Changeset 33864 in vbox

Timestamp:

Nov 8, 2010 5:09:31 PM (14 years ago)

Author:

vboxsync

Message:

Main,NAT: Don't bother NAT back-end with rule name.

Location:

trunk

Files:

• include/VBox/pdmnetifs.h (modified) (1 diff)
• src/VBox/Devices/Network/DrvNAT.cpp (modified) (2 diffs)
• src/VBox/Main/ConsoleImpl.cpp (modified) (1 diff)

trunk/include/VBox/pdmnetifs.h

@@ -413 +413 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnRedirectRuleCommand ,(PDMINETWORKNATCONFIG *pInterface, bool fRemove, 
-                                                   const char *pNatRuleName, bool fUdp, const char *pHostIp,
-                                                   uint16_t u16HostPort, const char *pGuestIp, uint16_t u16GuestPort));
+                                                       bool fUdp, const char *pHostIp, uint16_t u16HostPort, 
+                                                       const char *pGuestIp, uint16_t u16GuestPort));
 
 } PDMINETWORKNATCONFIG, *PPDMINETWORKNATCONFIG;

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -649 +649 @@
 
 static void drvNATNotifyApplyPortForwardCommand(PDRVNAT pThis, bool fRemove,
-                                                const char *pNatRuleName, bool fUdp, const char *pHostIp,
+                                                bool fUdp, const char *pHostIp,
                                                 uint16_t u16HostPort, const char *pGuestIp, uint16_t u16GuestPort)
 {
@@ -674 +674 @@
 
 DECLCALLBACK(int) drvNATNetworkNatConfig_RedirectRuleCommand(PPDMINETWORKNATCONFIG pInterface, bool fRemove, 
-                                                   const char *pNatRuleName, bool fUdp, const char *pHostIp,
-                                                   uint16_t u16HostPort, const char *pGuestIp, uint16_t u16GuestPort)
-{
-    LogFlow(("drvNATNetworkNatConfig_ApplyNatCommand: cRules=%s\n", (pNatRuleName ? pNatRuleName: "")));
+                                                             bool fUdp, const char *pHostIp,
+                                                             uint16_t u16HostPort, const char *pGuestIp, uint16_t u16GuestPort)
+{
+    LogFlow(("drvNATNetworkNatConfig_ApplyNatCommand: \n", (pNatRuleName ? pNatRuleName: "")));
     PDRVNAT pThis = RT_FROM_MEMBER(pInterface, DRVNAT, INetworkNATCfg);
     PRTREQ pReq;
     int rc = RTReqCallEx(pThis->pSlirpReqQueue, &pReq, 0 /*cMillies*/, RTREQFLAGS_VOID,
-                         (PFNRT)drvNATNotifyApplyPortForwardCommand, 8, pThis, fRemove,
-                          pNatRuleName, fUdp, pHostIp, u16HostPort, pGuestIp, u16GuestPort);
+                         (PFNRT)drvNATNotifyApplyPortForwardCommand, 7, pThis, fRemove,
+                         fUdp, pHostIp, u16HostPort, pGuestIp, u16GuestPort);
     if (RT_LIKELY(rc == VERR_TIMEOUT))
     {

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3567 +3567 @@
             goto done;
         bool fUdp = (aProto == NATProtocol_UDP);
-        vrc = pNetNatCfg->pfnRedirectRuleCommand(pNetNatCfg, aNatRuleRemove, Utf8Str(aRuleName).c_str(), fUdp,
+        vrc = pNetNatCfg->pfnRedirectRuleCommand(pNetNatCfg, aNatRuleRemove, fUdp,
                                                  Utf8Str(aHostIp).c_str(), aHostPort, Utf8Str(aGuestIp).c_str(),
                                                  aGuestPort);