Changeset 46 in cheroxy for trunk/src/CRXHttpResponse.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/CRXHttpResponse.cpp (modified) (4 diffs)

trunk/src/CRXHttpResponse.cpp

@@ -36 +36 @@
 {
     /*----------------------------------------------------------------*/
-    ResetMessage ();
-    ResetContent ();
+    Get ().clear ();
+    mContent.clear ();
     /*----------------------------------------------------------------*/
 }
 
 void
-CRXHttpResponse::ResetContent (void)
+CRXHttpResponse::SetHeader (const char * aHeader)
 {
     /*----------------------------------------------------------------*/
-    if (mContent.mBody)
-        free (mContent.mBody);
-
-    memset (&mContent, 0x00, sizeof (mContent));
-    /*----------------------------------------------------------------*/
-}
-
-int
-CRXHttpResponse::SetResponseAll (const char * aHttpResponse,
-                                 const int  aResponseLength)
-{
-    int             aResult = 0;
-
-    const char      * aEndOfHeader = NULL;
-    std::string     aHeader;
-
-    int             aHeaderLength = 0;
-
-    /*----------------------------------------------------------------*/
-    if (aResponseLength <= 0)
-        return ERROR_HTTP_RESPONSE_INVALID_LENGTH;
-
-    if (GetHeader ().rfind (CRLF2) == std::string::npos)
-    {
-        aEndOfHeader = strstr (aHttpResponse, CRLF2);
-        if (aEndOfHeader == NULL)
-            return ERROR_HTTP_RESPONSE_INVALID_FORMAT;
-
-        aEndOfHeader += strlen (CRLF2);
-        aHeaderLength = aEndOfHeader - aHttpResponse;
-        aHeader.assign (aHttpResponse, aHeaderLength);
-
-        SetHeader (aHeader.c_str ());
-    }
-
-    aResult = SetContent (aHttpResponse + aHeaderLength, aResponseLength - aHeaderLength);
-    if (aResult)
-    {
-        aResult = ERROR_HTTP_RESPONSE_FAILED_TO_PARSE_CONTENT;
-    }
-    /*----------------------------------------------------------------*/
-
-    return aResult;
-}
-
-void
-CRXHttpResponse::SetHeader (const char * aHttpMessage)
-{
-    /*----------------------------------------------------------------*/
-    SetMessage (aHttpMessage);
+    Set (aHeader);
     /*----------------------------------------------------------------*/
 }
@@ -104 +55 @@
     /*----------------------------------------------------------------*/
 
-    return GetMessage ();
+    return Get ();
 }
 
@@ -164 +115 @@
                              const int  aLength)
 {
-    int     aResult = 0;
-
-    char    * aReallocPtr = NULL;
+    int     aResult = 0;
+    int     aSize   = 0;
+    char    * aChunkedPtr = NULL;
 
     /*----------------------------------------------------------------*/
-    if (!mIsChunked)
+    /*----------------------------------------------------------------
+     * 1. check parameter
+     *----------------------------------------------------------------*/
+    if (aLength < 0)
+        return ERROR_HTTP_RESPONSE_INVALID_LENGTH;
+
+    /*----------------------------------------------------------------
+     * 2. check content size when is NOT chunked-encoding
+     *----------------------------------------------------------------*/
+    if (!mIsChunked && mContent.size () >= mContentLength)
+        return 0;
+
+    /*----------------------------------------------------------------
+     * 3. resize memory and copy
+     *----------------------------------------------------------------*/
+    aSize = mContent.size ();
+    mContent.resize (aSize + aLength);
+    memcpy (mContent.begin ()._Myptr + aSize, aContent, aLength);
+
+    /*----------------------------------------------------------------
+     * 4. 
+     *----------------------------------------------------------------*/
+    aResult = mContent.size ();
+    if (mIsChunked)
     {
-        if (mContentLength <= mContent.mLength)
-            return aResult;
-
-        if (mContent.mBody == NULL)
+        mContentLength += aLength;
+        aSize = mContent.size ();
+        if ((unsigned int)aSize > strlen (CRLF) + strlen (CRLF2))
         {
-            mContent.mBody = static_cast<char *> (calloc (mContentLength, 1));
-            if (mContent.mBody == NULL)
+            aChunkedPtr = mContent.begin ()._Myptr + aSize - strlen (CRLF2);
+            if (!strncmp (aChunkedPtr, CRLF2, strlen (CRLF2)))
             {
-                return ERROR_HTTP_RESPONSE_FAILED_TO_MEMORY_ALLOCATION;
+                for ( ; strncmp (aChunkedPtr--, CRLF, strlen (CRLF)) ; );
+                aResult = strtol (aChunkedPtr, NULL, 16);
             }
         }
     }
-    else
-    {
-        mContentLength += aLength;
-        aReallocPtr = static_cast<char *> (realloc (mContent.mBody, mContentLength));
-        if (aReallocPtr == NULL)
-        {
-            return ERROR_HTTP_RESPONSE_FAILED_TO_MEMORY_ALLOCATION;
-        }
-        mContent.mBody = aReallocPtr;
-    }
-
-    memcpy (mContent.mBody + mContent.mLength, aContent, aLength);
-    mContent.mLength += aLength;
     /*----------------------------------------------------------------*/
 
@@ -201 +162 @@
 }
 
-int             CRXHttpResponse::GetStatusCode      (void) const { return mStatusCode; }
-bool            CRXHttpResponse::IsChunked          (void) const { return mIsChunked; }
-int             CRXHttpResponse::GetContentLength   (void) const { return mContentLength; }
-const char *    CRXHttpResponse::GetContentBody     (void) const { return mContent.mBody; }
+int
+CRXHttpResponse::GetStatusCode (void) const
+{
+    /*----------------------------------------------------------------*/
+    /*----------------------------------------------------------------*/
+
+    return mStatusCode;
+}
+
+bool
+CRXHttpResponse::IsChunked (void) const
+{
+    /*----------------------------------------------------------------*/
+    /*----------------------------------------------------------------*/
+
+    return mIsChunked;
+}
+
+int
+CRXHttpResponse::GetContentLength (void) const
+{
+    /*----------------------------------------------------------------*/
+    /*----------------------------------------------------------------*/
+
+    return mContentLength;
+}
+
+const char *
+CRXHttpResponse::GetContentBody (void) const
+{
+    /*----------------------------------------------------------------*/
+    /*----------------------------------------------------------------*/
+
+    return mContent.empty () ? "" : &mContent[0];
+}