Changeset 33825 in vbox for trunk/src/VBox/Main/NATEngineImpl.cpp

Timestamp:

Nov 8, 2010 10:16:25 AM (15 years ago)

Author:

vboxsync

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

67471

Message:

Main,NAT: Managing port-forwarding at runtime. (xTracker/#4835).

File:

• trunk/src/VBox/Main/NATEngineImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/NATEngineImpl.cpp

@@ -32 +32 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-NATEngine::NATEngine():mParent(NULL){}
+NATEngine::NATEngine():mParent(NULL), mAdapter(NULL){}
 NATEngine::~NATEngine(){}
 
@@ -40 +40 @@
 }
 
-HRESULT NATEngine::init(Machine *aParent)
+HRESULT NATEngine::init(Machine *aParent, INetworkAdapter *aAdapter)
 {
     AutoInitSpan autoInitSpan(this);
@@ -50 +50 @@
     mData->mBindIP.setNull();
     unconst(mParent) = aParent;
-    return S_OK;
-}
-
-HRESULT NATEngine::init(Machine *aParent, NATEngine *aThat)
+    unconst(mAdapter) = aAdapter;
+    return S_OK;
+}
+
+HRESULT NATEngine::init(Machine *aParent, INetworkAdapter *aAdapter, NATEngine *aThat)
 {
     AutoInitSpan autoInitSpan(this);
@@ -72 +73 @@
     }
     unconst(mParent) = aParent;
+    unconst(mAdapter) = aAdapter;
     unconst(mPeer) = aThat;
     autoInitSpan.setSucceeded();
@@ -77 +79 @@
 }
 
-HRESULT NATEngine::initCopy (Machine *aParent, NATEngine *aThat)
+HRESULT NATEngine::initCopy (Machine *aParent, INetworkAdapter *aAdapter, NATEngine *aThat)
 {
     AutoInitSpan autoInitSpan(this);
@@ -96 +98 @@
         mNATRules.insert(std::make_pair(it->first, it->second));
     }
+    unconst(mAdapter) = aAdapter;
     unconst(mParent) = aParent;
     autoInitSpan.setSucceeded();
@@ -265 +268 @@
     Utf8Str name = aName;
     settings::NATRule r;
+    const char *proto;
+    switch (aProto)
+    {
+        case NATProtocol_TCP:
+            proto = "tcp";
+            break;
+        case NATProtocol_UDP:
+            proto = "udp";
+            break;
+        default:
+            return E_INVALIDARG;
+    }
     if (name.isEmpty())
-    {
-        const char *proto;
-        switch (aProto)
-        {
-            case NATProtocol_TCP:
-                proto = "tcp";
-                break;
-            case NATProtocol_UDP:
-                proto = "udp";
-                break;
-            default:
-                return E_INVALIDARG;
-        }
         name = Utf8StrFmt("%s_%d_%d", proto, aHostPort, aGuestPort);
-    }
     r.strName = name.c_str();
     r.u32Proto = aProto;
@@ -290 +291 @@
     mParent->setModified(Machine::IsModified_NetworkAdapters);
     m_fModified = true;
+    alock.release();
+    mParent->onNATRedirectRuleChange(mAdapter, FALSE, Bstr(name).raw(), aProto, Bstr(r.strHostIP).raw(), r.u16HostPort, Bstr(r.strGuestIP).raw(), r.u16GuestPort);
     return S_OK;
 }
@@ -300 +303 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-    Utf8Str rule;
     NATRuleMap::iterator it = mNATRules.find(aName);
     if (it == mNATRules.end())
         return E_INVALIDARG;
     mData.backup();
+    settings::NATRule r = it->second;
+    Utf8Str strHostIP = r.strHostIP;
+    Utf8Str strGuestIP = r.strGuestIP;
+    NATProtocol_T proto = r.u32Proto;
+    uint16_t u16HostPort = r.u16HostPort;
+    uint16_t u16GuestPort = r.u16GuestPort;
+                                                    
     mNATRules.erase(it);
     mParent->setModified(Machine::IsModified_NetworkAdapters);
     m_fModified = true;
+    alock.release();
+    mParent->onNATRedirectRuleChange(mAdapter, TRUE, aName, proto, Bstr(strHostIP).raw(), u16HostPort, Bstr(strGuestIP).raw(), u16GuestPort);
     return S_OK;
 }