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

Avoid losing timer when deleting a RA context.

Browse Source
This commit is contained in:
S L
2016-02-12 17:36:20 +00:00
committed by Simon Kelley
parent 1566bacb2c
commit a18bf3149a
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/radv.c
View File

@@ -28,11 +28,12 @@
struct ra_param { struct ra_param {
time_t now; time_t now;
int ind, managed, other, found_context, first, adv_router; int ind, managed, other, first, adv_router;
char *if_name; char *if_name;
struct dhcp_netid *tags; struct dhcp_netid *tags;
struct in6_addr link_local, link_global, ula; struct in6_addr link_local, link_global, ula;
unsigned int glob_pref_time, link_pref_time, ula_pref_time, adv_interval, prio; unsigned int glob_pref_time, link_pref_time, ula_pref_time, adv_interval, prio;
struct dhcp_context *found_context;
}; };
struct search_param { struct search_param {
@@ -251,7 +252,7 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad
parm.ind = iface; parm.ind = iface;
parm.managed = 0; parm.managed = 0;
parm.other = 0; parm.other = 0;
parm.found_context = 0; parm.found_context = NULL;
parm.adv_router = 0; parm.adv_router = 0;
parm.if_name = iface_name; parm.if_name = iface_name;
parm.first = 1; parm.first = 1;
@@ -308,8 +309,14 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad
unsigned int old = difftime(now, context->address_lost_time); unsigned int old = difftime(now, context->address_lost_time);
if (old > context->saved_valid) if (old > context->saved_valid)
{ {
/* We've advertised this enough, time to go */ /* We've advertised this enough, time to go */
/* If this context held the timeout, and there's another context in use
transfer the timeout there. */
if (context->ra_time != 0 && parm.found_context && parm.found_context->ra_time == 0)
new_timeout(parm.found_context, iface_name, now);
*up = context->next; *up = context->next;
free(context); free(context);
} }
@@ -636,8 +643,10 @@ static int add_prefixes(struct in6_addr *local, int prefix,
off_link = (context->flags & CONTEXT_RA_OFF_LINK); off_link = (context->flags & CONTEXT_RA_OFF_LINK);
} }
param->first = 0; param->first = 0;
param->found_context = 1; /* found_context is the _last_ one we found, so if there's
more than one, it's not the first. */
param->found_context = context;
} }
/* configured time is ceiling */ /* configured time is ceiling */