Compare commits

...
9 Commits
22 changed files with 3011 additions and 1571 deletions

No files matched your search

+204
View File
@@ -1123,4 +1123,208 @@ release 2.10
support was added. Thanks to Michael Hamilton for support was added. Thanks to Michael Hamilton for
assistance with this. assistance with this.
version 2.11
Fixed DHCP problem which could result in two leases in the
database with the same address. This looked much more
alarming then it was, since it could only happen when a
machine changes MAC address but kept the same name. The
old lease would persist until it timed out but things
would still work OK.
Check that IP addresses in all dhcp-host directives are
unique and die horribly if they are not, since otherwise
endless protocol loops can occur.
Use IPV6_RECVPKTINFO as socket option rather than
IPV6_PKTINFO where available. This keeps late-model FreeBSD
happy.
Set source interface when replying to IPv6 UDP
queries. This is needed to cope with link-local addresses.
version 2.12
Added extra checks to ensure that DHCP created DNS entries
cannot generate multiple DNS address->name entries. Thanks to
Stefan Monnier for finding the exact set of configuration
options which could create this.
Don't set the the filterwin2k option in the example config
file and add warnings that is breaks Kerberos. Thanks to
Simon Josefsson and Timothy Folks for pointing that out.
Log types of incoming queries as well as source and domain.
Log NODATA replies generated as a result of the
filterwin2k option.
version 2.13
Fixed crash with un-named DHCP hosts introduced in 2.12.
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.
version 2.15
Fixed NXDOMAIN/NODATA confusion for locally known
names. We now return a NODATA reponse for names which are
locally known. Now a query for (eg AAAA or MX) for a name
with an IPv4 address in /etc/hosts which fails upstream
will generate a NODATA response. Note that the query
is still tried upstream, but a NXDOMAIN reply gets
converted to NODATA. Thanks to Eric de Thouars, Eric
Spakman and Mike Mestnik for bug reports/testing.
Allow multiple dhcp-ranges within the same network. The
original intention was that there would be a dhcp-range
option for each network served, but there's no real reason
not to allow discontinuous ranges within a network so this
release adds support for that.
Check for dhcp-ranges which are inconsistent with their
netmask, and generate errors or warnings.
Improve error messages when there are problems with
configuration.
version 2.16
Fixed typo in OpenBSD-only code which stopped compilation
under that OS. Chris Weinhaupl gets credit for reporting
this.
Added dhcp-authoritative option which restores non-RFC
compliant but desirable behaviour of pre-2.14 versions and
avoids long timeouts while DHCP clients try to renew leases
which are unknown to dnsmasq. Thanks to John Mastwijk for
help with this.
Added support to the DHCP option code to allow RFC-3397
domain search DHCP option (119) to be sent.
Set NONBLOCK on all listening sockets to workaround non-POSIX
compliance in Linux 2.4 and 2.6. This fixes rare hangs which
occured when corrupted packets were received. Thanks to
Joris van Rantwijk for chasing that down.
Updated config.h for NetBSD. Thanks to Martin Lambers.
Do a better job of distinguishing between retransmissions
and new queries when forwarding. This fixes a bug
triggered by the polipo web cache which sends A and AAAA
queries both with the same transaction-ID. Thanks to
Joachim Berdal Haga and Juliusz Chroboczek for help with this.
Rewrote cache code to store CNAMES, rather then chasing
them before storage. This eliminates bad situations when
clients get inconsistent views depending on if data comes
from the cache.
Allow for more than one --addn-hosts flag.
Clarify logged message when a DHCP lease clashes with an
/etc/hosts entry. Thanks to Mat Swift for the suggestion.
Added dynamic-dnsmasq from Peter Willis to the contrib
section.
version 2.17
Correctly deduce the size of numeric dhcp-options, rather
than making wild guesses. Also cope with negative values.
Fixed use of C library reserved symbol "index" which broke
under certain combinations of library and compiler.
Make bind-interfaces work for IPv6 interfaces too.
Warn if an interface is given for listening which doesn't
currently exist when not in bind-interfaces mode. (This is
already a fatal error when bind-interfaces is set.)
Allow the --interface and --except-interface options to
take a comma-seperated list of interfaces.
Tweak --dhcp-userclass matching code to work with the
ISC dhclient which violates RFC3004 unless its
configuration is very warped. Thanks to Cedric Duval for
the bug report.
Allow more than one network-id tag in a dhcp-option. All
the tags must match to enable the option.
Added dhcp-ignore option to disable classes of hosts based
on network-id tags. Also allow BOOTP options to be
controlled by network tags.
Fill in sname, file and siaddr fields in replies to
DHCPINFORM messages.
Don't send NAK replies to DHCPREQUEST packets for disabled
clients. Credit to Cedric Duval for spotting this.
Fix rare crash associated with long DNS names and CNAME
records. Thanks to Holger Hoffstatte and especially Steve
Grecni for help chasing that one down.
version 2.18
Reworked the Linux interface discovery code (again) to
cope with interfaces which have only IPv6 addresses and
interfaces with more than one IPv6 address. Thanks to
Martin Pels for help with that.
Fix problems which occured when more than one dhcp-range
was specified in the same subnet: sometimes parameters
(lease time, network-id tag) from the wrong one would be
used. Thanks to Rory Campbell-Lange for the bug report.
Reset cache statistics when clearing the cache.
Enable long command line options on FreeBSD when the
C library supports them.
version 2.19
Tweaked the Linux-only interface discovery code to cope
with interface-indexes larger than 8 bits in
/proc/net/if_inet6. This only affects Linux, obviously.
Thanks to Richard Atterer for the bug report.
Check for under-length option fields in DHCP packets, a
zero length client-id, in particluar, could seriously
confuse dnsmasq 'till now. Thanks to Will Murname for help
with that.
If a DHCP-allocated address has an associated name in
/etc/hosts, and the client does not provide a hostname
parameter and there is no hostname in a matching dhcp-host
option, send the /etc/hosts name as the hostname in
the DHCP lease. Thanks to Will Murname for the suggestion.
+51 -2
View File
@@ -115,7 +115,7 @@ A: Resolver code sometime does strange things when given names without
--expand-hosts and --domain-suffix options. --expand-hosts and --domain-suffix options.
Q: Can I get dnsmasq to save the contents of its cache to disk when Q: Can I get dnsmasq to save the contents of its cache to disk when
I shut my machine down and re-load when it starts again. I shut my machine down and re-load when it starts again?
A: No, that facility is not provided. Very few names in the DNS have A: No, that facility is not provided. Very few names in the DNS have
their time-to-live set for longer than a few hours so most of the their time-to-live set for longer than a few hours so most of the
@@ -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
@@ -268,4 +269,52 @@ A: The DNS spec says that the reply to a DNS query must come from the
(address,port) pair when dnsmasq has bound (wildcard,port), hence (address,port) pair when dnsmasq has bound (wildcard,port), hence
the ability to explicitly turn off wildcard binding. the ability to explicitly turn off wildcard binding.
Q: Why doesn't Kerberos work/why can't I get sensible answers to
queries for SRV records.
A: Probably because you have the "filterwin2k" option set. Note that
it was on by default in example configuration files included in
versions before 2.12, so you might have it set on without
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.
Q: What does the dhcp-authoritative option do?
A: See http://www.isc.org/index.pl?/sw/dhcp/authoritative.php - that's
for the ISC daemon, but the same applies to dnsmasq.
Q: Why does my Gentoo box pause for a minute before getting a new
lease?
A: Because when a Gentoo box shuts down, it releases its lease with
the server but remembers it on the client; this seems to be a
Gentoo-specific patch to dhcpcd. On restart it tries to renew
a lease which is long gone, as far as dnsmasq is concerned, and
dnsmasq ignores it until is times out and restarts the process.
To fix this, set the dhcp-authoritative flag in dnsmasq.
Q: My laptop has two network interfaces, a wired one and a wireless
one. I never use both interfaces at the same time, and I'd like the
same IP and configuration to be used irrespcetive of which
interface is in use. How can I do that.
A: By default, the identity of a machine is determined by using the
MAC address, which is associated with interface hardware. Once an
IP is bound to the MAC address of one interface, it cannot be
associated with another MAC address until after the DHCP lease
expires. The solution to this is to use a client-id as the machine
identity rather than the MAC address. If you arrange for the same
client-id to sent when either interface is in use, the DHCP server
will recognise the same machine, and use the same address. The
method for setting the client-id varies with DHCP client software,
dhcpcd uses the "-I" flag. Windows uses a registry setting,
see http://www.jsiinc.com/SUBF/TIP2800/rh2845.htm
+249
View File
@@ -0,0 +1,249 @@
#!/usr/bin/perl
# dynamic-dnsmasq.pl - update dnsmasq's internal dns entries dynamically
# Copyright (C) 2004 Peter Willis
#
# 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
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# the purpose of this script is to be able to update dnsmasq's dns
# records from a remote dynamic dns client.
#
# basic use of this script:
# dynamic-dnsmasq.pl add testaccount 1234 testaccount.mydomain.com
# dynamic-dnsmasq.pl listen &
#
# this script tries to emulate DynDNS.org's dynamic dns service, so
# technically you should be able to use any DynDNS.org client to
# update the records here. tested and confirmed to work with ddnsu
# 1.3.1. just point the client's host to the IP of this machine,
# port 9020, and include the hostname, user and pass, and it should
# work.
#
# make sure "addn-hosts=/etc/dyndns-hosts" is in your /etc/dnsmasq.conf
# file and "nopoll" is commented out.
use strict;
use IO::Socket;
use MIME::Base64;
use DB_File;
use Fcntl;
my $accountdb = "accounts.db";
my $recordfile = "/etc/dyndns-hosts";
my $dnsmasqpidfile = "/var/run/dnsmasq.pid"; # if this doesn't exist, will look for process in /proc
my $listenaddress = "0.0.0.0";
my $listenport = 9020;
# no editing past this point should be necessary
if ( @ARGV < 1 ) {
die "Usage: $0 ADD|DEL|LISTUSERS|WRITEHOSTSFILE|LISTEN\n";
} elsif ( lc $ARGV[0] eq "add" ) {
die "Usage: $0 ADD USER PASS HOSTNAME\n" unless @ARGV == 4;
add_acct($ARGV[1], $ARGV[2], $ARGV[3]);
} elsif ( lc $ARGV[0] eq "del" ) {
die "Usage: $0 DEL USER\n" unless @ARGV == 2;
print "Are you sure you want to delete user \"$ARGV[1]\"? [N/y] ";
my $resp = <STDIN>;
chomp $resp;
if ( lc substr($resp,0,1) eq "y" ) {
del_acct($ARGV[1]);
}
} elsif ( lc $ARGV[0] eq "listusers" or lc $ARGV[0] eq "writehostsfile" ) {
my $X = tie my %h, "DB_File", $accountdb, O_RDWR|O_CREAT, 0600, $DB_HASH;
my $fh;
if ( lc $ARGV[0] eq "writehostsfile" ) {
open($fh, ">$recordfile") || die "Couldn't open recordfile \"$recordfile\": $!\n";
flock($fh, 2);
seek($fh, 0, 0);
truncate($fh, 0);
}
while ( my ($key, $val) = each %h ) {
my ($pass, $domain, $ip) = split("\t",$val);
if ( lc $ARGV[0] eq "listusers" ) {
print "user $key, hostname $domain, ip $ip\n";
} else {
if ( defined $ip ) {
print $fh "$ip\t$domain\n";
}
}
}
if ( lc $ARGV[0] eq "writehostsfile" ) {
flock($fh, 8);
close($fh);
dnsmasq_rescan_configs();
}
undef $X;
untie %h;
} elsif ( lc $ARGV[0] eq "listen" ) {
listen_for_updates();
}
sub listen_for_updates {
my $sock = IO::Socket::INET->new(Listen => 5,
LocalAddr => $listenaddress, LocalPort => $listenport,
Proto => 'tcp', ReuseAddr => 1,
MultiHomed => 1) || die "Could not open listening socket: $!\n";
$SIG{'CHLD'} = 'IGNORE';
while ( my $client = $sock->accept() ) {
my $p = fork();
if ( $p != 0 ) {
next;
}
$SIG{'CHLD'} = 'DEFAULT';
my @headers;
my %cgi;
while ( <$client> ) {
s/(\r|\n)//g;
last if $_ eq "";
push @headers, $_;
}
foreach my $header (@headers) {
if ( $header =~ /^GET \/nic\/update\?([^\s].+) HTTP\/1\.[01]$/ ) {
foreach my $element (split('&', $1)) {
$cgi{(split '=', $element)[0]} = (split '=', $element)[1];
}
} elsif ( $header =~ /^Authorization: basic (.+)$/ ) {
unless ( defined $cgi{'hostname'} ) {
print_http_response($client, undef, "badsys");
exit(1);
}
if ( !exists $cgi{'myip'} ) {
$cgi{'myip'} = $client->peerhost();
}
my ($user,$pass) = split ":", MIME::Base64::decode($1);
if ( authorize($user, $pass, $cgi{'hostname'}, $cgi{'myip'}) == 0 ) {
print_http_response($client, $cgi{'myip'}, "good");
update_dns(\%cgi);
} else {
print_http_response($client, undef, "badauth");
exit(1);
}
last;
}
}
exit(0);
}
return(0);
}
sub add_acct {
my ($user, $pass, $hostname) = @_;
my $X = tie my %h, "DB_File", $accountdb, O_RDWR|O_CREAT, 0600, $DB_HASH;
$X->put($user, join("\t", ($pass, $hostname)));
undef $X;
untie %h;
}
sub del_acct {
my ($user, $pass, $hostname) = @_;
my $X = tie my %h, "DB_File", $accountdb, O_RDWR|O_CREAT, 0600, $DB_HASH;
$X->del($user);
undef $X;
untie %h;
}
sub authorize {
my $user = shift;
my $pass = shift;
my $hostname = shift;
my $ip = shift;;
my $X = tie my %h, "DB_File", $accountdb, O_RDWR|O_CREAT, 0600, $DB_HASH;
my ($spass, $shost) = split("\t", $h{$user});
if ( defined $h{$user} and ($spass eq $pass) and ($shost eq $hostname) ) {
$X->put($user, join("\t", $spass, $shost, $ip));
undef $X;
untie %h;
return(0);
}
undef $X;
untie %h;
return(1);
}
sub print_http_response {
my $sock = shift;
my $ip = shift;
my $response = shift;
print $sock "HTTP/1.0 200 OK\n";
my @tmp = split /\s+/, scalar gmtime();
print $sock "Date: $tmp[0], $tmp[2] $tmp[1] $tmp[4] $tmp[3] GMT\n";
print $sock "Server: Peter's Fake DynDNS.org Server/1.0\n";
print $sock "Content-Type: text/plain; charset=ISO-8859-1\n";
print $sock "Connection: close\n";
print $sock "Transfer-Encoding: chunked\n";
print $sock "\n";
#print $sock "12\n"; # this was part of the dyndns response but i'm not sure what it is
print $sock "$response", defined($ip)? " $ip" : "" . "\n";
}
sub update_dns {
my $hashref = shift;
my @records;
my $found = 0;
# update the addn-hosts file
open(FILE, "+<$recordfile") || die "Couldn't open recordfile \"$recordfile\": $!\n";
flock(FILE, 2);
while ( <FILE> ) {
if ( /^(\d+\.\d+\.\d+\.\d+)\s+$$hashref{'hostname'}\n$/si ) {
if ( $1 ne $$hashref{'myip'} ) {
push @records, "$$hashref{'myip'}\t$$hashref{'hostname'}\n";
$found = 1;
}
} else {
push @records, $_;
}
}
unless ( $found ) {
push @records, "$$hashref{'myip'}\t$$hashref{'hostname'}\n";
}
sysseek(FILE, 0, 0);
truncate(FILE, 0);
syswrite(FILE, join("", @records));
flock(FILE, 8);
close(FILE);
dnsmasq_rescan_configs();
return(0);
}
sub dnsmasq_rescan_configs {
# send the HUP signal to dnsmasq
if ( -r $dnsmasqpidfile ) {
open(PID,"<$dnsmasqpidfile") || die "Could not open PID file \"$dnsmasqpidfile\": $!\n";
my $pid = <PID>;
close(PID);
chomp $pid;
if ( kill(0, $pid) ) {
kill(1, $pid);
} else {
goto LOOKFORDNSMASQ;
}
} else {
LOOKFORDNSMASQ:
opendir(DIR,"/proc") || die "Couldn't opendir /proc: $!\n";
my @dirs = grep(/^\d+$/, readdir(DIR));
closedir(DIR);
foreach my $process (@dirs) {
if ( open(FILE,"</proc/$process/cmdline") ) {
my $cmdline = <FILE>;
close(FILE);
if ( (split(/\0/,$cmdline))[0] =~ /dnsmasq/ ) {
kill(1, $process);
}
}
}
}
return(0);
}
+1 -1
View File
@@ -5,7 +5,7 @@
############################################################################### ###############################################################################
Name: dnsmasq Name: dnsmasq
Version: 2.10 Version: 2.19
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
+2 -1
View File
@@ -5,7 +5,7 @@
############################################################################### ###############################################################################
Name: dnsmasq Name: dnsmasq
Version: 2.10 Version: 2.19
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: Productivity/Networking/DNS/Servers Group: Productivity/Networking/DNS/Servers
@@ -103,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 rpm/README.susefirewall %doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 rpm/README.susefirewall
%doc contrib
%config /etc/init.d/dnsmasq %config /etc/init.d/dnsmasq
%config /etc/dnsmasq.conf %config /etc/dnsmasq.conf
/usr/sbin/rcdnsmasq /usr/sbin/rcdnsmasq
+94 -27
View File
@@ -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
@@ -33,8 +34,8 @@ Don't read the hostnames in /etc/hosts.
.TP .TP
.B \-H, --addn-hosts=<file> .B \-H, --addn-hosts=<file>
Additional hosts file. Read the specified file as well as /etc/hosts. If -h is given, read Additional hosts file. Read the specified file as well as /etc/hosts. If -h is given, read
only the specified file. At most one additional hosts file may be only the specified file. This option may be repeated for more than one
given. additional hosts file.
.TP .TP
.B \-T, --local-ttl=<time> .B \-T, --local-ttl=<time>
When replying with information from /etc/hosts or the DHCP leases When replying with information from /etc/hosts or the DHCP leases
@@ -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.
@@ -360,7 +366,7 @@ have exactly the same effect as
.B --dhcp-host .B --dhcp-host
options containing the same information. options containing the same information.
.TP .TP
.B \-O, --dhcp-option=[network-id,]<opt>,[<value>[,<value>]] .B \-O, --dhcp-option=[<network-id>,[<network-id>,]]<opt>,[<value>[,<value>]]
Specfify different or extra options to DHCP clients. By default, Specfify different or extra options to DHCP clients. By default,
dnsmasq sends some standard options to DHCP clients, the netmask and dnsmasq sends some standard options to DHCP clients, the netmask and
broadcast address are set to the same as the host running dnsmasq, and broadcast address are set to the same as the host running dnsmasq, and
@@ -376,12 +382,10 @@ and to set the time-server address to 192.168.0.4, do
The special address 0.0.0.0 is taken to mean "the address of the The special address 0.0.0.0 is taken to mean "the address of the
machine running dnsmasq". Data types allowed are comma seperated machine running dnsmasq". Data types allowed are comma seperated
dotted-quad IP addresses, a decimal number, colon-seperated hex digits dotted-quad IP addresses, a decimal number, colon-seperated hex digits
and a text string. If the optional network-id is given then and a text string. If the optional network-ids are given then
this option is only sent to machines on the network whose dhcp-range this option is only sent when all the network-ids are matched.
contains a matching network-id.
Be careful: no checking is done that the correct type of data for the Be careful: no checking is done that the correct type of data for the
option number is sent, and there are option numbers for which it is not option number is sent, it is quite possible to
possible to generate the correct data type; it is quite possible to
persuade dnsmasq to generate illegal DHCP packets with injudicious use persuade dnsmasq to generate illegal DHCP packets with injudicious use
of this flag. of this flag.
.TP .TP
@@ -406,10 +410,17 @@ to different classes of hosts. It is possible, for instance to use
this to set a different printer server for hosts in the class this to set a different printer server for hosts in the class
"accounts" than for hosts in the class "engineering". "accounts" than for hosts in the class "engineering".
.TP .TP
.B \-M, --dhcp-boot=<filename>,[<servername>[,<server address>]] .B \ -J, --dhcp-ignore=<network-id>[,<network-id>]
When all the given network-ids match the set of network-ids derived
from the net, host, vendor and user classes, ignore the host and do
not allocate it a DHCP lease.
.TP
.B \-M, --dhcp-boot=[net:<network-id>,]<filename>,[<servername>[,<server address>]]
Set BOOTP options to be returned by the DHCP server. These are needed Set BOOTP options to be returned by the DHCP server. These are needed
for machines which network boot, and tell the machine where to collect for machines which network boot, and tell the machine where to collect
its initial configuration. its initial configuration. If the optional network-id(s) are given,
they must match for this configuration to be sent. Note that
network-ids are prefixed by "net:" to distinguish them.
.TP .TP
.B \-X, --dhcp-lease-max=<number> .B \-X, --dhcp-lease-max=<number>
Limits dnsmasq to the specified maximum number of DHCP leases. The Limits dnsmasq to the specified maximum number of DHCP leases. The
@@ -417,6 +428,12 @@ default is 150. This limit is to prevent DoS attacks from hosts which
create thousands of leases and use lots of memory in the dnsmasq create thousands of leases and use lots of memory in the dnsmasq
process. process.
.TP .TP
.B \-K, --dhcp-authoritative
Should be set when dnsmasq is definatively the only DHCP server on a network.
It changes the behaviour from strict RFC compliance so that DHCP requests on
unknown leases from unknown hosts are not ignored. This allows new hosts
to get a lease without a tedious timeout under all circumstances.
.TP
.B \-l, --dhcp-leasefile=<path> .B \-l, --dhcp-leasefile=<path>
Use the specified file to store DHCP lease information. If this option Use the specified file to store DHCP lease information. If this option
is given but no dhcp-range option is given then dnsmasq version 1 is given but no dhcp-range option is given then dnsmasq version 1
@@ -441,8 +458,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 +474,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 +497,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 +544,37 @@ 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 network-id system works as follows: For each DHCP request, dnsmasq
collects a set of valid network-id tags, one from the
.B dhcp-range
used to allocate the address, one from any matching
.B dhcp-host
and possibly many from matching vendor classes and user
classes sent by the DHCP client. Any
.B dhcp-option
which has network-id tags will be used in preference to an untagged
.B dhcp-option,
provided that _all_ the tags match somewhere in the
set collected as described above. The prefix '#' on a tag means 'not'
so --dhcp=option=#purple,3,1.2.3.4 sends the option when the
network-id tag purple is not in the set of valid tags.
.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 +584,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
+21 -5
View File
@@ -12,7 +12,7 @@
#selfmx #selfmx
#localmx #localmx
# The following three options make you a better netizen, since they # The following two options make you a better netizen, since they
# tell dnsmasq to filter out queries which the public DNS cannot # tell dnsmasq to filter out queries which the public DNS cannot
# answer, and which load the servers (especially the root servers) # answer, and which load the servers (especially the root servers)
# uneccessarily. If you have a dial-on-demand link they also stop # uneccessarily. If you have a dial-on-demand link they also stop
@@ -20,13 +20,16 @@
# Never forward plain names (with a dot or domain part) # Never forward plain names (with a dot or domain part)
domain-needed domain-needed
# Reply to reverse queries for addresses in the non-routed address # Never forward addresses in the non-routed address spaces.
# space with the dotted.quad address
bogus-priv bogus-priv
# Filter useless windows-originated DNS requests
filterwin2k
# Uncomment this to filter useless windows-originated DNS requests
# which can trigger dial-on-demand links needlessly.
# Note that (amongst other things) this blocks all SRV requests,
# so don't use it if you use eg Kerberos.
#filterwin2k
# Change this line if you want dns to get its upstream servers from # Change this line if you want dns to get its upstream servers from
# somewhere other that /etc/resolv.conf # somewhere other that /etc/resolv.conf
#resolv-file= #resolv-file=
@@ -235,6 +238,9 @@ filterwin2k
#dhcp-option=46,8 # netbios node type #dhcp-option=46,8 # netbios node type
#dhcp-option=47 # empty netbios scope. #dhcp-option=47 # empty netbios scope.
# Send RFC-3397 DNS domain search DHCP option. WARNING: Your DHCP client
# probably doesn't support this......
#dhcp-option=119,eng.apple.com,marketing.apple.com
# Set the boot filename and tftpd server name and address # Set the boot filename and tftpd server name and address
# for BOOTP. You will only need this is you want to # for BOOTP. You will only need this is you want to
@@ -249,6 +255,16 @@ filterwin2k
# the line below. # the line below.
#dhcp-leasefile=/var/lib/misc/dnsmasq.leases #dhcp-leasefile=/var/lib/misc/dnsmasq.leases
# Set the DHCP server to authoritative mode. In this mode it will barge in
# and take over the lease for any client which broadcasts on the network,
# whether it has a record of the lease or not. This avoids long timeouts
# when a machine wakes up on a new network. DO NOT enable this if there's
# the slighest chance that you might end up accidentally configuring a DHCP
# server for your campus/company accidentally. The ISC server uses the same
# the same option, and this URL provides more information:
# http://www.isc.org/index.pl?/sw/dhcp/authoritative.php
#dhcp-authoritative
# Set the cachesize here. # Set the cachesize here.
#cache-size=150 #cache-size=150
+23 -23
View File
@@ -23,7 +23,8 @@ Mac OS X.
Dnsmasq is included in at least the following Linux distributions: Dnsmasq is included in at least the following Linux distributions:
Gentoo, Debian, Slackware, Suse, Gentoo, Debian, Slackware, Suse,
Smoothwall, IP-Cop, floppyfw, Firebox, LEAF, Freesco, CoyoteLinux and Smoothwall, IP-Cop, floppyfw, Firebox, LEAF, Freesco, CoyoteLinux and
Clarkconnect. It is also available as a FreeBSD port and is used in Linksys wireless routers. Clarkconnect. It is also available as a FreeBSD port and is used in
Linksys wireless routers and the m0n0wall project.
<P> <P>
Dnsmasq provides the following features: Dnsmasq provides the following features:
<DIR> <DIR>
@@ -41,22 +42,18 @@ machine: If the names of local machines are there, then they can all
be addressed without having to maintain /etc/hosts on each machine. be addressed without having to maintain /etc/hosts on each machine.
</LI> </LI>
<LI> <LI>
Dnsmasq will serve names from the DHCP leases file on the firewall machine: The integrated DHCP server supports static and dynamic DHCP leases and
If machines specify a hostname when they take out a DHCP lease, then they are multiple networks and IP ranges. It works across BOOTP relays and
addressable in the local DNS. <B>UPDATE</B> Dnsmasq version 2 now offers an integrated DHCP server supports DHCP options including RFC3397 DNS search lists.
instead of the lease file reader. This gives better control of the Machines which are configured by DHCP have their names automatically
interaction with new functions (for example fixed IP leasess and included in the DNS and the names can specified by each machine or
attaching names to ethernet addresses centrally) it's also much centrally by associating a name with a MAC address in the dnsmasq
smaller than dnsmasq and ISC dhcpd which is important for router distros. config file.
</LI> </LI>
<LI> <LI>
Dnsmasq caches internet addresses (A records and AAAA records) and address-to-name Dnsmasq caches internet addresses (A records and AAAA records) and address-to-name
mappings (PTR records), reducing the load on upstream servers and mappings (PTR records), reducing the load on upstream servers and
improving performance (especially on modem connections). From version improving performance (especially on modem connections).
0.95 the cache honours time-to-live information and removes old
records as they expire. From version 0.996 dnsmasq does negative
caching. From version 1.2 dnsmasq supports IPv6 addresses, both
in its cache and in /etc/hosts.
</LI> </LI>
<LI> <LI>
Dnsmasq can be configured to automatically pick up the addresses of Dnsmasq can be configured to automatically pick up the addresses of
@@ -76,14 +73,8 @@ upstream servers handling only those domains. This makes integration
with private DNS systems easy. with private DNS systems easy.
</LI> </LI>
<LI> <LI>
Dnsmasq can be configured to return an MX record Dnsmasq supports MX records and can be configured to return MX records
for the firewall host. This makes it easy to configure the mailer on the local for any or all local machines.
machines to forward all mail to the central mailer on the firewall host. Never
lose root messages from your machines again!
</LI>
<LI>
For version 1.15 dnsmasq has a facility to work around Verisign's infamous wildcard A record
in the .com and .net TLDs
</LI> </LI>
</DIR> </DIR>
@@ -112,13 +103,22 @@ bzip2 dnsmasq-zzz.tar
</PRE> </PRE>
<H2>Links.</H2> <H2>Links.</H2>
Ulrich Ivens has a nice HOWTO in German on installing dnsmasq at <A HREF="http://howto.linux-hardware-shop.de/dnsmasq.html">http://howto.linux-hardware-shop.de/dnsmasq.html</A> Ulrich Ivens has a nice HOWTO in German on installing dnsmasq at <A
HREF="http://howto.linux-hardware-shop.de/dnsmasq.html">http://howto.linux-hardware-shop.de/dnsmasq.html</A>
and Damien Raude-Morvan has one in French at <A HREF="http://www.drazzib.com/docs-dnsmasq.html">http://www.drazzib.com/docs-dnsmasq.html</A>
There is a good article about dnsmasq at <A
HREF="http://www.enterprisenetworkingplanet.com/netos/article.php/3377351">http://www.enterprisenetworkingplanet.com/netos/article.php/3377351</A>
<H2>License.</H2> <H2>License.</H2>
Dnsmasq is distributed under the GPL. See the file COPYING in the distribution Dnsmasq is distributed under the GPL. See the file COPYING in the distribution
for details. for details.
<H2>Contact.</H2> <H2>Contact.</H2>
Dnsmasq was written by Simon Kelley. You can contact me at <A HREF="mailto:simon@thekelleys.org.uk">simon@thekelleys.org.uk</A>. Bugreports, patches, and suggestions for improvements gratefully accepted. There is a dnsmasq mailing list at <A
HREF="http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss">
http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss</A> which should be the
first location for queries, bugreports, suggestions etc.
Dnsmasq was written by Simon Kelley. You can contact me at <A
HREF="mailto:simon@thekelleys.org.uk">simon@thekelleys.org.uk</A>.
</BODY> </BODY>
+10 -10
View File
@@ -1,6 +1,6 @@
--- dnsmasq.8 2004-06-21 21:55:47.000000000 +0200 --- dnsmasq.8 2004-08-08 20:57:56.000000000 +0200
+++ dnsmasq.8 2004-06-22 23:30:18.000000000 +0200 +++ dnsmasq.8 2004-08-12 00:40:01.000000000 +0200
@@ -63,7 +63,7 @@ @@ -69,7 +69,7 @@
.TP .TP
.B \-g, --group=<groupname> .B \-g, --group=<groupname>
Specify the group which dnsmasq will run Specify the group which dnsmasq will run
@@ -9,9 +9,9 @@
/etc/ppp/resolv.conf which is not normally world readable. /etc/ppp/resolv.conf which is not normally world readable.
.TP .TP
.B \-v, --version .B \-v, --version
--- dnsmasq.conf.example 2004-05-26 12:59:56.000000000 +0200 --- dnsmasq.conf.example 2004-08-08 21:18:26.000000000 +0200
+++ dnsmasq.conf.example 2004-06-22 23:32:36.000000000 +0200 +++ dnsmasq.conf.example 2004-08-12 00:40:01.000000000 +0200
@@ -62,7 +62,7 @@ @@ -65,7 +65,7 @@
# You no longer (as of version 1.7) need to set these to enable # You no longer (as of version 1.7) need to set these to enable
# dnsmasq to read /etc/ppp/resolv.conf since dnsmasq now uses the # dnsmasq to read /etc/ppp/resolv.conf since dnsmasq now uses the
@@ -20,9 +20,9 @@
#user= #user=
#group= #group=
--- src/config.h 2004-06-22 21:14:50.000000000 +0200 --- src/config.h 2004-08-11 11:39:18.000000000 +0200
+++ src/config.h 2004-06-22 23:31:46.000000000 +0200 +++ src/config.h 2004-08-12 00:40:01.000000000 +0200
@@ -38,7 +38,7 @@ @@ -44,7 +44,7 @@
#endif #endif
#define DEFLEASE 3600 /* default lease time, 1 hour */ #define DEFLEASE 3600 /* default lease time, 1 hour */
#define CHUSER "nobody" #define CHUSER "nobody"
@@ -31,7 +31,7 @@
#define IP6INTERFACES "/proc/net/if_inet6" #define IP6INTERFACES "/proc/net/if_inet6"
#define UPTIME "/proc/uptime" #define UPTIME "/proc/uptime"
#define DHCP_SERVER_PORT 67 #define DHCP_SERVER_PORT 67
@@ -171,7 +171,7 @@ @@ -187,7 +187,7 @@
/* platform independent options. */ /* platform independent options. */
#undef HAVE_BROKEN_RTC #undef HAVE_BROKEN_RTC
+170 -66
View File
@@ -17,11 +17,12 @@ static struct crec *dhcp_inuse, *dhcp_spare, *new_chain;
static int cache_inserted, cache_live_freed, insert_error; static int cache_inserted, cache_live_freed, insert_error;
static union bigname *big_free; static union bigname *big_free;
static int bignames_left, log_queries, cache_size, hash_size; static int bignames_left, log_queries, cache_size, hash_size;
static char *addn_file; static int uid;
static void cache_free(struct crec *crecp); static void cache_free(struct crec *crecp);
static void cache_unlink(struct crec *crecp); static void cache_unlink(struct crec *crecp);
static void cache_link(struct crec *crecp); static void cache_link(struct crec *crecp);
static char *record_source(struct hostsfile *add_hosts, int index);
void cache_init(int size, int logq) void cache_init(int size, int logq)
{ {
@@ -35,7 +36,7 @@ void cache_init(int size, int logq)
cache_size = size; cache_size = size;
big_free = NULL; big_free = NULL;
bignames_left = size/10; bignames_left = size/10;
addn_file = NULL; uid = 0;
cache_inserted = cache_live_freed = 0; cache_inserted = cache_live_freed = 0;
@@ -47,6 +48,7 @@ void cache_init(int size, int logq)
{ {
cache_link(crecp); cache_link(crecp);
crecp->flags = 0; crecp->flags = 0;
crecp->uid = uid++;
} }
} }
@@ -83,6 +85,7 @@ static void cache_free(struct crec *crecp)
{ {
crecp->flags &= ~F_FORWARD; crecp->flags &= ~F_FORWARD;
crecp->flags &= ~F_REVERSE; crecp->flags &= ~F_REVERSE;
crecp->uid = uid++; /* invalidate CNAMES pointing to this. */
if (cache_tail) if (cache_tail)
cache_tail->next = crecp; cache_tail->next = crecp;
@@ -137,6 +140,22 @@ char *cache_get_name(struct crec *crecp)
return crecp->name.sname; return crecp->name.sname;
} }
static int is_outdated_cname_pointer(struct crec *crecp)
{
struct crec *target = crecp->addr.cname.cache;
if (!(crecp->flags & F_CNAME))
return 0;
if (!target)
return 1;
if (crecp->addr.cname.uid == target->uid)
return 0;
return 1;
}
static void cache_scan_free(char *name, struct all_addr *addr, time_t now, unsigned short flags) static void cache_scan_free(char *name, struct all_addr *addr, time_t now, unsigned short flags)
{ {
/* Scan and remove old entries. /* Scan and remove old entries.
@@ -146,14 +165,15 @@ static void cache_scan_free(char *name, struct all_addr *addr, time_t now, unsig
entries in the whole cache. entries in the whole cache.
If (flags == 0) remove any expired entries in the whole cache. */ If (flags == 0) remove any expired entries in the whole cache. */
#define F_CACHESTATUS (F_HOSTS | F_DHCP | F_FORWARD | F_REVERSE | F_IPV4 | F_IPV6) #define F_CACHESTATUS (F_HOSTS | F_DHCP | F_FORWARD | F_REVERSE | F_IPV4 | F_IPV6 | F_CNAME)
struct crec *crecp, **up; struct crec *crecp, **up;
flags &= (F_FORWARD | F_REVERSE | F_IPV6 | F_IPV4); flags &= (F_FORWARD | F_REVERSE | F_IPV6 | F_IPV4 | F_CNAME);
if (flags & F_FORWARD) if (flags & F_FORWARD)
{ {
for (up = hash_bucket(name), crecp = *up; crecp; crecp = crecp->hash_next) for (up = hash_bucket(name), crecp = *up; crecp; crecp = crecp->hash_next)
if ((!(crecp->flags & F_IMMORTAL) && difftime(now, crecp->ttd) > 0) || if ((!(crecp->flags & F_IMMORTAL) && difftime(now, crecp->ttd) > 0) ||
is_outdated_cname_pointer(crecp) ||
((flags == (crecp->flags & F_CACHESTATUS)) && hostname_isequal(cache_get_name(crecp), name))) ((flags == (crecp->flags & F_CACHESTATUS)) && hostname_isequal(cache_get_name(crecp), name)))
{ {
*up = crecp->hash_next; *up = crecp->hash_next;
@@ -177,7 +197,7 @@ static void cache_scan_free(char *name, struct all_addr *addr, time_t now, unsig
for (i = 0; i < hash_size; i++) for (i = 0; i < hash_size; i++)
for (crecp = hash_table[i], up = &hash_table[i]; crecp; crecp = crecp->hash_next) for (crecp = hash_table[i], up = &hash_table[i]; crecp; crecp = crecp->hash_next)
if ((!(crecp->flags & F_IMMORTAL) && difftime(now, crecp->ttd) > 0) || if ((!(crecp->flags & F_IMMORTAL) && difftime(now, crecp->ttd) > 0) ||
((flags == (crecp->flags & F_CACHESTATUS)) && memcmp(&crecp->addr, addr, addrlen) == 0)) ((flags == (crecp->flags & F_CACHESTATUS)) && memcmp(&crecp->addr.addr, addr, addrlen) == 0))
{ {
*up = crecp->hash_next; *up = crecp->hash_next;
if (!(crecp->flags & (F_HOSTS | F_DHCP))) if (!(crecp->flags & (F_HOSTS | F_DHCP)))
@@ -214,7 +234,7 @@ void cache_start_insert(void)
insert_error = 0; insert_error = 0;
} }
void cache_insert(char *name, struct all_addr *addr, struct crec *cache_insert(char *name, struct all_addr *addr,
time_t now, unsigned long ttl, unsigned short flags) time_t now, unsigned long ttl, unsigned short flags)
{ {
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
@@ -226,7 +246,7 @@ void cache_insert(char *name, struct all_addr *addr,
union bigname *big_name = NULL; union bigname *big_name = NULL;
int freed_all = flags & F_REVERSE; int freed_all = flags & F_REVERSE;
log_query(flags | F_UPSTREAM, name, addr); log_query(flags | F_UPSTREAM, name, addr, 0, NULL, 0);
/* name is needed as workspace by log_query in this case */ /* name is needed as workspace by log_query in this case */
if ((flags & F_NEG) && (flags & F_REVERSE)) if ((flags & F_NEG) && (flags & F_REVERSE))
@@ -237,7 +257,7 @@ void cache_insert(char *name, struct all_addr *addr,
/* if previous insertion failed give up now. */ /* if previous insertion failed give up now. */
if (insert_error) if (insert_error)
return; return NULL;
/* First remove any expired entries and entries for the name/address we /* First remove any expired entries and entries for the name/address we
are currently inserting. */ are currently inserting. */
@@ -248,7 +268,7 @@ void cache_insert(char *name, struct all_addr *addr,
if (!(new = cache_tail)) /* no entries left - cache is too small, bail */ if (!(new = cache_tail)) /* no entries left - cache is too small, bail */
{ {
insert_error = 1; insert_error = 1;
return; return NULL;
} }
/* End of LRU list is still in use: if we didn't scan all the hash /* End of LRU list is still in use: if we didn't scan all the hash
@@ -259,7 +279,7 @@ void cache_insert(char *name, struct all_addr *addr,
{ {
if (freed_all) if (freed_all)
{ {
cache_scan_free(cache_get_name(new), &new->addr, now, new->flags); cache_scan_free(cache_get_name(new), &new->addr.addr, now, new->flags);
cache_live_freed++; cache_live_freed++;
} }
else else
@@ -283,7 +303,7 @@ void cache_insert(char *name, struct all_addr *addr,
!(big_name = (union bigname *)malloc(sizeof(union bigname)))) !(big_name = (union bigname *)malloc(sizeof(union bigname))))
{ {
insert_error = 1; insert_error = 1;
return; return NULL;
} }
else else
bignames_left--; bignames_left--;
@@ -306,10 +326,15 @@ void cache_insert(char *name, struct all_addr *addr,
else else
*cache_get_name(new) = 0; *cache_get_name(new) = 0;
if (addr) if (addr)
memcpy(&new->addr, addr, addrlen); memcpy(&new->addr.addr, addr, addrlen);
else
new->addr.cname.cache = NULL;
new->ttd = now + (time_t)ttl; new->ttd = now + (time_t)ttl;
new->next = new_chain; new->next = new_chain;
new_chain = new; new_chain = new;
return new;
} }
/* after end of insertion, commit the new entries */ /* after end of insertion, commit the new entries */
@@ -321,11 +346,17 @@ void cache_end_insert(void)
while (new_chain) while (new_chain)
{ {
struct crec *tmp = new_chain->next; struct crec *tmp = new_chain->next;
/* drop CNAMEs which didn't find a target. */
if (is_outdated_cname_pointer(new_chain))
cache_free(new_chain);
else
{
cache_hash(new_chain); cache_hash(new_chain);
cache_link(new_chain); cache_link(new_chain);
new_chain = tmp;
cache_inserted++; cache_inserted++;
} }
new_chain = tmp;
}
new_chain = NULL; new_chain = NULL;
} }
@@ -345,7 +376,8 @@ struct crec *cache_find_by_name(struct crec *crecp, char *name, time_t now, unsi
{ {
next = crecp->hash_next; next = crecp->hash_next;
if ((crecp->flags & F_IMMORTAL) || difftime(now, crecp->ttd) < 0) if (!is_outdated_cname_pointer(crecp) &&
((crecp->flags & F_IMMORTAL) || difftime(now, crecp->ttd) < 0))
{ {
if ((crecp->flags & F_FORWARD) && if ((crecp->flags & F_FORWARD) &&
(crecp->flags & prot) && (crecp->flags & prot) &&
@@ -430,7 +462,7 @@ struct crec *cache_find_by_addr(struct crec *crecp, struct all_addr *addr,
{ {
if ((crecp->flags & F_REVERSE) && if ((crecp->flags & F_REVERSE) &&
(crecp->flags & prot) && (crecp->flags & prot) &&
memcmp(&crecp->addr, addr, addrlen) == 0) memcmp(&crecp->addr.addr, addr, addrlen) == 0)
{ {
if (crecp->flags & (F_HOSTS | F_DHCP)) if (crecp->flags & (F_HOSTS | F_DHCP))
{ {
@@ -461,19 +493,20 @@ struct crec *cache_find_by_addr(struct crec *crecp, struct all_addr *addr,
if (ans && if (ans &&
(ans->flags & F_REVERSE) && (ans->flags & F_REVERSE) &&
(ans->flags & prot) && (ans->flags & prot) &&
memcmp(&ans->addr, addr, addrlen) == 0) memcmp(&ans->addr.addr, addr, addrlen) == 0)
return ans; return ans;
return NULL; return NULL;
} }
static void add_hosts_entry(struct crec *cache, struct all_addr *addr, int addrlen, unsigned short flags) static void add_hosts_entry(struct crec *cache, struct all_addr *addr, int addrlen,
unsigned short flags, int index)
{ {
struct crec *lookup = cache_find_by_name(NULL, cache->name.sname, 0, flags & (F_IPV4 | F_IPV6)); struct crec *lookup = cache_find_by_name(NULL, cache->name.sname, 0, flags & (F_IPV4 | F_IPV6));
/* Remove duplicates in hosts files. */ /* Remove duplicates in hosts files. */
if (lookup && (lookup->flags & F_HOSTS) && if (lookup && (lookup->flags & F_HOSTS) &&
memcmp(&lookup->addr, addr, addrlen) == 0) memcmp(&lookup->addr.addr, addr, addrlen) == 0)
free(cache); free(cache);
else else
{ {
@@ -481,12 +514,13 @@ static void add_hosts_entry(struct crec *cache, struct all_addr *addr, int addrl
if (cache_find_by_addr(NULL, addr, 0, flags & (F_IPV4 | F_IPV6))) if (cache_find_by_addr(NULL, addr, 0, flags & (F_IPV4 | F_IPV6)))
flags &= ~F_REVERSE; flags &= ~F_REVERSE;
cache->flags = flags; cache->flags = flags;
memcpy(&cache->addr, addr, addrlen); cache->uid = index;
memcpy(&cache->addr.addr, addr, addrlen);
cache_hash(cache); cache_hash(cache);
} }
} }
static void read_hostsfile(char *filename, int opts, char *buff, char *domain_suffix, int is_addn) static void read_hostsfile(char *filename, int opts, char *buff, char *domain_suffix, int index)
{ {
FILE *f = fopen(filename, "r"); FILE *f = fopen(filename, "r");
char *line; char *line;
@@ -531,9 +565,6 @@ static void read_hostsfile(char *filename, int opts, char *buff, char *domain_su
else else
continue; continue;
if (is_addn)
flags |= F_ADDN;
while ((token = strtok(NULL, " \t\n\r")) && (*token != '#')) while ((token = strtok(NULL, " \t\n\r")) && (*token != '#'))
{ {
struct crec *cache; struct crec *cache;
@@ -548,12 +579,12 @@ static void read_hostsfile(char *filename, int opts, char *buff, char *domain_su
strcpy(cache->name.sname, token); strcpy(cache->name.sname, token);
strcat(cache->name.sname, "."); strcat(cache->name.sname, ".");
strcat(cache->name.sname, domain_suffix); strcat(cache->name.sname, domain_suffix);
add_hosts_entry(cache, &addr, addrlen, flags); add_hosts_entry(cache, &addr, addrlen, flags, index);
} }
if ((cache = malloc(sizeof(struct crec) + strlen(token)+1-SMALLDNAME))) if ((cache = malloc(sizeof(struct crec) + strlen(token)+1-SMALLDNAME)))
{ {
strcpy(cache->name.sname, token); strcpy(cache->name.sname, token);
add_hosts_entry(cache, &addr, addrlen, flags); add_hosts_entry(cache, &addr, addrlen, flags, index);
} }
} }
else else
@@ -566,11 +597,13 @@ static void read_hostsfile(char *filename, int opts, char *buff, char *domain_su
syslog(LOG_INFO, "read %s - %d addresses", filename, count); syslog(LOG_INFO, "read %s - %d addresses", filename, count);
} }
void cache_reload(int opts, char *buff, char *domain_suffix, char *addn_hosts) void cache_reload(int opts, char *buff, char *domain_suffix, struct hostsfile *addn_hosts)
{ {
struct crec *cache, **up, *tmp; struct crec *cache, **up, *tmp;
int i; int i;
cache_inserted = cache_live_freed = 0;
for (i=0; i<hash_size; i++) for (i=0; i<hash_size; i++)
for (cache = hash_table[i], up = &hash_table[i]; cache; cache = tmp) for (cache = hash_table[i], up = &hash_table[i]; cache; cache = tmp)
{ {
@@ -603,10 +636,10 @@ void cache_reload(int opts, char *buff, char *domain_suffix, char *addn_hosts)
if (!(opts & OPT_NO_HOSTS)) if (!(opts & OPT_NO_HOSTS))
read_hostsfile(HOSTSFILE, opts, buff, domain_suffix, 0); read_hostsfile(HOSTSFILE, opts, buff, domain_suffix, 0);
if (addn_hosts) while (addn_hosts)
{ {
read_hostsfile(addn_hosts, opts, buff, domain_suffix, 1); read_hostsfile(addn_hosts->fname, opts, buff, domain_suffix, addn_hosts->index);
addn_file = addn_hosts; addn_hosts = addn_hosts->next;
} }
} }
@@ -633,36 +666,43 @@ void cache_unhash_dhcp(void)
dhcp_inuse = NULL; dhcp_inuse = NULL;
} }
void cache_add_dhcp_entry(char *host_name, struct in_addr *host_address, time_t ttd, unsigned short flags) void cache_add_dhcp_entry(struct daemon *daemon, char *host_name,
struct in_addr *host_address, time_t ttd)
{ {
struct crec *crec; struct crec *crec;
unsigned short flags = F_DHCP | F_FORWARD | F_IPV4 | F_REVERSE;
if ((crec = cache_find_by_name(NULL, host_name, 0, F_IPV4))) if (!host_name)
return;
if ((crec = cache_find_by_name(NULL, host_name, 0, F_IPV4 | F_CNAME)))
{ {
if (crec->flags & F_HOSTS) if (crec->flags & F_HOSTS)
{ {
if (crec->addr.addr.addr4.s_addr != host_address->s_addr) if (crec->addr.addr.addr.addr4.s_addr != host_address->s_addr)
syslog(LOG_WARNING, "not naming DHCP lease for %s because it clashes with an /etc/hosts entry.", host_name);
}
else if (!(crec->flags & F_DHCP))
{ {
if (crec->flags & F_NEG) strcpy(daemon->namebuff, inet_ntoa(crec->addr.addr.addr.addr4));
{ syslog(LOG_WARNING,
/* name may have been searched for before being allocated to DHCP and "not giving name %s to the DHCP lease of %s because "
therefore got a negative cache entry. If so delete it and continue. */ "the name exists in %s with address %s",
cache_scan_free(host_name, NULL, 0, F_IPV4 | F_FORWARD); host_name, inet_ntoa(*host_address),
goto newrec; record_source(daemon->addn_hosts, crec->uid), daemon->namebuff);
}
else
syslog(LOG_WARNING, "not naming DHCP lease for %s because it clashes with a cached name.", cache_get_name(crec));
} }
return; return;
} }
else if (!(crec->flags & F_DHCP))
cache_scan_free(host_name, NULL, 0, crec->flags & (F_IPV4 | F_CNAME | F_FORWARD));
}
if ((crec = cache_find_by_addr(NULL, (struct all_addr *)host_address, 0, F_IPV4)) && (crec->flags & F_NEG)) if ((crec = cache_find_by_addr(NULL, (struct all_addr *)host_address, 0, F_IPV4)))
{
if (crec->flags & F_NEG)
cache_scan_free(NULL, (struct all_addr *)host_address, 0, F_IPV4 | F_REVERSE); cache_scan_free(NULL, (struct all_addr *)host_address, 0, F_IPV4 | F_REVERSE);
else
/* avoid multiple reverse mappings */
flags &= ~F_REVERSE;
}
newrec:
if ((crec = dhcp_spare)) if ((crec = dhcp_spare))
dhcp_spare = dhcp_spare->prev; dhcp_spare = dhcp_spare->prev;
else /* need new one */ else /* need new one */
@@ -670,12 +710,12 @@ void cache_add_dhcp_entry(char *host_name, struct in_addr *host_address, time_t
if (crec) /* malloc may fail */ if (crec) /* malloc may fail */
{ {
crec->flags = F_DHCP | F_FORWARD | F_IPV4 | flags; crec->flags = flags;
if (ttd == 0) if (ttd == 0)
crec->flags |= F_IMMORTAL; crec->flags |= F_IMMORTAL;
else else
crec->ttd = ttd; crec->ttd = ttd;
crec->addr.addr.addr4 = *host_address; crec->addr.addr.addr.addr4 = *host_address;
crec->name.namep = host_name; crec->name.namep = host_name;
crec->prev = dhcp_inuse; crec->prev = dhcp_inuse;
dhcp_inuse = crec; dhcp_inuse = crec;
@@ -685,12 +725,12 @@ void cache_add_dhcp_entry(char *host_name, struct in_addr *host_address, time_t
void dump_cache(int debug, int cache_size) void dump_cache(struct daemon *daemon)
{ {
syslog(LOG_INFO, "cache size %d, %d/%d cache insertions re-used unexpired cache entries.", syslog(LOG_INFO, "cache size %d, %d/%d cache insertions re-used unexpired cache entries.",
cache_size, cache_live_freed, cache_inserted); daemon->cachesize, cache_live_freed, cache_inserted);
if (debug) if (daemon->options & (OPT_DEBUG | OPT_LOG))
{ {
struct crec *cache ; struct crec *cache ;
char addrbuff[ADDRSTRLEN]; char addrbuff[ADDRSTRLEN];
@@ -702,14 +742,21 @@ void dump_cache(int debug, int cache_size)
{ {
if ((cache->flags & F_NEG) && (cache->flags & F_FORWARD)) if ((cache->flags & F_NEG) && (cache->flags & F_FORWARD))
addrbuff[0] = 0; addrbuff[0] = 0;
else if (cache->flags & F_CNAME)
{
addrbuff[0] = 0;
addrbuff[ADDRSTRLEN-1] = 0;
if (!is_outdated_cname_pointer(cache))
strncpy(addrbuff, cache_get_name(cache->addr.cname.cache), ADDRSTRLEN);
}
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else if (cache->flags & F_IPV4) else if (cache->flags & F_IPV4)
inet_ntop(AF_INET, &cache->addr, addrbuff, ADDRSTRLEN); inet_ntop(AF_INET, &cache->addr.addr, addrbuff, ADDRSTRLEN);
else if (cache->flags & F_IPV6) else if (cache->flags & F_IPV6)
inet_ntop(AF_INET6, &cache->addr, addrbuff, ADDRSTRLEN); inet_ntop(AF_INET6, &cache->addr.addr, addrbuff, ADDRSTRLEN);
#else #else
else else
strcpy(addrbuff, inet_ntoa(cache->addr.addr.addr4)); strcpy(addrbuff, inet_ntoa(cache->addr.addr.addr.addr4));
#endif #endif
syslog(LOG_DEBUG, syslog(LOG_DEBUG,
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
@@ -720,6 +767,7 @@ void dump_cache(int debug, int cache_size)
cache_get_name(cache), addrbuff, cache_get_name(cache), addrbuff,
cache->flags & F_IPV4 ? "4" : "", cache->flags & F_IPV4 ? "4" : "",
cache->flags & F_IPV6 ? "6" : "", cache->flags & F_IPV6 ? "6" : "",
cache->flags & F_CNAME ? "C" : "",
cache->flags & F_FORWARD ? "F" : " ", cache->flags & F_FORWARD ? "F" : " ",
cache->flags & F_REVERSE ? "R" : " ", cache->flags & F_REVERSE ? "R" : " ",
cache->flags & F_IMMORTAL ? "I" : " ", cache->flags & F_IMMORTAL ? "I" : " ",
@@ -727,27 +775,45 @@ void dump_cache(int debug, int cache_size)
cache->flags & F_NEG ? "N" : " ", cache->flags & F_NEG ? "N" : " ",
cache->flags & F_NXDOMAIN ? "X" : " ", cache->flags & F_NXDOMAIN ? "X" : " ",
cache->flags & F_HOSTS ? "H" : " ", cache->flags & F_HOSTS ? "H" : " ",
cache->flags & F_ADDN ? "A" : " ",
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
cache->flags & F_IMMORTAL ? 0: (unsigned long)cache->ttd) ; cache->flags & F_IMMORTAL ? 0: (unsigned long)cache->ttd
#else #else
cache->flags & F_IMMORTAL ? "\n" : ctime(&(cache->ttd))) ; cache->flags & F_IMMORTAL ? "\n" : ctime(&(cache->ttd))
#endif #endif
);
} }
} }
} }
static char *record_source(struct hostsfile *addn_hosts, int index)
{
char *source = HOSTSFILE;
while (addn_hosts)
{
if (addn_hosts->index == index)
{
source = addn_hosts->fname;
break;
}
addn_hosts = addn_hosts->next;
}
void log_query(unsigned short flags, char *name, struct all_addr *addr) return source;
}
void log_query(unsigned short flags, char *name, struct all_addr *addr,
unsigned short type, struct hostsfile *addn_hosts, int index)
{ {
char *source; char *source;
char *verb = "is"; char *verb = "is";
char types[20];
char addrbuff[ADDRSTRLEN]; char addrbuff[ADDRSTRLEN];
if (!log_queries) if (!log_queries)
return; return;
strcpy(types, " ");
if (flags & F_NEG) if (flags & F_NEG)
{ {
if (flags & F_REVERSE) if (flags & F_REVERSE)
@@ -768,6 +834,8 @@ void log_query(unsigned short flags, char *name, struct all_addr *addr)
else if (flags & F_IPV6) else if (flags & F_IPV6)
strcat(addrbuff, "-IPv6"); strcat(addrbuff, "-IPv6");
} }
else if (flags & F_CNAME)
strcpy(addrbuff, "<CNAME>");
else else
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
inet_ntop(flags & F_IPV4 ? AF_INET : AF_INET6, inet_ntop(flags & F_IPV4 ? AF_INET : AF_INET6,
@@ -779,12 +847,7 @@ void log_query(unsigned short flags, char *name, struct all_addr *addr)
if (flags & F_DHCP) if (flags & F_DHCP)
source = "DHCP"; source = "DHCP";
else if (flags & F_HOSTS) else if (flags & F_HOSTS)
{ source = record_source(addn_hosts, index);
if (flags & F_ADDN)
source = addn_file;
else
source = HOSTSFILE;
}
else if (flags & F_CONFIG) else if (flags & F_CONFIG)
source = "config"; source = "config";
else if (flags & F_UPSTREAM) else if (flags & F_UPSTREAM)
@@ -796,6 +859,47 @@ void log_query(unsigned short flags, char *name, struct all_addr *addr)
} }
else if (flags & F_QUERY) else if (flags & F_QUERY)
{ {
unsigned int i;
static struct {
unsigned int type;
char *name;
} typestr[] = {
{ 1, "A" },
{ 2, "NS" },
{ 5, "CNAME" },
{ 6, "SOA" },
{ 10, "NULL" },
{ 11, "WKS" },
{ 12, "PTR" },
{ 13, "HINFO" },
{ 15, "MX" },
{ 16, "TXT" },
{ 22, "NSAP" },
{ 23, "NSAP_PTR" },
{ 24, "SIG" },
{ 25, "KEY" },
{ 28, "AAAA" },
{ 33, "SRV" },
{ 36, "KX" },
{ 37, "CERT" },
{ 38, "A6" },
{ 39, "DNAME" },
{ 41, "OPT" },
{ 250, "TSIG" },
{ 251, "IXFR" },
{ 252, "AXFR" },
{ 253, "MAILB" },
{ 254, "MAILA" },
{ 255, "ANY" }
};
if (type != 0)
{
sprintf(types, "[type=%d] ", type);
for (i = 0; i < (sizeof(typestr)/sizeof(typestr[0])); i++)
if (typestr[i].type == type)
sprintf(types,"[%s] ", typestr[i].name);
}
source = "query"; source = "query";
verb = "from"; verb = "from";
} }
@@ -803,7 +907,7 @@ void log_query(unsigned short flags, char *name, struct all_addr *addr)
source = "cached"; source = "cached";
if ((flags & F_FORWARD) | (flags & F_NEG)) if ((flags & F_FORWARD) | (flags & F_NEG))
syslog(LOG_DEBUG, "%s %s %s %s", source, name, verb, addrbuff); syslog(LOG_DEBUG, "%s %s%s%s %s", source, name, types, verb, addrbuff);
else if (flags & F_REVERSE) else if (flags & F_REVERSE)
syslog(LOG_DEBUG, "%s %s is %s", source, addrbuff, name); syslog(LOG_DEBUG, "%s %s is %s", source, addrbuff, name);
} }
+31 -18
View File
@@ -1,4 +1,4 @@
/* dnsmasq is Copyright (c) 2000 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
@@ -12,7 +12,7 @@
/* Author's email: simon@thekelleys.org.uk */ /* Author's email: simon@thekelleys.org.uk */
#define VERSION "2.10" #define VERSION "2.19"
#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 @@
# 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
@@ -147,7 +156,7 @@ HAVE_PSELECT
If your C library implements pselect, define this. If your C library implements pselect, define this.
HAVE_BPF HAVE_BPF
If your OS implements Berkeley PAcket filter, define this. If your OS implements Berkeley Packet filter, define this.
NOTES: NOTES:
For Linux you should define For Linux you should define
@@ -167,10 +176,12 @@ NOTES:
you should NOT define you should NOT define
HAVE_LINUX_IPV6_PROC HAVE_LINUX_IPV6_PROC
and you MAY define and you MAY define
HAVE_ARC4RANDOM - OpenBSD and FreeBSD HAVE_ARC4RANDOM - OpenBSD and FreeBSD and NetBSD version 2.0 or later
HAVE_DEV_URANDOM - OpenBSD and FreeBSD HAVE_DEV_URANDOM - OpenBSD and FreeBSD and NetBSD
HAVE_DEV_RANDOM - FreeBSD (OpenBSD with hardware random number generator) HAVE_DEV_RANDOM - FreeBSD and NetBSD
HAVE_GETOPT_LONG - only if you link GNU getopt. (OpenBSD with hardware random number generator)
HAVE_GETOPT_LONG - NetBSD, later FreeBSD
(FreeBSD and OpenBSD only if you link GNU getopt)
*/ */
@@ -194,8 +205,10 @@ NOTES:
#define HAVE_DEV_RANDOM #define HAVE_DEV_RANDOM
#undef HAVE_SOCKADDR_SA_LEN #undef HAVE_SOCKADDR_SA_LEN
#undef HAVE_PSELECT #undef HAVE_PSELECT
/* Don't fork into background on uClinux */
#if defined(__uClinux__) #if defined(__uClinux__)
/* Never use fork() on uClinux. Note that this is subtly different from the
--keep-in-foreground option, since it also suppresses forking new
processes for TCP connections. It's intended for use on MMU-less kernels. */
# define NO_FORK # define NO_FORK
#endif #endif
@@ -218,7 +231,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;
@@ -242,12 +254,14 @@ typedef unsigned long in_addr_t;
#endif #endif
#endif #endif
/* #elif defined(__OpenBSD__)
#error The sockets API in OpenBSD does not provide facilities required by dnsmasq
*/
#elif defined(__FreeBSD__) || defined(__OpenBSD__) #elif defined(__FreeBSD__) || defined(__OpenBSD__)
#undef HAVE_LINUX_IPV6_PROC #undef HAVE_LINUX_IPV6_PROC
#undef HAVE_GETOPT_LONG /* Later verions of FreeBSD have getopt_long() */
#if defined(optional_argument) && defined(required_argument)
# define HAVE_GETOPT_LONG
#else
# undef HAVE_GETOPT_LONG
#endif
#define HAVE_ARC4RANDOM #define HAVE_ARC4RANDOM
#define HAVE_RANDOM #define HAVE_RANDOM
#define HAVE_DEV_URANDOM #define HAVE_DEV_URANDOM
@@ -267,17 +281,16 @@ 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 */ /* This is 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
#undef HAVE_GETOPT_LONG #define HAVE_GETOPT_LONG
#undef HAVE_ARC4RANDOM #undef HAVE_ARC4RANDOM
#define HAVE_RANDOM #define HAVE_RANDOM
#undef HAVE_DEV_URANDOM #define HAVE_DEV_URANDOM
#undef HAVE_DEV_RANDOM #define HAVE_DEV_RANDOM
#define HAVE_SOCKADDR_SA_LEN #define HAVE_SOCKADDR_SA_LEN
#undef HAVE_PSELECT #undef HAVE_PSELECT
#define HAVE_BPF #define HAVE_BPF
+239 -142
View File
@@ -14,61 +14,94 @@
#include "dnsmasq.h" #include "dnsmasq.h"
void dhcp_init(int *fdp, int* rfdp) 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 flags, oneopt = 1, zeroopt = 0;
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 ((flags = fcntl(fd, F_GETFL, 0)) == -1 ||
fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1 ||
#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 ||
(flags = fcntl(fd, F_GETFL, 0)) == -1 ||
fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -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; {
int i = 0;
while (1) while (1)
{ {
char filename[50]; char filename[50];
sprintf(filename, "/dev/bpf%d", opt++); sprintf(filename, "/dev/bpf%d", i++);
if ((fd = open(filename, O_RDWR, 0)) != -1) if ((fd = open(filename, O_RDWR, 0)) != -1)
break; break;
if (errno != EBUSY) if (errno != EBUSY)
die("cannot create DHCP BPF socket: %s", NULL); 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
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. */
for (configs = daemon->dhcp_conf; configs; configs = configs->next)
for (cp = configs->next; cp; cp = cp->next)
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));
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;
@@ -76,8 +109,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
@@ -91,8 +123,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);
@@ -102,7 +134,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;
@@ -115,7 +147,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)
@@ -129,35 +161,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; name->isloop; name = name->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;
@@ -165,89 +199,81 @@ 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,
else use the address of the interface is arrived on. */
source = mess->giaddr.s_addr ? mess->giaddr : iface_addr;
iface_netmask.s_addr = 0; iface_netmask.s_addr = 0;
iface_broadcast.s_addr = 0; iface_broadcast.s_addr = 0;
if (ioctl(dhcp_fd, SIOCGIFNETMASK, &ifr) != -1) for (context = daemon->dhcp; context; context = context->next)
{ {
iface_netmask = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr; /* Fill in missing netmask and broadcast address values for any approriate
/* we can use the interface netmask if either the packet came direct, dhcp-ranges which match this interface and don't have them. */
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;
broadcast_save = context->broadcast;
if (!context->netmask.s_addr) if (!context->netmask.s_addr)
context->netmask = iface_netmask; {
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;
if (!(is_same_net(iface_addr, context->start, iface_netmask) &&
is_same_net(iface_addr, context->end, iface_netmask)))
{
strcpy(daemon->dhcp_buff, inet_ntoa(context->start));
strcpy(daemon->dhcp_buff2, inet_ntoa(context->end));
syslog(LOG_WARNING, "DHCP range %s -- %s is not consistent with netmask %s",
daemon->dhcp_buff, daemon->dhcp_buff2, inet_ntoa(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 (!context->broadcast.s_addr)
{ {
if (iface_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 &&
is_same_net(iface_broadcast, context->start, context->netmask))
context->broadcast = iface_broadcast; context->broadcast = iface_broadcast;
else else
context->broadcast.s_addr = (source.s_addr & context->netmask.s_addr) | ~context->netmask.s_addr; 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(daemon);
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)
{ {
@@ -260,7 +286,9 @@ 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)); while(sendto(daemon->dhcpfd, mess, newlen, 0,
(struct sockaddr *)&dest, sizeof(dest)) == -1 &&
retry_send());
} }
else else
{ {
@@ -324,13 +352,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); while (writev(daemon->dhcp_raw_fd, iov, 2) == -1 && retry_send());
#else #else
struct sockaddr_ll dest; struct sockaddr_ll dest;
@@ -339,81 +367,110 @@ 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), while (sendto(daemon->dhcp_raw_fd, rawpacket, ntohs(rawpacket->ip.ip_len),
0, (struct sockaddr *)&dest, sizeof(dest)); 0, (struct sockaddr *)&dest, sizeof(dest)) == -1 &&
retry_send());
#endif #endif
} }
} }
} }
int address_available(struct dhcp_context *context, struct in_addr taddr) struct dhcp_context *address_available(struct dhcp_context *context, struct in_addr taddr)
{ {
/* Check is an address is OK for this network, ie /* Check is an address is OK for this network, check all
within allowable range and not in an existing lease */ possible ranges. */
unsigned int addr, start, end; unsigned int start, end, addr = ntohl(taddr.s_addr);
addr = ntohl(taddr.s_addr); for (; context; context = context->current)
{
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 (!context->static_only &&
if (start == end) addr >= start &&
return 0; addr <= end)
return context;
}
if (addr < start) return NULL;
return 0;
if (addr > end)
return 0;
return 1;
} }
int address_allocate(struct dhcp_context *context, struct dhcp_config *configs, struct dhcp_context *narrow_context(struct dhcp_context *context, struct in_addr taddr)
{
/* We start of with a set of possible contexts, all on the current subnet.
These are chained on ->current.
Here we have an address, and return the actual context correponding to that
address. Note that none may fit, if the address came a dhcp-host and is outside
any dhcp-range. In that case we return a static range is possible, or failing that,
any context on the subnet. (If there's more than one, this is a dodgy configuration:
maybe there should be a warning.) */
struct dhcp_context *tmp = address_available(context, taddr);
if (tmp)
return tmp;
for (tmp = context; tmp; tmp = tmp->current)
if (tmp->static_only)
return tmp;
return context;
}
struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr)
{
struct dhcp_config *config;
for (config = configs; config; config = config->next)
if ((config->flags & CONFIG_ADDR) && config->addr.s_addr == addr.s_addr)
return config;
return NULL;
}
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
a particular hwaddr/clientid/hostname in our configuration */ a particular hwaddr/clientid/hostname in our configuration */
struct dhcp_config *config;
struct in_addr start, addr ; struct in_addr start, addr ;
unsigned int i, j; unsigned int i, j;
/* start == end means no dynamic leases. */ for (; context; context = context->current)
if (context->end.s_addr == context->start.s_addr) if (!context->static_only)
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. */
for (j = context->addr_epoch, i = 0; i < ETHER_ADDR_LEN; i++) for (j = context->addr_epoch, i = 0; i < ETHER_ADDR_LEN; i++)
j += hwaddr[i] + (hwaddr[i] << 8) + (hwaddr[i] << 16); j += hwaddr[i] + (hwaddr[i] << 8) + (hwaddr[i] << 16);
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 { do {
if (addr.s_addr == context->end.s_addr) if (!lease_find_by_addr(addr) &&
addr = context->start; !config_find_by_address(daemon->dhcp_conf, addr))
else
addr.s_addr = htonl(ntohl(addr.s_addr) + 1);
if (!lease_find_by_addr(addr))
{ {
for (config = configs; config; config = config->next) if (icmp_ping(daemon, addr))
if ((config->flags & CONFIG_ADDR) && config->addr.s_addr == addr.s_addr) /* perturb address selection so that we are
break; less likely to try this address again. */
context->addr_epoch++;
if (!config) else
{ {
*addrp = addr; *addrp = addr;
return 1; return 1;
} }
} }
} while (addr.s_addr != start.s_addr);
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);
}
return 0; return 0;
} }
@@ -469,20 +526,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))
@@ -574,7 +632,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)
@@ -592,8 +651,46 @@ void dhcp_update_configs(struct dhcp_config *configs)
(crec = cache_find_by_name(NULL, config->hostname, 0, F_IPV4)) && (crec = cache_find_by_name(NULL, config->hostname, 0, F_IPV4)) &&
(crec->flags & F_HOSTS)) (crec->flags & F_HOSTS))
{ {
config->addr = crec->addr.addr.addr4; config->addr = crec->addr.addr.addr.addr4;
config->flags |= CONFIG_ADDR; config->flags |= CONFIG_ADDR;
} }
} }
/* If we've not found a hostname any other way, try and see if there's one in /etc/hosts
for this address. If it has a domain part, that must match the set domain and
it gets stripped. */
char *host_from_dns(struct daemon *daemon, struct in_addr addr)
{
struct crec *lookup = cache_find_by_addr(NULL, (struct all_addr *)&addr, 0, F_IPV4);
char *hostname = NULL;
if (lookup && (lookup->flags & F_HOSTS))
{
hostname = daemon->dhcp_buff;
hostname[256] = 0;
strncpy(hostname, cache_get_name(lookup), 256);
hostname = strip_hostname(daemon, hostname);
}
return hostname;
}
char *strip_hostname(struct daemon *daemon, char *hostname)
{
char *dot = strchr(hostname, '.');
if (dot)
{
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);
hostname = NULL;
}
else
{
*dot = 0; /* truncate */
if (strlen(hostname) == 0)
hostname = NULL; /* nothing left */
}
}
return hostname;
}
+286 -227
View File
@@ -1,4 +1,4 @@
/* 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,77 +16,21 @@
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;
struct iname *if_tmp;
sighup = 1; /* init cache the first time through */ sighup = 1; /* init cache the first time through */
sigusr1 = 0; /* but don't dump */ sigusr1 = 0; /* but don't dump */
@@ -121,56 +65,44 @@ 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
code. We manage to get away with one buffer. */
dnamebuff = safe_malloc(MAXDNAME);
dhcp_next_server.s_addr = 0; if (daemon->edns_pktsz < PACKETSZ)
options = read_opts(argc, argv, dnamebuff, &resolv, &mxnames, &mxtarget, &lease_file, daemon->edns_pktsz = PACKETSZ;
&username, &groupname, &domain_suffix, &runfile, daemon->packet = safe_malloc(daemon->edns_pktsz > DNSMASQ_PACKETSZ ?
&if_names, &if_addrs, &if_except, &bogus_addr, daemon->edns_pktsz : DNSMASQ_PACKETSZ);
&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) if (!daemon->lease_file)
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; daemon->listeners = create_bound_listeners(interfaces, daemon->port);
listeners = create_bound_listeners(interfaces, 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)
} }
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_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,6 +181,8 @@ int main (int argc, char **argv)
See Stevens section 12.4 */ See Stevens section 12.4 */
#ifndef NO_FORK #ifndef NO_FORK
if (!(daemon->options & OPT_NO_FORK))
{
if (fork() != 0 ) if (fork() != 0 )
exit(0); exit(0);
@@ -254,13 +190,14 @@ int main (int argc, char **argv)
if (fork() != 0) if (fork() != 0)
exit(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)
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 || continue;
i == dhcp_raw_fd) #endif
if (daemon->dhcp &&
(i == daemon->lease_fd ||
i == daemon->dhcpfd ||
i == daemon->dhcp_raw_fd ||
i == daemon->dhcp_icmp_fd))
continue; continue;
for (serverfdp = sfds; serverfdp; serverfdp = serverfdp->next) 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)
} }
/* 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)
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,49 +252,57 @@ 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->options & OPT_NOWILD))
for (if_tmp = daemon->if_names; if_tmp; if_tmp = if_tmp->next)
if (if_tmp->name && !if_tmp->used)
syslog(LOG_WARNING, "warning: interface %s does not currently exist", if_tmp->name);
if (daemon->dhcp)
{ {
strcpy(dnamebuff, inet_ntoa(dhcp_tmp->start)); struct dhcp_context *dhcp_tmp;
for (dhcp_tmp = daemon->dhcp; dhcp_tmp; dhcp_tmp = dhcp_tmp->next)
{
char *time = daemon->dhcp_buff2;
strcpy(daemon->dhcp_buff, inet_ntoa(dhcp_tmp->start));
if (dhcp_tmp->lease_time == 0) if (dhcp_tmp->lease_time == 0)
sprintf(packet, "infinite"); sprintf(time, "infinite");
else else
{ {
unsigned int x, p = 0, t = (unsigned int)dhcp_tmp->lease_time; unsigned int x, p = 0, t = (unsigned int)dhcp_tmp->lease_time;
if ((x = t/3600)) if ((x = t/3600))
p += sprintf(&packet[p], "%dh", x); p += sprintf(&time[p], "%dh", x);
if ((x = (t/60)%60)) if ((x = (t/60)%60))
p += sprintf(&packet[p], "%dm", x); p += sprintf(&time[p], "%dm", x);
if ((x = t%60)) if ((x = t%60))
p += sprintf(&packet[p], "%ds", x); p += sprintf(&time[p], "%ds", x);
} }
syslog(LOG_INFO, syslog(LOG_INFO,
dhcp_tmp->start.s_addr == dhcp_tmp->end.s_addr ? dhcp_tmp->static_only ?
"DHCP, static leases only on %.0s%s, lease time %s" : "DHCP, static leases only on %.0s%s, lease time %s" :
"DHCP, IP range %s -- %s, lease time %s", "DHCP, IP range %s -- %s, lease time %s",
dnamebuff, inet_ntoa(dhcp_tmp->end), packet); daemon->dhcp_buff, inet_ntoa(dhcp_tmp->end), time);
} }
#ifdef HAVE_BROKEN_RTC #ifdef HAVE_BROKEN_RTC
if (dhcp) syslog(LOG_INFO, "DHCP, %s will be written every %ds", daemon->lease_file, daemon->min_leasetime/3);
syslog(LOG_INFO, "DHCP, %s will be written every %ds", lease_file, 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)
{ {
@@ -363,38 +310,37 @@ int main (int argc, char **argv)
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(daemon);
} }
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);
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 +350,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); FD_SET(daemon->dhcpfd, &rset);
if (serverfdp->fd > maxfd) if (daemon->dhcpfd > maxfd)
maxfd = serverfdp->fd; maxfd = daemon->dhcpfd;
}
for (listener = listeners; listener; listener = listener->next)
{
FD_SET(listener->fd, &rset);
if (listener->fd > maxfd)
maxfd = listener->fd;
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 +371,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 +382,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, now);
#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,33 +417,96 @@ 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)) if (daemon->dhcp && FD_ISSET(daemon->dhcpfd, &rset))
dhcp_packet(dhcp, packet, dhcp_options, dhcp_configs, dhcp_vendors, dhcp_packet(daemon, now);
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) syslog(LOG_INFO, "exiting on receipt of SIGTERM");
if (daemon->dhcp)
{ {
if (FD_ISSET(listener->fd, &rset)) #ifdef HAVE_BROKEN_RTC
last_server = receive_query(listener, packet, lease_update_file(1, now);
mxnames, mxtarget, options, now, local_ttl, dnamebuff, #endif
if_names, if_addrs, if_except, last_server, servers, edns_pktsz); close(daemon->lease_fd);
}
if (FD_ISSET(listener->tcpfd, &rset)) 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; int confd;
@@ -524,7 +515,7 @@ int main (int argc, char **argv)
if (confd != -1) if (confd != -1)
{ {
int match = 1; int match = 1;
if (!(options & OPT_NOWILD)) if (!(daemon->options & OPT_NOWILD))
{ {
/* Check for allowed interfaces when binding the wildcard address */ /* Check for allowed interfaces when binding the wildcard address */
/* Don't know how to get interface of a connection, so we have to /* Don't know how to get interface of a connection, so we have to
@@ -539,17 +530,17 @@ int main (int argc, char **argv)
if (tcp_addr.sa.sa_family == AF_INET6) if (tcp_addr.sa.sa_family == AF_INET6)
tcp_addr.in6.sin6_flowinfo = htonl(0); tcp_addr.in6.sin6_flowinfo = htonl(0);
#endif #endif
for (match = 1, tmp = if_except; tmp; tmp = tmp->next) for (match = 1, tmp = daemon->if_except; tmp; tmp = tmp->next)
if (sockaddr_isequal(&tmp->addr, &tcp_addr)) if (sockaddr_isequal(&tmp->addr, &tcp_addr))
match = 0; match = 0;
if (match && (if_names || if_addrs)) if (match && (daemon->if_names || daemon->if_addrs))
{ {
match = 0; match = 0;
for (tmp = if_names; tmp; tmp = tmp->next) for (tmp = daemon->if_names; tmp; tmp = tmp->next)
if (sockaddr_isequal(&tmp->addr, &tcp_addr)) if (sockaddr_isequal(&tmp->addr, &tcp_addr))
match = 1; match = 1;
for (tmp = if_addrs; tmp; tmp = tmp->next) for (tmp = daemon->if_addrs; tmp; tmp = tmp->next)
if (sockaddr_isequal(&tmp->addr, &tcp_addr)) if (sockaddr_isequal(&tmp->addr, &tcp_addr))
match = 1; match = 1;
} }
@@ -558,11 +549,13 @@ int main (int argc, char **argv)
if (!match || (num_kids >= MAX_PROCS)) if (!match || (num_kids >= MAX_PROCS))
close(confd); close(confd);
else if (!(options & OPT_DEBUG) && fork()) #ifndef NO_FORK
else if (!(daemon->options & OPT_DEBUG) && fork())
{ {
num_kids++; num_kids++;
close(confd); close(confd);
} }
#endif
else else
{ {
char *buff; char *buff;
@@ -571,17 +564,18 @@ int main (int argc, char **argv)
/* Arrange for SIGALARM after CHILD_LIFETIME seconds to /* Arrange for SIGALARM after CHILD_LIFETIME seconds to
terminate the process. */ terminate the process. */
if (!(options & OPT_DEBUG)) if (!(daemon->options & OPT_DEBUG))
{ {
sigemptyset(&sigact.sa_mask); sigset_t mask;
sigaddset(&sigact.sa_mask, SIGALRM); sigemptyset(&mask);
sigprocmask(SIG_UNBLOCK, &sigact.sa_mask, NULL); sigaddset(&mask, SIGALRM);
sigprocmask(SIG_UNBLOCK, &mask, NULL);
alarm(CHILD_LIFETIME); alarm(CHILD_LIFETIME);
in_child = 1; in_child = 1;
} }
/* start with no upstream connections. */ /* start with no upstream connections. */
for (s = servers; s; s = s->next) for (s = daemon->servers; s; s = s->next)
s->tcpfd = -1; s->tcpfd = -1;
/* The connected socket inherits non-blocking /* The connected socket inherits non-blocking
@@ -590,40 +584,105 @@ int main (int argc, char **argv)
if ((flags = fcntl(confd, F_GETFL, 0)) != -1) if ((flags = fcntl(confd, F_GETFL, 0)) != -1)
fcntl(confd, F_SETFL, flags & ~O_NONBLOCK); fcntl(confd, F_SETFL, flags & ~O_NONBLOCK);
buff = tcp_request(confd, mxnames, mxtarget, options, now, buff = tcp_request(daemon, confd, now);
local_ttl, dnamebuff, last_server, servers,
bogus_addr, doctors, edns_pktsz);
if (!(daemon->options & OPT_DEBUG))
if (!(options & OPT_DEBUG))
exit(0); exit(0);
close(confd); close(confd);
if (buff) if (buff)
free(buff); free(buff);
for (s = servers; s; s = s->next) for (s = daemon->servers; s; s = s->next)
if (s->tcpfd != -1) if (s->tcpfd != -1)
close(s->tcpfd); close(s->tcpfd);
} }
} }
} }
} }
}
syslog(LOG_INFO, "exiting on receipt of SIGTERM");
#ifdef HAVE_BROKEN_RTC
if (dhcp)
lease_update_file(1, now);
#endif
if (leasefd != -1)
close(leasefd);
return 0;
} }
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));
while (sendto(daemon->dhcp_icmp_fd, (char *)&packet.icmp, sizeof(struct icmp), 0,
(struct sockaddr *)&saddr, sizeof(saddr)) == -1 &&
retry_send());
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;
}
+128 -85
View File
@@ -27,14 +27,16 @@
/* get this before config.h too. */ /* get this before config.h too. */
#include <syslog.h> #include <syslog.h>
#include <arpa/nameser.h>
/* and this. */
#include <getopt.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>
@@ -51,9 +53,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <ctype.h> #include <ctype.h>
#include <signal.h> #include <signal.h>
#ifdef HAVE_GETOPT_LONG
# include <getopt.h>
#endif
#include <time.h> #include <time.h>
#include <errno.h> #include <errno.h>
#include <pwd.h> #include <pwd.h>
@@ -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,8 @@
#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
#define OPT_AUTHORITATIVE 131072
struct all_addr { struct all_addr {
union { union {
@@ -128,7 +130,14 @@ union bigname {
struct crec { struct crec {
struct crec *next, *prev, *hash_next; struct crec *next, *prev, *hash_next;
time_t ttd; /* time to die */ time_t ttd; /* time to die */
int uid;
union {
struct all_addr addr; struct all_addr addr;
struct {
struct crec *cache;
int uid;
} cname;
} addr;
unsigned short flags; unsigned short flags;
union { union {
char sname[SMALLDNAME]; char sname[SMALLDNAME];
@@ -151,7 +160,7 @@ struct crec {
#define F_SERVER 2048 #define F_SERVER 2048
#define F_NXDOMAIN 4096 #define F_NXDOMAIN 4096
#define F_QUERY 8192 #define F_QUERY 8192
#define F_ADDN 16384 #define F_CNAME 16384
#define F_NOERR 32768 #define F_NOERR 32768
/* struct sockaddr is not large enough to hold any address, /* struct sockaddr is not large enough to hold any address,
@@ -226,12 +235,21 @@ struct resolvc {
char *name; char *name;
}; };
/* adn-hosts parms from command-line */
struct hostsfile {
struct hostsfile *next;
char *fname;
int index; /* matches to cache entries fro logging */
};
struct frec { struct frec {
union mysockaddr source; union mysockaddr source;
struct all_addr dest; struct all_addr dest;
struct server *sentto; struct server *sentto;
unsigned int iface;
unsigned short orig_id, new_id; unsigned short orig_id, new_id;
int fd; int fd;
unsigned int crc;
time_t time; time_t time;
struct frec *next; struct frec *next;
}; };
@@ -251,6 +269,10 @@ struct dhcp_netid {
struct dhcp_netid *next; struct dhcp_netid *next;
}; };
struct dhcp_netid_list {
struct dhcp_netid *list;
struct dhcp_netid_list *next;
};
struct dhcp_config { struct dhcp_config {
unsigned int flags; unsigned int flags;
int clid_len; /* length of client identifier */ int clid_len; /* length of client identifier */
@@ -275,12 +297,19 @@ struct dhcp_config {
struct dhcp_opt { struct dhcp_opt {
int opt, len, is_addr; int opt, len, is_addr;
unsigned char *val; unsigned char *val;
char *netid; struct dhcp_netid *netid;
struct dhcp_opt *next; struct dhcp_opt *next;
}; };
struct dhcp_boot {
char *file, *sname;
struct in_addr next_server;
struct dhcp_netid *netid;
struct dhcp_boot *next;
};
struct dhcp_vendor { struct dhcp_vendor {
int len, is_vendor, used; int len, is_vendor;
char *data; char *data;
struct dhcp_netid netid; struct dhcp_netid netid;
struct dhcp_vendor *next; struct dhcp_vendor *next;
@@ -288,10 +317,11 @@ 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, *current;
}; };
typedef unsigned char u8; typedef unsigned char u8;
@@ -313,15 +343,60 @@ 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;
struct hostsfile *addn_hosts;
struct dhcp_context *dhcp;
struct dhcp_config *dhcp_conf;
struct dhcp_opt *dhcp_opts;
struct dhcp_vendor *dhcp_vendors;
struct dhcp_boot *boot_config;
struct dhcp_netid_list *dhcp_ignore;
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); void log_query(unsigned short flags, char *name, struct all_addr *addr,
unsigned short type, struct hostsfile *addn_hosts, int index);
struct crec *cache_find_by_addr(struct crec *crecp, struct crec *cache_find_by_addr(struct crec *crecp,
struct all_addr *addr, time_t now, struct all_addr *addr, time_t now,
unsigned short prot); unsigned short prot);
@@ -329,29 +404,31 @@ struct crec *cache_find_by_name(struct crec *crecp,
char *name, time_t now, unsigned short prot); char *name, time_t now, unsigned short prot);
void cache_end_insert(void); void cache_end_insert(void);
void cache_start_insert(void); void cache_start_insert(void);
void cache_insert(char *name, struct all_addr *addr, struct crec *cache_insert(char *name, struct all_addr *addr,
time_t now, unsigned long ttl, unsigned short flags); time_t now, unsigned long ttl, unsigned short flags);
void cache_reload(int opts, char *buff, char *domain_suffix, char *addn_hosts); void cache_reload(int opts, char *buff, char *domain_suffix, struct hostsfile *addn_hosts);
void cache_add_dhcp_entry(char *host_name, struct in_addr *host_address, void cache_add_dhcp_entry(struct daemon *daemon, char *host_name, struct in_addr *host_address, time_t ttd);
time_t ttd, unsigned short flags);
void cache_unhash_dhcp(void); void cache_unhash_dhcp(void);
void dump_cache(int debug, int size); void dump_cache(struct daemon *daemon);
char *cache_get_name(struct crec *crecp); char *cache_get_name(struct crec *crecp);
/* rfc1035.c */ /* rfc1035.c */
unsigned short extract_request(HEADER *header, unsigned int qlen, char *name); unsigned short extract_request(HEADER *header, unsigned int qlen,
char *name, unsigned short *typep);
int setup_reply(HEADER *header, unsigned int qlen, int setup_reply(HEADER *header, unsigned int qlen,
struct all_addr *addrp, unsigned short flags, struct all_addr *addrp, unsigned short flags,
unsigned long local_ttl); unsigned long local_ttl);
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 daemon *daemon);
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 daemon *daemon, time_t now);
int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_record *mxnames,
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,
unsigned int *len, unsigned char **p);
int check_for_local_domain(char *name, time_t now, struct mx_record *mx);
unsigned int questions_crc(HEADER *header, unsigned int plen);
int resize_packet(HEADER *header, unsigned int plen,
unsigned char *pheader, unsigned int hlen);
/* util.c */ /* util.c */
unsigned short rand16(void); unsigned short rand16(void);
@@ -367,75 +444,47 @@ int sockaddr_isequal(union mysockaddr *s1, union mysockaddr *s2);
int hostname_isequal(unsigned char *a, unsigned char *b); int hostname_isequal(unsigned char *a, unsigned char *b);
time_t dnsmasq_time(int fd); 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);
int retry_send(void);
/* 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); 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, struct dhcp_context *address_available(struct dhcp_context *context, struct in_addr addr);
time_t now, char *namebuff, char *domain_suffix, struct dhcp_context *narrow_context(struct dhcp_context *context, struct in_addr taddr);
char *dhcp_file, char *dhcp_sname, int address_allocate(struct dhcp_context *context, struct daemon *daemon,
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_allocate(struct dhcp_context *context, struct dhcp_config *configs,
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);
char *strip_hostname(struct daemon *daemon, char *hostname);
char *host_from_dns(struct daemon *daemon, 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(struct daemon *daemon);
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);
@@ -446,19 +495,13 @@ 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
void load_dhcp(char *file, char *suffix, time_t now, char *hostname); void load_dhcp(struct daemon *daemon, time_t now);
#endif #endif
+210 -174
View File
@@ -19,7 +19,8 @@ static struct frec *frec_list;
static struct frec *get_new_frec(time_t now); static struct frec *get_new_frec(time_t now);
static struct frec *lookup_frec(unsigned short id); static struct frec *lookup_frec(unsigned short id);
static struct frec *lookup_frec_by_sender(unsigned short id, static struct frec *lookup_frec_by_sender(unsigned short id,
union mysockaddr *addr); union mysockaddr *addr,
unsigned int crc);
static unsigned short get_id(void); static unsigned short get_id(void);
/* May be called more than once. */ /* May be called more than once. */
@@ -36,7 +37,8 @@ void forward_init(int first)
/* Send a UDP packet with it's source address set as "source" /* Send a UDP packet with it's source address set as "source"
unless nowild is true, when we just send it with the kernel default */ unless nowild is true, when we just send it with the kernel default */
static void send_from(int fd, int nowild, char *packet, int len, static void send_from(int fd, int nowild, char *packet, int len,
union mysockaddr *to, struct all_addr *source) union mysockaddr *to, struct all_addr *source,
unsigned int iface)
{ {
struct msghdr msg; struct msghdr msg;
struct iovec iov[1]; struct iovec iov[1];
@@ -63,12 +65,15 @@ static void send_from(int fd, int nowild, char *packet, int len,
msg.msg_iov = iov; msg.msg_iov = iov;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
if (!nowild && to->sa.sa_family == AF_INET) if (!nowild)
{ {
struct cmsghdr *cmptr;
msg.msg_control = &control_u; msg.msg_control = &control_u;
msg.msg_controllen = sizeof(control_u); msg.msg_controllen = sizeof(control_u);
cmptr = CMSG_FIRSTHDR(&msg);
if (to->sa.sa_family == AF_INET)
{ {
struct cmsghdr *cmptr = CMSG_FIRSTHDR(&msg);
#if defined(IP_PKTINFO) #if defined(IP_PKTINFO)
struct in_pktinfo *pkt = (struct in_pktinfo *)CMSG_DATA(cmptr); struct in_pktinfo *pkt = (struct in_pktinfo *)CMSG_DATA(cmptr);
pkt->ipi_ifindex = 0; pkt->ipi_ifindex = 0;
@@ -84,36 +89,37 @@ static void send_from(int fd, int nowild, char *packet, int len,
cmptr->cmsg_type = IP_SENDSRCADDR; cmptr->cmsg_type = IP_SENDSRCADDR;
#endif #endif
} }
}
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (to->sa.sa_family == AF_INET6) else
{ {
msg.msg_control = &control_u;
msg.msg_controllen = sizeof(control_u);
{
struct cmsghdr *cmptr = CMSG_FIRSTHDR(&msg);
struct in6_pktinfo *pkt = (struct in6_pktinfo *)CMSG_DATA(cmptr); struct in6_pktinfo *pkt = (struct in6_pktinfo *)CMSG_DATA(cmptr);
pkt->ipi6_ifindex = 0; pkt->ipi6_ifindex = iface; /* Need iface for IPv6 to handle link-local addrs */
pkt->ipi6_addr = source->addr.addr6; pkt->ipi6_addr = source->addr.addr6;
msg.msg_controllen = cmptr->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo)); msg.msg_controllen = cmptr->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
cmptr->cmsg_type = IPV6_PKTINFO; cmptr->cmsg_type = IPV6_PKTINFO;
cmptr->cmsg_level = IPV6_LEVEL; cmptr->cmsg_level = IPV6_LEVEL;
} }
}
#endif #endif
}
retry:
if (sendmsg(fd, &msg, 0) == -1)
{
/* certain Linux kernels seem to object to setting the source address in the IPv6 stack /* certain Linux kernels seem to object to setting the source address in the IPv6 stack
by returning EINVAL from sendmsg. In that case, try again without setting the by returning EINVAL from sendmsg. In that case, try again without setting the
source address, since it will nearly alway be correct anyway. IPv6 stinks. */ source address, since it will nearly alway be correct anyway. IPv6 stinks. */
if (sendmsg(fd, &msg, 0) == -1 && errno == EINVAL) if (errno == EINVAL && msg.msg_controllen)
{ {
msg.msg_controllen = 0; msg.msg_controllen = 0;
sendmsg(fd, &msg, 0); goto retry;
}
if (retry_send())
goto retry;
} }
} }
unsigned short search_servers(struct server *servers, unsigned int options, struct all_addr **addrpp, static unsigned short search_servers(struct daemon *daemon, time_t now, struct all_addr **addrpp,
unsigned short qtype, char *qdomain, int *type, char **domain) unsigned short qtype, char *qdomain, int *type, char **domain)
{ {
@@ -126,16 +132,17 @@ 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, '.'))
{ {
unsigned short sflag = serv->addr.sa.sa_family == AF_INET ? F_IPV4 : F_IPV6; unsigned short sflag = serv->addr.sa.sa_family == AF_INET ? F_IPV4 : F_IPV6;
*type = SERV_FOR_NODOTS; *type = SERV_FOR_NODOTS;
flags = 0;
if (serv->flags & SERV_NO_ADDR) if (serv->flags & SERV_NO_ADDR)
flags = F_NOERR; flags = F_NXDOMAIN;
else if ((serv->flags & SERV_LITERAL_ADDRESS) && (sflag & qtype)) else if (serv->flags & SERV_LITERAL_ADDRESS)
{
if (sflag & qtype)
{ {
flags = sflag; flags = sflag;
if (serv->addr.sa.sa_family == AF_INET) if (serv->addr.sa.sa_family == AF_INET)
@@ -145,6 +152,9 @@ unsigned short search_servers(struct server *servers, unsigned int options, stru
*addrpp = (struct all_addr *)&serv->addr.in6.sin6_addr; *addrpp = (struct all_addr *)&serv->addr.in6.sin6_addr;
#endif #endif
} }
else if (!flags)
flags = F_NOERR;
}
} }
else if (serv->flags & SERV_HAS_DOMAIN) else if (serv->flags & SERV_HAS_DOMAIN)
{ {
@@ -157,10 +167,11 @@ unsigned short search_servers(struct server *servers, unsigned int options, stru
*type = SERV_HAS_DOMAIN; *type = SERV_HAS_DOMAIN;
*domain = serv->domain; *domain = serv->domain;
matchlen = domainlen; matchlen = domainlen;
flags = 0;
if (serv->flags & SERV_NO_ADDR) if (serv->flags & SERV_NO_ADDR)
flags = F_NOERR; flags = F_NXDOMAIN;
else if ((serv->flags & SERV_LITERAL_ADDRESS) && ((sflag | F_QUERY ) & qtype)) else if (serv->flags & SERV_LITERAL_ADDRESS)
{
if ((sflag | F_QUERY ) & qtype)
{ {
flags = qtype; flags = qtype;
if (serv->addr.sa.sa_family == AF_INET) if (serv->addr.sa.sa_family == AF_INET)
@@ -170,61 +181,66 @@ unsigned short search_servers(struct server *servers, unsigned int options, stru
*addrpp = (struct all_addr *)&serv->addr.in6.sin6_addr; *addrpp = (struct all_addr *)&serv->addr.in6.sin6_addr;
#endif #endif
} }
else if (!flags)
flags = F_NOERR;
}
} }
} }
if (flags & ~F_NOERR) /* flags set here means a literal found */ if (flags & ~(F_NOERR | F_NXDOMAIN)) /* flags set here means a literal found */
{ {
if (flags & F_QUERY) if (flags & F_QUERY)
log_query(F_CONFIG | F_FORWARD | F_NEG, qdomain, NULL); log_query(F_CONFIG | F_FORWARD | F_NEG, qdomain, NULL, 0, NULL, 0);
else else
log_query(F_CONFIG | F_FORWARD | flags, qdomain, *addrpp); log_query(F_CONFIG | F_FORWARD | flags, qdomain, *addrpp, 0, NULL, 0);
} }
else if (qtype && (options & OPT_NODOTS_LOCAL) && !strchr(qdomain, '.')) else if (qtype && (daemon->options & OPT_NODOTS_LOCAL) && !strchr(qdomain, '.'))
flags = F_NXDOMAIN; flags = F_NXDOMAIN;
if (flags & (F_NOERR | F_NXDOMAIN)) if (flags == F_NXDOMAIN && check_for_local_domain(qdomain, now, daemon->mxnames))
log_query(F_CONFIG | F_FORWARD | F_NEG | qtype | (flags & F_NXDOMAIN), qdomain, NULL); flags = F_NOERR;
if (flags == F_NXDOMAIN || flags == F_NOERR)
log_query(F_CONFIG | F_FORWARD | F_NEG | qtype | (flags & F_NXDOMAIN), qdomain, NULL, 0, NULL, 0);
return flags; return flags;
} }
/* 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, HEADER *header, struct all_addr *dst_addr, unsigned int dst_iface,
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); unsigned short gotname = extract_request(header, (unsigned int)plen, daemon->namebuff, NULL);
struct server *start = NULL; struct server *start = NULL;
unsigned int crc = questions_crc(header,(unsigned int)plen);
/* 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, crc)))
{ {
/* 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, now, &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. */
@@ -236,19 +252,21 @@ 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;
} }
forward->source = *udpaddr; forward->source = *udpaddr;
forward->dest = *dst_addr; forward->dest = *dst_addr;
forward->iface = dst_iface;
forward->new_id = get_id(); forward->new_id = get_id();
forward->fd = udpfd; forward->fd = udpfd;
forward->orig_id = ntohs(header->id); forward->orig_id = ntohs(header->id);
forward->crc = crc;
header->id = htons(forward->new_id); header->id = htons(forward->new_id);
} }
} }
@@ -269,22 +287,29 @@ static struct server *forward_query(int udpfd, union mysockaddr *udpaddr,
must be NULL also. */ must be NULL also. */
if (type == (start->flags & SERV_TYPE) && if (type == (start->flags & SERV_TYPE) &&
(type != SERV_HAS_DOMAIN || hostname_isequal(domain, start->domain))) (type != SERV_HAS_DOMAIN || hostname_isequal(domain, start->domain)) &&
!(start->flags & SERV_LITERAL_ADDRESS))
{ {
if (!(start->flags & SERV_LITERAL_ADDRESS) && if (sendto(start->sfd->fd, (char *)header, plen, 0,
sendto(start->sfd->fd, (char *)header, plen, 0,
&start->addr.sa, &start->addr.sa,
sa_len(&start->addr)) != -1) sa_len(&start->addr)) == -1)
{
if (retry_send())
continue;
}
else
{ {
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); (struct all_addr *)&start->addr.in.sin_addr, 0,
NULL, 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); (struct all_addr *)&start->addr.in6.sin6_addr, 0,
NULL, 0);
#endif #endif
forwarded = 1; forwarded = 1;
forward->sentto = start; forward->sentto = start;
@@ -294,14 +319,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);
@@ -309,30 +334,30 @@ 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); 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, unsigned int n)
int n, int options, unsigned short edns_pcktsz)
{ {
unsigned char *pheader; unsigned char *pheader, *sizep;
unsigned int plen, munged = 0;
/* If upstream is advertising a larger UDP packet size /* If upstream is advertising a larger UDP packet size
than we allow, trim it so that we don't get overlarge than we allow, trim it so that we don't get overlarge
requests for the client. */ requests for the client. */
if ((pheader = find_pseudoheader(header, n))) if ((pheader = find_pseudoheader(header, n, &plen, &sizep)))
{ {
unsigned short udpsz; unsigned short udpsz;
unsigned char *psave = pheader; unsigned char *psave = sizep;
GETSHORT(udpsz, pheader); GETSHORT(udpsz, sizep);
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. */
@@ -351,26 +376,51 @@ static int process_reply(HEADER *header, time_t now, char *dnamebuff, struct bog
return 0; return 0;
} }
if ((header->rcode == NOERROR || header->rcode == NXDOMAIN) && header->opcode == QUERY) if (header->opcode != QUERY || (header->rcode != NOERROR && header->rcode != NXDOMAIN))
return n;
if (daemon->bogus_addr && header->rcode != NXDOMAIN &&
check_for_bogus_wildcard(header, n, daemon->namebuff, daemon->bogus_addr, now))
{ {
if (!(bogus_nxdomain && munged = 1;
header->rcode == NOERROR && header->rcode = NXDOMAIN;
check_for_bogus_wildcard(header, (unsigned int)n, dnamebuff, bogus_nxdomain, now))) header->aa = 0;
{
if (header->rcode == NOERROR && ntohs(header->ancount) != 0)
extract_addresses(header, (unsigned int)n, dnamebuff, now, doctors);
else if (!(options & OPT_NO_NEG))
extract_neg_addrs(header, (unsigned int)n, dnamebuff, now);
} }
else
{
if (header->rcode == NXDOMAIN &&
extract_request(header, n, daemon->namebuff, NULL) &&
check_for_local_domain(daemon->namebuff, now, daemon->mxnames))
{
/* if we forwarded a query for a locally known name (because it was for
an unknown type) and the answer is NXDOMAIN, convert that to NODATA,
since we know that the domain exists, even if upstream doesn't */
munged = 1;
header->aa = 1;
header->rcode = NOERROR;
} }
return 1; extract_addresses(header, n, daemon->namebuff, now, daemon);
}
/* do this after extract_addresses. Ensure NODATA reply and remove
nameserver info. */
if (munged)
{
header->ancount = htons(0);
header->nscount = htons(0);
header->arcount = htons(0);
}
/* the bogus-nxdomain stuff, doctor and NXDOMAIN->NODATA munging can all elide
sections of the packet. Find the new length here and put back pseudoheader
if it was removed. */
return resize_packet(header, n, pheader, plen);
} }
/* 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 */
@@ -378,7 +428,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;
@@ -387,42 +437,43 @@ 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)))) forward = lookup_frec(ntohs(header->id));
if (n >= (int)sizeof(HEADER) && header->qr && forward)
{ {
/* 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))
{
daemon->last_server = last_server;
break; break;
if (!last_server) }
last_server = forward->sentto;
} }
if (!process_reply(header, now, dnamebuff, bogus_nxdomain, doctors, &serveraddr, n, options, edns_pcktsz)) if ((n = process_reply(daemon, header, now, &serveraddr, (unsigned int)n)))
return NULL; {
header->id = htons(forward->orig_id); header->id = htons(forward->orig_id);
send_from(forward->fd, options & OPT_NOWILD, packet, n, &forward->source, &forward->dest); header->ra = 1; /* recursion if available */
send_from(forward->fd, daemon->options & OPT_NOWILD, daemon->packet, n,
&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;
struct iname *tmp; struct iname *tmp;
struct all_addr dst_addr; struct all_addr dst_addr;
int check_dst = !(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;
@@ -440,8 +491,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);
@@ -452,22 +503,26 @@ 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;
if (n < (int)sizeof(HEADER) || header->qr)
return;
source_addr.sa.sa_family = listen->family; source_addr.sa.sa_family = listen->family;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (listen->family == AF_INET6) if (listen->family == AF_INET6)
{
check_dst = 1;
source_addr.in6.sin6_flowinfo = htonl(0); source_addr.in6.sin6_flowinfo = htonl(0);
}
#endif #endif
if (check_dst && msg.msg_controllen < sizeof(struct cmsghdr)) if (!(daemon->options & OPT_NOWILD))
return last_server; {
struct ifreq ifr;
if (msg.msg_controllen < sizeof(struct cmsghdr))
return;
#if defined(IP_PKTINFO) #if defined(IP_PKTINFO)
if (check_dst && listen->family == AF_INET) if (listen->family == AF_INET)
for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr)) for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
if (cmptr->cmsg_level == SOL_IP && cmptr->cmsg_type == IP_PKTINFO) if (cmptr->cmsg_level == SOL_IP && cmptr->cmsg_type == IP_PKTINFO)
{ {
@@ -475,7 +530,7 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re
if_index = ((struct in_pktinfo *)CMSG_DATA(cmptr))->ipi_ifindex; if_index = ((struct in_pktinfo *)CMSG_DATA(cmptr))->ipi_ifindex;
} }
#elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF) #elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF)
if (check_dst && listen->family == AF_INET) if (listen->family == AF_INET)
{ {
for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr)) for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVDSTADDR) if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVDSTADDR)
@@ -497,40 +552,34 @@ struct server *receive_query(struct listener *listen, char *packet, struct mx_re
} }
#endif #endif
if (n < (int)sizeof(HEADER) || header->qr)
return last_server;
/* enforce available interface configuration */ /* enforce available interface configuration */
if (check_dst)
{
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 &&
@@ -545,31 +594,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)) 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); (struct all_addr *)&source_addr.in.sin_addr, type, NULL, 0);
#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); (struct all_addr *)&source_addr.in6.sin6_addr, type, NULL, 0);
#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); 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, 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)
@@ -588,16 +634,8 @@ static int read_write(int fd, char *packet, int size, int rw)
return 0; return 0;
else if (n == -1) else if (n == -1)
{ {
if (errno == EINTR) if (retry_send())
goto retry; goto retry;
else if (errno == EAGAIN)
{
struct timespec waiter;
waiter.tv_sec = 0;
waiter.tv_nsec = 10000;
nanosleep(&waiter, NULL);
goto retry;
}
else else
return 0; return 0;
} }
@@ -609,18 +647,15 @@ 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 char c1, c2; unsigned char c1, c2;
/* 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)
{ {
@@ -635,7 +670,7 @@ char *tcp_request(int confd, struct mx_record *mxnames,
header = (HEADER *)packet; header = (HEADER *)packet;
if (extract_request(header, (unsigned int)size, namebuff)) 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);
@@ -643,33 +678,33 @@ 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); (struct all_addr *)&peer_addr.in.sin_addr, qtype, NULL, 0);
#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); (struct all_addr *)&peer_addr.in6.sin6_addr, qtype, NULL, 0);
#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)
{ {
unsigned short flags = 0; unsigned short flags = 0;
unsigned short gotname = extract_request(header, (unsigned int)size, namebuff);
struct all_addr *addrp = NULL; struct all_addr *addrp = NULL;
int type = 0; int type = 0;
char *domain = NULL; char *domain = NULL;
if (gotname) if (gotname)
flags = search_servers(servers, options, &addrp, gotname, namebuff, &type, &domain); flags = search_servers(daemon, now, &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)
{ {
@@ -685,7 +720,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;
@@ -726,21 +761,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); (struct all_addr *)&last_server->addr.in.sin_addr, 0, NULL, 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); (struct all_addr *)&last_server->addr.in6.sin6_addr, 0, NULL, 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, m = process_reply(daemon, header, now, &last_server->addr, (unsigned int)m);
&last_server->addr, m, options, edns_pktsz);
break; break;
} }
@@ -748,7 +782,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;
@@ -824,13 +858,15 @@ static struct frec *lookup_frec(unsigned short id)
} }
static struct frec *lookup_frec_by_sender(unsigned short id, static struct frec *lookup_frec_by_sender(unsigned short id,
union mysockaddr *addr) union mysockaddr *addr,
unsigned int crc)
{ {
struct frec *f; struct frec *f;
for(f = frec_list; f; f = f->next) for(f = frec_list; f; f = f->next)
if (f->new_id && if (f->new_id &&
f->orig_id == id && f->orig_id == id &&
f->crc == crc &&
sockaddr_isequal(&f->source, addr)) sockaddr_isequal(&f->source, addr))
return f; return f;
+14 -17
View File
@@ -55,8 +55,9 @@ static int next_token (char *token, int buffsize, FILE * fp)
return count ? 1 : 0; return count ? 1 : 0;
} }
void load_dhcp(char *file, char *suffix, time_t now, char *hostname) void load_dhcp(struct daemon *daemon, time_t now)
{ {
char *hostname = daemon->namebuff;
char token[MAXTOK], *dot; char token[MAXTOK], *dot;
struct in_addr host_address; struct in_addr host_address;
time_t ttd, tts; time_t ttd, tts;
@@ -64,10 +65,10 @@ void load_dhcp(char *file, char *suffix, time_t now, char *hostname)
struct isc_lease *lease, *tmp, **up; struct isc_lease *lease, *tmp, **up;
struct stat statbuf; struct stat statbuf;
if (stat(file, &statbuf) == -1) if (stat(daemon->lease_file, &statbuf) == -1)
{ {
if (!logged_lease) if (!logged_lease)
syslog(LOG_WARNING, "failed to access %s: %m", file); syslog(LOG_WARNING, "failed to access %s: %m", daemon->lease_file);
logged_lease = 1; logged_lease = 1;
return; return;
} }
@@ -81,13 +82,13 @@ void load_dhcp(char *file, char *suffix, time_t now, char *hostname)
lease_file_size = statbuf.st_size; lease_file_size = statbuf.st_size;
lease_file_inode = statbuf.st_ino; lease_file_inode = statbuf.st_ino;
if (!(fp = fopen (file, "r"))) if (!(fp = fopen (daemon->lease_file, "r")))
{ {
syslog (LOG_ERR, "failed to load %s: %m", file); syslog (LOG_ERR, "failed to load %s: %m", daemon->lease_file);
return; return;
} }
syslog (LOG_INFO, "reading %s", file); syslog (LOG_INFO, "reading %s", daemon->lease_file);
while ((next_token(token, MAXTOK, fp))) while ((next_token(token, MAXTOK, fp)))
{ {
@@ -109,7 +110,7 @@ void load_dhcp(char *file, char *suffix, time_t now, char *hostname)
if (!canonicalise(hostname)) if (!canonicalise(hostname))
{ {
*hostname = 0; *hostname = 0;
syslog(LOG_ERR, "bad name in %s", file); syslog(LOG_ERR, "bad name in %s", daemon->lease_file);
} }
} }
else if ((strcmp(token, "ends") == 0) || else if ((strcmp(token, "ends") == 0) ||
@@ -168,7 +169,7 @@ void load_dhcp(char *file, char *suffix, time_t now, char *hostname)
if ((dot = strchr(hostname, '.'))) if ((dot = strchr(hostname, '.')))
{ {
if (!suffix || hostname_isequal(dot+1, suffix)) if (!daemon->domain_suffix || hostname_isequal(dot+1, daemon->domain_suffix))
{ {
syslog(LOG_WARNING, syslog(LOG_WARNING,
"Ignoring DHCP lease for %s because it has an illegal domain part", "Ignoring DHCP lease for %s because it has an illegal domain part",
@@ -198,11 +199,12 @@ void load_dhcp(char *file, char *suffix, time_t now, char *hostname)
{ {
leases = lease; leases = lease;
strcpy(lease->name, hostname); strcpy(lease->name, hostname);
if (suffix && (lease->fqdn = malloc(strlen(hostname) + strlen(suffix) + 2))) if (daemon->domain_suffix &&
(lease->fqdn = malloc(strlen(hostname) + strlen(daemon->domain_suffix) + 2)))
{ {
strcpy(lease->fqdn, hostname); strcpy(lease->fqdn, hostname);
strcat(lease->fqdn, "."); strcat(lease->fqdn, ".");
strcat(lease->fqdn, suffix); strcat(lease->fqdn, daemon->domain_suffix);
} }
} }
} }
@@ -235,13 +237,8 @@ void load_dhcp(char *file, char *suffix, time_t now, char *hostname)
for (lease = leases; lease; lease = lease->next) for (lease = leases; lease; lease = lease->next)
{ {
if (lease->fqdn) cache_add_dhcp_entry(daemon, lease->fqdn, &lease->addr, lease->expires);
{ cache_add_dhcp_entry(daemon, lease->name, &lease->addr, lease->expires);
cache_add_dhcp_entry(lease->fqdn, &lease->addr, lease->expires, F_REVERSE);
cache_add_dhcp_entry(lease->name, &lease->addr, lease->expires, 0);
}
else
cache_add_dhcp_entry(lease->name, &lease->addr, lease->expires, F_REVERSE);
} }
} }
+16 -19
View File
@@ -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,
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,
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)
@@ -165,7 +167,7 @@ void lease_update_file(int force, time_t now)
} }
} }
void lease_update_dns(void) void lease_update_dns(struct daemon *daemon)
{ {
struct dhcp_lease *lease; struct dhcp_lease *lease;
@@ -175,13 +177,8 @@ void lease_update_dns(void)
for (lease = leases; lease; lease = lease->next) for (lease = leases; lease; lease = lease->next)
{ {
if (lease->fqdn) cache_add_dhcp_entry(daemon, lease->fqdn, &lease->addr, lease->expires);
{ cache_add_dhcp_entry(daemon, lease->hostname, &lease->addr, lease->expires);
cache_add_dhcp_entry(lease->fqdn, &lease->addr, lease->expires, F_REVERSE);
cache_add_dhcp_entry(lease->hostname, &lease->addr, lease->expires, 0);
}
else if (lease->hostname)
cache_add_dhcp_entry(lease->hostname, &lease->addr, lease->expires, F_REVERSE);
} }
dns_dirty = 0; dns_dirty = 0;
+108 -85
View File
@@ -14,16 +14,36 @@
#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,
struct iname *names, struct iname *addrs, char *name, int is_loopback, union mysockaddr *addr)
struct iname *except)
{ {
struct irec *iface; struct irec *iface;
struct iname *tmp; struct iname *tmp;
/* If we are restricting the set of interfaces to use, make
sure that loopback interfaces are in that set. */
if (daemon->if_names && is_loopback)
{
struct iname *lo;
for (lo = daemon->if_names; lo; lo = lo->next)
if (lo->name && strcmp(lo->name, name) == 0)
{
lo->isloop = 1;
break;
}
if (!lo)
{
lo = safe_malloc(sizeof(struct iname));
lo->name = safe_string_alloc(name);
lo->isloop = lo->used = 1;
lo->next = daemon->if_names;
daemon->if_names = lo;
}
}
/* 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 +52,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,11 +87,12 @@ 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)
{ {
#if defined(HAVE_LINUX_IPV6_PROC) && defined(HAVE_IPV6)
FILE *f;
#endif
union mysockaddr addr;
struct irec *iface = NULL; struct irec *iface = NULL;
char *buf, *ptr; char *buf, *ptr;
struct ifreq *ifr = NULL; struct ifreq *ifr = NULL;
@@ -104,9 +125,8 @@ struct irec *enumerate_interfaces(struct iname **names,
free(buf); free(buf);
} }
for (ptr = buf; ptr < buf + len; ) for (ptr = buf; ptr < buf + ifc.ifc_len; )
{ {
union mysockaddr addr;
#ifdef HAVE_SOCKADDR_SA_LEN #ifdef HAVE_SOCKADDR_SA_LEN
/* subsequent entries may not be aligned, so copy into /* subsequent entries may not be aligned, so copy into
an aligned buffer to avoid nasty complaints about an aligned buffer to avoid nasty complaints about
@@ -126,7 +146,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 +156,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
@@ -146,75 +166,44 @@ struct irec *enumerate_interfaces(struct iname **names,
if (ioctl(fd, SIOCGIFFLAGS, ifr) < 0) if (ioctl(fd, SIOCGIFFLAGS, ifr) < 0)
die("ioctl error getting interface flags: %m", NULL); die("ioctl error getting interface flags: %m", NULL);
/* If we are restricting the set of interfaces to use, make iface = add_iface(daemon, iface, ifr->ifr_name, ifr->ifr_flags & IFF_LOOPBACK, &addr);
sure that loopback interfaces are in that set. */
if (*names && (ifr->ifr_flags & IFF_LOOPBACK))
{
struct iname *lo;
for (lo = *names; lo; lo = lo->next)
if (lo->name && strcmp(lo->name, ifr->ifr_name) == 0)
{
lo->isloop = 1;
break;
} }
if (!lo)
{
lo = safe_malloc(sizeof(struct iname));
lo->name = safe_string_alloc(ifr->ifr_name);
lo->isloop = lo->used = 1;
lo->next = *names;
*names = lo;
}
}
iface = add_iface(iface, ifr->ifr_name, &addr, *names, *addrs, except);
#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 */
/* This code snarfed from net-tools 1.60 and certainly linux specific, though /* This code snarfed from net-tools 1.60 and certainly linux specific, though
it shouldn't break on other Unices, and their SIOGIFCONF might work. */ it shouldn't break on other Unices, and their SIOGIFCONF might work. */
{ if ((f = fopen(IP6INTERFACES, "r")))
FILE *f = fopen(IP6INTERFACES, "r");
int found = 0;
union mysockaddr addr6;
if (f)
{ {
unsigned int plen, scope, flags, if_idx; unsigned int plen, scope, flags, if_idx;
char devname[20], addrstring[32]; char devname[20], addrstring[32];
while (fscanf(f, "%32s %02x %02x %02x %02x %20s\n", while (fscanf(f, "%32s %x %x %x %x %20s\n",
addrstring, &if_idx, &plen, &scope, &flags, devname) != EOF) addrstring, &if_idx, &plen, &scope, &flags, devname) != EOF)
{
if (strcmp(devname, ifr->ifr_name) == 0)
{ {
int i; int i;
unsigned char *addr6p = (unsigned char *) &addr6.in6.sin6_addr; struct ifreq sifr;
memset(&addr6, 0, sizeof(addr6)); unsigned char *addr6p = (unsigned char *) &addr.in6.sin6_addr;
addr6.sa.sa_family = AF_INET6; memset(&addr, 0, sizeof(addr));
addr.sa.sa_family = AF_INET6;
for (i=0; i<16; i++) for (i=0; i<16; i++)
{ {
unsigned int byte; unsigned int byte;
sscanf(addrstring+i+i, "%02x", &byte); sscanf(addrstring+i+i, "%02x", &byte);
addr6p[i] = byte; addr6p[i] = byte;
} }
addr6.in6.sin6_port = htons(port); addr.in6.sin6_port = htons(daemon->port);
addr6.in6.sin6_flowinfo = htonl(0); addr.in6.sin6_flowinfo = htonl(0);
addr6.in6.sin6_scope_id = htonl(scope); addr.in6.sin6_scope_id = htonl(scope);
found = 1; strncpy(sifr.ifr_name, devname, IF_NAMESIZE);
break; if (ioctl(fd, SIOCGIFFLAGS, &sifr) < 0)
die("ioctl error getting interface flags: %m", NULL);
iface = add_iface(daemon, iface, sifr.ifr_name, sifr.ifr_flags & IFF_LOOPBACK, &addr);
} }
}
fclose(f); fclose(f);
} }
if (found)
iface = add_iface(iface, ifr->ifr_name, &addr6, *names, *addrs, except);
}
#endif /* LINUX */ #endif /* LINUX */
}
if (buf) if (buf)
free(buf); free(buf);
@@ -261,9 +250,15 @@ static int create_ipv6_listener(struct listener **link, int port)
setsockopt(tcpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 || setsockopt(tcpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
setsockopt(fd, IPV6_LEVEL, IPV6_V6ONLY, &opt, sizeof(opt)) == -1 || setsockopt(fd, IPV6_LEVEL, IPV6_V6ONLY, &opt, sizeof(opt)) == -1 ||
setsockopt(tcpfd, IPV6_LEVEL, IPV6_V6ONLY, &opt, sizeof(opt)) == -1 || setsockopt(tcpfd, IPV6_LEVEL, IPV6_V6ONLY, &opt, sizeof(opt)) == -1 ||
(flags = fcntl(fd, F_GETFL, 0)) == -1 ||
fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1 ||
(flags = fcntl(tcpfd, F_GETFL, 0)) == -1 || (flags = fcntl(tcpfd, F_GETFL, 0)) == -1 ||
fcntl(tcpfd, F_SETFL, flags | O_NONBLOCK) == -1 || fcntl(tcpfd, F_SETFL, flags | O_NONBLOCK) == -1 ||
#ifdef IPV6_RECVPKTINFO
setsockopt(fd, IPV6_LEVEL, IPV6_RECVPKTINFO, &opt, sizeof(opt)) == -1 ||
#else
setsockopt(fd, IPV6_LEVEL, IPV6_PKTINFO, &opt, sizeof(opt)) == -1 || setsockopt(fd, IPV6_LEVEL, IPV6_PKTINFO, &opt, sizeof(opt)) == -1 ||
#endif
bind(tcpfd, (struct sockaddr *)&addr, sa_len(&addr)) == -1 || bind(tcpfd, (struct sockaddr *)&addr, sa_len(&addr)) == -1 ||
listen(tcpfd, 5) == -1 || listen(tcpfd, 5) == -1 ||
bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1) bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1)
@@ -322,6 +317,8 @@ struct listener *create_wildcard_listeners(int port)
!create_ipv6_listener(&l6, port) || !create_ipv6_listener(&l6, port) ||
#endif #endif
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 || setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
(flags = fcntl(fd, F_GETFL, 0)) == -1 ||
fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1 ||
#if defined(IP_PKTINFO) #if defined(IP_PKTINFO)
setsockopt(fd, SOL_IP, IP_PKTINFO, &opt, sizeof(opt)) == -1 || setsockopt(fd, SOL_IP, IP_PKTINFO, &opt, sizeof(opt)) == -1 ||
#elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF) #elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF)
@@ -353,20 +350,11 @@ struct listener *create_bound_listeners(struct irec *interfaces, int port)
struct irec *iface; struct irec *iface;
int flags = port, opt = 1; int flags = port, opt = 1;
/* Create bound listeners only for IPv4, IPv6 always binds the wildcard */
#ifdef HAVE_IPV6
if (!create_ipv6_listener(&listeners, port))
die("failed to to create listening socket: %s", NULL);
#endif
for (iface = interfaces ;iface; iface = iface->next) for (iface = interfaces ;iface; iface = iface->next)
if (iface->addr.sa.sa_family == AF_INET)
{ {
struct listener *new = safe_malloc(sizeof(struct listener)); struct listener *new = safe_malloc(sizeof(struct listener));
new->family = iface->addr.sa.sa_family; new->family = iface->addr.sa.sa_family;
new->next = listeners; new->next = listeners;
listeners = new;
if ((new->tcpfd = socket(iface->addr.sa.sa_family, SOCK_STREAM, 0)) == -1 || if ((new->tcpfd = socket(iface->addr.sa.sa_family, SOCK_STREAM, 0)) == -1 ||
(new->fd = socket(iface->addr.sa.sa_family, SOCK_DGRAM, 0)) == -1 || (new->fd = socket(iface->addr.sa.sa_family, SOCK_DGRAM, 0)) == -1 ||
setsockopt(new->fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 || setsockopt(new->fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
@@ -374,10 +362,39 @@ struct listener *create_bound_listeners(struct irec *interfaces, int port)
/* See Stevens 16.6 */ /* See Stevens 16.6 */
(flags = fcntl(new->tcpfd, F_GETFL, 0)) == -1 || (flags = fcntl(new->tcpfd, F_GETFL, 0)) == -1 ||
fcntl(new->tcpfd, F_SETFL, flags | O_NONBLOCK) == -1 || fcntl(new->tcpfd, F_SETFL, flags | O_NONBLOCK) == -1 ||
bind(new->tcpfd, &iface->addr.sa, sa_len(&iface->addr)) == -1 || (flags = fcntl(new->fd, F_GETFL, 0)) == -1 ||
bind(new->fd, &iface->addr.sa, sa_len(&iface->addr)) == -1 || fcntl(new->fd, F_SETFL, flags | O_NONBLOCK) == -1)
listen(new->tcpfd, 5) == -1) die("failed to create listening socket: %s", NULL);
die("failed to to create listening socket: %s", NULL);
#ifdef HAVE_IPV6
if (iface->addr.sa.sa_family == AF_INET6)
{
if (setsockopt(new->fd, IPV6_LEVEL, IPV6_V6ONLY, &opt, sizeof(opt)) == -1 ||
setsockopt(new->tcpfd, IPV6_LEVEL, IPV6_V6ONLY, &opt, sizeof(opt)) == -1)
die("failed to set IPV6 options on listening socket: %s", NULL);
}
#endif
if (bind(new->tcpfd, &iface->addr.sa, sa_len(&iface->addr)) == -1 ||
bind(new->fd, &iface->addr.sa, sa_len(&iface->addr)) == -1)
{
#ifdef HAVE_IPV6
if (iface->addr.sa.sa_family == AF_INET6 && errno == ENODEV)
{
close(new->tcpfd);
close(new->fd);
free(new);
}
else
#endif
die("failed to bind listening socket: %s", NULL);
}
else
{
listeners = new;
if (listen(new->tcpfd, 5) == -1)
die("failed to listen on socket: %s", NULL);
}
} }
return listeners; return listeners;
@@ -386,6 +403,7 @@ struct listener *create_bound_listeners(struct irec *interfaces, int port)
struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds) struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds)
{ {
struct serverfd *sfd; struct serverfd *sfd;
int flags;
/* may have a suitable one already */ /* may have a suitable one already */
for (sfd = *sfds; sfd; sfd = sfd->next ) for (sfd = *sfds; sfd; sfd = sfd->next )
@@ -403,7 +421,9 @@ struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds)
return NULL; return NULL;
} }
if (bind(sfd->fd, (struct sockaddr *)addr, sa_len(addr)) == -1) if (bind(sfd->fd, (struct sockaddr *)addr, sa_len(addr)) == -1 ||
(flags = fcntl(sfd->fd, F_GETFL, 0)) == -1 ||
fcntl(sfd->fd, F_SETFL, flags | O_NONBLOCK) == -1)
{ {
int errsave = errno; /* save error from bind. */ int errsave = errno; /* save error from bind. */
close(sfd->fd); close(sfd->fd);
@@ -419,17 +439,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;
@@ -461,7 +483,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);
@@ -491,15 +513,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.
@@ -529,7 +552,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");
@@ -552,7 +575,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))
@@ -564,7 +587,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
@@ -600,7 +623,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;
} }
+371 -178
View File
@@ -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 "ZDNLERKzowefnbvhdkqr: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:J:"
static struct myoption opts[] = { static struct myoption opts[] = {
{"version", 0, 0, 'v'}, {"version", 0, 0, 'v'},
@@ -72,7 +72,10 @@ static struct myoption opts[] = {
{"alias", 1, 0, 'V' }, {"alias", 1, 0, 'V' },
{"dhcp-vendorclass", 1, 0, 'U'}, {"dhcp-vendorclass", 1, 0, 'U'},
{"dhcp-userclass", 1, 0, 'j'}, {"dhcp-userclass", 1, 0, 'j'},
{"dhcp-ignore", 1, 0, 'J'},
{"edns-packet-max", 1, 0, 'P'}, {"edns-packet-max", 1, 0, 'P'},
{"keep-in-foreground", 0, 0, 'k'},
{"dhcp-authoritative", 0, 0, 'K'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@@ -89,6 +92,8 @@ 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 },
{ 'K', OPT_AUTHORITATIVE },
{ 'o', OPT_ORDER }, { 'o', OPT_ORDER },
{ 'R', OPT_NO_RESOLV }, { 'R', OPT_NO_RESOLV },
{ 'E', OPT_EXPAND }, { 'E', OPT_EXPAND },
@@ -103,8 +108,11 @@ static struct optflags optmap[] = {
}; };
static char *usage = static char *usage =
"Usage: dnsmasq [options]\n" "Usage: dnsmasq [options]\n\n"
"\nValid options are :\n" #ifndef HAVE_GETOPT_LONG
"Use short options only on the command line.\n"
#endif
"Valid options are :\n"
"-a, --listen-address=ipaddr Specify local address(es) to listen on.\n" "-a, --listen-address=ipaddr Specify local address(es) to listen on.\n"
"-A, --address=/domain/ipaddr Return ipaddr for all hosts in specified domains.\n" "-A, --address=/domain/ipaddr Return ipaddr for all hosts in specified domains.\n"
"-b, --bogus-priv Fake reverse lookups for RFC1918 private address ranges.\n" "-b, --bogus-priv Fake reverse lookups for RFC1918 private address ranges.\n"
@@ -124,6 +132,9 @@ 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"
"-J, --dhcp-ignore=<id> Don't do DHCP for hosts in option set.\n"
"-k, --keep-in-foreground Do NOT fork into the background, do NOT run in debug mode.\n"
"-K, --dhcp-authoritative Assume we are the only DHCP server on the local network.\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,28 +166,37 @@ 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 *problem = NULL, *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 *comma, *file_name_save = NULL, *conffile = CONFFILE;
int conffile_set = 0; int hosts_index = 1, 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)
{ {
problem = NULL;
if (!f) if (!f)
#ifdef HAVE_GETOPT_LONG #ifdef HAVE_GETOPT_LONG
option = getopt_long(argc, argv, OPTSTRING, (struct option *)opts, NULL); option = getopt_long(argc, argv, OPTSTRING, (struct option *)opts, NULL);
@@ -274,7 +294,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 +339,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,22 +366,24 @@ 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;
} }
case 'm': case 'm':
{ {
char *comma = strchr(optarg, ','); if ((comma = strchr(optarg, ',')))
if (comma)
*(comma++) = 0; *(comma++) = 0;
if (!canonicalise(optarg) || (comma && !canonicalise(comma))) if (!canonicalise(optarg) || (comma && !canonicalise(comma)))
{
option = '?'; option = '?';
problem = "bad MX name";
}
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 */
} }
@@ -370,63 +392,75 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
case 't': case 't':
if (!canonicalise(optarg)) if (!canonicalise(optarg))
{
option = '?'; option = '?';
problem = "bad MX target";
}
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) {
option = '?'; struct hostsfile *new = safe_malloc(sizeof(struct hostsfile));
else new->fname = safe_string_alloc(optarg);
*addn_hosts = safe_string_alloc(optarg); new->index = hosts_index++;
new->next = daemon->addn_hosts;
daemon->addn_hosts = new;
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':
{ do {
struct iname *new = safe_malloc(sizeof(struct iname)); struct iname *new = safe_malloc(sizeof(struct iname));
new->next = *if_names; if ((comma = strchr(optarg, ',')))
*if_names = new; *comma++ = 0;
new->next = daemon->if_names;
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;
optarg = comma;
} while (optarg);
break; break;
}
case 'I': case 'I':
{ do {
struct iname *new = safe_malloc(sizeof(struct iname)); struct iname *new = safe_malloc(sizeof(struct iname));
new->next = *if_except; if ((comma = strchr(optarg, ',')))
*if_except = new; *comma++ = 0;
new->next = daemon->if_except;
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;
optarg = comma;
} while (optarg);
break; break;
}
case 'B': case 'B':
{ {
@@ -434,8 +468,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
@@ -444,9 +478,11 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
} }
case 'a': case 'a':
{ do {
struct iname *new = safe_malloc(sizeof(struct iname)); struct iname *new = safe_malloc(sizeof(struct iname));
new->next = *if_addrs; if ((comma = strchr(optarg, ',')))
*comma++ = 0;
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))
{ {
@@ -476,14 +512,14 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
{ {
option = '?'; /* error */ option = '?'; /* error */
free(new); free(new);
new = NULL;
}
if (new)
*if_addrs = new;
break; break;
} }
daemon->if_addrs = new;
optarg = comma;
} while (optarg);
break;
case 'S': case 'S':
case 'A': case 'A':
{ {
@@ -553,7 +589,10 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
{ {
*portno = 0; *portno = 0;
if (!atoi_check(portno+1, &source_port)) if (!atoi_check(portno+1, &source_port))
{
option = '?'; option = '?';
problem = "bad port";
}
} }
} }
@@ -561,7 +600,10 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
{ {
*portno = 0; *portno = 0;
if (!atoi_check(portno+1, &serv_port)) if (!atoi_check(portno+1, &serv_port))
{
option = '?'; option = '?';
problem = "bad port";
}
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
@@ -633,8 +675,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 +695,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 +710,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,28 +725,31 @@ 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;
case 'F': case 'F':
{ {
int k, leasepos = 2; int k, leasepos = 2;
char *cp, *comma, *a[5] = { NULL, NULL, NULL, NULL, NULL }; char *cp, *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;
problem = "bad dhcp-range";
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,21 +775,38 @@ 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 != '?' && k >= 3 && strchr(a[2], '.') &&
((new->netmask.s_addr = inet_addr(a[2])) != (in_addr_t)-1))
{
leasepos = 3;
if (!is_same_net(new->start, new->end, new->netmask))
{
problem = "inconsistent DHCP range";
option = '?';
}
}
if (option == '?') if (option == '?')
{ {
free(new); free(new);
break; break;
} }
else else
*dhcp = new; daemon->dhcp = new;
if (k >= 3 && strchr(a[2], '.') &&
((new->netmask.s_addr = inet_addr(a[2])) != (in_addr_t)-1))
leasepos = 3;
if (k >= 4 && strchr(a[3], '.') && if (k >= 4 && strchr(a[3], '.') &&
((new->broadcast.s_addr = inet_addr(a[3])) != (in_addr_t)-1)) ((new->broadcast.s_addr = inet_addr(a[3])) != (in_addr_t)-1))
@@ -779,8 +841,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 +854,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;
@@ -852,10 +914,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
memcpy(new->clid, arg, len); memcpy(new->clid, arg, len);
} }
} }
else if ((arg[0] == 'n' || arg[0] == 'N') && else if (strstr(arg, "net:") == arg)
(arg[1] == 'e' || arg[1] == 'E') &&
(arg[2] == 't' || arg[3] == 'T') &&
arg[3] == ':')
{ {
new->flags |= CONFIG_NETID; new->flags |= CONFIG_NETID;
new->netid.net = safe_string_alloc(arg+4); new->netid.net = safe_string_alloc(arg+4);
@@ -934,6 +993,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
if (option == '?') if (option == '?')
{ {
problem = "bad dhcp-host";
if (new->flags & CONFIG_NAME) if (new->flags & CONFIG_NAME)
free(new->hostname); free(new->hostname);
if (new->flags & CONFIG_CLID) if (new->flags & CONFIG_CLID)
@@ -944,9 +1004,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;
} }
@@ -954,49 +1014,109 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
case 'O': case 'O':
{ {
struct dhcp_opt *new = safe_malloc(sizeof(struct dhcp_opt)); struct dhcp_opt *new = safe_malloc(sizeof(struct dhcp_opt));
char *cp, *comma; char *cp;
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;
new->val = NULL;
if ((comma = strchr(optarg, ','))) if ((comma = strchr(optarg, ',')))
{ {
*comma = 0; struct dhcp_netid *np = NULL;
*comma++ = 0;
do {
for (cp = optarg; *cp; cp++) for (cp = optarg; *cp; cp++)
if (!(*cp == ' ' || (*cp >='0' && *cp <= '9'))) if (!(*cp == ' ' || (*cp >='0' && *cp <= '9')))
break; break;
if (!*cp)
break;
if (*cp) new->netid = safe_malloc(sizeof (struct dhcp_netid));
{ new->netid->net = safe_string_alloc(optarg);
new->netid = safe_string_alloc(optarg); new->netid->next = np;
optarg = comma + 1; np = new->netid;
optarg = comma;
if ((comma = strchr(optarg, ','))) if ((comma = strchr(optarg, ',')))
*comma = 0; *comma++ = 0;
} } while (optarg);
} }
if ((new->opt = atoi(optarg)) == 0) if (!optarg || (new->opt = atoi(optarg)) == 0)
{ {
option = '?'; option = '?';
if (new->netid) problem = "bad dhcp-option";
free(new->netid); }
free(new); else if (comma && new->opt == 119)
{
/* dns search, RFC 3397 */
unsigned char *q, *r, *tail;
unsigned char *p = NULL;
int newlen, len = 0;
optarg = comma;
if ((comma = strchr(optarg, ',')))
*(comma++) = 0;
while (optarg && *optarg)
{
if (!canonicalise(optarg))
{
option = '?';
problem = "bad domain in dhcp-option";
break; break;
} }
*dhcp_opts = new; if (!(r = realloc(p, len + strlen(optarg) + 2)))
die("could not get memory", NULL);
p = memmove(r, p, len);
if (!comma) q = p + len;
break;
/* add string on the end in RFC1035 format */
while (*optarg)
{
char *cp = q++;
int j;
for (j = 0; *optarg && (*optarg != '.'); optarg++, j++)
*q++ = *optarg;
*cp = j;
if (*optarg)
optarg++;
}
*q++ = 0;
/* Now tail-compress using earlier names. */
newlen = q - p;
for (tail = p + len; *tail; tail += (*tail) + 1)
for (r = p; r - p < len; r += (*r) + 1)
if (strcmp(r, tail) == 0)
{
PUTSHORT((r - p) | 0xc000, tail);
newlen = tail - p;
goto end;
}
end:
len = newlen;
optarg = comma;
if (optarg && (comma = strchr(optarg, ',')))
*(comma++) = 0;
}
new->len = len;
new->val = p;
}
else if (comma)
{
/* not option 119 */
/* characterise the value */ /* characterise the value */
is_addr = is_hex = is_dec = 1; is_addr = is_hex = is_dec = 1;
addrs = digs = 1; addrs = digs = 1;
for (cp = comma+1; *cp; cp++) for (cp = comma; *cp; cp++)
if (*cp == ',') if (*cp == ',')
{ {
addrs++; addrs++;
@@ -1009,7 +1129,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
} }
else if (*cp == '.') else if (*cp == '.')
is_dec = is_hex = 0; is_dec = is_hex = 0;
else if (!(*cp >='0' && *cp <= '9')) else if (!((*cp >='0' && *cp <= '9') || *cp == '-'))
{ {
is_dec = is_addr = 0; is_dec = is_addr = 0;
if (!((*cp >='A' && *cp <= 'F') || if (!((*cp >='A' && *cp <= 'F') ||
@@ -1019,7 +1139,7 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
if (is_hex && digs > 1) if (is_hex && digs > 1)
{ {
char *p = comma+1, *q, *r; char *p = comma, *q, *r;
new->len = digs; new->len = digs;
q = new->val = safe_malloc(new->len); q = new->val = safe_malloc(new->len);
while (*p) while (*p)
@@ -1044,31 +1164,24 @@ 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, int i, val = atoi(comma);
this applaing hack is the best available */ /* assume numeric arg is 1 byte except for
unsigned int val = atoi(comma+1); options where it is known otherwise. */
if (val < 256) switch (new->opt)
{ {
default:
new->len = 1; new->len = 1;
new->val = safe_malloc(1); break;
*(new->val) = val; case 13: case 22: case 25: case 26:
}
else if (val < 65536)
{
new->len = 2; new->len = 2;
new->val = safe_malloc(2); break;
*(new->val) = val>>8; case 2: case 24: case 35: case 38:
*(new->val+1) = val;
}
else
{
new->len = 4; new->len = 4;
new->val = safe_malloc(4); break;
*(new->val) = val>>24;
*(new->val+1) = val>>16;
*(new->val+2) = val>>8;
*(new->val+3) = val;
} }
new->val = safe_malloc(new->len);
for (i=0; i<new->len; i++)
new->val[i] = val>>((new->len - i - 1)*8);
} }
else if (is_addr) else if (is_addr)
{ {
@@ -1080,9 +1193,9 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
while (addrs--) while (addrs--)
{ {
cp = comma; cp = comma;
if ((comma = strchr(cp+1, ','))) if ((comma = strchr(cp, ',')))
*comma = 0; *comma++ = 0;
in.s_addr = inet_addr(cp+1); in.s_addr = inet_addr(cp);
memcpy(op, &in, INADDRSZ); memcpy(op, &in, INADDRSZ);
op += INADDRSZ; op += INADDRSZ;
} }
@@ -1090,37 +1203,92 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
else else
{ {
/* text arg */ /* text arg */
new->len = strlen(comma+1); new->len = strlen(comma);
new->val = safe_malloc(new->len); new->val = safe_malloc(new->len);
memcpy(new->val, comma+1, new->len); memcpy(new->val, comma, new->len);
} }
}
if (new->len > 256)
{
option = '?';
problem = "dhcp-option too long";
}
if (option == '?')
{
if (new->netid)
free(new->netid);
if (new->val)
free(new->val);
free(new);
}
else
daemon->dhcp_opts = new;
break; break;
} }
case 'M': case 'M':
{ {
char *comma; struct dhcp_netid *id = NULL;
while (optarg && strstr(optarg, "net:") == optarg)
{
struct dhcp_netid *newid = safe_malloc(sizeof(struct dhcp_netid));
newid->next = id;
id = newid;
if ((comma = strchr(optarg, ','))) if ((comma = strchr(optarg, ',')))
*comma = 0; *comma++ = 0;
*dhcp_file = safe_string_alloc(optarg); newid->net = safe_string_alloc(optarg+4);
optarg = comma;
};
if (!optarg)
option = '?';
else
{
char *dhcp_file, *dhcp_sname = NULL;
struct in_addr dhcp_next_server;
if ((comma = strchr(optarg, ',')))
*comma++ = 0;
dhcp_file = safe_string_alloc(optarg);
dhcp_next_server.s_addr = 0;
if (comma) if (comma)
{ {
optarg = comma+1; optarg = comma;
if ((comma = strchr(optarg, ','))) if ((comma = strchr(optarg, ',')))
*comma = 0; *comma++ = 0;
*dhcp_sname = safe_string_alloc(optarg); dhcp_sname = safe_string_alloc(optarg);
if (comma && (dhcp_next_server->s_addr = inet_addr(comma+1)) == (in_addr_t)-1) if (comma && (dhcp_next_server.s_addr = inet_addr(comma)) == (in_addr_t)-1)
option = '?'; option = '?';
} }
if (option != '?')
{
struct dhcp_boot *new = safe_malloc(sizeof(struct dhcp_boot));
new->file = dhcp_file;
new->sname = dhcp_sname;
new->next_server = dhcp_next_server;
new->netid = id;
new->next = daemon->boot_config;
daemon->boot_config = new;
}
}
if (option == '?')
{
struct dhcp_netid *tmp;
for (; id; id = tmp)
{
tmp = id->next;
free(id);
}
}
break; break;
} }
case 'U': case 'U':
case 'j': case 'j':
{ {
char *comma;
if (!(comma = strchr(optarg, ','))) if (!(comma = strchr(optarg, ',')))
option = '?'; option = '?';
else else
@@ -1132,12 +1300,32 @@ 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;
} }
case 'J':
{
struct dhcp_netid_list *new = safe_malloc(sizeof(struct dhcp_netid_list));
struct dhcp_netid *list = NULL;
new->next = daemon->dhcp_ignore;
daemon->dhcp_ignore = new;
do {
struct dhcp_netid *member = safe_malloc(sizeof(struct dhcp_netid));
if ((comma = strchr(optarg, ',')))
*comma++ = 0;
member->next = list;
list = member;
member->net = safe_string_alloc(optarg);
optarg = comma;
} while (optarg);
new->list = list;
break;
}
case 'V': case 'V':
{ {
char *a[3] = { NULL, NULL, NULL }; char *a[3] = { NULL, NULL, NULL };
@@ -1170,8 +1358,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;
} }
@@ -1182,75 +1370,80 @@ unsigned int read_opts (int argc, char **argv, char *buff, struct resolvc **reso
{ {
if (f) if (f)
{ {
sprintf(buff, "error at line %d of %s ", lineno, conffile); sprintf(buff, "%s at line %d of %s ",
problem ? problem : "error", lineno, conffile);
complain(buff, NULL); complain(buff, NULL);
} }
else else
die("bad command line options: try --help.", NULL); #ifdef HAVE_GETOPT_LONG
} die("bad command line options: %s.", problem ? problem : "try --help");
} #else
die("bad command line options: %s.", problem ? problem : "try -w");
/* port might no be known when the address is parsed - fill in here */
if (*serv_addrs)
{
struct server *tmp;
for (tmp = *serv_addrs; tmp; tmp = tmp->next)
if (!(tmp->flags & SERV_HAS_SOURCE))
{
if (tmp->source_addr.sa.sa_family == AF_INET)
tmp->source_addr.in.sin_port = htons(*query_port);
#ifdef HAVE_IPV6
else if (tmp->source_addr.sa.sa_family == AF_INET6)
tmp->source_addr.in6.sin6_port = htons(*query_port);
#endif #endif
} }
} }
if (*if_addrs) /* port might no be known when the address is parsed - fill in here */
if (daemon->servers)
{
struct server *tmp;
for (tmp = daemon->servers; tmp; tmp = tmp->next)
if (!(tmp->flags & SERV_HAS_SOURCE))
{
if (tmp->source_addr.sa.sa_family == AF_INET)
tmp->source_addr.in.sin_port = htons(daemon->query_port);
#ifdef HAVE_IPV6
else if (tmp->source_addr.sa.sa_family == AF_INET6)
tmp->source_addr.in6.sin6_port = htons(daemon->query_port);
#endif
}
}
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 (!daemon->mxtarget)
daemon->mxtarget = safe_string_alloc(buff);
} }
if (!*mxtarget) if (daemon->options & OPT_NO_RESOLV)
*mxtarget = safe_string_alloc(buff); daemon->resolv_files = 0;
} else if (daemon->resolv_files && (daemon->resolv_files)->next && (daemon->options & OPT_NO_POLL))
if (flags & OPT_NO_RESOLV)
*resolv_files = 0;
else if (*resolv_files && (*resolv_files)->next && (flags & 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 +1454,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;
} }
+350 -250
View File
@@ -306,18 +306,11 @@ static unsigned char *skip_questions(HEADER *header, unsigned int plen)
return ansp; return ansp;
} }
unsigned char *find_pseudoheader(HEADER *header, unsigned int plen) static unsigned char *skip_section(unsigned char *ansp, int count, HEADER *header, unsigned int plen)
{ {
/* See if packet has an RFC2671 pseudoheader, and if so return a pointer to it. */ int i, rdlen;
int i, arcount = ntohs(header->arcount); for (i = 0; i < count; i++)
unsigned char *ansp;
unsigned short rdlen, type;
if (arcount == 0 || !(ansp = skip_questions(header, plen)))
return NULL;
for (i = 0; i < (ntohs(header->ancount) + ntohs(header->nscount)); i++)
{ {
if (!(ansp = skip_name(ansp, header, plen))) if (!(ansp = skip_name(ansp, header, plen)))
return NULL; return NULL;
@@ -328,9 +321,69 @@ unsigned char *find_pseudoheader(HEADER *header, unsigned int plen)
ansp += rdlen; ansp += rdlen;
} }
return ansp;
}
/* CRC all the bytes of the question section. This is used to
safely detect query retransmision. */
unsigned int questions_crc(HEADER *header, unsigned int plen)
{
unsigned char *start, *end = skip_questions(header, plen);
unsigned int crc = 0xffffffff;
if (end)
for (start = (unsigned char *)(header+1); start < end; start++)
{
int i = 8;
crc ^= *start << 24;
while (i--)
crc = crc & 0x80000000 ? (crc << 1) ^ 0x04c11db7 : crc << 1;
}
return crc;
}
int resize_packet(HEADER *header, unsigned int plen, unsigned char *pheader, unsigned int hlen)
{
unsigned char *ansp = skip_questions(header, plen);
if (!ansp)
return 0;
if (!(ansp = skip_section(ansp, ntohs(header->ancount) + ntohs(header->nscount) + ntohs(header->arcount),
header, plen)))
return 0;
/* restore pseudoheader */
if (pheader && ntohs(header->arcount) == 0)
{
/* must use memmove, may overlap */
memmove(ansp, pheader, hlen);
header->arcount = htons(1);
ansp += hlen;
}
return ansp - (unsigned char *)header;
}
unsigned char *find_pseudoheader(HEADER *header, unsigned int plen, unsigned int *len, unsigned char **p)
{
/* See if packet has an RFC2671 pseudoheader, and if so return a pointer to it.
also return length of pseudoheader in *len and pointer to the UDP size in *p */
int i, arcount = ntohs(header->arcount);
unsigned char *ansp;
unsigned short rdlen, type;
if (arcount == 0 || !(ansp = skip_questions(header, plen)))
return NULL;
if (!(ansp = skip_section(ansp, ntohs(header->ancount) + ntohs(header->nscount), header, plen)))
return NULL;
for (i = 0; i < arcount; i++) for (i = 0; i < arcount; i++)
{ {
unsigned char *save; unsigned char *save, *start = ansp;
if (!(ansp = skip_name(ansp, header, plen))) if (!(ansp = skip_name(ansp, header, plen)))
return NULL; return NULL;
@@ -340,9 +393,15 @@ 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)
return save;
ansp += rdlen; ansp += rdlen;
if (type == T_OPT)
{
if (len)
*len = ansp - start;
if (p)
*p = save;
return start;
}
} }
return NULL; return NULL;
@@ -361,9 +420,9 @@ static int private_net(struct all_addr *addrp)
return 0; return 0;
} }
static unsigned char *add_text_record(unsigned int nameoffset, unsigned char *p, static unsigned char *add_text_record(HEADER *header, unsigned int nameoffset, unsigned char *p,
unsigned long ttl, unsigned short pref, unsigned long ttl, unsigned short pref,
unsigned short type, char *name) unsigned short type, char *name, int *offset)
{ {
unsigned char *sav, *cp; unsigned char *sav, *cp;
int j; int j;
@@ -392,105 +451,12 @@ static unsigned char *add_text_record(unsigned int nameoffset, unsigned char *p,
j = p - sav - 2; j = p - sav - 2;
PUTSHORT(j, sav); /* Real RDLENGTH */ PUTSHORT(j, sav); /* Real RDLENGTH */
if (offset)
*offset = sav - (unsigned char *)header;
return p; return p;
} }
/* On receiving an NXDOMAIN or NODATA reply, determine which names are known
not to exist for negative caching. name if a working buffer passed in. */
void extract_neg_addrs(HEADER *header, unsigned int qlen, char *name, time_t now)
{
unsigned char *p;
int i, found_soa = 0;
int qtype, qclass, rdlen;
unsigned long ttl, minttl = 0;
unsigned short flags = F_NEG;
if (header->rcode == NXDOMAIN)
flags |= F_NXDOMAIN;
/* there may be more than one question with some questions
answered. We don't generate negative entries from those. */
if (ntohs(header->ancount) != 0)
return;
if (!(p = skip_questions(header, qlen)))
return; /* bad packet */
/* we first need to find SOA records, to get min TTL, then we
add a NEG cache entry for each question. */
for (i=0; i<ntohs(header->nscount); i++)
{
if (!extract_name(header, qlen, &p, name, 1))
return; /* bad packet */
GETSHORT(qtype, p);
GETSHORT(qclass, p);
GETLONG(ttl, p);
GETSHORT(rdlen, p);
if ((qclass == C_IN) && (qtype == T_SOA))
{
int dummy;
/* MNAME */
if (!extract_name(header, qlen, &p, name, 1))
return;
/* RNAME */
if (!extract_name(header, qlen, &p, name, 1))
return;
GETLONG(dummy, p); /* SERIAL */
GETLONG(dummy, p); /* REFRESH */
GETLONG(dummy, p); /* RETRY */
GETLONG(dummy, p); /* EXPIRE */
if (!found_soa)
{
found_soa = 1;
minttl = ttl;
}
else if (ttl < minttl)
minttl = ttl;
GETLONG(ttl, p); /* minTTL */
if (ttl < minttl)
minttl = ttl;
}
else
p += rdlen;
if ((unsigned int)(p - (unsigned char *)header) > qlen)
return; /* bad packet */
}
if (!found_soa)
return; /* failed to find SOA */
cache_start_insert();
p = (unsigned char *)(header+1);
for (i=0; i<ntohs(header->qdcount); i++)
{
struct all_addr addr;
int is_arpa;
if (!extract_name(header, qlen, &p, name, 1))
return; /* bad packet */
GETSHORT(qtype, p);
GETSHORT(qclass, p);
if (qclass == C_IN && qtype == T_PTR && (is_arpa = in_arpa_name_2_addr(name, &addr)))
cache_insert(name, &addr, now, minttl , is_arpa | F_REVERSE | flags);
else if (qclass == C_IN && qtype == T_A)
cache_insert(name, NULL, now, minttl, F_IPV4 | F_FORWARD | flags);
#ifdef HAVE_IPV6
else if (qclass == C_IN && qtype == T_AAAA)
cache_insert(name, NULL, now, minttl, F_IPV6 | F_FORWARD | flags);
#endif
}
cache_end_insert();
}
static void dns_doctor(HEADER *header, struct doctor *doctor, struct in_addr *addr) static void dns_doctor(HEADER *header, struct doctor *doctor, struct in_addr *addr)
{ {
for (; doctor; doctor = doctor->next) for (; doctor; doctor = doctor->next)
@@ -501,147 +467,247 @@ static void dns_doctor(HEADER *header, struct doctor *doctor, struct in_addr *ad
/* Since we munged the data, the server it came from is no longer authoritative */ /* Since we munged the data, the server it came from is no longer authoritative */
header->nscount = htons(0); header->nscount = htons(0);
header->arcount = htons(0); header->arcount = htons(0);
header->aa = 0;
break; break;
} }
} }
void extract_addresses(HEADER *header, unsigned int qlen, char *name, static int find_soa(HEADER *header, unsigned int qlen)
time_t now, struct doctor *doctors)
{ {
unsigned char *p, *psave, *endrr; unsigned char *p;
int qtype, qclass, rdlen; int qtype, qclass, rdlen;
unsigned long ttl; unsigned long ttl, minttl = ULONG_MAX;
int i; int i, found_soa = 0;
/* skip over questions */ /* first move to NS section and find TTL from any SOA section */
if (!(p = skip_questions(header, qlen))) if (!(p = skip_questions(header, qlen)) ||
return; /* bad packet */ !(p = skip_section(p, ntohs(header->ancount), header, qlen)))
return 0; /* bad packet */
cache_start_insert(); for (i=0; i<ntohs(header->nscount); i++)
psave = p;
for (i=0; i<ntohs(header->ancount); i++)
{ {
unsigned char *origname = p; if (!(p = skip_name(p, header, qlen)))
if (!extract_name(header, qlen, &p, name, 1)) return 0; /* bad packet */
return; /* bad packet */
GETSHORT(qtype, p); GETSHORT(qtype, p);
GETSHORT(qclass, p); GETSHORT(qclass, p);
GETLONG(ttl, p); GETLONG(ttl, p);
GETSHORT(rdlen, p); GETSHORT(rdlen, p);
endrr = p + rdlen; if ((qclass == C_IN) && (qtype == T_SOA))
if ((unsigned int)(endrr - (unsigned char *)header) > qlen)
return; /* bad packet */
if (qclass != C_IN)
{ {
p = endrr; found_soa = 1;
continue; if (ttl < minttl)
minttl = ttl;
/* MNAME */
if (!(p = skip_name(p, header, qlen)))
return 0;
/* RNAME */
if (!(p = skip_name(p, header, qlen)))
return 0;
p += 16; /* SERIAL REFRESH RETRY EXPIRE */
GETLONG(ttl, p); /* minTTL */
if (ttl < minttl)
minttl = ttl;
}
else
p += rdlen;
if ((unsigned int)(p - (unsigned char *)header) > qlen)
return 0; /* bad packet */
} }
if (qtype == T_A) /* A record. */ return found_soa ? minttl : 0;
{ }
dns_doctor(header, doctors, (struct in_addr *)p);
cache_insert(name, (struct all_addr *)p, now, /* Note that the following code can create CNAME chains that don't point to a real record,
ttl, F_IPV4 | F_FORWARD); either because of lack of memory, or lack of SOA records. These are treated by the cache code as
} expired and cleaned out that way. */
#ifdef HAVE_IPV6 void extract_addresses(HEADER *header, unsigned int qlen, char *name, time_t now, struct daemon *daemon)
else if (qtype == T_AAAA) /* IPV6 address record. */ {
cache_insert(name, (struct all_addr *)p, now, unsigned char *p, *p1, *endrr;
ttl, F_IPV6 | F_FORWARD); int i, j, qtype, qclass, aqtype, aqclass, ardlen, res, searched_soa = 0;
#endif
else if (qtype == T_PTR) cache_start_insert();
{
/* PTR record */ /* go through the questions. */
struct all_addr addr; p = (unsigned char *)(header+1);
int name_encoding = in_arpa_name_2_addr(name, &addr);
if (name_encoding) for (i = 0; i<ntohs(header->qdcount); i++)
{ {
int found = 0, cname_count = 5;
struct crec *cpp = NULL;
int flags = header->rcode == NXDOMAIN ? F_NXDOMAIN : 0;
unsigned long cttl = ULONG_MAX, attl, ttl = 0;
if (!extract_name(header, qlen, &p, name, 1)) if (!extract_name(header, qlen, &p, name, 1))
return; /* bad packet */ return; /* bad packet */
cache_insert(name, &addr, now,
ttl, name_encoding | F_REVERSE);
}
}
else if (qtype == T_CNAME)
{
/* CNAME, search whole answer section again */
unsigned char *endrr1;
unsigned long cttl;
int j;
unsigned char *targp = p;
p = psave; /* rewind p */
for (j=0; j<ntohs(header->ancount); j++)
{
int res;
unsigned char *tmp = targp;
/* copy since it gets altered by extract_name */
/* get CNAME target each time round */
if (!extract_name(header, qlen, &tmp, name, 1))
return; /* bad packet */
/* compare this name with target of CNAME in name buffer */
if (!(res = extract_name(header, qlen, &p, name, 0)))
return; /* bad packet */
GETSHORT(qtype, p); GETSHORT(qtype, p);
GETSHORT(qclass, p); GETSHORT(qclass, p);
GETLONG(cttl, p);
GETSHORT(rdlen, p);
endrr1 = p+rdlen; if (qclass != C_IN)
if ((unsigned int)(endrr1 - (unsigned char *)header) > qlen)
return; /* bad packet */
/* is this RR name same as target of CNAME */
if ((qclass != C_IN) || (res == 2))
{
p = endrr1;
continue; continue;
}
/* match, use name of CNAME, data from this RR /* PTRs: we chase CNAMEs here, since we have no way to
use min TTL of two */ represent them in the cache. */
if (qtype == T_PTR)
if (ttl < cttl)
cttl = ttl;
/* get orig. name back again */
tmp = origname;
if (!extract_name(header, qlen, &tmp, name, 1))
return;
if (qtype == T_A) /* A record. */
{ {
dns_doctor(header, doctors, (struct in_addr *)p);
cache_insert(name, (struct all_addr *)p, now,
cttl, F_IPV4 | F_FORWARD);
}
#ifdef HAVE_IPV6
else if (qtype == T_AAAA) /* IPV6 address record. */
cache_insert(name, (struct all_addr *)p, now,
cttl, F_IPV6 | F_FORWARD);
#endif
else if (qtype == T_PTR)
{
/* PTR record extract address from CNAME name */
struct all_addr addr; struct all_addr addr;
int name_encoding = in_arpa_name_2_addr(name, &addr); int name_encoding = in_arpa_name_2_addr(name, &addr);
if (name_encoding)
if (!name_encoding)
continue;
if (!(flags & F_NXDOMAIN))
{ {
if (!extract_name(header, qlen, &p, name, 1)) cname_loop:
if (!(p1 = skip_questions(header, qlen)))
return;
for (j = 0; j<ntohs(header->ancount); j++)
{
if (!(res = extract_name(header, qlen, &p1, name, 0)))
return; /* bad packet */
GETSHORT(aqtype, p1);
GETSHORT(aqclass, p1);
GETLONG(attl, p1);
GETSHORT(ardlen, p1);
endrr = p1+ardlen;
/* TTL of record is minimum of CNAMES and PTR */
if (attl < cttl)
cttl = attl;
if (aqclass == C_IN && res != 2 && (aqtype == T_CNAME || aqtype == T_PTR))
{
if (!extract_name(header, qlen, &p1, name, 1))
return;
if (aqtype == T_CNAME)
{
if (!cname_count--)
return; /* looped CNAMES */
goto cname_loop;
}
cache_insert(name, &addr, now, cttl, name_encoding | F_REVERSE);
found = 1;
}
p1 = endrr;
if ((unsigned int)(p1 - (unsigned char *)header) > qlen)
return; /* bad packet */ return; /* bad packet */
cache_insert(name, &addr, now, cttl,
name_encoding | F_REVERSE);
} }
} }
p = endrr1;
if (!found && !(daemon->options & OPT_NO_NEG))
{
if (!searched_soa)
{
searched_soa = 1;
ttl = find_soa(header, qlen);
}
if (ttl)
cache_insert(name, &addr, now, ttl, name_encoding | F_REVERSE | F_NEG | flags);
}
}
else
{
/* everything other than PTR */
struct crec *newc;
if (qtype == T_A)
flags |= F_IPV4;
#ifdef HAVE_IPV6
else if (qtype == T_AAAA)
flags |= F_IPV6;
#endif
else
continue;
if (!(flags & F_NXDOMAIN))
{
cname_loop1:
if (!(p1 = skip_questions(header, qlen)))
return;
for (j = 0; j<ntohs(header->ancount); j++)
{
if (!(res = extract_name(header, qlen, &p1, name, 0)))
return; /* bad packet */
GETSHORT(aqtype, p1);
GETSHORT(aqclass, p1);
GETLONG(attl, p1);
GETSHORT(ardlen, p1);
endrr = p1+ardlen;
if (aqclass == C_IN && res != 2 && (aqtype == T_CNAME || aqtype == qtype))
{
if (aqtype == T_CNAME)
{
if (!cname_count--)
return; /* looped CNAMES */
newc = cache_insert(name, NULL, now, attl, F_CNAME | F_FORWARD);
if (newc && cpp)
{
cpp->addr.cname.cache = newc;
cpp->addr.cname.uid = newc->uid;
}
cpp = newc;
if (attl < cttl)
cttl = attl;
if (!extract_name(header, qlen, &p1, name, 1))
return;
goto cname_loop1;
}
else
{
found = 1;
if (aqtype == T_A)
dns_doctor(header, daemon->doctors, (struct in_addr *)p1);
newc = cache_insert(name, (struct all_addr *)p1, now, attl, flags | F_FORWARD);
if (newc && cpp)
{
cpp->addr.cname.cache = newc;
cpp->addr.cname.uid = newc->uid;
}
cpp = NULL;
}
}
p1 = endrr;
if ((unsigned int)(p1 - (unsigned char *)header) > qlen)
return; /* bad packet */
}
}
if (!found && !(daemon->options & OPT_NO_NEG))
{
if (!searched_soa)
{
searched_soa = 1;
ttl = find_soa(header, qlen);
}
/* If there's no SOA to get the TTL from, but there is a CNAME
pointing at this, inherit it's TTL */
if (ttl || cpp)
{
newc = cache_insert(name, (struct all_addr *)p, now, ttl ? ttl : cttl, F_FORWARD | F_NEG | flags);
if (newc && cpp)
{
cpp->addr.cname.cache = newc;
cpp->addr.cname.uid = newc->uid;
}
}
} }
} }
p = endrr;
} }
cache_end_insert(); cache_end_insert();
@@ -650,11 +716,14 @@ void extract_addresses(HEADER *header, unsigned int qlen, char *name,
/* If the packet holds exactly one query /* If the packet holds exactly one query
return 1 and leave the name from the query in name. */ return 1 and leave the name from the query in name. */
unsigned short extract_request(HEADER *header,unsigned int qlen, char *name) unsigned short extract_request(HEADER *header,unsigned int qlen, char *name, unsigned short *typep)
{ {
unsigned char *p = (unsigned char *)(header+1); unsigned char *p = (unsigned char *)(header+1);
int qtype, qclass; int qtype, qclass;
if (typep)
*typep = 0;
if (ntohs(header->qdcount) != 1 || header->opcode != QUERY) if (ntohs(header->qdcount) != 1 || header->opcode != QUERY)
return 0; /* must be exactly one query. */ return 0; /* must be exactly one query. */
@@ -666,6 +735,9 @@ unsigned short extract_request(HEADER *header,unsigned int qlen, char *name)
if (qclass == C_IN) if (qclass == C_IN)
{ {
if (typep)
*typep = qtype;
if (qtype == T_A) if (qtype == T_A)
return F_IPV4; return F_IPV4;
if (qtype == T_AAAA) if (qtype == T_AAAA)
@@ -730,6 +802,21 @@ int setup_reply(HEADER *header, unsigned int qlen,
return p - (unsigned char *)header; return p - (unsigned char *)header;
} }
/* check if name matches local names ie from /etc/hosts or DHCP or local mx names. */
int check_for_local_domain(char *name, time_t now, struct mx_record *mx)
{
struct crec *crecp;
if ((crecp = cache_find_by_name(NULL, name, now, F_IPV4 | F_IPV6)) &&
(crecp->flags & (F_HOSTS | F_DHCP)))
return 1;
for (; mx; mx = mx->next)
if (hostname_isequal(name, mx->mxname))
return 1;
return 0;
}
/* Is the packet a reply with the answer address equal to addr? /* Is the packet a reply with the answer address equal to addr?
If so mung is into an NXDOMAIN reply and also put that information If so mung is into an NXDOMAIN reply and also put that information
@@ -760,14 +847,8 @@ int check_for_bogus_wildcard(HEADER *header, unsigned int qlen, char *name,
for (baddrp = baddr; baddrp; baddrp = baddrp->next) for (baddrp = baddr; baddrp; baddrp = baddrp->next)
if (memcmp(&baddrp->addr, p, INADDRSZ) == 0) if (memcmp(&baddrp->addr, p, INADDRSZ) == 0)
{ {
/* Found a bogus address. Mangle the packet into an NXDOMAIN reply */ /* Found a bogus address. Insert that info here, since there no SOA record
header->aa = 0; to get the ttl from in the normal processing */
header->ra = 1; /* recursion if available */
header->nscount = htons(0);
header->arcount = htons(0);
header->ancount = htons(0);
header->rcode = NXDOMAIN;
cache_start_insert(); cache_start_insert();
cache_insert(name, NULL, now, ttl, F_IPV4 | F_FORWARD | F_NEG | F_NXDOMAIN | F_CONFIG); cache_insert(name, NULL, now, ttl, F_IPV4 | F_FORWARD | F_NEG | F_NXDOMAIN | F_CONFIG);
cache_end_insert(); cache_end_insert();
@@ -782,10 +863,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;
@@ -806,7 +886,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec
forward rather than answering from the cache, which doesn't include forward rather than answering from the cache, which doesn't include
security information. */ security information. */
if ((pheader = find_pseudoheader(header, qlen))) if (find_pseudoheader(header, qlen, NULL, &pheader))
{ {
unsigned short udpsz, ext_rcode, flags; unsigned short udpsz, ext_rcode, flags;
unsigned char *psave = pheader; unsigned char *psave = pheader;
@@ -821,8 +901,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;
} }
@@ -883,22 +963,25 @@ 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;
log_query(F_CONFIG | F_NEG, name, &addr, 0, NULL, 0);
}
else else
{ {
if (qtype == T_PTR || qtype == T_ANY) if (qtype == T_PTR || qtype == T_ANY)
{ {
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;
if (!dryrun) if (!dryrun)
{ {
log_query(F_CONFIG | F_REVERSE | F_IPV4 | F_NEG | F_NXDOMAIN, name, &addr); log_query(F_CONFIG | F_REVERSE | F_IPV4 | F_NEG | F_NXDOMAIN, name, &addr, 0, NULL, 0);
nxdomain = 1; nxdomain = 1;
} }
} }
@@ -914,7 +997,7 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec
ans = 1; ans = 1;
if (!dryrun) if (!dryrun)
{ {
log_query(crecp->flags & ~F_FORWARD, name, &addr); log_query(crecp->flags & ~F_FORWARD, name, &addr, 0, NULL, 0);
auth = 0; auth = 0;
if (crecp->flags & F_NXDOMAIN) if (crecp->flags & F_NXDOMAIN)
nxdomain = 1; nxdomain = 1;
@@ -929,17 +1012,18 @@ 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;
if (!(crecp->flags & (F_HOSTS | F_DHCP))) if (!(crecp->flags & (F_HOSTS | F_DHCP)))
auth = 0; auth = 0;
ansp = add_text_record(nameoffset, ansp, ttl, 0, T_PTR, ansp = add_text_record(header, nameoffset, ansp, ttl, 0, T_PTR,
cache_get_name(crecp)); cache_get_name(crecp), NULL);
log_query(crecp->flags & ~F_FORWARD, cache_get_name(crecp), &addr); log_query(crecp->flags & ~F_FORWARD, cache_get_name(crecp), &addr,
0, daemon->addn_hosts, crecp->uid);
anscount++; anscount++;
/* if last answer exceeded packet size, give up */ /* if last answer exceeded packet size, give up */
@@ -968,20 +1052,35 @@ int answer_request(HEADER *header, char *limit, unsigned int qlen, struct mx_rec
if (qtype != type && qtype != T_ANY) if (qtype != type && qtype != T_ANY)
continue; continue;
cname_restart:
crecp = NULL; crecp = NULL;
while ((crecp = cache_find_by_name(crecp, name, now, flag))) while ((crecp = cache_find_by_name(crecp, name, now, flag | F_CNAME)))
{ {
/* don't answer wildcard queries with data not from /etc/hosts /* don't answer wildcard queries with data not from /etc/hosts
or DHCP leases */ or DHCP leases */
if (qtype == T_ANY && !(crecp->flags & (F_HOSTS | F_DHCP))) if (qtype == T_ANY && !(crecp->flags & (F_HOSTS | F_DHCP)))
continue; break;
if (crecp->flags & F_CNAME)
{
if (!dryrun)
{
ansp = add_text_record(header, nameoffset, ansp, crecp->ttd - now, 0, T_CNAME,
cache_get_name(crecp->addr.cname.cache), &nameoffset);
anscount++;
log_query(crecp->flags, name, NULL, 0, daemon->addn_hosts, crecp->uid);
}
strcpy(name, cache_get_name(crecp->addr.cname.cache));
goto cname_restart;
}
if (crecp->flags & F_NEG) if (crecp->flags & F_NEG)
{ {
ans = 1; ans = 1;
if (!dryrun) if (!dryrun)
{ {
log_query(crecp->flags, name, NULL); log_query(crecp->flags, name, NULL, 0, NULL, 0);
auth = 0; auth = 0;
if (crecp->flags & F_NXDOMAIN) if (crecp->flags & F_NXDOMAIN)
nxdomain = 1; nxdomain = 1;
@@ -995,13 +1094,14 @@ 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;
if (!(crecp->flags & (F_HOSTS | F_DHCP))) if (!(crecp->flags & (F_HOSTS | F_DHCP)))
auth = 0; auth = 0;
log_query(crecp->flags & ~F_REVERSE, name, &crecp->addr); log_query(crecp->flags & ~F_REVERSE, name, &crecp->addr.addr,
0, daemon->addn_hosts, crecp->uid);
/* copy question as first part of answer (use compression) */ /* copy question as first part of answer (use compression) */
PUTSHORT(nameoffset | 0xc000, ansp); PUTSHORT(nameoffset | 0xc000, ansp);
@@ -1024,7 +1124,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)
@@ -1032,19 +1132,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(header, nameoffset, ansp, daemon->local_ttl, 1, T_MX,
mx->mxtarget ? mx->mxtarget : mxtarget); mx->mxtarget ? mx->mxtarget : daemon->mxtarget, NULL);
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(header, nameoffset, ansp, daemon->local_ttl, 1, T_MX,
(options & OPT_SELFMX) ? name : mxtarget); (daemon->options & OPT_SELFMX) ? name : daemon->mxtarget, NULL);
anscount++; anscount++;
} }
} }
+416 -241
View File
@@ -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
@@ -56,56 +57,53 @@
static unsigned char *option_put(unsigned char *p, unsigned char *end, int opt, int len, unsigned int val); static unsigned char *option_put(unsigned char *p, unsigned char *end, int opt, int len, unsigned int val);
static unsigned char *option_end(unsigned char *p, unsigned char *end, struct dhcp_packet *start); static unsigned char *option_end(unsigned char *p, unsigned char *end, struct dhcp_packet *start);
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);
static void bootp_option_put(struct dhcp_packet *mess, char *filename, char *sname); static void bootp_option_put(struct dhcp_packet *mess,
static int option_len(unsigned char *opt); struct dhcp_boot *boot_opts, struct dhcp_netid *netids);
static unsigned int option_len(unsigned char *opt);
static void *option_ptr(unsigned char *opt); static void *option_ptr(unsigned char *opt);
static struct in_addr option_addr(unsigned char *opt); static struct in_addr option_addr(unsigned char *opt);
static unsigned int option_uint(unsigned char *opt, int size); static unsigned int option_uint(unsigned char *opt, int size);
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);
static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_type); static int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool);
static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_type, unsigned int minsize);
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)
{ {
unsigned char *opt, *clid; struct dhcp_context *context, *context_tmp;
struct dhcp_lease *lease; unsigned char *opt, *clid = NULL;
struct dhcp_lease *lease, *ltmp;
struct dhcp_vendor *vendor; struct dhcp_vendor *vendor;
int clid_len; struct dhcp_netid_list *id_list;
struct dhcp_packet *mess = &rawpacket->data; int clid_len = 0, ignore = 0;
unsigned char *p = mess->options; struct dhcp_packet *mess = &daemon->dhcp_packet->data;
/* default max reply packet length, max be overridden */ unsigned char *p = mess->options + sizeof(u32); /* skip cookie */
unsigned char *end = (unsigned char *)(rawpacket + 1); unsigned char *end = (unsigned char *)(daemon->dhcp_packet + 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 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
@@ -127,69 +125,91 @@ int dhcp_reply(struct dhcp_context *context,
if (mess->hlen != ETHER_ADDR_LEN) if (mess->hlen != ETHER_ADDR_LEN)
return 0; return 0;
mess->op = BOOTREPLY; /* check for DHCP rather than BOOTP */
if ((opt = option_find(mess, sz, OPTION_MESSAGE_TYPE, 1)))
if ((opt = option_find(mess, sz, OPTION_MAXMESSAGE)))
{ {
int maxsize = (int)option_uint(opt, 2); mess_type = option_uint(opt, 1);
if (maxsize > DNSMASQ_PACKETSZ)
maxsize = DNSMASQ_PACKETSZ;
if (maxsize > iface_mtu)
maxsize = iface_mtu;
end = ((unsigned char *)rawpacket) + maxsize; /* only insist on a cookie for DHCP. */
} if (*((u32 *)&mess->options) != htonl(DHCP_COOKIE))
return 0;
/* Some buggy clients set ciaddr when they shouldn't, so clear that here since
it can affect the context-determination code. */
if ((option_find(mess, sz, OPTION_REQUESTED_IP, INADDRSZ) || mess_type == DHCPDISCOVER))
mess->ciaddr.s_addr = 0;
/* Check for RFC3011 subnet selector */
if ((opt = option_find(mess, sz, OPTION_SUBNET_SELECT, INADDRSZ)))
subnet_addr = option_addr(opt);
/* 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, 1)))
{ {
clid = option_ptr(opt);
clid_len = option_len(opt); clid_len = option_len(opt);
clid = option_ptr(opt);
} }
else else
{
clid = mess->chaddr; clid = mess->chaddr;
clid_len = 0;
} }
if ((config = find_config(dhcp_configs, context, clid, clid_len, mess->chaddr, NULL)) && /* Determine network for this packet. If the machine has an address already, and we don't have
have_config(config, CONFIG_NAME)) 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));
/* More than one context may match, we build a chain of them all on ->current
Note that if netmasks, netid or lease times don't match, odd things may happen. */
for (context = NULL, context_tmp = daemon->dhcp; context_tmp; context_tmp = context_tmp->next)
if (context_tmp->netmask.s_addr &&
is_same_net(addr, context_tmp->start, context_tmp->netmask) &&
is_same_net(addr, context_tmp->end, context_tmp->netmask))
{
context_tmp->current = context;
context = context_tmp;
}
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;
config = find_config(daemon->dhcp_conf, context, clid, clid_len, mess->chaddr, NULL);
if (mess_type == 0)
{
/* BOOTP request */
struct dhcp_netid id;
char save = mess->file[128];
struct in_addr *logaddr = NULL;
if (have_config(config, CONFIG_ADDR))
{
logaddr = &config->addr;
mess->yiaddr = config->addr;
if (lease_find_by_addr(config->addr))
message = "address in use";
context = narrow_context(context, config->addr);
}
else
message = "no address configured";
if (have_config(config, CONFIG_DISABLE))
message = "disabled";
end = mess->options + 64; /* BOOTP vend area is only 64 bytes */
if (have_config(config, CONFIG_NAME))
hostname = config->hostname; hostname = config->hostname;
else if ((opt = option_find(mess, sz, OPTION_HOSTNAME)))
{
int len = option_len(opt);
/* namebuff is 1K long, use half for requested options and half for hostname */
/* len < 256 by definition */
hostname = namebuff + 500;
memcpy(hostname, option_ptr(opt), len);
/* May not be zero terminated */
hostname[len] = 0;
/* ensure there are no strange chars in there */
if (!canonicalise(hostname))
hostname = NULL;
else
{
char *dot = strchr(hostname, '.');
if (dot)
{
if (!domain_suffix || !hostname_isequal(dot+1, domain_suffix))
{
syslog(LOG_WARNING, "Ignoring DHCP host name %s because it has an illegal domain part", hostname);
hostname = NULL;
}
else
{
*dot = 0; /* truncate */
if (strlen(hostname) == 0)
hostname = NULL; /* nothing left */
}
}
/* search again now we have a hostname */
config = find_config(dhcp_configs, context, clid, clid_len, mess->chaddr, hostname);
}
}
def_time = have_config(config, CONFIG_TIME) ? config->lease_time : context->lease_time;
if (context->netid.net) if (context->netid.net)
{ {
@@ -203,45 +223,101 @@ int dhcp_reply(struct dhcp_context *context,
netid = &config->netid; netid = &config->netid;
} }
/* Theres a chance that carefully chosen data could match the same /* Match incoming filename field as a netid. */
vendor/user option twice and make a loop in the netid chain. */ if (mess->file[0])
for (vendor = vendors; vendor; vendor = vendor->next)
vendor->used = 0;
if ((opt = option_find(mess, sz, OPTION_VENDOR_ID)))
for (vendor = vendors; vendor; vendor = vendor->next)
if (vendor->is_vendor && !vendor->used)
{ {
int i; mess->file[128] = 0; /* ensure zero term. */
id.net = mess->file;
id.next = netid;
netid = &id;
}
for (id_list = daemon->dhcp_ignore; id_list; id_list = id_list->next)
if (match_netid(id_list->list, netid))
message = "disabled";
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. */
mess->siaddr = iface_addr;
bootp_option_put(mess, daemon->boot_config, netid);
p = option_end(p, end, mess);
log_packet(NULL, logaddr, mess->chaddr, iface_name, message);
mess->file[128] = save;
if (message)
return 0;
else
return p - (unsigned char *)mess;
}
if (have_config(config, CONFIG_NAME))
hostname = config->hostname;
else if ((opt = option_find(mess, sz, OPTION_HOSTNAME, 1)))
{
unsigned int len = option_len(opt);
hostname = daemon->dhcp_buff;
memcpy(hostname, option_ptr(opt), len);
/* May not be zero terminated */
hostname[len] = 0;
/* ensure there are no strange chars in there */
if (!canonicalise(hostname))
hostname = NULL;
else if ((hostname = strip_hostname(daemon, hostname)) && !config)
{
/* Search again now we have a hostname.
Only accept configs without CLID and HWADDR here, (they won't match)
to avoid impersonation by name. */
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))
config = new;
}
}
if (have_config(config, CONFIG_NETID))
{
config->netid.next = netid;
netid = &config->netid;
}
/* user-class options are, according to RFC3004, supposed to contain
a set of counted strings. Here we check that this is so (by seeing
if the counts are consistent with the overall option length) and if
so zero the counts so that we don't get spurious matches between
the vendor string and the counts. If the lengths don't add up, we
assume that the option is a single string and non RFC3004 compliant
and just do the substring match. dhclient provides these broken options. */
if ((opt = option_find(mess, sz, OPTION_USER_CLASS, 1)))
{
unsigned char *ucp = option_ptr(opt);
unsigned int tmp, j;
for (j = 0; j < option_len(opt); j += ucp[j] + 1);
if (j == option_len(opt))
for (j = 0; j < option_len(opt); j = tmp)
{
tmp = j + ucp[j] + 1;
ucp[j] = 0;
}
}
for (vendor = daemon->dhcp_vendors; vendor; vendor = vendor->next)
if ((opt = option_find(mess, sz, vendor->is_vendor ? OPTION_VENDOR_ID : OPTION_USER_CLASS, 1)))
{
unsigned int i;
for (i = 0; i <= (option_len(opt) - vendor->len); i++) for (i = 0; i <= (option_len(opt) - vendor->len); i++)
if (memcmp(vendor->data, option_ptr(opt)+i, vendor->len) == 0) if (memcmp(vendor->data, option_ptr(opt)+i, vendor->len) == 0)
{ {
vendor->used = 1;
vendor->netid.next = netid; vendor->netid.next = netid;
netid = &vendor->netid; netid = &vendor->netid;
break; break;
} }
} }
if ((opt = option_find(mess, sz, OPTION_USER_CLASS))) /* if all the netids in the ignore list are present, ignore this client */
{ for (id_list = daemon->dhcp_ignore; id_list; id_list = id_list->next)
unsigned char *ucp = option_ptr(opt); if (match_netid(id_list->list, netid))
int j; ignore = 1;
for (j = 0; j < option_len(opt); j += ucp[j] + 1)
for (vendor = vendors; vendor; vendor = vendor->next)
if (!vendor->is_vendor && !vendor->used)
{
int i;
for (i = 0; i <= (ucp[j] - vendor->len); i++)
if (memcmp(vendor->data, &ucp[j+i+1], vendor->len) == 0)
{
vendor->used = 1;
vendor->netid.next = netid;
netid = &vendor->netid;
break;
}
}
}
/* Can have setting to ignore the client ID for a particular MAC address or hostname */ /* Can have setting to ignore the client ID for a particular MAC address or hostname */
if (have_config(config, CONFIG_NOCLID)) if (have_config(config, CONFIG_NOCLID))
@@ -253,47 +329,24 @@ int dhcp_reply(struct dhcp_context *context,
/* do we have a lease in store? */ /* do we have a lease in store? */
lease = lease_find_by_client(clid, clid_len); lease = lease_find_by_client(clid, clid_len);
if ((opt = option_find(mess, sz, OPTION_LEASE_TIME))) if ((opt = option_find(mess, sz, OPTION_REQUESTED_OPTIONS, 0)))
{ {
unsigned int req_time = option_uint(opt, 4); req_options = daemon->dhcp_buff2;
memcpy(req_options, option_ptr(opt), option_len(opt));
if (def_time == 0xffffffff || req_options[option_len(opt)] = OPTION_END;
(req_time != 0xffffffff && req_time < def_time))
expires_time = renewal_time = req_time;
else
expires_time = renewal_time = def_time;
}
else
{
renewal_time = def_time;
if (lease)
expires_time = (unsigned int)difftime(lease->expires, now);
else
expires_time = def_time;
} }
if ((opt = option_find(mess, sz, OPTION_REQUESTED_OPTIONS))) switch (mess_type)
{
int len = option_len(opt);
req_options = namebuff;
memcpy(req_options, option_ptr(opt), len);
req_options[len] = OPTION_END;
}
if (!(opt = option_find(mess, sz, OPTION_MESSAGE_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, INADDRSZ)) ||
(iface_addr.s_addr != option_addr(opt).s_addr)) (iface_addr.s_addr != option_addr(opt).s_addr))
return 0; return 0;
/* 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, 1)))
{ {
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--)
@@ -303,10 +356,10 @@ 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, INADDRSZ)))
return 0; return 0;
log_packet("DECLINE", option_ptr(opt), mess->chaddr, iface_name, message); log_packet("DECLINE", option_ptr(opt), mess->chaddr, iface_name, message);
@@ -322,73 +375,92 @@ int dhcp_reply(struct dhcp_context *context,
} }
else else
/* make sure this host gets a different address next time. */ /* make sure this host gets a different address next time. */
for (; context; context = context->current)
context->addr_epoch++; context->addr_epoch++;
return 0; return 0;
case DHCPRELEASE: case DHCPRELEASE:
if (!(opt = option_find(mess, sz, OPTION_SERVER_IDENTIFIER)) || if (!(opt = option_find(mess, sz, OPTION_SERVER_IDENTIFIER, INADDRSZ)) ||
(iface_addr.s_addr != option_addr(opt).s_addr)) (iface_addr.s_addr != option_addr(opt).s_addr))
return 0; return 0;
log_packet("RELEASE", &mess->ciaddr, mess->chaddr, iface_name, NULL);
if (lease && lease->addr.s_addr == mess->ciaddr.s_addr) if (lease && lease->addr.s_addr == mess->ciaddr.s_addr)
lease_prune(lease, now); lease_prune(lease, now);
else
message = "unknown lease";
log_packet("RELEASE", &mess->ciaddr, mess->chaddr, iface_name, message);
return 0; return 0;
case DHCPDISCOVER: case DHCPDISCOVER:
if ((opt = option_find(mess, sz, OPTION_REQUESTED_IP))) if ((opt = option_find(mess, sz, OPTION_REQUESTED_IP, INADDRSZ)))
addr = option_addr(opt); addr = option_addr(opt);
if (have_config(config, CONFIG_DISABLE)) if (ignore || have_config(config, CONFIG_DISABLE))
message = "ignored"; message = "ignored";
else if (have_config(config, CONFIG_ADDR) && !lease_find_by_addr(config->addr)) else if (have_config(config, CONFIG_ADDR) &&
(!(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(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. */ context = narrow_context(context, mess->yiaddr);
mess->ciaddr.s_addr = 0; if (context->netid.net)
bootp_option_put(mess, dhcp_file, dhcp_sname); {
mess->siaddr = dhcp_next_server.s_addr ? dhcp_next_server : iface_addr; context->netid.next = netid;
netid = &context->netid;
}
time = have_config(config, CONFIG_TIME) ? config->lease_time : context->lease_time;
if ((opt = option_find(mess, sz, OPTION_LEASE_TIME, 4)))
{
unsigned int req_time = option_uint(opt, 4);
if (time == 0xffffffff || (req_time != 0xffffffff && req_time < time))
time = req_time;
}
else if (lease && lease->expires != 0)
time = (unsigned int)difftime(lease->expires, now);
mess->siaddr = iface_addr;
bootp_option_put(mess, daemon->boot_config, netid);
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, time);
/* T1 and T2 are required in DHCPOFFER by HP's wacky Jetdirect client. */ /* T1 and T2 are required in DHCPOFFER by HP's wacky Jetdirect client. */
if (expires_time != 0xffffffff) if (time != 0xffffffff)
{ {
p = option_put(p, end, OPTION_T1, 4, (expires_time/2)); p = option_put(p, end, OPTION_T1, 4, (time/2));
p = option_put(p, end, OPTION_T2, 4, ((expires_time * 7)/8)); p = option_put(p, end, OPTION_T2, 4, (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);
return p - (unsigned char *)mess; return p - (unsigned char *)mess;
case DHCPREQUEST: case DHCPREQUEST:
if (have_config(config, CONFIG_DISABLE)) if (ignore || have_config(config, CONFIG_DISABLE))
message = "disabled"; return 0;
else if ((opt = option_find(mess, sz, OPTION_REQUESTED_IP))) if ((opt = option_find(mess, sz, OPTION_REQUESTED_IP, INADDRSZ)))
{ {
/* 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, INADDRSZ)))
(iface_addr.s_addr != option_addr(opt).s_addr)) {
/* SELECTING */
if (iface_addr.s_addr != option_addr(opt).s_addr)
return 0; return 0;
/* If a lease exists for this host and another address, squash it. */ /* If a lease exists for this host and another address, squash it. */
@@ -397,51 +469,63 @@ int dhcp_reply(struct dhcp_context *context,
lease_prune(lease, now); lease_prune(lease, now);
lease = NULL; lease = NULL;
} }
}
if (!lease) else
{ {
if ((!address_available(context, mess->yiaddr) || lease_find_by_addr(mess->yiaddr)) && /* INIT-REBOOT */
(!have_config(config, CONFIG_ADDR) || config->addr.s_addr != mess->yiaddr.s_addr)) if (!lease && !(daemon->options & OPT_AUTHORITATIVE))
message = "address unavailable"; return 0;
else if (!(lease = lease_allocate(clid, clid_len, mess->yiaddr)))
message = "no leases left"; if (lease && lease->addr.s_addr != mess->yiaddr.s_addr)
message = "wrong address";
} }
} }
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)) mess->yiaddr = mess->ciaddr;
fuzz = fuzz/2;
} }
log_packet("REQUEST", &mess->yiaddr, mess->chaddr, iface_name, NULL);
if (!message)
{
struct dhcp_config *addr_config;
/* If a machine moves networks whilst it has a lease, we catch that here. */ /* If a machine moves networks whilst it has a lease, we catch that here. */
if (!message && !is_same_net(mess->yiaddr, context->start, context->netmask)) if (!is_same_net(mess->yiaddr, context->start, context->netmask))
message = "wrong network"; message = "wrong network";
/* Check for renewal of a lease which is now outside the allowed range. */ /* Check for renewal of a lease which is outside the allowed range. */
if (!message && !address_available(context, mess->yiaddr) && else if (!address_available(context, mess->yiaddr) &&
(!have_config(config, CONFIG_ADDR) || config->addr.s_addr != mess->yiaddr.s_addr)) (!have_config(config, CONFIG_ADDR) || config->addr.s_addr != mess->yiaddr.s_addr))
message = "address no longer available"; message = "address not available";
/* Check if a new static address has been configured. Be very sure that /* Check if a new static address has been configured. Be very sure that
when the client does DISCOVER, it will get the static address, otherwise when the client does DISCOVER, it will get the static address, otherwise
an endless protocol loop will ensue. */ an endless protocol loop will ensue. */
if (!message && have_config(config, CONFIG_ADDR) &&
!have_config(config, CONFIG_DISABLE) && else if (have_config(config, CONFIG_ADDR) &&
!lease_find_by_addr(config->addr)) config->addr.s_addr != mess->yiaddr.s_addr &&
(!(ltmp = lease_find_by_addr(config->addr)) || ltmp == lease))
message = "static lease available"; message = "static lease available";
log_packet("REQUEST", &mess->yiaddr, mess->chaddr, iface_name, NULL); /* Check to see if the address is reserved as a static address for another host */
else if ((addr_config = config_find_by_address(daemon->dhcp_conf, mess->yiaddr)) && addr_config != config)
message ="address reserved";
else if ((ltmp = lease_find_by_addr(mess->yiaddr)) && ltmp != lease)
message = "address in use";
else if (!lease && !(lease = lease_allocate(clid, clid_len, mess->yiaddr)))
message = "no leases left";
}
if (message) if (message)
{ {
@@ -451,35 +535,55 @@ int dhcp_reply(struct dhcp_context *context,
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);
p = option_put_string(p, end, OPTION_MESSAGE, message); p = option_put_string(p, end, OPTION_MESSAGE, message);
p = option_end(p, end, mess);
mess->flags |= htons(0x8000); /* broadcast */ mess->flags |= htons(0x8000); /* broadcast */
return p - (unsigned char *)mess;
} }
else
{
log_packet("ACK", &mess->yiaddr, mess->chaddr, iface_name, hostname); log_packet("ACK", &mess->yiaddr, mess->chaddr, iface_name, hostname);
lease_set_hwaddr(lease, mess->chaddr); context = narrow_context(context, mess->yiaddr);
if (hostname) if (context->netid.net)
lease_set_hostname(lease, hostname, domain_suffix); {
lease_set_expires(lease, renewal_time == 0xffffffff ? 0 : now + (time_t)renewal_time); context->netid.next = netid;
netid = &context->netid;
}
bootp_option_put(mess, dhcp_file, dhcp_sname); time = have_config(config, CONFIG_TIME) ? config->lease_time : context->lease_time;
mess->siaddr = dhcp_next_server.s_addr ? dhcp_next_server : iface_addr; if ((opt = option_find(mess, sz, OPTION_LEASE_TIME, 4)))
{
unsigned int req_time = option_uint(opt, 4);
if (time == 0xffffffff || (req_time != 0xffffffff && req_time < time))
time = req_time;
}
lease_set_hwaddr(lease, mess->chaddr);
if (!hostname)
hostname = host_from_dns(daemon, mess->yiaddr);
if (hostname)
lease_set_hostname(lease, hostname, daemon->domain_suffix);
lease_set_expires(lease, time == 0xffffffff ? 0 : now + (time_t)time);
mess->siaddr = iface_addr;
bootp_option_put(mess, daemon->boot_config, netid);
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, time);
if (renewal_time != 0xffffffff) if (time != 0xffffffff)
{ {
p = option_put(p, end, OPTION_T1, 4, (renewal_time/2) - fuzz); while (fuzz > (time/16))
p = option_put(p, end, OPTION_T2, 4, ((renewal_time * 7)/8) - fuzz); fuzz = fuzz/2;
p = option_put(p, end, OPTION_T1, 4, (time/2) - fuzz);
p = option_put(p, end, OPTION_T2, 4, ((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;
case DHCPINFORM: case DHCPINFORM:
if (have_config(config, CONFIG_DISABLE)) if (ignore || have_config(config, CONFIG_DISABLE))
message = "ignored"; message = "ignored";
log_packet("INFORM", &mess->ciaddr, mess->chaddr, iface_name, message); log_packet("INFORM", &mess->ciaddr, mess->chaddr, iface_name, message);
@@ -487,10 +591,21 @@ int dhcp_reply(struct dhcp_context *context,
if (message || mess->ciaddr.s_addr == 0) if (message || mess->ciaddr.s_addr == 0)
return 0; return 0;
context = narrow_context(context, mess->ciaddr);
if (context->netid.net)
{
context->netid.next = netid;
netid = &context->netid;
}
mess->siaddr = iface_addr;
bootp_option_put(mess, daemon->boot_config, netid);
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, if (!hostname)
hostname, router, iface_addr, iface_mtu, netid); hostname = host_from_dns(daemon, mess->yiaddr);
p = do_req_options(context, p, end, req_options, daemon,
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);
@@ -502,8 +617,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) : "",
@@ -512,7 +628,7 @@ static void log_packet(char *type, struct in_addr *addr, unsigned char *hwaddr,
string ? string : ""); string ? string : "");
} }
static int option_len(unsigned char *opt) static unsigned int option_len(unsigned char *opt)
{ {
return opt[1]; return opt[1];
} }
@@ -546,14 +662,35 @@ static unsigned int option_uint(unsigned char *opt, int size)
return ret; return ret;
} }
static void bootp_option_put(struct dhcp_packet *mess, char *filename, char *sname) static void bootp_option_put(struct dhcp_packet *mess,
struct dhcp_boot *boot_opts, struct dhcp_netid *netids)
{ {
struct dhcp_boot *tmp;
for (tmp = boot_opts; tmp; tmp = tmp->next)
if (match_netid(tmp->netid, netids))
break;
if (!tmp)
/* No match, look for one without a netid */
for (tmp = boot_opts; tmp; tmp = tmp->next)
if (!tmp->netid)
break;
/* Do this _after_ the matching above, since in
BOOTP mode, one if the things we match is the filename. */
memset(mess->sname, 0, sizeof(mess->sname)); memset(mess->sname, 0, sizeof(mess->sname));
memset(mess->file, 0, sizeof(mess->file)); memset(mess->file, 0, sizeof(mess->file));
if (sname)
strncpy(mess->sname, sname, sizeof(mess->sname)-1); if (tmp)
if (filename) {
strncpy(mess->file, filename, sizeof(mess->file)-1); if (tmp->sname)
strncpy(mess->sname, tmp->sname, sizeof(mess->sname)-1);
if (tmp->file)
strncpy(mess->file, tmp->file, sizeof(mess->file)-1);
if (tmp->next_server.s_addr)
mess->siaddr = tmp->next_server;
}
} }
static unsigned char *option_put(unsigned char *p, unsigned char *end, int opt, int len, unsigned int val) static unsigned char *option_put(unsigned char *p, unsigned char *end, int opt, int len, unsigned int val)
@@ -583,13 +720,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;
} }
@@ -600,13 +740,13 @@ static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt
while (*p != OPTION_END) while (*p != OPTION_END)
{ {
if (end && (p >= end)) if (p >= end)
return 0; /* malformed packet */ return 0; /* malformed packet */
else if (*p == OPTION_PAD) else if (*p == OPTION_PAD)
p++; p++;
else if (*p == OPTION_OVERLOAD) else if (*p == OPTION_OVERLOAD)
{ {
if (end && (p >= end - 3)) if (p >= end - 3)
return 0; /* malformed packet */ return 0; /* malformed packet */
if (overload) if (overload)
*overload = *(p+2); *overload = *(p+2);
@@ -615,10 +755,10 @@ static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt
else else
{ {
int opt_len;; int opt_len;;
if (end && (p >= end - 2)) if (p >= end - 2)
return 0; /* malformed packet */ return 0; /* malformed packet */
opt_len = option_len(p); opt_len = option_len(p);
if (end && (p >= end - (2 + opt_len))) if (p >= end - (2 + opt_len))
return 0; /* malformed packet */ return 0; /* malformed packet */
if (*p == opt) if (*p == opt)
return p; return p;
@@ -629,12 +769,13 @@ static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt
return NULL; return NULL;
} }
static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_type) static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_type, unsigned int minsize)
{ {
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);
@@ -642,6 +783,10 @@ static unsigned char *option_find(struct dhcp_packet *mess, int size, int opt_ty
if (!ret && (overload & 2)) if (!ret && (overload & 2))
ret = option_find1(&mess->sname[0], &mess->file[64], opt_type, &overload); ret = option_find1(&mess->sname[0], &mess->file[64], opt_type, &overload);
/* Check the option field is big enough */
if (ret && (option_len(ret) < minsize))
ret = NULL;
return ret; return ret;
} }
@@ -660,19 +805,42 @@ static int in_list(unsigned char *list, int opt)
return 0; return 0;
} }
/* Is every member of check matched by a member of pool? */
static int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool)
{
struct dhcp_netid *tmp1;
if (!check)
return 0;
for (; check; check = check->next)
{
if (check->net[0] != '#')
{
for (tmp1 = pool; tmp1; tmp1 = tmp1->next)
if (strcmp(check->net, tmp1->net) == 0)
break;
if (!tmp1)
return 0;
}
else
for (tmp1 = pool; tmp1; tmp1 = tmp1->next)
if (strcmp((check->net)+1, tmp1->net) == 0)
return 0;
}
return 1;
}
static struct dhcp_opt *option_find2(struct dhcp_netid *netid, struct dhcp_opt *opts, int opt) static struct dhcp_opt *option_find2(struct dhcp_netid *netid, struct dhcp_opt *opts, int opt)
{ {
struct dhcp_opt *tmp; struct dhcp_opt *tmp;
struct dhcp_netid *tmp1;
for (tmp = opts; tmp; tmp = tmp->next) for (tmp = opts; tmp; tmp = tmp->next)
if (tmp->opt == opt) if (tmp->opt == opt)
{ {
if (netid) if (netid)
{ {
if (tmp->netid) if (match_netid(tmp->netid, netid))
for (tmp1 = netid; tmp1; tmp1 = tmp1->next)
if (strcmp(tmp->netid, tmp1->net) == 0)
return tmp; return tmp;
} }
else if (!tmp->netid) else if (!tmp->netid)
@@ -685,39 +853,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> */
+17
View File
@@ -251,3 +251,20 @@ int is_same_net(struct in_addr a, struct in_addr b, struct in_addr mask)
{ {
return (a.s_addr & mask.s_addr) == (b.s_addr & mask.s_addr); return (a.s_addr & mask.s_addr) == (b.s_addr & mask.s_addr);
} }
int retry_send(void)
{
struct timespec waiter;
if (errno == EAGAIN)
{
waiter.tv_sec = 0;
waiter.tv_nsec = 10000;
nanosleep(&waiter, NULL);
return 1;
}
if (errno == EINTR)
return 1;
return 0;
}