Changeset 87450 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Jan 27, 2021 2:00:34 AM (4 years ago)

Author:

vboxsync

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

142468

Message:

NAT/Net: Get rid of obsolete options -p/-P to pass port-forwarding
rules on the command line. It's a left-over from some very early test
code that just adds clutter. Leave the placeholders to add custom
options in place. Since there are no options, and arrays can't be
empty, use an array with a sentinel entry instead (and only the
sentinel for now).

While here fix VBoxNetBaseService::addCommandLineOption() - const and
pointer typedefs don't mean what they might seem to mean.

Location:

trunk/src/VBox/NetworkServices

Files:

• NAT/VBoxNetLwipNAT.cpp (modified) (8 diffs)
• NetLib/VBoxNetBaseService.cpp (modified) (3 diffs)
• NetLib/VBoxNetBaseService.h (modified) (1 diff)

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

@@ -113 +113 @@
 
 
-static RTGETOPTDEF g_aGetOptDef[] =
-{
-    { "--port-forward4",           'p',   RTGETOPT_REQ_STRING },
-    { "--port-forward6",           'P',   RTGETOPT_REQ_STRING }
-};
 
 typedef struct NATSERVICEPORTFORWARDRULE
@@ -156 +151 @@
     ComNatListenerPtr m_VBoxClientListener;
 
-    /* Only for debug needs, by default NAT service should load rules from SVC
-     * on startup, and then on sync them on events.
-     */
-    bool fDontLoadRulesOnStartup;
-
     VECNATSERVICEPF m_vecPortForwardRule4;
     VECNATSERVICEPF m_vecPortForwardRule6;
@@ -166 +156 @@
     static INTNETSEG aXmitSeg[64];
 
+    static RTGETOPTDEF s_aGetOptDef[];
 
 public:
@@ -174 +165 @@
 
     virtual void usage() { /** @todo should be implemented */ };
-    virtual int parseOpt(int rc, const RTGETOPTUNION& getOptVal);
+    virtual int parseOpt(int c, const RTGETOPTUNION &Value);
 
     virtual bool isMainNeeded() const { return true; }
@@ -207 +198 @@
 
 INTNETSEG VBoxNetLwipNAT::aXmitSeg[64];
+
+/**
+ * Additional command line options.
+ *
+ * Our parseOpt() will be called by the base class if any of these are
+ * supplied.
+ */
+RTGETOPTDEF VBoxNetLwipNAT::s_aGetOptDef[] =
+{
+    /*
+     * Currently there are no extra options and since arrays can't be
+     * empty use a sentinel entry instead, so that the placeholder
+     * code to process the options can be supplied nonetheless.
+     */
+    {}                          /* sentinel */
+};
 
 
@@ -251 +258 @@
     setIpv4Netmask(address);
 
-    fDontLoadRulesOnStartup = false;
-
-    for (size_t i = 0; i < RT_ELEMENTS(g_aGetOptDef); ++i)
-        addCommandLineOption(&g_aGetOptDef[i]);
+    /* tell the base class about our command line options */
+    for (PCRTGETOPTDEF pcOpt = &s_aGetOptDef[0]; pcOpt->iShort != 0; ++pcOpt)
+        addCommandLineOption(pcOpt);
 
     LogFlowFuncLeave();
@@ -285 +291 @@
  *
  * 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;
+ * recognized by the base class.  See s_aGetOptDef[].
+ */
+int VBoxNetLwipNAT::parseOpt(int c, const RTGETOPTUNION &Value)
+{
+    RT_NOREF(c, Value);
+    return VERR_NOT_FOUND;      /* not recognized */
 }
 
@@ -436 +422 @@
 
 
-    if (!fDontLoadRulesOnStartup)
-    {
-        fetchNatPortForwardRules(m_vecPortForwardRule4, /* :fIsIPv6 */ false);
+    fetchNatPortForwardRules(m_vecPortForwardRule4, /* :fIsIPv6 */ false);
+    if (fIPv6Enabled)
         fetchNatPortForwardRules(m_vecPortForwardRule6, /* :fIsIPv6 */ true);
-    }
 
     AddressToOffsetMapping tmp;

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -108 +108 @@
     PINTNETBUF          m_pIfBuf;       /**< Interface buffer. */
 
-    std::vector<PRTGETOPTDEF> m_vecOptionDefs;
+    std::vector<PCRTGETOPTDEF> m_vecOptionDefs;
 
     int32_t             m_cVerbosity;
@@ -682 +682 @@
 
 
-void VBoxNetBaseService::addCommandLineOption(const PRTGETOPTDEF optDef)
+void VBoxNetBaseService::addCommandLineOption(PCRTGETOPTDEF optDef)
 {
     m->m_vecOptionDefs.push_back(optDef);
@@ -843 +843 @@
     for (unsigned int i = 0; i < m->m_vecOptionDefs.size(); ++i)
     {
-        PRTGETOPTDEF pOpt = m->m_vecOptionDefs[i];
+        PCRTGETOPTDEF pOpt = m->m_vecOptionDefs[i];
         memcpy(&pOptArray[i], pOpt, sizeof(*pOpt));
     }

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h

@@ -115 +115 @@
     void setVerbosityLevel(int32_t);
 
-    void addCommandLineOption(const PRTGETOPTDEF);
+    void addCommandLineOption(PCRTGETOPTDEF);
 
     /**