Changeset 55365 in vbox for trunk/src/VBox/NetworkServices/DHCP

Timestamp:

Apr 22, 2015 9:34:46 AM (10 years ago)

Author:

vboxsync

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

99701

Message:

NetworkServices: When handling COM/XPCOM events, always check if the event is for our network, otherwise ignore the event. Renamed {get/set}Network to {get/set}NetworkName(). Renamed {get/set}Name to {get/set}ServiceName(). Use RT_ZERO instead of memset if possible. Coding style.

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

• NetworkManagerDhcp.cpp (modified) (1 diff)
• VBoxNetDHCP.cpp (modified) (3 diffs)

trunk/src/VBox/NetworkServices/DHCP/NetworkManagerDhcp.cpp

@@ -55 +55 @@
 {
     RawOption opt;
-    memset(&opt, 0, sizeof(RawOption));
+    RT_ZERO(opt);
+
     /* 1. Find client */
     ConfigurationManager *confManager = ConfigurationManager::getConfigurationManager();

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -221 +221 @@
     m_cbCurMsg              = 0;
     m_pCurMsg               = NULL;
-    memset(&m_CurHdrs, '\0', sizeof(m_CurHdrs));
+    RT_ZERO(m_CurHdrs);
 
     m_fIgnoreCmdLineParameters = true;
@@ -499 +499 @@
      */
     AssertRCReturn(virtualbox.isNull(), VERR_INTERNAL_ERROR);
-    std::string networkName = getNetwork();
+    std::string networkName = getNetworkName();
 
     int rc = findDhcpServer(virtualbox, networkName, m_DhcpServer);
@@ -616 +616 @@
         {
             ComPtr <INATNetworkStartStopEvent> pStartStopEvent = pEvent;
+
+            com::Bstr networkName;
+            HRESULT hrc = pStartStopEvent->COMGETTER(NetworkName)(networkName.asOutParam());
+            AssertComRCReturn(hrc, hrc);
+            if (networkName.compare(getNetworkName().c_str()))
+                break; /* change not for our network */
+
             BOOL fStart = TRUE;
-            HRESULT hrc = pStartStopEvent->COMGETTER(StartEvent)(&fStart);
+            hrc = pStartStopEvent->COMGETTER(StartEvent)(&fStart);
+            AssertComRCReturn(hrc, hrc);
             if (!fStart)
                 shutdown();