Changeset 49516 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

Nov 16, 2013 6:42:31 AM (11 years ago)

Author:

vboxsync

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

90686

Message:

Introduce option "--need-main(-M) on|off" in network services to emphosize whether network service need to establish connection with Main (by default this optiois off).

Location:

trunk/src/VBox/NetworkServices/NetLib

Files:

• VBoxNetBaseService.cpp (modified) (4 diffs)
• VBoxNetBaseService.h (modified) (1 diff)

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

@@ -86 +86 @@
     { "--netmask",        'm',   RTGETOPT_REQ_IPV4ADDR },
     { "--verbose",        'v',   RTGETOPT_REQ_NOTHING },
+    { "--need-main",      'M',   RTGETOPT_REQ_BOOL },
 };
 
@@ -102 +103 @@
     m_Name                  = "VBoxNetNAT";
     m_Network               = "intnet";
+    m_fNeedMain             = false;
 
     for(unsigned int i = 0; i < RT_ELEMENTS(g_aGetOptDef); ++i)
         m_vecOptionDefs.push_back(&g_aGetOptDef[i]);
-
-    HRESULT hrc = virtualbox.createLocalObject(CLSID_VirtualBox);
-    if (FAILED(hrc))
-        RTMsgError("Failed to create the VirtualBox object!");
 }
 
@@ -140 +138 @@
 int VBoxNetBaseService::init()
 {
+    if (m_fNeedMain)
+    {
+        HRESULT hrc = com::Initialize();
+        AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+        hrc = virtualbox.createLocalObject(CLSID_VirtualBox);
+        AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+    }
+
     return VINF_SUCCESS;
 }
@@ -223 +230 @@
                 return 1;
 
+            case 'M': // --need-main
+                m_fNeedMain = true;
+                break;
+
             case 'h': // --help (missed)
                 RTPrintf("%s Version %sr%u\n"

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

@@ -83 +83 @@
     PINTNETBUF          m_pIfBuf;       /**< Interface buffer. */
     std::vector<PRTGETOPTDEF> m_vecOptionDefs;
+    bool                m_fNeedMain;
     /** @} */
     /** @name Debug stuff