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

Timestamp:

Feb 3, 2021 11:28:21 PM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: Create network's own release log file only after we have
verified the network of that name actually exists. bugref:9929.

File:

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

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

@@ -162 +162 @@
     virtual ~VBoxNetLwipNAT();
 
-    static int logInit(int argc, char **argv);
-
     virtual void usage() { /** @todo should be implemented */ };
     virtual int parseOpt(int c, const RTGETOPTUNION &Value);
@@ -173 +171 @@
 
 private:
+    int logInit();
+
     static void reportError(const char *a_pcszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 
@@ -327 +327 @@
         return rc;
 
+    /*
+     * We get the network name on the command line.  Get hold of our
+     * API object.
+     */
     const std::string &networkName = getNetworkName();
     hrc = virtualbox->FindNATNetworkByName(com::Bstr(networkName.c_str()).raw(),
@@ -335 +339 @@
         return VERR_NOT_FOUND;
     }
+
+    /*
+     * Now that we know the network name we can create the release log file.
+     */
+    logInit();
 
 
@@ -1455 +1464 @@
  */
 /* static */
-int VBoxNetLwipNAT::logInit(int argc, char **argv)
+int VBoxNetLwipNAT::logInit()
 {
     size_t cch;
@@ -1471 +1480 @@
         return rc;
 
-    const char *pcszNetwork = NULL;
-
-    // XXX: This duplicates information from VBoxNetBaseService.cpp.
-    // Perhaps option definitions should be exported as public static
-    // member of VBoxNetBaseService?
-    static const RTGETOPTDEF s_aOptions[] = {
-        { "--network", 'n', RTGETOPT_REQ_STRING }
-    };
-
-    RTGETOPTSTATE GetState;
-    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1,
-                 RTGETOPTINIT_FLAGS_NO_STD_OPTS);
-
-    RTGETOPTUNION ValueUnion;
-    int ch;
-    while ((ch = RTGetOpt(&GetState, &ValueUnion)))
-    {
-        if (ch == 'n')
-        {
-            pcszNetwork = ValueUnion.psz;
-            break;
-        }
-    }
-
-    if (pcszNetwork == NULL)
+    const std::string &strNetworkName = getNetworkName();
+    if (strNetworkName.empty())
         return VERR_MISSING;
 
     char szNetwork[RTPATH_MAX];
-    rc = RTStrCopy(szNetwork, sizeof(szNetwork), pcszNetwork);
+    rc = RTStrCopy(szNetwork, sizeof(szNetwork), strNetworkName.c_str());
     if (RT_FAILURE(rc))
         return rc;
@@ -1596 +1582 @@
 #endif
 
-    VBoxNetLwipNAT::logInit(argc, argv);
-
     hrc = com::Initialize();
     if (FAILED(hrc))