Skip to content

D
Dnsmasq
Commit 3be34541 authored by Simon Kelley's avatar Simon Kelley
Browse files
Options

import of dnsmasq-2.14.tar.gz

parent 9c74ec03
Hide whitespace changes
Inline Side-by-side
Showing with 1168 additions and 928 deletions
CHANGELOG
View file @ 3be34541
...@@ -1160,3 +1160,33 @@ version 2.12 ...@@ -1160,3 +1160,33 @@ version 2.12
version 2.13 version 2.13
Fixed crash with un-named DHCP hosts introduced in 2.12. Fixed crash with un-named DHCP hosts introduced in 2.12.
Thanks to Nicolo Wojewoda and Gregory Gathy for bug reports. Thanks to Nicolo Wojewoda and Gregory Gathy for bug reports.
version 2.14
Fix DHCP network detection for hosts which talk via a
relay. This makes lease renewal for such hosts work
correctly.
Support RFC3011 subnet selectors in the DHCP server.
Fix DHCP code to generate RFC-compliant responses
to hosts in the INIT-REBOOT state.
In the DHCP server, set the receive buffer size on
the transmit-only packet socket to zero, to avoid
waste of kernel buffers.
Fix DHCP address allocation code to use the whole of
the DHCP range, including the start and end addresses.
Attempt an ICMP "ping" on new addresses before allocating
them to leases, to avoid allocating addresses which are in use.
Handle rfc951 BOOTP as well as DHCP for hosts which have
MAC address to IP address mapping defined.
Fix compilation under MacOS X. Thanks to Chris Tomlinson.
Fix compilation under NetBSD. Thanks to Felix Deichmann.
Added "keep-in-foreground" option. Thanks to Sean
MacLennan for the patch.
FAQ
View file @ 3be34541
...@@ -190,7 +190,8 @@ A: By default, none of the DHCP clients send the host-name when asking ...@@ -190,7 +190,8 @@ A: By default, none of the DHCP clients send the host-name when asking
send with the "hostname" keyword in /etc/network/interfaces. (See send with the "hostname" keyword in /etc/network/interfaces. (See
"man interfaces" for details.) That doesn't work for dhclient, were "man interfaces" for details.) That doesn't work for dhclient, were
you have to add something like "send host-name daisy" to you have to add something like "send host-name daisy" to
/etc/dhclient.conf /etc/dhclient.conf [Update: the lastest dhcpcd packages _do_ send
the hostname by default.
Q: I'm network booting my machines, and trying to give them static Q: I'm network booting my machines, and trying to give them static
DHCP-assigned addresses. The machine gets its correct address DHCP-assigned addresses. The machine gets its correct address
...@@ -276,5 +277,13 @@ A: Probably because you have the "filterwin2k" option set. Note that ...@@ -276,5 +277,13 @@ A: Probably because you have the "filterwin2k" option set. Note that
versions before 2.12, so you might have it set on without versions before 2.12, so you might have it set on without
realising. realising.
Q: Can I get email notification when a new version of dnsmasq is
released?
A: Yes, new releases of dnsmasq are always announced through
freshmeat.net, and they allow you to subcribe to email alerts when
new versions of particular projects are released.
dnsmasq-rh.spec
View file @ 3be34541
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
############################################################################### ###############################################################################
Name: dnsmasq Name: dnsmasq
Version: 2.13 Version: 2.14
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
......
dnsmasq-suse.spec
View file @ 3be34541
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
############################################################################### ###############################################################################
Name: dnsmasq Name: dnsmasq
Version: 2.13 Version: 2.14
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: Productivity/Networking/DNS/Servers Group: Productivity/Networking/DNS/Servers
......
dnsmasq.8
View file @ 3be34541
...@@ -15,12 +15,13 @@ contents of /etc/hosts so that local hostnames ...@@ -15,12 +15,13 @@ contents of /etc/hosts so that local hostnames
which do not appear in the global DNS can be resolved and also answers which do not appear in the global DNS can be resolved and also answers
DNS queries for DHCP configured hosts. DNS queries for DHCP configured hosts.
.PP .PP
.BR dnsmasq The dnsmasq DHCP server supports static address assignments, multiple
supports IPv6. networks, DHCP-relay and RFC3011 subnet specifiers. It automatically
sends a sensible default set of DHCP options, and can be configured to
send any desired set of DHCP options. It also supports BOOTP.
.PP .PP
.BR dnsmasq Dnsmasq
is lightweight and easy to configure. It is intended as be run on supports IPv6.
small router/firewalls and provide a DNS (and optionally, DHCP) service to a LAN.
.SH OPTIONS .SH OPTIONS
Note that in general missing parameters are allowed and switch off Note that in general missing parameters are allowed and switch off
functions, for instance "--pid-file=" disables writing a PID file. On functions, for instance "--pid-file=" disables writing a PID file. On
...@@ -45,10 +46,15 @@ time-to-live (in seconds) to be given for these replies. This will ...@@ -45,10 +46,15 @@ time-to-live (in seconds) to be given for these replies. This will
reduce the load on the server at the expense of clients using stale reduce the load on the server at the expense of clients using stale
data under some circumstances. data under some circumstances.
.TP .TP
.B \-k, --keep-in-foreground
Do not go into the background at startup but otherwise run as
normal. This is intended for use when dnsmasq is run under daemontools.
.TP
.B \-d, --no-daemon .B \-d, --no-daemon
Debug mode: don't fork to the background, don't write a pid file, Debug mode: don't fork to the background, don't write a pid file,
don't change user id, generate a complete cache dump on receipt on don't change user id, generate a complete cache dump on receipt on
SIGUSR1, log to stderr as well as syslog. SIGUSR1, log to stderr as well as syslog, don't fork new processes
to handle TCP queries.
.TP .TP
.B \-q, --log-queries .B \-q, --log-queries
Log the results of DNS queries handled by dnsmasq. Enable a full cache dump on receipt of SIGUSR1. Log the results of DNS queries handled by dnsmasq. Enable a full cache dump on receipt of SIGUSR1.
...@@ -441,8 +447,12 @@ in /etc/resolv.conf (or equivalent). ...@@ -441,8 +447,12 @@ in /etc/resolv.conf (or equivalent).
Add the domain-suffix to simple names (without a period) in /etc/hosts Add the domain-suffix to simple names (without a period) in /etc/hosts
in the same way as for DHCP-derived names. in the same way as for DHCP-derived names.
.SH CONFIG FILE .SH CONFIG FILE
At startup, dnsmasq reads /etc/dnsmasq.conf, if it exists. (On At startup, dnsmasq reads
FreeBSD and OpenBSD, the file is /usr/local/etc/dnsmasq.conf) The format of this .I /etc/dnsmasq.conf,
if it exists. (On
FreeBSD, the file is
.I /usr/local/etc/dnsmasq.conf
) The format of this
file consists of one option per line, exactly as the long options detailed file consists of one option per line, exactly as the long options detailed
in the OPTIONS section but without the leading "--". Lines starting with # are comments and ignored. For in the OPTIONS section but without the leading "--". Lines starting with # are comments and ignored. For
options which may only be specified once, the configuration file overrides options which may only be specified once, the configuration file overrides
...@@ -453,10 +463,14 @@ level of nesting is allowed. ...@@ -453,10 +463,14 @@ level of nesting is allowed.
.SH NOTES .SH NOTES
When it receives a SIGHUP, When it receives a SIGHUP,
.B dnsmasq .B dnsmasq
clears its cache and then re-loads /etc/hosts. If clears its cache and then re-loads
.I /etc/hosts.
If
.B .B
--no-poll --no-poll
is set SIGHUP also re-reads /etc/resolv.conf. SIGHUP is set SIGHUP also re-reads
.I /etc/resolv.conf.
SIGHUP
does NOT re-read the configuration file. does NOT re-read the configuration file.
.PP .PP
When it receives a SIGUSR1, When it receives a SIGUSR1,
...@@ -472,25 +486,34 @@ Dnsmasq is a DNS query forwarder: it it not capable of recursively ...@@ -472,25 +486,34 @@ Dnsmasq is a DNS query forwarder: it it not capable of recursively
answering arbitrary queries starting from the root servers but answering arbitrary queries starting from the root servers but
forwards such queries to a fully recursive upstream DNS server which is forwards such queries to a fully recursive upstream DNS server which is
typically provided by an ISP. By default, dnsmasq reads typically provided by an ISP. By default, dnsmasq reads
/etc/resolv.conf to discover the IP .I /etc/resolv.conf
to discover the IP
addresses of the upstream nameservers it should use, since the addresses of the upstream nameservers it should use, since the
information is typically stored there. Unless information is typically stored there. Unless
.B --no-poll .B --no-poll
is used, is used,
.B dnsmasq .B dnsmasq
checks the modification time of /etc/resolv.conf (or checks the modification time of
equivalent if .I /etc/resolv.conf
(or equivalent if
.B \--resolv-file .B \--resolv-file
is used) and re-reads it if it changes. This allows the DNS servers to is used) and re-reads it if it changes. This allows the DNS servers to
be set dynamically by PPP or DHCP since both protocols provide the be set dynamically by PPP or DHCP since both protocols provide the
information. information.
Absence of /etc/resolv.conf is not an error Absence of
.I /etc/resolv.conf
is not an error
since it may not have been created before a PPP connection exists. Dnsmasq since it may not have been created before a PPP connection exists. Dnsmasq
simply keeps checking in case /etc/resolv.conf is created at any simply keeps checking in case
.I /etc/resolv.conf
is created at any
time. Dnsmasq can be told to parse more than one resolv.conf time. Dnsmasq can be told to parse more than one resolv.conf
file. This is useful on a laptop, where both PPP and DHCP may be used: file. This is useful on a laptop, where both PPP and DHCP may be used:
dnsmasq can be set to poll both /etc/ppp/resolv.conf and dnsmasq can be set to poll both
/etc/dhcpc/resolv.conf and will use the contents of whichever changed .I /etc/ppp/resolv.conf
and
.I /etc/dhcpc/resolv.conf
and will use the contents of whichever changed
last, giving automatic switching between DNS servers. last, giving automatic switching between DNS servers.
.PP .PP
Upstream servers may also be specified on the command line or in Upstream servers may also be specified on the command line or in
...@@ -510,6 +533,22 @@ and run dnsmasq with the ...@@ -510,6 +533,22 @@ and run dnsmasq with the
.B \-r /etc/resolv.dnsmasq .B \-r /etc/resolv.dnsmasq
option. This second technique allows for dynamic update of the server option. This second technique allows for dynamic update of the server
addresses by PPP or DHCP. addresses by PPP or DHCP.
.PP
The DHCP server in dnsmasq will function as a BOOTP server also,
provided that the MAC address and IP address for clients are given,
either using
.B dhcp-host
configurations or in
.I /etc/ethers
, and a
.B dhcp-range
configuration option is present to activate the DHCP server
on a particular network. The filename
parameter in a BOOTP request is matched against netids in
.B dhcp-option
configurations, allowing some control over the options returned to
different classes of hosts.
.SH FILES .SH FILES
.IR /etc/dnsmasq.conf .IR /etc/dnsmasq.conf
...@@ -519,6 +558,8 @@ addresses by PPP or DHCP. ...@@ -519,6 +558,8 @@ addresses by PPP or DHCP.
.IR /etc/hosts .IR /etc/hosts
.IR /etc/ethers
.IR /var/lib/misc/dnsmasq.leases .IR /var/lib/misc/dnsmasq.leases
.IR /var/db/dnsmasq.leases .IR /var/db/dnsmasq.leases
......
src/config.h
View file @ 3be34541
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
/* Author's email: simon@thekelleys.org.uk */ /* Author's email: simon@thekelleys.org.uk */
#define VERSION "2.13" #define VERSION "2.14"
#define FTABSIZ 150 /* max number of outstanding requests */ #define FTABSIZ 150 /* max number of outstanding requests */
#define MAX_PROCS 20 /* max no children for TCP requests */ #define MAX_PROCS 20 /* max no children for TCP requests */
...@@ -64,6 +64,15 @@ ...@@ -64,6 +64,15 @@
# define DNSMASQ_LOG_FAC(debug) LOG_DAEMON # define DNSMASQ_LOG_FAC(debug) LOG_DAEMON
#endif #endif
/* A small collection of RR-types which are missing on some platforms */
#ifndef T_SRV
# define T_SRV 33
#endif
#ifndef T_OPT
# define T_OPT 41
#endif
/* Decide if we're going to support IPv6 */ /* Decide if we're going to support IPv6 */
/* We assume that systems which don't have IPv6 /* We assume that systems which don't have IPv6
...@@ -218,7 +227,6 @@ NOTES: ...@@ -218,7 +227,6 @@ NOTES:
#undef HAVE_SOCKADDR_SA_LEN #undef HAVE_SOCKADDR_SA_LEN
#undef HAVE_PSELECT #undef HAVE_PSELECT
/* Fix various misfeatures of libc5 headers */ /* Fix various misfeatures of libc5 headers */
#define T_SRV 33
typedef unsigned long in_addr_t; typedef unsigned long in_addr_t;
typedef size_t socklen_t; typedef size_t socklen_t;
...@@ -267,9 +275,8 @@ typedef unsigned long in_addr_t; ...@@ -267,9 +275,8 @@ typedef unsigned long in_addr_t;
#define BIND_8_COMPAT #define BIND_8_COMPAT
/* Define before sys/socket.h is included so we get socklen_t */ /* Define before sys/socket.h is included so we get socklen_t */
#define _BSD_SOCKLEN_T_ #define _BSD_SOCKLEN_T_
/* The two below are not defined in Mac OS X arpa/nameserv.h */ /* The three below are not defined in Mac OS X arpa/nameserv.h */
#define IN6ADDRSZ 16 #define IN6ADDRSZ 16
#define T_SRV 33
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
#undef HAVE_LINUX_IPV6_PROC #undef HAVE_LINUX_IPV6_PROC
......
src/dhcp.c
View file @ 3be34541
...@@ -14,70 +14,91 @@ ...@@ -14,70 +14,91 @@
#include "dnsmasq.h" #include "dnsmasq.h"
void dhcp_init(int *fdp, int* rfdp, struct dhcp_config *configs) void dhcp_init(struct daemon *daemon)
{ {
int fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); int fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
struct sockaddr_in saddr; struct sockaddr_in saddr;
int opt = 1; int oneopt = 1, zeroopt = 0;
struct dhcp_config *cp; struct dhcp_config *configs, *cp;
if (fd == -1) if (fd == -1)
die ("cannot create DHCP socket : %s", NULL); die ("cannot create DHCP socket : %s", NULL);
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 || if (
#if defined(IP_PKTINFO) #if defined(IP_PKTINFO)
setsockopt(fd, SOL_IP, IP_PKTINFO, &opt, sizeof(opt)) == -1 || setsockopt(fd, SOL_IP, IP_PKTINFO, &oneopt, sizeof(oneopt)) == -1 ||
#elif defined(IP_RECVIF) #elif defined(IP_RECVIF)
setsockopt(fd, IPPROTO_IP, IP_RECVIF, &opt, sizeof(opt)) == -1 || setsockopt(fd, IPPROTO_IP, IP_RECVIF, &oneopt, sizeof(oneopt)) == -1 ||
#endif #endif
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &opt, sizeof(opt)) == -1) setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &oneopt, sizeof(oneopt)) == -1)
die("failed to set options on DHCP socket: %s", NULL); die("failed to set options on DHCP socket: %s", NULL);
saddr.sin_family = AF_INET; saddr.sin_family = AF_INET;
saddr.sin_port = htons(DHCP_SERVER_PORT); saddr.sin_port = htons(DHCP_SERVER_PORT);
saddr.sin_addr.s_addr = INADDR_ANY; saddr.sin_addr.s_addr = INADDR_ANY;
#ifdef HAVE_SOCKADDR_SA_LEN
saddr.sin_len = sizeof(struct sockaddr_in);
#endif
if (bind(fd, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in))) if (bind(fd, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in)))
die("failed to bind DHCP server socket: %s", NULL); die("failed to bind DHCP server socket: %s", NULL);
*fdp = fd; daemon->dhcpfd = fd;
if ((fd = socket (AF_INET, SOCK_RAW, IPPROTO_ICMP)) == -1 ||
setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &oneopt, sizeof(oneopt)) ||
setsockopt(fd, SOL_SOCKET, SO_DONTROUTE, &zeroopt, sizeof(zeroopt)) == -1)
die("cannot create ICMP raw socket: %s.", NULL);
daemon->dhcp_icmp_fd = fd;
#ifdef HAVE_BPF #ifdef HAVE_BPF
opt = 0; {
while (1) int i = 0;
{ while (1)
char filename[50]; {
sprintf(filename, "/dev/bpf%d", opt++); char filename[50];
if ((fd = open(filename, O_RDWR, 0)) != -1) sprintf(filename, "/dev/bpf%d", i++);
break; if ((fd = open(filename, O_RDWR, 0)) != -1)
if (errno != EBUSY) break;
die("cannot create DHCP BPF socket: %s", NULL); if (errno != EBUSY)
} die("cannot create DHCP BPF socket: %s", NULL);
}
}
#else #else
if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETHERTYPE_IP))) == -1) /* since we don't ever use the packet socket for reception,
die("cannot create DHCP packet socket: %s", NULL); and it receives copies of _all_ IP packets, then that data
will build up in kernel buffers, wasting memory. Set the
socket receive buffer size to one to avoid that. (zero is
rejected as non-sensical by some BSD kernels) */
if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETHERTYPE_IP))) == -1 ||
setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &oneopt, sizeof(oneopt)) == -1)
die("cannot create DHCP packet socket: %s. "
"Is CONFIG_PACKET enabled in your kernel?", NULL);
#endif #endif
*rfdp = fd; daemon->dhcp_raw_fd = fd;
/* If the same IP appears in more than one host config, then DISCOVER /* If the same IP appears in more than one host config, then DISCOVER
for one of the hosts will get the address, but REQUEST will be NAKed, for one of the hosts will get the address, but REQUEST will be NAKed,
since the address is reserved by the other one -> protocol loop. */ since the address is reserved by the other one -> protocol loop. */
for (; configs; configs = configs->next) for (configs = daemon->dhcp_conf; configs; configs = configs->next)
for (cp = configs->next; cp; cp = cp->next) for (cp = configs->next; cp; cp = cp->next)
if ((configs->flags & cp->flags & CONFIG_ADDR) && configs->addr.s_addr == cp->addr.s_addr) if ((configs->flags & cp->flags & CONFIG_ADDR) && configs->addr.s_addr == cp->addr.s_addr)
die("Duplicate IP address %s in dhcp-config directive.", inet_ntoa(cp->addr)); die("duplicate IP address %s in dhcp-config directive.", inet_ntoa(cp->addr));
daemon->dhcp_packet = safe_malloc(sizeof(struct udp_dhcp_packet));
/* These two each hold a DHCP option max size 256
and get a terminating zero added */
daemon->dhcp_buff = safe_malloc(257);
daemon->dhcp_buff2 = safe_malloc(257);
} }
void dhcp_packet(struct dhcp_context *contexts, char *packet, void dhcp_packet(struct daemon *daemon, time_t now)
struct dhcp_opt *dhcp_opts, struct dhcp_config *dhcp_configs,
struct dhcp_vendor *vendors,
time_t now, char *namebuff, char *domain_suffix,
char *dhcp_file, char *dhcp_sname,
struct in_addr dhcp_next_server, int dhcp_fd, int raw_fd,
struct iname *names, struct iname *addrs, struct iname *except)
{ {
struct udp_dhcp_packet *rawpacket = (struct udp_dhcp_packet *)packet; struct udp_dhcp_packet *rawpacket = daemon->dhcp_packet;
struct dhcp_packet *mess = (struct dhcp_packet *)&rawpacket->data; struct dhcp_packet *mess = &rawpacket->data;
struct dhcp_context *context; struct dhcp_context *context;
struct iname *tmp; struct iname *tmp;
struct ifreq ifr; struct ifreq ifr;
...@@ -85,8 +106,7 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet, ...@@ -85,8 +106,7 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet,
struct iovec iov[2]; struct iovec iov[2];
struct cmsghdr *cmptr; struct cmsghdr *cmptr;
int sz, newlen, iface_index = 0; int sz, newlen, iface_index = 0;
struct in_addr source, iface_netmask, iface_addr, iface_broadcast; struct in_addr iface_netmask, iface_addr, iface_broadcast;
struct in_addr netmask_save, broadcast_save, router;
#ifdef HAVE_BPF #ifdef HAVE_BPF
unsigned char iface_hwaddr[ETHER_ADDR_LEN]; unsigned char iface_hwaddr[ETHER_ADDR_LEN];
#endif #endif
...@@ -100,8 +120,8 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet, ...@@ -100,8 +120,8 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet,
#endif #endif
} control_u; } control_u;
iov[0].iov_base = (char *)&rawpacket->data; iov[0].iov_base = (char *)mess;
iov[0].iov_len = DNSMASQ_PACKETSZ - (sizeof(struct ip) + sizeof(struct udphdr)); iov[0].iov_len = sizeof(struct dhcp_packet);
msg.msg_control = control_u.control; msg.msg_control = control_u.control;
msg.msg_controllen = sizeof(control_u); msg.msg_controllen = sizeof(control_u);
...@@ -111,7 +131,7 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet, ...@@ -111,7 +131,7 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet,
msg.msg_iov = iov; msg.msg_iov = iov;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
sz = recvmsg(dhcp_fd, &msg, 0); sz = recvmsg(daemon->dhcpfd, &msg, 0);
if (sz < (int)(sizeof(*mess) - sizeof(mess->options))) if (sz < (int)(sizeof(*mess) - sizeof(mess->options)))
return; return;
...@@ -124,7 +144,7 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet, ...@@ -124,7 +144,7 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet,
iface_index = ((struct in_pktinfo *)CMSG_DATA(cmptr))->ipi_ifindex; iface_index = ((struct in_pktinfo *)CMSG_DATA(cmptr))->ipi_ifindex;
if (!(ifr.ifr_ifindex = iface_index) || if (!(ifr.ifr_ifindex = iface_index) ||
ioctl(dhcp_fd, SIOCGIFNAME, &ifr) == -1) ioctl(daemon->dhcpfd, SIOCGIFNAME, &ifr) == -1)
return; return;
#elif defined(IP_RECVIF) #elif defined(IP_RECVIF)
...@@ -138,35 +158,37 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet, ...@@ -138,35 +158,37 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet,
return; return;
#else #else
while (names->isloop) {
names = names->next; struct iname *name;
strcpy(ifr.ifr_name, names->name); for (name = daemon->if_names; names->isloop; names = names->next);
strcpy(ifr.ifr_name, name->name);
}
#endif #endif
#ifdef HAVE_BPF #ifdef HAVE_BPF
ifr.ifr_addr.sa_family = AF_LINK; ifr.ifr_addr.sa_family = AF_LINK;
if (ioctl(dhcp_fd, SIOCGIFADDR, &ifr) < 0) if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) < 0)
return; return;
memcpy(iface_hwaddr, LLADDR((struct sockaddr_dl *)&ifr.ifr_addr), ETHER_ADDR_LEN); memcpy(iface_hwaddr, LLADDR((struct sockaddr_dl *)&ifr.ifr_addr), ETHER_ADDR_LEN);
#endif #endif
ifr.ifr_addr.sa_family = AF_INET; ifr.ifr_addr.sa_family = AF_INET;
if (ioctl(dhcp_fd, SIOCGIFADDR, &ifr) < 0 ) if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) < 0 )
return; return;
iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr; iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
/* enforce available interface configuration */ /* enforce available interface configuration */
for (tmp = except; tmp; tmp = tmp->next) for (tmp = daemon->if_except; tmp; tmp = tmp->next)
if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0)) if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
return; return;
if (names || addrs) if (daemon->if_names || daemon->if_addrs)
{ {
for (tmp = names; tmp; tmp = tmp->next) for (tmp = daemon->if_names; tmp; tmp = tmp->next)
if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0)) if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
break; break;
if (!tmp) if (!tmp)
for (tmp = addrs; tmp; tmp = tmp->next) for (tmp = daemon->if_addrs; tmp; tmp = tmp->next)
if (tmp->addr.sa.sa_family == AF_INET && if (tmp->addr.sa.sa_family == AF_INET &&
tmp->addr.in.sin_addr.s_addr == iface_addr.s_addr) tmp->addr.in.sin_addr.s_addr == iface_addr.s_addr)
break; break;
...@@ -174,90 +196,71 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet, ...@@ -174,90 +196,71 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet,
return; return;
} }
/* If the packet came via a relay, use that address to look up the context, iface_netmask.s_addr = 0;
else use the address of the interface is arrived on. */ iface_broadcast.s_addr = 0;
source = mess->giaddr.s_addr ? mess->giaddr : iface_addr;
iface_netmask.s_addr = 0;
iface_broadcast.s_addr = 0;
if (ioctl(dhcp_fd, SIOCGIFNETMASK, &ifr) != -1)
{
iface_netmask = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
/* we can use the interface netmask if either the packet came direct,
or it came via a relay listening on the same network. This sounds unlikely,
but it happens with win4lin. */
if (!is_same_net(source, iface_addr, iface_netmask))
iface_netmask.s_addr = 0;
else if (ioctl(dhcp_fd, SIOCGIFBRDADDR, &ifr) != -1)
iface_broadcast = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
}
for (context = contexts; context; context = context->next)
{
struct in_addr netmask = context->netmask.s_addr ? context->netmask : iface_netmask;
if (netmask.s_addr &&
is_same_net(source, context->start, netmask) &&
is_same_net(source, context->end, netmask))
break;
}
if (!context)
{
syslog(LOG_WARNING, "no address range available for DHCP request via %s", inet_ntoa(source));
return;
}
netmask_save = context->netmask; for (context = daemon->dhcp; context; context = context->next)
broadcast_save = context->broadcast;
if (!context->netmask.s_addr)
context->netmask = iface_netmask;
if (!context->broadcast.s_addr)
{ {
if (iface_broadcast.s_addr) /* Fill in missing netmask and broadcast address values for any approriate
context->broadcast = iface_broadcast; dhcp-ranges which match this interface and don't have them. */
else if (!context->netmask.s_addr)
context->broadcast.s_addr = (source.s_addr & context->netmask.s_addr) | ~context->netmask.s_addr; {
if (!iface_netmask.s_addr && ioctl(daemon->dhcpfd, SIOCGIFNETMASK, &ifr) != -1)
iface_netmask = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
if (iface_netmask.s_addr &&
is_same_net(iface_addr, context->start, iface_netmask) &&
is_same_net(iface_addr, context->end, iface_netmask))
context->netmask = iface_netmask;
}
/* Determine "default" default routes. These are to this server or the relay agent.
Also broadcast addresses, if not specified */
if (context->netmask.s_addr)
{
if (is_same_net(iface_addr, context->start, context->netmask))
{
if (!context->router.s_addr)
context->router = iface_addr;
if (!context->broadcast.s_addr)
{
if (!iface_broadcast.s_addr && ioctl(daemon->dhcpfd, SIOCGIFBRDADDR, &ifr) != -1)
iface_broadcast = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
if (iface_broadcast.s_addr)
context->broadcast = iface_broadcast;
else
context->broadcast.s_addr = context->start.s_addr | ~context->netmask.s_addr;
}
}
else if (mess->giaddr.s_addr && is_same_net(mess->giaddr, context->start, context->netmask))
{
if (!context->router.s_addr)
context->router = mess->giaddr;
/* fill in missing broadcast addresses for relayed ranges */
if (!context->broadcast.s_addr)
context->broadcast.s_addr = context->start.s_addr | ~context->netmask.s_addr;
}
}
} }
if (ioctl(dhcp_fd, SIOCGIFMTU, &ifr) == -1)
ifr.ifr_mtu = ETHERMTU;
/* Normally, we set the default route to point to the machine which is getting the
DHCP broadcast, either this machine or a relay. In the special case that the relay
is on the same network as us, we set the default route to us, not the relay.
This is the win4lin scenario again. */
if (is_same_net(source, iface_addr, context->netmask))
router = iface_addr;
else
router = source;
lease_prune(NULL, now); /* lose any expired leases */ lease_prune(NULL, now); /* lose any expired leases */
newlen = dhcp_reply(context, iface_addr, ifr.ifr_name, ifr.ifr_mtu, newlen = dhcp_reply(daemon, iface_addr, ifr.ifr_name, sz, now);
rawpacket, sz, now, namebuff,
dhcp_opts, dhcp_configs, vendors, domain_suffix,
dhcp_file, dhcp_sname, dhcp_next_server, router);
lease_update_file(0, now); lease_update_file(0, now);
lease_update_dns(); lease_update_dns();
context->netmask = netmask_save;
context->broadcast = broadcast_save;
if (newlen == 0) if (newlen == 0)
return; return;
if (mess->giaddr.s_addr || mess->ciaddr.s_addr) if (mess->giaddr.s_addr || mess->ciaddr.s_addr)
{ {
/* To send to BOOTP relay or configured client, use /* To send to BOOTP relay or configured client, use the IP packet */
the IP packet */
struct sockaddr_in dest; struct sockaddr_in dest;
dest.sin_family = AF_INET; dest.sin_family = AF_INET;
#ifdef HAVE_SOCKADDR_SA_LEN
dest.sin_len = sizeof(struct sockaddr_in);
#endif
if (mess->giaddr.s_addr) if (mess->giaddr.s_addr)
{ {
dest.sin_port = htons(DHCP_SERVER_PORT); dest.sin_port = htons(DHCP_SERVER_PORT);
...@@ -269,7 +272,7 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet, ...@@ -269,7 +272,7 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet,
dest.sin_addr = mess->ciaddr; dest.sin_addr = mess->ciaddr;
} }
sendto(dhcp_fd, mess, newlen, 0, (struct sockaddr *)&dest, sizeof(dest)); sendto(daemon->dhcpfd, mess, newlen, 0, (struct sockaddr *)&dest, sizeof(dest));
} }
else else
{ {
...@@ -333,13 +336,13 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet, ...@@ -333,13 +336,13 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet,
memcpy(header.ether_shost, iface_hwaddr, ETHER_ADDR_LEN); memcpy(header.ether_shost, iface_hwaddr, ETHER_ADDR_LEN);
memcpy(header.ether_dhost, hwdest, ETHER_ADDR_LEN); memcpy(header.ether_dhost, hwdest, ETHER_ADDR_LEN);
ioctl(raw_fd, BIOCSETIF, &ifr); ioctl(daemon->dhcp_raw_fd, BIOCSETIF, &ifr);
iov[0].iov_base = (char *)&header; iov[0].iov_base = (char *)&header;
iov[0].iov_len = sizeof(struct ether_header); iov[0].iov_len = sizeof(struct ether_header);
iov[1].iov_base = (char *)rawpacket; iov[1].iov_base = (char *)rawpacket;
iov[1].iov_len = ntohs(rawpacket->ip.ip_len); iov[1].iov_len = ntohs(rawpacket->ip.ip_len);
writev(raw_fd, iov, 2); writev(daemon->dhcp_raw_fd, iov, 2);
#else #else
struct sockaddr_ll dest; struct sockaddr_ll dest;
...@@ -348,7 +351,7 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet, ...@@ -348,7 +351,7 @@ void dhcp_packet(struct dhcp_context *contexts, char *packet,
dest.sll_ifindex = iface_index; dest.sll_ifindex = iface_index;
dest.sll_protocol = htons(ETHERTYPE_IP); dest.sll_protocol = htons(ETHERTYPE_IP);
memcpy(dest.sll_addr, hwdest, ETHER_ADDR_LEN); memcpy(dest.sll_addr, hwdest, ETHER_ADDR_LEN);
sendto(raw_fd, rawpacket, ntohs(rawpacket->ip.ip_len), sendto(daemon->dhcp_raw_fd, rawpacket, ntohs(rawpacket->ip.ip_len),
0, (struct sockaddr *)&dest, sizeof(dest)); 0, (struct sockaddr *)&dest, sizeof(dest));
#endif #endif
...@@ -363,14 +366,14 @@ int address_available(struct dhcp_context *context, struct in_addr taddr) ...@@ -363,14 +366,14 @@ int address_available(struct dhcp_context *context, struct in_addr taddr)
unsigned int addr, start, end; unsigned int addr, start, end;
/* static leases only. */
if (context->static_only)
return 0;
addr = ntohl(taddr.s_addr); addr = ntohl(taddr.s_addr);
start = ntohl(context->start.s_addr); start = ntohl(context->start.s_addr);
end = ntohl(context->end.s_addr); end = ntohl(context->end.s_addr);
/* static leases only. */
if (start == end)
return 0;
if (addr < start) if (addr < start)
return 0; return 0;
...@@ -391,7 +394,7 @@ struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct i ...@@ -391,7 +394,7 @@ struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct i
return NULL; return NULL;
} }
int address_allocate(struct dhcp_context *context, struct dhcp_config *configs, int address_allocate(struct dhcp_context *context, struct daemon *daemon,
struct in_addr *addrp, unsigned char *hwaddr) struct in_addr *addrp, unsigned char *hwaddr)
{ {
/* Find a free address: exclude anything in use and anything allocated to /* Find a free address: exclude anything in use and anything allocated to
...@@ -400,8 +403,8 @@ int address_allocate(struct dhcp_context *context, struct dhcp_config *configs, ...@@ -400,8 +403,8 @@ int address_allocate(struct dhcp_context *context, struct dhcp_config *configs,
struct in_addr start, addr ; struct in_addr start, addr ;
unsigned int i, j; unsigned int i, j;
/* start == end means no dynamic leases. */ /* check if no dynamic leases. */
if (context->end.s_addr == context->start.s_addr) if (context->static_only)
return 0; return 0;
/* pick a seed based on hwaddr then iterate until we find a free address. */ /* pick a seed based on hwaddr then iterate until we find a free address. */
...@@ -410,20 +413,28 @@ int address_allocate(struct dhcp_context *context, struct dhcp_config *configs, ...@@ -410,20 +413,28 @@ int address_allocate(struct dhcp_context *context, struct dhcp_config *configs,
start.s_addr = addr.s_addr = start.s_addr = addr.s_addr =
htonl(ntohl(context->start.s_addr) + htonl(ntohl(context->start.s_addr) +
(j % (ntohl(context->end.s_addr) - ntohl(context->start.s_addr)))); (j % (1 + ntohl(context->end.s_addr) - ntohl(context->start.s_addr))));
do {
if (addr.s_addr == context->end.s_addr)
addr = context->start;
else
addr.s_addr = htonl(ntohl(addr.s_addr) + 1);
do {
if (!lease_find_by_addr(addr) && !config_find_by_address(configs, addr)) if (!lease_find_by_addr(addr) &&
!config_find_by_address(daemon->dhcp_conf, addr))
{ {
*addrp = addr; if (icmp_ping(daemon, addr))
return 1; /* perturb address selection so that we are
less likely to try this address again. */
context->addr_epoch++;
else
{
*addrp = addr;
return 1;
}
} }
addr.s_addr = htonl(ntohl(addr.s_addr) + 1);
if (addr.s_addr == htonl(ntohl(context->end.s_addr) + 1))
addr = context->start;
} while (addr.s_addr != start.s_addr); } while (addr.s_addr != start.s_addr);
return 0; return 0;
...@@ -481,20 +492,21 @@ struct dhcp_config *find_config(struct dhcp_config *configs, ...@@ -481,20 +492,21 @@ struct dhcp_config *find_config(struct dhcp_config *configs,
return NULL; return NULL;
} }
struct dhcp_config *dhcp_read_ethers(struct dhcp_config *configs, char *buff) void dhcp_read_ethers(struct daemon *daemon)
{ {
FILE *f = fopen(ETHERSFILE, "r"); FILE *f = fopen(ETHERSFILE, "r");
unsigned int flags, e0, e1, e2, e3, e4, e5; unsigned int flags, e0, e1, e2, e3, e4, e5;
char *buff = daemon->namebuff;
char *ip, *cp; char *ip, *cp;
struct in_addr addr; struct in_addr addr;
unsigned char hwaddr[ETHER_ADDR_LEN]; unsigned char hwaddr[ETHER_ADDR_LEN];
struct dhcp_config *config; struct dhcp_config *config, *configs = daemon->dhcp_conf;
int count = 0; int count = 0;
if (!f) if (!f)
{ {
syslog(LOG_ERR, "failed to read " ETHERSFILE ":%m"); syslog(LOG_ERR, "failed to read " ETHERSFILE ":%m");
return configs; return;
} }
while (fgets(buff, MAXDNAME, f)) while (fgets(buff, MAXDNAME, f))
...@@ -586,7 +598,8 @@ struct dhcp_config *dhcp_read_ethers(struct dhcp_config *configs, char *buff) ...@@ -586,7 +598,8 @@ struct dhcp_config *dhcp_read_ethers(struct dhcp_config *configs, char *buff)
fclose(f); fclose(f);
syslog(LOG_INFO, "read " ETHERSFILE " - %d addresses", count); syslog(LOG_INFO, "read " ETHERSFILE " - %d addresses", count);
return configs;
daemon->dhcp_conf = configs;
} }
void dhcp_update_configs(struct dhcp_config *configs) void dhcp_update_configs(struct dhcp_config *configs)
......
src/dnsmasq.c
View file @ 3be34541
/* dnsmasq is Copyright (c) 2000-2003 Simon Kelley /* dnsmasq is Copyright (c) 2000-2004 Simon Kelley
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -16,75 +16,18 @@ ...@@ -16,75 +16,18 @@
static int sigterm, sighup, sigusr1, sigalarm, num_kids, in_child; static int sigterm, sighup, sigusr1, sigalarm, num_kids, in_child;
static void sig_handler(int sig) static int set_dns_listeners(struct daemon *daemon, fd_set *set, int maxfd);
{ static void check_dns_listeners(struct daemon *daemon, fd_set *set, time_t now);
if (sig == SIGTERM) static void sig_handler(int sig);
sigterm = 1;
else if (sig == SIGHUP)
sighup = 1;
else if (sig == SIGUSR1)
sigusr1 = 1;
else if (sig == SIGALRM)
{
/* alarm is used to kill children after a fixed time. */
if (in_child)
exit(0);
else
sigalarm = 1;
}
else if (sig == SIGCHLD)
{
/* See Stevens 5.10 */
pid_t pid;
int stat;
while ((pid = waitpid(-1, &stat, WNOHANG)) > 0)
num_kids--;
}
}
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
int cachesize = CACHESIZ; struct daemon *daemon;
int port = NAMESERVER_PORT;
int maxleases = MAXLEASES;
unsigned short edns_pktsz = EDNS_PKTSZ;
int query_port = 0;
int first_loop = 1; int first_loop = 1;
int bind_fallback = 0; int bind_fallback = 0;
unsigned long local_ttl = 0;
unsigned int options, min_leasetime;
char *runfile = RUNFILE;
time_t resolv_changed = 0; time_t resolv_changed = 0;
time_t now, last = 0; time_t now, last = 0;
struct irec *interfaces = NULL; struct irec *interfaces;
struct listener *listener, *listeners = NULL;
struct doctor *doctors = NULL;
struct mx_record *mxnames = NULL;
char *mxtarget = NULL;
char *lease_file = NULL;
char *addn_hosts = NULL;
char *domain_suffix = NULL;
char *username = CHUSER;
char *groupname = CHGRP;
struct iname *if_names = NULL;
struct iname *if_addrs = NULL;
struct iname *if_except = NULL;
struct server *serv_addrs = NULL;
char *dnamebuff, *packet;
int uptime_fd = -1;
struct server *servers, *last_server;
struct resolvc default_resolv = { NULL, 1, 0, RESOLVFILE };
struct resolvc *resolv = &default_resolv;
struct bogus_addr *bogus_addr = NULL;
struct serverfd *serverfdp, *sfds = NULL;
struct dhcp_context *dhcp_tmp, *dhcp = NULL;
struct dhcp_config *dhcp_configs = NULL;
struct dhcp_opt *dhcp_options = NULL;
struct dhcp_vendor *dhcp_vendors = NULL;
char *dhcp_file = NULL, *dhcp_sname = NULL;
struct in_addr dhcp_next_server;
int leasefd = -1, dhcpfd = -1, dhcp_raw_fd = -1;
struct sigaction sigact; struct sigaction sigact;
sigset_t sigmask; sigset_t sigmask;
...@@ -121,56 +64,45 @@ int main (int argc, char **argv) ...@@ -121,56 +64,45 @@ int main (int argc, char **argv)
sigaddset(&sigact.sa_mask, SIGCHLD); sigaddset(&sigact.sa_mask, SIGCHLD);
sigprocmask(SIG_BLOCK, &sigact.sa_mask, &sigmask); sigprocmask(SIG_BLOCK, &sigact.sa_mask, &sigmask);
/* These get allocated here to avoid overflowing the small stack daemon = read_opts(argc, argv);
on embedded systems. dnamebuff is big enough to hold one
maximal sixed domain name and gets passed into all the processing if (daemon->edns_pktsz < PACKETSZ)
code. We manage to get away with one buffer. */ daemon->edns_pktsz = PACKETSZ;
dnamebuff = safe_malloc(MAXDNAME); daemon->packet = safe_malloc(daemon->edns_pktsz > DNSMASQ_PACKETSZ ?
daemon->edns_pktsz : DNSMASQ_PACKETSZ);
dhcp_next_server.s_addr = 0; if (!daemon->lease_file)
options = read_opts(argc, argv, dnamebuff, &resolv, &mxnames, &mxtarget, &lease_file,
&username, &groupname, &domain_suffix, &runfile,
&if_names, &if_addrs, &if_except, &bogus_addr,
&serv_addrs, &cachesize, &port, &query_port, &local_ttl, &addn_hosts,
&dhcp, &dhcp_configs, &dhcp_options, &dhcp_vendors,
&dhcp_file, &dhcp_sname, &dhcp_next_server, &maxleases, &min_leasetime,
&doctors, &edns_pktsz);
if (edns_pktsz < PACKETSZ)
edns_pktsz = PACKETSZ;
packet = safe_malloc(edns_pktsz > DNSMASQ_PACKETSZ ? edns_pktsz : DNSMASQ_PACKETSZ);
if (!lease_file)
{ {
if (dhcp) if (daemon->dhcp)
lease_file = LEASEFILE; daemon->lease_file = LEASEFILE;
} }
#ifndef HAVE_ISC_READER #ifndef HAVE_ISC_READER
else if (!dhcp) else if (!daemon->dhcp)
die("ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h", NULL); die("ISC dhcpd integration not available: set HAVE_ISC_READER in src/config.h", NULL);
#endif #endif
interfaces = enumerate_interfaces(&if_names, &if_addrs, if_except, port); interfaces = enumerate_interfaces(daemon);
if (!(options & OPT_NOWILD) && !(listeners = create_wildcard_listeners(port))) if (!(daemon->options & OPT_NOWILD) &&
!(daemon->listeners = create_wildcard_listeners(daemon->port)))
{ {
bind_fallback = 1; bind_fallback = 1;
options |= OPT_NOWILD; daemon->options |= OPT_NOWILD;
} }
if (options & OPT_NOWILD) if (daemon->options & OPT_NOWILD)
{ {
struct iname *if_tmp; struct iname *if_tmp;
listeners = create_bound_listeners(interfaces, port); daemon->listeners = create_bound_listeners(interfaces, daemon->port);
for (if_tmp = if_names; if_tmp; if_tmp = if_tmp->next) for (if_tmp = daemon->if_names; if_tmp; if_tmp = if_tmp->next)
if (if_tmp->name && !if_tmp->used) if (if_tmp->name && !if_tmp->used)
die("unknown interface %s", if_tmp->name); die("unknown interface %s", if_tmp->name);
for (if_tmp = if_addrs; if_tmp; if_tmp = if_tmp->next) for (if_tmp = daemon->if_addrs; if_tmp; if_tmp = if_tmp->next)
if (!if_tmp->used) if (!if_tmp->used)
{ {
char addrbuff[ADDRSTRLEN]; char *addrbuff = daemon->namebuff;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (if_tmp->addr.sa.sa_family == AF_INET) if (if_tmp->addr.sa.sa_family == AF_INET)
inet_ntop(AF_INET, &if_tmp->addr.in.sin_addr, inet_ntop(AF_INET, &if_tmp->addr.in.sin_addr,
...@@ -186,60 +118,62 @@ int main (int argc, char **argv) ...@@ -186,60 +118,62 @@ int main (int argc, char **argv)
} }
forward_init(1); forward_init(1);
cache_init(cachesize, options & OPT_LOG); cache_init(daemon->cachesize, daemon->options & OPT_LOG);
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
if ((uptime_fd = open(UPTIME, O_RDONLY)) == -1) if ((daemon->uptime_fd = open(UPTIME, O_RDONLY)) == -1)
die("cannot open " UPTIME ":%s", NULL); die("cannot open " UPTIME ":%s", NULL);
#endif #endif
now = dnsmasq_time(uptime_fd); now = dnsmasq_time(daemon->uptime_fd);
if (dhcp) if (daemon->dhcp)
{ {
#if !defined(IP_PKTINFO) && !defined(IP_RECVIF) #if !defined(IP_PKTINFO) && !defined(IP_RECVIF)
int c; int c;
struct iname *tmp; struct iname *tmp;
for (c = 0, tmp = if_names; tmp; tmp = tmp->next) for (c = 0, tmp = daemon->if_names; tmp; tmp = tmp->next)
if (!tmp->isloop) if (!tmp->isloop)
c++; c++;
if (c != 1) if (c != 1)
die("must set exactly one interface on broken systems without IP_RECVIF", NULL); die("must set exactly one interface on broken systems without IP_RECVIF", NULL);
#endif #endif
dhcp_init(&dhcpfd, &dhcp_raw_fd, dhcp_configs); dhcp_init(daemon);
leasefd = lease_init(lease_file, domain_suffix, dnamebuff, packet, now, maxleases); lease_init(daemon, now);
} }
/* If query_port is set then create a socket now, before dumping root /* If query_port is set then create a socket now, before dumping root
for use to access nameservers without more specific source addresses. for use to access nameservers without more specific source addresses.
This allows query_port to be a low port */ This allows query_port to be a low port */
if (query_port) if (daemon->query_port)
{ {
union mysockaddr addr; union mysockaddr addr;
addr.in.sin_family = AF_INET; addr.in.sin_family = AF_INET;
addr.in.sin_addr.s_addr = INADDR_ANY; addr.in.sin_addr.s_addr = INADDR_ANY;
addr.in.sin_port = htons(query_port); addr.in.sin_port = htons(daemon->query_port);
#ifdef HAVE_SOCKADDR_SA_LEN #ifdef HAVE_SOCKADDR_SA_LEN
addr.in.sin_len = sizeof(struct sockaddr_in); addr.in.sin_len = sizeof(struct sockaddr_in);
#endif #endif
allocate_sfd(&addr, &sfds); allocate_sfd(&addr, &daemon->sfds);
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
addr.in6.sin6_family = AF_INET6; addr.in6.sin6_family = AF_INET6;
addr.in6.sin6_addr = in6addr_any; addr.in6.sin6_addr = in6addr_any;
addr.in6.sin6_port = htons(query_port); addr.in6.sin6_port = htons(daemon->query_port);
addr.in6.sin6_flowinfo = htonl(0); addr.in6.sin6_flowinfo = htonl(0);
#ifdef HAVE_SOCKADDR_SA_LEN #ifdef HAVE_SOCKADDR_SA_LEN
addr.in6.sin6_len = sizeof(struct sockaddr_in6); addr.in6.sin6_len = sizeof(struct sockaddr_in6);
#endif #endif
allocate_sfd(&addr, &sfds); allocate_sfd(&addr, &daemon->sfds);
#endif #endif
} }
setbuf(stdout, NULL); setbuf(stdout, NULL);
if (!(options & OPT_DEBUG)) if (!(daemon->options & OPT_DEBUG))
{ {
FILE *pidfile; FILE *pidfile;
struct serverfd *serverfdp;
struct listener *listener;
struct passwd *ent_pw; struct passwd *ent_pw;
int i; int i;
...@@ -247,20 +181,23 @@ int main (int argc, char **argv) ...@@ -247,20 +181,23 @@ int main (int argc, char **argv)
See Stevens section 12.4 */ See Stevens section 12.4 */
#ifndef NO_FORK #ifndef NO_FORK
if (fork() != 0 ) if (!(daemon->options & OPT_NO_FORK))
exit(0); {
if (fork() != 0 )
setsid(); exit(0);
if (fork() != 0) setsid();
exit(0);
if (fork() != 0)
exit(0);
}
#endif #endif
chdir("/"); chdir("/");
umask(022); /* make pidfile 0644 */ umask(022); /* make pidfile 0644 */
/* write pidfile _after_ forking ! */ /* write pidfile _after_ forking ! */
if (runfile && (pidfile = fopen(runfile, "w"))) if (daemon->runfile && (pidfile = fopen(daemon->runfile, "w")))
{ {
fprintf(pidfile, "%d\n", (int) getpid()); fprintf(pidfile, "%d\n", (int) getpid());
fclose(pidfile); fclose(pidfile);
...@@ -270,23 +207,25 @@ int main (int argc, char **argv) ...@@ -270,23 +207,25 @@ int main (int argc, char **argv)
for (i=0; i<64; i++) for (i=0; i<64; i++)
{ {
for (listener = listeners; listener; listener = listener->next) for (listener = daemon->listeners; listener; listener = listener->next)
{ if (listener->fd == i || listener->tcpfd == i)
if (listener->fd == i) break;
break;
if (listener->tcpfd == i)
break;
}
if (listener) if (listener)
continue; continue;
if (i == leasefd || #ifdef HAVE_BROKEN_RTC
i == uptime_fd || if (i == daemon->uptime_fd)
i == dhcpfd ||
i == dhcp_raw_fd)
continue; continue;
#endif
for (serverfdp = sfds; serverfdp; serverfdp = serverfdp->next) if (daemon->dhcp &&
(i == daemon->lease_fd ||
i == daemon->dhcpfd ||
i == daemon->dhcp_raw_fd ||
i == daemon->dhcp_icmp_fd))
continue;
for (serverfdp = daemon->sfds; serverfdp; serverfdp = serverfdp->next)
if (serverfdp->fd == i) if (serverfdp->fd == i)
break; break;
if (serverfdp) if (serverfdp)
...@@ -296,7 +235,7 @@ int main (int argc, char **argv) ...@@ -296,7 +235,7 @@ int main (int argc, char **argv)
} }
/* Change uid and gid for security */ /* Change uid and gid for security */
if (username && (ent_pw = getpwnam(username))) if (daemon->username && (ent_pw = getpwnam(daemon->username)))
{ {
gid_t dummy; gid_t dummy;
struct group *gp; struct group *gp;
...@@ -304,7 +243,7 @@ int main (int argc, char **argv) ...@@ -304,7 +243,7 @@ int main (int argc, char **argv)
setgroups(0, &dummy); setgroups(0, &dummy);
/* change group for /etc/ppp/resolv.conf /* change group for /etc/ppp/resolv.conf
otherwise get the group for "nobody" */ otherwise get the group for "nobody" */
if ((groupname && (gp = getgrnam(groupname))) || if ((daemon->groupname && (gp = getgrnam(daemon->groupname))) ||
(gp = getgrgid(ent_pw->pw_gid))) (gp = getgrgid(ent_pw->pw_gid)))
setgid(gp->gr_gid); setgid(gp->gr_gid);
/* finally drop root */ /* finally drop root */
...@@ -313,88 +252,91 @@ int main (int argc, char **argv) ...@@ -313,88 +252,91 @@ int main (int argc, char **argv)
} }
openlog("dnsmasq", openlog("dnsmasq",
DNSMASQ_LOG_OPT(options & OPT_DEBUG), DNSMASQ_LOG_OPT(daemon->options & OPT_DEBUG),
DNSMASQ_LOG_FAC(options & OPT_DEBUG)); DNSMASQ_LOG_FAC(daemon->options & OPT_DEBUG));
if (cachesize != 0) if (daemon->cachesize != 0)
syslog(LOG_INFO, "started, version %s cachesize %d", VERSION, cachesize); syslog(LOG_INFO, "started, version %s cachesize %d", VERSION, daemon->cachesize);
else else
syslog(LOG_INFO, "started, version %s cache disabled", VERSION); syslog(LOG_INFO, "started, version %s cache disabled", VERSION);
if (bind_fallback) if (bind_fallback)
syslog(LOG_WARNING, "setting --bind-interfaces option because of OS limitations"); syslog(LOG_WARNING, "setting --bind-interfaces option because of OS limitations");
for (dhcp_tmp = dhcp; dhcp_tmp; dhcp_tmp = dhcp_tmp->next) if (daemon->dhcp)
{ {
strcpy(dnamebuff, inet_ntoa(dhcp_tmp->start)); struct dhcp_context *dhcp_tmp;
if (dhcp_tmp->lease_time == 0) for (dhcp_tmp = daemon->dhcp; dhcp_tmp; dhcp_tmp = dhcp_tmp->next)
sprintf(packet, "infinite");
else
{ {
unsigned int x, p = 0, t = (unsigned int)dhcp_tmp->lease_time; char *time = daemon->dhcp_buff2;
if ((x = t/3600)) strcpy(daemon->dhcp_buff, inet_ntoa(dhcp_tmp->start));
p += sprintf(&packet[p], "%dh", x); if (dhcp_tmp->lease_time == 0)
if ((x = (t/60)%60)) sprintf(time, "infinite");
p += sprintf(&packet[p], "%dm", x); else
if ((x = t%60)) {
p += sprintf(&packet[p], "%ds", x); unsigned int x, p = 0, t = (unsigned int)dhcp_tmp->lease_time;
if ((x = t/3600))
p += sprintf(&time[p], "%dh", x);
if ((x = (t/60)%60))
p += sprintf(&time[p], "%dm", x);
if ((x = t%60))
p += sprintf(&time[p], "%ds", x);
}
syslog(LOG_INFO,
dhcp_tmp->static_only ?
"DHCP, static leases only on %.0s%s, lease time %s" :
"DHCP, IP range %s -- %s, lease time %s",
daemon->dhcp_buff, inet_ntoa(dhcp_tmp->end), time);
} }
syslog(LOG_INFO,
dhcp_tmp->start.s_addr == dhcp_tmp->end.s_addr ?
"DHCP, static leases only on %.0s%s, lease time %s" :
"DHCP, IP range %s -- %s, lease time %s",
dnamebuff, inet_ntoa(dhcp_tmp->end), packet);
} }
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
if (dhcp) if (daemon->dhcp)
syslog(LOG_INFO, "DHCP, %s will be written every %ds", lease_file, min_leasetime/3); syslog(LOG_INFO, "DHCP, %s will be written every %ds", daemon->lease_file, daemon->min_leasetime/3);
#endif #endif
if (!(options & OPT_DEBUG) && (getuid() == 0 || geteuid() == 0)) if (!(daemon->options & OPT_DEBUG) && (getuid() == 0 || geteuid() == 0))
syslog(LOG_WARNING, "running as root"); syslog(LOG_WARNING, "running as root");
servers = check_servers(serv_addrs, interfaces, &sfds); check_servers(daemon, interfaces);
last_server = NULL;
while (sigterm == 0) while (sigterm == 0)
{ {
fd_set rset; fd_set rset;
if (sighup) if (sighup)
{ {
cache_reload(options, dnamebuff, domain_suffix, addn_hosts); cache_reload(daemon->options, daemon->namebuff, daemon->domain_suffix, daemon->addn_hosts);
if (dhcp) if (daemon->dhcp)
{ {
if (options & OPT_ETHERS) if (daemon->options & OPT_ETHERS)
dhcp_configs = dhcp_read_ethers(dhcp_configs, dnamebuff); dhcp_read_ethers(daemon);
dhcp_update_configs(dhcp_configs); dhcp_update_configs(daemon->dhcp_conf);
lease_update_from_configs(dhcp_configs, domain_suffix); lease_update_from_configs(daemon->dhcp_conf, daemon->domain_suffix);
lease_update_file(0, now); lease_update_file(0, now);
lease_update_dns(); lease_update_dns();
} }
if (resolv && (options & OPT_NO_POLL)) if (daemon->resolv_files && (daemon->options & OPT_NO_POLL))
{ {
servers = check_servers(reload_servers(resolv->name, dnamebuff, servers, query_port), reload_servers(daemon->resolv_files->name, daemon);
interfaces, &sfds); check_servers(daemon, interfaces);
last_server = NULL;
} }
sighup = 0; sighup = 0;
} }
if (sigusr1) if (sigusr1)
{ {
dump_cache(options & (OPT_DEBUG | OPT_LOG), cachesize); dump_cache(daemon->options & (OPT_DEBUG | OPT_LOG), daemon->cachesize);
sigusr1 = 0; sigusr1 = 0;
} }
if (sigalarm) if (sigalarm)
{ {
if (dhcp) if (daemon->dhcp)
{ {
lease_update_file(1, now); lease_update_file(1, now);
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
alarm(min_leasetime/3); alarm(daemon->min_leasetime/3);
#endif #endif
} }
sigalarm = 0; sigalarm = 0;
...@@ -404,30 +346,13 @@ int main (int argc, char **argv) ...@@ -404,30 +346,13 @@ int main (int argc, char **argv)
if (!first_loop) if (!first_loop)
{ {
int maxfd = 0; int maxfd = set_dns_listeners(daemon, &rset, 0);
for (serverfdp = sfds; serverfdp; serverfdp = serverfdp->next) if (daemon->dhcp)
{
FD_SET(serverfdp->fd, &rset);
if (serverfdp->fd > maxfd)
maxfd = serverfdp->fd;
}
for (listener = listeners; listener; listener = listener->next)
{ {
FD_SET(listener->fd, &rset); FD_SET(daemon->dhcpfd, &rset);
if (listener->fd > maxfd) if (daemon->dhcpfd > maxfd)
maxfd = listener->fd; maxfd = daemon->dhcpfd;
FD_SET(listener->tcpfd, &rset);
if (listener->tcpfd > maxfd)
maxfd = listener->tcpfd;
}
if (dhcp)
{
FD_SET(dhcpfd, &rset);
if (dhcpfd > maxfd)
maxfd = dhcpfd;
} }
#ifdef HAVE_PSELECT #ifdef HAVE_PSELECT
...@@ -442,11 +367,10 @@ int main (int argc, char **argv) ...@@ -442,11 +367,10 @@ int main (int argc, char **argv)
sigprocmask(SIG_SETMASK, &save_mask, NULL); sigprocmask(SIG_SETMASK, &save_mask, NULL);
} }
#endif #endif
} }
first_loop = 0; first_loop = 0;
now = dnsmasq_time(uptime_fd); now = dnsmasq_time(daemon->uptime_fd);
/* Check for changes to resolv files once per second max. */ /* Check for changes to resolv files once per second max. */
if (last == 0 || difftime(now, last) > 1.0) if (last == 0 || difftime(now, last) > 1.0)
...@@ -454,13 +378,13 @@ int main (int argc, char **argv) ...@@ -454,13 +378,13 @@ int main (int argc, char **argv)
last = now; last = now;
#ifdef HAVE_ISC_READER #ifdef HAVE_ISC_READER
if (lease_file && !dhcp) if (daemon->lease_file && !daemon->dhcp)
load_dhcp(lease_file, domain_suffix, now, dnamebuff); load_dhcp(daemon->lease_file, daemon->domain_suffix, now, daemon->namebuff);
#endif #endif
if (!(options & OPT_NO_POLL)) if (!(daemon->options & OPT_NO_POLL))
{ {
struct resolvc *res = resolv, *latest = NULL; struct resolvc *res = daemon->resolv_files, *latest = NULL;
struct stat statbuf; struct stat statbuf;
time_t last_change = 0; time_t last_change = 0;
/* There may be more than one possible file. /* There may be more than one possible file.
...@@ -489,141 +413,268 @@ int main (int argc, char **argv) ...@@ -489,141 +413,268 @@ int main (int argc, char **argv)
if (latest && difftime(last_change, resolv_changed) > 0.0) if (latest && difftime(last_change, resolv_changed) > 0.0)
{ {
resolv_changed = last_change; resolv_changed = last_change;
servers = check_servers(reload_servers(latest->name, dnamebuff, servers, query_port), reload_servers(latest->name, daemon);
interfaces, &sfds); check_servers(daemon, interfaces);
last_server = NULL;
} }
} }
} }
for (serverfdp = sfds; serverfdp; serverfdp = serverfdp->next) check_dns_listeners(daemon, &rset, now);
if (FD_ISSET(serverfdp->fd, &rset))
last_server = reply_query(serverfdp, options, packet, now,
dnamebuff, servers, last_server,
bogus_addr, doctors, edns_pktsz);
if (dhcp && FD_ISSET(dhcpfd, &rset))
dhcp_packet(dhcp, packet, dhcp_options, dhcp_configs, dhcp_vendors,
now, dnamebuff, domain_suffix, dhcp_file,
dhcp_sname, dhcp_next_server, dhcpfd, dhcp_raw_fd,
if_names, if_addrs, if_except);
for (listener = listeners; listener; listener = listener->next) if (daemon->dhcp && FD_ISSET(daemon->dhcpfd, &rset))
{ dhcp_packet(daemon, now);
if (FD_ISSET(listener->fd, &rset))
last_server = receive_query(listener, packet,
mxnames, mxtarget, options, now, local_ttl, dnamebuff,
if_names, if_addrs, if_except, last_server, servers, edns_pktsz);
if (FD_ISSET(listener->tcpfd, &rset))
{
int confd;
while((confd = accept(listener->tcpfd, NULL, NULL)) == -1 && errno == EINTR);
if (confd != -1)
{
int match = 1;
if (!(options & OPT_NOWILD))
{
/* Check for allowed interfaces when binding the wildcard address */
/* Don't know how to get interface of a connection, so we have to
check by address. This will break when interfaces change address */
union mysockaddr tcp_addr;
socklen_t tcp_len = sizeof(union mysockaddr);
struct iname *tmp;
if (getsockname(confd, (struct sockaddr *)&tcp_addr, &tcp_len) != -1)
{
#ifdef HAVE_IPV6
if (tcp_addr.sa.sa_family == AF_INET6)
tcp_addr.in6.sin6_flowinfo = htonl(0);
#endif
for (match = 1, tmp = if_except; tmp; tmp = tmp->next)
if (sockaddr_isequal(&tmp->addr, &tcp_addr))
match = 0;
if (match && (if_names || if_addrs))
{
match = 0;
for (tmp = if_names; tmp; tmp = tmp->next)
if (sockaddr_isequal(&tmp->addr, &tcp_addr))
match = 1;
for (tmp = if_addrs; tmp; tmp = tmp->next)
if (sockaddr_isequal(&tmp->addr, &tcp_addr))
match = 1;
}
}
}
if (!match || (num_kids >= MAX_PROCS))
close(confd);
else if (!(options & OPT_DEBUG) && fork())
{
num_kids++;
close(confd);
}
else
{
char *buff;
struct server *s;
int flags;
/* Arrange for SIGALARM after CHILD_LIFETIME seconds to
terminate the process. */
if (!(options & OPT_DEBUG))
{
sigemptyset(&sigact.sa_mask);
sigaddset(&sigact.sa_mask, SIGALRM);
sigprocmask(SIG_UNBLOCK, &sigact.sa_mask, NULL);
alarm(CHILD_LIFETIME);
in_child = 1;
}
/* start with no upstream connections. */
for (s = servers; s; s = s->next)
s->tcpfd = -1;
/* The connected socket inherits non-blocking
attribute from the listening socket.
Reset that here. */
if ((flags = fcntl(confd, F_GETFL, 0)) != -1)
fcntl(confd, F_SETFL, flags & ~O_NONBLOCK);
buff = tcp_request(confd, mxnames, mxtarget, options, now,
local_ttl, dnamebuff, last_server, servers,
bogus_addr, doctors, edns_pktsz);
if (!(options & OPT_DEBUG))
exit(0);
close(confd);
if (buff)
free(buff);
for (s = servers; s; s = s->next)
if (s->tcpfd != -1)
close(s->tcpfd);
}
}
}
}
} }
syslog(LOG_INFO, "exiting on receipt of SIGTERM"); syslog(LOG_INFO, "exiting on receipt of SIGTERM");
if (daemon->dhcp)
{
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
if (dhcp) lease_update_file(1, now);
lease_update_file(1, now);
#endif #endif
close(daemon->lease_fd);
if (leasefd != -1) }
close(leasefd);
return 0; return 0;
} }
static void sig_handler(int sig)
{
if (sig == SIGTERM)
sigterm = 1;
else if (sig == SIGHUP)
sighup = 1;
else if (sig == SIGUSR1)
sigusr1 = 1;
else if (sig == SIGALRM)
{
/* alarm is used to kill children after a fixed time. */
if (in_child)
exit(0);
else
sigalarm = 1;
}
else if (sig == SIGCHLD)
{
/* See Stevens 5.10 */
while (waitpid(-1, NULL, WNOHANG) > 0)
num_kids--;
}
}
static int set_dns_listeners(struct daemon *daemon, fd_set *set, int maxfd)
{
struct serverfd *serverfdp;
struct listener *listener;
for (serverfdp = daemon->sfds; serverfdp; serverfdp = serverfdp->next)
{
FD_SET(serverfdp->fd, set);
if (serverfdp->fd > maxfd)
maxfd = serverfdp->fd;
}
for (listener = daemon->listeners; listener; listener = listener->next)
{
FD_SET(listener->fd, set);
if (listener->fd > maxfd)
maxfd = listener->fd;
FD_SET(listener->tcpfd, set);
if (listener->tcpfd > maxfd)
maxfd = listener->tcpfd;
}
return maxfd;
}
static void check_dns_listeners(struct daemon *daemon, fd_set *set, time_t now)
{
struct serverfd *serverfdp;
struct listener *listener;
for (serverfdp = daemon->sfds; serverfdp; serverfdp = serverfdp->next)
if (FD_ISSET(serverfdp->fd, set))
reply_query(serverfdp, daemon, now);
for (listener = daemon->listeners; listener; listener = listener->next)
{
if (FD_ISSET(listener->fd, set))
receive_query(listener, daemon, now);
if (FD_ISSET(listener->tcpfd, set))
{
int confd;
while((confd = accept(listener->tcpfd, NULL, NULL)) == -1 && errno == EINTR);
if (confd != -1)
{
int match = 1;
if (!(daemon->options & OPT_NOWILD))
{
/* Check for allowed interfaces when binding the wildcard address */
/* Don't know how to get interface of a connection, so we have to
check by address. This will break when interfaces change address */
union mysockaddr tcp_addr;
socklen_t tcp_len = sizeof(union mysockaddr);
struct iname *tmp;
if (getsockname(confd, (struct sockaddr *)&tcp_addr, &tcp_len) != -1)
{
#ifdef HAVE_IPV6
if (tcp_addr.sa.sa_family == AF_INET6)
tcp_addr.in6.sin6_flowinfo = htonl(0);
#endif
for (match = 1, tmp = daemon->if_except; tmp; tmp = tmp->next)
if (sockaddr_isequal(&tmp->addr, &tcp_addr))
match = 0;
if (match && (daemon->if_names || daemon->if_addrs))
{
match = 0;
for (tmp = daemon->if_names; tmp; tmp = tmp->next)
if (sockaddr_isequal(&tmp->addr, &tcp_addr))
match = 1;
for (tmp = daemon->if_addrs; tmp; tmp = tmp->next)
if (sockaddr_isequal(&tmp->addr, &tcp_addr))
match = 1;
}
}
}
if (!match || (num_kids >= MAX_PROCS))
close(confd);
else if (!(daemon->options & OPT_DEBUG) && fork())
{
num_kids++;
close(confd);
}
else
{
char *buff;
struct server *s;
int flags;
/* Arrange for SIGALARM after CHILD_LIFETIME seconds to
terminate the process. */
if (!(daemon->options & OPT_DEBUG))
{
sigset_t mask;
sigemptyset(&mask);
sigaddset(&mask, SIGALRM);
sigprocmask(SIG_UNBLOCK, &mask, NULL);
alarm(CHILD_LIFETIME);
in_child = 1;
}
/* start with no upstream connections. */
for (s = daemon->servers; s; s = s->next)
s->tcpfd = -1;
/* The connected socket inherits non-blocking
attribute from the listening socket.
Reset that here. */
if ((flags = fcntl(confd, F_GETFL, 0)) != -1)
fcntl(confd, F_SETFL, flags & ~O_NONBLOCK);
buff = tcp_request(daemon, confd, now);
if (!(daemon->options & OPT_DEBUG))
exit(0);
close(confd);
if (buff)
free(buff);
for (s = daemon->servers; s; s = s->next)
if (s->tcpfd != -1)
close(s->tcpfd);
}
}
}
}
}
int icmp_ping(struct daemon *daemon, struct in_addr addr)
{
/* Try and get an ICMP echo from a machine.
Note that we can't create the raw socket each time
we do this, since that needs root. Therefore the socket has to hang
around all the time. Since most of the time we won't read the
socket, it will accumulate buffers full of ICMP messages,
wasting memory. To avoid that we set the receive buffer
length to zero except when we're actively pinging. */
/* Note that whilst in the three second wait, we check for
(and service) events on the DNS sockets, (so doing that
better not use any resources our caller has in use...)
but we remain deaf to signals or further DHCP packets. */
struct sockaddr_in saddr;
struct {
struct ip ip;
struct icmp icmp;
} packet;
unsigned short id = rand16();
unsigned int i, j;
int opt = 2000, gotreply = 0;
time_t start, now;
saddr.sin_family = AF_INET;
saddr.sin_port = 0;
saddr.sin_addr = addr;
#ifdef HAVE_SOCKADDR_SA_LEN
saddr.sin_len = sizeof(struct sockaddr_in);
#endif
memset(&packet.icmp, 0, sizeof(packet.icmp));
packet.icmp.icmp_type = ICMP_ECHO;
packet.icmp.icmp_id = id;
for (j = 0, i = 0; i < sizeof(struct icmp) / 2; i++)
j += ((u16 *)&packet.icmp)[i];
while (j>>16)
j = (j & 0xffff) + (j >> 16);
packet.icmp.icmp_cksum = (j == 0xffff) ? j : ~j;
setsockopt(daemon->dhcp_icmp_fd, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt));
if (sendto(daemon->dhcp_icmp_fd, (char *)&packet.icmp, sizeof(struct icmp), 0,
(struct sockaddr *)&saddr, sizeof(saddr)) == sizeof(struct icmp))
for (now = start = dnsmasq_time(daemon->uptime_fd); difftime(now, start) < 3.0;)
{
struct timeval tv;
fd_set rset;
struct sockaddr_in faddr;
int maxfd, len = sizeof(faddr);
tv.tv_usec = 250000;
tv.tv_sec = 0;
FD_ZERO(&rset);
FD_SET(daemon->dhcp_icmp_fd, &rset);
maxfd = set_dns_listeners(daemon, &rset, daemon->dhcp_icmp_fd);
if (select(maxfd+1, &rset, NULL, NULL, &tv) < 0)
FD_ZERO(&rset);
now = dnsmasq_time(daemon->uptime_fd);
check_dns_listeners(daemon, &rset, now);
if (FD_ISSET(daemon->dhcp_icmp_fd, &rset) &&
recvfrom(daemon->dhcp_icmp_fd, &packet, sizeof(packet), 0,
(struct sockaddr *)&faddr, &len) == sizeof(packet) &&
saddr.sin_addr.s_addr == faddr.sin_addr.s_addr &&
packet.icmp.icmp_type == ICMP_ECHOREPLY &&
packet.icmp.icmp_seq == 0 &&
packet.icmp.icmp_id == id)
{
gotreply = 1;
break;
}
}
opt = 1;
setsockopt(daemon->dhcp_icmp_fd, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt));
return gotreply;
}
src/dnsmasq.h
View file @ 3be34541
...@@ -27,14 +27,13 @@ ...@@ -27,14 +27,13 @@
/* get this before config.h too. */ /* get this before config.h too. */
#include <syslog.h> #include <syslog.h>
#include <arpa/nameser.h>
#include "config.h" #include "config.h"
#include <arpa/nameser.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/select.h> #include <sys/select.h>
#include <sys/wait.h> #include <sys/wait.h>
...@@ -66,6 +65,7 @@ ...@@ -66,6 +65,7 @@
#include <net/if_arp.h> #include <net/if_arp.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/ip_icmp.h>
#ifdef HAVE_BPF #ifdef HAVE_BPF
# include <net/bpf.h> # include <net/bpf.h>
# include <net/if_dl.h> # include <net/if_dl.h>
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
#define OPT_NOWILD 8192 #define OPT_NOWILD 8192
#define OPT_ETHERS 16384 #define OPT_ETHERS 16384
#define OPT_RESOLV_DOMAIN 32768 #define OPT_RESOLV_DOMAIN 32768
#define OPT_NO_FORK 65536
struct all_addr { struct all_addr {
union { union {
...@@ -289,8 +290,9 @@ struct dhcp_vendor { ...@@ -289,8 +290,9 @@ struct dhcp_vendor {
struct dhcp_context { struct dhcp_context {
unsigned int lease_time, addr_epoch; unsigned int lease_time, addr_epoch;
struct in_addr netmask, broadcast; struct in_addr netmask, broadcast, router;
struct in_addr start, end; /* range of available addresses */ struct in_addr start, end; /* range of available addresses */
int static_only;
struct dhcp_netid netid; struct dhcp_netid netid;
struct dhcp_context *next; struct dhcp_context *next;
}; };
...@@ -314,12 +316,57 @@ struct udp_dhcp_packet { ...@@ -314,12 +316,57 @@ struct udp_dhcp_packet {
u16 secs, flags; u16 secs, flags;
struct in_addr ciaddr, yiaddr, siaddr, giaddr; struct in_addr ciaddr, yiaddr, siaddr, giaddr;
u8 chaddr[16], sname[64], file[128]; u8 chaddr[16], sname[64], file[128];
u32 cookie; u8 options[312];
u8 options[308];
} data; } data;
}; };
struct daemon {
/* datastuctures representing the command-line and
config file arguments. All set (including defaults)
in option.c */
unsigned int options;
struct resolvc default_resolv, *resolv_files;
struct mx_record *mxnames;
char *mxtarget;
char *lease_file;
char *username, *groupname;
char *domain_suffix;
char *runfile;
struct iname *if_names, *if_addrs, *if_except;
struct bogus_addr *bogus_addr;
struct server *servers;
int cachesize;
int port, query_port;
unsigned long local_ttl;
char *addn_hosts;
struct dhcp_context *dhcp;
struct dhcp_config *dhcp_conf;
struct dhcp_opt *dhcp_opts;
struct dhcp_vendor *dhcp_vendors;
char *dhcp_file;
char *dhcp_sname;
struct in_addr dhcp_next_server;
int dhcp_max;
unsigned int min_leasetime;
struct doctor *doctors;
unsigned short edns_pktsz;
/* globally used stuff for DNS */
char *packet; /* packet buffer */
char *namebuff; /* MAXDNAME size buffer */
struct serverfd *sfds;
struct listener *listeners;
struct server *last_server;
int uptime_fd;
/* DHCP state */
int dhcpfd, dhcp_raw_fd, dhcp_icmp_fd, lease_fd;
struct udp_dhcp_packet *dhcp_packet;
char *dhcp_buff, *dhcp_buff2;
};
/* cache.c */ /* cache.c */
void cache_init(int cachesize, int log); void cache_init(int cachesize, int log);
void log_query(unsigned short flags, char *name, struct all_addr *addr, unsigned short type); void log_query(unsigned short flags, char *name, struct all_addr *addr, unsigned short type);
...@@ -347,9 +394,7 @@ int setup_reply(HEADER *header, unsigned int qlen, ...@@ -347,9 +394,7 @@ int setup_reply(HEADER *header, unsigned int qlen,
void extract_addresses(HEADER *header, unsigned int qlen, char *namebuff, void extract_addresses(HEADER *header, unsigned int qlen, char *namebuff,
time_t now, struct doctor *doctors); time_t now, struct doctor *doctors);
void extract_neg_addrs(HEADER *header, unsigned int qlen, char *namebuff, time_t now); void extract_neg_addrs(HEADER *header, unsigned int qlen, char *namebuff, time_t now);
int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_record *mxnames, int answer_request(HEADER *header, char *limit, unsigned int qlen, struct daemon *daemon, time_t now);
char *mxtarget, unsigned int options, time_t now, unsigned long local_ttl,
char *namebuff, unsigned short edns_pcktsz);
int check_for_bogus_wildcard(HEADER *header, unsigned int qlen, char *name, int check_for_bogus_wildcard(HEADER *header, unsigned int qlen, char *name,
struct bogus_addr *addr, time_t now); struct bogus_addr *addr, time_t now);
unsigned char *find_pseudoheader(HEADER *header, unsigned int plen); unsigned char *find_pseudoheader(HEADER *header, unsigned int plen);
...@@ -370,73 +415,41 @@ time_t dnsmasq_time(int fd); ...@@ -370,73 +415,41 @@ time_t dnsmasq_time(int fd);
int is_same_net(struct in_addr a, struct in_addr b, struct in_addr mask); int is_same_net(struct in_addr a, struct in_addr b, struct in_addr mask);
/* option.c */ /* option.c */
unsigned int read_opts(int argc, char **argv, char *buff, struct resolvc **resolv_file, struct daemon *read_opts (int argc, char **argv);
struct mx_record **mxnames, char **mxtarget, char **lease_file,
char **username, char **groupname,
char **domain_suffix, char **runfile,
struct iname **if_names, struct iname **if_addrs, struct iname **if_except,
struct bogus_addr **bogus_addr, struct server **serv_addrs, int *cachesize,
int *port, int *query_port, unsigned long *local_ttl, char **addn_hosts,
struct dhcp_context **dhcp, struct dhcp_config **dhcp_conf,
struct dhcp_opt **opts, struct dhcp_vendor **dhcp_vendors,
char **dhcp_file, char **dhcp_sname, struct in_addr *dhcp_next_server,
int *maxleases, unsigned int *min_leasetime, struct doctor **doctors,
unsigned short *edns_pktsz);
/* forward.c */ /* forward.c */
void forward_init(int first); void forward_init(int first);
struct server *reply_query(struct serverfd *sfd, int options, char *packet, time_t now, void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now);
char *dnamebuff, struct server *servers, struct server *last_server, void receive_query(struct listener *listen, struct daemon *daemon, time_t now);
struct bogus_addr *bogus_nxdomain, char *tcp_request(struct daemon *daemon, int confd, time_t now);
struct doctor *doctors, unsigned short edns_pcktsz);
struct server *receive_query(struct listener *listen, char *packet, struct mx_record *mxnames,
char *mxtarget, unsigned int options, time_t now,
unsigned long local_ttl, char *namebuff,
struct iname *names, struct iname *addrs, struct iname *except,
struct server *last_server, struct server *servers, unsigned short edns_pcktsz);
char *tcp_request(int confd, struct mx_record *mxnames,
char *mxtarget, unsigned int options, time_t now,
unsigned long local_ttl, char *namebuff,
struct server *last_server, struct server *servers,
struct bogus_addr *bogus_nxdomain, struct doctor *doctors,
unsigned short edns_pcktsz);
/* network.c */ /* network.c */
struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds); struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds);
struct server *reload_servers(char *fname, char *buff, struct server *servers, int query_port); void reload_servers(char *fname, struct daemon *daemon);
struct server *check_servers(struct server *new, struct irec *interfaces, struct serverfd **sfds); void check_servers(struct daemon *daemon, struct irec *interfaces);
struct irec *enumerate_interfaces(struct iname **names, struct irec *enumerate_interfaces(struct daemon *daemon);
struct iname **addrs,
struct iname *except,
int port);
struct listener *create_wildcard_listeners(int port); struct listener *create_wildcard_listeners(int port);
struct listener *create_bound_listeners(struct irec *interfaces, int port); struct listener *create_bound_listeners(struct irec *interfaces, int port);
/* dhcp.c */ /* dhcp.c */
void dhcp_init(int *fdp, int* rfdp, struct dhcp_config *configs); void dhcp_init(struct daemon *daemon);
void dhcp_packet(struct dhcp_context *contexts, char *packet, void dhcp_packet(struct daemon *daemon, time_t now);
struct dhcp_opt *dhcp_opts, struct dhcp_config *dhcp_configs,
struct dhcp_vendor *vendors,
time_t now, char *namebuff, char *domain_suffix,
char *dhcp_file, char *dhcp_sname,
struct in_addr dhcp_next_server, int dhcp_fd, int raw_fd,
struct iname *names, struct iname *addrs, struct iname *except);
int address_available(struct dhcp_context *context, struct in_addr addr); int address_available(struct dhcp_context *context, struct in_addr addr);
int address_allocate(struct dhcp_context *context, struct dhcp_config *configs, int address_allocate(struct dhcp_context *context, struct daemon *daemon,
struct in_addr *addrp, unsigned char *hwaddr); struct in_addr *addrp, unsigned char *hwaddr);
struct dhcp_config *find_config(struct dhcp_config *configs, struct dhcp_config *find_config(struct dhcp_config *configs,
struct dhcp_context *context, struct dhcp_context *context,
unsigned char *clid, int clid_len, unsigned char *clid, int clid_len,
unsigned char *hwaddr, char *hostname); unsigned char *hwaddr, char *hostname);
struct dhcp_config *read_ethers(struct dhcp_config *configs, char *buff);
void dhcp_update_configs(struct dhcp_config *configs); void dhcp_update_configs(struct dhcp_config *configs);
struct dhcp_config *dhcp_read_ethers(struct dhcp_config *configs, char *buff); void dhcp_read_ethers(struct daemon *daemon);
struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr); struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr);
/* lease.c */ /* lease.c */
void lease_update_file(int force, time_t now); void lease_update_file(int force, time_t now);
void lease_update_dns(void); void lease_update_dns(void);
int lease_init(char *lease_file, char *domain, char *buff, void lease_init(struct daemon *daemon, time_t now);
char *buff2, time_t now, int maxleases);
struct dhcp_lease *lease_allocate(unsigned char *clid, int clid_len, struct in_addr addr); struct dhcp_lease *lease_allocate(unsigned char *clid, int clid_len, struct in_addr addr);
void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr); void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr);
void lease_set_hostname(struct dhcp_lease *lease, char *name, char *suffix); void lease_set_hostname(struct dhcp_lease *lease, char *name, char *suffix);
...@@ -447,16 +460,10 @@ void lease_prune(struct dhcp_lease *target, time_t now); ...@@ -447,16 +460,10 @@ void lease_prune(struct dhcp_lease *target, time_t now);
void lease_update_from_configs(struct dhcp_config *dhcp_configs, char *domain); void lease_update_from_configs(struct dhcp_config *dhcp_configs, char *domain);
/* rfc2131.c */ /* rfc2131.c */
int dhcp_reply(struct dhcp_context *context, int dhcp_reply(struct daemon *daemon, struct in_addr iface_addr, char *iface_name, unsigned int sz, time_t now);
struct in_addr iface_addr,
char *iface_name, /* dnsmasq.c */
int iface_mtu, int icmp_ping(struct daemon *daemon, struct in_addr addr);
struct udp_dhcp_packet *rawpacket,
unsigned int sz, time_t now, char *namebuff,
struct dhcp_opt *dhcp_opts, struct dhcp_config *dhcp_configs,
struct dhcp_vendor *vendors,
char *domain_suffix, char *dhcp_file, char *dhcp_sname,
struct in_addr dhcp_next_server, struct in_addr router);
/* isc.c */ /* isc.c */
#ifdef HAVE_ISC_READER #ifdef HAVE_ISC_READER
......
src/forward.c
View file @ 3be34541
...@@ -114,7 +114,7 @@ static void send_from(int fd, int nowild, char *packet, int len, ...@@ -114,7 +114,7 @@ static void send_from(int fd, int nowild, char *packet, int len,
} }
} }
unsigned short search_servers(struct server *servers, unsigned int options, struct all_addr **addrpp, unsigned short search_servers(struct daemon *daemon, struct all_addr **addrpp,
unsigned short qtype, char *qdomain, int *type, char **domain) unsigned short qtype, char *qdomain, int *type, char **domain)
{ {
...@@ -127,7 +127,7 @@ unsigned short search_servers(struct server *servers, unsigned int options, stru ...@@ -127,7 +127,7 @@ unsigned short search_servers(struct server *servers, unsigned int options, stru
struct server *serv; struct server *serv;
unsigned short flags = 0; unsigned short flags = 0;
for (serv=servers; serv; serv=serv->next) for (serv = daemon->servers; serv; serv=serv->next)
/* domain matches take priority over NODOTS matches */ /* domain matches take priority over NODOTS matches */
if ((serv->flags & SERV_FOR_NODOTS) && *type != SERV_HAS_DOMAIN && !strchr(qdomain, '.')) if ((serv->flags & SERV_FOR_NODOTS) && *type != SERV_HAS_DOMAIN && !strchr(qdomain, '.'))
{ {
...@@ -181,7 +181,7 @@ unsigned short search_servers(struct server *servers, unsigned int options, stru ...@@ -181,7 +181,7 @@ unsigned short search_servers(struct server *servers, unsigned int options, stru
else else
log_query(F_CONFIG | F_FORWARD | flags, qdomain, *addrpp, 0); log_query(F_CONFIG | F_FORWARD | flags, qdomain, *addrpp, 0);
} }
else if (qtype && (options & OPT_NODOTS_LOCAL) && !strchr(qdomain, '.')) else if (qtype && (daemon->options & OPT_NODOTS_LOCAL) && !strchr(qdomain, '.'))
flags = F_NOERR; flags = F_NOERR;
if (flags & (F_NOERR | F_NXDOMAIN)) if (flags & (F_NOERR | F_NXDOMAIN))
...@@ -191,41 +191,39 @@ unsigned short search_servers(struct server *servers, unsigned int options, stru ...@@ -191,41 +191,39 @@ unsigned short search_servers(struct server *servers, unsigned int options, stru
} }
/* returns new last_server */ /* returns new last_server */
static struct server *forward_query(int udpfd, union mysockaddr *udpaddr, static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *udpaddr,
struct all_addr *dst_addr, unsigned int dst_iface, struct all_addr *dst_addr, unsigned int dst_iface,
HEADER *header, int plen, unsigned int options, char *dnamebuff, HEADER *header, int plen, time_t now)
struct server *servers, struct server *last_server,
time_t now, unsigned long local_ttl)
{ {
struct frec *forward; struct frec *forward;
char *domain = NULL; char *domain = NULL;
int forwardall = 0, type = 0; int forwardall = 0, type = 0;
struct all_addr *addrp = NULL; struct all_addr *addrp = NULL;
unsigned short flags = 0; unsigned short flags = 0;
unsigned short gotname = extract_request(header, (unsigned int)plen, dnamebuff, NULL); unsigned short gotname = extract_request(header, (unsigned int)plen, daemon->namebuff, NULL);
struct server *start = NULL; struct server *start = NULL;
/* may be recursion not speced or no servers available. */ /* may be recursion not speced or no servers available. */
if (!header->rd || !servers) if (!header->rd || !daemon->servers)
forward = NULL; forward = NULL;
else if ((forward = lookup_frec_by_sender(ntohs(header->id), udpaddr))) else if ((forward = lookup_frec_by_sender(ntohs(header->id), udpaddr)))
{ {
/* retry on existing query, send to all available servers */ /* retry on existing query, send to all available servers */
domain = forward->sentto->domain; domain = forward->sentto->domain;
if (!(options & OPT_ORDER)) if (!(daemon->options & OPT_ORDER))
{ {
forwardall = 1; forwardall = 1;
last_server = NULL; daemon->last_server = NULL;
} }
type = forward->sentto->flags & SERV_TYPE; type = forward->sentto->flags & SERV_TYPE;
if (!(start = forward->sentto->next)) if (!(start = forward->sentto->next))
start = servers; /* at end of list, recycle */ start = daemon->servers; /* at end of list, recycle */
header->id = htons(forward->new_id); header->id = htons(forward->new_id);
} }
else else
{ {
if (gotname) if (gotname)
flags = search_servers(servers, options, &addrp, gotname, dnamebuff, &type, &domain); flags = search_servers(daemon, &addrp, gotname, daemon->namebuff, &type, &domain);
if (!flags && !(forward = get_new_frec(now))) if (!flags && !(forward = get_new_frec(now)))
/* table full - server failure. */ /* table full - server failure. */
...@@ -237,11 +235,11 @@ static struct server *forward_query(int udpfd, union mysockaddr *udpaddr, ...@@ -237,11 +235,11 @@ static struct server *forward_query(int udpfd, union mysockaddr *udpaddr,
always try servers in the order specified in resolv.conf, always try servers in the order specified in resolv.conf,
otherwise, use the one last known to work. */ otherwise, use the one last known to work. */
if (type != 0 || (options & OPT_ORDER)) if (type != 0 || (daemon->options & OPT_ORDER))
start = servers; start = daemon->servers;
else if (!(start = last_server)) else if (!(start = daemon->last_server))
{ {
start = servers; start = daemon->servers;
forwardall = 1; forwardall = 1;
} }
...@@ -279,13 +277,13 @@ static struct server *forward_query(int udpfd, union mysockaddr *udpaddr, ...@@ -279,13 +277,13 @@ static struct server *forward_query(int udpfd, union mysockaddr *udpaddr,
sa_len(&start->addr)) != -1) sa_len(&start->addr)) != -1)
{ {
if (!gotname) if (!gotname)
strcpy(dnamebuff, "query"); strcpy(daemon->namebuff, "query");
if (start->addr.sa.sa_family == AF_INET) if (start->addr.sa.sa_family == AF_INET)
log_query(F_SERVER | F_IPV4 | F_FORWARD, dnamebuff, log_query(F_SERVER | F_IPV4 | F_FORWARD, daemon->namebuff,
(struct all_addr *)&start->addr.in.sin_addr, 0); (struct all_addr *)&start->addr.in.sin_addr, 0);
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else else
log_query(F_SERVER | F_IPV6 | F_FORWARD, dnamebuff, log_query(F_SERVER | F_IPV6 | F_FORWARD, daemon->namebuff,
(struct all_addr *)&start->addr.in6.sin6_addr, 0); (struct all_addr *)&start->addr.in6.sin6_addr, 0);
#endif #endif
forwarded = 1; forwarded = 1;
...@@ -296,14 +294,14 @@ static struct server *forward_query(int udpfd, union mysockaddr *udpaddr, ...@@ -296,14 +294,14 @@ static struct server *forward_query(int udpfd, union mysockaddr *udpaddr,
} }
if (!(start = start->next)) if (!(start = start->next))
start = servers; start = daemon->servers;
if (start == firstsentto) if (start == firstsentto)
break; break;
} }
if (forwarded) if (forwarded)
return last_server; return;
/* could not send on, prepare to return */ /* could not send on, prepare to return */
header->id = htons(forward->orig_id); header->id = htons(forward->orig_id);
...@@ -311,15 +309,14 @@ static struct server *forward_query(int udpfd, union mysockaddr *udpaddr, ...@@ -311,15 +309,14 @@ static struct server *forward_query(int udpfd, union mysockaddr *udpaddr,
} }
/* could not send on, return empty answer or address if known for whole domain */ /* could not send on, return empty answer or address if known for whole domain */
plen = setup_reply(header, (unsigned int)plen, addrp, flags, local_ttl); plen = setup_reply(header, (unsigned int)plen, addrp, flags, daemon->local_ttl);
send_from(udpfd, options & OPT_NOWILD, (char *)header, plen, udpaddr, dst_addr, dst_iface); send_from(udpfd, daemon->options & OPT_NOWILD, (char *)header, plen, udpaddr, dst_addr, dst_iface);
return last_server; return;
} }
static int process_reply(HEADER *header, time_t now, char *dnamebuff, struct bogus_addr *bogus_nxdomain, static int process_reply(struct daemon *daemon, HEADER *header, time_t now,
struct doctor *doctors, union mysockaddr *serveraddr, union mysockaddr *serveraddr, int n)
int n, int options, unsigned short edns_pcktsz)
{ {
unsigned char *pheader; unsigned char *pheader;
...@@ -333,8 +330,8 @@ static int process_reply(HEADER *header, time_t now, char *dnamebuff, struct bog ...@@ -333,8 +330,8 @@ static int process_reply(HEADER *header, time_t now, char *dnamebuff, struct bog
unsigned char *psave = pheader; unsigned char *psave = pheader;
GETSHORT(udpsz, pheader); GETSHORT(udpsz, pheader);
if (udpsz > edns_pcktsz) if (udpsz > daemon->edns_pktsz)
PUTSHORT(edns_pcktsz, psave); PUTSHORT(daemon->edns_pktsz, psave);
} }
/* Complain loudly if the upstream server is non-recursive. */ /* Complain loudly if the upstream server is non-recursive. */
...@@ -355,24 +352,22 @@ static int process_reply(HEADER *header, time_t now, char *dnamebuff, struct bog ...@@ -355,24 +352,22 @@ static int process_reply(HEADER *header, time_t now, char *dnamebuff, struct bog
if ((header->rcode == NOERROR || header->rcode == NXDOMAIN) && header->opcode == QUERY) if ((header->rcode == NOERROR || header->rcode == NXDOMAIN) && header->opcode == QUERY)
{ {
if (!(bogus_nxdomain && if (!(daemon->bogus_addr &&
header->rcode == NOERROR && header->rcode == NOERROR &&
check_for_bogus_wildcard(header, (unsigned int)n, dnamebuff, bogus_nxdomain, now))) check_for_bogus_wildcard(header, (unsigned int)n, daemon->namebuff, daemon->bogus_addr, now)))
{ {
if (header->rcode == NOERROR && ntohs(header->ancount) != 0) if (header->rcode == NOERROR && ntohs(header->ancount) != 0)
extract_addresses(header, (unsigned int)n, dnamebuff, now, doctors); extract_addresses(header, (unsigned int)n, daemon->namebuff, now, daemon->doctors);
else if (!(options & OPT_NO_NEG)) else if (!(daemon->options & OPT_NO_NEG))
extract_neg_addrs(header, (unsigned int)n, dnamebuff, now); extract_neg_addrs(header, (unsigned int)n, daemon->namebuff, now);
} }
} }
return 1; return 1;
} }
/* returns new last_server */ /* sets new last_server */
struct server *reply_query(struct serverfd *sfd, int options, char *packet, time_t now, void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now)
char *dnamebuff, struct server *servers, struct server *last_server,
struct bogus_addr *bogus_nxdomain, struct doctor *doctors, unsigned short edns_pcktsz)
{ {
/* packet from peer server, extract data for cache, and send to /* packet from peer server, extract data for cache, and send to
original requester */ original requester */
...@@ -380,7 +375,7 @@ struct server *reply_query(struct serverfd *sfd, int options, char *packet, time ...@@ -380,7 +375,7 @@ struct server *reply_query(struct serverfd *sfd, int options, char *packet, time
HEADER *header; HEADER *header;
union mysockaddr serveraddr; union mysockaddr serveraddr;
socklen_t addrlen = sizeof(serveraddr); socklen_t addrlen = sizeof(serveraddr);
int n = recvfrom(sfd->fd, packet, edns_pcktsz, 0, &serveraddr.sa, &addrlen); int n = recvfrom(sfd->fd, daemon->packet, daemon->edns_pktsz, 0, &serveraddr.sa, &addrlen);
/* Determine the address of the server replying so that we can mark that as good */ /* Determine the address of the server replying so that we can mark that as good */
serveraddr.sa.sa_family = sfd->source_addr.sa.sa_family; serveraddr.sa.sa_family = sfd->source_addr.sa.sa_family;
...@@ -389,43 +384,41 @@ struct server *reply_query(struct serverfd *sfd, int options, char *packet, time ...@@ -389,43 +384,41 @@ struct server *reply_query(struct serverfd *sfd, int options, char *packet, time
serveraddr.in6.sin6_flowinfo = htonl(0); serveraddr.in6.sin6_flowinfo = htonl(0);
#endif #endif
header = (HEADER *)packet; header = (HEADER *)daemon->packet;
if (n >= (int)sizeof(HEADER) && header->qr && (forward = lookup_frec(ntohs(header->id)))) if (n >= (int)sizeof(HEADER) && header->qr && (forward = lookup_frec(ntohs(header->id))))
{ {
/* find good server by address if possible, otherwise assume the last one we sent to */ /* find good server by address if possible, otherwise assume the last one we sent to */
if ((forward->sentto->flags & SERV_TYPE) == 0) if ((forward->sentto->flags & SERV_TYPE) == 0)
{ {
for (last_server = servers; last_server; last_server = last_server->next) struct server *last_server;
daemon->last_server = forward->sentto;
for (last_server = daemon->servers; last_server; last_server = last_server->next)
if (!(last_server->flags & (SERV_LITERAL_ADDRESS | SERV_HAS_DOMAIN | SERV_FOR_NODOTS | SERV_NO_ADDR)) && if (!(last_server->flags & (SERV_LITERAL_ADDRESS | SERV_HAS_DOMAIN | SERV_FOR_NODOTS | SERV_NO_ADDR)) &&
sockaddr_isequal(&last_server->addr, &serveraddr)) sockaddr_isequal(&last_server->addr, &serveraddr))
break; {
if (!last_server) daemon->last_server = last_server;
last_server = forward->sentto; break;
}
} }
if (!process_reply(header, now, dnamebuff, bogus_nxdomain, doctors, &serveraddr, n, options, edns_pcktsz)) if (process_reply(daemon, header, now, &serveraddr, n))
return NULL; {
header->id = htons(forward->orig_id);
header->id = htons(forward->orig_id); send_from(forward->fd, daemon->options & OPT_NOWILD, daemon->packet, n,
send_from(forward->fd, options & OPT_NOWILD, packet, n, &forward->source, &forward->dest, forward->iface); &forward->source, &forward->dest, forward->iface);
forward->new_id = 0; /* cancel */ forward->new_id = 0; /* cancel */
}
} }
return last_server;
} }
struct server *receive_query(struct listener *listen, char *packet, struct mx_record *mxnames, void receive_query(struct listener *listen, struct daemon *daemon, time_t now)
char *mxtarget, unsigned int options, time_t now,
unsigned long local_ttl, char *namebuff,
struct iname *names, struct iname *addrs, struct iname *except,
struct server *last_server, struct server *servers, unsigned short edns_pcktsz)
{ {
HEADER *header = (HEADER *)packet; HEADER *header = (HEADER *)daemon->packet;
union mysockaddr source_addr; union mysockaddr source_addr;
unsigned short type; unsigned short type;
struct iname *tmp; struct iname *tmp;
struct all_addr dst_addr; struct all_addr dst_addr;
int check_dst = !(options & OPT_NOWILD); int check_dst = !(daemon->options & OPT_NOWILD);
int m, n, if_index = 0; int m, n, if_index = 0;
struct iovec iov[1]; struct iovec iov[1];
struct msghdr msg; struct msghdr msg;
...@@ -443,8 +436,8 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re ...@@ -443,8 +436,8 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re
#endif #endif
} control_u; } control_u;
iov[0].iov_base = packet; iov[0].iov_base = daemon->packet;
iov[0].iov_len = edns_pcktsz; iov[0].iov_len = daemon->edns_pktsz;
msg.msg_control = control_u.control; msg.msg_control = control_u.control;
msg.msg_controllen = sizeof(control_u); msg.msg_controllen = sizeof(control_u);
...@@ -455,7 +448,7 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re ...@@ -455,7 +448,7 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
if ((n = recvmsg(listen->fd, &msg, 0)) == -1) if ((n = recvmsg(listen->fd, &msg, 0)) == -1)
return last_server; return;
source_addr.sa.sa_family = listen->family; source_addr.sa.sa_family = listen->family;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
...@@ -467,7 +460,7 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re ...@@ -467,7 +460,7 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re
#endif #endif
if (check_dst && msg.msg_controllen < sizeof(struct cmsghdr)) if (check_dst && msg.msg_controllen < sizeof(struct cmsghdr))
return last_server; return;
#if defined(IP_PKTINFO) #if defined(IP_PKTINFO)
if (check_dst && listen->family == AF_INET) if (check_dst && listen->family == AF_INET)
...@@ -501,7 +494,7 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re ...@@ -501,7 +494,7 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re
#endif #endif
if (n < (int)sizeof(HEADER) || header->qr) if (n < (int)sizeof(HEADER) || header->qr)
return last_server; return;
/* enforce available interface configuration */ /* enforce available interface configuration */
if (check_dst) if (check_dst)
...@@ -509,31 +502,31 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re ...@@ -509,31 +502,31 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re
struct ifreq ifr; struct ifreq ifr;
if (if_index == 0) if (if_index == 0)
return last_server; return;
if (except || names) if (daemon->if_except || daemon->if_names)
{ {
#ifdef SIOCGIFNAME #ifdef SIOCGIFNAME
ifr.ifr_ifindex = if_index; ifr.ifr_ifindex = if_index;
if (ioctl(listen->fd, SIOCGIFNAME, &ifr) == -1) if (ioctl(listen->fd, SIOCGIFNAME, &ifr) == -1)
return last_server; return;
#else #else
if (!if_indextoname(if_index, ifr.ifr_name)) if (!if_indextoname(if_index, ifr.ifr_name))
return last_server; return;
#endif #endif
} }
for (tmp = except; tmp; tmp = tmp->next) for (tmp = daemon->if_except; tmp; tmp = tmp->next)
if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0)) if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
return last_server; return;
if (names || addrs) if (daemon->if_names || daemon->if_addrs)
{ {
for (tmp = names; tmp; tmp = tmp->next) for (tmp = daemon->if_names; tmp; tmp = tmp->next)
if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0)) if (tmp->name && (strcmp(tmp->name, ifr.ifr_name) == 0))
break; break;
if (!tmp) if (!tmp)
for (tmp = addrs; tmp; tmp = tmp->next) for (tmp = daemon->if_addrs; tmp; tmp = tmp->next)
if (tmp->addr.sa.sa_family == listen->family) if (tmp->addr.sa.sa_family == listen->family)
{ {
if (tmp->addr.sa.sa_family == AF_INET && if (tmp->addr.sa.sa_family == AF_INET &&
...@@ -548,31 +541,28 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re ...@@ -548,31 +541,28 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re
#endif #endif
} }
if (!tmp) if (!tmp)
return last_server; return;
} }
} }
if (extract_request(header, (unsigned int)n, namebuff, &type)) if (extract_request(header, (unsigned int)n, daemon->namebuff, &type))
{ {
if (listen->family == AF_INET) if (listen->family == AF_INET)
log_query(F_QUERY | F_IPV4 | F_FORWARD, namebuff, log_query(F_QUERY | F_IPV4 | F_FORWARD, daemon->namebuff,
(struct all_addr *)&source_addr.in.sin_addr, type); (struct all_addr *)&source_addr.in.sin_addr, type);
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else else
log_query(F_QUERY | F_IPV6 | F_FORWARD, namebuff, log_query(F_QUERY | F_IPV6 | F_FORWARD, daemon->namebuff,
(struct all_addr *)&source_addr.in6.sin6_addr, type); (struct all_addr *)&source_addr.in6.sin6_addr, type);
#endif #endif
} }
m = answer_request (header, ((char *) header) + PACKETSZ, (unsigned int)n, m = answer_request (header, ((char *) header) + PACKETSZ, (unsigned int)n, daemon, now);
mxnames, mxtarget, options, now, local_ttl, namebuff, edns_pcktsz);
if (m >= 1) if (m >= 1)
send_from(listen->fd, options & OPT_NOWILD, (char *)header, m, &source_addr, &dst_addr, if_index); send_from(listen->fd, daemon->options & OPT_NOWILD, (char *)header, m, &source_addr, &dst_addr, if_index);
else else
last_server = forward_query(listen->fd, &source_addr, &dst_addr, if_index, forward_query(daemon, listen->fd, &source_addr, &dst_addr, if_index,
header, n, options, namebuff, servers, header, n, now);
last_server, now, local_ttl);
return last_server;
} }
static int read_write(int fd, char *packet, int size, int rw) static int read_write(int fd, char *packet, int size, int rw)
...@@ -612,12 +602,7 @@ static int read_write(int fd, char *packet, int size, int rw) ...@@ -612,12 +602,7 @@ static int read_write(int fd, char *packet, int size, int rw)
blocking as neccessary, and then return. Note, need to be a bit careful blocking as neccessary, and then return. Note, need to be a bit careful
about resources for debug mode, when the fork is suppressed: that's about resources for debug mode, when the fork is suppressed: that's
done by the caller. */ done by the caller. */
char *tcp_request(int confd, struct mx_record *mxnames, char *tcp_request(struct daemon *daemon, int confd, time_t now)
char *mxtarget, unsigned int options, time_t now,
unsigned long local_ttl, char *namebuff,
struct server *last_server, struct server *servers,
struct bogus_addr *bogus_nxdomain, struct doctor *doctors,
unsigned short edns_pktsz)
{ {
int size = 0, m; int size = 0, m;
unsigned short qtype, gotname; unsigned short qtype, gotname;
...@@ -625,7 +610,8 @@ char *tcp_request(int confd, struct mx_record *mxnames, ...@@ -625,7 +610,8 @@ char *tcp_request(int confd, struct mx_record *mxnames,
/* Max TCP packet + slop */ /* Max TCP packet + slop */
char *packet = malloc(65536 + MAXDNAME + RRFIXEDSZ); char *packet = malloc(65536 + MAXDNAME + RRFIXEDSZ);
HEADER *header; HEADER *header;
struct server *last_server;
while (1) while (1)
{ {
if (!packet || if (!packet ||
...@@ -639,7 +625,7 @@ char *tcp_request(int confd, struct mx_record *mxnames, ...@@ -639,7 +625,7 @@ char *tcp_request(int confd, struct mx_record *mxnames,
header = (HEADER *)packet; header = (HEADER *)packet;
if ((gotname = extract_request(header, (unsigned int)size, namebuff, &qtype))) if ((gotname = extract_request(header, (unsigned int)size, daemon->namebuff, &qtype)))
{ {
union mysockaddr peer_addr; union mysockaddr peer_addr;
socklen_t peer_len = sizeof(union mysockaddr); socklen_t peer_len = sizeof(union mysockaddr);
...@@ -647,19 +633,18 @@ char *tcp_request(int confd, struct mx_record *mxnames, ...@@ -647,19 +633,18 @@ char *tcp_request(int confd, struct mx_record *mxnames,
if (getpeername(confd, (struct sockaddr *)&peer_addr, &peer_len) != -1) if (getpeername(confd, (struct sockaddr *)&peer_addr, &peer_len) != -1)
{ {
if (peer_addr.sa.sa_family == AF_INET) if (peer_addr.sa.sa_family == AF_INET)
log_query(F_QUERY | F_IPV4 | F_FORWARD, namebuff, log_query(F_QUERY | F_IPV4 | F_FORWARD, daemon->namebuff,
(struct all_addr *)&peer_addr.in.sin_addr, qtype); (struct all_addr *)&peer_addr.in.sin_addr, qtype);
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else else
log_query(F_QUERY | F_IPV6 | F_FORWARD, namebuff, log_query(F_QUERY | F_IPV6 | F_FORWARD, daemon->namebuff,
(struct all_addr *)&peer_addr.in6.sin6_addr, qtype); (struct all_addr *)&peer_addr.in6.sin6_addr, qtype);
#endif #endif
} }
} }
/* m > 0 if answered from cache */ /* m > 0 if answered from cache */
m = answer_request (header, ((char *) header) + 65536, (unsigned int)size, m = answer_request(header, ((char *) header) + 65536, (unsigned int)size, daemon, now);
mxnames, mxtarget, options, now, local_ttl, namebuff, edns_pktsz);
if (m == 0) if (m == 0)
{ {
...@@ -669,10 +654,12 @@ char *tcp_request(int confd, struct mx_record *mxnames, ...@@ -669,10 +654,12 @@ char *tcp_request(int confd, struct mx_record *mxnames,
char *domain = NULL; char *domain = NULL;
if (gotname) if (gotname)
flags = search_servers(servers, options, &addrp, gotname, namebuff, &type, &domain); flags = search_servers(daemon, &addrp, gotname, daemon->namebuff, &type, &domain);
if (type != 0 || (options & OPT_ORDER) || !last_server) if (type != 0 || (daemon->options & OPT_ORDER) || !daemon->last_server)
last_server = servers; last_server = daemon->servers;
else
last_server = daemon->last_server;
if (!flags && last_server) if (!flags && last_server)
{ {
...@@ -688,7 +675,7 @@ char *tcp_request(int confd, struct mx_record *mxnames, ...@@ -688,7 +675,7 @@ char *tcp_request(int confd, struct mx_record *mxnames,
else else
{ {
if (!(last_server = last_server->next)) if (!(last_server = last_server->next))
last_server = servers; last_server = daemon->servers;
if (last_server == firstsendto) if (last_server == firstsendto)
break; break;
...@@ -729,21 +716,20 @@ char *tcp_request(int confd, struct mx_record *mxnames, ...@@ -729,21 +716,20 @@ char *tcp_request(int confd, struct mx_record *mxnames,
return packet; return packet;
if (!gotname) if (!gotname)
strcpy(namebuff, "query"); strcpy(daemon->namebuff, "query");
if (last_server->addr.sa.sa_family == AF_INET) if (last_server->addr.sa.sa_family == AF_INET)
log_query(F_SERVER | F_IPV4 | F_FORWARD, namebuff, log_query(F_SERVER | F_IPV4 | F_FORWARD, daemon->namebuff,
(struct all_addr *)&last_server->addr.in.sin_addr, 0); (struct all_addr *)&last_server->addr.in.sin_addr, 0);
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else else
log_query(F_SERVER | F_IPV6 | F_FORWARD, namebuff, log_query(F_SERVER | F_IPV6 | F_FORWARD, daemon->namebuff,
(struct all_addr *)&last_server->addr.in6.sin6_addr, 0); (struct all_addr *)&last_server->addr.in6.sin6_addr, 0);
#endif #endif
/* There's no point in updating the cache, since this process will exit and /* There's no point in updating the cache, since this process will exit and
lose the information after one query. We make this call for the alias and lose the information after one query. We make this call for the alias and
bogus-nxdomain side-effects. */ bogus-nxdomain side-effects. */
process_reply(header, now, namebuff, bogus_nxdomain, doctors, process_reply(daemon, header, now, &last_server->addr, m);
&last_server->addr, m, options, edns_pktsz);
break; break;
} }
...@@ -751,7 +737,7 @@ char *tcp_request(int confd, struct mx_record *mxnames, ...@@ -751,7 +737,7 @@ char *tcp_request(int confd, struct mx_record *mxnames,
/* In case of local answer or no connections made. */ /* In case of local answer or no connections made. */
if (m == 0) if (m == 0)
m = setup_reply(header, (unsigned int)size, addrp, flags, local_ttl); m = setup_reply(header, (unsigned int)size, addrp, flags, daemon->local_ttl);
} }
c1 = m>>8; c1 = m>>8;
......
src/lease.c
View file @ 3be34541
...@@ -15,12 +15,11 @@ ...@@ -15,12 +15,11 @@
#include "dnsmasq.h" #include "dnsmasq.h"
static struct dhcp_lease *leases; static struct dhcp_lease *leases;
FILE *lease_file; static FILE *lease_file;
int dns_dirty, file_dirty, new_lease; static int dns_dirty, file_dirty, new_lease;
int leases_left; static int leases_left;
int lease_init(char *filename, char *domain, char *buff, void lease_init(struct daemon *daemon, time_t now)
char *buff2, time_t now, int maxleases)
{ {
unsigned int e0, e1, e2, e3, e4, e5, a0, a1, a2, a3; unsigned int e0, e1, e2, e3, e4, e5, a0, a1, a2, a3;
unsigned long ei; unsigned long ei;
...@@ -30,19 +29,22 @@ int lease_init(char *filename, char *domain, char *buff, ...@@ -30,19 +29,22 @@ int lease_init(char *filename, char *domain, char *buff,
struct dhcp_lease *lease; struct dhcp_lease *lease;
int clid_len = 0; int clid_len = 0;
int has_old = 0; int has_old = 0;
char *buff = daemon->dhcp_buff;
char *buff2 = daemon->dhcp_buff2;
leases = NULL; leases = NULL;
leases_left = maxleases; leases_left = daemon->dhcp_max;
/* NOTE: need a+ mode to create file if it doesn't exist */ /* NOTE: need a+ mode to create file if it doesn't exist */
if (!(lease_file = fopen(filename, "a+"))) if (!(lease_file = fopen(daemon->lease_file, "a+")))
die("cannot open or create leases file: %s", NULL); die("cannot open or create leases file: %s", NULL);
/* a+ mode lease pointer at end. */ /* a+ mode lease pointer at end. */
rewind(lease_file); rewind(lease_file);
while (fscanf(lease_file, "%lu %x:%x:%x:%x:%x:%x %d.%d.%d.%d %256s %500s", while (fscanf(lease_file, "%lu %x:%x:%x:%x:%x:%x %d.%d.%d.%d %257s %257s",
&ei, &e0, &e1, &e2, &e3, &e4, &e5, &a0, &a1, &a2, &a3, buff, buff2) == 13) &ei, &e0, &e1, &e2, &e3, &e4, &e5, &a0, &a1, &a2, &a3,
buff, buff2) == 13)
{ {
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
if (ei) if (ei)
...@@ -90,14 +92,14 @@ int lease_init(char *filename, char *domain, char *buff, ...@@ -90,14 +92,14 @@ int lease_init(char *filename, char *domain, char *buff,
memcpy(lease->hwaddr, hwaddr, ETHER_ADDR_LEN); memcpy(lease->hwaddr, hwaddr, ETHER_ADDR_LEN);
if (strcmp(buff, "*") != 0) if (strcmp(buff, "*") != 0)
lease_set_hostname(lease, buff, domain); lease_set_hostname(lease, buff, daemon->domain_suffix);
} }
dns_dirty = 1; dns_dirty = 1;
file_dirty = has_old; file_dirty = has_old;
new_lease = 0; new_lease = 0;
return fileno(lease_file); daemon->lease_fd = fileno(lease_file);
} }
void lease_update_from_configs(struct dhcp_config *dhcp_configs, char *domain) void lease_update_from_configs(struct dhcp_config *dhcp_configs, char *domain)
......
src/network.c
View file @ 3be34541
...@@ -14,16 +14,14 @@ ...@@ -14,16 +14,14 @@
#include "dnsmasq.h" #include "dnsmasq.h"
static struct irec *add_iface(struct irec *list, char *name, union mysockaddr *addr, static struct irec *add_iface(struct daemon *daemon, struct irec *list, char *name, union mysockaddr *addr)
struct iname *names, struct iname *addrs,
struct iname *except)
{ {
struct irec *iface; struct irec *iface;
struct iname *tmp; struct iname *tmp;
/* check blacklist */ /* check blacklist */
if (except) if (daemon->if_except)
for (tmp = except; tmp; tmp = tmp->next) for (tmp = daemon->if_except; tmp; tmp = tmp->next)
if (tmp->name && strcmp(tmp->name, name) == 0) if (tmp->name && strcmp(tmp->name, name) == 0)
{ {
/* record address of named interfaces, for TCP access control */ /* record address of named interfaces, for TCP access control */
...@@ -32,18 +30,18 @@ static struct irec *add_iface(struct irec *list, char *name, union mysockaddr *a ...@@ -32,18 +30,18 @@ static struct irec *add_iface(struct irec *list, char *name, union mysockaddr *a
} }
/* we may need to check the whitelist */ /* we may need to check the whitelist */
if (names || addrs) if (daemon->if_names || daemon->if_addrs)
{ {
int found = 0; int found = 0;
for (tmp = names; tmp; tmp = tmp->next) for (tmp = daemon->if_names; tmp; tmp = tmp->next)
if (tmp->name && (strcmp(tmp->name, name) == 0)) if (tmp->name && (strcmp(tmp->name, name) == 0))
{ {
tmp->addr = *addr; tmp->addr = *addr;
found = tmp->used = 1; found = tmp->used = 1;
} }
for (tmp = addrs; tmp; tmp = tmp->next) for (tmp = daemon->if_addrs; tmp; tmp = tmp->next)
if (sockaddr_isequal(&tmp->addr, addr)) if (sockaddr_isequal(&tmp->addr, addr))
found = tmp->used = 1; found = tmp->used = 1;
...@@ -67,10 +65,7 @@ static struct irec *add_iface(struct irec *list, char *name, union mysockaddr *a ...@@ -67,10 +65,7 @@ static struct irec *add_iface(struct irec *list, char *name, union mysockaddr *a
} }
struct irec *enumerate_interfaces(struct iname **names, struct irec *enumerate_interfaces(struct daemon *daemon)
struct iname **addrs,
struct iname *except,
int port)
{ {
struct irec *iface = NULL; struct irec *iface = NULL;
char *buf, *ptr; char *buf, *ptr;
...@@ -126,7 +121,7 @@ struct irec *enumerate_interfaces(struct iname **names, ...@@ -126,7 +121,7 @@ struct irec *enumerate_interfaces(struct iname **names,
if (ifr->ifr_addr.sa_family == AF_INET) if (ifr->ifr_addr.sa_family == AF_INET)
{ {
addr.in = *((struct sockaddr_in *) &ifr->ifr_addr); addr.in = *((struct sockaddr_in *) &ifr->ifr_addr);
addr.in.sin_port = htons(port); addr.in.sin_port = htons(daemon->port);
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else if (ifr->ifr_addr.sa_family == AF_INET6) else if (ifr->ifr_addr.sa_family == AF_INET6)
...@@ -136,7 +131,7 @@ struct irec *enumerate_interfaces(struct iname **names, ...@@ -136,7 +131,7 @@ struct irec *enumerate_interfaces(struct iname **names,
#else #else
addr.in6 = *((struct sockaddr_in6 *) &ifr->ifr_addr); addr.in6 = *((struct sockaddr_in6 *) &ifr->ifr_addr);
#endif #endif
addr.in6.sin6_port = htons(port); addr.in6.sin6_port = htons(daemon->port);
addr.in6.sin6_flowinfo = htonl(0); addr.in6.sin6_flowinfo = htonl(0);
} }
#endif #endif
...@@ -148,10 +143,10 @@ struct irec *enumerate_interfaces(struct iname **names, ...@@ -148,10 +143,10 @@ struct irec *enumerate_interfaces(struct iname **names,
/* If we are restricting the set of interfaces to use, make /* If we are restricting the set of interfaces to use, make
sure that loopback interfaces are in that set. */ sure that loopback interfaces are in that set. */
if (*names && (ifr->ifr_flags & IFF_LOOPBACK)) if (daemon->if_names && (ifr->ifr_flags & IFF_LOOPBACK))
{ {
struct iname *lo; struct iname *lo;
for (lo = *names; lo; lo = lo->next) for (lo = daemon->if_names; lo; lo = lo->next)
if (lo->name && strcmp(lo->name, ifr->ifr_name) == 0) if (lo->name && strcmp(lo->name, ifr->ifr_name) == 0)
{ {
lo->isloop = 1; lo->isloop = 1;
...@@ -162,12 +157,12 @@ struct irec *enumerate_interfaces(struct iname **names, ...@@ -162,12 +157,12 @@ struct irec *enumerate_interfaces(struct iname **names,
lo = safe_malloc(sizeof(struct iname)); lo = safe_malloc(sizeof(struct iname));
lo->name = safe_string_alloc(ifr->ifr_name); lo->name = safe_string_alloc(ifr->ifr_name);
lo->isloop = lo->used = 1; lo->isloop = lo->used = 1;
lo->next = *names; lo->next = daemon->if_names;
*names = lo; daemon->if_names = lo;
} }
} }
iface = add_iface(iface, ifr->ifr_name, &addr, *names, *addrs, except); iface = add_iface(daemon, iface, ifr->ifr_name, &addr);
#if defined(HAVE_LINUX_IPV6_PROC) && defined(HAVE_IPV6) #if defined(HAVE_LINUX_IPV6_PROC) && defined(HAVE_IPV6)
/* IPv6 addresses don't seem to work with SIOCGIFCONF. Barf */ /* IPv6 addresses don't seem to work with SIOCGIFCONF. Barf */
...@@ -198,7 +193,7 @@ struct irec *enumerate_interfaces(struct iname **names, ...@@ -198,7 +193,7 @@ struct irec *enumerate_interfaces(struct iname **names,
sscanf(addrstring+i+i, "%02x", &byte); sscanf(addrstring+i+i, "%02x", &byte);
addr6p[i] = byte; addr6p[i] = byte;
} }
addr6.in6.sin6_port = htons(port); addr6.in6.sin6_port = htons(daemon->port);
addr6.in6.sin6_flowinfo = htonl(0); addr6.in6.sin6_flowinfo = htonl(0);
addr6.in6.sin6_scope_id = htonl(scope); addr6.in6.sin6_scope_id = htonl(scope);
...@@ -211,7 +206,7 @@ struct irec *enumerate_interfaces(struct iname **names, ...@@ -211,7 +206,7 @@ struct irec *enumerate_interfaces(struct iname **names,
} }
if (found) if (found)
iface = add_iface(iface, ifr->ifr_name, &addr6, *names, *addrs, except); iface = add_iface(daemon, iface, ifr->ifr_name, &addr6);
} }
#endif /* LINUX */ #endif /* LINUX */
} }
...@@ -423,17 +418,19 @@ struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds) ...@@ -423,17 +418,19 @@ struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds)
return sfd; return sfd;
} }
struct server *check_servers(struct server *new, struct irec *interfaces, struct serverfd **sfds) void check_servers(struct daemon *daemon, struct irec *interfaces)
{ {
char addrbuff[ADDRSTRLEN]; char addrbuff[ADDRSTRLEN];
struct irec *iface; struct irec *iface;
struct server *tmp, *ret = NULL; struct server *new, *tmp, *ret = NULL;
int port = 0; int port = 0;
/* forward table rules reference servers, so have to blow them away */ /* forward table rules reference servers, so have to blow them away */
forward_init(0); forward_init(0);
for (;new; new = tmp) daemon->last_server = NULL;
for (new = daemon->servers; new; new = tmp)
{ {
tmp = new->next; tmp = new->next;
...@@ -465,7 +462,7 @@ struct server *check_servers(struct server *new, struct irec *interfaces, struct ...@@ -465,7 +462,7 @@ struct server *check_servers(struct server *new, struct irec *interfaces, struct
} }
/* Do we need a socket set? */ /* Do we need a socket set? */
if (!new->sfd && !(new->sfd = allocate_sfd(&new->source_addr, sfds))) if (!new->sfd && !(new->sfd = allocate_sfd(&new->source_addr, &daemon->sfds)))
{ {
syslog(LOG_WARNING, syslog(LOG_WARNING,
"ignoring nameserver %s - cannot make/bind socket: %m", addrbuff); "ignoring nameserver %s - cannot make/bind socket: %m", addrbuff);
...@@ -495,15 +492,16 @@ struct server *check_servers(struct server *new, struct irec *interfaces, struct ...@@ -495,15 +492,16 @@ struct server *check_servers(struct server *new, struct irec *interfaces, struct
syslog(LOG_INFO, "using nameserver %s#%d", addrbuff, port); syslog(LOG_INFO, "using nameserver %s#%d", addrbuff, port);
} }
return ret; daemon->servers = ret;
} }
struct server *reload_servers(char *fname, char *buff, struct server *serv, int query_port) void reload_servers(char *fname, struct daemon *daemon)
{ {
FILE *f; FILE *f;
char *line; char *line;
struct server *old_servers = NULL; struct server *old_servers = NULL;
struct server *new_servers = NULL; struct server *new_servers = NULL;
struct server *serv = daemon->servers;
/* move old servers to free list - we can reuse the memory /* move old servers to free list - we can reuse the memory
and not risk malloc if there are the same or fewer new servers. and not risk malloc if there are the same or fewer new servers.
...@@ -533,7 +531,7 @@ struct server *reload_servers(char *fname, char *buff, struct server *serv, int ...@@ -533,7 +531,7 @@ struct server *reload_servers(char *fname, char *buff, struct server *serv, int
else else
{ {
syslog(LOG_INFO, "reading %s", fname); syslog(LOG_INFO, "reading %s", fname);
while ((line = fgets(buff, MAXDNAME, f))) while ((line = fgets(daemon->namebuff, MAXDNAME, f)))
{ {
union mysockaddr addr, source_addr; union mysockaddr addr, source_addr;
char *token = strtok(line, " \t\n\r"); char *token = strtok(line, " \t\n\r");
...@@ -556,7 +554,7 @@ struct server *reload_servers(char *fname, char *buff, struct server *serv, int ...@@ -556,7 +554,7 @@ struct server *reload_servers(char *fname, char *buff, struct server *serv, int
source_addr.in.sin_family = addr.in.sin_family = AF_INET; source_addr.in.sin_family = addr.in.sin_family = AF_INET;
addr.in.sin_port = htons(NAMESERVER_PORT); addr.in.sin_port = htons(NAMESERVER_PORT);
source_addr.in.sin_addr.s_addr = INADDR_ANY; source_addr.in.sin_addr.s_addr = INADDR_ANY;
source_addr.in.sin_port = htons(query_port); source_addr.in.sin_port = htons(daemon->query_port);
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else if (inet_pton(AF_INET6, token, &addr.in6.sin6_addr)) else if (inet_pton(AF_INET6, token, &addr.in6.sin6_addr))
...@@ -568,7 +566,7 @@ struct server *reload_servers(char *fname, char *buff, struct server *serv, int ...@@ -568,7 +566,7 @@ struct server *reload_servers(char *fname, char *buff, struct server *serv, int
addr.in6.sin6_port = htons(NAMESERVER_PORT); addr.in6.sin6_port = htons(NAMESERVER_PORT);
source_addr.in6.sin6_flowinfo = addr.in6.sin6_flowinfo = htonl(0); source_addr.in6.sin6_flowinfo = addr.in6.sin6_flowinfo = htonl(0);
source_addr.in6.sin6_addr = in6addr_any; source_addr.in6.sin6_addr = in6addr_any;
source_addr.in6.sin6_port = htons(query_port); source_addr.in6.sin6_port = htons(daemon->query_port);
} }
#endif /* IPV6 */ #endif /* IPV6 */
else else
...@@ -604,7 +602,7 @@ struct server *reload_servers(char *fname, char *buff, struct server *serv, int ...@@ -604,7 +602,7 @@ struct server *reload_servers(char *fname, char *buff, struct server *serv, int
old_servers = tmp; old_servers = tmp;
} }
return new_servers; daemon->servers = new_servers;
} }
......
src/option.c
View file @ 3be34541
...@@ -21,7 +21,7 @@ struct myoption { ...@@ -21,7 +21,7 @@ struct myoption {
int val; int val;
}; };
#define OPTSTRING "ZDNLERzowefnbvhdqr:m:p:c:l:s:i:t:u:g:a:x:S:C:A:T:H:Q:I:B:F:G:O:M:X:V:U:j:P:" #define OPTSTRING "ZDNLERzowefnbvhdkqr:m:p:c:l:s:i:t:u:g:a:x:S:C:A:T:H:Q:I:B:F:G:O:M:X:V:U:j:P:"
static struct myoption opts[] = { static struct myoption opts[] = {
{"version", 0, 0, 'v'}, {"version", 0, 0, 'v'},
...@@ -73,6 +73,7 @@ static struct myoption opts[] = { ...@@ -73,6 +73,7 @@ static struct myoption opts[] = {
{"dhcp-vendorclass", 1, 0, 'U'}, {"dhcp-vendorclass", 1, 0, 'U'},
{"dhcp-userclass", 1, 0, 'j'}, {"dhcp-userclass", 1, 0, 'j'},
{"edns-packet-max", 1, 0, 'P'}, {"edns-packet-max", 1, 0, 'P'},
{"keep-in-foreground", 0, 0, 'k'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
...@@ -89,6 +90,7 @@ static struct optflags optmap[] = { ...@@ -89,6 +90,7 @@ static struct optflags optmap[] = {
{ 'h', OPT_NO_HOSTS }, { 'h', OPT_NO_HOSTS },
{ 'n', OPT_NO_POLL }, { 'n', OPT_NO_POLL },
{ 'd', OPT_DEBUG }, { 'd', OPT_DEBUG },
{ 'k', OPT_NO_FORK },
{ 'o', OPT_ORDER }, { 'o', OPT_ORDER },
{ 'R', OPT_NO_RESOLV }, { 'R', OPT_NO_RESOLV },
{ 'E', OPT_EXPAND }, { 'E', OPT_EXPAND },
...@@ -124,6 +126,7 @@ static char *usage = ...@@ -124,6 +126,7 @@ static char *usage =
"-i, --interface=interface Specify interface(s) to listen on.\n" "-i, --interface=interface Specify interface(s) to listen on.\n"
"-I, --except-interface=int Specify interface(s) NOT to listen on.\n" "-I, --except-interface=int Specify interface(s) NOT to listen on.\n"
"-j, --dhcp-userclass=<id>,<class> Map DHCP user class to option set.\n" "-j, --dhcp-userclass=<id>,<class> Map DHCP user class to option set.\n"
"-k, --keep-in-foreground Do NOT fork into the background, do NOT run in debug mode.\n"
"-l, --dhcp-leasefile=path Specify where to store DHCP leases (defaults to " LEASEFILE ").\n" "-l, --dhcp-leasefile=path Specify where to store DHCP leases (defaults to " LEASEFILE ").\n"
"-L, --localmx Return MX records for local hosts.\n" "-L, --localmx Return MX records for local hosts.\n"
"-m, --mx-host=host_name Specify the MX name to reply to.\n" "-m, --mx-host=host_name Specify the MX name to reply to.\n"
...@@ -155,26 +158,33 @@ static char *usage = ...@@ -155,26 +158,33 @@ static char *usage =
"\n"; "\n";
unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **resolv_files, struct daemon *read_opts (int argc, char **argv)
struct mx_record **mxnames, char **mxtarget, char **lease_file,
char **username, char **groupname, char **domain_suffix, char **runfile,
struct iname **if_names, struct iname **if_addrs, struct iname **if_except,
struct bogus_addr **bogus_addr, struct server **serv_addrs, int *cachesize, int *port,
int *query_port, unsigned long *local_ttl, char **addn_hosts, struct dhcp_context **dhcp,
struct dhcp_config **dhcp_conf, struct dhcp_opt **dhcp_opts, struct dhcp_vendor **dhcp_vendors, char **dhcp_file,
char **dhcp_sname, struct in_addr *dhcp_next_server, int *dhcp_max,
unsigned int *min_leasetime, struct doctor **doctors, unsigned short *edns_pktsz)
{ {
struct daemon *daemon = safe_malloc(sizeof(struct daemon));
char *buff = safe_malloc(MAXDNAME);
int option = 0, i; int option = 0, i;
unsigned int flags = 0;
FILE *file_save = NULL, *f = NULL; FILE *file_save = NULL, *f = NULL;
char *file_name_save = NULL, *conffile = CONFFILE; char *file_name_save = NULL, *conffile = CONFFILE;
int conffile_set = 0; int conffile_set = 0;
int line_save = 0, lineno = 0; int line_save = 0, lineno = 0;
opterr = 0; opterr = 0;
*min_leasetime = UINT_MAX; memset(daemon, 0, sizeof(struct daemon));
daemon->namebuff = buff;
/* Set defaults - everything else is zero or NULL */
daemon->min_leasetime = UINT_MAX;
daemon->cachesize = CACHESIZ;
daemon->port = NAMESERVER_PORT;
daemon->default_resolv.is_default = 1;
daemon->default_resolv.name = RESOLVFILE;
daemon->resolv_files = &daemon->default_resolv;
daemon->username = CHUSER;
daemon->groupname = CHGRP;
daemon->runfile = RUNFILE;
daemon->dhcp_max = MAXLEASES;
daemon->edns_pktsz = EDNS_PKTSZ;
while (1) while (1)
{ {
if (!f) if (!f)
...@@ -274,7 +284,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -274,7 +284,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
for (i=0; optmap[i].c; i++) for (i=0; optmap[i].c; i++)
if (option == optmap[i].c) if (option == optmap[i].c)
{ {
flags |= optmap[i].flag; daemon->options |= optmap[i].flag;
option = 0; option = 0;
if (f && optarg) if (f && optarg)
{ {
...@@ -319,13 +329,13 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -319,13 +329,13 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
goto fileopen; goto fileopen;
case 'x': case 'x':
*runfile = safe_string_alloc(optarg); daemon->runfile = safe_string_alloc(optarg);
break; break;
case 'r': case 'r':
{ {
char *name = safe_string_alloc(optarg); char *name = safe_string_alloc(optarg);
struct resolvc *new, *list = *resolv_files; struct resolvc *new, *list = daemon->resolv_files;
if (list && list->is_default) if (list && list->is_default)
{ {
/* replace default resolv file - possibly with nothing */ /* replace default resolv file - possibly with nothing */
...@@ -346,7 +356,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -346,7 +356,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
new->logged = 0; new->logged = 0;
list = new; list = new;
} }
*resolv_files = list; daemon->resolv_files = list;
break; break;
} }
...@@ -360,8 +370,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -360,8 +370,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
else else
{ {
struct mx_record *new = safe_malloc(sizeof(struct mx_record)); struct mx_record *new = safe_malloc(sizeof(struct mx_record));
new->next = *mxnames; new->next = daemon->mxnames;
*mxnames = new; daemon->mxnames = new;
new->mxname = safe_string_alloc(optarg); new->mxname = safe_string_alloc(optarg);
new->mxtarget = safe_string_alloc(comma); /* may be NULL */ new->mxtarget = safe_string_alloc(comma); /* may be NULL */
} }
...@@ -372,59 +382,59 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -372,59 +382,59 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
if (!canonicalise(optarg)) if (!canonicalise(optarg))
option = '?'; option = '?';
else else
*mxtarget = safe_string_alloc(optarg); daemon->mxtarget = safe_string_alloc(optarg);
break; break;
case 'l': case 'l':
*lease_file = safe_string_alloc(optarg); daemon->lease_file = safe_string_alloc(optarg);
break; break;
case 'H': case 'H':
if (*addn_hosts) if (daemon->addn_hosts)
option = '?'; option = '?';
else else
*addn_hosts = safe_string_alloc(optarg); daemon->addn_hosts = safe_string_alloc(optarg);
break; break;
case 's': case 's':
if (strcmp (optarg, "#") == 0) if (strcmp (optarg, "#") == 0)
flags |= OPT_RESOLV_DOMAIN; daemon->options |= OPT_RESOLV_DOMAIN;
else if (!canonicalise(optarg)) else if (!canonicalise(optarg))
option = '?'; option = '?';
else else
*domain_suffix = safe_string_alloc(optarg); daemon->domain_suffix = safe_string_alloc(optarg);
break; break;
case 'u': case 'u':
*username = safe_string_alloc(optarg); daemon->username = safe_string_alloc(optarg);
break; break;
case 'g': case 'g':
*groupname = safe_string_alloc(optarg); daemon->groupname = safe_string_alloc(optarg);
break; break;
case 'i': case 'i':
{ {
struct iname *new = safe_malloc(sizeof(struct iname)); struct iname *new = safe_malloc(sizeof(struct iname));
new->next = *if_names; new->next = daemon->if_names;
*if_names = new; daemon->if_names = new;
/* new->name may be NULL if someone does /* new->name may be NULL if someone does
"interface=" to disable all interfaces except loop. */ "interface=" to disable all interfaces except loop. */
new->name = safe_string_alloc(optarg); new->name = safe_string_alloc(optarg);
new->isloop = new->used = 0; new->isloop = new->used = 0;
if (strchr(optarg, ':')) if (strchr(optarg, ':'))
flags |= OPT_NOWILD; daemon->options |= OPT_NOWILD;
break; break;
} }
case 'I': case 'I':
{ {
struct iname *new = safe_malloc(sizeof(struct iname)); struct iname *new = safe_malloc(sizeof(struct iname));
new->next = *if_except; new->next = daemon->if_except;
*if_except = new; daemon->if_except = new;
new->name = safe_string_alloc(optarg); new->name = safe_string_alloc(optarg);
if (strchr(optarg, ':')) if (strchr(optarg, ':'))
flags |= OPT_NOWILD; daemon->options |= OPT_NOWILD;
break; break;
} }
...@@ -434,8 +444,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -434,8 +444,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
if ((addr.s_addr = inet_addr(optarg)) != (in_addr_t)-1) if ((addr.s_addr = inet_addr(optarg)) != (in_addr_t)-1)
{ {
struct bogus_addr *baddr = safe_malloc(sizeof(struct bogus_addr)); struct bogus_addr *baddr = safe_malloc(sizeof(struct bogus_addr));
baddr->next = *bogus_addr; baddr->next = daemon->bogus_addr;
*bogus_addr = baddr; daemon->bogus_addr = baddr;
baddr->addr = addr; baddr->addr = addr;
} }
else else
...@@ -446,7 +456,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -446,7 +456,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
case 'a': case 'a':
{ {
struct iname *new = safe_malloc(sizeof(struct iname)); struct iname *new = safe_malloc(sizeof(struct iname));
new->next = *if_addrs; new->next = daemon->if_addrs;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (inet_pton(AF_INET, optarg, &new->addr.in.sin_addr)) if (inet_pton(AF_INET, optarg, &new->addr.in.sin_addr))
{ {
...@@ -480,7 +490,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -480,7 +490,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
} }
if (new) if (new)
*if_addrs = new; daemon->if_addrs = new;
break; break;
} }
...@@ -633,8 +643,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -633,8 +643,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
serv->next->source_addr = serv->source_addr; serv->next->source_addr = serv->source_addr;
serv = serv->next; serv = serv->next;
} }
serv->next = *serv_addrs; serv->next = daemon->servers;
*serv_addrs = newlist; daemon->servers = newlist;
} }
break; break;
} }
...@@ -653,13 +663,13 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -653,13 +663,13 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
else if (size > 10000) else if (size > 10000)
size = 10000; size = 10000;
*cachesize = size; daemon->cachesize = size;
} }
break; break;
} }
case 'p': case 'p':
if (!atoi_check(optarg, port)) if (!atoi_check(optarg, &daemon->port))
option = '?'; option = '?';
break; break;
...@@ -668,12 +678,12 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -668,12 +678,12 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
int i; int i;
if (!atoi_check(optarg, &i)) if (!atoi_check(optarg, &i))
option = '?'; option = '?';
*edns_pktsz = (unsigned short)i; daemon->edns_pktsz = (unsigned short)i;
break; break;
} }
case 'Q': case 'Q':
if (!atoi_check(optarg, query_port)) if (!atoi_check(optarg, &daemon->query_port))
option = '?'; option = '?';
break; break;
...@@ -683,12 +693,12 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -683,12 +693,12 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
if (!atoi_check(optarg, &ttl)) if (!atoi_check(optarg, &ttl))
option = '?'; option = '?';
else else
*local_ttl = (unsigned long)ttl; daemon->local_ttl = (unsigned long)ttl;
break; break;
} }
case 'X': case 'X':
if (!atoi_check(optarg, dhcp_max)) if (!atoi_check(optarg, &daemon->dhcp_max))
option = '?'; option = '?';
break; break;
...@@ -698,13 +708,14 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -698,13 +708,14 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
char *cp, *comma, *a[5] = { NULL, NULL, NULL, NULL, NULL }; char *cp, *comma, *a[5] = { NULL, NULL, NULL, NULL, NULL };
struct dhcp_context *new = safe_malloc(sizeof(struct dhcp_context)); struct dhcp_context *new = safe_malloc(sizeof(struct dhcp_context));
new->next = *dhcp; new->next = daemon->dhcp;
new->lease_time = DEFLEASE; new->lease_time = DEFLEASE;
new->addr_epoch = 0; new->addr_epoch = 0;
new->netmask.s_addr = 0; new->netmask.s_addr = 0;
new->broadcast.s_addr = 0; new->broadcast.s_addr = 0;
new->router.s_addr = 0;
new->netid.net = NULL; new->netid.net = NULL;
new->static_only = 0;
for (cp = optarg; *cp; cp++) for (cp = optarg; *cp; cp++)
if (!(*cp == ' ' || *cp == '.' || (*cp >='0' && *cp <= '9'))) if (!(*cp == ' ' || *cp == '.' || (*cp >='0' && *cp <= '9')))
...@@ -730,17 +741,27 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -730,17 +741,27 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
if ((k < 2) || ((new->start.s_addr = inet_addr(a[0])) == (in_addr_t)-1)) if ((k < 2) || ((new->start.s_addr = inet_addr(a[0])) == (in_addr_t)-1))
option = '?'; option = '?';
else if (strcmp(a[1], "static") == 0) else if (strcmp(a[1], "static") == 0)
new->end = new->start; {
new->end = new->start;
new->static_only = 1;
}
else if ((new->end.s_addr = inet_addr(a[1])) == (in_addr_t)-1) else if ((new->end.s_addr = inet_addr(a[1])) == (in_addr_t)-1)
option = '?'; option = '?';
if (ntohl(new->start.s_addr) > ntohl(new->end.s_addr))
{
struct in_addr tmp = new->start;
new->start = new->end;
new->end = tmp;
}
if (option == '?') if (option == '?')
{ {
free(new); free(new);
break; break;
} }
else else
*dhcp = new; daemon->dhcp = new;
if (k >= 3 && strchr(a[2], '.') && if (k >= 3 && strchr(a[2], '.') &&
((new->netmask.s_addr = inet_addr(a[2])) != (in_addr_t)-1)) ((new->netmask.s_addr = inet_addr(a[2])) != (in_addr_t)-1))
...@@ -779,8 +800,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -779,8 +800,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
} }
} }
if (new->lease_time < *min_leasetime) if (new->lease_time < daemon->min_leasetime)
*min_leasetime = new->lease_time; daemon->min_leasetime = new->lease_time;
break; break;
} }
...@@ -792,7 +813,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -792,7 +813,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
struct dhcp_config *new = safe_malloc(sizeof(struct dhcp_config)); struct dhcp_config *new = safe_malloc(sizeof(struct dhcp_config));
struct in_addr in; struct in_addr in;
new->next = *dhcp_conf; new->next = daemon->dhcp_conf;
new->flags = 0; new->flags = 0;
...@@ -944,9 +965,9 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -944,9 +965,9 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
} }
else else
{ {
if ((new->flags & CONFIG_TIME) && new->lease_time < *min_leasetime) if ((new->flags & CONFIG_TIME) && new->lease_time < daemon->min_leasetime)
*min_leasetime = new->lease_time; daemon->min_leasetime = new->lease_time;
*dhcp_conf = new; daemon->dhcp_conf = new;
} }
break; break;
} }
...@@ -957,7 +978,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -957,7 +978,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
char *cp, *comma; char *cp, *comma;
int addrs, digs, is_addr, is_hex, is_dec; int addrs, digs, is_addr, is_hex, is_dec;
new->next = *dhcp_opts; new->next = daemon->dhcp_opts;
new->len = 0; new->len = 0;
new->is_addr = 0; new->is_addr = 0;
new->netid = NULL; new->netid = NULL;
...@@ -988,7 +1009,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -988,7 +1009,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
break; break;
} }
*dhcp_opts = new; daemon->dhcp_opts = new;
if (!comma) if (!comma)
break; break;
...@@ -1045,7 +1066,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -1045,7 +1066,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
else if (is_dec) else if (is_dec)
{ {
/* Given that we don't know the length, /* Given that we don't know the length,
this applaing hack is the best available */ this appaling hack is the best available */
unsigned int val = atoi(comma+1); unsigned int val = atoi(comma+1);
if (val < 256) if (val < 256)
{ {
...@@ -1103,14 +1124,14 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -1103,14 +1124,14 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
if ((comma = strchr(optarg, ','))) if ((comma = strchr(optarg, ',')))
*comma = 0; *comma = 0;
*dhcp_file = safe_string_alloc(optarg); daemon->dhcp_file = safe_string_alloc(optarg);
if (comma) if (comma)
{ {
optarg = comma+1; optarg = comma+1;
if ((comma = strchr(optarg, ','))) if ((comma = strchr(optarg, ',')))
*comma = 0; *comma = 0;
*dhcp_sname = safe_string_alloc(optarg); daemon->dhcp_sname = safe_string_alloc(optarg);
if (comma && (dhcp_next_server->s_addr = inet_addr(comma+1)) == (in_addr_t)-1) if (comma && (daemon->dhcp_next_server.s_addr = inet_addr(comma+1)) == (in_addr_t)-1)
option = '?'; option = '?';
} }
break; break;
...@@ -1132,8 +1153,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -1132,8 +1153,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
new->data = safe_malloc(new->len); new->data = safe_malloc(new->len);
memcpy(new->data, comma+1, new->len); memcpy(new->data, comma+1, new->len);
new->is_vendor = (option == 'U'); new->is_vendor = (option == 'U');
new->next = *dhcp_vendors; new->next = daemon->dhcp_vendors;
*dhcp_vendors = new; daemon->dhcp_vendors = new;
} }
break; break;
} }
...@@ -1170,8 +1191,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -1170,8 +1191,8 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
new->in = in; new->in = in;
new->out = out; new->out = out;
new->mask = mask; new->mask = mask;
new->next = *doctors; new->next = daemon->doctors;
*doctors = new; daemon->doctors = new;
break; break;
} }
...@@ -1191,66 +1212,66 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -1191,66 +1212,66 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
} }
/* port might no be known when the address is parsed - fill in here */ /* port might no be known when the address is parsed - fill in here */
if (*serv_addrs) if (daemon->servers)
{ {
struct server *tmp; struct server *tmp;
for (tmp = *serv_addrs; tmp; tmp = tmp->next) for (tmp = daemon->servers; tmp; tmp = tmp->next)
if (!(tmp->flags & SERV_HAS_SOURCE)) if (!(tmp->flags & SERV_HAS_SOURCE))
{ {
if (tmp->source_addr.sa.sa_family == AF_INET) if (tmp->source_addr.sa.sa_family == AF_INET)
tmp->source_addr.in.sin_port = htons(*query_port); tmp->source_addr.in.sin_port = htons(daemon->query_port);
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else if (tmp->source_addr.sa.sa_family == AF_INET6) else if (tmp->source_addr.sa.sa_family == AF_INET6)
tmp->source_addr.in6.sin6_port = htons(*query_port); tmp->source_addr.in6.sin6_port = htons(daemon->query_port);
#endif #endif
} }
} }
if (*if_addrs) if (daemon->if_addrs)
{ {
struct iname *tmp; struct iname *tmp;
for(tmp = *if_addrs; tmp; tmp = tmp->next) for(tmp = daemon->if_addrs; tmp; tmp = tmp->next)
if (tmp->addr.sa.sa_family == AF_INET) if (tmp->addr.sa.sa_family == AF_INET)
tmp->addr.in.sin_port = htons(*port); tmp->addr.in.sin_port = htons(daemon->port);
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else if (tmp->addr.sa.sa_family == AF_INET6) else if (tmp->addr.sa.sa_family == AF_INET6)
tmp->addr.in6.sin6_port = htons(*port); tmp->addr.in6.sin6_port = htons(daemon->port);
#endif /* IPv6 */ #endif /* IPv6 */
} }
/* only one of these need be specified: the other defaults to the /* only one of these need be specified: the other defaults to the
host-name */ host-name */
if ((flags & OPT_LOCALMX) || *mxnames || *mxtarget) if ((daemon->options & OPT_LOCALMX) || daemon->mxnames || daemon->mxtarget)
{ {
if (gethostname(buff, MAXDNAME) == -1) if (gethostname(buff, MAXDNAME) == -1)
die("cannot get host-name: %s", NULL); die("cannot get host-name: %s", NULL);
if (!*mxnames) if (!daemon->mxnames)
{ {
*mxnames = safe_malloc(sizeof(struct mx_record)); daemon->mxnames = safe_malloc(sizeof(struct mx_record));
(*mxnames)->next = NULL; daemon->mxnames->next = NULL;
(*mxnames)->mxtarget = NULL; daemon->mxnames->mxtarget = NULL;
(*mxnames)->mxname = safe_string_alloc(buff); daemon->mxnames->mxname = safe_string_alloc(buff);
} }
if (!*mxtarget) if (!daemon->mxtarget)
*mxtarget = safe_string_alloc(buff); daemon->mxtarget = safe_string_alloc(buff);
} }
if (flags & OPT_NO_RESOLV) if (daemon->options & OPT_NO_RESOLV)
*resolv_files = 0; daemon->resolv_files = 0;
else if (*resolv_files && (*resolv_files)->next && (flags & OPT_NO_POLL)) else if (daemon->resolv_files && (daemon->resolv_files)->next && (daemon->options & OPT_NO_POLL))
die("only one resolv.conf file allowed in no-poll mode.", NULL); die("only one resolv.conf file allowed in no-poll mode.", NULL);
if (flags & OPT_RESOLV_DOMAIN) if (daemon->options & OPT_RESOLV_DOMAIN)
{ {
char *line; char *line;
if (!*resolv_files || (*resolv_files)->next) if (!daemon->resolv_files || (daemon->resolv_files)->next)
die("must have exactly one resolv.conf to read domain from.", NULL); die("must have exactly one resolv.conf to read domain from.", NULL);
if (!(f = fopen((*resolv_files)->name, "r"))) if (!(f = fopen((daemon->resolv_files)->name, "r")))
die("failed to read %s: %m", (*resolv_files)->name); die("failed to read %s: %m", (daemon->resolv_files)->name);
while ((line = fgets(buff, MAXDNAME, f))) while ((line = fgets(buff, MAXDNAME, f)))
{ {
...@@ -1261,17 +1282,17 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso ...@@ -1261,17 +1282,17 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
if ((token = strtok(NULL, " \t\n\r")) && if ((token = strtok(NULL, " \t\n\r")) &&
canonicalise(token) && canonicalise(token) &&
(*domain_suffix = safe_string_alloc(token))) (daemon->domain_suffix = safe_string_alloc(token)))
break; break;
} }
fclose(f); fclose(f);
if (!*domain_suffix) if (!daemon->domain_suffix)
die("no search directive found in %s", (*resolv_files)->name); die("no search directive found in %s", (daemon->resolv_files)->name);
} }
return flags; return daemon;
} }
......
src/rfc1035.c
View file @ 3be34541
...@@ -340,7 +340,7 @@ unsigned char *find_pseudoheader(HEADER *header, unsigned int plen) ...@@ -340,7 +340,7 @@ unsigned char *find_pseudoheader(HEADER *header, unsigned int plen)
GETSHORT(rdlen, ansp); GETSHORT(rdlen, ansp);
if ((unsigned int)(ansp + rdlen - (unsigned char *)header) > plen) if ((unsigned int)(ansp + rdlen - (unsigned char *)header) > plen)
return NULL; return NULL;
if (type == ns_t_opt) if (type == T_OPT)
return save; return save;
ansp += rdlen; ansp += rdlen;
} }
...@@ -788,10 +788,9 @@ int check_for_bogus_wildcard(HEADER *header, unsigned int qlen, char *name, ...@@ -788,10 +788,9 @@ int check_for_bogus_wildcard(HEADER *header, unsigned int qlen, char *name,
} }
/* return zero if we can't answer from cache, or packet size if we can */ /* return zero if we can't answer from cache, or packet size if we can */
int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_record *mxnames, int answer_request(HEADER *header, char *limit, unsigned int qlen, struct daemon *daemon, time_t now)
char *mxtarget, unsigned int options, time_t now,
unsigned long local_ttl, char *name, unsigned short edns_pcktsz)
{ {
char *name = daemon->namebuff;
unsigned char *p, *ansp, *pheader; unsigned char *p, *ansp, *pheader;
int qtype, qclass, is_arpa; int qtype, qclass, is_arpa;
struct all_addr addr; struct all_addr addr;
...@@ -827,8 +826,8 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec ...@@ -827,8 +826,8 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec
than we allow, trim it so that we don't get an overlarge than we allow, trim it so that we don't get an overlarge
response from upstream */ response from upstream */
if (udpsz > edns_pcktsz) if (udpsz > daemon->edns_pktsz)
PUTSHORT(edns_pcktsz, psave); PUTSHORT(daemon->edns_pktsz, psave);
dryrun = 1; dryrun = 1;
} }
...@@ -889,7 +888,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec ...@@ -889,7 +888,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec
} }
else if (qclass == C_IN) else if (qclass == C_IN)
{ {
if ((options & OPT_FILTER) && if ((daemon->options & OPT_FILTER) &&
(qtype == T_SOA || qtype == T_SRV || (qtype == T_ANY && strchr(name, '_')))) (qtype == T_SOA || qtype == T_SRV || (qtype == T_ANY && strchr(name, '_'))))
{ {
ans = 1; ans = 1;
...@@ -901,7 +900,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec ...@@ -901,7 +900,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec
{ {
if (!(crecp = cache_find_by_addr(NULL, &addr, now, is_arpa))) if (!(crecp = cache_find_by_addr(NULL, &addr, now, is_arpa)))
{ {
if (is_arpa == F_IPV4 && (options & OPT_BOGUSPRIV) && private_net(&addr)) if (is_arpa == F_IPV4 && (daemon->options & OPT_BOGUSPRIV) && private_net(&addr))
{ {
/* if not in cache, enabled and private IPV4 address, return NXDOMAIN */ /* if not in cache, enabled and private IPV4 address, return NXDOMAIN */
ans = 1; ans = 1;
...@@ -938,7 +937,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec ...@@ -938,7 +937,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec
/* Return 0 ttl for DHCP entries, which might change /* Return 0 ttl for DHCP entries, which might change
before the lease expires. */ before the lease expires. */
if (crecp->flags & (F_IMMORTAL | F_DHCP)) if (crecp->flags & (F_IMMORTAL | F_DHCP))
ttl = local_ttl; ttl = daemon->local_ttl;
else else
ttl = crecp->ttd - now; ttl = crecp->ttd - now;
...@@ -1004,7 +1003,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec ...@@ -1004,7 +1003,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec
unsigned long ttl; unsigned long ttl;
if (crecp->flags & (F_IMMORTAL | F_DHCP)) if (crecp->flags & (F_IMMORTAL | F_DHCP))
ttl = local_ttl; ttl = daemon->local_ttl;
else else
ttl = crecp->ttd - now; ttl = crecp->ttd - now;
...@@ -1033,7 +1032,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec ...@@ -1033,7 +1032,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec
if (qtype == T_MX || qtype == T_ANY) if (qtype == T_MX || qtype == T_ANY)
{ {
struct mx_record *mx; struct mx_record *mx;
for (mx = mxnames; mx; mx = mx->next) for (mx = daemon->mxnames; mx; mx = mx->next)
if (hostname_isequal(name, mx->mxname)) if (hostname_isequal(name, mx->mxname))
break; break;
if (mx) if (mx)
...@@ -1041,19 +1040,19 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec ...@@ -1041,19 +1040,19 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec
ans = 1; ans = 1;
if (!dryrun) if (!dryrun)
{ {
ansp = add_text_record(nameoffset, ansp, local_ttl, 1, T_MX, ansp = add_text_record(nameoffset, ansp, daemon->local_ttl, 1, T_MX,
mx->mxtarget ? mx->mxtarget : mxtarget); mx->mxtarget ? mx->mxtarget : daemon->mxtarget);
anscount++; anscount++;
} }
} }
else if ((options & (OPT_SELFMX | OPT_LOCALMX)) && else if ((daemon->options & (OPT_SELFMX | OPT_LOCALMX)) &&
cache_find_by_name(NULL, name, now, F_HOSTS | F_DHCP)) cache_find_by_name(NULL, name, now, F_HOSTS | F_DHCP))
{ {
ans = 1; ans = 1;
if (!dryrun) if (!dryrun)
{ {
ansp = add_text_record(nameoffset, ansp, local_ttl, 1, T_MX, ansp = add_text_record(nameoffset, ansp, daemon->local_ttl, 1, T_MX,
(options & OPT_SELFMX) ? name : mxtarget); (daemon->options & OPT_SELFMX) ? name : daemon->mxtarget);
anscount++; anscount++;
} }
} }
......
src/rfc2131.c
View file @ 3be34541
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#define OPTION_VENDOR_ID 60 #define OPTION_VENDOR_ID 60
#define OPTION_CLIENT_ID 61 #define OPTION_CLIENT_ID 61
#define OPTION_USER_CLASS 77 #define OPTION_USER_CLASS 77
#define OPTION_SUBNET_SELECT 118
#define OPTION_END 255 #define OPTION_END 255
#define DHCPDISCOVER 1 #define DHCPDISCOVER 1
...@@ -66,53 +67,47 @@ static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_ty ...@@ -66,53 +67,47 @@ static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_ty
static unsigned char *do_req_options(struct dhcp_context *context, static unsigned char *do_req_options(struct dhcp_context *context,
unsigned char *p, unsigned char *end, unsigned char *p, unsigned char *end,
unsigned char *req_options, unsigned char *req_options,
struct dhcp_opt *config_opts, struct daemon *daemon,
char *domainname, char *hostname, char *hostname,
struct in_addr router,
struct in_addr iface_addr, struct in_addr iface_addr,
int iface_mtu, struct dhcp_netid *netid); struct dhcp_netid *netid,
struct in_addr subnet_addr);
static int have_config(struct dhcp_config *config, unsigned int mask) static int have_config(struct dhcp_config *config, unsigned int mask)
{ {
return config && (config->flags & mask); return config && (config->flags & mask);
} }
int dhcp_reply(struct dhcp_context *context, int dhcp_reply(struct daemon *daemon, struct in_addr iface_addr, char *iface_name, unsigned int sz, time_t now)
struct in_addr iface_addr,
char *iface_name,
int iface_mtu,
struct udp_dhcp_packet *rawpacket,
unsigned int sz, time_t now, char *namebuff,
struct dhcp_opt *dhcp_opts, struct dhcp_config *dhcp_configs,
struct dhcp_vendor *vendors,
char *domain_suffix, char *dhcp_file, char *dhcp_sname,
struct in_addr dhcp_next_server, struct in_addr router)
{ {
struct dhcp_context *context;
unsigned char *opt, *clid; unsigned char *opt, *clid;
struct dhcp_lease *lease, *ltmp; struct dhcp_lease *lease, *ltmp;
struct dhcp_vendor *vendor; struct dhcp_vendor *vendor;
int clid_len; int clid_len;
struct dhcp_packet *mess = &rawpacket->data; struct dhcp_packet *mess = &daemon->dhcp_packet->data;
unsigned char *p = mess->options; unsigned char *p = mess->options + sizeof(u32); /* skip cookie */
/* default max reply packet length, max be overridden */ unsigned char *end = (unsigned char *)(daemon->dhcp_packet + 1);
unsigned char *end = (unsigned char *)(rawpacket + 1);
char *hostname = NULL; char *hostname = NULL;
char *req_options = NULL; char *req_options = NULL;
char *message = NULL; char *message = NULL;
unsigned int renewal_time, expires_time, def_time; unsigned int renewal_time, expires_time, def_time;
struct dhcp_config *config; struct dhcp_config *config;
struct dhcp_netid *netid = NULL; struct dhcp_netid *netid = NULL;
struct in_addr addr; struct in_addr addr, subnet_addr;
unsigned short fuzz = 0; unsigned short fuzz = 0;
unsigned int mess_type = 0;
if (mess->op != BOOTREQUEST || mess->cookie != htonl(DHCP_COOKIE)) subnet_addr.s_addr = 0;
if (mess->op != BOOTREQUEST)
return 0; return 0;
/* Token ring is supported when we have packet sockets /* Token ring is supported when we have packet sockets
to make the HW headers for us. We don't have the code to build to make the HW headers for us. We don't have the code to build
token ring headers when using BPF. We rely on the fact that token ring headers when using BPF. We rely on the fact that
token ring hwaddrs are the same size as ethernet hwaddrs. */ token ring hwaddrs are the same size as ethernet hwaddrs. */
#ifdef HAVE_BPF #ifdef HAVE_BPF
if (mess->htype != ARPHRD_ETHER) if (mess->htype != ARPHRD_ETHER)
#else #else
...@@ -123,23 +118,100 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -123,23 +118,100 @@ int dhcp_reply(struct dhcp_context *context,
mess->htype, iface_name); mess->htype, iface_name);
return 0; return 0;
} }
if (mess->hlen != ETHER_ADDR_LEN) if (mess->hlen != ETHER_ADDR_LEN)
return 0; return 0;
/* check for DHCP rather than BOOTP */
if ((opt = option_find(mess, sz, OPTION_MESSAGE_TYPE)))
{
mess_type = option_uint(opt, 1);
mess->op = BOOTREPLY; /* only insist on a cookie for DHCP. */
if (*((u32 *)&mess->options) != htonl(DHCP_COOKIE))
return 0;
if ((opt = option_find(mess, sz, OPTION_MAXMESSAGE))) /* Some buggy clients set ciaddr when they shouldn't, so clear that here since
{ it can affect the context-determination code. */
int maxsize = (int)option_uint(opt, 2); if ((option_find(mess, sz, OPTION_REQUESTED_IP) || mess_type == DHCPDISCOVER))
if (maxsize > DNSMASQ_PACKETSZ) mess->ciaddr.s_addr = 0;
maxsize = DNSMASQ_PACKETSZ;
if (maxsize > iface_mtu)
maxsize = iface_mtu;
end = ((unsigned char *)rawpacket) + maxsize; /* Check for RFC3011 subnet selector */
if ((opt = option_find(mess, sz, OPTION_SUBNET_SELECT)))
subnet_addr = option_addr(opt);
} }
/* Determine network for this packet. If the machine has an address already, and we don't have
have a giaddr or explicit subnet selector, use the ciaddr. This is necessary because a
machine which got a lease via a relay won't use the relay to renew. */
addr =
subnet_addr.s_addr ? subnet_addr :
(mess->giaddr.s_addr ? mess->giaddr :
(mess->ciaddr.s_addr ? mess->ciaddr : iface_addr));
for (context = daemon->dhcp; context; context = context->next)
if (context->netmask.s_addr &&
is_same_net(addr, context->start, context->netmask) &&
is_same_net(addr, context->end, context->netmask))
break;
if (!context)
{
syslog(LOG_WARNING, "no address range available for DHCP request %s %s",
subnet_addr.s_addr ? "with subnet selector" : "via",
subnet_addr.s_addr ? inet_ntoa(subnet_addr) : (mess->giaddr.s_addr ? inet_ntoa(mess->giaddr) : iface_name));
return 0;
}
mess->op = BOOTREPLY;
/* start to build netid chain */
if (context->netid.net)
{
context->netid.next = netid;
netid = &context->netid;
}
if (mess_type == 0)
{
/* BOOTP request */
config = find_config(daemon->dhcp_conf, context, NULL, 0, mess->chaddr, NULL);
if (have_config(config, CONFIG_ADDR) &&
!have_config(config, CONFIG_DISABLE) &&
!lease_find_by_addr(config->addr))
{
struct dhcp_netid id;
char save = mess->file[128];
end = mess->options + 64; /* BOOTP vend area is only 64 bytes */
mess->yiaddr = config->addr;
mess->siaddr = daemon->dhcp_next_server.s_addr ? daemon->dhcp_next_server : iface_addr;
if (have_config(config, CONFIG_NAME))
hostname = config->hostname;
if (have_config(config, CONFIG_NETID))
{
config->netid.next = netid;
netid = &config->netid;
}
/* Match incoming filename field as a netid. */
if (mess->file[0])
{
mess->file[128] = 0; /* ensure zero term. */
id.net = mess->file;
id.next = netid;
netid = &id;
}
p = do_req_options(context, p, end, NULL, daemon,
hostname, iface_addr, netid, subnet_addr);
/* must do this after do_req_options since it overwrites filename field. */
bootp_option_put(mess, daemon->dhcp_file, daemon->dhcp_sname);
p = option_end(p, end, mess);
log_packet(NULL, &config->addr, mess->chaddr, iface_name, NULL);
mess->file[128] = save;
return p - (unsigned char *)mess;
}
return 0;
}
/* If there is no client identifier option, use the hardware address */ /* If there is no client identifier option, use the hardware address */
if ((opt = option_find(mess, sz, OPTION_CLIENT_ID))) if ((opt = option_find(mess, sz, OPTION_CLIENT_ID)))
{ {
...@@ -152,16 +224,14 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -152,16 +224,14 @@ int dhcp_reply(struct dhcp_context *context,
clid_len = 0; clid_len = 0;
} }
config = find_config(dhcp_configs, context, clid, clid_len, mess->chaddr, NULL); config = find_config(daemon->dhcp_conf, context, clid, clid_len, mess->chaddr, NULL);
if (have_config(config, CONFIG_NAME)) if (have_config(config, CONFIG_NAME))
hostname = config->hostname; hostname = config->hostname;
else if ((opt = option_find(mess, sz, OPTION_HOSTNAME))) else if ((opt = option_find(mess, sz, OPTION_HOSTNAME)))
{ {
int len = option_len(opt); int len = option_len(opt);
/* namebuff is 1K long, use half for requested options and half for hostname */ hostname = daemon->dhcp_buff;
/* len < 256 by definition */
hostname = namebuff + 500;
memcpy(hostname, option_ptr(opt), len); memcpy(hostname, option_ptr(opt), len);
/* May not be zero terminated */ /* May not be zero terminated */
hostname[len] = 0; hostname[len] = 0;
...@@ -173,7 +243,7 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -173,7 +243,7 @@ int dhcp_reply(struct dhcp_context *context,
char *dot = strchr(hostname, '.'); char *dot = strchr(hostname, '.');
if (dot) if (dot)
{ {
if (!domain_suffix || !hostname_isequal(dot+1, domain_suffix)) if (!daemon->domain_suffix || !hostname_isequal(dot+1, daemon->domain_suffix))
{ {
syslog(LOG_WARNING, "Ignoring DHCP host name %s because it has an illegal domain part", hostname); syslog(LOG_WARNING, "Ignoring DHCP host name %s because it has an illegal domain part", hostname);
hostname = NULL; hostname = NULL;
...@@ -191,7 +261,7 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -191,7 +261,7 @@ int dhcp_reply(struct dhcp_context *context,
to avoid impersonation by name. */ to avoid impersonation by name. */
if (!config) if (!config)
{ {
struct dhcp_config *new = find_config(dhcp_configs, context, NULL, 0, mess->chaddr, hostname); struct dhcp_config *new = find_config(daemon->dhcp_conf, context, NULL, 0, mess->chaddr, hostname);
if (!have_config(new, CONFIG_CLID) && !have_config(new, CONFIG_HWADDR)) if (!have_config(new, CONFIG_CLID) && !have_config(new, CONFIG_HWADDR))
config = new; config = new;
} }
...@@ -200,12 +270,6 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -200,12 +270,6 @@ int dhcp_reply(struct dhcp_context *context,
def_time = have_config(config, CONFIG_TIME) ? config->lease_time : context->lease_time; def_time = have_config(config, CONFIG_TIME) ? config->lease_time : context->lease_time;
if (context->netid.net)
{
context->netid.next = netid;
netid = &context->netid;
}
if (have_config(config, CONFIG_NETID)) if (have_config(config, CONFIG_NETID))
{ {
config->netid.next = netid; config->netid.next = netid;
...@@ -214,11 +278,11 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -214,11 +278,11 @@ int dhcp_reply(struct dhcp_context *context,
/* Theres a chance that carefully chosen data could match the same /* Theres a chance that carefully chosen data could match the same
vendor/user option twice and make a loop in the netid chain. */ vendor/user option twice and make a loop in the netid chain. */
for (vendor = vendors; vendor; vendor = vendor->next) for (vendor = daemon->dhcp_vendors; vendor; vendor = vendor->next)
vendor->used = 0; vendor->used = 0;
if ((opt = option_find(mess, sz, OPTION_VENDOR_ID))) if ((opt = option_find(mess, sz, OPTION_VENDOR_ID)))
for (vendor = vendors; vendor; vendor = vendor->next) for (vendor = daemon->dhcp_vendors; vendor; vendor = vendor->next)
if (vendor->is_vendor && !vendor->used) if (vendor->is_vendor && !vendor->used)
{ {
int i; int i;
...@@ -237,7 +301,7 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -237,7 +301,7 @@ int dhcp_reply(struct dhcp_context *context,
unsigned char *ucp = option_ptr(opt); unsigned char *ucp = option_ptr(opt);
int j; int j;
for (j = 0; j < option_len(opt); j += ucp[j] + 1) for (j = 0; j < option_len(opt); j += ucp[j] + 1)
for (vendor = vendors; vendor; vendor = vendor->next) for (vendor = daemon->dhcp_vendors; vendor; vendor = vendor->next)
if (!vendor->is_vendor && !vendor->used) if (!vendor->is_vendor && !vendor->used)
{ {
int i; int i;
...@@ -284,15 +348,12 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -284,15 +348,12 @@ int dhcp_reply(struct dhcp_context *context,
if ((opt = option_find(mess, sz, OPTION_REQUESTED_OPTIONS))) if ((opt = option_find(mess, sz, OPTION_REQUESTED_OPTIONS)))
{ {
int len = option_len(opt); int len = option_len(opt);
req_options = namebuff; req_options = daemon->dhcp_buff2;
memcpy(req_options, option_ptr(opt), len); memcpy(req_options, option_ptr(opt), len);
req_options[len] = OPTION_END; req_options[len] = OPTION_END;
} }
if (!(opt = option_find(mess, sz, OPTION_MESSAGE_TYPE))) switch (mess_type)
return 0;
switch (option_uint(opt, 1))
{ {
case DHCPDECLINE: case DHCPDECLINE:
if (!(opt = option_find(mess, sz, OPTION_SERVER_IDENTIFIER)) || if (!(opt = option_find(mess, sz, OPTION_SERVER_IDENTIFIER)) ||
...@@ -302,7 +363,7 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -302,7 +363,7 @@ int dhcp_reply(struct dhcp_context *context,
/* sanitise any message. Paranoid? Moi? */ /* sanitise any message. Paranoid? Moi? */
if ((opt = option_find(mess, sz, OPTION_MESSAGE))) if ((opt = option_find(mess, sz, OPTION_MESSAGE)))
{ {
char *p = option_ptr(opt), *q = namebuff; char *p = option_ptr(opt), *q = daemon->dhcp_buff;
int i; int i;
for (i = option_len(opt); i > 0; i--) for (i = option_len(opt); i > 0; i--)
...@@ -312,7 +373,7 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -312,7 +373,7 @@ int dhcp_reply(struct dhcp_context *context,
*q++ = c; *q++ = c;
} }
*q++ = 0; /* add terminator */ *q++ = 0; /* add terminator */
message = namebuff; message = daemon->dhcp_buff;
} }
if (!(opt = option_find(mess, sz, OPTION_REQUESTED_IP))) if (!(opt = option_find(mess, sz, OPTION_REQUESTED_IP)))
...@@ -353,24 +414,22 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -353,24 +414,22 @@ int dhcp_reply(struct dhcp_context *context,
if (have_config(config, CONFIG_DISABLE)) if (have_config(config, CONFIG_DISABLE))
message = "ignored"; message = "ignored";
else if (have_config(config, CONFIG_ADDR) && else if (have_config(config, CONFIG_ADDR) &&
(!(ltmp = lease_find_by_addr(config->addr)) || ltmp == lease)) (!(ltmp = lease_find_by_addr(config->addr)) || ltmp == lease))
mess->yiaddr = config->addr; mess->yiaddr = config->addr;
else if (lease && address_available(context, lease->addr)) else if (lease && address_available(context, lease->addr))
mess->yiaddr = lease->addr; mess->yiaddr = lease->addr;
else if (opt && address_available(context, addr) && !lease_find_by_addr(addr) && else if (opt && address_available(context, addr) && !lease_find_by_addr(addr) &&
!config_find_by_address(dhcp_configs, addr)) !config_find_by_address(daemon->dhcp_conf, addr))
mess->yiaddr = addr; mess->yiaddr = addr;
else if (!address_allocate(context, dhcp_configs, &mess->yiaddr, mess->chaddr)) else if (!address_allocate(context, daemon, &mess->yiaddr, mess->chaddr))
message = "no address available"; message = "no address available";
log_packet("DISCOVER", opt ? &addr : NULL, mess->chaddr, iface_name, message); log_packet("DISCOVER", opt ? &addr : NULL, mess->chaddr, iface_name, message);
if (message) if (message)
return 0; return 0;
/* ensure that we send the reply by steam even if a buggy client sets this. */ bootp_option_put(mess, daemon->dhcp_file, daemon->dhcp_sname);
mess->ciaddr.s_addr = 0; mess->siaddr = daemon->dhcp_next_server.s_addr ? daemon->dhcp_next_server : iface_addr;
bootp_option_put(mess, dhcp_file, dhcp_sname);
mess->siaddr = dhcp_next_server.s_addr ? dhcp_next_server : iface_addr;
p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPOFFER); p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPOFFER);
p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(iface_addr.s_addr)); p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(iface_addr.s_addr));
p = option_put(p, end, OPTION_LEASE_TIME, 4, expires_time); p = option_put(p, end, OPTION_LEASE_TIME, 4, expires_time);
...@@ -380,8 +439,8 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -380,8 +439,8 @@ int dhcp_reply(struct dhcp_context *context,
p = option_put(p, end, OPTION_T1, 4, (expires_time/2)); p = option_put(p, end, OPTION_T1, 4, (expires_time/2));
p = option_put(p, end, OPTION_T2, 4, ((expires_time * 7)/8)); p = option_put(p, end, OPTION_T2, 4, ((expires_time * 7)/8));
} }
p = do_req_options(context, p, end, req_options, dhcp_opts, domain_suffix, p = do_req_options(context, p, end, req_options, daemon,
NULL, router, iface_addr, iface_mtu, netid); NULL, iface_addr, netid, subnet_addr);
p = option_end(p, end, mess); p = option_end(p, end, mess);
log_packet("OFFER" , &mess->yiaddr, mess->chaddr, iface_name, NULL); log_packet("OFFER" , &mess->yiaddr, mess->chaddr, iface_name, NULL);
...@@ -394,44 +453,51 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -394,44 +453,51 @@ int dhcp_reply(struct dhcp_context *context,
{ {
/* SELECTING or INIT_REBOOT */ /* SELECTING or INIT_REBOOT */
mess->yiaddr = option_addr(opt); mess->yiaddr = option_addr(opt);
/* The RFC says that this is already zero, but there exist
real-world counter examples. */
mess->ciaddr.s_addr = 0;
if ((opt = option_find(mess, sz, OPTION_SERVER_IDENTIFIER)) && if ((opt = option_find(mess, sz, OPTION_SERVER_IDENTIFIER)))
(iface_addr.s_addr != option_addr(opt).s_addr)) {
return 0; /* SELECTING */
if (iface_addr.s_addr != option_addr(opt).s_addr)
/* If a lease exists for this host and another address, squash it. */ return 0;
if (lease && lease->addr.s_addr != mess->yiaddr.s_addr)
/* If a lease exists for this host and another address, squash it. */
if (lease && lease->addr.s_addr != mess->yiaddr.s_addr)
{
lease_prune(lease, now);
lease = NULL;
}
if (!lease)
{
if (lease_find_by_addr(mess->yiaddr))
message = "address in use";
else if (!(lease = lease_allocate(clid, clid_len, mess->yiaddr)))
message = "no leases left";
}
}
else
{ {
lease_prune(lease, now); /* INIT-REBOOT */
lease = NULL; if (!lease)
return 0;
if (lease->addr.s_addr != mess->yiaddr.s_addr)
message = "wrong address";
} }
if (!lease)
{
if (lease_find_by_addr(mess->yiaddr))
message = "address in use";
else if (!(lease = lease_allocate(clid, clid_len, mess->yiaddr)))
message = "no leases left";
}
} }
else else
{ {
/* RENEWING or REBINDING */ /* RENEWING or REBINDING */
/* Must exist a lease for this address */ /* Must exist a lease for this address */
if (!mess->ciaddr.s_addr)
return 0;
mess->yiaddr = mess->ciaddr;
if (!lease || mess->ciaddr.s_addr != lease->addr.s_addr) if (!lease || mess->ciaddr.s_addr != lease->addr.s_addr)
message = "lease not found"; message = "lease not found";
/* desynchronise renewals */ /* desynchronise renewals */
fuzz = rand16(); fuzz = rand16();
while (fuzz > (renewal_time/16)) while (fuzz > (renewal_time/16))
fuzz = fuzz/2; fuzz = fuzz/2;
mess->yiaddr = mess->ciaddr;
} }
if (!message) if (!message)
...@@ -454,7 +520,7 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -454,7 +520,7 @@ int dhcp_reply(struct dhcp_context *context,
message = "static lease available"; message = "static lease available";
/* Check to see if the address is reserved as a static address for another host */ /* Check to see if the address is reserved as a static address for another host */
else if ((addr_config = config_find_by_address(dhcp_configs, mess->yiaddr)) && addr_config != config) else if ((addr_config = config_find_by_address(daemon->dhcp_conf, mess->yiaddr)) && addr_config != config)
message ="address reserved"; message ="address reserved";
} }
...@@ -464,8 +530,6 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -464,8 +530,6 @@ int dhcp_reply(struct dhcp_context *context,
{ {
log_packet("NAK", &mess->yiaddr, mess->chaddr, iface_name, message); log_packet("NAK", &mess->yiaddr, mess->chaddr, iface_name, message);
lease_prune(lease, now);
mess->siaddr.s_addr = mess->yiaddr.s_addr = mess->ciaddr.s_addr = 0; mess->siaddr.s_addr = mess->yiaddr.s_addr = mess->ciaddr.s_addr = 0;
bootp_option_put(mess, NULL, NULL); bootp_option_put(mess, NULL, NULL);
p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPNAK); p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPNAK);
...@@ -479,11 +543,11 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -479,11 +543,11 @@ int dhcp_reply(struct dhcp_context *context,
lease_set_hwaddr(lease, mess->chaddr); lease_set_hwaddr(lease, mess->chaddr);
if (hostname) if (hostname)
lease_set_hostname(lease, hostname, domain_suffix); lease_set_hostname(lease, hostname, daemon->domain_suffix);
lease_set_expires(lease, renewal_time == 0xffffffff ? 0 : now + (time_t)renewal_time); lease_set_expires(lease, renewal_time == 0xffffffff ? 0 : now + (time_t)renewal_time);
bootp_option_put(mess, dhcp_file, dhcp_sname); bootp_option_put(mess, daemon->dhcp_file, daemon->dhcp_sname);
mess->siaddr = dhcp_next_server.s_addr ? dhcp_next_server : iface_addr; mess->siaddr = daemon->dhcp_next_server.s_addr ? daemon->dhcp_next_server : iface_addr;
p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPACK); p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(iface_addr.s_addr)); p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(iface_addr.s_addr));
p = option_put(p, end, OPTION_LEASE_TIME, 4, renewal_time); p = option_put(p, end, OPTION_LEASE_TIME, 4, renewal_time);
...@@ -492,8 +556,8 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -492,8 +556,8 @@ int dhcp_reply(struct dhcp_context *context,
p = option_put(p, end, OPTION_T1, 4, (renewal_time/2) - fuzz); p = option_put(p, end, OPTION_T1, 4, (renewal_time/2) - fuzz);
p = option_put(p, end, OPTION_T2, 4, ((renewal_time * 7)/8) - fuzz); p = option_put(p, end, OPTION_T2, 4, ((renewal_time * 7)/8) - fuzz);
} }
p = do_req_options(context, p, end, req_options, dhcp_opts, domain_suffix, p = do_req_options(context, p, end, req_options, daemon,
hostname, router, iface_addr, iface_mtu, netid); hostname, iface_addr, netid, subnet_addr);
p = option_end(p, end, mess); p = option_end(p, end, mess);
return p - (unsigned char *)mess; return p - (unsigned char *)mess;
...@@ -508,8 +572,8 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -508,8 +572,8 @@ int dhcp_reply(struct dhcp_context *context,
p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPACK); p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(iface_addr.s_addr)); p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(iface_addr.s_addr));
p = do_req_options(context, p, end, req_options, dhcp_opts, domain_suffix, p = do_req_options(context, p, end, req_options, daemon,
hostname, router, iface_addr, iface_mtu, netid); hostname, iface_addr, netid, subnet_addr);
p = option_end(p, end, mess); p = option_end(p, end, mess);
log_packet("ACK", &mess->ciaddr, mess->chaddr, iface_name, hostname); log_packet("ACK", &mess->ciaddr, mess->chaddr, iface_name, hostname);
...@@ -521,8 +585,9 @@ int dhcp_reply(struct dhcp_context *context, ...@@ -521,8 +585,9 @@ int dhcp_reply(struct dhcp_context *context,
static void log_packet(char *type, struct in_addr *addr, unsigned char *hwaddr, char *interface, char *string) static void log_packet(char *type, struct in_addr *addr, unsigned char *hwaddr, char *interface, char *string)
{ {
syslog(LOG_INFO, "DHCP%s(%s)%s%s %.2x:%.2x:%.2x:%.2x:%.2x:%.2x%s%s", syslog(LOG_INFO, "%s%s(%s)%s%s %.2x:%.2x:%.2x:%.2x:%.2x:%.2x%s%s",
type, type ? "DHCP" : "BOOTP",
type ? type : "",
interface, interface,
addr ? " " : "", addr ? " " : "",
addr ? inet_ntoa(*addr) : "", addr ? inet_ntoa(*addr) : "",
...@@ -602,13 +667,16 @@ static unsigned char *option_end(unsigned char *p, unsigned char *end, struct dh ...@@ -602,13 +667,16 @@ static unsigned char *option_end(unsigned char *p, unsigned char *end, struct dh
static unsigned char *option_put_string(unsigned char *p, unsigned char *end, int opt, char *string) static unsigned char *option_put_string(unsigned char *p, unsigned char *end, int opt, char *string)
{ {
if (p + strlen(string) + 3 < end) int len = strlen(string);
if (p + len + 3 < end)
{ {
*(p++) = opt; *(p++) = opt;
*(p++) = strlen(string); *(p++) = len;
memcpy(p, string, strlen(string)); memcpy(p, string, len);
p += strlen(string); p += len;
} }
return p; return p;
} }
...@@ -653,7 +721,8 @@ static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_ty ...@@ -653,7 +721,8 @@ static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_ty
int overload = 0; int overload = 0;
unsigned char *ret; unsigned char *ret;
ret = option_find1(&mess->options[0], ((unsigned char *)mess) + size, opt_type, &overload); /* skip over DHCP cookie; */
ret = option_find1(&mess->options[0] + sizeof(u32), ((unsigned char *)mess) + size, opt_type, &overload);
if (!ret && (overload & 1)) if (!ret && (overload & 1))
ret = option_find1(&mess->file[0], &mess->file[128], opt_type, &overload); ret = option_find1(&mess->file[0], &mess->file[128], opt_type, &overload);
...@@ -704,39 +773,46 @@ static struct dhcp_opt *option_find2(struct dhcp_netid *netid, struct dhcp_opt * ...@@ -704,39 +773,46 @@ static struct dhcp_opt *option_find2(struct dhcp_netid *netid, struct dhcp_opt *
static unsigned char *do_req_options(struct dhcp_context *context, static unsigned char *do_req_options(struct dhcp_context *context,
unsigned char *p, unsigned char *end, unsigned char *p, unsigned char *end,
unsigned char *req_options, unsigned char *req_options,
struct dhcp_opt *config_opts, struct daemon *daemon,
char *domainname, char *hostname, char *hostname,
struct in_addr router,
struct in_addr iface_addr, struct in_addr iface_addr,
int iface_mtu, struct dhcp_netid *netid) struct dhcp_netid *netid,
struct in_addr subnet_addr)
{ {
struct dhcp_opt *opt; struct dhcp_opt *opt, *config_opts = daemon->dhcp_opts;
if (in_list(req_options, OPTION_MAXMESSAGE)) if (in_list(req_options, OPTION_MAXMESSAGE))
p = option_put(p, end, OPTION_MAXMESSAGE, 2, p = option_put(p, end, OPTION_MAXMESSAGE, 2, end - (unsigned char *)daemon->dhcp_packet);
DNSMASQ_PACKETSZ > iface_mtu ?
iface_mtu : DNSMASQ_PACKETSZ);
/* rfc3011 says this doesn't need to be in the requested options list. */
if (subnet_addr.s_addr)
p = option_put(p, end, OPTION_SUBNET_SELECT, INADDRSZ, ntohl(subnet_addr.s_addr));
if (in_list(req_options, OPTION_NETMASK) && if (in_list(req_options, OPTION_NETMASK) &&
!option_find2(netid, config_opts, OPTION_NETMASK)) !option_find2(netid, config_opts, OPTION_NETMASK))
p = option_put(p, end, OPTION_NETMASK, INADDRSZ, ntohl(context->netmask.s_addr)); p = option_put(p, end, OPTION_NETMASK, INADDRSZ, ntohl(context->netmask.s_addr));
if (in_list(req_options, OPTION_BROADCAST) && /* May not have a "guessed" broadcast address if we got no packets via a relay
from this net yet (ie just unicast renewals after a restart */
if (context->broadcast.s_addr &&
in_list(req_options, OPTION_BROADCAST) &&
!option_find2(netid, config_opts, OPTION_BROADCAST)) !option_find2(netid, config_opts, OPTION_BROADCAST))
p = option_put(p, end, OPTION_BROADCAST, INADDRSZ, ntohl(context->broadcast.s_addr)); p = option_put(p, end, OPTION_BROADCAST, INADDRSZ, ntohl(context->broadcast.s_addr));
if (in_list(req_options, OPTION_ROUTER) && /* Same comments as broadcast apply, and also may not be able to get a sensible
default when using subnet select. User must configure by steam in that case. */
if (context->router.s_addr &&
in_list(req_options, OPTION_ROUTER) &&
!option_find2(netid, config_opts, OPTION_ROUTER)) !option_find2(netid, config_opts, OPTION_ROUTER))
p = option_put(p, end, OPTION_ROUTER, INADDRSZ, p = option_put(p, end, OPTION_ROUTER, INADDRSZ, ntohl(context->router.s_addr));
ntohl(router.s_addr));
if (in_list(req_options, OPTION_DNSSERVER) && if (in_list(req_options, OPTION_DNSSERVER) &&
!option_find2(netid, config_opts, OPTION_DNSSERVER)) !option_find2(netid, config_opts, OPTION_DNSSERVER))
p = option_put(p, end, OPTION_DNSSERVER, INADDRSZ, ntohl(iface_addr.s_addr)); p = option_put(p, end, OPTION_DNSSERVER, INADDRSZ, ntohl(iface_addr.s_addr));
if (domainname && in_list(req_options, OPTION_DOMAINNAME) && if (daemon->domain_suffix && in_list(req_options, OPTION_DOMAINNAME) &&
!option_find2(netid, config_opts, OPTION_DOMAINNAME)) !option_find2(netid, config_opts, OPTION_DOMAINNAME))
p = option_put_string(p, end, OPTION_DOMAINNAME, domainname); p = option_put_string(p, end, OPTION_DOMAINNAME, daemon->domain_suffix);
/* Note that we ignore attempts to set the hostname using /* Note that we ignore attempts to set the hostname using
--dhcp-option=12,<name> */ --dhcp-option=12,<name> */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment