Changeset 57 in cheroxy for trunk/src

Timestamp:

12/17/12 18:01:59 (11 years ago)

Author:

cheese

Message:

#1 add reuseaddr option to server socket and linger option to client socket

File:

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

trunk/src/CRXSocket.cpp

@@ -103 +103 @@
 #ifdef _WIN32
                           (char *) &aTimeMilliSec,
-                          sizeof (aTimeMilliSec));
 #else
                           &aTimeVal,
+#endif
                           (socklen_t) sizeof (aTimeVal));
-#endif
-    if (aResult < 0)
-    {
-        aResult = ERROR_TCPSOCKET_FAILED_TO_SETSOCKOPT;
+    if (aResult < 0)
+    {
+        aResult = ERROR_TCPSOCKET_FAILED_TO_SET_SOCKOPT;
         CRX_ERROR_SET (aResult, "Failed to set socket option.");
     }
@@ -212 +211 @@
     int             aResult = -1;
     struct hostent  * aHostEnt;
+    struct linger   aLinger;
 
     /*----------------------------------------------------------------*/
@@ -239 +239 @@
     }
 
+    aLinger.l_onoff = 1;
+    aLinger.l_linger = 0;
+    aResult = setsockopt (mSocket,
+                          SOL_SOCKET,
+                          SO_LINGER,
+#ifdef _WIN32
+                          (char *) &aLinger,
+#else
+                          &aLinger,
+#endif
+                          (socklen_t) sizeof (aLinger));
+    if (aResult < 0)
+    {
+        aResult = ERROR_TCPSOCKET_FAILED_TO_SET_SOCKOPT;
+        CRX_ERROR_SET (aResult, "Failed to set socket option (linger).");
+    }
+
     aResult = SetTimeout (aTimeout);
     if (aResult < 0)
     {
-        aResult = ERROR_TCPSOCKET_FAILED_TO_SETSOCKOPT;
+        aResult = ERROR_TCPSOCKET_FAILED_TO_SET_TIMEOUT;
         CRX_ERROR_SET (aResult, "Failed to set timeout (%d).", GetSystemErrorCode ());
         return aResult;
@@ -265 +282 @@
     int aResult = -1;
 
+    int aReuseAddress = 1;
+
     /*----------------------------------------------------------------*/
     aResult = CreateSocket ();
@@ -272 +291 @@
         CRX_ERROR_SET (aResult, "Failed to create socket(%d).", GetSystemErrorCode ());
         return aResult;
+    }
+
+    aResult = setsockopt (mSocket,
+                          SOL_SOCKET,
+                          SO_REUSEADDR,
+#ifdef _WIN32
+                          (char *) &aReuseAddress,
+#else
+                          &aReuseAddress,
+#endif
+                          (socklen_t) sizeof (aReuseAddress));
+    if (aResult < 0)
+    {
+        aResult = ERROR_TCPSOCKET_FAILED_TO_SET_SOCKOPT;
+        CRX_ERROR_SET (aResult, "Failed to set socket option (reuseaddr).");
     }