Changeset 87399 in vbox

Timestamp:

Jan 23, 2021 1:17:40 AM (4 years ago)

Author:

vboxsync

Message:

NAT/Net: Collect port-forwarding functions in one place.

File:

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

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

@@ -192 +192 @@
     const char **getHostNameservers();
 
-    static int natServicePfRegister(NATSERVICEPORTFORWARDRULE& natServicePf);
-    static int natServiceProcessRegisteredPf(VECNATSERVICEPF& vecPf);
+    static int natServiceProcessRegisteredPf(VECNATSERVICEPF &vecPf);
+    static int natServicePfRegister(NATSERVICEPORTFORWARDRULE &natServicePf);
 
     /* input from intnet */
@@ -922 +922 @@
 
 
-/*static*/ int VBoxNetLwipNAT::natServicePfRegister(NATSERVICEPORTFORWARDRULE& natPf)
-{
-    int lrc;
-
-    int sockFamily = (natPf.Pfr.fPfrIPv6 ? PF_INET6 : PF_INET);
-    int socketSpec;
-    switch(natPf.Pfr.iPfrProto)
-    {
-        case IPPROTO_TCP:
-            socketSpec = SOCK_STREAM;
-            break;
-        case IPPROTO_UDP:
-            socketSpec = SOCK_DGRAM;
-            break;
-        default:
-            return VERR_IGNORED;
-    }
-
-    const char *pszHostAddr = natPf.Pfr.szPfrHostAddr;
-    if (pszHostAddr[0] == '\0')
-    {
-        if (sockFamily == PF_INET)
-            pszHostAddr = "0.0.0.0";
-        else
-            pszHostAddr = "::";
-    }
-
-    lrc = fwspec_set(&natPf.FWSpec,
-                     sockFamily,
-                     socketSpec,
-                     pszHostAddr,
-                     natPf.Pfr.u16PfrHostPort,
-                     natPf.Pfr.szPfrGuestAddr,
-                     natPf.Pfr.u16PfrGuestPort);
-    if (lrc != 0)
-        return VERR_IGNORED;
-
-    fwspec *pFwCopy = (fwspec *)RTMemDup(&natPf.FWSpec, sizeof(natPf.FWSpec));
-    if (pFwCopy)
-    {
-        lrc = portfwd_rule_add(pFwCopy);
-        if (lrc == 0)
-            return VINF_SUCCESS; /* (pFwCopy is owned by lwip thread now.) */
-        RTMemFree(pFwCopy);
-    }
+static int fetchNatPortForwardRules(const ComNatPtr& nat, bool fIsIPv6, VECNATSERVICEPF& vec)
+{
+    HRESULT hrc;
+    com::SafeArray<BSTR> rules;
+    if (fIsIPv6)
+        hrc = nat->COMGETTER(PortForwardRules6)(ComSafeArrayAsOutParam(rules));
     else
-        LogRel(("Unable to allocate memory for %s rule \"%s\"\n",
-                natPf.Pfr.fPfrIPv6 ? "IPv6" : "IPv4",
-                natPf.Pfr.szPfrName));
-    return VERR_IGNORED;
-}
-
-
-/*static*/ int VBoxNetLwipNAT::natServiceProcessRegisteredPf(VECNATSERVICEPF& vecRules)
+        hrc = nat->COMGETTER(PortForwardRules4)(ComSafeArrayAsOutParam(rules));
+    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+    NATSERVICEPORTFORWARDRULE Rule;
+    for (size_t idxRules = 0; idxRules < rules.size(); ++idxRules)
+    {
+        Log(("%d-%s rule: %ls\n", idxRules, (fIsIPv6 ? "IPv6" : "IPv4"), rules[idxRules]));
+        RT_ZERO(Rule);
+
+        int rc = netPfStrToPf(com::Utf8Str(rules[idxRules]).c_str(), fIsIPv6,
+                              &Rule.Pfr);
+        if (RT_FAILURE(rc))
+            continue;
+
+        vec.push_back(Rule);
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+/* static */
+int VBoxNetLwipNAT::natServiceProcessRegisteredPf(VECNATSERVICEPF& vecRules)
 {
     ITERATORNATSERVICEPF it;
@@ -1001 +977 @@
 
     return VINF_SUCCESS;
+}
+
+
+/* static */
+int VBoxNetLwipNAT::natServicePfRegister(NATSERVICEPORTFORWARDRULE &natPf)
+{
+    int lrc;
+
+    int sockFamily = (natPf.Pfr.fPfrIPv6 ? PF_INET6 : PF_INET);
+    int socketSpec;
+    switch(natPf.Pfr.iPfrProto)
+    {
+        case IPPROTO_TCP:
+            socketSpec = SOCK_STREAM;
+            break;
+        case IPPROTO_UDP:
+            socketSpec = SOCK_DGRAM;
+            break;
+        default:
+            return VERR_IGNORED;
+    }
+
+    const char *pszHostAddr = natPf.Pfr.szPfrHostAddr;
+    if (pszHostAddr[0] == '\0')
+    {
+        if (sockFamily == PF_INET)
+            pszHostAddr = "0.0.0.0";
+        else
+            pszHostAddr = "::";
+    }
+
+    lrc = fwspec_set(&natPf.FWSpec,
+                     sockFamily,
+                     socketSpec,
+                     pszHostAddr,
+                     natPf.Pfr.u16PfrHostPort,
+                     natPf.Pfr.szPfrGuestAddr,
+                     natPf.Pfr.u16PfrGuestPort);
+    if (lrc != 0)
+        return VERR_IGNORED;
+
+    fwspec *pFwCopy = (fwspec *)RTMemDup(&natPf.FWSpec, sizeof(natPf.FWSpec));
+    if (pFwCopy)
+    {
+        lrc = portfwd_rule_add(pFwCopy);
+        if (lrc == 0)
+            return VINF_SUCCESS; /* (pFwCopy is owned by lwip thread now.) */
+        RTMemFree(pFwCopy);
+    }
+    else
+        LogRel(("Unable to allocate memory for %s rule \"%s\"\n",
+                natPf.Pfr.fPfrIPv6 ? "IPv6" : "IPv4",
+                natPf.Pfr.szPfrName));
+    return VERR_IGNORED;
 }
 
@@ -1434 +1464 @@
 
 
-static int fetchNatPortForwardRules(const ComNatPtr& nat, bool fIsIPv6, VECNATSERVICEPF& vec)
-{
-    HRESULT hrc;
-    com::SafeArray<BSTR> rules;
-    if (fIsIPv6)
-        hrc = nat->COMGETTER(PortForwardRules6)(ComSafeArrayAsOutParam(rules));
-    else
-        hrc = nat->COMGETTER(PortForwardRules4)(ComSafeArrayAsOutParam(rules));
-    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
-
-    NATSERVICEPORTFORWARDRULE Rule;
-    for (size_t idxRules = 0; idxRules < rules.size(); ++idxRules)
-    {
-        Log(("%d-%s rule: %ls\n", idxRules, (fIsIPv6 ? "IPv6" : "IPv4"), rules[idxRules]));
-        RT_ZERO(Rule);
-
-        int rc = netPfStrToPf(com::Utf8Str(rules[idxRules]).c_str(), fIsIPv6,
-                              &Rule.Pfr);
-        if (RT_FAILURE(rc))
-            continue;
-
-        vec.push_back(Rule);
-    }
-
-    return VINF_SUCCESS;
-}
-
-
 #ifndef VBOX_WITH_HARDENING