mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-19 19:51:01 +00:00
Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed4c0767b1 | ||
|
|
043c271f8a | ||
|
|
d4da20f064 | ||
|
|
903650af67 | ||
|
|
ef1d7425e3 | ||
|
|
1d1c795601 | ||
|
|
889d8a156f | ||
|
|
b7f666ff09 | ||
|
|
e4e9b342a7 | ||
|
|
d5c35a59b0 | ||
|
|
2f9fd1dcc5 |
No files matched your search
@@ -125,6 +125,16 @@ version 2.67
|
|||||||
range. This was originally to avoid SLAAC addresses, but
|
range. This was originally to avoid SLAAC addresses, but
|
||||||
we now explicitly autoconfig and privacy addresses instead.
|
we now explicitly autoconfig and privacy addresses instead.
|
||||||
|
|
||||||
|
Update Polish translation. Thanks to Jan Psota.
|
||||||
|
|
||||||
|
Fix problem in DHCPv6 vendorclass/userclass matching
|
||||||
|
code. Thanks to Tanguy Bouzeloc for the patch.
|
||||||
|
|
||||||
|
Update Spanish transalation. Thanks to Vicente Soriano.
|
||||||
|
|
||||||
|
Add --add-subnet configuration, to tell upstream DNS
|
||||||
|
servers where the original client is.
|
||||||
|
|
||||||
|
|
||||||
version 2.66
|
version 2.66
|
||||||
Add the ability to act as an authoritative DNS
|
Add the ability to act as an authoritative DNS
|
||||||
|
|||||||
@@ -114,6 +114,11 @@ merge :
|
|||||||
echo -n msgmerge $(PO)/$$f && $(MSGMERGE) --no-wrap -U $(PO)/$$f $(BUILDDIR)/dnsmasq.pot; \
|
echo -n msgmerge $(PO)/$$f && $(MSGMERGE) --no-wrap -U $(PO)/$$f $(BUILDDIR)/dnsmasq.pot; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Cannonicalise .po file.
|
||||||
|
%.po :
|
||||||
|
@cd $(BUILDDIR) && $(MAKE) -f $(top)/Makefile dnsmasq.pot
|
||||||
|
mv $(PO)/$*.po $(PO)/$*.po.orig && $(MSGMERGE) --no-wrap $(PO)/$*.po.orig $(BUILDDIR)/dnsmasq.pot >$(PO)/$*.po;
|
||||||
|
|
||||||
$(BUILDDIR):
|
$(BUILDDIR):
|
||||||
mkdir -p $(BUILDDIR)
|
mkdir -p $(BUILDDIR)
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-1
@@ -25,7 +25,7 @@ DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
|
|||||||
|
|
||||||
# Force package version based on git tags.
|
# Force package version based on git tags.
|
||||||
ifneq (,$(filter gitversion,$(DEB_BUILD_OPTIONS)))
|
ifneq (,$(filter gitversion,$(DEB_BUILD_OPTIONS)))
|
||||||
PACKAGE_VERSION = $(shell bld/get-version `pwd` | sed 's/[a-z]/~&/; s/-/./g; s/$$/-1/; s/^/-v/';)
|
PACKAGE_VERSION = $(shell bld/get-version `pwd` | sed 's/test/~&/; s/[a-z]/~&/; s/-/./g; s/$$/-1/; s/^/-v/';)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (,$(filter nodbus,$(DEB_BUILD_OPTIONS)))
|
ifeq (,$(filter nodbus,$(DEB_BUILD_OPTIONS)))
|
||||||
|
|||||||
+14
-1
@@ -543,7 +543,20 @@ server. The MAC address can only be added if the requestor is on the same
|
|||||||
subnet as the dnsmasq server. Note that the mechanism used to achieve this (an EDNS0 option)
|
subnet as the dnsmasq server. Note that the mechanism used to achieve this (an EDNS0 option)
|
||||||
is not yet standardised, so this should be considered
|
is not yet standardised, so this should be considered
|
||||||
experimental. Also note that exposing MAC addresses in this way may
|
experimental. Also note that exposing MAC addresses in this way may
|
||||||
have security and privacy implications.
|
have security and privacy implications. The warning about caching
|
||||||
|
given for --add-subnet applies to --add-mac too.
|
||||||
|
.TP
|
||||||
|
.B --add-subnet[[=<IPv4 prefix length>],<IPv6 prefix length>]
|
||||||
|
Add the subnet address of the requestor to the DNS queries which are
|
||||||
|
forwarded upstream. The amount of the address forwarded depends on the
|
||||||
|
prefix length parameter: 32 (128 for IPv6) forwards the whole address,
|
||||||
|
zero forwards none of it but still marks the request so that no
|
||||||
|
upstream nameserver will add client address information either. The
|
||||||
|
default is zero for both IPv4 and IPv6. Note that upstream nameservers
|
||||||
|
may be configured to return different results based on this
|
||||||
|
information, but the dnsmasq cache does not take account. If a dnsmasq
|
||||||
|
instance is configured such that different results may be encountered,
|
||||||
|
caching should be disabled.
|
||||||
.TP
|
.TP
|
||||||
.B \-c, --cache-size=<cachesize>
|
.B \-c, --cache-size=<cachesize>
|
||||||
Set the size of dnsmasq's cache. The default is 150 names. Setting the cache size to zero disables caching.
|
Set the size of dnsmasq's cache. The default is 150 names. Setting the cache size to zero disables caching.
|
||||||
|
|||||||
+516
-467
File diff suppressed because it is too large.
Load diff
@@ -39,7 +39,6 @@
|
|||||||
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
|
#define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
|
||||||
#define LOG_MAX 5 /* log-queue length */
|
#define LOG_MAX 5 /* log-queue length */
|
||||||
#define RANDFILE "/dev/urandom"
|
#define RANDFILE "/dev/urandom"
|
||||||
#define EDNS0_OPTION_MAC 5 /* dyndns.org temporary assignment */
|
|
||||||
#define DNSMASQ_SERVICE "uk.org.thekelleys.dnsmasq" /* Default - may be overridden by config */
|
#define DNSMASQ_SERVICE "uk.org.thekelleys.dnsmasq" /* Default - may be overridden by config */
|
||||||
#define DNSMASQ_PATH "/uk/org/thekelleys/dnsmasq"
|
#define DNSMASQ_PATH "/uk/org/thekelleys/dnsmasq"
|
||||||
#define AUTH_TTL 600 /* default TTL for auth DNS */
|
#define AUTH_TTL 600 /* default TTL for auth DNS */
|
||||||
|
|||||||
+26
-10
@@ -830,7 +830,7 @@ void log_context(int family, struct dhcp_context *context)
|
|||||||
if (indextoname(daemon->icmp6fd, context->if_index, ifrn_name))
|
if (indextoname(daemon->icmp6fd, context->if_index, ifrn_name))
|
||||||
sprintf(p, "%s for %s", (context->flags & CONTEXT_OLD) ? "old prefix" : "constructed", ifrn_name);
|
sprintf(p, "%s for %s", (context->flags & CONTEXT_OLD) ? "old prefix" : "constructed", ifrn_name);
|
||||||
}
|
}
|
||||||
else if (context->flags & CONTEXT_TEMPLATE)
|
else if (context->flags & CONTEXT_TEMPLATE && !(context->flags & CONTEXT_RA_STATELESS))
|
||||||
{
|
{
|
||||||
template = p;
|
template = p;
|
||||||
p += sprintf(p, ", ");
|
p += sprintf(p, ", ");
|
||||||
@@ -842,21 +842,37 @@ void log_context(int family, struct dhcp_context *context)
|
|||||||
if (!(context->flags & CONTEXT_OLD) &&
|
if (!(context->flags & CONTEXT_OLD) &&
|
||||||
((context->flags & CONTEXT_DHCP) || family == AF_INET))
|
((context->flags & CONTEXT_DHCP) || family == AF_INET))
|
||||||
{
|
{
|
||||||
inet_ntop(family, start, daemon->dhcp_buff, 256);
|
#ifdef HAVE_DHCP6
|
||||||
|
if (context->flags & CONTEXT_RA_STATELESS)
|
||||||
|
{
|
||||||
|
if (context->flags & CONTEXT_TEMPLATE)
|
||||||
|
strncpy(daemon->dhcp_buff, context->template_interface, 256);
|
||||||
|
else
|
||||||
|
strcpy(daemon->dhcp_buff, daemon->addrbuff);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
inet_ntop(family, start, daemon->dhcp_buff, 256);
|
||||||
inet_ntop(family, end, daemon->dhcp_buff3, 256);
|
inet_ntop(family, end, daemon->dhcp_buff3, 256);
|
||||||
my_syslog(MS_DHCP | LOG_INFO,
|
my_syslog(MS_DHCP | LOG_INFO,
|
||||||
(context->flags & CONTEXT_RA_STATELESS) ?
|
(context->flags & CONTEXT_RA_STATELESS) ?
|
||||||
_("%s stateless on %s%.0s%.0s%s") :
|
_("%s stateless on %s%.0s%.0s%s") :
|
||||||
(context->flags & CONTEXT_STATIC) ?
|
(context->flags & CONTEXT_STATIC) ?
|
||||||
_("%s, static leases only on %.0s%s%s%.0s") :
|
_("%s, static leases only on %.0s%s%s%.0s") :
|
||||||
(context->flags & CONTEXT_PROXY) ?
|
(context->flags & CONTEXT_PROXY) ?
|
||||||
_("%s, proxy on subnet %.0s%s%.0s%.0s") :
|
_("%s, proxy on subnet %.0s%s%.0s%.0s") :
|
||||||
_("%s, IP range %s -- %s%s%.0s"),
|
_("%s, IP range %s -- %s%s%.0s"),
|
||||||
(family != AF_INET) ? "DHCPv6" : "DHCP",
|
(family != AF_INET) ? "DHCPv6" : "DHCP",
|
||||||
daemon->dhcp_buff, daemon->dhcp_buff3, daemon->namebuff, template);
|
daemon->dhcp_buff, daemon->dhcp_buff3, daemon->namebuff, template);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_DHCP6
|
#ifdef HAVE_DHCP6
|
||||||
|
if (context->flags & CONTEXT_TEMPLATE)
|
||||||
|
{
|
||||||
|
strcpy(daemon->addrbuff, context->template_interface);
|
||||||
|
template = "";
|
||||||
|
}
|
||||||
|
|
||||||
if ((context->flags & CONTEXT_RA_NAME) && !(context->flags & CONTEXT_OLD))
|
if ((context->flags & CONTEXT_RA_NAME) && !(context->flags & CONTEXT_OLD))
|
||||||
my_syslog(MS_DHCP | LOG_INFO, _("DHCPv4-derived IPv6 names on %s%s"), daemon->addrbuff, template);
|
my_syslog(MS_DHCP | LOG_INFO, _("DHCPv4-derived IPv6 names on %s%s"), daemon->addrbuff, template);
|
||||||
|
|
||||||
|
|||||||
@@ -56,6 +56,10 @@
|
|||||||
#define T_MAILB 253
|
#define T_MAILB 253
|
||||||
#define T_ANY 255
|
#define T_ANY 255
|
||||||
|
|
||||||
|
#define EDNS0_OPTION_MAC 65001 /* dyndns.org temporary assignment */
|
||||||
|
#define EDNS0_OPTION_CLIENT_SUBNET 5 /* IANA */
|
||||||
|
|
||||||
|
|
||||||
struct dns_header {
|
struct dns_header {
|
||||||
u16 id;
|
u16 id;
|
||||||
u8 hb3,hb4;
|
u8 hb3,hb4;
|
||||||
|
|||||||
+7
-1
@@ -222,7 +222,8 @@ struct event_desc {
|
|||||||
#define OPT_CLEVERBIND 39
|
#define OPT_CLEVERBIND 39
|
||||||
#define OPT_TFTP 40
|
#define OPT_TFTP 40
|
||||||
#define OPT_FAST_RA 41
|
#define OPT_FAST_RA 41
|
||||||
#define OPT_LAST 42
|
#define OPT_CLIENT_SUBNET 42
|
||||||
|
#define OPT_LAST 43
|
||||||
|
|
||||||
/* extra flags for my_syslog, we use a couple of facilities since they are known
|
/* extra flags for my_syslog, we use a couple of facilities since they are known
|
||||||
not to occupy the same bits as priorities, no matter how syslog.h is set up. */
|
not to occupy the same bits as priorities, no matter how syslog.h is set up. */
|
||||||
@@ -487,6 +488,7 @@ struct hostsfile {
|
|||||||
|
|
||||||
#define FREC_NOREBIND 1
|
#define FREC_NOREBIND 1
|
||||||
#define FREC_CHECKING_DISABLED 2
|
#define FREC_CHECKING_DISABLED 2
|
||||||
|
#define FREC_HAS_SUBNET 4
|
||||||
|
|
||||||
struct frec {
|
struct frec {
|
||||||
union mysockaddr source;
|
union mysockaddr source;
|
||||||
@@ -802,6 +804,8 @@ extern struct daemon {
|
|||||||
struct auth_zone *auth_zones;
|
struct auth_zone *auth_zones;
|
||||||
struct interface_name *int_names;
|
struct interface_name *int_names;
|
||||||
char *mxtarget;
|
char *mxtarget;
|
||||||
|
int addr4_netmask;
|
||||||
|
int addr6_netmask;
|
||||||
char *lease_file;
|
char *lease_file;
|
||||||
char *username, *groupname, *scriptuser;
|
char *username, *groupname, *scriptuser;
|
||||||
char *luascript;
|
char *luascript;
|
||||||
@@ -962,6 +966,8 @@ unsigned int questions_crc(struct dns_header *header, size_t plen, char *buff);
|
|||||||
size_t resize_packet(struct dns_header *header, size_t plen,
|
size_t resize_packet(struct dns_header *header, size_t plen,
|
||||||
unsigned char *pheader, size_t hlen);
|
unsigned char *pheader, size_t hlen);
|
||||||
size_t add_mac(struct dns_header *header, size_t plen, char *limit, union mysockaddr *l3);
|
size_t add_mac(struct dns_header *header, size_t plen, char *limit, union mysockaddr *l3);
|
||||||
|
size_t add_source_addr(struct dns_header *header, size_t plen, char *limit, union mysockaddr *source);
|
||||||
|
int check_source(struct dns_header *header, size_t plen, unsigned char *pseudoheader, union mysockaddr *peer);
|
||||||
int add_resource_record(struct dns_header *header, char *limit, int *truncp,
|
int add_resource_record(struct dns_header *header, char *limit, int *truncp,
|
||||||
int nameoffset, unsigned char **pp, unsigned long ttl,
|
int nameoffset, unsigned char **pp, unsigned long ttl,
|
||||||
int *offset, unsigned short type, unsigned short class, char *format, ...);
|
int *offset, unsigned short type, unsigned short class, char *format, ...);
|
||||||
|
|||||||
+47
-12
@@ -284,6 +284,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
|
|||||||
forward->fd = udpfd;
|
forward->fd = udpfd;
|
||||||
forward->crc = crc;
|
forward->crc = crc;
|
||||||
forward->forwardall = 0;
|
forward->forwardall = 0;
|
||||||
|
forward->flags = 0;
|
||||||
if (norebind)
|
if (norebind)
|
||||||
forward->flags |= FREC_NOREBIND;
|
forward->flags |= FREC_NOREBIND;
|
||||||
if (header->hb4 & HB4_CD)
|
if (header->hb4 & HB4_CD)
|
||||||
@@ -331,6 +332,16 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
|
|||||||
if (option_bool(OPT_ADD_MAC))
|
if (option_bool(OPT_ADD_MAC))
|
||||||
plen = add_mac(header, plen, ((char *) header) + PACKETSZ, &forward->source);
|
plen = add_mac(header, plen, ((char *) header) + PACKETSZ, &forward->source);
|
||||||
|
|
||||||
|
if (option_bool(OPT_CLIENT_SUBNET))
|
||||||
|
{
|
||||||
|
size_t new = add_source_addr(header, plen, ((char *) header) + PACKETSZ, &forward->source);
|
||||||
|
if (new != plen)
|
||||||
|
{
|
||||||
|
plen = new;
|
||||||
|
forward->flags |= FREC_HAS_SUBNET;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
/* only send to servers dealing with our domain.
|
/* only send to servers dealing with our domain.
|
||||||
@@ -435,8 +446,8 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t process_reply(struct dns_header *header, time_t now,
|
static size_t process_reply(struct dns_header *header, time_t now, struct server *server, size_t n, int check_rebind,
|
||||||
struct server *server, size_t n, int check_rebind, int checking_disabled)
|
int checking_disabled, int check_subnet, union mysockaddr *query_source)
|
||||||
{
|
{
|
||||||
unsigned char *pheader, *sizep;
|
unsigned char *pheader, *sizep;
|
||||||
char **sets = 0;
|
char **sets = 0;
|
||||||
@@ -465,19 +476,29 @@ static size_t process_reply(struct dns_header *header, time_t now,
|
|||||||
than we allow, trim it so that we don't get overlarge
|
than we allow, trim it so that we don't get overlarge
|
||||||
requests for the client. We can't do this for signed packets. */
|
requests for the client. We can't do this for signed packets. */
|
||||||
|
|
||||||
if ((pheader = find_pseudoheader(header, n, &plen, &sizep, &is_sign)) && !is_sign)
|
if ((pheader = find_pseudoheader(header, n, &plen, &sizep, &is_sign)))
|
||||||
{
|
{
|
||||||
unsigned short udpsz;
|
if (!is_sign)
|
||||||
unsigned char *psave = sizep;
|
{
|
||||||
|
unsigned short udpsz;
|
||||||
|
unsigned char *psave = sizep;
|
||||||
|
|
||||||
GETSHORT(udpsz, sizep);
|
GETSHORT(udpsz, sizep);
|
||||||
if (udpsz > daemon->edns_pktsz)
|
if (udpsz > daemon->edns_pktsz)
|
||||||
PUTSHORT(daemon->edns_pktsz, psave);
|
PUTSHORT(daemon->edns_pktsz, psave);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (check_subnet && !check_source(header, plen, pheader, query_source))
|
||||||
|
{
|
||||||
|
my_syslog(LOG_WARNING, _("discarding DNS reply: subnet option mismatch"));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* RFC 4035 sect 4.6 para 3 */
|
/* RFC 4035 sect 4.6 para 3 */
|
||||||
if (!is_sign && !option_bool(OPT_DNSSEC))
|
if (!is_sign && !option_bool(OPT_DNSSEC))
|
||||||
header->hb4 &= ~HB4_AD;
|
header->hb4 &= ~HB4_AD;
|
||||||
|
|
||||||
if (OPCODE(header) != QUERY || (RCODE(header) != NOERROR && RCODE(header) != NXDOMAIN))
|
if (OPCODE(header) != QUERY || (RCODE(header) != NOERROR && RCODE(header) != NXDOMAIN))
|
||||||
return n;
|
return n;
|
||||||
@@ -632,7 +653,8 @@ void reply_query(int fd, int family, time_t now)
|
|||||||
if (!option_bool(OPT_NO_REBIND))
|
if (!option_bool(OPT_NO_REBIND))
|
||||||
check_rebind = 0;
|
check_rebind = 0;
|
||||||
|
|
||||||
if ((nn = process_reply(header, now, server, (size_t)n, check_rebind, forward->flags & FREC_CHECKING_DISABLED)))
|
if ((nn = process_reply(header, now, server, (size_t)n, check_rebind, forward->flags & FREC_CHECKING_DISABLED,
|
||||||
|
forward->flags & FREC_HAS_SUBNET, &forward->source)))
|
||||||
{
|
{
|
||||||
header->id = htons(forward->orig_id);
|
header->id = htons(forward->orig_id);
|
||||||
header->hb4 |= HB4_RA; /* recursion if available */
|
header->hb4 |= HB4_RA; /* recursion if available */
|
||||||
@@ -876,7 +898,7 @@ unsigned char *tcp_request(int confd, time_t now,
|
|||||||
{
|
{
|
||||||
size_t size = 0;
|
size_t size = 0;
|
||||||
int norebind = 0;
|
int norebind = 0;
|
||||||
int checking_disabled;
|
int checking_disabled, check_subnet;
|
||||||
size_t m;
|
size_t m;
|
||||||
unsigned short qtype;
|
unsigned short qtype;
|
||||||
unsigned int gotname;
|
unsigned int gotname;
|
||||||
@@ -906,6 +928,8 @@ unsigned char *tcp_request(int confd, time_t now,
|
|||||||
if (size < (int)sizeof(struct dns_header))
|
if (size < (int)sizeof(struct dns_header))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
check_subnet = 0;
|
||||||
|
|
||||||
/* save state of "cd" flag in query */
|
/* save state of "cd" flag in query */
|
||||||
checking_disabled = header->hb4 & HB4_CD;
|
checking_disabled = header->hb4 & HB4_CD;
|
||||||
|
|
||||||
@@ -956,6 +980,16 @@ unsigned char *tcp_request(int confd, time_t now,
|
|||||||
if (option_bool(OPT_ADD_MAC))
|
if (option_bool(OPT_ADD_MAC))
|
||||||
size = add_mac(header, size, ((char *) header) + 65536, &peer_addr);
|
size = add_mac(header, size, ((char *) header) + 65536, &peer_addr);
|
||||||
|
|
||||||
|
if (option_bool(OPT_CLIENT_SUBNET))
|
||||||
|
{
|
||||||
|
size_t new = add_source_addr(header, size, ((char *) header) + 65536, &peer_addr);
|
||||||
|
if (size != new)
|
||||||
|
{
|
||||||
|
size = new;
|
||||||
|
check_subnet = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (gotname)
|
if (gotname)
|
||||||
flags = search_servers(now, &addrp, gotname, daemon->namebuff, &type, &domain, &norebind);
|
flags = search_servers(now, &addrp, gotname, daemon->namebuff, &type, &domain, &norebind);
|
||||||
|
|
||||||
@@ -1056,7 +1090,8 @@ unsigned char *tcp_request(int confd, time_t now,
|
|||||||
sending replies containing questions and bogus answers. */
|
sending replies containing questions and bogus answers. */
|
||||||
if (crc == questions_crc(header, (unsigned int)m, daemon->namebuff))
|
if (crc == questions_crc(header, (unsigned int)m, daemon->namebuff))
|
||||||
m = process_reply(header, now, last_server, (unsigned int)m,
|
m = process_reply(header, now, last_server, (unsigned int)m,
|
||||||
option_bool(OPT_NO_REBIND) && !norebind, checking_disabled);
|
option_bool(OPT_NO_REBIND) && !norebind, checking_disabled,
|
||||||
|
check_subnet, &peer_addr);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
+54
-48
@@ -61,8 +61,13 @@ struct script_data
|
|||||||
#else
|
#else
|
||||||
time_t expires;
|
time_t expires;
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_DHCP6
|
#ifdef HAVE_TFTP
|
||||||
|
off_t file_len;
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
struct in6_addr addr6;
|
struct in6_addr addr6;
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_DHCP6
|
||||||
int iaid, vendorclass_count;
|
int iaid, vendorclass_count;
|
||||||
#endif
|
#endif
|
||||||
unsigned char hwaddr[DHCP_CHADDR_MAX];
|
unsigned char hwaddr[DHCP_CHADDR_MAX];
|
||||||
@@ -289,9 +294,11 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
inet_ntop(AF_INET6, &data.addr6, daemon->addrbuff, ADDRSTRLEN);
|
inet_ntop(AF_INET6, &data.addr6, daemon->addrbuff, ADDRSTRLEN);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_TFTP
|
||||||
/* file length */
|
/* file length */
|
||||||
if (data.action == ACTION_TFTP)
|
if (data.action == ACTION_TFTP)
|
||||||
sprintf(is6 ? daemon->packet : daemon->dhcp_buff, "%u", data.iaid);
|
sprintf(is6 ? daemon->packet : daemon->dhcp_buff, "%lu", (unsigned long)data.file_len);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_LUASCRIPT
|
#ifdef HAVE_LUASCRIPT
|
||||||
if (daemon->luascript)
|
if (daemon->luascript)
|
||||||
@@ -474,20 +481,13 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
if (data.action != ACTION_TFTP)
|
if (data.action != ACTION_TFTP)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_DHCP6
|
#ifdef HAVE_DHCP6
|
||||||
if (is6)
|
my_setenv("DNSMASQ_IAID", is6 ? daemon->dhcp_buff3 : NULL, &err);
|
||||||
{
|
my_setenv("DNSMASQ_SERVER_DUID", is6 ? daemon->dhcp_packet.iov_base : NULL, &err);
|
||||||
my_setenv("DNSMASQ_IAID", daemon->dhcp_buff3, &err);
|
my_setenv("DNSMASQ_MAC", is6 && data.hwaddr_len != 0 ? daemon->dhcp_buff : NULL, &err);
|
||||||
my_setenv("DNSMASQ_SERVER_DUID", daemon->dhcp_packet.iov_base, &err);
|
|
||||||
if (data.hwaddr_len != 0)
|
|
||||||
my_setenv("DNSMASQ_MAC", daemon->dhcp_buff, &err);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!is6 && data.clid_len != 0)
|
my_setenv("DNSMASQ_CLIENT_ID", !is6 && data.clid_len != 0 ? daemon->packet : NULL, &err);
|
||||||
my_setenv("DNSMASQ_CLIENT_ID", daemon->packet, &err);
|
my_setenv("DNSMASQ_INTERFACE", strlen(data.interface) != 0 ? data.interface : NULL, &err);
|
||||||
|
|
||||||
if (strlen(data.interface) != 0)
|
|
||||||
my_setenv("DNSMASQ_INTERFACE", data.interface, &err);
|
|
||||||
|
|
||||||
#ifdef HAVE_BROKEN_RTC
|
#ifdef HAVE_BROKEN_RTC
|
||||||
sprintf(daemon->dhcp_buff2, "%u", data.length);
|
sprintf(daemon->dhcp_buff2, "%u", data.length);
|
||||||
@@ -497,8 +497,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
my_setenv("DNSMASQ_LEASE_EXPIRES", daemon->dhcp_buff2, &err);
|
my_setenv("DNSMASQ_LEASE_EXPIRES", daemon->dhcp_buff2, &err);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (domain)
|
my_setenv("DNSMASQ_DOMAIN", domain, &err);
|
||||||
my_setenv("DNSMASQ_DOMAIN", domain, &err);
|
|
||||||
|
|
||||||
end = extradata + data.ed_len;
|
end = extradata + data.ed_len;
|
||||||
buf = extradata;
|
buf = extradata;
|
||||||
@@ -536,8 +535,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
|
|
||||||
if (is6)
|
if (is6)
|
||||||
buf = grab_extradata(buf, end, "DNSMASQ_RELAY_ADDRESS", &err);
|
buf = grab_extradata(buf, end, "DNSMASQ_RELAY_ADDRESS", &err);
|
||||||
else if (data.giaddr.s_addr != 0)
|
else
|
||||||
my_setenv("DNSMASQ_RELAY_ADDRESS", inet_ntoa(data.giaddr), &err);
|
my_setenv("DNSMASQ_RELAY_ADDRESS", data.giaddr.s_addr != 0 ? inet_ntoa(data.giaddr) : NULL, &err);
|
||||||
|
|
||||||
for (i = 0; buf; i++)
|
for (i = 0; buf; i++)
|
||||||
{
|
{
|
||||||
@@ -545,21 +544,15 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
buf = grab_extradata(buf, end, daemon->dhcp_buff2, &err);
|
buf = grab_extradata(buf, end, daemon->dhcp_buff2, &err);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.action != ACTION_DEL && data.remaining_time != 0)
|
sprintf(daemon->dhcp_buff2, "%u", data.remaining_time);
|
||||||
{
|
my_setenv("DNSMASQ_TIME_REMAINING", data.action != ACTION_DEL && data.remaining_time != 0 ? daemon->dhcp_buff2 : NULL, &err);
|
||||||
sprintf(daemon->dhcp_buff2, "%u", data.remaining_time);
|
|
||||||
my_setenv("DNSMASQ_TIME_REMAINING", daemon->dhcp_buff2, &err);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data.action == ACTION_OLD_HOSTNAME && hostname)
|
my_setenv("DNSMASQ_OLD_HOSTNAME", data.action == ACTION_OLD_HOSTNAME ? hostname : NULL, &err);
|
||||||
{
|
if (data.action == ACTION_OLD_HOSTNAME)
|
||||||
my_setenv("DNSMASQ_OLD_HOSTNAME", hostname, &err);
|
hostname = NULL;
|
||||||
hostname = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (option_bool(OPT_LOG_OPTS))
|
my_setenv("DNSMASQ_LOG_DHCP", option_bool(OPT_LOG_OPTS) ? "1" : NULL, &err);
|
||||||
my_setenv("DNSMASQ_LOG_DHCP", "1", &err);
|
|
||||||
|
|
||||||
/* we need to have the event_fd around if exec fails */
|
/* we need to have the event_fd around if exec fails */
|
||||||
if ((i = fcntl(event_fd, F_GETFD)) != -1)
|
if ((i = fcntl(event_fd, F_GETFD)) != -1)
|
||||||
@@ -583,31 +576,44 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
|
|||||||
|
|
||||||
static void my_setenv(const char *name, const char *value, int *error)
|
static void my_setenv(const char *name, const char *value, int *error)
|
||||||
{
|
{
|
||||||
if (*error == 0 && setenv(name, value, 1) != 0)
|
if (*error == 0)
|
||||||
*error = errno;
|
{
|
||||||
|
if (!value)
|
||||||
|
unsetenv(name);
|
||||||
|
else if (setenv(name, value, 1) != 0)
|
||||||
|
*error = errno;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned char *grab_extradata(unsigned char *buf, unsigned char *end, char *env, int *err)
|
static unsigned char *grab_extradata(unsigned char *buf, unsigned char *end, char *env, int *err)
|
||||||
{
|
{
|
||||||
unsigned char *next;
|
unsigned char *next = NULL;
|
||||||
|
char *val = NULL;
|
||||||
|
|
||||||
if (!buf || (buf == end))
|
if (buf && (buf != end))
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (next = buf; *next != 0; next++)
|
|
||||||
if (next == end)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
if (next != buf)
|
|
||||||
{
|
{
|
||||||
char *p;
|
for (next = buf; ; next++)
|
||||||
/* No "=" in value */
|
if (next == end)
|
||||||
if ((p = strchr((char *)buf, '=')))
|
{
|
||||||
*p = 0;
|
next = NULL;
|
||||||
my_setenv(env, (char *)buf, err);
|
break;
|
||||||
|
}
|
||||||
|
else if (*next == 0)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (next && (next != buf))
|
||||||
|
{
|
||||||
|
char *p;
|
||||||
|
/* No "=" in value */
|
||||||
|
if ((p = strchr((char *)buf, '=')))
|
||||||
|
*p = 0;
|
||||||
|
val = (char *)buf;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return next + 1;
|
my_setenv(env, val, err);
|
||||||
|
|
||||||
|
return next ? next + 1 : NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_LUASCRIPT
|
#ifdef HAVE_LUASCRIPT
|
||||||
@@ -739,7 +745,7 @@ void queue_tftp(off_t file_len, char *filename, union mysockaddr *peer)
|
|||||||
|
|
||||||
buf->action = ACTION_TFTP;
|
buf->action = ACTION_TFTP;
|
||||||
buf->hostname_len = filename_len;
|
buf->hostname_len = filename_len;
|
||||||
buf->iaid = file_len;
|
buf->file_len = file_len;
|
||||||
|
|
||||||
if ((buf->flags = peer->sa.sa_family) == AF_INET)
|
if ((buf->flags = peer->sa.sa_family) == AF_INET)
|
||||||
buf->addr = peer->in.sin_addr;
|
buf->addr = peer->in.sin_addr;
|
||||||
|
|||||||
@@ -134,6 +134,7 @@ struct myoption {
|
|||||||
#endif
|
#endif
|
||||||
#define LOPT_FAST_RA 322
|
#define LOPT_FAST_RA 322
|
||||||
#define LOPT_RELAY 323
|
#define LOPT_RELAY 323
|
||||||
|
#define LOPT_ADD_SBNET 324
|
||||||
|
|
||||||
#ifdef HAVE_GETOPT_LONG
|
#ifdef HAVE_GETOPT_LONG
|
||||||
static const struct option opts[] =
|
static const struct option opts[] =
|
||||||
@@ -251,6 +252,7 @@ static const struct myoption opts[] =
|
|||||||
{ "dhcp-generate-names", 2, 0, LOPT_GEN_NAMES },
|
{ "dhcp-generate-names", 2, 0, LOPT_GEN_NAMES },
|
||||||
{ "rebind-localhost-ok", 0, 0, LOPT_LOC_REBND },
|
{ "rebind-localhost-ok", 0, 0, LOPT_LOC_REBND },
|
||||||
{ "add-mac", 0, 0, LOPT_ADD_MAC },
|
{ "add-mac", 0, 0, LOPT_ADD_MAC },
|
||||||
|
{ "add-subnet", 2, 0, LOPT_ADD_SBNET },
|
||||||
{ "proxy-dnssec", 0, 0, LOPT_DNSSEC },
|
{ "proxy-dnssec", 0, 0, LOPT_DNSSEC },
|
||||||
{ "dhcp-sequential-ip", 0, 0, LOPT_INCR_ADDR },
|
{ "dhcp-sequential-ip", 0, 0, LOPT_INCR_ADDR },
|
||||||
{ "conntrack", 0, 0, LOPT_CONNTRACK },
|
{ "conntrack", 0, 0, LOPT_CONNTRACK },
|
||||||
@@ -397,6 +399,7 @@ static struct {
|
|||||||
{ LOPT_PXE_SERV, ARG_DUP, "<service>", gettext_noop("Boot service for PXE menu."), NULL },
|
{ LOPT_PXE_SERV, ARG_DUP, "<service>", gettext_noop("Boot service for PXE menu."), NULL },
|
||||||
{ LOPT_TEST, 0, NULL, gettext_noop("Check configuration syntax."), NULL },
|
{ LOPT_TEST, 0, NULL, gettext_noop("Check configuration syntax."), NULL },
|
||||||
{ LOPT_ADD_MAC, OPT_ADD_MAC, NULL, gettext_noop("Add requestor's MAC address to forwarded DNS queries."), NULL },
|
{ LOPT_ADD_MAC, OPT_ADD_MAC, NULL, gettext_noop("Add requestor's MAC address to forwarded DNS queries."), NULL },
|
||||||
|
{ LOPT_ADD_SBNET, ARG_ONE, "<v4 pref>[,<v6 pref>]", gettext_noop("Add requestor's IP subnet to forwarded DNS queries."), NULL },
|
||||||
{ LOPT_DNSSEC, OPT_DNSSEC, NULL, gettext_noop("Proxy DNSSEC validation results from upstream nameservers."), NULL },
|
{ LOPT_DNSSEC, OPT_DNSSEC, NULL, gettext_noop("Proxy DNSSEC validation results from upstream nameservers."), NULL },
|
||||||
{ LOPT_INCR_ADDR, OPT_CONSEC_ADDR, NULL, gettext_noop("Attempt to allocate sequential IP addresses to DHCP clients."), NULL },
|
{ LOPT_INCR_ADDR, OPT_CONSEC_ADDR, NULL, gettext_noop("Attempt to allocate sequential IP addresses to DHCP clients."), NULL },
|
||||||
{ LOPT_CONNTRACK, OPT_CONNTRACK, NULL, gettext_noop("Copy connection-track mark from queries to upstream connections."), NULL },
|
{ LOPT_CONNTRACK, OPT_CONNTRACK, NULL, gettext_noop("Copy connection-track mark from queries to upstream connections."), NULL },
|
||||||
@@ -1424,6 +1427,17 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case LOPT_ADD_SBNET: /* --add-subnet */
|
||||||
|
set_option_bool(OPT_CLIENT_SUBNET);
|
||||||
|
if (arg)
|
||||||
|
{
|
||||||
|
comma = split(arg);
|
||||||
|
if (!atoi_check(arg, &daemon->addr4_netmask) ||
|
||||||
|
(comma && !atoi_check(comma, &daemon->addr6_netmask)))
|
||||||
|
ret_err(gen_err);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case '1': /* --enable-dbus */
|
case '1': /* --enable-dbus */
|
||||||
set_option_bool(OPT_DBUS);
|
set_option_bool(OPT_DBUS);
|
||||||
if (arg)
|
if (arg)
|
||||||
|
|||||||
+165
-64
@@ -514,13 +514,79 @@ struct macparm {
|
|||||||
union mysockaddr *l3;
|
union mysockaddr *l3;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *limit,
|
||||||
|
int optno, unsigned char *opt, size_t optlen)
|
||||||
|
{
|
||||||
|
unsigned char *lenp, *datap, *p;
|
||||||
|
int rdlen;
|
||||||
|
|
||||||
|
if (ntohs(header->arcount) == 0)
|
||||||
|
{
|
||||||
|
/* We are adding the pseudoheader */
|
||||||
|
if (!(p = skip_questions(header, plen)) ||
|
||||||
|
!(p = skip_section(p,
|
||||||
|
ntohs(header->ancount) + ntohs(header->nscount),
|
||||||
|
header, plen)))
|
||||||
|
return plen;
|
||||||
|
*p++ = 0; /* empty name */
|
||||||
|
PUTSHORT(T_OPT, p);
|
||||||
|
PUTSHORT(daemon->edns_pktsz, p); /* max packet length */
|
||||||
|
PUTLONG(0, p); /* extended RCODE */
|
||||||
|
lenp = p;
|
||||||
|
PUTSHORT(0, p); /* RDLEN */
|
||||||
|
rdlen = 0;
|
||||||
|
if (((ssize_t)optlen) > (limit - (p + 4)))
|
||||||
|
return plen; /* Too big */
|
||||||
|
header->arcount = htons(1);
|
||||||
|
datap = p;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int i, is_sign;
|
||||||
|
unsigned short code, len;
|
||||||
|
|
||||||
|
if (ntohs(header->arcount) != 1 ||
|
||||||
|
!(p = find_pseudoheader(header, plen, NULL, NULL, &is_sign)) ||
|
||||||
|
is_sign ||
|
||||||
|
(!(p = skip_name(p, header, plen, 10))))
|
||||||
|
return plen;
|
||||||
|
|
||||||
|
p += 8; /* skip UDP length and RCODE */
|
||||||
|
|
||||||
|
lenp = p;
|
||||||
|
GETSHORT(rdlen, p);
|
||||||
|
if (!CHECK_LEN(header, p, plen, rdlen))
|
||||||
|
return plen; /* bad packet */
|
||||||
|
datap = p;
|
||||||
|
|
||||||
|
/* check if option already there */
|
||||||
|
for (i = 0; i + 4 < rdlen; i += len + 4)
|
||||||
|
{
|
||||||
|
GETSHORT(code, p);
|
||||||
|
GETSHORT(len, p);
|
||||||
|
if (code == optno)
|
||||||
|
return plen;
|
||||||
|
p += len;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (((ssize_t)optlen) > (limit - (p + 4)))
|
||||||
|
return plen; /* Too big */
|
||||||
|
}
|
||||||
|
|
||||||
|
PUTSHORT(optno, p);
|
||||||
|
PUTSHORT(optlen, p);
|
||||||
|
memcpy(p, opt, optlen);
|
||||||
|
p += optlen;
|
||||||
|
|
||||||
|
PUTSHORT(p - datap, lenp);
|
||||||
|
return p - (unsigned char *)header;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
static int filter_mac(int family, char *addrp, char *mac, size_t maclen, void *parmv)
|
static int filter_mac(int family, char *addrp, char *mac, size_t maclen, void *parmv)
|
||||||
{
|
{
|
||||||
struct macparm *parm = parmv;
|
struct macparm *parm = parmv;
|
||||||
int match = 0;
|
int match = 0;
|
||||||
unsigned short rdlen;
|
|
||||||
struct dns_header *header = parm->header;
|
|
||||||
unsigned char *lenp, *datap, *p;
|
|
||||||
|
|
||||||
if (family == parm->l3->sa.sa_family)
|
if (family == parm->l3->sa.sa_family)
|
||||||
{
|
{
|
||||||
@@ -536,71 +602,11 @@ static int filter_mac(int family, char *addrp, char *mac, size_t maclen, void *p
|
|||||||
if (!match)
|
if (!match)
|
||||||
return 1; /* continue */
|
return 1; /* continue */
|
||||||
|
|
||||||
if (ntohs(header->arcount) == 0)
|
parm->plen = add_pseudoheader(parm->header, parm->plen, parm->limit, EDNS0_OPTION_MAC, (unsigned char *)mac, maclen);
|
||||||
{
|
|
||||||
/* We are adding the pseudoheader */
|
|
||||||
if (!(p = skip_questions(header, parm->plen)) ||
|
|
||||||
!(p = skip_section(p,
|
|
||||||
ntohs(header->ancount) + ntohs(header->nscount),
|
|
||||||
header, parm->plen)))
|
|
||||||
return 0;
|
|
||||||
*p++ = 0; /* empty name */
|
|
||||||
PUTSHORT(T_OPT, p);
|
|
||||||
PUTSHORT(PACKETSZ, p); /* max packet length - is 512 suitable default for non-EDNS0 resolvers? */
|
|
||||||
PUTLONG(0, p); /* extended RCODE */
|
|
||||||
lenp = p;
|
|
||||||
PUTSHORT(0, p); /* RDLEN */
|
|
||||||
rdlen = 0;
|
|
||||||
if (((ssize_t)maclen) > (parm->limit - (p + 4)))
|
|
||||||
return 0; /* Too big */
|
|
||||||
header->arcount = htons(1);
|
|
||||||
datap = p;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
int i, is_sign;
|
|
||||||
unsigned short code, len;
|
|
||||||
|
|
||||||
if (ntohs(header->arcount) != 1 ||
|
|
||||||
!(p = find_pseudoheader(header, parm->plen, NULL, NULL, &is_sign)) ||
|
|
||||||
is_sign ||
|
|
||||||
(!(p = skip_name(p, header, parm->plen, 10))))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
p += 8; /* skip UDP length and RCODE */
|
|
||||||
|
|
||||||
lenp = p;
|
|
||||||
GETSHORT(rdlen, p);
|
|
||||||
if (!CHECK_LEN(header, p, parm->plen, rdlen))
|
|
||||||
return 0; /* bad packet */
|
|
||||||
datap = p;
|
|
||||||
|
|
||||||
/* check if option already there */
|
|
||||||
for (i = 0; i + 4 < rdlen; i += len + 4)
|
|
||||||
{
|
|
||||||
GETSHORT(code, p);
|
|
||||||
GETSHORT(len, p);
|
|
||||||
if (code == EDNS0_OPTION_MAC)
|
|
||||||
return 0;
|
|
||||||
p += len;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (((ssize_t)maclen) > (parm->limit - (p + 4)))
|
|
||||||
return 0; /* Too big */
|
|
||||||
}
|
|
||||||
|
|
||||||
PUTSHORT(EDNS0_OPTION_MAC, p);
|
|
||||||
PUTSHORT(maclen, p);
|
|
||||||
memcpy(p, mac, maclen);
|
|
||||||
p += maclen;
|
|
||||||
|
|
||||||
PUTSHORT(p - datap, lenp);
|
|
||||||
parm->plen = p - (unsigned char *)header;
|
|
||||||
|
|
||||||
return 0; /* done */
|
return 0; /* done */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
size_t add_mac(struct dns_header *header, size_t plen, char *limit, union mysockaddr *l3)
|
size_t add_mac(struct dns_header *header, size_t plen, char *limit, union mysockaddr *l3)
|
||||||
{
|
{
|
||||||
struct macparm parm;
|
struct macparm parm;
|
||||||
@@ -621,6 +627,101 @@ size_t add_mac(struct dns_header *header, size_t plen, char *limit, union mysock
|
|||||||
return parm.plen;
|
return parm.plen;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct subnet_opt {
|
||||||
|
u16 family;
|
||||||
|
u8 source_netmask, scope_netmask;
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
u8 addr[IN6ADDRSZ];
|
||||||
|
#else
|
||||||
|
u8 addr[INADDRSZ];
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source)
|
||||||
|
{
|
||||||
|
/* http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-02 */
|
||||||
|
|
||||||
|
int len;
|
||||||
|
void *addrp;
|
||||||
|
|
||||||
|
if (source->sa.sa_family == AF_INET)
|
||||||
|
{
|
||||||
|
opt->family = htons(1);
|
||||||
|
opt->source_netmask = daemon->addr4_netmask;
|
||||||
|
addrp = &source->in.sin_addr;
|
||||||
|
}
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
else
|
||||||
|
{
|
||||||
|
opt->family = htons(2);
|
||||||
|
opt->source_netmask = daemon->addr6_netmask;
|
||||||
|
addrp = &source->in6.sin6_addr;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
opt->scope_netmask = 0;
|
||||||
|
len = 0;
|
||||||
|
|
||||||
|
if (opt->source_netmask != 0)
|
||||||
|
{
|
||||||
|
len = ((opt->source_netmask - 1) >> 3) + 1;
|
||||||
|
memcpy(opt->addr, addrp, len);
|
||||||
|
if (opt->source_netmask & 7)
|
||||||
|
opt->addr[len-1] &= 0xff << (8 - (opt->source_netmask & 7));
|
||||||
|
}
|
||||||
|
|
||||||
|
return len + 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t add_source_addr(struct dns_header *header, size_t plen, char *limit, union mysockaddr *source)
|
||||||
|
{
|
||||||
|
/* http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-02 */
|
||||||
|
|
||||||
|
int len;
|
||||||
|
struct subnet_opt opt;
|
||||||
|
|
||||||
|
len = calc_subnet_opt(&opt, source);
|
||||||
|
return add_pseudoheader(header, plen, (unsigned char *)limit, EDNS0_OPTION_CLIENT_SUBNET, (unsigned char *)&opt, len);
|
||||||
|
}
|
||||||
|
|
||||||
|
int check_source(struct dns_header *header, size_t plen, unsigned char *pseudoheader, union mysockaddr *peer)
|
||||||
|
{
|
||||||
|
/* Section 9.2, Check that subnet option in reply matches. */
|
||||||
|
|
||||||
|
|
||||||
|
int len, calc_len;
|
||||||
|
struct subnet_opt opt;
|
||||||
|
unsigned char *p;
|
||||||
|
int code, i, rdlen;
|
||||||
|
|
||||||
|
calc_len = calc_subnet_opt(&opt, peer);
|
||||||
|
|
||||||
|
if (!(p = skip_name(pseudoheader, header, plen, 10)))
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
p += 8; /* skip UDP length and RCODE */
|
||||||
|
|
||||||
|
GETSHORT(rdlen, p);
|
||||||
|
if (!CHECK_LEN(header, p, plen, rdlen))
|
||||||
|
return 1; /* bad packet */
|
||||||
|
|
||||||
|
/* check if option there */
|
||||||
|
for (i = 0; i + 4 < rdlen; i += len + 4)
|
||||||
|
{
|
||||||
|
GETSHORT(code, p);
|
||||||
|
GETSHORT(len, p);
|
||||||
|
if (code == EDNS0_OPTION_CLIENT_SUBNET)
|
||||||
|
{
|
||||||
|
/* make sure this doesn't mismatch. */
|
||||||
|
opt.scope_netmask = p[3];
|
||||||
|
if (len != calc_len || memcmp(p, &opt, len) != 0)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
p += len;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* is addr in the non-globally-routed IP space? */
|
/* is addr in the non-globally-routed IP space? */
|
||||||
static int private_net(struct in_addr addr, int ban_localhost)
|
static int private_net(struct in_addr addr, int ban_localhost)
|
||||||
|
|||||||
+8
-3
@@ -66,6 +66,10 @@ static void calculate_times(struct dhcp_context *context, unsigned int *min_time
|
|||||||
#define opt6_type(opt) (opt6_uint(opt, -4, 2))
|
#define opt6_type(opt) (opt6_uint(opt, -4, 2))
|
||||||
#define opt6_ptr(opt, i) ((void *)&(((unsigned char *)(opt))[4+(i)]))
|
#define opt6_ptr(opt, i) ((void *)&(((unsigned char *)(opt))[4+(i)]))
|
||||||
|
|
||||||
|
#define opt6_user_vendor_ptr(opt, i) ((void *)&(((unsigned char *)(opt))[2+(i)]))
|
||||||
|
#define opt6_user_vendor_len(opt) ((int)(opt6_uint(opt, -4, 2)))
|
||||||
|
#define opt6_user_vendor_next(opt, end) (opt6_next(((void *) opt) - 2, end))
|
||||||
|
|
||||||
|
|
||||||
unsigned short dhcp6_reply(struct dhcp_context *context, int interface, char *iface_name,
|
unsigned short dhcp6_reply(struct dhcp_context *context, int interface, char *iface_name,
|
||||||
struct in6_addr *fallback, size_t sz, struct in6_addr *client_addr, time_t now)
|
struct in6_addr *fallback, size_t sz, struct in6_addr *client_addr, time_t now)
|
||||||
@@ -355,9 +359,10 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
|
|||||||
offset = 4;
|
offset = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (enc_opt = opt6_ptr(opt, offset); enc_opt; enc_opt = opt6_next(enc_opt, enc_end))
|
/* Note that format if user/vendor classes is different to DHCP options - no option types. */
|
||||||
for (i = 0; i <= (opt6_len(enc_opt) - vendor->len); i++)
|
for (enc_opt = opt6_ptr(opt, offset); enc_opt; enc_opt = opt6_user_vendor_next(enc_opt, enc_end))
|
||||||
if (memcmp(vendor->data, opt6_ptr(enc_opt, i), vendor->len) == 0)
|
for (i = 0; i <= (opt6_user_vendor_len(enc_opt) - vendor->len); i++)
|
||||||
|
if (memcmp(vendor->data, opt6_user_vendor_ptr(enc_opt, i), vendor->len) == 0)
|
||||||
{
|
{
|
||||||
vendor->netid.next = state->tags;
|
vendor->netid.next = state->tags;
|
||||||
state->tags = &vendor->netid;
|
state->tags = &vendor->netid;
|
||||||
|
|||||||
Reference in new issue
Block a user