mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-21 20:01:54 +00:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
89382bacaa | ||
|
|
6c559c34df | ||
|
|
adaa6888dd |
No files matched your search
@@ -74,6 +74,9 @@ version 2.61
|
|||||||
using the settings provided for DHCP options
|
using the settings provided for DHCP options
|
||||||
option6:domain-search and option6:dns-server.
|
option6:domain-search and option6:dns-server.
|
||||||
|
|
||||||
|
Tweak logo/favicon.ico to add some transparency. Thanks to
|
||||||
|
SamLT for work on this.
|
||||||
|
|
||||||
|
|
||||||
version 2.60
|
version 2.60
|
||||||
Fix compilation problem in Mac OS X Lion. Thanks to Olaf
|
Fix compilation problem in Mac OS X Lion. Thanks to Olaf
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -1128,9 +1128,10 @@ msgstr "DHCP, Proxy im Subnetz %.0s%s%.0s"
|
|||||||
msgid "DHCP, IP range %s -- %s, lease time %s"
|
msgid "DHCP, IP range %s -- %s, lease time %s"
|
||||||
msgstr "DHCP, IP-Bereich %s - %s, Lease-Zeit %s "
|
msgstr "DHCP, IP-Bereich %s - %s, Lease-Zeit %s "
|
||||||
|
|
||||||
|
# FIXME: this and the next few must be full strings to be translatable - do not assemble in code"
|
||||||
#: dnsmasq.c:588
|
#: dnsmasq.c:588
|
||||||
msgid "root is "
|
msgid "root is "
|
||||||
msgstr "FIXME: this and the next few must be full strings to be translatable - do not assemble in code"
|
msgstr ""
|
||||||
|
|
||||||
#: dnsmasq.c:588
|
#: dnsmasq.c:588
|
||||||
msgid "enabled"
|
msgid "enabled"
|
||||||
|
|||||||
+9
-6
@@ -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)
|
|||||||
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)
|
|||||||
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 &&
|
||||||
|
|||||||
Reference in new issue
Block a user