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

Timestamp:

Oct 21, 2013 12:38:11 PM (11 years ago)

Author:

vboxsync

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

90096

Message:

Add listener for HostNameResolutionConfigurationChange (a do-nothing
as of yet). Doesn't get events yet b/c of problems on the event
source side that are being worked on.

File:

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

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

@@ -186 +186 @@
     /* Our NAT network descriptor in Main */
     ComPtr<INATNetwork> m_net;
-    ComPtr<NATNetworkListenerImpl> m_listener;
+    ComObjPtr<NATNetworkListenerImpl> m_listener;
+
+    ComPtr<IHost> m_host;
+    ComObjPtr<NATNetworkListenerImpl> m_vboxListener;
+
     STDMETHOD(HandleEvent)(VBoxEventType_T aEventType, IEvent *pEvent);
 
@@ -879 +883 @@
     AssertComRCReturn(hrc, VERR_NOT_FOUND);
 
-    ComPtr<IEventSource> pES;
-    hrc = m_net->COMGETTER(EventSource)(pES.asOutParam());
+    hrc = m_listener.createObject();
+    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+    hrc = m_listener->init(new NATNetworkListener(), this);
+    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+    ComPtr<IEventSource> esNet;
+    hrc = m_net->COMGETTER(EventSource)(esNet.asOutParam());
     AssertComRC(hrc);
 
-    ComObjPtr<NATNetworkListenerImpl> listener;
-    hrc = listener.createObject();
+    com::SafeArray<VBoxEventType_T> aNetEvents;
+    aNetEvents.push_back(VBoxEventType_OnNATNetworkPortForward);
+    aNetEvents.push_back(VBoxEventType_OnNATNetworkSetting);
+    hrc = esNet->RegisterListener(m_listener, ComSafeArrayAsInParam(aNetEvents), true);
     AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
 
-    hrc = listener->init(new NATNetworkListener(), this);
+
+    // resolver changes are reported on vbox but are retrieved from
+    // host so stash a pointer for future lookups
+    hrc = virtualbox->COMGETTER(Host)(m_host.asOutParam());
     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);
+    hrc = m_vboxListener.createObject();
     AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
 
-    m_listener = listener;
+    hrc = m_vboxListener->init(new NATNetworkListener(), this);
+    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+    ComPtr<IEventSource> esVBox;
+    hrc = virtualbox->COMGETTER(EventSource)(esVBox.asOutParam());
+    AssertComRC(hrc);
+
+    com::SafeArray<VBoxEventType_T> aVBoxEvents;
+    aVBoxEvents.push_back(VBoxEventType_OnHostNameResolutionConfigurationChange);
+    hrc = esVBox->RegisterListener(m_vboxListener, ComSafeArrayAsInParam(aVBoxEvents), true);
+    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);