1 files changed, 46 insertions, 1 deletions

diff --git a/lib/server/WinNamedPipeStream.h b/lib/server/WinNamedPipeStream.h
index 386ff7e3..5473c690 100644
--- a/lib/server/WinNamedPipeStream.h
+++ b/lib/server/WinNamedPipeStream.h
@@ -10,6 +10,8 @@
 #if ! defined WINNAMEDPIPESTREAM__H && defined WIN32
 #define WINNAMEDPIPESTREAM__H
 
+#include <list>
+
 #include "IOStream.h"
 
 // --------------------------------------------------------------------------
@@ -36,15 +38,27 @@ public:
 	// both sides
 	virtual int Read(void *pBuffer, int NBytes, 
 		int Timeout = IOStream::TimeOutInfinite);
-	virtual void Write(const void *pBuffer, int NBytes);
+	virtual void Write(const void *pBuffer, int NBytes,
+		int Timeout = IOStream::TimeOutInfinite);
 	virtual void WriteAllBuffered();
 	virtual void Close();
 	virtual bool StreamDataLeft();
 	virtual bool StreamClosed();
 
+	// 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);
+	}
+
 protected:
 	void MarkAsReadClosed()  {mReadClosed  = true;}
 	void MarkAsWriteClosed() {mWriteClosed = true;}
+	bool WaitForOverlappedOperation(OVERLAPPED& Overlapped,
+		int Timeout, int64_t* pBytesTransferred);
+	void StartFirstRead();
+	void StartOverlappedRead();
 
 private:
 	WinNamedPipeStream(const WinNamedPipeStream &rToCopy) 
@@ -59,6 +73,37 @@ private:
 	bool mWriteClosed;
 	bool mIsServer;
 	bool mIsConnected;
+	bool mNeedAnotherRead;
+
+	class WriteInProgress {
+	private:
+		friend class WinNamedPipeStream;
+		std::string mBuffer;
+		OVERLAPPED mOverlap;
+		WriteInProgress(const WriteInProgress& other); // do not call
+	public:
+		WriteInProgress(const std::string& dataToWrite)
+		: mBuffer(dataToWrite)
+		{
+			// create the Writable event
+			HANDLE writable_event = CreateEvent(NULL, TRUE, FALSE,
+				NULL);
+			if (writable_event == INVALID_HANDLE_VALUE)
+			{
+				BOX_LOG_WIN_ERROR("Failed to create the "
+					"Writable event");
+				THROW_EXCEPTION(CommonException, Internal)
+			}
+
+			memset(&mOverlap, 0, sizeof(mOverlap));
+			mOverlap.hEvent = writable_event;
+		}
+		~WriteInProgress()
+		{
+			CloseHandle(mOverlap.hEvent);
+		}
+	};
+	std::list<WriteInProgress*> mWritesInProgress;
 
 public:
 	static std::string sPipeNamePrefix;