Changeset 49200 in vbox for trunk/src/VBox/NetworkServices/NAT

Timestamp:

Oct 20, 2013 11:49:48 PM (12 years ago)

Author:

vboxsync

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

90083

Message:

VBoxNetLwipNAT::init: Move code to read IPv6 options so that
options-related code is grouped together.

File:

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

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

@@ -879 +879 @@
     AssertComRCReturn(hrc, VERR_NOT_FOUND);
 
+    ComPtr<IEventSource> pES;
+    hrc = m_net->COMGETTER(EventSource)(pES.asOutParam());
+    AssertComRC(hrc);
+
+    ComObjPtr<NATNetworkListenerImpl> listener;
+    hrc = listener.createObject();
+    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+    hrc = listener->init(new NATNetworkListener(), this);
+    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+    com::SafeArray<VBoxEventType_T> events;
+    events.push_back(VBoxEventType_OnNATNetworkPortForward);
+    events.push_back(VBoxEventType_OnNATNetworkSetting);
+
+    hrc = pES->RegisterListener(listener, ComSafeArrayAsInParam(events), true);
+    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+    m_listener = listener;
+
+
     BOOL fIPv6Enabled = FALSE;
     hrc = m_net->COMGETTER(IPv6Enabled)(&fIPv6Enabled);
@@ -893 +914 @@
     m_ProxyOptions.ipv6_defroute = fIPv6DefaultRoute;
 
-    ComPtr<IEventSource> pES;
-    hrc = m_net->COMGETTER(EventSource)(pES.asOutParam());
-    AssertComRC(hrc);
-
-    ComObjPtr<NATNetworkListenerImpl> listener;
-    hrc = listener.createObject();
-    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
-
-    hrc = listener->init(new NATNetworkListener(), this);
-    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
-
-    com::SafeArray<VBoxEventType_T> events;
-    events.push_back(VBoxEventType_OnNATNetworkPortForward);
-    events.push_back(VBoxEventType_OnNATNetworkSetting);
-
-    hrc = pES->RegisterListener(listener, ComSafeArrayAsInParam(events), true);
-    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
-
-    m_listener = listener;
 
     com::Bstr bstrSourceIp4Key = com::BstrFmt("NAT/%s/SourceIp4",m_Network.c_str());