Skip to content

D
Dnsmasq
Commit 89382bac authored by Simon Kelley's avatar Simon Kelley
Browse files
Options

Tweak sending ICMP6 echo requests for slaac.

parent 6c559c34
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
src/slaac.c
View file @ 89382bac
...@@ -139,7 +139,6 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases) ...@@ -139,7 +139,6 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases)
{ {
struct ping_packet *ping; struct ping_packet *ping;
struct sockaddr_in6 addr; struct sockaddr_in6 addr;
int err;
save_counter(0); save_counter(0);
ping = expand(sizeof(struct ping_packet)); ping = expand(sizeof(struct ping_packet));
...@@ -156,9 +155,15 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases) ...@@ -156,9 +155,15 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases)
addr.sin6_port = htons(IPPROTO_ICMPV6); addr.sin6_port = htons(IPPROTO_ICMPV6);
addr.sin6_addr = slaac->addr; addr.sin6_addr = slaac->addr;
if (send_from(daemon->icmp6fd, 0, daemon->outpacket.iov_base, save_counter(0), if (sendto(daemon->icmp6fd, daemon->outpacket.iov_base, save_counter(0), 0,
(union mysockaddr *)&addr, (struct all_addr *)&slaac->local, (struct sockaddr *)&addr, sizeof(addr)) == -1 &&
lease->last_interface, &err)) errno == EHOSTUNREACH)
{
slaac->ping_time = 0; /* Give up */
inet_ntop(AF_INET6, &addr, daemon->addrbuff, ADDRSTRLEN);
my_syslog(MS_DHCP | LOG_INFO, "SLAAC-HOSTUNREACH %s", daemon->addrbuff);
}
else
{ {
slaac->ping_time += (1 << (slaac->backoff - 1)) + (rand16()/21785); /* 0 - 3 */ slaac->ping_time += (1 << (slaac->backoff - 1)) + (rand16()/21785); /* 0 - 3 */
if (slaac->backoff > 4) if (slaac->backoff > 4)
...@@ -166,8 +171,6 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases) ...@@ -166,8 +171,6 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases)
if (slaac->backoff < 12) if (slaac->backoff < 12)
slaac->backoff++; slaac->backoff++;
} }
else if (err == EHOSTUNREACH)
slaac->ping_time = 0; /* Give up */
} }
if (slaac->ping_time != 0 && if (slaac->ping_time != 0 &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment