diff options
author | Simon Kelley <simon@thekelleys.org.uk> | 2012-05-21 14:34:15 +0100 |
---|---|---|
committer | Simon Kelley <simon@thekelleys.org.uk> | 2012-05-21 14:34:15 +0100 |
commit | 18c63eff8f14473da47b33dcc92494dae40474a2 (patch) | |
tree | 27c64912aec5832b665b41b3a9ce3cbb79c256ba | |
parent | c64b7f6a7828b74a13836aee84f5bcdc30fb374e (diff) | |
download | dnsmasq-2.62test3.tar.gz |
Fix non-response to router-solicitations whenv2.62test3
router-advertisement configured, but DHCPv6 not
configured.
-rw-r--r-- | CHANGELOG | 4 | ||||
-rw-r--r-- | src/dnsmasq.c | 11 |
2 files changed, 8 insertions, 7 deletions
@@ -12,6 +12,10 @@ version 2.62 which are not divisible by 8. Thanks to Andre Coetzee 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 Re-write interface discovery code on *BSD to use diff --git a/src/dnsmasq.c b/src/dnsmasq.c index 1b951f0..a6237ba 100644 --- a/src/dnsmasq.c +++ b/src/dnsmasq.c @@ -849,14 +849,11 @@ int main (int argc, char **argv) } #ifdef HAVE_DHCP6 - if (daemon->dhcp6) - { - if (FD_ISSET(daemon->dhcp6fd, &rset)) - dhcp6_packet(now); + if (daemon->dhcp6 && FD_ISSET(daemon->dhcp6fd, &rset)) + dhcp6_packet(now); - if (daemon->ra_contexts && FD_ISSET(daemon->icmp6fd, &rset)) - icmp6_packet(); - } + if (daemon->ra_contexts && FD_ISSET(daemon->icmp6fd, &rset)) + icmp6_packet(); #endif # ifdef HAVE_SCRIPT |