Changeset 905

Timestamp:

01/09/2006 00:30:42 (5 years ago)

Author:

chris

Message:

Revert to trunk

File:

• box/chris/merge/lib/server/SocketStream.cpp (modified) (13 diffs)

box/chris/merge/lib/server/SocketStream.cpp

@@ -37 +37 @@
 // --------------------------------------------------------------------------
 SocketStream::SocketStream()
-        : mSocketHandle(INVALID_SOCKET_VALUE),
+        : mSocketHandle(-1),
           mReadClosed(false),
           mWriteClosed(false),
@@ -86 +86 @@
                 THROW_EXCEPTION(ServerException, BadSocketHandle);
         }
-        if(mSocketHandle == INVALID_SOCKET_VALUE)
+        if(mSocketHandle == -1)
         {
                 THROW_EXCEPTION(ServerException, DupError);
@@ -102 +102 @@
 SocketStream::~SocketStream()
 {
-        if(mSocketHandle != INVALID_SOCKET_VALUE)
+        if(mSocketHandle != -1)
         {
                 Close();
@@ -118 +118 @@
 void SocketStream::Attach(int socket)
 {
-        if(mSocketHandle != INVALID_SOCKET_VALUE) 
-        {
-                THROW_EXCEPTION(ServerException, SocketAlreadyOpen)
-        }
+        if(mSocketHandle != -1) {THROW_EXCEPTION(ServerException, SocketAlreadyOpen)}
 
         mSocketHandle = socket;
@@ -138 +135 @@
 void SocketStream::Open(int Type, const char *Name, int Port)
 {
-        if(mSocketHandle != INVALID_SOCKET_VALUE) 
-        {
-                THROW_EXCEPTION(ServerException, SocketAlreadyOpen)
-        }
+        if(mSocketHandle != -1) {THROW_EXCEPTION(ServerException, SocketAlreadyOpen)}
         
         // Setup parameters based on type, looking up names if required
@@ -151 +145 @@
         // Create the socket
         mSocketHandle = ::socket(sockDomain, SOCK_STREAM, 0 /* let OS choose protocol */);
-        if(mSocketHandle == INVALID_SOCKET_VALUE)
+        if(mSocketHandle == -1)
         {
                 THROW_EXCEPTION(ServerException, SocketOpenError)
@@ -165 +159 @@
                 ::close(mSocketHandle);
 #endif
-                mSocketHandle = INVALID_SOCKET_VALUE;
+                mSocketHandle = -1;
                 THROW_EXCEPTION(ConnectionException, Conn_SocketConnectError)
         }
@@ -181 +175 @@
 int SocketStream::Read(void *pBuffer, int NBytes, int Timeout)
 {
-        if(mSocketHandle == INVALID_SOCKET_VALUE) 
-        {
-                THROW_EXCEPTION(ServerException, BadSocketHandle)
-        }
+        if(mSocketHandle == -1) {THROW_EXCEPTION(ServerException, BadSocketHandle)}
 
         if(Timeout != IOStream::TimeOutInfinite)
@@ -257 +248 @@
 void SocketStream::Write(const void *pBuffer, int NBytes)
 {
-        if(mSocketHandle == INVALID_SOCKET_VALUE) 
-        {
-                THROW_EXCEPTION(ServerException, BadSocketHandle)
-        }
+        if(mSocketHandle == -1) {THROW_EXCEPTION(ServerException, BadSocketHandle)}
         
         // Buffer in byte sized type.
@@ -324 +312 @@
 void SocketStream::Close()
 {
-        if(mSocketHandle == INVALID_SOCKET_VALUE) 
-        {
-                THROW_EXCEPTION(ServerException, BadSocketHandle)
-        }
+        if(mSocketHandle == -1) {THROW_EXCEPTION(ServerException, BadSocketHandle)}
 #ifdef WIN32
         if(::closesocket(mSocketHandle) == -1)
@@ -336 +321 @@
                 THROW_EXCEPTION(ServerException, SocketCloseError)
         }
-        mSocketHandle = INVALID_SOCKET_VALUE;
+        mSocketHandle = -1;
 }
 
@@ -349 +334 @@
 void SocketStream::Shutdown(bool Read, bool Write)
 {
-        if(mSocketHandle == INVALID_SOCKET_VALUE) 
-        {
-                THROW_EXCEPTION(ServerException, BadSocketHandle)
-        }
+        if(mSocketHandle == -1) {THROW_EXCEPTION(ServerException, BadSocketHandle)}
         
         // Do anything?
@@ -407 +389 @@
 tOSSocketHandle SocketStream::GetSocketHandle()
 {
-        if(mSocketHandle == INVALID_SOCKET_VALUE) 
-        {
-                THROW_EXCEPTION(ServerException, BadSocketHandle)
-        }
+        if(mSocketHandle == -1) {THROW_EXCEPTION(ServerException, BadSocketHandle)}
         return mSocketHandle;
 }