From 1c1872a295a8f624feda363b9edb366da97798c6 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 28 Dec 2014 22:03:23 +0000 Subject: Add missing timeouts on command socket writes. --- lib/server/SocketStream.h | 6 +++--- lib/server/WinNamedPipeStream.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/server') diff --git a/lib/server/SocketStream.h b/lib/server/SocketStream.h index 438bd989..fd57af8f 100644 --- a/lib/server/SocketStream.h +++ b/lib/server/SocketStream.h @@ -51,9 +51,9 @@ public: virtual void Write(const void *pBuffer, int NBytes, int Timeout = IOStream::TimeOutInfinite); - // Why not inherited from IOStream? - virtual void Write(const std::string& rBuffer, - int Timeout = IOStream::TimeOutInfinite) + // Why not inherited from IOStream? Never mind, we want to enforce + // supplying a timeout for network operations anyway. + virtual void Write(const std::string& rBuffer, int Timeout) { IOStream::Write(rBuffer, Timeout); } diff --git a/lib/server/WinNamedPipeStream.h b/lib/server/WinNamedPipeStream.h index 60641808..4c8a1e8f 100644 --- a/lib/server/WinNamedPipeStream.h +++ b/lib/server/WinNamedPipeStream.h @@ -45,9 +45,9 @@ public: virtual bool StreamDataLeft(); virtual bool StreamClosed(); - // Why not inherited from IOStream? - virtual void Write(const std::string& rBuffer, - int Timeout = IOStream::TimeOutInfinite) + // Why not inherited from IOStream? Never mind, we want to enforce + // supplying a timeout for network operations anyway. + virtual void Write(const std::string& rBuffer, int Timeout) { IOStream::Write(rBuffer, Timeout); } -- cgit v1.2.3