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

Fixed missing periodic-ras in some configurations.

Browse Source
This commit is contained in:
Simon Kelley
2012-05-12 15:23:09 +01:00
parent f632e56793
commit 919dd7cf14
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -4,6 +4,10 @@ version 2.62
Cope with router-solict packets wich don't have a valid Cope with router-solict packets wich don't have a valid
source address. Thanks to Vladislav Grishenko for the patch. source address. Thanks to Vladislav Grishenko for the patch.
Fixed bug which caused missing periodic router
advertisements with some configurations. Thanks to
Vladislav Grishenko for the patch.
version 2.61 version 2.61
Re-write interface discovery code on *BSD to use Re-write interface discovery code on *BSD to use

15
src/lease.c
View File

@@ -310,12 +310,19 @@ void lease_update_file(time_t now)
/* do timed RAs and determine when the next is, also pings to potential SLAAC addresses */ /* do timed RAs and determine when the next is, also pings to potential SLAAC addresses */
if (daemon->ra_contexts) if (daemon->ra_contexts)
{ {
time_t ra_event = periodic_slaac(now, leases); time_t event;
next_event = periodic_ra(now); if ((event = periodic_slaac(now, leases)) != 0)
{
if (next_event == 0 || difftime(next_event, event) > 0.0)
next_event = event;
}
if (next_event == 0 || difftime(next_event, ra_event) > 0.0) if ((event = periodic_ra(now)) != 0)
next_event = ra_event; {
if (next_event == 0 || difftime(next_event, event) > 0.0)
next_event = event;
}
} }
#endif #endif