Skip to content

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

import of dnsmasq-2.16.tar.gz

parent 36717eee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1174 additions and 616 deletions
CHANGELOG
View file @ fd9fa481
......@@ -1213,4 +1213,43 @@ version 2.15
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.
FAQ
View file @ fd9fa481
......@@ -284,6 +284,22 @@ 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.
contrib/dynamic-dnsmasq/dynamic-dnsmasq.pl 0 → 100755
View file @ fd9fa481
#!/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);
}
dnsmasq-rh.spec
View file @ fd9fa481
......@@ -5,7 +5,7 @@
###############################################################################
Name: dnsmasq
Version: 2.15
Version: 2.16
Release: 1
Copyright: GPL
Group: System Environment/Daemons
......
dnsmasq-suse.spec
View file @ fd9fa481
......@@ -5,7 +5,7 @@
###############################################################################
Name: dnsmasq
Version: 2.15
Version: 2.16
Release: 1
Copyright: GPL
Group: Productivity/Networking/DNS/Servers
......
dnsmasq.8
View file @ fd9fa481
......@@ -34,8 +34,8 @@ Don't read the hostnames in /etc/hosts.
.TP
.B \-H, --addn-hosts=<file>
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
given.
only the specified file. This option may be repeated for more than one
additional hosts file.
.TP
.B \-T, --local-ttl=<time>
When replying with information from /etc/hosts or the DHCP leases
......@@ -423,6 +423,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
process.
.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>
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
......
dnsmasq.conf.example
View file @ fd9fa481
......@@ -237,7 +237,10 @@ bogus-priv
#dhcp-option=45,0.0.0.0 # netbios datagram distribution server
#dhcp-option=46,8 # netbios node type
#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
# for BOOTP. You will only need this is you want to
......@@ -252,6 +255,16 @@ bogus-priv
# the line below.
#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.
#cache-size=150
......
rpm/dnsmasq-SuSE.patch
View file @ fd9fa481
--- dnsmasq.8 2004-08-08 20:57:56.000000000 +0200
+++ dnsmasq.8 2004-08-12 00:40:01.000000000 +0200
@@ -63,7 +63,7 @@
@@ -69,7 +69,7 @@
.TP
.B \-g, --group=<groupname>
Specify the group which dnsmasq will run
......@@ -31,7 +31,7 @@
#define IP6INTERFACES "/proc/net/if_inet6"
#define UPTIME "/proc/uptime"
#define DHCP_SERVER_PORT 67
@@ -176,7 +176,7 @@
@@ -187,7 +187,7 @@
/* platform independent options. */
#undef HAVE_BROKEN_RTC
......
src/cache.c
View file @ fd9fa481
This diff is collapsed.
src/config.h
View file @ fd9fa481
......@@ -12,7 +12,7 @@
/* Author's email: simon@thekelleys.org.uk */
#define VERSION "2.15"
#define VERSION "2.16"
#define FTABSIZ 150 /* max number of outstanding requests */
#define MAX_PROCS 20 /* max no children for TCP requests */
......@@ -156,7 +156,7 @@ HAVE_PSELECT
If your C library implements pselect, define this.
HAVE_BPF
If your OS implements Berkeley PAcket filter, define this.
If your OS implements Berkeley Packet filter, define this.
NOTES:
For Linux you should define
......@@ -176,10 +176,12 @@ NOTES:
you should NOT define
HAVE_LINUX_IPV6_PROC
and you MAY define
HAVE_ARC4RANDOM - OpenBSD and FreeBSD
HAVE_DEV_URANDOM - OpenBSD and FreeBSD
HAVE_DEV_RANDOM - FreeBSD (OpenBSD with hardware random number generator)
HAVE_GETOPT_LONG - only if you link GNU getopt.
HAVE_ARC4RANDOM - OpenBSD and FreeBSD and NetBSD version 2.0 or later
HAVE_DEV_URANDOM - OpenBSD and FreeBSD and NetBSD
HAVE_DEV_RANDOM - FreeBSD and NetBSD
(OpenBSD with hardware random number generator)
HAVE_GETOPT_LONG - NetBSD
(FreeBSD and OpenBSD only if you link GNU getopt)
*/
......@@ -250,9 +252,6 @@ typedef unsigned long in_addr_t;
#endif
#endif
/* #elif defined(__OpenBSD__)
#error The sockets API in OpenBSD does not provide facilities required by dnsmasq
*/
#elif defined(__FreeBSD__) || defined(__OpenBSD__)
#undef HAVE_LINUX_IPV6_PROC
#undef HAVE_GETOPT_LONG
......@@ -275,16 +274,16 @@ typedef unsigned long in_addr_t;
#define BIND_8_COMPAT
/* Define before sys/socket.h is included so we get socklen_t */
#define _BSD_SOCKLEN_T_
/* The three 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
#elif defined(__NetBSD__)
#undef HAVE_LINUX_IPV6_PROC
#undef HAVE_GETOPT_LONG
#define HAVE_GETOPT_LONG
#undef HAVE_ARC4RANDOM
#define HAVE_RANDOM
#undef HAVE_DEV_URANDOM
#undef HAVE_DEV_RANDOM
#define HAVE_DEV_URANDOM
#define HAVE_DEV_RANDOM
#define HAVE_SOCKADDR_SA_LEN
#undef HAVE_PSELECT
#define HAVE_BPF
......
src/dhcp.c
View file @ fd9fa481
......@@ -18,13 +18,14 @@ void dhcp_init(struct daemon *daemon)
{
int fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
struct sockaddr_in saddr;
int oneopt = 1, zeroopt = 0;
int flags, oneopt = 1, zeroopt = 0;
struct dhcp_config *configs, *cp;
if (fd == -1)
die ("cannot create DHCP socket : %s", NULL);
if (
if ((flags = fcntl(fd, F_GETFL, 0)) == -1 ||
fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1 ||
#if defined(IP_PKTINFO)
setsockopt(fd, SOL_IP, IP_PKTINFO, &oneopt, sizeof(oneopt)) == -1 ||
#elif defined(IP_RECVIF)
......@@ -72,6 +73,8 @@ void dhcp_init(struct daemon *daemon)
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 ||
(flags = fcntl(fd, F_GETFL, 0)) == -1 ||
fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -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);
......@@ -160,7 +163,7 @@ void dhcp_packet(struct daemon *daemon, time_t now)
#else
{
struct iname *name;
for (name = daemon->if_names; names->isloop; names = names->next);
for (name = daemon->if_names; name->isloop; name = name->next);
strcpy(ifr.ifr_name, name->name);
}
#endif
......@@ -257,7 +260,7 @@ void dhcp_packet(struct daemon *daemon, time_t now)
lease_prune(NULL, now); /* lose any expired leases */
newlen = dhcp_reply(daemon, iface_addr, ifr.ifr_name, sz, now);
lease_update_file(0, now);
lease_update_dns();
lease_update_dns(daemon);
if (newlen == 0)
return;
......@@ -283,7 +286,9 @@ void dhcp_packet(struct daemon *daemon, time_t now)
dest.sin_addr = mess->ciaddr;
}
sendto(daemon->dhcpfd, mess, newlen, 0, (struct sockaddr *)&dest, sizeof(dest));
while(sendto(daemon->dhcpfd, mess, newlen, 0,
(struct sockaddr *)&dest, sizeof(dest)) == -1 &&
retry_send());
}
else
{
......@@ -353,7 +358,8 @@ void dhcp_packet(struct daemon *daemon, time_t now)
iov[0].iov_len = sizeof(struct ether_header);
iov[1].iov_base = (char *)rawpacket;
iov[1].iov_len = ntohs(rawpacket->ip.ip_len);
writev(daemon->dhcp_raw_fd, iov, 2);
while (writev(daemon->dhcp_raw_fd, iov, 2) == -1 &&
errno == EINTR);
#else
struct sockaddr_ll dest;
......@@ -362,9 +368,9 @@ void dhcp_packet(struct daemon *daemon, time_t now)
dest.sll_ifindex = iface_index;
dest.sll_protocol = htons(ETHERTYPE_IP);
memcpy(dest.sll_addr, hwdest, ETHER_ADDR_LEN);
sendto(daemon->dhcp_raw_fd, rawpacket, ntohs(rawpacket->ip.ip_len),
0, (struct sockaddr *)&dest, sizeof(dest));
while (sendto(daemon->dhcp_raw_fd, rawpacket, ntohs(rawpacket->ip.ip_len),
0, (struct sockaddr *)&dest, sizeof(dest)) == -1 &&
errno == EINTR);
#endif
}
}
......@@ -624,7 +630,7 @@ void dhcp_update_configs(struct dhcp_config *configs)
(crec = cache_find_by_name(NULL, config->hostname, 0, F_IPV4)) &&
(crec->flags & F_HOSTS))
{
config->addr = crec->addr.addr.addr4;
config->addr = crec->addr.addr.addr.addr4;
config->flags |= CONFIG_ADDR;
}
}
......
src/dnsmasq.c
View file @ fd9fa481
......@@ -314,7 +314,7 @@ int main (int argc, char **argv)
dhcp_update_configs(daemon->dhcp_conf);
lease_update_from_configs(daemon->dhcp_conf, daemon->domain_suffix);
lease_update_file(0, now);
lease_update_dns();
lease_update_dns(daemon);
}
if (daemon->resolv_files && (daemon->options & OPT_NO_POLL))
{
......@@ -326,7 +326,7 @@ int main (int argc, char **argv)
if (sigusr1)
{
dump_cache(daemon->options & (OPT_DEBUG | OPT_LOG), daemon->cachesize);
dump_cache(daemon);
sigusr1 = 0;
}
......@@ -379,7 +379,7 @@ int main (int argc, char **argv)
#ifdef HAVE_ISC_READER
if (daemon->lease_file && !daemon->dhcp)
load_dhcp(daemon->lease_file, daemon->domain_suffix, now, daemon->namebuff);
load_dhcp(daemon, now);
#endif
if (!(daemon->options & OPT_NO_POLL))
......@@ -638,43 +638,45 @@ int icmp_ping(struct daemon *daemon, struct in_addr addr)
setsockopt(daemon->dhcp_icmp_fd, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt));
if (sendto(daemon->dhcp_icmp_fd, (char *)&packet.icmp, sizeof(struct icmp), 0,
(struct sockaddr *)&saddr, sizeof(saddr)) == sizeof(struct icmp))
for (now = start = dnsmasq_time(daemon->uptime_fd); difftime(now, start) < 3.0;)
{
struct timeval tv;
fd_set rset;
struct sockaddr_in faddr;
int maxfd, len = sizeof(faddr);
tv.tv_usec = 250000;
tv.tv_sec = 0;
FD_ZERO(&rset);
FD_SET(daemon->dhcp_icmp_fd, &rset);
maxfd = set_dns_listeners(daemon, &rset, daemon->dhcp_icmp_fd);
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;
}
}
if (select(maxfd+1, &rset, NULL, NULL, &tv) < 0)
FD_ZERO(&rset);
now = dnsmasq_time(daemon->uptime_fd);
check_dns_listeners(daemon, &rset, now);
if (FD_ISSET(daemon->dhcp_icmp_fd, &rset) &&
recvfrom(daemon->dhcp_icmp_fd, &packet, sizeof(packet), 0,
(struct sockaddr *)&faddr, &len) == sizeof(packet) &&
saddr.sin_addr.s_addr == faddr.sin_addr.s_addr &&
packet.icmp.icmp_type == ICMP_ECHOREPLY &&
packet.icmp.icmp_seq == 0 &&
packet.icmp.icmp_id == id)
{
gotreply = 1;
break;
}
}
opt = 1;
setsockopt(daemon->dhcp_icmp_fd, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(opt));
return gotreply;
}
src/dnsmasq.h
View file @ fd9fa481
......@@ -95,6 +95,7 @@
#define OPT_ETHERS 16384
#define OPT_RESOLV_DOMAIN 32768
#define OPT_NO_FORK 65536
#define OPT_AUTHORITATIVE 131072
struct all_addr {
union {
......@@ -129,7 +130,14 @@ union bigname {
struct crec {
struct crec *next, *prev, *hash_next;
time_t ttd; /* time to die */
struct all_addr addr;
int uid;
union {
struct all_addr addr;
struct {
struct crec *cache;
int uid;
} cname;
} addr;
unsigned short flags;
union {
char sname[SMALLDNAME];
......@@ -139,7 +147,7 @@ struct crec {
};
#define F_IMMORTAL 1
#define F_CONFIG 2
#define F_CONFIG 2
#define F_REVERSE 4
#define F_FORWARD 8
#define F_DHCP 16
......@@ -152,7 +160,7 @@ struct crec {
#define F_SERVER 2048
#define F_NXDOMAIN 4096
#define F_QUERY 8192
#define F_ADDN 16384
#define F_CNAME 16384
#define F_NOERR 32768
/* struct sockaddr is not large enough to hold any address,
......@@ -227,6 +235,13 @@ struct resolvc {
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 {
union mysockaddr source;
struct all_addr dest;
......@@ -234,6 +249,7 @@ struct frec {
unsigned int iface;
unsigned short orig_id, new_id;
int fd;
unsigned int crc;
time_t time;
struct frec *next;
};
......@@ -340,7 +356,7 @@ struct daemon {
int cachesize;
int port, query_port;
unsigned long local_ttl;
char *addn_hosts;
struct hostsfile *addn_hosts;
struct dhcp_context *dhcp;
struct dhcp_config *dhcp_conf;
struct dhcp_opt *dhcp_opts;
......@@ -369,7 +385,8 @@ struct daemon {
/* cache.c */
void cache_init(int cachesize, int log);
void log_query(unsigned short flags, char *name, struct all_addr *addr, unsigned short type);
void log_query(unsigned short flags, char *name, struct all_addr *addr,
unsigned short type, struct hostsfile *addn_hosts, int index);
struct crec *cache_find_by_addr(struct crec *crecp,
struct all_addr *addr, time_t now,
unsigned short prot);
......@@ -377,12 +394,12 @@ struct crec *cache_find_by_name(struct crec *crecp,
char *name, time_t now, unsigned short prot);
void cache_end_insert(void);
void cache_start_insert(void);
void cache_insert(char *name, struct all_addr *addr,
time_t now, unsigned long ttl, unsigned short flags);
void cache_reload(int opts, char *buff, char *domain_suffix, char *addn_hosts);
void cache_add_dhcp_entry(char *host_name, struct in_addr *host_address, time_t ttd);
struct crec *cache_insert(char *name, struct all_addr *addr,
time_t now, unsigned long ttl, unsigned short flags);
void cache_reload(int opts, char *buff, char *domain_suffix, struct hostsfile *addn_hosts);
void cache_add_dhcp_entry(struct daemon *daemon, char *host_name, struct in_addr *host_address, time_t ttd);
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);
/* rfc1035.c */
......@@ -392,14 +409,14 @@ int setup_reply(HEADER *header, unsigned int qlen,
struct all_addr *addrp, unsigned short flags,
unsigned long local_ttl);
void extract_addresses(HEADER *header, unsigned int qlen, char *namebuff,
time_t now, struct doctor *doctors);
void extract_neg_addrs(HEADER *header, unsigned int qlen, char *namebuff, time_t now, unsigned short flags);
time_t now, struct daemon *daemon);
int answer_request(HEADER *header, char *limit, unsigned int qlen, struct daemon *daemon, time_t now);
int check_for_bogus_wildcard(HEADER *header, unsigned int qlen, char *name,
struct bogus_addr *addr, time_t now);
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);
......@@ -417,6 +434,7 @@ int sockaddr_isequal(union mysockaddr *s1, union mysockaddr *s2);
int hostname_isequal(unsigned char *a, unsigned char *b);
time_t dnsmasq_time(int fd);
int is_same_net(struct in_addr a, struct in_addr b, struct in_addr mask);
int retry_send(void);
/* option.c */
struct daemon *read_opts (int argc, char **argv);
......@@ -452,7 +470,7 @@ struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct i
/* lease.c */
void lease_update_file(int force, time_t now);
void lease_update_dns(void);
void lease_update_dns(struct daemon *daemon);
void lease_init(struct daemon *daemon, time_t now);
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);
......@@ -471,6 +489,6 @@ int icmp_ping(struct daemon *daemon, struct in_addr addr);
/* isc.c */
#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
src/forward.c
View file @ fd9fa481
This diff is collapsed.
src/isc.c
View file @ fd9fa481
......@@ -55,8 +55,9 @@ static int next_token (char *token, int buffsize, FILE * fp)
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;
struct in_addr host_address;
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 stat statbuf;
if (stat(file, &statbuf) == -1)
if (stat(daemon->lease_file, &statbuf) == -1)
{
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;
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_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;
}
syslog (LOG_INFO, "reading %s", file);
syslog (LOG_INFO, "reading %s", daemon->lease_file);
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))
{
*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) ||
......@@ -168,7 +169,7 @@ void load_dhcp(char *file, char *suffix, time_t now, char *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,
"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;
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);
strcat(lease->fqdn, ".");
strcat(lease->fqdn, suffix);
strcat(lease->fqdn, daemon->domain_suffix);
}
}
}
......@@ -235,8 +237,8 @@ void load_dhcp(char *file, char *suffix, time_t now, char *hostname)
for (lease = leases; lease; lease = lease->next)
{
cache_add_dhcp_entry(lease->fqdn, &lease->addr, lease->expires);
cache_add_dhcp_entry(lease->name, &lease->addr, lease->expires);
cache_add_dhcp_entry(daemon, lease->fqdn, &lease->addr, lease->expires);
cache_add_dhcp_entry(daemon, lease->name, &lease->addr, lease->expires);
}
}
......
src/lease.c
View file @ fd9fa481
......@@ -167,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;
......@@ -177,8 +177,8 @@ void lease_update_dns(void)
for (lease = leases; lease; lease = lease->next)
{
cache_add_dhcp_entry(lease->fqdn, &lease->addr, lease->expires);
cache_add_dhcp_entry(lease->hostname, &lease->addr, lease->expires);
cache_add_dhcp_entry(daemon, lease->fqdn, &lease->addr, lease->expires);
cache_add_dhcp_entry(daemon, lease->hostname, &lease->addr, lease->expires);
}
dns_dirty = 0;
......
src/network.c
View file @ fd9fa481
......@@ -256,6 +256,8 @@ static int create_ipv6_listener(struct listener **link, int port)
setsockopt(tcpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
setsockopt(fd, 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 ||
fcntl(tcpfd, F_SETFL, flags | O_NONBLOCK) == -1 ||
#ifdef IPV6_RECVPKTINFO
......@@ -321,6 +323,8 @@ struct listener *create_wildcard_listeners(int port)
!create_ipv6_listener(&l6, port) ||
#endif
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)
setsockopt(fd, SOL_IP, IP_PKTINFO, &opt, sizeof(opt)) == -1 ||
#elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF)
......@@ -373,6 +377,8 @@ struct listener *create_bound_listeners(struct irec *interfaces, int port)
/* See Stevens 16.6 */
(flags = fcntl(new->tcpfd, F_GETFL, 0)) == -1 ||
fcntl(new->tcpfd, F_SETFL, flags | O_NONBLOCK) == -1 ||
(flags = fcntl(new->fd, F_GETFL, 0)) == -1 ||
fcntl(new->fd, F_SETFL, flags | O_NONBLOCK) == -1 ||
bind(new->tcpfd, &iface->addr.sa, sa_len(&iface->addr)) == -1 ||
bind(new->fd, &iface->addr.sa, sa_len(&iface->addr)) == -1 ||
listen(new->tcpfd, 5) == -1)
......@@ -385,7 +391,8 @@ struct listener *create_bound_listeners(struct irec *interfaces, int port)
struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds)
{
struct serverfd *sfd;
int flags;
/* may have a suitable one already */
for (sfd = *sfds; sfd; sfd = sfd->next )
if (sockaddr_isequal(&sfd->source_addr, addr))
......@@ -402,7 +409,9 @@ struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds)
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. */
close(sfd->fd);
......
src/option.c
View file @ fd9fa481
......@@ -21,7 +21,7 @@ struct myoption {
int val;
};
#define OPTSTRING "ZDNLERzowefnbvhdkqr:m:p:c:l:s:i:t:u:g:a:x:S:C:A:T:H:Q:I:B:F:G:O:M:X:V:U:j:P:"
#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:"
static struct myoption opts[] = {
{"version", 0, 0, 'v'},
......@@ -74,6 +74,7 @@ static struct myoption opts[] = {
{"dhcp-userclass", 1, 0, 'j'},
{"edns-packet-max", 1, 0, 'P'},
{"keep-in-foreground", 0, 0, 'k'},
{"dhcp-authoritative", 0, 0, 'K'},
{0, 0, 0, 0}
};
......@@ -91,6 +92,7 @@ static struct optflags optmap[] = {
{ 'n', OPT_NO_POLL },
{ 'd', OPT_DEBUG },
{ 'k', OPT_NO_FORK },
{ 'K', OPT_AUTHORITATIVE },
{ 'o', OPT_ORDER },
{ 'R', OPT_NO_RESOLV },
{ 'E', OPT_EXPAND },
......@@ -127,6 +129,7 @@ static char *usage =
"-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"
"-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, --localmx Return MX records for local hosts.\n"
"-m, --mx-host=host_name Specify the MX name to reply to.\n"
......@@ -165,7 +168,7 @@ struct daemon *read_opts (int argc, char **argv)
int option = 0, i;
FILE *file_save = NULL, *f = NULL;
char *file_name_save = NULL, *conffile = CONFFILE;
int conffile_set = 0;
int hosts_index = 1, conffile_set = 0;
int line_save = 0, lineno = 0;
opterr = 0;
......@@ -398,15 +401,15 @@ struct daemon *read_opts (int argc, char **argv)
break;
case 'H':
if (daemon->addn_hosts)
{
option = '?';
problem = "only one addn hosts file allowed";
}
else
daemon->addn_hosts = safe_string_alloc(optarg);
break;
{
struct hostsfile *new = safe_malloc(sizeof(struct hostsfile));
new->fname = safe_string_alloc(optarg);
new->index = hosts_index++;
new->next = daemon->addn_hosts;
daemon->addn_hosts = new;
break;
}
case 's':
if (strcmp (optarg, "#") == 0)
daemon->options |= OPT_RESOLV_DOMAIN;
......@@ -1009,10 +1012,11 @@ struct daemon *read_opts (int argc, char **argv)
new->len = 0;
new->is_addr = 0;
new->netid = NULL;
new->val = NULL;
if ((comma = strchr(optarg, ',')))
{
*comma = 0;
*comma++ = 0;
for (cp = optarg; *cp; cp++)
if (!(*cp == ' ' || (*cp >='0' && *cp <= '9')))
......@@ -1021,9 +1025,9 @@ struct daemon *read_opts (int argc, char **argv)
if (*cp)
{
new->netid = safe_string_alloc(optarg);
optarg = comma + 1;
optarg = comma;
if ((comma = strchr(optarg, ',')))
*comma = 0;
*comma++ = 0;
}
}
......@@ -1031,118 +1035,190 @@ struct daemon *read_opts (int argc, char **argv)
{
option = '?';
problem = "bad dhcp-opt";
if (new->netid)
free(new->netid);
free(new);
break;
}
daemon->dhcp_opts = new;
if (!comma)
break;
/* characterise the value */
is_addr = is_hex = is_dec = 1;
addrs = digs = 1;
for (cp = comma+1; *cp; cp++)
if (*cp == ',')
{
addrs++;
is_dec = is_hex = 0;
}
else if (*cp == ':')
{
digs++;
is_dec = is_addr = 0;
}
else if (*cp == '.')
is_dec = is_hex = 0;
else if (!(*cp >='0' && *cp <= '9'))
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)
{
is_dec = is_addr = 0;
if (!((*cp >='A' && *cp <= 'F') ||
(*cp >='a' && *cp <= 'f')))
is_hex = 0;
if (!canonicalise(optarg))
{
option = '?';
problem = "bad dhcp-search-opt";
break;
}
if (!(r = realloc(p, len + strlen(optarg) + 2)))
die("could not get memory", NULL);
p = memmove(r, p, len);
q = p + len;
/* 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;
}
if (is_hex && digs > 1)
new->len = len;
new->val = p;
}
else if (comma)
{
char *p = comma+1, *q, *r;
new->len = digs;
q = new->val = safe_malloc(new->len);
while (*p)
/* not option 119 */
/* characterise the value */
is_addr = is_hex = is_dec = 1;
addrs = digs = 1;
for (cp = comma; *cp; cp++)
if (*cp == ',')
{
addrs++;
is_dec = is_hex = 0;
}
else if (*cp == ':')
{
digs++;
is_dec = is_addr = 0;
}
else if (*cp == '.')
is_dec = is_hex = 0;
else if (!(*cp >='0' && *cp <= '9'))
{
is_dec = is_addr = 0;
if (!((*cp >='A' && *cp <= 'F') ||
(*cp >='a' && *cp <= 'f')))
is_hex = 0;
}
if (is_hex && digs > 1)
{
for (r = p; *r && *r != ':'; r++);
if (*r)
char *p = comma, *q, *r;
new->len = digs;
q = new->val = safe_malloc(new->len);
while (*p)
{
if (r != p)
for (r = p; *r && *r != ':'; r++);
if (*r)
{
*r = 0;
*(q++) = strtol(p, NULL, 16);
if (r != p)
{
*r = 0;
*(q++) = strtol(p, NULL, 16);
}
p = r+1;
}
p = r+1;
else
{
if (*p)
*(q++) = strtol(p, NULL, 16);
break;
}
}
}
else if (is_dec)
{
/* Given that we don't know the length,
this appaling hack is the best available */
unsigned int val = atoi(comma);
if (val < 256)
{
new->len = 1;
new->val = safe_malloc(1);
*(new->val) = val;
}
else if (val < 65536)
{
new->len = 2;
new->val = safe_malloc(2);
*(new->val) = val>>8;
*(new->val+1) = val;
}
else
{
if (*p)
*(q++) = strtol(p, NULL, 16);
break;
new->len = 4;
new->val = safe_malloc(4);
*(new->val) = val>>24;
*(new->val+1) = val>>16;
*(new->val+2) = val>>8;
*(new->val+3) = val;
}
}
}
else if (is_dec)
{
/* Given that we don't know the length,
this appaling hack is the best available */
unsigned int val = atoi(comma+1);
if (val < 256)
{
new->len = 1;
new->val = safe_malloc(1);
*(new->val) = val;
}
else if (val < 65536)
else if (is_addr)
{
new->len = 2;
new->val = safe_malloc(2);
*(new->val) = val>>8;
*(new->val+1) = val;
struct in_addr in;
unsigned char *op;
new->len = INADDRSZ * addrs;
new->val = op = safe_malloc(new->len);
new->is_addr = 1;
while (addrs--)
{
cp = comma;
if ((comma = strchr(cp, ',')))
*comma++ = 0;
in.s_addr = inet_addr(cp);
memcpy(op, &in, INADDRSZ);
op += INADDRSZ;
}
}
else
{
new->len = 4;
new->val = safe_malloc(4);
*(new->val) = val>>24;
*(new->val+1) = val>>16;
*(new->val+2) = val>>8;
*(new->val+3) = val;
/* text arg */
new->len = strlen(comma);
new->val = safe_malloc(new->len);
memcpy(new->val, comma, new->len);
}
}
else if (is_addr)
if (new->len > 256)
{
struct in_addr in;
unsigned char *op;
new->len = INADDRSZ * addrs;
new->val = op = safe_malloc(new->len);
new->is_addr = 1;
while (addrs--)
{
cp = comma;
if ((comma = strchr(cp+1, ',')))
*comma = 0;
in.s_addr = inet_addr(cp+1);
memcpy(op, &in, INADDRSZ);
op += INADDRSZ;
}
option = '?';
problem = "dhcp-option too long";
}
else
if (option == '?')
{
/* text arg */
new->len = strlen(comma+1);
new->val = safe_malloc(new->len);
memcpy(new->val, comma+1, new->len);
if (new->netid)
free(new->netid);
if (new->val)
free(new->val);
free(new);
}
else
daemon->dhcp_opts = new;
break;
}
......
src/rfc1035.c
View file @ fd9fa481
This diff is collapsed.
src/rfc2131.c
View file @ fd9fa481
......@@ -408,10 +408,12 @@ int dhcp_reply(struct daemon *daemon, struct in_addr iface_addr, char *iface_nam
(iface_addr.s_addr != option_addr(opt).s_addr))
return 0;
log_packet("RELEASE", &mess->ciaddr, mess->chaddr, iface_name, NULL);
if (lease && lease->addr.s_addr == mess->ciaddr.s_addr)
lease_prune(lease, now);
else
message = "unknown lease";
log_packet("RELEASE", &mess->ciaddr, mess->chaddr, iface_name, message);
return 0;
......@@ -473,22 +475,14 @@ int dhcp_reply(struct daemon *daemon, struct in_addr iface_addr, char *iface_nam
lease_prune(lease, now);
lease = NULL;
}
if (!lease)
{
if (lease_find_by_addr(mess->yiaddr))
message = "address in use";
else if (!(lease = lease_allocate(clid, clid_len, mess->yiaddr)))
message = "no leases left";
}
}
else
{
/* INIT-REBOOT */
if (!lease)
if (!lease && !(daemon->options & OPT_AUTHORITATIVE))
return 0;
if (lease->addr.s_addr != mess->yiaddr.s_addr)
if (lease && lease->addr.s_addr != mess->yiaddr.s_addr)
message = "wrong address";
}
}
......@@ -507,31 +501,40 @@ int dhcp_reply(struct daemon *daemon, struct in_addr iface_addr, char *iface_nam
mess->yiaddr = mess->ciaddr;
}
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 (!is_same_net(mess->yiaddr, context->start, context->netmask))
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. */
else if (!address_available(context, mess->yiaddr) &&
(!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
when the client does DISCOVER, it will get the static address, otherwise
an endless protocol loop will ensue. */
else if (have_config(config, CONFIG_ADDR) && !lease_find_by_addr(config->addr))
else if (have_config(config, CONFIG_ADDR) &&
config->addr.s_addr != mess->yiaddr.s_addr &&
(!(ltmp = lease_find_by_addr(config->addr)) || ltmp == lease))
message = "static lease available";
/* 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";
}
log_packet("REQUEST", &mess->yiaddr, mess->chaddr, iface_name, NULL);
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)
{
......@@ -541,30 +544,31 @@ int dhcp_reply(struct daemon *daemon, struct in_addr iface_addr, char *iface_nam
bootp_option_put(mess, NULL, NULL);
p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPNAK);
p = option_put_string(p, end, OPTION_MESSAGE, message);
p = option_end(p, end, mess);
mess->flags |= htons(0x8000); /* broadcast */
return p - (unsigned char *)mess;
}
log_packet("ACK", &mess->yiaddr, mess->chaddr, iface_name, hostname);
lease_set_hwaddr(lease, mess->chaddr);
if (hostname)
lease_set_hostname(lease, hostname, daemon->domain_suffix);
lease_set_expires(lease, renewal_time == 0xffffffff ? 0 : now + (time_t)renewal_time);
bootp_option_put(mess, daemon->dhcp_file, daemon->dhcp_sname);
mess->siaddr = daemon->dhcp_next_server.s_addr ? daemon->dhcp_next_server : iface_addr;
p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(iface_addr.s_addr));
p = option_put(p, end, OPTION_LEASE_TIME, 4, renewal_time);
if (renewal_time != 0xffffffff)
else
{
p = option_put(p, end, OPTION_T1, 4, (renewal_time/2) - fuzz);
p = option_put(p, end, OPTION_T2, 4, ((renewal_time * 7)/8) - fuzz);
log_packet("ACK", &mess->yiaddr, mess->chaddr, iface_name, hostname);
lease_set_hwaddr(lease, mess->chaddr);
if (hostname)
lease_set_hostname(lease, hostname, daemon->domain_suffix);
lease_set_expires(lease, renewal_time == 0xffffffff ? 0 : now + (time_t)renewal_time);
bootp_option_put(mess, daemon->dhcp_file, daemon->dhcp_sname);
mess->siaddr = daemon->dhcp_next_server.s_addr ? daemon->dhcp_next_server : iface_addr;
p = option_put(p, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
p = option_put(p, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(iface_addr.s_addr));
p = option_put(p, end, OPTION_LEASE_TIME, 4, renewal_time);
if (renewal_time != 0xffffffff)
{
p = option_put(p, end, OPTION_T1, 4, (renewal_time/2) - fuzz);
p = option_put(p, end, OPTION_T2, 4, ((renewal_time * 7)/8) - fuzz);
}
p = do_req_options(context, p, end, req_options, daemon,
hostname, iface_addr, netid, subnet_addr);
}
p = do_req_options(context, p, end, req_options, daemon,
hostname, iface_addr, netid, subnet_addr);
p = option_end(p, end, mess);
return p - (unsigned char *)mess;
......
src/util.c
View file @ fd9fa481
......@@ -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);
}
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;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment