Changeset 17436 in vbox for trunk/src

Timestamp:

Mar 6, 2009 3:33:40 AM (16 years ago)

Author:

vboxsync

Message:

NAT: added extradata options to control DHCP forcing use external TFTP server and DNS proxy

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (1 diff)
• libslirp.h (modified) (2 diffs)
• slirp.c (modified) (4 diffs)
• slirp_state.h (modified) (1 diff)

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

@@ -284 +284 @@
         FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &dns_addr_dhcp.s_addr);
 #else
+# ifdef VBOX_WITH_SLIRP_DNS_PROXY
+        if (pData->use_dns_proxy) 
+        {
+            uint32_t addr = htonl(ntohl(special_addr.s_addr) | CTL_DNS);
+            FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &addr);
+        }
+        else
+# endif
         LIST_FOREACH(de, &pData->dns_list_head, de_list)
         {

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

@@ -28 +28 @@
 #endif
 
-int slirp_init(PNATState *, const char *, uint32_t, bool, const char *, const char *, void *);
+int slirp_init(PNATState *, const char *, uint32_t, bool, void *);
 void slirp_register_timers(PNATState pData, PPDMDRVINS pDrvIns);
 void slirp_term(PNATState);
@@ -68 +68 @@
                    int guest_port);
 
+void slirp_set_dhcp_TFTP_prefix(PNATState pData, const char *tftpPrefix);
+void slirp_set_dhcp_TFTP_bootfile(PNATState pData, const char *bootFile);
+void slirp_set_dhcp_next_server(PNATState pData, const char *nextServer);
+#ifdef VBOX_WITH_SLIRP_DNS_PROXY
+void slirp_set_dhcp_dns_proxy(PNATState pData, bool fDNSProxy);
+#endif
 #if defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) && defined(RT_OS_WINDOWS)
 

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

@@ -543 +543 @@
 
 int slirp_init(PNATState *ppData, const char *pszNetAddr, uint32_t u32Netmask,
-               bool fPassDomain, const char *pszTFTPPrefix,
-               const char *pszBootFile, void *pvUser)
+               bool fPassDomain, void *pvUser)
 {
     int fNATfailed = 0;
@@ -557 +556 @@
     pData->fPassDomain = fPassDomain;
     pData->pvUser = pvUser;
-    tftp_prefix = pszTFTPPrefix;
-    bootp_filename = pszBootFile;
     pData->netmask = u32Netmask;
 
@@ -590 +587 @@
     alias_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS);
     /* @todo: add ability to configure this staff */
-    pData->tftp_server.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_TFTP);
 
     /* set default addresses */
@@ -1664 +1660 @@
     return htons(service);
 }
+
+void slirp_set_dhcp_TFTP_prefix(PNATState pData, const char *tftpPrefix)
+{
+    Log2(("tftp_prefix:%s\n", tftp_prefix));
+    tftp_prefix = tftpPrefix;
+}
+
+void slirp_set_dhcp_TFTP_bootfile(PNATState pData, const char *bootFile)
+{
+    Log2(("bootFile:%s\n", bootFile));
+    bootp_filename = bootFile;
+}
+
+void slirp_set_dhcp_next_server(PNATState pData, const char *next_server)
+{
+    Log2(("next_server:%s\n", next_server));
+    if (next_server == NULL)
+        pData->tftp_server.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_TFTP);
+    else
+        inet_aton(next_server, &pData->tftp_server);
+}
+#ifdef VBOX_WITH_SLIRP_DNS_PROXY
+void slirp_set_dhcp_dns_proxy(PNATState pData, bool fDNSProxy)
+{
+    pData->use_dns_proxy = fDNSProxy;
+}
+#endif

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

@@ -209 +209 @@
     #define HASH(id) (id & ((1 << HASHSIZE) - 1))
     struct request *request_hash[1 << HASHSIZE];
+    /* this field control behaviour of DHCP server */
+    bool use_dns_proxy;
 #endif
     STAMPROFILE StatFill;