Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-20 02:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-response to router-solicitations when

Browse Source 
router-advertisement configured, but DHCPv6 not
configured.
This commit is contained in:
Simon Kelley
2012-05-21 14:34:15 +01:00
parent c64b7f6a78
commit 18c63eff8f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -12,6 +12,10 @@ version 2.62
which are not divisible by 8. Thanks to Andre Coetzee which are not divisible by 8. Thanks to Andre Coetzee
for spotting this. for spotting this.
Fix non-response to router-solicitations when
router-advertisement configured, but DHCPv6 not
configured. Thanks to Marien Zwart 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

11
src/dnsmasq.c
View File

@@ -849,14 +849,11 @@ int main (int argc, char **argv)
} }
#ifdef HAVE_DHCP6 #ifdef HAVE_DHCP6
if (daemon->dhcp6) if (daemon->dhcp6 && FD_ISSET(daemon->dhcp6fd, &rset))
{ dhcp6_packet(now);
if (FD_ISSET(daemon->dhcp6fd, &rset))
dhcp6_packet(now);
if (daemon->ra_contexts && FD_ISSET(daemon->icmp6fd, &rset)) if (daemon->ra_contexts && FD_ISSET(daemon->icmp6fd, &rset))
icmp6_packet(); icmp6_packet();
}
#endif #endif
# ifdef HAVE_SCRIPT # ifdef HAVE_SCRIPT