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

Timestamp:

11/22/12 15:21:02 (11 years ago)

Author:

cheese

Message:

#1 change logic more detail

File:

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

trunk/src/CRXProxy.cpp

@@ -25 +25 @@
 }
 
-CRXProxy *
-CRXProxy::GetNewInstance (void)
-{
-    /*----------------------------------------------------------------*/
-    /*----------------------------------------------------------------*/
-
-    return new(std::nothrow) CRXProxy ();
-}
-
-void
-CRXProxy::ReleaseInstance (void)
-{
-    /*----------------------------------------------------------------*/
-    delete this;
-    /*----------------------------------------------------------------*/
-}
-
 void
 CRXProxy::SetClientSocket (const int aSocket)
@@ -141 +124 @@
 {
     /*----------------------------------------------------------------*/
-    mHttpRequest = aHttpRequest;
+    mHttpRequest.SetHeader (aHttpRequest);
     /*----------------------------------------------------------------*/
 }
@@ -158 +141 @@
     if (aPtr == NULL)
         return NULL;
-    
+
     aCopyLength = aRemainLength < aHeaderLength ? aBufferSize : aHeaderLength;
     if (aCopyLength > 0)
@@ -180 +163 @@
 {
     /*----------------------------------------------------------------*/
-    mHttpResponse = aHttpResponse;
+    mHttpResponse.SetHeader (aHttpResponse);
     /*----------------------------------------------------------------*/
 }
@@ -249 +232 @@
 CRXProxy::ReceiveRequest (void)
 {
-    int                 aResult     = 0;
-
-    const unsigned int  aBufferSize = 1024 * 56;
-    char                aBuffer[aBufferSize + 1] = {0x00, };
-
-    /*----------------------------------------------------------------*/
-    aResult = mClient.Receive (aBuffer, aBufferSize);
-    if (aResult < 0)
-    {
-        aResult = ERROR_PROXY_FAILED_TO_RECEIVE_REQUEST;
-        CRX_ADD_SUBCLASS_ERROR (mClient);
-        CRX_ERROR_SET (aResult, "Failed to receive from client.");
-        return aResult;
-    }
-
-    /* parse http request */
-    mHttpRequest = aBuffer;
+    int         aResult = 0;
+    char        aBuffer;
+
+    std::string aHttpHeader;
+    /*----------------------------------------------------------------*/
+    for (;;)
+    {
+        aResult = mClient.Receive (&aBuffer, 1);
+        if (aResult < 0)
+        {
+            aResult = ERROR_PROXY_FAILED_TO_RECEIVE_REQUEST;
+            CRX_ADD_SUBCLASS_ERROR (mClient);
+            CRX_ERROR_SET (aResult, "Failed to receive from client.");
+            return aResult;
+        }
+        aHttpHeader += aBuffer;
+        if (aHttpHeader.rfind (CRLF2) != std::string::npos)
+            break;
+    }
+
+    mHttpRequest.SetHeader (aHttpHeader.c_str ());
     /*----------------------------------------------------------------*/
 
@@ -292 +279 @@
             return aResult;
         }
-
-        if (getsockname (mServer, (struct sockaddr *) &aSockName, &aSockLen) == 0)
-            CRX_DEBUG_TRACE ("Connected on port number (%d)\n", ntohs (aSockName.sin_port));
     }
 
@@ -315 +299 @@
     const unsigned int  aBufferSize     = 1024 * 64;
     char                aBuffer[aBufferSize + 1] = {0x00, };
-
-    std::string         aHttpResponse;
 
     /*----------------------------------------------------------------*/
@@ -331 +313 @@
             return aResult;
         }
-        else if (aResult == 0)
-        {
-            break;
-        }
-
-        aResult = mHttpResponse.SetResponse (aBuffer, aResult);
+
+        aResult = mHttpResponse.SetResponseAll (aBuffer, aResult);
         if (aResult)
         {
@@ -343 +321 @@
             return aResult;
         }
-
-        if (!CheckRequestFilter (CRX_FILTER_REQUEST_FILE_EXTENSION) &&
-            mHttpResponse.GetContentLength () > 0)
-        {
-            CRX_DEBUG_TRACE_BIN (mHttpResponse.GetContentBody (),
-                                 mHttpResponse.GetContentLength (),
-                                 "");
-        }
     }
     /*----------------------------------------------------------------*/