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

Timestamp:

Jan 23, 2021 12:02:01 AM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: Insertion-sort VBoxNetLwipNAT::parseOpt() where it belongs.

File:

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

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

@@ -175 +175 @@
     static int logInit(int argc, char **argv);
 
-    void usage(){                /** @todo should be implemented */ };
+    virtual void usage() { /** @todo should be implemented */ };
+    virtual int parseOpt(int rc, const RTGETOPTUNION& getOptVal);
+
     int run();
     virtual int init(void);
-    virtual int parseOpt(int rc, const RTGETOPTUNION& getOptVal);
     /* VBoxNetNAT always needs Main */
     virtual bool isMainNeeded() const { return true; }
@@ -273 +274 @@
         m_ProxyOptions.nameservers = NULL;
     }
+}
+
+
+/**
+ * Hook into the option processing.
+ *
+ * Called by VBoxNetBaseService::parseArgs() for options that are not
+ * recognized by the base class.
+ */
+int VBoxNetLwipNAT::parseOpt(int rc, const RTGETOPTUNION& Val)
+{
+    switch (rc)
+    {
+        case 'p':
+        case 'P':
+        {
+            NATSERVICEPORTFORWARDRULE Rule;
+            VECNATSERVICEPF& rules = (rc == 'P'?
+                                        m_vecPortForwardRule6
+                                      : m_vecPortForwardRule4);
+
+            fDontLoadRulesOnStartup = true;
+
+            RT_ZERO(Rule);
+
+            int rc2 = netPfStrToPf(Val.psz, (rc == 'P'), &Rule.Pfr);
+            RT_NOREF_PV(rc2);
+            rules.push_back(Rule);
+            return VINF_SUCCESS;
+        }
+        default:;
+    }
+    return VERR_NOT_FOUND;
 }
 
@@ -1004 +1038 @@
 
 
-int VBoxNetLwipNAT::parseOpt(int rc, const RTGETOPTUNION& Val)
-{
-    switch (rc)
-    {
-        case 'p':
-        case 'P':
-        {
-            NATSERVICEPORTFORWARDRULE Rule;
-            VECNATSERVICEPF& rules = (rc == 'P'?
-                                        m_vecPortForwardRule6
-                                      : m_vecPortForwardRule4);
-
-            fDontLoadRulesOnStartup = true;
-
-            RT_ZERO(Rule);
-
-            int rc2 = netPfStrToPf(Val.psz, (rc == 'P'), &Rule.Pfr);
-            RT_NOREF_PV(rc2);
-            rules.push_back(Rule);
-            return VINF_SUCCESS;
-        }
-        default:;
-    }
-    return VERR_NOT_FOUND;
-}
-
-
 int VBoxNetLwipNAT::processFrame(void *pvFrame, size_t cbFrame)
 {