Changeset 18 in cheroxy for trunk/src/CRXSocket.cpp

Timestamp:

11/08/12 16:39:42 (12 years ago)

Author:

cheese

Message:

#1 work for CRXProxy and CRXException

File:

• trunk/src/CRXSocket.cpp (modified) (11 diffs)

trunk/src/CRXSocket.cpp

@@ -95 +95 @@
     if (aResult != 0)
     {
-        return ERROR_TCPSOCKET_FAILED_TO_INITIALIZE;
+        aResult = ERROR_TCPSOCKET_FAILED_TO_INITIALIZE;
+        return aResult;
     }
 #endif
@@ -146 +147 @@
     /*----------------------------------------------------------------*/
     if (!IsInitialized () || IsCreated ())
-        return ERROR_TCPSOCKET_ALREADY_IN_USE;
+    {
+        aResult = ERROR_TCPSOCKET_ALREADY_IN_USE;
+        CRX_ERROR (aResult, "Already in use.");
+        return aResult;
+    }
 
     aResult = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
     if (aResult < 0)
     {
+        aResult = ERROR_TCPSOCKET_FAILED_TO_CREATE_SOCKET;
+        CRX_ERROR (aResult, "Failed to create socket.");
+        return aResult;
     }
 
@@ -191 +199 @@
         if (aHostEnt == NULL)
         {
-            return ERROR_TCPSOCKET_FAILED_TO_GET_HOSTNAME;
+            aResult = ERROR_TCPSOCKET_FAILED_TO_GET_HOSTNAME;
+            CRX_ERROR (aResult, "Failed to get hostname.");
+            return aResult;
         }
         mAddress.sin_family = aHostEnt->h_addrtype;
@@ -199 +209 @@
     if (aTimeout > TCPSOCKET_NO_TIMEOUT)
     {
-#ifdef _WIN32
         aResult = setsockopt (mSocket,
                               SOL_SOCKET,
                               SO_RCVTIMEO,
+#ifdef _WIN32
                               (char *) &aTimeMilliSec,
                               sizeof (aTimeMilliSec));
 #else
-        aResult = setsockopt (mSocket,
-                              SOL_SOCKET,
-                              SO_RCVTIMEO,
                               &aTimeVal,
                               (socklen_t) sizeof (aTimeVal));
@@ -214 +221 @@
         if (aResult < 0)
         {
-            return ERROR_TCPSOCKET_FAILED_TO_SETSOCKOPT;
+            aResult = ERROR_TCPSOCKET_FAILED_TO_SETSOCKOPT;
+            CRX_ERROR (aResult, "Failed to set socket option.");
+            return aResult;
         }
     }
@@ -221 +230 @@
     if (aResult < 0)
     {
-        return ERROR_TCPSOCKET_FAILED_TO_CONNECT;
+        aResult = ERROR_TCPSOCKET_FAILED_TO_CONNECT;
+        CRX_ERROR (aResult, "Failed to connect.");
     }
 
@@ -249 +259 @@
     if (aResult < 0)
     {
-        return ERROR_TCPSOCKET_FAILED_TO_BIND;
+        aResult = ERROR_TCPSOCKET_FAILED_TO_BIND;
+        CRX_ERROR (aResult, "Failed to bind.");
+        return aResult;
     }
 
@@ -255 +267 @@
     if (aResult < 0)
     {
-        return ERROR_TCPSOCKET_FAILED_TO_LISTEN;
+        aResult = ERROR_TCPSOCKET_FAILED_TO_LISTEN;
+        CRX_ERROR (aResult, "Failed to listen.");
+        return aResult;
     }
 
@@ -283 +297 @@
     if (aResult < 0)
     {
+        aResult = ERROR_TCPSOCKET_FAILED_TO_ACCEPT;
+        CRX_ERROR (aResult, "Failed to accept.");
         return aResult;
     }
@@ -311 +327 @@
     if (aResult != aSize)
     {
-        return ERROR_TCPSOCKET_FAILED_TO_SEND;
+        aResult = ERROR_TCPSOCKET_FAILED_TO_SEND;
+        CRX_ERROR (aResult, "Failed to send.");
+        return aResult;
     }
 
@@ -330 +348 @@
     if (aResult < 0)
     {
-        return ERROR_TCPSOCKET_FAILED_TO_RECEIVE;
-    }
-
-    /*----------------------------------------------------------------*/
-    return aResult;
-}
+        aResult = ERROR_TCPSOCKET_FAILED_TO_RECEIVE;
+        CRX_ERROR (aResult, "Failed to receive.");
+        return aResult;
+    }
+
+    /*----------------------------------------------------------------*/
+    return aResult;
+}