Changeset 45454 in vbox for trunk/src/VBox/Runtime

Timestamp:

Apr 10, 2013 12:16:33 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84891

Message:

Runtime/http: added RTHttpAbort()

File:

• trunk/src/VBox/Runtime/common/misc/http.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/common/misc/http.cpp

@@ -47 +47 @@
 typedef struct RTHTTPINTERNAL
 {
+    /** magic value */
     uint32_t u32Magic;
+    /** cURL handle */
     CURL *pCurl;
     long lLastResp;
+    /** custom headers */
     struct curl_slist *pHeaders;
+    /** CA certificate for HTTPS authentication check */
     const char *pcszCAFile;
+    /** abort the current HTTP request if true */
+    bool fAbort;
 } RTHTTPINTERNAL;
 typedef RTHTTPINTERNAL *PRTHTTPINTERNAL;
@@ -129 +135 @@
 }
 
-static size_t rtHttpWriteData(void *pvBuf, size_t cb, size_t n, void *pvUser)
+static DECLCALLBACK(size_t) rtHttpWriteData(void *pvBuf, size_t cb, size_t n, void *pvUser)
 {
     PRTHTTPMEMCHUNK pMem = (PRTHTTPMEMCHUNK)pvUser;
@@ -142 +148 @@
     }
     return cbAll;
+}
+
+static DECLCALLBACK(int) rtHttpProgress(void *pData, double DlTotal, double DlNow,
+                                        double UlTotal, double UlNow)
+{
+    PRTHTTPINTERNAL pHttpInt = (PRTHTTPINTERNAL)pData;
+    AssertReturn(pHttpInt->u32Magic == RTHTTP_MAGIC, 1);
+
+    return pHttpInt->fAbort ? 1 : 0;
+}
+
+RTR3DECL(int) RTHttpAbort(RTHTTP hHttp)
+{
+    PRTHTTPINTERNAL pHttpInt = hHttp;
+    RTHTTP_VALID_RETURN(pHttpInt);
+
+    pHttpInt->fAbort = true;
+
+    return VINF_SUCCESS;
 }
 
@@ -278 +303 @@
     RTHTTP_VALID_RETURN(pHttpInt);
 
+    pHttpInt->fAbort = false;
+
     int rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_URL, pcszUrl);
     if (CURL_FAILED(rcCurl))
@@ -303 +330 @@
         return VERR_INTERNAL_ERROR;
     rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_WRITEDATA, (void*)&chunk);
+    if (CURL_FAILED(rcCurl))
+        return VERR_INTERNAL_ERROR;
+    rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_PROGRESSFUNCTION, &rtHttpProgress);
+    if (CURL_FAILED(rcCurl))
+        return VERR_INTERNAL_ERROR;
+    rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_PROGRESSDATA, (void*)pHttpInt);
+    if (CURL_FAILED(rcCurl))
+        return VERR_INTERNAL_ERROR;
+    rcCurl = curl_easy_setopt(pHttpInt->pCurl, CURLOPT_NOPROGRESS, (long)0);
     if (CURL_FAILED(rcCurl))
         return VERR_INTERNAL_ERROR;
@@ -356 +392 @@
                 rc = VERR_HTTP_CACERT_WRONG_FORMAT;
                 break;
+            case CURLE_ABORTED_BY_CALLBACK:
+                /* forcefully aborted */
+                rc = VERR_HTTP_ABORTED;
+                break;
             default:
                 break;