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

Timestamp:

10/24/12 11:12:11 (12 years ago)

Author:

cheese

Message:

#1 add timeout to socket connection and fix test label in makefile

File:

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

trunk/src/CRXSocket.cpp

@@ -18 +18 @@
 {
     /*----------------------------------------------------------------*/
-    memset ((void *)&mAddress, 0x0, sizeof (stSockAddrIn));
+    memset ((void *)&mAddress, 0x0, sizeof (struct sockaddr_in));
 
     if (!CRXSocket::IsInitialized ())
@@ -160 +160 @@
 
 int
-CRXSocket::Connect (std::string aUrl,
-                    ushort      aPort)
+CRXSocket::Connect (const std::string       aUrl,
+                    const unsigned short    aPort,
+                    const int               aTimeout)
 {
     int             aResult = -1;
     struct hostent  * aHostEnt;
+
+#ifndef _WIN32
+    struct timeval  aTimeVal;
+    aTimeVal.tv_sec = aTimeout;
+    aTimeVal.tv_usec= 0;
+#else
+    int             aTimeMilliSec = aTimeout * 1000;
+#endif
 
     /*----------------------------------------------------------------*/
@@ -188 +197 @@
     }
 
-    aResult = connect (mSocket, (stSockAddr*) &mAddress, sizeof (mAddress));
+    if (aTimeout > TCPSOCKET_NO_TIMEOUT)
+    {
+#ifdef _WIN32
+        aResult = setsockopt (mSocket,
+                              SOL_SOCKET,
+                              SO_RCVTIMEO,
+                              (char *) &aTimeMilliSec,
+                              sizeof (aTimeMilliSec));
+#else
+        aResult = setsockopt (mSocket,
+                              SOL_SOCKET,
+                              SO_RCVTIMEO,
+                              &aTimeVal,
+                              (socklen_t) sizeof (aTimeVal));
+#endif
+        if (aResult < 0)
+        {
+            return ERROR_TCPSOCKET_FAILED_TO_SETSOCKOPT;
+        }
+    }
+
+    aResult = connect (mSocket, (struct sockaddr*) &mAddress, sizeof (mAddress));
     if (aResult < 0)
     {
@@ -199 +229 @@
 
 int
-CRXSocket::CreateServer (ushort         aPort,
-                         int            aBacklog,
-                         stSockAddrIn   * aAddress)
+CRXSocket::CreateServer (const unsigned short   aPort,
+                         const int              aBacklog,
+                         struct sockaddr_in     * aAddress)
 {
     int aResult = -1;
@@ -216 +246 @@
     mAddress.sin_port       = htons (aPort);
 
-    aResult = bind (mSocket, (stSockAddr *)&mAddress, sizeof (stSockAddr));
+    aResult = bind (mSocket, (struct sockaddr *)&mAddress, sizeof (struct sockaddr));
     if (aResult < 0)
     {
@@ -230 +260 @@
     if (aAddress != NULL)
     {
-        memset ((void *)aAddress, 0x0, sizeof (stSockAddrIn));
-        memcpy ((void *)aAddress, (void *)&mAddress, sizeof (stSockAddrIn));
-    }
-
-    /*----------------------------------------------------------------*/
-    return aResult;
-}
-
-int
-CRXSocket::Accept (stSockAddrIn * aRemoteAddress,
-                   int          * aAddressLength)
-{
-    int             aResult = -1;
-
-    stSockAddrIn    aAddress;
-    socklen_t       aLength = sizeof (aAddress);
+        memset ((void *)aAddress, 0x0, sizeof (struct sockaddr_in));
+        memcpy ((void *)aAddress, (void *)&mAddress, sizeof (struct sockaddr_in));
+    }
+
+    /*----------------------------------------------------------------*/
+    return aResult;
+}
+
+int
+CRXSocket::Accept (struct sockaddr_in   * aRemoteAddress,
+                   int                  * aAddressLength)
+{
+    int                 aResult = -1;
+
+    struct sockaddr_in  aAddress;
+    socklen_t           aLength = sizeof (aAddress);
 
     /*----------------------------------------------------------------*/
     if (!IsReady ())        return ERROR_TCPSOCKET_NOT_READY;
 
-    aResult = accept (mSocket, (stSockAddr *) &aAddress, &aLength);
+    aResult = accept (mSocket, (struct sockaddr *) &aAddress, &aLength);
     if (aResult < 0)
     {
@@ -258 +288 @@
     if (aRemoteAddress != NULL)
     {
-        memset ((void *)aRemoteAddress, 0x0, sizeof (stSockAddrIn));
-        memcpy ((void *)aRemoteAddress, (void *)&aAddress, sizeof (stSockAddrIn));
+        memset ((void *)aRemoteAddress, 0x0, sizeof (struct sockaddr_in));
+        memcpy ((void *)aRemoteAddress, (void *)&aAddress, sizeof (struct sockaddr_in));
     }