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

Timestamp:

Dec 9, 2013 1:49:46 PM (11 years ago)

Author:

vboxsync

Message:

DHCP/NAT and NAT are acting in the same manner: polling for events on main thread and waiting for packets on internal network on RECV thread. DHCP/Host-Only waits for packets on main thread.

File:

• trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (4 diffs)

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

@@ -93 +93 @@
 
     int                 init();
-    int                 run(void);
     void                usage(void) { /* XXX: document options */ };
     int                 parseOpt(int rc, const RTGETOPTUNION& getOptVal);
@@ -283 +282 @@
 }
 
-/**
- * Runs the DHCP server.
- *
- * @returns exit code + error message to stderr on failure, won't return on
- *          success (you must kill this process).
- */
-int VBoxNetDhcp::run(void)
-{
-    doReceiveLoop();
-    return 0;
-}
-
 
 int  VBoxNetDhcp::processUDP(void *pv, size_t cbPv)
@@ -306 +293 @@
     {
         m_uCurMsgType = uMsgType;
-        handleDhcpMsg(uMsgType, pDhcpMsg, cbPv);
+        {
+            /* To avoid fight with event processing thread */
+            VBoxNetALock(this);
+            handleDhcpMsg(uMsgType, pDhcpMsg, cbPv);
+        }
         m_uCurMsgType = UINT8_MAX;
     }
@@ -565 +556 @@
 
         {
+            VBoxNetALock(this);   
             ConfigurationManager *confManager = ConfigurationManager::getConfigurationManager();
             confManager->flushAddressList(RTNET_DHCP_OPT_DNS);