From 85900a246cbd1f8959658c7bc376add07460f20c Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Sat, 13 Sep 2014 20:41:04 +0100 Subject: Revert route-information option in RA. There are problems with some clients. http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2014q3/008796.html --- CHANGELOG | 4 ---- src/radv.c | 26 -------------------------- 2 files changed, 30 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 941b56f..1146413 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -27,10 +27,6 @@ version 2.72 servers which loop back are disabled and this event is logged. Thanks to Smoothwall for their sponsorship of this feature. - Include an RFC4191 route information option in router - advertisements for the prefix we're advertising. Thanks to - Ilya Ponetaev for the patch. - Extend --conf-dir to allow filtering of files. So --conf-dir=/etc/dnsmasq.d,\*.conf will load all the files in /etc/dnsmasq.d which end in .conf diff --git a/src/radv.c b/src/radv.c index 87ddfae..3c8b162 100644 --- a/src/radv.c +++ b/src/radv.c @@ -649,32 +649,6 @@ static int add_prefixes(struct in6_addr *local, int prefix, inet_ntop(AF_INET6, local, daemon->addrbuff, ADDRSTRLEN); if (!option_bool(OPT_QUIET_RA)) my_syslog(MS_DHCP | LOG_INFO, "RTR-ADVERT(%s) %s", param->if_name, daemon->addrbuff); - - /* Send Route Information option (RFC4191, 2.3) */ - put_opt6_char(ICMP6_OPT_RT_INFO); - /* Length in units of 8 octets will be 1 (header) + - * 0, 1 or 2 (0...128 bits / 64 bit per unit) */ - if (0 == prefix) - put_opt6_char(1); - else if (prefix < 65) - put_opt6_char(2); - else - put_opt6_char(3); - - put_opt6_char(prefix); - /* Same priority and advertised prefix */ - put_opt6_char(param->prio); - /* "valid lifetime" seems more reasonable than "preferred" */ - put_opt6_long(valid); - /* Actual prefix, only necessary part - * Don't append any data in case of prefix length == 0 */ - if (0 != prefix) - { - if (prefix < 65) - put_opt6((void *)local, 8); - else - put_opt6((void *)local, 16); - } } } } -- cgit v1.2.1