Changeset 50488 in vbox

Timestamp:

Feb 18, 2014 1:30:46 AM (11 years ago)

Author:

vboxsync

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

92329

Message:

Massage release logging for port-forwarding a bit. Log rules on startup.

File:

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

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

@@ -283 +283 @@
 
                 default:
-                    LogRel(("Event: %s %s rule \"%s\": unknown protocol %d\n",
+                    LogRel(("Event: %s %s port-forwarding rule \"%s\":"
+                            " invalid protocol %d\n",
                             fCreateFW ? "Add" : "Remove",
                             fIPv6FW ? "IPv6" : "IPv4",
@@ -291 +292 @@
             }
 
-            LogRel(("Event: %s %s rule \"%s\": %s %s%s%s:%d -> %s%s%s:%d\n",
+            LogRel(("Event: %s %s port-forwarding rule \"%s\":"
+                    " %s %s%s%s:%d -> %s%s%s:%d\n",
                     fCreateFW ? "Add" : "Remove",
                     fIPv6FW ? "IPv6" : "IPv4",
@@ -704 +706 @@
     RTCMemAutoPtr<fwspec> pFwCopy;
     if (RT_UNLIKELY(!pFwCopy.alloc()))
+    {
+        LogRel(("Unable to allocate memory for %s rule \"%s\"\n",
+                natPf.Pfr.fPfrIPv6 ? "IPv6" : "IPv4",
+                natPf.Pfr.szPfrName));
         return VERR_IGNORED;
+    }
 
     memcpy(pFwCopy.get(), &natPf.FWSpec, sizeof(natPf.FWSpec));
@@ -717 +724 @@
 
 
-int VBoxNetLwipNAT::natServiceProcessRegisteredPf(VECNATSERVICEPF& vecRules){
+int VBoxNetLwipNAT::natServiceProcessRegisteredPf(VECNATSERVICEPF& vecRules)
+{
     ITERATORNATSERVICEPF it;
-    for (it = vecRules.begin();
-         it != vecRules.end(); ++it)
-    {
-        int rc = natServicePfRegister((*it));
-        if (RT_FAILURE(rc))
-        {
-            LogRel(("PF: %s is ignored\n", (*it).Pfr.szPfrName));
-            continue;
-        }
-    }
+    for (it = vecRules.begin(); it != vecRules.end(); ++it)
+    {
+        NATSEVICEPORTFORWARDRULE &natPf = *it;
+
+        LogRel(("Loading %s port-forwarding rule \"%s\": %s %s%s%s:%d -> %s%s%s:%d\n",
+                natPf.Pfr.fPfrIPv6 ? "IPv6" : "IPv4",
+                natPf.Pfr.szPfrName,
+                natPf.Pfr.iPfrProto == IPPROTO_TCP ? "TCP" : "UDP",
+                /* from */
+                natPf.Pfr.fPfrIPv6 ? "[" : "",
+                natPf.Pfr.szPfrHostAddr,
+                natPf.Pfr.fPfrIPv6 ? "]" : "",
+                natPf.Pfr.u16PfrHostPort,
+                /* to */
+                natPf.Pfr.fPfrIPv6 ? "[" : "",
+                natPf.Pfr.szPfrGuestAddr,
+                natPf.Pfr.fPfrIPv6 ? "]" : "",
+                natPf.Pfr.u16PfrGuestPort));
+
+        natServicePfRegister(natPf);
+    }
+
     return VINF_SUCCESS;
 }