mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-17 19:31:09 +00:00
Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
00238fb019 | ||
|
|
74e6b52011 | ||
|
|
875b8160f6 | ||
|
|
76ff440ebe | ||
|
|
8db957dfbf |
No files matched your search
@@ -4,6 +4,9 @@ version 2.69
|
|||||||
on the BSD platform. Thanks to Matthias Andree for
|
on the BSD platform. Thanks to Matthias Andree for
|
||||||
valuable research on how to implement this.
|
valuable research on how to implement this.
|
||||||
|
|
||||||
|
Fix infinite loop associated with some --bogus-nxdomain
|
||||||
|
configs. Thanks fogobogo for the bug report.
|
||||||
|
|
||||||
|
|
||||||
version 2.68
|
version 2.68
|
||||||
Use random addresses for DHCPv6 temporary address
|
Use random addresses for DHCPv6 temporary address
|
||||||
|
|||||||
+7
-7
@@ -399,13 +399,13 @@ void dhcp_update_configs(struct dhcp_config *configs)
|
|||||||
if (cache_find_by_name(crec, config->hostname, 0, cacheflags))
|
if (cache_find_by_name(crec, config->hostname, 0, cacheflags))
|
||||||
{
|
{
|
||||||
/* use primary (first) address */
|
/* use primary (first) address */
|
||||||
while (crec && !(crec->flags & F_REVERSE))
|
while (crec && !(crec->flags & F_REVERSE))
|
||||||
crec = cache_find_by_name(crec, config->hostname, 0, cacheflags);
|
crec = cache_find_by_name(crec, config->hostname, 0, cacheflags);
|
||||||
if (!crec)
|
if (!crec)
|
||||||
continue; /* should be never */
|
continue; /* should be never */
|
||||||
inet_ntop(prot, &crec->addr.addr, daemon->addrbuff, ADDRSTRLEN);
|
inet_ntop(prot, &crec->addr.addr, daemon->addrbuff, ADDRSTRLEN);
|
||||||
my_syslog(MS_DHCP | LOG_WARNING, _("%s has more than one address in hostsfile, using %s for DHCP"),
|
my_syslog(MS_DHCP | LOG_WARNING, _("%s has more than one address in hostsfile, using %s for DHCP"),
|
||||||
config->hostname, daemon->addrbuff);
|
config->hostname, daemon->addrbuff);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prot == AF_INET &&
|
if (prot == AF_INET &&
|
||||||
|
|||||||
+1
-1
@@ -561,7 +561,7 @@ struct dhcp_lease {
|
|||||||
struct in6_addr addr6;
|
struct in6_addr addr6;
|
||||||
int iaid;
|
int iaid;
|
||||||
struct slaac_address {
|
struct slaac_address {
|
||||||
struct in6_addr addr, local;
|
struct in6_addr addr;
|
||||||
time_t ping_time;
|
time_t ping_time;
|
||||||
int backoff; /* zero -> confirmed */
|
int backoff; /* zero -> confirmed */
|
||||||
struct slaac_address *next;
|
struct slaac_address *next;
|
||||||
|
|||||||
+5
-3
@@ -2732,7 +2732,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
char *cp, *lastp = NULL, last = 0;
|
char *cp, *lastp = NULL, last = 0;
|
||||||
int fac = 1;
|
int fac = 1, isdig = 0;
|
||||||
|
|
||||||
if (strlen(a[j]) > 1)
|
if (strlen(a[j]) > 1)
|
||||||
{
|
{
|
||||||
@@ -2763,7 +2763,9 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (cp = a[j]; *cp; cp++)
|
for (cp = a[j]; *cp; cp++)
|
||||||
if (!isdigit((unsigned char)*cp) && *cp != ' ')
|
if (isdigit((unsigned char)*cp))
|
||||||
|
isdig = 1;
|
||||||
|
else if (*cp != ' ')
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (*cp)
|
if (*cp)
|
||||||
@@ -2787,7 +2789,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
new->domain = strip_hostname(new->hostname);
|
new->domain = strip_hostname(new->hostname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else if (isdig)
|
||||||
{
|
{
|
||||||
new->lease_time = atoi(a[j]) * fac;
|
new->lease_time = atoi(a[j]) * fac;
|
||||||
/* Leases of a minute or less confuse
|
/* Leases of a minute or less confuse
|
||||||
|
|||||||
+1
-1
@@ -1283,7 +1283,7 @@ int check_for_bogus_wildcard(struct dns_header *header, size_t qlen, char *name,
|
|||||||
/* Found a bogus address. Insert that info here, since there no SOA record
|
/* Found a bogus address. Insert that info here, since there no SOA record
|
||||||
to get the ttl from in the normal processing */
|
to get the ttl from in the normal processing */
|
||||||
cache_start_insert();
|
cache_start_insert();
|
||||||
cache_insert(name, NULL, now, ttl, F_IPV4 | F_FORWARD | F_NEG | F_NXDOMAIN | F_CONFIG);
|
cache_insert(name, NULL, now, ttl, F_IPV4 | F_FORWARD | F_NEG | F_NXDOMAIN);
|
||||||
cache_end_insert();
|
cache_end_insert();
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
@@ -93,7 +93,6 @@ void slaac_add_addrs(struct dhcp_lease *lease, time_t now, int force)
|
|||||||
slaac->ping_time = now;
|
slaac->ping_time = now;
|
||||||
slaac->backoff = 1;
|
slaac->backoff = 1;
|
||||||
slaac->addr = addr;
|
slaac->addr = addr;
|
||||||
slaac->local = context->local6;
|
|
||||||
/* Do RA's to prod it */
|
/* Do RA's to prod it */
|
||||||
ra_start_unsolicted(now, context);
|
ra_start_unsolicted(now, context);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user