Changeset 59 in cheroxy

Timestamp:

12/26/12 11:00:40 (11 years ago)

Author:

cheese

Message:

#1 add SetOption in CRXSocket

Location:

trunk

Files:

• include/CRXSocket.h (modified) (1 diff)
• src/CRXSocket.cpp (modified) (5 diffs)

trunk/include/CRXSocket.h

@@ -87 +87 @@
     CRXSocket   & operator =    (int aSocket);
 
+    int         SetOption       (const int      aOptName,
+                                 const void     * aOptVal,
+                                 const size_t   aOptLen);
+
     int         SetTimeout      (const int aTimeout);
 

trunk/src/CRXSocket.cpp

@@ -76 +76 @@
     /*----------------------------------------------------------------*/
     return *this;
+}
+
+int
+CRXSocket::SetOption (const int     aOptName,
+                      const void    * aOptVal,
+                      const size_t  aOptLen)
+{
+    int aResult = 0;
+    /*----------------------------------------------------------------*/
+    aResult = setsockopt (mSocket,
+                          SOL_SOCKET,
+                          aOptName,
+#ifdef _WIN32
+                          (char *) aOptVal,
+#else
+                          aOptVal,
+#endif
+                          (socklen_t) aOptLen);
+    if (aResult < 0)
+    {
+        aResult = ERROR_TCPSOCKET_FAILED_TO_SET_SOCKOPT;
+        CRX_ERROR_SET (aResult, "Failed to set socket option.");
+    }
+    /*----------------------------------------------------------------*/
+
+    return aResult;
 }
 
@@ -98 +124 @@
         return 0;
 
-    aResult = setsockopt (mSocket,
-                          SOL_SOCKET,
-                          SO_RCVTIMEO,
+    aResult = SetOption (SO_RCVTIMEO,
 #ifdef _WIN32
-                          (char *) &aTimeMilliSec,
-                          sizeof (aTimeMilliSec));
+                         &aTimeMilliSec,
+                         sizeof (aTimeMilliSec));
 #else
-                          &aTimeVal,
-                          (socklen_t) sizeof (aTimeVal));
-#endif
-    if (aResult < 0)
-    {
-        aResult = ERROR_TCPSOCKET_FAILED_TO_SET_SOCKOPT;
-        CRX_ERROR_SET (aResult, "Failed to set socket option.");
+                         &aTimeVal,
+                         sizeof (aTimeVal));
+#endif
+    if (aResult < 0)
+    {
+        aResult = ERROR_TCPSOCKET_FAILED_TO_SET_TIMEOUT;
+        CRX_ERROR_SET (aResult, "Failed to set socket tieout.");
     }
     /*----------------------------------------------------------------*/
@@ -242 +266 @@
     aLinger.l_onoff = 1;
     aLinger.l_linger = 0;
-    aResult = setsockopt (mSocket,
-                          SOL_SOCKET,
-                          SO_LINGER,
-#ifdef _WIN32
-                          (char *) &aLinger,
-#else
+    aResult = SetOption (SO_LINGER,
                           &aLinger,
-#endif
-                          (socklen_t) sizeof (aLinger));
+                          sizeof (aLinger));
     if (aResult < 0)
     {
@@ -271 +289 @@
         CRX_ERROR_SET (aResult, "Failed to connect (%d).", GetSystemErrorCode ());
     }
-
-    /*----------------------------------------------------------------*/
+    /*----------------------------------------------------------------*/
+
     return aResult;
 }
@@ -294 +312 @@
     }
 
-    aResult = setsockopt (mSocket,
-                          SOL_SOCKET,
-                          SO_REUSEADDR,
-#ifdef _WIN32
-                          (char *) &aReuseAddress,
-#else
-                          &aReuseAddress,
-#endif
-                          (socklen_t) sizeof (aReuseAddress));
+    aResult = SetOption (SO_REUSEADDR,
+                         &aReuseAddress,
+                         sizeof (aReuseAddress));
     if (aResult < 0)
     {