Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better defaults for address and lifetime of RDNS option in RA.

Browse Source
This commit is contained in:
Simon Kelley
2013-10-14 14:08:44 +01:00
parent 3b3f441189
commit 806cf78797
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/radv.c
View File

@@ -338,13 +338,13 @@ static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *de
struct in6_addr *a = (struct in6_addr *)opt_cfg->val; struct in6_addr *a = (struct in6_addr *)opt_cfg->val;
done_dns = 1; done_dns = 1;
if (opt_cfg->len == 0) if (opt_cfg->len == 0 || (IN6_IS_ADDR_UNSPECIFIED(a) && parm.pref_time != 0))
continue; continue;
put_opt6_char(ICMP6_OPT_RDNSS); put_opt6_char(ICMP6_OPT_RDNSS);
put_opt6_char((opt_cfg->len/8) + 1); put_opt6_char((opt_cfg->len/8) + 1);
put_opt6_short(0); put_opt6_short(0);
put_opt6_long(parm.adv_interval * 2); /* lifetime - twice RA retransmit */ put_opt6_long(parm.pref_time);
/* zero means "self" */ /* zero means "self" */
for (i = 0; i < opt_cfg->len; i += IN6ADDRSZ, a++) for (i = 0; i < opt_cfg->len; i += IN6ADDRSZ, a++)
if (IN6_IS_ADDR_UNSPECIFIED(a)) if (IN6_IS_ADDR_UNSPECIFIED(a))
@@ -360,7 +360,7 @@ static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *de
put_opt6_char(ICMP6_OPT_DNSSL); put_opt6_char(ICMP6_OPT_DNSSL);
put_opt6_char(len + 1); put_opt6_char(len + 1);
put_opt6_short(0); put_opt6_short(0);
put_opt6_long(parm.adv_interval * 2); /* lifetime - twice RA retransmit */ put_opt6_long(parm.pref_time);
put_opt6(opt_cfg->val, opt_cfg->len); put_opt6(opt_cfg->val, opt_cfg->len);
/* pad */ /* pad */
@@ -369,14 +369,14 @@ static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *de
} }
} }
if (daemon->port == NAMESERVER_PORT && !done_dns) if (daemon->port == NAMESERVER_PORT && !done_dns && parm.pref_time != 0)
{ {
/* default == us, as long as we are supplying DNS service. */ /* default == us, as long as we are supplying DNS service. */
put_opt6_char(ICMP6_OPT_RDNSS); put_opt6_char(ICMP6_OPT_RDNSS);
put_opt6_char(3); put_opt6_char(3);
put_opt6_short(0); put_opt6_short(0);
put_opt6_long(parm.adv_interval * 2); /* lifetime - twice RA retransmit */ put_opt6_long(parm.pref_time);
put_opt6(&parm.link_global, IN6ADDRSZ); put_opt6(&parm.link_local, IN6ADDRSZ);
} }
/* set managed bits unless we're providing only RA on this link */ /* set managed bits unless we're providing only RA on this link */