Changeset 73922 in vbox for trunk

Timestamp:

Aug 28, 2018 7:30:28 AM (6 years ago)

Author:

vboxsync

Message:

iprt/rest: Added error info, copy of http status, and content type to RTCRestClientResponseBase. bugref:9167

Location:

trunk

Files:

• include/iprt/cpp/restbase.h (modified) (1 diff)
• src/VBox/Runtime/common/rest/RTCRestClientResponseBase.cpp (modified) (6 diffs)

trunk/include/iprt/cpp/restbase.h

@@ -701 +701 @@
     int getStatus() { return m_rcStatus; }
 
+    /**
+     * Getter for m_rcHttp.
+     * @returns HTTP status code or VERR_NOT_AVAILABLE.
+     */
+    int getHttpStatus() { return m_rcHttp; }
+
 protected:
     /** Negative numbers are IPRT errors, positive are HTTP status codes. */
     int m_rcStatus;
+    /** The HTTP status code, VERR_NOT_AVAILABLE if not set. */
+    int m_rcHttp;
+    /** Error information. */
+    PRTERRINFO m_pErrInfo;
+    /** The value of the Content-Type header field. */
+    RTCString m_strContentType;
+
+    PRTERRINFO  allocErrInfo(void);
+    void        deleteErrInfo(void);
+    void        copyErrInfo(PCRTERRINFO pErrInfo);
 
     /**

trunk/src/VBox/Runtime/common/rest/RTCRestClientResponseBase.cpp

@@ -40 +40 @@
 RTCRestClientResponseBase::RTCRestClientResponseBase()
     : m_rcStatus(VERR_WRONG_ORDER)
+    , m_rcHttp(VERR_NOT_AVAILABLE)
+    , m_pErrInfo(NULL)
 {
 }
@@ -49 +51 @@
 RTCRestClientResponseBase::~RTCRestClientResponseBase()
 {
-    /* nothing to do here */
+    deleteErrInfo();
 }
 
@@ -58 +60 @@
 RTCRestClientResponseBase::RTCRestClientResponseBase(RTCRestClientResponseBase const &a_rThat)
     : m_rcStatus(a_rThat.m_rcStatus)
-{
+    , m_rcHttp(a_rThat.m_rcHttp)
+    , m_strContentType(a_rThat.m_strContentType)
+    , m_pErrInfo(NULL)
+{
+    if (m_pErrInfo)
+        copyErrInfo(m_pErrInfo);
 }
 
@@ -67 +74 @@
 RTCRestClientResponseBase &RTCRestClientResponseBase::operator=(RTCRestClientResponseBase const &a_rThat)
 {
-    m_rcStatus = a_rThat.m_rcStatus;
+    m_rcStatus       = a_rThat.m_rcStatus;
+    m_rcHttp         = a_rThat.m_rcHttp;
+    m_strContentType = a_rThat.m_strContentType;
+    if (a_rThat.m_pErrInfo)
+        copyErrInfo(a_rThat.m_pErrInfo);
+    else if (m_pErrInfo)
+        deleteErrInfo();
+
     return *this;
 }
@@ -83 +97 @@
     RT_NOREF_PV(a_hHttp);
     m_rcStatus = a_rcStatus;
+    if (a_rcStatus >= 0)
+        m_rcHttp = a_rcStatus;
 }
 
@@ -88 +104 @@
 void RTCRestClientResponseBase::consumeHeaders(const char *a_pchData, size_t a_cbData)
 {
+    /*
+     * Get the the content type.
+     */
+    int rc = extractHeaderFromBlob(RT_STR_TUPLE("Content-Type"), a_pchData, a_cbData, &m_strContentType);
+    if (rc == VERR_NOT_FOUND)
+        rc = VINF_SUCCESS;
+    AssertRCReturnVoidStmt(rc, m_rcStatus = rc);
+}
+
+
+void RTCRestClientResponseBase::consumeBody(const char *a_pchData, size_t a_cbData)
+{
     RT_NOREF(a_pchData, a_cbData);
 }
 
 
-void RTCRestClientResponseBase::consumeBody(const char *a_pchData, size_t a_cbData)
-{
-    RT_NOREF(a_pchData, a_cbData);
-}
-
-
 void RTCRestClientResponseBase::receiveFinal()
 {
+}
+
+
+PRTERRINFO RTCRestClientResponseBase::allocErrInfo(void)
+{
+    size_t cbMsg = _4K;
+    m_pErrInfo = (PRTERRINFO)RTMemAllocZ(sizeof(*m_pErrInfo) + cbMsg);
+    if (m_pErrInfo)
+        return RTErrInfoInit(m_pErrInfo, (char *)(m_pErrInfo + 1), cbMsg);
+    return NULL;
+}
+
+
+void RTCRestClientResponseBase::deleteErrInfo(void)
+{
+    if (m_pErrInfo)
+    {
+        RTMemFree(m_pErrInfo);
+        m_pErrInfo = NULL;
+    }
+}
+
+
+void RTCRestClientResponseBase::copyErrInfo(PCRTERRINFO pErrInfo)
+{
+    deleteErrInfo();
+    m_pErrInfo = (PRTERRINFO)RTMemDup(pErrInfo, pErrInfo->cbMsg + sizeof(*pErrInfo));
+    if (m_pErrInfo)
+    {
+        m_pErrInfo->pszMsg = (char *)(m_pErrInfo + 1);
+        m_pErrInfo->apvReserved[0] = NULL;
+        m_pErrInfo->apvReserved[1] = NULL;
+    }
 }