Changeset 48338 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Sep 6, 2013 6:27:06 AM (11 years ago)

Author:

vboxsync

Message:

Disable stateless DHCPv6 server for now. It only tells guests the
nameserver IPv6 address, but HostDnsService doesn't support IPv6
nameserver addresses yet. Do not set "O" (other configuration) flag
in router advertisements, accordingly. This should avoid confusion
for the beta.

Add "TODO" comments in DHCPv6 server code where the nameserver address
should be picked up - it currently has leftover testing kludge, that
advertised mapped host loopback as IPv6 nameserver (with a
corresponding hack to remap IPv6 to IPv4 in pxudp.c that has been
disabled since).

Location:

trunk/src/VBox/NetworkServices/NAT

Files:

• proxy_dhcp6ds.c (modified) (2 diffs)
• proxy_rtadvd.c (modified) (1 diff)
• proxytest.c (modified) (1 diff)

trunk/src/VBox/NetworkServices/NAT/proxy_dhcp6ds.c

@@ -57 +57 @@
     pxaddr = netif_ip6_addr(proxy_netif, 0); /* link local */
 
+    /*
+     * XXX: TODO: This is a leftover from testing with IPv6 mapped
+     * loopback with a special IPv6->IPv4 mapping hack in pxudp.c
+     */
     /* advertise ourself as DNS resolver - will be proxied to host */
     pxaddr_nonlocal = NULL;
@@ -117 +121 @@
     DNSSRV_SET(0, DHCP6_OPTION_DNS_SERVERS);
     DNSSRV_SET(2, 16);          /* one IPv6 address */
+    /*
+     * XXX: TODO: This is a leftover from testing with IPv6 mapped
+     * loopback with a special IPv6->IPv4 mapping hack in pxudp.c
+     */
     memcpy(&dhcp6ds_dns[4], pxaddr_nonlocal, sizeof(ip6_addr_t));
 

trunk/src/VBox/NetworkServices/NAT/proxy_rtadvd.c

@@ -321 +321 @@
 #endif
     /*
+     * XXX: TODO: Disable "O" flag for now to match disabled stateless
+     * server.  We don't yet get IPv6 nameserver addresses from
+     * HostDnsService, so we have nothing to say, don't tell guests to
+     * come asking.
+     */
+#if 0
+    /*
      * "O" flag.  Tell guests to use DHCP6 for DNS and the like.  This
      * is served by simple stateless server (RFC 3736).
+     *
+     * XXX: "STATEFUL" in the flag name was probably a bug in RFC2461.
+     * It's present in the text, but not in the router configuration
+     * variable name.  It's dropped in the text in RFC4861.
      */
     ra_hdr->flags |= ND6_RA_FLAG_OTHER_STATEFUL_CONFIG;
+#endif
 
     if (is_default) {

trunk/src/VBox/NetworkServices/NAT/proxytest.c

@@ -58 +58 @@
 #endif
 
-#if 1
+    /*
+     * XXX: We use stateless DHCPv6 only to report IPv6 address(es) of
+     * nameserver(s).  Since we don't yet support IPv6 addresses in
+     * HostDnsService, there's no point in running DHCPv6.
+     */
+#if 0
     dhcp6ds_init(proxy_netif);
 #endif