mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-20 19:52:10 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
824af85bdf | ||
|
|
5aabfc78bc |
No files matched your search
@@ -45,7 +45,7 @@ release 0.95 Major rewrite: remove calls to gethostbyname() and talk
|
|||||||
dnsmasq to serve names to the machine it is running
|
dnsmasq to serve names to the machine it is running
|
||||||
on (put nameserver 127.0.0.1 in /etc/resolv.conf and
|
on (put nameserver 127.0.0.1 in /etc/resolv.conf and
|
||||||
give dnsmasq the option -r /etc/resolv.dnsmasq)
|
give dnsmasq the option -r /etc/resolv.dnsmasq)
|
||||||
(6) Dnsmasq will re-read it's servers if the
|
(6) Dnsmasq will re-read its servers if the
|
||||||
modification time of resolv.conf changes. Along with
|
modification time of resolv.conf changes. Along with
|
||||||
4 above this allows nameservers to be set
|
4 above this allows nameservers to be set
|
||||||
automatically by ppp or dhcp.
|
automatically by ppp or dhcp.
|
||||||
@@ -1076,7 +1076,7 @@ release 2.10
|
|||||||
|
|
||||||
NAK attempts to renew a pool DHCP lease when a statically
|
NAK attempts to renew a pool DHCP lease when a statically
|
||||||
allocated address has become available, forcing a host to
|
allocated address has become available, forcing a host to
|
||||||
move to it's allocated address. Lots of people have
|
move to its allocated address. Lots of people have
|
||||||
suggested this change and been rebuffed (they know who
|
suggested this change and been rebuffed (they know who
|
||||||
they are) the straws that broke the camel's back were Tim
|
they are) the straws that broke the camel's back were Tim
|
||||||
Cutts and Jamie Lokier.
|
Cutts and Jamie Lokier.
|
||||||
@@ -2234,3 +2234,235 @@ release 2.39
|
|||||||
to add a domain name with a dynamic IP address taken from
|
to add a domain name with a dynamic IP address taken from
|
||||||
the address of a local network interface. Useful for
|
the address of a local network interface. Useful for
|
||||||
networks with dynamic IPs.
|
networks with dynamic IPs.
|
||||||
|
|
||||||
|
version 2.40
|
||||||
|
Make SIGUSR2 close-and-reopen the logfile when logging
|
||||||
|
direct to a file. Thanks to Carlos Carvalho for
|
||||||
|
suggesting this. When a logfile is created, change
|
||||||
|
its ownership to the user dnsmasq will run as, don't
|
||||||
|
leave it owned by root.
|
||||||
|
|
||||||
|
Set a special tag, "known" for hosts which are matched by
|
||||||
|
a dhcp-host or /etc/ethers line. This is especially
|
||||||
|
useful to be able to do --dhcp-ignore=#known, like ISCs
|
||||||
|
"deny unknown-clients".
|
||||||
|
|
||||||
|
Explicitly set a umask before creating the leases file,
|
||||||
|
rather than relying on whatever we inherited. The
|
||||||
|
permissions are set to 644.
|
||||||
|
|
||||||
|
Fix handling of fully-qualified names in --dhcp-host
|
||||||
|
directives and in /etc/ethers. These are now rejected
|
||||||
|
if the domain doesn't match that given by --domain,
|
||||||
|
and used correctly otherwise. Before, putting
|
||||||
|
a FQDN here could cause the whole FQDN to be used as
|
||||||
|
hostname. Thanks to Michael Heimpold for the bug report.
|
||||||
|
|
||||||
|
Massive but trivial edit to make the "daemon" variable
|
||||||
|
global, instead of copying the same value around as the
|
||||||
|
first argument to half the functions in the program.
|
||||||
|
|
||||||
|
Updated Spanish manpage and message catalog. Thanks
|
||||||
|
to Chris Chatham.
|
||||||
|
|
||||||
|
Added patch for support of DNS LOC records in
|
||||||
|
contrib/dns-loc. Thanks to Lorenz Schori.
|
||||||
|
|
||||||
|
Fixed error in manpage: dhcp-ignore-name ->
|
||||||
|
dhcp-ignore-names. Thanks to Daniel Mentz for spotting
|
||||||
|
this.
|
||||||
|
|
||||||
|
Use client-id as hash-seed for DHCP address allocation
|
||||||
|
with Firewire and Infiniband, as these don't supply an MAC
|
||||||
|
address.
|
||||||
|
|
||||||
|
Tweaked TFTP file-open code to make it behave sensibly
|
||||||
|
when the filesystem changes under its feet.
|
||||||
|
|
||||||
|
Added DNSMASQ_TIME_REMAINING environment variable to the
|
||||||
|
lease-script.
|
||||||
|
|
||||||
|
Always send replies to DHCPINFORM requests to the source
|
||||||
|
of the request and not to the address in ciaddr. This
|
||||||
|
allows third-party queries.
|
||||||
|
|
||||||
|
Return "lease time remaining" in the reply to a DHCPINFORM
|
||||||
|
request if there exists a lease for the host sending the
|
||||||
|
request.
|
||||||
|
|
||||||
|
Added --dhcp-hostsfile option. This gives a superset of
|
||||||
|
the functionality provided by /etc/ethers. Thanks to
|
||||||
|
Greg Kurtzer for the suggestion.
|
||||||
|
|
||||||
|
Accept keyword "server" as a synonym for "nameserver" in
|
||||||
|
resolv.conf. Thanks to Andrew Bartlett for the report.
|
||||||
|
|
||||||
|
Add --tftp-unique-root option. Suggestion from Dermot
|
||||||
|
Bradley.
|
||||||
|
|
||||||
|
Tweak TFTP retry timer to avoid problems with difficult
|
||||||
|
clients. Thanks to Dermot Bradley for assistance with
|
||||||
|
this.
|
||||||
|
|
||||||
|
Continue to use unqualified hostnames provided by DHCP
|
||||||
|
clients, even if the domain part is illegal. (The domain
|
||||||
|
is ignored, and an error logged.) Previously in this
|
||||||
|
situation, the whole name whould have been
|
||||||
|
rejected. Thanks to Jima for the patch.
|
||||||
|
|
||||||
|
Handle EINTR returns from wait() correctly and reap
|
||||||
|
our children's children if necessary. This fixes
|
||||||
|
a problem with zombie-creation under *BSD when using
|
||||||
|
--dhcp-script.
|
||||||
|
|
||||||
|
Escape spaces in hostnames when they are stored in the
|
||||||
|
leases file and passed to the lease-change
|
||||||
|
script. Suggestion from Ben Voigt.
|
||||||
|
|
||||||
|
Re-run the lease chamge script with an "old" event for
|
||||||
|
each lease when dnsmasq receives a SIGHUP.
|
||||||
|
|
||||||
|
Added more useful exit codes, including passing on a
|
||||||
|
non-zero exit code from the lease-script "init" call when
|
||||||
|
--leasefile-ro is set.
|
||||||
|
|
||||||
|
Log memory allocation failure whilst the daemon is
|
||||||
|
running. Allocation failures during startup are fatal,
|
||||||
|
but lack of memory whilst running is worked around.
|
||||||
|
This used to be silent, but now is logged.
|
||||||
|
|
||||||
|
Fixed misaligned memory access which caused problems on
|
||||||
|
Blackfin CPUs. Thanks to Alex Landau for the patch.
|
||||||
|
|
||||||
|
Don't include (useless) script-calling code when NO_FORK
|
||||||
|
is set. Since this tends to be used on very small uclinux
|
||||||
|
systems, it's worth-while to save some code-size.
|
||||||
|
|
||||||
|
Don't set REUSEADDR on TFTP listening socket. There's no
|
||||||
|
need to do so, and it creates confusing behaviour when
|
||||||
|
inetd is also listening on the same port. Thanks to Erik
|
||||||
|
Brown for spotting the problem.
|
||||||
|
|
||||||
|
version 2.41
|
||||||
|
Remove deprecated calls when compiled against libdbus 1.1.
|
||||||
|
|
||||||
|
Fix "strict-alias" warning in bpf.c
|
||||||
|
|
||||||
|
Reduce dependency on Gnu-make in build system: dnsmasq now
|
||||||
|
builds with system make under OpenBSD.
|
||||||
|
|
||||||
|
Port to Solaris. Dnsmasq 1.x used to run under Solaris,
|
||||||
|
and this release does so again, for Solaris 9 or better.
|
||||||
|
|
||||||
|
Allow the DNS function to be completely disabled, by
|
||||||
|
setting the port to zero "--port=0". The allows dnsmasq to
|
||||||
|
be used as a simple DHCP server, simple TFTP server, or
|
||||||
|
both, but without the DNS server getting in the way.
|
||||||
|
|
||||||
|
Fix a bug where NXDOMAIN could be returned for a query
|
||||||
|
even if the name's value was known for a different query
|
||||||
|
type. This bug could be prodded with
|
||||||
|
--local=/domain/ --address=/name.domain/1.2.3.4
|
||||||
|
An IPv6 query for name.domain would return NXDOMAIN, and
|
||||||
|
not the correct NOERROR. Thanks to Lars Nooden for
|
||||||
|
spotting the bug and Jima for diagnosis of the problem.
|
||||||
|
|
||||||
|
Added per-server stats to the information logged when
|
||||||
|
dnsmasq gets SIGUSR1.
|
||||||
|
|
||||||
|
Added counts of queries forwarded and queries answered
|
||||||
|
locally (from the cache, /etc/hosts or config).
|
||||||
|
|
||||||
|
Fixed possible crash bug in DBus IPv6 code. Thanks to Matt
|
||||||
|
Domsch and Jima.
|
||||||
|
|
||||||
|
Tighten checks for clashes between hosts-file and
|
||||||
|
DHCP-derived names. Multiple addresses associated with a
|
||||||
|
name in hosts-file no longer confuses the check.
|
||||||
|
|
||||||
|
Add --dhcp-no-override option to fix problems with some
|
||||||
|
combinations of stage zero and stage one
|
||||||
|
bootloaders. Thanks to Steve Alexander for the bug report.
|
||||||
|
|
||||||
|
Add --tftp-port-range option. Thanks to Daniel Mierswa for
|
||||||
|
the suggestion.
|
||||||
|
|
||||||
|
Add --stop-dns-rebind option. Thanks to Collin Mulliner
|
||||||
|
for the patch.
|
||||||
|
|
||||||
|
Added GPL version 3 as a license option.
|
||||||
|
|
||||||
|
Added --all-servers option. Thanks to Peter Naulls for the
|
||||||
|
patch.
|
||||||
|
|
||||||
|
Extend source address mechanism so that the interface used
|
||||||
|
to contact an upstream DNS server can be nailed
|
||||||
|
down. Something like "--server=1.2.3.4@eth1" will force
|
||||||
|
the use of eth1 for traffic to DNS-server 1.2.3.4. This
|
||||||
|
facility is only available on Linux and Solaris. Thanks to
|
||||||
|
Peter Naulls for prompting this.
|
||||||
|
|
||||||
|
Add --dhcp-optsfile option. Thanks to Carlos Carvalho for
|
||||||
|
the suggestion.
|
||||||
|
|
||||||
|
Fixed failure to set source address for server connections
|
||||||
|
when using TCP. Thanks to Simon Capper for finding this
|
||||||
|
bug.
|
||||||
|
|
||||||
|
Refuse to give a DHCP client the address it asks for if
|
||||||
|
the address range in question is not available to that
|
||||||
|
particular host. Thanks to Cedric Duval for the bug
|
||||||
|
report.
|
||||||
|
|
||||||
|
Changed behavior of DHCP server to always return total length of
|
||||||
|
a new lease in DHCPOFFER, even if an existing lease
|
||||||
|
exists. (It used to return the time remaining on the lease
|
||||||
|
whne one existed.) This fixes problems with the Sony Ericsson
|
||||||
|
K610i phone. Thanks to Hakon Stordahl for finding and
|
||||||
|
fixing this.
|
||||||
|
|
||||||
|
Add DNSMASQ_INTERFACE to the environment of the
|
||||||
|
lease-change script. Thanks to Nikos Mavrogiannopoulos for
|
||||||
|
the patch.
|
||||||
|
|
||||||
|
Fixed broken --alias functionality. Thanks to Michael
|
||||||
|
Meelis for the bug report.
|
||||||
|
|
||||||
|
Added French translation of the man page. Thank to Gildas
|
||||||
|
Le Nadan for that.
|
||||||
|
|
||||||
|
Add --dhcp-match flag, to check for arbitrary options in
|
||||||
|
DHCP messages from clients. This enables use of dnsmasq
|
||||||
|
with gPXE. Thanks to Rance Hall for the suggestion.
|
||||||
|
|
||||||
|
Added --dhcp-broadcast, to force broadcast replies to DHCP
|
||||||
|
clients which need them but are too dumb or too old to
|
||||||
|
ask. Thanks to Bodo Bellut for the suggestion.
|
||||||
|
|
||||||
|
Disable path-MTU discovery on DHCP and TFTP sockets. This
|
||||||
|
is never needed, and the presence of DF flags in the IP
|
||||||
|
header confuses some broken PXE ROMS. Thanks again to Bodo
|
||||||
|
Bellut for spotting this.
|
||||||
|
|
||||||
|
Fix problems with addresses which have multiple PTR
|
||||||
|
records - all but one of these could get lost.
|
||||||
|
|
||||||
|
Fix bug with --address and ANY query type seeing REFUSED
|
||||||
|
return code in replies. Thanks to Mike Wright for spotting
|
||||||
|
the problem.
|
||||||
|
|
||||||
|
Update Spanish translation. Thanks to Chris Chatham.
|
||||||
|
|
||||||
|
Add --neg-ttl option.
|
||||||
|
|
||||||
|
Add warnings about the bad effects of --filterwin2k on
|
||||||
|
SIP, XMPP and Google-talk to the example config file.
|
||||||
|
|
||||||
|
Fix va_list abuse in log.c. This fixes crashes on powerpc
|
||||||
|
when debug mode is set. Thanks to cedric Duval for the
|
||||||
|
patch.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
+674
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
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 3 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, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
Q: Why does dnsmasq open UDP ports >1024 as well as port 53.
|
Q: Why does dnsmasq open UDP ports >1024 as well as port 53.
|
||||||
Is this a security problem/trojan/backdoor?
|
Is this a security problem/trojan/backdoor?
|
||||||
|
|
||||||
A: The high ports that dnsmasq opens is for replies from the upstream
|
A: The high ports that dnsmasq opens are for replies from the upstream
|
||||||
nameserver(s). Queries from dnsmasq to upstream nameservers are sent
|
nameserver(s). Queries from dnsmasq to upstream nameservers are sent
|
||||||
from these ports and replies received to them. The reason for doing this is
|
from these ports and replies received to them. The reason for doing this is
|
||||||
that most firewall setups block incoming packets _to_ port 53, in order
|
that most firewall setups block incoming packets _to_ port 53, in order
|
||||||
@@ -39,10 +39,9 @@ A: They are negative entries: that's what the N flag means. Dnsmasq asked
|
|||||||
|
|
||||||
Q: Will dnsmasq compile/run on non-Linux systems?
|
Q: Will dnsmasq compile/run on non-Linux systems?
|
||||||
|
|
||||||
A: Yes, there is explicit support for *BSD and MacOS X. There are
|
A: Yes, there is explicit support for *BSD and MacOS X and Solaris.
|
||||||
start-up scripts for MacOS X Tiger and Panther in /contrib. Earlier
|
There are start-up scripts for MacOS X Tiger and Panther
|
||||||
dnsmasq releases ran under Solaris, but that capability has
|
in /contrib. Dnsmasq will link with uclibc to provide small
|
||||||
rotted. Dnsmasq will link with uclibc to provide small
|
|
||||||
binaries suitable for use in embedded systems such as
|
binaries suitable for use in embedded systems such as
|
||||||
routers. (There's special code to support machines with flash
|
routers. (There's special code to support machines with flash
|
||||||
filesystems and no battery-backed RTC.)
|
filesystems and no battery-backed RTC.)
|
||||||
@@ -50,7 +49,7 @@ A: Yes, there is explicit support for *BSD and MacOS X. There are
|
|||||||
ports and building dnsmasq with "make MAKE=gmake"
|
ports and building dnsmasq with "make MAKE=gmake"
|
||||||
For other systems, try altering the settings in config.h.
|
For other systems, try altering the settings in config.h.
|
||||||
|
|
||||||
Q: My companies' nameserver knows about some names which aren't in the
|
Q: My company's nameserver knows about some names which aren't in the
|
||||||
public DNS. Even though I put it first in /etc/resolv.conf, it
|
public DNS. Even though I put it first in /etc/resolv.conf, it
|
||||||
dosen't work: dnsmasq seems not to use the nameservers in the order
|
dosen't work: dnsmasq seems not to use the nameservers in the order
|
||||||
given. What am I doing wrong?
|
given. What am I doing wrong?
|
||||||
@@ -380,6 +379,14 @@ A: This a variant on the iptables problem. Explicit details on how to
|
|||||||
http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2005q3/000431.html
|
http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2005q3/000431.html
|
||||||
|
|
||||||
|
|
||||||
|
Q: I'm using dnsmasq on a machine with the shorewall firewall, and
|
||||||
|
DHCP doesn't work. What's the problem?
|
||||||
|
|
||||||
|
A: This a variant on the iptables problem. Explicit details on how to
|
||||||
|
proceed can be found at
|
||||||
|
http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2007q4/001764.html
|
||||||
|
|
||||||
|
|
||||||
Q: Dnsmasq logs "running as root because setting capabilities failed"
|
Q: Dnsmasq logs "running as root because setting capabilities failed"
|
||||||
when it starts up. Why did that happen and what can do to fix it?
|
when it starts up. Why did that happen and what can do to fix it?
|
||||||
|
|
||||||
@@ -443,6 +450,3 @@ A: In almost all cases: none. If you have the normal arrangement with
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,18 +1,47 @@
|
|||||||
PREFIX ?= /usr/local
|
# dnsmasq is Copyright (c) 2000-2007 Simon Kelley
|
||||||
BINDIR ?= ${PREFIX}/sbin
|
#
|
||||||
MANDIR ?= ${PREFIX}/share/man
|
# This program is free software; you can redistribute it and/or modify
|
||||||
LOCALEDIR ?= ${PREFIX}/share/locale
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
# (at your option) version 3 dated 29 June, 2007.
|
||||||
|
#
|
||||||
|
# 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, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
PREFIX = /usr/local
|
||||||
|
BINDIR = ${PREFIX}/sbin
|
||||||
|
MANDIR = ${PREFIX}/share/man
|
||||||
|
LOCALEDIR = ${PREFIX}/share/locale
|
||||||
|
|
||||||
SRC = src
|
SRC = src
|
||||||
PO = po
|
PO = po
|
||||||
MAN = man
|
MAN = man
|
||||||
|
|
||||||
CFLAGS?= -O2
|
PKG_CONFIG = pkg-config
|
||||||
|
AWK = nawk
|
||||||
|
INSTALL = install
|
||||||
|
|
||||||
|
DBUS_MINOR=" `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --modversion dbus-1 | $(AWK) -F . -- '{ if ($$(NF-1)) print \"-DDBUS_MINOR=\"$$(NF-1) }'`"
|
||||||
|
DBUS_CFLAGS="`echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --cflags dbus-1`"
|
||||||
|
DBUS_LIBS=" `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --libs dbus-1`"
|
||||||
|
SUNOS_VER=" `if uname | grep SunOS 2>&1 >/dev/null; then uname -r | $(AWK) -F . -- '{ print \"-DSUNOS_VER=\"$$2 }'; fi`"
|
||||||
|
SUNOS_LIBS=" `if uname | grep SunOS 2>&1 >/dev/null; then echo -lsocket -lnsl -lposix4; fi `"
|
||||||
|
|
||||||
all : dnsmasq
|
all : dnsmasq
|
||||||
|
|
||||||
dnsmasq :
|
dnsmasq :
|
||||||
$(MAKE) I18N=-DNO_GETTEXT -f ../bld/Makefile -C $(SRC) dnsmasq
|
cd $(SRC) && $(MAKE) \
|
||||||
|
DBUS_MINOR=$(DBUS_MINOR) \
|
||||||
|
DBUS_CFLAGS=$(DBUS_CFLAGS) \
|
||||||
|
DBUS_LIBS=$(DBUS_LIBS) \
|
||||||
|
SUNOS_LIBS=$(SUNOS_LIBS) \
|
||||||
|
SUNOS_VER=$(SUNOS_VER) \
|
||||||
|
-f ../bld/Makefile dnsmasq
|
||||||
|
|
||||||
clean :
|
clean :
|
||||||
rm -f *~ $(SRC)/*.mo contrib/*/*~ */*~ $(SRC)/*.pot
|
rm -f *~ $(SRC)/*.mo contrib/*/*~ */*~ $(SRC)/*.pot
|
||||||
@@ -21,14 +50,21 @@ clean :
|
|||||||
install : all install-common
|
install : all install-common
|
||||||
|
|
||||||
install-common :
|
install-common :
|
||||||
install -d $(DESTDIR)$(BINDIR) -d $(DESTDIR)$(MANDIR)/man8
|
$(INSTALL) -d $(DESTDIR)$(BINDIR) -d $(DESTDIR)$(MANDIR)/man8
|
||||||
install -m 644 $(MAN)/dnsmasq.8 $(DESTDIR)$(MANDIR)/man8
|
$(INSTALL) -m 644 $(MAN)/dnsmasq.8 $(DESTDIR)$(MANDIR)/man8
|
||||||
install -m 755 $(SRC)/dnsmasq $(DESTDIR)$(BINDIR)
|
$(INSTALL) -m 755 $(SRC)/dnsmasq $(DESTDIR)$(BINDIR)
|
||||||
|
|
||||||
all-i18n :
|
all-i18n :
|
||||||
$(MAKE) I18N=-DLOCALEDIR='\"$(LOCALEDIR)\"' -f ../bld/Makefile -C $(SRC) dnsmasq
|
cd $(SRC) && $(MAKE) \
|
||||||
|
I18N=-DLOCALEDIR='\"$(LOCALEDIR)\"' \
|
||||||
|
DBUS_MINOR=$(DBUS_MINOR) \
|
||||||
|
DBUS_CFLAGS=$(DBUS_CFLAGS) \
|
||||||
|
DBUS_LIBS=$(DBUS_LIBS) \
|
||||||
|
SUNOS_LIBS=$(SUNOS_LIBS) \
|
||||||
|
SUNOS_VER=$(SUNOS_VER) \
|
||||||
|
-f ../bld/Makefile dnsmasq
|
||||||
cd $(PO); for f in *.po; do \
|
cd $(PO); for f in *.po; do \
|
||||||
$(MAKE) -f ../bld/Makefile -C ../$(SRC) $${f%.po}.mo; \
|
cd ../$(SRC) && $(MAKE) -f ../bld/Makefile $${f%.po}.mo; \
|
||||||
done
|
done
|
||||||
|
|
||||||
install-i18n : all-i18n install-common
|
install-i18n : all-i18n install-common
|
||||||
|
|||||||
+3
-5
@@ -1,16 +1,14 @@
|
|||||||
CFLAGS ?= -O2
|
CFLAGS = -Wall -W -O2
|
||||||
PKG_CONFIG ?= pkg-config
|
|
||||||
|
|
||||||
|
|
||||||
OBJS = cache.o rfc1035.o util.o option.o forward.o isc.o network.o \
|
OBJS = cache.o rfc1035.o util.o option.o forward.o isc.o network.o \
|
||||||
dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
|
dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
|
||||||
helper.o tftp.o log.o
|
helper.o tftp.o log.o
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
$(CC) $(CFLAGS) $(COPTS) $(I18N) `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --cflags dbus-1` $(RPM_OPT_FLAGS) -Wall -W -c $<
|
$(CC) $(CFLAGS) $(COPTS) $(DBUS_MINOR) $(I18N) $(DBUS_CFLAGS) $(SUNOS_VER) $(RPM_OPT_FLAGS) -c $<
|
||||||
|
|
||||||
dnsmasq : $(OBJS)
|
dnsmasq : $(OBJS)
|
||||||
$(CC) $(LDFLAGS) -o $@ $(OBJS) `echo $(COPTS) | ../bld/pkg-wrapper $(PKG_CONFIG) --libs dbus-1` $(LIBS)
|
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(DBUS_LIBS) $(SUNOS_LIBS) $(LIBS)
|
||||||
|
|
||||||
dnsmasq.pot : $(OBJS:.o=.c) dnsmasq.h config.h
|
dnsmasq.pot : $(OBJS:.o=.c) dnsmasq.h config.h
|
||||||
xgettext -d dnsmasq --foreign-user --keyword=_ -o dnsmasq.pot -i $(OBJS:.o=.c)
|
xgettext -d dnsmasq --foreign-user --keyword=_ -o dnsmasq.pot -i $(OBJS:.o=.c)
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
for f in *; do
|
for f in *; do
|
||||||
if [ -d $f ]; then
|
if [ -d $f ]; then
|
||||||
install -d $1/$f/man8
|
install -m 755 -d $1/$f/man8
|
||||||
install -m 644 $f/dnsmasq.8 $1/$f/man8
|
install -m 644 $f/dnsmasq.8 $1/$f/man8
|
||||||
echo installing $1/$f/man8/dnsmasq.8
|
echo installing $1/$f/man8/dnsmasq.8
|
||||||
fi
|
fi
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
for f in *.mo; do
|
for f in *.mo; do
|
||||||
install -d $1/${f%.mo}/LC_MESSAGES
|
install -m 755 -d $1/${f%.mo}/LC_MESSAGES
|
||||||
install -m 644 $f $1/${f%.mo}/LC_MESSAGES/dnsmasq.mo
|
install -m 644 $f $1/${f%.mo}/LC_MESSAGES/dnsmasq.mo
|
||||||
echo installing $1/${f%.mo}/LC_MESSAGES/dnsmasq.mo
|
echo installing $1/${f%.mo}/LC_MESSAGES/dnsmasq.mo
|
||||||
done
|
done
|
||||||
|
|||||||
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
if grep -q "^\#.*define.*HAVE_DBUS" config.h || grep -q HAVE_DBUS ; then
|
if grep "^\#.*define.*HAVE_DBUS" config.h 2>&1 >/dev/null || \
|
||||||
|
grep HAVE_DBUS 2>&1 >/dev/null ; then
|
||||||
exec $*
|
exec $*
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
Hi Simon
|
||||||
|
|
||||||
|
Here is a patch against dnsmasq 2.39 which provides support for LOC
|
||||||
|
entries in order to assign location information to dns records
|
||||||
|
(rfc1876). I tested it on OSX and on OpenWRT.
|
||||||
|
|
||||||
|
Cheers
|
||||||
|
Lorenz
|
||||||
|
|
||||||
|
More info:
|
||||||
|
http://www.ckdhr.com/dns-loc/
|
||||||
|
http://www.faqs.org/rfcs/rfc1876.html
|
||||||
@@ -0,0 +1,522 @@
|
|||||||
|
diff -Nur dnsmasq-2.39-orig/bld/Makefile dnsmasq-2.39/bld/Makefile
|
||||||
|
--- dnsmasq-2.39-orig/bld/Makefile 2007-02-17 14:37:06.000000000 +0100
|
||||||
|
+++ dnsmasq-2.39/bld/Makefile 2007-05-20 18:23:44.000000000 +0200
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
PKG_CONFIG ?= pkg-config
|
||||||
|
|
||||||
|
|
||||||
|
-OBJS = cache.o rfc1035.o util.o option.o forward.o isc.o network.o \
|
||||||
|
+OBJS = cache.o rfc1035.o rfc1876.o util.o option.o forward.o isc.o network.o \
|
||||||
|
dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
|
||||||
|
helper.o tftp.o log.o
|
||||||
|
|
||||||
|
diff -Nur dnsmasq-2.39-orig/src/dnsmasq.h dnsmasq-2.39/src/dnsmasq.h
|
||||||
|
--- dnsmasq-2.39-orig/src/dnsmasq.h 2007-04-20 12:53:38.000000000 +0200
|
||||||
|
+++ dnsmasq-2.39/src/dnsmasq.h 2007-05-20 19:50:37.000000000 +0200
|
||||||
|
@@ -162,6 +162,12 @@
|
||||||
|
struct interface_name *next;
|
||||||
|
};
|
||||||
|
|
||||||
|
+struct loc_record {
|
||||||
|
+ char *name, loc[16];
|
||||||
|
+ unsigned short class;
|
||||||
|
+ struct loc_record *next;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
union bigname {
|
||||||
|
char name[MAXDNAME];
|
||||||
|
union bigname *next; /* freelist */
|
||||||
|
@@ -476,6 +482,7 @@
|
||||||
|
struct mx_srv_record *mxnames;
|
||||||
|
struct txt_record *txt;
|
||||||
|
struct ptr_record *ptr;
|
||||||
|
+ struct loc_record *loc;
|
||||||
|
struct interface_name *int_names;
|
||||||
|
char *mxtarget;
|
||||||
|
char *lease_file;
|
||||||
|
@@ -725,3 +732,6 @@
|
||||||
|
void tftp_request(struct listener *listen, struct daemon *daemon, time_t now);
|
||||||
|
void check_tftp_listeners(struct daemon *daemon, fd_set *rset, time_t now);
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+/* rfc1876 */
|
||||||
|
+u_int32_t loc_aton(const char *ascii, u_char *binary);
|
||||||
|
diff -Nur dnsmasq-2.39-orig/src/option.c dnsmasq-2.39/src/option.c
|
||||||
|
--- dnsmasq-2.39-orig/src/option.c 2007-04-19 23:34:49.000000000 +0200
|
||||||
|
+++ dnsmasq-2.39/src/option.c 2007-05-20 20:15:15.000000000 +0200
|
||||||
|
@@ -43,6 +43,7 @@
|
||||||
|
#define LOPT_REMOTE 269
|
||||||
|
#define LOPT_SUBSCR 270
|
||||||
|
#define LOPT_INTNAME 271
|
||||||
|
+#define LOPT_LOC 272
|
||||||
|
|
||||||
|
#ifdef HAVE_GETOPT_LONG
|
||||||
|
static const struct option opts[] =
|
||||||
|
@@ -122,6 +123,7 @@
|
||||||
|
{"tftp-root", 1, 0, LOPT_PREFIX },
|
||||||
|
{"tftp-max", 1, 0, LOPT_TFTP_MAX },
|
||||||
|
{"ptr-record", 1, 0, LOPT_PTR },
|
||||||
|
+ {"loc-record", 1, 0, LOPT_LOC },
|
||||||
|
#if defined(__FreeBSD__) || defined(__DragonFly__)
|
||||||
|
{"bridge-interface", 1, 0 , LOPT_BRIDGE },
|
||||||
|
#endif
|
||||||
|
@@ -235,6 +237,7 @@
|
||||||
|
{ "-y, --localise-queries", gettext_noop("Answer DNS queries based on the interface a query was sent to."), NULL },
|
||||||
|
{ "-Y --txt-record=name,txt....", gettext_noop("Specify TXT DNS record."), NULL },
|
||||||
|
{ " --ptr-record=name,target", gettext_noop("Specify PTR DNS record."), NULL },
|
||||||
|
+ { " --loc-record=name,lat lon alt", gettext_noop("Specify LOC DNS record."), NULL },
|
||||||
|
{ " --interface-name=name,interface", gettext_noop("Give DNS name to IPv4 address of interface."), NULL },
|
||||||
|
{ "-z, --bind-interfaces", gettext_noop("Bind only to interfaces in use."), NULL },
|
||||||
|
{ "-Z, --read-ethers", gettext_noop("Read DHCP static host information from %s."), ETHERSFILE },
|
||||||
|
@@ -1835,6 +1838,37 @@
|
||||||
|
new->intr = safe_string_alloc(comma);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ case LOPT_LOC:
|
||||||
|
+ {
|
||||||
|
+ struct loc_record *new;
|
||||||
|
+ unsigned char *p, *q;
|
||||||
|
+
|
||||||
|
+ comma = split(arg);
|
||||||
|
+
|
||||||
|
+ if (!canonicalise_opt(arg))
|
||||||
|
+ {
|
||||||
|
+ option = '?';
|
||||||
|
+ problem = _("bad LOC record");
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ new = safe_malloc(sizeof(struct loc_record));
|
||||||
|
+ new->next = daemon->loc;
|
||||||
|
+ daemon->loc = new;
|
||||||
|
+ new->class = C_IN;
|
||||||
|
+ if (!comma || loc_aton(comma,new->loc)!=16)
|
||||||
|
+ {
|
||||||
|
+ option = '?';
|
||||||
|
+ problem = _("bad LOC record");
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (comma)
|
||||||
|
+ *comma = 0;
|
||||||
|
+ new->name = safe_string_alloc(arg);
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
case LOPT_PTR: /* --ptr-record */
|
||||||
|
{
|
||||||
|
diff -Nur dnsmasq-2.39-orig/src/rfc1035.c dnsmasq-2.39/src/rfc1035.c
|
||||||
|
--- dnsmasq-2.39-orig/src/rfc1035.c 2007-04-20 12:54:26.000000000 +0200
|
||||||
|
+++ dnsmasq-2.39/src/rfc1035.c 2007-05-20 18:22:46.000000000 +0200
|
||||||
|
@@ -1112,6 +1112,27 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (qtype == T_LOC || qtype == T_ANY)
|
||||||
|
+ {
|
||||||
|
+ struct loc_record *t;
|
||||||
|
+ for(t = daemon->loc; t ; t = t->next)
|
||||||
|
+ {
|
||||||
|
+ if (t->class == qclass && hostname_isequal(name, t->name))
|
||||||
|
+ {
|
||||||
|
+ ans = 1;
|
||||||
|
+ if (!dryrun)
|
||||||
|
+ {
|
||||||
|
+ log_query(F_CNAME | F_FORWARD | F_CONFIG | F_NXDOMAIN, name, NULL, 0, NULL, 0);
|
||||||
|
+ if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
|
||||||
|
+ daemon->local_ttl, NULL,
|
||||||
|
+ T_LOC, t->class, "t", 16, t->loc))
|
||||||
|
+ anscount++;
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (qclass == C_IN)
|
||||||
|
{
|
||||||
|
if (qtype == T_PTR || qtype == T_ANY)
|
||||||
|
diff -Nur dnsmasq-2.39-orig/src/rfc1876.c dnsmasq-2.39/src/rfc1876.c
|
||||||
|
--- dnsmasq-2.39-orig/src/rfc1876.c 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ dnsmasq-2.39/src/rfc1876.c 2007-05-20 19:50:10.000000000 +0200
|
||||||
|
@@ -0,0 +1,379 @@
|
||||||
|
+/*
|
||||||
|
+ * routines to convert between on-the-wire RR format and zone file
|
||||||
|
+ * format. Does not contain conversion to/from decimal degrees;
|
||||||
|
+ * divide or multiply by 60*60*1000 for that.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include "dnsmasq.h"
|
||||||
|
+
|
||||||
|
+static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
|
||||||
|
+ 1000000,10000000,100000000,1000000000};
|
||||||
|
+
|
||||||
|
+/* takes an XeY precision/size value, returns a string representation.*/
|
||||||
|
+static const char *
|
||||||
|
+precsize_ntoa(u_int8_t prec)
|
||||||
|
+{
|
||||||
|
+ static char retbuf[sizeof("90000000.00")];
|
||||||
|
+ unsigned long val;
|
||||||
|
+ int mantissa, exponent;
|
||||||
|
+
|
||||||
|
+ mantissa = (int)((prec >> 4) & 0x0f) % 10;
|
||||||
|
+ exponent = (int)((prec >> 0) & 0x0f) % 10;
|
||||||
|
+
|
||||||
|
+ val = mantissa * poweroften[exponent];
|
||||||
|
+
|
||||||
|
+ (void) sprintf(retbuf,"%d.%.2d", val/100, val%100);
|
||||||
|
+ return (retbuf);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* converts ascii size/precision X * 10**Y(cm) to 0xXY. moves pointer.*/
|
||||||
|
+static u_int8_t
|
||||||
|
+precsize_aton(char **strptr)
|
||||||
|
+{
|
||||||
|
+ unsigned int mval = 0, cmval = 0;
|
||||||
|
+ u_int8_t retval = 0;
|
||||||
|
+ register char *cp;
|
||||||
|
+ register int exponent;
|
||||||
|
+ register int mantissa;
|
||||||
|
+
|
||||||
|
+ cp = *strptr;
|
||||||
|
+
|
||||||
|
+ while (isdigit(*cp))
|
||||||
|
+ mval = mval * 10 + (*cp++ - '0');
|
||||||
|
+
|
||||||
|
+ if (*cp == '.') { /* centimeters */
|
||||||
|
+ cp++;
|
||||||
|
+ if (isdigit(*cp)) {
|
||||||
|
+ cmval = (*cp++ - '0') * 10;
|
||||||
|
+ if (isdigit(*cp)) {
|
||||||
|
+ cmval += (*cp++ - '0');
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ cmval = (mval * 100) + cmval;
|
||||||
|
+
|
||||||
|
+ for (exponent = 0; exponent < 9; exponent++)
|
||||||
|
+ if (cmval < poweroften[exponent+1])
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ mantissa = cmval / poweroften[exponent];
|
||||||
|
+ if (mantissa > 9)
|
||||||
|
+ mantissa = 9;
|
||||||
|
+
|
||||||
|
+ retval = (mantissa << 4) | exponent;
|
||||||
|
+
|
||||||
|
+ *strptr = cp;
|
||||||
|
+
|
||||||
|
+ return (retval);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* converts ascii lat/lon to unsigned encoded 32-bit number.
|
||||||
|
+ * moves pointer. */
|
||||||
|
+static u_int32_t
|
||||||
|
+latlon2ul(char **latlonstrptr,int *which)
|
||||||
|
+{
|
||||||
|
+ register char *cp;
|
||||||
|
+ u_int32_t retval;
|
||||||
|
+ int deg = 0, min = 0, secs = 0, secsfrac = 0;
|
||||||
|
+
|
||||||
|
+ cp = *latlonstrptr;
|
||||||
|
+
|
||||||
|
+ while (isdigit(*cp))
|
||||||
|
+ deg = deg * 10 + (*cp++ - '0');
|
||||||
|
+
|
||||||
|
+ while (isspace(*cp))
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ if (!(isdigit(*cp)))
|
||||||
|
+ goto fndhemi;
|
||||||
|
+
|
||||||
|
+ while (isdigit(*cp))
|
||||||
|
+ min = min * 10 + (*cp++ - '0');
|
||||||
|
+ while (isspace(*cp))
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ if (!(isdigit(*cp)))
|
||||||
|
+ goto fndhemi;
|
||||||
|
+
|
||||||
|
+ while (isdigit(*cp))
|
||||||
|
+ secs = secs * 10 + (*cp++ - '0');
|
||||||
|
+
|
||||||
|
+ if (*cp == '.') { /* decimal seconds */
|
||||||
|
+ cp++;
|
||||||
|
+ if (isdigit(*cp)) {
|
||||||
|
+ secsfrac = (*cp++ - '0') * 100;
|
||||||
|
+ if (isdigit(*cp)) {
|
||||||
|
+ secsfrac += (*cp++ - '0') * 10;
|
||||||
|
+ if (isdigit(*cp)) {
|
||||||
|
+ secsfrac += (*cp++ - '0');
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ while (!isspace(*cp)) /* if any trailing garbage */
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ while (isspace(*cp))
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ fndhemi:
|
||||||
|
+ switch (*cp) {
|
||||||
|
+ case 'N': case 'n':
|
||||||
|
+ case 'E': case 'e':
|
||||||
|
+ retval = ((unsigned)1<<31)
|
||||||
|
+ + (((((deg * 60) + min) * 60) + secs) * 1000)
|
||||||
|
+ + secsfrac;
|
||||||
|
+ break;
|
||||||
|
+ case 'S': case 's':
|
||||||
|
+ case 'W': case 'w':
|
||||||
|
+ retval = ((unsigned)1<<31)
|
||||||
|
+ - (((((deg * 60) + min) * 60) + secs) * 1000)
|
||||||
|
+ - secsfrac;
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ retval = 0; /* invalid value -- indicates error */
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ switch (*cp) {
|
||||||
|
+ case 'N': case 'n':
|
||||||
|
+ case 'S': case 's':
|
||||||
|
+ *which = 1; /* latitude */
|
||||||
|
+ break;
|
||||||
|
+ case 'E': case 'e':
|
||||||
|
+ case 'W': case 'w':
|
||||||
|
+ *which = 2; /* longitude */
|
||||||
|
+ break;
|
||||||
|
+ default:
|
||||||
|
+ *which = 0; /* error */
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ cp++; /* skip the hemisphere */
|
||||||
|
+
|
||||||
|
+ while (!isspace(*cp)) /* if any trailing garbage */
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ while (isspace(*cp)) /* move to next field */
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ *latlonstrptr = cp;
|
||||||
|
+
|
||||||
|
+ return (retval);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* converts a zone file representation in a string to an RDATA
|
||||||
|
+ * on-the-wire representation. */
|
||||||
|
+u_int32_t
|
||||||
|
+loc_aton(const char *ascii, u_char *binary)
|
||||||
|
+{
|
||||||
|
+ const char *cp, *maxcp;
|
||||||
|
+ u_char *bcp;
|
||||||
|
+
|
||||||
|
+ u_int32_t latit = 0, longit = 0, alt = 0;
|
||||||
|
+ u_int32_t lltemp1 = 0, lltemp2 = 0;
|
||||||
|
+ int altmeters = 0, altfrac = 0, altsign = 1;
|
||||||
|
+ u_int8_t hp = 0x16; /* default = 1e6 cm = 10000.00m = 10km */
|
||||||
|
+ u_int8_t vp = 0x13; /* default = 1e3 cm = 10.00m */
|
||||||
|
+ u_int8_t siz = 0x12; /* default = 1e2 cm = 1.00m */
|
||||||
|
+ int which1 = 0, which2 = 0;
|
||||||
|
+
|
||||||
|
+ cp = ascii;
|
||||||
|
+ maxcp = cp + strlen(ascii);
|
||||||
|
+
|
||||||
|
+ lltemp1 = latlon2ul(&cp, &which1);
|
||||||
|
+ lltemp2 = latlon2ul(&cp, &which2);
|
||||||
|
+
|
||||||
|
+ switch (which1 + which2) {
|
||||||
|
+ case 3: /* 1 + 2, the only valid combination */
|
||||||
|
+ if ((which1 == 1) && (which2 == 2)) { /* normal case */
|
||||||
|
+ latit = lltemp1;
|
||||||
|
+ longit = lltemp2;
|
||||||
|
+ } else if ((which1 == 2) && (which2 == 1)) {/*reversed*/
|
||||||
|
+ longit = lltemp1;
|
||||||
|
+ latit = lltemp2;
|
||||||
|
+ } else { /* some kind of brokenness */
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ default: /* we didn't get one of each */
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /* altitude */
|
||||||
|
+ if (*cp == '-') {
|
||||||
|
+ altsign = -1;
|
||||||
|
+ cp++;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (*cp == '+')
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ while (isdigit(*cp))
|
||||||
|
+ altmeters = altmeters * 10 + (*cp++ - '0');
|
||||||
|
+
|
||||||
|
+ if (*cp == '.') { /* decimal meters */
|
||||||
|
+ cp++;
|
||||||
|
+ if (isdigit(*cp)) {
|
||||||
|
+ altfrac = (*cp++ - '0') * 10;
|
||||||
|
+ if (isdigit(*cp)) {
|
||||||
|
+ altfrac += (*cp++ - '0');
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
|
||||||
|
+
|
||||||
|
+ while (!isspace(*cp) && (cp < maxcp))
|
||||||
|
+ /* if trailing garbage or m */
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ while (isspace(*cp) && (cp < maxcp))
|
||||||
|
+ cp++;
|
||||||
|
+ if (cp >= maxcp)
|
||||||
|
+ goto defaults;
|
||||||
|
+
|
||||||
|
+ siz = precsize_aton(&cp);
|
||||||
|
+
|
||||||
|
+ while (!isspace(*cp) && (cp < maxcp))/*if trailing garbage or m*/
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ while (isspace(*cp) && (cp < maxcp))
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ if (cp >= maxcp)
|
||||||
|
+ goto defaults;
|
||||||
|
+
|
||||||
|
+ hp = precsize_aton(&cp);
|
||||||
|
+
|
||||||
|
+ while (!isspace(*cp) && (cp < maxcp))/*if trailing garbage or m*/
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ while (isspace(*cp) && (cp < maxcp))
|
||||||
|
+ cp++;
|
||||||
|
+
|
||||||
|
+ if (cp >= maxcp)
|
||||||
|
+ goto defaults;
|
||||||
|
+
|
||||||
|
+ vp = precsize_aton(&cp);
|
||||||
|
+
|
||||||
|
+ defaults:
|
||||||
|
+
|
||||||
|
+ bcp = binary;
|
||||||
|
+ *bcp++ = (u_int8_t) 0; /* version byte */
|
||||||
|
+ *bcp++ = siz;
|
||||||
|
+ *bcp++ = hp;
|
||||||
|
+ *bcp++ = vp;
|
||||||
|
+ PUTLONG(latit,bcp);
|
||||||
|
+ PUTLONG(longit,bcp);
|
||||||
|
+ PUTLONG(alt,bcp);
|
||||||
|
+
|
||||||
|
+ return (16); /* size of RR in octets */
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/* takes an on-the-wire LOC RR and prints it in zone file
|
||||||
|
+ * (human readable) format. */
|
||||||
|
+char *
|
||||||
|
+loc_ntoa(const u_char *binary,char *ascii)
|
||||||
|
+{
|
||||||
|
+ static char tmpbuf[255*3];
|
||||||
|
+
|
||||||
|
+ register char *cp;
|
||||||
|
+ register const u_char *rcp;
|
||||||
|
+
|
||||||
|
+ int latdeg, latmin, latsec, latsecfrac;
|
||||||
|
+ int longdeg, longmin, longsec, longsecfrac;
|
||||||
|
+ char northsouth, eastwest;
|
||||||
|
+ int altmeters, altfrac, altsign;
|
||||||
|
+
|
||||||
|
+ const int referencealt = 100000 * 100;
|
||||||
|
+
|
||||||
|
+ int32_t latval, longval, altval;
|
||||||
|
+ u_int32_t templ;
|
||||||
|
+ u_int8_t sizeval, hpval, vpval, versionval;
|
||||||
|
+
|
||||||
|
+ char *sizestr, *hpstr, *vpstr;
|
||||||
|
+
|
||||||
|
+ rcp = binary;
|
||||||
|
+ if (ascii)
|
||||||
|
+ cp = ascii;
|
||||||
|
+ else {
|
||||||
|
+ cp = tmpbuf;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ versionval = *rcp++;
|
||||||
|
+
|
||||||
|
+ if (versionval) {
|
||||||
|
+ sprintf(cp,"; error: unknown LOC RR version");
|
||||||
|
+ return (cp);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ sizeval = *rcp++;
|
||||||
|
+
|
||||||
|
+ hpval = *rcp++;
|
||||||
|
+ vpval = *rcp++;
|
||||||
|
+
|
||||||
|
+ GETLONG(templ,rcp);
|
||||||
|
+ latval = (templ - ((unsigned)1<<31));
|
||||||
|
+
|
||||||
|
+ GETLONG(templ,rcp);
|
||||||
|
+ longval = (templ - ((unsigned)1<<31));
|
||||||
|
+
|
||||||
|
+ GETLONG(templ,rcp);
|
||||||
|
+ if (templ < referencealt) { /* below WGS 84 spheroid */
|
||||||
|
+ altval = referencealt - templ;
|
||||||
|
+ altsign = -1;
|
||||||
|
+ } else {
|
||||||
|
+ altval = templ - referencealt;
|
||||||
|
+ altsign = 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (latval < 0) {
|
||||||
|
+ northsouth = 'S';
|
||||||
|
+ latval = -latval;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ northsouth = 'N';
|
||||||
|
+
|
||||||
|
+ latsecfrac = latval % 1000;
|
||||||
|
+ latval = latval / 1000;
|
||||||
|
+ latsec = latval % 60;
|
||||||
|
+ latval = latval / 60;
|
||||||
|
+ latmin = latval % 60;
|
||||||
|
+ latval = latval / 60;
|
||||||
|
+ latdeg = latval;
|
||||||
|
+
|
||||||
|
+ if (longval < 0) {
|
||||||
|
+ eastwest = 'W';
|
||||||
|
+ longval = -longval;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ eastwest = 'E';
|
||||||
|
+
|
||||||
|
+ longsecfrac = longval % 1000;
|
||||||
|
+ longval = longval / 1000;
|
||||||
|
+ longsec = longval % 60;
|
||||||
|
+ longval = longval / 60;
|
||||||
|
+ longmin = longval % 60;
|
||||||
|
+ longval = longval / 60;
|
||||||
|
+ longdeg = longval;
|
||||||
|
+
|
||||||
|
+ altfrac = altval % 100;
|
||||||
|
+ altmeters = (altval / 100) * altsign;
|
||||||
|
+
|
||||||
|
+ sizestr = strdup(precsize_ntoa(sizeval));
|
||||||
|
+ hpstr = strdup(precsize_ntoa(hpval));
|
||||||
|
+ vpstr = strdup(precsize_ntoa(vpval));
|
||||||
|
+
|
||||||
|
+ sprintf(cp,
|
||||||
|
+ "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %d.%.2dm %sm %sm %sm",
|
||||||
|
+ latdeg, latmin, latsec, latsecfrac, northsouth,
|
||||||
|
+ longdeg, longmin, longsec, longsecfrac, eastwest,
|
||||||
|
+ altmeters, altfrac, sizestr, hpstr, vpstr);
|
||||||
|
+ free(sizestr);
|
||||||
|
+ free(hpstr);
|
||||||
|
+ free(vpstr);
|
||||||
|
+
|
||||||
|
+ return (cp);
|
||||||
|
+}
|
||||||
@@ -23,6 +23,6 @@
|
|||||||
# will port forward port 53 UDP and TCP from this host to port 53 on dnsserver.
|
# will port forward port 53 UDP and TCP from this host to port 53 on dnsserver.
|
||||||
#
|
#
|
||||||
# Port forwards will recreated when dnsmasq restarts after a reboot, and
|
# Port forwards will recreated when dnsmasq restarts after a reboot, and
|
||||||
# removed when DHCP leases expire. After editing this file, restart dnsmasq
|
# removed when DHCP leases expire. After editing this file, send
|
||||||
# to install new iptables entries in the kernel.
|
# SIGHUP to dnsmasq to install new iptables entries in the kernel.
|
||||||
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
CFLAGS?= -O2
|
CFLAGS?= -O2 -Wall -W
|
||||||
|
|
||||||
all: dhcp_release.c
|
all: dhcp_release dhcp_lease_time
|
||||||
$(CC) $(CFLAGS) $(RPM_OPT_FLAGS) -Wall -W dhcp_release.c -o dhcp_release
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *~ *.o core dhcp_release
|
rm -f *~ *.o core dhcp_release dhcp_lease_time
|
||||||
@@ -0,0 +1,214 @@
|
|||||||
|
/* Copyright (c) 2007 Simon Kelley
|
||||||
|
|
||||||
|
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; version 2 dated June, 1991.
|
||||||
|
|
||||||
|
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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* dhcp_lease_time <address> */
|
||||||
|
|
||||||
|
/* Send a DHCPINFORM message to a dnsmasq server running on the local host
|
||||||
|
and print (to stdout) the time remaining in any lease for the given
|
||||||
|
address. The time is given as string printed to stdout.
|
||||||
|
|
||||||
|
If an error occurs or no lease exists for the given address,
|
||||||
|
nothing is sent to stdout a message is sent to stderr and a
|
||||||
|
non-zero error code is returned.
|
||||||
|
|
||||||
|
Requires dnsmasq 2.40 or later.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <net/if.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <net/if_arp.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <linux/types.h>
|
||||||
|
#include <linux/netlink.h>
|
||||||
|
#include <linux/rtnetlink.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
#define DHCP_CHADDR_MAX 16
|
||||||
|
#define BOOTREQUEST 1
|
||||||
|
#define DHCP_COOKIE 0x63825363
|
||||||
|
#define OPTION_PAD 0
|
||||||
|
#define OPTION_LEASE_TIME 51
|
||||||
|
#define OPTION_OVERLOAD 52
|
||||||
|
#define OPTION_MESSAGE_TYPE 53
|
||||||
|
#define OPTION_END 255
|
||||||
|
#define DHCPINFORM 8
|
||||||
|
#define DHCP_SERVER_PORT 67
|
||||||
|
|
||||||
|
#define option_len(opt) ((int)(((unsigned char *)(opt))[1]))
|
||||||
|
#define option_ptr(opt) ((void *)&(((unsigned char *)(opt))[2]))
|
||||||
|
|
||||||
|
|
||||||
|
typedef unsigned char u8;
|
||||||
|
typedef unsigned short u16;
|
||||||
|
typedef unsigned int u32;
|
||||||
|
|
||||||
|
struct dhcp_packet {
|
||||||
|
u8 op, htype, hlen, hops;
|
||||||
|
u32 xid;
|
||||||
|
u16 secs, flags;
|
||||||
|
struct in_addr ciaddr, yiaddr, siaddr, giaddr;
|
||||||
|
u8 chaddr[DHCP_CHADDR_MAX], sname[64], file[128];
|
||||||
|
u32 cookie;
|
||||||
|
unsigned char options[308];
|
||||||
|
};
|
||||||
|
|
||||||
|
static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt, int minsize)
|
||||||
|
{
|
||||||
|
while (*p != OPTION_END)
|
||||||
|
{
|
||||||
|
if (p >= end)
|
||||||
|
return NULL; /* malformed packet */
|
||||||
|
else if (*p == OPTION_PAD)
|
||||||
|
p++;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int opt_len;
|
||||||
|
if (p >= end - 2)
|
||||||
|
return NULL; /* malformed packet */
|
||||||
|
opt_len = option_len(p);
|
||||||
|
if (p >= end - (2 + opt_len))
|
||||||
|
return NULL; /* malformed packet */
|
||||||
|
if (*p == opt && opt_len >= minsize)
|
||||||
|
return p;
|
||||||
|
p += opt_len + 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return opt == OPTION_END ? p : NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static unsigned char *option_find(struct dhcp_packet *mess, size_t size, int opt_type, int minsize)
|
||||||
|
{
|
||||||
|
unsigned char *ret, *overload;
|
||||||
|
|
||||||
|
/* skip over DHCP cookie; */
|
||||||
|
if ((ret = option_find1(&mess->options[0], ((unsigned char *)mess) + size, opt_type, minsize)))
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
/* look for overload option. */
|
||||||
|
if (!(overload = option_find1(&mess->options[0], ((unsigned char *)mess) + size, OPTION_OVERLOAD, 1)))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
/* Can we look in filename area ? */
|
||||||
|
if ((overload[2] & 1) &&
|
||||||
|
(ret = option_find1(&mess->file[0], &mess->file[128], opt_type, minsize)))
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
/* finally try sname area */
|
||||||
|
if ((overload[2] & 2) &&
|
||||||
|
(ret = option_find1(&mess->sname[0], &mess->sname[64], opt_type, minsize)))
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static unsigned int option_uint(unsigned char *opt, int size)
|
||||||
|
{
|
||||||
|
/* this worries about unaligned data and byte order */
|
||||||
|
unsigned int ret = 0;
|
||||||
|
int i;
|
||||||
|
unsigned char *p = option_ptr(opt);
|
||||||
|
|
||||||
|
for (i = 0; i < size; i++)
|
||||||
|
ret = (ret << 8) | *p++;
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
struct in_addr lease;
|
||||||
|
struct dhcp_packet packet;
|
||||||
|
unsigned char *p = packet.options;
|
||||||
|
struct sockaddr_in dest;
|
||||||
|
int fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
|
||||||
|
ssize_t rc;
|
||||||
|
|
||||||
|
if (argc < 2)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "usage: dhcp_lease_time <address>\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fd == -1)
|
||||||
|
{
|
||||||
|
perror("cannot create socket");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
lease.s_addr = inet_addr(argv[1]);
|
||||||
|
|
||||||
|
memset(&packet, 0, sizeof(packet));
|
||||||
|
|
||||||
|
packet.hlen = 0;
|
||||||
|
packet.htype = 0;
|
||||||
|
|
||||||
|
packet.op = BOOTREQUEST;
|
||||||
|
packet.ciaddr = lease;
|
||||||
|
packet.cookie = htonl(DHCP_COOKIE);
|
||||||
|
|
||||||
|
*(p++) = OPTION_MESSAGE_TYPE;
|
||||||
|
*(p++) = 1;
|
||||||
|
*(p++) = DHCPINFORM;
|
||||||
|
|
||||||
|
*(p++) = OPTION_END;
|
||||||
|
|
||||||
|
dest.sin_family = AF_INET;
|
||||||
|
dest.sin_addr.s_addr = inet_addr("127.0.0.1");
|
||||||
|
dest.sin_port = ntohs(DHCP_SERVER_PORT);
|
||||||
|
|
||||||
|
if (sendto(fd, &packet, sizeof(packet), 0,
|
||||||
|
(struct sockaddr *)&dest, sizeof(dest)) == -1)
|
||||||
|
{
|
||||||
|
perror("sendto failed");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
alarm(3); /* noddy timeout. */
|
||||||
|
|
||||||
|
rc = recv(fd, &packet, sizeof(packet), 0);
|
||||||
|
|
||||||
|
if (rc < (ssize_t)(sizeof(packet) - sizeof(packet.options)))
|
||||||
|
{
|
||||||
|
perror("recv failed");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((p = option_find(&packet, (size_t)rc, OPTION_LEASE_TIME, 4)))
|
||||||
|
{
|
||||||
|
unsigned int t = option_uint(p, 4);
|
||||||
|
if (t == 0xffffffff)
|
||||||
|
printf("infinite");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unsigned int x;
|
||||||
|
if ((x = t/86400))
|
||||||
|
printf("%dd", x);
|
||||||
|
if ((x = (t/3600)%24))
|
||||||
|
printf("%dh", x);
|
||||||
|
if ((x = (t/60)%60))
|
||||||
|
printf("%dm", x);
|
||||||
|
if ((x = t%60))
|
||||||
|
printf("%ds", x);
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1; /* no lease */
|
||||||
|
}
|
||||||
+29
-4
@@ -19,7 +19,7 @@
|
|||||||
# Uncomment this to filter useless windows-originated DNS requests
|
# Uncomment this to filter useless windows-originated DNS requests
|
||||||
# which can trigger dial-on-demand links needlessly.
|
# which can trigger dial-on-demand links needlessly.
|
||||||
# Note that (amongst other things) this blocks all SRV requests,
|
# Note that (amongst other things) this blocks all SRV requests,
|
||||||
# so don't use it if you use eg Kerberos.
|
# so don't use it if you use eg Kerberos, SIP, XMMP or Google-talk.
|
||||||
# This option only affects forwarding, SRV records originating for
|
# This option only affects forwarding, SRV records originating for
|
||||||
# dnsmasq (via srv-host= lines) are not suppressed by it.
|
# dnsmasq (via srv-host= lines) are not suppressed by it.
|
||||||
#filterwin2k
|
#filterwin2k
|
||||||
@@ -61,6 +61,18 @@
|
|||||||
# webserver.
|
# webserver.
|
||||||
#address=/doubleclick.net/127.0.0.1
|
#address=/doubleclick.net/127.0.0.1
|
||||||
|
|
||||||
|
# --address (and --server) work with IPv6 addresses too.
|
||||||
|
#address=/www.thekelleys.org.uk/fe80::20d:60ff:fe36:f83
|
||||||
|
|
||||||
|
# You can control how dnsmasq talks to a server: this forces
|
||||||
|
# queries to 10.1.2.3 to be routed via eth1
|
||||||
|
# --server=10.1.2.3@eth1
|
||||||
|
|
||||||
|
# and this sets the source (ie local) address used to talk to
|
||||||
|
# 10.1.2.3 to 192.168.1.1 port 55 (there must be a interface with that
|
||||||
|
# IP on the machine, obviously).
|
||||||
|
# --server=10.1.2.3@192.168.1.1#55
|
||||||
|
|
||||||
# If you want dnsmasq to change uid and gid to something other
|
# If you want dnsmasq to change uid and gid to something other
|
||||||
# than the default, edit the following lines.
|
# than the default, edit the following lines.
|
||||||
#user=
|
#user=
|
||||||
@@ -145,7 +157,7 @@
|
|||||||
# the name fred and IP address 192.168.0.60 and lease time 45 minutes
|
# the name fred and IP address 192.168.0.60 and lease time 45 minutes
|
||||||
#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m
|
#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m
|
||||||
|
|
||||||
# Give the machine which says it's name is "bert" IP address
|
# Give the machine which says its name is "bert" IP address
|
||||||
# 192.168.0.70 and an infinite lease
|
# 192.168.0.70 and an infinite lease
|
||||||
#dhcp-host=bert,192.168.0.70,infinite
|
#dhcp-host=bert,192.168.0.70,infinite
|
||||||
|
|
||||||
@@ -180,6 +192,12 @@
|
|||||||
# any machine with ethernet address starting 11:22:33:
|
# any machine with ethernet address starting 11:22:33:
|
||||||
#dhcp-host=11:22:33:*:*:*,net:red
|
#dhcp-host=11:22:33:*:*:*,net:red
|
||||||
|
|
||||||
|
# Ignore any clients which are specified in dhcp-host lines
|
||||||
|
# or /etc/ethers. Equivalent to ISC "deny unkown-clients".
|
||||||
|
# This relies on the special "known" tag which is set when
|
||||||
|
# a host is matched.
|
||||||
|
#dhcp-ignore=#known
|
||||||
|
|
||||||
# Send extra options which are tagged as "red" to any machine whose
|
# Send extra options which are tagged as "red" to any machine whose
|
||||||
# DHCP vendorclass string includes the substring "Linux"
|
# DHCP vendorclass string includes the substring "Linux"
|
||||||
#dhcp-vendorclass=red,Linux
|
#dhcp-vendorclass=red,Linux
|
||||||
@@ -204,7 +222,7 @@
|
|||||||
# run "dnsmasq --help dhcp" to get a list.
|
# run "dnsmasq --help dhcp" to get a list.
|
||||||
# Note that all the common settings, such as netmask and
|
# Note that all the common settings, such as netmask and
|
||||||
# broadcast address, DNS server and default route, are given
|
# broadcast address, DNS server and default route, are given
|
||||||
# sane defaults by dnsmasq. You very likely will not need any
|
# sane defaults by dnsmasq. You very likely will not need
|
||||||
# any dhcp-options. If you use Windows clients and Samba, there
|
# any dhcp-options. If you use Windows clients and Samba, there
|
||||||
# are some options which are recommended, they are detailed at the
|
# are some options which are recommended, they are detailed at the
|
||||||
# end of this section.
|
# end of this section.
|
||||||
@@ -303,6 +321,13 @@
|
|||||||
# external one. (See below for how to enable the TFTP server.)
|
# external one. (See below for how to enable the TFTP server.)
|
||||||
#dhcp-boot=pxelinux.0
|
#dhcp-boot=pxelinux.0
|
||||||
|
|
||||||
|
# Boot for Etherboot gPXE. The idea is to send two different
|
||||||
|
# filenames, the first loads gPXE, and the second tells gPXE what to
|
||||||
|
# load. The dhcp-match sets the gpxe tag for requests from gPXE.
|
||||||
|
#dhcp-match=gpxe,175 # gPXE sends a 175 option.
|
||||||
|
#dhcp-boot=net:#gpxe,undionly.kpxe
|
||||||
|
#dhcp-boot=mybootimage
|
||||||
|
|
||||||
# Enable dnsmasq's built-in TFTP server
|
# Enable dnsmasq's built-in TFTP server
|
||||||
#enable-tftp
|
#enable-tftp
|
||||||
|
|
||||||
@@ -333,7 +358,7 @@
|
|||||||
# whether it has a record of the lease or not. This avoids long timeouts
|
# 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
|
# 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
|
# the slighest chance that you might end up accidentally configuring a DHCP
|
||||||
# server for your campus/company accidentally. The ISC server uses the same
|
# server for your campus/company accidentally. The ISC server uses
|
||||||
# the same option, and this URL provides more information:
|
# the same option, and this URL provides more information:
|
||||||
# http://www.isc.org/index.pl?/sw/dhcp/authoritative.php
|
# http://www.isc.org/index.pl?/sw/dhcp/authoritative.php
|
||||||
#dhcp-authoritative
|
#dhcp-authoritative
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ connection but would be a good choice for any smallish network (up to
|
|||||||
1000 clients is known to work) where low
|
1000 clients is known to work) where low
|
||||||
resource use and ease of configuration are important.
|
resource use and ease of configuration are important.
|
||||||
<P>
|
<P>
|
||||||
Supported platforms include Linux (with glibc and uclibc), *BSD and
|
Supported platforms include Linux (with glibc and uclibc), *BSD,
|
||||||
Mac OS X.
|
Solaris and 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, Fedora,
|
Gentoo, Debian, Slackware, Suse, Fedora,
|
||||||
Smoothwall, IP-Cop, floppyfw, Firebox, LEAF, Freesco, fli4l,
|
Smoothwall, IP-Cop, floppyfw, Firebox, LEAF, Freesco, fli4l,
|
||||||
@@ -59,7 +59,7 @@ improving performance (especially on modem connections).
|
|||||||
</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
|
||||||
it's upstream nameservers from ppp or dhcp configuration. It will
|
its upstream nameservers from ppp or dhcp configuration. It will
|
||||||
automatically reload this information if it changes. This facility
|
automatically reload this information if it changes. This facility
|
||||||
will be of particular interest to maintainers of Linux firewall
|
will be of particular interest to maintainers of Linux firewall
|
||||||
distributions since it allows dns configuration to be made automatic.
|
distributions since it allows dns configuration to be made automatic.
|
||||||
|
|||||||
+169
-34
@@ -6,8 +6,8 @@ dnsmasq \- A lightweight DHCP and caching DNS server.
|
|||||||
.I [OPTION]...
|
.I [OPTION]...
|
||||||
.SH "DESCRIPTION"
|
.SH "DESCRIPTION"
|
||||||
.BR dnsmasq
|
.BR dnsmasq
|
||||||
is a lightweight DNS, TFTP and DHCP server. It is intended to provide coupled DNS and DHCP service to a
|
is a lightweight DNS, TFTP and DHCP server. It is intended to provide
|
||||||
LAN.
|
coupled DNS and DHCP service to a LAN.
|
||||||
.PP
|
.PP
|
||||||
Dnsmasq accepts DNS queries and either answers them from a small, local,
|
Dnsmasq accepts DNS queries and either answers them from a small, local,
|
||||||
cache or forwards them to a real, recursive, DNS server. It loads the
|
cache or forwards them to a real, recursive, DNS server. It loads the
|
||||||
@@ -52,6 +52,14 @@ 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 --neg-ttl=<time>
|
||||||
|
Negative replies from upstream servers normally contain time-to-live
|
||||||
|
information in SOA records which dnsmasq uses for caching. If the
|
||||||
|
replies from upstream servers omit this information, dnsmasq does not
|
||||||
|
cache the reply. This option gives a default value for time-to-live
|
||||||
|
(in seconds) which dnsmasq uses to cache negative replies even in
|
||||||
|
the absence of an SOA record.
|
||||||
|
.TP
|
||||||
.B \-k, --keep-in-foreground
|
.B \-k, --keep-in-foreground
|
||||||
Do not go into the background at startup but otherwise run as
|
Do not go into the background at startup but otherwise run as
|
||||||
normal. This is intended for use when dnsmasq is run under daemontools
|
normal. This is intended for use when dnsmasq is run under daemontools
|
||||||
@@ -73,7 +81,9 @@ the facilty given contains at least one '/' character, it is taken to
|
|||||||
be a filename, and dnsmasq logs to the given file, instead of
|
be a filename, and dnsmasq logs to the given file, instead of
|
||||||
syslog. (Errors whilst reading configuration will still go to syslog,
|
syslog. (Errors whilst reading configuration will still go to syslog,
|
||||||
but all output from a successful startup, and all output whilst
|
but all output from a successful startup, and all output whilst
|
||||||
running, will go exclusively to the file.)
|
running, will go exclusively to the file.) When logging to a file,
|
||||||
|
dnsmasq will close and reopen the file when it receives SIGUSR2. This
|
||||||
|
allows the log file to be rotated without stopping dnsmasq.
|
||||||
.TP
|
.TP
|
||||||
.B --log-async[=<lines>]
|
.B --log-async[=<lines>]
|
||||||
Enable asynchronous logging and optionally set the limit on the
|
Enable asynchronous logging and optionally set the limit on the
|
||||||
@@ -103,8 +113,8 @@ as. The defaults to "dip", if available, to facilitate access to
|
|||||||
Print the version number.
|
Print the version number.
|
||||||
.TP
|
.TP
|
||||||
.B \-p, --port=<port>
|
.B \-p, --port=<port>
|
||||||
Listen on <port> instead of the standard DNS port (53). Useful mainly for
|
Listen on <port> instead of the standard DNS port (53). Setting this
|
||||||
debugging.
|
to zero completely disables DNS function, leaving only DHCP and/or TFTP.
|
||||||
.TP
|
.TP
|
||||||
.B \-P, --edns-packet-max=<size>
|
.B \-P, --edns-packet-max=<size>
|
||||||
Specify the largest EDNS.0 UDP packet which is supported by the DNS
|
Specify the largest EDNS.0 UDP packet which is supported by the DNS
|
||||||
@@ -234,10 +244,21 @@ been built with DBus support.
|
|||||||
.TP
|
.TP
|
||||||
.B \-o, --strict-order
|
.B \-o, --strict-order
|
||||||
By default, dnsmasq will send queries to any of the upstream servers
|
By default, dnsmasq will send queries to any of the upstream servers
|
||||||
it knows about and tries to favour servers to are known to
|
it knows about and tries to favour servers that are known to
|
||||||
be up. Setting this flag forces dnsmasq to try each query with each
|
be up. Setting this flag forces dnsmasq to try each query with each
|
||||||
server strictly in the order they appear in /etc/resolv.conf
|
server strictly in the order they appear in /etc/resolv.conf
|
||||||
.TP
|
.TP
|
||||||
|
.B --all-servers
|
||||||
|
By default, when dnsmasq has more than one upstream server available,
|
||||||
|
it will send queries to just one server. Setting this flag forces
|
||||||
|
dnsmasq to send all queries to all available servers. The reply from
|
||||||
|
the server which answers first will be returned to the original requestor.
|
||||||
|
.TP
|
||||||
|
.B --stop-dns-rebind
|
||||||
|
Reject (and log) addresses from upstream nameservers which are in the
|
||||||
|
private IP ranges. This blocks an attack where a browser behind a
|
||||||
|
firewall is used to probe machines on the local network.
|
||||||
|
.TP
|
||||||
.B \-n, --no-poll
|
.B \-n, --no-poll
|
||||||
Don't poll /etc/resolv.conf for changes.
|
Don't poll /etc/resolv.conf for changes.
|
||||||
.TP
|
.TP
|
||||||
@@ -251,8 +272,8 @@ Tells dnsmasq to never forward queries for plain names, without dots
|
|||||||
or domain parts, to upstream nameservers. If the name is not known
|
or domain parts, to upstream nameservers. If the name is not known
|
||||||
from /etc/hosts or DHCP then a "not found" answer is returned.
|
from /etc/hosts or DHCP then a "not found" answer is returned.
|
||||||
.TP
|
.TP
|
||||||
.B \-S, --local, --server=[/[<domain>]/[domain/]][<ipaddr>[#<port>][@<source>[#<port>]]]
|
.B \-S, --local, --server=[/[<domain>]/[domain/]][<ipaddr>[#<port>][@<source-ip>|<interface>[#<port>]]
|
||||||
Specify IP address of upstream severs directly. Setting this flag does
|
Specify IP address of upstream servers directly. Setting this flag does
|
||||||
not suppress reading of /etc/resolv.conf, use -R to do that. If one or
|
not suppress reading of /etc/resolv.conf, use -R to do that. If one or
|
||||||
more
|
more
|
||||||
optional domains are given, that server is used only for those domains
|
optional domains are given, that server is used only for those domains
|
||||||
@@ -282,13 +303,18 @@ is a synonym for
|
|||||||
.B server
|
.B server
|
||||||
to make configuration files clearer in this case.
|
to make configuration files clearer in this case.
|
||||||
|
|
||||||
The optional second IP address after the @ character tells
|
The optional string after the @ character tells
|
||||||
dnsmasq how to set the source address of the queries to this
|
dnsmasq how to set the source of the queries to this
|
||||||
nameserver. It should be an address belonging to the machine on which
|
nameserver. It should be an ip-address, which should belong to the machine on which
|
||||||
dnsmasq is running otherwise this server line will be logged and then
|
dnsmasq is running otherwise this server line will be logged and then
|
||||||
ignored. The query-port flag is ignored for any servers which have a
|
ignored, or an interface name. If an interface name is given, then
|
||||||
|
queries to the server will be forced via that interface; if an
|
||||||
|
ip-address is given then the source address of the queries will be set
|
||||||
|
to that address.
|
||||||
|
The query-port flag is ignored for any servers which have a
|
||||||
source address specified but the port may be specified directly as
|
source address specified but the port may be specified directly as
|
||||||
part of the source address.
|
part of the source address. Forcing queries to an interface is not
|
||||||
|
implemented on all platforms supported by dnsmasq.
|
||||||
.TP
|
.TP
|
||||||
.B \-A, --address=/<domain>/[domain/]<ipaddr>
|
.B \-A, --address=/<domain>/[domain/]<ipaddr>
|
||||||
Specify an IP address to return for any host in the given domains.
|
Specify an IP address to return for any host in the given domains.
|
||||||
@@ -364,8 +390,7 @@ Set the size of dnsmasq's cache. The default is 150 names. Setting the cache siz
|
|||||||
.B \-N, --no-negcache
|
.B \-N, --no-negcache
|
||||||
Disable negative caching. Negative caching allows dnsmasq to remember
|
Disable negative caching. Negative caching allows dnsmasq to remember
|
||||||
"no such domain" answers from upstream nameservers and answer
|
"no such domain" answers from upstream nameservers and answer
|
||||||
identical queries without forwarding them again. This flag disables
|
identical queries without forwarding them again.
|
||||||
negative caching.
|
|
||||||
.TP
|
.TP
|
||||||
.B \-0, --dns-forward-max=<queries>
|
.B \-0, --dns-forward-max=<queries>
|
||||||
Set the maximum number of concurrent DNS queries. The default value is
|
Set the maximum number of concurrent DNS queries. The default value is
|
||||||
@@ -380,7 +405,8 @@ in
|
|||||||
.B dhcp-host
|
.B dhcp-host
|
||||||
options. If the lease time is given, then leases
|
options. If the lease time is given, then leases
|
||||||
will be given for that length of time. The lease time is in seconds,
|
will be given for that length of time. The lease time is in seconds,
|
||||||
or minutes (eg 45m) or hours (eg 1h) or the literal "infinite". This
|
or minutes (eg 45m) or hours (eg 1h) or the literal "infinite". The
|
||||||
|
minimum lease time is two minutres. This
|
||||||
option may be repeated, with different addresses, to enable DHCP
|
option may be repeated, with different addresses, to enable DHCP
|
||||||
service to more than one network. For directly connected networks (ie,
|
service to more than one network. For directly connected networks (ie,
|
||||||
networks on which the machine running dnsmasq has an interface) the
|
networks on which the machine running dnsmasq has an interface) the
|
||||||
@@ -441,9 +467,12 @@ instance
|
|||||||
This is
|
This is
|
||||||
useful when there is another DHCP server on the network which should
|
useful when there is another DHCP server on the network which should
|
||||||
be used by some machines. The net:<network-id> sets the network-id tag
|
be used by some machines. The net:<network-id> sets the network-id tag
|
||||||
whenever this dhcp-host directive is in use.
|
whenever this dhcp-host directive is in use.This can be used to
|
||||||
This can be used to selectively send DHCP options just
|
selectively send DHCP options just for this host. When a host matches any
|
||||||
for this host.
|
dhcp-host directive (or one implied by /etc/ethers) then the special
|
||||||
|
network-id tag "known" is set. This allows dnsmasq to be configured to
|
||||||
|
ignore requests from unknown machines using
|
||||||
|
.B --dhcp-ignore=#known
|
||||||
Ethernet addresses (but not client-ids) may have
|
Ethernet addresses (but not client-ids) may have
|
||||||
wildcard bytes, so for example
|
wildcard bytes, so for example
|
||||||
.B --dhcp-host=00:20:e0:3b:13:*,ignore
|
.B --dhcp-host=00:20:e0:3b:13:*,ignore
|
||||||
@@ -457,13 +486,26 @@ will only match a
|
|||||||
Token-Ring hardware address, since the ARP-address type for token ring
|
Token-Ring hardware address, since the ARP-address type for token ring
|
||||||
is 6.
|
is 6.
|
||||||
.TP
|
.TP
|
||||||
|
.B --dhcp-hostsfile=<file>
|
||||||
|
Read DHCP host information from the specified file. The file contains
|
||||||
|
information about one host per line. The format of a line is the same
|
||||||
|
as text to the right of '=' in --dhcp-host. The advantage of storing DHCP host information
|
||||||
|
in this file is that it can be changed without re-starting dnsmasq:
|
||||||
|
the file will be re-read when dnsmasq receives SIGHUP.
|
||||||
|
.TP
|
||||||
|
.B --dhcp-optsfile=<file>
|
||||||
|
Read DHCP option information from the specified file. The advantage of
|
||||||
|
using this option is the same as for --dhcp-hostsfile: the
|
||||||
|
dhcp-optsfile will be re-read when dnsmasq receives SIGHUP.
|
||||||
|
.TP
|
||||||
.B \-Z, --read-ethers
|
.B \-Z, --read-ethers
|
||||||
Read /etc/ethers for information about hosts for the DHCP server. The
|
Read /etc/ethers for information about hosts for the DHCP server. The
|
||||||
format of /etc/ethers is a hardware address, followed by either a
|
format of /etc/ethers is a hardware address, followed by either a
|
||||||
hostname or dotted-quad IP address. When read by dnsmasq these lines
|
hostname or dotted-quad IP address. When read by dnsmasq these lines
|
||||||
have exactly the same effect as
|
have exactly the same effect as
|
||||||
.B --dhcp-host
|
.B --dhcp-host
|
||||||
options containing the same information.
|
options containing the same information. /etc/ethers is re-read when
|
||||||
|
dnsmasq receives SIGHUP.
|
||||||
.TP
|
.TP
|
||||||
.B \-O, --dhcp-option=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],][<opt>|option:<opt-name>],[<value>[,<value>]]
|
.B \-O, --dhcp-option=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],][<opt>|option:<opt-name>],[<value>[,<value>]]
|
||||||
Specify different or extra options to DHCP clients. By default,
|
Specify different or extra options to DHCP clients. By default,
|
||||||
@@ -535,6 +577,14 @@ except that the option will always be sent, even if the client does
|
|||||||
not ask for it in the parameter request list. This is sometimes
|
not ask for it in the parameter request list. This is sometimes
|
||||||
needed, for example when sending options to PXELinux.
|
needed, for example when sending options to PXELinux.
|
||||||
.TP
|
.TP
|
||||||
|
.B --dhcp-no-override
|
||||||
|
Disable re-use of the DHCP servername and filename fields as extra
|
||||||
|
option space. If it can, dnsmasq moves the boot server and filename
|
||||||
|
information (from dhcp-boot) out of their dedicated fields into
|
||||||
|
DHCP options. This make extra space available in the DHCP packet for
|
||||||
|
options but can, rarely, confuse old or broken clients. This flag
|
||||||
|
forces "simple and safe" behaviour to avoid problems in such a case.
|
||||||
|
.TP
|
||||||
.B \-U, --dhcp-vendorclass=<network-id>,<vendor-class>
|
.B \-U, --dhcp-vendorclass=<network-id>,<vendor-class>
|
||||||
Map from a vendor-class string to a network id tag. Most DHCP clients provide a
|
Map from a vendor-class string to a network id tag. Most DHCP clients provide a
|
||||||
"vendor class" which represents, in some sense, the type of host. This option
|
"vendor class" which represents, in some sense, the type of host. This option
|
||||||
@@ -570,14 +620,19 @@ simple string. If an exact match is achieved between the circuit or
|
|||||||
agent ID and one provided by a relay agent, the network-id tag is set.
|
agent ID and one provided by a relay agent, the network-id tag is set.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-subscrid=<network-id>,<subscriber-id>
|
.B --dhcp-subscrid=<network-id>,<subscriber-id>
|
||||||
Map from RFC3993 subscriber-d relay agent options to network-id tags.
|
Map from RFC3993 subscriber-id relay agent options to network-id tags.
|
||||||
|
.TP
|
||||||
|
.B --dhcp-match=<network-id>,<option number>
|
||||||
|
Set the network-id tag if the client sends a DHCP option of the given
|
||||||
|
number. This can be used to identify particular clients which send
|
||||||
|
information using private option numbers.
|
||||||
.TP
|
.TP
|
||||||
.B \-J, --dhcp-ignore=<network-id>[,<network-id>]
|
.B \-J, --dhcp-ignore=<network-id>[,<network-id>]
|
||||||
When all the given network-ids match the set of network-ids derived
|
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
|
from the net, host, vendor and user classes, ignore the host and do
|
||||||
not allocate it a DHCP lease.
|
not allocate it a DHCP lease.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-ignore-name[=<network-id>[,<network-id>]]
|
.B --dhcp-ignore-names[=<network-id>[,<network-id>]]
|
||||||
When all the given network-ids match the set of network-ids derived
|
When all the given network-ids match the set of network-ids derived
|
||||||
from the net, host, vendor and user classes, ignore any hostname
|
from the net, host, vendor and user classes, ignore any hostname
|
||||||
provided by the host. Note that, unlike dhcp-ignore, it is permissable
|
provided by the host. Note that, unlike dhcp-ignore, it is permissable
|
||||||
@@ -586,6 +641,13 @@ are always ignored, and DHCP hosts are added to the DNS using only
|
|||||||
dhcp-host configuration in dnsmasq and the contents of /etc/hosts and
|
dhcp-host configuration in dnsmasq and the contents of /etc/hosts and
|
||||||
/etc/ethers.
|
/etc/ethers.
|
||||||
.TP
|
.TP
|
||||||
|
.B --dhcp-broadcast=<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, always use broadcast to
|
||||||
|
communicate with the host when it is unconfigured. Most DHCP clients which
|
||||||
|
need broadcast replies set a flag in their requests so that this
|
||||||
|
happens automatically, some old BOOTP clients do not.
|
||||||
|
.TP
|
||||||
.B \-M, --dhcp-boot=[net:<network-id>,]<filename>,[<servername>[,<server address>]]
|
.B \-M, --dhcp-boot=[net:<network-id>,]<filename>,[<servername>[,<server address>]]
|
||||||
Set BOOTP options to be returned by the DHCP server. Server name and
|
Set BOOTP options to be returned by the DHCP server. Server name and
|
||||||
address are optional: if not provided, the name is left empty, and the
|
address are optional: if not provided, the name is left empty, and the
|
||||||
@@ -660,10 +722,14 @@ since these data are not held in dnsmasq's lease
|
|||||||
database. If dnsmasq was compiled with HAVE_BROKEN_RTC, then
|
database. If dnsmasq was compiled with HAVE_BROKEN_RTC, then
|
||||||
the length of the lease (in seconds) is stored in
|
the length of the lease (in seconds) is stored in
|
||||||
DNSMASQ_LEASE_LENGTH, otherwise the time of lease expiry is stored in
|
DNSMASQ_LEASE_LENGTH, otherwise the time of lease expiry is stored in
|
||||||
DNSMASQ_LEASE_EXPIRES. If a lease used to have a hostname, which is
|
DNSMASQ_LEASE_EXPIRES. The number of seconds until lease expiry is
|
||||||
|
always stored in DNSMASQ_TIME_REMAINING.
|
||||||
|
If a lease used to have a hostname, which is
|
||||||
removed, an "old" event is generated with the new state of the lease,
|
removed, an "old" event is generated with the new state of the lease,
|
||||||
ie no name, and the former name is provided in the environment
|
ie no name, and the former name is provided in the environment
|
||||||
variable DNSMASQ_OLD_HOSTNAME.
|
variable DNSMASQ_OLD_HOSTNAME. DNSMASQ_INTERFACE stores the name of
|
||||||
|
the interface on which the reuest arrived; this is not set for "old"
|
||||||
|
actions when dnsmasq restarts.
|
||||||
All file decriptors are
|
All file decriptors are
|
||||||
closed except stdin, stdout and stderr which are open to /dev/null
|
closed except stdin, stdout and stderr which are open to /dev/null
|
||||||
(except in debug mode).
|
(except in debug mode).
|
||||||
@@ -672,7 +738,9 @@ changes occur, the script is not invoked again until any existing
|
|||||||
invocation exits. At dnsmasq startup, the script will be invoked for
|
invocation exits. At dnsmasq startup, the script will be invoked for
|
||||||
all existing leases as they are read from the lease file. Expired
|
all existing leases as they are read from the lease file. Expired
|
||||||
leases will be called with "del" and others with "old". <path>
|
leases will be called with "del" and others with "old". <path>
|
||||||
must be an absolute pathname, no PATH search occurs.
|
must be an absolute pathname, no PATH search occurs. When dnsmasq
|
||||||
|
receives a HUP signal, the script will be invoked for existing leases
|
||||||
|
with an "old " event.
|
||||||
.TP
|
.TP
|
||||||
.B \-9, --leasefile-ro
|
.B \-9, --leasefile-ro
|
||||||
Completely suppress use of the lease database file. The file will not
|
Completely suppress use of the lease database file. The file will not
|
||||||
@@ -726,8 +794,15 @@ rejected, to stop clients getting outside the specified root.
|
|||||||
Absolute paths (starting with /) are allowed, but they must be within
|
Absolute paths (starting with /) are allowed, but they must be within
|
||||||
the tftp-root.
|
the tftp-root.
|
||||||
.TP
|
.TP
|
||||||
|
.B --tftp-unique-root
|
||||||
|
Add the IP address of the TFTP client as a path component on the end
|
||||||
|
of the TFTP-root (in standard dotted-quad format). Only valid if a
|
||||||
|
tftp-root is set and the directory exists. For instance, if tftp-root is "/tftp" and client
|
||||||
|
1.2.3.4 requests file "myfile" then the effective path will be
|
||||||
|
"/tftp/1.2.3.4/myfile" if /tftp/1.2.3.4 exists or /tftp/myfile otherwise.
|
||||||
|
.TP
|
||||||
.B --tftp-secure
|
.B --tftp-secure
|
||||||
Enable TFTP secure mode: without this, any file which is readble by
|
Enable TFTP secure mode: without this, any file which is readable by
|
||||||
the dnsmasq process under normal unix access-control rules is
|
the dnsmasq process under normal unix access-control rules is
|
||||||
available via TFTP. When the --tftp-secure flag is given, only files
|
available via TFTP. When the --tftp-secure flag is given, only files
|
||||||
owned by the user running the dnsmasq process are accessible. If
|
owned by the user running the dnsmasq process are accessible. If
|
||||||
@@ -745,13 +820,24 @@ one file descriptor for each concurrent TFTP connection and one
|
|||||||
file descriptor per unique file (plus a few others). So serving the
|
file descriptor per unique file (plus a few others). So serving the
|
||||||
same file simultaneously to n clients will use require about n + 10 file
|
same file simultaneously to n clients will use require about n + 10 file
|
||||||
descriptors, serving different files simultaneously to n clients will
|
descriptors, serving different files simultaneously to n clients will
|
||||||
require about (2*n) + 10 descriptors.
|
require about (2*n) + 10 descriptors. If
|
||||||
|
.B --tftp-port-range
|
||||||
|
is given, that can affect the number of concurrent connections.
|
||||||
.TP
|
.TP
|
||||||
.B --tftp-no-blocksize
|
.B --tftp-no-blocksize
|
||||||
Stop the TFTP server from negotiating the "blocksize" option with a
|
Stop the TFTP server from negotiating the "blocksize" option with a
|
||||||
client. Some buggy clients request this option but then behave badly
|
client. Some buggy clients request this option but then behave badly
|
||||||
when it is granted.
|
when it is granted.
|
||||||
.TP
|
.TP
|
||||||
|
.B --tftp-port-range=<start>,<end>
|
||||||
|
A TFTP server listens on a well-known port (69) for connection initiation,
|
||||||
|
but it also uses a dynamically-allocated port for each
|
||||||
|
connection. Normally these are allocated by the OS, but this option
|
||||||
|
specifies a range of ports for use by TFTP transfers. This can be
|
||||||
|
useful when TFTP has to traverse a firewall. The start of the range
|
||||||
|
cannot be lower than 1025 unless dnsmasq is running as root. The number
|
||||||
|
of concurrent TFTP connections is limited by the size of the port range.
|
||||||
|
.TP
|
||||||
.B \-C, --conf-file=<file>
|
.B \-C, --conf-file=<file>
|
||||||
Specify a different configuration file. The conf-file option is also allowed in
|
Specify a different configuration file. The conf-file option is also allowed in
|
||||||
configuration files, to include multiple configuration files.
|
configuration files, to include multiple configuration files.
|
||||||
@@ -777,14 +863,18 @@ in the OPTIONS section but without the leading "--". Lines starting with # are c
|
|||||||
options which may only be specified once, the configuration file overrides
|
options which may only be specified once, the configuration file overrides
|
||||||
the command line. Quoting is allowed in a config file:
|
the command line. Quoting is allowed in a config file:
|
||||||
between " quotes the special meanings of ,:. and # are removed and the
|
between " quotes the special meanings of ,:. and # are removed and the
|
||||||
following escapes are allowed: \\\\ \\" \\t \\a \\b \\r and \\n. The later
|
following escapes are allowed: \\\\ \\" \\t \\e \\b \\r and \\n. The later
|
||||||
corresponding to tab, bell, backspace, return and newline.
|
corresponding to tab, escape, backspace, return and newline.
|
||||||
.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
|
clears its cache and then re-loads
|
||||||
.I /etc/hosts and /etc/ethers.
|
.I /etc/hosts
|
||||||
If
|
and
|
||||||
|
.I /etc/ethers
|
||||||
|
and any file given by --dhcp-hostsfile, --dhcp-optsfile or --addn-hosts.
|
||||||
|
The dhcp lease change script is called for all
|
||||||
|
existing DHCP leases. If
|
||||||
.B
|
.B
|
||||||
--no-poll
|
--no-poll
|
||||||
is set SIGHUP also re-reads
|
is set SIGHUP also re-reads
|
||||||
@@ -794,12 +884,36 @@ does NOT re-read the configuration file.
|
|||||||
.PP
|
.PP
|
||||||
When it receives a SIGUSR1,
|
When it receives a SIGUSR1,
|
||||||
.B dnsmasq
|
.B dnsmasq
|
||||||
writes cache statistics to the system log. It writes the cache size,
|
writes statistics to the system log. It writes the cache size,
|
||||||
the number of names which have had to removed from the cache before
|
the number of names which have had to removed from the cache before
|
||||||
they expired in order to make room for new names and the total number
|
they expired in order to make room for new names and the total number
|
||||||
of names that have been inserted into the cache. In
|
of names that have been inserted into the cache. For each upstream
|
||||||
|
server it gives the number of queries sent, and the number which
|
||||||
|
resulted in an error. In
|
||||||
.B --no-daemon
|
.B --no-daemon
|
||||||
mode or when full logging is enabled (-q), a complete dump of the contents of the cache is made.
|
mode or when full logging is enabled (-q), a complete dump of the
|
||||||
|
contents of the cache is made.
|
||||||
|
.PP
|
||||||
|
When it receives SIGUSR2 and it is logging direct to a file (see
|
||||||
|
.B --log-facility
|
||||||
|
)
|
||||||
|
.B dnsmasq
|
||||||
|
will close and reopen the log file. Note that during this operation,
|
||||||
|
dnsmasq will not be running as root. When it first creates the logfile
|
||||||
|
dnsmasq changes the ownership of the file to the non-root user it will run
|
||||||
|
as. Logrotate should be configured to create a new log file with
|
||||||
|
the ownership which matches the exising one before sending SIGUSR2.
|
||||||
|
If TCP DNS queries are in progress, the old logfile will remain open in
|
||||||
|
child processes which are handling TCP queries and may continue to be
|
||||||
|
written. There is a limit of 150 seconds, after which all existing TCP
|
||||||
|
processes will have expired: for this reason, it is not wise to
|
||||||
|
configure logfile compression for logfiles which have just been
|
||||||
|
rotated. Using logrotate, the required options are
|
||||||
|
.B create
|
||||||
|
and
|
||||||
|
.B delaycompress.
|
||||||
|
|
||||||
|
|
||||||
.PP
|
.PP
|
||||||
Dnsmasq is a DNS query forwarder: it it not capable of recursively
|
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
|
||||||
@@ -903,6 +1017,27 @@ parameter in a BOOTP request is matched against netids in
|
|||||||
configurations, as is the tag "bootp", allowing some control over the options returned to
|
configurations, as is the tag "bootp", allowing some control over the options returned to
|
||||||
different classes of hosts.
|
different classes of hosts.
|
||||||
|
|
||||||
|
.SH EXIT CODES
|
||||||
|
.PP
|
||||||
|
0 - Dnsmasq successfully forked into the background, or terminated
|
||||||
|
normally if backgrounding is not enabled.
|
||||||
|
.PP
|
||||||
|
1 - A problem with configuration was detected.
|
||||||
|
.PP
|
||||||
|
2 - A problem with network access occurred (address in use, attempt
|
||||||
|
to use privileged ports without permission).
|
||||||
|
.PP
|
||||||
|
3 - A problem occured with a filesystem operation (missing
|
||||||
|
file/directory, permissions).
|
||||||
|
.PP
|
||||||
|
4 - Memory allocation failure.
|
||||||
|
.PP
|
||||||
|
5 - Other miscellaneous problem.
|
||||||
|
.PP
|
||||||
|
11 or greater - a non zero return code was received from the
|
||||||
|
lease-script process "init" call. The exit code from dnsmasq is the
|
||||||
|
script's exit code with 10 added.
|
||||||
|
|
||||||
.SH LIMITS
|
.SH LIMITS
|
||||||
The default values for resource limits in dnsmasq are generally
|
The default values for resource limits in dnsmasq are generally
|
||||||
conservative, and appropriate for embedded router type devices with
|
conservative, and appropriate for embedded router type devices with
|
||||||
|
|||||||
+207
-57
@@ -4,7 +4,7 @@ dnsmasq \- Un ligero servidor DHCP y DNS con cach
|
|||||||
.SH SINOPSIS
|
.SH SINOPSIS
|
||||||
.B dnsmasq
|
.B dnsmasq
|
||||||
.I [OPCION]...
|
.I [OPCION]...
|
||||||
.SH "DESCRIPCION"
|
.SH "DESCRIPCIÓN"
|
||||||
.BR dnsmasq
|
.BR dnsmasq
|
||||||
es un ligero servidor DNS, TFTP y DHCP. Su propósito es proveer servicios DNS
|
es un ligero servidor DNS, TFTP y DHCP. Su propósito es proveer servicios DNS
|
||||||
y DHCP a una red de área local.
|
y DHCP a una red de área local.
|
||||||
@@ -16,7 +16,7 @@ hosts locales los cuales no aparecen en el DNS mundial puedan ser
|
|||||||
resueltos. También responde a búsquedas DNS para hosts configurados
|
resueltos. También responde a búsquedas DNS para hosts configurados
|
||||||
vía DHCP.
|
vía DHCP.
|
||||||
.PP
|
.PP
|
||||||
El servidor DHCP dnsmasq incluye soporte para assignación de direcciones
|
El servidor DHCP dnsmasq incluye soporte para asignación de direcciones
|
||||||
estáticas, redes múltiples, DHCP-relay y especificadores de subredes
|
estáticas, redes múltiples, DHCP-relay y especificadores de subredes
|
||||||
RFC3011. Automáticamente envía un predeterminado sensible de opciones
|
RFC3011. Automáticamente envía un predeterminado sensible de opciones
|
||||||
DHCP, y puede ser configurado para enviar cualquier opciones DHCP deseadas,
|
DHCP, y puede ser configurado para enviar cualquier opciones DHCP deseadas,
|
||||||
@@ -24,7 +24,8 @@ incluyendo opciones encapsuladas por vendedores. Incluye un servidor seguro
|
|||||||
TFTP solo-lectura para permitir el inicio vía red/PXE de hosts DHCP. Tambíen
|
TFTP solo-lectura para permitir el inicio vía red/PXE de hosts DHCP. Tambíen
|
||||||
incluye soporte para BOOTP.
|
incluye soporte para BOOTP.
|
||||||
.PP
|
.PP
|
||||||
Dnsmasq incluye soporte IPv6 para DNS, pero no para DHCP.
|
Dnsmasq
|
||||||
|
incluye soporte IPv6 para DNS, pero no para DHCP.
|
||||||
.SH OPCIONES
|
.SH OPCIONES
|
||||||
Nótese que en general parámetros ausentes son permitidos y deshabilitan
|
Nótese que en general parámetros ausentes son permitidos y deshabilitan
|
||||||
funciones, por ejemplo "--pid-file=" deshabilita la escritura de un
|
funciones, por ejemplo "--pid-file=" deshabilita la escritura de un
|
||||||
@@ -54,6 +55,15 @@ cierto tiempo de vida (en segundos) para estas respuestas. Esto
|
|||||||
reduce la carga sobre el servidor al costo de que los clientes
|
reduce la carga sobre el servidor al costo de que los clientes
|
||||||
usaran datos añejos bajo algunas circunstancias.
|
usaran datos añejos bajo algunas circunstancias.
|
||||||
.TP
|
.TP
|
||||||
|
.B --neg-ttl=<tiempo>
|
||||||
|
Respuestas negativas desde servidores upstream normalmente contienen
|
||||||
|
información time-to-live (tiempo de vida) en expedientes SOA que
|
||||||
|
dnsmasq usa para hacer caché. Si las respuestas de servidores upstream
|
||||||
|
omiten esta información, dnsmasq no mete la respuesta en el caché.
|
||||||
|
Esta opción brinda un valor predeterminado para el time-to-live que
|
||||||
|
dnsmasq usa para meter respuestas en el caché aún en la ausencia de
|
||||||
|
un expediente SOA.
|
||||||
|
.TP
|
||||||
.B \-k, --keep-in-foreground
|
.B \-k, --keep-in-foreground
|
||||||
No ir hacia el fondo al iniciar, pero aparte de eso ejecutar como
|
No ir hacia el fondo al iniciar, pero aparte de eso ejecutar como
|
||||||
normal. La intención de esto es para cuando dnsmasq es ejecutado
|
normal. La intención de esto es para cuando dnsmasq es ejecutado
|
||||||
@@ -77,6 +87,9 @@ en operaci
|
|||||||
archivo, en vez de syslog. (Errores durante la lectura de la configuración
|
archivo, en vez de syslog. (Errores durante la lectura de la configuración
|
||||||
irán a syslog todavía, pero todo output desde un inicio exitoso, y todo
|
irán a syslog todavía, pero todo output desde un inicio exitoso, y todo
|
||||||
output mientras en ejecución, irá a este archivo exclusivamente.)
|
output mientras en ejecución, irá a este archivo exclusivamente.)
|
||||||
|
Al bitacorear a un archivo, dnsmasq cerrará y reabrirá el archivo al
|
||||||
|
recibir un SIGUSR2. Esto permite que el archivo de bitácora sea rotado
|
||||||
|
sin detener a dnsmasq.
|
||||||
.TP
|
.TP
|
||||||
.B --log-async[=<líneas>]
|
.B --log-async[=<líneas>]
|
||||||
Habilitar bitacoréo asincrónico y opcionalmente fijar el límite de número
|
Habilitar bitacoréo asincrónico y opcionalmente fijar el límite de número
|
||||||
@@ -86,7 +99,7 @@ funcionando sin ser bloqueado por syslog, y permite a syslog usar dnsmasq
|
|||||||
para búsquedas DNS sin riesgo de tranque. Si la coleta de líneas de bitácora
|
para búsquedas DNS sin riesgo de tranque. Si la coleta de líneas de bitácora
|
||||||
se llena, dnsmasq bitacoreará el desbordamiento, y el número de mensajes
|
se llena, dnsmasq bitacoreará el desbordamiento, y el número de mensajes
|
||||||
perdidos. El tamaño predeterminado de coleta es 5, un valor sano sería 5-25,
|
perdidos. El tamaño predeterminado de coleta es 5, un valor sano sería 5-25,
|
||||||
y el valor máximo de 100 es impuesto.
|
y un límite de 100 es impuesto.
|
||||||
.TP
|
.TP
|
||||||
.B \-x, --pid-file=<path>
|
.B \-x, --pid-file=<path>
|
||||||
Especificar un path alterno donde dnsmasq debe guardar su PID.
|
Especificar un path alterno donde dnsmasq debe guardar su PID.
|
||||||
@@ -109,7 +122,8 @@ Mostrar el n
|
|||||||
.TP
|
.TP
|
||||||
.B \-p, --port=<puerto>
|
.B \-p, --port=<puerto>
|
||||||
Escuchar en el puerto <puerto> en vez del puerto estándar DNS (53).
|
Escuchar en el puerto <puerto> en vez del puerto estándar DNS (53).
|
||||||
Principalmente útil para debugging.
|
Fijar esto a cero deshabilita completamente la función DNS, dejando
|
||||||
|
solo DHCP y/o TFTP.
|
||||||
.TP
|
.TP
|
||||||
.B \-P, --edns-packet-max=<tamaño>
|
.B \-P, --edns-packet-max=<tamaño>
|
||||||
Especificar el paquete UDP EDNS.0 más grande que es soportado por
|
Especificar el paquete UDP EDNS.0 más grande que es soportado por
|
||||||
@@ -135,7 +149,7 @@ es usada. Si ninguna opci
|
|||||||
o
|
o
|
||||||
.B \--listen-address
|
.B \--listen-address
|
||||||
es brindada, dnsmasq escucha en todas las interfaces disponibles excepto
|
es brindada, dnsmasq escucha en todas las interfaces disponibles excepto
|
||||||
cualquiera fijada con la opción
|
cualquiera fijada con opciones
|
||||||
.B \--except-interface
|
.B \--except-interface
|
||||||
Interfaces IP alias (por ejemplo, "eth1:0") no pueden ser utilizadas con
|
Interfaces IP alias (por ejemplo, "eth1:0") no pueden ser utilizadas con
|
||||||
.B --interface
|
.B --interface
|
||||||
@@ -150,9 +164,9 @@ las opciones
|
|||||||
.B --interface
|
.B --interface
|
||||||
y
|
y
|
||||||
.B --except-interface
|
.B --except-interface
|
||||||
no importa y la opción
|
no importa y las opciones
|
||||||
.B --except-interface
|
.B --except-interface
|
||||||
siempre invalida las otras.
|
siempre invalidan a las otras.
|
||||||
.TP
|
.TP
|
||||||
.B \-2, --no-dhcp-interface=<nombre de interface>
|
.B \-2, --no-dhcp-interface=<nombre de interface>
|
||||||
No proveer DHCP ni TFTP en la interface especificada, pero sí
|
No proveer DHCP ni TFTP en la interface especificada, pero sí
|
||||||
@@ -168,7 +182,7 @@ direcciones IP y interfaces es usada. N
|
|||||||
.B \--interface
|
.B \--interface
|
||||||
es brindada, pero sí se brinda la opción
|
es brindada, pero sí se brinda la opción
|
||||||
.B \--listen-address
|
.B \--listen-address
|
||||||
entonces dnsmasq no escuchará automáticamente en la interface
|
, entonces dnsmasq no escuchará automáticamente en la interface
|
||||||
loopback. Para obtener esto, su dirección IP, 127.0.0.1, debe ser
|
loopback. Para obtener esto, su dirección IP, 127.0.0.1, debe ser
|
||||||
explícitamente brindada como una opción
|
explícitamente brindada como una opción
|
||||||
.B \--listen-address
|
.B \--listen-address
|
||||||
@@ -213,7 +227,7 @@ y 1.2.3.67 a 6.7.8.67. Esto es lo que
|
|||||||
ruteadores Cisco PIX llaman "DNS doctoring".
|
ruteadores Cisco PIX llaman "DNS doctoring".
|
||||||
.TP
|
.TP
|
||||||
.B \-B, --bogus-nxdomain=<dirección IP>
|
.B \-B, --bogus-nxdomain=<dirección IP>
|
||||||
Transformar respuestas que contienen la dirección IP brindada en
|
Transformar respuestas que contienen la dirección IP brindada a
|
||||||
respuestas tipo "Dominio no existe". La intención de esto es actuar
|
respuestas tipo "Dominio no existe". La intención de esto es actuar
|
||||||
en contra de una movida desviada hecha por Verisign en septiembre
|
en contra de una movida desviada hecha por Verisign en septiembre
|
||||||
del 2003, cuando comenzaron a retornar la dirección de un servidor
|
del 2003, cuando comenzaron a retornar la dirección de un servidor
|
||||||
@@ -255,10 +269,22 @@ opci
|
|||||||
.B \-o, --strict-order
|
.B \-o, --strict-order
|
||||||
Por predeterminado, dnsmasq enviará búsquedas a cualquiera de los
|
Por predeterminado, dnsmasq enviará búsquedas a cualquiera de los
|
||||||
servidores upstream que conoce, y trata de favorecer servidores los
|
servidores upstream que conoce, y trata de favorecer servidores los
|
||||||
cuales sabe que están activos. Fijar esta opcion forza a dnsmasq a
|
cuales sabe que están activos. Fijar esta opción forza a dnsmasq a
|
||||||
probar cada búsqueda con cada servidor estrictamente en el orden
|
probar cada búsqueda con cada servidor estrictamente en el orden
|
||||||
que aparecen en /etc/resolv.conf
|
que aparecen en /etc/resolv.conf
|
||||||
.TP
|
.TP
|
||||||
|
.B --all-servers
|
||||||
|
Por predeterminado, cuando dnsmasq tiene más de un servidor upstream
|
||||||
|
disponible, enviará búsquedas a solo un servidor. Fijar esta opción
|
||||||
|
forza a dnsmasq a enviar todas las búsquedas a todos los servidores
|
||||||
|
disponibles. La respuesta del servidor que responda primero será
|
||||||
|
devuelta al solicitante original.
|
||||||
|
.TP
|
||||||
|
.B --stop-dns-rebind
|
||||||
|
Denegar (y bitacorear) direcciones de servidores upstream que están
|
||||||
|
dentro de rangos IP privados. Esto bloquea un ataque donde un navegador
|
||||||
|
detrás de un firewall es usado para analizar máquinas en la red local.
|
||||||
|
.TP
|
||||||
.B \-n, --no-poll
|
.B \-n, --no-poll
|
||||||
No revisar periodicamente a /etc/resolv.conf en busca de cambios.
|
No revisar periodicamente a /etc/resolv.conf en busca de cambios.
|
||||||
.TP
|
.TP
|
||||||
@@ -273,7 +299,7 @@ sin puntos o partes de dominios, a servidores upstream. Si el nombre
|
|||||||
no se conoce desde /etc/hosts o desde DHCP entonces una respuesta
|
no se conoce desde /etc/hosts o desde DHCP entonces una respuesta
|
||||||
"no encontrado" es devuelta.
|
"no encontrado" es devuelta.
|
||||||
.TP
|
.TP
|
||||||
.B \-S, --local, --server=[/[<dominio>]/[dominio/]][<dirección IP>[#<puerto>][@<remitente>[#<puerto>]]]
|
.B \-S, --local, --server=[/[<dominio>]/[dominio/]][<dirección IP>[#<puerto>][@<IP de remitente>|<interface>[#<puerto>]]
|
||||||
Especificar la dirección IP de servidores upstream directamente. Fijar
|
Especificar la dirección IP de servidores upstream directamente. Fijar
|
||||||
esta opción no suprime la lectura de /etc/resolv.conf, use -R para
|
esta opción no suprime la lectura de /etc/resolv.conf, use -R para
|
||||||
hacer eso. Si uno a más dominios opcionales son brindados, ese servidor
|
hacer eso. Si uno a más dominios opcionales son brindados, ese servidor
|
||||||
@@ -303,16 +329,21 @@ es un sin
|
|||||||
.B server
|
.B server
|
||||||
para hacer los archivos de configuración mas claros en este caso.
|
para hacer los archivos de configuración mas claros en este caso.
|
||||||
|
|
||||||
La segunda dirección IP opcional después del carácter @ le dice
|
El string opcional despues del carácter @ le dice a dnsmasq como fijar
|
||||||
a dnsmasq como fijar la dirección de remitente de las búsquedas
|
el remitente de las búsquedas hacia este servidor DNS. Debe ser una
|
||||||
hacia este servidor DNS. Debe ser una dirección perteneciente a
|
dirección IP, la cual debe ser perteneciente a la máquina en la cual
|
||||||
la máquina en la cual corre dnsmasq, o de forma contraria esta
|
corre dnsmasq, de forma contraria esta línea de servidor será bitacoreada
|
||||||
línea de servidor será bitacoreada y después ignorada. La opción
|
y después ignorada, o un nombre de interface. Si un nombre de interface
|
||||||
query-port es ignorada para cualquier servidores que tengan una
|
es brindado, entonces búsquedas hacia el servidor serán forzadas vía esa
|
||||||
dirección remitente especificada, pero el puerto puede ser
|
interface; si una dirección IP es brindada, entonces la dirección de
|
||||||
especificado directamente como parte de la dirección remitente.
|
remitente de las búsquedas será fijada a esa dirección.
|
||||||
|
La etiqueta query-port es ignorada para cualquier servidores que tengan
|
||||||
|
una dirección remitente especificada, pero el puerto puede ser
|
||||||
|
especificado directamente como parte de la dirección remitente. Forzar
|
||||||
|
búsquedas a una interface no está implementado en todas las plataformas
|
||||||
|
soportadas por dnsmasq.
|
||||||
.TP
|
.TP
|
||||||
.B \-A, --address=/<domain>/[domain/]<ipaddr>
|
.B \-A, --address=/<dominio>/[dominio/]<dirección IP>
|
||||||
Especificar una dirección IP para retornar por cualquier host en
|
Especificar una dirección IP para retornar por cualquier host en
|
||||||
los dominios brindados. Búsquedas en estos dominios nunca son
|
los dominios brindados. Búsquedas en estos dominios nunca son
|
||||||
reenviadas, y siempre son respondidas con la dirección IP
|
reenviadas, y siempre son respondidas con la dirección IP
|
||||||
@@ -354,7 +385,7 @@ la m
|
|||||||
Máquinas locales son aquellas en /etc/hosts o con arriendos DHCP.
|
Máquinas locales son aquellas en /etc/hosts o con arriendos DHCP.
|
||||||
.TP
|
.TP
|
||||||
.B \-W, --srv-host=<_servicio>.<_prot>.[<dominio>],[<target>[,<puerto>[,<prioridad>[,<peso>]]]]
|
.B \-W, --srv-host=<_servicio>.<_prot>.[<dominio>],[<target>[,<puerto>[,<prioridad>[,<peso>]]]]
|
||||||
Retornar un record SRV DNS. Ver RFC2782 para detalles. Si no es
|
Retornar un record DNS SRV. Ver RFC2782 para detalles. Si no es
|
||||||
brindada, el dominio se predetermina a el brindado por
|
brindada, el dominio se predetermina a el brindado por
|
||||||
.B --domain.
|
.B --domain.
|
||||||
El predeterminado para el dominio target está vacío, el predeterminado
|
El predeterminado para el dominio target está vacío, el predeterminado
|
||||||
@@ -372,6 +403,18 @@ comas.
|
|||||||
.B --ptr-record=<nombre>[,<target>]
|
.B --ptr-record=<nombre>[,<target>]
|
||||||
Retornar un récord DNS PTR.
|
Retornar un récord DNS PTR.
|
||||||
.TP
|
.TP
|
||||||
|
.B --interface-name=<nombre>,<interface>
|
||||||
|
Retornar un récord DNS, asociando el nombre con la dirección primaria
|
||||||
|
en la interface brindada. Esta opción especifica un expediente tipo A
|
||||||
|
para el nombre brindado de la misma forma que una línea de /etc/hosts,
|
||||||
|
excepto que la dirección no es constante y es en vez tomada de la
|
||||||
|
interface brindada. Si la interface está deshabilitada, nó configurada,
|
||||||
|
o nó existente, un récord vacío es devuelto. El récord PTR relevante
|
||||||
|
tambien es creado, trazando la dirección de la interface a el nombre.
|
||||||
|
Más de un nombre puede ser asociado con una dirección de interface,
|
||||||
|
repitiendo la opción. En tal caso, la primera instancia es usada para
|
||||||
|
la traza reversa dirección-a-nombre.
|
||||||
|
.TP
|
||||||
.B \-c, --cache-size=<tamaño de caché>
|
.B \-c, --cache-size=<tamaño de caché>
|
||||||
Fijar el tamaño del caché de dnsmasq. El predeterminado es 150 nombres.
|
Fijar el tamaño del caché de dnsmasq. El predeterminado es 150 nombres.
|
||||||
Fijar el tamaño a cero deshabilita el caché.
|
Fijar el tamaño a cero deshabilita el caché.
|
||||||
@@ -380,7 +423,6 @@ Fijar el tama
|
|||||||
Deshabilitar caché negativo. El caché negativo le permite a dnsmasq
|
Deshabilitar caché negativo. El caché negativo le permite a dnsmasq
|
||||||
recordar resultados tipo "dominio no existe" desde servidores DNS
|
recordar resultados tipo "dominio no existe" desde servidores DNS
|
||||||
upstream y responder búsquedas idénticas sin reenviarlas nuevamente.
|
upstream y responder búsquedas idénticas sin reenviarlas nuevamente.
|
||||||
Esta opción deshabilita el caché negativo.
|
|
||||||
.TP
|
.TP
|
||||||
.B \-0, --dns-forward-max=<búsquedas>
|
.B \-0, --dns-forward-max=<búsquedas>
|
||||||
Fijar el número máximo de búsquedas DNS simultáneas. El valor
|
Fijar el número máximo de búsquedas DNS simultáneas. El valor
|
||||||
@@ -391,14 +433,14 @@ generar un n
|
|||||||
.TP
|
.TP
|
||||||
.B \-F, --dhcp-range=[[net:]network-id,]<dirección-inicio>,<dirección-final>[[,<máscara>],<broadcast>][,<tiempo de arriendo predeterminado>]
|
.B \-F, --dhcp-range=[[net:]network-id,]<dirección-inicio>,<dirección-final>[[,<máscara>],<broadcast>][,<tiempo de arriendo predeterminado>]
|
||||||
Habilitar el servidor DHCP. Direcciones serán distribuidas desde el
|
Habilitar el servidor DHCP. Direcciones serán distribuidas desde el
|
||||||
rango <start-addr> hasta <end-addr> y desde direcciones definidas
|
rango <dirección-inicio> hasta <dirección-final> y desde direcciones definidas
|
||||||
estáticamente en opciones
|
estáticamente en opciones
|
||||||
.B dhcp-host
|
.B dhcp-host
|
||||||
Si el tiempo de arriendo es brindado, entonces arriendos serán
|
Si el tiempo de arriendo es especificado, entonces arriendos serán
|
||||||
dados por esa cantidad de tiempo. El tiempo de arriendo es en
|
otorgados por esa cantidad de tiempo. El tiempo de arriendo es en
|
||||||
segundos, o minutos (por ejemplo, 45m), o horas (por ejemplo, 1h), o el
|
segundos, o minutos (por ejemplo, 45m), o horas (por ejemplo, 1h), o el
|
||||||
literal "infinite". Esta opción puede ser repetida, con diferentes
|
literal "infinite". Esta opción puede ser repetida, con diferentes
|
||||||
direcciones para habilitar servicio DHCP en más de una red. Para
|
direcciones, para habilitar servicio DHCP en más de una red. Para
|
||||||
redes conectadas diréctamente (en otras palabras, redes en las
|
redes conectadas diréctamente (en otras palabras, redes en las
|
||||||
cuales la máquina corriendo dnsmasq tiene una interface) la
|
cuales la máquina corriendo dnsmasq tiene una interface) la
|
||||||
máscara de subred es opcional. Pero, es requerida para redes que
|
máscara de subred es opcional. Pero, es requerida para redes que
|
||||||
@@ -430,7 +472,7 @@ alocada el mismo nombre de host, direcci
|
|||||||
Un nombre de host especificado de esta manera toma presedencia
|
Un nombre de host especificado de esta manera toma presedencia
|
||||||
sobre cualquiera suministrado por el cliente DHCP en la máquina.
|
sobre cualquiera suministrado por el cliente DHCP en la máquina.
|
||||||
También se permite omitir la direccion de hardware y incluir el
|
También se permite omitir la direccion de hardware y incluir el
|
||||||
nombre host; en tal caso la dirección IP y los tiempos de arriendo
|
nombre de host; en tal caso la dirección IP y los tiempos de arriendo
|
||||||
serán aplicables a cualquier máquina que reclame ese nombre.
|
serán aplicables a cualquier máquina que reclame ese nombre.
|
||||||
Por ejemplo:
|
Por ejemplo:
|
||||||
.B --dhcp-host=00:20:e0:3b:13:af,wap,infinite
|
.B --dhcp-host=00:20:e0:3b:13:af,wap,infinite
|
||||||
@@ -462,7 +504,11 @@ Esto es
|
|||||||
usado por algúnas máquinas. El net:<network-id> fija la etiqueta
|
usado por algúnas máquinas. El net:<network-id> fija la etiqueta
|
||||||
network-id cuando sea que esta directiva dhcp-host está en uso.
|
network-id cuando sea que esta directiva dhcp-host está en uso.
|
||||||
Esto puede ser usado para enviar selectivamente opciones DHCP
|
Esto puede ser usado para enviar selectivamente opciones DHCP
|
||||||
a este host.
|
a este host. Cuando un host coincide con cualquier directiva
|
||||||
|
dhcp-host (o una implicada por /etc/ethers) entonces la etiqueta
|
||||||
|
network-id especial "known" es fijada. Esto permite que dnsmasq sea
|
||||||
|
configurado para ignorar pedidos desde máquinas desconocidas usando
|
||||||
|
.B --dhcp-ignore=#known
|
||||||
Direcciones ethernet (pero no client-ids) pueden tener bytes
|
Direcciones ethernet (pero no client-ids) pueden tener bytes
|
||||||
comodínes, así que por ejemplo
|
comodínes, así que por ejemplo
|
||||||
.B --dhcp-host=00:20:e0:3b:13:*,ignore
|
.B --dhcp-host=00:20:e0:3b:13:*,ignore
|
||||||
@@ -473,16 +519,24 @@ Direcciones de hardware normalmente coinciden con cualquier
|
|||||||
tipo de red (ARP), pero es posible restringirlas a un tipo ARP
|
tipo de red (ARP), pero es posible restringirlas a un tipo ARP
|
||||||
singular precediendolo con el tipo ARP (en HEX) y "-". Así que
|
singular precediendolo con el tipo ARP (en HEX) y "-". Así que
|
||||||
.B --dhcp-host=06-00:20:e0:3b:13:af,1.2.3.4
|
.B --dhcp-host=06-00:20:e0:3b:13:af,1.2.3.4
|
||||||
solo coincidaría una dirección de hardware Token-Ring, dado que
|
solo coincidiría con una dirección de hardware Token-Ring, dado que
|
||||||
el tipo ARP para Token-Ring es 6.
|
el tipo ARP para Token-Ring es 6.
|
||||||
.TP
|
.TP
|
||||||
|
.B --dhcp-hostsfile=<archivo>
|
||||||
|
Leer información host DHCP desde el archivo especificado. El archivo contiene información de un host por línea. El formato de una línea es igual que texto hacia la derecha de '=' en --dhcp-host. La ventaja de almacenar información host DHCP en este archivo es que puede ser cambiada sin tener que reiniciar dnsmasq. El archivo será re-leído cuando dnsmasq recibe un SIGHUP.
|
||||||
|
.TP
|
||||||
|
.B --dhcp-optsfile=<archivo>
|
||||||
|
Leer información sobre opciones DHCP desde el archivo especificado. La
|
||||||
|
ventaja de usar esta opción es la misma que con --dhcp-hostsfile: el
|
||||||
|
archivo dhcp-optsfile será re-leído cuando dnsmasq recibe un SIGHUP.
|
||||||
|
.TP
|
||||||
.B \-Z, --read-ethers
|
.B \-Z, --read-ethers
|
||||||
Leer /etc/ethers en busca de información sobre hosts para el servidor
|
Leer /etc/ethers en busca de información sobre hosts para el servidor
|
||||||
DHCP. El formato de /etc/ethers es una dirección de hardware, seguida
|
DHCP. El formato de /etc/ethers es una dirección de hardware, seguida
|
||||||
por ya sea un nombre de host o una dirección IP. Al ser leidas por
|
por ya sea un nombre de host o una dirección IP. Al ser leidas por
|
||||||
dnsmasq, estas líneas tienen exáctamente el mismo efecto que opciones
|
dnsmasq, estas líneas tienen exáctamente el mismo efecto que opciones
|
||||||
.B --dhcp-host
|
.B --dhcp-host
|
||||||
que contienen la misma información.
|
que contienen la misma información. /etc/ethers es re-leída cuando dnsmasq recibe un SIGHUP.
|
||||||
.TP
|
.TP
|
||||||
.B \-O, --dhcp-option=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],][<opt>|option:<opt-name>],[<value>[,<value>]]
|
.B \-O, --dhcp-option=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],][<opt>|option:<opt-name>],[<value>[,<value>]]
|
||||||
Especificar opciones diferentes o extra a clientes DHCP. Por
|
Especificar opciones diferentes o extra a clientes DHCP. Por
|
||||||
@@ -496,7 +550,7 @@ otras opciones. La opci
|
|||||||
número decimal o como "option:<option-name>". Los números de opción
|
número decimal o como "option:<option-name>". Los números de opción
|
||||||
están especificados en RFC2132 y RFCs subsiguientes. El juego de
|
están especificados en RFC2132 y RFCs subsiguientes. El juego de
|
||||||
option-names conocido por dnsmasq puede ser descubierto ejecutando
|
option-names conocido por dnsmasq puede ser descubierto ejecutando
|
||||||
"dnsmasq --help dhcp". Por ejemplo, para fijar a ruta predeterminada a
|
"dnsmasq --help dhcp". Por ejemplo, para fijar la ruta predeterminada a
|
||||||
192.168.4.4, hágase un
|
192.168.4.4, hágase un
|
||||||
.B --dhcp-option=3,192.168.4.4
|
.B --dhcp-option=3,192.168.4.4
|
||||||
o
|
o
|
||||||
@@ -510,7 +564,7 @@ La direcci
|
|||||||
dirección de la máquina que corre dnsmasq". Tipos de data permitidos
|
dirección de la máquina que corre dnsmasq". Tipos de data permitidos
|
||||||
son direcciones IP de cuatro segmentos, un número decimal, dígitos hex
|
son direcciones IP de cuatro segmentos, un número decimal, dígitos hex
|
||||||
separados por colones, y un string de texto. Si las network-ids
|
separados por colones, y un string de texto. Si las network-ids
|
||||||
opcionales son brindadas, entonces esta opcion es solo enviada cuando
|
opcionales son brindadas, entonces esta opción es solo enviada cuando
|
||||||
todas las network-ids coinciden.
|
todas las network-ids coinciden.
|
||||||
|
|
||||||
Procesamiento especial es llevado a cabo en un argumento de texto para
|
Procesamiento especial es llevado a cabo en un argumento de texto para
|
||||||
@@ -554,10 +608,18 @@ encapsuladas.
|
|||||||
.B --dhcp-option-force=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],]<opt>,[<value>[,<value>]]
|
.B --dhcp-option-force=[<network-id>,[<network-id>,]][vendor:[<vendor-class>],]<opt>,[<value>[,<value>]]
|
||||||
Esto funciona exáctamente de la misma forma que
|
Esto funciona exáctamente de la misma forma que
|
||||||
.B --dhcp-option
|
.B --dhcp-option
|
||||||
excepto que la opción siempre será enviada, aún si el cliente no lo pide en
|
excepto que la opción siempre será enviada, aún si el cliente no la pide en
|
||||||
la lista de pedido de parámetros. Esto se necesita aveces, por ejemplo cuando
|
la lista de pedido de parámetros. Esto se necesita aveces, por ejemplo cuando
|
||||||
enviando opciones a PXELinux.
|
enviando opciones a PXELinux.
|
||||||
.TP
|
.TP
|
||||||
|
.B --dhcp-no-override
|
||||||
|
Deshabilitar la reutilización de los campos DHCP de nombre de servidor y
|
||||||
|
archivo como espacio para opciones extra. Si puede, dnsmasq mueve la información
|
||||||
|
del servidor boot y del nombre de archivo (de dhcp-boot) de sus campos dedicados
|
||||||
|
hacia opciones DHCP. Esto crea espacio extra en el paquete DHCP para opciones,
|
||||||
|
pero puede raramente confundir clientes viejos o defectuosos. Esta opción forza
|
||||||
|
comportamiento "simple y sencillo" para prevenir problemas en tales casos.
|
||||||
|
.TP
|
||||||
.B \-U, --dhcp-vendorclass=<network-id>,<vendor-class>
|
.B \-U, --dhcp-vendorclass=<network-id>,<vendor-class>
|
||||||
Trazar desde un string vendor-class a un network id. La mayoría de los
|
Trazar desde un string vendor-class a un network id. La mayoría de los
|
||||||
clientes DHCP proveen una "vendor class" la cual representa, en cierto
|
clientes DHCP proveen una "vendor class" la cual representa, en cierto
|
||||||
@@ -580,7 +642,7 @@ por ejemplo, usar esto para especificar una impresora diferente para
|
|||||||
hosts en la clase "cuentas" que para los de la clase "ingenieria".
|
hosts en la clase "cuentas" que para los de la clase "ingenieria".
|
||||||
.TP
|
.TP
|
||||||
.B \-4, --dhcp-mac=<network-id>,<dirección MAC>
|
.B \-4, --dhcp-mac=<network-id>,<dirección MAC>
|
||||||
Mapear desde una dirección MAC a una network id. La dirección MAC
|
Trazar desde una dirección MAC a una network id. La dirección MAC
|
||||||
puede incluir comodínes. Por ejemplo:
|
puede incluir comodínes. Por ejemplo:
|
||||||
.B --dhcp-mac=3com,01:34:23:*:*:*
|
.B --dhcp-mac=3com,01:34:23:*:*:*
|
||||||
fijaría el tag "3com" a cualquier host el cual su MAC coincida con
|
fijaría el tag "3com" a cualquier host el cual su MAC coincida con
|
||||||
@@ -597,12 +659,17 @@ network-id es fijado.
|
|||||||
.B --dhcp-subscrid=<network-id>,<subscriber-id>
|
.B --dhcp-subscrid=<network-id>,<subscriber-id>
|
||||||
Trazar de opciones relay subscriber-id RFC3993 a opciones network-id.
|
Trazar de opciones relay subscriber-id RFC3993 a opciones network-id.
|
||||||
.TP
|
.TP
|
||||||
|
.B --dhcp-match=<network-id>,<número de opción>
|
||||||
|
Fijar la opción network-id si el cliente envía un opción DHCP del nombre
|
||||||
|
brindado. Esto puede ser utilizado para identificar clientes particulares
|
||||||
|
que envían información usando números privados de opciones.
|
||||||
|
.TP
|
||||||
.B \-J, --dhcp-ignore=<network-id>[,<network-id>]
|
.B \-J, --dhcp-ignore=<network-id>[,<network-id>]
|
||||||
Cuando todos los network ids brindados coincidan con el juego de
|
Cuando todos los network ids brindados coincidan con el juego de
|
||||||
network ids derivados de las clases net, host, y vendor, ignorar
|
network ids derivados de las clases net, host, y vendor, ignorar
|
||||||
el host y no brindarle un arriendo DHCP.
|
el host y no brindarle un arriendo DHCP.
|
||||||
.TP
|
.TP
|
||||||
.B --dhcp-ignore-name[=<network-id>[,<network-id>]]
|
.B --dhcp-ignore-names[=<network-id>[,<network-id>]]
|
||||||
Cuando todos los network-ids brindados coinciden con el juego de
|
Cuando todos los network-ids brindados coinciden con el juego de
|
||||||
network-ids derivado de la red, host, classes de vendedor y usuario,
|
network-ids derivado de la red, host, classes de vendedor y usuario,
|
||||||
ignorar cualquier nombre de host proveido por el host. Nótese que,
|
ignorar cualquier nombre de host proveido por el host. Nótese que,
|
||||||
@@ -611,6 +678,14 @@ y en tal caso nombres de host proveidos por clientes DHCP siempre son
|
|||||||
ignorados, y hosts DHCP son agregados al DNS usando solo la configuración
|
ignorados, y hosts DHCP son agregados al DNS usando solo la configuración
|
||||||
dhcp-host en dnsmasq y el contenido de /etc/hosts y /etc/ethers.
|
dhcp-host en dnsmasq y el contenido de /etc/hosts y /etc/ethers.
|
||||||
.TP
|
.TP
|
||||||
|
.B --dhcp-broadcast=<network-id>[,<network-id>]
|
||||||
|
Cuando todos los network-ids brindados coinciden con el juego de network-ids
|
||||||
|
derivados de la red, host, clases de vendedor y usuarios, siempre usar
|
||||||
|
broadcast para comunicarse con el host cuando está sin configurar. La
|
||||||
|
mayoría de clientes DHCP que necesitan respuestas broadcast fijan una
|
||||||
|
opción en sus pedidos para que esto pase automaticamente, algunos
|
||||||
|
clientes BOOTP viejos no lo hacen.
|
||||||
|
.TP
|
||||||
.B \-M, --dhcp-boot=[net:<network-id>,]<filename>,[<servername>[,<server address>]]
|
.B \-M, --dhcp-boot=[net:<network-id>,]<filename>,[<servername>[,<server address>]]
|
||||||
Fijar opciones BOOTP que han de ser devueltas por el servidor DHCP. Nombre
|
Fijar opciones BOOTP que han de ser devueltas por el servidor DHCP. Nombre
|
||||||
y dirección de servidor son opcionales: si no son brindadas, el nombre es
|
y dirección de servidor son opcionales: si no son brindadas, el nombre es
|
||||||
@@ -653,7 +728,7 @@ cuidado.
|
|||||||
.TP
|
.TP
|
||||||
.B --log-dhcp
|
.B --log-dhcp
|
||||||
Bitacoréo extra para DHCP: Bitacorear todas las opciones enviadas a
|
Bitacoréo extra para DHCP: Bitacorear todas las opciones enviadas a
|
||||||
clientes DHCP y los tags netid usados para determinarlos.
|
clientes DHCP y las etiquetas netid usadas para determinarlos.
|
||||||
.TP
|
.TP
|
||||||
.B \-l, --dhcp-leasefile=<path>
|
.B \-l, --dhcp-leasefile=<path>
|
||||||
Usar el archivo especificado para almacenar información de arriendos
|
Usar el archivo especificado para almacenar información de arriendos
|
||||||
@@ -665,7 +740,7 @@ DNS si tienen un nombre de host. Esta funcionalidad pudo haber sido
|
|||||||
excluida de dnsmasq a la hora de compilación, y en tal caso ocurrirá
|
excluida de dnsmasq a la hora de compilación, y en tal caso ocurrirá
|
||||||
un error. Nótese que la integración de archivos de
|
un error. Nótese que la integración de archivos de
|
||||||
arriendo ISC es una caracterísctica depreciada. No debería ser usada
|
arriendo ISC es una caracterísctica depreciada. No debería ser usada
|
||||||
en instalaciones nuevas, y será eliminada en versiones futuras.
|
en instalaciones nuevas, y será eliminada en una versión futura.
|
||||||
.TP
|
.TP
|
||||||
.B \-6 --dhcp-script=<path>
|
.B \-6 --dhcp-script=<path>
|
||||||
Cuando un arriendo DHCP nuevo es creado, o uno viejo es
|
Cuando un arriendo DHCP nuevo es creado, o uno viejo es
|
||||||
@@ -689,26 +764,32 @@ datos no son almacenados en la base de datos de arriendos de dnsmasq.
|
|||||||
Si dnsmasq fue compilado con HAVE_BROKEN_RTC, entonces la duración del
|
Si dnsmasq fue compilado con HAVE_BROKEN_RTC, entonces la duración del
|
||||||
arriendo (en segundos) es almacenada en DNSMASQ_LEASE_LENGTH, de otra
|
arriendo (en segundos) es almacenada en DNSMASQ_LEASE_LENGTH, de otra
|
||||||
manera el tiempo de vencimiento es almacenado en DNSMASQ_LEASE_EXPIRES.
|
manera el tiempo de vencimiento es almacenado en DNSMASQ_LEASE_EXPIRES.
|
||||||
|
El número de segundos faltante para el vencimiento del arriendo siempre
|
||||||
|
es almacenado en DNSMASQ_TIME_REMAINING.
|
||||||
Si un arriendo solía tener un nombre de host, el cual es removido, un
|
Si un arriendo solía tener un nombre de host, el cual es removido, un
|
||||||
evento "old" es generado con el nuevo estado del arriendo, (por ejemplo, sin
|
evento "old" es generado con el nuevo estado del arriendo, (por ejemplo, sin
|
||||||
nombre), y el nombre anterior es brindado en la variable de ambiente
|
nombre), y el nombre anterior es brindado en la variable de ambiente
|
||||||
DNSMASQ_OLD_HOSTNAME. Todos los descriptores de archivo están cerrados
|
DNSMASQ_OLD_HOSTNAME. DNSMASQ_INTERFACE almacena el nombre de la interface
|
||||||
|
en la cual llegó el pedido; esto no es fijado para acciones "viejas"
|
||||||
|
cuando dnsmasq re-inicia.
|
||||||
|
Todos los descriptores de archivo están cerrados
|
||||||
excepto stdin, stdout, y stderr los cuales están abiertos a /dev/null
|
excepto stdin, stdout, y stderr los cuales están abiertos a /dev/null
|
||||||
(excepto en modo debug).
|
(excepto en modo debug).
|
||||||
Este guión no es invocado concurrentemente: si cambios de arriendos
|
Este guión no es invocado concurrentemente: si cambios de arriendos
|
||||||
subsiguientes ocurren, el guión no es invocado otra vez hasta que
|
subsiguientes ocurren, el guión no es invocado otra vez hasta que
|
||||||
cualquier invocación existente haga exit. Al inicio de dnsmasq, el guión
|
cualquier invocación existente haga exit. Al inicio de dnsmasq, el guión
|
||||||
será invocado para todos los arriendos existenetes mientras van siendo
|
será invocado para todos los arriendos existentes mientras van siendo
|
||||||
leídos desde el archivo de arriendos. Arriendos vencidos serán llamados
|
leídos desde el archivo de arriendos. Arriendos vencidos serán llamados
|
||||||
con "del" y otros con "old". <path> debe ser un path absoluto, ninguna
|
con "del" y otros con "old". <path> debe ser un path absoluto, ninguna
|
||||||
búsqueda PATH ocurre.
|
búsqueda PATH ocurre. Cuando dnsmasq recibe una señal HUP, el guión será
|
||||||
|
invocado para arriendos existentes con un evento "old".
|
||||||
.TP
|
.TP
|
||||||
.B \-9, --leasefile-ro
|
.B \-9, --leasefile-ro
|
||||||
Suprimir completamente el uso del archivo de arriendos. El archivo no será
|
Suprimir completamente el uso del archivo de arriendos. El archivo no será
|
||||||
creado, leído, o escrito. Cambiar la manera en la cuál el archivo guión de
|
creado, leído, ni escrito. Cambiar la manera en la cuál el archivo guión de
|
||||||
cambio de arriendo es llamado, de tal forma que la base de datos de arriendos
|
cambio de arriendo (si es brindado) es llamado, de tal forma que la base de
|
||||||
pueda ser mantenida en almacenaje externo por el archivo guión. Adicionálmente
|
datos de arriendospueda ser mantenida en almacenaje externo por el archivo
|
||||||
a las invocaciones brindadas en
|
guión. Adicionálmente a las invocaciones brindadas en
|
||||||
.B --dhcp-script
|
.B --dhcp-script
|
||||||
el archivo de cambio de arriendos es llamado una vez, al inicio de dnsmasq,
|
el archivo de cambio de arriendos es llamado una vez, al inicio de dnsmasq,
|
||||||
con el único argumento "init". Cuando invocado de esta forma, el guión debería
|
con el único argumento "init". Cuando invocado de esta forma, el guión debería
|
||||||
@@ -760,6 +841,13 @@ rechazados, para prevenir que clientes salgan de la ra
|
|||||||
absolutos (los que comienzan con "/") están permitidos, pero deben estar
|
absolutos (los que comienzan con "/") están permitidos, pero deben estar
|
||||||
dentro del tftp-root.
|
dentro del tftp-root.
|
||||||
.TP
|
.TP
|
||||||
|
.B --tftp-unique-root
|
||||||
|
Agregar la dirección IP del cliente TFTP como un componente path del lado del
|
||||||
|
TFTP-root (en formato estándar de cuatro puntos). Solo válido si un tftp-root
|
||||||
|
está fijado y el directorio existe. Por ejemplo, si tftp-root es "/tftp" y el
|
||||||
|
cliente 1.2.3.4 pide el archivo "miarchivo" entonces el path efectivo será
|
||||||
|
"/tftp/1.2.3.4/miarchivo" si /tftp/1.2.3.4 existe o /tftp/miarchivo si no.
|
||||||
|
.TP
|
||||||
.B --tftp-secure
|
.B --tftp-secure
|
||||||
Habilitar modo TFTP seguro: sin esto, cualquier archivo que es leíble por el
|
Habilitar modo TFTP seguro: sin esto, cualquier archivo que es leíble por el
|
||||||
proceso dnsmasq bajo reglas normales de control de acceso UNIX, está disponible
|
proceso dnsmasq bajo reglas normales de control de acceso UNIX, está disponible
|
||||||
@@ -779,13 +867,25 @@ un descriptor de archivo por cada coneccion TFTP concurrente, y por archivo
|
|||||||
único (mas algunos otros). De tal manera que servirle el mismo archivo
|
único (mas algunos otros). De tal manera que servirle el mismo archivo
|
||||||
simultáneo a n clientes requerirá el uso de n + 10 descriptores de archivo,
|
simultáneo a n clientes requerirá el uso de n + 10 descriptores de archivo,
|
||||||
y servirles archivos diferentes simultáneamente requerirá (2*n) + 10
|
y servirles archivos diferentes simultáneamente requerirá (2*n) + 10
|
||||||
descriptores.
|
descriptores. Si
|
||||||
|
.B --tftp-port-range
|
||||||
|
es brindado, eso puede afectar el número de conexiones simultáneas.
|
||||||
.TP
|
.TP
|
||||||
.B --tftp-no-blocksize
|
.B --tftp-no-blocksize
|
||||||
No permitir que el servidor negocie la opción "blocksize" con un cliente.
|
No permitir que el servidor negocie la opción "blocksize" con un cliente.
|
||||||
Algunos clientes con errores piden esta opción pero se portán mal cuando se
|
Algunos clientes con errores piden esta opción pero se portán mal cuando se
|
||||||
les brinda.
|
les brinda.
|
||||||
.TP
|
.TP
|
||||||
|
.B --tftp-port-range=<inicio>,<final>
|
||||||
|
Un servidor TFTP escucha por inicios de conexión en un puerto bien conocido
|
||||||
|
(69), pero tambien usa un puerto dinamicamente seleccionado para cada
|
||||||
|
conexión. Normalmente estos son seleccionados por el sistema operativo,
|
||||||
|
pero esta opción especifica un rango de puertos para ser usado por transferencias
|
||||||
|
TFTP. Esto puede ser útil cuando TFTP tiene que pasar atraves de un firewall.
|
||||||
|
El comienzo del rango no puede ser menor a 1025 a menos que dnsmasq esté corriendo
|
||||||
|
como root. El número de conexiones simultáneas está limitado por el tamaño del
|
||||||
|
rango de puertos.
|
||||||
|
.TP
|
||||||
.B \-C, --conf-file=<archivo>
|
.B \-C, --conf-file=<archivo>
|
||||||
Especificar un archivo de configuración diferente. La opción conf-file
|
Especificar un archivo de configuración diferente. La opción conf-file
|
||||||
también es permitida en archivos de configuración, para incluir múltiples
|
también es permitida en archivos de configuración, para incluir múltiples
|
||||||
@@ -812,14 +912,19 @@ y son ignoradas. Para opciones que solo pueden ser especificadas una
|
|||||||
sola vez, el archivo de configuración invalida la línea de comandos.
|
sola vez, el archivo de configuración invalida la línea de comandos.
|
||||||
Las comillas son permitidas en el archivo de configuración: entre comillas
|
Las comillas son permitidas en el archivo de configuración: entre comillas
|
||||||
tipo " los significados especiales de ,:. y # son eliminados y los
|
tipo " los significados especiales de ,:. y # son eliminados y los
|
||||||
siguientes escapes son permitidos: \\\\ \\" \\t \\a \\b \\r y \\n. El
|
siguientes escapes son permitidos: \\\\ \\" \\t \\e \\b \\r y \\n.
|
||||||
último corresponde a tab, bell, backspace, return y newline.
|
Corresponden a tab, escape, backspace, return y newline.
|
||||||
.SH NOTAS
|
.SH NOTAS
|
||||||
Al recibir un SIGHUP
|
Al recibir un SIGHUP
|
||||||
.B dnsmasq
|
.B dnsmasq
|
||||||
libera su cache y entonces recarga
|
libera su cache y entonces recarga
|
||||||
.I /etc/hosts y /etc/ethers.
|
.I /etc/hosts
|
||||||
Si
|
y
|
||||||
|
.I /etc/ethers
|
||||||
|
al igual que cualquier archivo brindado con --dhcp-hostsfile, --dhcp-optsfile,
|
||||||
|
o --addn-hosts.
|
||||||
|
El archivo guión de cambio de arriendos es llamado para todos los arriendos
|
||||||
|
DHCP existentes. Si
|
||||||
.B
|
.B
|
||||||
--no-poll
|
--no-poll
|
||||||
está fijado entonces SIGHUP también re-lee
|
está fijado entonces SIGHUP también re-lee
|
||||||
@@ -829,14 +934,36 @@ NO re-lee el archivo de configuraci
|
|||||||
.PP
|
.PP
|
||||||
Al recibir un SIGUSR1,
|
Al recibir un SIGUSR1,
|
||||||
.B dnsmasq
|
.B dnsmasq
|
||||||
escribe estadisticas de caché a la biácora del sistema. Escribe el tamaño
|
escribe estadísticas a la bitácora del sistema. Escribe el tamaño
|
||||||
del caché, el numero de nombres que han tenido que ser removidos del
|
del caché, el numero de nombres que han tenido que ser removidos del
|
||||||
caché antes de que vencieran para hacer espacio para nombres nuevos, y el
|
caché antes de que vencieran para hacer espacio para nombres nuevos, y el
|
||||||
número total de nombres que han sido insertados en el caché. En modo
|
número total de nombres que han sido insertados en el caché. Para cada
|
||||||
|
servidor upstream brinda el número de búsquedas enviadas, y el
|
||||||
|
número que resultaron en error. En modo
|
||||||
.B --no-daemon
|
.B --no-daemon
|
||||||
o cuando bitacoréo completo está habilitado (-q), una descarga completa de
|
o cuando bitacoréo completo está habilitado (-q), una descarga completa de
|
||||||
el contenido del caché es hecha.
|
el contenido del caché es hecha.
|
||||||
.PP
|
.PP
|
||||||
|
Cuando recibe un SIGUSR2 y está bitacoreando diréctamente a un archivo (ver
|
||||||
|
.B --log-facility
|
||||||
|
)
|
||||||
|
.B dnsmasq
|
||||||
|
cerrará y reabrirá el archivo de bitácora. Nótese que durante esta
|
||||||
|
operación, dnsmasq no estará corriendo como root. Al crear el archivo de
|
||||||
|
bitácora, dnsmasq cambia el dueño del archivo a el usuario normal como
|
||||||
|
el que correrá. Logrotate debe ser configurado para crear un archivo de
|
||||||
|
bitácora nuevo con permisos iguales al existente, antes de enviar
|
||||||
|
SIGUSR2. Si búsquedas DNS TCP están en progreso, el archivo de bitácora
|
||||||
|
viejo se mantendrá abierto en procesos hijos que están manejando
|
||||||
|
búsquedas TCP, y puede continuarse a escribirle. Hay un límite de 150
|
||||||
|
segundos, después de lo cual todos los procesos TCP existentes se habrán
|
||||||
|
vencido: por esta razón, no es sabio configurar compresión de archivos
|
||||||
|
de bitácora para archivos que acaban de ser rotados. Con logrotate, las
|
||||||
|
opciones requeridas son
|
||||||
|
.B create
|
||||||
|
y
|
||||||
|
.B delaycompress.
|
||||||
|
.PP
|
||||||
Dnsmasq es un reenviador de búsquedas DNS: no puede responder búsquedas
|
Dnsmasq es un reenviador de búsquedas DNS: no puede responder búsquedas
|
||||||
arbitrarias comenzando desde los servidores root pero reenvía dichas
|
arbitrarias comenzando desde los servidores root pero reenvía dichas
|
||||||
búsquedas a un servidor DNS recursivo, el cual es típicamente proveído
|
búsquedas a un servidor DNS recursivo, el cual es típicamente proveído
|
||||||
@@ -862,7 +989,7 @@ haya existido. Dnsmasq simplemente sigue revisando en caso de que
|
|||||||
.I /etc/resolv.conf
|
.I /etc/resolv.conf
|
||||||
sea creado en algún momento. A dnsmasq se le puede decir que revise más
|
sea creado en algún momento. A dnsmasq se le puede decir que revise más
|
||||||
de un archivo resolv.conf. Esto es útil en una laptop, donde ambos PPP y
|
de un archivo resolv.conf. Esto es útil en una laptop, donde ambos PPP y
|
||||||
DHCP podrían estar siendo usados: dnsmasq puede ser fijado para revisar ambos:
|
DHCP podrían estar siendo usados: dnsmasq puede ser fijado para revisar ambos
|
||||||
.I /etc/ppp/resolv.conf
|
.I /etc/ppp/resolv.conf
|
||||||
y
|
y
|
||||||
.I /etc/dhcpc/resolv.conf
|
.I /etc/dhcpc/resolv.conf
|
||||||
@@ -942,6 +1069,27 @@ ver si coincide con alg
|
|||||||
al igual que la etiqueta "bootp", permitiendo así algún control sobre
|
al igual que la etiqueta "bootp", permitiendo así algún control sobre
|
||||||
las opciones devueltas a diferentes clases de hosts.
|
las opciones devueltas a diferentes clases de hosts.
|
||||||
|
|
||||||
|
.SH CÓDIGOS EXIT
|
||||||
|
.PP
|
||||||
|
0 - Dnsmasq hizo fork hacia el fondo exitosamente, o terminó de manera
|
||||||
|
normal si ir al fondo no está habilitado.
|
||||||
|
.PP
|
||||||
|
1 - Un problema con la configuración ha sido detectado.
|
||||||
|
.PP
|
||||||
|
2 - Un problema con acceso a redes ocurrió (dirección en uso, intento
|
||||||
|
de usar puertos privilegiados sin permiso).
|
||||||
|
.PP
|
||||||
|
3 - Un problema con una operación de sistema de archivos ocurrió (archivo
|
||||||
|
o directorio ausente, permisos).
|
||||||
|
.PP
|
||||||
|
4 - Falla de alocación de memoria.
|
||||||
|
.PP
|
||||||
|
5 - Otro problema misceláneo.
|
||||||
|
.PP
|
||||||
|
11 o mayor - un codigo de retorno no cero fué recibido del llamado "init"
|
||||||
|
del proceso de archivo guión de arriendos. El código exit de dnsmasq es
|
||||||
|
el código exit del archivo guión con 10 sumado.
|
||||||
|
|
||||||
.SH LIMITES
|
.SH LIMITES
|
||||||
Los valores predeterminados para limites de recursos son generálmente
|
Los valores predeterminados para limites de recursos son generálmente
|
||||||
conservadores, y apropiados para uso en dispositivos tipo enrutador
|
conservadores, y apropiados para uso en dispositivos tipo enrutador
|
||||||
@@ -952,19 +1100,20 @@ no escalaban tan bien.
|
|||||||
|
|
||||||
.PP
|
.PP
|
||||||
Dnsmasq es capaz de soportar con DNS y DHCP a por lo menos mil (1,000)
|
Dnsmasq es capaz de soportar con DNS y DHCP a por lo menos mil (1,000)
|
||||||
clientes. Por supuesto que para lograr esto debe ser aumentadoo el valor de
|
clientes. Por supuesto que para lograr esto debe aumentarse el valor de
|
||||||
.B --dhcp-lease-max
|
.B --dhcp-lease-max
|
||||||
debe ser incrementado, y tiempos de arriendo no deben ser muy cortos
|
, y tiempos de arriendo no deben ser muy cortos (menos de una hora).
|
||||||
(menos de una hora). El valor de
|
El valor de
|
||||||
.B --dns-forward-max
|
.B --dns-forward-max
|
||||||
puede ser aumentado: comienze con el equivalente a el número de clientes y
|
puede ser aumentado: comienze con el equivalente a el número de clientes y
|
||||||
auméntelo si parece lento el DNS. Nótese que el rendimiento DNS depende
|
auméntelo si parece lento el DNS. Nótese que el rendimiento DNS depende
|
||||||
también de los servidores DNS upstream. El tamaño del caché DNS puede ser
|
también de los servidores DNS upstream. El tamaño del caché DNS puede ser
|
||||||
incrementado: el límite obligatorio es 10,000 nombres y el predeterminado
|
incrementado: el límite obligatorio es 10,000 nombres y el predeterminado
|
||||||
(150) es muy bajo. Enviarle un SIGUSR1 a dnsmasq hace que bitacorée
|
(150) es muy bajo. El enviarle un SIGUSR1 a dnsmasq hace que bitacorée
|
||||||
información que es útil para afinar el tamaño de caché. Ver la sección
|
información que es útil para afinar el tamaño de caché. Ver la sección
|
||||||
.B NOTAS
|
.B NOTAS
|
||||||
para detalles.
|
para detalles.
|
||||||
|
|
||||||
.PP
|
.PP
|
||||||
El servidor TFTP incorporado es capáz de soportar varias transferencias
|
El servidor TFTP incorporado es capáz de soportar varias transferencias
|
||||||
simultáneas de archivos: el límite absoluto está relacionado con el número
|
simultáneas de archivos: el límite absoluto está relacionado con el número
|
||||||
@@ -975,6 +1124,7 @@ demasiado alto con
|
|||||||
será de-escalado y el límite real será bitacoreado al inicio. Nótese que más
|
será de-escalado y el límite real será bitacoreado al inicio. Nótese que más
|
||||||
transferencias son posibles cuando el mismo archivo es enviado qué cuando
|
transferencias son posibles cuando el mismo archivo es enviado qué cuando
|
||||||
cada transferencia envía un archivo diferente.
|
cada transferencia envía un archivo diferente.
|
||||||
|
|
||||||
.PP
|
.PP
|
||||||
Es posible usar dnsmasq para negar publicidad Web usando una lista de
|
Es posible usar dnsmasq para negar publicidad Web usando una lista de
|
||||||
servidores de banners bien conocidos, todos resolviendose a 127.0.0.1 o
|
servidores de banners bien conocidos, todos resolviendose a 127.0.0.1 o
|
||||||
|
|||||||
+1197
File diff suppressed because it is too large.
Load diff
+470
-325
File diff suppressed because it is too large.
Load diff
@@ -1,20 +1,22 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
#ifndef HAVE_LINUX_NETWORK
|
#if defined(HAVE_BSD_NETWORK) || defined(HAVE_SOLARIS_NETWORK)
|
||||||
|
|
||||||
#include <net/bpf.h>
|
|
||||||
|
|
||||||
static struct iovec ifconf = {
|
static struct iovec ifconf = {
|
||||||
.iov_base = NULL,
|
.iov_base = NULL,
|
||||||
@@ -26,7 +28,108 @@ static struct iovec ifreq = {
|
|||||||
.iov_len = 0
|
.iov_len = 0
|
||||||
};
|
};
|
||||||
|
|
||||||
void init_bpf(struct daemon *daemon)
|
int iface_enumerate(void *parm, int (*ipv4_callback)(), int (*ipv6_callback)())
|
||||||
|
{
|
||||||
|
char *ptr;
|
||||||
|
struct ifreq *ifr;
|
||||||
|
struct ifconf ifc;
|
||||||
|
int fd, errsav, ret = 0;
|
||||||
|
int lastlen = 0;
|
||||||
|
size_t len = 0;
|
||||||
|
|
||||||
|
if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) == -1)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
while(1)
|
||||||
|
{
|
||||||
|
len += 10*sizeof(struct ifreq);
|
||||||
|
|
||||||
|
if (!expand_buf(&ifconf, len))
|
||||||
|
goto err;
|
||||||
|
|
||||||
|
ifc.ifc_len = len;
|
||||||
|
ifc.ifc_buf = ifconf.iov_base;
|
||||||
|
|
||||||
|
if (ioctl(fd, SIOCGIFCONF, &ifc) == -1)
|
||||||
|
{
|
||||||
|
if (errno != EINVAL || lastlen != 0)
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (ifc.ifc_len == lastlen)
|
||||||
|
break; /* got a big enough buffer now */
|
||||||
|
lastlen = ifc.ifc_len;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (ptr = ifc.ifc_buf; ptr < ifc.ifc_buf + ifc.ifc_len; ptr += len )
|
||||||
|
{
|
||||||
|
/* subsequent entries may not be aligned, so copy into
|
||||||
|
an aligned buffer to avoid nasty complaints about
|
||||||
|
unaligned accesses. */
|
||||||
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
||||||
|
len = ((struct ifreq *)ptr)->ifr_addr.sa_len + IF_NAMESIZE;
|
||||||
|
#else
|
||||||
|
len = sizeof(struct ifreq);
|
||||||
|
#endif
|
||||||
|
if (!expand_buf(&ifreq, len))
|
||||||
|
goto err;
|
||||||
|
|
||||||
|
ifr = (struct ifreq *)ifreq.iov_base;
|
||||||
|
memcpy(ifr, ptr, len);
|
||||||
|
|
||||||
|
if (ifr->ifr_addr.sa_family == AF_INET && ipv4_callback)
|
||||||
|
{
|
||||||
|
struct in_addr addr, netmask, broadcast;
|
||||||
|
broadcast.s_addr = 0;
|
||||||
|
addr = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr;
|
||||||
|
if (ioctl(fd, SIOCGIFNETMASK, ifr) == -1)
|
||||||
|
continue;
|
||||||
|
netmask = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr;
|
||||||
|
if (ioctl(fd, SIOCGIFBRDADDR, ifr) != -1)
|
||||||
|
broadcast = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr;
|
||||||
|
if (!((*ipv4_callback)(addr,
|
||||||
|
(int)if_nametoindex(ifr->ifr_name),
|
||||||
|
netmask, broadcast,
|
||||||
|
parm)))
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
else if (ifr->ifr_addr.sa_family == AF_INET6 && ipv6_callback)
|
||||||
|
{
|
||||||
|
struct in6_addr *addr = &((struct sockaddr_in6 *)&ifr->ifr_addr)->sin6_addr;
|
||||||
|
/* voodoo to clear interface field in address */
|
||||||
|
if (!(daemon->options & OPT_NOWILD) && IN6_IS_ADDR_LINKLOCAL(addr))
|
||||||
|
{
|
||||||
|
addr->s6_addr[2] = 0;
|
||||||
|
addr->s6_addr[3] = 0;
|
||||||
|
}
|
||||||
|
if (!((*ipv6_callback)(addr,
|
||||||
|
(int)((struct sockaddr_in6 *)&ifr->ifr_addr)->sin6_scope_id,
|
||||||
|
(int)if_nametoindex(ifr->ifr_name),
|
||||||
|
parm)))
|
||||||
|
goto err;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = 1;
|
||||||
|
|
||||||
|
err:
|
||||||
|
errsav = errno;
|
||||||
|
close(fd);
|
||||||
|
errno = errsav;
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(HAVE_BSD_NETWORK)
|
||||||
|
#include <net/bpf.h>
|
||||||
|
|
||||||
|
void init_bpf(void)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
||||||
@@ -37,19 +140,14 @@ void init_bpf(struct daemon *daemon)
|
|||||||
{
|
{
|
||||||
sprintf(ifreq.iov_base, "/dev/bpf%d", i++);
|
sprintf(ifreq.iov_base, "/dev/bpf%d", i++);
|
||||||
if ((daemon->dhcp_raw_fd = open(ifreq.iov_base, O_RDWR, 0)) != -1)
|
if ((daemon->dhcp_raw_fd = open(ifreq.iov_base, O_RDWR, 0)) != -1)
|
||||||
{
|
|
||||||
int flags = fcntl(daemon->dhcp_raw_fd, F_GETFD);
|
|
||||||
if (flags != -1)
|
|
||||||
fcntl(daemon->dhcp_raw_fd, F_SETFD, flags | FD_CLOEXEC);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (errno != EBUSY)
|
if (errno != EBUSY)
|
||||||
die(_("cannot create DHCP BPF socket: %s"), NULL);
|
die(_("cannot create DHCP BPF socket: %s"), NULL, EC_BADNET);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void send_via_bpf(struct daemon *daemon, struct dhcp_packet *mess, size_t len,
|
void send_via_bpf(struct dhcp_packet *mess, size_t len,
|
||||||
struct in_addr iface_addr, struct ifreq *ifr)
|
struct in_addr iface_addr, struct ifreq *ifr)
|
||||||
{
|
{
|
||||||
/* Hairy stuff, packet either has to go to the
|
/* Hairy stuff, packet either has to go to the
|
||||||
@@ -121,8 +219,10 @@ void send_via_bpf(struct daemon *daemon, struct dhcp_packet *mess, size_t len,
|
|||||||
udp.uh_sum = 0;
|
udp.uh_sum = 0;
|
||||||
udp.uh_ulen = sum = htons(sizeof(struct udphdr) + len);
|
udp.uh_ulen = sum = htons(sizeof(struct udphdr) + len);
|
||||||
sum += htons(IPPROTO_UDP);
|
sum += htons(IPPROTO_UDP);
|
||||||
for (i = 0; i < 4; i++)
|
sum += ip.ip_src.s_addr & 0xffff;
|
||||||
sum += ((u16 *)&ip.ip_src)[i];
|
sum += (ip.ip_src.s_addr >> 16) & 0xffff;
|
||||||
|
sum += ip.ip_dst.s_addr & 0xffff;
|
||||||
|
sum += (ip.ip_dst.s_addr >> 16) & 0xffff;
|
||||||
for (i = 0; i < sizeof(struct udphdr)/2; i++)
|
for (i = 0; i < sizeof(struct udphdr)/2; i++)
|
||||||
sum += ((u16 *)&udp)[i];
|
sum += ((u16 *)&udp)[i];
|
||||||
for (i = 0; i < (len + 1) / 2; i++)
|
for (i = 0; i < (len + 1) / 2; i++)
|
||||||
@@ -145,100 +245,6 @@ void send_via_bpf(struct daemon *daemon, struct dhcp_packet *mess, size_t len,
|
|||||||
while (writev(daemon->dhcp_raw_fd, iov, 4) == -1 && retry_send());
|
while (writev(daemon->dhcp_raw_fd, iov, 4) == -1 && retry_send());
|
||||||
}
|
}
|
||||||
|
|
||||||
int iface_enumerate(struct daemon *daemon, void *parm, int (*ipv4_callback)(), int (*ipv6_callback)())
|
|
||||||
{
|
|
||||||
char *ptr;
|
|
||||||
struct ifreq *ifr;
|
|
||||||
struct ifconf ifc;
|
|
||||||
int fd, errsav, ret = 0;
|
|
||||||
int lastlen = 0;
|
|
||||||
size_t len = 0;
|
|
||||||
|
|
||||||
if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) == -1)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
while(1)
|
|
||||||
{
|
|
||||||
len += 10*sizeof(struct ifreq);
|
|
||||||
|
|
||||||
if (!expand_buf(&ifconf, len))
|
|
||||||
goto err;
|
|
||||||
|
|
||||||
ifc.ifc_len = len;
|
|
||||||
ifc.ifc_buf = ifconf.iov_base;
|
|
||||||
|
|
||||||
if (ioctl(fd, SIOCGIFCONF, &ifc) == -1)
|
|
||||||
{
|
|
||||||
if (errno != EINVAL || lastlen != 0)
|
|
||||||
goto err;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (ifc.ifc_len == lastlen)
|
|
||||||
break; /* got a big enough buffer now */
|
|
||||||
lastlen = ifc.ifc_len;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (ptr = ifc.ifc_buf; ptr < ifc.ifc_buf + ifc.ifc_len; ptr += len )
|
|
||||||
{
|
|
||||||
/* subsequent entries may not be aligned, so copy into
|
|
||||||
an aligned buffer to avoid nasty complaints about
|
|
||||||
unaligned accesses. */
|
|
||||||
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
||||||
len = ((struct ifreq *)ptr)->ifr_addr.sa_len + IF_NAMESIZE;
|
|
||||||
#else
|
|
||||||
len = sizeof(struct ifreq);
|
|
||||||
#endif
|
#endif
|
||||||
if (!expand_buf(&ifreq, len))
|
|
||||||
goto err;
|
|
||||||
|
|
||||||
ifr = ifreq.iov_base;
|
|
||||||
memcpy(ifr, ptr, len);
|
|
||||||
|
|
||||||
if (ifr->ifr_addr.sa_family == AF_INET && ipv4_callback)
|
|
||||||
{
|
|
||||||
struct in_addr addr, netmask, broadcast;
|
|
||||||
broadcast.s_addr = 0;
|
|
||||||
addr = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr;
|
|
||||||
if (ioctl(fd, SIOCGIFNETMASK, ifr) == -1)
|
|
||||||
continue;
|
|
||||||
netmask = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr;
|
|
||||||
if (ioctl(fd, SIOCGIFBRDADDR, ifr) != -1)
|
|
||||||
broadcast = ((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr;
|
|
||||||
if (!((*ipv4_callback)(daemon, addr,
|
|
||||||
(int)if_nametoindex(ifr->ifr_name),
|
|
||||||
netmask, broadcast,
|
|
||||||
parm)))
|
|
||||||
goto err;
|
|
||||||
}
|
|
||||||
#ifdef HAVE_IPV6
|
|
||||||
else if (ifr->ifr_addr.sa_family == AF_INET6 && ipv6_callback)
|
|
||||||
{
|
|
||||||
struct in6_addr *addr = &((struct sockaddr_in6 *)&ifr->ifr_addr)->sin6_addr;
|
|
||||||
/* voodoo to clear interface field in address */
|
|
||||||
if (!(daemon->options & OPT_NOWILD) && IN6_IS_ADDR_LINKLOCAL(addr))
|
|
||||||
{
|
|
||||||
addr->s6_addr[2] = 0;
|
|
||||||
addr->s6_addr[3] = 0;
|
|
||||||
}
|
|
||||||
if (!((*ipv6_callback)(daemon, addr,
|
|
||||||
(int)((struct sockaddr_in6 *)&ifr->ifr_addr)->sin6_scope_id,
|
|
||||||
(int)if_nametoindex(ifr->ifr_name),
|
|
||||||
parm)))
|
|
||||||
goto err;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = 1;
|
|
||||||
|
|
||||||
err:
|
|
||||||
errsav = errno;
|
|
||||||
close(fd);
|
|
||||||
errno = errsav;
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+127
-95
@@ -2,23 +2,27 @@
|
|||||||
|
|
||||||
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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
static struct crec *cache_head, *cache_tail, **hash_table;
|
static struct crec *cache_head = NULL, *cache_tail = NULL, **hash_table = NULL;
|
||||||
static struct crec *dhcp_spare, *new_chain;
|
static struct crec *dhcp_spare = NULL, *new_chain = NULL;
|
||||||
static int cache_inserted, cache_live_freed, insert_error;
|
static int cache_inserted = 0, cache_live_freed = 0, insert_error;
|
||||||
static union bigname *big_free;
|
static union bigname *big_free = NULL;
|
||||||
static int bignames_left, log_queries, cache_size, hash_size;
|
static int bignames_left, hash_size;
|
||||||
static int uid;
|
static int uid = 0;
|
||||||
static char *addrbuff;
|
static char *addrbuff = NULL;
|
||||||
|
|
||||||
/* type->string mapping: this is also used by the name-hash function as a mixing table. */
|
/* type->string mapping: this is also used by the name-hash function as a mixing table. */
|
||||||
static const struct {
|
static const struct {
|
||||||
@@ -63,32 +67,21 @@ static char *record_source(struct hostsfile *add_hosts, int index);
|
|||||||
static void rehash(int size);
|
static void rehash(int size);
|
||||||
static void cache_hash(struct crec *crecp);
|
static void cache_hash(struct crec *crecp);
|
||||||
|
|
||||||
void cache_init(int size, int logq)
|
void cache_init(void)
|
||||||
{
|
{
|
||||||
struct crec *crecp;
|
struct crec *crecp;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if ((log_queries = logq))
|
if (daemon->options & OPT_LOG)
|
||||||
addrbuff = safe_malloc(ADDRSTRLEN);
|
addrbuff = safe_malloc(ADDRSTRLEN);
|
||||||
else
|
|
||||||
addrbuff = NULL;
|
|
||||||
|
|
||||||
cache_head = cache_tail = NULL;
|
bignames_left = daemon->cachesize/10;
|
||||||
dhcp_spare = NULL;
|
|
||||||
new_chain = NULL;
|
|
||||||
hash_table = NULL;
|
|
||||||
cache_size = size;
|
|
||||||
big_free = NULL;
|
|
||||||
bignames_left = size/10;
|
|
||||||
uid = 0;
|
|
||||||
|
|
||||||
cache_inserted = cache_live_freed = 0;
|
if (daemon->cachesize > 0)
|
||||||
|
|
||||||
if (cache_size > 0)
|
|
||||||
{
|
{
|
||||||
crecp = safe_malloc(size*sizeof(struct crec));
|
crecp = safe_malloc(daemon->cachesize*sizeof(struct crec));
|
||||||
|
|
||||||
for (i=0; i<size; i++, crecp++)
|
for (i=0; i < daemon->cachesize; i++, crecp++)
|
||||||
{
|
{
|
||||||
cache_link(crecp);
|
cache_link(crecp);
|
||||||
crecp->flags = 0;
|
crecp->flags = 0;
|
||||||
@@ -97,7 +90,7 @@ void cache_init(int size, int logq)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* create initial hash table*/
|
/* create initial hash table*/
|
||||||
rehash(cache_size);
|
rehash(daemon->cachesize);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* In most cases, we create the hash table once here by calling this with (hash_table == NULL)
|
/* In most cases, we create the hash table once here by calling this with (hash_table == NULL)
|
||||||
@@ -115,7 +108,7 @@ static void rehash(int size)
|
|||||||
/* must succeed in getting first instance, failure later is non-fatal */
|
/* must succeed in getting first instance, failure later is non-fatal */
|
||||||
if (!hash_table)
|
if (!hash_table)
|
||||||
new = safe_malloc(new_size * sizeof(struct crec *));
|
new = safe_malloc(new_size * sizeof(struct crec *));
|
||||||
else if (new_size <= hash_size || !(new = malloc(new_size * sizeof(struct crec *))))
|
else if (new_size <= hash_size || !(new = whine_malloc(new_size * sizeof(struct crec *))))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for(i = 0; i < new_size; i++)
|
for(i = 0; i < new_size; i++)
|
||||||
@@ -238,15 +231,10 @@ char *cache_get_name(struct crec *crecp)
|
|||||||
|
|
||||||
static int is_outdated_cname_pointer(struct crec *crecp)
|
static int is_outdated_cname_pointer(struct crec *crecp)
|
||||||
{
|
{
|
||||||
struct crec *target = crecp->addr.cname.cache;
|
|
||||||
|
|
||||||
if (!(crecp->flags & F_CNAME))
|
if (!(crecp->flags & F_CNAME))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!target)
|
if (crecp->addr.cname.cache && crecp->addr.cname.uid == crecp->addr.cname.cache->uid)
|
||||||
return 1;
|
|
||||||
|
|
||||||
if (crecp->addr.cname.uid == target->uid)
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
@@ -368,21 +356,12 @@ void cache_start_insert(void)
|
|||||||
struct crec *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
|
|
||||||
int addrlen = (flags & F_IPV6) ? IN6ADDRSZ : INADDRSZ;
|
|
||||||
#else
|
|
||||||
int addrlen = INADDRSZ;
|
|
||||||
#endif
|
|
||||||
struct crec *new;
|
struct crec *new;
|
||||||
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, 0, NULL, 0);
|
log_query(flags | F_UPSTREAM, name, addr, 0, NULL, 0);
|
||||||
|
|
||||||
/* name is needed as workspace by log_query in this case */
|
|
||||||
if ((flags & F_NEG) && (flags & F_REVERSE))
|
|
||||||
name = NULL;
|
|
||||||
|
|
||||||
/* CONFIG bit no needed except for logging */
|
/* CONFIG bit no needed except for logging */
|
||||||
flags &= ~F_CONFIG;
|
flags &= ~F_CONFIG;
|
||||||
|
|
||||||
@@ -436,7 +415,7 @@ struct crec *cache_insert(char *name, struct all_addr *addr,
|
|||||||
big_free = big_free->next;
|
big_free = big_free->next;
|
||||||
}
|
}
|
||||||
else if (!bignames_left ||
|
else if (!bignames_left ||
|
||||||
!(big_name = (union bigname *)malloc(sizeof(union bigname))))
|
!(big_name = (union bigname *)whine_malloc(sizeof(union bigname))))
|
||||||
{
|
{
|
||||||
insert_error = 1;
|
insert_error = 1;
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -457,12 +436,14 @@ struct crec *cache_insert(char *name, struct all_addr *addr,
|
|||||||
new->name.bname = big_name;
|
new->name.bname = big_name;
|
||||||
new->flags |= F_BIGNAME;
|
new->flags |= F_BIGNAME;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (name)
|
if (name)
|
||||||
strcpy(cache_get_name(new), name);
|
strcpy(cache_get_name(new), name);
|
||||||
else
|
else
|
||||||
*cache_get_name(new) = 0;
|
*cache_get_name(new) = 0;
|
||||||
|
|
||||||
if (addr)
|
if (addr)
|
||||||
memcpy(&new->addr.addr, addr, addrlen);
|
new->addr.addr = *addr;
|
||||||
else
|
else
|
||||||
new->addr.cname.cache = NULL;
|
new->addr.cname.cache = NULL;
|
||||||
|
|
||||||
@@ -507,6 +488,7 @@ struct crec *cache_find_by_name(struct crec *crecp, char *name, time_t now, unsi
|
|||||||
/* first search, look for relevant entries and push to top of list
|
/* first search, look for relevant entries and push to top of list
|
||||||
also free anything which has expired */
|
also free anything which has expired */
|
||||||
struct crec *next, **up, **insert = NULL, **chainp = &ans;
|
struct crec *next, **up, **insert = NULL, **chainp = &ans;
|
||||||
|
int ins_flags = 0;
|
||||||
|
|
||||||
for (up = hash_bucket(name), crecp = *up; crecp; crecp = next)
|
for (up = hash_bucket(name), crecp = *up; crecp; crecp = next)
|
||||||
{
|
{
|
||||||
@@ -529,14 +511,18 @@ struct crec *cache_find_by_name(struct crec *crecp, char *name, time_t now, unsi
|
|||||||
cache_link(crecp);
|
cache_link(crecp);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* move all but the first entry up the hash chain
|
/* Move all but the first entry up the hash chain
|
||||||
this implements round-robin */
|
this implements round-robin.
|
||||||
|
Make sure that re-ordering doesn't break the hash-chain
|
||||||
|
order invariants.
|
||||||
|
*/
|
||||||
if (!insert)
|
if (!insert)
|
||||||
{
|
{
|
||||||
insert = up;
|
insert = up;
|
||||||
|
ins_flags = crecp->flags & (F_REVERSE | F_IMMORTAL);
|
||||||
up = &crecp->hash_next;
|
up = &crecp->hash_next;
|
||||||
}
|
}
|
||||||
else
|
else if ((crecp->flags & (F_REVERSE | F_IMMORTAL)) == ins_flags)
|
||||||
{
|
{
|
||||||
*up = crecp->hash_next;
|
*up = crecp->hash_next;
|
||||||
crecp->hash_next = *insert;
|
crecp->hash_next = *insert;
|
||||||
@@ -754,7 +740,7 @@ static int read_hostsfile(char *filename, int opts, char *buff, char *domain_suf
|
|||||||
{
|
{
|
||||||
/* If set, add a version of the name with a default domain appended */
|
/* If set, add a version of the name with a default domain appended */
|
||||||
if ((opts & OPT_EXPAND) && domain_suffix && !fqdn &&
|
if ((opts & OPT_EXPAND) && domain_suffix && !fqdn &&
|
||||||
(cache = malloc(sizeof(struct crec) +
|
(cache = whine_malloc(sizeof(struct crec) +
|
||||||
strlen(token)+2+strlen(domain_suffix)-SMALLDNAME)))
|
strlen(token)+2+strlen(domain_suffix)-SMALLDNAME)))
|
||||||
{
|
{
|
||||||
strcpy(cache->name.sname, token);
|
strcpy(cache->name.sname, token);
|
||||||
@@ -764,7 +750,7 @@ static int read_hostsfile(char *filename, int opts, char *buff, char *domain_suf
|
|||||||
addr_dup = 1;
|
addr_dup = 1;
|
||||||
name_count++;
|
name_count++;
|
||||||
}
|
}
|
||||||
if ((cache = malloc(sizeof(struct crec) + strlen(token)+1-SMALLDNAME)))
|
if ((cache = whine_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, index, addr_dup);
|
add_hosts_entry(cache, &addr, addrlen, flags, index, addr_dup);
|
||||||
@@ -787,7 +773,7 @@ static int read_hostsfile(char *filename, int opts, char *buff, char *domain_suf
|
|||||||
void cache_reload(int opts, char *buff, char *domain_suffix, struct hostsfile *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, total_size = cache_size;
|
int i, total_size = daemon->cachesize;
|
||||||
|
|
||||||
cache_inserted = cache_live_freed = 0;
|
cache_inserted = cache_live_freed = 0;
|
||||||
|
|
||||||
@@ -816,7 +802,7 @@ void cache_reload(int opts, char *buff, char *domain_suffix, struct hostsfile *a
|
|||||||
|
|
||||||
if ((opts & OPT_NO_HOSTS) && !addn_hosts)
|
if ((opts & OPT_NO_HOSTS) && !addn_hosts)
|
||||||
{
|
{
|
||||||
if (cache_size > 0)
|
if (daemon->cachesize > 0)
|
||||||
my_syslog(LOG_INFO, _("cleared cache"));
|
my_syslog(LOG_INFO, _("cleared cache"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -847,17 +833,19 @@ void cache_unhash_dhcp(void)
|
|||||||
up = &cache->hash_next;
|
up = &cache->hash_next;
|
||||||
}
|
}
|
||||||
|
|
||||||
void cache_add_dhcp_entry(struct daemon *daemon, char *host_name,
|
void cache_add_dhcp_entry(char *host_name,
|
||||||
struct in_addr *host_address, time_t ttd)
|
struct in_addr *host_address, time_t ttd)
|
||||||
{
|
{
|
||||||
struct crec *crec;
|
struct crec *crec = NULL;
|
||||||
unsigned short flags = F_DHCP | F_FORWARD | F_IPV4 | F_REVERSE;
|
unsigned short flags = F_DHCP | F_FORWARD | F_IPV4 | F_REVERSE;
|
||||||
|
int in_hosts = 0;
|
||||||
|
|
||||||
if (!host_name)
|
if (!host_name)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if ((crec = cache_find_by_name(NULL, host_name, 0, F_IPV4 | F_CNAME)))
|
while ((crec = cache_find_by_name(crec, host_name, 0, F_IPV4 | F_CNAME)))
|
||||||
{
|
{
|
||||||
|
/* check all addresses associated with name */
|
||||||
if (crec->flags & F_HOSTS)
|
if (crec->flags & F_HOSTS)
|
||||||
{
|
{
|
||||||
if (crec->addr.addr.addr.addr4.s_addr != host_address->s_addr)
|
if (crec->addr.addr.addr.addr4.s_addr != host_address->s_addr)
|
||||||
@@ -868,12 +856,22 @@ void cache_add_dhcp_entry(struct daemon *daemon, char *host_name,
|
|||||||
"the name exists in %s with address %s"),
|
"the name exists in %s with address %s"),
|
||||||
host_name, inet_ntoa(*host_address),
|
host_name, inet_ntoa(*host_address),
|
||||||
record_source(daemon->addn_hosts, crec->uid), daemon->namebuff);
|
record_source(daemon->addn_hosts, crec->uid), daemon->namebuff);
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (!(crec->flags & F_DHCP))
|
else
|
||||||
cache_scan_free(host_name, NULL, 0, crec->flags & (F_IPV4 | F_CNAME | F_FORWARD));
|
/* if in hosts, don't need DHCP record */
|
||||||
|
in_hosts = 1;
|
||||||
}
|
}
|
||||||
|
else if (!(crec->flags & F_DHCP))
|
||||||
|
{
|
||||||
|
cache_scan_free(host_name, NULL, 0, crec->flags & (F_IPV4 | F_CNAME | F_FORWARD));
|
||||||
|
/* scan_free deletes all addresses associated with name */
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (in_hosts)
|
||||||
|
return;
|
||||||
|
|
||||||
if ((crec = cache_find_by_addr(NULL, (struct all_addr *)host_address, 0, F_IPV4)))
|
if ((crec = cache_find_by_addr(NULL, (struct all_addr *)host_address, 0, F_IPV4)))
|
||||||
{
|
{
|
||||||
@@ -887,7 +885,7 @@ void cache_add_dhcp_entry(struct daemon *daemon, char *host_name,
|
|||||||
if ((crec = dhcp_spare))
|
if ((crec = dhcp_spare))
|
||||||
dhcp_spare = dhcp_spare->next;
|
dhcp_spare = dhcp_spare->next;
|
||||||
else /* need new one */
|
else /* need new one */
|
||||||
crec = malloc(sizeof(struct crec));
|
crec = whine_malloc(sizeof(struct crec));
|
||||||
|
|
||||||
if (crec) /* malloc may fail */
|
if (crec) /* malloc may fail */
|
||||||
{
|
{
|
||||||
@@ -902,13 +900,40 @@ void cache_add_dhcp_entry(struct daemon *daemon, char *host_name,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void dump_cache(struct daemon *daemon, time_t now)
|
void dump_cache(time_t now)
|
||||||
{
|
{
|
||||||
my_syslog(LOG_INFO, _("time %lu, cache size %d, %d/%d cache insertions re-used unexpired cache entries."),
|
struct server *serv, *serv1;
|
||||||
(unsigned long)now, daemon->cachesize, cache_live_freed, cache_inserted);
|
|
||||||
|
|
||||||
if ((daemon->options & (OPT_DEBUG | OPT_LOG)) &&
|
my_syslog(LOG_INFO, _("time %lu"), (unsigned long)now);
|
||||||
(addrbuff || (addrbuff = malloc(ADDRSTRLEN))))
|
my_syslog(LOG_INFO, _("cache size %d, %d/%d cache insertions re-used unexpired cache entries."),
|
||||||
|
daemon->cachesize, cache_live_freed, cache_inserted);
|
||||||
|
my_syslog(LOG_INFO, _("queries forwarded %u, queries answered locally %u"),
|
||||||
|
daemon->queries_forwarded, daemon->local_answer);
|
||||||
|
|
||||||
|
if (!addrbuff && !(addrbuff = whine_malloc(ADDRSTRLEN)))
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* sum counts from different records for same server */
|
||||||
|
for (serv = daemon->servers; serv; serv = serv->next)
|
||||||
|
serv->flags &= ~SERV_COUNTED;
|
||||||
|
|
||||||
|
for (serv = daemon->servers; serv; serv = serv->next)
|
||||||
|
if (!(serv->flags & (SERV_NO_ADDR | SERV_LITERAL_ADDRESS | SERV_COUNTED)))
|
||||||
|
{
|
||||||
|
int port;
|
||||||
|
unsigned int queries = 0, failed_queries = 0;
|
||||||
|
for (serv1 = serv; serv1; serv1 = serv1->next)
|
||||||
|
if (!(serv1->flags & (SERV_NO_ADDR | SERV_LITERAL_ADDRESS | SERV_COUNTED)) && sockaddr_isequal(&serv->addr, &serv1->addr))
|
||||||
|
{
|
||||||
|
serv1->flags |= SERV_COUNTED;
|
||||||
|
queries += serv1->queries;
|
||||||
|
failed_queries += serv1->failed_queries;
|
||||||
|
}
|
||||||
|
port = prettyprint_addr(&serv->addr, addrbuff);
|
||||||
|
my_syslog(LOG_INFO, _("server %s#%d: queries sent %u, retried or failed %u"), addrbuff, port, queries, failed_queries);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((daemon->options & (OPT_DEBUG | OPT_LOG)))
|
||||||
{
|
{
|
||||||
struct crec *cache ;
|
struct crec *cache ;
|
||||||
int i;
|
int i;
|
||||||
@@ -982,54 +1007,64 @@ static char *record_source(struct hostsfile *addn_hosts, int index)
|
|||||||
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)
|
unsigned short type, struct hostsfile *addn_hosts, int index)
|
||||||
{
|
{
|
||||||
char *source;
|
char *source, *dest = addrbuff;
|
||||||
char *verb = "is";
|
char *verb = "is";
|
||||||
char types[20];
|
char types[20];
|
||||||
|
|
||||||
if (!log_queries)
|
if (!(daemon->options & OPT_LOG))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (addr)
|
||||||
|
{
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
inet_ntop(flags & F_IPV4 ? AF_INET : AF_INET6,
|
||||||
|
addr, addrbuff, ADDRSTRLEN);
|
||||||
|
#else
|
||||||
|
strncpy(addrbuff, inet_ntoa(addr->addr.addr4), ADDRSTRLEN);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
if (flags & F_REVERSE)
|
||||||
|
{
|
||||||
|
dest = name;
|
||||||
|
name = addrbuff;
|
||||||
|
}
|
||||||
|
|
||||||
if (flags & F_NEG)
|
if (flags & F_NEG)
|
||||||
{
|
{
|
||||||
if (flags & F_REVERSE)
|
|
||||||
#ifdef HAVE_IPV6
|
|
||||||
inet_ntop(flags & F_IPV4 ? AF_INET : AF_INET6,
|
|
||||||
addr, name, MAXDNAME);
|
|
||||||
#else
|
|
||||||
strcpy(name, inet_ntoa(addr->addr.addr4));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (flags & F_NXDOMAIN)
|
if (flags & F_NXDOMAIN)
|
||||||
strcpy(addrbuff, "<NXDOMAIN>");
|
{
|
||||||
else
|
|
||||||
strcpy(addrbuff, "<NODATA>");
|
|
||||||
|
|
||||||
if (flags & F_IPV4)
|
if (flags & F_IPV4)
|
||||||
strcat(addrbuff, "-IPv4");
|
dest = "NXDOMAIN-IPv4";
|
||||||
else if (flags & F_IPV6)
|
else if (flags & F_IPV6)
|
||||||
strcat(addrbuff, "-IPv6");
|
dest = "NXDOMAIN-IPv6";
|
||||||
|
else
|
||||||
|
dest = "NXDOMAIN";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (flags & F_IPV4)
|
||||||
|
dest = "NODATA-IPv4";
|
||||||
|
else if (flags & F_IPV6)
|
||||||
|
dest = "NODATA-IPv6";
|
||||||
|
else
|
||||||
|
dest = "NODATA";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (flags & F_CNAME)
|
else if (flags & F_CNAME)
|
||||||
{
|
{
|
||||||
/* nasty abuse of IPV4 and IPV6 flags */
|
/* nasty abuse of IPV4 and IPV6 flags */
|
||||||
if (flags & F_IPV4)
|
if (flags & F_IPV4)
|
||||||
strcpy(addrbuff, "<MX>");
|
dest = "<MX>";
|
||||||
else if (flags & F_IPV6)
|
else if (flags & F_IPV6)
|
||||||
strcpy(addrbuff, "<SRV>");
|
dest = "<SRV>";
|
||||||
else if (flags & F_NXDOMAIN)
|
else if (flags & F_NXDOMAIN)
|
||||||
strcpy(addrbuff, "<TXT>");
|
dest = "<TXT>";
|
||||||
else if (flags & F_BIGNAME)
|
else if (flags & F_BIGNAME)
|
||||||
strcpy(addrbuff, "<PTR>");
|
dest = "<PTR>";
|
||||||
else
|
else
|
||||||
strcpy(addrbuff, "<CNAME>");
|
dest = "<CNAME>";
|
||||||
}
|
}
|
||||||
else
|
|
||||||
#ifdef HAVE_IPV6
|
|
||||||
inet_ntop(flags & F_IPV4 ? AF_INET : AF_INET6,
|
|
||||||
addr, addrbuff, ADDRSTRLEN);
|
|
||||||
#else
|
|
||||||
strcpy(addrbuff, inet_ntoa(addr->addr.addr4));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (flags & F_DHCP)
|
if (flags & F_DHCP)
|
||||||
source = "DHCP";
|
source = "DHCP";
|
||||||
@@ -1064,9 +1099,6 @@ void log_query(unsigned short flags, char *name, struct all_addr *addr,
|
|||||||
if (strlen(name) == 0)
|
if (strlen(name) == 0)
|
||||||
name = ".";
|
name = ".";
|
||||||
|
|
||||||
if ((flags & F_FORWARD) | (flags & F_NEG))
|
my_syslog(LOG_DEBUG, "%s %s %s %s", source, name, verb, dest);
|
||||||
my_syslog(LOG_DEBUG, "%s %s %s %s", source, name, verb, addrbuff);
|
|
||||||
else if (flags & F_REVERSE)
|
|
||||||
my_syslog(LOG_DEBUG, "%s %s is %s", source, addrbuff, name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
+49
-12
@@ -2,15 +2,19 @@
|
|||||||
|
|
||||||
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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define VERSION "2.39"
|
#define VERSION "2.41"
|
||||||
|
|
||||||
#define FTABSIZ 150 /* max number of outstanding requests (default) */
|
#define FTABSIZ 150 /* max number of outstanding requests (default) */
|
||||||
#define MAX_PROCS 20 /* max no children for TCP requests */
|
#define MAX_PROCS 20 /* max no children for TCP requests */
|
||||||
@@ -35,6 +39,8 @@
|
|||||||
#define RUNFILE "/var/run/dnsmasq.pid"
|
#define RUNFILE "/var/run/dnsmasq.pid"
|
||||||
#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
|
#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
|
||||||
# define LEASEFILE "/var/db/dnsmasq.leases"
|
# define LEASEFILE "/var/db/dnsmasq.leases"
|
||||||
|
#elif defined(__sun__)
|
||||||
|
# define LEASEFILE "/var/cache/dnsmasq.leases"
|
||||||
#else
|
#else
|
||||||
# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
|
# define LEASEFILE "/var/lib/misc/dnsmasq.leases"
|
||||||
#endif
|
#endif
|
||||||
@@ -91,10 +97,12 @@
|
|||||||
May replace this with Autoconf one day.
|
May replace this with Autoconf one day.
|
||||||
|
|
||||||
HAVE_LINUX_NETWORK
|
HAVE_LINUX_NETWORK
|
||||||
define this to do networking the Linux way. When it's defined, the code will
|
HAVE_BSD_NETWORK
|
||||||
use IP_PKTINFO, Linux capabilities and the RTnetlink system. If it's not defined,
|
HAVE_SOLARIS_NETWORK
|
||||||
a few facilities will be lost, namely support for multiple addresses on an interface,
|
define exactly one of these to alter interaction with kernel networking.
|
||||||
DNS query retransmission, and (on some systems) wildcard interface binding.
|
|
||||||
|
HAVE_SOLARIS_PRIVS
|
||||||
|
define for Solaris > 10 which can split privileges.
|
||||||
|
|
||||||
HAVE_BROKEN_RTC
|
HAVE_BROKEN_RTC
|
||||||
define this on embedded systems which don't have an RTC
|
define this on embedded systems which don't have an RTC
|
||||||
@@ -157,10 +165,9 @@ NOTES:
|
|||||||
HAVE_SOCKADDR_SA_LEN
|
HAVE_SOCKADDR_SA_LEN
|
||||||
|
|
||||||
For *BSD systems you should define
|
For *BSD systems you should define
|
||||||
|
HAVE_BSD_NETWORK
|
||||||
HAVE_SOCKADDR_SA_LEN
|
HAVE_SOCKADDR_SA_LEN
|
||||||
HAVE_RANDOM
|
HAVE_RANDOM
|
||||||
you should NOT define
|
|
||||||
HAVE_LINUX_NETWORK
|
|
||||||
and you MAY define
|
and you MAY define
|
||||||
HAVE_ARC4RANDOM - OpenBSD and FreeBSD and NetBSD version 2.0 or later
|
HAVE_ARC4RANDOM - OpenBSD and FreeBSD and NetBSD version 2.0 or later
|
||||||
HAVE_DEV_URANDOM - OpenBSD and FreeBSD and NetBSD
|
HAVE_DEV_URANDOM - OpenBSD and FreeBSD and NetBSD
|
||||||
@@ -199,7 +206,8 @@ NOTES:
|
|||||||
#undef HAVE_SOCKADDR_SA_LEN
|
#undef HAVE_SOCKADDR_SA_LEN
|
||||||
/* Never use fork() on uClinux. Note that this is subtly different from the
|
/* Never use fork() on uClinux. Note that this is subtly different from the
|
||||||
--keep-in-foreground option, since it also suppresses forking new
|
--keep-in-foreground option, since it also suppresses forking new
|
||||||
processes for TCP connections. It's intended for use on MMU-less kernels. */
|
processes for TCP connections and disables the call-a-script on leasechange
|
||||||
|
system. It's intended for use on MMU-less kernels. */
|
||||||
#define NO_FORK
|
#define NO_FORK
|
||||||
|
|
||||||
#elif defined(__UCLIBC__)
|
#elif defined(__UCLIBC__)
|
||||||
@@ -242,7 +250,7 @@ typedef unsigned long in_addr_t;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
|
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
|
||||||
#undef HAVE_LINUX_NETWORK
|
#define HAVE_BSD_NETWORK
|
||||||
/* Later verions of FreeBSD have getopt_long() */
|
/* Later verions of FreeBSD have getopt_long() */
|
||||||
#if defined(optional_argument) && defined(required_argument)
|
#if defined(optional_argument) && defined(required_argument)
|
||||||
# define HAVE_GETOPT_LONG
|
# define HAVE_GETOPT_LONG
|
||||||
@@ -255,7 +263,7 @@ typedef unsigned long in_addr_t;
|
|||||||
#define HAVE_SOCKADDR_SA_LEN
|
#define HAVE_SOCKADDR_SA_LEN
|
||||||
|
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
#undef HAVE_LINUX_NETWORK
|
#define HAVE_BSD_NETWORK
|
||||||
#undef HAVE_GETOPT_LONG
|
#undef HAVE_GETOPT_LONG
|
||||||
#define HAVE_ARC4RANDOM
|
#define HAVE_ARC4RANDOM
|
||||||
#define HAVE_RANDOM
|
#define HAVE_RANDOM
|
||||||
@@ -267,7 +275,7 @@ typedef unsigned long in_addr_t;
|
|||||||
#define IN6ADDRSZ 16
|
#define IN6ADDRSZ 16
|
||||||
|
|
||||||
#elif defined(__NetBSD__)
|
#elif defined(__NetBSD__)
|
||||||
#undef HAVE_LINUX_NETWORK
|
#define HAVE_BSD_NETWORK
|
||||||
#define HAVE_GETOPT_LONG
|
#define HAVE_GETOPT_LONG
|
||||||
#undef HAVE_ARC4RANDOM
|
#undef HAVE_ARC4RANDOM
|
||||||
#define HAVE_RANDOM
|
#define HAVE_RANDOM
|
||||||
@@ -275,7 +283,36 @@ typedef unsigned long in_addr_t;
|
|||||||
#define HAVE_DEV_RANDOM
|
#define HAVE_DEV_RANDOM
|
||||||
#define HAVE_SOCKADDR_SA_LEN
|
#define HAVE_SOCKADDR_SA_LEN
|
||||||
|
|
||||||
|
#elif defined(__sun) || defined(__sun__)
|
||||||
|
#define HAVE_SOLARIS_NETWORK
|
||||||
|
/* only Solaris 10 does split privs. */
|
||||||
|
#if (SUNOS_VER >= 10)
|
||||||
|
# define HAVE_SOLARIS_PRIVS
|
||||||
|
# define HAVE_GETOPT_LONG
|
||||||
#endif
|
#endif
|
||||||
|
/* some CMSG stuff missing on early solaris */
|
||||||
|
#ifndef OSSH_ALIGNBYTES
|
||||||
|
# define OSSH_ALIGNBYTES (sizeof(int) - 1)
|
||||||
|
#endif
|
||||||
|
#ifndef __CMSG_ALIGN
|
||||||
|
# define __CMSG_ALIGN(p) (((u_int)(p) + OSSH_ALIGNBYTES) &~ OSSH_ALIGNBYTES)
|
||||||
|
#endif
|
||||||
|
#ifndef CMSG_LEN
|
||||||
|
# define CMSG_LEN(len) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
|
||||||
|
#endif
|
||||||
|
#ifndef CMSG_SPACE
|
||||||
|
# define CMSG_SPACE(len) (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(len))
|
||||||
|
#endif
|
||||||
|
#undef HAVE_ARC4RANDOM
|
||||||
|
#define HAVE_RANDOM
|
||||||
|
#undef HAVE_DEV_URANDOM
|
||||||
|
#undef HAVE_DEV_RANDOM
|
||||||
|
#undef HAVE_SOCKADDR_SA_LEN
|
||||||
|
#define _XPG4_2
|
||||||
|
#define __EXTENSIONS__
|
||||||
|
#define ETHER_ADDR_LEN 6
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Decide if we're going to support IPv6 */
|
/* Decide if we're going to support IPv6 */
|
||||||
/* IPv6 can be forced off with "make COPTS=-DNO_IPV6" */
|
/* IPv6 can be forced off with "make COPTS=-DNO_IPV6" */
|
||||||
/* We assume that systems which don't have IPv6
|
/* We assume that systems which don't have IPv6
|
||||||
|
|||||||
+34
-23
@@ -1,13 +1,17 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2005 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -25,28 +29,25 @@ struct watch {
|
|||||||
|
|
||||||
static dbus_bool_t add_watch(DBusWatch *watch, void *data)
|
static dbus_bool_t add_watch(DBusWatch *watch, void *data)
|
||||||
{
|
{
|
||||||
struct daemon *daemon = data;
|
|
||||||
struct watch *w;
|
struct watch *w;
|
||||||
|
|
||||||
for (w = daemon->watches; w; w = w->next)
|
for (w = daemon->watches; w; w = w->next)
|
||||||
if (w->watch == watch)
|
if (w->watch == watch)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
if (!(w = malloc(sizeof(struct watch))))
|
if (!(w = whine_malloc(sizeof(struct watch))))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
w->watch = watch;
|
w->watch = watch;
|
||||||
w->next = daemon->watches;
|
w->next = daemon->watches;
|
||||||
daemon->watches = w;
|
daemon->watches = w;
|
||||||
|
|
||||||
dbus_watch_set_data (watch, (void *)daemon, NULL);
|
w = data; /* no warning */
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void remove_watch(DBusWatch *watch, void *data)
|
static void remove_watch(DBusWatch *watch, void *data)
|
||||||
{
|
{
|
||||||
struct daemon *daemon = data;
|
|
||||||
struct watch **up, *w;
|
struct watch **up, *w;
|
||||||
|
|
||||||
for (up = &(daemon->watches), w = daemon->watches; w; w = w->next)
|
for (up = &(daemon->watches), w = daemon->watches; w; w = w->next)
|
||||||
@@ -57,9 +58,11 @@ static void remove_watch(DBusWatch *watch, void *data)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
up = &(w->next);
|
up = &(w->next);
|
||||||
|
|
||||||
|
w = data; /* no warning */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dbus_read_servers(struct daemon *daemon, DBusMessage *message)
|
static void dbus_read_servers(DBusMessage *message)
|
||||||
{
|
{
|
||||||
struct server *serv, *tmp, **up;
|
struct server *serv, *tmp, **up;
|
||||||
DBusMessageIter iter;
|
DBusMessageIter iter;
|
||||||
@@ -113,9 +116,9 @@ static void dbus_read_servers(struct daemon *daemon, DBusMessage *message)
|
|||||||
#else
|
#else
|
||||||
if (i == sizeof(struct in6_addr)-1)
|
if (i == sizeof(struct in6_addr)-1)
|
||||||
{
|
{
|
||||||
memcpy(&addr.in6.sin6_addr, p, sizeof(addr.in6));
|
memcpy(&addr.in6.sin6_addr, p, sizeof(struct in6_addr));
|
||||||
#ifdef HAVE_SOCKADDR_SA_LEN
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
||||||
source_addr.in6.sin6_len = addr.in6.sin6_len = sizeof(addr.in6);
|
source_addr.in6.sin6_len = addr.in6.sin6_len = sizeof(stuct sockaddr_in6);
|
||||||
#endif
|
#endif
|
||||||
source_addr.in6.sin6_family = addr.in6.sin6_family = AF_INET6;
|
source_addr.in6.sin6_family = addr.in6.sin6_family = AF_INET6;
|
||||||
addr.in6.sin6_port = htons(NAMESERVER_PORT);
|
addr.in6.sin6_port = htons(NAMESERVER_PORT);
|
||||||
@@ -161,11 +164,11 @@ static void dbus_read_servers(struct daemon *daemon, DBusMessage *message)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!serv && (serv = malloc(sizeof (struct server))))
|
if (!serv && (serv = whine_malloc(sizeof (struct server))))
|
||||||
{
|
{
|
||||||
/* Not found, create a new one. */
|
/* Not found, create a new one. */
|
||||||
if (domain)
|
if (domain)
|
||||||
serv->domain = malloc(strlen(domain)+1);
|
serv->domain = whine_malloc(strlen(domain)+1);
|
||||||
if (domain && !serv->domain)
|
if (domain && !serv->domain)
|
||||||
{
|
{
|
||||||
free(serv);
|
free(serv);
|
||||||
@@ -208,7 +211,7 @@ static void dbus_read_servers(struct daemon *daemon, DBusMessage *message)
|
|||||||
tmp = serv->next;
|
tmp = serv->next;
|
||||||
if (serv->flags & SERV_MARK)
|
if (serv->flags & SERV_MARK)
|
||||||
{
|
{
|
||||||
server_gone(daemon, serv);
|
server_gone(serv);
|
||||||
*up = serv->next;
|
*up = serv->next;
|
||||||
free(serv);
|
free(serv);
|
||||||
}
|
}
|
||||||
@@ -223,7 +226,6 @@ DBusHandlerResult message_handler(DBusConnection *connection,
|
|||||||
void *user_data)
|
void *user_data)
|
||||||
{
|
{
|
||||||
char *method = (char *)dbus_message_get_member(message);
|
char *method = (char *)dbus_message_get_member(message);
|
||||||
struct daemon *daemon = (struct daemon *)user_data;
|
|
||||||
|
|
||||||
if (strcmp(method, "GetVersion") == 0)
|
if (strcmp(method, "GetVersion") == 0)
|
||||||
{
|
{
|
||||||
@@ -237,21 +239,23 @@ DBusHandlerResult message_handler(DBusConnection *connection,
|
|||||||
else if (strcmp(method, "SetServers") == 0)
|
else if (strcmp(method, "SetServers") == 0)
|
||||||
{
|
{
|
||||||
my_syslog(LOG_INFO, _("setting upstream servers from DBus"));
|
my_syslog(LOG_INFO, _("setting upstream servers from DBus"));
|
||||||
dbus_read_servers(daemon, message);
|
dbus_read_servers(message);
|
||||||
check_servers(daemon);
|
check_servers();
|
||||||
}
|
}
|
||||||
else if (strcmp(method, "ClearCache") == 0)
|
else if (strcmp(method, "ClearCache") == 0)
|
||||||
clear_cache_and_reload(daemon, dnsmasq_time());
|
clear_cache_and_reload(dnsmasq_time());
|
||||||
else
|
else
|
||||||
return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
|
return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
|
||||||
|
|
||||||
|
method = user_data; /* no warning */
|
||||||
|
|
||||||
return (DBUS_HANDLER_RESULT_HANDLED);
|
return (DBUS_HANDLER_RESULT_HANDLED);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* returns NULL or error message, may fail silently if dbus daemon not yet up. */
|
/* returns NULL or error message, may fail silently if dbus daemon not yet up. */
|
||||||
char *dbus_init(struct daemon *daemon)
|
char *dbus_init(void)
|
||||||
{
|
{
|
||||||
DBusConnection *connection = NULL;
|
DBusConnection *connection = NULL;
|
||||||
DBusObjectPathVTable dnsmasq_vtable = {NULL, &message_handler, NULL, NULL, NULL, NULL };
|
DBusObjectPathVTable dnsmasq_vtable = {NULL, &message_handler, NULL, NULL, NULL, NULL };
|
||||||
@@ -264,14 +268,14 @@ char *dbus_init(struct daemon *daemon)
|
|||||||
|
|
||||||
dbus_connection_set_exit_on_disconnect(connection, FALSE);
|
dbus_connection_set_exit_on_disconnect(connection, FALSE);
|
||||||
dbus_connection_set_watch_functions(connection, add_watch, remove_watch,
|
dbus_connection_set_watch_functions(connection, add_watch, remove_watch,
|
||||||
NULL, (void *)daemon, NULL);
|
NULL, NULL, NULL);
|
||||||
dbus_error_init (&dbus_error);
|
dbus_error_init (&dbus_error);
|
||||||
dbus_bus_request_name (connection, DNSMASQ_SERVICE, 0, &dbus_error);
|
dbus_bus_request_name (connection, DNSMASQ_SERVICE, 0, &dbus_error);
|
||||||
if (dbus_error_is_set (&dbus_error))
|
if (dbus_error_is_set (&dbus_error))
|
||||||
return (char *)dbus_error.message;
|
return (char *)dbus_error.message;
|
||||||
|
|
||||||
if (!dbus_connection_register_object_path(connection, DNSMASQ_PATH,
|
if (!dbus_connection_register_object_path(connection, DNSMASQ_PATH,
|
||||||
&dnsmasq_vtable, daemon))
|
&dnsmasq_vtable, NULL))
|
||||||
return _("could not register a DBus message handler");
|
return _("could not register a DBus message handler");
|
||||||
|
|
||||||
daemon->dbus = connection;
|
daemon->dbus = connection;
|
||||||
@@ -283,7 +287,7 @@ char *dbus_init(struct daemon *daemon)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void set_dbus_listeners(struct daemon *daemon, int *maxfdp,
|
void set_dbus_listeners(int *maxfdp,
|
||||||
fd_set *rset, fd_set *wset, fd_set *eset)
|
fd_set *rset, fd_set *wset, fd_set *eset)
|
||||||
{
|
{
|
||||||
struct watch *w;
|
struct watch *w;
|
||||||
@@ -292,7 +296,11 @@ void set_dbus_listeners(struct daemon *daemon, int *maxfdp,
|
|||||||
if (dbus_watch_get_enabled(w->watch))
|
if (dbus_watch_get_enabled(w->watch))
|
||||||
{
|
{
|
||||||
unsigned int flags = dbus_watch_get_flags(w->watch);
|
unsigned int flags = dbus_watch_get_flags(w->watch);
|
||||||
|
#if (DBUS_MINOR > 0)
|
||||||
|
int fd = dbus_watch_get_unix_fd(w->watch);
|
||||||
|
#else
|
||||||
int fd = dbus_watch_get_fd(w->watch);
|
int fd = dbus_watch_get_fd(w->watch);
|
||||||
|
#endif
|
||||||
|
|
||||||
bump_maxfd(fd, maxfdp);
|
bump_maxfd(fd, maxfdp);
|
||||||
|
|
||||||
@@ -306,8 +314,7 @@ void set_dbus_listeners(struct daemon *daemon, int *maxfdp,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void check_dbus_listeners(struct daemon *daemon,
|
void check_dbus_listeners(fd_set *rset, fd_set *wset, fd_set *eset)
|
||||||
fd_set *rset, fd_set *wset, fd_set *eset)
|
|
||||||
{
|
{
|
||||||
DBusConnection *connection = (DBusConnection *)daemon->dbus;
|
DBusConnection *connection = (DBusConnection *)daemon->dbus;
|
||||||
struct watch *w;
|
struct watch *w;
|
||||||
@@ -316,7 +323,11 @@ void check_dbus_listeners(struct daemon *daemon,
|
|||||||
if (dbus_watch_get_enabled(w->watch))
|
if (dbus_watch_get_enabled(w->watch))
|
||||||
{
|
{
|
||||||
unsigned int flags = 0;
|
unsigned int flags = 0;
|
||||||
|
#if (DBUS_MINOR > 0)
|
||||||
|
int fd = dbus_watch_get_unix_fd(w->watch);
|
||||||
|
#else
|
||||||
int fd = dbus_watch_get_fd(w->watch);
|
int fd = dbus_watch_get_fd(w->watch);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (FD_ISSET(fd, rset))
|
if (FD_ISSET(fd, rset))
|
||||||
flags |= DBUS_WATCH_READABLE;
|
flags |= DBUS_WATCH_READABLE;
|
||||||
|
|||||||
+189
-93
@@ -1,13 +1,17 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -18,27 +22,32 @@ struct iface_param {
|
|||||||
int ind;
|
int ind;
|
||||||
};
|
};
|
||||||
|
|
||||||
static int complete_context(struct daemon *daemon, struct in_addr local, int if_index,
|
static int complete_context(struct in_addr local, int if_index,
|
||||||
struct in_addr netmask, struct in_addr broadcast, void *vparam);
|
struct in_addr netmask, struct in_addr broadcast, void *vparam);
|
||||||
|
|
||||||
void dhcp_init(struct daemon *daemon)
|
void dhcp_init(void)
|
||||||
{
|
{
|
||||||
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 oneopt = 1;
|
int oneopt = 1;
|
||||||
struct dhcp_config *configs, *cp;
|
#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
|
||||||
|
int mtu = IP_PMTUDISC_DONT;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (fd == -1)
|
if (fd == -1)
|
||||||
die (_("cannot create DHCP socket : %s"), NULL);
|
die (_("cannot create DHCP socket : %s"), NULL, EC_BADNET);
|
||||||
|
|
||||||
if (!fix_fd(fd) ||
|
if (!fix_fd(fd) ||
|
||||||
|
#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
|
||||||
|
setsockopt(fd, SOL_IP, IP_MTU_DISCOVER, &mtu, sizeof(mtu)) == -1 ||
|
||||||
|
#endif
|
||||||
#if defined(HAVE_LINUX_NETWORK)
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
setsockopt(fd, SOL_IP, IP_PKTINFO, &oneopt, sizeof(oneopt)) == -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, &oneopt, sizeof(oneopt)) == -1 ||
|
setsockopt(fd, IPPROTO_IP, IP_RECVIF, &oneopt, sizeof(oneopt)) == -1 ||
|
||||||
#endif
|
#endif
|
||||||
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &oneopt, sizeof(oneopt)) == -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, EC_BADNET);
|
||||||
|
|
||||||
/* When bind-interfaces is set, there might be more than one dnmsasq
|
/* When bind-interfaces is set, there might be more than one dnmsasq
|
||||||
instance binding port 67. That's OK if they serve different networks.
|
instance binding port 67. That's OK if they serve different networks.
|
||||||
@@ -56,7 +65,7 @@ void dhcp_init(struct daemon *daemon)
|
|||||||
int rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &oneopt, sizeof(oneopt));
|
int rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &oneopt, sizeof(oneopt));
|
||||||
#endif
|
#endif
|
||||||
if (rc == -1)
|
if (rc == -1)
|
||||||
die(_("failed to set SO_REUSE{ADDR|PORT} on DHCP socket: %s"), NULL);
|
die(_("failed to set SO_REUSE{ADDR|PORT} on DHCP socket: %s"), NULL, EC_BADNET);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -69,11 +78,11 @@ void dhcp_init(struct daemon *daemon)
|
|||||||
#endif
|
#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, EC_BADNET);
|
||||||
|
|
||||||
daemon->dhcpfd = fd;
|
daemon->dhcpfd = fd;
|
||||||
|
|
||||||
#ifndef HAVE_LINUX_NETWORK
|
#if defined(HAVE_BSD_NETWORK)
|
||||||
/* When we're not using capabilities, we need to do this here before
|
/* When we're not using capabilities, we need to do this here before
|
||||||
we drop root. Also, set buffer size small, to avoid wasting
|
we drop root. Also, set buffer size small, to avoid wasting
|
||||||
kernel buffers */
|
kernel buffers */
|
||||||
@@ -82,30 +91,19 @@ void dhcp_init(struct daemon *daemon)
|
|||||||
daemon->dhcp_icmp_fd = -1;
|
daemon->dhcp_icmp_fd = -1;
|
||||||
else if ((daemon->dhcp_icmp_fd = make_icmp_sock()) == -1 ||
|
else if ((daemon->dhcp_icmp_fd = make_icmp_sock()) == -1 ||
|
||||||
setsockopt(daemon->dhcp_icmp_fd, SOL_SOCKET, SO_RCVBUF, &oneopt, sizeof(oneopt)) == -1 )
|
setsockopt(daemon->dhcp_icmp_fd, SOL_SOCKET, SO_RCVBUF, &oneopt, sizeof(oneopt)) == -1 )
|
||||||
die(_("cannot create ICMP raw socket: %s."), NULL);
|
die(_("cannot create ICMP raw socket: %s."), NULL, EC_BADNET);
|
||||||
|
|
||||||
/* Make BPF raw send socket */
|
/* Make BPF raw send socket */
|
||||||
init_bpf(daemon);
|
init_bpf();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If the same IP appears in more than one host config, then DISCOVER
|
check_dhcp_hosts(1);
|
||||||
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.iov_len = sizeof(struct dhcp_packet);
|
daemon->dhcp_packet.iov_len = sizeof(struct dhcp_packet);
|
||||||
daemon->dhcp_packet.iov_base = safe_malloc(daemon->dhcp_packet.iov_len);
|
daemon->dhcp_packet.iov_base = safe_malloc(daemon->dhcp_packet.iov_len);
|
||||||
/* These two each hold a DHCP option max size 255
|
|
||||||
and get a terminating zero added */
|
|
||||||
daemon->dhcp_buff = safe_malloc(256);
|
|
||||||
daemon->dhcp_buff2 = safe_malloc(256);
|
|
||||||
daemon->ping_results = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void dhcp_packet(struct daemon *daemon, time_t now)
|
void dhcp_packet(time_t now)
|
||||||
{
|
{
|
||||||
struct dhcp_packet *mess;
|
struct dhcp_packet *mess;
|
||||||
struct dhcp_context *context;
|
struct dhcp_context *context;
|
||||||
@@ -116,15 +114,17 @@ void dhcp_packet(struct daemon *daemon, time_t now)
|
|||||||
struct cmsghdr *cmptr;
|
struct cmsghdr *cmptr;
|
||||||
struct iovec iov;
|
struct iovec iov;
|
||||||
ssize_t sz;
|
ssize_t sz;
|
||||||
int iface_index = 0, unicast_dest = 0;
|
int iface_index = 0, unicast_dest = 0, is_inform = 0;
|
||||||
struct in_addr iface_addr, *addrp = NULL;
|
struct in_addr iface_addr, *addrp = NULL;
|
||||||
struct iface_param parm;
|
struct iface_param parm;
|
||||||
|
|
||||||
union {
|
union {
|
||||||
struct cmsghdr align; /* this ensures alignment */
|
struct cmsghdr align; /* this ensures alignment */
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
|
char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
|
||||||
#else
|
#elif defined(HAVE_SOLARIS_NETWORK)
|
||||||
|
char control[CMSG_SPACE(sizeof(unsigned int))];
|
||||||
|
#elif defined(IP_RECVIF)
|
||||||
char control[CMSG_SPACE(sizeof(struct sockaddr_dl))];
|
char control[CMSG_SPACE(sizeof(struct sockaddr_dl))];
|
||||||
#endif
|
#endif
|
||||||
} control_u;
|
} control_u;
|
||||||
@@ -145,7 +145,7 @@ void dhcp_packet(struct daemon *daemon, time_t now)
|
|||||||
expand_buf(&daemon->dhcp_packet, daemon->dhcp_packet.iov_len + 100));
|
expand_buf(&daemon->dhcp_packet, daemon->dhcp_packet.iov_len + 100));
|
||||||
|
|
||||||
/* expand_buf may have moved buffer */
|
/* expand_buf may have moved buffer */
|
||||||
mess = daemon->dhcp_packet.iov_base;
|
mess = (struct dhcp_packet *)daemon->dhcp_packet.iov_base;
|
||||||
msg.msg_controllen = sizeof(control_u);
|
msg.msg_controllen = sizeof(control_u);
|
||||||
msg.msg_control = control_u.control;
|
msg.msg_control = control_u.control;
|
||||||
msg.msg_flags = 0;
|
msg.msg_flags = 0;
|
||||||
@@ -175,7 +175,11 @@ void dhcp_packet(struct daemon *daemon, time_t now)
|
|||||||
if (msg.msg_controllen >= sizeof(struct cmsghdr))
|
if (msg.msg_controllen >= sizeof(struct cmsghdr))
|
||||||
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_RECVIF)
|
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
||||||
|
#ifdef HAVE_SOLARIS_NETWORK
|
||||||
|
iface_index = *((unsigned int *)CMSG_DATA(cmptr));
|
||||||
|
#else
|
||||||
iface_index = ((struct sockaddr_dl *)CMSG_DATA(cmptr))->sdl_index;
|
iface_index = ((struct sockaddr_dl *)CMSG_DATA(cmptr))->sdl_index;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!iface_index || !if_indextoname(iface_index, ifr.ifr_name))
|
if (!iface_index || !if_indextoname(iface_index, ifr.ifr_name))
|
||||||
return;
|
return;
|
||||||
@@ -204,7 +208,7 @@ void dhcp_packet(struct daemon *daemon, time_t now)
|
|||||||
iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
|
iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!iface_check(daemon, AF_INET, (struct all_addr *)addrp, &ifr, &iface_index))
|
if (!iface_check(AF_INET, (struct all_addr *)addrp, &ifr, &iface_index))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
||||||
@@ -232,12 +236,13 @@ void dhcp_packet(struct daemon *daemon, time_t now)
|
|||||||
parm.current = NULL;
|
parm.current = NULL;
|
||||||
parm.ind = iface_index;
|
parm.ind = iface_index;
|
||||||
|
|
||||||
if (!iface_enumerate(daemon, &parm, complete_context, NULL))
|
if (!iface_enumerate(&parm, complete_context, NULL))
|
||||||
return;
|
return;
|
||||||
lease_prune(NULL, now); /* lose any expired leases */
|
lease_prune(NULL, now); /* lose any expired leases */
|
||||||
iov.iov_len = dhcp_reply(daemon, parm.current, ifr.ifr_name, (size_t)sz, now, unicast_dest);
|
iov.iov_len = dhcp_reply(parm.current, ifr.ifr_name, iface_index, (size_t)sz,
|
||||||
lease_update_file(daemon, now);
|
now, unicast_dest, &is_inform);
|
||||||
lease_update_dns(daemon);
|
lease_update_file(now);
|
||||||
|
lease_update_dns();
|
||||||
|
|
||||||
if (iov.iov_len == 0)
|
if (iov.iov_len == 0)
|
||||||
return;
|
return;
|
||||||
@@ -250,7 +255,7 @@ void dhcp_packet(struct daemon *daemon, time_t now)
|
|||||||
iov.iov_base = daemon->dhcp_packet.iov_base;
|
iov.iov_base = daemon->dhcp_packet.iov_base;
|
||||||
|
|
||||||
/* packet buffer may have moved */
|
/* packet buffer may have moved */
|
||||||
mess = daemon->dhcp_packet.iov_base;
|
mess = (struct dhcp_packet *)daemon->dhcp_packet.iov_base;
|
||||||
|
|
||||||
#ifdef HAVE_SOCKADDR_SA_LEN
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
||||||
dest.sin_len = sizeof(struct sockaddr_in);
|
dest.sin_len = sizeof(struct sockaddr_in);
|
||||||
@@ -266,14 +271,16 @@ void dhcp_packet(struct daemon *daemon, time_t now)
|
|||||||
{
|
{
|
||||||
/* If the client's idea of its own address tallys with
|
/* If the client's idea of its own address tallys with
|
||||||
the source address in the request packet, we believe the
|
the source address in the request packet, we believe the
|
||||||
source port too, and send back to that. */
|
source port too, and send back to that. If we're replying
|
||||||
if (dest.sin_addr.s_addr != mess->ciaddr.s_addr || !dest.sin_port)
|
to a DHCPINFORM, trust the source address always. */
|
||||||
|
if ((!is_inform && dest.sin_addr.s_addr != mess->ciaddr.s_addr) ||
|
||||||
|
dest.sin_port == 0 || dest.sin_addr.s_addr == 0)
|
||||||
{
|
{
|
||||||
dest.sin_port = htons(DHCP_CLIENT_PORT);
|
dest.sin_port = htons(DHCP_CLIENT_PORT);
|
||||||
dest.sin_addr = mess->ciaddr;
|
dest.sin_addr = mess->ciaddr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
else if ((ntohs(mess->flags) & 0x8000) || mess->hlen == 0 ||
|
else if ((ntohs(mess->flags) & 0x8000) || mess->hlen == 0 ||
|
||||||
mess->hlen > sizeof(ifr.ifr_addr.sa_data) || mess->htype == 0)
|
mess->hlen > sizeof(ifr.ifr_addr.sa_data) || mess->htype == 0)
|
||||||
{
|
{
|
||||||
@@ -282,14 +289,14 @@ void dhcp_packet(struct daemon *daemon, time_t now)
|
|||||||
msg.msg_control = control_u.control;
|
msg.msg_control = control_u.control;
|
||||||
msg.msg_controllen = sizeof(control_u);
|
msg.msg_controllen = sizeof(control_u);
|
||||||
cmptr = CMSG_FIRSTHDR(&msg);
|
cmptr = CMSG_FIRSTHDR(&msg);
|
||||||
dest.sin_addr.s_addr = INADDR_BROADCAST;
|
|
||||||
dest.sin_port = htons(DHCP_CLIENT_PORT);
|
|
||||||
pkt = (struct in_pktinfo *)CMSG_DATA(cmptr);
|
pkt = (struct in_pktinfo *)CMSG_DATA(cmptr);
|
||||||
pkt->ipi_ifindex = iface_index;
|
pkt->ipi_ifindex = iface_index;
|
||||||
pkt->ipi_spec_dst.s_addr = 0;
|
pkt->ipi_spec_dst.s_addr = 0;
|
||||||
msg.msg_controllen = cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
|
msg.msg_controllen = cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
|
||||||
cmptr->cmsg_level = SOL_IP;
|
cmptr->cmsg_level = SOL_IP;
|
||||||
cmptr->cmsg_type = IP_PKTINFO;
|
cmptr->cmsg_type = IP_PKTINFO;
|
||||||
|
dest.sin_addr.s_addr = INADDR_BROADCAST;
|
||||||
|
dest.sin_port = htons(DHCP_CLIENT_PORT);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -305,14 +312,42 @@ void dhcp_packet(struct daemon *daemon, time_t now)
|
|||||||
req.arp_flags = ATF_COM;
|
req.arp_flags = ATF_COM;
|
||||||
ioctl(daemon->dhcpfd, SIOCSARP, &req);
|
ioctl(daemon->dhcpfd, SIOCSARP, &req);
|
||||||
}
|
}
|
||||||
#else
|
#elif defined(HAVE_SOLARIS_NETWORK)
|
||||||
|
else if ((ntohs(mess->flags) & 0x8000) || mess->hlen != ETHER_ADDR_LEN || mess->htype != ARPHRD_ETHER)
|
||||||
|
{
|
||||||
|
/* broadcast to 255.255.255.255 (or mac address invalid) */
|
||||||
|
dest.sin_addr.s_addr = INADDR_BROADCAST;
|
||||||
|
dest.sin_port = htons(DHCP_CLIENT_PORT);
|
||||||
|
/* note that we don't specify the interface here: that's done by the
|
||||||
|
IP_XMIT_IF sockopt lower down. */
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
send_via_bpf(daemon, mess, iov.iov_len, iface_addr, &ifr);
|
/* unicast to unconfigured client. Inject mac address direct into ARP cache.
|
||||||
|
Note that this only works for ethernet on solaris, because we use SIOCSARP
|
||||||
|
and not SIOCSXARP, which would be perfect, except that it returns ENXIO
|
||||||
|
mysteriously. Bah. Fall back to broadcast for other net types. */
|
||||||
|
struct arpreq req;
|
||||||
|
dest.sin_addr = mess->yiaddr;
|
||||||
|
dest.sin_port = htons(DHCP_CLIENT_PORT);
|
||||||
|
*((struct sockaddr_in *)&req.arp_pa) = dest;
|
||||||
|
req.arp_ha.sa_family = AF_UNSPEC;
|
||||||
|
memcpy(req.arp_ha.sa_data, mess->chaddr, mess->hlen);
|
||||||
|
req.arp_flags = ATF_COM;
|
||||||
|
ioctl(daemon->dhcpfd, SIOCSARP, &req);
|
||||||
|
}
|
||||||
|
#elif defined(HAVE_BSD_NETWORK)
|
||||||
|
else
|
||||||
|
{
|
||||||
|
send_via_bpf(mess, iov.iov_len, iface_addr, &ifr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_SOLARIS_NETWORK
|
||||||
|
setsockopt(daemon->dhcpfd, IPPROTO_IP, IP_XMIT_IF, &iface_index, sizeof(iface_index));
|
||||||
|
#endif
|
||||||
|
|
||||||
while(sendmsg(daemon->dhcpfd, &msg, 0) == -1 && retry_send());
|
while(sendmsg(daemon->dhcpfd, &msg, 0) == -1 && retry_send());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -326,15 +361,12 @@ void dhcp_packet(struct daemon *daemon, time_t now)
|
|||||||
|
|
||||||
Note that the current chain may be superceded later for configured hosts or those coming via gateways. */
|
Note that the current chain may be superceded later for configured hosts or those coming via gateways. */
|
||||||
|
|
||||||
static int complete_context(struct daemon *daemon, struct in_addr local, int if_index,
|
static int complete_context(struct in_addr local, int if_index,
|
||||||
struct in_addr netmask, struct in_addr broadcast, void *vparam)
|
struct in_addr netmask, struct in_addr broadcast, void *vparam)
|
||||||
{
|
{
|
||||||
struct dhcp_context *context;
|
struct dhcp_context *context;
|
||||||
struct iface_param *param = vparam;
|
struct iface_param *param = vparam;
|
||||||
|
|
||||||
if (if_index != param->ind)
|
|
||||||
return 1; /* no for us. */
|
|
||||||
|
|
||||||
for (context = daemon->dhcp; context; context = context->next)
|
for (context = daemon->dhcp; context; context = context->next)
|
||||||
{
|
{
|
||||||
if (!(context->flags & CONTEXT_NETMASK) &&
|
if (!(context->flags & CONTEXT_NETMASK) &&
|
||||||
@@ -359,7 +391,7 @@ static int complete_context(struct daemon *daemon, struct in_addr local, int if_
|
|||||||
is_same_net(local, context->end, context->netmask))
|
is_same_net(local, context->end, context->netmask))
|
||||||
{
|
{
|
||||||
/* link it onto the current chain if we've not seen it before */
|
/* link it onto the current chain if we've not seen it before */
|
||||||
if (context->current == context)
|
if (if_index == param->ind && context->current == context)
|
||||||
{
|
{
|
||||||
context->router = local;
|
context->router = local;
|
||||||
context->local = local;
|
context->local = local;
|
||||||
@@ -390,7 +422,9 @@ static int complete_context(struct daemon *daemon, struct in_addr local, int if_
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct dhcp_context *address_available(struct dhcp_context *context, struct in_addr taddr)
|
struct dhcp_context *address_available(struct dhcp_context *context,
|
||||||
|
struct in_addr taddr,
|
||||||
|
struct dhcp_netid *netids)
|
||||||
{
|
{
|
||||||
/* Check is an address is OK for this network, check all
|
/* Check is an address is OK for this network, check all
|
||||||
possible ranges. Make sure that the address isn't in use
|
possible ranges. Make sure that the address isn't in use
|
||||||
@@ -410,14 +444,17 @@ struct dhcp_context *address_available(struct dhcp_context *context, struct in_a
|
|||||||
|
|
||||||
if (!(tmp->flags & CONTEXT_STATIC) &&
|
if (!(tmp->flags & CONTEXT_STATIC) &&
|
||||||
addr >= start &&
|
addr >= start &&
|
||||||
addr <= end)
|
addr <= end &&
|
||||||
|
match_netid(tmp->filter, netids, 1))
|
||||||
return tmp;
|
return tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct dhcp_context *narrow_context(struct dhcp_context *context, struct in_addr taddr)
|
struct dhcp_context *narrow_context(struct dhcp_context *context,
|
||||||
|
struct in_addr taddr,
|
||||||
|
struct dhcp_netid *netids)
|
||||||
{
|
{
|
||||||
/* We start of with a set of possible contexts, all on the current physical interface.
|
/* We start of with a set of possible contexts, all on the current physical interface.
|
||||||
These are chained on ->current.
|
These are chained on ->current.
|
||||||
@@ -429,19 +466,24 @@ struct dhcp_context *narrow_context(struct dhcp_context *context, struct in_addr
|
|||||||
|
|
||||||
struct dhcp_context *tmp;
|
struct dhcp_context *tmp;
|
||||||
|
|
||||||
if ((tmp = address_available(context, taddr)))
|
if (!(tmp = address_available(context, taddr, netids)))
|
||||||
return tmp;
|
{
|
||||||
|
|
||||||
for (tmp = context; tmp; tmp = tmp->current)
|
for (tmp = context; tmp; tmp = tmp->current)
|
||||||
if (is_same_net(taddr, tmp->start, tmp->netmask) &&
|
if (is_same_net(taddr, tmp->start, tmp->netmask) &&
|
||||||
(tmp->flags & CONTEXT_STATIC))
|
(tmp->flags & CONTEXT_STATIC))
|
||||||
return tmp;
|
break;
|
||||||
|
|
||||||
|
if (!tmp)
|
||||||
for (tmp = context; tmp; tmp = tmp->current)
|
for (tmp = context; tmp; tmp = tmp->current)
|
||||||
if (is_same_net(taddr, tmp->start, tmp->netmask))
|
if (is_same_net(taddr, tmp->start, tmp->netmask))
|
||||||
return tmp;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
return NULL;
|
/* Only one context allowed now */
|
||||||
|
if (tmp)
|
||||||
|
tmp->current = NULL;
|
||||||
|
|
||||||
|
return tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr)
|
struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr)
|
||||||
@@ -456,12 +498,12 @@ struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct i
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Is every member of check matched by a member of pool?
|
/* Is every member of check matched by a member of pool?
|
||||||
If negonly, match unless there's a negative tag which matches. */
|
If tagnotneeded, untagged is OK */
|
||||||
int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool, int negonly)
|
int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool, int tagnotneeded)
|
||||||
{
|
{
|
||||||
struct dhcp_netid *tmp1;
|
struct dhcp_netid *tmp1;
|
||||||
|
|
||||||
if (!check && !negonly)
|
if (!check && !tagnotneeded)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
for (; check; check = check->next)
|
for (; check; check = check->next)
|
||||||
@@ -471,7 +513,7 @@ int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool, int negonly)
|
|||||||
for (tmp1 = pool; tmp1; tmp1 = tmp1->next)
|
for (tmp1 = pool; tmp1; tmp1 = tmp1->next)
|
||||||
if (strcmp(check->net, tmp1->net) == 0)
|
if (strcmp(check->net, tmp1->net) == 0)
|
||||||
break;
|
break;
|
||||||
if (!tmp1 || negonly)
|
if (!tmp1)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -482,7 +524,7 @@ int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool, int negonly)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int address_allocate(struct dhcp_context *context, struct daemon *daemon,
|
int address_allocate(struct dhcp_context *context,
|
||||||
struct in_addr *addrp, unsigned char *hwaddr, int hw_len,
|
struct in_addr *addrp, unsigned char *hwaddr, int hw_len,
|
||||||
struct dhcp_netid *netids, time_t now)
|
struct dhcp_netid *netids, time_t now)
|
||||||
{
|
{
|
||||||
@@ -543,7 +585,7 @@ int address_allocate(struct dhcp_context *context, struct daemon *daemon,
|
|||||||
else if (++count == max || r->addr.s_addr == addr.s_addr)
|
else if (++count == max || r->addr.s_addr == addr.s_addr)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (icmp_ping(daemon, addr))
|
if (icmp_ping(addr))
|
||||||
/* address in use: perturb address selection so that we are
|
/* address in use: perturb address selection so that we are
|
||||||
less likely to try this address again. */
|
less likely to try this address again. */
|
||||||
c->addr_epoch++;
|
c->addr_epoch++;
|
||||||
@@ -552,7 +594,7 @@ int address_allocate(struct dhcp_context *context, struct daemon *daemon,
|
|||||||
/* at this point victim may hold an expired record */
|
/* at this point victim may hold an expired record */
|
||||||
if (!victim)
|
if (!victim)
|
||||||
{
|
{
|
||||||
if ((victim = malloc(sizeof(struct ping_result))))
|
if ((victim = whine_malloc(sizeof(struct ping_result))))
|
||||||
{
|
{
|
||||||
victim->next = daemon->ping_results;
|
victim->next = daemon->ping_results;
|
||||||
daemon->ping_results = victim;
|
daemon->ping_results = victim;
|
||||||
@@ -648,7 +690,7 @@ struct dhcp_config *find_config(struct dhcp_config *configs,
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void dhcp_read_ethers(struct daemon *daemon)
|
void dhcp_read_ethers(void)
|
||||||
{
|
{
|
||||||
FILE *f = fopen(ETHERSFILE, "r");
|
FILE *f = fopen(ETHERSFILE, "r");
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
@@ -688,14 +730,14 @@ void dhcp_read_ethers(struct daemon *daemon)
|
|||||||
{
|
{
|
||||||
lineno++;
|
lineno++;
|
||||||
|
|
||||||
while (strlen(buff) > 0 && isspace(buff[strlen(buff)-1]))
|
while (strlen(buff) > 0 && isspace((int)buff[strlen(buff)-1]))
|
||||||
buff[strlen(buff)-1] = 0;
|
buff[strlen(buff)-1] = 0;
|
||||||
|
|
||||||
if ((*buff == '#') || (*buff == '+'))
|
if ((*buff == '#') || (*buff == '+'))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
for (ip = buff; *ip && !isspace(*ip); ip++);
|
for (ip = buff; *ip && !isspace((int)*ip); ip++);
|
||||||
for(; *ip && isspace(*ip); ip++)
|
for(; *ip && isspace((int)*ip); ip++)
|
||||||
*ip = 0;
|
*ip = 0;
|
||||||
if (!*ip || parse_hex(buff, hwaddr, ETHER_ADDR_LEN, NULL, NULL) != ETHER_ADDR_LEN)
|
if (!*ip || parse_hex(buff, hwaddr, ETHER_ADDR_LEN, NULL, NULL) != ETHER_ADDR_LEN)
|
||||||
{
|
{
|
||||||
@@ -724,7 +766,7 @@ void dhcp_read_ethers(struct daemon *daemon)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!canonicalise(ip))
|
if (!canonicalise(ip) || strip_hostname(ip))
|
||||||
{
|
{
|
||||||
my_syslog(LOG_ERR, _("bad name at %s line %d"), ETHERSFILE, lineno);
|
my_syslog(LOG_ERR, _("bad name at %s line %d"), ETHERSFILE, lineno);
|
||||||
continue;
|
continue;
|
||||||
@@ -749,7 +791,7 @@ void dhcp_read_ethers(struct daemon *daemon)
|
|||||||
|
|
||||||
if (!config)
|
if (!config)
|
||||||
{
|
{
|
||||||
if (!(config = malloc(sizeof(struct dhcp_config))))
|
if (!(config = whine_malloc(sizeof(struct dhcp_config))))
|
||||||
continue;
|
continue;
|
||||||
config->flags = CONFIG_FROM_ETHERS;
|
config->flags = CONFIG_FROM_ETHERS;
|
||||||
config->wildcard_mask = 0;
|
config->wildcard_mask = 0;
|
||||||
@@ -761,7 +803,7 @@ void dhcp_read_ethers(struct daemon *daemon)
|
|||||||
|
|
||||||
if (flags & CONFIG_NAME)
|
if (flags & CONFIG_NAME)
|
||||||
{
|
{
|
||||||
if ((config->hostname = malloc(strlen(ip)+1)))
|
if ((config->hostname = whine_malloc(strlen(ip)+1)))
|
||||||
strcpy(config->hostname, ip);
|
strcpy(config->hostname, ip);
|
||||||
else
|
else
|
||||||
config->flags &= ~CONFIG_NAME;
|
config->flags &= ~CONFIG_NAME;
|
||||||
@@ -783,6 +825,46 @@ void dhcp_read_ethers(struct daemon *daemon)
|
|||||||
my_syslog(LOG_INFO, _("read %s - %d addresses"), ETHERSFILE, count);
|
my_syslog(LOG_INFO, _("read %s - %d addresses"), ETHERSFILE, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void check_dhcp_hosts(int fatal)
|
||||||
|
{
|
||||||
|
/* 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.
|
||||||
|
Also check that FQDNs match the domain we are using. */
|
||||||
|
|
||||||
|
struct dhcp_config *configs, *cp;
|
||||||
|
|
||||||
|
for (configs = daemon->dhcp_conf; configs; configs = configs->next)
|
||||||
|
{
|
||||||
|
char *domain;
|
||||||
|
|
||||||
|
if ((configs->flags & DHOPT_BANK) || fatal)
|
||||||
|
{
|
||||||
|
for (cp = configs->next; cp; cp = cp->next)
|
||||||
|
if ((configs->flags & cp->flags & CONFIG_ADDR) && configs->addr.s_addr == cp->addr.s_addr)
|
||||||
|
{
|
||||||
|
if (fatal)
|
||||||
|
die(_("duplicate IP address %s in dhcp-config directive."),
|
||||||
|
inet_ntoa(cp->addr), EC_BADCONF);
|
||||||
|
else
|
||||||
|
my_syslog(LOG_ERR, _("duplicate IP address %s in %s."),
|
||||||
|
inet_ntoa(cp->addr), daemon->dhcp_hosts_file);
|
||||||
|
configs->flags &= ~CONFIG_ADDR;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((configs->flags & CONFIG_NAME) && (domain = strip_hostname(configs->hostname)))
|
||||||
|
{
|
||||||
|
if (fatal)
|
||||||
|
die(_("illegal domain %s in dhcp-config directive."), domain, EC_BADCONF);
|
||||||
|
else
|
||||||
|
my_syslog(LOG_ERR, _("illegal domain %s in %s."), domain, daemon->dhcp_hosts_file);
|
||||||
|
free(configs->hostname);
|
||||||
|
configs->flags &= ~CONFIG_NAME;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void dhcp_update_configs(struct dhcp_config *configs)
|
void dhcp_update_configs(struct dhcp_config *configs)
|
||||||
{
|
{
|
||||||
/* Some people like to keep all static IP addresses in /etc/hosts.
|
/* Some people like to keep all static IP addresses in /etc/hosts.
|
||||||
@@ -799,12 +881,25 @@ void dhcp_update_configs(struct dhcp_config *configs)
|
|||||||
if (config->flags & CONFIG_ADDR_HOSTS)
|
if (config->flags & CONFIG_ADDR_HOSTS)
|
||||||
config->flags &= ~(CONFIG_ADDR | CONFIG_ADDR_HOSTS);
|
config->flags &= ~(CONFIG_ADDR | CONFIG_ADDR_HOSTS);
|
||||||
|
|
||||||
|
|
||||||
|
if (daemon->port != 0)
|
||||||
for (config = configs; config; config = config->next)
|
for (config = configs; config; config = config->next)
|
||||||
if (!(config->flags & CONFIG_ADDR) &&
|
if (!(config->flags & CONFIG_ADDR) &&
|
||||||
(config->flags & CONFIG_NAME) &&
|
(config->flags & CONFIG_NAME) &&
|
||||||
(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))
|
||||||
{
|
{
|
||||||
|
if (cache_find_by_name(crec, config->hostname, 0, F_IPV4))
|
||||||
|
{
|
||||||
|
/* use primary (first) address */
|
||||||
|
while (crec && !(crec->flags & F_REVERSE))
|
||||||
|
crec = cache_find_by_name(crec, config->hostname, 0, F_IPV4);
|
||||||
|
if (!crec)
|
||||||
|
continue; /* should be never */
|
||||||
|
my_syslog(LOG_WARNING, _("%s has more then one address in hostsfile, using %s for DHCP"),
|
||||||
|
config->hostname, inet_ntoa(crec->addr.addr.addr.addr4));
|
||||||
|
}
|
||||||
|
|
||||||
if (config_find_by_address(configs, crec->addr.addr.addr.addr4))
|
if (config_find_by_address(configs, crec->addr.addr.addr.addr4))
|
||||||
my_syslog(LOG_WARNING, _("duplicate IP address %s (%s) in dhcp-config directive"),
|
my_syslog(LOG_WARNING, _("duplicate IP address %s (%s) in dhcp-config directive"),
|
||||||
inet_ntoa(crec->addr.addr.addr.addr4), config->hostname);
|
inet_ntoa(crec->addr.addr.addr.addr4), config->hostname);
|
||||||
@@ -819,38 +914,39 @@ void dhcp_update_configs(struct dhcp_config *configs)
|
|||||||
/* If we've not found a hostname any other way, try and see if there's one in /etc/hosts
|
/* 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
|
for this address. If it has a domain part, that must match the set domain and
|
||||||
it gets stripped. */
|
it gets stripped. */
|
||||||
char *host_from_dns(struct daemon *daemon, struct in_addr addr)
|
char *host_from_dns(struct in_addr addr)
|
||||||
{
|
{
|
||||||
struct crec *lookup = cache_find_by_addr(NULL, (struct all_addr *)&addr, 0, F_IPV4);
|
struct crec *lookup;
|
||||||
char *hostname = NULL;
|
char *hostname = NULL;
|
||||||
|
|
||||||
|
if (daemon->port == 0)
|
||||||
|
return NULL; /* DNS disabled. */
|
||||||
|
|
||||||
|
lookup = cache_find_by_addr(NULL, (struct all_addr *)&addr, 0, F_IPV4);
|
||||||
if (lookup && (lookup->flags & F_HOSTS))
|
if (lookup && (lookup->flags & F_HOSTS))
|
||||||
{
|
{
|
||||||
hostname = daemon->dhcp_buff;
|
hostname = daemon->dhcp_buff;
|
||||||
strncpy(hostname, cache_get_name(lookup), 256);
|
strncpy(hostname, cache_get_name(lookup), 256);
|
||||||
hostname[255] = 0;
|
hostname[255] = 0;
|
||||||
hostname = strip_hostname(daemon, hostname);
|
if (strip_hostname(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))
|
|
||||||
{
|
|
||||||
my_syslog(LOG_WARNING, _("Ignoring DHCP host name %s because it has an illegal domain part"), hostname);
|
|
||||||
hostname = NULL;
|
hostname = NULL;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
*dot = 0; /* truncate */
|
|
||||||
if (strlen(hostname) == 0)
|
|
||||||
hostname = NULL; /* nothing left */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return hostname;
|
return hostname;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* return illegal domain or NULL if OK */
|
||||||
|
char *strip_hostname(char *hostname)
|
||||||
|
{
|
||||||
|
char *dot = strchr(hostname, '.');
|
||||||
|
|
||||||
|
if (!dot)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
*dot = 0; /* truncate */
|
||||||
|
|
||||||
|
if (*(dot+1) && (!daemon->domain_suffix || !hostname_isequal(dot+1, daemon->domain_suffix)))
|
||||||
|
return dot+1;
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
+376
-293
@@ -1,17 +1,23 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
|
struct daemon *daemon;
|
||||||
|
|
||||||
static char *compile_opts =
|
static char *compile_opts =
|
||||||
#ifndef HAVE_IPV6
|
#ifndef HAVE_IPV6
|
||||||
"no-"
|
"no-"
|
||||||
@@ -35,7 +41,7 @@ static char *compile_opts =
|
|||||||
"no-"
|
"no-"
|
||||||
#endif
|
#endif
|
||||||
"DBus "
|
"DBus "
|
||||||
#ifdef NO_GETTEXT
|
#ifndef LOCALEDIR
|
||||||
"no-"
|
"no-"
|
||||||
#endif
|
#endif
|
||||||
"I18N "
|
"I18N "
|
||||||
@@ -44,36 +50,37 @@ static char *compile_opts =
|
|||||||
#endif
|
#endif
|
||||||
"TFTP";
|
"TFTP";
|
||||||
|
|
||||||
static pid_t pid;
|
static volatile pid_t pid = 0;
|
||||||
static int pipewrite;
|
static volatile int pipewrite;
|
||||||
|
|
||||||
static int set_dns_listeners(struct daemon *daemon, time_t now, fd_set *set, int *maxfdp);
|
static int set_dns_listeners(time_t now, fd_set *set, int *maxfdp);
|
||||||
static void check_dns_listeners(struct daemon *daemon, fd_set *set, time_t now);
|
static void check_dns_listeners(fd_set *set, time_t now);
|
||||||
static void sig_handler(int sig);
|
static void sig_handler(int sig);
|
||||||
|
static void async_event(int pipe, time_t now);
|
||||||
|
static void poll_resolv(void);
|
||||||
|
|
||||||
int main (int argc, char **argv)
|
int main (int argc, char **argv)
|
||||||
{
|
{
|
||||||
struct daemon *daemon;
|
|
||||||
int bind_fallback = 0;
|
int bind_fallback = 0;
|
||||||
int bad_capabilities = 0;
|
int bad_capabilities = 0;
|
||||||
time_t now, last = 0;
|
time_t now, last = 0;
|
||||||
struct sigaction sigact;
|
struct sigaction sigact;
|
||||||
struct iname *if_tmp;
|
struct iname *if_tmp;
|
||||||
int piperead, pipefd[2], log_fd;
|
int piperead, pipefd[2];
|
||||||
unsigned char sig;
|
struct passwd *ent_pw;
|
||||||
|
long i, max_fd = sysconf(_SC_OPEN_MAX);
|
||||||
|
|
||||||
#ifndef NO_GETTEXT
|
#ifdef LOCALEDIR
|
||||||
setlocale(LC_ALL, "");
|
setlocale(LC_ALL, "");
|
||||||
bindtextdomain("dnsmasq", LOCALEDIR);
|
bindtextdomain("dnsmasq", LOCALEDIR);
|
||||||
textdomain("dnsmasq");
|
textdomain("dnsmasq");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
pid = 0;
|
|
||||||
|
|
||||||
sigact.sa_handler = sig_handler;
|
sigact.sa_handler = sig_handler;
|
||||||
sigact.sa_flags = 0;
|
sigact.sa_flags = 0;
|
||||||
sigemptyset(&sigact.sa_mask);
|
sigemptyset(&sigact.sa_mask);
|
||||||
sigaction(SIGUSR1, &sigact, NULL);
|
sigaction(SIGUSR1, &sigact, NULL);
|
||||||
|
sigaction(SIGUSR2, &sigact, NULL);
|
||||||
sigaction(SIGHUP, &sigact, NULL);
|
sigaction(SIGHUP, &sigact, NULL);
|
||||||
sigaction(SIGTERM, &sigact, NULL);
|
sigaction(SIGTERM, &sigact, NULL);
|
||||||
sigaction(SIGALRM, &sigact, NULL);
|
sigaction(SIGALRM, &sigact, NULL);
|
||||||
@@ -83,8 +90,9 @@ int main (int argc, char **argv)
|
|||||||
sigact.sa_handler = SIG_IGN;
|
sigact.sa_handler = SIG_IGN;
|
||||||
sigaction(SIGPIPE, &sigact, NULL);
|
sigaction(SIGPIPE, &sigact, NULL);
|
||||||
|
|
||||||
daemon = read_opts(argc, argv, compile_opts);
|
umask(022); /* known umask, create leases and pid files as 0644 */
|
||||||
log_fd = log_start(daemon);
|
|
||||||
|
read_opts(argc, argv, compile_opts);
|
||||||
|
|
||||||
if (daemon->edns_pktsz < PACKETSZ)
|
if (daemon->edns_pktsz < PACKETSZ)
|
||||||
daemon->edns_pktsz = PACKETSZ;
|
daemon->edns_pktsz = PACKETSZ;
|
||||||
@@ -99,11 +107,16 @@ int main (int argc, char **argv)
|
|||||||
}
|
}
|
||||||
#ifndef HAVE_ISC_READER
|
#ifndef HAVE_ISC_READER
|
||||||
else if (!daemon->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, EC_BADCONF);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Close any file descriptors we inherited apart from std{in|out|err} */
|
||||||
|
for (i = 0; i < max_fd; i++)
|
||||||
|
if (i != STDOUT_FILENO && i != STDERR_FILENO && i != STDIN_FILENO)
|
||||||
|
close(i);
|
||||||
|
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#ifdef HAVE_LINUX_NETWORK
|
||||||
netlink_init(daemon);
|
netlink_init();
|
||||||
#elif !(defined(IP_RECVDSTADDR) && \
|
#elif !(defined(IP_RECVDSTADDR) && \
|
||||||
defined(IP_RECVIF) && \
|
defined(IP_RECVIF) && \
|
||||||
defined(IP_SENDSRCADDR))
|
defined(IP_SENDSRCADDR))
|
||||||
@@ -116,32 +129,13 @@ int main (int argc, char **argv)
|
|||||||
|
|
||||||
#ifndef HAVE_TFTP
|
#ifndef HAVE_TFTP
|
||||||
if (daemon->options & OPT_TFTP)
|
if (daemon->options & OPT_TFTP)
|
||||||
die(_("TFTP server not available: set HAVE_TFTP in src/config.h"), NULL);
|
die(_("TFTP server not available: set HAVE_TFTP in src/config.h"), NULL, EC_BADCONF);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
daemon->interfaces = NULL;
|
#ifdef HAVE_SOLARIS_NETWORK
|
||||||
if (!enumerate_interfaces(daemon))
|
if (daemon->max_logs != 0)
|
||||||
die(_("failed to find list of interfaces: %s"), NULL);
|
die(_("asychronous logging is not available under Solaris"), NULL, EC_BADCONF);
|
||||||
|
#endif
|
||||||
if (daemon->options & OPT_NOWILD)
|
|
||||||
{
|
|
||||||
daemon->listeners = create_bound_listeners(daemon);
|
|
||||||
|
|
||||||
for (if_tmp = daemon->if_names; if_tmp; if_tmp = if_tmp->next)
|
|
||||||
if (if_tmp->name && !if_tmp->used)
|
|
||||||
die(_("unknown interface %s"), if_tmp->name);
|
|
||||||
|
|
||||||
for (if_tmp = daemon->if_addrs; if_tmp; if_tmp = if_tmp->next)
|
|
||||||
if (!if_tmp->used)
|
|
||||||
{
|
|
||||||
prettyprint_addr(&if_tmp->addr, daemon->namebuff);
|
|
||||||
die(_("no interface with address %s"), daemon->namebuff);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (!(daemon->listeners = create_wildcard_listeners(daemon->port, daemon->options & OPT_TFTP)))
|
|
||||||
die(_("failed to create listening socket: %s"), NULL);
|
|
||||||
|
|
||||||
cache_init(daemon->cachesize, daemon->options & OPT_LOG);
|
|
||||||
|
|
||||||
now = dnsmasq_time();
|
now = dnsmasq_time();
|
||||||
|
|
||||||
@@ -154,67 +148,70 @@ int main (int argc, char **argv)
|
|||||||
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, EC_BADCONF);
|
||||||
#endif
|
#endif
|
||||||
dhcp_init(daemon);
|
/* Note that order matters here, we must call lease_init before
|
||||||
lease_init(daemon, now);
|
creating any file descriptors which shouldn't be leaked
|
||||||
|
to the lease-script init process. */
|
||||||
|
lease_init(now);
|
||||||
|
dhcp_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!enumerate_interfaces())
|
||||||
|
die(_("failed to find list of interfaces: %s"), NULL, EC_MISC);
|
||||||
|
|
||||||
|
if (daemon->options & OPT_NOWILD)
|
||||||
|
{
|
||||||
|
daemon->listeners = create_bound_listeners();
|
||||||
|
|
||||||
|
for (if_tmp = daemon->if_names; if_tmp; if_tmp = if_tmp->next)
|
||||||
|
if (if_tmp->name && !if_tmp->used)
|
||||||
|
die(_("unknown interface %s"), if_tmp->name, EC_BADNET);
|
||||||
|
|
||||||
|
for (if_tmp = daemon->if_addrs; if_tmp; if_tmp = if_tmp->next)
|
||||||
|
if (!if_tmp->used)
|
||||||
|
{
|
||||||
|
prettyprint_addr(&if_tmp->addr, daemon->namebuff);
|
||||||
|
die(_("no interface with address %s"), daemon->namebuff, EC_BADNET);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if ((daemon->port != 0 || (daemon->options & OPT_TFTP)) &&
|
||||||
|
!(daemon->listeners = create_wildcard_listeners()))
|
||||||
|
die(_("failed to create listening socket: %s"), NULL, EC_BADNET);
|
||||||
|
|
||||||
|
if (daemon->port != 0)
|
||||||
|
cache_init();
|
||||||
|
|
||||||
if (daemon->options & OPT_DBUS)
|
if (daemon->options & OPT_DBUS)
|
||||||
#ifdef HAVE_DBUS
|
#ifdef HAVE_DBUS
|
||||||
{
|
{
|
||||||
char *err;
|
char *err;
|
||||||
daemon->dbus = NULL;
|
daemon->dbus = NULL;
|
||||||
daemon->watches = NULL;
|
daemon->watches = NULL;
|
||||||
if ((err = dbus_init(daemon)))
|
if ((err = dbus_init()))
|
||||||
die(_("DBus error: %s"), err);
|
die(_("DBus error: %s"), err, EC_MISC);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
die(_("DBus not available: set HAVE_DBUS in src/config.h"), NULL);
|
die(_("DBus not available: set HAVE_DBUS in src/config.h"), NULL, EC_BADCONF);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If query_port is set then create a socket now, before dumping root
|
if (daemon->port != 0)
|
||||||
for use to access nameservers without more specific source addresses.
|
pre_allocate_sfds();
|
||||||
This allows query_port to be a low port */
|
|
||||||
if (daemon->query_port)
|
|
||||||
{
|
|
||||||
union mysockaddr addr;
|
|
||||||
memset(&addr, 0, sizeof(addr));
|
|
||||||
addr.in.sin_family = AF_INET;
|
|
||||||
addr.in.sin_addr.s_addr = INADDR_ANY;
|
|
||||||
addr.in.sin_port = htons(daemon->query_port);
|
|
||||||
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
||||||
addr.in.sin_len = sizeof(struct sockaddr_in);
|
|
||||||
#endif
|
|
||||||
allocate_sfd(&addr, &daemon->sfds);
|
|
||||||
#ifdef HAVE_IPV6
|
|
||||||
memset(&addr, 0, sizeof(addr));
|
|
||||||
addr.in6.sin6_family = AF_INET6;
|
|
||||||
addr.in6.sin6_addr = in6addr_any;
|
|
||||||
addr.in6.sin6_port = htons(daemon->query_port);
|
|
||||||
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
||||||
addr.in6.sin6_len = sizeof(struct sockaddr_in6);
|
|
||||||
#endif
|
|
||||||
allocate_sfd(&addr, &daemon->sfds);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Use a pipe to carry signals back to the event loop in a race-free manner */
|
/* Use a pipe to carry signals and other events back to the event loop
|
||||||
|
in a race-free manner */
|
||||||
if (pipe(pipefd) == -1 || !fix_fd(pipefd[0]) || !fix_fd(pipefd[1]))
|
if (pipe(pipefd) == -1 || !fix_fd(pipefd[0]) || !fix_fd(pipefd[1]))
|
||||||
die(_("cannot create pipe: %s"), NULL);
|
die(_("cannot create pipe: %s"), NULL, EC_MISC);
|
||||||
|
|
||||||
piperead = pipefd[0];
|
piperead = pipefd[0];
|
||||||
pipewrite = pipefd[1];
|
pipewrite = pipefd[1];
|
||||||
/* prime the pipe to load stuff first time. */
|
/* prime the pipe to load stuff first time. */
|
||||||
sig = SIGHUP;
|
send_event(pipewrite, EVENT_RELOAD, 0);
|
||||||
write(pipewrite, &sig, 1);
|
|
||||||
|
|
||||||
if (!(daemon->options & OPT_DEBUG))
|
if (!(daemon->options & OPT_DEBUG))
|
||||||
{
|
{
|
||||||
FILE *pidfile;
|
FILE *pidfile;
|
||||||
fd_set test_set;
|
int nullfd;
|
||||||
int maxfd = -1, i;
|
|
||||||
int nullfd = open("/dev/null", O_RDWR);
|
|
||||||
|
|
||||||
/* The following code "daemonizes" the process.
|
/* The following code "daemonizes" the process.
|
||||||
See Stevens section 12.4 */
|
See Stevens section 12.4 */
|
||||||
@@ -222,18 +219,24 @@ int main (int argc, char **argv)
|
|||||||
#ifndef NO_FORK
|
#ifndef NO_FORK
|
||||||
if (!(daemon->options & OPT_NO_FORK))
|
if (!(daemon->options & OPT_NO_FORK))
|
||||||
{
|
{
|
||||||
if (fork() != 0 )
|
pid_t pid;
|
||||||
_exit(0);
|
|
||||||
|
if ((pid = fork()) == -1 )
|
||||||
|
die(_("cannot fork into background: %s"), NULL, EC_MISC);
|
||||||
|
|
||||||
|
if (pid != 0)
|
||||||
|
_exit(EC_GOOD);
|
||||||
|
|
||||||
setsid();
|
setsid();
|
||||||
|
pid = fork();
|
||||||
|
|
||||||
if (fork() != 0)
|
if (pid != 0 && pid != -1)
|
||||||
_exit(0);
|
_exit(0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
chdir("/");
|
if (chdir("/") != 0)
|
||||||
umask(022); /* make pidfile 0644 */
|
die(_("cannot chdir to filesystem root: %s"), NULL, EC_MISC);
|
||||||
|
|
||||||
/* write pidfile _after_ forking ! */
|
/* write pidfile _after_ forking ! */
|
||||||
if (daemon->runfile && (pidfile = fopen(daemon->runfile, "w")))
|
if (daemon->runfile && (pidfile = fopen(daemon->runfile, "w")))
|
||||||
@@ -242,51 +245,27 @@ int main (int argc, char **argv)
|
|||||||
fclose(pidfile);
|
fclose(pidfile);
|
||||||
}
|
}
|
||||||
|
|
||||||
umask(0);
|
|
||||||
|
|
||||||
FD_ZERO(&test_set);
|
|
||||||
set_dns_listeners(daemon, now, &test_set, &maxfd);
|
|
||||||
#ifdef HAVE_DBUS
|
|
||||||
set_dbus_listeners(daemon, &maxfd, &test_set, &test_set, &test_set);
|
|
||||||
#endif
|
|
||||||
for (i=0; i<64; i++)
|
|
||||||
{
|
|
||||||
if (i == piperead || i == pipewrite || i == log_fd)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
|
||||||
if (i == daemon->netlinkfd)
|
|
||||||
continue;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (daemon->dhcp &&
|
|
||||||
((daemon->lease_stream && i == fileno(daemon->lease_stream)) ||
|
|
||||||
#ifndef HAVE_LINUX_NETWORK
|
|
||||||
i == daemon->dhcp_raw_fd ||
|
|
||||||
i == daemon->dhcp_icmp_fd ||
|
|
||||||
#endif
|
|
||||||
i == daemon->dhcpfd))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (i <= maxfd && FD_ISSET(i, &test_set))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* open stdout etc to /dev/null */
|
/* open stdout etc to /dev/null */
|
||||||
if (i == STDOUT_FILENO || i == STDERR_FILENO || i == STDIN_FILENO)
|
nullfd = open("/dev/null", O_RDWR);
|
||||||
dup2(nullfd, i);
|
dup2(nullfd, STDOUT_FILENO);
|
||||||
else
|
dup2(nullfd, STDERR_FILENO);
|
||||||
close(i);
|
dup2(nullfd, STDIN_FILENO);
|
||||||
}
|
close(nullfd);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* if we are to run scripts, we need to fork a helper before dropping root. */
|
/* if we are to run scripts, we need to fork a helper before dropping root. */
|
||||||
daemon->helperfd = create_helper(daemon, log_fd);
|
#ifndef NO_FORK
|
||||||
|
daemon->helperfd = create_helper(pipewrite, max_fd);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
ent_pw = daemon->username ? getpwnam(daemon->username) : NULL;
|
||||||
|
|
||||||
|
/* before here, we should only call die(), after here, only call syslog() */
|
||||||
|
log_start(ent_pw);
|
||||||
|
|
||||||
if (!(daemon->options & OPT_DEBUG))
|
if (!(daemon->options & OPT_DEBUG))
|
||||||
{
|
{
|
||||||
/* UID changing, etc */
|
/* UID changing, etc */
|
||||||
struct passwd *ent_pw = daemon->username ? getpwnam(daemon->username) : NULL;
|
|
||||||
|
|
||||||
if (daemon->groupname || ent_pw)
|
if (daemon->groupname || ent_pw)
|
||||||
{
|
{
|
||||||
gid_t dummy;
|
gid_t dummy;
|
||||||
@@ -304,7 +283,7 @@ int main (int argc, char **argv)
|
|||||||
|
|
||||||
if (ent_pw && ent_pw->pw_uid != 0)
|
if (ent_pw && ent_pw->pw_uid != 0)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
/* On linux, we keep CAP_NETADMIN (for ARP-injection) and
|
/* On linux, we keep CAP_NETADMIN (for ARP-injection) and
|
||||||
CAP_NET_RAW (for icmp) if we're doing dhcp */
|
CAP_NET_RAW (for icmp) if we're doing dhcp */
|
||||||
cap_user_header_t hdr = safe_malloc(sizeof(*hdr));
|
cap_user_header_t hdr = safe_malloc(sizeof(*hdr));
|
||||||
@@ -318,8 +297,33 @@ int main (int argc, char **argv)
|
|||||||
/* Tell kernel to not clear capabilities when dropping root */
|
/* Tell kernel to not clear capabilities when dropping root */
|
||||||
if (capset(hdr, data) == -1 || prctl(PR_SET_KEEPCAPS, 1) == -1)
|
if (capset(hdr, data) == -1 || prctl(PR_SET_KEEPCAPS, 1) == -1)
|
||||||
bad_capabilities = errno;
|
bad_capabilities = errno;
|
||||||
else
|
|
||||||
|
#elif defined(HAVE_SOLARIS_PRIVS)
|
||||||
|
/* http://developers.sun.com/solaris/articles/program_privileges.html */
|
||||||
|
priv_set_t *priv_set;
|
||||||
|
|
||||||
|
if (!(priv_set = priv_str_to_set("basic", ",", NULL)) ||
|
||||||
|
priv_addset(priv_set, PRIV_NET_ICMPACCESS) == -1 ||
|
||||||
|
priv_addset(priv_set, PRIV_SYS_NET_CONFIG) == -1)
|
||||||
|
bad_capabilities = errno;
|
||||||
|
|
||||||
|
if (priv_set && bad_capabilities == 0)
|
||||||
|
{
|
||||||
|
priv_inverse(priv_set);
|
||||||
|
|
||||||
|
if (setppriv(PRIV_OFF, PRIV_LIMIT, priv_set) == -1)
|
||||||
|
bad_capabilities = errno;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (priv_set)
|
||||||
|
priv_freeset(priv_set);
|
||||||
|
|
||||||
|
#elif defined(HAVE_SOLARIS_NETWORK)
|
||||||
|
|
||||||
|
bad_capabilities = ENOTSUP;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (bad_capabilities == 0)
|
||||||
{
|
{
|
||||||
/* finally drop root */
|
/* finally drop root */
|
||||||
setuid(ent_pw->pw_uid);
|
setuid(ent_pw->pw_uid);
|
||||||
@@ -341,7 +345,9 @@ int main (int argc, char **argv)
|
|||||||
prctl(PR_SET_DUMPABLE, 1);
|
prctl(PR_SET_DUMPABLE, 1);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (daemon->cachesize != 0)
|
if (daemon->port == 0)
|
||||||
|
my_syslog(LOG_INFO, _("started, version %s DNS disabled"), VERSION);
|
||||||
|
else if (daemon->cachesize != 0)
|
||||||
my_syslog(LOG_INFO, _("started, version %s cachesize %d"), VERSION, daemon->cachesize);
|
my_syslog(LOG_INFO, _("started, version %s cachesize %d"), VERSION, daemon->cachesize);
|
||||||
else
|
else
|
||||||
my_syslog(LOG_INFO, _("started, version %s cache disabled"), VERSION);
|
my_syslog(LOG_INFO, _("started, version %s cache disabled"), VERSION);
|
||||||
@@ -366,7 +372,7 @@ int main (int argc, char **argv)
|
|||||||
if (if_tmp->name && !if_tmp->used)
|
if (if_tmp->name && !if_tmp->used)
|
||||||
my_syslog(LOG_WARNING, _("warning: interface %s does not currently exist"), if_tmp->name);
|
my_syslog(LOG_WARNING, _("warning: interface %s does not currently exist"), if_tmp->name);
|
||||||
|
|
||||||
if (daemon->options & OPT_NO_RESOLV)
|
if (daemon->port != 0 && (daemon->options & OPT_NO_RESOLV))
|
||||||
{
|
{
|
||||||
if (daemon->resolv_files && !daemon->resolv_files->is_default)
|
if (daemon->resolv_files && !daemon->resolv_files->is_default)
|
||||||
my_syslog(LOG_WARNING, _("warning: ignoring resolv-file flag because no-resolv is set"));
|
my_syslog(LOG_WARNING, _("warning: ignoring resolv-file flag because no-resolv is set"));
|
||||||
@@ -397,10 +403,8 @@ int main (int argc, char **argv)
|
|||||||
#ifdef HAVE_TFTP
|
#ifdef HAVE_TFTP
|
||||||
if (daemon->options & OPT_TFTP)
|
if (daemon->options & OPT_TFTP)
|
||||||
{
|
{
|
||||||
long max_fd = sysconf(_SC_OPEN_MAX);
|
|
||||||
|
|
||||||
#ifdef FD_SETSIZE
|
#ifdef FD_SETSIZE
|
||||||
if (FD_SETSIZE < max_fd)
|
if (FD_SETSIZE < (unsigned)max_fd)
|
||||||
max_fd = FD_SETSIZE;
|
max_fd = FD_SETSIZE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -423,6 +427,12 @@ int main (int argc, char **argv)
|
|||||||
else
|
else
|
||||||
max_fd = max_fd - 20;
|
max_fd = max_fd - 20;
|
||||||
|
|
||||||
|
/* if we have to use a limited range of ports,
|
||||||
|
that will limit the number of transfers */
|
||||||
|
if (daemon->start_tftp_port != 0 &&
|
||||||
|
daemon->end_tftp_port - daemon->start_tftp_port + 1 < max_fd)
|
||||||
|
max_fd = daemon->end_tftp_port - daemon->start_tftp_port + 1;
|
||||||
|
|
||||||
if (daemon->tftp_max > max_fd)
|
if (daemon->tftp_max > max_fd)
|
||||||
{
|
{
|
||||||
daemon->tftp_max = max_fd;
|
daemon->tftp_max = max_fd;
|
||||||
@@ -441,7 +451,8 @@ int main (int argc, char **argv)
|
|||||||
my_syslog(LOG_WARNING, _("running as root"));
|
my_syslog(LOG_WARNING, _("running as root"));
|
||||||
}
|
}
|
||||||
|
|
||||||
check_servers(daemon);
|
if (daemon->port != 0)
|
||||||
|
check_servers();
|
||||||
|
|
||||||
pid = getpid();
|
pid = getpid();
|
||||||
|
|
||||||
@@ -458,7 +469,7 @@ int main (int argc, char **argv)
|
|||||||
/* if we are out of resources, find how long we have to wait
|
/* if we are out of resources, find how long we have to wait
|
||||||
for some to come free, we'll loop around then and restart
|
for some to come free, we'll loop around then and restart
|
||||||
listening for queries */
|
listening for queries */
|
||||||
if ((t.tv_sec = set_dns_listeners(daemon, now, &rset, &maxfd)) != 0)
|
if ((t.tv_sec = set_dns_listeners(now, &rset, &maxfd)) != 0)
|
||||||
{
|
{
|
||||||
t.tv_usec = 0;
|
t.tv_usec = 0;
|
||||||
tp = &t;
|
tp = &t;
|
||||||
@@ -474,7 +485,7 @@ int main (int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_DBUS
|
#ifdef HAVE_DBUS
|
||||||
set_dbus_listeners(daemon, &maxfd, &rset, &wset, &eset);
|
set_dbus_listeners(&maxfd, &rset, &wset, &eset);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (daemon->dhcp)
|
if (daemon->dhcp)
|
||||||
@@ -491,13 +502,18 @@ int main (int argc, char **argv)
|
|||||||
FD_SET(piperead, &rset);
|
FD_SET(piperead, &rset);
|
||||||
bump_maxfd(piperead, &maxfd);
|
bump_maxfd(piperead, &maxfd);
|
||||||
|
|
||||||
while (helper_buf_empty() && do_script_run(daemon));
|
#ifndef NO_FORK
|
||||||
|
while (helper_buf_empty() && do_script_run(now));
|
||||||
|
|
||||||
if (!helper_buf_empty())
|
if (!helper_buf_empty())
|
||||||
{
|
{
|
||||||
FD_SET(daemon->helperfd, &wset);
|
FD_SET(daemon->helperfd, &wset);
|
||||||
bump_maxfd(daemon->helperfd, &maxfd);
|
bump_maxfd(daemon->helperfd, &maxfd);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
/* need this for other side-effects */
|
||||||
|
while (do_script_run(now));
|
||||||
|
#endif
|
||||||
|
|
||||||
/* must do this just before select(), when we know no
|
/* must do this just before select(), when we know no
|
||||||
more calls to my_syslog() can occur */
|
more calls to my_syslog() can occur */
|
||||||
@@ -521,10 +537,202 @@ int main (int argc, char **argv)
|
|||||||
|
|
||||||
#ifdef HAVE_ISC_READER
|
#ifdef HAVE_ISC_READER
|
||||||
if (daemon->lease_file && !daemon->dhcp)
|
if (daemon->lease_file && !daemon->dhcp)
|
||||||
load_dhcp(daemon, now);
|
load_dhcp(now);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!(daemon->options & OPT_NO_POLL))
|
if (daemon->port != 0 && !(daemon->options & OPT_NO_POLL))
|
||||||
|
poll_resolv();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (FD_ISSET(piperead, &rset))
|
||||||
|
async_event(piperead, now);
|
||||||
|
|
||||||
|
#ifdef HAVE_LINUX_NETWORK
|
||||||
|
if (FD_ISSET(daemon->netlinkfd, &rset))
|
||||||
|
netlink_multicast();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_DBUS
|
||||||
|
/* if we didn't create a DBus connection, retry now. */
|
||||||
|
if ((daemon->options & OPT_DBUS) && !daemon->dbus)
|
||||||
|
{
|
||||||
|
char *err;
|
||||||
|
if ((err = dbus_init()))
|
||||||
|
my_syslog(LOG_WARNING, _("DBus error: %s"), err);
|
||||||
|
if (daemon->dbus)
|
||||||
|
my_syslog(LOG_INFO, _("connected to system DBus"));
|
||||||
|
}
|
||||||
|
check_dbus_listeners(&rset, &wset, &eset);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
check_dns_listeners(&rset, now);
|
||||||
|
|
||||||
|
#ifdef HAVE_TFTP
|
||||||
|
check_tftp_listeners(&rset, now);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (daemon->dhcp && FD_ISSET(daemon->dhcpfd, &rset))
|
||||||
|
dhcp_packet(now);
|
||||||
|
|
||||||
|
#ifndef NO_FORK
|
||||||
|
if (daemon->helperfd != -1 && FD_ISSET(daemon->helperfd, &wset))
|
||||||
|
helper_write();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void sig_handler(int sig)
|
||||||
|
{
|
||||||
|
if (pid == 0)
|
||||||
|
{
|
||||||
|
/* ignore anything other than TERM during startup
|
||||||
|
and in helper proc. (helper ignore TERM too) */
|
||||||
|
if (sig == SIGTERM)
|
||||||
|
exit(EC_MISC);
|
||||||
|
}
|
||||||
|
else if (pid != getpid())
|
||||||
|
{
|
||||||
|
/* alarm is used to kill TCP children after a fixed time. */
|
||||||
|
if (sig == SIGALRM)
|
||||||
|
_exit(0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* master process */
|
||||||
|
int event, errsave = errno;
|
||||||
|
|
||||||
|
if (sig == SIGHUP)
|
||||||
|
event = EVENT_RELOAD;
|
||||||
|
else if (sig == SIGCHLD)
|
||||||
|
event = EVENT_CHILD;
|
||||||
|
else if (sig == SIGALRM)
|
||||||
|
event = EVENT_ALARM;
|
||||||
|
else if (sig == SIGTERM)
|
||||||
|
event = EVENT_TERM;
|
||||||
|
else if (sig == SIGUSR1)
|
||||||
|
event = EVENT_DUMP;
|
||||||
|
else if (sig == SIGUSR2)
|
||||||
|
event = EVENT_REOPEN;
|
||||||
|
else
|
||||||
|
return;
|
||||||
|
|
||||||
|
send_event(pipewrite, event, 0);
|
||||||
|
errno = errsave;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void send_event(int fd, int event, int data)
|
||||||
|
{
|
||||||
|
struct event_desc ev;
|
||||||
|
|
||||||
|
ev.event = event;
|
||||||
|
ev.data = data;
|
||||||
|
/* pipe is non-blocking and struct event_desc is smaller than
|
||||||
|
PIPE_BUF, so this either fails or writes everything */
|
||||||
|
while (write(fd, &ev, sizeof(ev)) == -1 && errno == EINTR);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void async_event(int pipe, time_t now)
|
||||||
|
{
|
||||||
|
pid_t p;
|
||||||
|
struct event_desc ev;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if (read_write(pipe, (unsigned char *)&ev, sizeof(ev), 1))
|
||||||
|
switch (ev.event)
|
||||||
|
{
|
||||||
|
case EVENT_RELOAD:
|
||||||
|
clear_cache_and_reload(now);
|
||||||
|
if (daemon->port != 0 && daemon->resolv_files && (daemon->options & OPT_NO_POLL))
|
||||||
|
{
|
||||||
|
reload_servers(daemon->resolv_files->name);
|
||||||
|
check_servers();
|
||||||
|
}
|
||||||
|
rerun_scripts();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EVENT_DUMP:
|
||||||
|
if (daemon->port != 0)
|
||||||
|
dump_cache(now);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EVENT_ALARM:
|
||||||
|
if (daemon->dhcp)
|
||||||
|
{
|
||||||
|
lease_prune(NULL, now);
|
||||||
|
lease_update_file(now);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EVENT_CHILD:
|
||||||
|
/* See Stevens 5.10 */
|
||||||
|
while ((p = waitpid(-1, NULL, WNOHANG)) != 0)
|
||||||
|
if (p == -1)
|
||||||
|
{
|
||||||
|
if (errno != EINTR)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
for (i = 0 ; i < MAX_PROCS; i++)
|
||||||
|
if (daemon->tcp_pids[i] == p)
|
||||||
|
daemon->tcp_pids[i] = 0;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EVENT_KILLED:
|
||||||
|
my_syslog(LOG_WARNING, _("child process killed by signal %d"), ev.data);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EVENT_EXITED:
|
||||||
|
my_syslog(LOG_WARNING, _("child process exited with status %d"), ev.data);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EVENT_EXEC_ERR:
|
||||||
|
my_syslog(LOG_ERR, _("failed to execute %s: %s"), daemon->lease_change_command, strerror(ev.data));
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EVENT_PIPE_ERR:
|
||||||
|
my_syslog(LOG_ERR, _("failed to create helper: %s"), strerror(ev.data));
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EVENT_REOPEN:
|
||||||
|
/* Note: this may leave TCP-handling processes with the old file still open.
|
||||||
|
Since any such process will die in CHILD_LIFETIME or probably much sooner,
|
||||||
|
we leave them logging to the old file. */
|
||||||
|
if (daemon->log_file != NULL)
|
||||||
|
log_reopen(daemon->log_file);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case EVENT_TERM:
|
||||||
|
/* Knock all our children on the head. */
|
||||||
|
for (i = 0; i < MAX_PROCS; i++)
|
||||||
|
if (daemon->tcp_pids[i] != 0)
|
||||||
|
kill(daemon->tcp_pids[i], SIGALRM);
|
||||||
|
|
||||||
|
#ifndef NO_FORK
|
||||||
|
/* handle pending lease transitions */
|
||||||
|
if (daemon->helperfd != -1)
|
||||||
|
{
|
||||||
|
/* block in writes until all done */
|
||||||
|
if ((i = fcntl(daemon->helperfd, F_GETFL)) != -1)
|
||||||
|
fcntl(daemon->helperfd, F_SETFL, i & ~O_NONBLOCK);
|
||||||
|
do {
|
||||||
|
helper_write();
|
||||||
|
} while (!helper_buf_empty() || do_script_run(now));
|
||||||
|
close(daemon->helperfd);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (daemon->lease_stream)
|
||||||
|
fclose(daemon->lease_stream);
|
||||||
|
|
||||||
|
my_syslog(LOG_INFO, _("exiting on receipt of SIGTERM"));
|
||||||
|
flush_log();
|
||||||
|
exit(EC_GOOD);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void poll_resolv()
|
||||||
{
|
{
|
||||||
struct resolvc *res, *latest;
|
struct resolvc *res, *latest;
|
||||||
struct stat statbuf;
|
struct stat statbuf;
|
||||||
@@ -556,11 +764,11 @@ int main (int argc, char **argv)
|
|||||||
if (latest)
|
if (latest)
|
||||||
{
|
{
|
||||||
static int warned = 0;
|
static int warned = 0;
|
||||||
if (reload_servers(latest->name, daemon))
|
if (reload_servers(latest->name))
|
||||||
{
|
{
|
||||||
my_syslog(LOG_INFO, _("reading %s"), latest->name);
|
my_syslog(LOG_INFO, _("reading %s"), latest->name);
|
||||||
warned = 0;
|
warned = 0;
|
||||||
check_servers(daemon);
|
check_servers();
|
||||||
if (daemon->options & OPT_RELOAD)
|
if (daemon->options & OPT_RELOAD)
|
||||||
cache_reload(daemon->options, daemon->namebuff, daemon->domain_suffix, daemon->addn_hosts);
|
cache_reload(daemon->options, daemon->namebuff, daemon->domain_suffix, daemon->addn_hosts);
|
||||||
}
|
}
|
||||||
@@ -575,160 +783,30 @@ int main (int argc, char **argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (FD_ISSET(piperead, &rset))
|
void clear_cache_and_reload(time_t now)
|
||||||
{
|
|
||||||
pid_t p;
|
|
||||||
|
|
||||||
if (read(piperead, &sig, 1) == 1)
|
|
||||||
switch (sig)
|
|
||||||
{
|
|
||||||
case SIGHUP:
|
|
||||||
clear_cache_and_reload(daemon, now);
|
|
||||||
if (daemon->resolv_files && (daemon->options & OPT_NO_POLL))
|
|
||||||
{
|
|
||||||
reload_servers(daemon->resolv_files->name, daemon);
|
|
||||||
check_servers(daemon);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SIGUSR1:
|
|
||||||
dump_cache(daemon, now);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SIGALRM:
|
|
||||||
if (daemon->dhcp)
|
|
||||||
{
|
|
||||||
lease_prune(NULL, now);
|
|
||||||
lease_update_file(daemon, now);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SIGTERM:
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
/* Knock all our children on the head. */
|
|
||||||
for (i = 0; i < MAX_PROCS; i++)
|
|
||||||
if (daemon->tcp_pids[i] != 0)
|
|
||||||
kill(daemon->tcp_pids[i], SIGALRM);
|
|
||||||
|
|
||||||
/* handle pending lease transitions */
|
|
||||||
if (daemon->helperfd != -1)
|
|
||||||
{
|
|
||||||
/* block in writes until all done */
|
|
||||||
if ((i = fcntl(daemon->helperfd, F_GETFL)) != -1)
|
|
||||||
fcntl(daemon->helperfd, F_SETFL, i & ~O_NONBLOCK);
|
|
||||||
do {
|
|
||||||
helper_write(daemon);
|
|
||||||
} while (!helper_buf_empty() || do_script_run(daemon));
|
|
||||||
close(daemon->helperfd);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (daemon->lease_stream)
|
|
||||||
fclose(daemon->lease_stream);
|
|
||||||
|
|
||||||
my_syslog(LOG_INFO, _("exiting on receipt of SIGTERM"));
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
case SIGCHLD:
|
|
||||||
/* See Stevens 5.10 */
|
|
||||||
/* Note that if a script process forks and then exits
|
|
||||||
without waiting for its child, we will reap that child.
|
|
||||||
It is not therefore safe to assume that any dieing children
|
|
||||||
whose pid != script_pid are TCP server threads. */
|
|
||||||
while ((p = waitpid(-1, NULL, WNOHANG)) > 0)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
for (i = 0 ; i < MAX_PROCS; i++)
|
|
||||||
if (daemon->tcp_pids[i] == p)
|
|
||||||
{
|
|
||||||
daemon->tcp_pids[i] = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
|
||||||
if (FD_ISSET(daemon->netlinkfd, &rset))
|
|
||||||
netlink_multicast(daemon);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_DBUS
|
|
||||||
/* if we didn't create a DBus connection, retry now. */
|
|
||||||
if ((daemon->options & OPT_DBUS) && !daemon->dbus)
|
|
||||||
{
|
|
||||||
char *err;
|
|
||||||
if ((err = dbus_init(daemon)))
|
|
||||||
my_syslog(LOG_WARNING, _("DBus error: %s"), err);
|
|
||||||
if (daemon->dbus)
|
|
||||||
my_syslog(LOG_INFO, _("connected to system DBus"));
|
|
||||||
}
|
|
||||||
check_dbus_listeners(daemon, &rset, &wset, &eset);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
check_dns_listeners(daemon, &rset, now);
|
|
||||||
|
|
||||||
#ifdef HAVE_TFTP
|
|
||||||
check_tftp_listeners(daemon, &rset, now);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (daemon->dhcp && FD_ISSET(daemon->dhcpfd, &rset))
|
|
||||||
dhcp_packet(daemon, now);
|
|
||||||
|
|
||||||
if (daemon->helperfd != -1 && FD_ISSET(daemon->helperfd, &wset))
|
|
||||||
helper_write(daemon);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void sig_handler(int sig)
|
|
||||||
{
|
|
||||||
if (pid == 0)
|
|
||||||
{
|
|
||||||
/* ignore anything other than TERM during startup
|
|
||||||
and in helper proc. (helper ignore TERM too) */
|
|
||||||
if (sig == SIGTERM)
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
else if (pid == getpid())
|
|
||||||
{
|
|
||||||
/* master process */
|
|
||||||
unsigned char sigchr = sig;
|
|
||||||
int errsave = errno;
|
|
||||||
write(pipewrite, &sigchr, 1);
|
|
||||||
errno = errsave;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* alarm is used to kill TCP children after a fixed time. */
|
|
||||||
if (sig == SIGALRM)
|
|
||||||
_exit(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void clear_cache_and_reload(struct daemon *daemon, time_t now)
|
|
||||||
{
|
{
|
||||||
|
if (daemon->port != 0)
|
||||||
cache_reload(daemon->options, daemon->namebuff, daemon->domain_suffix, daemon->addn_hosts);
|
cache_reload(daemon->options, daemon->namebuff, daemon->domain_suffix, daemon->addn_hosts);
|
||||||
|
|
||||||
if (daemon->dhcp)
|
if (daemon->dhcp)
|
||||||
{
|
{
|
||||||
if (daemon->options & OPT_ETHERS)
|
if (daemon->options & OPT_ETHERS)
|
||||||
dhcp_read_ethers(daemon);
|
dhcp_read_ethers();
|
||||||
|
reread_dhcp();
|
||||||
dhcp_update_configs(daemon->dhcp_conf);
|
dhcp_update_configs(daemon->dhcp_conf);
|
||||||
lease_update_from_configs(daemon);
|
check_dhcp_hosts(0);
|
||||||
lease_update_file(daemon, now);
|
lease_update_from_configs();
|
||||||
lease_update_dns(daemon);
|
lease_update_file(now);
|
||||||
|
lease_update_dns();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int set_dns_listeners(struct daemon *daemon, time_t now, fd_set *set, int *maxfdp)
|
static int set_dns_listeners(time_t now, fd_set *set, int *maxfdp)
|
||||||
{
|
{
|
||||||
struct serverfd *serverfdp;
|
struct serverfd *serverfdp;
|
||||||
struct listener *listener;
|
struct listener *listener;
|
||||||
int wait, i;
|
int wait = 0, i;
|
||||||
|
|
||||||
#ifdef HAVE_TFTP
|
#ifdef HAVE_TFTP
|
||||||
int tftp = 0;
|
int tftp = 0;
|
||||||
@@ -742,7 +820,8 @@ static int set_dns_listeners(struct daemon *daemon, time_t now, fd_set *set, int
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* will we be able to get memory? */
|
/* will we be able to get memory? */
|
||||||
get_new_frec(daemon, now, &wait);
|
if (daemon->port != 0)
|
||||||
|
get_new_frec(now, &wait);
|
||||||
|
|
||||||
for (serverfdp = daemon->sfds; serverfdp; serverfdp = serverfdp->next)
|
for (serverfdp = daemon->sfds; serverfdp; serverfdp = serverfdp->next)
|
||||||
{
|
{
|
||||||
@@ -753,7 +832,7 @@ static int set_dns_listeners(struct daemon *daemon, time_t now, fd_set *set, int
|
|||||||
for (listener = daemon->listeners; listener; listener = listener->next)
|
for (listener = daemon->listeners; listener; listener = listener->next)
|
||||||
{
|
{
|
||||||
/* only listen for queries if we have resources */
|
/* only listen for queries if we have resources */
|
||||||
if (wait == 0)
|
if (listener->fd != -1 && wait == 0)
|
||||||
{
|
{
|
||||||
FD_SET(listener->fd, set);
|
FD_SET(listener->fd, set);
|
||||||
bump_maxfd(listener->fd, maxfdp);
|
bump_maxfd(listener->fd, maxfdp);
|
||||||
@@ -761,6 +840,7 @@ static int set_dns_listeners(struct daemon *daemon, time_t now, fd_set *set, int
|
|||||||
|
|
||||||
/* death of a child goes through the select loop, so
|
/* death of a child goes through the select loop, so
|
||||||
we don't need to explicitly arrange to wake up here */
|
we don't need to explicitly arrange to wake up here */
|
||||||
|
if (listener->tcpfd != -1)
|
||||||
for (i = 0; i < MAX_PROCS; i++)
|
for (i = 0; i < MAX_PROCS; i++)
|
||||||
if (daemon->tcp_pids[i] == 0)
|
if (daemon->tcp_pids[i] == 0)
|
||||||
{
|
{
|
||||||
@@ -782,26 +862,26 @@ static int set_dns_listeners(struct daemon *daemon, time_t now, fd_set *set, int
|
|||||||
return wait;
|
return wait;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void check_dns_listeners(struct daemon *daemon, fd_set *set, time_t now)
|
static void check_dns_listeners(fd_set *set, time_t now)
|
||||||
{
|
{
|
||||||
struct serverfd *serverfdp;
|
struct serverfd *serverfdp;
|
||||||
struct listener *listener;
|
struct listener *listener;
|
||||||
|
|
||||||
for (serverfdp = daemon->sfds; serverfdp; serverfdp = serverfdp->next)
|
for (serverfdp = daemon->sfds; serverfdp; serverfdp = serverfdp->next)
|
||||||
if (FD_ISSET(serverfdp->fd, set))
|
if (FD_ISSET(serverfdp->fd, set))
|
||||||
reply_query(serverfdp, daemon, now);
|
reply_query(serverfdp, now);
|
||||||
|
|
||||||
for (listener = daemon->listeners; listener; listener = listener->next)
|
for (listener = daemon->listeners; listener; listener = listener->next)
|
||||||
{
|
{
|
||||||
if (FD_ISSET(listener->fd, set))
|
if (listener->fd != -1 && FD_ISSET(listener->fd, set))
|
||||||
receive_query(listener, daemon, now);
|
receive_query(listener, now);
|
||||||
|
|
||||||
#ifdef HAVE_TFTP
|
#ifdef HAVE_TFTP
|
||||||
if (listener->tftpfd != -1 && FD_ISSET(listener->tftpfd, set))
|
if (listener->tftpfd != -1 && FD_ISSET(listener->tftpfd, set))
|
||||||
tftp_request(listener, daemon, now);
|
tftp_request(listener, now);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (FD_ISSET(listener->tcpfd, set))
|
if (listener->tcpfd != -1 && FD_ISSET(listener->tcpfd, set))
|
||||||
{
|
{
|
||||||
int confd;
|
int confd;
|
||||||
struct irec *iface = NULL;
|
struct irec *iface = NULL;
|
||||||
@@ -825,7 +905,7 @@ static void check_dns_listeners(struct daemon *daemon, fd_set *set, time_t now)
|
|||||||
interface too, for localisation. */
|
interface too, for localisation. */
|
||||||
|
|
||||||
/* interface may be new since startup */
|
/* interface may be new since startup */
|
||||||
if (enumerate_interfaces(daemon) &&
|
if (enumerate_interfaces() &&
|
||||||
getsockname(confd, (struct sockaddr *)&tcp_addr, &tcp_len) != -1)
|
getsockname(confd, (struct sockaddr *)&tcp_addr, &tcp_len) != -1)
|
||||||
for (iface = daemon->interfaces; iface; iface = iface->next)
|
for (iface = daemon->interfaces; iface; iface = iface->next)
|
||||||
if (sockaddr_isequal(&iface->addr, &tcp_addr))
|
if (sockaddr_isequal(&iface->addr, &tcp_addr))
|
||||||
@@ -880,7 +960,7 @@ static void check_dns_listeners(struct daemon *daemon, fd_set *set, time_t now)
|
|||||||
if (listener->family == AF_INET)
|
if (listener->family == AF_INET)
|
||||||
dst_addr_4 = iface->addr.in.sin_addr;
|
dst_addr_4 = iface->addr.in.sin_addr;
|
||||||
|
|
||||||
buff = tcp_request(daemon, confd, now, dst_addr_4, iface->netmask);
|
buff = tcp_request(confd, now, dst_addr_4, iface->netmask);
|
||||||
|
|
||||||
shutdown(confd, SHUT_RDWR);
|
shutdown(confd, SHUT_RDWR);
|
||||||
close(confd);
|
close(confd);
|
||||||
@@ -896,7 +976,10 @@ static void check_dns_listeners(struct daemon *daemon, fd_set *set, time_t now)
|
|||||||
}
|
}
|
||||||
#ifndef NO_FORK
|
#ifndef NO_FORK
|
||||||
if (!(daemon->options & OPT_DEBUG))
|
if (!(daemon->options & OPT_DEBUG))
|
||||||
|
{
|
||||||
|
flush_log();
|
||||||
_exit(0);
|
_exit(0);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -922,7 +1005,7 @@ int make_icmp_sock(void)
|
|||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
int icmp_ping(struct daemon *daemon, struct in_addr addr)
|
int icmp_ping(struct in_addr addr)
|
||||||
{
|
{
|
||||||
/* Try and get an ICMP echo from a machine. */
|
/* Try and get an ICMP echo from a machine. */
|
||||||
|
|
||||||
@@ -942,7 +1025,7 @@ int icmp_ping(struct daemon *daemon, struct in_addr addr)
|
|||||||
int gotreply = 0;
|
int gotreply = 0;
|
||||||
time_t start, now;
|
time_t start, now;
|
||||||
|
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#if defined(HAVE_LINUX_NETWORK) || defined (HAVE_SOLARIS_NETWORK)
|
||||||
if ((fd = make_icmp_sock()) == -1)
|
if ((fd = make_icmp_sock()) == -1)
|
||||||
return 0;
|
return 0;
|
||||||
#else
|
#else
|
||||||
@@ -986,7 +1069,7 @@ int icmp_ping(struct daemon *daemon, struct in_addr addr)
|
|||||||
FD_ZERO(&rset);
|
FD_ZERO(&rset);
|
||||||
FD_ZERO(&wset);
|
FD_ZERO(&wset);
|
||||||
FD_SET(fd, &rset);
|
FD_SET(fd, &rset);
|
||||||
set_dns_listeners(daemon, now, &rset, &maxfd);
|
set_dns_listeners(now, &rset, &maxfd);
|
||||||
set_log_writer(&wset, &maxfd);
|
set_log_writer(&wset, &maxfd);
|
||||||
|
|
||||||
if (select(maxfd+1, &rset, &wset, NULL, &tv) < 0)
|
if (select(maxfd+1, &rset, &wset, NULL, &tv) < 0)
|
||||||
@@ -998,10 +1081,10 @@ int icmp_ping(struct daemon *daemon, struct in_addr addr)
|
|||||||
now = dnsmasq_time();
|
now = dnsmasq_time();
|
||||||
|
|
||||||
check_log_writer(&wset);
|
check_log_writer(&wset);
|
||||||
check_dns_listeners(daemon, &rset, now);
|
check_dns_listeners(&rset, now);
|
||||||
|
|
||||||
#ifdef HAVE_TFTP
|
#ifdef HAVE_TFTP
|
||||||
check_tftp_listeners(daemon, &rset, now);
|
check_tftp_listeners(&rset, now);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (FD_ISSET(fd, &rset) &&
|
if (FD_ISSET(fd, &rset) &&
|
||||||
@@ -1017,7 +1100,7 @@ int icmp_ping(struct daemon *daemon, struct in_addr addr)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#if defined(HAVE_LINUX_NETWORK) || defined(HAVE_SOLARIS_NETWORK)
|
||||||
close(fd);
|
close(fd);
|
||||||
#else
|
#else
|
||||||
opt = 1;
|
opt = 1;
|
||||||
|
|||||||
+142
-76
@@ -1,16 +1,20 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2007 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2008 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COPYRIGHT "Copyright (C) 2000-2007 Simon Kelley"
|
#define COPYRIGHT "Copyright (C) 2000-2008 Simon Kelley"
|
||||||
|
|
||||||
/* get these before config.h for IPv6 stuff... */
|
/* get these before config.h for IPv6 stuff... */
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@@ -28,7 +32,7 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#define gettext_noop(S) (S)
|
#define gettext_noop(S) (S)
|
||||||
#ifdef NO_GETTEXT
|
#ifndef LOCALEDIR
|
||||||
# define _(S) (S)
|
# define _(S) (S)
|
||||||
#else
|
#else
|
||||||
# include <libintl.h>
|
# include <libintl.h>
|
||||||
@@ -40,6 +44,9 @@
|
|||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
#if defined(HAVE_SOLARIS_NETWORK)
|
||||||
|
#include <sys/sockio.h>
|
||||||
|
#endif
|
||||||
#include <sys/select.h>
|
#include <sys/select.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
@@ -58,7 +65,7 @@
|
|||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#include <grp.h>
|
#include <grp.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__sun__)
|
||||||
# include <netinet/if_ether.h>
|
# include <netinet/if_ether.h>
|
||||||
#else
|
#else
|
||||||
# include <net/ethernet.h>
|
# include <net/ethernet.h>
|
||||||
@@ -74,14 +81,44 @@
|
|||||||
# include <net/if_dl.h>
|
# include <net/if_dl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
#include <linux/capability.h>
|
#include <linux/capability.h>
|
||||||
/* There doesn't seem to be a universally-available
|
/* There doesn't seem to be a universally-available
|
||||||
userpace header for this. */
|
userpace header for this. */
|
||||||
extern int capset(cap_user_header_t header, cap_user_data_t data);
|
extern int capset(cap_user_header_t header, cap_user_data_t data);
|
||||||
#include <sys/prctl.h>
|
#include <sys/prctl.h>
|
||||||
|
#elif defined(HAVE_SOLARIS_PRIVS)
|
||||||
|
#include <priv.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* daemon is function in the C library.... */
|
||||||
|
#define daemon dnsmasq_daemon
|
||||||
|
|
||||||
|
/* Async event queue */
|
||||||
|
struct event_desc {
|
||||||
|
int event, data;
|
||||||
|
};
|
||||||
|
|
||||||
|
#define EVENT_RELOAD 1
|
||||||
|
#define EVENT_DUMP 2
|
||||||
|
#define EVENT_ALARM 3
|
||||||
|
#define EVENT_TERM 4
|
||||||
|
#define EVENT_CHILD 5
|
||||||
|
#define EVENT_REOPEN 6
|
||||||
|
#define EVENT_EXITED 7
|
||||||
|
#define EVENT_KILLED 8
|
||||||
|
#define EVENT_EXEC_ERR 9
|
||||||
|
#define EVENT_PIPE_ERR 10
|
||||||
|
|
||||||
|
/* Exit codes. */
|
||||||
|
#define EC_GOOD 0
|
||||||
|
#define EC_BADCONF 1
|
||||||
|
#define EC_BADNET 2
|
||||||
|
#define EC_FILE 3
|
||||||
|
#define EC_NOMEM 4
|
||||||
|
#define EC_MISC 5
|
||||||
|
#define EC_INIT_OFFSET 10
|
||||||
|
|
||||||
/* Min buffer size: we check after adding each record, so there must be
|
/* Min buffer size: we check after adding each record, so there must be
|
||||||
memory for the largest packet, and the largest record so the
|
memory for the largest packet, and the largest record so the
|
||||||
min for DNS is PACKETSZ+MAXDNAME+RRFIXEDSZ which is < 1000.
|
min for DNS is PACKETSZ+MAXDNAME+RRFIXEDSZ which is < 1000.
|
||||||
@@ -112,11 +149,15 @@ extern int capset(cap_user_header_t header, cap_user_data_t data);
|
|||||||
#define OPT_BOOTP_DYNAMIC (1<<20)
|
#define OPT_BOOTP_DYNAMIC (1<<20)
|
||||||
#define OPT_NO_PING (1<<21)
|
#define OPT_NO_PING (1<<21)
|
||||||
#define OPT_LEASE_RO (1<<22)
|
#define OPT_LEASE_RO (1<<22)
|
||||||
|
#define OPT_ALL_SERVERS (1<<23)
|
||||||
#define OPT_RELOAD (1<<24)
|
#define OPT_RELOAD (1<<24)
|
||||||
#define OPT_TFTP (1<<25)
|
#define OPT_TFTP (1<<25)
|
||||||
#define OPT_TFTP_SECURE (1<<26)
|
#define OPT_TFTP_SECURE (1<<26)
|
||||||
#define OPT_TFTP_NOBLOCK (1<<27)
|
#define OPT_TFTP_NOBLOCK (1<<27)
|
||||||
#define OPT_LOG_OPTS (1<<28)
|
#define OPT_LOG_OPTS (1<<28)
|
||||||
|
#define OPT_TFTP_APREF (1<<29)
|
||||||
|
#define OPT_NO_OVERRIDE (1<<30)
|
||||||
|
#define OPT_NO_REBIND (1<<31)
|
||||||
|
|
||||||
struct all_addr {
|
struct all_addr {
|
||||||
union {
|
union {
|
||||||
@@ -229,26 +270,29 @@ union mysockaddr {
|
|||||||
#define SERV_FROM_RESOLV 1 /* 1 for servers from resolv, 0 for command line. */
|
#define SERV_FROM_RESOLV 1 /* 1 for servers from resolv, 0 for command line. */
|
||||||
#define SERV_NO_ADDR 2 /* no server, this domain is local only */
|
#define SERV_NO_ADDR 2 /* no server, this domain is local only */
|
||||||
#define SERV_LITERAL_ADDRESS 4 /* addr is the answer, not the server */
|
#define SERV_LITERAL_ADDRESS 4 /* addr is the answer, not the server */
|
||||||
#define SERV_HAS_SOURCE 8 /* source address specified */
|
#define SERV_HAS_DOMAIN 8 /* server for one domain only */
|
||||||
#define SERV_HAS_DOMAIN 16 /* server for one domain only */
|
#define SERV_HAS_SOURCE 16 /* source address defined */
|
||||||
#define SERV_FOR_NODOTS 32 /* server for names with no domain part only */
|
#define SERV_FOR_NODOTS 32 /* server for names with no domain part only */
|
||||||
#define SERV_WARNED_RECURSIVE 64 /* avoid warning spam */
|
#define SERV_WARNED_RECURSIVE 64 /* avoid warning spam */
|
||||||
#define SERV_FROM_DBUS 128 /* 1 if source is DBus */
|
#define SERV_FROM_DBUS 128 /* 1 if source is DBus */
|
||||||
#define SERV_MARK 256 /* for mark-and-delete */
|
#define SERV_MARK 256 /* for mark-and-delete */
|
||||||
#define SERV_TYPE (SERV_HAS_DOMAIN | SERV_FOR_NODOTS)
|
#define SERV_TYPE (SERV_HAS_DOMAIN | SERV_FOR_NODOTS)
|
||||||
|
#define SERV_COUNTED 512 /* workspace for log code */
|
||||||
|
|
||||||
struct serverfd {
|
struct serverfd {
|
||||||
int fd;
|
int fd;
|
||||||
union mysockaddr source_addr;
|
union mysockaddr source_addr;
|
||||||
|
char interface[IF_NAMESIZE+1];
|
||||||
struct serverfd *next;
|
struct serverfd *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct server {
|
struct server {
|
||||||
union mysockaddr addr, source_addr;
|
union mysockaddr addr, source_addr;
|
||||||
|
char interface[IF_NAMESIZE+1];
|
||||||
struct serverfd *sfd;
|
struct serverfd *sfd;
|
||||||
char *domain; /* set if this server only handles a domain. */
|
char *domain; /* set if this server only handles a domain. */
|
||||||
int flags, tcpfd;
|
int flags, tcpfd;
|
||||||
|
unsigned int queries, failed_queries;
|
||||||
struct server *next;
|
struct server *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -326,6 +370,7 @@ struct dhcp_lease {
|
|||||||
struct in_addr addr;
|
struct in_addr addr;
|
||||||
unsigned char *vendorclass, *userclass;
|
unsigned char *vendorclass, *userclass;
|
||||||
unsigned int vendorclass_len, userclass_len;
|
unsigned int vendorclass_len, userclass_len;
|
||||||
|
int last_interface;
|
||||||
struct dhcp_lease *next;
|
struct dhcp_lease *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -364,6 +409,7 @@ struct dhcp_config {
|
|||||||
#define CONFIG_FROM_ETHERS 256 /* entry created by /etc/ethers */
|
#define CONFIG_FROM_ETHERS 256 /* entry created by /etc/ethers */
|
||||||
#define CONFIG_ADDR_HOSTS 512 /* address added by from /etc/hosts */
|
#define CONFIG_ADDR_HOSTS 512 /* address added by from /etc/hosts */
|
||||||
#define CONFIG_DECLINED 1024 /* address declined by client */
|
#define CONFIG_DECLINED 1024 /* address declined by client */
|
||||||
|
#define CONFIG_BANK 2048 /* from dhcp hosts file */
|
||||||
|
|
||||||
struct dhcp_opt {
|
struct dhcp_opt {
|
||||||
int opt, len, flags;
|
int opt, len, flags;
|
||||||
@@ -377,6 +423,7 @@ struct dhcp_opt {
|
|||||||
#define DHOPT_ENCAPSULATE 4
|
#define DHOPT_ENCAPSULATE 4
|
||||||
#define DHOPT_VENDOR_MATCH 8
|
#define DHOPT_VENDOR_MATCH 8
|
||||||
#define DHOPT_FORCE 16
|
#define DHOPT_FORCE 16
|
||||||
|
#define DHOPT_BANK 32
|
||||||
|
|
||||||
struct dhcp_boot {
|
struct dhcp_boot {
|
||||||
char *file, *sname;
|
char *file, *sname;
|
||||||
@@ -390,10 +437,11 @@ struct dhcp_boot {
|
|||||||
#define MATCH_CIRCUIT 3
|
#define MATCH_CIRCUIT 3
|
||||||
#define MATCH_REMOTE 4
|
#define MATCH_REMOTE 4
|
||||||
#define MATCH_SUBSCRIBER 5
|
#define MATCH_SUBSCRIBER 5
|
||||||
|
#define MATCH_OPTION 6
|
||||||
|
|
||||||
/* vendorclass, userclass, remote-id or cicuit-id */
|
/* vendorclass, userclass, remote-id or cicuit-id */
|
||||||
struct dhcp_vendor {
|
struct dhcp_vendor {
|
||||||
int len, match_type;
|
int len, match_type, option;
|
||||||
char *data;
|
char *data;
|
||||||
struct dhcp_netid netid;
|
struct dhcp_netid netid;
|
||||||
struct dhcp_vendor *next;
|
struct dhcp_vendor *next;
|
||||||
@@ -452,6 +500,8 @@ struct ping_result {
|
|||||||
struct tftp_file {
|
struct tftp_file {
|
||||||
int refcount, fd;
|
int refcount, fd;
|
||||||
off_t size;
|
off_t size;
|
||||||
|
dev_t dev;
|
||||||
|
ino_t inode;
|
||||||
char filename[];
|
char filename[];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -466,7 +516,7 @@ struct tftp_transfer {
|
|||||||
struct tftp_transfer *next;
|
struct tftp_transfer *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct daemon {
|
extern struct daemon {
|
||||||
/* datastuctures representing the command-line and
|
/* datastuctures representing the command-line and
|
||||||
config file arguments. All set (including defaults)
|
config file arguments. All set (including defaults)
|
||||||
in option.c */
|
in option.c */
|
||||||
@@ -491,7 +541,7 @@ struct daemon {
|
|||||||
int max_logs; /* queue limit */
|
int max_logs; /* queue limit */
|
||||||
int cachesize, ftabsize;
|
int cachesize, ftabsize;
|
||||||
int port, query_port;
|
int port, query_port;
|
||||||
unsigned long local_ttl;
|
unsigned long local_ttl, neg_ttl;
|
||||||
struct hostsfile *addn_hosts;
|
struct hostsfile *addn_hosts;
|
||||||
struct dhcp_context *dhcp;
|
struct dhcp_context *dhcp;
|
||||||
struct dhcp_config *dhcp_conf;
|
struct dhcp_config *dhcp_conf;
|
||||||
@@ -499,16 +549,20 @@ struct daemon {
|
|||||||
struct dhcp_vendor *dhcp_vendors;
|
struct dhcp_vendor *dhcp_vendors;
|
||||||
struct dhcp_mac *dhcp_macs;
|
struct dhcp_mac *dhcp_macs;
|
||||||
struct dhcp_boot *boot_config;
|
struct dhcp_boot *boot_config;
|
||||||
struct dhcp_netid_list *dhcp_ignore, *dhcp_ignore_names;
|
struct dhcp_netid_list *dhcp_ignore, *dhcp_ignore_names, *force_broadcast;
|
||||||
|
char *dhcp_hosts_file, *dhcp_opts_file;
|
||||||
int dhcp_max, tftp_max;
|
int dhcp_max, tftp_max;
|
||||||
|
int start_tftp_port, end_tftp_port;
|
||||||
unsigned int min_leasetime;
|
unsigned int min_leasetime;
|
||||||
struct doctor *doctors;
|
struct doctor *doctors;
|
||||||
unsigned short edns_pktsz;
|
unsigned short edns_pktsz;
|
||||||
|
char *tftp_prefix;
|
||||||
|
|
||||||
/* globally used stuff for DNS */
|
/* globally used stuff for DNS */
|
||||||
char *packet; /* packet buffer */
|
char *packet; /* packet buffer */
|
||||||
int packet_buff_sz; /* size of above */
|
int packet_buff_sz; /* size of above */
|
||||||
char *namebuff; /* MAXDNAME size buffer */
|
char *namebuff; /* MAXDNAME size buffer */
|
||||||
|
unsigned int local_answer, queries_forwarded;
|
||||||
struct serverfd *sfds;
|
struct serverfd *sfds;
|
||||||
struct irec *interfaces;
|
struct irec *interfaces;
|
||||||
struct listener *listeners;
|
struct listener *listeners;
|
||||||
@@ -541,11 +595,11 @@ struct daemon {
|
|||||||
|
|
||||||
/* TFTP stuff */
|
/* TFTP stuff */
|
||||||
struct tftp_transfer *tftp_trans;
|
struct tftp_transfer *tftp_trans;
|
||||||
char *tftp_prefix;
|
|
||||||
};
|
} *daemon;
|
||||||
|
|
||||||
/* cache.c */
|
/* cache.c */
|
||||||
void cache_init(int cachesize, int log);
|
void cache_init(void);
|
||||||
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);
|
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,
|
||||||
@@ -558,9 +612,9 @@ void cache_start_insert(void);
|
|||||||
struct crec *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, struct hostsfile *addn_hosts);
|
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_add_dhcp_entry(char *host_name, struct in_addr *host_address, time_t ttd);
|
||||||
void cache_unhash_dhcp(void);
|
void cache_unhash_dhcp(void);
|
||||||
void dump_cache(struct daemon *daemon, time_t now);
|
void dump_cache(time_t now);
|
||||||
char *cache_get_name(struct crec *crecp);
|
char *cache_get_name(struct crec *crecp);
|
||||||
|
|
||||||
/* rfc1035.c */
|
/* rfc1035.c */
|
||||||
@@ -569,15 +623,14 @@ unsigned short extract_request(HEADER *header, size_t qlen,
|
|||||||
size_t setup_reply(HEADER *header, size_t qlen,
|
size_t setup_reply(HEADER *header, size_t 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, size_t qlen, char *namebuff,
|
int extract_addresses(HEADER *header, size_t qlen, char *namebuff, time_t now);
|
||||||
time_t now, struct daemon *daemon);
|
size_t answer_request(HEADER *header, char *limit, size_t qlen,
|
||||||
size_t answer_request(HEADER *header, char *limit, size_t qlen, struct daemon *daemon,
|
|
||||||
struct in_addr local_addr, struct in_addr local_netmask, time_t now);
|
struct in_addr local_addr, struct in_addr local_netmask, time_t now);
|
||||||
int check_for_bogus_wildcard(HEADER *header, size_t qlen, char *name,
|
int check_for_bogus_wildcard(HEADER *header, size_t qlen, char *name,
|
||||||
struct bogus_addr *addr, time_t now);
|
struct bogus_addr *addr, time_t now);
|
||||||
unsigned char *find_pseudoheader(HEADER *header, size_t plen,
|
unsigned char *find_pseudoheader(HEADER *header, size_t plen,
|
||||||
size_t *len, unsigned char **p, int *is_sign);
|
size_t *len, unsigned char **p, int *is_sign);
|
||||||
int check_for_local_domain(char *name, time_t now, struct daemon *daemon);
|
int check_for_local_domain(char *name, time_t now);
|
||||||
unsigned int questions_crc(HEADER *header, size_t plen, char *buff);
|
unsigned int questions_crc(HEADER *header, size_t plen, char *buff);
|
||||||
size_t resize_packet(HEADER *header, size_t plen,
|
size_t resize_packet(HEADER *header, size_t plen,
|
||||||
unsigned char *pheader, size_t hlen);
|
unsigned char *pheader, size_t hlen);
|
||||||
@@ -588,6 +641,7 @@ int legal_char(char c);
|
|||||||
int canonicalise(char *s);
|
int canonicalise(char *s);
|
||||||
unsigned char *do_rfc1035_name(unsigned char *p, char *sval);
|
unsigned char *do_rfc1035_name(unsigned char *p, char *sval);
|
||||||
void *safe_malloc(size_t size);
|
void *safe_malloc(size_t size);
|
||||||
|
void *whine_malloc(size_t size);
|
||||||
int sa_len(union mysockaddr *addr);
|
int sa_len(union mysockaddr *addr);
|
||||||
int sockaddr_isequal(union mysockaddr *s1, union mysockaddr *s2);
|
int sockaddr_isequal(union mysockaddr *s1, union mysockaddr *s2);
|
||||||
int hostname_isequal(char *a, char *b);
|
int hostname_isequal(char *a, char *b);
|
||||||
@@ -601,49 +655,57 @@ int parse_hex(char *in, unsigned char *out, int maxlen,
|
|||||||
int memcmp_masked(unsigned char *a, unsigned char *b, int len,
|
int memcmp_masked(unsigned char *a, unsigned char *b, int len,
|
||||||
unsigned int mask);
|
unsigned int mask);
|
||||||
int expand_buf(struct iovec *iov, size_t size);
|
int expand_buf(struct iovec *iov, size_t size);
|
||||||
char *print_mac(struct daemon *daemon, unsigned char *mac, int len);
|
char *print_mac(char *buff, unsigned char *mac, int len);
|
||||||
void bump_maxfd(int fd, int *max);
|
void bump_maxfd(int fd, int *max);
|
||||||
int read_write(int fd, unsigned char *packet, int size, int rw);
|
int read_write(int fd, unsigned char *packet, int size, int rw);
|
||||||
|
|
||||||
/* log.c */
|
/* log.c */
|
||||||
void die(char *message, char *arg1);
|
void die(char *message, char *arg1, int exit_code);
|
||||||
int log_start(struct daemon *daemon);
|
void log_start(struct passwd *ent_pw);
|
||||||
|
int log_reopen(char *log_file);
|
||||||
void my_syslog(int priority, const char *format, ...);
|
void my_syslog(int priority, const char *format, ...);
|
||||||
void set_log_writer(fd_set *set, int *maxfdp);
|
void set_log_writer(fd_set *set, int *maxfdp);
|
||||||
void check_log_writer(fd_set *set);
|
void check_log_writer(fd_set *set);
|
||||||
|
void flush_log(void);
|
||||||
|
|
||||||
/* option.c */
|
/* option.c */
|
||||||
struct daemon *read_opts (int argc, char **argv, char *compile_opts);
|
void read_opts (int argc, char **argv, char *compile_opts);
|
||||||
char *option_string(unsigned char opt);
|
char *option_string(unsigned char opt);
|
||||||
|
void reread_dhcp(void);
|
||||||
|
|
||||||
/* forward.c */
|
/* forward.c */
|
||||||
void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now);
|
void reply_query(struct serverfd *sfd, time_t now);
|
||||||
void receive_query(struct listener *listen, struct daemon *daemon, time_t now);
|
void receive_query(struct listener *listen, time_t now);
|
||||||
unsigned char *tcp_request(struct daemon *daemon, int confd, time_t now,
|
unsigned char *tcp_request(int confd, time_t now,
|
||||||
struct in_addr local_addr, struct in_addr netmask);
|
struct in_addr local_addr, struct in_addr netmask);
|
||||||
void server_gone(struct daemon *daemon, struct server *server);
|
void server_gone(struct server *server);
|
||||||
struct frec *get_new_frec(struct daemon *daemon, time_t now, int *wait);
|
struct frec *get_new_frec(time_t now, int *wait);
|
||||||
|
|
||||||
/* network.c */
|
/* network.c */
|
||||||
struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds);
|
int local_bind(int fd, union mysockaddr *addr, char *intname, int is_tcp);
|
||||||
int reload_servers(char *fname, struct daemon *daemon);
|
void pre_allocate_sfds(void);
|
||||||
void check_servers(struct daemon *daemon);
|
int reload_servers(char *fname);
|
||||||
int enumerate_interfaces(struct daemon *daemon);
|
void check_servers(void);
|
||||||
struct listener *create_wildcard_listeners(int port, int have_tftp);
|
int enumerate_interfaces();
|
||||||
struct listener *create_bound_listeners(struct daemon *daemon);
|
struct listener *create_wildcard_listeners(void);
|
||||||
int iface_check(struct daemon *daemon, int family, struct all_addr *addr,
|
struct listener *create_bound_listeners(void);
|
||||||
|
int iface_check(int family, struct all_addr *addr,
|
||||||
struct ifreq *ifr, int *indexp);
|
struct ifreq *ifr, int *indexp);
|
||||||
int fix_fd(int fd);
|
int fix_fd(int fd);
|
||||||
struct in_addr get_ifaddr(struct daemon* daemon, char *intr);
|
struct in_addr get_ifaddr(char *intr);
|
||||||
|
|
||||||
/* dhcp.c */
|
/* dhcp.c */
|
||||||
void dhcp_init(struct daemon *daemon);
|
void dhcp_init(void);
|
||||||
void dhcp_packet(struct daemon *daemon, time_t now);
|
void dhcp_packet(time_t now);
|
||||||
|
|
||||||
struct dhcp_context *address_available(struct dhcp_context *context, struct in_addr addr);
|
struct dhcp_context *address_available(struct dhcp_context *context,
|
||||||
struct dhcp_context *narrow_context(struct dhcp_context *context, struct in_addr taddr);
|
struct in_addr addr,
|
||||||
|
struct dhcp_netid *netids);
|
||||||
|
struct dhcp_context *narrow_context(struct dhcp_context *context,
|
||||||
|
struct in_addr taddr,
|
||||||
|
struct dhcp_netid *netids);
|
||||||
int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool, int negonly);
|
int match_netid(struct dhcp_netid *check, struct dhcp_netid *pool, int negonly);
|
||||||
int address_allocate(struct dhcp_context *context, struct daemon *daemon,
|
int address_allocate(struct dhcp_context *context,
|
||||||
struct in_addr *addrp, unsigned char *hwaddr, int hw_len,
|
struct in_addr *addrp, unsigned char *hwaddr, int hw_len,
|
||||||
struct dhcp_netid *netids, time_t now);
|
struct dhcp_netid *netids, time_t now);
|
||||||
struct dhcp_config *find_config(struct dhcp_config *configs,
|
struct dhcp_config *find_config(struct dhcp_config *configs,
|
||||||
@@ -652,76 +714,80 @@ struct dhcp_config *find_config(struct dhcp_config *configs,
|
|||||||
unsigned char *hwaddr, int hw_len,
|
unsigned char *hwaddr, int hw_len,
|
||||||
int hw_type, char *hostname);
|
int hw_type, char *hostname);
|
||||||
void dhcp_update_configs(struct dhcp_config *configs);
|
void dhcp_update_configs(struct dhcp_config *configs);
|
||||||
void dhcp_read_ethers(struct daemon *daemon);
|
void dhcp_read_ethers(void);
|
||||||
|
void check_dhcp_hosts(int fatal);
|
||||||
struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr);
|
struct dhcp_config *config_find_by_address(struct dhcp_config *configs, struct in_addr addr);
|
||||||
char *strip_hostname(struct daemon *daemon, char *hostname);
|
char *strip_hostname(char *hostname);
|
||||||
char *host_from_dns(struct daemon *daemon, struct in_addr addr);
|
char *host_from_dns(struct in_addr addr);
|
||||||
|
|
||||||
/* lease.c */
|
/* lease.c */
|
||||||
void lease_update_file(struct daemon *daemon, time_t now);
|
void lease_update_file(time_t now);
|
||||||
void lease_update_dns(struct daemon *daemon);
|
void lease_update_dns();
|
||||||
void lease_init(struct daemon *daemon, time_t now);
|
void lease_init(time_t now);
|
||||||
struct dhcp_lease *lease_allocate(struct in_addr addr);
|
struct dhcp_lease *lease_allocate(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,
|
||||||
unsigned char *clid, int hw_len, int hw_type, int clid_len);
|
unsigned char *clid, int hw_len, int hw_type, int clid_len);
|
||||||
void lease_set_hostname(struct dhcp_lease *lease, char *name,
|
void lease_set_hostname(struct dhcp_lease *lease, char *name,
|
||||||
char *suffix, int auth);
|
char *suffix, int auth);
|
||||||
void lease_set_expires(struct dhcp_lease *lease, unsigned int len, time_t now);
|
void lease_set_expires(struct dhcp_lease *lease, unsigned int len, time_t now);
|
||||||
|
void lease_set_interface(struct dhcp_lease *lease, int interface);
|
||||||
struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr, int hw_len, int hw_type,
|
struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr, int hw_len, int hw_type,
|
||||||
unsigned char *clid, int clid_len);
|
unsigned char *clid, int clid_len);
|
||||||
struct dhcp_lease *lease_find_by_addr(struct in_addr addr);
|
struct dhcp_lease *lease_find_by_addr(struct in_addr addr);
|
||||||
void lease_prune(struct dhcp_lease *target, time_t now);
|
void lease_prune(struct dhcp_lease *target, time_t now);
|
||||||
void lease_update_from_configs(struct daemon *daemon);
|
void lease_update_from_configs(void);
|
||||||
int do_script_run(struct daemon *daemon);
|
int do_script_run(time_t now);
|
||||||
|
void rerun_scripts(void);
|
||||||
|
|
||||||
/* rfc2131.c */
|
/* rfc2131.c */
|
||||||
size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_name, size_t sz, time_t now, int unicast_dest);
|
size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
||||||
|
size_t sz, time_t now, int unicast_dest, int *is_inform);
|
||||||
|
|
||||||
/* dnsmasq.c */
|
/* dnsmasq.c */
|
||||||
int make_icmp_sock(void);
|
int make_icmp_sock(void);
|
||||||
int icmp_ping(struct daemon *daemon, struct in_addr addr);
|
int icmp_ping(struct in_addr addr);
|
||||||
void clear_cache_and_reload(struct daemon *daemon, time_t now);
|
void send_event(int fd, int event, int data);
|
||||||
|
void clear_cache_and_reload(time_t now);
|
||||||
|
|
||||||
/* isc.c */
|
/* isc.c */
|
||||||
#ifdef HAVE_ISC_READER
|
#ifdef HAVE_ISC_READER
|
||||||
void load_dhcp(struct daemon *daemon, time_t now);
|
void load_dhcp(time_t now);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* netlink.c */
|
/* netlink.c */
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#ifdef HAVE_LINUX_NETWORK
|
||||||
void netlink_init(struct daemon *daemon);
|
void netlink_init(void);
|
||||||
int iface_enumerate(struct daemon *daemon, void *parm,
|
void netlink_multicast(void);
|
||||||
int (*ipv4_callback)(), int (*ipv6_callback)());
|
|
||||||
void netlink_multicast(struct daemon *daemon);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* bpf.c */
|
/* bpf.c */
|
||||||
#ifndef HAVE_LINUX_NETWORK
|
#ifdef HAVE_BSD_NETWORK
|
||||||
void init_bpf(struct daemon *daemon);
|
void init_bpf(void);
|
||||||
void send_via_bpf(struct daemon *daemon, struct dhcp_packet *mess, size_t len,
|
void send_via_bpf(struct dhcp_packet *mess, size_t len,
|
||||||
struct in_addr iface_addr, struct ifreq *ifr);
|
struct in_addr iface_addr, struct ifreq *ifr);
|
||||||
int iface_enumerate(struct daemon *daemon, void *parm,
|
|
||||||
int (*ipv4_callback)(), int (*ipv6_callback)());
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* bpf.c or netlink.c */
|
||||||
|
int iface_enumerate(void *parm, int (*ipv4_callback)(), int (*ipv6_callback)());
|
||||||
|
|
||||||
/* dbus.c */
|
/* dbus.c */
|
||||||
#ifdef HAVE_DBUS
|
#ifdef HAVE_DBUS
|
||||||
char *dbus_init(struct daemon *daemon);
|
char *dbus_init(void);
|
||||||
void check_dbus_listeners(struct daemon *daemon,
|
void check_dbus_listeners(fd_set *rset, fd_set *wset, fd_set *eset);
|
||||||
fd_set *rset, fd_set *wset, fd_set *eset);
|
void set_dbus_listeners(int *maxfdp, fd_set *rset, fd_set *wset, fd_set *eset);
|
||||||
void set_dbus_listeners(struct daemon *daemon, int *maxfdp,
|
|
||||||
fd_set *rset, fd_set *wset, fd_set *eset);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* helper.c */
|
/* helper.c */
|
||||||
int create_helper(struct daemon *daemon, int log_fd);
|
#ifndef NO_FORK
|
||||||
void helper_write(struct daemon *daemon);
|
int create_helper(int log_fd, long max_fd);
|
||||||
void queue_script(struct daemon *daemon, int action,
|
void helper_write(void);
|
||||||
struct dhcp_lease *lease, char *hostname);
|
void queue_script(int action, struct dhcp_lease *lease,
|
||||||
|
char *hostname, time_t now);
|
||||||
int helper_buf_empty(void);
|
int helper_buf_empty(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* tftp.c */
|
/* tftp.c */
|
||||||
#ifdef HAVE_TFTP
|
#ifdef HAVE_TFTP
|
||||||
void tftp_request(struct listener *listen, struct daemon *daemon, time_t now);
|
void tftp_request(struct listener *listen, time_t now);
|
||||||
void check_tftp_listeners(struct daemon *daemon, fd_set *rset, time_t now);
|
void check_tftp_listeners(fd_set *rset, time_t now);
|
||||||
#endif
|
#endif
|
||||||
+75
-46
@@ -1,13 +1,17 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000 - 2005 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -21,7 +25,7 @@ static struct frec *lookup_frec_by_sender(unsigned short id,
|
|||||||
static unsigned short get_id(int force, unsigned short force_id, unsigned int crc);
|
static unsigned short get_id(int force, unsigned short force_id, unsigned int crc);
|
||||||
|
|
||||||
|
|
||||||
/* Send a UDP packet with it's source address set as "source"
|
/* Send a UDP packet with its 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, size_t len,
|
static void send_from(int fd, int nowild, char *packet, size_t len,
|
||||||
union mysockaddr *to, struct all_addr *source,
|
union mysockaddr *to, struct all_addr *source,
|
||||||
@@ -107,7 +111,7 @@ static void send_from(int fd, int nowild, char *packet, size_t len,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned short search_servers(struct daemon *daemon, time_t now, struct all_addr **addrpp,
|
static unsigned short search_servers(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)
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -140,7 +144,7 @@ static unsigned short search_servers(struct daemon *daemon, time_t now, struct a
|
|||||||
*addrpp = (struct all_addr *)&serv->addr.in6.sin6_addr;
|
*addrpp = (struct all_addr *)&serv->addr.in6.sin6_addr;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else if (!flags)
|
else if (!flags || (flags & F_NXDOMAIN))
|
||||||
flags = F_NOERR;
|
flags = F_NOERR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -161,9 +165,9 @@ static unsigned short search_servers(struct daemon *daemon, time_t now, struct a
|
|||||||
flags = F_NXDOMAIN;
|
flags = F_NXDOMAIN;
|
||||||
else if (serv->flags & SERV_LITERAL_ADDRESS)
|
else if (serv->flags & SERV_LITERAL_ADDRESS)
|
||||||
{
|
{
|
||||||
if ((sflag | F_QUERY ) & qtype)
|
if (sflag & qtype)
|
||||||
{
|
{
|
||||||
flags = qtype & ~F_BIGNAME;
|
flags = sflag;
|
||||||
if (serv->addr.sa.sa_family == AF_INET)
|
if (serv->addr.sa.sa_family == AF_INET)
|
||||||
*addrpp = (struct all_addr *)&serv->addr.in.sin_addr;
|
*addrpp = (struct all_addr *)&serv->addr.in.sin_addr;
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
@@ -171,35 +175,34 @@ static unsigned short search_servers(struct daemon *daemon, time_t now, struct a
|
|||||||
*addrpp = (struct all_addr *)&serv->addr.in6.sin6_addr;
|
*addrpp = (struct all_addr *)&serv->addr.in6.sin6_addr;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else if (!flags)
|
else if (!flags || (flags & F_NXDOMAIN))
|
||||||
flags = F_NOERR;
|
flags = F_NOERR;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags & ~(F_NOERR | F_NXDOMAIN)) /* flags set here means a literal found */
|
if (flags == 0 && !(qtype & F_BIGNAME) &&
|
||||||
{
|
|
||||||
if (flags & F_QUERY)
|
|
||||||
log_query(F_CONFIG | F_FORWARD | F_NEG, qdomain, NULL, 0, NULL, 0);
|
|
||||||
else
|
|
||||||
log_query(F_CONFIG | F_FORWARD | flags, qdomain, *addrpp, 0, NULL, 0);
|
|
||||||
}
|
|
||||||
else if (qtype && !(qtype & F_BIGNAME) &&
|
|
||||||
(daemon->options & OPT_NODOTS_LOCAL) && !strchr(qdomain, '.') && namelen != 0)
|
(daemon->options & OPT_NODOTS_LOCAL) && !strchr(qdomain, '.') && namelen != 0)
|
||||||
/* don't forward simple names, make exception from NS queries and empty name. */
|
/* don't forward simple names, make exception for NS queries and empty name. */
|
||||||
flags = F_NXDOMAIN;
|
flags = F_NXDOMAIN;
|
||||||
|
|
||||||
if (flags == F_NXDOMAIN && check_for_local_domain(qdomain, now, daemon))
|
if (flags == F_NXDOMAIN && check_for_local_domain(qdomain, now))
|
||||||
flags = F_NOERR;
|
flags = F_NOERR;
|
||||||
|
|
||||||
|
if (flags)
|
||||||
|
{
|
||||||
|
int logflags = 0;
|
||||||
|
|
||||||
if (flags == F_NXDOMAIN || 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);
|
logflags = F_NEG | qtype;
|
||||||
|
|
||||||
|
log_query(logflags | flags | F_CONFIG | F_FORWARD, qdomain, *addrpp, 0, NULL, 0);
|
||||||
|
}
|
||||||
|
|
||||||
return flags;
|
return flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* returns new last_server */
|
static int forward_query(int udpfd, union mysockaddr *udpaddr,
|
||||||
static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *udpaddr,
|
|
||||||
struct all_addr *dst_addr, unsigned int dst_iface,
|
struct all_addr *dst_addr, unsigned int dst_iface,
|
||||||
HEADER *header, size_t plen, time_t now, struct frec *forward)
|
HEADER *header, size_t plen, time_t now, struct frec *forward)
|
||||||
{
|
{
|
||||||
@@ -218,6 +221,7 @@ static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *ud
|
|||||||
{
|
{
|
||||||
/* 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;
|
||||||
|
forward->sentto->failed_queries++;
|
||||||
if (!(daemon->options & OPT_ORDER))
|
if (!(daemon->options & OPT_ORDER))
|
||||||
{
|
{
|
||||||
forward->forwardall = 1;
|
forward->forwardall = 1;
|
||||||
@@ -231,9 +235,9 @@ static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *ud
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (gotname)
|
if (gotname)
|
||||||
flags = search_servers(daemon, now, &addrp, gotname, daemon->namebuff, &type, &domain);
|
flags = search_servers(now, &addrp, gotname, daemon->namebuff, &type, &domain);
|
||||||
|
|
||||||
if (!flags && !(forward = get_new_frec(daemon, now, NULL)))
|
if (!flags && !(forward = get_new_frec(now, NULL)))
|
||||||
/* table full - server failure. */
|
/* table full - server failure. */
|
||||||
flags = F_NEG;
|
flags = F_NEG;
|
||||||
|
|
||||||
@@ -311,6 +315,7 @@ static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *ud
|
|||||||
(struct all_addr *)&start->addr.in6.sin6_addr, 0,
|
(struct all_addr *)&start->addr.in6.sin6_addr, 0,
|
||||||
NULL, 0);
|
NULL, 0);
|
||||||
#endif
|
#endif
|
||||||
|
start->queries++;
|
||||||
forwarded = 1;
|
forwarded = 1;
|
||||||
forward->sentto = start;
|
forward->sentto = start;
|
||||||
if (!forward->forwardall)
|
if (!forward->forwardall)
|
||||||
@@ -327,7 +332,7 @@ static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *ud
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (forwarded)
|
if (forwarded)
|
||||||
return;
|
return 1;
|
||||||
|
|
||||||
/* 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);
|
||||||
@@ -341,10 +346,10 @@ static void forward_query(struct daemon *daemon, int udpfd, union mysockaddr *ud
|
|||||||
send_from(udpfd, daemon->options & OPT_NOWILD, (char *)header, plen, udpaddr, dst_addr, dst_iface);
|
send_from(udpfd, daemon->options & OPT_NOWILD, (char *)header, plen, udpaddr, dst_addr, dst_iface);
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t process_reply(struct daemon *daemon, HEADER *header, time_t now,
|
static size_t process_reply(HEADER *header, time_t now,
|
||||||
struct server *server, size_t n)
|
struct server *server, size_t n)
|
||||||
{
|
{
|
||||||
unsigned char *pheader, *sizep;
|
unsigned char *pheader, *sizep;
|
||||||
@@ -389,7 +394,7 @@ static size_t process_reply(struct daemon *daemon, HEADER *header, time_t now,
|
|||||||
{
|
{
|
||||||
if (header->rcode == NXDOMAIN &&
|
if (header->rcode == NXDOMAIN &&
|
||||||
extract_request(header, n, daemon->namebuff, NULL) &&
|
extract_request(header, n, daemon->namebuff, NULL) &&
|
||||||
check_for_local_domain(daemon->namebuff, now, daemon))
|
check_for_local_domain(daemon->namebuff, now))
|
||||||
{
|
{
|
||||||
/* if we forwarded a query for a locally known name (because it was for
|
/* 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,
|
an unknown type) and the answer is NXDOMAIN, convert that to NODATA,
|
||||||
@@ -399,7 +404,11 @@ static size_t process_reply(struct daemon *daemon, HEADER *header, time_t now,
|
|||||||
header->rcode = NOERROR;
|
header->rcode = NOERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
extract_addresses(header, n, daemon->namebuff, now, daemon);
|
if (extract_addresses(header, n, daemon->namebuff, now))
|
||||||
|
{
|
||||||
|
my_syslog(LOG_WARNING, _("possible DNS-rebind attack detected"));
|
||||||
|
munged = 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* do this after extract_addresses. Ensure NODATA reply and remove
|
/* do this after extract_addresses. Ensure NODATA reply and remove
|
||||||
@@ -419,7 +428,7 @@ static size_t process_reply(struct daemon *daemon, HEADER *header, time_t now,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* sets new last_server */
|
/* sets new last_server */
|
||||||
void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now)
|
void reply_query(struct serverfd *sfd, time_t now)
|
||||||
{
|
{
|
||||||
/* 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 */
|
||||||
@@ -467,7 +476,7 @@ void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now)
|
|||||||
{
|
{
|
||||||
header->qr = 0;
|
header->qr = 0;
|
||||||
header->tc = 0;
|
header->tc = 0;
|
||||||
forward_query(daemon, -1, NULL, NULL, 0, header, nn, now, forward);
|
forward_query(-1, NULL, NULL, 0, header, nn, now, forward);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -489,6 +498,7 @@ void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!(daemon->options & OPT_ALL_SERVERS))
|
||||||
daemon->last_server = server;
|
daemon->last_server = server;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -499,7 +509,7 @@ void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now)
|
|||||||
if (forward->forwardall == 0 || --forward->forwardall == 1 ||
|
if (forward->forwardall == 0 || --forward->forwardall == 1 ||
|
||||||
(header->rcode != REFUSED && header->rcode != SERVFAIL))
|
(header->rcode != REFUSED && header->rcode != SERVFAIL))
|
||||||
{
|
{
|
||||||
if ((nn = process_reply(daemon, header, now, server, (size_t)n)))
|
if ((nn = process_reply(header, now, server, (size_t)n)))
|
||||||
{
|
{
|
||||||
header->id = htons(forward->orig_id);
|
header->id = htons(forward->orig_id);
|
||||||
header->ra = 1; /* recursion if available */
|
header->ra = 1; /* recursion if available */
|
||||||
@@ -511,7 +521,7 @@ void reply_query(struct serverfd *sfd, struct daemon *daemon, time_t now)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void receive_query(struct listener *listen, struct daemon *daemon, time_t now)
|
void receive_query(struct listener *listen, time_t now)
|
||||||
{
|
{
|
||||||
HEADER *header = (HEADER *)daemon->packet;
|
HEADER *header = (HEADER *)daemon->packet;
|
||||||
union mysockaddr source_addr;
|
union mysockaddr source_addr;
|
||||||
@@ -531,6 +541,9 @@ void receive_query(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
#endif
|
#endif
|
||||||
#if defined(HAVE_LINUX_NETWORK)
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
|
char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
|
||||||
|
#elif defined(IP_RECVDSTADDR) && defined(HAVE_SOLARIS_NETWORK)
|
||||||
|
char control[CMSG_SPACE(sizeof(struct in_addr)) +
|
||||||
|
CMSG_SPACE(sizeof(unsigned int))];
|
||||||
#elif defined(IP_RECVDSTADDR)
|
#elif defined(IP_RECVDSTADDR)
|
||||||
char control[CMSG_SPACE(sizeof(struct in_addr)) +
|
char control[CMSG_SPACE(sizeof(struct in_addr)) +
|
||||||
CMSG_SPACE(sizeof(struct sockaddr_dl))];
|
CMSG_SPACE(sizeof(struct sockaddr_dl))];
|
||||||
@@ -598,7 +611,11 @@ void receive_query(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVDSTADDR)
|
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVDSTADDR)
|
||||||
dst_addr_4 = dst_addr.addr.addr4 = *((struct in_addr *)CMSG_DATA(cmptr));
|
dst_addr_4 = dst_addr.addr.addr4 = *((struct in_addr *)CMSG_DATA(cmptr));
|
||||||
else if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
else if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
||||||
|
#ifdef HAVE_SOLARIS_NETWORK
|
||||||
|
if_index = *((unsigned int *)CMSG_DATA(cmptr));
|
||||||
|
#else
|
||||||
if_index = ((struct sockaddr_dl *)CMSG_DATA(cmptr))->sdl_index;
|
if_index = ((struct sockaddr_dl *)CMSG_DATA(cmptr))->sdl_index;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -628,7 +645,7 @@ void receive_query(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
return;
|
return;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!iface_check(daemon, listen->family, &dst_addr, &ifr, &if_index))
|
if (!iface_check(listen->family, &dst_addr, &ifr, &if_index))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (listen->family == AF_INET &&
|
if (listen->family == AF_INET &&
|
||||||
@@ -651,20 +668,26 @@ void receive_query(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
m = answer_request (header, ((char *) header) + PACKETSZ, (size_t)n, daemon,
|
m = answer_request (header, ((char *) header) + PACKETSZ, (size_t)n,
|
||||||
dst_addr_4, netmask, now);
|
dst_addr_4, netmask, now);
|
||||||
if (m >= 1)
|
if (m >= 1)
|
||||||
send_from(listen->fd, daemon->options & OPT_NOWILD, (char *)header, m, &source_addr, &dst_addr, if_index);
|
{
|
||||||
|
send_from(listen->fd, daemon->options & OPT_NOWILD, (char *)header,
|
||||||
|
m, &source_addr, &dst_addr, if_index);
|
||||||
|
daemon->local_answer++;
|
||||||
|
}
|
||||||
|
else if (forward_query(listen->fd, &source_addr, &dst_addr, if_index,
|
||||||
|
header, (size_t)n, now, NULL))
|
||||||
|
daemon->queries_forwarded++;
|
||||||
else
|
else
|
||||||
forward_query(daemon, listen->fd, &source_addr, &dst_addr, if_index,
|
daemon->local_answer++;
|
||||||
header, (size_t)n, now, NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The daemon forks before calling this: it should deal with one connection,
|
/* The daemon forks before calling this: it should deal with one connection,
|
||||||
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. */
|
||||||
unsigned char *tcp_request(struct daemon *daemon, int confd, time_t now,
|
unsigned char *tcp_request(int confd, time_t now,
|
||||||
struct in_addr local_addr, struct in_addr netmask)
|
struct in_addr local_addr, struct in_addr netmask)
|
||||||
{
|
{
|
||||||
int size = 0;
|
int size = 0;
|
||||||
@@ -672,7 +695,7 @@ unsigned char *tcp_request(struct daemon *daemon, int confd, time_t now,
|
|||||||
unsigned short qtype, gotname;
|
unsigned short qtype, gotname;
|
||||||
unsigned char c1, c2;
|
unsigned char c1, c2;
|
||||||
/* Max TCP packet + slop */
|
/* Max TCP packet + slop */
|
||||||
unsigned char *packet = malloc(65536 + MAXDNAME + RRFIXEDSZ);
|
unsigned char *packet = whine_malloc(65536 + MAXDNAME + RRFIXEDSZ);
|
||||||
HEADER *header;
|
HEADER *header;
|
||||||
struct server *last_server;
|
struct server *last_server;
|
||||||
|
|
||||||
@@ -708,9 +731,12 @@ unsigned char *tcp_request(struct daemon *daemon, int confd, time_t now,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* m > 0 if answered from cache */
|
/* m > 0 if answered from cache */
|
||||||
m = answer_request(header, ((char *) header) + 65536, (unsigned int)size, daemon,
|
m = answer_request(header, ((char *) header) + 65536, (unsigned int)size,
|
||||||
local_addr, netmask, now);
|
local_addr, netmask, now);
|
||||||
|
|
||||||
|
/* Do this by steam now we're not in the select() loop */
|
||||||
|
check_log_writer(NULL);
|
||||||
|
|
||||||
if (m == 0)
|
if (m == 0)
|
||||||
{
|
{
|
||||||
unsigned short flags = 0;
|
unsigned short flags = 0;
|
||||||
@@ -719,7 +745,7 @@ unsigned char *tcp_request(struct daemon *daemon, int confd, time_t now,
|
|||||||
char *domain = NULL;
|
char *domain = NULL;
|
||||||
|
|
||||||
if (gotname)
|
if (gotname)
|
||||||
flags = search_servers(daemon, now, &addrp, gotname, daemon->namebuff, &type, &domain);
|
flags = search_servers(now, &addrp, gotname, daemon->namebuff, &type, &domain);
|
||||||
|
|
||||||
if (type != 0 || (daemon->options & OPT_ORDER) || !daemon->last_server)
|
if (type != 0 || (daemon->options & OPT_ORDER) || !daemon->last_server)
|
||||||
last_server = daemon->servers;
|
last_server = daemon->servers;
|
||||||
@@ -754,7 +780,8 @@ unsigned char *tcp_request(struct daemon *daemon, int confd, time_t now,
|
|||||||
|
|
||||||
if ((last_server->tcpfd == -1) &&
|
if ((last_server->tcpfd == -1) &&
|
||||||
(last_server->tcpfd = socket(last_server->addr.sa.sa_family, SOCK_STREAM, 0)) != -1 &&
|
(last_server->tcpfd = socket(last_server->addr.sa.sa_family, SOCK_STREAM, 0)) != -1 &&
|
||||||
connect(last_server->tcpfd, &last_server->addr.sa, sa_len(&last_server->addr)) == -1)
|
(!local_bind(last_server->tcpfd, &last_server->source_addr, last_server->interface, 1) ||
|
||||||
|
connect(last_server->tcpfd, &last_server->addr.sa, sa_len(&last_server->addr)) == -1))
|
||||||
{
|
{
|
||||||
close(last_server->tcpfd);
|
close(last_server->tcpfd);
|
||||||
last_server->tcpfd = -1;
|
last_server->tcpfd = -1;
|
||||||
@@ -799,7 +826,7 @@ unsigned char *tcp_request(struct daemon *daemon, int confd, time_t now,
|
|||||||
someone might be attempting to insert bogus values into the cache by
|
someone might be attempting to insert bogus values into the cache by
|
||||||
sending replies containing questions and bogus answers. */
|
sending replies containing questions and bogus answers. */
|
||||||
if (crc == questions_crc(header, (unsigned int)m, daemon->namebuff))
|
if (crc == questions_crc(header, (unsigned int)m, daemon->namebuff))
|
||||||
m = process_reply(daemon, header, now, last_server, (unsigned int)m);
|
m = process_reply(header, now, last_server, (unsigned int)m);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -810,6 +837,8 @@ unsigned char *tcp_request(struct daemon *daemon, int confd, time_t now,
|
|||||||
m = setup_reply(header, (unsigned int)size, addrp, flags, daemon->local_ttl);
|
m = setup_reply(header, (unsigned int)size, addrp, flags, daemon->local_ttl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
check_log_writer(NULL);
|
||||||
|
|
||||||
c1 = m>>8;
|
c1 = m>>8;
|
||||||
c2 = m;
|
c2 = m;
|
||||||
if (!read_write(confd, &c1, 1, 0) ||
|
if (!read_write(confd, &c1, 1, 0) ||
|
||||||
@@ -823,7 +852,7 @@ static struct frec *allocate_frec(time_t now)
|
|||||||
{
|
{
|
||||||
struct frec *f;
|
struct frec *f;
|
||||||
|
|
||||||
if ((f = (struct frec *)malloc(sizeof(struct frec))))
|
if ((f = (struct frec *)whine_malloc(sizeof(struct frec))))
|
||||||
{
|
{
|
||||||
f->next = frec_list;
|
f->next = frec_list;
|
||||||
f->time = now;
|
f->time = now;
|
||||||
@@ -837,7 +866,7 @@ static struct frec *allocate_frec(time_t now)
|
|||||||
/* if wait==NULL return a free or older than TIMEOUT record.
|
/* if wait==NULL return a free or older than TIMEOUT record.
|
||||||
else return *wait zero if one available, or *wait is delay to
|
else return *wait zero if one available, or *wait is delay to
|
||||||
when the oldest in-use record will expire. */
|
when the oldest in-use record will expire. */
|
||||||
struct frec *get_new_frec(struct daemon *daemon, time_t now, int *wait)
|
struct frec *get_new_frec(time_t now, int *wait)
|
||||||
{
|
{
|
||||||
struct frec *f, *oldest;
|
struct frec *f, *oldest;
|
||||||
int count;
|
int count;
|
||||||
@@ -918,7 +947,7 @@ static struct frec *lookup_frec_by_sender(unsigned short id,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* A server record is going away, remove references to it */
|
/* A server record is going away, remove references to it */
|
||||||
void server_gone(struct daemon *daemon, struct server *server)
|
void server_gone(struct server *server)
|
||||||
{
|
{
|
||||||
struct frec *f;
|
struct frec *f;
|
||||||
|
|
||||||
|
|||||||
+130
-53
@@ -1,13 +1,17 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -24,38 +28,45 @@
|
|||||||
main process.
|
main process.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifndef NO_FORK
|
||||||
|
|
||||||
|
static void my_setenv(const char *name, const char *value, int *error);
|
||||||
|
|
||||||
struct script_data
|
struct script_data
|
||||||
{
|
{
|
||||||
unsigned char action, hwaddr_len, hwaddr_type;
|
unsigned char action, hwaddr_len, hwaddr_type;
|
||||||
unsigned char clid_len, hostname_len, uclass_len, vclass_len;
|
unsigned char clid_len, hostname_len, uclass_len, vclass_len;
|
||||||
struct in_addr addr;
|
struct in_addr addr;
|
||||||
|
unsigned int remaining_time;
|
||||||
#ifdef HAVE_BROKEN_RTC
|
#ifdef HAVE_BROKEN_RTC
|
||||||
unsigned int length;
|
unsigned int length;
|
||||||
#else
|
#else
|
||||||
time_t expires;
|
time_t expires;
|
||||||
#endif
|
#endif
|
||||||
unsigned char hwaddr[DHCP_CHADDR_MAX];
|
unsigned char hwaddr[DHCP_CHADDR_MAX];
|
||||||
|
char interface[IF_NAMESIZE];
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct script_data *buf;
|
static struct script_data *buf = NULL;
|
||||||
static size_t bytes_in_buf, buf_size;
|
static size_t bytes_in_buf = 0, buf_size = 0;
|
||||||
|
|
||||||
int create_helper(struct daemon *daemon, int log_fd)
|
int create_helper(int event_fd, long max_fd)
|
||||||
{
|
{
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
int i, pipefd[2];
|
int i, pipefd[2];
|
||||||
struct sigaction sigact;
|
struct sigaction sigact;
|
||||||
|
|
||||||
buf = NULL;
|
|
||||||
buf_size = bytes_in_buf = 0;
|
|
||||||
|
|
||||||
if (!daemon->dhcp || !daemon->lease_change_command)
|
if (!daemon->dhcp || !daemon->lease_change_command)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
/* create the pipe through which the main program sends us commands,
|
/* create the pipe through which the main program sends us commands,
|
||||||
then fork our process. */
|
then fork our process. By now it's too late to die(), we just log
|
||||||
|
any failure via the main process. */
|
||||||
if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1)
|
if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1)
|
||||||
|
{
|
||||||
|
send_event(event_fd, EVENT_PIPE_ERR, errno);
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
if (pid != 0)
|
if (pid != 0)
|
||||||
{
|
{
|
||||||
@@ -63,21 +74,19 @@ int create_helper(struct daemon *daemon, int log_fd)
|
|||||||
return pipefd[1];
|
return pipefd[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ignore SIGTERM, so that we can clean up when the main process gets hit */
|
/* ignore SIGTERM, so that we can clean up when the main process gets hit
|
||||||
|
and SIGALRM so that we can use sleep() */
|
||||||
sigact.sa_handler = SIG_IGN;
|
sigact.sa_handler = SIG_IGN;
|
||||||
sigact.sa_flags = 0;
|
sigact.sa_flags = 0;
|
||||||
sigemptyset(&sigact.sa_mask);
|
sigemptyset(&sigact.sa_mask);
|
||||||
sigaction(SIGTERM, &sigact, NULL);
|
sigaction(SIGTERM, &sigact, NULL);
|
||||||
|
sigaction(SIGALRM, &sigact, NULL);
|
||||||
|
|
||||||
/* close all the sockets etc, we don't need them here */
|
/* close all the sockets etc, we don't need them here */
|
||||||
for (i = 0; i < 64; i++)
|
for (max_fd--; max_fd > 0; max_fd--)
|
||||||
if (i != STDOUT_FILENO && i != STDERR_FILENO &&
|
if (max_fd != STDOUT_FILENO && max_fd != STDERR_FILENO &&
|
||||||
i != STDIN_FILENO && i != pipefd[0] && i != log_fd)
|
max_fd != STDIN_FILENO && max_fd != pipefd[0] && max_fd != event_fd)
|
||||||
close(i);
|
close(max_fd);
|
||||||
|
|
||||||
/* don't give our end of the pipe to our children */
|
|
||||||
if ((i = fcntl(pipefd[0], F_GETFD)) != -1)
|
|
||||||
fcntl(pipefd[0], F_SETFD, i | FD_CLOEXEC);
|
|
||||||
|
|
||||||
/* loop here */
|
/* loop here */
|
||||||
while(1)
|
while(1)
|
||||||
@@ -85,6 +94,7 @@ int create_helper(struct daemon *daemon, int log_fd)
|
|||||||
struct script_data data;
|
struct script_data data;
|
||||||
char *p, *action_str, *hostname = NULL;
|
char *p, *action_str, *hostname = NULL;
|
||||||
unsigned char *buf = (unsigned char *)daemon->namebuff;
|
unsigned char *buf = (unsigned char *)daemon->namebuff;
|
||||||
|
int err = 0;
|
||||||
|
|
||||||
/* we read zero bytes when pipe closed: this is our signal to exit */
|
/* we read zero bytes when pipe closed: this is our signal to exit */
|
||||||
if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1))
|
if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1))
|
||||||
@@ -130,32 +140,49 @@ int create_helper(struct daemon *daemon, int log_fd)
|
|||||||
if (!read_write(pipefd[0], buf, data.hostname_len + data.uclass_len + data.vclass_len, 1))
|
if (!read_write(pipefd[0], buf, data.hostname_len + data.uclass_len + data.vclass_len, 1))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if ((pid = fork()) == -1)
|
/* possible fork errors are all temporary resource problems */
|
||||||
|
while ((pid = fork()) == -1 && (errno == EAGAIN || errno == ENOMEM))
|
||||||
|
sleep(2);
|
||||||
|
|
||||||
|
if (pid == -1)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* wait for child to complete */
|
/* wait for child to complete */
|
||||||
if (pid != 0)
|
if (pid != 0)
|
||||||
|
{
|
||||||
|
/* reap our children's children, if necessary */
|
||||||
|
while (1)
|
||||||
{
|
{
|
||||||
int status;
|
int status;
|
||||||
waitpid(pid, &status, 0);
|
pid_t rc = wait(&status);
|
||||||
|
|
||||||
|
if (rc == pid)
|
||||||
|
{
|
||||||
|
/* On error send event back to main process for logging */
|
||||||
if (WIFSIGNALED(status))
|
if (WIFSIGNALED(status))
|
||||||
my_syslog(LOG_WARNING, _("child process killed by signal %d"), WTERMSIG(status));
|
send_event(event_fd, EVENT_KILLED, WTERMSIG(status));
|
||||||
else if (WIFEXITED(status) && WEXITSTATUS(status) != 0)
|
else if (WIFEXITED(status) && WEXITSTATUS(status) != 0)
|
||||||
my_syslog(LOG_WARNING, _("child process exited with status %d"), WEXITSTATUS(status));
|
send_event(event_fd, EVENT_EXITED, WEXITSTATUS(status));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (rc == -1 && errno != EINTR)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.clid_len != 0)
|
if (data.clid_len != 0)
|
||||||
setenv("DNSMASQ_CLIENT_ID", daemon->packet, 1);
|
my_setenv("DNSMASQ_CLIENT_ID", daemon->packet, &err);
|
||||||
else
|
|
||||||
unsetenv("DNSMASQ_CLIENT_ID");
|
if (strlen(data.interface) != 0)
|
||||||
|
my_setenv("DNSMASQ_INTERFACE", data.interface, &err);
|
||||||
|
|
||||||
#ifdef HAVE_BROKEN_RTC
|
#ifdef HAVE_BROKEN_RTC
|
||||||
setenv("DNSMASQ_LEASE_LENGTH", daemon->dhcp_buff2, 1);
|
my_setenv("DNSMASQ_LEASE_LENGTH", daemon->dhcp_buff2, &err);
|
||||||
unsetenv("DNSMASQ_LEASE_EXPIRES");
|
|
||||||
#else
|
#else
|
||||||
setenv("DNSMASQ_LEASE_EXPIRES", daemon->dhcp_buff2, 1);
|
my_setenv("DNSMASQ_LEASE_EXPIRES", daemon->dhcp_buff2, &err);
|
||||||
unsetenv("DNSMASQ_LEASE_LENGTH");
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (data.vclass_len != 0)
|
if (data.vclass_len != 0)
|
||||||
@@ -164,11 +191,9 @@ int create_helper(struct daemon *daemon, int log_fd)
|
|||||||
/* cannot have = chars in env - truncate if found . */
|
/* cannot have = chars in env - truncate if found . */
|
||||||
if ((p = strchr((char *)buf, '=')))
|
if ((p = strchr((char *)buf, '=')))
|
||||||
*p = 0;
|
*p = 0;
|
||||||
setenv("DNSMASQ_VENDOR_CLASS", (char *)buf, 1);
|
my_setenv("DNSMASQ_VENDOR_CLASS", (char *)buf, &err);
|
||||||
buf += data.vclass_len;
|
buf += data.vclass_len;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
unsetenv("DNSMASQ_VENDOR_CLASS");
|
|
||||||
|
|
||||||
if (data.uclass_len != 0)
|
if (data.uclass_len != 0)
|
||||||
{
|
{
|
||||||
@@ -183,45 +208,80 @@ int create_helper(struct daemon *daemon, int log_fd)
|
|||||||
if (strlen((char *)buf) != 0)
|
if (strlen((char *)buf) != 0)
|
||||||
{
|
{
|
||||||
sprintf(daemon->dhcp_buff2, "DNSMASQ_USER_CLASS%i", i++);
|
sprintf(daemon->dhcp_buff2, "DNSMASQ_USER_CLASS%i", i++);
|
||||||
setenv(daemon->dhcp_buff2, (char *)buf, 1);
|
my_setenv(daemon->dhcp_buff2, (char *)buf, &err);
|
||||||
}
|
}
|
||||||
buf += len;
|
buf += len;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sprintf(daemon->dhcp_buff2, "%u ", data.remaining_time);
|
||||||
|
my_setenv("DNSMASQ_TIME_REMAINING", daemon->dhcp_buff2, &err);
|
||||||
|
|
||||||
if (data.hostname_len != 0)
|
if (data.hostname_len != 0)
|
||||||
{
|
{
|
||||||
hostname = (char *)buf;
|
hostname = (char *)buf;
|
||||||
hostname[data.hostname_len - 1] = 0;
|
hostname[data.hostname_len - 1] = 0;
|
||||||
canonicalise(hostname);
|
if (!canonicalise(hostname))
|
||||||
|
hostname = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.action == ACTION_OLD_HOSTNAME && hostname)
|
if (data.action == ACTION_OLD_HOSTNAME && hostname)
|
||||||
{
|
{
|
||||||
setenv("DNSMASQ_OLD_HOSTNAME", hostname, 1);
|
my_setenv("DNSMASQ_OLD_HOSTNAME", hostname, &err);
|
||||||
hostname = NULL;
|
hostname = NULL;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
unsetenv("DNSMASQ_OLD_HOSTNAME");
|
/* we need to have the event_fd around if exec fails */
|
||||||
|
if ((i = fcntl(event_fd, F_GETFD)) != -1)
|
||||||
|
fcntl(event_fd, F_SETFD, i | FD_CLOEXEC);
|
||||||
|
close(pipefd[0]);
|
||||||
|
|
||||||
p = strrchr(daemon->lease_change_command, '/');
|
p = strrchr(daemon->lease_change_command, '/');
|
||||||
|
if (err == 0)
|
||||||
|
{
|
||||||
execl(daemon->lease_change_command,
|
execl(daemon->lease_change_command,
|
||||||
p ? p+1 : daemon->lease_change_command,
|
p ? p+1 : daemon->lease_change_command,
|
||||||
action_str, daemon->dhcp_buff, inet_ntoa(data.addr), hostname, (char*)NULL);
|
action_str, daemon->dhcp_buff, inet_ntoa(data.addr), hostname, (char*)NULL);
|
||||||
|
err = errno;
|
||||||
/* log socket should still be open, right? */
|
}
|
||||||
my_syslog(LOG_ERR, _("failed to execute %s: %s"),
|
/* failed, send event so the main process logs the problem */
|
||||||
daemon->lease_change_command, strerror(errno));
|
send_event(event_fd, EVENT_EXEC_ERR, err);
|
||||||
_exit(0);
|
_exit(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void my_setenv(const char *name, const char *value, int *error)
|
||||||
|
{
|
||||||
|
if (*error == 0)
|
||||||
|
{
|
||||||
|
#if defined(HAVE_SOLARIS_NETWORK) && !defined(HAVE_SOLARIS_PRIVS)
|
||||||
|
/* old Solaris is missing setenv..... */
|
||||||
|
char *p;
|
||||||
|
|
||||||
|
if (!(p = malloc(strlen(name) + strlen(value) + 2)))
|
||||||
|
*error = ENOMEM;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
strcpy(p, name);
|
||||||
|
strcat(p, "=");
|
||||||
|
strcat(p, value);
|
||||||
|
|
||||||
|
if (putenv(p) != 0)
|
||||||
|
*error = errno;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
if (setenv(name, value, 1) != 0)
|
||||||
|
*error = errno;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* pack up lease data into a buffer */
|
/* pack up lease data into a buffer */
|
||||||
void queue_script(struct daemon *daemon, int action, struct dhcp_lease *lease, char *hostname)
|
void queue_script(int action, struct dhcp_lease *lease, char *hostname, time_t now)
|
||||||
{
|
{
|
||||||
unsigned char *p;
|
unsigned char *p;
|
||||||
size_t size;
|
size_t size;
|
||||||
unsigned int hostname_len = 0, clid_len = 0, vclass_len = 0, uclass_len = 0;
|
unsigned int i, hostname_len = 0, clid_len = 0, vclass_len = 0, uclass_len = 0;
|
||||||
|
|
||||||
/* no script */
|
/* no script */
|
||||||
if (daemon->helperfd == -1)
|
if (daemon->helperfd == -1)
|
||||||
@@ -246,7 +306,7 @@ void queue_script(struct daemon *daemon, int action, struct dhcp_lease *lease, c
|
|||||||
if (size < sizeof(struct script_data) + 200)
|
if (size < sizeof(struct script_data) + 200)
|
||||||
size = sizeof(struct script_data) + 200;
|
size = sizeof(struct script_data) + 200;
|
||||||
|
|
||||||
if (!(new = malloc(size)))
|
if (!(new = whine_malloc(size)))
|
||||||
return;
|
return;
|
||||||
if (buf)
|
if (buf)
|
||||||
free(buf);
|
free(buf);
|
||||||
@@ -263,33 +323,49 @@ void queue_script(struct daemon *daemon, int action, struct dhcp_lease *lease, c
|
|||||||
buf->hostname_len = hostname_len;
|
buf->hostname_len = hostname_len;
|
||||||
buf->addr = lease->addr;
|
buf->addr = lease->addr;
|
||||||
memcpy(buf->hwaddr, lease->hwaddr, lease->hwaddr_len);
|
memcpy(buf->hwaddr, lease->hwaddr, lease->hwaddr_len);
|
||||||
|
buf->interface[0] = 0;
|
||||||
|
#ifdef HAVE_LINUX_NETWORK
|
||||||
|
if (lease->last_interface != 0)
|
||||||
|
{
|
||||||
|
struct ifreq ifr;
|
||||||
|
ifr.ifr_ifindex = lease->last_interface;
|
||||||
|
if (ioctl(daemon->dhcpfd, SIOCGIFNAME, &ifr) != -1)
|
||||||
|
strncpy(buf->interface, ifr.ifr_name, IF_NAMESIZE);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
if (lease->last_interface != 0)
|
||||||
|
if_indextoname(lease->last_interface, buf->interface);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_BROKEN_RTC
|
#ifdef HAVE_BROKEN_RTC
|
||||||
buf->length = lease->length;
|
buf->length = lease->length;
|
||||||
#else
|
#else
|
||||||
buf->expires = lease->expires;
|
buf->expires = lease->expires;
|
||||||
#endif
|
#endif
|
||||||
|
buf->remaining_time = (unsigned int)difftime(lease->expires, now);
|
||||||
|
|
||||||
p = (unsigned char *)(buf+1);
|
p = (unsigned char *)(buf+1);
|
||||||
if (buf->clid_len != 0)
|
if (clid_len != 0)
|
||||||
{
|
{
|
||||||
memcpy(p, lease->clid, clid_len);
|
memcpy(p, lease->clid, clid_len);
|
||||||
p += clid_len;
|
p += clid_len;
|
||||||
}
|
}
|
||||||
if (buf->vclass_len != 0)
|
if (vclass_len != 0)
|
||||||
{
|
{
|
||||||
memcpy(p, lease->vendorclass, vclass_len);
|
memcpy(p, lease->vendorclass, vclass_len);
|
||||||
p += vclass_len;
|
p += vclass_len;
|
||||||
}
|
}
|
||||||
if (buf->uclass_len != 0)
|
if (uclass_len != 0)
|
||||||
{
|
{
|
||||||
memcpy(p, lease->userclass, uclass_len);
|
memcpy(p, lease->userclass, uclass_len);
|
||||||
p += uclass_len;
|
p += uclass_len;
|
||||||
}
|
}
|
||||||
if (buf->hostname_len != 0)
|
/* substitute * for space */
|
||||||
{
|
for (i = 0; i < hostname_len; i++)
|
||||||
memcpy(p, hostname, hostname_len);
|
if ((daemon->options & OPT_LEASE_RO) && hostname[i] == ' ')
|
||||||
p += hostname_len;
|
*(p++) = '*';
|
||||||
}
|
else
|
||||||
|
*(p++) = hostname[i];
|
||||||
|
|
||||||
bytes_in_buf = p - (unsigned char *)buf;
|
bytes_in_buf = p - (unsigned char *)buf;
|
||||||
}
|
}
|
||||||
@@ -299,7 +375,7 @@ int helper_buf_empty(void)
|
|||||||
return bytes_in_buf == 0;
|
return bytes_in_buf == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void helper_write(struct daemon *daemon)
|
void helper_write(void)
|
||||||
{
|
{
|
||||||
ssize_t rc;
|
ssize_t rc;
|
||||||
|
|
||||||
@@ -320,5 +396,6 @@ void helper_write(struct daemon *daemon)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@@ -1,13 +1,17 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000 - 2005 by Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@@ -57,7 +61,7 @@ static int next_token (char *token, int buffsize, FILE * fp)
|
|||||||
return count ? 1 : 0;
|
return count ? 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void load_dhcp(struct daemon *daemon, time_t now)
|
void load_dhcp(time_t now)
|
||||||
{
|
{
|
||||||
char *hostname = daemon->namebuff;
|
char *hostname = daemon->namebuff;
|
||||||
char token[MAXTOK], *dot;
|
char token[MAXTOK], *dot;
|
||||||
@@ -189,20 +193,20 @@ void load_dhcp(struct daemon *daemon, time_t now)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!lease && (lease = malloc(sizeof(struct isc_lease))))
|
if (!lease && (lease = whine_malloc(sizeof(struct isc_lease))))
|
||||||
{
|
{
|
||||||
lease->expires = ttd;
|
lease->expires = ttd;
|
||||||
lease->addr = host_address;
|
lease->addr = host_address;
|
||||||
lease->fqdn = NULL;
|
lease->fqdn = NULL;
|
||||||
lease->next = leases;
|
lease->next = leases;
|
||||||
if (!(lease->name = malloc(strlen(hostname)+1)))
|
if (!(lease->name = whine_malloc(strlen(hostname)+1)))
|
||||||
free(lease);
|
free(lease);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
leases = lease;
|
leases = lease;
|
||||||
strcpy(lease->name, hostname);
|
strcpy(lease->name, hostname);
|
||||||
if (daemon->domain_suffix &&
|
if (daemon->domain_suffix &&
|
||||||
(lease->fqdn = malloc(strlen(hostname) + strlen(daemon->domain_suffix) + 2)))
|
(lease->fqdn = whine_malloc(strlen(hostname) + strlen(daemon->domain_suffix) + 2)))
|
||||||
{
|
{
|
||||||
strcpy(lease->fqdn, hostname);
|
strcpy(lease->fqdn, hostname);
|
||||||
strcat(lease->fqdn, ".");
|
strcat(lease->fqdn, ".");
|
||||||
@@ -239,8 +243,8 @@ void load_dhcp(struct daemon *daemon, time_t now)
|
|||||||
|
|
||||||
for (lease = leases; lease; lease = lease->next)
|
for (lease = leases; lease; lease = lease->next)
|
||||||
{
|
{
|
||||||
cache_add_dhcp_entry(daemon, lease->fqdn, &lease->addr, lease->expires);
|
cache_add_dhcp_entry(lease->fqdn, &lease->addr, lease->expires);
|
||||||
cache_add_dhcp_entry(daemon, lease->name, &lease->addr, lease->expires);
|
cache_add_dhcp_entry(lease->name, &lease->addr, lease->expires);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+90
-58
@@ -1,29 +1,37 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
static struct dhcp_lease *leases, *old_leases;
|
static struct dhcp_lease *leases = NULL, *old_leases = NULL;
|
||||||
static int dns_dirty, file_dirty, leases_left;
|
static int dns_dirty, file_dirty, leases_left;
|
||||||
|
|
||||||
void lease_init(struct daemon *daemon, time_t now)
|
void lease_init(time_t now)
|
||||||
{
|
{
|
||||||
unsigned long ei;
|
unsigned long ei;
|
||||||
struct in_addr addr;
|
struct in_addr addr;
|
||||||
struct dhcp_lease *lease;
|
struct dhcp_lease *lease;
|
||||||
int flags, clid_len, hw_len, hw_type;
|
int clid_len, hw_len, hw_type;
|
||||||
FILE *leasestream;
|
FILE *leasestream;
|
||||||
|
|
||||||
leases = old_leases = NULL;
|
/* These two each hold a DHCP option max size 255
|
||||||
|
and get a terminating zero added */
|
||||||
|
daemon->dhcp_buff = safe_malloc(256);
|
||||||
|
daemon->dhcp_buff2 = safe_malloc(256);
|
||||||
|
|
||||||
leases_left = daemon->dhcp_max;
|
leases_left = daemon->dhcp_max;
|
||||||
|
|
||||||
if (daemon->options & OPT_LEASE_RO)
|
if (daemon->options & OPT_LEASE_RO)
|
||||||
@@ -47,11 +55,7 @@ void lease_init(struct daemon *daemon, time_t now)
|
|||||||
leasestream = daemon->lease_stream = fopen(daemon->lease_file, "a+");
|
leasestream = daemon->lease_stream = fopen(daemon->lease_file, "a+");
|
||||||
|
|
||||||
if (!leasestream)
|
if (!leasestream)
|
||||||
die(_("cannot open or create lease file %s: %s"), daemon->lease_file);
|
die(_("cannot open or create lease file %s: %s"), daemon->lease_file, EC_FILE);
|
||||||
|
|
||||||
flags = fcntl(fileno(leasestream), F_GETFD);
|
|
||||||
if (flags != -1)
|
|
||||||
fcntl(fileno(leasestream), F_SETFD, flags | FD_CLOEXEC);
|
|
||||||
|
|
||||||
/* a+ mode lease pointer at end. */
|
/* a+ mode lease pointer at end. */
|
||||||
rewind(leasestream);
|
rewind(leasestream);
|
||||||
@@ -77,9 +81,7 @@ void lease_init(struct daemon *daemon, time_t now)
|
|||||||
clid_len = parse_hex(daemon->packet, (unsigned char *)daemon->packet, 255, NULL, NULL);
|
clid_len = parse_hex(daemon->packet, (unsigned char *)daemon->packet, 255, NULL, NULL);
|
||||||
|
|
||||||
if (!(lease = lease_allocate(addr)))
|
if (!(lease = lease_allocate(addr)))
|
||||||
die (_("too many stored leases"), NULL);
|
die (_("too many stored leases"), NULL, EC_MISC);
|
||||||
/* not actually new */
|
|
||||||
lease->new = 0;
|
|
||||||
|
|
||||||
#ifdef HAVE_BROKEN_RTC
|
#ifdef HAVE_BROKEN_RTC
|
||||||
if (ei != 0)
|
if (ei != 0)
|
||||||
@@ -96,9 +98,19 @@ void lease_init(struct daemon *daemon, time_t now)
|
|||||||
lease_set_hwaddr(lease, (unsigned char *)daemon->dhcp_buff2, (unsigned char *)daemon->packet, hw_len, hw_type, clid_len);
|
lease_set_hwaddr(lease, (unsigned char *)daemon->dhcp_buff2, (unsigned char *)daemon->packet, hw_len, hw_type, clid_len);
|
||||||
|
|
||||||
if (strcmp(daemon->dhcp_buff, "*") != 0)
|
if (strcmp(daemon->dhcp_buff, "*") != 0)
|
||||||
|
{
|
||||||
|
char *p;
|
||||||
|
/* unprotect spaces */
|
||||||
|
for (p = strchr(daemon->dhcp_buff, '*'); p; p = strchr(p, '*'))
|
||||||
|
*p = ' ';
|
||||||
lease_set_hostname(lease, daemon->dhcp_buff, daemon->domain_suffix, 0);
|
lease_set_hostname(lease, daemon->dhcp_buff, daemon->domain_suffix, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* set these correctly: the "old" events are generated later from
|
||||||
|
the startup synthesised SIGHUP. */
|
||||||
|
lease->new = lease->changed = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (!daemon->lease_stream)
|
if (!daemon->lease_stream)
|
||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
@@ -110,13 +122,13 @@ void lease_init(struct daemon *daemon, time_t now)
|
|||||||
errno = ENOENT;
|
errno = ENOENT;
|
||||||
else if (WEXITSTATUS(rc) == 126)
|
else if (WEXITSTATUS(rc) == 126)
|
||||||
errno = EACCES;
|
errno = EACCES;
|
||||||
die(_("cannot run lease-init script %s: %s"), daemon->lease_change_command);
|
die(_("cannot run lease-init script %s: %s"), daemon->lease_change_command, EC_FILE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (WEXITSTATUS(rc) != 0)
|
if (WEXITSTATUS(rc) != 0)
|
||||||
{
|
{
|
||||||
sprintf(daemon->dhcp_buff, "%d", WEXITSTATUS(rc));
|
sprintf(daemon->dhcp_buff, "%d", WEXITSTATUS(rc));
|
||||||
die(_("lease-init script returned exit code %s"), daemon->dhcp_buff);
|
die(_("lease-init script returned exit code %s"), daemon->dhcp_buff, WEXITSTATUS(rc) + EC_INIT_OFFSET);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -126,7 +138,7 @@ void lease_init(struct daemon *daemon, time_t now)
|
|||||||
dns_dirty = 1;
|
dns_dirty = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void lease_update_from_configs(struct daemon *daemon)
|
void lease_update_from_configs(void)
|
||||||
{
|
{
|
||||||
/* changes to the config may change current leases. */
|
/* changes to the config may change current leases. */
|
||||||
|
|
||||||
@@ -140,11 +152,11 @@ void lease_update_from_configs(struct daemon *daemon)
|
|||||||
(config->flags & CONFIG_NAME) &&
|
(config->flags & CONFIG_NAME) &&
|
||||||
(!(config->flags & CONFIG_ADDR) || config->addr.s_addr == lease->addr.s_addr))
|
(!(config->flags & CONFIG_ADDR) || config->addr.s_addr == lease->addr.s_addr))
|
||||||
lease_set_hostname(lease, config->hostname, daemon->domain_suffix, 1);
|
lease_set_hostname(lease, config->hostname, daemon->domain_suffix, 1);
|
||||||
else if ((name = host_from_dns(daemon, lease->addr)))
|
else if ((name = host_from_dns(lease->addr)))
|
||||||
lease_set_hostname(lease, name, daemon->domain_suffix, 1); /* updates auth flag only */
|
lease_set_hostname(lease, name, daemon->domain_suffix, 1); /* updates auth flag only */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ourprintf(struct daemon *daemon, int *errp, char *format, ...)
|
static void ourprintf(int *errp, char *format, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
||||||
@@ -154,11 +166,12 @@ static void ourprintf(struct daemon *daemon, int *errp, char *format, ...)
|
|||||||
va_end(ap);
|
va_end(ap);
|
||||||
}
|
}
|
||||||
|
|
||||||
void lease_update_file(struct daemon *daemon, time_t now)
|
void lease_update_file(time_t now)
|
||||||
{
|
{
|
||||||
struct dhcp_lease *lease;
|
struct dhcp_lease *lease;
|
||||||
time_t next_event;
|
time_t next_event;
|
||||||
int i, err = 0;
|
int i, err = 0;
|
||||||
|
char *p;
|
||||||
|
|
||||||
if (file_dirty != 0 && daemon->lease_stream)
|
if (file_dirty != 0 && daemon->lease_stream)
|
||||||
{
|
{
|
||||||
@@ -170,29 +183,37 @@ void lease_update_file(struct daemon *daemon, time_t now)
|
|||||||
for (lease = leases; lease; lease = lease->next)
|
for (lease = leases; lease; lease = lease->next)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_BROKEN_RTC
|
#ifdef HAVE_BROKEN_RTC
|
||||||
ourprintf(daemon, &err, "%u ", lease->length);
|
ourprintf(&err, "%u ", lease->length);
|
||||||
#else
|
#else
|
||||||
ourprintf(daemon, &err, "%lu ", (unsigned long)lease->expires);
|
ourprintf(&err, "%lu ", (unsigned long)lease->expires);
|
||||||
#endif
|
#endif
|
||||||
if (lease->hwaddr_type != ARPHRD_ETHER || lease->hwaddr_len == 0)
|
if (lease->hwaddr_type != ARPHRD_ETHER || lease->hwaddr_len == 0)
|
||||||
ourprintf(daemon, &err, "%.2x-", lease->hwaddr_type);
|
ourprintf(&err, "%.2x-", lease->hwaddr_type);
|
||||||
for (i = 0; i < lease->hwaddr_len; i++)
|
for (i = 0; i < lease->hwaddr_len; i++)
|
||||||
{
|
{
|
||||||
ourprintf(daemon, &err, "%.2x", lease->hwaddr[i]);
|
ourprintf(&err, "%.2x", lease->hwaddr[i]);
|
||||||
if (i != lease->hwaddr_len - 1)
|
if (i != lease->hwaddr_len - 1)
|
||||||
ourprintf(daemon, &err, ":");
|
ourprintf(&err, ":");
|
||||||
}
|
}
|
||||||
ourprintf(daemon, &err, " %s %s ", inet_ntoa(lease->addr),
|
|
||||||
lease->hostname && strlen(lease->hostname) != 0 ? lease->hostname : "*");
|
ourprintf(&err, " %s ", inet_ntoa(lease->addr));
|
||||||
|
|
||||||
|
/* substitute * for space: "*" is an illegal name, as is " " */
|
||||||
|
if (lease->hostname)
|
||||||
|
for (p = lease->hostname; *p; p++)
|
||||||
|
ourprintf(&err, "%c", *p == ' ' ? '*' : *p);
|
||||||
|
else
|
||||||
|
ourprintf(&err, "*");
|
||||||
|
ourprintf(&err, " ");
|
||||||
|
|
||||||
if (lease->clid && lease->clid_len != 0)
|
if (lease->clid && lease->clid_len != 0)
|
||||||
{
|
{
|
||||||
for (i = 0; i < lease->clid_len - 1; i++)
|
for (i = 0; i < lease->clid_len - 1; i++)
|
||||||
ourprintf(daemon, &err, "%.2x:", lease->clid[i]);
|
ourprintf(&err, "%.2x:", lease->clid[i]);
|
||||||
ourprintf(daemon, &err, "%.2x\n", lease->clid[i]);
|
ourprintf(&err, "%.2x\n", lease->clid[i]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
ourprintf(daemon, &err, "*\n");
|
ourprintf(&err, "*\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fflush(daemon->lease_stream) != 0 ||
|
if (fflush(daemon->lease_stream) != 0 ||
|
||||||
@@ -223,18 +244,18 @@ void lease_update_file(struct daemon *daemon, time_t now)
|
|||||||
alarm((unsigned)difftime(next_event, now));
|
alarm((unsigned)difftime(next_event, now));
|
||||||
}
|
}
|
||||||
|
|
||||||
void lease_update_dns(struct daemon *daemon)
|
void lease_update_dns(void)
|
||||||
{
|
{
|
||||||
struct dhcp_lease *lease;
|
struct dhcp_lease *lease;
|
||||||
|
|
||||||
if (dns_dirty)
|
if (daemon->port != 0 && dns_dirty)
|
||||||
{
|
{
|
||||||
cache_unhash_dhcp();
|
cache_unhash_dhcp();
|
||||||
|
|
||||||
for (lease = leases; lease; lease = lease->next)
|
for (lease = leases; lease; lease = lease->next)
|
||||||
{
|
{
|
||||||
cache_add_dhcp_entry(daemon, lease->fqdn, &lease->addr, lease->expires);
|
cache_add_dhcp_entry(lease->fqdn, &lease->addr, lease->expires);
|
||||||
cache_add_dhcp_entry(daemon, lease->hostname, &lease->addr, lease->expires);
|
cache_add_dhcp_entry(lease->hostname, &lease->addr, lease->expires);
|
||||||
}
|
}
|
||||||
|
|
||||||
dns_dirty = 0;
|
dns_dirty = 0;
|
||||||
@@ -306,7 +327,7 @@ struct dhcp_lease *lease_find_by_addr(struct in_addr addr)
|
|||||||
struct dhcp_lease *lease_allocate(struct in_addr addr)
|
struct dhcp_lease *lease_allocate(struct in_addr addr)
|
||||||
{
|
{
|
||||||
struct dhcp_lease *lease;
|
struct dhcp_lease *lease;
|
||||||
if (!leases_left || !(lease = malloc(sizeof(struct dhcp_lease))))
|
if (!leases_left || !(lease = whine_malloc(sizeof(struct dhcp_lease))))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
memset(lease, 0, sizeof(struct dhcp_lease));
|
memset(lease, 0, sizeof(struct dhcp_lease));
|
||||||
@@ -378,9 +399,8 @@ void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr,
|
|||||||
if (lease->clid_len != clid_len)
|
if (lease->clid_len != clid_len)
|
||||||
{
|
{
|
||||||
lease->aux_changed = file_dirty = 1;
|
lease->aux_changed = file_dirty = 1;
|
||||||
if (lease->clid)
|
|
||||||
free(lease->clid);
|
free(lease->clid);
|
||||||
if (!(lease->clid = malloc(clid_len)))
|
if (!(lease->clid = whine_malloc(clid_len)))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (memcmp(lease->clid, clid, clid_len) != 0)
|
else if (memcmp(lease->clid, clid, clid_len) != 0)
|
||||||
@@ -420,7 +440,6 @@ void lease_set_hostname(struct dhcp_lease *lease, char *name, char *suffix, int
|
|||||||
return;
|
return;
|
||||||
/* this shouldn't happen unless updates are very quick and the
|
/* this shouldn't happen unless updates are very quick and the
|
||||||
script very slow, we just avoid a memory leak if it does. */
|
script very slow, we just avoid a memory leak if it does. */
|
||||||
if (lease_tmp->old_hostname)
|
|
||||||
free(lease_tmp->old_hostname);
|
free(lease_tmp->old_hostname);
|
||||||
lease_tmp->old_hostname = lease_tmp->hostname;
|
lease_tmp->old_hostname = lease_tmp->hostname;
|
||||||
lease_tmp->hostname = NULL;
|
lease_tmp->hostname = NULL;
|
||||||
@@ -432,10 +451,10 @@ void lease_set_hostname(struct dhcp_lease *lease, char *name, char *suffix, int
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!new_name && (new_name = malloc(strlen(name) + 1)))
|
if (!new_name && (new_name = whine_malloc(strlen(name) + 1)))
|
||||||
strcpy(new_name, name);
|
strcpy(new_name, name);
|
||||||
|
|
||||||
if (suffix && !new_fqdn && (new_fqdn = malloc(strlen(name) + strlen(suffix) + 2)))
|
if (suffix && !new_fqdn && (new_fqdn = whine_malloc(strlen(name) + strlen(suffix) + 2)))
|
||||||
{
|
{
|
||||||
strcpy(new_fqdn, name);
|
strcpy(new_fqdn, name);
|
||||||
strcat(new_fqdn, ".");
|
strcat(new_fqdn, ".");
|
||||||
@@ -446,12 +465,10 @@ void lease_set_hostname(struct dhcp_lease *lease, char *name, char *suffix, int
|
|||||||
if (lease->hostname)
|
if (lease->hostname)
|
||||||
{
|
{
|
||||||
/* run script to say we lost our old name */
|
/* run script to say we lost our old name */
|
||||||
if (lease->old_hostname)
|
|
||||||
free(lease->old_hostname);
|
free(lease->old_hostname);
|
||||||
lease->old_hostname = lease->hostname;
|
lease->old_hostname = lease->hostname;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lease->fqdn)
|
|
||||||
free(lease->fqdn);
|
free(lease->fqdn);
|
||||||
|
|
||||||
lease->hostname = new_name;
|
lease->hostname = new_name;
|
||||||
@@ -463,12 +480,29 @@ void lease_set_hostname(struct dhcp_lease *lease, char *name, char *suffix, int
|
|||||||
lease->changed = 1; /* run script on change */
|
lease->changed = 1; /* run script on change */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void lease_set_interface(struct dhcp_lease *lease, int interface)
|
||||||
|
{
|
||||||
|
if (lease->last_interface == interface)
|
||||||
|
return;
|
||||||
|
|
||||||
|
lease->last_interface = interface;
|
||||||
|
lease->changed = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void rerun_scripts(void)
|
||||||
|
{
|
||||||
|
struct dhcp_lease *lease;
|
||||||
|
|
||||||
|
for (lease = leases; lease; lease = lease->next)
|
||||||
|
lease->changed = 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* deleted leases get transferred to the old_leases list.
|
/* deleted leases get transferred to the old_leases list.
|
||||||
remove them here, after calling the lease change
|
remove them here, after calling the lease change
|
||||||
script. Also run the lease change script on new/modified leases.
|
script. Also run the lease change script on new/modified leases.
|
||||||
|
|
||||||
Return zero if nothing to do. */
|
Return zero if nothing to do. */
|
||||||
int do_script_run(struct daemon *daemon)
|
int do_script_run(time_t now)
|
||||||
{
|
{
|
||||||
struct dhcp_lease *lease;
|
struct dhcp_lease *lease;
|
||||||
|
|
||||||
@@ -479,25 +513,24 @@ int do_script_run(struct daemon *daemon)
|
|||||||
/* If the lease still has an old_hostname, do the "old" action on that first */
|
/* If the lease still has an old_hostname, do the "old" action on that first */
|
||||||
if (lease->old_hostname)
|
if (lease->old_hostname)
|
||||||
{
|
{
|
||||||
queue_script(daemon, ACTION_OLD_HOSTNAME, lease, lease->old_hostname);
|
#ifndef NO_FORK
|
||||||
|
queue_script(ACTION_OLD_HOSTNAME, lease, lease->old_hostname, now);
|
||||||
|
#endif
|
||||||
free(lease->old_hostname);
|
free(lease->old_hostname);
|
||||||
lease->old_hostname = NULL;
|
lease->old_hostname = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
queue_script(daemon, ACTION_DEL, lease, lease->hostname);
|
#ifndef NO_FORK
|
||||||
|
queue_script(ACTION_DEL, lease, lease->hostname, now);
|
||||||
|
#endif
|
||||||
old_leases = lease->next;
|
old_leases = lease->next;
|
||||||
|
|
||||||
if (lease->hostname)
|
|
||||||
free(lease->hostname);
|
free(lease->hostname);
|
||||||
if (lease->fqdn)
|
|
||||||
free(lease->fqdn);
|
free(lease->fqdn);
|
||||||
if (lease->clid)
|
|
||||||
free(lease->clid);
|
free(lease->clid);
|
||||||
if (lease->vendorclass)
|
|
||||||
free(lease->vendorclass);
|
free(lease->vendorclass);
|
||||||
if (lease->userclass)
|
|
||||||
free(lease->userclass);
|
free(lease->userclass);
|
||||||
free(lease);
|
free(lease);
|
||||||
|
|
||||||
@@ -509,7 +542,9 @@ int do_script_run(struct daemon *daemon)
|
|||||||
for (lease = leases; lease; lease = lease->next)
|
for (lease = leases; lease; lease = lease->next)
|
||||||
if (lease->old_hostname)
|
if (lease->old_hostname)
|
||||||
{
|
{
|
||||||
queue_script(daemon, ACTION_OLD_HOSTNAME, lease, lease->old_hostname);
|
#ifndef NO_FORK
|
||||||
|
queue_script(ACTION_OLD_HOSTNAME, lease, lease->old_hostname, now);
|
||||||
|
#endif
|
||||||
free(lease->old_hostname);
|
free(lease->old_hostname);
|
||||||
lease->old_hostname = NULL;
|
lease->old_hostname = NULL;
|
||||||
return 1;
|
return 1;
|
||||||
@@ -519,20 +554,17 @@ int do_script_run(struct daemon *daemon)
|
|||||||
if (lease->new || lease->changed ||
|
if (lease->new || lease->changed ||
|
||||||
(lease->aux_changed && (daemon->options & OPT_LEASE_RO)))
|
(lease->aux_changed && (daemon->options & OPT_LEASE_RO)))
|
||||||
{
|
{
|
||||||
queue_script(daemon, lease->new ? ACTION_ADD : ACTION_OLD, lease, lease->hostname);
|
#ifndef NO_FORK
|
||||||
|
queue_script(lease->new ? ACTION_ADD : ACTION_OLD, lease, lease->hostname, now);
|
||||||
|
#endif
|
||||||
lease->new = lease->changed = lease->aux_changed = 0;
|
lease->new = lease->changed = lease->aux_changed = 0;
|
||||||
|
|
||||||
/* these are used for the "add" call, then junked, since they're not in the database */
|
/* these are used for the "add" call, then junked, since they're not in the database */
|
||||||
if (lease->vendorclass)
|
|
||||||
{
|
|
||||||
free(lease->vendorclass);
|
free(lease->vendorclass);
|
||||||
lease->vendorclass = NULL;
|
lease->vendorclass = NULL;
|
||||||
}
|
|
||||||
if (lease->userclass)
|
|
||||||
{
|
|
||||||
free(lease->userclass);
|
free(lease->userclass);
|
||||||
lease->userclass = NULL;
|
lease->userclass = NULL;
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,12 +2,16 @@
|
|||||||
|
|
||||||
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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -33,9 +37,11 @@ static int entries_alloced = 0;
|
|||||||
static int entries_lost = 0;
|
static int entries_lost = 0;
|
||||||
static int connection_good = 1;
|
static int connection_good = 1;
|
||||||
static int max_logs = 0;
|
static int max_logs = 0;
|
||||||
|
static int connection_type = SOCK_DGRAM;
|
||||||
|
|
||||||
struct log_entry {
|
struct log_entry {
|
||||||
int offset, length;
|
int offset, length;
|
||||||
|
pid_t pid; /* to avoid duplicates over a fork */
|
||||||
struct log_entry *next;
|
struct log_entry *next;
|
||||||
char payload[MAX_MESSAGE];
|
char payload[MAX_MESSAGE];
|
||||||
};
|
};
|
||||||
@@ -44,10 +50,8 @@ static struct log_entry *entries = NULL;
|
|||||||
static struct log_entry *free_entries = NULL;
|
static struct log_entry *free_entries = NULL;
|
||||||
|
|
||||||
|
|
||||||
int log_start(struct daemon *daemon)
|
void log_start(struct passwd *ent_pw)
|
||||||
{
|
{
|
||||||
int flags;
|
|
||||||
|
|
||||||
log_stderr = !!(daemon->options & OPT_DEBUG);
|
log_stderr = !!(daemon->options & OPT_DEBUG);
|
||||||
|
|
||||||
if (daemon->log_fac != -1)
|
if (daemon->log_fac != -1)
|
||||||
@@ -59,42 +63,88 @@ int log_start(struct daemon *daemon)
|
|||||||
|
|
||||||
if (daemon->log_file)
|
if (daemon->log_file)
|
||||||
{
|
{
|
||||||
log_fd = open(daemon->log_file, O_WRONLY|O_CREAT|O_APPEND, S_IRUSR|S_IWUSR|S_IRGRP);
|
|
||||||
log_to_file = 1;
|
log_to_file = 1;
|
||||||
daemon->max_logs = 0;
|
daemon->max_logs = 0;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
log_fd = socket(AF_UNIX, SOCK_DGRAM, 0);
|
|
||||||
|
|
||||||
if (log_fd == -1)
|
max_logs = daemon->max_logs;
|
||||||
die(_("cannot open %s: %s"), daemon->log_file ? daemon->log_file : "log");
|
|
||||||
|
if (!log_reopen(daemon->log_file))
|
||||||
|
die(_("cannot open %s: %s"), daemon->log_file ? daemon->log_file : "log", EC_FILE);
|
||||||
|
|
||||||
/* if queuing is inhibited, make sure we allocate
|
/* if queuing is inhibited, make sure we allocate
|
||||||
the one required buffer now. */
|
the one required buffer now. */
|
||||||
if ((max_logs = daemon->max_logs) == 0)
|
if (max_logs == 0)
|
||||||
{
|
{
|
||||||
free_entries = safe_malloc(sizeof(struct log_entry));
|
free_entries = safe_malloc(sizeof(struct log_entry));
|
||||||
free_entries->next = NULL;
|
free_entries->next = NULL;
|
||||||
entries_alloced = 1;
|
entries_alloced = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((flags = fcntl(log_fd, F_GETFD)) != -1)
|
/* If we're running as root and going to change uid later,
|
||||||
fcntl(log_fd, F_SETFD, flags | FD_CLOEXEC);
|
change the ownership here so that the file is always owned by
|
||||||
|
the dnsmasq user. Then logrotate can just copy the owner.
|
||||||
|
Failure of the chown call is OK, (for instance when started as non-root) */
|
||||||
|
if (log_to_file && ent_pw && ent_pw->pw_uid != 0 && fchown(log_fd, ent_pw->pw_uid, -1) != 0)
|
||||||
|
my_syslog(LOG_WARNING, _("warning: failed to change owner of %s: %s"), daemon->log_file, strerror(errno));
|
||||||
|
}
|
||||||
|
|
||||||
/* if max_log is zero, leave the socket blocking */
|
int log_reopen(char *log_file)
|
||||||
|
{
|
||||||
|
if (log_fd != -1)
|
||||||
|
close(log_fd);
|
||||||
|
|
||||||
|
/* NOTE: umask is set to 022 by the time this gets called */
|
||||||
|
|
||||||
|
if (log_file)
|
||||||
|
{
|
||||||
|
log_fd = open(log_file, O_WRONLY|O_CREAT|O_APPEND, S_IRUSR|S_IWUSR|S_IRGRP);
|
||||||
|
return log_fd != -1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#ifdef HAVE_SOLARIS_NETWORK
|
||||||
|
/* Solaris logging is "different", /dev/log is not unix-domain socket.
|
||||||
|
Just leave log_fd == -1 and use the vsyslog call for everything.... */
|
||||||
|
# define _PATH_LOG "" /* dummy */
|
||||||
|
log_fd = -1;
|
||||||
|
#else
|
||||||
|
{
|
||||||
|
int flags;
|
||||||
|
log_fd = socket(AF_UNIX, connection_type, 0);
|
||||||
|
|
||||||
|
if (log_fd == -1)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* if max_logs is zero, leave the socket blocking */
|
||||||
if (max_logs != 0 && (flags = fcntl(log_fd, F_GETFL)) != -1)
|
if (max_logs != 0 && (flags = fcntl(log_fd, F_GETFL)) != -1)
|
||||||
fcntl(log_fd, F_SETFL, flags | O_NONBLOCK);
|
fcntl(log_fd, F_SETFL, flags | O_NONBLOCK);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
return log_fd;
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void free_entry(void)
|
||||||
|
{
|
||||||
|
struct log_entry *tmp = entries;
|
||||||
|
entries = tmp->next;
|
||||||
|
tmp->next = free_entries;
|
||||||
|
free_entries = tmp;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void log_write(void)
|
static void log_write(void)
|
||||||
{
|
{
|
||||||
ssize_t rc;
|
ssize_t rc;
|
||||||
int tried_stream = 0;
|
|
||||||
|
|
||||||
while (entries)
|
while (entries)
|
||||||
{
|
{
|
||||||
|
/* Avoid duplicates over a fork() */
|
||||||
|
if (entries->pid != getpid())
|
||||||
|
{
|
||||||
|
free_entry();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
connection_good = 1;
|
connection_good = 1;
|
||||||
|
|
||||||
if ((rc = write(log_fd, entries->payload + entries->offset, entries->length)) != -1)
|
if ((rc = write(log_fd, entries->payload + entries->offset, entries->length)) != -1)
|
||||||
@@ -103,11 +153,7 @@ static void log_write(void)
|
|||||||
entries->offset += rc;
|
entries->offset += rc;
|
||||||
if (entries->length == 0)
|
if (entries->length == 0)
|
||||||
{
|
{
|
||||||
struct log_entry *tmp = entries;
|
free_entry();
|
||||||
entries = tmp->next;
|
|
||||||
tmp->next = free_entries;
|
|
||||||
free_entries = tmp;
|
|
||||||
|
|
||||||
if (entries_lost != 0)
|
if (entries_lost != 0)
|
||||||
{
|
{
|
||||||
int e = entries_lost;
|
int e = entries_lost;
|
||||||
@@ -130,29 +176,33 @@ static void log_write(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Once a stream socket hits EPIPE, we have to close and re-open */
|
/* errors handling after this assumes sockets */
|
||||||
|
if (!log_to_file)
|
||||||
|
{
|
||||||
|
/* Once a stream socket hits EPIPE, we have to close and re-open
|
||||||
|
(we ignore SIGPIPE) */
|
||||||
if (errno == EPIPE)
|
if (errno == EPIPE)
|
||||||
goto reopen_stream;
|
{
|
||||||
|
if (log_reopen(NULL))
|
||||||
if (!log_to_file &&
|
continue;
|
||||||
(errno == ECONNREFUSED ||
|
}
|
||||||
|
else if (errno == ECONNREFUSED ||
|
||||||
errno == ENOTCONN ||
|
errno == ENOTCONN ||
|
||||||
errno == EDESTADDRREQ ||
|
errno == EDESTADDRREQ ||
|
||||||
errno == ECONNRESET))
|
errno == ECONNRESET)
|
||||||
{
|
{
|
||||||
/* socket went (syslogd down?), try and reconnect. If we fail,
|
/* socket went (syslogd down?), try and reconnect. If we fail,
|
||||||
stop trying until the next call to my_syslog()
|
stop trying until the next call to my_syslog()
|
||||||
ECONNREFUSED -> connection went down
|
ECONNREFUSED -> connection went down
|
||||||
ENOTCONN -> nobody listening
|
ENOTCONN -> nobody listening
|
||||||
(ECONNRESET, EDESTADDRREQ are *BSD equivalents)
|
(ECONNRESET, EDESTADDRREQ are *BSD equivalents) */
|
||||||
EPIPE comes from broken stream socket (we ignore SIGPIPE) */
|
|
||||||
|
|
||||||
struct sockaddr_un logaddr;
|
struct sockaddr_un logaddr;
|
||||||
|
|
||||||
#ifdef HAVE_SOCKADDR_SA_LEN
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
||||||
logaddr.sun_len = sizeof(logaddr) - sizeof(logaddr.sun_path) + strlen(_PATH_LOG) + 1;
|
logaddr.sun_len = sizeof(logaddr) - sizeof(logaddr.sun_path) + strlen(_PATH_LOG) + 1;
|
||||||
#endif
|
#endif
|
||||||
logaddr.sun_family = AF_LOCAL;
|
logaddr.sun_family = AF_UNIX;
|
||||||
strncpy(logaddr.sun_path, _PATH_LOG, sizeof(logaddr.sun_path));
|
strncpy(logaddr.sun_path, _PATH_LOG, sizeof(logaddr.sun_path));
|
||||||
|
|
||||||
/* Got connection back? try again. */
|
/* Got connection back? try again. */
|
||||||
@@ -172,23 +222,11 @@ static void log_write(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* we start with a SOCK_DGRAM socket, but syslog may want SOCK_STREAM */
|
/* try the other sort of socket... */
|
||||||
if (!tried_stream && errno == EPROTOTYPE)
|
if (errno == EPROTOTYPE)
|
||||||
{
|
{
|
||||||
reopen_stream:
|
connection_type = connection_type == SOCK_DGRAM ? SOCK_STREAM : SOCK_DGRAM;
|
||||||
tried_stream = 1;
|
if (log_reopen(NULL))
|
||||||
close(log_fd);
|
|
||||||
if ((log_fd = socket(AF_UNIX, SOCK_STREAM, 0)) != -1)
|
|
||||||
{
|
|
||||||
int flags;
|
|
||||||
|
|
||||||
if ((flags = fcntl(log_fd, F_GETFD)) != -1)
|
|
||||||
fcntl(log_fd, F_SETFD, flags | FD_CLOEXEC);
|
|
||||||
|
|
||||||
/* if max_log is zero, leave the socket blocking */
|
|
||||||
if (max_logs != 0 && (flags = fcntl(log_fd, F_GETFL)) != -1)
|
|
||||||
fcntl(log_fd, F_SETFL, flags | O_NONBLOCK);
|
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -209,13 +247,14 @@ void my_syslog(int priority, const char *format, ...)
|
|||||||
time_t time_now;
|
time_t time_now;
|
||||||
char *p;
|
char *p;
|
||||||
size_t len;
|
size_t len;
|
||||||
|
pid_t pid = getpid();
|
||||||
va_start(ap, format);
|
|
||||||
|
|
||||||
if (log_stderr)
|
if (log_stderr)
|
||||||
{
|
{
|
||||||
fprintf(stderr, "dnsmasq: ");
|
fprintf(stderr, "dnsmasq: ");
|
||||||
|
va_start(ap, format);
|
||||||
vfprintf(stderr, format, ap);
|
vfprintf(stderr, format, ap);
|
||||||
|
va_end(ap);
|
||||||
fputc('\n', stderr);
|
fputc('\n', stderr);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -228,6 +267,7 @@ void my_syslog(int priority, const char *format, ...)
|
|||||||
openlog("dnsmasq", LOG_PID, log_fac);
|
openlog("dnsmasq", LOG_PID, log_fac);
|
||||||
isopen = 1;
|
isopen = 1;
|
||||||
}
|
}
|
||||||
|
va_start(ap, format);
|
||||||
vsyslog(priority, format, ap);
|
vsyslog(priority, format, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
return;
|
return;
|
||||||
@@ -258,11 +298,14 @@ void my_syslog(int priority, const char *format, ...)
|
|||||||
if (!log_to_file)
|
if (!log_to_file)
|
||||||
p += sprintf(p, "<%d>", priority | log_fac);
|
p += sprintf(p, "<%d>", priority | log_fac);
|
||||||
|
|
||||||
p += sprintf(p, "%.15s dnsmasq[%d]: ", ctime(&time_now) + 4, getpid());
|
p += sprintf(p, "%.15s dnsmasq[%d]: ", ctime(&time_now) + 4, (int)pid);
|
||||||
len = p - entry->payload;
|
len = p - entry->payload;
|
||||||
|
va_start(ap, format);
|
||||||
len += vsnprintf(p, MAX_MESSAGE - len, format, ap) + 1; /* include zero-terminator */
|
len += vsnprintf(p, MAX_MESSAGE - len, format, ap) + 1; /* include zero-terminator */
|
||||||
|
va_end(ap);
|
||||||
entry->length = len > MAX_MESSAGE ? MAX_MESSAGE : len;
|
entry->length = len > MAX_MESSAGE ? MAX_MESSAGE : len;
|
||||||
entry->offset = 0;
|
entry->offset = 0;
|
||||||
|
entry->pid = pid;
|
||||||
|
|
||||||
/* replace terminator with \n */
|
/* replace terminator with \n */
|
||||||
if (log_to_file)
|
if (log_to_file)
|
||||||
@@ -306,8 +349,6 @@ void my_syslog(int priority, const char *format, ...)
|
|||||||
log_write();
|
log_write();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
va_end(ap);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_log_writer(fd_set *set, int *maxfdp)
|
void set_log_writer(fd_set *set, int *maxfdp)
|
||||||
@@ -321,11 +362,24 @@ void set_log_writer(fd_set *set, int *maxfdp)
|
|||||||
|
|
||||||
void check_log_writer(fd_set *set)
|
void check_log_writer(fd_set *set)
|
||||||
{
|
{
|
||||||
if (log_fd != -1 && FD_ISSET(log_fd, set))
|
if (log_fd != -1 && (!set || FD_ISSET(log_fd, set)))
|
||||||
log_write();
|
log_write();
|
||||||
}
|
}
|
||||||
|
|
||||||
void die(char *message, char *arg1)
|
void flush_log(void)
|
||||||
|
{
|
||||||
|
/* block until queue empty */
|
||||||
|
if (log_fd != -1)
|
||||||
|
{
|
||||||
|
int flags;
|
||||||
|
if ((flags = fcntl(log_fd, F_GETFL)) != -1)
|
||||||
|
fcntl(log_fd, F_SETFL, flags & ~O_NONBLOCK);
|
||||||
|
log_write();
|
||||||
|
close(log_fd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void die(char *message, char *arg1, int exit_code)
|
||||||
{
|
{
|
||||||
char *errmess = strerror(errno);
|
char *errmess = strerror(errno);
|
||||||
|
|
||||||
@@ -333,10 +387,12 @@ void die(char *message, char *arg1)
|
|||||||
arg1 = errmess;
|
arg1 = errmess;
|
||||||
|
|
||||||
log_stderr = 1; /* print as well as log when we die.... */
|
log_stderr = 1; /* print as well as log when we die.... */
|
||||||
|
fputc('\n', stderr); /* prettyfy startup-script message */
|
||||||
my_syslog(LOG_CRIT, message, arg1, errmess);
|
my_syslog(LOG_CRIT, message, arg1, errmess);
|
||||||
|
|
||||||
log_stderr = 0;
|
log_stderr = 0;
|
||||||
my_syslog(LOG_CRIT, _("FAILED to start up"));
|
my_syslog(LOG_CRIT, _("FAILED to start up"));
|
||||||
|
flush_log();
|
||||||
|
|
||||||
exit(1);
|
exit(exit_code);
|
||||||
}
|
}
|
||||||
+19
-21
@@ -1,13 +1,17 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -29,9 +33,9 @@
|
|||||||
static struct iovec iov;
|
static struct iovec iov;
|
||||||
|
|
||||||
static void nl_err(struct nlmsghdr *h);
|
static void nl_err(struct nlmsghdr *h);
|
||||||
static void nl_routechange(struct daemon *daemon, struct nlmsghdr *h);
|
static void nl_routechange(struct nlmsghdr *h);
|
||||||
|
|
||||||
void netlink_init(struct daemon *daemon)
|
void netlink_init(void)
|
||||||
{
|
{
|
||||||
struct sockaddr_nl addr;
|
struct sockaddr_nl addr;
|
||||||
|
|
||||||
@@ -56,19 +60,13 @@ void netlink_init(struct daemon *daemon)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (daemon->netlinkfd == -1)
|
if (daemon->netlinkfd == -1)
|
||||||
die(_("cannot create netlink socket: %s"), NULL);
|
die(_("cannot create netlink socket: %s"), NULL, EC_MISC);
|
||||||
else
|
|
||||||
{
|
|
||||||
int flags = fcntl(daemon->netlinkfd, F_GETFD);
|
|
||||||
if (flags != -1)
|
|
||||||
fcntl(daemon->netlinkfd, F_SETFD, flags | FD_CLOEXEC);
|
|
||||||
}
|
|
||||||
|
|
||||||
iov.iov_len = 200;
|
iov.iov_len = 200;
|
||||||
iov.iov_base = safe_malloc(iov.iov_len);
|
iov.iov_base = safe_malloc(iov.iov_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t netlink_recv(struct daemon *daemon)
|
static ssize_t netlink_recv(void)
|
||||||
{
|
{
|
||||||
struct msghdr msg;
|
struct msghdr msg;
|
||||||
ssize_t rc;
|
ssize_t rc;
|
||||||
@@ -107,7 +105,7 @@ static ssize_t netlink_recv(struct daemon *daemon)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
int iface_enumerate(struct daemon *daemon, void *parm, int (*ipv4_callback)(), int (*ipv6_callback)())
|
int iface_enumerate(void *parm, int (*ipv4_callback)(), int (*ipv6_callback)())
|
||||||
{
|
{
|
||||||
struct sockaddr_nl addr;
|
struct sockaddr_nl addr;
|
||||||
struct nlmsghdr *h;
|
struct nlmsghdr *h;
|
||||||
@@ -142,14 +140,14 @@ int iface_enumerate(struct daemon *daemon, void *parm, int (*ipv4_callback)(), i
|
|||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
if ((len = netlink_recv(daemon)) == -1)
|
if ((len = netlink_recv()) == -1)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len))
|
for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len))
|
||||||
if (h->nlmsg_type == NLMSG_ERROR)
|
if (h->nlmsg_type == NLMSG_ERROR)
|
||||||
nl_err(h);
|
nl_err(h);
|
||||||
else if (h->nlmsg_seq != seq)
|
else if (h->nlmsg_seq != seq)
|
||||||
nl_routechange(daemon, h); /* May be multicast arriving async */
|
nl_routechange(h); /* May be multicast arriving async */
|
||||||
else if (h->nlmsg_type == NLMSG_DONE)
|
else if (h->nlmsg_type == NLMSG_DONE)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
@@ -186,7 +184,7 @@ int iface_enumerate(struct daemon *daemon, void *parm, int (*ipv4_callback)(), i
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (addr.s_addr && ipv4_callback)
|
if (addr.s_addr && ipv4_callback)
|
||||||
if (!((*ipv4_callback)(daemon, addr, ifa->ifa_index, netmask, broadcast, parm)))
|
if (!((*ipv4_callback)(addr, ifa->ifa_index, netmask, broadcast, parm)))
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
@@ -202,7 +200,7 @@ int iface_enumerate(struct daemon *daemon, void *parm, int (*ipv4_callback)(), i
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (addrp && ipv6_callback)
|
if (addrp && ipv6_callback)
|
||||||
if (!((*ipv6_callback)(daemon, addrp, ifa->ifa_index, ifa->ifa_index, parm)))
|
if (!((*ipv6_callback)(addrp, ifa->ifa_index, ifa->ifa_index, parm)))
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -210,18 +208,18 @@ int iface_enumerate(struct daemon *daemon, void *parm, int (*ipv4_callback)(), i
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void netlink_multicast(struct daemon *daemon)
|
void netlink_multicast(void)
|
||||||
{
|
{
|
||||||
ssize_t len;
|
ssize_t len;
|
||||||
struct nlmsghdr *h;
|
struct nlmsghdr *h;
|
||||||
|
|
||||||
if ((len = netlink_recv(daemon)) != -1)
|
if ((len = netlink_recv()) != -1)
|
||||||
{
|
{
|
||||||
for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len))
|
for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len))
|
||||||
if (h->nlmsg_type == NLMSG_ERROR)
|
if (h->nlmsg_type == NLMSG_ERROR)
|
||||||
nl_err(h);
|
nl_err(h);
|
||||||
else
|
else
|
||||||
nl_routechange(daemon, h);
|
nl_routechange(h);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -237,7 +235,7 @@ static void nl_err(struct nlmsghdr *h)
|
|||||||
This helps on DoD links, where frequently the packet which triggers dialling is
|
This helps on DoD links, where frequently the packet which triggers dialling is
|
||||||
a DNS query, which then gets lost. By re-sending, we can avoid the lookup
|
a DNS query, which then gets lost. By re-sending, we can avoid the lookup
|
||||||
failing. */
|
failing. */
|
||||||
static void nl_routechange(struct daemon *daemon, struct nlmsghdr *h)
|
static void nl_routechange(struct nlmsghdr *h)
|
||||||
{
|
{
|
||||||
if (h->nlmsg_type == RTM_NEWROUTE && daemon->srv_save)
|
if (h->nlmsg_type == RTM_NEWROUTE && daemon->srv_save)
|
||||||
{
|
{
|
||||||
|
|||||||
+153
-59
@@ -1,18 +1,22 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000 - 2006 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
int iface_check(struct daemon *daemon, int family, struct all_addr *addr,
|
int iface_check(int family, struct all_addr *addr,
|
||||||
struct ifreq *ifr, int *indexp)
|
struct ifreq *ifr, int *indexp)
|
||||||
{
|
{
|
||||||
struct iname *tmp;
|
struct iname *tmp;
|
||||||
@@ -84,7 +88,7 @@ int iface_check(struct daemon *daemon, int family, struct all_addr *addr,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int iface_allowed(struct daemon *daemon, struct irec **irecp, int if_index,
|
static int iface_allowed(struct irec **irecp, int if_index,
|
||||||
union mysockaddr *addr, struct in_addr netmask)
|
union mysockaddr *addr, struct in_addr netmask)
|
||||||
{
|
{
|
||||||
struct irec *iface;
|
struct irec *iface;
|
||||||
@@ -134,9 +138,10 @@ static int iface_allowed(struct daemon *daemon, struct irec **irecp, int if_inde
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!lo && (lo = malloc(sizeof(struct iname))))
|
if (!lo &&
|
||||||
|
(lo = whine_malloc(sizeof(struct iname))) &&
|
||||||
|
(lo->name = whine_malloc(strlen(ifr.ifr_name)+1)))
|
||||||
{
|
{
|
||||||
lo->name = safe_malloc(strlen(ifr.ifr_name)+1);
|
|
||||||
strcpy(lo->name, ifr.ifr_name);
|
strcpy(lo->name, ifr.ifr_name);
|
||||||
lo->isloop = lo->used = 1;
|
lo->isloop = lo->used = 1;
|
||||||
lo->next = daemon->if_names;
|
lo->next = daemon->if_names;
|
||||||
@@ -145,7 +150,7 @@ static int iface_allowed(struct daemon *daemon, struct irec **irecp, int if_inde
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (addr->sa.sa_family == AF_INET &&
|
if (addr->sa.sa_family == AF_INET &&
|
||||||
!iface_check(daemon, AF_INET, (struct all_addr *)&addr->in.sin_addr, &ifr, NULL))
|
!iface_check(AF_INET, (struct all_addr *)&addr->in.sin_addr, &ifr, NULL))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
|
||||||
@@ -154,12 +159,12 @@ static int iface_allowed(struct daemon *daemon, struct irec **irecp, int if_inde
|
|||||||
|
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
if (addr->sa.sa_family == AF_INET6 &&
|
if (addr->sa.sa_family == AF_INET6 &&
|
||||||
!iface_check(daemon, AF_INET6, (struct all_addr *)&addr->in6.sin6_addr, &ifr, NULL))
|
!iface_check(AF_INET6, (struct all_addr *)&addr->in6.sin6_addr, &ifr, NULL))
|
||||||
return 1;
|
return 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* add to list */
|
/* add to list */
|
||||||
if ((iface = malloc(sizeof(struct irec))))
|
if ((iface = whine_malloc(sizeof(struct irec))))
|
||||||
{
|
{
|
||||||
iface->addr = *addr;
|
iface->addr = *addr;
|
||||||
iface->netmask = netmask;
|
iface->netmask = netmask;
|
||||||
@@ -174,7 +179,7 @@ static int iface_allowed(struct daemon *daemon, struct irec **irecp, int if_inde
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
static int iface_allowed_v6(struct daemon *daemon, struct in6_addr *local,
|
static int iface_allowed_v6(struct in6_addr *local,
|
||||||
int scope, int if_index, void *vparam)
|
int scope, int if_index, void *vparam)
|
||||||
{
|
{
|
||||||
union mysockaddr addr;
|
union mysockaddr addr;
|
||||||
@@ -191,11 +196,11 @@ static int iface_allowed_v6(struct daemon *daemon, struct in6_addr *local,
|
|||||||
addr.in6.sin6_port = htons(daemon->port);
|
addr.in6.sin6_port = htons(daemon->port);
|
||||||
addr.in6.sin6_scope_id = scope;
|
addr.in6.sin6_scope_id = scope;
|
||||||
|
|
||||||
return iface_allowed(daemon, (struct irec **)vparam, if_index, &addr, netmask);
|
return iface_allowed((struct irec **)vparam, if_index, &addr, netmask);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static int iface_allowed_v4(struct daemon *daemon, struct in_addr local, int if_index,
|
static int iface_allowed_v4(struct in_addr local, int if_index,
|
||||||
struct in_addr netmask, struct in_addr broadcast, void *vparam)
|
struct in_addr netmask, struct in_addr broadcast, void *vparam)
|
||||||
{
|
{
|
||||||
union mysockaddr addr;
|
union mysockaddr addr;
|
||||||
@@ -209,28 +214,26 @@ static int iface_allowed_v4(struct daemon *daemon, struct in_addr local, int if_
|
|||||||
addr.in.sin_addr = local;
|
addr.in.sin_addr = local;
|
||||||
addr.in.sin_port = htons(daemon->port);
|
addr.in.sin_port = htons(daemon->port);
|
||||||
|
|
||||||
return iface_allowed(daemon, (struct irec **)vparam, if_index, &addr, netmask);
|
return iface_allowed((struct irec **)vparam, if_index, &addr, netmask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int enumerate_interfaces(struct daemon *daemon)
|
int enumerate_interfaces(void)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
return iface_enumerate(daemon, &daemon->interfaces, iface_allowed_v4, iface_allowed_v6);
|
return iface_enumerate(&daemon->interfaces, iface_allowed_v4, iface_allowed_v6);
|
||||||
#else
|
#else
|
||||||
return iface_enumerate(daemon, &daemon->interfaces, iface_allowed_v4, NULL);
|
return iface_enumerate(&daemon->interfaces, iface_allowed_v4, NULL);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set NONBLOCK and CLOEXEC bits on fd: See Stevens 16.6 */
|
/* set NONBLOCK bit on fd: See Stevens 16.6 */
|
||||||
int fix_fd(int fd)
|
int fix_fd(int fd)
|
||||||
{
|
{
|
||||||
int flags;
|
int flags;
|
||||||
|
|
||||||
if ((flags = fcntl(fd, F_GETFL)) == -1 ||
|
if ((flags = fcntl(fd, F_GETFL)) == -1 ||
|
||||||
fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1 ||
|
fcntl(fd, F_SETFL, flags | O_NONBLOCK) == -1)
|
||||||
(flags = fcntl(fd, F_GETFD)) == -1 ||
|
|
||||||
fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1)
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
@@ -289,21 +292,24 @@ static int create_ipv6_listener(struct listener **link, int port)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
struct listener *create_wildcard_listeners(int port, int have_tftp)
|
struct listener *create_wildcard_listeners(void)
|
||||||
{
|
{
|
||||||
union mysockaddr addr;
|
union mysockaddr addr;
|
||||||
int opt = 1;
|
int opt = 1;
|
||||||
struct listener *l, *l6 = NULL;
|
struct listener *l, *l6 = NULL;
|
||||||
int tcpfd, fd, tftpfd = -1;
|
int tcpfd = -1, fd = -1, tftpfd = -1;
|
||||||
|
|
||||||
memset(&addr, 0, sizeof(addr));
|
memset(&addr, 0, sizeof(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(port);
|
addr.in.sin_port = htons(daemon->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
|
||||||
|
|
||||||
|
if (daemon->port != 0)
|
||||||
|
{
|
||||||
|
|
||||||
if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1 ||
|
if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1 ||
|
||||||
(tcpfd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
|
(tcpfd = socket(AF_INET, SOCK_STREAM, 0)) == -1)
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -313,7 +319,7 @@ struct listener *create_wildcard_listeners(int port, int have_tftp)
|
|||||||
listen(tcpfd, 5) == -1 ||
|
listen(tcpfd, 5) == -1 ||
|
||||||
!fix_fd(tcpfd) ||
|
!fix_fd(tcpfd) ||
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
!create_ipv6_listener(&l6, port) ||
|
!create_ipv6_listener(&l6, daemon->port) ||
|
||||||
#endif
|
#endif
|
||||||
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
|
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
|
||||||
!fix_fd(fd) ||
|
!fix_fd(fd) ||
|
||||||
@@ -325,16 +331,16 @@ struct listener *create_wildcard_listeners(int port, int have_tftp)
|
|||||||
#endif
|
#endif
|
||||||
bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1)
|
bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef HAVE_TFTP
|
#ifdef HAVE_TFTP
|
||||||
if (have_tftp)
|
if (daemon->options & OPT_TFTP)
|
||||||
{
|
{
|
||||||
addr.in.sin_port = htons(TFTP_PORT);
|
addr.in.sin_port = htons(TFTP_PORT);
|
||||||
if ((tftpfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
|
if ((tftpfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (setsockopt(tftpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
|
if (!fix_fd(tftpfd) ||
|
||||||
!fix_fd(tftpfd) ||
|
|
||||||
#if defined(HAVE_LINUX_NETWORK)
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
setsockopt(tftpfd, SOL_IP, IP_PKTINFO, &opt, sizeof(opt)) == -1 ||
|
setsockopt(tftpfd, SOL_IP, IP_PKTINFO, &opt, sizeof(opt)) == -1 ||
|
||||||
#elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF)
|
#elif defined(IP_RECVDSTADDR) && defined(IP_RECVIF)
|
||||||
@@ -356,7 +362,7 @@ struct listener *create_wildcard_listeners(int port, int have_tftp)
|
|||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct listener *create_bound_listeners(struct daemon *daemon)
|
struct listener *create_bound_listeners(void)
|
||||||
{
|
{
|
||||||
struct listener *listeners = NULL;
|
struct listener *listeners = NULL;
|
||||||
struct irec *iface;
|
struct irec *iface;
|
||||||
@@ -369,21 +375,25 @@ struct listener *create_bound_listeners(struct daemon *daemon)
|
|||||||
new->iface = iface;
|
new->iface = iface;
|
||||||
new->next = listeners;
|
new->next = listeners;
|
||||||
new->tftpfd = -1;
|
new->tftpfd = -1;
|
||||||
|
new->tcpfd = -1;
|
||||||
|
new->fd = -1;
|
||||||
|
|
||||||
|
if (daemon->port != 0)
|
||||||
|
{
|
||||||
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 ||
|
||||||
setsockopt(new->tcpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
|
setsockopt(new->tcpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
|
||||||
!fix_fd(new->tcpfd) ||
|
!fix_fd(new->tcpfd) ||
|
||||||
!fix_fd(new->fd))
|
!fix_fd(new->fd))
|
||||||
die(_("failed to create listening socket: %s"), NULL);
|
die(_("failed to create listening socket: %s"), NULL, EC_BADNET);
|
||||||
|
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
if (iface->addr.sa.sa_family == AF_INET6)
|
if (iface->addr.sa.sa_family == AF_INET6)
|
||||||
{
|
{
|
||||||
if (setsockopt(new->fd, IPV6_LEVEL, IPV6_V6ONLY, &opt, sizeof(opt)) == -1 ||
|
if (setsockopt(new->fd, IPV6_LEVEL, IPV6_V6ONLY, &opt, sizeof(opt)) == -1 ||
|
||||||
setsockopt(new->tcpfd, 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);
|
die(_("failed to set IPV6 options on listening socket: %s"), NULL, EC_BADNET);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -391,27 +401,26 @@ struct listener *create_bound_listeners(struct daemon *daemon)
|
|||||||
bind(new->fd, &iface->addr.sa, sa_len(&iface->addr)) == -1)
|
bind(new->fd, &iface->addr.sa, sa_len(&iface->addr)) == -1)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
if (iface->addr.sa.sa_family == AF_INET6 && errno == ENODEV)
|
if (iface->addr.sa.sa_family == AF_INET6 && (errno == ENODEV || errno == EADDRNOTAVAIL))
|
||||||
{
|
{
|
||||||
close(new->tcpfd);
|
close(new->tcpfd);
|
||||||
close(new->fd);
|
close(new->fd);
|
||||||
free(new);
|
free(new);
|
||||||
|
new = NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
prettyprint_addr(&iface->addr, daemon->namebuff);
|
prettyprint_addr(&iface->addr, daemon->namebuff);
|
||||||
die(_("failed to bind listening socket for %s: %s"),
|
die(_("failed to bind listening socket for %s: %s"),
|
||||||
daemon->namebuff);
|
daemon->namebuff, EC_BADNET);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else if (listen(new->tcpfd, 5) == -1)
|
||||||
{
|
die(_("failed to listen on socket: %s"), NULL, EC_BADNET);
|
||||||
listeners = new;
|
|
||||||
if (listen(new->tcpfd, 5) == -1)
|
|
||||||
die(_("failed to listen on socket: %s"), NULL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_TFTP
|
||||||
if ((daemon->options & OPT_TFTP) && iface->addr.sa.sa_family == AF_INET && iface->dhcp_ok)
|
if ((daemon->options & OPT_TFTP) && iface->addr.sa.sa_family == AF_INET && iface->dhcp_ok)
|
||||||
{
|
{
|
||||||
short save = iface->addr.in.sin_port;
|
short save = iface->addr.in.sin_port;
|
||||||
@@ -420,26 +429,59 @@ struct listener *create_bound_listeners(struct daemon *daemon)
|
|||||||
setsockopt(new->tftpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
|
setsockopt(new->tftpfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1 ||
|
||||||
!fix_fd(new->tftpfd) ||
|
!fix_fd(new->tftpfd) ||
|
||||||
bind(new->tftpfd, &iface->addr.sa, sa_len(&iface->addr)) == -1)
|
bind(new->tftpfd, &iface->addr.sa, sa_len(&iface->addr)) == -1)
|
||||||
die(_("failed to create TFTP socket: %s"), NULL);
|
die(_("failed to create TFTP socket: %s"), NULL, EC_BADNET);
|
||||||
iface->addr.in.sin_port = save;
|
iface->addr.in.sin_port = save;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (new)
|
||||||
|
listeners = new;
|
||||||
}
|
}
|
||||||
|
|
||||||
return listeners;
|
return listeners;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct serverfd *allocate_sfd(union mysockaddr *addr, struct serverfd **sfds)
|
int local_bind(int fd, union mysockaddr *addr, char *intname, int is_tcp)
|
||||||
|
{
|
||||||
|
union mysockaddr addr_copy = *addr;
|
||||||
|
|
||||||
|
/* cannot set source _port_ for TCP connections. */
|
||||||
|
if (is_tcp)
|
||||||
|
{
|
||||||
|
if (addr_copy.sa.sa_family == AF_INET)
|
||||||
|
addr_copy.in.sin_port = 0;
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
else
|
||||||
|
addr_copy.in6.sin6_port = 0;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bind(fd, (struct sockaddr *)&addr_copy, sa_len(&addr_copy)) == -1)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
#if defined(SO_BINDTODEVICE)
|
||||||
|
if (strlen(intname) != 0 &&
|
||||||
|
setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, intname, sizeof(intname)) == -1)
|
||||||
|
return 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct serverfd *allocate_sfd(union mysockaddr *addr, char *intname)
|
||||||
{
|
{
|
||||||
struct serverfd *sfd;
|
struct serverfd *sfd;
|
||||||
|
int errsave;
|
||||||
|
|
||||||
/* may have a suitable one already */
|
/* may have a suitable one already */
|
||||||
for (sfd = *sfds; sfd; sfd = sfd->next )
|
for (sfd = daemon->sfds; sfd; sfd = sfd->next )
|
||||||
if (sockaddr_isequal(&sfd->source_addr, addr))
|
if (sockaddr_isequal(&sfd->source_addr, addr) &&
|
||||||
|
strcmp(intname, sfd->interface) == 0)
|
||||||
return sfd;
|
return sfd;
|
||||||
|
|
||||||
/* need to make a new one. */
|
/* need to make a new one. */
|
||||||
errno = ENOMEM; /* in case malloc fails. */
|
errno = ENOMEM; /* in case malloc fails. */
|
||||||
if (!(sfd = malloc(sizeof(struct serverfd))))
|
if (!(sfd = whine_malloc(sizeof(struct serverfd))))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if ((sfd->fd = socket(addr->sa.sa_family, SOCK_DGRAM, 0)) == -1)
|
if ((sfd->fd = socket(addr->sa.sa_family, SOCK_DGRAM, 0)) == -1)
|
||||||
@@ -448,24 +490,69 @@ 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 (!local_bind(sfd->fd, addr, intname, 0) || !fix_fd(sfd->fd))
|
||||||
!fix_fd(sfd->fd))
|
|
||||||
{
|
{
|
||||||
int errsave = errno; /* save error from bind. */
|
errsave = errno; /* save error from bind. */
|
||||||
close(sfd->fd);
|
close(sfd->fd);
|
||||||
free(sfd);
|
free(sfd);
|
||||||
errno = errsave;
|
errno = errsave;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
strcpy(sfd->interface, intname);
|
||||||
sfd->source_addr = *addr;
|
sfd->source_addr = *addr;
|
||||||
sfd->next = *sfds;
|
sfd->next = daemon->sfds;
|
||||||
*sfds = sfd;
|
daemon->sfds = sfd;
|
||||||
|
|
||||||
return sfd;
|
return sfd;
|
||||||
}
|
}
|
||||||
|
|
||||||
void check_servers(struct daemon *daemon)
|
/* create upstream sockets during startup, before root is dropped which may be needed
|
||||||
|
this allows query_port to be a low port and interface binding */
|
||||||
|
void pre_allocate_sfds(void)
|
||||||
|
{
|
||||||
|
struct server *srv;
|
||||||
|
|
||||||
|
if (daemon->query_port != 0)
|
||||||
|
{
|
||||||
|
union mysockaddr addr;
|
||||||
|
memset(&addr, 0, sizeof(addr));
|
||||||
|
addr.in.sin_family = AF_INET;
|
||||||
|
addr.in.sin_addr.s_addr = INADDR_ANY;
|
||||||
|
addr.in.sin_port = htons(daemon->query_port);
|
||||||
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
||||||
|
addr.in.sin_len = sizeof(struct sockaddr_in);
|
||||||
|
#endif
|
||||||
|
allocate_sfd(&addr, "");
|
||||||
|
#ifdef HAVE_IPV6
|
||||||
|
memset(&addr, 0, sizeof(addr));
|
||||||
|
addr.in6.sin6_family = AF_INET6;
|
||||||
|
addr.in6.sin6_addr = in6addr_any;
|
||||||
|
addr.in6.sin6_port = htons(daemon->query_port);
|
||||||
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
||||||
|
addr.in6.sin6_len = sizeof(struct sockaddr_in6);
|
||||||
|
#endif
|
||||||
|
allocate_sfd(&addr, "");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
for (srv = daemon->servers; srv; srv = srv->next)
|
||||||
|
if (!(srv->flags & (SERV_LITERAL_ADDRESS | SERV_NO_ADDR)) &&
|
||||||
|
!allocate_sfd(&srv->source_addr, srv->interface) &&
|
||||||
|
(daemon->options & OPT_NOWILD))
|
||||||
|
{
|
||||||
|
prettyprint_addr(&srv->addr, daemon->namebuff);
|
||||||
|
if (strlen(srv->interface) != 0)
|
||||||
|
{
|
||||||
|
strcat(daemon->namebuff, " ");
|
||||||
|
strcat(daemon->namebuff, srv->interface);
|
||||||
|
}
|
||||||
|
die(_("failed to bind server socket for %s: %s"),
|
||||||
|
daemon->namebuff, EC_BADNET);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void check_servers(void)
|
||||||
{
|
{
|
||||||
struct irec *iface;
|
struct irec *iface;
|
||||||
struct server *new, *tmp, *ret = NULL;
|
struct server *new, *tmp, *ret = NULL;
|
||||||
@@ -498,7 +585,7 @@ void check_servers(struct daemon *daemon)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Do we need a socket set? */
|
/* Do we need a socket set? */
|
||||||
if (!new->sfd && !(new->sfd = allocate_sfd(&new->source_addr, &daemon->sfds)))
|
if (!new->sfd && !(new->sfd = allocate_sfd(&new->source_addr, new->interface)))
|
||||||
{
|
{
|
||||||
my_syslog(LOG_WARNING,
|
my_syslog(LOG_WARNING,
|
||||||
_("ignoring nameserver %s - cannot make/bind socket: %s"),
|
_("ignoring nameserver %s - cannot make/bind socket: %s"),
|
||||||
@@ -515,16 +602,20 @@ void check_servers(struct daemon *daemon)
|
|||||||
if (new->flags & (SERV_HAS_DOMAIN | SERV_FOR_NODOTS))
|
if (new->flags & (SERV_HAS_DOMAIN | SERV_FOR_NODOTS))
|
||||||
{
|
{
|
||||||
char *s1, *s2;
|
char *s1, *s2;
|
||||||
if (new->flags & SERV_HAS_DOMAIN)
|
if (!(new->flags & SERV_HAS_DOMAIN))
|
||||||
s1 = _("domain"), s2 = new->domain;
|
s1 = _("unqualified"), s2 = _("names");
|
||||||
|
else if (strlen(new->domain) == 0)
|
||||||
|
s1 = _("default"), s2 = "";
|
||||||
else
|
else
|
||||||
s1 = _("unqualified"), s2 = _("domains");
|
s1 = _("domain"), s2 = new->domain;
|
||||||
|
|
||||||
if (new->flags & SERV_NO_ADDR)
|
if (new->flags & SERV_NO_ADDR)
|
||||||
my_syslog(LOG_INFO, _("using local addresses only for %s %s"), s1, s2);
|
my_syslog(LOG_INFO, _("using local addresses only for %s %s"), s1, s2);
|
||||||
else if (!(new->flags & SERV_LITERAL_ADDRESS))
|
else if (!(new->flags & SERV_LITERAL_ADDRESS))
|
||||||
my_syslog(LOG_INFO, _("using nameserver %s#%d for %s %s"), daemon->namebuff, port, s1, s2);
|
my_syslog(LOG_INFO, _("using nameserver %s#%d for %s %s"), daemon->namebuff, port, s1, s2);
|
||||||
}
|
}
|
||||||
|
else if (strlen(new->interface) != 0)
|
||||||
|
my_syslog(LOG_INFO, _("using nameserver %s#%d(via %s)"), daemon->namebuff, port, new->interface);
|
||||||
else
|
else
|
||||||
my_syslog(LOG_INFO, _("using nameserver %s#%d"), daemon->namebuff, port);
|
my_syslog(LOG_INFO, _("using nameserver %s#%d"), daemon->namebuff, port);
|
||||||
}
|
}
|
||||||
@@ -534,7 +625,7 @@ void check_servers(struct daemon *daemon)
|
|||||||
|
|
||||||
/* Return zero if no servers found, in that case we keep polling.
|
/* Return zero if no servers found, in that case we keep polling.
|
||||||
This is a protection against an update-time/write race on resolv.conf */
|
This is a protection against an update-time/write race on resolv.conf */
|
||||||
int reload_servers(char *fname, struct daemon *daemon)
|
int reload_servers(char *fname)
|
||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
char *line;
|
char *line;
|
||||||
@@ -561,7 +652,7 @@ int reload_servers(char *fname, struct daemon *daemon)
|
|||||||
serv->next = old_servers;
|
serv->next = old_servers;
|
||||||
old_servers = serv;
|
old_servers = serv;
|
||||||
/* forward table rules reference servers, so have to blow them away */
|
/* forward table rules reference servers, so have to blow them away */
|
||||||
server_gone(daemon, serv);
|
server_gone(serv);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -576,7 +667,9 @@ int reload_servers(char *fname, struct daemon *daemon)
|
|||||||
union mysockaddr addr, source_addr;
|
union mysockaddr addr, source_addr;
|
||||||
char *token = strtok(line, " \t\n\r");
|
char *token = strtok(line, " \t\n\r");
|
||||||
|
|
||||||
if (!token || strcmp(token, "nameserver") != 0)
|
if (!token)
|
||||||
|
continue;
|
||||||
|
if (strcmp(token, "nameserver") != 0 && strcmp(token, "server") != 0)
|
||||||
continue;
|
continue;
|
||||||
if (!(token = strtok(NULL, " \t\n\r")))
|
if (!(token = strtok(NULL, " \t\n\r")))
|
||||||
continue;
|
continue;
|
||||||
@@ -614,7 +707,7 @@ int reload_servers(char *fname, struct daemon *daemon)
|
|||||||
serv = old_servers;
|
serv = old_servers;
|
||||||
old_servers = old_servers->next;
|
old_servers = old_servers->next;
|
||||||
}
|
}
|
||||||
else if (!(serv = malloc(sizeof (struct server))))
|
else if (!(serv = whine_malloc(sizeof (struct server))))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* this list is reverse ordered:
|
/* this list is reverse ordered:
|
||||||
@@ -624,9 +717,10 @@ int reload_servers(char *fname, struct daemon *daemon)
|
|||||||
serv->addr = addr;
|
serv->addr = addr;
|
||||||
serv->source_addr = source_addr;
|
serv->source_addr = source_addr;
|
||||||
serv->domain = NULL;
|
serv->domain = NULL;
|
||||||
|
serv->interface[0] = 0;
|
||||||
serv->sfd = NULL;
|
serv->sfd = NULL;
|
||||||
serv->flags = SERV_FROM_RESOLV;
|
serv->flags = SERV_FROM_RESOLV;
|
||||||
|
serv->queries = serv->failed_queries = 0;
|
||||||
gotone = 1;
|
gotone = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -646,7 +740,7 @@ int reload_servers(char *fname, struct daemon *daemon)
|
|||||||
|
|
||||||
|
|
||||||
/* Use an IPv4 listener socket for ioctling */
|
/* Use an IPv4 listener socket for ioctling */
|
||||||
struct in_addr get_ifaddr(struct daemon* daemon, char *intr)
|
struct in_addr get_ifaddr(char *intr)
|
||||||
{
|
{
|
||||||
struct listener *l;
|
struct listener *l;
|
||||||
struct ifreq ifr;
|
struct ifreq ifr;
|
||||||
|
|||||||
+447
-239
File diff suppressed because it is too large.
Load diff
+122
-73
@@ -1,13 +1,17 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000 - 2006 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -32,7 +36,7 @@ static int extract_name(HEADER *header, size_t plen, unsigned char **pp,
|
|||||||
unsigned int label_type = l & 0xc0;
|
unsigned int label_type = l & 0xc0;
|
||||||
if (label_type == 0xc0) /* pointer */
|
if (label_type == 0xc0) /* pointer */
|
||||||
{
|
{
|
||||||
if ((size_t)(p - (unsigned char *)header + 1) >= plen)
|
if ((size_t)(p - (unsigned char *)header) >= plen)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* get offset */
|
/* get offset */
|
||||||
@@ -70,7 +74,7 @@ static int extract_name(HEADER *header, size_t plen, unsigned char **pp,
|
|||||||
/* output is \[x<hex>/siz]. which is digs+9 chars */
|
/* output is \[x<hex>/siz]. which is digs+9 chars */
|
||||||
if (cp - (unsigned char *)name + digs + 9 >= MAXDNAME)
|
if (cp - (unsigned char *)name + digs + 9 >= MAXDNAME)
|
||||||
return 0;
|
return 0;
|
||||||
if ((size_t)(p - (unsigned char *)header + ((count-1)>>3) + 1) >= plen)
|
if ((size_t)(p - (unsigned char *)header + ((count-1)>>3)) >= plen)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
*cp++ = '\\';
|
*cp++ = '\\';
|
||||||
@@ -94,7 +98,7 @@ static int extract_name(HEADER *header, size_t plen, unsigned char **pp,
|
|||||||
{ /* label_type = 0 -> label. */
|
{ /* label_type = 0 -> label. */
|
||||||
if (cp - (unsigned char *)name + l + 1 >= MAXDNAME)
|
if (cp - (unsigned char *)name + l + 1 >= MAXDNAME)
|
||||||
return 0;
|
return 0;
|
||||||
if ((size_t)(p - (unsigned char *)header + 1) >= plen)
|
if ((size_t)(p - (unsigned char *)header) >= plen)
|
||||||
return 0;
|
return 0;
|
||||||
for(j=0; j<l; j++, p++)
|
for(j=0; j<l; j++, p++)
|
||||||
if (isExtract)
|
if (isExtract)
|
||||||
@@ -304,10 +308,10 @@ static unsigned char *skip_name(unsigned char *ansp, HEADER *header, size_t plen
|
|||||||
|
|
||||||
static unsigned char *skip_questions(HEADER *header, size_t plen)
|
static unsigned char *skip_questions(HEADER *header, size_t plen)
|
||||||
{
|
{
|
||||||
int q, qdcount = ntohs(header->qdcount);
|
int q;
|
||||||
unsigned char *ansp = (unsigned char *)(header+1);
|
unsigned char *ansp = (unsigned char *)(header+1);
|
||||||
|
|
||||||
for (q = 0; q<qdcount; q++)
|
for (q = ntohs(header->qdcount); q != 0; q--)
|
||||||
{
|
{
|
||||||
if (!(ansp = skip_name(ansp, header, plen)))
|
if (!(ansp = skip_name(ansp, header, plen)))
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -349,7 +353,7 @@ unsigned int questions_crc(HEADER *header, size_t plen, char *name)
|
|||||||
unsigned int crc = 0xffffffff;
|
unsigned int crc = 0xffffffff;
|
||||||
unsigned char *p1, *p = (unsigned char *)(header+1);
|
unsigned char *p1, *p = (unsigned char *)(header+1);
|
||||||
|
|
||||||
for (q = 0; q < ntohs(header->qdcount); q++)
|
for (q = ntohs(header->qdcount); q != 0; q--)
|
||||||
{
|
{
|
||||||
if (!extract_name(header, plen, &p, name, 1))
|
if (!extract_name(header, plen, &p, name, 1))
|
||||||
return crc; /* bad packet */
|
return crc; /* bad packet */
|
||||||
@@ -426,7 +430,7 @@ unsigned char *find_pseudoheader(HEADER *header, size_t plen, size_t *len, unsi
|
|||||||
|
|
||||||
if (header->opcode == QUERY)
|
if (header->opcode == QUERY)
|
||||||
{
|
{
|
||||||
for (i = 0; i < ntohs(header->qdcount); i++)
|
for (i = ntohs(header->qdcount); i != 0; i--)
|
||||||
{
|
{
|
||||||
if (!(ansp = skip_name(ansp, header, plen)))
|
if (!(ansp = skip_name(ansp, header, plen)))
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -497,20 +501,51 @@ static int private_net(struct in_addr addr)
|
|||||||
((ip_addr & 0xFFFF0000) == 0xA9FE0000) /* 169.254.0.0/16 (zeroconf) */ ;
|
((ip_addr & 0xFFFF0000) == 0xA9FE0000) /* 169.254.0.0/16 (zeroconf) */ ;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dns_doctor(HEADER *header, struct doctor *doctor, struct in_addr *addr)
|
static unsigned char *do_doctor(unsigned char *p, int count, HEADER *header, size_t qlen)
|
||||||
{
|
{
|
||||||
for (; doctor; doctor = doctor->next)
|
int i, qtype, qclass, rdlen;
|
||||||
if (is_same_net(doctor->in, *addr, doctor->mask))
|
unsigned long ttl;
|
||||||
|
|
||||||
|
for (i = count; i != 0; i--)
|
||||||
{
|
{
|
||||||
addr->s_addr &= ~doctor->mask.s_addr;
|
if (!(p = skip_name(p, header, qlen)))
|
||||||
addr->s_addr |= (doctor->out.s_addr & doctor->mask.s_addr);
|
return 0; /* bad packet */
|
||||||
|
|
||||||
|
GETSHORT(qtype, p);
|
||||||
|
GETSHORT(qclass, p);
|
||||||
|
GETLONG(ttl, p);
|
||||||
|
GETSHORT(rdlen, p);
|
||||||
|
|
||||||
|
if ((qclass == C_IN) && (qtype == T_A))
|
||||||
|
{
|
||||||
|
struct doctor *doctor;
|
||||||
|
struct in_addr addr;
|
||||||
|
|
||||||
|
/* alignment */
|
||||||
|
memcpy(&addr, p, INADDRSZ);
|
||||||
|
|
||||||
|
for (doctor = daemon->doctors; doctor; doctor = doctor->next)
|
||||||
|
if (is_same_net(doctor->in, addr, doctor->mask))
|
||||||
|
{
|
||||||
|
addr.s_addr &= ~doctor->mask.s_addr;
|
||||||
|
addr.s_addr |= (doctor->out.s_addr & doctor->mask.s_addr);
|
||||||
/* 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->aa = 0;
|
header->aa = 0;
|
||||||
|
memcpy(p, &addr, INADDRSZ);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int find_soa(HEADER *header, struct doctor *doctor, size_t qlen)
|
p += rdlen;
|
||||||
|
|
||||||
|
if ((size_t)(p - (unsigned char *)header) > qlen)
|
||||||
|
return 0; /* bad packet */
|
||||||
|
}
|
||||||
|
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int find_soa(HEADER *header, size_t qlen)
|
||||||
{
|
{
|
||||||
unsigned char *p;
|
unsigned char *p;
|
||||||
int qtype, qclass, rdlen;
|
int qtype, qclass, rdlen;
|
||||||
@@ -519,10 +554,10 @@ static int find_soa(HEADER *header, struct doctor *doctor, size_t qlen)
|
|||||||
|
|
||||||
/* first move to NS section and find TTL from any SOA section */
|
/* first move to NS section and find TTL from any SOA section */
|
||||||
if (!(p = skip_questions(header, qlen)) ||
|
if (!(p = skip_questions(header, qlen)) ||
|
||||||
!(p = skip_section(p, ntohs(header->ancount), header, qlen)))
|
!(p = do_doctor(p, ntohs(header->ancount), header, qlen)))
|
||||||
return 0; /* bad packet */
|
return 0; /* bad packet */
|
||||||
|
|
||||||
for (i=0; i<ntohs(header->nscount); i++)
|
for (i = ntohs(header->nscount); i != 0; i--)
|
||||||
{
|
{
|
||||||
if (!(p = skip_name(p, header, qlen)))
|
if (!(p = skip_name(p, header, qlen)))
|
||||||
return 0; /* bad packet */
|
return 0; /* bad packet */
|
||||||
@@ -557,37 +592,26 @@ static int find_soa(HEADER *header, struct doctor *doctor, size_t qlen)
|
|||||||
return 0; /* bad packet */
|
return 0; /* bad packet */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (doctor)
|
/* rewrite addresses in additioal section too */
|
||||||
for (i=0; i<ntohs(header->arcount); i++)
|
if (!do_doctor(p, ntohs(header->arcount), header, qlen))
|
||||||
{
|
return 0;
|
||||||
if (!(p = skip_name(p, header, qlen)))
|
|
||||||
return 0; /* bad packet */
|
|
||||||
|
|
||||||
GETSHORT(qtype, p);
|
if (!found_soa)
|
||||||
GETSHORT(qclass, p);
|
minttl = daemon->neg_ttl;
|
||||||
GETLONG(ttl, p);
|
|
||||||
GETSHORT(rdlen, p);
|
|
||||||
|
|
||||||
if ((qclass == C_IN) && (qtype == T_A))
|
return minttl;
|
||||||
dns_doctor(header, doctor, (struct in_addr *)p);
|
|
||||||
|
|
||||||
p += rdlen;
|
|
||||||
|
|
||||||
if ((size_t)(p - (unsigned char *)header) > qlen)
|
|
||||||
return 0; /* bad packet */
|
|
||||||
}
|
|
||||||
|
|
||||||
return found_soa ? minttl : 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Note that the following code can create CNAME chains that don't point to a real record,
|
/* Note that the following code can create CNAME chains that don't point to a real record,
|
||||||
either because of lack of memory, or lack of SOA records. These are treated by the cache code as
|
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. */
|
expired and cleaned out that way.
|
||||||
void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, struct daemon *daemon)
|
Return 1 if we reject an address because it look like parct of dns-rebinding attack. */
|
||||||
|
int extract_addresses(HEADER *header, size_t qlen, char *name, time_t now)
|
||||||
{
|
{
|
||||||
unsigned char *p, *p1, *endrr;
|
unsigned char *p, *p1, *endrr, *namep;
|
||||||
int i, j, qtype, qclass, aqtype, aqclass, ardlen, res, searched_soa = 0;
|
int i, j, qtype, qclass, aqtype, aqclass, ardlen, res, searched_soa = 0;
|
||||||
unsigned long ttl = 0;
|
unsigned long ttl = 0;
|
||||||
|
struct all_addr addr;
|
||||||
|
|
||||||
cache_start_insert();
|
cache_start_insert();
|
||||||
|
|
||||||
@@ -595,21 +619,22 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
if (daemon->doctors)
|
if (daemon->doctors)
|
||||||
{
|
{
|
||||||
searched_soa = 1;
|
searched_soa = 1;
|
||||||
ttl = find_soa(header, daemon->doctors, qlen);
|
ttl = find_soa(header, qlen);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* go through the questions. */
|
/* go through the questions. */
|
||||||
p = (unsigned char *)(header+1);
|
p = (unsigned char *)(header+1);
|
||||||
|
|
||||||
for (i = 0; i<ntohs(header->qdcount); i++)
|
for (i = ntohs(header->qdcount); i != 0; i--)
|
||||||
{
|
{
|
||||||
int found = 0, cname_count = 5;
|
int found = 0, cname_count = 5;
|
||||||
struct crec *cpp = NULL;
|
struct crec *cpp = NULL;
|
||||||
int flags = header->rcode == NXDOMAIN ? F_NXDOMAIN : 0;
|
int flags = header->rcode == NXDOMAIN ? F_NXDOMAIN : 0;
|
||||||
unsigned long cttl = ULONG_MAX, attl;
|
unsigned long cttl = ULONG_MAX, attl;
|
||||||
|
|
||||||
|
namep = p;
|
||||||
if (!extract_name(header, qlen, &p, name, 1))
|
if (!extract_name(header, qlen, &p, name, 1))
|
||||||
return; /* bad packet */
|
return 0; /* bad packet */
|
||||||
|
|
||||||
GETSHORT(qtype, p);
|
GETSHORT(qtype, p);
|
||||||
GETSHORT(qclass, p);
|
GETSHORT(qclass, p);
|
||||||
@@ -621,7 +646,6 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
represent them in the cache. */
|
represent them in the cache. */
|
||||||
if (qtype == T_PTR)
|
if (qtype == T_PTR)
|
||||||
{
|
{
|
||||||
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)
|
||||||
@@ -631,12 +655,15 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
{
|
{
|
||||||
cname_loop:
|
cname_loop:
|
||||||
if (!(p1 = skip_questions(header, qlen)))
|
if (!(p1 = skip_questions(header, qlen)))
|
||||||
return;
|
return 0;
|
||||||
|
|
||||||
for (j = 0; j<ntohs(header->ancount); j++)
|
for (j = ntohs(header->ancount); j != 0; j--)
|
||||||
{
|
{
|
||||||
if (!(res = extract_name(header, qlen, &p1, name, 0)))
|
unsigned char *tmp = namep;
|
||||||
return; /* bad packet */
|
/* the loop body overwrites the original name, so get it back here. */
|
||||||
|
if (!extract_name(header, qlen, &tmp, name, 1) ||
|
||||||
|
!(res = extract_name(header, qlen, &p1, name, 0)))
|
||||||
|
return 0; /* bad packet */
|
||||||
|
|
||||||
GETSHORT(aqtype, p1);
|
GETSHORT(aqtype, p1);
|
||||||
GETSHORT(aqclass, p1);
|
GETSHORT(aqclass, p1);
|
||||||
@@ -651,12 +678,12 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
if (aqclass == C_IN && res != 2 && (aqtype == T_CNAME || aqtype == T_PTR))
|
if (aqclass == C_IN && res != 2 && (aqtype == T_CNAME || aqtype == T_PTR))
|
||||||
{
|
{
|
||||||
if (!extract_name(header, qlen, &p1, name, 1))
|
if (!extract_name(header, qlen, &p1, name, 1))
|
||||||
return;
|
return 0;
|
||||||
|
|
||||||
if (aqtype == T_CNAME)
|
if (aqtype == T_CNAME)
|
||||||
{
|
{
|
||||||
if (!cname_count--)
|
if (!cname_count--)
|
||||||
return; /* looped CNAMES */
|
return 0; /* looped CNAMES */
|
||||||
goto cname_loop;
|
goto cname_loop;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -666,7 +693,7 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
|
|
||||||
p1 = endrr;
|
p1 = endrr;
|
||||||
if ((size_t)(p1 - (unsigned char *)header) > qlen)
|
if ((size_t)(p1 - (unsigned char *)header) > qlen)
|
||||||
return; /* bad packet */
|
return 0; /* bad packet */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -675,22 +702,29 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
if (!searched_soa)
|
if (!searched_soa)
|
||||||
{
|
{
|
||||||
searched_soa = 1;
|
searched_soa = 1;
|
||||||
ttl = find_soa(header, NULL, qlen);
|
ttl = find_soa(header, qlen);
|
||||||
}
|
}
|
||||||
if (ttl)
|
if (ttl)
|
||||||
cache_insert(name, &addr, now, ttl, name_encoding | F_REVERSE | F_NEG | flags);
|
cache_insert(NULL, &addr, now, ttl, name_encoding | F_REVERSE | F_NEG | flags);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* everything other than PTR */
|
/* everything other than PTR */
|
||||||
struct crec *newc;
|
struct crec *newc;
|
||||||
|
int addrlen;
|
||||||
|
|
||||||
if (qtype == T_A)
|
if (qtype == T_A)
|
||||||
|
{
|
||||||
|
addrlen = INADDRSZ;
|
||||||
flags |= F_IPV4;
|
flags |= F_IPV4;
|
||||||
|
}
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
else if (qtype == T_AAAA)
|
else if (qtype == T_AAAA)
|
||||||
|
{
|
||||||
|
addrlen = IN6ADDRSZ;
|
||||||
flags |= F_IPV6;
|
flags |= F_IPV6;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
else
|
else
|
||||||
continue;
|
continue;
|
||||||
@@ -699,12 +733,12 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
{
|
{
|
||||||
cname_loop1:
|
cname_loop1:
|
||||||
if (!(p1 = skip_questions(header, qlen)))
|
if (!(p1 = skip_questions(header, qlen)))
|
||||||
return;
|
return 0;
|
||||||
|
|
||||||
for (j = 0; j<ntohs(header->ancount); j++)
|
for (j = ntohs(header->ancount); j != 0; j--)
|
||||||
{
|
{
|
||||||
if (!(res = extract_name(header, qlen, &p1, name, 0)))
|
if (!(res = extract_name(header, qlen, &p1, name, 0)))
|
||||||
return; /* bad packet */
|
return 0; /* bad packet */
|
||||||
|
|
||||||
GETSHORT(aqtype, p1);
|
GETSHORT(aqtype, p1);
|
||||||
GETSHORT(aqclass, p1);
|
GETSHORT(aqclass, p1);
|
||||||
@@ -717,7 +751,7 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
if (aqtype == T_CNAME)
|
if (aqtype == T_CNAME)
|
||||||
{
|
{
|
||||||
if (!cname_count--)
|
if (!cname_count--)
|
||||||
return; /* looped CNAMES */
|
return 0; /* looped CNAMES */
|
||||||
newc = cache_insert(name, NULL, now, attl, F_CNAME | F_FORWARD);
|
newc = cache_insert(name, NULL, now, attl, F_CNAME | F_FORWARD);
|
||||||
if (newc && cpp)
|
if (newc && cpp)
|
||||||
{
|
{
|
||||||
@@ -730,15 +764,22 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
cttl = attl;
|
cttl = attl;
|
||||||
|
|
||||||
if (!extract_name(header, qlen, &p1, name, 1))
|
if (!extract_name(header, qlen, &p1, name, 1))
|
||||||
return;
|
return 0;
|
||||||
goto cname_loop1;
|
goto cname_loop1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
found = 1;
|
found = 1;
|
||||||
if (aqtype == T_A)
|
/* copy address into aligned storage */
|
||||||
dns_doctor(header, daemon->doctors, (struct in_addr *)p1);
|
memcpy(&addr, p1, addrlen);
|
||||||
newc = cache_insert(name, (struct all_addr *)p1, now, attl, flags | F_FORWARD);
|
|
||||||
|
/* check for returned address in private space */
|
||||||
|
if ((daemon->options & OPT_NO_REBIND) &&
|
||||||
|
(flags & F_IPV4) &&
|
||||||
|
private_net(addr.addr.addr4))
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
newc = cache_insert(name, &addr, now, attl, flags | F_FORWARD);
|
||||||
if (newc && cpp)
|
if (newc && cpp)
|
||||||
{
|
{
|
||||||
cpp->addr.cname.cache = newc;
|
cpp->addr.cname.cache = newc;
|
||||||
@@ -750,7 +791,7 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
|
|
||||||
p1 = endrr;
|
p1 = endrr;
|
||||||
if ((size_t)(p1 - (unsigned char *)header) > qlen)
|
if ((size_t)(p1 - (unsigned char *)header) > qlen)
|
||||||
return; /* bad packet */
|
return 0; /* bad packet */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -759,13 +800,13 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
if (!searched_soa)
|
if (!searched_soa)
|
||||||
{
|
{
|
||||||
searched_soa = 1;
|
searched_soa = 1;
|
||||||
ttl = find_soa(header, NULL, qlen);
|
ttl = find_soa(header, qlen);
|
||||||
}
|
}
|
||||||
/* If there's no SOA to get the TTL from, but there is a CNAME
|
/* If there's no SOA to get the TTL from, but there is a CNAME
|
||||||
pointing at this, inherit it's TTL */
|
pointing at this, inherit its TTL */
|
||||||
if (ttl || cpp)
|
if (ttl || cpp)
|
||||||
{
|
{
|
||||||
newc = cache_insert(name, (struct all_addr *)p, now, ttl ? ttl : cttl, F_FORWARD | F_NEG | flags);
|
newc = cache_insert(name, NULL, now, ttl ? ttl : cttl, F_FORWARD | F_NEG | flags);
|
||||||
if (newc && cpp)
|
if (newc && cpp)
|
||||||
{
|
{
|
||||||
cpp->addr.cname.cache = newc;
|
cpp->addr.cname.cache = newc;
|
||||||
@@ -776,7 +817,11 @@ void extract_addresses(HEADER *header, size_t qlen, char *name, time_t now, stru
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Don't put stuff from a truncated packet into the cache, but do everything else */
|
||||||
|
if (!header->tc)
|
||||||
cache_end_insert();
|
cache_end_insert();
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If the packet holds exactly one query
|
/* If the packet holds exactly one query
|
||||||
@@ -833,7 +878,7 @@ size_t setup_reply(HEADER *header, size_t qlen,
|
|||||||
header->ancount = htons(0); /* no answers unless changed below */
|
header->ancount = htons(0); /* no answers unless changed below */
|
||||||
if (flags == F_NEG)
|
if (flags == F_NEG)
|
||||||
header->rcode = SERVFAIL; /* couldn't get memory */
|
header->rcode = SERVFAIL; /* couldn't get memory */
|
||||||
else if (flags == F_NOERR || flags == F_QUERY)
|
else if (flags == F_NOERR)
|
||||||
header->rcode = NOERROR; /* empty domain */
|
header->rcode = NOERROR; /* empty domain */
|
||||||
else if (flags == F_NXDOMAIN)
|
else if (flags == F_NXDOMAIN)
|
||||||
header->rcode = NXDOMAIN;
|
header->rcode = NXDOMAIN;
|
||||||
@@ -860,7 +905,7 @@ size_t setup_reply(HEADER *header, size_t qlen,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* check if name matches local names ie from /etc/hosts or DHCP or local mx names. */
|
/* 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 daemon *daemon)
|
int check_for_local_domain(char *name, time_t now)
|
||||||
{
|
{
|
||||||
struct crec *crecp;
|
struct crec *crecp;
|
||||||
struct mx_srv_record *mx;
|
struct mx_srv_record *mx;
|
||||||
@@ -906,7 +951,7 @@ int check_for_bogus_wildcard(HEADER *header, size_t qlen, char *name,
|
|||||||
if (!(p = skip_questions(header, qlen)))
|
if (!(p = skip_questions(header, qlen)))
|
||||||
return 0; /* bad packet */
|
return 0; /* bad packet */
|
||||||
|
|
||||||
for (i=0; i<ntohs(header->ancount); i++)
|
for (i = ntohs(header->ancount); i != 0; i--)
|
||||||
{
|
{
|
||||||
if (!extract_name(header, qlen, &p, name, 1))
|
if (!extract_name(header, qlen, &p, name, 1))
|
||||||
return 0; /* bad packet */
|
return 0; /* bad packet */
|
||||||
@@ -1019,7 +1064,7 @@ static int add_resource_record(HEADER *header, char *limit, int *truncp, unsigne
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* 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 */
|
||||||
size_t answer_request(HEADER *header, char *limit, size_t qlen, struct daemon *daemon,
|
size_t answer_request(HEADER *header, char *limit, size_t qlen,
|
||||||
struct in_addr local_addr, struct in_addr local_netmask, time_t now)
|
struct in_addr local_addr, struct in_addr local_netmask, time_t now)
|
||||||
{
|
{
|
||||||
char *name = daemon->namebuff;
|
char *name = daemon->namebuff;
|
||||||
@@ -1028,7 +1073,6 @@ size_t answer_request(HEADER *header, char *limit, size_t qlen, struct daemon *d
|
|||||||
struct all_addr addr;
|
struct all_addr addr;
|
||||||
unsigned int nameoffset;
|
unsigned int nameoffset;
|
||||||
unsigned short flag;
|
unsigned short flag;
|
||||||
int qdcount = ntohs(header->qdcount);
|
|
||||||
int q, ans, anscount = 0, addncount = 0;
|
int q, ans, anscount = 0, addncount = 0;
|
||||||
int dryrun = 0, sec_reqd = 0;
|
int dryrun = 0, sec_reqd = 0;
|
||||||
int is_sign;
|
int is_sign;
|
||||||
@@ -1063,7 +1107,7 @@ size_t answer_request(HEADER *header, char *limit, size_t qlen, struct daemon *d
|
|||||||
dryrun = 1;
|
dryrun = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!qdcount || header->opcode != QUERY )
|
if (ntohs(header->qdcount) == 0 || header->opcode != QUERY )
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
for (rec = daemon->mxnames; rec; rec = rec->next)
|
for (rec = daemon->mxnames; rec; rec = rec->next)
|
||||||
@@ -1077,7 +1121,7 @@ size_t answer_request(HEADER *header, char *limit, size_t qlen, struct daemon *d
|
|||||||
/* now process each question, answers go in RRs after the question */
|
/* now process each question, answers go in RRs after the question */
|
||||||
p = (unsigned char *)(header+1);
|
p = (unsigned char *)(header+1);
|
||||||
|
|
||||||
for (q=0; q<qdcount; q++)
|
for (q = ntohs(header->qdcount); q != 0; q--)
|
||||||
{
|
{
|
||||||
/* save pointer to name for copying into answers */
|
/* save pointer to name for copying into answers */
|
||||||
nameoffset = p - (unsigned char *)header;
|
nameoffset = p - (unsigned char *)header;
|
||||||
@@ -1127,8 +1171,13 @@ size_t answer_request(HEADER *header, char *limit, size_t qlen, struct daemon *d
|
|||||||
|
|
||||||
if (is_arpa == F_IPV4)
|
if (is_arpa == F_IPV4)
|
||||||
for (intr = daemon->int_names; intr; intr = intr->next)
|
for (intr = daemon->int_names; intr; intr = intr->next)
|
||||||
if (addr.addr.addr4.s_addr == get_ifaddr(daemon, intr->intr).s_addr)
|
{
|
||||||
|
if (addr.addr.addr4.s_addr == get_ifaddr(intr->intr).s_addr)
|
||||||
break;
|
break;
|
||||||
|
else
|
||||||
|
while (intr->next && strcmp(intr->intr, intr->next->intr) == 0)
|
||||||
|
intr = intr->next;
|
||||||
|
}
|
||||||
|
|
||||||
if (intr)
|
if (intr)
|
||||||
{
|
{
|
||||||
@@ -1252,7 +1301,7 @@ size_t answer_request(HEADER *header, char *limit, size_t qlen, struct daemon *d
|
|||||||
ans = 1;
|
ans = 1;
|
||||||
if (!dryrun)
|
if (!dryrun)
|
||||||
{
|
{
|
||||||
if ((addr.addr.addr4 = get_ifaddr(daemon, intr->intr)).s_addr == (in_addr_t) -1)
|
if ((addr.addr.addr4 = get_ifaddr(intr->intr)).s_addr == (in_addr_t) -1)
|
||||||
log_query(F_FORWARD | F_CONFIG | F_IPV4 | F_NEG, name, NULL, 0, NULL, 0);
|
log_query(F_FORWARD | F_CONFIG | F_IPV4 | F_NEG, name, NULL, 0, NULL, 0);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
+203
-112
@@ -2,12 +2,16 @@
|
|||||||
|
|
||||||
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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
@@ -67,24 +71,22 @@
|
|||||||
#define option_ptr(opt) ((void *)&(((unsigned char *)(opt))[2]))
|
#define option_ptr(opt) ((void *)&(((unsigned char *)(opt))[2]))
|
||||||
|
|
||||||
static int sanitise(unsigned char *opt, char *buf);
|
static int sanitise(unsigned char *opt, char *buf);
|
||||||
static unsigned int calc_time(struct dhcp_context *context, struct dhcp_config *config,
|
static unsigned int calc_time(struct dhcp_context *context, struct dhcp_config *config, unsigned char *opt);
|
||||||
struct dhcp_lease *lease, unsigned char *opt, time_t now);
|
|
||||||
static void option_put(struct dhcp_packet *mess, unsigned char *end, int opt, int len, unsigned int val);
|
static void option_put(struct dhcp_packet *mess, unsigned char *end, int opt, int len, unsigned int val);
|
||||||
static void option_put_string(struct dhcp_packet *mess, unsigned char *end,
|
static void option_put_string(struct dhcp_packet *mess, unsigned char *end,
|
||||||
int opt, char *string, int null_term);
|
int opt, char *string, int null_term);
|
||||||
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(struct daemon *daemon, char *type, void *addr,
|
static void log_packet(char *type, void *addr,
|
||||||
unsigned char *ext_mac, int mac_len, char *interface, char *string);
|
unsigned char *ext_mac, int mac_len, char *interface, char *string);
|
||||||
static unsigned char *option_find(struct dhcp_packet *mess, size_t size, int opt_type, int minsize);
|
static unsigned char *option_find(struct dhcp_packet *mess, size_t size, int opt_type, int minsize);
|
||||||
static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt, int minsize);
|
static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt, int minsize);
|
||||||
static size_t dhcp_packet_size(struct daemon *daemon, struct dhcp_packet *mess, struct dhcp_netid *netid);
|
static size_t dhcp_packet_size(struct dhcp_packet *mess, struct dhcp_netid *netid);
|
||||||
static void clear_packet(struct dhcp_packet *mess, unsigned char *end);
|
static void clear_packet(struct dhcp_packet *mess, unsigned char *end);
|
||||||
static void do_options(struct dhcp_context *context,
|
static void do_options(struct dhcp_context *context,
|
||||||
struct dhcp_packet *mess,
|
struct dhcp_packet *mess,
|
||||||
unsigned char *real_end,
|
unsigned char *real_end,
|
||||||
unsigned char *req_options,
|
unsigned char *req_options,
|
||||||
struct daemon *daemon,
|
|
||||||
char *hostname,
|
char *hostname,
|
||||||
struct dhcp_netid *netid,
|
struct dhcp_netid *netid,
|
||||||
struct in_addr subnet_addr,
|
struct in_addr subnet_addr,
|
||||||
@@ -96,8 +98,8 @@ static unsigned char *extended_hwaddr(int hwtype, int hwlen, unsigned char *hwad
|
|||||||
static void match_vendor_opts(unsigned char *opt, struct dhcp_opt *dopt);
|
static void match_vendor_opts(unsigned char *opt, struct dhcp_opt *dopt);
|
||||||
|
|
||||||
|
|
||||||
size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *iface_name,
|
size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
|
||||||
size_t sz, time_t now, int unicast_dest)
|
size_t sz, time_t now, int unicast_dest, int *is_inform)
|
||||||
{
|
{
|
||||||
unsigned char *opt, *clid = NULL;
|
unsigned char *opt, *clid = NULL;
|
||||||
struct dhcp_lease *ltmp, *lease = NULL;
|
struct dhcp_lease *ltmp, *lease = NULL;
|
||||||
@@ -105,7 +107,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
struct dhcp_mac *mac;
|
struct dhcp_mac *mac;
|
||||||
struct dhcp_netid_list *id_list;
|
struct dhcp_netid_list *id_list;
|
||||||
int clid_len = 0, ignore = 0, do_classes = 0, selecting = 0;
|
int clid_len = 0, ignore = 0, do_classes = 0, selecting = 0;
|
||||||
struct dhcp_packet *mess = daemon->dhcp_packet.iov_base;
|
struct dhcp_packet *mess = (struct dhcp_packet *)daemon->dhcp_packet.iov_base;
|
||||||
unsigned char *end = (unsigned char *)(mess + 1);
|
unsigned char *end = (unsigned char *)(mess + 1);
|
||||||
char *hostname = NULL, *offer_hostname = NULL, *client_hostname = NULL;
|
char *hostname = NULL, *offer_hostname = NULL, *client_hostname = NULL;
|
||||||
int hostname_auth = 0, borken_opt = 0;
|
int hostname_auth = 0, borken_opt = 0;
|
||||||
@@ -121,6 +123,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
unsigned char *agent_id = NULL;
|
unsigned char *agent_id = NULL;
|
||||||
unsigned char *emac = NULL;
|
unsigned char *emac = NULL;
|
||||||
int emac_len;
|
int emac_len;
|
||||||
|
struct dhcp_netid known_id;
|
||||||
|
|
||||||
subnet_addr.s_addr = 0;
|
subnet_addr.s_addr = 0;
|
||||||
|
|
||||||
@@ -153,7 +156,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
|
|
||||||
if (expand_buf(&daemon->dhcp_packet, size))
|
if (expand_buf(&daemon->dhcp_packet, size))
|
||||||
{
|
{
|
||||||
mess = daemon->dhcp_packet.iov_base;
|
mess = (struct dhcp_packet *)daemon->dhcp_packet.iov_base;
|
||||||
end = ((unsigned char *)mess) + size;
|
end = ((unsigned char *)mess) + size;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -325,6 +328,14 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
config = find_config(daemon->dhcp_conf, context, clid, clid_len,
|
config = find_config(daemon->dhcp_conf, context, clid, clid_len,
|
||||||
mess->chaddr, mess->hlen, mess->htype, NULL);
|
mess->chaddr, mess->hlen, mess->htype, NULL);
|
||||||
|
|
||||||
|
/* set "known" tag for known hosts */
|
||||||
|
if (config)
|
||||||
|
{
|
||||||
|
known_id.net = "known";
|
||||||
|
known_id.next = netid;
|
||||||
|
netid = &known_id;
|
||||||
|
}
|
||||||
|
|
||||||
if (mess_type == 0)
|
if (mess_type == 0)
|
||||||
{
|
{
|
||||||
/* BOOTP request */
|
/* BOOTP request */
|
||||||
@@ -386,7 +397,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!(lease = lease_find_by_client(mess->chaddr, mess->hlen, mess->htype, NULL, 0)) ||
|
if (!(lease = lease_find_by_client(mess->chaddr, mess->hlen, mess->htype, NULL, 0)) ||
|
||||||
!address_available(context, lease->addr))
|
!address_available(context, lease->addr, netid))
|
||||||
{
|
{
|
||||||
if (lease)
|
if (lease)
|
||||||
{
|
{
|
||||||
@@ -394,7 +405,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
lease_prune(lease, now);
|
lease_prune(lease, now);
|
||||||
lease = NULL;
|
lease = NULL;
|
||||||
}
|
}
|
||||||
if (!address_allocate(context, daemon, &mess->yiaddr, mess->chaddr, mess->hlen, netid, now))
|
if (!address_allocate(context, &mess->yiaddr, mess->chaddr, mess->hlen, netid, now))
|
||||||
message = _("no address available");
|
message = _("no address available");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -404,12 +415,9 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
if (!message &&
|
if (!message &&
|
||||||
!lease &&
|
!lease &&
|
||||||
(!(lease = lease_allocate(mess->yiaddr))))
|
(!(lease = lease_allocate(mess->yiaddr))))
|
||||||
{
|
|
||||||
my_syslog(LOG_WARNING, _("Limit of %d leases exceeded."), daemon->dhcp_max);
|
|
||||||
message = _("no leases left");
|
message = _("no leases left");
|
||||||
}
|
|
||||||
|
|
||||||
if (!message && !(context = narrow_context(context, mess->yiaddr)))
|
if (!message && !(context = narrow_context(context, mess->yiaddr, netid)))
|
||||||
message = _("wrong network");
|
message = _("wrong network");
|
||||||
|
|
||||||
if (!message)
|
if (!message)
|
||||||
@@ -426,16 +434,17 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
if (hostname)
|
if (hostname)
|
||||||
lease_set_hostname(lease, hostname, daemon->domain_suffix, 1);
|
lease_set_hostname(lease, hostname, daemon->domain_suffix, 1);
|
||||||
lease_set_expires(lease, 0xffffffff, now); /* infinite lease */
|
lease_set_expires(lease, 0xffffffff, now); /* infinite lease */
|
||||||
|
lease_set_interface(lease, int_index);
|
||||||
|
|
||||||
clear_packet(mess, end);
|
clear_packet(mess, end);
|
||||||
do_options(context, mess, end, NULL, daemon,
|
do_options(context, mess, end, NULL,
|
||||||
hostname, netid, subnet_addr, 0, 0, NULL);
|
hostname, netid, subnet_addr, 0, 0, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log_packet(daemon, NULL, logaddr, mess->chaddr, mess->hlen, iface_name, message);
|
log_packet(NULL, logaddr, mess->chaddr, mess->hlen, iface_name, message);
|
||||||
|
|
||||||
return message ? 0 : dhcp_packet_size(daemon, mess, netid);
|
return message ? 0 : dhcp_packet_size(mess, netid);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((opt = option_find(mess, sz, OPTION_CLIENT_FQDN, 4)))
|
if ((opt = option_find(mess, sz, OPTION_CLIENT_FQDN, 4)))
|
||||||
@@ -504,7 +513,16 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
if (fqdn_flags != 0 || !client_hostname || hostname_isequal(hostname, client_hostname))
|
if (fqdn_flags != 0 || !client_hostname || hostname_isequal(hostname, client_hostname))
|
||||||
offer_hostname = hostname;
|
offer_hostname = hostname;
|
||||||
}
|
}
|
||||||
else if (client_hostname && (hostname = strip_hostname(daemon, client_hostname)) && !config)
|
else if (client_hostname)
|
||||||
|
{
|
||||||
|
char *d = strip_hostname(client_hostname);
|
||||||
|
if (d)
|
||||||
|
my_syslog(LOG_WARNING, _("Ignoring domain %s for DHCP host name %s"), d, client_hostname);
|
||||||
|
|
||||||
|
if (strlen(client_hostname) != 0)
|
||||||
|
{
|
||||||
|
hostname = client_hostname;
|
||||||
|
if (!config)
|
||||||
{
|
{
|
||||||
/* Search again now we have a hostname.
|
/* Search again now we have a hostname.
|
||||||
Only accept configs without CLID and HWADDR here, (they won't match)
|
Only accept configs without CLID and HWADDR here, (they won't match)
|
||||||
@@ -512,8 +530,16 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
struct dhcp_config *new = find_config(daemon->dhcp_conf, context, NULL, 0,
|
struct dhcp_config *new = find_config(daemon->dhcp_conf, context, NULL, 0,
|
||||||
mess->chaddr, mess->hlen,
|
mess->chaddr, mess->hlen,
|
||||||
mess->htype, hostname);
|
mess->htype, hostname);
|
||||||
if (!have_config(new, CONFIG_CLID) && !have_config(new, CONFIG_HWADDR))
|
if (new && !have_config(new, CONFIG_CLID) && !have_config(new, CONFIG_HWADDR))
|
||||||
|
{
|
||||||
config = new;
|
config = new;
|
||||||
|
/* set "known" tag for known hosts */
|
||||||
|
known_id.net = "known";
|
||||||
|
known_id.next = netid;
|
||||||
|
netid = &known_id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (have_config(config, CONFIG_NETID))
|
if (have_config(config, CONFIG_NETID))
|
||||||
@@ -554,6 +580,15 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
mopt = OPTION_VENDOR_ID;
|
mopt = OPTION_VENDOR_ID;
|
||||||
else if (vendor->match_type == MATCH_USER)
|
else if (vendor->match_type == MATCH_USER)
|
||||||
mopt = OPTION_USER_CLASS;
|
mopt = OPTION_USER_CLASS;
|
||||||
|
else if (vendor->match_type == MATCH_OPTION)
|
||||||
|
{
|
||||||
|
if (option_find(mess, sz, vendor->option, 1))
|
||||||
|
{
|
||||||
|
vendor->netid.next = netid;
|
||||||
|
netid = &vendor->netid;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -610,7 +645,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
if (!(opt = option_find(mess, sz, OPTION_REQUESTED_IP, INADDRSZ)))
|
if (!(opt = option_find(mess, sz, OPTION_REQUESTED_IP, INADDRSZ)))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
log_packet(daemon, "DECLINE", option_ptr(opt), emac, emac_len, iface_name, daemon->dhcp_buff);
|
log_packet("DECLINE", option_ptr(opt), emac, emac_len, iface_name, daemon->dhcp_buff);
|
||||||
|
|
||||||
if (lease && lease->addr.s_addr == option_addr(opt).s_addr)
|
if (lease && lease->addr.s_addr == option_addr(opt).s_addr)
|
||||||
lease_prune(lease, now);
|
lease_prune(lease, now);
|
||||||
@@ -632,7 +667,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
case DHCPRELEASE:
|
case DHCPRELEASE:
|
||||||
if (!(context = narrow_context(context, mess->ciaddr)) ||
|
if (!(context = narrow_context(context, mess->ciaddr, netid)) ||
|
||||||
!(opt = option_find(mess, sz, OPTION_SERVER_IDENTIFIER, INADDRSZ)) ||
|
!(opt = option_find(mess, sz, OPTION_SERVER_IDENTIFIER, INADDRSZ)) ||
|
||||||
(context->local.s_addr != option_addr(opt).s_addr))
|
(context->local.s_addr != option_addr(opt).s_addr))
|
||||||
return 0;
|
return 0;
|
||||||
@@ -642,7 +677,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
else
|
else
|
||||||
message = _("unknown lease");
|
message = _("unknown lease");
|
||||||
|
|
||||||
log_packet(daemon, "RELEASE", &mess->ciaddr, emac, emac_len, iface_name, message);
|
log_packet("RELEASE", &mess->ciaddr, emac, emac_len, iface_name, message);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@@ -670,7 +705,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
unsigned char *mac = extended_hwaddr(ltmp->hwaddr_type, ltmp->hwaddr_len,
|
unsigned char *mac = extended_hwaddr(ltmp->hwaddr_type, ltmp->hwaddr_len,
|
||||||
ltmp->hwaddr, ltmp->clid_len, ltmp->clid, &len);
|
ltmp->hwaddr, ltmp->clid_len, ltmp->clid, &len);
|
||||||
my_syslog(LOG_WARNING, _("not using configured address %s because it is leased to %s"),
|
my_syslog(LOG_WARNING, _("not using configured address %s because it is leased to %s"),
|
||||||
addrs, print_mac(daemon, mac, len));
|
addrs, print_mac(daemon->namebuff, mac, len));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -690,21 +725,23 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
|
|
||||||
if (conf.s_addr)
|
if (conf.s_addr)
|
||||||
mess->yiaddr = conf;
|
mess->yiaddr = conf;
|
||||||
else if (lease && address_available(context, lease->addr))
|
else if (lease && address_available(context, lease->addr, netid))
|
||||||
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, netid) && !lease_find_by_addr(addr) &&
|
||||||
!config_find_by_address(daemon->dhcp_conf, addr))
|
!config_find_by_address(daemon->dhcp_conf, addr))
|
||||||
mess->yiaddr = addr;
|
mess->yiaddr = addr;
|
||||||
else if (!address_allocate(context, daemon, &mess->yiaddr, mess->chaddr, mess->hlen, netid, now))
|
else if (emac_len == 0)
|
||||||
|
message = _("no unique-id");
|
||||||
|
else if (!address_allocate(context, &mess->yiaddr, emac, emac_len, netid, now))
|
||||||
message = _("no address available");
|
message = _("no address available");
|
||||||
}
|
}
|
||||||
|
|
||||||
log_packet(daemon, "DISCOVER", opt ? option_ptr(opt) : NULL, emac, emac_len, iface_name, message);
|
log_packet("DISCOVER", opt ? option_ptr(opt) : NULL, emac, emac_len, iface_name, message);
|
||||||
|
|
||||||
if (message || !(context = narrow_context(context, mess->yiaddr)))
|
if (message || !(context = narrow_context(context, mess->yiaddr, netid)))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
log_packet(daemon, "OFFER" , &mess->yiaddr, emac, emac_len, iface_name, NULL);
|
log_packet("OFFER" , &mess->yiaddr, emac, emac_len, iface_name, NULL);
|
||||||
|
|
||||||
if (context->netid.net)
|
if (context->netid.net)
|
||||||
{
|
{
|
||||||
@@ -712,7 +749,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
netid = &context->netid;
|
netid = &context->netid;
|
||||||
}
|
}
|
||||||
|
|
||||||
time = calc_time(context, config, lease, option_find(mess, sz, OPTION_LEASE_TIME, 4), now);
|
time = calc_time(context, config, option_find(mess, sz, OPTION_LEASE_TIME, 4));
|
||||||
clear_packet(mess, end);
|
clear_packet(mess, end);
|
||||||
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPOFFER);
|
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPOFFER);
|
||||||
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(context->local.s_addr));
|
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(context->local.s_addr));
|
||||||
@@ -723,10 +760,10 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
option_put(mess, end, OPTION_T1, 4, (time/2));
|
option_put(mess, end, OPTION_T1, 4, (time/2));
|
||||||
option_put(mess, end, OPTION_T2, 4, (time*7)/8);
|
option_put(mess, end, OPTION_T2, 4, (time*7)/8);
|
||||||
}
|
}
|
||||||
do_options(context, mess, end, req_options, daemon, offer_hostname,
|
do_options(context, mess, end, req_options, offer_hostname,
|
||||||
netid, subnet_addr, fqdn_flags, borken_opt, agent_id);
|
netid, subnet_addr, fqdn_flags, borken_opt, agent_id);
|
||||||
|
|
||||||
return dhcp_packet_size(daemon, mess, netid);
|
return dhcp_packet_size(mess, netid);
|
||||||
|
|
||||||
case DHCPREQUEST:
|
case DHCPREQUEST:
|
||||||
if (ignore || have_config(config, CONFIG_DISABLE))
|
if (ignore || have_config(config, CONFIG_DISABLE))
|
||||||
@@ -765,7 +802,12 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (lease && lease->addr.s_addr != mess->yiaddr.s_addr)
|
if (lease && lease->addr.s_addr != mess->yiaddr.s_addr)
|
||||||
|
{
|
||||||
message = _("wrong address");
|
message = _("wrong address");
|
||||||
|
/* avoid loops when client brain-dead */
|
||||||
|
lease_prune(lease, now);
|
||||||
|
lease = NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -787,7 +829,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
mess->yiaddr = mess->ciaddr;
|
mess->yiaddr = mess->ciaddr;
|
||||||
}
|
}
|
||||||
|
|
||||||
log_packet(daemon, "REQUEST", &mess->yiaddr, emac, emac_len, iface_name, NULL);
|
log_packet("REQUEST", &mess->yiaddr, emac, emac_len, iface_name, NULL);
|
||||||
|
|
||||||
if (!message)
|
if (!message)
|
||||||
{
|
{
|
||||||
@@ -799,7 +841,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
if (context->router.s_addr == config->addr.s_addr)
|
if (context->router.s_addr == config->addr.s_addr)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (!(context = narrow_context(context, mess->yiaddr)))
|
if (!(context = narrow_context(context, mess->yiaddr, netid)))
|
||||||
{
|
{
|
||||||
/* 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. */
|
||||||
message = _("wrong network");
|
message = _("wrong network");
|
||||||
@@ -808,7 +850,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Check for renewal of a lease which is outside the allowed range. */
|
/* Check for renewal of a lease which is outside the allowed range. */
|
||||||
else if (!address_available(context, mess->yiaddr) &&
|
else if (!address_available(context, mess->yiaddr, netid) &&
|
||||||
(!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 not available");
|
message = _("address not available");
|
||||||
|
|
||||||
@@ -830,7 +872,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
else if ((ltmp = lease_find_by_addr(mess->yiaddr)) && ltmp != lease)
|
else if ((ltmp = lease_find_by_addr(mess->yiaddr)) && ltmp != lease)
|
||||||
message = _("address in use");
|
message = _("address in use");
|
||||||
|
|
||||||
else if (!clid && mess->hlen == 0)
|
else if (emac_len == 0)
|
||||||
message = _("no unique-id");
|
message = _("no unique-id");
|
||||||
|
|
||||||
else if (!lease)
|
else if (!lease)
|
||||||
@@ -844,7 +886,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
|
|
||||||
if (message)
|
if (message)
|
||||||
{
|
{
|
||||||
log_packet(daemon, "NAK", &mess->yiaddr, emac, emac_len, iface_name, message);
|
log_packet("NAK", &mess->yiaddr, emac, emac_len, iface_name, message);
|
||||||
|
|
||||||
mess->yiaddr.s_addr = 0;
|
mess->yiaddr.s_addr = 0;
|
||||||
clear_packet(mess, end);
|
clear_packet(mess, end);
|
||||||
@@ -874,9 +916,8 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
/* If the user-class option started as counted strings, the first byte will be zero. */
|
/* If the user-class option started as counted strings, the first byte will be zero. */
|
||||||
if (len != 0 && ucp[0] == 0)
|
if (len != 0 && ucp[0] == 0)
|
||||||
ucp++, len--;
|
ucp++, len--;
|
||||||
if (lease->userclass)
|
|
||||||
free(lease->userclass);
|
free(lease->userclass);
|
||||||
if ((lease->userclass = malloc(len+1)))
|
if ((lease->userclass = whine_malloc(len+1)))
|
||||||
{
|
{
|
||||||
memcpy(lease->userclass, ucp, len);
|
memcpy(lease->userclass, ucp, len);
|
||||||
lease->userclass[len] = 0;
|
lease->userclass[len] = 0;
|
||||||
@@ -887,9 +928,8 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
{
|
{
|
||||||
int len = option_len(opt);
|
int len = option_len(opt);
|
||||||
unsigned char *ucp = option_ptr(opt);
|
unsigned char *ucp = option_ptr(opt);
|
||||||
if (lease->vendorclass)
|
|
||||||
free(lease->vendorclass);
|
free(lease->vendorclass);
|
||||||
if ((lease->vendorclass = malloc(len+1)))
|
if ((lease->vendorclass = whine_malloc(len+1)))
|
||||||
{
|
{
|
||||||
memcpy(lease->vendorclass, ucp, len);
|
memcpy(lease->vendorclass, ucp, len);
|
||||||
lease->vendorclass[len] = 0;
|
lease->vendorclass[len] = 0;
|
||||||
@@ -898,7 +938,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!hostname_auth && (client_hostname = host_from_dns(daemon, mess->yiaddr)))
|
if (!hostname_auth && (client_hostname = host_from_dns(mess->yiaddr)))
|
||||||
{
|
{
|
||||||
hostname = client_hostname;
|
hostname = client_hostname;
|
||||||
hostname_auth = 1;
|
hostname_auth = 1;
|
||||||
@@ -910,7 +950,7 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
netid = &context->netid;
|
netid = &context->netid;
|
||||||
}
|
}
|
||||||
|
|
||||||
time = calc_time(context, config, NULL, option_find(mess, sz, OPTION_LEASE_TIME, 4), now);
|
time = calc_time(context, config, option_find(mess, sz, OPTION_LEASE_TIME, 4));
|
||||||
lease_set_hwaddr(lease, mess->chaddr, clid, mess->hlen, mess->htype, clid_len);
|
lease_set_hwaddr(lease, mess->chaddr, clid, mess->hlen, mess->htype, clid_len);
|
||||||
|
|
||||||
/* if all the netids in the ignore_name list are present, ignore client-supplied name */
|
/* if all the netids in the ignore_name list are present, ignore client-supplied name */
|
||||||
@@ -926,8 +966,9 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
lease_set_hostname(lease, hostname, daemon->domain_suffix, hostname_auth);
|
lease_set_hostname(lease, hostname, daemon->domain_suffix, hostname_auth);
|
||||||
|
|
||||||
lease_set_expires(lease, time, now);
|
lease_set_expires(lease, time, now);
|
||||||
|
lease_set_interface(lease, int_index);
|
||||||
|
|
||||||
log_packet(daemon, "ACK", &mess->yiaddr, emac, emac_len, iface_name, hostname);
|
log_packet("ACK", &mess->yiaddr, emac, emac_len, iface_name, hostname);
|
||||||
|
|
||||||
clear_packet(mess, end);
|
clear_packet(mess, end);
|
||||||
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
|
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
|
||||||
@@ -940,23 +981,33 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
option_put(mess, end, OPTION_T1, 4, (time/2) - fuzz);
|
option_put(mess, end, OPTION_T1, 4, (time/2) - fuzz);
|
||||||
option_put(mess, end, OPTION_T2, 4, ((time/8)*7) - fuzz);
|
option_put(mess, end, OPTION_T2, 4, ((time/8)*7) - fuzz);
|
||||||
}
|
}
|
||||||
do_options(context, mess, end, req_options, daemon, hostname,
|
do_options(context, mess, end, req_options, hostname,
|
||||||
netid, subnet_addr, fqdn_flags, borken_opt, agent_id);
|
netid, subnet_addr, fqdn_flags, borken_opt, agent_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
return dhcp_packet_size(daemon, mess, netid);
|
return dhcp_packet_size(mess, netid);
|
||||||
|
|
||||||
case DHCPINFORM:
|
case DHCPINFORM:
|
||||||
if (ignore || have_config(config, CONFIG_DISABLE))
|
if (ignore || have_config(config, CONFIG_DISABLE))
|
||||||
message = _("ignored");
|
message = _("ignored");
|
||||||
|
|
||||||
log_packet(daemon, "INFORM", &mess->ciaddr, emac, emac_len, iface_name, message);
|
log_packet("INFORM", &mess->ciaddr, emac, emac_len, iface_name, message);
|
||||||
|
|
||||||
if (message || mess->ciaddr.s_addr == 0 ||
|
if (message || mess->ciaddr.s_addr == 0 ||
|
||||||
!(context = narrow_context(context, mess->ciaddr)))
|
!(context = narrow_context(context, mess->ciaddr, netid)))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
log_packet(daemon, "ACK", &mess->ciaddr, emac, emac_len, iface_name, hostname);
|
/* Find a least based on IP address if we didn't
|
||||||
|
get one from MAC address/client-d */
|
||||||
|
if (!lease &&
|
||||||
|
(lease = lease_find_by_addr(mess->ciaddr)) &&
|
||||||
|
lease->hostname)
|
||||||
|
hostname = lease->hostname;
|
||||||
|
|
||||||
|
if (!hostname)
|
||||||
|
hostname = host_from_dns(mess->ciaddr);
|
||||||
|
|
||||||
|
log_packet("ACK", &mess->ciaddr, emac, emac_len, iface_name, hostname);
|
||||||
|
|
||||||
if (context->netid.net)
|
if (context->netid.net)
|
||||||
{
|
{
|
||||||
@@ -967,12 +1018,22 @@ size_t dhcp_reply(struct daemon *daemon, struct dhcp_context *context, char *ifa
|
|||||||
clear_packet(mess, end);
|
clear_packet(mess, end);
|
||||||
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
|
option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK);
|
||||||
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(context->local.s_addr));
|
option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, ntohl(context->local.s_addr));
|
||||||
if (!hostname)
|
|
||||||
hostname = host_from_dns(daemon, mess->yiaddr);
|
if (lease)
|
||||||
do_options(context, mess, end, req_options, daemon, hostname,
|
{
|
||||||
|
if (lease->expires == 0)
|
||||||
|
time = 0xffffffff;
|
||||||
|
else
|
||||||
|
time = (unsigned int)difftime(lease->expires, now);
|
||||||
|
option_put(mess, end, OPTION_LEASE_TIME, 4, time);
|
||||||
|
lease_set_interface(lease, int_index);
|
||||||
|
}
|
||||||
|
|
||||||
|
do_options(context, mess, end, req_options, hostname,
|
||||||
netid, subnet_addr, fqdn_flags, borken_opt, agent_id);
|
netid, subnet_addr, fqdn_flags, borken_opt, agent_id);
|
||||||
|
|
||||||
return dhcp_packet_size(daemon, mess, netid);
|
*is_inform = 1; /* handle reply differently */
|
||||||
|
return dhcp_packet_size(mess, netid);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1013,8 +1074,7 @@ static unsigned char *extended_hwaddr(int hwtype, int hwlen, unsigned char *hwad
|
|||||||
return hwaddr;
|
return hwaddr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int calc_time(struct dhcp_context *context, struct dhcp_config *config,
|
static unsigned int calc_time(struct dhcp_context *context, struct dhcp_config *config, unsigned char *opt)
|
||||||
struct dhcp_lease *lease, unsigned char *opt, time_t now)
|
|
||||||
{
|
{
|
||||||
unsigned int time = have_config(config, CONFIG_TIME) ? config->lease_time : context->lease_time;
|
unsigned int time = have_config(config, CONFIG_TIME) ? config->lease_time : context->lease_time;
|
||||||
|
|
||||||
@@ -1026,17 +1086,6 @@ static unsigned int calc_time(struct dhcp_context *context, struct dhcp_config *
|
|||||||
if (time == 0xffffffff || (req_time != 0xffffffff && req_time < time))
|
if (time == 0xffffffff || (req_time != 0xffffffff && req_time < time))
|
||||||
time = req_time;
|
time = req_time;
|
||||||
}
|
}
|
||||||
else if (lease && lease->expires != 0 && difftime(lease->expires, now) > 0.0)
|
|
||||||
{
|
|
||||||
unsigned int lease_time = (unsigned int)difftime(lease->expires, now);
|
|
||||||
|
|
||||||
/* put a floor on lease-remaining time. */
|
|
||||||
if (lease_time < 360 )
|
|
||||||
lease_time = 360;
|
|
||||||
|
|
||||||
if (time > lease_time)
|
|
||||||
time = lease_time;
|
|
||||||
}
|
|
||||||
|
|
||||||
return time;
|
return time;
|
||||||
}
|
}
|
||||||
@@ -1056,7 +1105,7 @@ static int sanitise(unsigned char *opt, char *buf)
|
|||||||
for (i = option_len(opt); i > 0; i--)
|
for (i = option_len(opt); i > 0; i--)
|
||||||
{
|
{
|
||||||
char c = *p++;
|
char c = *p++;
|
||||||
if (isprint(c))
|
if (isprint((int)c))
|
||||||
*buf++ = c;
|
*buf++ = c;
|
||||||
}
|
}
|
||||||
*buf = 0; /* add terminator */
|
*buf = 0; /* add terminator */
|
||||||
@@ -1064,8 +1113,8 @@ static int sanitise(unsigned char *opt, char *buf)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void log_packet(struct daemon *daemon, char *type, void *addr,
|
static void log_packet(char *type, void *addr, unsigned char *ext_mac,
|
||||||
unsigned char *ext_mac, int mac_len, char *interface, char *string)
|
int mac_len, char *interface, char *string)
|
||||||
{
|
{
|
||||||
struct in_addr a;
|
struct in_addr a;
|
||||||
|
|
||||||
@@ -1079,11 +1128,11 @@ static void log_packet(struct daemon *daemon, char *type, void *addr,
|
|||||||
interface,
|
interface,
|
||||||
addr ? inet_ntoa(a) : "",
|
addr ? inet_ntoa(a) : "",
|
||||||
addr ? " " : "",
|
addr ? " " : "",
|
||||||
print_mac(daemon, ext_mac, mac_len),
|
print_mac(daemon->namebuff, ext_mac, mac_len),
|
||||||
string ? string : "");
|
string ? string : "");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void log_options(struct daemon *daemon, unsigned char *start)
|
static void log_options(unsigned char *start)
|
||||||
{
|
{
|
||||||
while (*start != OPTION_END)
|
while (*start != OPTION_END)
|
||||||
{
|
{
|
||||||
@@ -1093,7 +1142,7 @@ static void log_options(struct daemon *daemon, unsigned char *start)
|
|||||||
start[1], start[0],
|
start[1], start[0],
|
||||||
text ? ":" : "", text ? text : "",
|
text ? ":" : "", text ? text : "",
|
||||||
start[1] == 0 ? "" : " ",
|
start[1] == 0 ? "" : " ",
|
||||||
start[1] == 0 ? "" : print_mac(daemon, &start[2], trunc),
|
start[1] == 0 ? "" : print_mac(daemon->namebuff, &start[2], trunc),
|
||||||
trunc == start[1] ? "" : "...");
|
trunc == start[1] ? "" : "...");
|
||||||
start += start[1] + 2;
|
start += start[1] + 2;
|
||||||
}
|
}
|
||||||
@@ -1194,11 +1243,12 @@ static unsigned char *find_overload(struct dhcp_packet *mess)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t dhcp_packet_size(struct daemon *daemon, struct dhcp_packet *mess, struct dhcp_netid *netid)
|
static size_t dhcp_packet_size(struct dhcp_packet *mess, struct dhcp_netid *netid)
|
||||||
{
|
{
|
||||||
unsigned char *p = dhcp_skip_opts(&mess->options[0] + sizeof(u32));
|
unsigned char *p = dhcp_skip_opts(&mess->options[0] + sizeof(u32));
|
||||||
unsigned char *overload;
|
unsigned char *overload;
|
||||||
size_t ret;
|
size_t ret;
|
||||||
|
struct dhcp_netid_list *id_list;
|
||||||
|
|
||||||
/* We do logging too */
|
/* We do logging too */
|
||||||
if (netid && (daemon->options & OPT_LOG_OPTS))
|
if (netid && (daemon->options & OPT_LOG_OPTS))
|
||||||
@@ -1222,19 +1272,24 @@ static size_t dhcp_packet_size(struct daemon *daemon, struct dhcp_packet *mess,
|
|||||||
{
|
{
|
||||||
*dhcp_skip_opts(mess->file) = OPTION_END;
|
*dhcp_skip_opts(mess->file) = OPTION_END;
|
||||||
if (daemon->options & OPT_LOG_OPTS)
|
if (daemon->options & OPT_LOG_OPTS)
|
||||||
log_options(daemon, mess->file);
|
log_options(mess->file);
|
||||||
}
|
}
|
||||||
if (option_uint(overload, 1) & 2)
|
if (option_uint(overload, 1) & 2)
|
||||||
{
|
{
|
||||||
*dhcp_skip_opts(mess->sname) = OPTION_END;
|
*dhcp_skip_opts(mess->sname) = OPTION_END;
|
||||||
if (daemon->options & OPT_LOG_OPTS)
|
if (daemon->options & OPT_LOG_OPTS)
|
||||||
log_options(daemon, mess->sname);
|
log_options(mess->sname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
*p++ = OPTION_END;
|
*p++ = OPTION_END;
|
||||||
|
|
||||||
if (daemon->options & OPT_LOG_OPTS)
|
if (daemon->options & OPT_LOG_OPTS)
|
||||||
log_options(daemon, &mess->options[0] + sizeof(u32));
|
log_options(&mess->options[0] + sizeof(u32));
|
||||||
|
|
||||||
|
for (id_list = daemon->force_broadcast; id_list; id_list = id_list->next)
|
||||||
|
if (match_netid(id_list->list, netid, 0))
|
||||||
|
mess->flags |= htons(0x8000); /* force broadcast */
|
||||||
|
|
||||||
ret = (size_t)(p - (unsigned char *)mess);
|
ret = (size_t)(p - (unsigned char *)mess);
|
||||||
|
|
||||||
@@ -1419,7 +1474,6 @@ static void do_options(struct dhcp_context *context,
|
|||||||
struct dhcp_packet *mess,
|
struct dhcp_packet *mess,
|
||||||
unsigned char *real_end,
|
unsigned char *real_end,
|
||||||
unsigned char *req_options,
|
unsigned char *req_options,
|
||||||
struct daemon *daemon,
|
|
||||||
char *hostname,
|
char *hostname,
|
||||||
struct dhcp_netid *netid,
|
struct dhcp_netid *netid,
|
||||||
struct in_addr subnet_addr,
|
struct in_addr subnet_addr,
|
||||||
@@ -1432,6 +1486,7 @@ static void do_options(struct dhcp_context *context,
|
|||||||
unsigned char *p, *end = agent_id ? agent_id : real_end;
|
unsigned char *p, *end = agent_id ? agent_id : real_end;
|
||||||
int i, len, force_encap = 0;
|
int i, len, force_encap = 0;
|
||||||
unsigned char f0 = 0, s0 = 0;
|
unsigned char f0 = 0, s0 = 0;
|
||||||
|
int done_file = 0, done_server = 0;
|
||||||
|
|
||||||
/* logging */
|
/* logging */
|
||||||
if ((daemon->options & OPT_LOG_OPTS) && req_options)
|
if ((daemon->options & OPT_LOG_OPTS) && req_options)
|
||||||
@@ -1468,34 +1523,31 @@ static void do_options(struct dhcp_context *context,
|
|||||||
|
|
||||||
/* See if we can send the boot stuff as options.
|
/* See if we can send the boot stuff as options.
|
||||||
To do this we need a requested option list, BOOTP
|
To do this we need a requested option list, BOOTP
|
||||||
and very old DHCP clients won't have this.
|
and very old DHCP clients won't have this, we also
|
||||||
|
provide an manual option to disable it.
|
||||||
Some PXE ROMs have bugs (surprise!) and need zero-terminated
|
Some PXE ROMs have bugs (surprise!) and need zero-terminated
|
||||||
names, so we always send those. */
|
names, so we always send those. */
|
||||||
if (boot)
|
if (boot)
|
||||||
{
|
{
|
||||||
if (boot->sname)
|
if (boot->sname)
|
||||||
{
|
{
|
||||||
if (req_options && in_list(req_options, OPTION_SNAME))
|
if (!(daemon->options & OPT_NO_OVERRIDE) &&
|
||||||
|
req_options &&
|
||||||
|
in_list(req_options, OPTION_SNAME))
|
||||||
option_put_string(mess, end, OPTION_SNAME, boot->sname, 1);
|
option_put_string(mess, end, OPTION_SNAME, boot->sname, 1);
|
||||||
else
|
else
|
||||||
{
|
|
||||||
if (daemon->options & OPT_LOG_OPTS)
|
|
||||||
my_syslog(LOG_INFO, _("server name: %s"), boot->sname);
|
|
||||||
strncpy((char *)mess->sname, boot->sname, sizeof(mess->sname)-1);
|
strncpy((char *)mess->sname, boot->sname, sizeof(mess->sname)-1);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (boot->file)
|
if (boot->file)
|
||||||
{
|
{
|
||||||
if (req_options && in_list(req_options, OPTION_FILENAME))
|
if (!(daemon->options & OPT_NO_OVERRIDE) &&
|
||||||
|
req_options &&
|
||||||
|
in_list(req_options, OPTION_FILENAME))
|
||||||
option_put_string(mess, end, OPTION_FILENAME, boot->file, 1);
|
option_put_string(mess, end, OPTION_FILENAME, boot->file, 1);
|
||||||
else
|
else
|
||||||
{
|
|
||||||
if (daemon->options & OPT_LOG_OPTS)
|
|
||||||
my_syslog(LOG_INFO, _("bootfile name: %s"), boot->file);
|
|
||||||
strncpy((char *)mess->file, boot->file, sizeof(mess->file)-1);
|
strncpy((char *)mess->file, boot->file, sizeof(mess->file)-1);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (boot->next_server.s_addr)
|
if (boot->next_server.s_addr)
|
||||||
mess->siaddr = boot->next_server;
|
mess->siaddr = boot->next_server;
|
||||||
@@ -1503,12 +1555,39 @@ static void do_options(struct dhcp_context *context,
|
|||||||
if (daemon->options & OPT_LOG_OPTS)
|
if (daemon->options & OPT_LOG_OPTS)
|
||||||
my_syslog(LOG_INFO, _("next server: %s"), inet_ntoa(mess->siaddr));
|
my_syslog(LOG_INFO, _("next server: %s"), inet_ntoa(mess->siaddr));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
/* Use the values of the relevant options if no dhcp-boot given and
|
||||||
|
they're no explicitly asked for as options. */
|
||||||
|
{
|
||||||
|
if ((!req_options || !in_list(req_options, OPTION_FILENAME)) &&
|
||||||
|
(opt = option_find2(netid, config_opts, OPTION_FILENAME)))
|
||||||
|
{
|
||||||
|
strncpy((char *)mess->file, (char *)opt->val, sizeof(mess->file)-1);
|
||||||
|
done_file = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((!req_options || !in_list(req_options, OPTION_SNAME)) &&
|
||||||
|
(opt = option_find2(netid, config_opts, OPTION_SNAME)))
|
||||||
|
{
|
||||||
|
strncpy((char *)mess->sname, (char *)opt->val, sizeof(mess->sname)-1);
|
||||||
|
done_server = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (daemon->options & OPT_LOG_OPTS)
|
||||||
|
{
|
||||||
|
if (strlen((char *)mess->file) != 0)
|
||||||
|
my_syslog(LOG_INFO, _("bootfile name: %s"), (char *)mess->file);
|
||||||
|
|
||||||
|
if (strlen((char *)mess->sname) != 0)
|
||||||
|
my_syslog(LOG_INFO, _("server name: %s"), (char *)mess->sname);
|
||||||
|
}
|
||||||
|
|
||||||
/* We don't want to do option-overload for BOOTP, so make the file and sname
|
/* We don't want to do option-overload for BOOTP, so make the file and sname
|
||||||
fields look like they are in use, even when they aren't. This gets restored
|
fields look like they are in use, even when they aren't. This gets restored
|
||||||
at the end of this function. */
|
at the end of this function. */
|
||||||
|
|
||||||
if (!req_options)
|
if (!req_options || (daemon->options & OPT_NO_OVERRIDE))
|
||||||
{
|
{
|
||||||
f0 = mess->file[0];
|
f0 = mess->file[0];
|
||||||
mess->file[0] = 1;
|
mess->file[0] = 1;
|
||||||
@@ -1549,12 +1628,11 @@ static void do_options(struct dhcp_context *context,
|
|||||||
!option_find2(netid, config_opts, OPTION_DOMAINNAME))
|
!option_find2(netid, config_opts, OPTION_DOMAINNAME))
|
||||||
option_put_string(mess, end, OPTION_DOMAINNAME, daemon->domain_suffix, null_term);
|
option_put_string(mess, end, OPTION_DOMAINNAME, daemon->domain_suffix, null_term);
|
||||||
|
|
||||||
/* Note that we ignore attempts to set the hostname using
|
/* Note that we ignore attempts to set the fqdn using --dhc-option=81,<name> */
|
||||||
--dhcp-option=12,<name> and the fqdn using
|
|
||||||
--dhc-option=81,<name> */
|
|
||||||
if (hostname)
|
if (hostname)
|
||||||
{
|
{
|
||||||
if (in_list(req_options, OPTION_HOSTNAME))
|
if (in_list(req_options, OPTION_HOSTNAME) &&
|
||||||
|
!option_find2(netid, config_opts, OPTION_HOSTNAME))
|
||||||
option_put_string(mess, end, OPTION_HOSTNAME, hostname, null_term);
|
option_put_string(mess, end, OPTION_HOSTNAME, hostname, null_term);
|
||||||
|
|
||||||
if (fqdn_flags != 0)
|
if (fqdn_flags != 0)
|
||||||
@@ -1600,41 +1678,54 @@ static void do_options(struct dhcp_context *context,
|
|||||||
|
|
||||||
for (opt = config_opts; opt; opt = opt->next)
|
for (opt = config_opts; opt; opt = opt->next)
|
||||||
{
|
{
|
||||||
|
int optno = opt->opt;
|
||||||
|
|
||||||
/* was it asked for, or are we sending it anyway? */
|
/* was it asked for, or are we sending it anyway? */
|
||||||
if (!(opt->flags & DHOPT_FORCE) && !in_list(req_options, opt->opt))
|
if (!(opt->flags & DHOPT_FORCE) && !in_list(req_options, optno))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* prohibit some used-internally options */
|
/* prohibit some used-internally options */
|
||||||
if (opt->opt == OPTION_HOSTNAME ||
|
if (optno == OPTION_CLIENT_FQDN ||
|
||||||
opt->opt == OPTION_CLIENT_FQDN ||
|
optno == OPTION_MAXMESSAGE ||
|
||||||
opt->opt == OPTION_MAXMESSAGE ||
|
optno == OPTION_OVERLOAD ||
|
||||||
opt->opt == OPTION_OVERLOAD ||
|
optno == OPTION_PAD ||
|
||||||
opt->opt == OPTION_PAD ||
|
optno == OPTION_END)
|
||||||
opt->opt == OPTION_END)
|
continue;
|
||||||
|
|
||||||
|
if (optno == OPTION_SNAME && done_server)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (optno == OPTION_FILENAME && done_file)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* netids match and not encapsulated? */
|
/* netids match and not encapsulated? */
|
||||||
if (opt != option_find2(netid, config_opts, opt->opt))
|
if (opt != option_find2(netid, config_opts, optno))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* For the options we have default values on
|
/* For the options we have default values on
|
||||||
dhc-option=<optionno> means "don't include this option"
|
dhc-option=<optionno> means "don't include this option"
|
||||||
not "include a zero-length option" */
|
not "include a zero-length option" */
|
||||||
if (opt->len == 0 &&
|
if (opt->len == 0 &&
|
||||||
(opt->opt == OPTION_NETMASK ||
|
(optno == OPTION_NETMASK ||
|
||||||
opt->opt == OPTION_BROADCAST ||
|
optno == OPTION_BROADCAST ||
|
||||||
opt->opt == OPTION_ROUTER ||
|
optno == OPTION_ROUTER ||
|
||||||
opt->opt == OPTION_DNSSERVER))
|
optno == OPTION_DNSSERVER ||
|
||||||
|
optno == OPTION_DOMAINNAME ||
|
||||||
|
optno == OPTION_HOSTNAME))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
len = do_opt(opt, NULL, context->local, null_term);
|
/* always force null-term for filename ans servername - buggy PXE again. */
|
||||||
if ((p = free_space(mess, end, opt->opt, len)))
|
len = do_opt(opt, NULL, context->local,
|
||||||
|
(optno == OPTION_SNAME || optno == OPTION_FILENAME) ? 1 : null_term);
|
||||||
|
|
||||||
|
if ((p = free_space(mess, end, optno, len)))
|
||||||
{
|
{
|
||||||
do_opt(opt, p, context->local, null_term);
|
do_opt(opt, p, context->local,
|
||||||
|
(optno == OPTION_SNAME || optno == OPTION_FILENAME) ? 1 : null_term);
|
||||||
|
|
||||||
/* If we send a vendor-id, revisit which vendor-ops we consider
|
/* If we send a vendor-id, revisit which vendor-ops we consider
|
||||||
it appropriate to send. */
|
it appropriate to send. */
|
||||||
if (opt->opt == OPTION_VENDOR_ID)
|
if (optno == OPTION_VENDOR_ID)
|
||||||
match_vendor_opts(p - 2, config_opts);
|
match_vendor_opts(p - 2, config_opts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1702,7 +1793,7 @@ static void do_options(struct dhcp_context *context,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* restore BOOTP anti-overload hack */
|
/* restore BOOTP anti-overload hack */
|
||||||
if (!req_options)
|
if (!req_options || (daemon->options & OPT_NO_OVERRIDE))
|
||||||
{
|
{
|
||||||
mess->file[0] = f0;
|
mess->file[0] = f0;
|
||||||
mess->sname[0] = s0;
|
mess->sname[0] = s0;
|
||||||
|
|||||||
+94
-57
@@ -1,20 +1,24 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000-2006 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dnsmasq.h"
|
#include "dnsmasq.h"
|
||||||
|
|
||||||
#ifdef HAVE_TFTP
|
#ifdef HAVE_TFTP
|
||||||
|
|
||||||
static struct tftp_file *check_tftp_fileperm(struct daemon *daemon, ssize_t *len);
|
static struct tftp_file *check_tftp_fileperm(ssize_t *len);
|
||||||
static void free_transfer(struct tftp_transfer *transfer);
|
static void free_transfer(struct tftp_transfer *transfer);
|
||||||
static ssize_t tftp_err(int err, char *packet, char *mess, char *file);
|
static ssize_t tftp_err(int err, char *packet, char *mess, char *file);
|
||||||
static ssize_t tftp_err_oops(char *packet, char *file);
|
static ssize_t tftp_err_oops(char *packet, char *file);
|
||||||
@@ -34,7 +38,7 @@ static char *next(char **p, char *end);
|
|||||||
#define ERR_FULL 3
|
#define ERR_FULL 3
|
||||||
#define ERR_ILL 4
|
#define ERR_ILL 4
|
||||||
|
|
||||||
void tftp_request(struct listener *listen, struct daemon *daemon, time_t now)
|
void tftp_request(struct listener *listen, time_t now)
|
||||||
{
|
{
|
||||||
ssize_t len;
|
ssize_t len;
|
||||||
char *packet = daemon->packet;
|
char *packet = daemon->packet;
|
||||||
@@ -46,12 +50,18 @@ void tftp_request(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
struct ifreq ifr;
|
struct ifreq ifr;
|
||||||
int is_err = 1, if_index = 0;
|
int is_err = 1, if_index = 0;
|
||||||
struct iname *tmp;
|
struct iname *tmp;
|
||||||
struct tftp_transfer *transfer, *t;
|
struct tftp_transfer *transfer;
|
||||||
|
int port = daemon->start_tftp_port; /* may be zero to use ephemeral port */
|
||||||
|
#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
|
||||||
|
int mtu = IP_PMTUDISC_DONT;
|
||||||
|
#endif
|
||||||
|
|
||||||
union {
|
union {
|
||||||
struct cmsghdr align; /* this ensures alignment */
|
struct cmsghdr align; /* this ensures alignment */
|
||||||
#ifdef HAVE_LINUX_NETWORK
|
#if defined(HAVE_LINUX_NETWORK)
|
||||||
char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
|
char control[CMSG_SPACE(sizeof(struct in_pktinfo))];
|
||||||
|
#elif defined(HAVE_SOLARIS_NETWORK)
|
||||||
|
char control[CMSG_SPACE(sizeof(unsigned int))];
|
||||||
#else
|
#else
|
||||||
char control[CMSG_SPACE(sizeof(struct sockaddr_dl))];
|
char control[CMSG_SPACE(sizeof(struct sockaddr_dl))];
|
||||||
#endif
|
#endif
|
||||||
@@ -96,7 +106,11 @@ void tftp_request(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVDSTADDR)
|
if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVDSTADDR)
|
||||||
addr.sin_addr = *((struct in_addr *)CMSG_DATA(cmptr));
|
addr.sin_addr = *((struct in_addr *)CMSG_DATA(cmptr));
|
||||||
else if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
else if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_RECVIF)
|
||||||
|
#ifdef HAVE_SOLARIS_NETWORK
|
||||||
|
if_index = *((unsigned int *)CMSG_DATA(cmptr));
|
||||||
|
#else
|
||||||
if_index = ((struct sockaddr_dl *)CMSG_DATA(cmptr))->sdl_index;
|
if_index = ((struct sockaddr_dl *)CMSG_DATA(cmptr))->sdl_index;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (if_index == 0 || !if_indextoname(if_index, ifr.ifr_name))
|
if (if_index == 0 || !if_indextoname(if_index, ifr.ifr_name))
|
||||||
return;
|
return;
|
||||||
@@ -106,7 +120,7 @@ void tftp_request(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
if (addr.sin_addr.s_addr == 0)
|
if (addr.sin_addr.s_addr == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!iface_check(daemon, AF_INET, (struct all_addr *)&addr.sin_addr,
|
if (!iface_check(AF_INET, (struct all_addr *)&addr.sin_addr,
|
||||||
&ifr, &if_index))
|
&ifr, &if_index))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -117,14 +131,13 @@ void tftp_request(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* tell kernel to use ephemeral port */
|
addr.sin_port = htons(port);
|
||||||
addr.sin_port = 0;
|
|
||||||
addr.sin_family = AF_INET;
|
addr.sin_family = AF_INET;
|
||||||
#ifdef HAVE_SOCKADDR_SA_LEN
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
||||||
addr.sin_len = sizeof(addr);
|
addr.sin_len = sizeof(addr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!(transfer = malloc(sizeof(struct tftp_transfer))))
|
if (!(transfer = whine_malloc(sizeof(struct tftp_transfer))))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if ((transfer->sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
|
if ((transfer->sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
|
||||||
@@ -134,19 +147,36 @@ void tftp_request(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
}
|
}
|
||||||
|
|
||||||
transfer->peer = peer;
|
transfer->peer = peer;
|
||||||
transfer->timeout = now + 1;
|
transfer->timeout = now + 2;
|
||||||
transfer->backoff = 1;
|
transfer->backoff = 1;
|
||||||
transfer->block = 1;
|
transfer->block = 1;
|
||||||
transfer->blocksize = 512;
|
transfer->blocksize = 512;
|
||||||
transfer->file = NULL;
|
transfer->file = NULL;
|
||||||
transfer->opt_blocksize = transfer->opt_transize = 0;
|
transfer->opt_blocksize = transfer->opt_transize = 0;
|
||||||
|
|
||||||
|
/* if we have a nailed-down range, iterate until we find a free one. */
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
if (bind(transfer->sockfd, (struct sockaddr *)&addr, sizeof(addr)) == -1 ||
|
if (bind(transfer->sockfd, (struct sockaddr *)&addr, sizeof(addr)) == -1 ||
|
||||||
|
#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
|
||||||
|
setsockopt(transfer->sockfd, SOL_IP, IP_MTU_DISCOVER, &mtu, sizeof(mtu)) == -1 ||
|
||||||
|
#endif
|
||||||
!fix_fd(transfer->sockfd))
|
!fix_fd(transfer->sockfd))
|
||||||
{
|
{
|
||||||
|
if (errno == EADDRINUSE && daemon->start_tftp_port != 0)
|
||||||
|
{
|
||||||
|
if (++port <= daemon->end_tftp_port)
|
||||||
|
{
|
||||||
|
addr.sin_port = htons(port);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
my_syslog(LOG_ERR, _("unable to get free port for TFTP"));
|
||||||
|
}
|
||||||
free_transfer(transfer);
|
free_transfer(transfer);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
p = packet + 2;
|
p = packet + 2;
|
||||||
end = packet + len;
|
end = packet + len;
|
||||||
@@ -189,6 +219,19 @@ void tftp_request(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
if (daemon->tftp_prefix[strlen(daemon->tftp_prefix)-1] != '/')
|
if (daemon->tftp_prefix[strlen(daemon->tftp_prefix)-1] != '/')
|
||||||
strncat(daemon->namebuff, "/", MAXDNAME);
|
strncat(daemon->namebuff, "/", MAXDNAME);
|
||||||
|
|
||||||
|
if (daemon->options & OPT_TFTP_APREF)
|
||||||
|
{
|
||||||
|
size_t oldlen = strlen(daemon->namebuff);
|
||||||
|
struct stat statbuf;
|
||||||
|
|
||||||
|
strncat(daemon->namebuff, inet_ntoa(peer.sin_addr), MAXDNAME);
|
||||||
|
strncat(daemon->namebuff, "/", MAXDNAME);
|
||||||
|
|
||||||
|
/* remove unique-directory if it doesn't exist */
|
||||||
|
if (stat(daemon->namebuff, &statbuf) == -1 || !S_ISDIR(statbuf.st_mode))
|
||||||
|
daemon->namebuff[oldlen] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* Absolute pathnames OK if they match prefix */
|
/* Absolute pathnames OK if they match prefix */
|
||||||
if (filename[0] == '/')
|
if (filename[0] == '/')
|
||||||
{
|
{
|
||||||
@@ -203,24 +246,8 @@ void tftp_request(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
strncat(daemon->namebuff, filename, MAXDNAME);
|
strncat(daemon->namebuff, filename, MAXDNAME);
|
||||||
daemon->namebuff[MAXDNAME-1] = 0;
|
daemon->namebuff[MAXDNAME-1] = 0;
|
||||||
|
|
||||||
/* If we're doing many tranfers from the same file, only
|
|
||||||
open it once this saves lots of file descriptors
|
|
||||||
when mass-booting a big cluster, for instance. */
|
|
||||||
for (t = daemon->tftp_trans; t; t = t->next)
|
|
||||||
if (strcmp(t->file->filename, daemon->namebuff) == 0)
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (t)
|
|
||||||
{
|
|
||||||
/* file already open */
|
|
||||||
transfer->file = t->file;
|
|
||||||
transfer->file->refcount++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
/* check permissions and open file */
|
/* check permissions and open file */
|
||||||
transfer->file = check_tftp_fileperm(daemon, &len);
|
if ((transfer->file = check_tftp_fileperm(&len)))
|
||||||
|
|
||||||
if (transfer->file)
|
|
||||||
{
|
{
|
||||||
if ((len = get_block(packet, transfer)) == -1)
|
if ((len = get_block(packet, transfer)) == -1)
|
||||||
len = tftp_err_oops(packet, daemon->namebuff);
|
len = tftp_err_oops(packet, daemon->namebuff);
|
||||||
@@ -242,80 +269,90 @@ void tftp_request(struct listener *listen, struct daemon *daemon, time_t now)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct tftp_file *check_tftp_fileperm(struct daemon *daemon, ssize_t *len)
|
static struct tftp_file *check_tftp_fileperm(ssize_t *len)
|
||||||
{
|
{
|
||||||
char *packet = daemon->packet, *namebuff = daemon->namebuff;
|
char *packet = daemon->packet, *namebuff = daemon->namebuff;
|
||||||
struct tftp_file *file;
|
struct tftp_file *file;
|
||||||
|
struct tftp_transfer *t;
|
||||||
uid_t uid = geteuid();
|
uid_t uid = geteuid();
|
||||||
struct stat statbuf;
|
struct stat statbuf;
|
||||||
|
int fd = -1;
|
||||||
|
|
||||||
/* trick to ban moving out of the subtree */
|
/* trick to ban moving out of the subtree */
|
||||||
if (daemon->tftp_prefix && strstr(namebuff, "/../"))
|
if (daemon->tftp_prefix && strstr(namebuff, "/../"))
|
||||||
{
|
|
||||||
errno = EACCES;
|
|
||||||
goto perm;
|
goto perm;
|
||||||
}
|
|
||||||
|
|
||||||
if (stat(namebuff, &statbuf) == -1)
|
if ((fd = open(namebuff, O_RDONLY)) == -1)
|
||||||
{
|
{
|
||||||
if (errno == ENOENT || errno == ENOTDIR)
|
if (errno == ENOENT)
|
||||||
goto nofile;
|
{
|
||||||
|
*len = tftp_err(ERR_FNF, packet, _("file %s not found"), namebuff);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
else if (errno == EACCES)
|
else if (errno == EACCES)
|
||||||
goto perm;
|
goto perm;
|
||||||
else
|
else
|
||||||
goto oops;
|
goto oops;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* stat the file descriptor to avoid stat->open races */
|
||||||
|
if (fstat(fd, &statbuf) == -1)
|
||||||
|
goto oops;
|
||||||
|
|
||||||
/* running as root, must be world-readable */
|
/* running as root, must be world-readable */
|
||||||
if (uid == 0)
|
if (uid == 0)
|
||||||
{
|
{
|
||||||
if (!(statbuf.st_mode & S_IROTH))
|
if (!(statbuf.st_mode & S_IROTH))
|
||||||
{
|
|
||||||
errno = EACCES;
|
|
||||||
goto perm;
|
goto perm;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
/* in secure mode, must be owned by user running dnsmasq */
|
/* in secure mode, must be owned by user running dnsmasq */
|
||||||
else if ((daemon->options & OPT_TFTP_SECURE) && uid != statbuf.st_uid)
|
else if ((daemon->options & OPT_TFTP_SECURE) && uid != statbuf.st_uid)
|
||||||
{
|
|
||||||
errno = EACCES;
|
|
||||||
goto perm;
|
goto perm;
|
||||||
|
|
||||||
|
/* If we're doing many tranfers from the same file, only
|
||||||
|
open it once this saves lots of file descriptors
|
||||||
|
when mass-booting a big cluster, for instance.
|
||||||
|
Be conservative and only share when inode and name match
|
||||||
|
this keeps error messages sane. */
|
||||||
|
for (t = daemon->tftp_trans; t; t = t->next)
|
||||||
|
if (t->file->dev == statbuf.st_dev &&
|
||||||
|
t->file->inode == statbuf.st_ino &&
|
||||||
|
strcmp(t->file->filename, namebuff) == 0)
|
||||||
|
{
|
||||||
|
close(fd);
|
||||||
|
t->file->refcount++;
|
||||||
|
return t->file;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(file = malloc(sizeof(struct tftp_file) + strlen(namebuff) + 1)))
|
if (!(file = whine_malloc(sizeof(struct tftp_file) + strlen(namebuff) + 1)))
|
||||||
{
|
{
|
||||||
errno = ENOMEM;
|
errno = ENOMEM;
|
||||||
goto oops;
|
goto oops;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((file->fd = open(namebuff, O_RDONLY)) == -1)
|
file->fd = fd;
|
||||||
{
|
|
||||||
free(file);
|
|
||||||
if (errno == EACCES || errno == EISDIR)
|
|
||||||
goto perm;
|
|
||||||
else
|
|
||||||
goto oops;
|
|
||||||
}
|
|
||||||
|
|
||||||
file->size = statbuf.st_size;
|
file->size = statbuf.st_size;
|
||||||
|
file->dev = statbuf.st_dev;
|
||||||
|
file->inode = statbuf.st_ino;
|
||||||
file->refcount = 1;
|
file->refcount = 1;
|
||||||
strcpy(file->filename, namebuff);
|
strcpy(file->filename, namebuff);
|
||||||
return file;
|
return file;
|
||||||
|
|
||||||
nofile:
|
|
||||||
*len = tftp_err(ERR_FNF, packet, _("file %s not found"), namebuff);
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
perm:
|
perm:
|
||||||
|
errno = EACCES;
|
||||||
*len = tftp_err(ERR_PERM, packet, _("cannot access %s: %s"), namebuff);
|
*len = tftp_err(ERR_PERM, packet, _("cannot access %s: %s"), namebuff);
|
||||||
|
if (fd != -1)
|
||||||
|
close(fd);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
oops:
|
oops:
|
||||||
*len = tftp_err_oops(packet, namebuff);
|
*len = tftp_err_oops(packet, namebuff);
|
||||||
|
if (fd != -1)
|
||||||
|
close(fd);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void check_tftp_listeners(struct daemon *daemon, fd_set *rset, time_t now)
|
void check_tftp_listeners(fd_set *rset, time_t now)
|
||||||
{
|
{
|
||||||
struct tftp_transfer *transfer, *tmp, **up;
|
struct tftp_transfer *transfer, *tmp, **up;
|
||||||
ssize_t len;
|
ssize_t len;
|
||||||
@@ -355,7 +392,7 @@ void check_tftp_listeners(struct daemon *daemon, fd_set *rset, time_t now)
|
|||||||
{
|
{
|
||||||
char *q, *r;
|
char *q, *r;
|
||||||
for (q = r = err; *r; r++)
|
for (q = r = err; *r; r++)
|
||||||
if (isprint(*r))
|
if (isprint((int)*r))
|
||||||
*(q++) = *r;
|
*(q++) = *r;
|
||||||
*q = 0;
|
*q = 0;
|
||||||
}
|
}
|
||||||
@@ -375,7 +412,7 @@ void check_tftp_listeners(struct daemon *daemon, fd_set *rset, time_t now)
|
|||||||
int endcon = 0;
|
int endcon = 0;
|
||||||
|
|
||||||
/* timeout, retransmit */
|
/* timeout, retransmit */
|
||||||
transfer->timeout += 1<<(transfer->backoff);
|
transfer->timeout += 1 + (1<<transfer->backoff);
|
||||||
|
|
||||||
/* we overwrote the buffer... */
|
/* we overwrote the buffer... */
|
||||||
daemon->srv_save = NULL;
|
daemon->srv_save = NULL;
|
||||||
|
|||||||
+44
-28
@@ -1,15 +1,18 @@
|
|||||||
/* dnsmasq is Copyright (c) 2000 - 2005 Simon Kelley
|
/* dnsmasq is Copyright (c) 2000-2007 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
|
||||||
the Free Software Foundation; version 2 dated June, 1991.
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
GNU General Public License for more details.
|
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, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
/* Some code in this file contributed by Rob Funk. */
|
/* Some code in this file contributed by Rob Funk. */
|
||||||
|
|
||||||
@@ -109,6 +112,7 @@ int canonicalise(char *s)
|
|||||||
also fail empty string and label > 63 chars */
|
also fail empty string and label > 63 chars */
|
||||||
size_t dotgap = 0, l = strlen(s);
|
size_t dotgap = 0, l = strlen(s);
|
||||||
char c;
|
char c;
|
||||||
|
int nowhite = 0;
|
||||||
|
|
||||||
if (l == 0 || l > MAXDNAME) return 0;
|
if (l == 0 || l > MAXDNAME) return 0;
|
||||||
|
|
||||||
@@ -124,9 +128,11 @@ int canonicalise(char *s)
|
|||||||
dotgap = 0;
|
dotgap = 0;
|
||||||
else if (!legal_char(c) || (++dotgap > MAXLABEL))
|
else if (!legal_char(c) || (++dotgap > MAXLABEL))
|
||||||
return 0;
|
return 0;
|
||||||
|
else if (c != ' ')
|
||||||
|
nowhite = 1;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
return 1;
|
return nowhite;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned char *do_rfc1035_name(unsigned char *p, char *sval)
|
unsigned char *do_rfc1035_name(unsigned char *p, char *sval)
|
||||||
@@ -151,7 +157,17 @@ void *safe_malloc(size_t size)
|
|||||||
void *ret = malloc(size);
|
void *ret = malloc(size);
|
||||||
|
|
||||||
if (!ret)
|
if (!ret)
|
||||||
die(_("could not get memory"), NULL);
|
die(_("could not get memory"), NULL, EC_NOMEM);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *whine_malloc(size_t size)
|
||||||
|
{
|
||||||
|
void *ret = malloc(size);
|
||||||
|
|
||||||
|
if (!ret)
|
||||||
|
my_syslog(LOG_ERR, _("failed to allocate %d bytes"), (int) size);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@@ -229,23 +245,6 @@ 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* returns port number from address */
|
/* returns port number from address */
|
||||||
int prettyprint_addr(union mysockaddr *addr, char *buf)
|
int prettyprint_addr(union mysockaddr *addr, char *buf)
|
||||||
{
|
{
|
||||||
@@ -348,10 +347,10 @@ int expand_buf(struct iovec *iov, size_t size)
|
|||||||
{
|
{
|
||||||
void *new;
|
void *new;
|
||||||
|
|
||||||
if (size <= iov->iov_len)
|
if (size <= (size_t)iov->iov_len)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (!(new = malloc(size)))
|
if (!(new = whine_malloc(size)))
|
||||||
{
|
{
|
||||||
errno = ENOMEM;
|
errno = ENOMEM;
|
||||||
return 0;
|
return 0;
|
||||||
@@ -369,9 +368,9 @@ int expand_buf(struct iovec *iov, size_t size)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *print_mac(struct daemon *daemon, unsigned char *mac, int len)
|
char *print_mac(char *buff, unsigned char *mac, int len)
|
||||||
{
|
{
|
||||||
char *p = daemon->namebuff;
|
char *p = buff;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (len == 0)
|
if (len == 0)
|
||||||
@@ -380,7 +379,7 @@ char *print_mac(struct daemon *daemon, unsigned char *mac, int len)
|
|||||||
for (i = 0; i < len; i++)
|
for (i = 0; i < len; i++)
|
||||||
p += sprintf(p, "%.2x%s", mac[i], (i == len - 1) ? "" : ":");
|
p += sprintf(p, "%.2x%s", mac[i], (i == len - 1) ? "" : ":");
|
||||||
|
|
||||||
return daemon->namebuff;
|
return buff;
|
||||||
}
|
}
|
||||||
|
|
||||||
void bump_maxfd(int fd, int *max)
|
void bump_maxfd(int fd, int *max)
|
||||||
@@ -389,6 +388,23 @@ void bump_maxfd(int fd, int *max)
|
|||||||
*max = fd;
|
*max = fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
int read_write(int fd, unsigned char *packet, int size, int rw)
|
int read_write(int fd, unsigned char *packet, int size, int rw)
|
||||||
{
|
{
|
||||||
ssize_t n, done;
|
ssize_t n, done;
|
||||||
@@ -405,7 +421,7 @@ int read_write(int fd, unsigned char *packet, int size, int rw)
|
|||||||
return 0;
|
return 0;
|
||||||
else if (n == -1)
|
else if (n == -1)
|
||||||
{
|
{
|
||||||
if (errno == EINTR || errno == ENOMEM || errno == ENOBUFS)
|
if (retry_send() || errno == ENOMEM || errno == ENOBUFS)
|
||||||
goto retry;
|
goto retry;
|
||||||
else
|
else
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Reference in new issue
Block a user