Changeset 87549 in vbox for trunk/src

Timestamp:

Feb 3, 2021 2:12:36 AM (4 years ago)

Author:

vboxsync

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

142576

Message:

NAT/Net: Plagiarize (but paraphrase) COM error reporting code from
VBoxManage. Don't assert we are passed an existing network, report
that we failed to find it.

File:

• trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp (modified) (4 diffs)

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -173 +173 @@
 
 private:
+    static void reportError(const char *a_pcszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
+
+    static HRESULT reportComError(ComPtr<IUnknown> iface,
+                                  const com::Utf8Str &strContext,
+                                  HRESULT hrc);
+    static void reportErrorInfoList(const com::ErrorInfo &info,
+                                    const com::Utf8Str &strContext);
+    static void reportErrorInfo(const com::ErrorInfo &info);
+
     void createRawSock4();
     void createRawSock6();
@@ -308 +317 @@
 int VBoxNetLwipNAT::init()
 {
+    HRESULT hrc;
+    int rc;
+
     LogFlowFuncEnter();
 
     /* virtualbox initialized in the superclass */
-    int rc = ::VBoxNetBaseService::init();
-    AssertRCReturn(rc, rc);
-
-    std::string networkName = getNetworkName();
-    rc = findNatNetwork(virtualbox, networkName, m_net);
-    AssertRCReturn(rc, rc);
+    rc = VBoxNetBaseService::init();
+    if (RT_FAILURE(rc))
+        return rc;
+
+    const std::string &networkName = getNetworkName();
+    hrc = virtualbox->FindNATNetworkByName(com::Bstr(networkName.c_str()).raw(),
+                                           m_net.asOutParam());
+    if (FAILED(hrc))
+    {
+        reportComError(virtualbox, "FindNATNetworkByName", hrc);
+        return VERR_NOT_FOUND;
+    }
+
 
     {
@@ -329 +348 @@
     // resolver changes are reported on vbox but are retrieved from
     // host so stash a pointer for future lookups
-    HRESULT hrc = virtualbox->COMGETTER(Host)(m_host.asOutParam());
+    hrc = virtualbox->COMGETTER(Host)(m_host.asOutParam());
     AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
 
@@ -1315 +1334 @@
 
 
+/* static */
+HRESULT VBoxNetLwipNAT::reportComError(ComPtr<IUnknown> iface,
+                                       const com::Utf8Str &strContext,
+                                       HRESULT hrc)
+{
+    const com::ErrorInfo info(iface, COM_IIDOF(IUnknown));
+    if (info.isFullAvailable() || info.isBasicAvailable())
+    {
+        reportErrorInfoList(info, strContext);
+    }
+    else
+    {
+        if (strContext.isNotEmpty())
+            reportError("%s: %Rhra", strContext.c_str(), hrc);
+        else
+            reportError("%Rhra", hrc);
+    }
+
+    return hrc;
+}
+
+
+/* static */
+void VBoxNetLwipNAT::reportErrorInfoList(const com::ErrorInfo &info,
+                                         const com::Utf8Str &strContext)
+{
+    if (strContext.isNotEmpty())
+        reportError("%s", strContext.c_str());
+
+    bool fFirst = true;
+    for (const com::ErrorInfo *pInfo = &info;
+         pInfo != NULL;
+         pInfo = pInfo->getNext())
+    {
+        if (fFirst)
+            fFirst = false;
+        else
+            reportError("--------");
+
+        reportErrorInfo(*pInfo);
+    }
+}
+
+
+/* static */
+void VBoxNetLwipNAT::reportErrorInfo(const com::ErrorInfo &info)
+{
+#if defined (RT_OS_WIN)
+    bool haveResultCode = info.isFullAvailable();
+    bool haveComponent = true;
+    bool haveInterfaceID = true;
+#else /* !RT_OS_WIN */
+    bool haveResultCode = true;
+    bool haveComponent = info.isFullAvailable();
+    bool haveInterfaceID = info.isFullAvailable();
+#endif
+    com::Utf8Str message;
+    if (info.getText().isNotEmpty())
+        message = info.getText();
+
+    const char *pcszDetails = "Details: ";
+    const char *pcszComma = ", ";
+    const char *pcszSeparator = pcszDetails;
+
+    if (haveResultCode)
+    {
+        message.appendPrintf("%s" "code %Rhrc (0x%RX32)",
+            pcszSeparator, info.getResultCode(), info.getResultCode());
+        pcszSeparator = pcszComma;
+    }
+
+    if (haveComponent)
+    {
+        message.appendPrintf("%s" "component %ls",
+            pcszSeparator, info.getComponent().raw());
+        pcszSeparator = pcszComma;
+    }
+
+    if (haveInterfaceID)
+    {
+        message.appendPrintf("%s" "interface %ls",
+            pcszSeparator, info.getInterfaceName().raw());
+        pcszSeparator = pcszComma;
+    }
+
+    if (info.getCalleeName().isNotEmpty())
+    {
+        message.appendPrintf("%s" "callee %ls",
+            pcszSeparator, info.getCalleeName().raw());
+        pcszSeparator = pcszComma;
+    }
+
+    reportError("%s", message.c_str());
+}
+
+
+/* static */
+void VBoxNetLwipNAT::reportError(const char *a_pcszFormat, ...)
+{
+    va_list ap;
+
+    va_start(ap, a_pcszFormat);
+    com::Utf8Str message(a_pcszFormat, ap);
+    va_end(ap);
+
+    RTMsgError("%s", message.c_str());
+    LogRel(("%s", message.c_str()));
+}
+
+
+
 /**
  * Create release logger.