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

Timestamp:

Jun 17, 2014 3:58:40 PM (11 years ago)

Author:

vboxsync

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

94391

Message:

introduced RTHttpGetBinary(), renamed RTHttpGet() to RTHttpGetText()

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/http.cpp (modified) (4 diffs)
• testcase/tstRTHttp.cpp (modified) (4 diffs)

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

@@ -66 +66 @@
 typedef struct RTHTTPMEMCHUNK
 {
-    char *pszMem;
+    uint8_t *pu8Mem;
     size_t cb;
 } RTHTTPMEMCHUNK;
@@ -146 +146 @@
     size_t cbAll = cb * n;
 
-    pMem->pszMem = (char*)RTMemRealloc(pMem->pszMem, pMem->cb + cbAll + 1);
-    if (pMem->pszMem)
-    {
-        memcpy(&pMem->pszMem[pMem->cb], pvBuf, cbAll);
+    pMem->pu8Mem = (uint8_t*)RTMemRealloc(pMem->pu8Mem, pMem->cb + cbAll + 1);
+    if (pMem->pu8Mem)
+    {
+        memcpy(&pMem->pu8Mem[pMem->cb], pvBuf, cbAll);
         pMem->cb += cbAll;
-        pMem->pszMem[pMem->cb] = '\0';
+        pMem->pu8Mem[pMem->cb] = '\0';
     }
     return cbAll;
@@ -414 +414 @@
 }
 
-RTR3DECL(int) RTHttpGet(RTHTTP hHttp, const char *pcszUrl, char **ppszResponse)
+RTR3DECL(int) rtHttpGet(RTHTTP hHttp, const char *pcszUrl, uint8_t **ppvResponse, size_t *pcb)
 {
     PRTHTTPINTERNAL pHttpInt = hHttp;
@@ -460 +460 @@
     rcCurl = curl_easy_perform(pHttpInt->pCurl);
     int rc = rtHttpGetCalcStatus(pHttpInt, rcCurl);
-    *ppszResponse = chunk.pszMem;
+    *ppvResponse = chunk.pu8Mem;
+    *pcb = chunk.cb;
 
     return rc;
+}
+
+
+RTR3DECL(int) RTHttpGetText(RTHTTP hHttp, const char *pcszUrl, char **ppszResponse)
+{
+    uint8_t *pv;
+    size_t cb;
+    int rc = rtHttpGet(hHttp, pcszUrl, &pv, &cb);
+    *ppszResponse = (char*)pv;
+    return rc;
+}
+
+
+RTR3DECL(int) RTHttpGetBinary(RTHTTP hHttp, const char *pcszUrl, void **ppvResponse, size_t *pcb)
+{
+    return rtHttpGet(hHttp, pcszUrl, (uint8_t**)ppvResponse, pcb);
 }
 

trunk/src/VBox/Runtime/testcase/tstRTHttp.cpp

@@ -74 +74 @@
     // using an intermediate cert which is signed by old root)
     if (RT_SUCCESS(rc))
-        rc = RTHttpGet(hHttp,
-                       "http://www.verisign.com/repository/roots/root-certificates/PCA-3G5.pem",
-                       &pszBuf);
+        rc = RTHttpGetText(hHttp,
+                           "http://www.verisign.com/repository/roots/root-certificates/PCA-3G5.pem",
+                           &pszBuf);
     if (RT_SUCCESS(rc) && pszBuf)
     {
@@ -146 +146 @@
     // fetch root CA certificate (old one, but still very widely used)
     if (RT_SUCCESS(rc))
-        rc = RTHttpGet(hHttp,
-                       "http://www.verisign.com/repository/roots/root-certificates/PCA-3.pem",
-                       &pszBuf);
+        rc = RTHttpGetText(hHttp,
+                           "http://www.verisign.com/repository/roots/root-certificates/PCA-3.pem",
+                           &pszBuf);
     if (RT_SUCCESS(rc) && pszBuf)
     {
@@ -227 +227 @@
 
     if (RT_SUCCESS(rc))
-        rc = RTHttpGet(hHttp,
-                       "https://update.virtualbox.org/query.php?platform=LINUX_32BITS_UBUNTU_12_04&version=4.1.18",
-                       &pszBuf);
+        rc = RTHttpGetText(hHttp,
+                           "https://update.virtualbox.org/query.php?platform=LINUX_32BITS_UBUNTU_12_04&version=4.1.18",
+                           &pszBuf);
 
     if (   RT_FAILURE(rc)
@@ -246 +246 @@
     }
 
+    void *u8Buf;
+    size_t cb;
+    rc = RTHttpGetBinary(hHttp,
+                         "http://www.verisign.com/support/roots.zip",
+                         &u8Buf, &cb);
+    if (RT_SUCCESS(rc) && u8Buf)
+    {
+        RTPrintf("Got file length %zd\n", cb);
+    }
+    else
+        RTPrintf("Error code %Rrc\n", rc);
+
     RTHttpDestroy(hHttp);