Changeset 54504 in vbox

Timestamp:

Feb 25, 2015 4:31:44 PM (10 years ago)

Author:

vboxsync

Message:

VBoxNetDHCP: Drag kicking and screaming VBoxNetDhcp::m_DhcpServer to
NetworkManager::processParameterReqList() so that we can interrorgate
it about DHCP options configured via API (though don't do it just yet).

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

• Config.cpp (modified) (2 diffs)
• Config.h (modified) (2 diffs)
• VBoxNetDHCP.cpp (modified) (1 diff)

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

@@ -699 +699 @@
     RTNETADDRIPV4 m_OurNetmask;
     RTMAC m_OurMac;
+
+    ComPtr<IDHCPServer>  m_DhcpServer;
     const VBoxNetHlpUDPService *m_service;
 };
@@ -716 +718 @@
 
 
-NetworkManager *NetworkManager::getNetworkManager()
+NetworkManager *NetworkManager::getNetworkManager(ComPtr<IDHCPServer> aDhcpServer)
 {
     if (!g_NetworkManager)
+    {
         g_NetworkManager = new NetworkManager();
+        g_NetworkManager->m->m_DhcpServer = aDhcpServer;
+    }
 
     return g_NetworkManager;

trunk/src/VBox/NetworkServices/DHCP/Config.h

@@ -21 +21 @@
 #include <iprt/asm-math.h>
 #include <iprt/cpp/utils.h>
+
+#include <VBox/com/ptr.h>
 #include <VBox/com/string.h>
+#include <VBox/com/VirtualBox.h>
 
 #include "../NetLib/cpp/utils.h"
@@ -490 +493 @@
 {
 public:
-    static NetworkManager *getNetworkManager();
+    static NetworkManager *getNetworkManager(ComPtr<IDHCPServer> aDhcpServer = ComPtr<IDHCPServer>());
 
     const RTNETADDRIPV4& getOurAddress() const;

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

@@ -292 +292 @@
     AssertRCReturn(rc, rc);
 
-    m_NetworkManager = NetworkManager::getNetworkManager();
+    m_NetworkManager = NetworkManager::getNetworkManager(m_DhcpServer);
     AssertPtrReturn(m_NetworkManager, VERR_INTERNAL_ERROR);