Changeset 54499 in vbox

Timestamp:

Feb 25, 2015 3:42:17 PM (10 years ago)

Author:

vboxsync

Message:

VBoxNetDHCP: keep a pointer to NetworkManager instead of using a
global. To minimize churn, convert that global into a singleton.
No functional change intended.

Location:

trunk/src/VBox/NetworkServices/DHCP

Files:

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

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

@@ -74 +74 @@
 static ConfigurationManager *g_ConfigurationManager = ConfigurationManager::getConfigurationManager();
 
-static NetworkManager *g_NetworkManager = NetworkManager::getNetworkManager();
+NetworkManager *NetworkManager::g_NetworkManager;
 
 bool MACClientMatchCriteria::check(const Client& client) const

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

@@ -517 +517 @@
     int doReply(const Client& client, const std::vector<RawOption>& extra);
     int processParameterReqList(const Client& client, const uint8_t *pu8ReqList, int cReqList, std::vector<RawOption>& extra);
+
+private:
+    static NetworkManager *g_NetworkManager;
 
 private:

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

@@ -130 +130 @@
     /** Listener for Host DNS changes */
     ComPtr<NATNetworkListenerImpl> m_vboxListener;
+
+    NetworkManager *m_NetworkManager;
+
     /*
      * We will ignore cmd line parameters IFF there will be some DHCP specific arguments
@@ -192 +195 @@
  * Construct a DHCP server with a default configuration.
  */
-VBoxNetDhcp::VBoxNetDhcp():VBoxNetBaseService("VBoxNetDhcp", "VBoxNetDhcp")
+VBoxNetDhcp::VBoxNetDhcp()
+  : VBoxNetBaseService("VBoxNetDhcp", "VBoxNetDhcp"),
+    m_NetworkManager(NULL)
 {
     /*   m_enmTrunkType          = kIntNetTrunkType_WhateverNone; */
@@ -281 +286 @@
     AssertRCReturn(rc, rc);
 
-    NetworkManager *netManager = NetworkManager::getNetworkManager();
-
-    netManager->setOurAddress(getIpv4Address());
-    netManager->setOurNetmask(getIpv4Netmask());
-    netManager->setOurMac(getMacAddress());
-    netManager->setService(this);
-
     if (isMainNeeded())
         rc = initWithMain();
     else
         rc = initNoMain();
-
     AssertRCReturn(rc, rc);
+
+    m_NetworkManager = NetworkManager::getNetworkManager();
+    AssertPtrReturn(m_NetworkManager, VERR_INTERNAL_ERROR);
+
+    m_NetworkManager->setOurAddress(getIpv4Address());
+    m_NetworkManager->setOurNetmask(getIpv4Netmask());
+    m_NetworkManager->setOurMac(getMacAddress());
+    m_NetworkManager->setService(this);
 
     return VINF_SUCCESS;
@@ -338 +343 @@
     if (pDhcpMsg->bp_op == RTNETBOOTP_OP_REQUEST)
     {
-        NetworkManager *networkManager = NetworkManager::getNetworkManager();
+        AssertPtrReturn(m_NetworkManager, false);
 
         switch (uMsgType)
         {
             case RTNET_DHCP_MT_DISCOVER:
-                return networkManager->handleDhcpReqDiscover(pDhcpMsg, cb);
+                return m_NetworkManager->handleDhcpReqDiscover(pDhcpMsg, cb);
 
             case RTNET_DHCP_MT_REQUEST:
-                return networkManager->handleDhcpReqRequest(pDhcpMsg, cb);
+                return m_NetworkManager->handleDhcpReqRequest(pDhcpMsg, cb);
 
             case RTNET_DHCP_MT_DECLINE:
-                return networkManager->handleDhcpReqDecline(pDhcpMsg, cb);
+                return m_NetworkManager->handleDhcpReqDecline(pDhcpMsg, cb);
 
             case RTNET_DHCP_MT_RELEASE:
-                return networkManager->handleDhcpReqRelease(pDhcpMsg, cb);
+                return m_NetworkManager->handleDhcpReqRelease(pDhcpMsg, cb);
 
             case RTNET_DHCP_MT_INFORM: