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

Timestamp:

11/20/12 19:06:30 (12 years ago)

Author:

cheese

Message:

#1 add debugging message

File:

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

trunk/src/CRXProxy.cpp

@@ -99 +99 @@
     {
         aResult = ERROR_PROXY_FAILED_TO_RECEIVE_REQUEST;
-        CRX_ERROR (aResult, "Failed to receive from client");
+        CRX_ERROR_SET (aResult, "Failed to receive from client.");
     }
 
@@ -106 +106 @@
     {
         aResult = ERROR_PROXY_FAILED_TO_SEND_REQUEST;
-        CRX_ERROR (aResult, "Failed to send to server");
+        CRX_ERROR_SET (aResult, "Failed to send to server.");
         return aResult;
     }
@@ -114 +114 @@
     {
         aResult = ERROR_PROXY_FAILED_TO_RECEIVE_RESPONSE;
-        CRX_ERROR (aResult, "Failed to receive from server");
+        CRX_ERROR_SET (aResult, "Failed to receive from server.");
     }
 
@@ -121 +121 @@
     {
         aResult = ERROR_PROXY_FAILED_TO_SEND_RESPONSE;
-        CRX_ERROR (aResult, "Failed to send to client");
+        CRX_ERROR_SET (aResult, "Failed to send to client.");
         return aResult;
     }
@@ -177 +177 @@
 
 char *
-CRXProxy::GetHttpResponse (char         * aBuffer,
-                           const int    aBufferSize) const
+CRXProxy::GetHttpResponseHeader (char       * aBuffer,
+                                 const int  aBufferSize) const
 {
     void        * aPtr = static_cast<void *> (aBuffer);
@@ -185 +185 @@
     int         aRemainLength   = aBufferSize;
     const int   aHeaderLength   = mHttpResponse.GetHeader ().length ();
-    const int   aContentLength  = mHttpResponse.GetContentLength ();
 
     /*----------------------------------------------------------------*/
@@ -194 +193 @@
     if (aCopyLength > 0)
         memcpy (aPtr, mHttpResponse.GetHeader ().c_str (), aCopyLength);
-
-    aRemainLength -= aCopyLength;
+    /*----------------------------------------------------------------*/
+
+    return aBuffer;
+}
+
+int
+CRXProxy::GetHttpResponseHeaderLength (void) const
+{
+    /*----------------------------------------------------------------*/
+    /*----------------------------------------------------------------*/
+
+    return mHttpResponse.GetHeader ().length ();
+}
+
+char *
+CRXProxy::GetHttpResponseBody (char         * aBuffer,
+                               const int    aBufferSize) const
+{
+    void        * aPtr = static_cast<void *> (aBuffer);
+
+    int         aCopyLength     = 0;
+    int         aRemainLength   = aBufferSize;
+    const int   aContentLength  = mHttpResponse.GetContentLength ();
+
+    /*----------------------------------------------------------------*/
+    if (aPtr == NULL)
+        return NULL;
 
     aCopyLength = aRemainLength < aContentLength ? aRemainLength : aContentLength;
@@ -206 +230 @@
 
 int
-CRXProxy::GetHttpResponseLength (void) const
-{
-    /*----------------------------------------------------------------*/
-    /*----------------------------------------------------------------*/
-
-    return mHttpResponse.GetHeader ().length ()
-         + mHttpResponse.GetContentLength ();
+CRXProxy::GetHttpResponseBodyLength (void) const
+{
+    /*----------------------------------------------------------------*/
+    /*----------------------------------------------------------------*/
+
+    return mHttpResponse.GetContentLength ();
 }
 
@@ -228 +251 @@
     {
         aResult = ERROR_PROXY_FAILED_TO_RECEIVE_REQUEST;
-        CRX_ERROR_ADD (mClient.GetErrorMessage ().c_str ());
-        CRX_ERROR (aResult, "Failed to receive from client");
+        CRX_ADD_SUBCLASS_ERROR (mClient);
+        CRX_ERROR_SET (aResult, "Failed to receive from client.");
         return aResult;
     }
@@ -254 +277 @@
         {
             aResult = ERROR_PROXY_FAILED_TO_CONNECT_TO_SERVER;
-            CRX_ERROR_ADD (mServer.GetErrorMessage ().c_str ());
-            CRX_ERROR (aResult, "Failed to connect to server <%s>", mHttpRequest.GetURL ().c_str ());
+            CRX_ADD_SUBCLASS_ERROR (mServer);
+            CRX_ERROR_SET (aResult, "Failed to connect to server <%s>.", mHttpRequest.GetURL ().c_str ());
             return aResult;
         }
@@ -263 +286 @@
     if (aResult != aSize)
     {
-        CRX_ERROR_ADD (mServer.GetErrorMessage ().c_str ());
-        CRX_ERROR (aResult, "Failed to send to server <%s>", mHttpRequest.GetURL ().c_str ());
+        CRX_ADD_SUBCLASS_ERROR (mServer);
+        CRX_ERROR_SET (aResult, "Failed to send to server <%s>.", mHttpRequest.GetURL ().c_str ());
     }
     /*----------------------------------------------------------------*/
@@ -290 +313 @@
         {
             aResult = ERROR_PROXY_FAILED_TO_RECEIVE_REQUEST;
-            CRX_ERROR_ADD (mServer.GetErrorMessage ().c_str ());
-            CRX_ERROR (aResult, "Failed to receive from server");
+            CRX_ADD_SUBCLASS_ERROR (mServer);
+            CRX_ERROR_SET (aResult, "Failed to receive from server.");
             return aResult;
         }
@@ -303 +326 @@
         {
             aResult = ERROR_PROXY_FAILED_TO_SET_RESPONSE;
-            CRX_ERROR (aResult, "Failed to set response");
+            CRX_ERROR_SET (aResult, "Failed to set response.");
             return aResult;
+        }
+
+        if (!CheckRequestFilter (CRX_FILTER_REQUEST_FILE_EXTENSION) &&
+            mHttpResponse.GetContentLength () > 0)
+        {
+            CRX_DEBUG_TRACE_BIN (mHttpResponse.GetContentBody (),
+                                 mHttpResponse.GetContentLength (),
+                                 "");
         }
     }
@@ -323 +354 @@
     if (aResult != aSize)
     {
-        CRX_ERROR_ADD (mClient.GetErrorMessage ().c_str ());
-        CRX_ERROR (aResult, "Failed to send to client");
+        CRX_ADD_SUBCLASS_ERROR (mClient);
+        CRX_ERROR_SET (aResult, "Failed to send to client.");
         return aResult;
     }
@@ -332 +363 @@
     if (aResult != aSize)
     {
-        CRX_ERROR_ADD (mClient.GetErrorMessage ().c_str ());
-        CRX_ERROR (aResult, "Failed to send to client");
+        CRX_ADD_SUBCLASS_ERROR (mClient);
+        CRX_ERROR_SET (aResult, "Failed to send to client.");
     }
     /*----------------------------------------------------------------*/