Changeset 5332 in vbox

Timestamp:

Oct 16, 2007 5:00:04 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

25365

Message:

Make PXE booting in NAT mode work without much hassle.

Location:

trunk/src/VBox

Files:

• Devices/Network/DrvNAT.cpp (modified) (4 diffs)
• Devices/Network/slirp/bootp.c (modified) (1 diff)
• Devices/Network/slirp/libslirp.h (modified) (1 diff)
• Devices/Network/slirp/slirp.c (modified) (2 diffs)
• Devices/Network/slirp/slirp.h (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (3 diffs)

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

@@ -52 +52 @@
     /** NAT state for this instance. */
     PNATState               pNATState;
+    /** TFTP directory prefix. */
+    char                    *pszTFTPPrefix;
+    /** Boot file name to provide in the DHCP server response. */
+    char                    *pszBootFile;
     /** Flag whether a NAT ping warning has been shown. */
     bool                    fSuppressPingWarning;
@@ -409 +413 @@
      * Validate the config.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "PassDomain\0"))
-        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES, "Unknown NAT configuration option, only supports PassDomain");
+    if (!CFGMR3AreValuesValid(pCfgHandle, "PassDomain\0TFTPPrefix\0BootFile\0"))
+        return PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES, N_("Unknown NAT configuration option, only supports PassDomain, TFTPPrefix and BootFile"));
+
+    /*
+     * Init the static parts.
+     */
+    pData->pDrvIns                      = pDrvIns;
+    pData->pNATState                    = NULL;
+    pData->pszTFTPPrefix                = NULL;
+    pData->pszBootFile                  = NULL;
+    /* IBase */
+    pDrvIns->IBase.pfnQueryInterface    = drvNATQueryInterface;
+    /* INetwork */
+    pData->INetworkConnector.pfnSend               = drvNATSend;
+    pData->INetworkConnector.pfnSetPromiscuousMode = drvNATSetPromiscuousMode;
+    pData->INetworkConnector.pfnNotifyLinkChanged  = drvNATNotifyLinkChanged;
+    pData->INetworkConnector.pfnNotifyCanReceive   = drvNATNotifyCanReceive;
 
     /*
@@ -420 +439 @@
         fPassDomain = true;
     else if (VBOX_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pData->pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"PassDomain\" boolean returned %Vrc"), pDrvIns->iInstance, rc);
-
-    /*
-     * Init the static parts.
-     */
-    pData->pDrvIns                      = pDrvIns;
-    pData->pNATState                    = NULL;
-    /* IBase */
-    pDrvIns->IBase.pfnQueryInterface    = drvNATQueryInterface;
-    /* INetwork */
-    pData->INetworkConnector.pfnSend               = drvNATSend;
-    pData->INetworkConnector.pfnSetPromiscuousMode = drvNATSetPromiscuousMode;
-    pData->INetworkConnector.pfnNotifyLinkChanged  = drvNATNotifyLinkChanged;
-    pData->INetworkConnector.pfnNotifyCanReceive   = drvNATNotifyCanReceive;
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"PassDomain\" boolean returned %Vrc"), pDrvIns->iInstance, rc);
+
+    rc = CFGMR3QueryStringAlloc(pCfgHandle, "TFTPPrefix", &pData->pszTFTPPrefix);
+    if (VBOX_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"TFTPPrefix\" string returned %Vrc"), pDrvIns->iInstance, rc);
+    rc = CFGMR3QueryStringAlloc(pCfgHandle, "BootFile", &pData->pszBootFile);
+    if (VBOX_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("NAT#%d: configuration query for \"BootFile\" string returned %Vrc"), pDrvIns->iInstance, rc);
 
     /*
@@ -467 +480 @@
              * Initialize slirp.
              */
-            rc = slirp_init(&pData->pNATState, &szNetAddr[0], fPassDomain, pData);
+            rc = slirp_init(&pData->pNATState, &szNetAddr[0], fPassDomain, pData->pszTFTPPrefix, pData->pszBootFile, pData);
             if (VBOX_SUCCESS(rc))
             {

trunk/src/VBox/Devices/Network/slirp/bootp.c

@@ -187 +187 @@
     }
 
-    if (bootp_filename)
+    if (tftp_prefix && RTDirExists(tftp_prefix) && bootp_filename)
         RTStrPrintf((char*)rbp->bp_file, sizeof(rbp->bp_file), "%s", bootp_filename);
 

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -27 +27 @@
 #endif
 
-int slirp_init(PNATState *, const char *, bool, void *);
+int slirp_init(PNATState *, const char *, bool, const char *, const char *, void *);
 void slirp_term(PNATState);
 void slirp_link_up(PNATState);

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -169 +169 @@
 #endif
 
-int slirp_init(PNATState *ppData, const char *pszNetAddr, bool fPassDomain, void *pvUser)
+int slirp_init(PNATState *ppData, const char *pszNetAddr, bool fPassDomain,
+               const char *pszTFTPPrefix, const char *pszBootFile,
+               void *pvUser)
 {
     int fNATfailed = 0;
@@ -182 +184 @@
     pData->cpvHashUsed = 1;
 #endif
+    tftp_prefix = pszTFTPPrefix;
+    bootp_filename = pszBootFile;
 
 #ifdef _WIN32

trunk/src/VBox/Devices/Network/slirp/slirp.h

@@ -32 +32 @@
 #include <iprt/assert.h>
 #include <iprt/string.h>
+#include <iprt/dir.h>
 #include <VBox/types.h>
 

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -928 +928 @@
                 rc = CFGMR3InsertNode(pLunL0, "Config", &pCfg);                     RC_CHECK();
                 /* (Port forwarding goes here.) */
+
+                /* Configure TFTP prefix and boot filename. */
+                hrc = virtualBox->COMGETTER(HomeFolder)(&str);                      H();
+                STR_CONV();
+                if (psz && *psz)
+                {
+                    char *pszTFTPPrefix = NULL;
+                    RTStrAPrintf(&pszTFTPPrefix, "%s%c%s", psz, RTPATH_DELIMITER, "TFTP");
+                    rc = CFGMR3InsertString(pCfg, "TFTPPrefix", pszTFTPPrefix);     RC_CHECK();
+                    RTStrFree(pszTFTPPrefix);
+                }
+                STR_FREE();
+                hrc = pMachine->COMGETTER(Name)(&str);                              H();
+                STR_CONV();
+                char *pszBootFile = NULL;
+                RTStrAPrintf(&pszBootFile, "%s.pxe", psz);
+                STR_FREE();
+                rc = CFGMR3InsertString(pCfg, "BootFile", pszBootFile);             RC_CHECK();
+                RTStrFree(pszBootFile);
                 break;
             }
@@ -965 +984 @@
                         if (!tapSetupApp.isEmpty())
                             rc = CFGMR3InsertString(pCfg, "TAPSetupApplication", Utf8Str(tapSetupApp)); RC_CHECK();
-                        
+
                         /* TAP terminate application/script */
                         Bstr tapTerminateApp;
@@ -971 +990 @@
                         if (!tapTerminateApp.isEmpty())
                             rc = CFGMR3InsertString(pCfg, "TAPTerminateApplication", Utf8Str(tapTerminateApp)); RC_CHECK();
-                        
+
                         /* "FileHandle" must NOT be inserted here, it is done in DrvTAP.cpp */