Changeset 17940 in vbox for trunk/src

Timestamp:

Mar 16, 2009 2:47:42 PM (16 years ago)

Author:

vboxsync

Message:

dhcp runner fixes + disabled launching code

Location:

trunk/src/VBox

Files:

• Devices/Makefile.kmk (modified) (2 diffs)
• Devices/Network/DrvIntNet.cpp (modified) (3 diffs)
• Main/ConsoleImpl2.cpp (modified) (6 diffs)
• Main/generic/DhcpServerRunner.cpp (modified) (1 diff)
• Main/generic/DhcpServerRunner.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile.kmk

@@ -623 +623 @@
         Input/DrvMouseQueue.cpp \
         Network/DrvIntNet.cpp \
+        Network/DhcpServerRunner.cpp \
         PC/DrvACPI.cpp \
         Serial/DrvChar.cpp \
@@ -717 +718 @@
         PC/DrvACPI.cpp \
         Network/DrvIntNet.cpp \
+        Network/DhcpServerRunner.cpp \
         Network/DrvNetSniffer.cpp \
         Network/Pcap.cpp \

trunk/src/VBox/Devices/Network/DrvIntNet.cpp

@@ -45 +45 @@
 #endif
 
+#include "DhcpServerRunner.h"
 
 /*******************************************************************************
@@ -1067 +1068 @@
     Log(("IntNet%d: hIf=%RX32 '%s'\n", pDrvIns->iInstance, pThis->hIf, pThis->szNetwork));
 
+#if 0
+    DhcpServerRunner dhcp;
+    dhcp.setOption(DHCPCFG_NETNAME, OpenReq.szNetwork);
+    dhcp.setOption(DHCPCFG_TRUNKNAME, OpenReq.szTrunk);
+    switch(OpenReq.enmTrunkType)
+    {
+    case kIntNetTrunkType_WhateverNone:
+        dhcp.setOption(DHCPCFG_TRUNKTYPE, TRUNKTYPE_WHATEVER);
+        break;
+    case kIntNetTrunkType_NetFlt:
+        dhcp.setOption(DHCPCFG_TRUNKTYPE, TRUNKTYPE_NETFLT);
+        break;
+    case kIntNetTrunkType_NetAdp:
+        dhcp.setOption(DHCPCFG_TRUNKTYPE, TRUNKTYPE_NETADP);
+        break;
+    case kIntNetTrunkType_SrvNat:
+        dhcp.setOption(DHCPCFG_TRUNKTYPE, TRUNKTYPE_SRVNAT);
+        break;
+    }
+//temporary hack for testing
+    //    DHCPCFG_NAME
+    dhcp.setOption(DHCPCFG_MACADDRESS, "080027A03128");
+    dhcp.setOption(DHCPCFG_IPADDRESS,  "192.168.55.1");
+//        DHCPCFG_LEASEDB,
+//        DHCPCFG_VERBOSE,
+//        DHCPCFG_BEGINCONFIG,
+//        DHCPCFG_GATEWAY,
+    dhcp.setOption(DHCPCFG_LOWERIP,  "192.168.55.10");
+    dhcp.setOption(DHCPCFG_UPPERIP,  "192.168.55.100");
+    dhcp.setOption(DHCPCFG_NETMASK,  "255.255.255.0");
+//        DHCPCFG_HELP,
+//        DHCPCFG_VERSION,
+//        DHCPCFG_NOTOPT_MAXVAL
+    dhcp.start();
+
+    dhcp.detachFromServer(); /* need to do this to avoid server shutdown on runner destruction */
+#endif
     /*
      * Get default buffer.
@@ -1116 +1154 @@
     }
 
-    return rc;
+   return rc;
 }
 

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1299 +1299 @@
         }
 
+
         NetworkAttachmentType_T networkAttachment;
         hrc = networkAdapter->COMGETTER(AttachmentType)(&networkAttachment);        H();
+        Bstr networkName;
         switch (networkAttachment)
         {
@@ -1344 +1346 @@
                     STR_CONV();
                     if (psz && *psz)
+                    {
                         rc = CFGMR3InsertString(pCfg, "Network", psz);              RC_CHECK();
+                        networkName = Bstr(psz);
+                    }
+
                     STR_FREE();
                 }
@@ -1486 +1492 @@
                     RTStrPrintf(szNetwork, sizeof(szNetwork), "HostInterfaceNetworking-%s", pszHifName);
                     rc = CFGMR3InsertString(pCfg, "Network", szNetwork);            RC_CHECK();
+                    networkName = Bstr(szNetwork);
 
 # if defined(RT_OS_DARWIN)
@@ -1707 +1714 @@
                         rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);             RC_CHECK();
                         rc = CFGMR3InsertString(pCfg, "Network", psz);              RC_CHECK();
+                        networkName = Bstr(psz);
                     }
                     STR_FREE();
@@ -1781 +1789 @@
                 RTStrPrintf(szNetwork, sizeof(szNetwork), "HostInterfaceNetworking-%s", pszHifName);
                 rc = CFGMR3InsertString(pCfg, "Network", szNetwork);            RC_CHECK();
+                networkName = Bstr(szNetwork);
 #elif defined(RT_OS_DARWIN)
                 rc = CFGMR3InsertString(pCfg, "Trunk", "vboxnet0");             RC_CHECK();
                 rc = CFGMR3InsertString(pCfg, "Network", "HostInterfaceNetworking-vboxnet0"); RC_CHECK();
                 rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp); RC_CHECK();
+                networkName = Bstr("HostInterfaceNetworking-vboxnet0");
 #else
                 rc = CFGMR3InsertString(pCfg, "Trunk", "vboxnet0");             RC_CHECK();
                 rc = CFGMR3InsertString(pCfg, "Network", "HostInterfaceNetworking-vboxnet0"); RC_CHECK();
                 rc = CFGMR3InsertInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt); RC_CHECK();
+                networkName = Bstr("HostInterfaceNetworking-vboxnet0");
 #endif
                 break;
@@ -1797 +1808 @@
                 break;
         }
+
+        ComPtr<IDhcpServer> dhcpServer;
+        hrc = virtualBox->FindDhcpServerByName(networkName.mutableRaw(), dhcpServer.asOutParam());
+        if(FAILED(hrc))
+        {
+            LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(Id) failed, hrc (0x%x)", hrc));
+            H();
+        }
+
     }
 

trunk/src/VBox/Main/generic/DhcpServerRunner.cpp

@@ -64 +64 @@
 }
 
+void DhcpServerRunner::detachFromServer()
+{
+    mProcess = NIL_RTPROCESS;
+}
+
 int DhcpServerRunner::start()
 {

trunk/src/VBox/Main/generic/DhcpServerRunner.h

@@ -69 +69 @@
     int stop();
     bool isRunning();
+
+    void detachFromServer();
 private:
     Utf8Str mOptions[DHCPCFG_NOTOPT_MAXVAL];