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

Timestamp:

Mar 6, 2009 3:36:26 AM (16 years ago)

Author:

vboxsync

Message:

NAT: missed changes (fix burns)

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (6 diffs)

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

@@ -86 +86 @@
     /** Boot file name to provide in the DHCP server response. */
     char                    *pszBootFile;
+    /** tftp server name to provide in the DHCP server response. */
+    char                    *pszNextServer;
 #ifdef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC
     /* polling thread */
@@ -799 +801 @@
      * Validate the config.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "PassDomain\0TFTPPrefix\0BootFile\0Network\0"))
+#ifndef VBOX_WITH_SLIRP_DNS_PROXY
+    if (!CFGMR3AreValuesValid(pCfgHandle, "PassDomain\0TFTPPrefix\0BootFile\0Network\0NextServer\0"))
+#else
+    if (!CFGMR3AreValuesValid(pCfgHandle, "PassDomain\0TFTPPrefix\0BootFile\0Network\0NextServer\0DNSProxy\0"))
+#endif
         return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES, N_("Unknown NAT configuration option, only supports PassDomain, TFTPPrefix, BootFile and Network"));
 
@@ -809 +815 @@
     pThis->pszTFTPPrefix                = NULL;
     pThis->pszBootFile                  = NULL;
+    pThis->pszNextServer                = NULL;
     /* IBase */
     pDrvIns->IBase.pfnQueryInterface    = drvNATQueryInterface;
@@ -832 +839 @@
     if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"BootFile\" string failed"), pDrvIns->iInstance);
+    rc = CFGMR3QueryStringAlloc(pCfgHandle, "NextServer", &pThis->pszNextServer);
+    if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"NextServer\" string failed"), pDrvIns->iInstance);
+#ifdef VBOX_WITH_SLIRP_DNS_PROXY
+    bool fDNSProxy;
+    rc = CFGMR3QueryBool(pCfgHandle, "DNSProxy", &fDNSProxy);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+        fDNSProxy = false;
+#endif
 
     /*
@@ -872 +888 @@
      * Initialize slirp.
      */
-    rc = slirp_init(&pThis->pNATState, &szNetAddr[0], Netmask, fPassDomain, pThis->pszTFTPPrefix, pThis->pszBootFile, pThis);
+    rc = slirp_init(&pThis->pNATState, &szNetAddr[0], Netmask, fPassDomain, pThis);
     if (RT_SUCCESS(rc))
     {
+        slirp_set_dhcp_TFTP_prefix(pThis->pNATState, pThis->pszTFTPPrefix);
+        slirp_set_dhcp_TFTP_bootfile(pThis->pNATState, pThis->pszBootFile);
+        slirp_set_dhcp_next_server(pThis->pNATState, pThis->pszNextServer);
+#ifdef VBOX_WITH_SLIRP_DNS_PROXY
+        slirp_set_dhcp_dns_proxy(pThis->pNATState, fDNSProxy);
+#endif
+
         slirp_register_timers(pThis->pNATState, pDrvIns);
         int rc2 = drvNATConstructRedir(pDrvIns->iInstance, pThis, pCfgHandle, Network);
@@ -946 +969 @@
         AssertMsgFailed(("Add error message for rc=%d (%Rrc)\n", rc, rc));
     }
+
 
 #ifndef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC