Changeset 17961 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 16, 2009 5:47:47 PM (16 years ago)

Author:

vboxsync

Message:

dhcp config/launch fixes

File:

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

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

@@ -781 +781 @@
                               "IgnoreTrunkHostPromisc\0"
                               "QuietlyIgnoreTrunkHostPromisc\0"
-                              "IsService\0"))
+                              "IsService\0"
+                              "DhcpIPAddress\0"
+                              "DhcpNetworkMask\0"
+                              "DhcpLowerIP\0"
+                              "DhcpUpperIP\0"
+                              "DhcpMacAddress\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
 
@@ -1067 +1072 @@
     pThis->hIf = OpenReq.hIf;
     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_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.setOption(DHCPCFG_BEGINCONFIG,  "");
-    dhcp.start();
-
-    dhcp.detachFromServer(); /* need to do this to avoid server shutdown on runner destruction */
-#endif
+
+    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);
+        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, 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.