mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-19 19:51:01 +00:00
Compare commits
6
Commits
v2.61test4
...
v2.61test5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e759d426fa | ||
|
|
40ef23b547 | ||
|
|
f5e8562f96 | ||
|
|
1567feae3c | ||
|
|
daf061c9de | ||
|
|
d0e2c6c9ab |
No files matched your search
@@ -21,6 +21,9 @@ version 2.61
|
|||||||
|
|
||||||
Better logging of DHCPv6 options.
|
Better logging of DHCPv6 options.
|
||||||
|
|
||||||
|
Add --host-record. Thanks to Rob Zwissler for the
|
||||||
|
suggestion.
|
||||||
|
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
Vendored
+1
@@ -3,6 +3,7 @@ dnsmasq (2.61-1) unstable; urgency=low
|
|||||||
* New upstream.
|
* New upstream.
|
||||||
* Provide "dump-stats" initscript method. (closes: #654656)
|
* Provide "dump-stats" initscript method. (closes: #654656)
|
||||||
* Add (empty) build-indep and build-arch rules targets.
|
* Add (empty) build-indep and build-arch rules targets.
|
||||||
|
* Bump standards-version to 3.9.3
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 6 Mar 2012 19:45:43 +0000
|
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 6 Mar 2012 19:45:43 +0000
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-1
@@ -3,7 +3,7 @@ Section: net
|
|||||||
Priority: optional
|
Priority: optional
|
||||||
Build-depends: gettext, libnetfilter-conntrack-dev [linux-any], libidn11-dev, libdbus-1-dev (>=0.61)
|
Build-depends: gettext, libnetfilter-conntrack-dev [linux-any], libidn11-dev, libdbus-1-dev (>=0.61)
|
||||||
Maintainer: Simon Kelley <simon@thekelleys.org.uk>
|
Maintainer: Simon Kelley <simon@thekelleys.org.uk>
|
||||||
Standards-Version: 3.9.2
|
Standards-Version: 3.9.3
|
||||||
|
|
||||||
Package: dnsmasq
|
Package: dnsmasq
|
||||||
Architecture: all
|
Architecture: all
|
||||||
|
|||||||
@@ -416,6 +416,22 @@ zone files: the port, weight and priority numbers are in a different
|
|||||||
order. More than one SRV record for a given service/domain is allowed,
|
order. More than one SRV record for a given service/domain is allowed,
|
||||||
all that match are returned.
|
all that match are returned.
|
||||||
.TP
|
.TP
|
||||||
|
.B --host-record=<name>[,<name>....][<IPv4-address>],[IPv6-address]
|
||||||
|
Add A, AAAA and PTR records to the DNS. This adds one or more names to
|
||||||
|
the DNS with associated IPv4 (A) and IPv6 (AAAA) records. A name may
|
||||||
|
appear in more than one
|
||||||
|
.B host-record
|
||||||
|
and therefore be assigned more than one address. Only the first
|
||||||
|
address creates a PTR record linking the address to the name. This is
|
||||||
|
the same rule as is used reading hosts-files.
|
||||||
|
.B host-record
|
||||||
|
options are considered to be read before host-files, so a name
|
||||||
|
appearing there inhibits PTR-record creation if it appears in
|
||||||
|
hosts-file also. Unlike host-files, names are not expanded, even when
|
||||||
|
.B expand-hosts
|
||||||
|
is in effect. Short and long names may appear in the same
|
||||||
|
.B host-record, eg. --host-record=laptop,laptop.thekelleys.org,192.168.0.1,1234::100
|
||||||
|
.TP
|
||||||
.B \-Y, --txt-record=<name>[[,<text>],<text>]
|
.B \-Y, --txt-record=<name>[[,<text>],<text>]
|
||||||
Return a TXT DNS record. The value of TXT record is a set of strings,
|
Return a TXT DNS record. The value of TXT record is a set of strings,
|
||||||
so any number may be included, delimited by commas; use quotes to put
|
so any number may be included, delimited by commas; use quotes to put
|
||||||
|
|||||||
+41
-22
@@ -634,10 +634,11 @@ struct crec *cache_find_by_addr(struct crec *crecp, struct all_addr *addr,
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void add_hosts_entry(struct crec *cache, struct all_addr *addr, int addrlen,
|
static void add_hosts_entry(struct crec *cache, struct all_addr *addr, int addrlen,
|
||||||
unsigned short flags, int index, struct crec **rhash, int hashsz)
|
int index, struct crec **rhash, int hashsz)
|
||||||
{
|
{
|
||||||
struct crec *lookup = cache_find_by_name(NULL, cache->name.sname, 0, flags & (F_IPV4 | F_IPV6));
|
struct crec *lookup = cache_find_by_name(NULL, cache_get_name(cache), 0, cache->flags & (F_IPV4 | F_IPV6));
|
||||||
int i, nameexists = 0;
|
int i, nameexists = 0;
|
||||||
struct cname *a;
|
struct cname *a;
|
||||||
unsigned int j;
|
unsigned int j;
|
||||||
@@ -670,10 +671,10 @@ static void add_hosts_entry(struct crec *cache, struct all_addr *addr, int addrl
|
|||||||
j = (j*2 +((unsigned char *)addr)[i]) % hashsz;
|
j = (j*2 +((unsigned char *)addr)[i]) % hashsz;
|
||||||
|
|
||||||
for (lookup = rhash[j]; lookup; lookup = lookup->next)
|
for (lookup = rhash[j]; lookup; lookup = lookup->next)
|
||||||
if ((lookup->flags & flags & (F_IPV4 | F_IPV6)) &&
|
if ((lookup->flags & cache->flags & (F_IPV4 | F_IPV6)) &&
|
||||||
memcmp(&lookup->addr.addr, addr, addrlen) == 0)
|
memcmp(&lookup->addr.addr, addr, addrlen) == 0)
|
||||||
{
|
{
|
||||||
flags &= ~F_REVERSE;
|
cache->flags &= ~F_REVERSE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -684,7 +685,6 @@ static void add_hosts_entry(struct crec *cache, struct all_addr *addr, int addrl
|
|||||||
rhash[j] = cache;
|
rhash[j] = cache;
|
||||||
}
|
}
|
||||||
|
|
||||||
cache->flags = flags;
|
|
||||||
cache->uid = index;
|
cache->uid = index;
|
||||||
memcpy(&cache->addr.addr, addr, addrlen);
|
memcpy(&cache->addr.addr, addr, addrlen);
|
||||||
cache_hash(cache);
|
cache_hash(cache);
|
||||||
@@ -692,7 +692,7 @@ static void add_hosts_entry(struct crec *cache, struct all_addr *addr, int addrl
|
|||||||
/* don't need to do alias stuff for second and subsequent addresses. */
|
/* don't need to do alias stuff for second and subsequent addresses. */
|
||||||
if (!nameexists)
|
if (!nameexists)
|
||||||
for (a = daemon->cnames; a; a = a->next)
|
for (a = daemon->cnames; a; a = a->next)
|
||||||
if (hostname_isequal(cache->name.sname, a->target) &&
|
if (hostname_isequal(cache_get_name(cache), a->target) &&
|
||||||
(lookup = whine_malloc(sizeof(struct crec))))
|
(lookup = whine_malloc(sizeof(struct crec))))
|
||||||
{
|
{
|
||||||
lookup->flags = F_FORWARD | F_IMMORTAL | F_NAMEP | F_HOSTS | F_CNAME;
|
lookup->flags = F_FORWARD | F_IMMORTAL | F_NAMEP | F_HOSTS | F_CNAME;
|
||||||
@@ -771,26 +771,19 @@ static int read_hostsfile(char *filename, int index, int cache_size, struct crec
|
|||||||
{
|
{
|
||||||
lineno++;
|
lineno++;
|
||||||
|
|
||||||
#ifdef HAVE_IPV6
|
|
||||||
if (inet_pton(AF_INET, token, &addr) > 0)
|
if (inet_pton(AF_INET, token, &addr) > 0)
|
||||||
{
|
{
|
||||||
flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV4;
|
flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV4;
|
||||||
addrlen = INADDRSZ;
|
addrlen = INADDRSZ;
|
||||||
domain_suffix = get_domain(addr.addr.addr4);
|
domain_suffix = get_domain(addr.addr.addr4);
|
||||||
}
|
}
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
else if (inet_pton(AF_INET6, token, &addr) > 0)
|
else if (inet_pton(AF_INET6, token, &addr) > 0)
|
||||||
{
|
{
|
||||||
flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV6;
|
flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV6;
|
||||||
addrlen = IN6ADDRSZ;
|
addrlen = IN6ADDRSZ;
|
||||||
domain_suffix = get_domain6(&addr.addr.addr6);
|
domain_suffix = get_domain6(&addr.addr.addr6);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
if ((addr.addr.addr4.s_addr = inet_addr(token)) != (in_addr_t) -1)
|
|
||||||
{
|
|
||||||
flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV4;
|
|
||||||
addrlen = INADDRSZ;
|
|
||||||
domain_suffix = get_domain(addr.addr.addr4);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -830,13 +823,15 @@ static int read_hostsfile(char *filename, int index, int cache_size, struct crec
|
|||||||
strcpy(cache->name.sname, canon);
|
strcpy(cache->name.sname, canon);
|
||||||
strcat(cache->name.sname, ".");
|
strcat(cache->name.sname, ".");
|
||||||
strcat(cache->name.sname, domain_suffix);
|
strcat(cache->name.sname, domain_suffix);
|
||||||
add_hosts_entry(cache, &addr, addrlen, flags, index, rhash, hashsz);
|
cache->flags = flags;
|
||||||
|
add_hosts_entry(cache, &addr, addrlen, index, rhash, hashsz);
|
||||||
name_count++;
|
name_count++;
|
||||||
}
|
}
|
||||||
if ((cache = whine_malloc(sizeof(struct crec) + strlen(canon)+1-SMALLDNAME)))
|
if ((cache = whine_malloc(sizeof(struct crec) + strlen(canon)+1-SMALLDNAME)))
|
||||||
{
|
{
|
||||||
strcpy(cache->name.sname, canon);
|
strcpy(cache->name.sname, canon);
|
||||||
add_hosts_entry(cache, &addr, addrlen, flags, index, rhash, hashsz);
|
cache->flags = flags;
|
||||||
|
add_hosts_entry(cache, &addr, addrlen, index, rhash, hashsz);
|
||||||
name_count++;
|
name_count++;
|
||||||
}
|
}
|
||||||
free(canon);
|
free(canon);
|
||||||
@@ -860,6 +855,8 @@ void cache_reload(void)
|
|||||||
struct crec *cache, **up, *tmp;
|
struct crec *cache, **up, *tmp;
|
||||||
int revhashsz, i, total_size = daemon->cachesize;
|
int revhashsz, i, total_size = daemon->cachesize;
|
||||||
struct hostsfile *ah;
|
struct hostsfile *ah;
|
||||||
|
struct host_record *hr;
|
||||||
|
struct name_list *nl;
|
||||||
|
|
||||||
cache_inserted = cache_live_freed = 0;
|
cache_inserted = cache_live_freed = 0;
|
||||||
|
|
||||||
@@ -886,6 +883,34 @@ void cache_reload(void)
|
|||||||
up = &cache->hash_next;
|
up = &cache->hash_next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* borrow the packet buffer for a temporary by-address hash */
|
||||||
|
memset(daemon->packet, 0, daemon->packet_buff_sz);
|
||||||
|
revhashsz = daemon->packet_buff_sz / sizeof(struct crec *);
|
||||||
|
/* we overwrote the buffer... */
|
||||||
|
daemon->srv_save = NULL;
|
||||||
|
|
||||||
|
/* Do host_records in config. */
|
||||||
|
for (hr = daemon->host_records; hr; hr = hr->next)
|
||||||
|
for (nl = hr->names; nl; nl = nl->next)
|
||||||
|
{
|
||||||
|
if (hr->addr.s_addr != 0 &&
|
||||||
|
(cache = whine_malloc(sizeof(struct crec))))
|
||||||
|
{
|
||||||
|
cache->name.namep = nl->name;
|
||||||
|
cache->flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV4 | F_NAMEP | F_CONFIG;
|
||||||
|
add_hosts_entry(cache, (struct all_addr *)&hr->addr, INADDRSZ, 0, (struct crec **)daemon->packet, revhashsz);
|
||||||
|
}
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
if (!IN6_IS_ADDR_UNSPECIFIED(&hr->addr6) &&
|
||||||
|
(cache = whine_malloc(sizeof(struct crec))))
|
||||||
|
{
|
||||||
|
cache->name.namep = nl->name;
|
||||||
|
cache->flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV6 | F_NAMEP | F_CONFIG;
|
||||||
|
add_hosts_entry(cache, (struct all_addr *)&hr->addr6, IN6ADDRSZ, 0, (struct crec **)daemon->packet, revhashsz);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
if (option_bool(OPT_NO_HOSTS) && !daemon->addn_hosts)
|
if (option_bool(OPT_NO_HOSTS) && !daemon->addn_hosts)
|
||||||
{
|
{
|
||||||
if (daemon->cachesize > 0)
|
if (daemon->cachesize > 0)
|
||||||
@@ -893,12 +918,6 @@ void cache_reload(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* borrow the packet buffer for a temporary by-address hash */
|
|
||||||
memset(daemon->packet, 0, daemon->packet_buff_sz);
|
|
||||||
revhashsz = daemon->packet_buff_sz / sizeof(struct crec *);
|
|
||||||
/* we overwrote the buffer... */
|
|
||||||
daemon->srv_save = NULL;
|
|
||||||
|
|
||||||
if (!option_bool(OPT_NO_HOSTS))
|
if (!option_bool(OPT_NO_HOSTS))
|
||||||
total_size = read_hostsfile(HOSTSFILE, 0, total_size, (struct crec **)daemon->packet, revhashsz);
|
total_size = read_hostsfile(HOSTSFILE, 0, total_size, (struct crec **)daemon->packet, revhashsz);
|
||||||
|
|
||||||
|
|||||||
@@ -444,4 +444,305 @@ void join_multicast(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
static const struct opttab_t {
|
||||||
|
char *name;
|
||||||
|
u16 val, size;
|
||||||
|
} opttab[] = {
|
||||||
|
{ "netmask", 1, OT_ADDR_LIST },
|
||||||
|
{ "time-offset", 2, 4 },
|
||||||
|
{ "router", 3, OT_ADDR_LIST },
|
||||||
|
{ "dns-server", 6, OT_ADDR_LIST },
|
||||||
|
{ "log-server", 7, OT_ADDR_LIST },
|
||||||
|
{ "lpr-server", 9, OT_ADDR_LIST },
|
||||||
|
{ "hostname", 12, OT_INTERNAL | OT_NAME },
|
||||||
|
{ "boot-file-size", 13, 2 | OT_DEC },
|
||||||
|
{ "domain-name", 15, OT_NAME },
|
||||||
|
{ "swap-server", 16, OT_ADDR_LIST },
|
||||||
|
{ "root-path", 17, OT_NAME },
|
||||||
|
{ "extension-path", 18, OT_NAME },
|
||||||
|
{ "ip-forward-enable", 19, 1 },
|
||||||
|
{ "non-local-source-routing", 20, 1 },
|
||||||
|
{ "policy-filter", 21, OT_ADDR_LIST },
|
||||||
|
{ "max-datagram-reassembly", 22, 2 | OT_DEC },
|
||||||
|
{ "default-ttl", 23, 1 | OT_DEC },
|
||||||
|
{ "mtu", 26, 2 | OT_DEC },
|
||||||
|
{ "all-subnets-local", 27, 1 },
|
||||||
|
{ "broadcast", 28, OT_INTERNAL | OT_ADDR_LIST },
|
||||||
|
{ "router-discovery", 31, 1 },
|
||||||
|
{ "router-solicitation", 32, OT_ADDR_LIST },
|
||||||
|
{ "static-route", 33, OT_ADDR_LIST },
|
||||||
|
{ "trailer-encapsulation", 34, 1 },
|
||||||
|
{ "arp-timeout", 35, 4 | OT_DEC },
|
||||||
|
{ "ethernet-encap", 36, 1 },
|
||||||
|
{ "tcp-ttl", 37, 1 },
|
||||||
|
{ "tcp-keepalive", 38, 4 | OT_DEC },
|
||||||
|
{ "nis-domain", 40, OT_NAME },
|
||||||
|
{ "nis-server", 41, OT_ADDR_LIST },
|
||||||
|
{ "ntp-server", 42, OT_ADDR_LIST },
|
||||||
|
{ "vendor-encap", 43, OT_INTERNAL },
|
||||||
|
{ "netbios-ns", 44, OT_ADDR_LIST },
|
||||||
|
{ "netbios-dd", 45, OT_ADDR_LIST },
|
||||||
|
{ "netbios-nodetype", 46, 1 },
|
||||||
|
{ "netbios-scope", 47, 0 },
|
||||||
|
{ "x-windows-fs", 48, OT_ADDR_LIST },
|
||||||
|
{ "x-windows-dm", 49, OT_ADDR_LIST },
|
||||||
|
{ "requested-address", 50, OT_INTERNAL | OT_ADDR_LIST },
|
||||||
|
{ "lease-time", 51, OT_INTERNAL | OT_DEC },
|
||||||
|
{ "option-overload", 52, OT_INTERNAL },
|
||||||
|
{ "message-type", 53, OT_INTERNAL | OT_DEC },
|
||||||
|
{ "server-identifier", 54, OT_INTERNAL | OT_ADDR_LIST },
|
||||||
|
{ "parameter-request", 55, OT_INTERNAL },
|
||||||
|
{ "message", 56, OT_INTERNAL },
|
||||||
|
{ "max-message-size", 57, OT_INTERNAL },
|
||||||
|
{ "T1", 58, OT_INTERNAL | OT_DEC},
|
||||||
|
{ "T2", 59, OT_INTERNAL | OT_DEC},
|
||||||
|
{ "vendor-class", 60, 0 },
|
||||||
|
{ "client-id", 61, OT_INTERNAL },
|
||||||
|
{ "nis+-domain", 64, OT_NAME },
|
||||||
|
{ "nis+-server", 65, OT_ADDR_LIST },
|
||||||
|
{ "tftp-server", 66, OT_NAME },
|
||||||
|
{ "bootfile-name", 67, OT_NAME },
|
||||||
|
{ "mobile-ip-home", 68, OT_ADDR_LIST },
|
||||||
|
{ "smtp-server", 69, OT_ADDR_LIST },
|
||||||
|
{ "pop3-server", 70, OT_ADDR_LIST },
|
||||||
|
{ "nntp-server", 71, OT_ADDR_LIST },
|
||||||
|
{ "irc-server", 74, OT_ADDR_LIST },
|
||||||
|
{ "user-class", 77, 0 },
|
||||||
|
{ "FQDN", 81, OT_INTERNAL },
|
||||||
|
{ "agent-id", 82, OT_INTERNAL },
|
||||||
|
{ "client-arch", 93, 2 | OT_DEC },
|
||||||
|
{ "client-interface-id", 94, 0 },
|
||||||
|
{ "client-machine-id", 97, 0 },
|
||||||
|
{ "subnet-select", 118, OT_INTERNAL },
|
||||||
|
{ "domain-search", 119, OT_RFC1035_NAME },
|
||||||
|
{ "sip-server", 120, 0 },
|
||||||
|
{ "classless-static-route", 121, 0 },
|
||||||
|
{ "vendor-id-encap", 125, 0 },
|
||||||
|
{ "server-ip-address", 255, OT_ADDR_LIST }, /* special, internal only, sets siaddr */
|
||||||
|
{ NULL, 0, 0 }
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
static const struct opttab_t opttab6[] = {
|
||||||
|
{ "client-id", 1, OT_INTERNAL },
|
||||||
|
{ "server-id", 2, OT_INTERNAL },
|
||||||
|
{ "ia-na", 3, OT_INTERNAL },
|
||||||
|
{ "ia-ta", 4, OT_INTERNAL },
|
||||||
|
{ "iaaddr", 5, OT_INTERNAL },
|
||||||
|
{ "oro", 6, OT_INTERNAL },
|
||||||
|
{ "preference", 7, OT_INTERNAL | OT_DEC },
|
||||||
|
{ "unicast", 12, OT_INTERNAL },
|
||||||
|
{ "status", 13, OT_INTERNAL },
|
||||||
|
{ "rapid-commit", 14, OT_INTERNAL },
|
||||||
|
{ "user-class", 15, OT_INTERNAL | OT_CSTRING },
|
||||||
|
{ "vendor-class", 16, OT_INTERNAL | OT_CSTRING },
|
||||||
|
{ "vendor-opts", 17, OT_INTERNAL },
|
||||||
|
{ "sip-server-domain", 21, OT_RFC1035_NAME },
|
||||||
|
{ "sip-server", 22, OT_ADDR_LIST },
|
||||||
|
{ "dns-server", 23, OT_ADDR_LIST },
|
||||||
|
{ "domain-search", 24, OT_RFC1035_NAME },
|
||||||
|
{ "nis-server", 27, OT_ADDR_LIST },
|
||||||
|
{ "nis+-server", 28, OT_ADDR_LIST },
|
||||||
|
{ "nis-domain", 29, OT_RFC1035_NAME },
|
||||||
|
{ "nis+-domain", 30, OT_RFC1035_NAME },
|
||||||
|
{ "sntp-server", 31, OT_ADDR_LIST },
|
||||||
|
{ "FQDN", 39, OT_INTERNAL | OT_RFC1035_NAME },
|
||||||
|
{ "ntp-server", 56, OT_ADDR_LIST },
|
||||||
|
{ "bootfile-url", 59, OT_NAME },
|
||||||
|
{ "bootfile-param", 60, OT_CSTRING },
|
||||||
|
{ NULL, 0, 0 }
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void display_opts(void)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
printf(_("Known DHCP options:\n"));
|
||||||
|
|
||||||
|
for (i = 0; opttab[i].name; i++)
|
||||||
|
if (!(opttab[i].size & OT_INTERNAL))
|
||||||
|
printf("%3d %s\n", opttab[i].val, opttab[i].name);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
void display_opts6(void)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
printf(_("Known DHCPv6 options:\n"));
|
||||||
|
|
||||||
|
for (i = 0; opttab6[i].name; i++)
|
||||||
|
if (!(opttab6[i].size & OT_INTERNAL))
|
||||||
|
printf("%3d %s\n", opttab6[i].val, opttab6[i].name);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
u16 lookup_dhcp_opt(int prot, char *name)
|
||||||
|
{
|
||||||
|
const struct opttab_t *t;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
if (prot == AF_INET6)
|
||||||
|
t = opttab6;
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
t = opttab;
|
||||||
|
|
||||||
|
for (i = 0; t[i].name; i++)
|
||||||
|
if (!(t[i].size & OT_INTERNAL) &&
|
||||||
|
strcasecmp(t[i].name, name) == 0)
|
||||||
|
return t[i].val;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
u16 lookup_dhcp_len(int prot, u16 val)
|
||||||
|
{
|
||||||
|
const struct opttab_t *t;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
if (prot == AF_INET6)
|
||||||
|
t = opttab6;
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
t = opttab;
|
||||||
|
|
||||||
|
for (i = 0; t[i].name; i++)
|
||||||
|
if (val == t[i].val)
|
||||||
|
{
|
||||||
|
if (t[i].size & OT_INTERNAL)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return t[i].size & ~OT_DEC;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *option_string(int prot, unsigned int opt, unsigned char *val, int opt_len, char *buf, int buf_len)
|
||||||
|
{
|
||||||
|
int o, i, j, nodecode = 0;
|
||||||
|
const struct opttab_t *ot = opttab;
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
if (prot == AF_INET6)
|
||||||
|
ot = opttab6;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
for (o = 0; ot[o].name; o++)
|
||||||
|
if (ot[o].val == opt)
|
||||||
|
{
|
||||||
|
if (buf)
|
||||||
|
{
|
||||||
|
memset(buf, 0, buf_len);
|
||||||
|
|
||||||
|
if (ot[o].size & OT_ADDR_LIST)
|
||||||
|
{
|
||||||
|
struct all_addr addr;
|
||||||
|
int addr_len = INADDRSZ;
|
||||||
|
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
if (prot == AF_INET6)
|
||||||
|
addr_len = IN6ADDRSZ;
|
||||||
|
#endif
|
||||||
|
for (buf[0]= 0, i = 0; i <= opt_len - addr_len; i += addr_len)
|
||||||
|
{
|
||||||
|
if (i != 0)
|
||||||
|
strncat(buf, ", ", buf_len - strlen(buf));
|
||||||
|
/* align */
|
||||||
|
memcpy(&addr, &val[i], addr_len);
|
||||||
|
inet_ntop(prot, &val[i], daemon->addrbuff, ADDRSTRLEN);
|
||||||
|
strncat(buf, daemon->addrbuff, buf_len - strlen(buf));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (ot[o].size & OT_NAME)
|
||||||
|
for (i = 0, j = 0; i < opt_len && j < buf_len ; i++)
|
||||||
|
{
|
||||||
|
char c = val[i];
|
||||||
|
if (isprint((int)c))
|
||||||
|
buf[j++] = c;
|
||||||
|
}
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
|
/* We don't handle compressed rfc1035 names, so no good in IPv4 land */
|
||||||
|
else if ((ot[o].size & OT_RFC1035_NAME) && prot == AF_INET6)
|
||||||
|
{
|
||||||
|
i = 0, j = 0;
|
||||||
|
while (i < opt_len && val[i] != 0)
|
||||||
|
{
|
||||||
|
int k, l = i + val[i] + 1;
|
||||||
|
for (k = i + 1; k < opt_len && k < l && j < buf_len ; k++)
|
||||||
|
{
|
||||||
|
char c = val[k];
|
||||||
|
if (isprint((int)c))
|
||||||
|
buf[j++] = c;
|
||||||
|
}
|
||||||
|
i = l;
|
||||||
|
if (val[i] != 0 && j < buf_len)
|
||||||
|
buf[j++] = '.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if ((ot[o].size & OT_CSTRING))
|
||||||
|
{
|
||||||
|
int k, len;
|
||||||
|
unsigned char *p;
|
||||||
|
|
||||||
|
i = 0, j = 0;
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
p = &val[i];
|
||||||
|
GETSHORT(len, p);
|
||||||
|
for (k = 0; k < len && j < buf_len; k++)
|
||||||
|
{
|
||||||
|
char c = *p++;
|
||||||
|
if (isprint((int)c))
|
||||||
|
buf[j++] = c;
|
||||||
|
}
|
||||||
|
i += len +2;
|
||||||
|
if (i >= opt_len)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (j < buf_len)
|
||||||
|
buf[j++] = ',';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
else if ((ot[o].size & OT_DEC) && opt_len != 0)
|
||||||
|
{
|
||||||
|
unsigned int dec = 0;
|
||||||
|
|
||||||
|
for (i = 0; i < opt_len; i++)
|
||||||
|
dec = (dec << 8) | val[i];
|
||||||
|
|
||||||
|
sprintf(buf, "%u", dec);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
nodecode = 1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opt_len != 0 && buf && (!ot[o].name || nodecode))
|
||||||
|
{
|
||||||
|
int trunc = 0;
|
||||||
|
if (opt_len > 14)
|
||||||
|
{
|
||||||
|
trunc = 1;
|
||||||
|
opt_len = 14;
|
||||||
|
}
|
||||||
|
print_mac(buf, val, opt_len);
|
||||||
|
if (trunc)
|
||||||
|
strncat(buf, "...", buf_len - strlen(buf));
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return ot[o].name ? ot[o].name : "";
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
@@ -274,6 +274,18 @@ struct cname {
|
|||||||
struct cname *next;
|
struct cname *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct host_record {
|
||||||
|
struct name_list {
|
||||||
|
char *name;
|
||||||
|
struct name_list *next;
|
||||||
|
} *names;
|
||||||
|
struct in_addr addr;
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
struct in6_addr addr6;
|
||||||
|
#endif
|
||||||
|
struct host_record *next;
|
||||||
|
};
|
||||||
|
|
||||||
struct interface_name {
|
struct interface_name {
|
||||||
char *name; /* domain name */
|
char *name; /* domain name */
|
||||||
char *intr; /* interface name */
|
char *intr; /* interface name */
|
||||||
@@ -432,6 +444,15 @@ struct frec {
|
|||||||
struct frec *next;
|
struct frec *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* flags in top of length field for DHCP-option tables */
|
||||||
|
#define OT_ADDR_LIST 0x8000
|
||||||
|
#define OT_RFC1035_NAME 0x4000
|
||||||
|
#define OT_INTERNAL 0x2000
|
||||||
|
#define OT_NAME 0x1000
|
||||||
|
#define OT_CSTRING 0x0800
|
||||||
|
#define OT_DEC 0x0400
|
||||||
|
|
||||||
|
|
||||||
/* actions in the daemon->helper RPC */
|
/* actions in the daemon->helper RPC */
|
||||||
#define ACTION_DEL 1
|
#define ACTION_DEL 1
|
||||||
#define ACTION_OLD_HOSTNAME 2
|
#define ACTION_OLD_HOSTNAME 2
|
||||||
@@ -686,6 +707,7 @@ extern struct daemon {
|
|||||||
struct naptr *naptr;
|
struct naptr *naptr;
|
||||||
struct txt_record *txt;
|
struct txt_record *txt;
|
||||||
struct ptr_record *ptr;
|
struct ptr_record *ptr;
|
||||||
|
struct host_record *host_records, *host_records_tail;
|
||||||
struct cname *cnames;
|
struct cname *cnames;
|
||||||
struct interface_name *int_names;
|
struct interface_name *int_names;
|
||||||
char *mxtarget;
|
char *mxtarget;
|
||||||
@@ -1070,7 +1092,13 @@ void log_tags(struct dhcp_netid *netid, u32 xid);
|
|||||||
int match_bytes(struct dhcp_opt *o, unsigned char *p, int len);
|
int match_bytes(struct dhcp_opt *o, unsigned char *p, int len);
|
||||||
void dhcp_update_configs(struct dhcp_config *configs);
|
void dhcp_update_configs(struct dhcp_config *configs);
|
||||||
void check_dhcp_hosts(int fatal);
|
void check_dhcp_hosts(int fatal);
|
||||||
|
void display_opts(void);
|
||||||
|
u16 lookup_dhcp_opt(int prot, char *name);
|
||||||
|
u16 lookup_dhcp_len(int prot, u16 val);
|
||||||
|
char *option_string(int prot, unsigned int opt, unsigned char *val,
|
||||||
|
int opt_len, char *buf, int buf_len);
|
||||||
# ifdef HAVE_DHCP6
|
# ifdef HAVE_DHCP6
|
||||||
|
void display_opts6(void);
|
||||||
void join_multicast(void);
|
void join_multicast(void);
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+67
-291
@@ -116,6 +116,7 @@ struct myoption {
|
|||||||
#define LOPT_LUASCRIPT 305
|
#define LOPT_LUASCRIPT 305
|
||||||
#define LOPT_RA 306
|
#define LOPT_RA 306
|
||||||
#define LOPT_DUID 307
|
#define LOPT_DUID 307
|
||||||
|
#define LOPT_HOST_REC 308
|
||||||
|
|
||||||
#ifdef HAVE_GETOPT_LONG
|
#ifdef HAVE_GETOPT_LONG
|
||||||
static const struct option opts[] =
|
static const struct option opts[] =
|
||||||
@@ -237,6 +238,7 @@ static const struct myoption opts[] =
|
|||||||
{ "dhcp-luascript", 1, 0, LOPT_LUASCRIPT },
|
{ "dhcp-luascript", 1, 0, LOPT_LUASCRIPT },
|
||||||
{ "enable-ra", 0, 0, LOPT_RA },
|
{ "enable-ra", 0, 0, LOPT_RA },
|
||||||
{ "dhcp-duid", 1, 0, LOPT_DUID },
|
{ "dhcp-duid", 1, 0, LOPT_DUID },
|
||||||
|
{ "host-record", 1, 0, LOPT_HOST_REC },
|
||||||
{ NULL, 0, 0, 0 }
|
{ NULL, 0, 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -365,242 +367,10 @@ static struct {
|
|||||||
{ LOPT_FQDN, OPT_FQDN_UPDATE, NULL, gettext_noop("Allow DHCP clients to do their own DDNS updates."), NULL },
|
{ LOPT_FQDN, OPT_FQDN_UPDATE, NULL, gettext_noop("Allow DHCP clients to do their own DDNS updates."), NULL },
|
||||||
{ LOPT_RA, OPT_RA, NULL, gettext_noop("Send router-advertisements for interfaces doing DHCPv6"), NULL },
|
{ LOPT_RA, OPT_RA, NULL, gettext_noop("Send router-advertisements for interfaces doing DHCPv6"), NULL },
|
||||||
{ LOPT_DUID, ARG_ONE, "<enterprise>,<duid>", gettext_noop("Specify DUID_EN-type DHCPv6 server DUID"), NULL },
|
{ LOPT_DUID, ARG_ONE, "<enterprise>,<duid>", gettext_noop("Specify DUID_EN-type DHCPv6 server DUID"), NULL },
|
||||||
|
{ LOPT_HOST_REC, ARG_DUP, "<name>,<address>", gettext_noop("Specify host (A/AAAA and PTR) records"), NULL },
|
||||||
{ 0, 0, NULL, NULL, NULL }
|
{ 0, 0, NULL, NULL, NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef HAVE_DHCP
|
|
||||||
|
|
||||||
#define OT_ADDR_LIST 0x8000
|
|
||||||
#define OT_RFC1035_NAME 0x4000
|
|
||||||
#define OT_INTERNAL 0x2000
|
|
||||||
#define OT_NAME 0x1000
|
|
||||||
#define OT_CSTRING 0x0800
|
|
||||||
|
|
||||||
static const struct opttab_t {
|
|
||||||
char *name;
|
|
||||||
u16 val, size;
|
|
||||||
} opttab[] = {
|
|
||||||
{ "netmask", 1, OT_ADDR_LIST },
|
|
||||||
{ "time-offset", 2, 4 },
|
|
||||||
{ "router", 3, OT_ADDR_LIST },
|
|
||||||
{ "dns-server", 6, OT_ADDR_LIST },
|
|
||||||
{ "log-server", 7, OT_ADDR_LIST },
|
|
||||||
{ "lpr-server", 9, OT_ADDR_LIST },
|
|
||||||
{ "hostname", 12, OT_INTERNAL | OT_NAME },
|
|
||||||
{ "boot-file-size", 13, 2 },
|
|
||||||
{ "domain-name", 15, OT_NAME },
|
|
||||||
{ "swap-server", 16, OT_ADDR_LIST },
|
|
||||||
{ "root-path", 17, OT_NAME },
|
|
||||||
{ "extension-path", 18, OT_NAME },
|
|
||||||
{ "ip-forward-enable", 19, 1 },
|
|
||||||
{ "non-local-source-routing", 20, 1 },
|
|
||||||
{ "policy-filter", 21, OT_ADDR_LIST },
|
|
||||||
{ "max-datagram-reassembly", 22, 2 },
|
|
||||||
{ "default-ttl", 23, 1 },
|
|
||||||
{ "mtu", 26, 2 },
|
|
||||||
{ "all-subnets-local", 27, 1 },
|
|
||||||
{ "broadcast", 28, OT_INTERNAL | OT_ADDR_LIST },
|
|
||||||
{ "router-discovery", 31, 1 },
|
|
||||||
{ "router-solicitation", 32, OT_ADDR_LIST },
|
|
||||||
{ "static-route", 33, OT_ADDR_LIST },
|
|
||||||
{ "trailer-encapsulation", 34, 1 },
|
|
||||||
{ "arp-timeout", 35, 4 },
|
|
||||||
{ "ethernet-encap", 36, 1 },
|
|
||||||
{ "tcp-ttl", 37, 1 },
|
|
||||||
{ "tcp-keepalive", 38, 4 },
|
|
||||||
{ "nis-domain", 40, OT_NAME },
|
|
||||||
{ "nis-server", 41, OT_ADDR_LIST },
|
|
||||||
{ "ntp-server", 42, OT_ADDR_LIST },
|
|
||||||
{ "vendor-encap", 43, OT_INTERNAL },
|
|
||||||
{ "netbios-ns", 44, OT_ADDR_LIST },
|
|
||||||
{ "netbios-dd", 45, OT_ADDR_LIST },
|
|
||||||
{ "netbios-nodetype", 46, 1 },
|
|
||||||
{ "netbios-scope", 47, 0 },
|
|
||||||
{ "x-windows-fs", 48, OT_ADDR_LIST },
|
|
||||||
{ "x-windows-dm", 49, OT_ADDR_LIST },
|
|
||||||
{ "requested-address", 50, OT_INTERNAL | OT_ADDR_LIST },
|
|
||||||
{ "lease-time", 51, OT_INTERNAL },
|
|
||||||
{ "option-overload", 52, OT_INTERNAL },
|
|
||||||
{ "message-type", 53, OT_INTERNAL, },
|
|
||||||
{ "server-identifier", 54, OT_INTERNAL | OT_ADDR_LIST },
|
|
||||||
{ "parameter-request", 55, OT_INTERNAL },
|
|
||||||
{ "message", 56, OT_INTERNAL },
|
|
||||||
{ "max-message-size", 57, OT_INTERNAL },
|
|
||||||
{ "T1", 58, OT_INTERNAL },
|
|
||||||
{ "T2", 59, OT_INTERNAL },
|
|
||||||
{ "vendor-class", 60, 0 },
|
|
||||||
{ "client-id", 61, OT_INTERNAL },
|
|
||||||
{ "nis+-domain", 64, OT_NAME },
|
|
||||||
{ "nis+-server", 65, OT_ADDR_LIST },
|
|
||||||
{ "tftp-server", 66, OT_NAME },
|
|
||||||
{ "bootfile-name", 67, OT_NAME },
|
|
||||||
{ "mobile-ip-home", 68, OT_ADDR_LIST },
|
|
||||||
{ "smtp-server", 69, OT_ADDR_LIST },
|
|
||||||
{ "pop3-server", 70, OT_ADDR_LIST },
|
|
||||||
{ "nntp-server", 71, OT_ADDR_LIST },
|
|
||||||
{ "irc-server", 74, OT_ADDR_LIST },
|
|
||||||
{ "user-class", 77, 0 },
|
|
||||||
{ "FQDN", 81, OT_INTERNAL },
|
|
||||||
{ "agent-id", 82, OT_INTERNAL },
|
|
||||||
{ "client-arch", 93, 2 },
|
|
||||||
{ "client-interface-id", 94, 0 },
|
|
||||||
{ "client-machine-id", 97, 0 },
|
|
||||||
{ "subnet-select", 118, OT_INTERNAL },
|
|
||||||
{ "domain-search", 119, OT_RFC1035_NAME },
|
|
||||||
{ "sip-server", 120, 0 },
|
|
||||||
{ "classless-static-route", 121, 0 },
|
|
||||||
{ "vendor-id-encap", 125, 0 },
|
|
||||||
{ "server-ip-address", 255, OT_ADDR_LIST }, /* special, internal only, sets siaddr */
|
|
||||||
{ NULL, 0, 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
#ifdef HAVE_DHCP6
|
|
||||||
static const struct opttab_t opttab6[] = {
|
|
||||||
{ "client-id", 1, OT_INTERNAL },
|
|
||||||
{ "server-id", 2, OT_INTERNAL },
|
|
||||||
{ "ia-na", 3, OT_INTERNAL },
|
|
||||||
{ "ia-ta", 4, OT_INTERNAL },
|
|
||||||
{ "iaaddr", 5, OT_INTERNAL },
|
|
||||||
{ "oro", 6, OT_INTERNAL },
|
|
||||||
{ "preference", 7, OT_INTERNAL },
|
|
||||||
{ "unicast", 12, OT_INTERNAL },
|
|
||||||
{ "status-code", 13, OT_INTERNAL },
|
|
||||||
{ "rapid-commit", 14, OT_INTERNAL },
|
|
||||||
{ "user-class", 15, OT_INTERNAL | OT_CSTRING },
|
|
||||||
{ "vendor-class", 16, OT_INTERNAL | OT_CSTRING },
|
|
||||||
{ "vendor-opts", 17, OT_INTERNAL },
|
|
||||||
{ "sip-server-domain", 21, OT_RFC1035_NAME },
|
|
||||||
{ "sip-server", 22, OT_ADDR_LIST },
|
|
||||||
{ "dns-server", 23, OT_ADDR_LIST },
|
|
||||||
{ "domain-search", 24, OT_RFC1035_NAME },
|
|
||||||
{ "nis-server", 27, OT_ADDR_LIST },
|
|
||||||
{ "nis+-server", 28, OT_ADDR_LIST },
|
|
||||||
{ "nis-domain", 29, OT_RFC1035_NAME },
|
|
||||||
{ "nis+-domain", 30, OT_RFC1035_NAME },
|
|
||||||
{ "sntp-server", 31, OT_ADDR_LIST },
|
|
||||||
{ "FQDN", 39, OT_INTERNAL | OT_RFC1035_NAME },
|
|
||||||
{ "ntp-server", 56, OT_ADDR_LIST },
|
|
||||||
{ "bootfile-url", 59, OT_NAME },
|
|
||||||
{ "bootfile-param", 60, OT_CSTRING },
|
|
||||||
{ NULL, 0, 0 }
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
char *option_string(int prot, unsigned int opt, unsigned char *val, int opt_len, char *buf, int buf_len)
|
|
||||||
{
|
|
||||||
int o, i, j, nodecode = 0;
|
|
||||||
const struct opttab_t *ot = opttab;
|
|
||||||
|
|
||||||
#ifdef HAVE_DHCP6
|
|
||||||
if (prot == AF_INET6)
|
|
||||||
ot = opttab6;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (o = 0; ot[o].name; o++)
|
|
||||||
if (ot[o].val == opt)
|
|
||||||
{
|
|
||||||
if (buf)
|
|
||||||
{
|
|
||||||
memset(buf, 0, buf_len);
|
|
||||||
|
|
||||||
if (ot[o].size & OT_ADDR_LIST)
|
|
||||||
{
|
|
||||||
struct all_addr addr;
|
|
||||||
int addr_len = INADDRSZ;
|
|
||||||
|
|
||||||
#ifdef HAVE_DHCP6
|
|
||||||
if (prot == AF_INET6)
|
|
||||||
addr_len = IN6ADDRSZ;
|
|
||||||
#endif
|
|
||||||
for (buf[0]= 0, i = 0; i <= opt_len - addr_len; i += addr_len)
|
|
||||||
{
|
|
||||||
if (i != 0)
|
|
||||||
strncat(buf, ", ", buf_len - strlen(buf));
|
|
||||||
/* align */
|
|
||||||
memcpy(&addr, &val[i], addr_len);
|
|
||||||
inet_ntop(prot, &val[i], daemon->addrbuff, ADDRSTRLEN);
|
|
||||||
strncat(buf, daemon->addrbuff, buf_len - strlen(buf));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (ot[o].size & OT_NAME)
|
|
||||||
for (i = 0, j = 0; i < opt_len && j < buf_len ; i++)
|
|
||||||
{
|
|
||||||
char c = val[i];
|
|
||||||
if (isprint((int)c))
|
|
||||||
buf[j++] = c;
|
|
||||||
}
|
|
||||||
#ifdef HAVE_DHCP6
|
|
||||||
/* We don't handle compressed rfc1035 names, so no good in IPv4 land */
|
|
||||||
else if ((ot[o].size & OT_RFC1035_NAME) && prot == AF_INET6)
|
|
||||||
{
|
|
||||||
i = 0, j = 0;
|
|
||||||
while (i < opt_len && val[i] != 0)
|
|
||||||
{
|
|
||||||
int k, l = i + val[i] + 1;
|
|
||||||
for (k = i + 1; k < opt_len && k < l && j < buf_len ; k++)
|
|
||||||
{
|
|
||||||
char c = val[k];
|
|
||||||
if (isprint((int)c))
|
|
||||||
buf[j++] = c;
|
|
||||||
}
|
|
||||||
i = l;
|
|
||||||
if (val[i] != 0 && j < buf_len)
|
|
||||||
buf[j++] = '.';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if ((ot[o].size & OT_CSTRING))
|
|
||||||
{
|
|
||||||
int k, len;
|
|
||||||
unsigned char *p;
|
|
||||||
|
|
||||||
i = 0, j = 0;
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
p = &val[i];
|
|
||||||
GETSHORT(len, p);
|
|
||||||
for (k = 0; k < len && j < buf_len; k++)
|
|
||||||
{
|
|
||||||
char c = *p++;
|
|
||||||
if (isprint((int)c))
|
|
||||||
buf[j++] = c;
|
|
||||||
}
|
|
||||||
i += len +2;
|
|
||||||
if (i >= opt_len)
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (j < buf_len)
|
|
||||||
buf[j++] = ',';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
else
|
|
||||||
nodecode = 1;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (opt_len != 0 && buf && (!ot[o].name || nodecode))
|
|
||||||
{
|
|
||||||
int trunc = 0;
|
|
||||||
if (opt_len > 14)
|
|
||||||
{
|
|
||||||
trunc = 1;
|
|
||||||
opt_len = 14;
|
|
||||||
}
|
|
||||||
print_mac(buf, val, opt_len);
|
|
||||||
if (trunc)
|
|
||||||
strncat(buf, "...", buf_len - strlen(buf));
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return ot[o].name ? ot[o].name : "";
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* We hide metacharaters in quoted strings by mapping them into the ASCII control
|
/* We hide metacharaters in quoted strings by mapping them into the ASCII control
|
||||||
character space. Note that the \0, \t \b \r \033 and \n characters are carefully placed in the
|
character space. Note that the \0, \t \b \r \033 and \n characters are carefully placed in the
|
||||||
following sequence so that they map to themselves: it is therefore possible to call
|
following sequence so that they map to themselves: it is therefore possible to call
|
||||||
@@ -823,29 +593,6 @@ static void do_usage(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_DHCP
|
#ifdef HAVE_DHCP
|
||||||
static void display_opts(void)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
printf(_("Known DHCP options:\n"));
|
|
||||||
|
|
||||||
for (i = 0; opttab[i].name; i++)
|
|
||||||
if (!(opttab[i].size & OT_INTERNAL))
|
|
||||||
printf("%3d %s\n", opttab[i].val, opttab[i].name);
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef HAVE_DHCP6
|
|
||||||
static void display_opts6(void)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
printf(_("Known DHCPv6 options:\n"));
|
|
||||||
|
|
||||||
for (i = 0; opttab6[i].name; i++)
|
|
||||||
if (!(opttab6[i].size & OT_INTERNAL))
|
|
||||||
printf("%3d %s\n", opttab6[i].val, opttab6[i].name);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
static int is_tag_prefix(char *arg)
|
static int is_tag_prefix(char *arg)
|
||||||
{
|
{
|
||||||
@@ -868,7 +615,7 @@ static char *parse_dhcp_opt(char *arg, int flags)
|
|||||||
{
|
{
|
||||||
struct dhcp_opt *new = opt_malloc(sizeof(struct dhcp_opt));
|
struct dhcp_opt *new = opt_malloc(sizeof(struct dhcp_opt));
|
||||||
char lenchar = 0, *cp;
|
char lenchar = 0, *cp;
|
||||||
int i, addrs, digs, is_addr, is_addr6, is_hex, is_dec, is_string, dots;
|
int addrs, digs, is_addr, is_addr6, is_hex, is_dec, is_string, dots;
|
||||||
char *comma = NULL, *problem = NULL;
|
char *comma = NULL, *problem = NULL;
|
||||||
struct dhcp_netid *np = NULL;
|
struct dhcp_netid *np = NULL;
|
||||||
u16 opt_len = 0;
|
u16 opt_len = 0;
|
||||||
@@ -897,14 +644,8 @@ static char *parse_dhcp_opt(char *arg, int flags)
|
|||||||
|
|
||||||
if (strstr(arg, "option:") == arg)
|
if (strstr(arg, "option:") == arg)
|
||||||
{
|
{
|
||||||
for (i = 0; opttab[i].name; i++)
|
new->opt = lookup_dhcp_opt(AF_INET, arg+7);
|
||||||
if (!(opttab[i].size & OT_INTERNAL) &&
|
opt_len = lookup_dhcp_len(AF_INET, new->opt);
|
||||||
strcasecmp(opttab[i].name, arg+7) == 0)
|
|
||||||
{
|
|
||||||
new->opt = opttab[i].val;
|
|
||||||
opt_len = opttab[i].size;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
/* option:<optname> must follow tag and vendor string. */
|
/* option:<optname> must follow tag and vendor string. */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -921,13 +662,9 @@ static char *parse_dhcp_opt(char *arg, int flags)
|
|||||||
opt_len = 0;
|
opt_len = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
for (i = 0; opttab6[i].name; i++)
|
|
||||||
if (!(opttab6[i].size & OT_INTERNAL) &&
|
|
||||||
strcasecmp(opttab6[i].name, arg+8) == 0)
|
|
||||||
{
|
{
|
||||||
new->opt = opttab6[i].val;
|
new->opt = lookup_dhcp_opt(AF_INET6, arg+8);
|
||||||
opt_len = opttab6[i].size;
|
opt_len = lookup_dhcp_len(AF_INET6, new->opt);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
/* option6:<opt>|<optname> must follow tag and vendor string. */
|
/* option6:<opt>|<optname> must follow tag and vendor string. */
|
||||||
is6 = 1;
|
is6 = 1;
|
||||||
@@ -977,27 +714,13 @@ static char *parse_dhcp_opt(char *arg, int flags)
|
|||||||
|
|
||||||
if (opt_len == 0 &&
|
if (opt_len == 0 &&
|
||||||
!(new->flags & DHOPT_RFC3925))
|
!(new->flags & DHOPT_RFC3925))
|
||||||
for (i = 0; opttab6[i].name; i++)
|
opt_len = lookup_dhcp_len(AF_INET6 ,new->opt);
|
||||||
if (new->opt == opttab6[i].val)
|
|
||||||
{
|
|
||||||
opt_len = opttab6[i].size;
|
|
||||||
if (opt_len & OT_INTERNAL)
|
|
||||||
opt_len = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
if (opt_len == 0 &&
|
if (opt_len == 0 &&
|
||||||
!(new->flags & (DHOPT_VENDOR | DHOPT_ENCAPSULATE | DHOPT_RFC3925)))
|
!(new->flags & (DHOPT_VENDOR | DHOPT_ENCAPSULATE | DHOPT_RFC3925)))
|
||||||
for (i = 0; opttab[i].name; i++)
|
opt_len = lookup_dhcp_len(AF_INET ,new->opt);
|
||||||
if (new->opt == opttab[i].val)
|
|
||||||
{
|
|
||||||
opt_len = opttab[i].size;
|
|
||||||
if (opt_len & OT_INTERNAL)
|
|
||||||
opt_len = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* option may be missing with rfc3925 match */
|
/* option may be missing with rfc3925 match */
|
||||||
if (new->opt == 0)
|
if (new->opt == 0)
|
||||||
@@ -1262,10 +985,10 @@ static char *parse_dhcp_opt(char *arg, int flags)
|
|||||||
else if (comma && (opt_len & OT_CSTRING))
|
else if (comma && (opt_len & OT_CSTRING))
|
||||||
{
|
{
|
||||||
/* length fields are two bytes so need 16 bits for each string */
|
/* length fields are two bytes so need 16 bits for each string */
|
||||||
int commas = 1;
|
int i, commas = 1;
|
||||||
unsigned char *p, *newp;
|
unsigned char *p, *newp;
|
||||||
|
|
||||||
for(i = 0; comma[i]; i++)
|
for (i = 0; comma[i]; i++)
|
||||||
if (comma[i] == ',')
|
if (comma[i] == ',')
|
||||||
commas++;
|
commas++;
|
||||||
|
|
||||||
@@ -1290,10 +1013,10 @@ static char *parse_dhcp_opt(char *arg, int flags)
|
|||||||
}
|
}
|
||||||
else if (comma && (opt_len & OT_RFC1035_NAME))
|
else if (comma && (opt_len & OT_RFC1035_NAME))
|
||||||
{
|
{
|
||||||
int commas = 1;
|
int i, commas = 1;
|
||||||
unsigned char *p, *newp;
|
unsigned char *p, *newp;
|
||||||
|
|
||||||
for(i = 0; comma[i]; i++)
|
for (i = 0; comma[i]; i++)
|
||||||
if (comma[i] == ',')
|
if (comma[i] == ',')
|
||||||
commas++;
|
commas++;
|
||||||
|
|
||||||
@@ -3310,6 +3033,59 @@ static char *one_opt(int option, char *arg, char *gen_prob, int command_line)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case LOPT_HOST_REC: /* --host-record */
|
||||||
|
{
|
||||||
|
struct host_record *new = opt_malloc(sizeof(struct host_record));
|
||||||
|
memset(new, 0, sizeof(struct host_record));
|
||||||
|
|
||||||
|
if (!arg || !(comma = split(arg)))
|
||||||
|
problem = _("Bad host-record");
|
||||||
|
else
|
||||||
|
while (arg)
|
||||||
|
{
|
||||||
|
struct all_addr addr;
|
||||||
|
if (inet_pton(AF_INET, arg, &addr))
|
||||||
|
new->addr = addr.addr.addr4;
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
else if (inet_pton(AF_INET6, arg, &addr))
|
||||||
|
new->addr6 = addr.addr.addr6;
|
||||||
|
#endif
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int nomem;
|
||||||
|
char *canon = canonicalise(arg, &nomem);
|
||||||
|
struct name_list *nl = opt_malloc(sizeof(struct name_list));
|
||||||
|
if (!canon)
|
||||||
|
{
|
||||||
|
problem = _("Bad name in host-record");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
nl->name = canon;
|
||||||
|
/* keep order, so that PTR record goes to first name */
|
||||||
|
nl->next = NULL;
|
||||||
|
if (!new->names)
|
||||||
|
new->names = nl;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
struct name_list *tmp;
|
||||||
|
for (tmp = new->names; tmp->next; tmp = tmp->next);
|
||||||
|
tmp->next = nl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
arg = comma;
|
||||||
|
comma = split(arg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Keep list order */
|
||||||
|
if (!daemon->host_records_tail)
|
||||||
|
daemon->host_records = new;
|
||||||
|
else
|
||||||
|
daemon->host_records_tail->next = new;
|
||||||
|
new->next = NULL;
|
||||||
|
daemon->host_records_tail = new;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return _("unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)");
|
return _("unsupported option (check that dnsmasq was compiled with DHCP/TFTP/DBus support)");
|
||||||
|
|
||||||
|
|||||||
+10
-2
@@ -290,6 +290,9 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (option_bool(OPT_LOG_OPTS) && (opt = opt6_find(packet_options, end, OPTION6_VENDOR_CLASS, 4)))
|
||||||
|
my_syslog(MS_DHCP | LOG_INFO, _("%u vendor class: %u"), xid, opt6_uint(opt, 0, 4));
|
||||||
|
|
||||||
/* dhcp-match. If we have hex-and-wildcards, look for a left-anchored match.
|
/* dhcp-match. If we have hex-and-wildcards, look for a left-anchored match.
|
||||||
Otherwise assume the option is an array, and look for a matching element.
|
Otherwise assume the option is an array, and look for a matching element.
|
||||||
If no data given, existance of the option is enough. This code handles
|
If no data given, existance of the option is enough. This code handles
|
||||||
@@ -922,9 +925,14 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh
|
|||||||
if (t1cntr != 0)
|
if (t1cntr != 0)
|
||||||
{
|
{
|
||||||
/* go back an fill in fields in IA_NA option */
|
/* go back an fill in fields in IA_NA option */
|
||||||
unsigned int t1 = min_time == 0xffffffff ? 0xffffffff : min_time/2;
|
|
||||||
unsigned int t2 = min_time == 0xffffffff ? 0xffffffff : (min_time/8) * 7;
|
|
||||||
int sav = save_counter(t1cntr);
|
int sav = save_counter(t1cntr);
|
||||||
|
unsigned int t1, t2, fuzz = rand16();
|
||||||
|
|
||||||
|
while (fuzz > (min_time/16))
|
||||||
|
fuzz = fuzz/2;
|
||||||
|
t1 = min_time == 0xffffffff ? 0xffffffff : min_time/2 - fuzz;
|
||||||
|
t2 = min_time == 0xffffffff ? 0xffffffff : ((min_time/8)*7) - fuzz;
|
||||||
|
|
||||||
put_opt6_long(t1);
|
put_opt6_long(t1);
|
||||||
put_opt6_long(t2);
|
put_opt6_long(t2);
|
||||||
save_counter(sav);
|
save_counter(sav);
|
||||||
|
|||||||
Reference in new issue
Block a user