mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-19 19:51:01 +00:00
Compare commits
3
Commits
v2.62test1
...
v2.62test4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8767ceecd4 | ||
|
|
18c63eff8f | ||
|
|
c64b7f6a78 |
No files matched your search
@@ -8,6 +8,14 @@ version 2.62
|
|||||||
advertisements with some configurations. Thanks to
|
advertisements with some configurations. Thanks to
|
||||||
Vladislav Grishenko for the patch.
|
Vladislav Grishenko for the patch.
|
||||||
|
|
||||||
|
Fixed bug which broke DHCPv6/RA with prefix lengths
|
||||||
|
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
|
version 2.61
|
||||||
Re-write interface discovery code on *BSD to use
|
Re-write interface discovery code on *BSD to use
|
||||||
|
|||||||
+1
-1
@@ -407,7 +407,7 @@ static int join_multicast_worker(struct in6_addr *local, int prefix,
|
|||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
/* weird libvirt-inspired access control */
|
/* weird libvirt-inspired access control */
|
||||||
for (context = daemon->dhcp6; context; context = context->next)
|
for (context = daemon->ra_contexts; context; context = context->next)
|
||||||
if (!context->interface || strcmp(context->interface, ifrn_name) == 0)
|
if (!context->interface || strcmp(context->interface, ifrn_name) == 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
+1
-4
@@ -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))
|
||||||
{
|
|
||||||
if (FD_ISSET(daemon->dhcp6fd, &rset))
|
|
||||||
dhcp6_packet(now);
|
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
|
||||||
|
|||||||
+1
-1
@@ -158,7 +158,7 @@ void icmp6_packet(void)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
/* weird libvirt-inspired access control */
|
/* weird libvirt-inspired access control */
|
||||||
for (context = daemon->dhcp6; context; context = context->next)
|
for (context = daemon->ra_contexts; context; context = context->next)
|
||||||
if (!context->interface || strcmp(context->interface, interface) == 0)
|
if (!context->interface || strcmp(context->interface, interface) == 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -330,7 +330,7 @@ int is_same_net6(struct in6_addr *a, struct in6_addr *b, int prefixlen)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (pfbits == 0 ||
|
if (pfbits == 0 ||
|
||||||
(a->s6_addr[pfbytes] >> (8 - pfbits) != b->s6_addr[pfbytes] >> (8 - pfbits)))
|
(a->s6_addr[pfbytes] >> (8 - pfbits) == b->s6_addr[pfbytes] >> (8 - pfbits)))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Reference in new issue
Block a user