[Box Backup-commit] COMMIT r1085 - box/chris/merge/lib/server

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-10-17 00:20:01 +0100 (Tue, 17 Oct 2006)
New Revision: 1085

Modified:
   box/chris/merge/lib/server/SocketStream.h
Log:
Use -1 for INVALID_SOCKET_HANDLE to ensure that it's always less than zero,
so that non-conditional code in SocketStream.cpp works properly.

Add a method to determine if a socket stream has been attached to a socket
yet. (refs #3)


Modified: box/chris/merge/lib/server/SocketStream.h
===================================================================
--- box/chris/merge/lib/server/SocketStream.h	2006-10-16 23:17:32 UTC (rev 1084)
+++ box/chris/merge/lib/server/SocketStream.h	2006-10-16 23:20:01 UTC (rev 1085)
@@ -14,7 +14,7 @@
 
 #ifdef WIN32
 	typedef SOCKET tOSSocketHandle;
-	#define INVALID_SOCKET_VALUE INVALID_SOCKET
+	#define INVALID_SOCKET_VALUE (tOSSocketHandle)(-1)
 #else
 	typedef int tOSSocketHandle;
 	#define INVALID_SOCKET_VALUE -1
@@ -67,6 +67,7 @@
 	off_t GetBytesRead() const {return mBytesRead;}
 	off_t GetBytesWritten() const {return mBytesWritten;}
 	void ResetCounters() {mBytesRead = mBytesWritten = 0;}
+	bool IsOpened() { return mSocketHandle != INVALID_SOCKET_VALUE; }
 };
 
 #endif // SOCKETSTREAM__H