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

Timestamp:

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

Author:

vboxsync

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

Files:

• DHCP/VBoxNetDHCP.cpp (modified) (6 diffs)
• NAT/VBoxNetLwipNAT.cpp (modified) (2 diffs)
• NetLib/VBoxNetBaseService.cpp (modified) (4 diffs)
• NetLib/VBoxNetBaseService.h (modified) (1 diff)

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

@@ -357 +357 @@
 int VBoxNetDhcp::init()
 {
-    HRESULT hrc = S_OK;
-    /* ok, here we should initiate instance of dhcp server
-     * and listener for Dhcp configuration events
-     */
-    AssertRCReturn(virtualbox.isNull(), VERR_INTERNAL_ERROR);
-
-    hrc = virtualbox->FindDHCPServerByNetworkName(com::Bstr(m_Network.c_str()).raw(),
-                                                  m_DhcpServer.asOutParam());
-    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
-
-    hrc = virtualbox->FindNATNetworkByName(com::Bstr(m_Network.c_str()).raw(),
-                                           m_NATNetwork.asOutParam());
-
-
-    bool fNoMain = m_NATNetwork.isNull();
-    int rc;
+    int rc = this->VBoxNetBaseService::init();
+    AssertRCReturn(rc, rc);
+
     NetworkManager *netManager = NetworkManager::getNetworkManager();
 
@@ -378 +365 @@
     netManager->setOurNetmask(m_Ipv4Netmask);
     netManager->setOurMac(m_MacAddress);
-
-    if (fNoMain)
+    
+    if (m_fNeedMain)
+        rc = initWithMain();
+    else
         rc = initNoMain();
-    else
-        rc = initWithMain();
 
     AssertRCReturn(rc, rc);
@@ -733 +720 @@
 int VBoxNetDhcp::initNoMain()
 {
-    /* In Host-Only mode we don't need Main. */
-    com::Shutdown();
-
     CmdParameterIterator it;
 
@@ -777 +761 @@
 int VBoxNetDhcp::initWithMain()
 {
+    /* ok, here we should initiate instance of dhcp server
+     * and listener for Dhcp configuration events
+     */
+    AssertRCReturn(virtualbox.isNull(), VERR_INTERNAL_ERROR);
+
+    HRESULT hrc = virtualbox->FindDHCPServerByNetworkName(com::Bstr(m_Network.c_str()).raw(),
+                                                  m_DhcpServer.asOutParam());
+    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
+
+    hrc = virtualbox->FindNATNetworkByName(com::Bstr(m_Network.c_str()).raw(),
+                                           m_NATNetwork.asOutParam());
+
     BOOL fNeedDhcpServer = false;
     if (FAILED(m_NATNetwork->COMGETTER(NeedDhcpServer)(&fNeedDhcpServer)))
@@ -787 +783 @@
     com::Bstr strGateway;
 
-    HRESULT hrc = m_NATNetwork->COMGETTER(Gateway)(strGateway.asOutParam());
+    hrc = m_NATNetwork->COMGETTER(Gateway)(strGateway.asOutParam());
     AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
     RTNetStrToIPv4Addr(com::Utf8Str(strGateway).c_str(), &gateway);
@@ -918 +914 @@
      * Instantiate the DHCP server and hand it the options.
      */
-    HRESULT hrc = com::Initialize();
-    Assert(!FAILED(hrc));
 
     VBoxNetDhcp *pDhcp = new VBoxNetDhcp();

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -890 +890 @@
 int VBoxNetLwipNAT::init()
 {
-    int rc = VINF_SUCCESS;
     HRESULT hrc;
     LogFlowFuncEnter();
@@ -896 +895 @@
 
     /* virtualbox initialized in super class */
+
+    int rc = ::VBoxNetBaseService::init();
+    AssertRCReturn(rc, rc);
 
     hrc = virtualbox->FindNATNetworkByName(com::Bstr(m_Network.c_str()).raw(),

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