Changeset 14 in cheroxy for trunk/src/main.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/main.cpp (modified) (8 diffs)

trunk/src/main.cpp

@@ -42 +42 @@
         __stream << __message;                                                                          \
         string __string = __stream.str ();                                                              \
-        sprintf (__error, "[%s][%d] %d : %s\n", __func__, __LINE__, __code, __string.c_str ());         \
+        sprintf (__error, "[%s][%d] (%d) %s\n", __func__, __LINE__, __code, __string.c_str ());         \
         cout << __error;                                                                                \
     } while (0)
@@ -54 +54 @@
 int main (int argc, char* argv[])
 {
-    int                 aResult = 0;
-    const ushort        aPort   = 8080;
+    int                     aResult = 0;
+    const unsigned short    aPort   = 8080;
 
     CRXSocket           aSocket;
@@ -119 +119 @@
 CRXProxyThread (void * aThreadArg)
 {
-    int             aResult         = 0;
-    int             aReceivedSize   = 0;
-    int             aSentSize       = 0;
-
-    const uint      aBufferSize     = 1024 * 64;
-    char            aBuffer[aBufferSize] = {0x00, };
-
-    CRXHttpRequest  aHttpRequest;
-    CRXHttpResponse aHttpResponse;
-    string          aUrl    = "";
-    string          aHost   = "";
-    int             aPort   = 0;
-
-    CRXSocket       aWebServer;
-    CRXSocket       aWebBrowser = ((CRXProxyThreadArgs *)aThreadArg)->mSocket;
-
-    bool            aIsMoreRequest = false;
+    int                 aResult         = 0;
+    int                 aReceivedSize   = 0;
+    int                 aSentSize       = 0;
+
+    const unsigned int  aBufferSize     = 1024 * 64;
+    char                aBuffer[aBufferSize] = {0x00, };
+
+    CRXHttpRequest      aHttpRequest;
+    CRXHttpResponse     aHttpResponse;
+    string              aUrl    = "";
+    string              aHost   = "";
+    int                 aPort   = 0;
+
+    CRXSocket           aWebServer;
+    CRXSocket           aWebBrowser = ((CRXProxyThreadArgs *)aThreadArg)->mSocket;
+
+    bool                aIsMoreRequest = false;
     /*----------------------------------------------------------------*/
     delete (CRXProxyThreadArgs *)aThreadArg;
@@ -145 +145 @@
         if (aReceivedSize < 0)
         {
-            CRX_PRINT_ERROR (aReceivedSize, "failed to receive from client");
-            aResult = CRX_ERROR ();
+            CRX_PRINT_ERROR (aReceivedSize, "failed to receive from client (" << CRX_ERROR () << ")");
             return aResult;
         }
@@ -157 +156 @@
 
             /* connect */
-            aResult = aWebServer.Connect (aHttpRequest.GetHost (), aHttpRequest.GetPort ());
+            aResult = aWebServer.Connect (aHttpRequest.GetHost (), aHttpRequest.GetPort (), 1);
             if (aResult < 0)
             {
-                CRX_PRINT_ERROR (aResult, "failed to connect to server <" << aHost << ":" << aPort << ">");
-                aResult = CRX_ERROR ();
+                CRX_PRINT_ERROR (aResult, "failed to connect to server <" << aHost << ":" << aPort << "> (" << CRX_ERROR () << ")");
                 return aResult;
             }
@@ -170 +168 @@
         if (aSentSize != aReceivedSize)
         {
-            CRX_PRINT_ERROR (aResult, "failed to send to server");
-            aResult = CRX_ERROR ();
+            CRX_PRINT_ERROR (aResult, "failed to send to server (" << CRX_ERROR () << ")");
             return aResult;
         }
@@ -183 +180 @@
             if (aReceivedSize < 0)
             {
-                CRX_PRINT_ERROR (aReceivedSize, "failed to receive");
-                aResult = CRX_ERROR ();
+                CRX_PRINT_ERROR (aReceivedSize, "failed to receive (" << CRX_ERROR () << ")");
                 break;
             }
@@ -196 +192 @@
             if (aSentSize != aReceivedSize)
             {
-                CRX_PRINT_ERROR (aSentSize, "failed to send");
-                aResult = CRX_ERROR ();
+                CRX_PRINT_ERROR (aSentSize, "failed to send (" << CRX_ERROR () << ")");
                 break;
             }