Changeset 87598 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Feb 4, 2021 12:09:16 AM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: Ignore VBoxNetBaseService::init() and do COM init here with
better error reporting. The base class version is a bit naive and
fixing that would just create unnecessary churn for little immediate
gain, will do the refactoring later. While here make the check of
parseOpt() return code less confusing and LogRel() a "Terminating"
message before exiting to make it more clear in the release log that
the process has terminated orderly. bugref:9929.

File:

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

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

@@ -172 +172 @@
 private:
     int logInit();
+    int comInit();
 
     static void reportError(const char *a_pcszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
@@ -322 +323 @@
     LogFlowFuncEnter();
 
-    /* virtualbox initialized in the superclass */
-    rc = VBoxNetBaseService::init();
+    /* Get the COM API set up. */
+    rc = comInit();
     if (RT_FAILURE(rc))
         return rc;
 
     /*
-     * We get the network name on the command line.  Get hold of our
-     * API object.
+     * We get the network name on the command line.  Get hold of its
+     * API object to get the rest of the configuration from.
      */
     const std::string &networkName = getNetworkName();
@@ -341 +342 @@
 
     /*
-     * Now that we know the network name we can create the release log file.
+     * Now that we know the network name and have ensured that it
+     * indeed exists we can create the release log file.
      */
     logInit();
@@ -499 +501 @@
     LogFlowFuncLeaveRC(rc);
     return rc;
+}
+
+
+/**
+ * Primary COM initialization performed on the main thread.
+ *
+ * This initializes COM and obtains VirtualBox Client and VirtualBox
+ * objects.
+ *
+ * @note The member variables for them are in the base class.  We
+ * currently do it here so that we can report errors properly, because
+ * the base class' VBoxNetBaseService::init() is a bit naive and
+ * fixing that would just create unnecessary churn for little
+ * immediate gain.  It's easier to ignore the base class code and do
+ * it ourselves and do the refactoring later.
+ */
+int VBoxNetLwipNAT::comInit()
+{
+    HRESULT hrc;
+
+    hrc = com::Initialize();
+    if (FAILED(hrc))
+    {
+#ifdef VBOX_WITH_XPCOM
+        if (hrc == NS_ERROR_FILE_ACCESS_DENIED)
+        {
+            char szHome[RTPATH_MAX] = "";
+            int vrc = com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome), false);
+            if (RT_SUCCESS(vrc))
+            {
+                return RTMsgErrorExit(RTEXITCODE_INIT,
+                                      "Failed to initialize COM: %s: %Rhrf",
+                                      szHome, hrc);
+            }
+        }
+#endif  /* VBOX_WITH_XPCOM */
+        return RTMsgErrorExit(RTEXITCODE_INIT,
+                              "Failed to initialize COM: %Rhrf", hrc);
+    }
+
+    hrc = virtualboxClient.createInprocObject(CLSID_VirtualBoxClient);
+    if (FAILED(hrc))
+    {
+        reportError("Failed to create VirtualBox Client object: %Rhra", hrc);
+        return VERR_GENERAL_FAILURE;
+    }
+
+    hrc = virtualboxClient->COMGETTER(VirtualBox)(virtualbox.asOutParam());
+    if (FAILED(hrc))
+    {
+        reportError("Failed to obtain VirtualBox object: %Rhra", hrc);
+        return VERR_GENERAL_FAILURE;
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -1563 +1620 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
-    HRESULT hrc;
     int rc;
 
@@ -1582 +1638 @@
 #endif
 
-    hrc = com::Initialize();
-    if (FAILED(hrc))
-    {
-#ifdef VBOX_WITH_XPCOM
-        if (hrc == NS_ERROR_FILE_ACCESS_DENIED)
-        {
-            char szHome[RTPATH_MAX] = "";
-            int vrc = com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome), false);
-            if (RT_SUCCESS(vrc))
-            {
-                return RTMsgErrorExit(RTEXITCODE_INIT,
-                                      "Failed to initialize COM: %s: %Rhrf",
-                                      szHome, hrc);
-            }
-        }
-#endif  // VBOX_WITH_XPCOM
-        return RTMsgErrorExit(RTEXITCODE_INIT,
-                              "Failed to initialize COM: %Rhrf", hrc);
-    }
-
     VBoxNetLwipNAT NAT;
 
-    Log2(("NAT: initialization\n"));
-    rc = NAT.parseArgs(argc - 1, argv + 1);
-    rc = (rc == 0) ? VINF_SUCCESS : VERR_GENERAL_FAILURE; /* XXX: FIXME */
-
-    if (RT_SUCCESS(rc))
-        rc = NAT.init();
-
-    if (RT_SUCCESS(rc))
-        NAT.run();
-
+    int rcExit = NAT.parseArgs(argc - 1, argv + 1);
+    if (rcExit != RTEXITCODE_SUCCESS)
+        return rcExit;          /* messages are already printed */
+
+    rc = NAT.init();
+    if (RT_FAILURE(rc))
+        return RTEXITCODE_INIT;
+
+    NAT.run();
+
+    LogRel(("Terminating\n"));
     return RTEXITCODE_SUCCESS;
 }