Changeset 18208 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Mar 24, 2009 5:01:32 PM (16 years ago)

Author:

vboxsync

Message:

#3569: DHCP Server is now started from VBoxSVC and terminates with it.

File:

• trunk/src/VBox/Devices/Network/DrvIntNet.cpp (modified) (2 diffs)

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

@@ -44 +44 @@
 # include "win/DrvIntNet-win.h"
 #endif
-
-#include "DHCPServerRunner.h"
 
 /*******************************************************************************
@@ -1073 +1071 @@
     Log(("IntNet%d: hIf=%RX32 '%s'\n", pDrvIns->iInstance, pThis->hIf, pThis->szNetwork));
 
-    if(rc != VINF_ALREADY_INITIALIZED)
-    {
-        /* new network gets created, check if we need to launch a DHCP server for it */
-        char ip[16], mask[16], lowerIp[16], upperIp[16], mac[13];
-        rc = CFGMR3QueryString(pCfgHandle, "DhcpIPAddress", ip, sizeof(ip));
-        if (RT_SUCCESS(rc))
-        {
-            /* this means we have DHCP server enabled */
-            rc = CFGMR3QueryString(pCfgHandle, "DhcpNetworkMask", mask, sizeof(mask));
-            if (RT_FAILURE(rc))
-                return PDMDRV_SET_ERROR(pDrvIns, rc,
-                                    N_("Configuration error: Failed to get the \"DhcpNetworkMask\" value"));
-
-            rc = CFGMR3QueryString(pCfgHandle, "DhcpLowerIP", lowerIp, sizeof(lowerIp));
-            if (RT_FAILURE(rc))
-                return PDMDRV_SET_ERROR(pDrvIns, rc,
-                                    N_("Configuration error: Failed to get the \"DhcpLowerIP\" value"));
-
-            rc = CFGMR3QueryString(pCfgHandle, "DhcpUpperIP", upperIp, sizeof(upperIp));
-            if (RT_FAILURE(rc))
-                return PDMDRV_SET_ERROR(pDrvIns, rc,
-                                    N_("Configuration error: Failed to get the \"DhcpUpperIP\" value"));
-
-            rc = CFGMR3QueryString(pCfgHandle, "DhcpMacAddress", mac, sizeof(mac));
-            if (RT_FAILURE(rc))
-                return PDMDRV_SET_ERROR(pDrvIns, rc,
-                                    N_("Configuration error: Failed to get the \"DhcpMacAddress\" value"));
-
-
-            DHCPServerRunner dhcp;
-            dhcp.setOption(DHCPCFG_NETNAME, OpenReq.szNetwork);
-            if(OpenReq.enmTrunkType == kIntNetTrunkType_NetFlt
-                    || OpenReq.enmTrunkType == kIntNetTrunkType_NetAdp)
-                dhcp.setOption(DHCPCFG_TRUNKNAME, OpenReq.szTrunk);
-
-            switch(OpenReq.enmTrunkType)
-            {
-            case kIntNetTrunkType_WhateverNone:
-            case kIntNetTrunkType_None:
-                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;
-            default:
-                AssertFailed();
-                break;
-            }
-        //temporary hack for testing
-            //    DHCPCFG_NAME
-            dhcp.setOption(DHCPCFG_MACADDRESS, mac);
-            dhcp.setOption(DHCPCFG_IPADDRESS,  ip);
-        //        DHCPCFG_LEASEDB,
-        //        DHCPCFG_VERBOSE,
-        //        DHCPCFG_GATEWAY,
-            dhcp.setOption(DHCPCFG_LOWERIP,  lowerIp);
-            dhcp.setOption(DHCPCFG_UPPERIP,  upperIp);
-            dhcp.setOption(DHCPCFG_NETMASK,  mask);
-
-        //        DHCPCFG_HELP,
-        //        DHCPCFG_VERSION,
-        //        DHCPCFG_NOTOPT_MAXVAL
-            dhcp.setOption(DHCPCFG_BEGINCONFIG,  "");
-            dhcp.start();
-
-            dhcp.detachFromServer(); /* need to do this to avoid server shutdown on runner destruction */
-        }
-    }
-
     /*
      * Get default buffer.