From a56f8c4fa0ef6583dcec12164e4ff9a17574fced Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Wed, 29 May 2013 20:44:29 +0100 Subject: [PATCH] DHCPv6-PD listen to WAN RA as per RFC 3633. Otherwise no default route set --- release/src/router/nvram/defaults.c | 2 +- release/src/router/rc/dhcp.c | 2 +- release/src/router/www/basic-ipv6.asp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c index 328fde333f..a07e8dde17 100644 --- a/release/src/router/nvram/defaults.c +++ b/release/src/router/nvram/defaults.c @@ -169,7 +169,7 @@ const defaults_t defaults[] = { { "ipv6_prefix_length", "64" }, // The bit length of the prefix. Used by dhcp6c. For radvd, /64 is always assumed. { "ipv6_rtr_addr", "" }, // defaults to $ipv6_prefix::1 { "ipv6_radvd", "1" }, // Enable Router Advertisement (radvd) - { "ipv6_accept_ra", "1" }, // Accept RA on WAN and/or LAN interfaces + { "ipv6_accept_ra", "1" }, // Accept RA on bit 0WAN and/or bit1LAN interfaces { "ipv6_ifname", "six0" }, // The interface facing the rest of the IPv6 world { "ipv6_tun_v4end", "0.0.0.0" }, // Foreign IPv4 endpoint of SIT tunnel { "ipv6_relay", "1" }, // Foreign IPv4 endpoint host of SIT tunnel 192.88.99.? diff --git a/release/src/router/rc/dhcp.c b/release/src/router/rc/dhcp.c index 4b982d9d8c..13ab35b3c8 100644 --- a/release/src/router/rc/dhcp.c +++ b/release/src/router/rc/dhcp.c @@ -454,7 +454,7 @@ int dhcp6c_state_main(int argc, char **argv) if (env2nv("new_domain_name_servers", "ipv6_get_dns")) { dns_to_resolv(); - start_dnsmasq(); // (re)start +// start_dnsmasq(); // (re)start KDB don't do twice! } // (re)start dnsmasq and httpd diff --git a/release/src/router/www/basic-ipv6.asp b/release/src/router/www/basic-ipv6.asp index d4a2eaafad..479e7317f3 100644 --- a/release/src/router/www/basic-ipv6.asp +++ b/release/src/router/www/basic-ipv6.asp @@ -101,15 +101,15 @@ function verifyFields(focused, quiet) vis._f_ipv6_rtr_addr = 0; vis._f_ipv6_prefix_length = 0; break; - - case '6rd-pd': case 'native-pd': + _fom.f_ipv6_accept_ra_wan.checked = true; + case '6rd-pd': vis._f_ipv6_prefix = 0; vis._f_ipv6_rtr_addr_auto = 0; vis._f_ipv6_rtr_addr = 0; + vis._f_ipv6_accept_ra_wan = 0; if (c == '6rd-pd') { vis._f_ipv6_prefix_length = 0; - vis._f_ipv6_accept_ra_wan = 0; vis._f_ipv6_accept_ra_lan = 0; } // fall through -- 2.11.4.GIT