Changeset 46 in cheroxy for trunk/src/CRXProxy.cpp

Timestamp:

11/26/12 15:23:31 (11 years ago)

Author:

cheese

Message:

#1 rename http message to http header and change way to process response content as binary

File:

• trunk/src/CRXProxy.cpp (modified) (6 diffs)

trunk/src/CRXProxy.cpp

@@ -91 +91 @@
 
     std::string aHttpHeader;
+
     /*----------------------------------------------------------------*/
     for (;;)
@@ -116 +117 @@
 CRXProxy::SendRequest (void)
 {
-    int     aResult = 0;
-    int     aSize   = mHttpRequest.GetHeader ().length ();
-
-    struct sockaddr_in  aSockName;
-    socklen_t           aSockLen = sizeof (aSockName);
-
-    /*----------------------------------------------------------------*/
-    if (!mServer)
-    {
-        /* connect */
-        aResult = mServer.Connect (mHttpRequest.GetHost (), mHttpRequest.GetPort (), mServerTimeout);
-        if (aResult < 0)
-        {
-            aResult = ERROR_PROXY_FAILED_TO_CONNECT_TO_SERVER;
-            CRX_ADD_SUBCLASS_ERROR (mServer);
-            CRX_ERROR_SET (aResult, "Failed to connect to server <%s>.", mHttpRequest.GetURL ().c_str ());
-            return aResult;
-        }
-    }
-
-    aResult = mServer.Send (mHttpRequest.GetHeader ().c_str (), aSize);
-    if (aResult != aSize)
+    int aResult = 0;
+    int aLength = mHttpRequest.GetHeader ().length ();
+
+    /*----------------------------------------------------------------*/
+    aResult = mServer.Connect (mHttpRequest.GetHost (), mHttpRequest.GetPort (), mServerTimeout);
+    if (aResult < 0)
+    {
+        aResult = ERROR_PROXY_FAILED_TO_CONNECT_TO_SERVER;
+        CRX_ADD_SUBCLASS_ERROR (mServer);
+        CRX_ERROR_SET (aResult, "Failed to connect to server <%s>.", mHttpRequest.GetURL ().c_str ());
+        return aResult;
+    }
+
+    aResult = mServer.Send (mHttpRequest.GetHeader ().c_str (), aLength);
+    if (aResult != aLength)
     {
         CRX_ADD_SUBCLASS_ERROR (mServer);
@@ -150 +144 @@
 CRXProxy::ReceiveResponse (void)
 {
-    int                 aResult         = 0;
-
-    const unsigned int  aBufferSize     = 1024 * 64;
-    char                aBuffer[aBufferSize + 1] = {0x00, };
+    int         aResult = 0;
+    char        aBuffer;
+
+    std::string aHttpHeader;
+    bool        aRemainHeader = true;
 
     /*----------------------------------------------------------------*/
     for (;;)
     {
-        memset (aBuffer, 0x00, sizeof (aBuffer));
-
-        aResult = mServer.Receive (aBuffer, aBufferSize);
+        aResult = mServer.Receive (&aBuffer, 1);
         if (aResult < 0)
         {
@@ -169 +162 @@
         }
 
-        aResult = mHttpResponse.SetResponseAll (aBuffer, aResult);
-        if (aResult < 0)
-        {
-            aResult = ERROR_PROXY_FAILED_TO_SET_RESPONSE;
-            CRX_ERROR_SET (aResult, "Failed to set response.");
-            return aResult;
+        if (aRemainHeader)
+        {
+            aHttpHeader += aBuffer;
+            if (aHttpHeader.rfind (CRLF2) != std::string::npos)
+            {
+                mHttpResponse.SetHeader (aHttpHeader.c_str ());
+                aRemainHeader = false;
+            }
+        }
+        else
+        {
+            aResult = mHttpResponse.SetContent (&aBuffer, aResult);
+            if (aResult < 0)
+            {
+                aResult = ERROR_PROXY_FAILED_TO_SET_RESPONSE;
+                CRX_ERROR_SET (aResult, "Failed to set response.");
+                return aResult;
+            }
+            else if (aResult == 0)
+                break;
         }
     }
@@ -185 +192 @@
 CRXProxy::SendResponse (void)
 {
-    int     aResult = 0;
-    int     aSize   = 0;
-
-    /*----------------------------------------------------------------*/
-    aSize = mHttpResponse.GetHeader ().length ();;
-    aResult = mClient.Send (mHttpResponse.GetHeader ().c_str (), aSize);
-    if (aResult != aSize)
+    int aResult = 0;
+    int aLength = 0;
+    /*----------------------------------------------------------------*/
+    aLength = mHttpResponse.GetHeader ().length ();
+    aResult = mClient.Send (mHttpResponse.GetHeader ().c_str (), aLength);
+    if (aResult != aLength)
     {
         CRX_ADD_SUBCLASS_ERROR (mClient);
@@ -198 +204 @@
     }
 
-    aSize = mHttpResponse.GetContentLength ();
-    aResult = mClient.Send (mHttpResponse.GetContentBody (), aSize);
-    if (aResult != aSize)
+    aLength = mHttpResponse.GetContentLength ();
+    aResult = mClient.Send (mHttpResponse.GetContentBody (), aLength);
+    if (aResult != aLength)
     {
         CRX_ADD_SUBCLASS_ERROR (mClient);