Changeset 49558 in vbox

Timestamp:

Nov 20, 2013 2:43:14 AM (11 years ago)

Author:

vboxsync

Message:

NetworkServices: changed the manner network services verify their dependecy on Main.

Location:

trunk/src/VBox/NetworkServices

Files:

• DHCP/VBoxNetDHCP.cpp (modified) (1 diff)
• NetLib/VBoxNetBaseService.cpp (modified) (1 diff)
• NetLib/VBoxNetBaseService.h (modified) (3 diffs)

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

@@ -366 +366 @@
     netManager->setOurMac(m_MacAddress);
     
-    if (m_fNeedMain)
+    if (isMainNeeded())
         rc = initWithMain();
     else

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -138 +138 @@
 int VBoxNetBaseService::init()
 {
-    if (m_fNeedMain)
+    if (isMainNeeded())
     {
         HRESULT hrc = com::Initialize();

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h

@@ -39 +39 @@
 
     virtual int         init(void);
-
+    virtual bool        isMainNeeded() { return m_fNeedMain; }
     /* VirtualBox instance */
     ComPtr<IVirtualBox> virtualbox;
@@ -83 +83 @@
     PINTNETBUF          m_pIfBuf;       /**< Interface buffer. */
     std::vector<PRTGETOPTDEF> m_vecOptionDefs;
-    bool                m_fNeedMain;
     /** @} */
     /** @name Debug stuff
@@ -93 +92 @@
     /* cs for syncing */
     RTCRITSECT          m_csThis;
+    /* Controls whether service will connect SVC for runtime needs */
+    bool                m_fNeedMain;
 
     /** @} */