Changeset 87616 in vbox

Timestamp:

Feb 4, 2021 11:59:16 PM (4 years ago)

Author:

vboxsync

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

142651

Message:

NAT/Net: Move the code to create event listeners to its own
eventsInit() method. bugref:9929.

File:

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

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

@@ -177 +177 @@
     int homeInit();
     int logInit();
+    int eventsInit();
 
     static void reportError(const char *a_pcszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
@@ -194 +195 @@
     static err_t netifInit(netif *pNetif) RT_NOTHROW_PROTO;
 
-    HRESULT HandleEvent(VBoxEventType_T aEventType, IEvent *pEvent);
+    virtual HRESULT HandleEvent(VBoxEventType_T aEventType, IEvent *pEvent);
 
     const char **getHostNameservers();
@@ -354 +355 @@
     logInit();
 
-
-    {
-        ComEventTypeArray eventTypes;
-        eventTypes.push_back(VBoxEventType_OnNATNetworkPortForward);
-        eventTypes.push_back(VBoxEventType_OnNATNetworkSetting);
-        rc = createNatListener(m_NatListener, virtualbox, this, eventTypes);
-        AssertRCReturn(rc, rc);
-    }
-
-
     // resolver changes are reported on vbox but are retrieved from
     // host so stash a pointer for future lookups
@@ -369 +360 @@
     AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
 
-    {
-        ComEventTypeArray eventTypes;
-        eventTypes.push_back(VBoxEventType_OnHostNameResolutionConfigurationChange);
-        eventTypes.push_back(VBoxEventType_OnNATNetworkStartStop);
-        rc = createNatListener(m_VBoxListener, virtualbox, this, eventTypes);
-        AssertRCReturn(rc, rc);
-    }
-
-    {
-        ComEventTypeArray eventTypes;
-        eventTypes.push_back(VBoxEventType_OnVBoxSVCAvailabilityChanged);
-        rc = createClientListener(m_VBoxClientListener, virtualboxClient, this, eventTypes);
-        AssertRCReturn(rc, rc);
-    }
 
     BOOL fIPv6Enabled = FALSE;
@@ -494 +471 @@
     m_ProxyOptions.nameservers = getHostNameservers();
 
+    eventsInit();
     /* end of COM initialization */
 
@@ -597 +575 @@
 
     return rc;
+}
+
+
+/**
+ * Create and register event listeners.
+ */
+int VBoxNetLwipNAT::eventsInit()
+{
+    int rc;
+
+    {
+        ComEventTypeArray eventTypes;
+        eventTypes.push_back(VBoxEventType_OnNATNetworkPortForward);
+        eventTypes.push_back(VBoxEventType_OnNATNetworkSetting);
+        rc = createNatListener(m_NatListener, virtualbox, this, eventTypes);
+        AssertRCReturn(rc, rc);
+    }
+
+    {
+        ComEventTypeArray eventTypes;
+        eventTypes.push_back(VBoxEventType_OnHostNameResolutionConfigurationChange);
+        eventTypes.push_back(VBoxEventType_OnNATNetworkStartStop);
+        rc = createNatListener(m_VBoxListener, virtualbox, this, eventTypes);
+        AssertRCReturn(rc, rc);
+    }
+
+    {
+        ComEventTypeArray eventTypes;
+        eventTypes.push_back(VBoxEventType_OnVBoxSVCAvailabilityChanged);
+        rc = createClientListener(m_VBoxClientListener, virtualboxClient, this, eventTypes);
+        AssertRCReturn(rc, rc);
+    }
+
+    return VINF_SUCCESS;
 }