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

Timestamp:

Oct 15, 2013 8:56:52 AM (11 years ago)

Author:

vboxsync

Message:

VBoxNetLwipNAT.cpp: extend listener scope to class level.

File:

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

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

@@ -26 +26 @@
 #include <VBox/com/errorprint.h>
 #include <VBox/com/VirtualBox.h>
+#include <VBox/com/NativeEventQueue.h>
 
 #include <iprt/net.h>
@@ -120 +121 @@
 typedef VECNATSERVICEPF::const_iterator CITERATORNATSERVICEPF;
 
-class NATNetworkListener;
+
+class VBoxNetLwipNAT;
+
+
+class NATNetworkListener
+{
+public:
+    NATNetworkListener():m_pNAT(NULL){}
+
+    HRESULT init(VBoxNetLwipNAT *pNAT)
+    {
+        AssertPtrReturn(pNAT, E_INVALIDARG);
+
+        m_pNAT = pNAT;
+        return S_OK;
+    }
+
+    HRESULT init()
+    {
+        m_pNAT = NULL;
+        return S_OK;
+    }
+
+    void uninit() { m_pNAT = NULL; }
+
+    STDMETHOD(HandleEvent)(VBoxEventType_T aEventType, IEvent *pEvent);
+
+private:
+    VBoxNetLwipNAT *m_pNAT;
+};
+typedef ListenerImpl<NATNetworkListener, VBoxNetLwipNAT *> NATNetworkListenerImpl;
+VBOX_LISTENER_DECLARE(NATNetworkListenerImpl)
+
 
 class VBoxNetLwipNAT: public VBoxNetBaseService
@@ -153 +186 @@
     /* Our NAT network descriptor in Main */
     ComPtr<INATNetwork> net;
+    ComPtr<NATNetworkListenerImpl> m_listener;
     STDMETHOD(HandleEvent)(VBoxEventType_T aEventType, IEvent *pEvent);
 
@@ -175 +209 @@
 
 
-class NATNetworkListener
-{
-public:
-    NATNetworkListener():m_pNAT(NULL){}
-
-    HRESULT init(VBoxNetLwipNAT *pNAT)
-    {
-        AssertPtrReturn(pNAT, E_INVALIDARG);
-
-        m_pNAT = pNAT;
-        return S_OK;
-    }
-
-    HRESULT init()
-    {
-        m_pNAT = NULL;
-        return S_OK;
-    }
-
-    void uninit() { m_pNAT = NULL; }
-
-    STDMETHOD(HandleEvent)(VBoxEventType_T aEventType, IEvent *pEvent)
-    {
-        if (m_pNAT)
-            return m_pNAT->HandleEvent(aEventType, pEvent);
-        else
-            return E_FAIL;
-    }
-
-private:
-    VBoxNetLwipNAT *m_pNAT;
-};
-
-
-typedef ListenerImpl<NATNetworkListener, VBoxNetLwipNAT *> NATNetworkListenerImpl;
-VBOX_LISTENER_DECLARE(NATNetworkListenerImpl)
-
-
-
 static VBoxNetLwipNAT *g_pLwipNat;
+
+STDMETHODIMP NATNetworkListener::HandleEvent(VBoxEventType_T aEventType, IEvent *pEvent)
+{
+    if (m_pNAT)
+        return m_pNAT->HandleEvent(aEventType, pEvent);
+    else
+        return E_FAIL;
+}
+
 
 
@@ -912 +916 @@
     hrc = pES->RegisterListener(listener, ComSafeArrayAsInParam(events), true);
     AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+    m_listener = listener;
 #endif