[Box Backup-commit] COMMIT r2425 - box/trunk/lib/server

[boxbackup-dev@boxbackup.org]

Author: chris
Date: 2009-01-03 08:56:47 +0000 (Sat, 03 Jan 2009)
New Revision: 2425

Modified:
   box/trunk/lib/server/SocketStream.cpp
Log:
Reset read and write closed state of a socket after Open() and Attach().


Modified: box/trunk/lib/server/SocketStream.cpp
===================================================================
--- box/trunk/lib/server/SocketStream.cpp	2009-01-03 08:56:13 UTC (rev 2424)
+++ box/trunk/lib/server/SocketStream.cpp	2009-01-03 08:56:47 UTC (rev 2425)
@@ -127,20 +127,23 @@
 		THROW_EXCEPTION(ServerException, SocketAlreadyOpen)
 	}
 
+	ResetCounters();
+
 	mSocketHandle = socket;
-	ResetCounters();
+	mReadClosed = false;
+	mWriteClosed = false;
 }
 
 
 // --------------------------------------------------------------------------
 //
 // Function
-//		Name:    SocketStream::Open(int, char *, int)
+//		Name:    SocketStream::Open(Socket::Type, char *, int)
 //		Purpose: Opens a connection to a listening socket (INET or UNIX)
 //		Created: 2003/07/31
 //
 // --------------------------------------------------------------------------
-void SocketStream::Open(int Type, const std::string& rName, int Port)
+void SocketStream::Open(Socket::Type Type, const std::string& rName, int Port)
 {
 	if(mSocketHandle != INVALID_SOCKET_VALUE) 
 	{
@@ -184,6 +187,9 @@
 	}
 
 	ResetCounters();
+
+	mReadClosed = false;
+	mWriteClosed = false;
 }
 
 // --------------------------------------------------------------------------