mirror of
http://thekelleys.org.uk/git/dnsmasq.git
synced 2026-11-18 19:41:03 +00:00
Compare commits
3
Commits
v2.90test2
..
v2.65
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8f6698643b | ||
|
|
c2e5c8d7cf | ||
|
|
95050a8d8b |
No files matched your search
@@ -1 +0,0 @@
|
|||||||
VERSION export-subst
|
|
||||||
-21
@@ -1,21 +0,0 @@
|
|||||||
src/*.o
|
|
||||||
src/*.mo
|
|
||||||
src/dnsmasq.pot
|
|
||||||
src/dnsmasq
|
|
||||||
src/dnsmasq_baseline
|
|
||||||
src/.copts_*
|
|
||||||
contrib/lease-tools/dhcp_lease_time
|
|
||||||
contrib/lease-tools/dhcp_release
|
|
||||||
contrib/lease-tools/dhcp_release6
|
|
||||||
debian/.debhelper
|
|
||||||
debian/auto-build
|
|
||||||
debian/debhelper-build-stamp
|
|
||||||
debian/files
|
|
||||||
debian/*.substvars
|
|
||||||
debian/*.debhelper
|
|
||||||
debian/*.log
|
|
||||||
debian/dnsmasq-base-lua/
|
|
||||||
debian/dnsmasq-base/
|
|
||||||
debian/dnsmasq-utils/
|
|
||||||
debian/dnsmasq/
|
|
||||||
debian/tmp
|
|
||||||
+42
-42
@@ -56,7 +56,7 @@ release 0.95 Major rewrite: remove calls to gethostbyname() and talk
|
|||||||
any more memory after start-up. The NAT-like forwarding was
|
any more memory after start-up. The NAT-like forwarding was
|
||||||
inspired by a suggestion from Eli Chen <eli@routefree.com>
|
inspired by a suggestion from Eli Chen <eli@routefree.com>
|
||||||
|
|
||||||
release 0.96 Fixed embarrassing thinko in cache linked-list code.
|
release 0.96 Fixed embarrasing thinko in cache linked-list code.
|
||||||
|
|
||||||
release 0.98 Some enhancements and bug-fixes.
|
release 0.98 Some enhancements and bug-fixes.
|
||||||
Thanks to "Denis Carre" <denis.carre@laposte.net> and Martin
|
Thanks to "Denis Carre" <denis.carre@laposte.net> and Martin
|
||||||
@@ -78,7 +78,7 @@ release 0.98 Some enhancements and bug-fixes.
|
|||||||
ids, to thwart DNS spoofers.
|
ids, to thwart DNS spoofers.
|
||||||
(7) Dnsmasq no longer forwards queries when the
|
(7) Dnsmasq no longer forwards queries when the
|
||||||
"recursion desired" bit is not set in the header.
|
"recursion desired" bit is not set in the header.
|
||||||
(8) Fixed getopt code to work on compilers with unsigned char.
|
(8) Fixed getopt code to work on compliers with unsigned char.
|
||||||
|
|
||||||
release 0.991 Added -b flag: when set causes dnsmasq to always answer
|
release 0.991 Added -b flag: when set causes dnsmasq to always answer
|
||||||
reverse queries on the RFC 1918 private IP space itself and
|
reverse queries on the RFC 1918 private IP space itself and
|
||||||
@@ -88,7 +88,7 @@ release 0.991 Added -b flag: when set causes dnsmasq to always answer
|
|||||||
Fixed a bug which stopped dnsmasq working on a box with
|
Fixed a bug which stopped dnsmasq working on a box with
|
||||||
two or more interfaces with the same IP address.
|
two or more interfaces with the same IP address.
|
||||||
|
|
||||||
Fixed caching of CNAMEs. Previously, a CNAME which pointed
|
Fixed cacheing of CNAMEs. Previously, a CNAME which pointed
|
||||||
to a name with many A records would not have all the addresses
|
to a name with many A records would not have all the addresses
|
||||||
returned when being answered from the cache.
|
returned when being answered from the cache.
|
||||||
|
|
||||||
@@ -191,7 +191,7 @@ release 1.1 Added --user argument to allow user to change to
|
|||||||
|
|
||||||
release 1.2 Added IPv6 DNS record support. AAAA records are cached
|
release 1.2 Added IPv6 DNS record support. AAAA records are cached
|
||||||
and read from /etc/hosts. Reverse-lookups in the
|
and read from /etc/hosts. Reverse-lookups in the
|
||||||
ip6.int and ip6.arpa domains are supported. Dnsmasq can
|
ip6.int and ip6.arpa domains are suppored. Dnsmasq can
|
||||||
talk to upstream servers via IPv6 if it finds IP6 addresses
|
talk to upstream servers via IPv6 if it finds IP6 addresses
|
||||||
in /etc/resolv.conf and it offers DNS service automatically
|
in /etc/resolv.conf and it offers DNS service automatically
|
||||||
if IPv6 support is present in the kernel.
|
if IPv6 support is present in the kernel.
|
||||||
@@ -214,7 +214,7 @@ release 1.3 Some versions of the Linux kernel return EINVAL rather
|
|||||||
starting, rather than after the first query - principle
|
starting, rather than after the first query - principle
|
||||||
of least surprise applies here.
|
of least surprise applies here.
|
||||||
|
|
||||||
release 1.4 Fix a bug with DHCP lease parsing which broke in
|
release 1.4 Fix a bug with DHPC lease parsing which broke in
|
||||||
non-UTC timezones. Thanks to Mark Wormgoor for
|
non-UTC timezones. Thanks to Mark Wormgoor for
|
||||||
spotting and diagnosing this. Fixed versions in
|
spotting and diagnosing this. Fixed versions in
|
||||||
the .spec files this time. Fixed bug in Suse startup
|
the .spec files this time. Fixed bug in Suse startup
|
||||||
@@ -258,7 +258,7 @@ release 1.7 Fix a problem with cache not clearing properly
|
|||||||
on receipt of SIGHUP. Bug spotted by Sat Deshpande.
|
on receipt of SIGHUP. Bug spotted by Sat Deshpande.
|
||||||
|
|
||||||
In group-id changing code:
|
In group-id changing code:
|
||||||
1) Drop supplementary groups.
|
1) Drop supplimentary groups.
|
||||||
2) Change gid before dropping root (patch from Soewono Effendi.)
|
2) Change gid before dropping root (patch from Soewono Effendi.)
|
||||||
3) Change group to "dip" if it exists, to allow access
|
3) Change group to "dip" if it exists, to allow access
|
||||||
to /etc/ppp/resolv.conf (suggestion from Jorg Sommer.)
|
to /etc/ppp/resolv.conf (suggestion from Jorg Sommer.)
|
||||||
@@ -297,7 +297,7 @@ release 1.9 Fixes to rpm .spec files.
|
|||||||
required. The difference is not really visible with
|
required. The difference is not really visible with
|
||||||
bloated libcs like glibc, but should dramatically reduce
|
bloated libcs like glibc, but should dramatically reduce
|
||||||
memory requirements when linked against ulibc for use on
|
memory requirements when linked against ulibc for use on
|
||||||
embedded routers, and that's the point really. Thanks to
|
embeded routers, and that's the point really. Thanks to
|
||||||
Matthew Natalier for prompting this.
|
Matthew Natalier for prompting this.
|
||||||
|
|
||||||
Changed debug mode (-d) so that all logging appears on
|
Changed debug mode (-d) so that all logging appears on
|
||||||
@@ -319,12 +319,12 @@ release 1.9 Fixes to rpm .spec files.
|
|||||||
uClinux. Thanks to Matthew Natalier for uClinux stuff.
|
uClinux. Thanks to Matthew Natalier for uClinux stuff.
|
||||||
|
|
||||||
release 1.10 Log warnings if resolv.conf or dhcp.leases are not
|
release 1.10 Log warnings if resolv.conf or dhcp.leases are not
|
||||||
accessible for any reason, as suggested by Hinrich Eilts.
|
accessable for any reason, as suggested by Hinrich Eilts.
|
||||||
|
|
||||||
Fixed wrong address printing in error message about
|
Fixed wrong address printing in error message about
|
||||||
no interface with address.
|
no interface with address.
|
||||||
|
|
||||||
Updated docs and split installation instructions into setup.html.
|
Updated docs and split installation instuctions into setup.html.
|
||||||
|
|
||||||
Fix bug in CNAME chasing code: One CNAME pointing
|
Fix bug in CNAME chasing code: One CNAME pointing
|
||||||
to many A records would lose A records after the
|
to many A records would lose A records after the
|
||||||
@@ -346,7 +346,7 @@ release 1.10 Log warnings if resolv.conf or dhcp.leases are not
|
|||||||
|
|
||||||
Added -S option to directly specify upstream servers and
|
Added -S option to directly specify upstream servers and
|
||||||
added ability to direct queries for specific domains to
|
added ability to direct queries for specific domains to
|
||||||
specific servers. Suggested by Jens Vonderheide.
|
specfic servers. Suggested by Jens Vonderheide.
|
||||||
|
|
||||||
Upgraded random ID generation - patch from Rob Funk.
|
Upgraded random ID generation - patch from Rob Funk.
|
||||||
|
|
||||||
@@ -386,13 +386,13 @@ release 1.11 Actually implement the -R flag promised in the 1.10 man page.
|
|||||||
names in /etc/hosts -suggestion from Phil Harman.
|
names in /etc/hosts -suggestion from Phil Harman.
|
||||||
|
|
||||||
Always return a zero time-to-live for names derived from
|
Always return a zero time-to-live for names derived from
|
||||||
DHCP which stops anything else caching these
|
DHCP which stops anthing else caching these
|
||||||
names. Previously the TTL was derived from the lease
|
names. Previously the TTL was derived from the lease
|
||||||
time but that is incorrect since a lease can be given
|
time but that is incorrect since a lease can be given
|
||||||
up early: dnsmasq would know this but anything with the
|
up early: dnsmasq would know this but anything with the
|
||||||
name cached with long TTL would not be updated.
|
name cached with long TTL would not be updated.
|
||||||
|
|
||||||
Extended HAVE_IPV6 config flag to allow compilation on
|
Extended HAVE_IPV6 config flag to allow compliation on
|
||||||
old systems which don't have modern library routines
|
old systems which don't have modern library routines
|
||||||
like inet_ntop(). Thanks to Phil Harman for the patch.
|
like inet_ntop(). Thanks to Phil Harman for the patch.
|
||||||
|
|
||||||
@@ -471,7 +471,7 @@ release 1.14 Fixed man page description of -b option which confused
|
|||||||
/etc/resolv.conf.
|
/etc/resolv.conf.
|
||||||
(Thanks to Klaas Teschauer)
|
(Thanks to Klaas Teschauer)
|
||||||
|
|
||||||
Check that received queries have only rfc1035-legal characters
|
Check that recieved queries have only rfc1035-legal characters
|
||||||
in them. This check is mainly to avoid bad strings being
|
in them. This check is mainly to avoid bad strings being
|
||||||
sent to syslog.
|
sent to syslog.
|
||||||
|
|
||||||
@@ -549,7 +549,7 @@ release 1.16 Allow "/" characters in domain names - this fixes
|
|||||||
|
|
||||||
release 1.17 Fixed crash with DHCP hostnames > 40 characters.
|
release 1.17 Fixed crash with DHCP hostnames > 40 characters.
|
||||||
|
|
||||||
Fixed name-comparison routines to not depend on Locale,
|
Fixed name-comparision routines to not depend on Locale,
|
||||||
in theory this versions since 1.15 could lock up or give
|
in theory this versions since 1.15 could lock up or give
|
||||||
wrong results when run with locale != 'C'.
|
wrong results when run with locale != 'C'.
|
||||||
|
|
||||||
@@ -574,7 +574,7 @@ release 1.18 Added round-robin DNS for names which have more than one
|
|||||||
forwarded because -D is in effect, return NXDOMAIN not
|
forwarded because -D is in effect, return NXDOMAIN not
|
||||||
an empty reply.
|
an empty reply.
|
||||||
|
|
||||||
Add code to return the software version in response to the
|
Add code to return the software version in repsonse to the
|
||||||
correct magic query in the same way as BIND. Use
|
correct magic query in the same way as BIND. Use
|
||||||
"dig version.bind chaos txt" to make the query.
|
"dig version.bind chaos txt" to make the query.
|
||||||
|
|
||||||
@@ -635,7 +635,7 @@ release 2.0
|
|||||||
dynamic allocation.
|
dynamic allocation.
|
||||||
|
|
||||||
Allow dhcp-host options for the same host with different
|
Allow dhcp-host options for the same host with different
|
||||||
IP addresses where the correct one will be selected for
|
IP adresses where the correct one will be selected for
|
||||||
the network the host appears on.
|
the network the host appears on.
|
||||||
|
|
||||||
Fix parsing of --dhcp-option to allow more than one
|
Fix parsing of --dhcp-option to allow more than one
|
||||||
@@ -674,7 +674,7 @@ release 2.1
|
|||||||
|
|
||||||
Fix unaligned access warnings on BSD/Alpha.
|
Fix unaligned access warnings on BSD/Alpha.
|
||||||
|
|
||||||
Allow empty DHCP options, like so: dhcp-option=44
|
Allow empty DHCP options, like so: dhpc-option=44
|
||||||
|
|
||||||
Allow single-byte DHCP options like so: dhcp-option=20,1
|
Allow single-byte DHCP options like so: dhcp-option=20,1
|
||||||
|
|
||||||
@@ -745,7 +745,7 @@ release 2.3
|
|||||||
around a bug in the DHCP client in HP Jetdirect printers.
|
around a bug in the DHCP client in HP Jetdirect printers.
|
||||||
Thanks to Marko Stolle for finding this problem.
|
Thanks to Marko Stolle for finding this problem.
|
||||||
|
|
||||||
Return DHCP T1 and T2 times, with "fuzz" to desynchronise lease
|
Return DHCP T1 and T2 times, with "fuzz" to desychronise lease
|
||||||
renewals, as specified in the RFC.
|
renewals, as specified in the RFC.
|
||||||
|
|
||||||
Ensure that the END option is always present in DHCP
|
Ensure that the END option is always present in DHCP
|
||||||
@@ -838,7 +838,7 @@ release 2.4
|
|||||||
by Chad Skeeters.
|
by Chad Skeeters.
|
||||||
|
|
||||||
Fixed bug in /etc/ethers parsing code triggered by tab
|
Fixed bug in /etc/ethers parsing code triggered by tab
|
||||||
characters. Kudos to Dag Wieers for helping to nail that
|
characters. Qudos to Dag Wieers for hepling to nail that
|
||||||
one.
|
one.
|
||||||
|
|
||||||
Added "bind-interfaces" option correctly.
|
Added "bind-interfaces" option correctly.
|
||||||
@@ -975,7 +975,7 @@ release 2.8
|
|||||||
configuration. Specifically: (1) options are matched on
|
configuration. Specifically: (1) options are matched on
|
||||||
the netids from dhcp-range, dhcp-host, vendor class and
|
the netids from dhcp-range, dhcp-host, vendor class and
|
||||||
user class(es). Multiple net-ids are allowed and options
|
user class(es). Multiple net-ids are allowed and options
|
||||||
are searched on them all. (2) matches against vendor class
|
are searched on them all. (2) matches agains vendor class
|
||||||
and user class are now on a substring, if the given
|
and user class are now on a substring, if the given
|
||||||
string is a substring of the vendor/user class, then a
|
string is a substring of the vendor/user class, then a
|
||||||
match occurs. Thanks again to Richard Musil for prompting
|
match occurs. Thanks again to Richard Musil for prompting
|
||||||
@@ -997,7 +997,7 @@ release 2.8
|
|||||||
|
|
||||||
Add checks against DHCP clients which return zero-length
|
Add checks against DHCP clients which return zero-length
|
||||||
hostnames. This avoids the potential lease-loss problems
|
hostnames. This avoids the potential lease-loss problems
|
||||||
referred to above. Also, if a client sends a hostname when
|
reffered to above. Also, if a client sends a hostname when
|
||||||
it creates a lease but subsequently sends no or a
|
it creates a lease but subsequently sends no or a
|
||||||
zero-length hostname whilst renewing, continue to use the
|
zero-length hostname whilst renewing, continue to use the
|
||||||
existing hostname, don't wipe it out.
|
existing hostname, don't wipe it out.
|
||||||
@@ -1010,7 +1010,7 @@ release 2.9
|
|||||||
but to the address of another interface were ignored
|
but to the address of another interface were ignored
|
||||||
unless the loopback interface was explicitly configured.
|
unless the loopback interface was explicitly configured.
|
||||||
2) on OpenBSD failure to configure one interface now
|
2) on OpenBSD failure to configure one interface now
|
||||||
causes a fatal error on startup rather than a huge
|
causes a fatal error on startup rather than an huge
|
||||||
stream of log messages. Thanks to Erik Jan Tromp for
|
stream of log messages. Thanks to Erik Jan Tromp for
|
||||||
finding that bug.
|
finding that bug.
|
||||||
|
|
||||||
@@ -1019,7 +1019,7 @@ release 2.9
|
|||||||
broken. The new algorithm is to pick as before for the
|
broken. The new algorithm is to pick as before for the
|
||||||
first try, but if a query is retried, to send to all
|
first try, but if a query is retried, to send to all
|
||||||
available servers in parallel. The first one to reply
|
available servers in parallel. The first one to reply
|
||||||
then becomes preferred for the next query. This should
|
then becomes prefered for the next query. This should
|
||||||
improve reliability without generating significant extra
|
improve reliability without generating significant extra
|
||||||
upstream load.
|
upstream load.
|
||||||
|
|
||||||
@@ -1027,7 +1027,7 @@ release 2.9
|
|||||||
unqualified domains introduced in version 2.8
|
unqualified domains introduced in version 2.8
|
||||||
|
|
||||||
Allow fallback to "bind-interfaces" at runtime: Some
|
Allow fallback to "bind-interfaces" at runtime: Some
|
||||||
versions of *BSD seem to have enough stuff in the header
|
verions of *BSD seem to have enough stuff in the header
|
||||||
files to build but no kernel support. Also now log if
|
files to build but no kernel support. Also now log if
|
||||||
"bind-interfaces" is forced on.
|
"bind-interfaces" is forced on.
|
||||||
|
|
||||||
@@ -1049,7 +1049,7 @@ release 2.9
|
|||||||
first name found is now returned for reverse lookups,
|
first name found is now returned for reverse lookups,
|
||||||
rather than all of them.
|
rather than all of them.
|
||||||
|
|
||||||
Add back fatal errors when nonexistent
|
Add back fatal errors when nonexistant
|
||||||
interfaces or interface addresses are given but only in
|
interfaces or interface addresses are given but only in
|
||||||
"bind-interfaces" mode. Principle of least surprise applies.
|
"bind-interfaces" mode. Principle of least surprise applies.
|
||||||
|
|
||||||
@@ -1193,7 +1193,7 @@ version 2.14
|
|||||||
|
|
||||||
version 2.15
|
version 2.15
|
||||||
Fixed NXDOMAIN/NODATA confusion for locally known
|
Fixed NXDOMAIN/NODATA confusion for locally known
|
||||||
names. We now return a NODATA response for names which are
|
names. We now return a NODATA reponse for names which are
|
||||||
locally known. Now a query for (eg AAAA or MX) for a name
|
locally known. Now a query for (eg AAAA or MX) for a name
|
||||||
with an IPv4 address in /etc/hosts which fails upstream
|
with an IPv4 address in /etc/hosts which fails upstream
|
||||||
will generate a NODATA response. Note that the query
|
will generate a NODATA response. Note that the query
|
||||||
@@ -1229,7 +1229,7 @@ version 2.16
|
|||||||
|
|
||||||
Set NONBLOCK on all listening sockets to workaround non-POSIX
|
Set NONBLOCK on all listening sockets to workaround non-POSIX
|
||||||
compliance in Linux 2.4 and 2.6. This fixes rare hangs which
|
compliance in Linux 2.4 and 2.6. This fixes rare hangs which
|
||||||
occurred when corrupted packets were received. Thanks to
|
occured when corrupted packets were received. Thanks to
|
||||||
Joris van Rantwijk for chasing that down.
|
Joris van Rantwijk for chasing that down.
|
||||||
|
|
||||||
Updated config.h for NetBSD. Thanks to Martin Lambers.
|
Updated config.h for NetBSD. Thanks to Martin Lambers.
|
||||||
@@ -1297,7 +1297,7 @@ version 2.18
|
|||||||
interfaces with more than one IPv6 address. Thanks to
|
interfaces with more than one IPv6 address. Thanks to
|
||||||
Martin Pels for help with that.
|
Martin Pels for help with that.
|
||||||
|
|
||||||
Fix problems which occurred when more than one dhcp-range
|
Fix problems which occured when more than one dhcp-range
|
||||||
was specified in the same subnet: sometimes parameters
|
was specified in the same subnet: sometimes parameters
|
||||||
(lease time, network-id tag) from the wrong one would be
|
(lease time, network-id tag) from the wrong one would be
|
||||||
used. Thanks to Rory Campbell-Lange for the bug report.
|
used. Thanks to Rory Campbell-Lange for the bug report.
|
||||||
@@ -1314,7 +1314,7 @@ version 2.19
|
|||||||
Thanks to Richard Atterer for the bug report.
|
Thanks to Richard Atterer for the bug report.
|
||||||
|
|
||||||
Check for under-length option fields in DHCP packets, a
|
Check for under-length option fields in DHCP packets, a
|
||||||
zero length client-id, in particular, could seriously
|
zero length client-id, in particluar, could seriously
|
||||||
confuse dnsmasq 'till now. Thanks to Will Murname for help
|
confuse dnsmasq 'till now. Thanks to Will Murname for help
|
||||||
with that.
|
with that.
|
||||||
|
|
||||||
@@ -1389,7 +1389,7 @@ version 2.21
|
|||||||
recursive queries.
|
recursive queries.
|
||||||
|
|
||||||
Fix DHCP address allocation problem when netid tags are in
|
Fix DHCP address allocation problem when netid tags are in
|
||||||
use. Thanks to Will Murname for the bug report and
|
use. Thanks to Will Murnane for the bug report and
|
||||||
subsequent testing.
|
subsequent testing.
|
||||||
|
|
||||||
Add an additional data section to the reply for MX and SRV
|
Add an additional data section to the reply for MX and SRV
|
||||||
@@ -1505,7 +1505,7 @@ version 2.23
|
|||||||
from dnsmasq --version. Thanks to Dirk Schenkewitz for
|
from dnsmasq --version. Thanks to Dirk Schenkewitz for
|
||||||
the suggestion.
|
the suggestion.
|
||||||
|
|
||||||
Fix pathological behaviour when a broken client keeps sending
|
Fix pathalogical behaviour when a broken client keeps sending
|
||||||
DHCPDISCOVER messages repeatedly and fast. Because dealing with
|
DHCPDISCOVER messages repeatedly and fast. Because dealing with
|
||||||
each of these takes a few seconds, (because of the ping) then a
|
each of these takes a few seconds, (because of the ping) then a
|
||||||
queue of DHCP packets could build up. Now, the results of a ping
|
queue of DHCP packets could build up. Now, the results of a ping
|
||||||
@@ -1593,7 +1593,7 @@ version 2.24
|
|||||||
than one dhcp-range is available. Thanks to Sorin Panca
|
than one dhcp-range is available. Thanks to Sorin Panca
|
||||||
for help chasing this down.
|
for help chasing this down.
|
||||||
|
|
||||||
Added more explicit error messages to the hosts file and
|
Added more explict error mesages to the hosts file and
|
||||||
ethers file reading code. Markus Kaiserswerth suffered to
|
ethers file reading code. Markus Kaiserswerth suffered to
|
||||||
make this happen.
|
make this happen.
|
||||||
|
|
||||||
@@ -1617,7 +1617,7 @@ version 2.25
|
|||||||
|
|
||||||
Fixed Suse spec file - thanks to Steven Springl.
|
Fixed Suse spec file - thanks to Steven Springl.
|
||||||
|
|
||||||
Fixed DHCP bug when two distinct subnets are on the same
|
Fixed DHCP bug when two distict subnets are on the same
|
||||||
physical interface. Thanks to Pawel Zawora for finding
|
physical interface. Thanks to Pawel Zawora for finding
|
||||||
this and suggesting the fix.
|
this and suggesting the fix.
|
||||||
|
|
||||||
@@ -1740,7 +1740,7 @@ version 2.28
|
|||||||
Fixed regression in netlink code under 2.2.x kernels which
|
Fixed regression in netlink code under 2.2.x kernels which
|
||||||
occurred in 2.27. Erik Jan Tromp is the vintage kernel fan
|
occurred in 2.27. Erik Jan Tromp is the vintage kernel fan
|
||||||
who found this. P.S. It looks like this "netlink bind:
|
who found this. P.S. It looks like this "netlink bind:
|
||||||
permission denied" problem occurred in kernels at least as
|
permission denied" problem occured in kernels at least as
|
||||||
late a 2.4.18. Good information from Alain Richoux.
|
late a 2.4.18. Good information from Alain Richoux.
|
||||||
|
|
||||||
Added a warning when it's impossible to give a host its
|
Added a warning when it's impossible to give a host its
|
||||||
@@ -1761,7 +1761,7 @@ version 2.28
|
|||||||
Eric House and Eric Spakman for help in chasing this down.
|
Eric House and Eric Spakman for help in chasing this down.
|
||||||
|
|
||||||
Tolerate configuration screwups which lead to the DHCP
|
Tolerate configuration screwups which lead to the DHCP
|
||||||
server attempting to allocate its own address to a
|
server attemping to allocate its own address to a
|
||||||
client; eg setting the whole subnet range as a DHCP
|
client; eg setting the whole subnet range as a DHCP
|
||||||
range. Addresses in use by the server are now excluded
|
range. Addresses in use by the server are now excluded
|
||||||
from use by clients.
|
from use by clients.
|
||||||
@@ -2067,7 +2067,7 @@ version 2.36
|
|||||||
kernel. Thanks to Philip Wall for the bug report.
|
kernel. Thanks to Philip Wall for the bug report.
|
||||||
|
|
||||||
Added --dhcp-bridge option, but only to the FreeBSD
|
Added --dhcp-bridge option, but only to the FreeBSD
|
||||||
build. This fixes an oddity with a particular bridged
|
build. This fixes an oddity with a a particular bridged
|
||||||
network configuration on FreeBSD. Thanks to Luigi Rizzo
|
network configuration on FreeBSD. Thanks to Luigi Rizzo
|
||||||
for the patch.
|
for the patch.
|
||||||
|
|
||||||
@@ -2273,7 +2273,7 @@ version 2.40
|
|||||||
this.
|
this.
|
||||||
|
|
||||||
Use client-id as hash-seed for DHCP address allocation
|
Use client-id as hash-seed for DHCP address allocation
|
||||||
with Firewire and InfiniBand, as these don't supply a MAC
|
with Firewire and Infiniband, as these don't supply an MAC
|
||||||
address.
|
address.
|
||||||
|
|
||||||
Tweaked TFTP file-open code to make it behave sensibly
|
Tweaked TFTP file-open code to make it behave sensibly
|
||||||
@@ -2307,7 +2307,7 @@ version 2.40
|
|||||||
Continue to use unqualified hostnames provided by DHCP
|
Continue to use unqualified hostnames provided by DHCP
|
||||||
clients, even if the domain part is illegal. (The domain
|
clients, even if the domain part is illegal. (The domain
|
||||||
is ignored, and an error logged.) Previously in this
|
is ignored, and an error logged.) Previously in this
|
||||||
situation, the whole name would have been
|
situation, the whole name whould have been
|
||||||
rejected. Thanks to Jima for the patch.
|
rejected. Thanks to Jima for the patch.
|
||||||
|
|
||||||
Handle EINTR returns from wait() correctly and reap
|
Handle EINTR returns from wait() correctly and reap
|
||||||
@@ -2319,7 +2319,7 @@ version 2.40
|
|||||||
leases file and passed to the lease-change
|
leases file and passed to the lease-change
|
||||||
script. Suggestion from Ben Voigt.
|
script. Suggestion from Ben Voigt.
|
||||||
|
|
||||||
Re-run the lease change script with an "old" event for
|
Re-run the lease chamge script with an "old" event for
|
||||||
each lease when dnsmasq receives a SIGHUP.
|
each lease when dnsmasq receives a SIGHUP.
|
||||||
|
|
||||||
Added more useful exit codes, including passing on a
|
Added more useful exit codes, including passing on a
|
||||||
@@ -2417,7 +2417,7 @@ version 2.41
|
|||||||
Changed behavior of DHCP server to always return total length of
|
Changed behavior of DHCP server to always return total length of
|
||||||
a new lease in DHCPOFFER, even if an existing lease
|
a new lease in DHCPOFFER, even if an existing lease
|
||||||
exists. (It used to return the time remaining on the lease
|
exists. (It used to return the time remaining on the lease
|
||||||
when one existed.) This fixes problems with the Sony Ericsson
|
whne one existed.) This fixes problems with the Sony Ericsson
|
||||||
K610i phone. Thanks to Hakon Stordahl for finding and
|
K610i phone. Thanks to Hakon Stordahl for finding and
|
||||||
fixing this.
|
fixing this.
|
||||||
|
|
||||||
@@ -2433,7 +2433,7 @@ version 2.41
|
|||||||
|
|
||||||
Add --dhcp-match flag, to check for arbitrary options in
|
Add --dhcp-match flag, to check for arbitrary options in
|
||||||
DHCP messages from clients. This enables use of dnsmasq
|
DHCP messages from clients. This enables use of dnsmasq
|
||||||
with iPXE. Thanks to Rance Hall for the suggestion.
|
with gPXE. Thanks to Rance Hall for the suggestion.
|
||||||
|
|
||||||
Added --dhcp-broadcast, to force broadcast replies to DHCP
|
Added --dhcp-broadcast, to force broadcast replies to DHCP
|
||||||
clients which need them but are too dumb or too old to
|
clients which need them but are too dumb or too old to
|
||||||
@@ -2476,7 +2476,7 @@ version 2.42
|
|||||||
|
|
||||||
Fix OS detection logic to cope with GNU/FreeBSD.
|
Fix OS detection logic to cope with GNU/FreeBSD.
|
||||||
|
|
||||||
Fix uninitialised variable in DBus code - thanks to Roy
|
Fix unitialised variable in DBus code - thanks to Roy
|
||||||
Marples.
|
Marples.
|
||||||
|
|
||||||
Fix network enumeration code to work on later NetBSD -
|
Fix network enumeration code to work on later NetBSD -
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
Version 2, June 1991
|
Version 2, June 1991
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
of this license document, but changing it is not allowed.
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
Preamble
|
Preamble
|
||||||
|
|
||||||
The licenses for most software are designed to take away your
|
The licenses for most software are designed to take away your
|
||||||
freedom to share and change it. By contrast, the GNU General Public
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
|
|||||||
General Public License applies to most of the Free Software
|
General Public License applies to most of the Free Software
|
||||||
Foundation's software and to any other program whose authors commit to
|
Foundation's software and to any other program whose authors commit to
|
||||||
using it. (Some other Free Software Foundation software is covered by
|
using it. (Some other Free Software Foundation software is covered by
|
||||||
the GNU Lesser General Public License instead.) You can apply it to
|
the GNU Library General Public License instead.) You can apply it to
|
||||||
your programs, too.
|
your programs, too.
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
When we speak of free software, we are referring to freedom, not
|
||||||
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
|
|||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
The precise terms and conditions for copying, distribution and
|
||||||
modification follow.
|
modification follow.
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
0. This License applies to any program or other work which contains
|
0. This License applies to any program or other work which contains
|
||||||
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
|
|||||||
License. (Exception: if the Program itself is interactive but
|
License. (Exception: if the Program itself is interactive but
|
||||||
does not normally print such an announcement, your work based on
|
does not normally print such an announcement, your work based on
|
||||||
the Program is not required to print an announcement.)
|
the Program is not required to print an announcement.)
|
||||||
|
|
||||||
These requirements apply to the modified work as a whole. If
|
These requirements apply to the modified work as a whole. If
|
||||||
identifiable sections of that work are not derived from the Program,
|
identifiable sections of that work are not derived from the Program,
|
||||||
and can be reasonably considered independent and separate works in
|
and can be reasonably considered independent and separate works in
|
||||||
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
|
|||||||
access to copy the source code from the same place counts as
|
access to copy the source code from the same place counts as
|
||||||
distribution of the source code, even though third parties are not
|
distribution of the source code, even though third parties are not
|
||||||
compelled to copy the source along with the object code.
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
4. You may not copy, modify, sublicense, or distribute the Program
|
4. You may not copy, modify, sublicense, or distribute the Program
|
||||||
except as expressly provided under this License. Any attempt
|
except as expressly provided under this License. Any attempt
|
||||||
otherwise to copy, modify, sublicense or distribute the Program is
|
otherwise to copy, modify, sublicense or distribute the Program is
|
||||||
@@ -225,7 +225,7 @@ impose that choice.
|
|||||||
|
|
||||||
This section is intended to make thoroughly clear what is believed to
|
This section is intended to make thoroughly clear what is believed to
|
||||||
be a consequence of the rest of this License.
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
8. If the distribution and/or use of the Program is restricted in
|
8. If the distribution and/or use of the Program is restricted in
|
||||||
certain countries either by patents or by copyrighted interfaces, the
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
original copyright holder who places the Program under this License
|
original copyright holder who places the Program under this License
|
||||||
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
|
|||||||
of preserving the free status of all derivatives of our free software and
|
of preserving the free status of all derivatives of our free software and
|
||||||
of promoting the sharing and reuse of software generally.
|
of promoting the sharing and reuse of software generally.
|
||||||
|
|
||||||
NO WARRANTY
|
NO WARRANTY
|
||||||
|
|
||||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||||
@@ -277,9 +277,9 @@ 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
|
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||||
POSSIBILITY OF SUCH DAMAGES.
|
POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
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
|
possible use to the public, the best way to achieve this is to make it
|
||||||
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
|
|||||||
the "copyright" line and a pointer to where the full notice is found.
|
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.>
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
Copyright (C) <year> <name of author>
|
Copyright (C) 19yy <name of author>
|
||||||
|
|
||||||
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
|
||||||
@@ -303,16 +303,17 @@ the "copyright" line and a pointer to where the full notice is found.
|
|||||||
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
|
You should have received a copy of the GNU General Public License
|
||||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
along with this program; if not, write to the Free Software
|
||||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
If the program is interactive, make it output a short notice like this
|
If the program is interactive, make it output a short notice like this
|
||||||
when it starts in an interactive mode:
|
when it starts in an interactive mode:
|
||||||
|
|
||||||
Gnomovision version 69, Copyright (C) year name of author
|
Gnomovision version 69, Copyright (C) 19yy name of author
|
||||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
This is free software, and you are welcome to redistribute it
|
This is free software, and you are welcome to redistribute it
|
||||||
under certain conditions; type `show c' for details.
|
under certain conditions; type `show c' for details.
|
||||||
@@ -335,5 +336,5 @@ necessary. Here is a sample; alter the names:
|
|||||||
This General Public License does not permit incorporating your program into
|
This General Public License does not permit incorporating your program into
|
||||||
proprietary programs. If your program is a subroutine library, you may
|
proprietary programs. If your program is a subroutine library, you may
|
||||||
consider it more useful to permit linking proprietary applications with the
|
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
|
library. If this is what you want to do, use the GNU Library General
|
||||||
Public License instead of this License.
|
Public License instead of this License.
|
||||||
@@ -9,7 +9,7 @@ A: The high ports that dnsmasq opens are for replies from the upstream
|
|||||||
from port 53 the replies would be _to_ port 53 and get blocked.
|
from port 53 the replies would be _to_ port 53 and get blocked.
|
||||||
|
|
||||||
This is not a security hole since dnsmasq will only accept replies to that
|
This is not a security hole since dnsmasq will only accept replies to that
|
||||||
port: queries are dropped. The replies must be to outstanding queries
|
port: queries are dropped. The replies must be to oustanding queries
|
||||||
which dnsmasq has forwarded, otherwise they are dropped too.
|
which dnsmasq has forwarded, otherwise they are dropped too.
|
||||||
|
|
||||||
Addendum: dnsmasq now has the option "query-port" (-Q), which allows
|
Addendum: dnsmasq now has the option "query-port" (-Q), which allows
|
||||||
@@ -22,7 +22,7 @@ A: The high ports that dnsmasq opens are for replies from the upstream
|
|||||||
now uses a new, randomly selected, port for each query. The old
|
now uses a new, randomly selected, port for each query. The old
|
||||||
default behaviour (use one port allocated by the OS) is available by
|
default behaviour (use one port allocated by the OS) is available by
|
||||||
setting --query-port=0, and setting the query port to a positive
|
setting --query-port=0, and setting the query port to a positive
|
||||||
value still works. You should think hard and know what you are
|
value is still works. You should think hard and know what you are
|
||||||
doing before using either of these options.
|
doing before using either of these options.
|
||||||
|
|
||||||
Q: Why doesn't dnsmasq support DNS queries over TCP? Don't the RFC's specify
|
Q: Why doesn't dnsmasq support DNS queries over TCP? Don't the RFC's specify
|
||||||
@@ -59,7 +59,7 @@ A: Yes, there is explicit support for *BSD and MacOS X and Solaris.
|
|||||||
|
|
||||||
Q: My company's 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
|
||||||
doesn'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?
|
||||||
|
|
||||||
A: By default, dnsmasq treats all the nameservers it knows about as
|
A: By default, dnsmasq treats all the nameservers it knows about as
|
||||||
@@ -112,7 +112,7 @@ A: Resolver code sometime does strange things when given names without
|
|||||||
hostname will fix things. (ie "ping myhost" fails, but "ping
|
hostname will fix things. (ie "ping myhost" fails, but "ping
|
||||||
myhost." works. The solution is to make sure that all your hosts
|
myhost." works. The solution is to make sure that all your hosts
|
||||||
have a domain set ("domain" in resolv.conf, or set a domain in
|
have a domain set ("domain" in resolv.conf, or set a domain in
|
||||||
your DHCP server, see below for Windows XP and Mac OS X).
|
your DHCP server, see below fr Windows XP and Mac OS X).
|
||||||
Any domain will do, but "localnet" is traditional. Now when you
|
Any domain will do, but "localnet" is traditional. Now when you
|
||||||
resolve "myhost" the resolver will attempt to look up
|
resolve "myhost" the resolver will attempt to look up
|
||||||
"myhost.localnet" so you need to have dnsmasq reply to that name.
|
"myhost.localnet" so you need to have dnsmasq reply to that name.
|
||||||
@@ -144,19 +144,19 @@ Q: Who are Verisign, what do they have to do with the bogus-nxdomain
|
|||||||
option in dnsmasq and why should I wory about it?
|
option in dnsmasq and why should I wory about it?
|
||||||
|
|
||||||
A: [note: this was written in September 2003, things may well change.]
|
A: [note: this was written in September 2003, things may well change.]
|
||||||
Verisign run the .com and .net top-level-domains. They have just
|
Versign run the .com and .net top-level-domains. They have just
|
||||||
changed the configuration of their servers so that unknown .com and
|
changed the configuration of their servers so that unknown .com and
|
||||||
.net domains, instead of returning an error code NXDOMAIN, (no such
|
.net domains, instead of returning an error code NXDOMAIN, (no such
|
||||||
domain) return the address of a host at Verisign which runs a web
|
domain) return the address of a host at Versign which runs a web
|
||||||
server showing a search page. Most right-thinking people regard
|
server showing a search page. Most right-thinking people regard
|
||||||
this new behaviour as broken :-). You can test to see if you are
|
this new behaviour as broken :-). You can test to see if you are
|
||||||
suffering Verisign brokenness by run a command like
|
suffering Versign brokeness by run a command like
|
||||||
|
|
||||||
host jlsdajkdalld.com
|
host jlsdajkdalld.com
|
||||||
|
|
||||||
If you get "jlsdajkdalld.com" does not exist, then all is fine, if
|
If you get "jlsdajkdalld.com" does not exist, then all is fine, if
|
||||||
host returns an IP address, then the DNS is broken. (Try a few
|
host returns an IP address, then the DNS is broken. (Try a few
|
||||||
different unlikely domains, just in case you picked a weird one
|
different unlikely domains, just in case you picked a wierd one
|
||||||
which really _is_ registered.)
|
which really _is_ registered.)
|
||||||
|
|
||||||
Assuming that your DNS is broken, and you want to fix it, simply
|
Assuming that your DNS is broken, and you want to fix it, simply
|
||||||
@@ -180,7 +180,7 @@ A: There are a couple of configuration gotchas which have been
|
|||||||
whilst the ISC one works.
|
whilst the ISC one works.
|
||||||
|
|
||||||
The first thing to check is the broadcast address set for the
|
The first thing to check is the broadcast address set for the
|
||||||
ethernet interface. This is normally the address on the connected
|
ethernet interface. This is normally the adddress on the connected
|
||||||
network with all ones in the host part. For instance if the
|
network with all ones in the host part. For instance if the
|
||||||
address of the ethernet interface is 192.168.55.7 and the netmask
|
address of the ethernet interface is 192.168.55.7 and the netmask
|
||||||
is 255.255.255.0 then the broadcast address should be
|
is 255.255.255.0 then the broadcast address should be
|
||||||
@@ -205,7 +205,7 @@ A: By default, none of the DHCP clients send the host-name when asking
|
|||||||
send with the "hostname" keyword in /etc/network/interfaces. (See
|
send with the "hostname" keyword in /etc/network/interfaces. (See
|
||||||
"man interfaces" for details.) That doesn't work for dhclient, were
|
"man interfaces" for details.) That doesn't work for dhclient, were
|
||||||
you have to add something like "send host-name daisy" to
|
you have to add something like "send host-name daisy" to
|
||||||
/etc/dhclient.conf [Update: the latest dhcpcd packages _do_ send
|
/etc/dhclient.conf [Update: the lastest dhcpcd packages _do_ send
|
||||||
the hostname by default.
|
the hostname by default.
|
||||||
|
|
||||||
Q: I'm network booting my machines, and trying to give them static
|
Q: I'm network booting my machines, and trying to give them static
|
||||||
@@ -236,11 +236,11 @@ Q: What network types are supported by the DHCP server?
|
|||||||
A: Ethernet (and 802.11 wireless) are supported on all platforms. On
|
A: Ethernet (and 802.11 wireless) are supported on all platforms. On
|
||||||
Linux all network types (including FireWire) are supported.
|
Linux all network types (including FireWire) are supported.
|
||||||
|
|
||||||
Q: What are these strange "bind-interfaces" and "bind-dynamic" options?
|
Q: What are these strange "bind-interface" and "bind-dynamic" options?
|
||||||
|
|
||||||
A: Dnsmasq from v2.63 can operate in one of three different "networking
|
A: Dnsmasq from v2.63 can operate in one of three different "networking
|
||||||
modes". This is unfortunate as it requires users configuring dnsmasq
|
modes". This is unfortunate as it requires users configuring dnsmasq
|
||||||
to take into account some rather bizarre constraints and select the
|
to take into account some rather bizzare contraints and select the
|
||||||
mode which best fits the requirements of a particular installation.
|
mode which best fits the requirements of a particular installation.
|
||||||
The origin of these are deficiencies in the Unix networking
|
The origin of these are deficiencies in the Unix networking
|
||||||
model and APIs and each mode has different advantages and
|
model and APIs and each mode has different advantages and
|
||||||
@@ -252,10 +252,10 @@ A: Dnsmasq from v2.63 can operate in one of three different "networking
|
|||||||
The three modes are "wildcard", "bind-interfaces" and "bind-dynamic".
|
The three modes are "wildcard", "bind-interfaces" and "bind-dynamic".
|
||||||
|
|
||||||
In "wildcard" mode, dnsmasq binds the wildcard IP address (0.0.0.0 or
|
In "wildcard" mode, dnsmasq binds the wildcard IP address (0.0.0.0 or
|
||||||
::). This allows it to receive all the packets sent to the server on
|
::). This allows it to recieve all the packets sent to the server on
|
||||||
the relevant port. Access control (--interface, --except-interface,
|
the relevant port. Access control (--interface, --except-interface,
|
||||||
--listen-address, etc) is implemented by dnsmasq: it queries the
|
--listen-address, etc) is implemented by dnsmasq: it queries the
|
||||||
kernel to determine the interface on which a packet was received and
|
kernel to determine the interface on which a packet was recieved and
|
||||||
the address to which it was sent, and applies the configured
|
the address to which it was sent, and applies the configured
|
||||||
rules. Wildcard mode is the default if neither of the other modes are
|
rules. Wildcard mode is the default if neither of the other modes are
|
||||||
specified.
|
specified.
|
||||||
@@ -276,7 +276,7 @@ A: Dnsmasq from v2.63 can operate in one of three different "networking
|
|||||||
The mode chosen has four different effects: co-existence with other
|
The mode chosen has four different effects: co-existence with other
|
||||||
servers, semantics of --interface access control, effect of new
|
servers, semantics of --interface access control, effect of new
|
||||||
interfaces, and legality of --interface specifications for
|
interfaces, and legality of --interface specifications for
|
||||||
non-existent interfaces. We will deal with these in order.
|
non-existent inferfaces. We will deal with these in order.
|
||||||
|
|
||||||
A dnsmasq instance running in wildcard mode precludes a machine from
|
A dnsmasq instance running in wildcard mode precludes a machine from
|
||||||
running a second instance of dnsmasq or any other DNS, TFTP or DHCP
|
running a second instance of dnsmasq or any other DNS, TFTP or DHCP
|
||||||
@@ -297,7 +297,7 @@ A: Dnsmasq from v2.63 can operate in one of three different "networking
|
|||||||
by dnsmasq when in --bind-interfaces mode. In wildcard or bind-dynamic
|
by dnsmasq when in --bind-interfaces mode. In wildcard or bind-dynamic
|
||||||
mode, such interfaces are handled normally.
|
mode, such interfaces are handled normally.
|
||||||
|
|
||||||
An --interface specification for a non-existent interface is a fatal
|
A --interface specification for a non-existent interface is a fatal
|
||||||
error at start-up when in --bind-interfaces mode, by just generates a
|
error at start-up when in --bind-interfaces mode, by just generates a
|
||||||
warning in wildcard or bind-dynamic mode.
|
warning in wildcard or bind-dynamic mode.
|
||||||
|
|
||||||
@@ -313,25 +313,15 @@ Q: Can I get email notification when a new version of dnsmasq is
|
|||||||
released?
|
released?
|
||||||
|
|
||||||
A: Yes, new releases of dnsmasq are always announced through
|
A: Yes, new releases of dnsmasq are always announced through
|
||||||
freshmeat.net, and they allow you to subscribe to email alerts when
|
freshmeat.net, and they allow you to subcribe to email alerts when
|
||||||
new versions of particular projects are released. New releases are
|
new versions of particular projects are released. New releases are
|
||||||
also announced in the dnsmasq-discuss mailing list, subscribe at
|
also announced in the dnsmasq-discuss mailing list, subscribe at
|
||||||
http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss
|
http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss
|
||||||
|
|
||||||
Q: What does the dhcp-authoritative option do?
|
Q: What does the dhcp-authoritative option do?
|
||||||
|
|
||||||
A: The DHCP spec says that when a DHCP server receives a renewal request
|
A: See http://www.isc.org/files/auth.html - that's
|
||||||
from a client it has no knowledge of, it should just ignore it.
|
for the ISC daemon, but the same applies to dnsmasq.
|
||||||
This is because it's supported to have more than one DHCP server
|
|
||||||
on a network, and another DHCP server may be dealing with the client.
|
|
||||||
This has the unfortunate effect that when _no_ DHCP replies to
|
|
||||||
the client, it takes some time for the client to time-out and start
|
|
||||||
to get a new lease. Setting this option makes dnsmasq violate the
|
|
||||||
standard to the extent that it will send a NAK reply to the client,
|
|
||||||
causing it to immediately start to get a new lease. This improves
|
|
||||||
behaviour when machines move networks, and in the case that the DHCP
|
|
||||||
lease database is lost. As long as there are not more tha one DHCP
|
|
||||||
server on the network, it's safe to enable the option.
|
|
||||||
|
|
||||||
Q: Why does my Gentoo box pause for a minute before getting a new
|
Q: Why does my Gentoo box pause for a minute before getting a new
|
||||||
lease?
|
lease?
|
||||||
@@ -359,64 +349,18 @@ A: By default, the identity of a machine is determined by using the
|
|||||||
method for setting the client-id varies with DHCP client software,
|
method for setting the client-id varies with DHCP client software,
|
||||||
dhcpcd uses the "-I" flag. Windows uses a registry setting,
|
dhcpcd uses the "-I" flag. Windows uses a registry setting,
|
||||||
see http://www.jsiinc.com/SUBF/TIP2800/rh2845.htm
|
see http://www.jsiinc.com/SUBF/TIP2800/rh2845.htm
|
||||||
|
|
||||||
Addendum:
|
Addendum:
|
||||||
From version 2.46, dnsmasq has a solution to this which doesn't
|
From version 2.46, dnsmasq has a solution to this which doesn't
|
||||||
involve setting client-IDs. It's possible to put more than one MAC
|
involve setting client-IDs. It's possible to put more than one MAC
|
||||||
address in a --dhcp-host configuration. This tells dnsmasq that it
|
address in a --dhcp-host configuration. This tells dnsmasq that it
|
||||||
should use the specified IP for any of the specified MAC addresses,
|
should use the specified IP for any of the specified MAC addresses,
|
||||||
and furthermore it gives dnsmasq permission to summarily abandon a
|
and furthermore it gives dnsmasq permission to sumarily abandon a
|
||||||
lease to one of the MAC addresses if another one comes along. Note
|
lease to one of the MAC addresses if another one comes along. Note
|
||||||
that this will work fine only as longer as only one interface is
|
that this will work fine only as longer as only one interface is
|
||||||
up at any time. There is no way for dnsmasq to enforce this
|
up at any time. There is no way for dnsmasq to enforce this
|
||||||
constraint: if you configure multiple MAC addresses and violate
|
constraint: if you configure multiple MAC addresses and violate
|
||||||
this rule, bad things will happen.
|
this rule, bad things will happen.
|
||||||
|
|
||||||
Addendum-II: The link above is dead, the former contents of the link are:
|
|
||||||
|
|
||||||
------------------------------------------------------------------------------
|
|
||||||
How can I keep the same DHCP client reservation, if the MAC address changes?
|
|
||||||
|
|
||||||
When you reserve an IP address for a DHCP client, you provide the
|
|
||||||
MAC address of the client's NIC.
|
|
||||||
|
|
||||||
It is possible to use a custom identifier, which is sent as
|
|
||||||
option 61 in the client's DHCP Discover and Request packet.
|
|
||||||
|
|
||||||
The DhcpClientIdentifier is a REG_DWORD value that is located at:
|
|
||||||
|
|
||||||
Windows NT 4.0 SP2+
|
|
||||||
|
|
||||||
HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\<Adapter Name>'X'\Parameters\Tcpip
|
|
||||||
|
|
||||||
where <Adapter Name> is the NIC driver name and 'X' is the number of the NIC.
|
|
||||||
|
|
||||||
Windows 2000
|
|
||||||
|
|
||||||
HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\TcpIp\Parameters\Interfaces\<NIC GUID>
|
|
||||||
|
|
||||||
where <NIC GUID> is the GUID of the NIC.
|
|
||||||
|
|
||||||
The valid range of data is 0x0 - 0xFFFFFFFF. The custom identifier is send as 4 bytes,
|
|
||||||
8 hexadecimal character, in groups of 2 hexadecimal characters, with the groups being
|
|
||||||
sent in reverse order. If the custom identifier is less than 8 hexadeciaml characters,
|
|
||||||
it is zero padded at the end. Examples:
|
|
||||||
|
|
||||||
Custom Client Client Reservation
|
|
||||||
Identifier on DHCP Server
|
|
||||||
12345678 78563412
|
|
||||||
123456 56341200
|
|
||||||
1234 34120000
|
|
||||||
1234567 67452301
|
|
||||||
12345 45230100
|
|
||||||
123 23010000
|
|
||||||
A18F42 428FA100
|
|
||||||
CF432 32F40C00
|
|
||||||
C32D1BE BED1320C
|
|
||||||
|
|
||||||
-------------------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
Q: Can dnsmasq do DHCP on IP-alias interfaces?
|
Q: Can dnsmasq do DHCP on IP-alias interfaces?
|
||||||
|
|
||||||
A: Yes, from version-2.21. The support is only available running under
|
A: Yes, from version-2.21. The support is only available running under
|
||||||
@@ -544,7 +488,7 @@ Q: DHCP doesn't work with windows 7 but everything else is fine.
|
|||||||
|
|
||||||
A: There seems to be a problem if Windows 7 doesn't get a value for
|
A: There seems to be a problem if Windows 7 doesn't get a value for
|
||||||
DHCP option 252 in DHCP packets it gets from the server. The
|
DHCP option 252 in DHCP packets it gets from the server. The
|
||||||
symptoms have been variously reported as continual DHCPINFORM
|
symtoms have beeen variously reported as continual DHCPINFORM
|
||||||
requests in an attempt to get an option-252, or even ignoring DHCP
|
requests in an attempt to get an option-252, or even ignoring DHCP
|
||||||
offers completely (and failing to get an IP address) if there is no
|
offers completely (and failing to get an IP address) if there is no
|
||||||
option-252 supplied. DHCP option 252 is for WPAD, WWW Proxy
|
option-252 supplied. DHCP option 252 is for WPAD, WWW Proxy
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# dnsmasq is Copyright (c) 2000-2024 Simon Kelley
|
# dnsmasq is Copyright (c) 2000-2012 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
|
||||||
@@ -51,65 +51,41 @@ top!=pwd
|
|||||||
# GNU make way.
|
# GNU make way.
|
||||||
top?=$(CURDIR)
|
top?=$(CURDIR)
|
||||||
|
|
||||||
dbus_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --cflags dbus-1`
|
dbus_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --cflags dbus-1`
|
||||||
dbus_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --libs dbus-1`
|
dbus_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --libs dbus-1`
|
||||||
ubus_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_UBUS "" --copy '-lubox -lubus'`
|
idn_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --cflags libidn`
|
||||||
idn_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --cflags libidn`
|
idn_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn`
|
||||||
idn_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn`
|
ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
|
||||||
idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --cflags libidn2`
|
ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
|
||||||
idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2`
|
lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1`
|
||||||
ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
|
lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1`
|
||||||
ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
|
sunos_libs = `if uname | grep SunOS >/dev/null 2>&1; then echo -lsocket -lnsl -lposix4; fi`
|
||||||
lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.4`
|
version = -DVERSION='\"`$(top)/bld/get-version $(top)`\"'
|
||||||
lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.4`
|
|
||||||
nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags 'nettle hogweed' \
|
|
||||||
HAVE_CRYPTOHASH $(PKG_CONFIG) --cflags nettle \
|
|
||||||
HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle`
|
|
||||||
nettle_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs 'nettle hogweed' \
|
|
||||||
HAVE_CRYPTOHASH $(PKG_CONFIG) --libs nettle \
|
|
||||||
HAVE_NETTLEHASH $(PKG_CONFIG) --libs nettle`
|
|
||||||
gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp`
|
|
||||||
sunos_libs = `if uname | grep SunOS >/dev/null 2>&1; then echo -lsocket -lnsl -lposix4; fi`
|
|
||||||
nft_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_NFTSET $(PKG_CONFIG) --cflags libnftables`
|
|
||||||
nft_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_NFTSET $(PKG_CONFIG) --libs libnftables`
|
|
||||||
version = -DVERSION='\"`$(top)/bld/get-version $(top)`\"'
|
|
||||||
|
|
||||||
sum?=$(shell $(CC) -DDNSMASQ_COMPILE_OPTS $(COPTS) -E $(top)/$(SRC)/dnsmasq.h | ( md5sum 2>/dev/null || md5 ) | cut -f 1 -d ' ')
|
|
||||||
sum!=$(CC) -DDNSMASQ_COMPILE_OPTS $(COPTS) -E $(top)/$(SRC)/dnsmasq.h | ( md5sum 2>/dev/null || md5 ) | cut -f 1 -d ' '
|
|
||||||
copts_conf = .copts_$(sum)
|
|
||||||
|
|
||||||
objs = cache.o rfc1035.o util.o option.o forward.o network.o \
|
objs = cache.o rfc1035.o util.o option.o forward.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 conntrack.o dhcp6.o rfc3315.o \
|
helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \
|
||||||
dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o pattern.o \
|
dhcp-common.o outpacket.o radv.o slaac.o
|
||||||
domain.o dnssec.o blockdata.o tables.o loop.o inotify.o \
|
|
||||||
poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o \
|
|
||||||
metrics.o hash-questions.o domain-match.o nftset.o
|
|
||||||
|
|
||||||
hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
|
hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
|
||||||
dns-protocol.h radv-protocol.h ip6addr.h metrics.h
|
dns-protocol.h radv-protocol.h
|
||||||
|
|
||||||
all : $(BUILDDIR)
|
all : $(BUILDDIR)
|
||||||
@cd $(BUILDDIR) && $(MAKE) \
|
@cd $(BUILDDIR) && $(MAKE) \
|
||||||
top="$(top)" \
|
top="$(top)" \
|
||||||
build_cflags="$(version) $(dbus_cflags) $(idn2_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags) $(nettle_cflags) $(nft_cflags)" \
|
build_cflags="$(version) $(dbus_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags)" \
|
||||||
build_libs="$(dbus_libs) $(idn2_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs) $(ubus_libs) $(nft_libs)" \
|
build_libs="$(dbus_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs)" \
|
||||||
-f $(top)/Makefile dnsmasq
|
-f $(top)/Makefile dnsmasq
|
||||||
|
|
||||||
mostly_clean :
|
clean :
|
||||||
rm -f $(BUILDDIR)/*.mo $(BUILDDIR)/*.pot
|
rm -f *~ $(BUILDDIR)/*.mo contrib/*/*~ */*~ $(BUILDDIR)/*.pot
|
||||||
rm -f $(BUILDDIR)/.copts_* $(BUILDDIR)/*.o $(BUILDDIR)/dnsmasq.a $(BUILDDIR)/dnsmasq
|
rm -f $(BUILDDIR)/.configured $(BUILDDIR)/*.o $(BUILDDIR)/dnsmasq.a $(BUILDDIR)/dnsmasq
|
||||||
|
rm -rf core */core
|
||||||
clean : mostly_clean
|
|
||||||
rm -f $(BUILDDIR)/dnsmasq_baseline
|
|
||||||
rm -f core */core
|
|
||||||
rm -f *~ contrib/*/*~ */*~
|
|
||||||
|
|
||||||
install : all install-common
|
install : all install-common
|
||||||
|
|
||||||
install-common :
|
install-common :
|
||||||
$(INSTALL) -d $(DESTDIR)$(BINDIR)
|
$(INSTALL) -d $(DESTDIR)$(BINDIR) -d $(DESTDIR)$(MANDIR)/man8
|
||||||
$(INSTALL) -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 $(BUILDDIR)/dnsmasq $(DESTDIR)$(BINDIR)
|
$(INSTALL) -m 755 $(BUILDDIR)/dnsmasq $(DESTDIR)$(BINDIR)
|
||||||
|
|
||||||
@@ -117,8 +93,8 @@ all-i18n : $(BUILDDIR)
|
|||||||
@cd $(BUILDDIR) && $(MAKE) \
|
@cd $(BUILDDIR) && $(MAKE) \
|
||||||
top="$(top)" \
|
top="$(top)" \
|
||||||
i18n=-DLOCALEDIR=\'\"$(LOCALEDIR)\"\' \
|
i18n=-DLOCALEDIR=\'\"$(LOCALEDIR)\"\' \
|
||||||
build_cflags="$(version) $(dbus_cflags) $(idn2_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags) $(nettle_cflags) $(nft_cflags)" \
|
build_cflags="$(version) $(dbus_cflags) $(ct_cflags) $(lua_cflags) `$(PKG_CONFIG) --cflags libidn`" \
|
||||||
build_libs="$(dbus_libs) $(idn2_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs) $(ubus_libs) $(nft_libs)" \
|
build_libs="$(dbus_libs) $(ct_libs) $(lua_libs) $(sunos_libs) `$(PKG_CONFIG) --libs libidn`" \
|
||||||
-f $(top)/Makefile dnsmasq
|
-f $(top)/Makefile dnsmasq
|
||||||
for f in `cd $(PO); echo *.po`; do \
|
for f in `cd $(PO); echo *.po`; do \
|
||||||
cd $(top) && cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile $${f%.po}.mo; \
|
cd $(top) && cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile $${f%.po}.mo; \
|
||||||
@@ -129,45 +105,28 @@ install-i18n : all-i18n install-common
|
|||||||
cd $(MAN); ../bld/install-man $(DESTDIR)$(MANDIR) $(INSTALL)
|
cd $(MAN); ../bld/install-man $(DESTDIR)$(MANDIR) $(INSTALL)
|
||||||
|
|
||||||
merge :
|
merge :
|
||||||
@cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile dnsmasq.pot
|
@cd $(BUILDDIR) && $(MAKE) -f $(top)/Makefile dnsmasq.pot
|
||||||
for f in `cd $(PO); echo *.po`; do \
|
for f in `cd $(PO); echo *.po`; do \
|
||||||
echo -n msgmerge $(PO)/$$f && $(MSGMERGE) --no-wrap -U $(PO)/$$f $(BUILDDIR)/dnsmasq.pot; \
|
echo -n msgmerge $(PO)/$$f && $(MSGMERGE) --no-wrap -U $(PO)/$$f $(BUILDDIR)/dnsmasq.pot; \
|
||||||
done
|
done
|
||||||
|
|
||||||
# Canonicalise .po file.
|
|
||||||
%.po :
|
|
||||||
@cd $(BUILDDIR) && $(MAKE) -f $(top)/Makefile dnsmasq.pot
|
|
||||||
mv $(PO)/$*.po $(PO)/$*.po.orig && $(MSGMERGE) --no-wrap $(PO)/$*.po.orig $(BUILDDIR)/dnsmasq.pot >$(PO)/$*.po;
|
|
||||||
|
|
||||||
$(BUILDDIR):
|
$(BUILDDIR):
|
||||||
mkdir -p $(BUILDDIR)
|
mkdir -p $(BUILDDIR)
|
||||||
|
|
||||||
# rules below are helpers for size tracking
|
|
||||||
|
|
||||||
baseline : mostly_clean all
|
# rules below are targets in recusive makes with cwd=$(BUILDDIR)
|
||||||
@cd $(BUILDDIR) && \
|
|
||||||
mv dnsmasq dnsmasq_baseline
|
|
||||||
|
|
||||||
bloatcheck : $(BUILDDIR)/dnsmasq_baseline mostly_clean all
|
.configured: $(hdrs)
|
||||||
@cd $(BUILDDIR) && \
|
@rm -f *.o
|
||||||
$(top)/bld/bloat-o-meter dnsmasq_baseline dnsmasq; \
|
|
||||||
size dnsmasq_baseline dnsmasq
|
|
||||||
|
|
||||||
# rules below are targets in recursive makes with cwd=$(BUILDDIR)
|
|
||||||
|
|
||||||
$(copts_conf): $(hdrs)
|
|
||||||
@rm -f *.o .copts_*
|
|
||||||
@touch $@
|
@touch $@
|
||||||
|
|
||||||
$(objs:.o=.c) $(hdrs):
|
$(objs:.o=.c) $(hdrs):
|
||||||
ln -s $(top)/$(SRC)/$@ .
|
ln -s $(top)/$(SRC)/$@ .
|
||||||
|
|
||||||
$(objs): $(copts_conf) $(hdrs)
|
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
$(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $<
|
$(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $<
|
||||||
|
|
||||||
dnsmasq : $(objs)
|
dnsmasq : .configured $(hdrs) $(objs)
|
||||||
$(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS)
|
$(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS)
|
||||||
|
|
||||||
dnsmasq.pot : $(objs:.o=.c) $(hdrs)
|
dnsmasq.pot : $(objs:.o=.c) $(hdrs)
|
||||||
@@ -176,4 +135,5 @@ dnsmasq.pot : $(objs:.o=.c) $(hdrs)
|
|||||||
%.mo : $(top)/$(PO)/%.po dnsmasq.pot
|
%.mo : $(top)/$(PO)/%.po dnsmasq.pot
|
||||||
$(MSGMERGE) -o - $(top)/$(PO)/$*.po dnsmasq.pot | $(MSGFMT) -o $*.mo -
|
$(MSGMERGE) -o - $(top)/$(PO)/$*.po dnsmasq.pot | $(MSGFMT) -o $*.mo -
|
||||||
|
|
||||||
.PHONY : all clean mostly_clean install install-common all-i18n install-i18n merge baseline bloatcheck
|
|
||||||
|
.PHONY : all clean install install-common all-i18n install-i18n merge
|
||||||
+1
-5
@@ -8,11 +8,7 @@ LOCAL_SRC_FILES := bpf.c cache.c dbus.c dhcp.c dnsmasq.c \
|
|||||||
netlink.c network.c option.c rfc1035.c \
|
netlink.c network.c option.c rfc1035.c \
|
||||||
rfc2131.c tftp.c util.c conntrack.c \
|
rfc2131.c tftp.c util.c conntrack.c \
|
||||||
dhcp6.c rfc3315.c dhcp-common.c outpacket.c \
|
dhcp6.c rfc3315.c dhcp-common.c outpacket.c \
|
||||||
radv.c slaac.c auth.c ipset.c domain.c \
|
radv.c slaac.c
|
||||||
dnssec.c dnssec-openssl.c blockdata.c tables.c \
|
|
||||||
loop.c inotify.c poll.c rrfilter.c edns0.c arp.c \
|
|
||||||
crypto.c dump.c ubus.c metrics.c hash-questions.c \
|
|
||||||
domain-match.c
|
|
||||||
|
|
||||||
LOCAL_MODULE := dnsmasq
|
LOCAL_MODULE := dnsmasq
|
||||||
|
|
||||||
|
|||||||
@@ -1,130 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
#
|
|
||||||
# Copyright 2004 Matt Mackall <mpm@selenic.com>
|
|
||||||
#
|
|
||||||
# Inspired by perl Bloat-O-Meter (c) 1997 by Andi Kleen
|
|
||||||
#
|
|
||||||
# This software may be used and distributed according to the terms
|
|
||||||
# of the GNU General Public License, incorporated herein by reference.
|
|
||||||
|
|
||||||
import sys, os#, re
|
|
||||||
|
|
||||||
def usage():
|
|
||||||
sys.stderr.write("usage: %s [-t] file1 file2\n" % sys.argv[0])
|
|
||||||
sys.exit(-1)
|
|
||||||
|
|
||||||
f1, f2 = (None, None)
|
|
||||||
flag_timing, dashes = (False, False)
|
|
||||||
|
|
||||||
for f in sys.argv[1:]:
|
|
||||||
if f.startswith("-"):
|
|
||||||
if f == "--": # sym_args
|
|
||||||
dashes = True
|
|
||||||
break
|
|
||||||
if f == "-t": # timings
|
|
||||||
flag_timing = True
|
|
||||||
else:
|
|
||||||
if not os.path.exists(f):
|
|
||||||
sys.stderr.write("Error: file '%s' does not exist\n" % f)
|
|
||||||
usage()
|
|
||||||
if f1 is None:
|
|
||||||
f1 = f
|
|
||||||
elif f2 is None:
|
|
||||||
f2 = f
|
|
||||||
if flag_timing:
|
|
||||||
import time
|
|
||||||
if f1 is None or f2 is None:
|
|
||||||
usage()
|
|
||||||
|
|
||||||
sym_args = " ".join(sys.argv[3 + flag_timing + dashes:])
|
|
||||||
def getsizes(file):
|
|
||||||
sym, alias, lut = {}, {}, {}
|
|
||||||
for l in os.popen("readelf -W -s %s %s" % (sym_args, file)).readlines():
|
|
||||||
l = l.strip()
|
|
||||||
if not (len(l) and l[0].isdigit() and len(l.split()) == 8):
|
|
||||||
continue
|
|
||||||
num, value, size, typ, bind, vis, ndx, name = l.split()
|
|
||||||
if ndx == "UND": continue # skip undefined
|
|
||||||
if typ in ["SECTION", "FILES"]: continue # skip sections and files
|
|
||||||
if "." in name: name = "static." + name.split(".")[0]
|
|
||||||
value = int(value, 16)
|
|
||||||
size = int(size, 16) if size.startswith('0x') else int(size)
|
|
||||||
if vis != "DEFAULT" and bind != "GLOBAL": # see if it is an alias
|
|
||||||
alias[(value, size)] = {"name" : name}
|
|
||||||
else:
|
|
||||||
sym[name] = {"addr" : value, "size": size}
|
|
||||||
lut[(value, size)] = 0
|
|
||||||
for addr, sz in iter(alias.keys()):
|
|
||||||
# If the non-GLOBAL sym has an implementation elsewhere then
|
|
||||||
# it's an alias, disregard it.
|
|
||||||
if not (addr, sz) in lut:
|
|
||||||
# If this non-GLOBAL sym does not have an implementation at
|
|
||||||
# another address, then treat it as a normal symbol.
|
|
||||||
sym[alias[(addr, sz)]["name"]] = {"addr" : addr, "size": sz}
|
|
||||||
for l in os.popen("readelf -W -S " + file).readlines():
|
|
||||||
x = l.split()
|
|
||||||
if len(x)<6: continue
|
|
||||||
# Should take these into account too!
|
|
||||||
#if x[1] not in [".text", ".rodata", ".symtab", ".strtab"]: continue
|
|
||||||
if x[1] not in [".rodata"]: continue
|
|
||||||
sym[x[1]] = {"addr" : int(x[3], 16), "size" : int(x[5], 16)}
|
|
||||||
return sym
|
|
||||||
|
|
||||||
if flag_timing:
|
|
||||||
start_t1 = int(time.time() * 1e9)
|
|
||||||
old = getsizes(f1)
|
|
||||||
if flag_timing:
|
|
||||||
end_t1 = int(time.time() * 1e9)
|
|
||||||
start_t2 = int(time.time() * 1e9)
|
|
||||||
new = getsizes(f2)
|
|
||||||
if flag_timing:
|
|
||||||
end_t2 = int(time.time() * 1e9)
|
|
||||||
start_t3 = int(time.time() * 1e9)
|
|
||||||
grow, shrink, add, remove, up, down = 0, 0, 0, 0, 0, 0
|
|
||||||
delta, common = [], {}
|
|
||||||
|
|
||||||
for name in iter(old.keys()):
|
|
||||||
if name in new:
|
|
||||||
common[name] = 1
|
|
||||||
|
|
||||||
for name in old:
|
|
||||||
if name not in common:
|
|
||||||
remove += 1
|
|
||||||
sz = old[name]["size"]
|
|
||||||
down += sz
|
|
||||||
delta.append((-sz, name))
|
|
||||||
|
|
||||||
for name in new:
|
|
||||||
if name not in common:
|
|
||||||
add += 1
|
|
||||||
sz = new[name]["size"]
|
|
||||||
up += sz
|
|
||||||
delta.append((sz, name))
|
|
||||||
|
|
||||||
for name in common:
|
|
||||||
d = new[name].get("size", 0) - old[name].get("size", 0)
|
|
||||||
if d>0: grow, up = grow+1, up+d
|
|
||||||
elif d<0: shrink, down = shrink+1, down-d
|
|
||||||
else:
|
|
||||||
continue
|
|
||||||
delta.append((d, name))
|
|
||||||
|
|
||||||
delta.sort()
|
|
||||||
delta.reverse()
|
|
||||||
if flag_timing:
|
|
||||||
end_t3 = int(time.time() * 1e9)
|
|
||||||
|
|
||||||
print("%-48s %7s %7s %+7s" % ("function", "old", "new", "delta"))
|
|
||||||
for d, n in delta:
|
|
||||||
if d:
|
|
||||||
old_sz = old.get(n, {}).get("size", "-")
|
|
||||||
new_sz = new.get(n, {}).get("size", "-")
|
|
||||||
print("%-48s %7s %7s %+7d" % (n, old_sz, new_sz, d))
|
|
||||||
print("-"*78)
|
|
||||||
total="(add/remove: %s/%s grow/shrink: %s/%s up/down: %s/%s)%%sTotal: %s bytes"\
|
|
||||||
% (add, remove, grow, shrink, up, -down, up-down)
|
|
||||||
print(total % (" "*(80-len(total))))
|
|
||||||
if flag_timing:
|
|
||||||
print("\n%d/%d; %d Parse origin/new; processing nsecs" %
|
|
||||||
(end_t1-start_t1, end_t2-start_t2, end_t3-start_t3))
|
|
||||||
print("total nsecs: %d" % (end_t3-start_t1))
|
|
||||||
+5
-16
@@ -9,29 +9,18 @@
|
|||||||
# If we can find one which matches $v[0-9].* then we assume it's
|
# If we can find one which matches $v[0-9].* then we assume it's
|
||||||
# a version-number tag, else we just use the whole string.
|
# a version-number tag, else we just use the whole string.
|
||||||
# If there is more than one v[0-9].* tag, sort them and use the
|
# If there is more than one v[0-9].* tag, sort them and use the
|
||||||
# first. The insane arguments to the sort command are to ensure
|
# first. This favours, eg v2.63 over 2.63rc6.
|
||||||
# that, eg v2.64 comes before v2.63, but v2.63 comes before v2.63rc1
|
|
||||||
# and v2.63rc1 comes before v2.63test1
|
|
||||||
|
|
||||||
|
if which git >/dev/null 2>&1 && [ -d $1/.git ]; then
|
||||||
# Change directory to the toplevel source directory.
|
cd $1; git describe
|
||||||
if test -z "$1" || ! test -d "$1" || ! cd "$1"; then
|
|
||||||
echo "$0: First argument $1 must be toplevel dir." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if which git >/dev/null 2>&1 && \
|
|
||||||
([ -d .git ] || grep '^gitdir:' .git >/dev/null 2>&1) && \
|
|
||||||
git describe >/dev/null 2>&1; then
|
|
||||||
git describe | sed 's/^v//'
|
|
||||||
elif grep '\$Format:%d\$' $1/VERSION >/dev/null 2>&1; then
|
elif grep '\$Format:%d\$' $1/VERSION >/dev/null 2>&1; then
|
||||||
# unsubstituted VERSION, but no git available.
|
# unsubstituted VERSION, but no git available.
|
||||||
echo UNKNOWN
|
echo UNKNOWN
|
||||||
else
|
else
|
||||||
vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]`
|
vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]`
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo "${vers}" | sort -k1.2,1.5Vr -k1.6,1.6 -k1.8,1.9Vr -k1.10,1.11Vr | head -n 1 | sed 's/^v//'
|
echo "${vers}" | sort | head -n 1 | sed 's/^v//'
|
||||||
else
|
else
|
||||||
cat $1/VERSION
|
cat $1/VERSION
|
||||||
fi
|
fi
|
||||||
|
|||||||
+6
-40
@@ -1,45 +1,11 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
in=`cat`
|
search=$1
|
||||||
|
shift
|
||||||
|
|
||||||
search()
|
if grep "^\#[[:space:]]*define[[:space:]]*$search" config.h >/dev/null 2>&1 || \
|
||||||
{
|
grep $search >/dev/null 2>&1; then
|
||||||
grep "^\#[[:space:]]*define[[:space:]]*$1" config.h >/dev/null 2>&1 || \
|
exec $*
|
||||||
echo $in | grep $1 >/dev/null 2>&1
|
|
||||||
}
|
|
||||||
|
|
||||||
while [ "$#" -gt 0 ]; do
|
|
||||||
search=$1
|
|
||||||
pkg=$2
|
|
||||||
op=$3
|
|
||||||
lib=$4
|
|
||||||
shift 4
|
|
||||||
if search "$search"; then
|
|
||||||
|
|
||||||
# Nasty, nasty, in --copy, arg 2 (if non-empty) is another config to search for, used with NO_GMP
|
|
||||||
if [ $op = "--copy" ]; then
|
|
||||||
if [ -z "$pkg" ]; then
|
|
||||||
pkg="$lib"
|
|
||||||
elif search "$pkg"; then
|
|
||||||
pkg=""
|
|
||||||
else
|
|
||||||
pkg="$lib"
|
|
||||||
fi
|
|
||||||
elif search "${search}_STATIC"; then
|
|
||||||
pkg=`$pkg --static $op $lib`
|
|
||||||
else
|
|
||||||
pkg=`$pkg $op $lib`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if search "${search}_STATIC"; then
|
|
||||||
if [ $op = "--libs" ] || [ $op = "--copy" ]; then
|
|
||||||
echo "-Wl,-Bstatic $pkg -Wl,-Bdynamic"
|
|
||||||
else
|
|
||||||
echo "$pkg"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "$pkg"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
done
|
|
||||||
@@ -22,7 +22,7 @@ sudo chmod 644 /Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist
|
|||||||
|
|
||||||
Optionally, edit your dnsmasq configuration file to your liking.
|
Optionally, edit your dnsmasq configuration file to your liking.
|
||||||
|
|
||||||
To start the launchd job, which starts dnsmasq, reboot or use the command:
|
To start the launchd job, which starts dnsmaq, reboot or use the command:
|
||||||
sudo launchctl load /Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist
|
sudo launchctl load /Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist
|
||||||
|
|
||||||
To stop the launchd job, which stops dnsmasq, use the command:
|
To stop the launchd job, which stops dnsmasq, use the command:
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
This packaging is now unmaintained in the dnsmasq source: dnsmasq is
|
||||||
|
included in Suse proper, and up-to-date packages are now available
|
||||||
|
from
|
||||||
|
|
||||||
|
ftp://ftp.suse.com/pub/people/ug/
|
||||||
|
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
This is a patch against SuSEfirewall2-3.1-206 (SuSE 9.x and older)
|
||||||
|
It fixes the depancy from the dns daemon name 'named'
|
||||||
|
After appending the patch, the SuSEfirewall is again able to autodetect
|
||||||
|
the dnsmasq named service.
|
||||||
|
This is a very old bug in the SuSEfirewall script.
|
||||||
|
The SuSE people think the name of the dns server will allways 'named'
|
||||||
|
|
||||||
|
|
||||||
|
--- /sbin/SuSEfirewall2.orig 2004-01-23 13:30:09.000000000 +0100
|
||||||
|
+++ /sbin/SuSEfirewall2 2004-01-23 13:31:56.000000000 +0100
|
||||||
|
@@ -764,7 +764,7 @@
|
||||||
|
echo 'FW_ALLOW_INCOMING_HIGHPORTS_UDP should be set to yes, if you are running a DNS server!'
|
||||||
|
|
||||||
|
test "$FW_SERVICE_AUTODETECT" = yes -o "$FW_SERVICE_AUTODETECT" = dmz -o "$FW_SERVICE_AUTODETECT" = ext && {
|
||||||
|
- test "$FW_SERVICE_DNS" = no -a '!' "$START_NAMED" = no && check_srv named && {
|
||||||
|
+ test "$FW_SERVICE_DNS" = no -a '!' "$START_NAMED" = no && check_srv dnsmasq && {
|
||||||
|
echo -e 'Warning: detected activated named, enabling FW_SERVICE_DNS!
|
||||||
|
You still have to allow tcp/udp port 53 on internal, dmz and/or external.'
|
||||||
|
FW_SERVICE_DNS=$FW_SERVICE_AUTODETECT
|
||||||
|
@@ -878,7 +878,7 @@
|
||||||
|
test -e /etc/resolv.conf || echo "Warning: /etc/resolv.conf not found"
|
||||||
|
# Get ports/IP bindings of NAMED/SQUID
|
||||||
|
test "$FW_SERVICE_DNS" = yes -o "$FW_SERVICE_DNS" = dmz -o "$FW_SERVICE_DNS" = ext -o "$START_NAMED" = yes && DNS_PORT=`$LSOF -i -n -P | \
|
||||||
|
- $AWK -F: '/^named .* UDP / {print $2}'| $GREP -vw 53 | $SORT -un`
|
||||||
|
+ $AWK -F: '/^dnsmasq .* UDP / {print $2}'| $GREP -vw 53 | $SORT -un`
|
||||||
|
test "$FW_SERVICE_SQUID" = yes -o "$FW_SERVICE_SQUID" = dmz -o "$FW_SERVICE_SQUID" = ext -o "$START_SQUID" = yes && SQUID_PORT=`$LSOF -i -n -P | \
|
||||||
|
$AWK -F: '/^squid .* UDP/ {print $2}'| $SORT -un`
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
--- man/dnsmasq.8 2004-08-08 20:57:56.000000000 +0200
|
||||||
|
+++ man/dnsmasq.8 2004-08-12 00:40:01.000000000 +0200
|
||||||
|
@@ -69,7 +69,7 @@
|
||||||
|
.TP
|
||||||
|
.B \-g, --group=<groupname>
|
||||||
|
Specify the group which dnsmasq will run
|
||||||
|
-as. The defaults to "dip", if available, to facilitate access to
|
||||||
|
+as. The defaults to "dialout", if available, to facilitate access to
|
||||||
|
/etc/ppp/resolv.conf which is not normally world readable.
|
||||||
|
.TP
|
||||||
|
.B \-v, --version
|
||||||
|
--- src/config.h 2004-08-11 11:39:18.000000000 +0200
|
||||||
|
+++ src/config.h 2004-08-12 00:40:01.000000000 +0200
|
||||||
|
@@ -44,7 +44,7 @@
|
||||||
|
#endif
|
||||||
|
#define DEFLEASE 3600 /* default lease time, 1 hour */
|
||||||
|
#define CHUSER "nobody"
|
||||||
|
-#define CHGRP "dip"
|
||||||
|
+#define CHGRP "dialout"
|
||||||
|
#define DHCP_SERVER_PORT 67
|
||||||
|
#define DHCP_CLIENT_PORT 68
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# General
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
Name: dnsmasq
|
||||||
|
Version: 2.33
|
||||||
|
Release: 1
|
||||||
|
Copyright: GPL
|
||||||
|
Group: Productivity/Networking/DNS/Servers
|
||||||
|
Vendor: Simon Kelley
|
||||||
|
Packager: Simon Kelley
|
||||||
|
URL: http://www.thekelleys.org.uk/dnsmasq
|
||||||
|
Provides: dns_daemon
|
||||||
|
Conflicts: bind bind8 bind9
|
||||||
|
PreReq: %fillup_prereq %insserv_prereq
|
||||||
|
Autoreqprov: on
|
||||||
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
|
BuildRoot: /var/tmp/%{name}-%{version}
|
||||||
|
Summary: A lightweight caching nameserver
|
||||||
|
|
||||||
|
%description
|
||||||
|
Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server. It
|
||||||
|
is designed to provide DNS and, optionally, DHCP, to a small network. It can
|
||||||
|
serve the names of local machines which are not in the global DNS. The DHCP
|
||||||
|
server integrates with the DNS server and allows machines with DHCP-allocated
|
||||||
|
addresses to appear in the DNS with names configured either in each host or
|
||||||
|
in a central configuration file. Dnsmasq supports static and dynamic DHCP
|
||||||
|
leases and BOOTP for network booting of diskless machines.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Build
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
patch -p0 <rpm/%{name}-SuSE.patch
|
||||||
|
|
||||||
|
%build
|
||||||
|
%{?suse_update_config:%{suse_update_config -f}}
|
||||||
|
make all-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Install
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
%install
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
|
||||||
|
make install-i18n DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr
|
||||||
|
install -o root -g root -m 755 rpm/rc.dnsmasq-suse $RPM_BUILD_ROOT/etc/init.d/dnsmasq
|
||||||
|
install -o root -g root -m 644 dnsmasq.conf.example $RPM_BUILD_ROOT/etc/dnsmasq.conf
|
||||||
|
strip $RPM_BUILD_ROOT/usr/sbin/dnsmasq
|
||||||
|
ln -sf ../../etc/init.d/dnsmasq $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Clean up
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Post-install scriptlet
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
%post
|
||||||
|
%{fillup_and_insserv dnsmasq}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# Post-uninstall scriptlet
|
||||||
|
#
|
||||||
|
# The %postun script executes after the package has been removed. It is the
|
||||||
|
# last chance for a package to clean up after itself.
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
%postun
|
||||||
|
%{insserv_cleanup}
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
#
|
||||||
|
# File list
|
||||||
|
#
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 rpm/README.susefirewall
|
||||||
|
%doc contrib
|
||||||
|
%config /etc/init.d/dnsmasq
|
||||||
|
%config /etc/dnsmasq.conf
|
||||||
|
/usr/sbin/rcdnsmasq
|
||||||
|
/usr/sbin/dnsmasq
|
||||||
|
/usr/share/locale/*/LC_MESSAGES/*
|
||||||
|
%doc %{_mandir}/man8/dnsmasq.8.gz
|
||||||
|
%doc %{_mandir}/*/man8/dnsmasq.8.gz
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
#! /bin/sh
|
||||||
|
#
|
||||||
|
# init.d/dnsmasq
|
||||||
|
#
|
||||||
|
### BEGIN INIT INFO
|
||||||
|
# Provides: dnsmasq
|
||||||
|
# Required-Start: $network $remote_fs $syslog
|
||||||
|
# Required-Stop:
|
||||||
|
# Default-Start: 3 5
|
||||||
|
# Default-Stop:
|
||||||
|
# Description: Starts internet name service masq caching server (DNS)
|
||||||
|
### END INIT INFO
|
||||||
|
|
||||||
|
NAMED_BIN=/usr/sbin/dnsmasq
|
||||||
|
NAMED_PID=/var/run/dnsmasq.pid
|
||||||
|
NAMED_CONF=/etc/dnsmasq.conf
|
||||||
|
|
||||||
|
if [ ! -x $NAMED_BIN ] ; then
|
||||||
|
echo -n "dnsmasq not installed ! "
|
||||||
|
exit 5
|
||||||
|
fi
|
||||||
|
|
||||||
|
. /etc/rc.status
|
||||||
|
rc_reset
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
echo -n "Starting name service masq caching server "
|
||||||
|
checkproc -p $NAMED_PID $NAMED_BIN
|
||||||
|
if [ $? -eq 0 ] ; then
|
||||||
|
echo -n "- Warning: dnsmasq already running ! "
|
||||||
|
else
|
||||||
|
[ -e $NAMED_PID ] && echo -n "- Warning: $NAMED_PID exists ! "
|
||||||
|
fi
|
||||||
|
startproc -p $NAMED_PID $NAMED_BIN -u nobody
|
||||||
|
rc_status -v
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
echo -n "Shutting name service masq caching server "
|
||||||
|
checkproc -p $NAMED_PID $NAMED_BIN
|
||||||
|
[ $? -ne 0 ] && echo -n "- Warning: dnsmasq not running ! "
|
||||||
|
killproc -p $NAMED_PID -TERM $NAMED_BIN
|
||||||
|
rc_status -v
|
||||||
|
;;
|
||||||
|
try-restart)
|
||||||
|
$0 stop && $0 start
|
||||||
|
rc_status
|
||||||
|
;;
|
||||||
|
restart)
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
|
rc_status
|
||||||
|
;;
|
||||||
|
force-reload)
|
||||||
|
$0 reload
|
||||||
|
rc_status
|
||||||
|
;;
|
||||||
|
reload)
|
||||||
|
echo -n "Reloading name service masq caching server "
|
||||||
|
checkproc -p $NAMED_PID $NAMED_BIN
|
||||||
|
[ $? -ne 0 ] && echo -n "- Warning: dnsmasq not running ! "
|
||||||
|
killproc -p $NAMED_PID -HUP $NAMED_BIN
|
||||||
|
rc_status -v
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
echo -n "Checking for name service masq caching server "
|
||||||
|
checkproc -p $NAMED_PID $NAMED_BIN
|
||||||
|
rc_status -v
|
||||||
|
;;
|
||||||
|
probe)
|
||||||
|
test $NAMED_CONF -nt $NAMED_PID && echo reload
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
rc_exit
|
||||||
|
|
||||||
@@ -13,10 +13,10 @@ connection comes out of the other side. However, sometimes, we want to
|
|||||||
maintain that relationship through the proxy and continue the connection
|
maintain that relationship through the proxy and continue the connection
|
||||||
mark on packets upstream of our proxy
|
mark on packets upstream of our proxy
|
||||||
|
|
||||||
Dnsmasq includes such a feature enabled by the --conntrack
|
DNSMasq includes such a feature enabled by the --conntrack
|
||||||
option. This allows, for example, using iptables to mark traffic from
|
option. This allows, for example, using iptables to mark traffic from
|
||||||
a particular IP, and that mark to be persisted to requests made *by*
|
a particular IP, and that mark to be persisted to requests made *by*
|
||||||
Dnsmasq. Such a feature could be useful for bandwidth accounting,
|
DNSMasq. Such a feature could be useful for bandwidth accounting,
|
||||||
captive portals and the like. Note a similar feature has been
|
captive portals and the like. Note a similar feature has been
|
||||||
implemented in Squid 2.2
|
implemented in Squid 2.2
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ on IP address. 3) Saves the firewall mark back to the connection mark
|
|||||||
(which will persist it across related packets)
|
(which will persist it across related packets)
|
||||||
|
|
||||||
4) is applied to the OUTPUT table, which is where we first see packets
|
4) is applied to the OUTPUT table, which is where we first see packets
|
||||||
generated locally. Dnsmasq will have already copied the firewall mark
|
generated locally. DNSMasq will have already copied the firewall mark
|
||||||
from the request, across to the new packet, and so all that remains is
|
from the request, across to the new packet, and so all that remains is
|
||||||
for iptables to copy it to the connection mark so it's persisted across
|
for iptables to copy it to the connection mark so it's persisted across
|
||||||
packets.
|
packets.
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ Index: src/dnsmasq.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
@@ -434,7 +433,7 @@
|
@@ -434,7 +433,7 @@
|
||||||
/* lose the setuid and setgid capabilities */
|
/* lose the setuid and setgid capbilities */
|
||||||
if (capset(hdr, data) == -1)
|
if (capset(hdr, data) == -1)
|
||||||
{
|
{
|
||||||
- send_event(err_pipe[1], EVENT_CAP_ERR, errno);
|
- send_event(err_pipe[1], EVENT_CAP_ERR, errno);
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
CFLAGS?= -O2 -Wall -W
|
|
||||||
|
|
||||||
all: dhcp_release dhcp_release6 dhcp_lease_time
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *~ *.o core dhcp_release dhcp_release6 dhcp_lease_time
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
.TH DHCP_RELEASE 1
|
|
||||||
.SH NAME
|
|
||||||
dhcp_release6 \- Release a DHCPv6 lease on a the local dnsmasq DHCP server.
|
|
||||||
.SH SYNOPSIS
|
|
||||||
.B dhcp_release6 --iface <interface> --client-id <client-id> --server-id
|
|
||||||
server-id --iaid <iaid> --ip <IP> [--dry-run] [--help]
|
|
||||||
.SH "DESCRIPTION"
|
|
||||||
A utility which forces the DHCP server running on this machine to release a
|
|
||||||
DHCPv6 lease.
|
|
||||||
.SS OPTIONS
|
|
||||||
.IP "-a, --ip"
|
|
||||||
IPv6 address to release.
|
|
||||||
.IP "-c, --client-id"
|
|
||||||
Colon-separated hex string representing DHCPv6 client id. Normally
|
|
||||||
it can be found in leases file both on client and server.
|
|
||||||
.IP "-d, --dry-run"
|
|
||||||
Print hexadecimal representation of generated DHCPv6 release packet to standard
|
|
||||||
output and exit.
|
|
||||||
.IP "-h, --help"
|
|
||||||
print usage information to standard output and exit.
|
|
||||||
.IP "-i, --iaid"
|
|
||||||
Decimal representation of DHCPv6 IAID. Normally it can be found in leases file
|
|
||||||
both on client and server.
|
|
||||||
.IP "-n, --iface"
|
|
||||||
Network interface to send a DHCPv6 release packet from.
|
|
||||||
.IP "-s, --server-id"
|
|
||||||
Colon-separated hex string representing DHCPv6 server id. Normally
|
|
||||||
it can be found in leases file both on client and server.
|
|
||||||
.SH NOTES
|
|
||||||
MUST be run as root - will fail otherwise.
|
|
||||||
.SH LIMITATIONS
|
|
||||||
Only usable on IPv6 DHCP leases.
|
|
||||||
.SH SEE ALSO
|
|
||||||
.BR dnsmasq (8)
|
|
||||||
.SH AUTHOR
|
|
||||||
This manual page was written by Simon Kelley <simon@thekelleys.org.uk>.
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,508 +0,0 @@
|
|||||||
/*
|
|
||||||
dhcp_release6 --iface <interface> --client-id <client-id> --server-id
|
|
||||||
server-id --iaid <iaid> --ip <IP> [--dry-run] [--help]
|
|
||||||
MUST be run as root - will fail otherwise
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Send a DHCPRELEASE message to IPv6 multicast address via the specified interface
|
|
||||||
to tell the local DHCP server to delete a particular lease.
|
|
||||||
|
|
||||||
The interface argument is the interface in which a DHCP
|
|
||||||
request _would_ be received if it was coming from the client,
|
|
||||||
rather than being faked up here.
|
|
||||||
|
|
||||||
The client-id argument is colon-separated hex string and mandatory. Normally
|
|
||||||
it can be found in leases file both on client and server
|
|
||||||
|
|
||||||
The server-id argument is colon-separated hex string and mandatory. Normally
|
|
||||||
it can be found in leases file both on client and server.
|
|
||||||
|
|
||||||
The iaid argument is numeric string and mandatory. Normally
|
|
||||||
it can be found in leases file both on client and server.
|
|
||||||
|
|
||||||
IP is an IPv6 address to release
|
|
||||||
|
|
||||||
If --dry-run is specified, dhcp_release6 just prints hexadecimal representation of
|
|
||||||
packet to send to stdout and exits.
|
|
||||||
|
|
||||||
If --help is specified, dhcp_release6 print usage information to stdout and exits
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
*/
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <strings.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <getopt.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#define NOT_REPLY_CODE 115
|
|
||||||
typedef unsigned char u8;
|
|
||||||
typedef unsigned short u16;
|
|
||||||
typedef unsigned int u32;
|
|
||||||
|
|
||||||
enum DHCP6_TYPES
|
|
||||||
{
|
|
||||||
SOLICIT = 1,
|
|
||||||
ADVERTISE = 2,
|
|
||||||
REQUEST = 3,
|
|
||||||
CONFIRM = 4,
|
|
||||||
RENEW = 5,
|
|
||||||
REBIND = 6,
|
|
||||||
REPLY = 7,
|
|
||||||
RELEASE = 8,
|
|
||||||
DECLINE = 9,
|
|
||||||
RECONFIGURE = 10,
|
|
||||||
INFORMATION_REQUEST = 11,
|
|
||||||
RELAY_FORW = 12,
|
|
||||||
RELAY_REPL = 13
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
enum DHCP6_OPTIONS
|
|
||||||
{
|
|
||||||
CLIENTID = 1,
|
|
||||||
SERVERID = 2,
|
|
||||||
IA_NA = 3,
|
|
||||||
IA_TA = 4,
|
|
||||||
IAADDR = 5,
|
|
||||||
ORO = 6,
|
|
||||||
PREFERENCE = 7,
|
|
||||||
ELAPSED_TIME = 8,
|
|
||||||
RELAY_MSG = 9,
|
|
||||||
AUTH = 11,
|
|
||||||
UNICAST = 12,
|
|
||||||
STATUS_CODE = 13,
|
|
||||||
RAPID_COMMIT = 14,
|
|
||||||
USER_CLASS = 15,
|
|
||||||
VENDOR_CLASS = 16,
|
|
||||||
VENDOR_OPTS = 17,
|
|
||||||
INTERFACE_ID = 18,
|
|
||||||
RECONF_MSG = 19,
|
|
||||||
RECONF_ACCEPT = 20,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum DHCP6_STATUSES
|
|
||||||
{
|
|
||||||
SUCCESS = 0,
|
|
||||||
UNSPEC_FAIL = 1,
|
|
||||||
NOADDR_AVAIL=2,
|
|
||||||
NO_BINDING = 3,
|
|
||||||
NOT_ON_LINK = 4,
|
|
||||||
USE_MULTICAST =5
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct option longopts[] = {
|
|
||||||
{"ip", required_argument, 0, 'a' },
|
|
||||||
{"server-id", required_argument, 0, 's' },
|
|
||||||
{"client-id", required_argument, 0, 'c' },
|
|
||||||
{"iface", required_argument, 0, 'n' },
|
|
||||||
{"iaid", required_argument, 0, 'i' },
|
|
||||||
{"dry-run", no_argument, 0, 'd' },
|
|
||||||
{"help", no_argument, 0, 'h' },
|
|
||||||
{0, 0, 0, 0 }
|
|
||||||
};
|
|
||||||
|
|
||||||
const short DHCP6_CLIENT_PORT = 546;
|
|
||||||
const short DHCP6_SERVER_PORT = 547;
|
|
||||||
|
|
||||||
const char* DHCP6_MULTICAST_ADDRESS = "ff02::1:2";
|
|
||||||
|
|
||||||
struct dhcp6_option {
|
|
||||||
uint16_t type;
|
|
||||||
uint16_t len;
|
|
||||||
char value[1024];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct dhcp6_iaaddr_option {
|
|
||||||
uint16_t type;
|
|
||||||
uint16_t len;
|
|
||||||
struct in6_addr ip;
|
|
||||||
uint32_t preferred_lifetime;
|
|
||||||
uint32_t valid_lifetime;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct dhcp6_iana_option {
|
|
||||||
uint16_t type;
|
|
||||||
uint16_t len;
|
|
||||||
uint32_t iaid;
|
|
||||||
uint32_t t1;
|
|
||||||
uint32_t t2;
|
|
||||||
char options[1024];
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
struct dhcp6_packet {
|
|
||||||
size_t len;
|
|
||||||
char buf[2048];
|
|
||||||
};
|
|
||||||
|
|
||||||
size_t pack_duid(const char* str, char* dst)
|
|
||||||
{
|
|
||||||
char* tmp = strdup(str);
|
|
||||||
char* tmp_to_free = tmp;
|
|
||||||
char *ptr;
|
|
||||||
uint8_t write_pos = 0;
|
|
||||||
while ((ptr = strtok (tmp, ":")))
|
|
||||||
{
|
|
||||||
dst[write_pos] = (uint8_t) strtol(ptr, NULL, 16);
|
|
||||||
write_pos += 1;
|
|
||||||
tmp = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
free(tmp_to_free);
|
|
||||||
return write_pos;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct dhcp6_option create_client_id_option(const char* duid)
|
|
||||||
{
|
|
||||||
struct dhcp6_option option;
|
|
||||||
option.type = htons(CLIENTID);
|
|
||||||
bzero(option.value, sizeof(option.value));
|
|
||||||
option.len = htons(pack_duid(duid, option.value));
|
|
||||||
return option;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct dhcp6_option create_server_id_option(const char* duid)
|
|
||||||
{
|
|
||||||
struct dhcp6_option option;
|
|
||||||
option.type = htons(SERVERID);
|
|
||||||
bzero(option.value, sizeof(option.value));
|
|
||||||
option.len = htons(pack_duid(duid, option.value));
|
|
||||||
return option;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct dhcp6_iaaddr_option create_iaadr_option(const char* ip)
|
|
||||||
{
|
|
||||||
struct dhcp6_iaaddr_option result;
|
|
||||||
result.type =htons(IAADDR);
|
|
||||||
/* no suboptions needed here, so length is 24 */
|
|
||||||
result.len = htons(24);
|
|
||||||
result.preferred_lifetime = 0;
|
|
||||||
result.valid_lifetime = 0;
|
|
||||||
int s = inet_pton(AF_INET6, ip, &(result.ip));
|
|
||||||
if (s <= 0) {
|
|
||||||
if (s == 0)
|
|
||||||
fprintf(stderr, "Not in presentation format");
|
|
||||||
else
|
|
||||||
perror("inet_pton");
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct dhcp6_iana_option create_iana_option(const char * iaid, struct dhcp6_iaaddr_option ia_addr)
|
|
||||||
{
|
|
||||||
struct dhcp6_iana_option result;
|
|
||||||
result.type = htons(IA_NA);
|
|
||||||
result.iaid = htonl(atoi(iaid));
|
|
||||||
result.t1 = 0;
|
|
||||||
result.t2 = 0;
|
|
||||||
result.len = htons(12 + ntohs(ia_addr.len) + 2 * sizeof(uint16_t));
|
|
||||||
memcpy(result.options, &ia_addr, ntohs(ia_addr.len) + 2 * sizeof(uint16_t));
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct dhcp6_packet create_release_packet(const char* iaid, const char* ip, const char* client_id, const char* server_id)
|
|
||||||
{
|
|
||||||
struct dhcp6_packet result;
|
|
||||||
bzero(result.buf, sizeof(result.buf));
|
|
||||||
/* message_type */
|
|
||||||
result.buf[0] = RELEASE;
|
|
||||||
/* tx_id */
|
|
||||||
bzero(result.buf+1, 3);
|
|
||||||
|
|
||||||
struct dhcp6_option client_option = create_client_id_option(client_id);
|
|
||||||
struct dhcp6_option server_option = create_server_id_option(server_id);
|
|
||||||
struct dhcp6_iaaddr_option iaaddr_option = create_iaadr_option(ip);
|
|
||||||
struct dhcp6_iana_option iana_option = create_iana_option(iaid, iaaddr_option);
|
|
||||||
int offset = 4;
|
|
||||||
memcpy(result.buf + offset, &client_option, ntohs(client_option.len) + 2*sizeof(uint16_t));
|
|
||||||
offset += (ntohs(client_option.len)+ 2 *sizeof(uint16_t) );
|
|
||||||
memcpy(result.buf + offset, &server_option, ntohs(server_option.len) + 2*sizeof(uint16_t) );
|
|
||||||
offset += (ntohs(server_option.len)+ 2* sizeof(uint16_t));
|
|
||||||
memcpy(result.buf + offset, &iana_option, ntohs(iana_option.len) + 2*sizeof(uint16_t) );
|
|
||||||
offset += (ntohs(iana_option.len)+ 2* sizeof(uint16_t));
|
|
||||||
result.len = offset;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t parse_iana_suboption(char* buf, size_t len)
|
|
||||||
{
|
|
||||||
size_t current_pos = 0;
|
|
||||||
char option_value[1024];
|
|
||||||
while (current_pos < len)
|
|
||||||
{
|
|
||||||
uint16_t option_type, option_len;
|
|
||||||
memcpy(&option_type,buf + current_pos, sizeof(uint16_t));
|
|
||||||
memcpy(&option_len,buf + current_pos + sizeof(uint16_t), sizeof(uint16_t));
|
|
||||||
option_type = ntohs(option_type);
|
|
||||||
option_len = ntohs(option_len);
|
|
||||||
current_pos += 2 * sizeof(uint16_t);
|
|
||||||
if (option_type == STATUS_CODE)
|
|
||||||
{
|
|
||||||
uint16_t status;
|
|
||||||
memcpy(&status, buf + current_pos, sizeof(uint16_t));
|
|
||||||
status = ntohs(status);
|
|
||||||
if (status != SUCCESS)
|
|
||||||
{
|
|
||||||
memcpy(option_value, buf + current_pos + sizeof(uint16_t) , option_len - sizeof(uint16_t));
|
|
||||||
option_value[option_len-sizeof(uint16_t)] ='\0';
|
|
||||||
fprintf(stderr, "Error: %s\n", option_value);
|
|
||||||
}
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return -2;
|
|
||||||
}
|
|
||||||
|
|
||||||
int16_t parse_packet(char* buf, size_t len)
|
|
||||||
{
|
|
||||||
int16_t ret = -1;
|
|
||||||
uint8_t type = buf[0];
|
|
||||||
/*skipping tx id. you need it, uncomment following line
|
|
||||||
uint16_t tx_id = ntohs((buf[1] <<16) + (buf[2] <<8) + buf[3]);
|
|
||||||
*/
|
|
||||||
size_t current_pos = 4;
|
|
||||||
if (type != REPLY )
|
|
||||||
return NOT_REPLY_CODE;
|
|
||||||
|
|
||||||
char option_value[1024];
|
|
||||||
while (current_pos < len)
|
|
||||||
{
|
|
||||||
uint16_t option_type, option_len;
|
|
||||||
memcpy(&option_type,buf + current_pos, sizeof(uint16_t));
|
|
||||||
memcpy(&option_len,buf + current_pos + sizeof(uint16_t), sizeof(uint16_t));
|
|
||||||
option_type = ntohs(option_type);
|
|
||||||
option_len = ntohs(option_len);
|
|
||||||
current_pos += 2 * sizeof(uint16_t);
|
|
||||||
if (option_type == STATUS_CODE)
|
|
||||||
{
|
|
||||||
uint16_t status;
|
|
||||||
memcpy(&status, buf + current_pos, sizeof(uint16_t));
|
|
||||||
status = ntohs(status);
|
|
||||||
if (status != SUCCESS)
|
|
||||||
{
|
|
||||||
memcpy(option_value, buf + current_pos +sizeof(uint16_t) , option_len -sizeof(uint16_t));
|
|
||||||
fprintf(stderr, "Error: %d %s\n", status, option_value);
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Got success status, return that if there's no specific error in an IA_NA. */
|
|
||||||
ret = SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (option_type == IA_NA )
|
|
||||||
{
|
|
||||||
uint16_t result = parse_iana_suboption(buf + current_pos +24, option_len -24);
|
|
||||||
if (result)
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
current_pos += option_len;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void usage(const char* arg, FILE* stream)
|
|
||||||
{
|
|
||||||
const char* usage_string ="--ip IPv6 --iface IFACE --server-id SERVER_ID --client-id CLIENT_ID --iaid IAID [--dry-run] | --help";
|
|
||||||
fprintf (stream, "Usage: %s %s\n", arg, usage_string);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void fail_fatal(const char *errstr, int exitcode)
|
|
||||||
{
|
|
||||||
perror(errstr);
|
|
||||||
exit(exitcode);
|
|
||||||
}
|
|
||||||
|
|
||||||
int send_release_packet(const char* iface, struct dhcp6_packet* packet)
|
|
||||||
{
|
|
||||||
struct sockaddr_in6 server_addr, client_addr;
|
|
||||||
char response[1400];
|
|
||||||
int sock = socket(PF_INET6, SOCK_DGRAM, 0);
|
|
||||||
int i = 0;
|
|
||||||
if (sock < 0)
|
|
||||||
{
|
|
||||||
perror("creating socket");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (setsockopt(sock, SOL_SOCKET, 25, iface, strlen(iface)) == -1)
|
|
||||||
{
|
|
||||||
perror("SO_BINDTODEVICE");
|
|
||||||
close(sock);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(&server_addr, 0, sizeof(server_addr));
|
|
||||||
server_addr.sin6_family = AF_INET6;
|
|
||||||
client_addr.sin6_family = AF_INET6;
|
|
||||||
client_addr.sin6_port = htons(DHCP6_CLIENT_PORT);
|
|
||||||
client_addr.sin6_flowinfo = 0;
|
|
||||||
client_addr.sin6_scope_id =0;
|
|
||||||
if (inet_pton(AF_INET6, "::", &client_addr.sin6_addr) <= 0)
|
|
||||||
fail_fatal("inet_pton", 5);
|
|
||||||
if (bind(sock, (struct sockaddr*)&client_addr, sizeof(struct sockaddr_in6)) != 0)
|
|
||||||
perror("bind"); /* continue on bind error */
|
|
||||||
if (inet_pton(AF_INET6, DHCP6_MULTICAST_ADDRESS, &server_addr.sin6_addr) <= 0)
|
|
||||||
fail_fatal("inet_pton", 5);
|
|
||||||
server_addr.sin6_port = htons(DHCP6_SERVER_PORT);
|
|
||||||
ssize_t recv_size = 0;
|
|
||||||
int result;
|
|
||||||
for (i = 0; i < 5; i++)
|
|
||||||
{
|
|
||||||
if (sendto(sock, packet->buf, packet->len, 0, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0)
|
|
||||||
fail_fatal("sendto failed", 4);
|
|
||||||
|
|
||||||
recv_size = recvfrom(sock, response, sizeof(response), MSG_DONTWAIT, NULL, 0);
|
|
||||||
if (recv_size == -1)
|
|
||||||
{
|
|
||||||
if (errno == EAGAIN)
|
|
||||||
{
|
|
||||||
sleep(1);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
perror("recvfrom");
|
|
||||||
result = UNSPEC_FAIL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
result = parse_packet(response, recv_size);
|
|
||||||
if (result == NOT_REPLY_CODE)
|
|
||||||
{
|
|
||||||
sleep(1);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
close(sock);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
close(sock);
|
|
||||||
fprintf(stderr, "Response timed out\n");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int main(int argc, char * const argv[])
|
|
||||||
{
|
|
||||||
const char* UNINITIALIZED = "";
|
|
||||||
const char* iface = UNINITIALIZED;
|
|
||||||
const char* ip = UNINITIALIZED;
|
|
||||||
const char* client_id = UNINITIALIZED;
|
|
||||||
const char* server_id = UNINITIALIZED;
|
|
||||||
const char* iaid = UNINITIALIZED;
|
|
||||||
int dry_run = 0;
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
int option_index = 0;
|
|
||||||
int c = getopt_long(argc, argv, "a:s:c:n:i:hd", longopts, &option_index);
|
|
||||||
if (c == -1)
|
|
||||||
break;
|
|
||||||
|
|
||||||
switch(c)
|
|
||||||
{
|
|
||||||
case 0:
|
|
||||||
if (longopts[option_index].flag !=0)
|
|
||||||
break;
|
|
||||||
|
|
||||||
printf ("option %s", longopts[option_index].name);
|
|
||||||
if (optarg)
|
|
||||||
printf (" with arg %s", optarg);
|
|
||||||
printf ("\n");
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'i':
|
|
||||||
iaid = optarg;
|
|
||||||
break;
|
|
||||||
case 'n':
|
|
||||||
iface = optarg;
|
|
||||||
break;
|
|
||||||
case 'a':
|
|
||||||
ip = optarg;
|
|
||||||
break;
|
|
||||||
case 'c':
|
|
||||||
client_id = optarg;
|
|
||||||
break;
|
|
||||||
case 'd':
|
|
||||||
dry_run = 1;
|
|
||||||
break;
|
|
||||||
case 's':
|
|
||||||
server_id = optarg;
|
|
||||||
break;
|
|
||||||
case 'h':
|
|
||||||
usage(argv[0], stdout);
|
|
||||||
return 0;
|
|
||||||
case '?':
|
|
||||||
usage(argv[0], stderr);
|
|
||||||
return -1;
|
|
||||||
default:
|
|
||||||
abort();
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (iaid == UNINITIALIZED)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "Missing required iaid parameter\n");
|
|
||||||
usage(argv[0], stderr);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (server_id == UNINITIALIZED)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "Missing required server-id parameter\n");
|
|
||||||
usage(argv[0], stderr);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client_id == UNINITIALIZED)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "Missing required client-id parameter\n");
|
|
||||||
usage(argv[0], stderr);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ip == UNINITIALIZED)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "Missing required ip parameter\n");
|
|
||||||
usage(argv[0], stderr);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (iface == UNINITIALIZED)
|
|
||||||
{
|
|
||||||
fprintf(stderr, "Missing required iface parameter\n");
|
|
||||||
usage(argv[0], stderr);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
struct dhcp6_packet packet = create_release_packet(iaid, ip, client_id, server_id);
|
|
||||||
|
|
||||||
if (dry_run)
|
|
||||||
{
|
|
||||||
uint16_t i;
|
|
||||||
|
|
||||||
for(i=0; i<packet.len; i++)
|
|
||||||
printf("%hhx", packet.buf[i]);
|
|
||||||
|
|
||||||
printf("\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return send_release_packet(iface, &packet);
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
STATUS_FILE="/tmp/dnsmasq-ip-mac.status"
|
|
||||||
|
|
||||||
# Script for dnsmasq lease-change hook.
|
|
||||||
# Maintains the above file with an IP address/MAC address pairs,
|
|
||||||
# one lease per line. Works with IPv4 and IPv6 leases, file is
|
|
||||||
# atomically updated, so no races for users of the data.
|
|
||||||
|
|
||||||
action="$1"
|
|
||||||
mac="$2" # IPv4
|
|
||||||
ip="$3"
|
|
||||||
|
|
||||||
# ensure it always exists.
|
|
||||||
|
|
||||||
if [ ! -f "$STATUS_FILE" ]; then
|
|
||||||
touch "$STATUS_FILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "$DNSMASQ_IAID" ]; then
|
|
||||||
mac="$DNSMASQ_MAC" # IPv6
|
|
||||||
fi
|
|
||||||
|
|
||||||
# worry about an add or old action when the MAC address is not known:
|
|
||||||
# leave any old one in place in that case.
|
|
||||||
|
|
||||||
if [ "$action" = "add" -o "$action" = "old" -o "$action" = "del" ]; then
|
|
||||||
if [ -n "$mac" -o "$action" = "del" ]; then
|
|
||||||
sed "/^${ip//./\.} / d" "$STATUS_FILE" > "$STATUS_FILE".new
|
|
||||||
|
|
||||||
if [ "$action" = "add" -o "$action" = "old" ]; then
|
|
||||||
echo "$ip $mac" >> "$STATUS_FILE".new
|
|
||||||
fi
|
|
||||||
mv "$STATUS_FILE".new "$STATUS_FILE" # atomic update.
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
# first column of this file, then a DNAT port-forward will be set up
|
# first column of this file, then a DNAT port-forward will be set up
|
||||||
# to the address which has just been allocated by DHCP . The second field
|
# to the address which has just been allocated by DHCP . The second field
|
||||||
# is port number(s). If there is only one, then the port-forward goes to
|
# is port number(s). If there is only one, then the port-forward goes to
|
||||||
# the same port on the DHCP-client, if there are two separated with a
|
# the same port on the DHCP-client, if there are two seperated with a
|
||||||
# colon, then the second number is the port to which the connection
|
# colon, then the second number is the port to which the connection
|
||||||
# is forwarded on the DHCP-client. By default, forwarding is set up
|
# is forwarded on the DHCP-client. By default, forwarding is set up
|
||||||
# for TCP, but it can done for UDP instead by prefixing the port to "u".
|
# for TCP, but it can done for UDP instead by prefixing the port to "u".
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
The script reads stdin and replaces all IP addresses with names before
|
|
||||||
outputting it again. IPs from private networks are reverse looked up
|
|
||||||
via dns. Other IP addresses are searched for in the dnsmasq query log.
|
|
||||||
This gives names (CNAMEs if I understand DNS correctly) that are closer
|
|
||||||
to the name the client originally asked for then the names obtained by
|
|
||||||
reverse lookup. Just run
|
|
||||||
|
|
||||||
netstat -n -4 | ./reverse_replace.sh
|
|
||||||
|
|
||||||
to see what it does. It needs
|
|
||||||
|
|
||||||
log-queries
|
|
||||||
log-facility=/var/log/dnsmasq.log
|
|
||||||
|
|
||||||
in the dnsmasq configuration.
|
|
||||||
|
|
||||||
The script runs on debian (with dash installed) and on busybox.
|
|
||||||
|
|
||||||
@@ -1,125 +0,0 @@
|
|||||||
#!/bin/dash
|
|
||||||
# $Id: reverse_replace.sh 18 2015-03-01 16:12:35Z jo $
|
|
||||||
#
|
|
||||||
# Usage e.g.: netstat -n -4 | reverse_replace.sh
|
|
||||||
# Parses stdin for IP4 addresses and replaces them
|
|
||||||
# with names retrieved by parsing the dnsmasq log.
|
|
||||||
# This currently only gives CNAMEs. But these
|
|
||||||
# usually tell you more than the ones from reverse
|
|
||||||
# lookups.
|
|
||||||
#
|
|
||||||
# This has been tested on debian and asuswrt. Please
|
|
||||||
# report successful tests on other platforms.
|
|
||||||
#
|
|
||||||
# Author: Joachim Zobel <jz-2014@heute-morgen.de>
|
|
||||||
# License: Consider this MIT style licensed. You can
|
|
||||||
# do as you ike, but you must not remove my name.
|
|
||||||
#
|
|
||||||
|
|
||||||
LOG=/var/log/dnsmasq.log
|
|
||||||
MAX_LINES=15000
|
|
||||||
|
|
||||||
# sed regex do match IPs
|
|
||||||
IP_regex='[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}'
|
|
||||||
# private IP ranges
|
|
||||||
IP_private='\(^127\.\)\|\(^192\.168\.\)\|\(^10\.\)\|\(^172\.1[6-9]\.\)\|\(^172\.2[0-9]\.\)\|\(^172\.3[0-1]\.\)'
|
|
||||||
|
|
||||||
#######################################################################
|
|
||||||
# Find Commands
|
|
||||||
|
|
||||||
HOST=nslookup
|
|
||||||
if type host > /dev/null 2>&1; then
|
|
||||||
# echo "No need for nslookup, host is there"
|
|
||||||
HOST=host
|
|
||||||
fi
|
|
||||||
|
|
||||||
#######################################################################
|
|
||||||
# Functions
|
|
||||||
|
|
||||||
# Use shell variables for an (IP) lookup table
|
|
||||||
create_lookup_table()
|
|
||||||
{
|
|
||||||
# Parse log into lookup table
|
|
||||||
local CMDS="$( tail -"$MAX_LINES" "$LOG" | \
|
|
||||||
grep " is $IP_regex" | \
|
|
||||||
sed "s#.* \([^ ]*\) is \($IP_regex\).*#set_val \2 \1;#" )"
|
|
||||||
|
|
||||||
local IFS='
|
|
||||||
'
|
|
||||||
for CMD in $CMDS
|
|
||||||
do
|
|
||||||
eval $CMD
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
set_val()
|
|
||||||
{
|
|
||||||
local _IP=$(echo $1 | tr . _)
|
|
||||||
local KEY="__IP__$_IP"
|
|
||||||
eval "$KEY"=$2
|
|
||||||
}
|
|
||||||
|
|
||||||
get_val()
|
|
||||||
{
|
|
||||||
local _IP=$(echo $1 | tr . _)
|
|
||||||
local KEY="__IP__$_IP"
|
|
||||||
eval echo -n '${'"$KEY"'}'
|
|
||||||
}
|
|
||||||
|
|
||||||
dns_lookup()
|
|
||||||
{
|
|
||||||
local IP=$1
|
|
||||||
|
|
||||||
local RTN="$($HOST $IP | \
|
|
||||||
sed 's#\s\+#\n#g' | \
|
|
||||||
grep -v '^$' | \
|
|
||||||
tail -1 | tr -d '\n' | \
|
|
||||||
sed 's#\.$##')"
|
|
||||||
if echo $RTN | grep -q NXDOMAIN; then
|
|
||||||
echo -n $IP
|
|
||||||
else
|
|
||||||
echo -n "$RTN"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
reverse_dns()
|
|
||||||
{
|
|
||||||
local IP=$1
|
|
||||||
|
|
||||||
# Skip if it is not an IP
|
|
||||||
if ! echo $IP | grep -q "^$IP_regex$"; then
|
|
||||||
echo -n $IP
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Do a dns lookup, if it is a local IP
|
|
||||||
if echo $IP | grep -q $IP_private; then
|
|
||||||
dns_lookup $IP
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
local NAME="$(get_val $IP)"
|
|
||||||
|
|
||||||
if [ -z "$NAME" ]; then
|
|
||||||
echo -n $IP
|
|
||||||
else
|
|
||||||
echo -n $NAME
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
#######################################################################
|
|
||||||
# Main
|
|
||||||
create_lookup_table
|
|
||||||
|
|
||||||
while read LINE; do
|
|
||||||
for IP in $(echo "$LINE" | \
|
|
||||||
sed "s#\b\($IP_regex\)\b#\n\1\n#g" | \
|
|
||||||
grep $IP_regex)
|
|
||||||
do
|
|
||||||
NAME=`reverse_dns $IP `
|
|
||||||
# echo "$NAME $IP"
|
|
||||||
LINE=`echo "$LINE" | sed "s#$IP#$NAME#" `
|
|
||||||
done
|
|
||||||
echo $LINE
|
|
||||||
done
|
|
||||||
|
|
||||||
@@ -1,8 +1,5 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=dnsmasq - A lightweight DHCP and caching DNS server
|
Description=A lightweight DHCP and caching DNS server
|
||||||
After=network.target
|
|
||||||
Before=network-online.target nss-lookup.target
|
|
||||||
Wants=nss-lookup.target
|
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=dbus
|
Type=dbus
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ A remake of patch Bob Carroll had posted to dnsmasq,
|
|||||||
now compatible with version 2.47. Hopefully he doesn't
|
now compatible with version 2.47. Hopefully he doesn't
|
||||||
mind (sending a copy of this mail to him too).
|
mind (sending a copy of this mail to him too).
|
||||||
|
|
||||||
Maybe the patch in question is not acceptable
|
Maybe the patch in question is not acceptible
|
||||||
as it doesn't add new switch, rather it binds itself to "strict-order".
|
as it doesn't add new switch, rather it binds itself to "strict-order".
|
||||||
|
|
||||||
What it does is: if you have strict-order in the
|
What it does is: if you have strict-order in the
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
Hi,
|
|
||||||
I updated the try-all-ns patch to work with the latest version of git. Ended up implementing it on top of master, 2.78test2-7-g63437ff. As that specific if-clause has been changed in the last few commits, it's not compatible for 2.77, sadly.
|
|
||||||
|
|
||||||
Find the patch attached.
|
|
||||||
|
|
||||||
Regards,
|
|
||||||
|
|
||||||
Rasmus Ahlberg
|
|
||||||
Software Developer, R&D
|
|
||||||
Electrolux Small Appliances
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
From: Jesse Glick <jglick@cloudbees.com>
|
|
||||||
To: dnsmasq-discuss@lists.thekelleys.org.uk
|
|
||||||
Subject: Re: [Dnsmasq-discuss] Ability to delegate to one server but fall
|
|
||||||
back to another after NXDOMAIN?
|
|
||||||
|
|
||||||
|
|
||||||
On Wed, Jan 15, 2014 at 12:30 PM, Simon Kelley <simon@thekelleys.org.uk> wrote:
|
|
||||||
> > There's a (very old) patch in contrib/try-all-ns that would make a starting point
|
|
||||||
This does not apply against trunk, so I tried to rework it. The
|
|
||||||
following appears to do what I expect:
|
|
||||||
|
|
||||||
diff --git a/src/forward.c b/src/forward.c
|
|
||||||
index 8167229..76070b5 100644
|
|
||||||
--- a/src/forward.c
|
|
||||||
+++ b/src/forward.c
|
|
||||||
@@ -610,7 +610,11 @@ void reply_query(int fd, int family, time_t now)
|
|
||||||
|
|
||||||
if ((RCODE(header) == SERVFAIL || RCODE(header) == REFUSED) &&
|
|
||||||
!option_bool(OPT_ORDER) &&
|
|
||||||
- forward->forwardall == 0)
|
|
||||||
+ forward->forwardall == 0 ||
|
|
||||||
+ /* try each in turn */
|
|
||||||
+ RCODE(header) == NXDOMAIN &&
|
|
||||||
+ option_bool(OPT_ORDER) &&
|
|
||||||
+ server->next != NULL)
|
|
||||||
/* for broken servers, attempt to send to another one. */
|
|
||||||
{
|
|
||||||
unsigned char *pheader;
|
|
||||||
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
diff --git a/src/forward.c b/src/forward.c
|
|
||||||
index e3fa94b..ecf3b98 100644
|
|
||||||
--- a/src/forward.c
|
|
||||||
+++ b/src/forward.c
|
|
||||||
@@ -789,9 +789,12 @@ void reply_query(int fd, int family, time_t now)
|
|
||||||
|
|
||||||
/* Note: if we send extra options in the EDNS0 header, we can't recreate
|
|
||||||
the query from the reply. */
|
|
||||||
- if (RCODE(header) == REFUSED &&
|
|
||||||
- forward->forwardall == 0 &&
|
|
||||||
- !(forward->flags & FREC_HAS_EXTRADATA))
|
|
||||||
+ if ((RCODE(header) == REFUSED &&
|
|
||||||
+ forward->forwardall == 0 &&
|
|
||||||
+ !(forward->flags & FREC_HAS_EXTRADATA)) ||
|
|
||||||
+ /* If strict-order is set, try next server on NXDOMAIN reply */
|
|
||||||
+ (RCODE(header) == NXDOMAIN && option_bool(OPT_ORDER) &&
|
|
||||||
+ server->next != NULL))
|
|
||||||
/* for broken servers, attempt to send to another one. */
|
|
||||||
{
|
|
||||||
unsigned char *pheader;
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
This is the README for the Dnsmasq webmin module.
|
This is the README for the DNSmasq webmin module.
|
||||||
|
|
||||||
Problems:
|
Problems:
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@ wade through the config file and man pages again.
|
|||||||
|
|
||||||
If you modify it, or add a language file, and you have a spare moment,
|
If you modify it, or add a language file, and you have a spare moment,
|
||||||
please e-mail me - I won't be upset at all if you fix my poor coding!
|
please e-mail me - I won't be upset at all if you fix my poor coding!
|
||||||
(rather the opposite - I'd be pleased someone found it useful)
|
(rather the opposite - I'd be pleased someone found it usefull)
|
||||||
|
|
||||||
Cheers,
|
Cheers,
|
||||||
Neil Fisher <neil@magnecor.com.au>
|
Neil Fisher <neil@magnecor.com.au>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
CFLAGS?= -O2 -Wall -W
|
||||||
|
|
||||||
|
all: dhcp_release dhcp_lease_time
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *~ *.o core dhcp_release dhcp_lease_time
|
||||||
+2
-2
@@ -4,7 +4,7 @@ reboot, then it will eventually be restored as hosts renew their
|
|||||||
leases. Until a host renews (which may take hours/days) it will
|
leases. Until a host renews (which may take hours/days) it will
|
||||||
not exist in the DNS if dnsmasq's DDNS function is in use.
|
not exist in the DNS if dnsmasq's DDNS function is in use.
|
||||||
|
|
||||||
*WRT systems remount all non-volatile filesystems read-only after boot,
|
*WRT systems remount all non-volatile fileystems read-only after boot,
|
||||||
so the normal leasefile will not work. They do, however have NV
|
so the normal leasefile will not work. They do, however have NV
|
||||||
storage, accessed with the nvram command:
|
storage, accessed with the nvram command:
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@ about 100 bytes, so restricting the number of leases to 50 will limit
|
|||||||
use to half that. (The default limit in the distributed source is 150)
|
use to half that. (The default limit in the distributed source is 150)
|
||||||
|
|
||||||
Any UI script which reads the dnsmasq leasefile will have to be
|
Any UI script which reads the dnsmasq leasefile will have to be
|
||||||
amended, probably by changing it to read the output of
|
ammended, probably by changing it to read the output of
|
||||||
`lease_update init` instead.
|
`lease_update init` instead.
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,11 +12,9 @@ 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
|
nothing is sent to stdout a message is sent to stderr and a
|
||||||
non-zero error code is returned.
|
non-zero error code is returned.
|
||||||
|
|
||||||
Requires dnsmasq 2.67 or later and may not work with other DHCP servers.
|
Requires dnsmasq 2.40 or later and may not work with other DHCP servers.
|
||||||
|
|
||||||
The address argument is a dotted-quad IP addresses and mandatory.
|
The address argument is a dotted-quad IP addresses and mandatory.
|
||||||
.SH LIMITATIONS
|
|
||||||
Only works with IPv4 addresses and DHCP leases.
|
|
||||||
.SH SEE ALSO
|
.SH SEE ALSO
|
||||||
.BR dnsmasq (8)
|
.BR dnsmasq (8)
|
||||||
.SH AUTHOR
|
.SH AUTHOR
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
nothing is sent to stdout a message is sent to stderr and a
|
nothing is sent to stdout a message is sent to stderr and a
|
||||||
non-zero error code is returned.
|
non-zero error code is returned.
|
||||||
|
|
||||||
This version requires dnsmasq 2.67 or later.
|
Requires dnsmasq 2.40 or later.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@@ -46,7 +46,6 @@
|
|||||||
#define OPTION_LEASE_TIME 51
|
#define OPTION_LEASE_TIME 51
|
||||||
#define OPTION_OVERLOAD 52
|
#define OPTION_OVERLOAD 52
|
||||||
#define OPTION_MESSAGE_TYPE 53
|
#define OPTION_MESSAGE_TYPE 53
|
||||||
#define OPTION_REQUESTED_OPTIONS 55
|
|
||||||
#define OPTION_END 255
|
#define OPTION_END 255
|
||||||
#define DHCPINFORM 8
|
#define DHCPINFORM 8
|
||||||
#define DHCP_SERVER_PORT 67
|
#define DHCP_SERVER_PORT 67
|
||||||
@@ -83,7 +82,7 @@ static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt
|
|||||||
if (p >= end - 2)
|
if (p >= end - 2)
|
||||||
return NULL; /* malformed packet */
|
return NULL; /* malformed packet */
|
||||||
opt_len = option_len(p);
|
opt_len = option_len(p);
|
||||||
if (end - p < (2 + opt_len))
|
if (p >= end - (2 + opt_len))
|
||||||
return NULL; /* malformed packet */
|
return NULL; /* malformed packet */
|
||||||
if (*p == opt && opt_len >= minsize)
|
if (*p == opt && opt_len >= minsize)
|
||||||
return p;
|
return p;
|
||||||
@@ -153,11 +152,7 @@ int main(int argc, char **argv)
|
|||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inet_pton(AF_INET, argv[1], &lease) < 1)
|
lease.s_addr = inet_addr(argv[1]);
|
||||||
{
|
|
||||||
fprintf(stderr, "invalid address: %s\n", argv[1]);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(&packet, 0, sizeof(packet));
|
memset(&packet, 0, sizeof(packet));
|
||||||
|
|
||||||
@@ -172,16 +167,10 @@ int main(int argc, char **argv)
|
|||||||
*(p++) = 1;
|
*(p++) = 1;
|
||||||
*(p++) = DHCPINFORM;
|
*(p++) = DHCPINFORM;
|
||||||
|
|
||||||
/* Explicitly request the lease time, it won't be sent otherwise:
|
|
||||||
this is a dnsmasq extension, not standard. */
|
|
||||||
*(p++) = OPTION_REQUESTED_OPTIONS;
|
|
||||||
*(p++) = 1;
|
|
||||||
*(p++) = OPTION_LEASE_TIME;
|
|
||||||
|
|
||||||
*(p++) = OPTION_END;
|
*(p++) = OPTION_END;
|
||||||
|
|
||||||
dest.sin_family = AF_INET;
|
dest.sin_family = AF_INET;
|
||||||
(void)inet_pton(AF_INET, "127.0.0.1", &dest.sin_addr);
|
dest.sin_addr.s_addr = inet_addr("127.0.0.1");
|
||||||
dest.sin_port = ntohs(DHCP_SERVER_PORT);
|
dest.sin_port = ntohs(DHCP_SERVER_PORT);
|
||||||
|
|
||||||
if (sendto(fd, &packet, sizeof(packet), 0,
|
if (sendto(fd, &packet, sizeof(packet), 0,
|
||||||
@@ -210,13 +199,13 @@ int main(int argc, char **argv)
|
|||||||
{
|
{
|
||||||
unsigned int x;
|
unsigned int x;
|
||||||
if ((x = t/86400))
|
if ((x = t/86400))
|
||||||
printf("%ud", x);
|
printf("%dd", x);
|
||||||
if ((x = (t/3600)%24))
|
if ((x = (t/3600)%24))
|
||||||
printf("%uh", x);
|
printf("%dh", x);
|
||||||
if ((x = (t/60)%60))
|
if ((x = (t/60)%60))
|
||||||
printf("%um", x);
|
printf("%dm", x);
|
||||||
if ((x = t%60))
|
if ((x = t%60))
|
||||||
printf("%us", x);
|
printf("%ds", x);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -27,8 +27,6 @@ for ethernet. This encoding is the one used in dnsmasq lease files.
|
|||||||
The client-id is optional. If it is "*" then it treated as being missing.
|
The client-id is optional. If it is "*" then it treated as being missing.
|
||||||
.SH NOTES
|
.SH NOTES
|
||||||
MUST be run as root - will fail otherwise.
|
MUST be run as root - will fail otherwise.
|
||||||
.SH LIMITATIONS
|
|
||||||
Only usable on IPv4 DHCP leases.
|
|
||||||
.SH SEE ALSO
|
.SH SEE ALSO
|
||||||
.BR dnsmasq (8)
|
.BR dnsmasq (8)
|
||||||
.SH AUTHOR
|
.SH AUTHOR
|
||||||
@@ -117,7 +117,7 @@ static ssize_t netlink_recv(int fd)
|
|||||||
msg.msg_flags = 0;
|
msg.msg_flags = 0;
|
||||||
while ((rc = recvmsg(fd, &msg, MSG_PEEK)) == -1 && errno == EINTR);
|
while ((rc = recvmsg(fd, &msg, MSG_PEEK)) == -1 && errno == EINTR);
|
||||||
|
|
||||||
/* 2.2.x doesn't support MSG_PEEK at all, returning EOPNOTSUPP, so we just grab a
|
/* 2.2.x doesn't suport MSG_PEEK at all, returning EOPNOTSUPP, so we just grab a
|
||||||
big buffer and pray in that case. */
|
big buffer and pray in that case. */
|
||||||
if (rc == -1 && errno == EOPNOTSUPP)
|
if (rc == -1 && errno == EOPNOTSUPP)
|
||||||
{
|
{
|
||||||
@@ -178,7 +178,7 @@ static 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct in_addr find_interface(struct in_addr client, int fd, unsigned int index, int ifrfd, struct ifreq *ifr)
|
static struct in_addr find_interface(struct in_addr client, int fd, unsigned int index)
|
||||||
{
|
{
|
||||||
struct sockaddr_nl addr;
|
struct sockaddr_nl addr;
|
||||||
struct nlmsghdr *h;
|
struct nlmsghdr *h;
|
||||||
@@ -218,17 +218,7 @@ static struct in_addr find_interface(struct in_addr client, int fd, unsigned int
|
|||||||
|
|
||||||
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_DONE)
|
if (h->nlmsg_type == NLMSG_DONE)
|
||||||
{
|
exit(0);
|
||||||
/* No match found, return first address as src/dhcp.c code does */
|
|
||||||
ifr->ifr_addr.sa_family = AF_INET;
|
|
||||||
if (ioctl(ifrfd, SIOCGIFADDR, ifr) != -1)
|
|
||||||
return ((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
fprintf(stderr, "error: local IPv4 address not found\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (h->nlmsg_type == RTM_NEWADDR)
|
else if (h->nlmsg_type == RTM_NEWADDR)
|
||||||
{
|
{
|
||||||
struct ifaddrmsg *ifa = NLMSG_DATA(h);
|
struct ifaddrmsg *ifa = NLMSG_DATA(h);
|
||||||
@@ -265,6 +255,10 @@ int main(int argc, char **argv)
|
|||||||
struct ifreq ifr;
|
struct ifreq ifr;
|
||||||
int fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
|
int fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
|
||||||
int nl = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
|
int nl = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
|
||||||
|
struct iovec iov;
|
||||||
|
|
||||||
|
iov.iov_len = 200;
|
||||||
|
iov.iov_base = malloc(iov.iov_len);
|
||||||
|
|
||||||
if (argc < 4 || argc > 5)
|
if (argc < 4 || argc > 5)
|
||||||
{
|
{
|
||||||
@@ -280,22 +274,16 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
/* This voodoo fakes up a packet coming from the correct interface, which really matters for
|
/* This voodoo fakes up a packet coming from the correct interface, which really matters for
|
||||||
a DHCP server */
|
a DHCP server */
|
||||||
memset(&ifr, 0, sizeof(ifr));
|
strcpy(ifr.ifr_name, argv[1]);
|
||||||
strncpy(ifr.ifr_name, argv[1], sizeof(ifr.ifr_name)-1);
|
|
||||||
ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0';
|
|
||||||
if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)) == -1)
|
if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)) == -1)
|
||||||
{
|
{
|
||||||
perror("cannot setup interface");
|
perror("cannot setup interface");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inet_pton(AF_INET, argv[2], &lease.s_addr) < 1)
|
|
||||||
{
|
|
||||||
perror("invalid ip address");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
server = find_interface(lease, nl, if_nametoindex(argv[1]), fd, &ifr);
|
lease.s_addr = inet_addr(argv[2]);
|
||||||
|
server = find_interface(lease, nl, if_nametoindex(argv[1]));
|
||||||
|
|
||||||
memset(&packet, 0, sizeof(packet));
|
memset(&packet, 0, sizeof(packet));
|
||||||
|
|
||||||
@@ -40,26 +40,6 @@ ClearCache
|
|||||||
Returns nothing. Clears the domain name cache and re-reads
|
Returns nothing. Clears the domain name cache and re-reads
|
||||||
/etc/hosts. The same as sending dnsmasq a HUP signal.
|
/etc/hosts. The same as sending dnsmasq a HUP signal.
|
||||||
|
|
||||||
SetFilterWin2KOption
|
|
||||||
--------------------
|
|
||||||
Takes boolean, sets or resets the --filterwin2k option.
|
|
||||||
|
|
||||||
SetFilterA
|
|
||||||
------------------------
|
|
||||||
Takes boolean, sets or resets the --filter-A option.
|
|
||||||
|
|
||||||
SetFilterAAAA
|
|
||||||
------------------------
|
|
||||||
Takes boolean, sets or resets the --filter-AAAA option.
|
|
||||||
|
|
||||||
SetBogusPrivOption
|
|
||||||
------------------
|
|
||||||
Takes boolean, sets or resets the --bogus-priv option.
|
|
||||||
|
|
||||||
SetLocaliseQueriesOption
|
|
||||||
------------------------
|
|
||||||
Takes boolean, sets or resets the --localise-queries option.
|
|
||||||
|
|
||||||
SetServers
|
SetServers
|
||||||
----------
|
----------
|
||||||
Returns nothing. Takes a set of arguments representing the new
|
Returns nothing. Takes a set of arguments representing the new
|
||||||
@@ -172,103 +152,7 @@ for SetServersEx is represented as
|
|||||||
"/eng.mycorp.com/lab.mycorp.com/1003:1234:abcd::1%eth0"
|
"/eng.mycorp.com/lab.mycorp.com/1003:1234:abcd::1%eth0"
|
||||||
]
|
]
|
||||||
|
|
||||||
GetLoopServers
|
|
||||||
--------------
|
|
||||||
|
|
||||||
(Only available if dnsmasq compiled with HAVE_LOOP)
|
|
||||||
|
|
||||||
Return an array of strings, each string is the IP address of an upstream
|
|
||||||
server which has been found to loop queries back to this dnsmasq instance, and
|
|
||||||
it therefore not being used.
|
|
||||||
|
|
||||||
AddDhcpLease
|
|
||||||
------------
|
|
||||||
|
|
||||||
Returns nothing. Adds or updates a DHCP or DHCPv6 lease to the internal lease
|
|
||||||
database, as if a client requested and obtained a lease.
|
|
||||||
|
|
||||||
If a lease for the IPv4 or IPv6 address already exist, it is overwritten.
|
|
||||||
|
|
||||||
Note that this function will trigger the DhcpLeaseAdded or DhcpLeaseUpdated
|
|
||||||
D-Bus signal and will run the configured DHCP lease script accordingly.
|
|
||||||
|
|
||||||
This function takes many arguments which are the lease parameters:
|
|
||||||
- A string with the textual representation of the IPv4 or IPv6 address of the
|
|
||||||
client.
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
"192.168.1.115"
|
|
||||||
"1003:1234:abcd::1%eth0"
|
|
||||||
"2001:db8:abcd::1"
|
|
||||||
|
|
||||||
- A string representing the hardware address of the client, using the same
|
|
||||||
format as the one used in the lease database.
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
|
|
||||||
"00:23:45:67:89:ab"
|
|
||||||
"06-00:20:e0:3b:13:af" (token ring)
|
|
||||||
|
|
||||||
- The hostname of the client, as an array of bytes (so there is no problem
|
|
||||||
with non-ASCII character encoding). May be empty.
|
|
||||||
|
|
||||||
Example (for "hostname.or.fqdn"):
|
|
||||||
[104, 111, 115, 116, 110, 97, 109, 101, 46, 111, 114, 46, 102, 113, 100, 110]
|
|
||||||
|
|
||||||
- The client identifier (IPv4) or DUID (IPv6) as an array of bytes. May be
|
|
||||||
empty.
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
|
|
||||||
DHCPv6 DUID:
|
|
||||||
[0, 3, 0, 1, 0, 35, 69, 103, 137, 171]
|
|
||||||
DHCPv4 client identifier:
|
|
||||||
[255, 12, 34, 56, 78, 0, 1, 0, 1, 29, 9, 99, 190, 35, 69, 103, 137, 171]
|
|
||||||
|
|
||||||
- The duration of the lease, in seconds. If the lease is updated, then
|
|
||||||
the duration replaces the previous duration.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
7200
|
|
||||||
|
|
||||||
- The IAID (Identity association identifier) of the DHCPv6 lease, as a network
|
|
||||||
byte-order unsigned integer. For DHCPv4 leases, this must be set to 0.
|
|
||||||
|
|
||||||
Example (for IPv6):
|
|
||||||
|
|
||||||
203569230
|
|
||||||
|
|
||||||
- A boolean which, if true, indicates that the DHCPv6 lease is for a temporary
|
|
||||||
address (IA_TA). If false, the DHCPv6 lease is for a non-temporary address
|
|
||||||
(IA_NA). For DHCPv4 leases, this must be set to false.
|
|
||||||
|
|
||||||
RemoveDhcpLease
|
|
||||||
---------------
|
|
||||||
|
|
||||||
Returns nothing. Removes a DHCP or DHCPv6 lease to the internal lease
|
|
||||||
database, as if a client sent a release message to abandon a lease.
|
|
||||||
|
|
||||||
This function takes only one parameter: the text representation of the
|
|
||||||
IPv4 or IPv6 address of the lease to remove.
|
|
||||||
|
|
||||||
Note that this function will trigger the DhcpLeaseRemoved signal and the
|
|
||||||
configured DHCP lease script will be run with the "del" action.
|
|
||||||
|
|
||||||
GetMetrics
|
|
||||||
----------
|
|
||||||
|
|
||||||
Returns an array with various metrics for DNS and DHCP.
|
|
||||||
|
|
||||||
GetServerMetrics
|
|
||||||
----------------
|
|
||||||
|
|
||||||
Returns per-DNS-server metrics.
|
|
||||||
|
|
||||||
ClearMetrics
|
|
||||||
------------
|
|
||||||
|
|
||||||
Clear call metric counters, global and per-server.
|
|
||||||
|
|
||||||
2. SIGNALS
|
2. SIGNALS
|
||||||
----------
|
----------
|
||||||
|
|||||||
Vendored
+20
-480
@@ -1,473 +1,3 @@
|
|||||||
dnsmasq (2.90-1) experimental; urgency=medium
|
|
||||||
|
|
||||||
[ Simon Kelley ]
|
|
||||||
* New upstream. (closes: #1033165)
|
|
||||||
[ Sven Geuer ]
|
|
||||||
* Introduce autokpgtests per d/tests/* (closes: #1034135).
|
|
||||||
* Switch to dpkg-source 3.0 (quilt) format (closes: #1007041).
|
|
||||||
* doc.html: Add patch to eliminate privacy breaches leaving the Donations
|
|
||||||
paragraph as untouched as possible.
|
|
||||||
* Prepend dnsmasq. to default, init, preinst, postinst, prerm, postrm.
|
|
||||||
* Rename d/systemd.service to d/dnsmasq.service.
|
|
||||||
* Rename d/systemd@.service to d/dnsmasq@.service.
|
|
||||||
* Refactor d/rules to use the DH sequencer and fix major lintian issues
|
|
||||||
(closes: #844989, #1040923).
|
|
||||||
Modified files:
|
|
||||||
- d/rules
|
|
||||||
Complete rewrite making use of debhelper and its tools, fixes lintian
|
|
||||||
warning debian-rules-sets-dpkg-architecture-variable.
|
|
||||||
- d/control
|
|
||||||
Build-Depends, Pre-Depends, Depends added or changed as needed, lintian
|
|
||||||
error depends-on-obsolete-package fixed.
|
|
||||||
- d/dnsmasq.default
|
|
||||||
ENABLED removed and comment changed to fix lintian error
|
|
||||||
init.d-script-should-always-start-service.
|
|
||||||
- d/dnsmasq.init
|
|
||||||
Remove handling of obsolete ENABLED flag.
|
|
||||||
Extract code used with System-V-style init and systemd into
|
|
||||||
d/init-system-common, extract code used with systemd only
|
|
||||||
into d/systemd-helper. This fixes lintian warning
|
|
||||||
systemd-service-file-wraps-init-script.
|
|
||||||
Drop workaround for hypothetically non-existent file
|
|
||||||
/lib/lsb/init-functions, it has been around for more than a decade.
|
|
||||||
- d/dnsmasq.service, d/dnsmasq@.service
|
|
||||||
Adapt these files to make use of init-system-common and systemd-helper.
|
|
||||||
- d/dnsmasq.{post,pre}{inst,rm}
|
|
||||||
Rely mostly on the script snippets created by the DH tools to get
|
|
||||||
things done, implicitly fixes the lintian warnings
|
|
||||||
maintainer-script-should-not-use-dpkg-maintscript-helper and
|
|
||||||
command-with-path-in-maintainer-script.
|
|
||||||
- d/resolvconf*
|
|
||||||
Change file mode bits to 0755, the installed files need it
|
|
||||||
New files:
|
|
||||||
- d/dnsmasq.{install,links,maintscript}
|
|
||||||
- d/dnsmasq-base.{dirs,docs,install}
|
|
||||||
- d/dnsmasq-base-lua.{dirs,docs,install,links}
|
|
||||||
- d/dnsmasq-utils.{install,manpages}
|
|
||||||
The DH tools use these to install what was scripted explicitly
|
|
||||||
in the previous version of the d/rules file,
|
|
||||||
lintian warning dbus-policy-in-etc fixed
|
|
||||||
- d/init-system-common
|
|
||||||
- d/systemd-helper
|
|
||||||
These files contain slightly modified code formerly part of in
|
|
||||||
d/dnsmasq.init.
|
|
||||||
Deleted files:
|
|
||||||
- d/*conffiles
|
|
||||||
- d/lintian-override
|
|
||||||
- d/installed-marker
|
|
||||||
These are not in use anymore.
|
|
||||||
* Deal with a removed conffile and changed links.
|
|
||||||
Modified files:
|
|
||||||
- d/dnsmasq-base.{postinst,postrm}
|
|
||||||
New files:
|
|
||||||
- d/dnsmasq-base.maintscript
|
|
||||||
- d/dnsmasq-base-lua.maintscript
|
|
||||||
* Add watch file and upstream's signing key.
|
|
||||||
New files:
|
|
||||||
- d/watch
|
|
||||||
- d/u/signing-key.asc
|
|
||||||
* Remove dependency on package adduser.
|
|
||||||
Modified files:
|
|
||||||
- d/control
|
|
||||||
- d/dnsmasq.post{inst,rm}
|
|
||||||
* Refactor d/copyright to comply with DEP 5 (closes: #966505).
|
|
||||||
* Remove trailing whitespace from various files under debian/.
|
|
||||||
* Bump Standards-Version to 4.6.2.
|
|
||||||
* Specify Rules-Requires-Root.
|
|
||||||
* Update http:// to https:// with Homepage, Vcs-Git and Vcs-Browser.
|
|
||||||
* Introduce d/u/metadata.
|
|
||||||
* Fix lintian issue duplicate-short-description.
|
|
||||||
* Fix lintian issue capitalization-error-in-description.
|
|
||||||
* Bump LUA version to 5.4 (closes: #1050750).
|
|
||||||
Modified files:
|
|
||||||
- d/control
|
|
||||||
- d/t/functions.d/log.patterns
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Fri, 23 Jan 2024 22:52:01 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.89-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 13 Jan 2023 21:57:01 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.88-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
* Fix loss of server configuration (closes: #1020830)
|
|
||||||
Git commit 930428fb970f4991e5c2933fd5a5d2504c18a551
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 2 Nov 2022 22:15:45 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.87-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream. (closes: #1001209, #1003156)
|
|
||||||
* Include new NFTset support in the build.
|
|
||||||
* Fix crash on netboot with DNS server disabled. (closes: #996332)
|
|
||||||
* Fix rare lockup in DNSSEC. (closes: #1001576)
|
|
||||||
* Close old bug. (closes: #902963)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 25 Sep 2022 23:11:25 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.86-1.1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Non-maintainer upload.
|
|
||||||
* Fix --address=/#/...... which was lost in 2.86. (closes: #995655)
|
|
||||||
|
|
||||||
-- Michael Biebl <biebl@debian.org> Wed, 10 Nov 2021 22:05:45 +0100
|
|
||||||
|
|
||||||
dnsmasq (2.86-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* Fix debian/changelog format error. (closes: #986626)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 08 Apr 2021 22:39:00 +0100
|
|
||||||
|
|
||||||
dnsmasq (2.85-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
* Includes fix to CVE-2021-3448.
|
|
||||||
* Fix manpage typos. (closes: #986150)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sat, 03 Apr 2021 22:17:23 +0100
|
|
||||||
|
|
||||||
dnsmasq (2.84-1.2) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Non-maintainer upload.
|
|
||||||
* Bump old-version in dpkg-maintscript-helper dir_to_symlink calls to also
|
|
||||||
clean up after upgrades to an earlier version in testing.
|
|
||||||
|
|
||||||
-- Andreas Beckmann <anbe@debian.org> Thu, 01 Apr 2021 16:01:51 +0200
|
|
||||||
|
|
||||||
dnsmasq (2.84-1.1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Non-maintainer upload.
|
|
||||||
* Fix symlink to directory conversion for /usr/share/doc/dnsmasq.
|
|
||||||
This is achieved by directly calling dpkg-maintscript-helper in the preinst,
|
|
||||||
postinst, and postrm scripts, since the package does not use debhelper.
|
|
||||||
(Closes: #985282)
|
|
||||||
|
|
||||||
-- Sébastien Villemot <sebastien@debian.org> Sun, 28 Mar 2021 10:55:07 +0200
|
|
||||||
|
|
||||||
dnsmasq (2.84-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sun, 24 Jan 2021 22:02:01 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.83-1) unstable; urgency=high
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
* Includes fixes to CVE-2020-25681 - CVE-2020-25687 inclusive.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Fri, 15 Jan 2021 22:22:41 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.82-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Fri, 26 Jun 2020 22:22:41 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.81-4) unstable; urgency=low
|
|
||||||
|
|
||||||
* Remove runit support when building for Ubuntu. (closes: #960401)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Fri, 26 Jun 2020 21:52:44 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.81-3) unstable; urgency=low
|
|
||||||
|
|
||||||
* Fixes to control file for bug 958100
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sun, 19 Apr 2020 21:44:12 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.81-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Fix FTBFS on kFreeBSD. (closes: #958100)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sat, 18 Apr 2020 18:34:15 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.81-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
* Fix nodocs/nodoc confusion in rules. (closes: #922758)
|
|
||||||
* Add Vcs-* fields to control. (closes: #922422)
|
|
||||||
* Add systemd support for multiple daemon instances. (closes: #914305)
|
|
||||||
* Add note explaining that ENABLED is SYSV-init only. (closes: #914755)
|
|
||||||
* Replace ash with dash in contrib/reverse-dns. (closes: #920224)
|
|
||||||
* Move to libidn2. (closes: #932695)
|
|
||||||
* Fix RA problem with two interfaces on same net, but RA service on
|
|
||||||
only one of the interfaces. (closes: #949565)
|
|
||||||
* Fix breakage of dig +trace. (closes: #942363)
|
|
||||||
* Fix build faliure with newer Nettle libraries. (closes: #940985)
|
|
||||||
* Support runscript init-system (closes: #929884)
|
|
||||||
* Security fix for CVE-2019-14834 (closes: #948373)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 8 Apr 2020 17:33:15 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.80-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream. (closes: #837602) (closes: #794640) (closes: #794636)
|
|
||||||
* Close old bugs, long agp fixed. (closes: #802845) (closes: #754299)
|
|
||||||
* Provide usr/lib/tmpfiles.d/dnsmasq.conf. (closes: #872396)
|
|
||||||
* Run restorecon on /run/dnsmasq for SE Linux. (closes: #872397)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Mon, 17 Sep 2018 23:11:25 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.79-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream. (closes: #888200)
|
|
||||||
* Fix trust-anchor regex in init script. (closes: #884347)
|
|
||||||
* Fix exit code for dhcp_release6 (closes: #883596)
|
|
||||||
* Add project homepage to control file. (closes: #887764)
|
|
||||||
* New binary package dnsmasq-base-lua, includes Lua support.
|
|
||||||
* Remove hardwired shlibs dependency for libnettle 3.3 and
|
|
||||||
fix code to avoid ABI breakage as long as compiled against
|
|
||||||
libnettle 3.4 or later. (closes: #891315)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Fri, 16 Feb 2018 19:54:22 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.78-3) unstable; urgency=high
|
|
||||||
|
|
||||||
* Make failure of pidfile chown a warning. (closes: #889857)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 8 Feb 2018 21:26:30 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.78-2) unstable; urgency=high
|
|
||||||
|
|
||||||
* Change ownership of pid file, to keep systemd happy. (closes: #889336)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 6 Feb 2018 17:21:30 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.78-1) unstable; urgency=high
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
Security fixes for CVE-2017-13704 (closes: #877102)
|
|
||||||
Security fixes for CVE-2017-14491 - CVE-2017-14496 inclusive.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sun, 29 Sep 2017 21:34:00 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.77-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Improve sed regexp for parsing root.ds.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Mon, 5 Jun 2017 20:46:32 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.77-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
* Don't register as a resolvconf source when config file
|
|
||||||
includes port=0 to disable DNS.
|
|
||||||
* Handle gratuitous format change in /usr/share/dns/root.ds
|
|
||||||
(closes: #858506) (closes: #860064)
|
|
||||||
* Add lsb-base dependency.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 11 Apr 2017 14:19:20 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.76-5) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Nail libnettle dependency to avoid ABI incompatibility.
|
|
||||||
(closes: #846642)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 14 Dec 2016 17:58:10 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.76-4.1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Non-maintainer upload.
|
|
||||||
* Add two upstream patches to fix binding to an interface being
|
|
||||||
destroyed and recreated. Closes: #834722.
|
|
||||||
+ 2675f2061525bc954be14988d64384b74aa7bf8b
|
|
||||||
+ 16800ea072dd0cdf14d951c4bb8d2808b3dfe53d
|
|
||||||
|
|
||||||
-- Vincent Bernat <bernat@debian.org> Sat, 26 Nov 2016 20:15:34 +0100
|
|
||||||
|
|
||||||
dnsmasq (2.76-4) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Non-maintainer upload.
|
|
||||||
* Fix FTCBFS: Use triplet-prefixed tools. (closes: #836072)
|
|
||||||
|
|
||||||
-- Helmut Grohne <helmut@subdivi.de> Tue, 30 Aug 2016 13:59:12 +0200
|
|
||||||
|
|
||||||
dnsmasq (2.76-3) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Bump auth zone serial on SIGHUP. (closes: #833733)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sat, 13 Aug 2016 21:43:10 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.76-2) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Fix to systemd to fix failure to start with bridge interface.
|
|
||||||
(Closes: #831372)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sat, 16 Jul 2016 22:09:10 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.76-1.2) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Non-maintainer upload.
|
|
||||||
* dnsmasq: Install marker file to determine package installed state,
|
|
||||||
for the benefit of the init script. (Closes: #819856)
|
|
||||||
|
|
||||||
-- Christian Hofstaedtler <zeha@debian.org> Sat, 16 Jul 2016 00:17:57 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.76-1.1) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Non-maintainer upload.
|
|
||||||
* Provide nss-lookup.target for systemd, without relying on insserv.
|
|
||||||
Patch from Michael Biebl <biebl@debian.org>. (Closes: #826242)
|
|
||||||
|
|
||||||
-- Christian Hofstaedtler <zeha@debian.org> Fri, 01 Jul 2016 13:41:11 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.76-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream. (closes: #798586)
|
|
||||||
* Use /run/dnsmasq directly, rather than relying on link from /var/run
|
|
||||||
to avoid problems before /var is mounted. (closes: #800351)
|
|
||||||
* Test for the existence of /usr/share/doc/dnsmasq rather then
|
|
||||||
/etc/dnsmasq.d/README in the daemon startup script. (closes: #819856)
|
|
||||||
* Add --help to manpage and mention dhcp6 in summary. (closes: #821226)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 10 Sep 2015 23:07:21 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.75-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream. (closes: #794095)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 30 Jul 2015 20:58:31 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.74-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream. (LP: #1468611)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 15 Jul 2015 21:54:11 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.73-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Fix behaviour of empty --conf-file (closes: #790341)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 7 Jul 2015 21:46:42 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.73-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream. (closes: #786996)
|
|
||||||
* Tweak field width in cache dump to avoid truncating IPv6
|
|
||||||
addresses. (closes: #771557)
|
|
||||||
* Add newline at the end of example config file. (LP: #1416895)
|
|
||||||
* Make Debian package build reproducible. (closes: #777323)
|
|
||||||
* Add Requires=network.target to systemd unit.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 4 Jun 2015 22:31:42 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.72-3) unstable; urgency=medium
|
|
||||||
|
|
||||||
* debian/systemd.service: switch from Type=dbus to Type=forking.
|
|
||||||
dnsmasq does not depend on dbus, but Type=dbus systemd services cannot
|
|
||||||
work without it. (Closes: #769486, #776530)
|
|
||||||
- debian/init: when called with systemd-exec argument, let dnsmasq
|
|
||||||
go into the background, so Type=forking can detect when it is ready
|
|
||||||
* Remove line containing only whitespace in debian/control.
|
|
||||||
(closes: #777571)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 11 Feb 2015 21:56:12 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.72-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Fix build in Debian-kFreeBSD. (closes: #763693)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 02 Oct 2014 22:34:12 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.72-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
* If dns-root-data package is installed, use it to set the DNSSEC
|
|
||||||
trust anchor(s). Recommend dns-root-data. (closes: #760460)
|
|
||||||
* Handle AD bit correctly in replies from cache. (closes: #761654)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 20 May 2014 21:01:11 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.71-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
* Fix 100% CPU-usage bug when dnsmasq started with cachesize
|
|
||||||
set to zero. (LP: #1314697)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Fri, 16 May 2014 20:17:10 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.70-3) unstable; urgency=medium
|
|
||||||
|
|
||||||
* Write a pid-file, even when being started using systemd, since
|
|
||||||
other components may wish to signal dnsmasq.
|
|
||||||
* Enable dnsmasq systemd unit on install. Otherwise dnsmasq does not run on
|
|
||||||
fresh installations (without administrator handholding) and even worse it
|
|
||||||
is disabled on systems switching from sysv to systemd. Modify
|
|
||||||
postinst/postrm exactly as dh_systemd would, add dependency on
|
|
||||||
init-system-helpers. Closes: #724602
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sun, 11 May 2014 17:45:21 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.70-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Ensure daemon not stared if dnsmasq package has been removed,
|
|
||||||
even if dnsmasq-base is still installed. (closes: #746941)
|
|
||||||
* Tidy cruft in initscript. (closes: #746940)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sun, 04 May 2014 21:34:11 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.70-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 23 Apr 2014 15:14:42 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.69-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
* Set --local-service. (closes: #732610)
|
|
||||||
This tells dnsmasq to ignore DNS requests that don't come
|
|
||||||
from a local network. It's automatically ignored if
|
|
||||||
--interface --except-interface, --listen-address or
|
|
||||||
--auth-server exist in the configuration, so for most
|
|
||||||
installations, it will have no effect, but for
|
|
||||||
otherwise-unconfigured installations, it stops dnsmasq
|
|
||||||
from being vulnerable to DNS-reflection attacks.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 4 Feb 2014 16:28:12 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.68-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream. (closes: #730553)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sun, 8 Dec 2013 15:57:32 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.67-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
* Update resolvconf script. (closes: #720732)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 4 Aug 2013 14:53:22 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.66-4) unstable; urgency=low
|
|
||||||
|
|
||||||
* Update resolvconf script. (closes: #716908)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Wed, 4 Aug 2013 14:48:21 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.66-3) unstable; urgency=low
|
|
||||||
|
|
||||||
* Update resolvconf script for dnscrypt-proxy integration. (closes: #709179)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 28 May 2013 14:39:51 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.66-2) unstable; urgency=low
|
|
||||||
|
|
||||||
* Fix error on startup with some configs. (closes: #709010)
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Mon, 20 May 2013 11:46:11 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.66-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* New upstream.
|
|
||||||
* Add support for noipset in DEB_BUILD_OPTIONS.
|
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Fri, 22 Feb 2013 21:52:13 +0000
|
|
||||||
|
|
||||||
dnsmasq (2.65-1) unstable; urgency=low
|
dnsmasq (2.65-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream.
|
* New upstream.
|
||||||
@@ -974,7 +504,7 @@ dnsmasq (2.26-1) unstable; urgency=high
|
|||||||
dnsmasq (2.25-1) unstable; urgency=low
|
dnsmasq (2.25-1) unstable; urgency=low
|
||||||
|
|
||||||
* Remove bashisms in postinst and prerm scripts.
|
* Remove bashisms in postinst and prerm scripts.
|
||||||
* Remove misconceived dependency on locales.
|
* Remove misconcieved dependency on locales.
|
||||||
* Depend on adduser.
|
* Depend on adduser.
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 01 Dec 2005 21:02:12 +0000
|
-- Simon Kelley <simon@thekelleys.org.uk> Thu, 01 Dec 2005 21:02:12 +0000
|
||||||
@@ -996,7 +526,7 @@ dnsmasq (2.23-1) unstable; urgency=low
|
|||||||
* Add support for DNSMASQ_EXCEPT in /etc/defaults/dnsmasq.
|
* Add support for DNSMASQ_EXCEPT in /etc/defaults/dnsmasq.
|
||||||
putting "lo" in this also disables resolvconf support.
|
putting "lo" in this also disables resolvconf support.
|
||||||
* No longer delete pre-existing /etc/init.d symlinks. The
|
* No longer delete pre-existing /etc/init.d symlinks. The
|
||||||
change in default runlevels which necessitated this
|
change in default runlevels which neccesitated this
|
||||||
is now ancient history and anyway the startup script now
|
is now ancient history and anyway the startup script now
|
||||||
behaves when called twice. (closes: #312111)
|
behaves when called twice. (closes: #312111)
|
||||||
* Tightened config-file parser. (closes: #317030)
|
* Tightened config-file parser. (closes: #317030)
|
||||||
@@ -1181,7 +711,7 @@ dnsmasq (2.6-3) unstable; urgency=low
|
|||||||
|
|
||||||
* Removed reload command from start script and moved force-reload
|
* Removed reload command from start script and moved force-reload
|
||||||
to be equivalent to restart. This is needed to be policy compliant
|
to be equivalent to restart. This is needed to be policy compliant
|
||||||
since SIGHUP doesn't cause dnsmasq to reload its configuration file,
|
since SIHGUP doesn't cause dnsmasq to reload its configuration file,
|
||||||
only the /etc/hosts, /etc/resolv.conf etc. (closes: #244208)
|
only the /etc/hosts, /etc/resolv.conf etc. (closes: #244208)
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Sun, 18 Apr 2004 14:40:51 +0000
|
-- Simon Kelley <simon@thekelleys.org.uk> Sun, 18 Apr 2004 14:40:51 +0000
|
||||||
@@ -1199,7 +729,7 @@ dnsmasq (2.6-2) unstable; urgency=low
|
|||||||
* Added note about the --bind-interfaces option to
|
* Added note about the --bind-interfaces option to
|
||||||
readme.Debian (closes: #241700)
|
readme.Debian (closes: #241700)
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Tue, 13 Apr 2004 18:37:55 +0000
|
-- Simon Kelley <simon@thekelleys.org.uk> Tues, 13 Apr 2004 18:37:55 +0000
|
||||||
|
|
||||||
dnsmasq (2.6-1) unstable; urgency=low
|
dnsmasq (2.6-1) unstable; urgency=low
|
||||||
|
|
||||||
@@ -1271,8 +801,8 @@ dnsmasq (2.0-1) unstable; urgency=low
|
|||||||
* New upstream: This removes the ability to read the
|
* New upstream: This removes the ability to read the
|
||||||
the leases file of ISC DHCP and replaces it with a built-in
|
the leases file of ISC DHCP and replaces it with a built-in
|
||||||
DHCP server. Apologies in advance for breaking backwards
|
DHCP server. Apologies in advance for breaking backwards
|
||||||
compatibility, but this replaces a bit of a hack (the ISC stuff)
|
compatibilty, but this replaces a bit of a hack (the ISC stuff)
|
||||||
with a nicely engineered and much more appropriate solution.
|
with a nicely engineered and much more apropriate solution.
|
||||||
Wearing my upstream-maintainer hat, I want to lose the hack now,
|
Wearing my upstream-maintainer hat, I want to lose the hack now,
|
||||||
rather than have to support it into Sarge.
|
rather than have to support it into Sarge.
|
||||||
* New upstream closes some bugs since they become
|
* New upstream closes some bugs since they become
|
||||||
@@ -1298,7 +828,7 @@ dnsmasq (1.18-1) unstable; urgency=low
|
|||||||
* New upstream which does round-robin. (closes: #215460)
|
* New upstream which does round-robin. (closes: #215460)
|
||||||
* Removed conflicts with other dns servers since it is now
|
* Removed conflicts with other dns servers since it is now
|
||||||
possible to control exactly where dnsmasq listens on multi-homed
|
possible to control exactly where dnsmasq listens on multi-homed
|
||||||
hosts, making co-existence with another nameserver
|
hosts, making co-existance with another nameserver
|
||||||
a viable proposition. (closes #176163)
|
a viable proposition. (closes #176163)
|
||||||
* New upstream allows _ in hostnames and check for illegal
|
* New upstream allows _ in hostnames and check for illegal
|
||||||
names in /etc/hosts. (closes: #218842)
|
names in /etc/hosts. (closes: #218842)
|
||||||
@@ -1384,13 +914,13 @@ dnsmasq (1.11-2) unstable; urgency=low
|
|||||||
|
|
||||||
dnsmasq (1.11-1) unstable; urgency=low
|
dnsmasq (1.11-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream.
|
* New uptream.
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Tues, 12 Jan 2003 22:25:17 -0100
|
-- Simon Kelley <simon@thekelleys.org.uk> Tues, 12 Jan 2003 22:25:17 -0100
|
||||||
|
|
||||||
dnsmasq (1.10-1) unstable; urgency=low
|
dnsmasq (1.10-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream.
|
* New uptream.
|
||||||
* Force service to stop in postinst before restarting. I don't
|
* Force service to stop in postinst before restarting. I don't
|
||||||
understand the circumstances under which it would still be running at
|
understand the circumstances under which it would still be running at
|
||||||
this point, but this is the correct fix anyway. (closes: #169718)
|
this point, but this is the correct fix anyway. (closes: #169718)
|
||||||
@@ -1402,7 +932,7 @@ dnsmasq (1.10-1) unstable; urgency=low
|
|||||||
|
|
||||||
dnsmasq (1.9-1) unstable; urgency=low
|
dnsmasq (1.9-1) unstable; urgency=low
|
||||||
|
|
||||||
* New upstream.
|
* New uptream.
|
||||||
|
|
||||||
-- Simon Kelley <simon@thekelleys.org.uk> Mon, 23 Sept 2002 21:35:07 -0100
|
-- Simon Kelley <simon@thekelleys.org.uk> Mon, 23 Sept 2002 21:35:07 -0100
|
||||||
|
|
||||||
@@ -1546,3 +1076,13 @@ dnsmasq (0.95-1) unstable; urgency=low
|
|||||||
* Initial Release.
|
* Initial Release.
|
||||||
|
|
||||||
-- Simon Kelley <simon@thkelleys.org.uk> Sat, 29 Aug 1998 20:27:27 -0400
|
-- Simon Kelley <simon@thkelleys.org.uk> Sat, 29 Aug 1998 20:27:27 -0400
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Vendored
+5
@@ -0,0 +1,5 @@
|
|||||||
|
/etc/init.d/dnsmasq
|
||||||
|
/etc/default/dnsmasq
|
||||||
|
/etc/dnsmasq.conf
|
||||||
|
/etc/resolvconf/update.d/dnsmasq
|
||||||
|
/etc/insserv.conf.d/dnsmasq
|
||||||
Vendored
+11
-37
@@ -1,27 +1,16 @@
|
|||||||
Source: dnsmasq
|
Source: dnsmasq
|
||||||
Section: net
|
Section: net
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Build-Depends: dh-exec, gettext, libnetfilter-conntrack-dev [linux-any],
|
Build-depends: gettext, libnetfilter-conntrack-dev [linux-any], libidn11-dev, libdbus-1-dev (>=0.61)
|
||||||
libidn2-dev, libdbus-1-dev (>=0.61), libgmp-dev,
|
|
||||||
nettle-dev (>=2.4-3), libbsd-dev [kfreebsd-any],
|
|
||||||
liblua5.4-dev, dh-runit, debhelper-compat (= 13),
|
|
||||||
pkg-config, libnftables-dev
|
|
||||||
Maintainer: Simon Kelley <simon@thekelleys.org.uk>
|
Maintainer: Simon Kelley <simon@thekelleys.org.uk>
|
||||||
Homepage: https://www.thekelleys.org.uk/dnsmasq/doc.html
|
Standards-Version: 3.9.3
|
||||||
Vcs-Git: https://thekelleys.org.uk/git/dnsmasq.git
|
|
||||||
Vcs-Browser: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git
|
|
||||||
Standards-Version: 4.6.2
|
|
||||||
Rules-Requires-Root: no
|
|
||||||
|
|
||||||
Package: dnsmasq
|
Package: dnsmasq
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Pre-Depends: ${misc:Pre-Depends}
|
Depends: netbase, dnsmasq-base(>= ${source:Version})
|
||||||
Depends: netbase, dnsmasq-base,
|
|
||||||
${misc:Depends}
|
|
||||||
Suggests: resolvconf
|
Suggests: resolvconf
|
||||||
Breaks: ${runit:Breaks}
|
Conflicts: resolvconf (<<1.15)
|
||||||
Conflicts: resolvconf (<<1.15), ${runit:Conflicts}
|
Description: Small caching DNS proxy and DHCP/TFTP server
|
||||||
Description: Small caching DNS proxy and DHCP/TFTP server - system daemon
|
|
||||||
Dnsmasq is a lightweight, easy to configure, DNS forwarder and DHCP
|
Dnsmasq is a lightweight, easy to configure, DNS forwarder and DHCP
|
||||||
server. It is designed to provide DNS and optionally, DHCP, to a
|
server. It is designed to provide DNS and optionally, DHCP, to a
|
||||||
small network. It can serve the names of local machines which are
|
small network. It can serve the names of local machines which are
|
||||||
@@ -33,36 +22,21 @@ Description: Small caching DNS proxy and DHCP/TFTP server - system daemon
|
|||||||
|
|
||||||
Package: dnsmasq-base
|
Package: dnsmasq-base
|
||||||
Architecture: any
|
Architecture: any
|
||||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
Depends: adduser, ${shlibs:Depends}
|
||||||
Breaks: dnsmasq (<< 2.63-1~)
|
Breaks: dnsmasq (<< 2.63-1~)
|
||||||
Replaces: dnsmasq (<< 2.63-1~), dnsmasq-base
|
Replaces: dnsmasq (<< 2.63-1~)
|
||||||
Recommends: dns-root-data
|
Description: Small caching DNS proxy and DHCP/TFTP server
|
||||||
Provides: dnsmasq-base
|
|
||||||
Conflicts: dnsmasq-base-lua
|
|
||||||
Description: Small caching DNS proxy and DHCP/TFTP server - executable
|
|
||||||
This package contains the dnsmasq executable and documentation, but
|
This package contains the dnsmasq executable and documentation, but
|
||||||
not the infrastructure required to run it as a system daemon. For
|
not the infrastructure required to run it as a system daemon. For
|
||||||
that, install the dnsmasq package.
|
that, install the dnsmasq package.
|
||||||
|
|
||||||
Package: dnsmasq-base-lua
|
|
||||||
Architecture: any
|
|
||||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
|
||||||
Breaks: dnsmasq (<< 2.63-1~)
|
|
||||||
Replaces: dnsmasq (<< 2.63-1~), dnsmasq-base
|
|
||||||
Recommends: dns-root-data
|
|
||||||
Provides: dnsmasq-base
|
|
||||||
Conflicts: dnsmasq-base
|
|
||||||
Description: Small caching DNS proxy and DHCP/TFTP server - executable, Lua-enabled
|
|
||||||
This package contains the dnsmasq executable and documentation, but
|
|
||||||
not the infrastructure required to run it as a system daemon. For
|
|
||||||
that, install the dnsmasq package. This package is an alternative
|
|
||||||
to dnsmasq-base which includes the Lua interpreter.
|
|
||||||
|
|
||||||
Package: dnsmasq-utils
|
Package: dnsmasq-utils
|
||||||
Architecture: linux-any
|
Architecture: linux-any
|
||||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
Depends: ${shlibs:Depends}
|
||||||
Conflicts: dnsmasq (<<2.40)
|
Conflicts: dnsmasq (<<2.40)
|
||||||
Description: Utilities for manipulating DHCP leases
|
Description: Utilities for manipulating DHCP leases
|
||||||
Small utilities to query a DHCP server's lease database and
|
Small utilities to query a DHCP server's lease database and
|
||||||
remove leases from it. These programs are distributed with dnsmasq
|
remove leases from it. These programs are distributed with dnsmasq
|
||||||
and may not work correctly with other DHCP servers.
|
and may not work correctly with other DHCP servers.
|
||||||
|
|
||||||
|
|
||||||
Vendored
+16
-53
@@ -1,58 +1,21 @@
|
|||||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
dnsmasq is Copyright (c) 2000-2012 Simon Kelley
|
||||||
Upstream-Name: dnsmasq
|
|
||||||
Upstream-Contact: Simon Kelley <simon@thekelleys.org.uk>
|
|
||||||
Source: https://thekelleys.org.uk/dnsmasq/
|
|
||||||
|
|
||||||
Files: *
|
It was downloaded from: http://www.thekelleys.org.uk/dnsmasq/
|
||||||
Copyright: 2000-2024 Simon Kelley <simon@thekelleys.org.uk>
|
|
||||||
License: GPL-2 or GPL-3
|
|
||||||
|
|
||||||
Files: src/dnssec.c
|
This program is free software; you can redistribute it and/or modify
|
||||||
Copyright: 2012-2024 Simon Kelley <simon@thekelleys.org.uk>
|
it under the terms of the GNU General Public License as published by
|
||||||
2012 Giovanni Bajo <rasky@develer.com>
|
the Free Software Foundation; version 2 dated June, 1991, or
|
||||||
|
(at your option) version 3 dated 29 June, 2007.
|
||||||
|
|
||||||
Files: debian/*
|
This program is distributed in the hope that it will be useful,
|
||||||
Copyright: 2004-2024 Simon Kelley <simon@thekelleys.org.uk>
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
2012 Lars Bahner <bahner@debian.org>
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
2024 Sven Geuer <debmaint@g-e-u-e-r.de>
|
GNU General Public License for more details.
|
||||||
License: GPL-2 or GPL-3
|
|
||||||
|
|
||||||
License: GPL-2
|
On Debian GNU/Linux systems, the text of the GNU general public license is
|
||||||
This program is free software; you can redistribute it
|
available in the file /usr/share/common-licenses/GPL-2 or
|
||||||
and/or modify it under the terms of the GNU General Public
|
/usr/share/common-licenses/GPL-3
|
||||||
License as published by the Free Software Foundation;
|
|
||||||
version 2 dated June, 1991.
|
The Debian package of dnsmasq was created by Simon Kelley with assistance
|
||||||
.
|
from Lars Bahner.
|
||||||
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
|
|
||||||
<https://www.gnu.org/licenses/gpl-2.0>.
|
|
||||||
.
|
|
||||||
On Debian systems, the full text of the GNU General Public
|
|
||||||
License can be found in the file
|
|
||||||
`/usr/share/common-licenses/GPL-2'.
|
|
||||||
|
|
||||||
License: GPL-3
|
|
||||||
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 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
|
|
||||||
<https://www.gnu.org/licenses/gpl-3.0>.
|
|
||||||
.
|
|
||||||
On Debian systems, the full text of the GNU General Public
|
|
||||||
License can be found in the file
|
|
||||||
`/usr/share/common-licenses/GPL-3'.
|
|
||||||
+5
-14
@@ -1,5 +1,5 @@
|
|||||||
# This file has six functions:
|
# This file has five functions:
|
||||||
# 1) to completely disable starting this dnsmasq instance
|
# 1) to completely disable starting dnsmasq,
|
||||||
# 2) to set DOMAIN_SUFFIX by running `dnsdomainname`
|
# 2) to set DOMAIN_SUFFIX by running `dnsdomainname`
|
||||||
# 3) to select an alternative config file
|
# 3) to select an alternative config file
|
||||||
# by setting DNSMASQ_OPTS to --conf-file=<file>
|
# by setting DNSMASQ_OPTS to --conf-file=<file>
|
||||||
@@ -7,8 +7,6 @@
|
|||||||
# more configuration variables.
|
# more configuration variables.
|
||||||
# 5) to stop the resolvconf package from controlling dnsmasq's
|
# 5) to stop the resolvconf package from controlling dnsmasq's
|
||||||
# idea of which upstream nameservers to use.
|
# idea of which upstream nameservers to use.
|
||||||
# 6) to avoid using this dnsmasq instance as the system's default resolver
|
|
||||||
# by setting DNSMASQ_EXCEPT="lo"
|
|
||||||
# For upgraders from very old versions, all the shell variables set
|
# For upgraders from very old versions, all the shell variables set
|
||||||
# here in previous versions are still honored by the init script
|
# here in previous versions are still honored by the init script
|
||||||
# so if you just keep your old version of this file nothing will break.
|
# so if you just keep your old version of this file nothing will break.
|
||||||
@@ -16,10 +14,8 @@
|
|||||||
#DOMAIN_SUFFIX=`dnsdomainname`
|
#DOMAIN_SUFFIX=`dnsdomainname`
|
||||||
#DNSMASQ_OPTS="--conf-file=/etc/dnsmasq.alt"
|
#DNSMASQ_OPTS="--conf-file=/etc/dnsmasq.alt"
|
||||||
|
|
||||||
# The dnsmasq daemon is run by default conforming to the Debian Policy.
|
# Whether or not to run the dnsmasq daemon; set to 0 to disable.
|
||||||
# To disable the service,
|
ENABLED=1
|
||||||
# for SYSV init, use "update-rc.d dnsmasq disable",
|
|
||||||
# for systemd, use "systemctl disable dnsmasq".
|
|
||||||
|
|
||||||
# By default search this drop directory for configuration options.
|
# By default search this drop directory for configuration options.
|
||||||
# Libvirt leaves a file here to make the system dnsmasq play nice.
|
# Libvirt leaves a file here to make the system dnsmasq play nice.
|
||||||
@@ -31,12 +27,7 @@ CONFIG_DIR=/etc/dnsmasq.d,.dpkg-dist,.dpkg-old,.dpkg-new
|
|||||||
# If the resolvconf package is installed, dnsmasq will use its output
|
# If the resolvconf package is installed, dnsmasq will use its output
|
||||||
# rather than the contents of /etc/resolv.conf to find upstream
|
# rather than the contents of /etc/resolv.conf to find upstream
|
||||||
# nameservers. Uncommenting this line inhibits this behaviour.
|
# nameservers. Uncommenting this line inhibits this behaviour.
|
||||||
# Note that including a "resolv-file=<filename>" line in
|
# Not that including a "resolv-file=<filename>" line in
|
||||||
# /etc/dnsmasq.conf is not enough to override resolvconf if it is
|
# /etc/dnsmasq.conf is not enough to override resolvconf if it is
|
||||||
# installed: the line below must be uncommented.
|
# installed: the line below must be uncommented.
|
||||||
#IGNORE_RESOLVCONF=yes
|
#IGNORE_RESOLVCONF=yes
|
||||||
|
|
||||||
# If the resolvconf package is installed, dnsmasq will tell resolvconf
|
|
||||||
# to use dnsmasq under 127.0.0.1 as the system's default resolver.
|
|
||||||
# Uncommenting this line inhibits this behaviour.
|
|
||||||
#DNSMASQ_EXCEPT="lo"
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
dnsmasq-base.dirs
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
dnsmasq-base.docs
|
|
||||||
Vendored
-3
@@ -1,3 +0,0 @@
|
|||||||
#!/usr/bin/dh-exec
|
|
||||||
debian/dbus.conf => /usr/share/dbus-1/system.d/dnsmasq.conf
|
|
||||||
trust-anchors.conf /usr/share/dnsmasq-base-lua
|
|
||||||
Vendored
-2
@@ -1,2 +0,0 @@
|
|||||||
usr/share/dnsmasq-base-lua usr/share/dnsmasq-base
|
|
||||||
usr/share/doc/dnsmasq-base-lua usr/share/doc/dnsmasq-base
|
|
||||||
Vendored
-9
@@ -1,9 +0,0 @@
|
|||||||
# With the use of debhelper /usr/share/doc/dnsmasq-base-lua has become a
|
|
||||||
# directory as required in
|
|
||||||
# https://www.debian.org/doc/debian-policy/ch-docs.html#additional-documentation
|
|
||||||
# thus /usr/share/doc/dnsmasq-base will be a link from now onwards.
|
|
||||||
symlink_to_dir /usr/share/doc/dnsmasq-base-lua /usr/share/doc/dnsmasq-base 2.89-1.1~ dnsmasq-base-lua
|
|
||||||
dir_to_symlink /usr/share/doc/dnsmasq-base /usr/share/doc/dnsmasq-base-lua 2.89-1.1~ dnsmasq-base-lua
|
|
||||||
# Due to lintian warning dbus-policy-in-etc this file has been moved to
|
|
||||||
# /usr/share/dbus-1/system.d/dnsmasq.conf and thus is not a conffile any more.
|
|
||||||
rm_conffile /etc/dbus-1/system.d/dnsmasq.conf 2.89-1.1~ dnsmasq-base-lua
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
dnsmasq-base.postinst
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
dnsmasq-base.postrm
|
|
||||||
Vendored
+1
@@ -0,0 +1 @@
|
|||||||
|
/etc/dbus-1/system.d/dnsmasq.conf
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
/var/lib/misc
|
|
||||||
Vendored
-8
@@ -1,8 +0,0 @@
|
|||||||
doc.html
|
|
||||||
setup.html
|
|
||||||
dnsmasq.conf.example
|
|
||||||
FAQ
|
|
||||||
CHANGELOG.archive
|
|
||||||
dbus/DBus-interface
|
|
||||||
debian/systemd_howto
|
|
||||||
debian/readme
|
|
||||||
Vendored
-3
@@ -1,3 +0,0 @@
|
|||||||
#!/usr/bin/dh-exec
|
|
||||||
debian/dbus.conf => /usr/share/dbus-1/system.d/dnsmasq.conf
|
|
||||||
trust-anchors.conf /usr/share/dnsmasq-base
|
|
||||||
Vendored
-3
@@ -1,3 +0,0 @@
|
|||||||
# Due to lintian warning dbus-policy-in-etc this file has been moved to
|
|
||||||
# /usr/share/dbus-1/system.d/dnsmasq.conf and thus is not a conffile any more.
|
|
||||||
rm_conffile /etc/dbus-1/system.d/dnsmasq.conf 2.89-1.1~ dnsmasq-base
|
|
||||||
Vendored
+7
-13
@@ -3,15 +3,12 @@ set -e
|
|||||||
|
|
||||||
# Create the dnsmasq user in dnsmasq-base, so that Dbus doesn't complain.
|
# Create the dnsmasq user in dnsmasq-base, so that Dbus doesn't complain.
|
||||||
|
|
||||||
|
# create a user to run as (code stolen from dovecot-common)
|
||||||
if [ "$1" = "configure" ]; then
|
if [ "$1" = "configure" ]; then
|
||||||
# Create the user to run as.
|
|
||||||
if [ -z "`id -u dnsmasq 2> /dev/null`" ]; then
|
if [ -z "`id -u dnsmasq 2> /dev/null`" ]; then
|
||||||
useradd --system \
|
adduser --system --home /var/lib/misc --gecos "dnsmasq" \
|
||||||
--gid nogroup \
|
--no-create-home --disabled-password \
|
||||||
--comment dnsmasq \
|
--quiet dnsmasq || true
|
||||||
--home-dir /var/lib/misc --no-create-home \
|
|
||||||
--shell /usr/sbin/nologin \
|
|
||||||
dnsmasq
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Make the directory where we keep the pid file - this
|
# Make the directory where we keep the pid file - this
|
||||||
@@ -20,11 +17,8 @@ if [ "$1" = "configure" ]; then
|
|||||||
# dnsmasq-base, but it's much easier to create it here so that
|
# dnsmasq-base, but it's much easier to create it here so that
|
||||||
# we don't have synchronisation issues with the creation of the
|
# we don't have synchronisation issues with the creation of the
|
||||||
# dnsmasq user.
|
# dnsmasq user.
|
||||||
if [ ! -d /run/dnsmasq ]; then
|
if [ ! -d /var/run/dnsmasq ]; then
|
||||||
mkdir /run/dnsmasq
|
mkdir /var/run/dnsmasq
|
||||||
chown dnsmasq:nogroup /run/dnsmasq
|
chown dnsmasq:nogroup /var/run/dnsmasq
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#DEBHELPER#
|
|
||||||
|
|
||||||
Vendored
+6
-5
@@ -2,9 +2,10 @@
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ purge = "$1" ]; then
|
if [ purge = "$1" ]; then
|
||||||
userdel dnsmasq
|
if [ -x "$(command -v deluser)" ]; then
|
||||||
rm -rf /run/dnsmasq
|
deluser --quiet --system dnsmasq > /dev/null || true
|
||||||
|
else
|
||||||
|
echo >&2 "not removing dnsmasq system account because deluser command was not found"
|
||||||
|
fi
|
||||||
|
rm -rf /var/run/dnsmasq
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#DEBHELPER#
|
|
||||||
|
|
||||||
Vendored
-3
@@ -1,3 +0,0 @@
|
|||||||
dhcp_lease_time /usr/bin
|
|
||||||
dhcp_release /usr/bin
|
|
||||||
dhcp_release6 /usr/bin
|
|
||||||
Vendored
-3
@@ -1,3 +0,0 @@
|
|||||||
dhcp_lease_time.1
|
|
||||||
dhcp_release.1
|
|
||||||
dhcp_release6.1
|
|
||||||
Vendored
-170
@@ -1,170 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
### BEGIN INIT INFO
|
|
||||||
# Provides: dnsmasq
|
|
||||||
# Required-Start: $network $remote_fs $syslog
|
|
||||||
# Required-Stop: $network $remote_fs $syslog
|
|
||||||
# Default-Start: 2 3 4 5
|
|
||||||
# Default-Stop: 0 1 6
|
|
||||||
# Description: DHCP and DNS server
|
|
||||||
### END INIT INFO
|
|
||||||
|
|
||||||
# Don't exit on error status
|
|
||||||
set +e
|
|
||||||
|
|
||||||
# The following test ensures the dnsmasq service is not started, when the
|
|
||||||
# package 'dnsmasq' is removed but not purged, even if the dnsmasq-base
|
|
||||||
# package is still in place.
|
|
||||||
if [ -r /usr/share/dnsmasq/init-system-common ]; then
|
|
||||||
# 'dnsmasq' is installed: source initial code used also with systemd.
|
|
||||||
. /usr/share/dnsmasq/init-system-common
|
|
||||||
else
|
|
||||||
# 'dnsmasq' is removed but not purged, or damaged: do nothing.
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Double-check 'dnsmasq-base' or 'dnsmasq-base-lua' is installed.
|
|
||||||
test -x ${DAEMON} || exit 0
|
|
||||||
|
|
||||||
# Source the SysV init-functions which should always be available.
|
|
||||||
. /lib/lsb/init-functions || exit 0
|
|
||||||
|
|
||||||
start()
|
|
||||||
{
|
|
||||||
# Return
|
|
||||||
# 0 if daemon has been started
|
|
||||||
# 1 if daemon was already running
|
|
||||||
# 2 if daemon could not be started
|
|
||||||
|
|
||||||
# /run may be volatile, so we need to ensure that
|
|
||||||
# /run/dnsmasq exists here as well as in postinst
|
|
||||||
if [ ! -d /run/dnsmasq ]; then
|
|
||||||
mkdir /run/dnsmasq || { [ -d /run/dnsmasq ] || return 2 ; }
|
|
||||||
chown dnsmasq:nogroup /run/dnsmasq || return 2
|
|
||||||
fi
|
|
||||||
[ -x /sbin/restorecon ] && /sbin/restorecon /run/dnsmasq
|
|
||||||
|
|
||||||
start-stop-daemon --start --quiet --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --exec ${DAEMON} --test > /dev/null || return 1
|
|
||||||
start-stop-daemon --start --quiet --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --exec ${DAEMON} -- \
|
|
||||||
-x /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid \
|
|
||||||
${MAILHOSTNAME:+ -m ${MAILHOSTNAME}} \
|
|
||||||
${MAILTARGET:+ -t ${MAILTARGET}} \
|
|
||||||
${DNSMASQ_USER:+ -u ${DNSMASQ_USER}} \
|
|
||||||
${DNSMASQ_INTERFACES:+ ${DNSMASQ_INTERFACES}} \
|
|
||||||
${DHCP_LEASE:+ -l ${DHCP_LEASE}} \
|
|
||||||
${DOMAIN_SUFFIX:+ -s ${DOMAIN_SUFFIX}} \
|
|
||||||
${RESOLV_CONF:+ -r ${RESOLV_CONF}} \
|
|
||||||
${CACHESIZE:+ -c ${CACHESIZE}} \
|
|
||||||
${CONFIG_DIR:+ -7 ${CONFIG_DIR}} \
|
|
||||||
${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}} \
|
|
||||||
|| return 2
|
|
||||||
}
|
|
||||||
|
|
||||||
stop()
|
|
||||||
{
|
|
||||||
# Return
|
|
||||||
# 0 if daemon has been stopped
|
|
||||||
# 1 if daemon was already stopped
|
|
||||||
# 2 if daemon could not be stopped
|
|
||||||
# other if a failure occurred
|
|
||||||
start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --name ${NAME}
|
|
||||||
}
|
|
||||||
|
|
||||||
status()
|
|
||||||
{
|
|
||||||
# Return
|
|
||||||
# 0 if daemon is running
|
|
||||||
# 1 if daemon is dead and pid file exists
|
|
||||||
# 3 if daemon is not running
|
|
||||||
# 4 if daemon status is unknown
|
|
||||||
start-stop-daemon --start --quiet --pidfile /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid --exec ${DAEMON} --test > /dev/null
|
|
||||||
case "${?}" in
|
|
||||||
0) [ -e "/run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid" ] && return 1 ; return 3 ;;
|
|
||||||
1) return 0 ;;
|
|
||||||
*) return 4 ;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
case "${1}" in
|
|
||||||
start)
|
|
||||||
log_daemon_msg "Starting ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"
|
|
||||||
start
|
|
||||||
case "${?}" in
|
|
||||||
0)
|
|
||||||
log_end_msg 0
|
|
||||||
start_resolvconf
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
1)
|
|
||||||
log_success_msg "(already running)"
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
log_end_msg 1
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
stop)
|
|
||||||
stop_resolvconf
|
|
||||||
log_daemon_msg "Stopping ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"
|
|
||||||
stop
|
|
||||||
RETVAL="${?}"
|
|
||||||
case "${RETVAL}" in
|
|
||||||
0) log_end_msg 0 ; exit 0 ;;
|
|
||||||
1) log_warning_msg "(not running)" ; exit 0 ;;
|
|
||||||
*) log_end_msg 1; exit 1 ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
restart|force-reload)
|
|
||||||
checkconfig
|
|
||||||
if [ ${?} -ne 0 ]; then
|
|
||||||
NAME="configuration syntax check"
|
|
||||||
RETVAL="2"
|
|
||||||
else
|
|
||||||
stop_resolvconf
|
|
||||||
stop
|
|
||||||
RETVAL="${?}"
|
|
||||||
fi
|
|
||||||
log_daemon_msg "Restarting ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"
|
|
||||||
case "${RETVAL}" in
|
|
||||||
0|1)
|
|
||||||
sleep 2
|
|
||||||
start
|
|
||||||
case "${?}" in
|
|
||||||
0)
|
|
||||||
log_end_msg 0
|
|
||||||
start_resolvconf
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
log_end_msg 1
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
log_end_msg 1
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
log_daemon_msg "Checking ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"
|
|
||||||
status
|
|
||||||
case "${?}" in
|
|
||||||
0) log_success_msg "(running)" ; exit 0 ;;
|
|
||||||
1) log_success_msg "(dead, pid file exists)" ; exit 1 ;;
|
|
||||||
3) log_success_msg "(not running)" ; exit 3 ;;
|
|
||||||
*) log_success_msg "(unknown)" ; exit 4 ;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
dump-stats)
|
|
||||||
kill -s USR1 `cat /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid`
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Usage: /etc/init.d/${NAME} {start|stop|restart|force-reload|dump-stats|status}" >&2
|
|
||||||
exit 3
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
Vendored
-8
@@ -1,8 +0,0 @@
|
|||||||
#!/usr/bin/dh-exec
|
|
||||||
debian/resolvconf => /etc/resolvconf/update.d/dnsmasq
|
|
||||||
debian/resolvconf-package => /usr/lib/resolvconf/dpkg-event.d/dnsmasq
|
|
||||||
debian/init-system-common => /usr/share/dnsmasq/init-system-common
|
|
||||||
debian/systemd-helper => /usr/share/dnsmasq/systemd-helper
|
|
||||||
dnsmasq.conf.example => /etc/dnsmasq.conf
|
|
||||||
debian/readme.dnsmasq.d => /etc/dnsmasq.d/README
|
|
||||||
debian/insserv => /etc/insserv.conf.d/dnsmasq
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
usr/share/dnsmasq-base/trust-anchors.conf usr/share/dnsmasq/trust-anchors.conf
|
|
||||||
Vendored
-2
@@ -1,2 +0,0 @@
|
|||||||
# /usr/share/doc/dnsmasq was a symlink in versions < 2.81-1 (see #985282)
|
|
||||||
symlink_to_dir /usr/share/doc/dnsmasq dnsmasq-base 2.84-1.2~ dnsmasq
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
debian/dnsmasq.runscript name=dnsmasq,logscript,presubj
|
|
||||||
Vendored
-5
@@ -1,5 +0,0 @@
|
|||||||
#!/bin/sh -eu
|
|
||||||
if [ -x /sbin/resolvconf ] ; then
|
|
||||||
/sbin/resolvconf -d lo.dnsmasq
|
|
||||||
fi
|
|
||||||
|
|
||||||
Vendored
-43
@@ -1,43 +0,0 @@
|
|||||||
#!/lib/runit/invoke-run
|
|
||||||
|
|
||||||
readonly name=dnsmasq
|
|
||||||
readonly daemon=/usr/sbin/dnsmasq
|
|
||||||
readonly marker=/usr/share/dnsmasq/installed-marker
|
|
||||||
|
|
||||||
test -e "${marker}" || exec sv down "${name}"
|
|
||||||
test -x "${daemon}" || exec sv down "${name}"
|
|
||||||
|
|
||||||
if [ ! "${RESOLV_CONF:-}" ] &&
|
|
||||||
[ "${IGNORE_RESOLVCONF:-}" != "yes" ] &&
|
|
||||||
[ -x /sbin/resolvconf ]
|
|
||||||
then
|
|
||||||
RESOLV_CONF=/run/dnsmasq/resolv.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
# This tells dnsmasq to ignore DNS requests that don't come from a local network.
|
|
||||||
# It's automatically ignored if --interface --except-interface, --listen-address
|
|
||||||
# or --auth-server exist in the configuration, so for most installations, it will
|
|
||||||
# have no effect, but for otherwise-unconfigured installations, it stops dnsmasq
|
|
||||||
# from being vulnerable to DNS-reflection attacks.
|
|
||||||
|
|
||||||
DNSMASQ_OPTS="${DNSMASQ_OPTS:-} --local-service"
|
|
||||||
|
|
||||||
# If the dns-root-data package is installed, then the trust anchors will be
|
|
||||||
# available in $ROOT_DS, in BIND zone-file format. Reformat as dnsmasq
|
|
||||||
# --trust-anchor options.
|
|
||||||
|
|
||||||
ROOT_DS="/usr/share/dns/root.ds"
|
|
||||||
|
|
||||||
if [ -f $ROOT_DS ]; then
|
|
||||||
DNSMASQ_OPTS="$DNSMASQ_OPTS `env LC_ALL=C sed -rne "s/^([.a-zA-Z0-9]+)([[:space:]]+[0-9]+)*([[:space:]]+IN)*[[:space:]]+DS[[:space:]]+/--trust-anchor=\1,/;s/[[:space:]]+/,/gp" $ROOT_DS | tr '\n' ' '`"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p /run/dnsmasq
|
|
||||||
chown dnsmasq:nogroup /run/dnsmasq
|
|
||||||
[ -x /sbin/restorecon ] && /sbin/restorecon /run/dnsmasq
|
|
||||||
exec "${daemon}" \
|
|
||||||
--keep-in-foreground \
|
|
||||||
--log-facility=/dev/stdout \
|
|
||||||
${RESOLV_CONF:+ -r $RESOLV_CONF} \
|
|
||||||
${DNSMASQ_OPTS} \
|
|
||||||
-u dnsmasq
|
|
||||||
Vendored
-31
@@ -1,31 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=dnsmasq - A lightweight DHCP and caching DNS server
|
|
||||||
Requires=network.target
|
|
||||||
Wants=nss-lookup.target
|
|
||||||
Before=nss-lookup.target
|
|
||||||
After=network.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=forking
|
|
||||||
PIDFile=/run/dnsmasq/dnsmasq.pid
|
|
||||||
|
|
||||||
# Test the config file and refuse starting if it is not valid.
|
|
||||||
ExecStartPre=/usr/share/dnsmasq/systemd-helper checkconfig
|
|
||||||
|
|
||||||
# We run dnsmasq via the /usr/share/dnsmasq/systemd-helper script which acts
|
|
||||||
# as a wrapper picking up extra configuration files and then execs dnsmasq
|
|
||||||
# itself, when called with the "exec" function.
|
|
||||||
ExecStart=/usr/share/dnsmasq/systemd-helper exec
|
|
||||||
|
|
||||||
# The *-resolvconf functions configure (and deconfigure)
|
|
||||||
# resolvconf to work with the dnsmasq DNS server. They're called like
|
|
||||||
# this to get correct error handling (ie don't start-resolvconf if the
|
|
||||||
# dnsmasq daemon fails to start).
|
|
||||||
ExecStartPost=/usr/share/dnsmasq/systemd-helper start-resolvconf
|
|
||||||
ExecStop=/usr/share/dnsmasq/systemd-helper stop-resolvconf
|
|
||||||
|
|
||||||
|
|
||||||
ExecReload=/bin/kill -HUP $MAINPID
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
d /run/dnsmasq 755 dnsmasq nogroup
|
|
||||||
Vendored
-31
@@ -1,31 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=dnsmasq (%i) - A lightweight DHCP and caching DNS server
|
|
||||||
Requires=network.target
|
|
||||||
Wants=nss-lookup.target
|
|
||||||
Before=nss-lookup.target
|
|
||||||
After=network.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=forking
|
|
||||||
PIDFile=/run/dnsmasq/dnsmasq.%i.pid
|
|
||||||
|
|
||||||
# Test the config file and refuse starting if it is not valid.
|
|
||||||
ExecStartPre=/usr/share/dnsmasq/systemd-helper checkconfig "%i"
|
|
||||||
|
|
||||||
# We run dnsmasq via the /usr/share/dnsmasq/systemd-helper script which acts
|
|
||||||
# as a wrapper picking up extra configuration files and then execs dnsmasq
|
|
||||||
# itself, when called with the "exec" function.
|
|
||||||
ExecStart=/usr/share/dnsmasq/systemd-helper exec "%i"
|
|
||||||
|
|
||||||
# The *-resolvconf functions configure (and deconfigure)
|
|
||||||
# resolvconf to work with the dnsmasq DNS server. They're called like
|
|
||||||
# this to get correct error handling (ie don't start-resolvconf if the
|
|
||||||
# dnsmasq daemon fails to start).
|
|
||||||
ExecStartPost=/usr/share/dnsmasq/systemd-helper start-resolvconf "%i"
|
|
||||||
ExecStop=/usr/share/dnsmasq/systemd-helper stop-resolvconf "%i"
|
|
||||||
|
|
||||||
|
|
||||||
ExecReload=/bin/kill -HUP $MAINPID
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
Vendored
+290
@@ -0,0 +1,290 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
### BEGIN INIT INFO
|
||||||
|
# Provides: dnsmasq
|
||||||
|
# Required-Start: $network $remote_fs $syslog
|
||||||
|
# Required-Stop: $network $remote_fs $syslog
|
||||||
|
# Default-Start: 2 3 4 5
|
||||||
|
# Default-Stop: 0 1 6
|
||||||
|
# Description: DHCP and DNS server
|
||||||
|
### END INIT INFO
|
||||||
|
|
||||||
|
set +e # Don't exit on error status
|
||||||
|
|
||||||
|
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
||||||
|
DAEMON=/usr/sbin/dnsmasq
|
||||||
|
NAME=dnsmasq
|
||||||
|
DESC="DNS forwarder and DHCP server"
|
||||||
|
|
||||||
|
# Most configuration options in /etc/default/dnsmasq are deprecated
|
||||||
|
# but still honoured.
|
||||||
|
ENABLED=1
|
||||||
|
if [ -r /etc/default/$NAME ]; then
|
||||||
|
. /etc/default/$NAME
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Get the system locale, so that messages are in the correct language, and the
|
||||||
|
# charset for IDN is correct
|
||||||
|
if [ -r /etc/default/locale ]; then
|
||||||
|
. /etc/default/locale
|
||||||
|
export LANG
|
||||||
|
fi
|
||||||
|
|
||||||
|
test -x $DAEMON || exit 0
|
||||||
|
|
||||||
|
# Provide skeleton LSB log functions for backports which don't have LSB functions.
|
||||||
|
if [ -f /lib/lsb/init-functions ]; then
|
||||||
|
. /lib/lsb/init-functions
|
||||||
|
else
|
||||||
|
log_warning_msg () {
|
||||||
|
echo "${@}."
|
||||||
|
}
|
||||||
|
|
||||||
|
log_success_msg () {
|
||||||
|
echo "${@}."
|
||||||
|
}
|
||||||
|
|
||||||
|
log_daemon_msg () {
|
||||||
|
echo -n "${1}: $2"
|
||||||
|
}
|
||||||
|
|
||||||
|
log_end_msg () {
|
||||||
|
if [ $1 -eq 0 ]; then
|
||||||
|
echo "."
|
||||||
|
elif [ $1 -eq 255 ]; then
|
||||||
|
/bin/echo -e " (warning)."
|
||||||
|
else
|
||||||
|
/bin/echo -e " failed!"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# RESOLV_CONF:
|
||||||
|
# If the resolvconf package is installed then use the resolv conf file
|
||||||
|
# that it provides as the default. Otherwise use /etc/resolv.conf as
|
||||||
|
# the default.
|
||||||
|
#
|
||||||
|
# If IGNORE_RESOLVCONF is set in /etc/default/dnsmasq or an explicit
|
||||||
|
# filename is set there then this inhibits the use of the resolvconf-provided
|
||||||
|
# information.
|
||||||
|
#
|
||||||
|
# Note that if the resolvconf package is installed it is not possible to
|
||||||
|
# override it just by configuration in /etc/dnsmasq.conf, it is necessary
|
||||||
|
# to set IGNORE_RESOLVCONF=yes in /etc/default/dnsmasq.
|
||||||
|
|
||||||
|
if [ ! "$RESOLV_CONF" ] &&
|
||||||
|
[ "$IGNORE_RESOLVCONF" != "yes" ] &&
|
||||||
|
[ -x /sbin/resolvconf ]
|
||||||
|
then
|
||||||
|
RESOLV_CONF=/var/run/dnsmasq/resolv.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
for INTERFACE in $DNSMASQ_INTERFACE; do
|
||||||
|
DNSMASQ_INTERFACES="$DNSMASQ_INTERFACES -i $INTERFACE"
|
||||||
|
done
|
||||||
|
|
||||||
|
for INTERFACE in $DNSMASQ_EXCEPT; do
|
||||||
|
DNSMASQ_INTERFACES="$DNSMASQ_INTERFACES -I $INTERFACE"
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ ! "$DNSMASQ_USER" ]; then
|
||||||
|
DNSMASQ_USER="dnsmasq"
|
||||||
|
fi
|
||||||
|
|
||||||
|
start()
|
||||||
|
{
|
||||||
|
# Return
|
||||||
|
# 0 if daemon has been started
|
||||||
|
# 1 if daemon was already running
|
||||||
|
# 2 if daemon could not be started
|
||||||
|
|
||||||
|
# /var/run may be volatile, so we need to ensure that
|
||||||
|
# /var/run/dnsmasq exists here as well as in postinst
|
||||||
|
if [ ! -d /var/run/dnsmasq ]; then
|
||||||
|
mkdir /var/run/dnsmasq || return 2
|
||||||
|
chown dnsmasq:nogroup /var/run/dnsmasq || return 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
start-stop-daemon --start --quiet --pidfile /var/run/dnsmasq/$NAME.pid --exec $DAEMON --test > /dev/null || return 1
|
||||||
|
start-stop-daemon --start --quiet --pidfile /var/run/dnsmasq/$NAME.pid --exec $DAEMON -- \
|
||||||
|
-x /var/run/dnsmasq/$NAME.pid \
|
||||||
|
${MAILHOSTNAME:+ -m $MAILHOSTNAME} \
|
||||||
|
${MAILTARGET:+ -t $MAILTARGET} \
|
||||||
|
${DNSMASQ_USER:+ -u $DNSMASQ_USER} \
|
||||||
|
${DNSMASQ_INTERFACES:+ $DNSMASQ_INTERFACES} \
|
||||||
|
${DHCP_LEASE:+ -l $DHCP_LEASE} \
|
||||||
|
${DOMAIN_SUFFIX:+ -s $DOMAIN_SUFFIX} \
|
||||||
|
${RESOLV_CONF:+ -r $RESOLV_CONF} \
|
||||||
|
${CACHESIZE:+ -c $CACHESIZE} \
|
||||||
|
${CONFIG_DIR:+ -7 $CONFIG_DIR} \
|
||||||
|
${DNSMASQ_OPTS:+ $DNSMASQ_OPTS} \
|
||||||
|
|| return 2
|
||||||
|
}
|
||||||
|
|
||||||
|
start_resolvconf()
|
||||||
|
{
|
||||||
|
# If interface "lo" is explicitly disabled in /etc/default/dnsmasq
|
||||||
|
# Then dnsmasq won't be providing local DNS, so don't add it to
|
||||||
|
# the resolvconf server set.
|
||||||
|
for interface in $DNSMASQ_EXCEPT
|
||||||
|
do
|
||||||
|
[ $interface = lo ] && return
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -x /sbin/resolvconf ] ; then
|
||||||
|
echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.$NAME
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
stop()
|
||||||
|
{
|
||||||
|
# Return
|
||||||
|
# 0 if daemon has been stopped
|
||||||
|
# 1 if daemon was already stopped
|
||||||
|
# 2 if daemon could not be stopped
|
||||||
|
# other if a failure occurred
|
||||||
|
start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile /var/run/dnsmasq/$NAME.pid --name $NAME
|
||||||
|
RETVAL="$?"
|
||||||
|
[ "$RETVAL" = 2 ] && return 2
|
||||||
|
return "$RETVAL"
|
||||||
|
}
|
||||||
|
|
||||||
|
stop_resolvconf()
|
||||||
|
{
|
||||||
|
if [ -x /sbin/resolvconf ] ; then
|
||||||
|
/sbin/resolvconf -d lo.$NAME
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
status()
|
||||||
|
{
|
||||||
|
# Return
|
||||||
|
# 0 if daemon is running
|
||||||
|
# 1 if daemon is dead and pid file exists
|
||||||
|
# 3 if daemon is not running
|
||||||
|
# 4 if daemon status is unknown
|
||||||
|
start-stop-daemon --start --quiet --pidfile /var/run/dnsmasq/$NAME.pid --exec $DAEMON --test > /dev/null
|
||||||
|
case "$?" in
|
||||||
|
0) [ -e "/var/run/dnsmasq/$NAME.pid" ] && return 1 ; return 3 ;;
|
||||||
|
1) return 0 ;;
|
||||||
|
*) return 4 ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
test "$ENABLED" != "0" || exit 0
|
||||||
|
log_daemon_msg "Starting $DESC" "$NAME"
|
||||||
|
start
|
||||||
|
case "$?" in
|
||||||
|
0)
|
||||||
|
log_end_msg 0
|
||||||
|
start_resolvconf
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
1)
|
||||||
|
log_success_msg "(already running)"
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
log_end_msg 1
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
stop_resolvconf
|
||||||
|
if [ "$ENABLED" != "0" ]; then
|
||||||
|
log_daemon_msg "Stopping $DESC" "$NAME"
|
||||||
|
fi
|
||||||
|
stop
|
||||||
|
RETVAL="$?"
|
||||||
|
if [ "$ENABLED" = "0" ]; then
|
||||||
|
case "$RETVAL" in
|
||||||
|
0) log_daemon_msg "Stopping $DESC" "$NAME"; log_end_msg 0 ;;
|
||||||
|
esac
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
case "$RETVAL" in
|
||||||
|
0) log_end_msg 0 ; exit 0 ;;
|
||||||
|
1) log_warning_msg "(not running)" ; exit 0 ;;
|
||||||
|
*) log_end_msg 1; exit 1 ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
restart|force-reload)
|
||||||
|
test "$ENABLED" != "0" || exit 1
|
||||||
|
$DAEMON --test ${CONFIG_DIR:+ -7 $CONFIG_DIR} ${DNSMASQ_OPTS:+ $DNSMASQ_OPTS} >/dev/null 2>&1
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
NAME="configuration syntax check"
|
||||||
|
RETVAL="2"
|
||||||
|
else
|
||||||
|
stop_resolvconf
|
||||||
|
stop
|
||||||
|
RETVAL="$?"
|
||||||
|
fi
|
||||||
|
log_daemon_msg "Restarting $DESC" "$NAME"
|
||||||
|
case "$RETVAL" in
|
||||||
|
0|1)
|
||||||
|
sleep 2
|
||||||
|
start
|
||||||
|
case "$?" in
|
||||||
|
0)
|
||||||
|
log_end_msg 0
|
||||||
|
start_resolvconf
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
log_end_msg 1
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
log_end_msg 1
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
log_daemon_msg "Checking $DESC" "$NAME"
|
||||||
|
status
|
||||||
|
case "$?" in
|
||||||
|
0) log_success_msg "(running)" ; exit 0 ;;
|
||||||
|
1) log_success_msg "(dead, pid file exists)" ; exit 1 ;;
|
||||||
|
3) log_success_msg "(not running)" ; exit 3 ;;
|
||||||
|
*) log_success_msg "(unknown)" ; exit 4 ;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
dump-stats)
|
||||||
|
kill -s USR1 `cat /var/run/dnsmasq/$NAME.pid`
|
||||||
|
;;
|
||||||
|
systemd-start-resolvconf)
|
||||||
|
start_resolvconf
|
||||||
|
;;
|
||||||
|
systemd-stop-resolvconf)
|
||||||
|
stop_resolvconf
|
||||||
|
;;
|
||||||
|
systemd-exec)
|
||||||
|
# --pid-file without argument disables writing a PIDfile, we don't need one with sytemd.
|
||||||
|
# Enable DBus by default because we use DBus activation with systemd.
|
||||||
|
exec $DAEMON --keep-in-foreground --pid-file --enable-dbus \
|
||||||
|
${MAILHOSTNAME:+ -m $MAILHOSTNAME} \
|
||||||
|
${MAILTARGET:+ -t $MAILTARGET} \
|
||||||
|
${DNSMASQ_USER:+ -u $DNSMASQ_USER} \
|
||||||
|
${DNSMASQ_INTERFACES:+ $DNSMASQ_INTERFACES} \
|
||||||
|
${DHCP_LEASE:+ -l $DHCP_LEASE} \
|
||||||
|
${DOMAIN_SUFFIX:+ -s $DOMAIN_SUFFIX} \
|
||||||
|
${RESOLV_CONF:+ -r $RESOLV_CONF} \
|
||||||
|
${CACHESIZE:+ -c $CACHESIZE} \
|
||||||
|
${CONFIG_DIR:+ -7 $CONFIG_DIR} \
|
||||||
|
${DNSMASQ_OPTS:+ $DNSMASQ_OPTS}
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload|dump-stats|status}" >&2
|
||||||
|
exit 3
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
|
||||||
Vendored
-102
@@ -1,102 +0,0 @@
|
|||||||
# -*- shell-script -*-
|
|
||||||
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
|
||||||
DAEMON=/usr/sbin/dnsmasq
|
|
||||||
NAME=dnsmasq
|
|
||||||
DESC="DNS forwarder and DHCP server"
|
|
||||||
INSTANCE="${2}"
|
|
||||||
|
|
||||||
# Most configuration options in /etc/default/dnsmasq are deprecated
|
|
||||||
# but still honoured.
|
|
||||||
if [ -r /etc/default/${NAME}${INSTANCE:+.${INSTANCE}} ]; then
|
|
||||||
. /etc/default/${NAME}${INSTANCE:+.${INSTANCE}}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Get the system locale, so that messages are in the correct language, and the
|
|
||||||
# charset for IDN is correct
|
|
||||||
if [ -r /etc/default/locale ]; then
|
|
||||||
. /etc/default/locale
|
|
||||||
export LANG
|
|
||||||
fi
|
|
||||||
|
|
||||||
# RESOLV_CONF:
|
|
||||||
# If the resolvconf package is installed then use the resolv conf file
|
|
||||||
# that it provides as the default. Otherwise use /etc/resolv.conf as
|
|
||||||
# the default.
|
|
||||||
#
|
|
||||||
# If IGNORE_RESOLVCONF is set in /etc/default/dnsmasq or an explicit
|
|
||||||
# filename is set there then this inhibits the use of the resolvconf-provided
|
|
||||||
# information.
|
|
||||||
#
|
|
||||||
# Note that if the resolvconf package is installed it is not possible to
|
|
||||||
# override it just by configuration in /etc/dnsmasq.conf, it is necessary
|
|
||||||
# to set IGNORE_RESOLVCONF=yes in /etc/default/dnsmasq.
|
|
||||||
|
|
||||||
if [ ! "${RESOLV_CONF}" ] &&
|
|
||||||
[ "${IGNORE_RESOLVCONF}" != "yes" ] &&
|
|
||||||
[ -x /sbin/resolvconf ]
|
|
||||||
then
|
|
||||||
RESOLV_CONF=/run/dnsmasq/resolv.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
for INTERFACE in ${DNSMASQ_INTERFACE}; do
|
|
||||||
DNSMASQ_INTERFACES="${DNSMASQ_INTERFACES} -i ${INTERFACE}"
|
|
||||||
done
|
|
||||||
|
|
||||||
for INTERFACE in ${DNSMASQ_EXCEPT}; do
|
|
||||||
DNSMASQ_INTERFACES="${DNSMASQ_INTERFACES} -I ${INTERFACE}"
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ ! "${DNSMASQ_USER}" ]; then
|
|
||||||
DNSMASQ_USER="dnsmasq"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# This tells dnsmasq to ignore DNS requests that don't come from a local network.
|
|
||||||
# It's automatically ignored if --interface --except-interface, --listen-address
|
|
||||||
# or --auth-server exist in the configuration, so for most installations, it will
|
|
||||||
# have no effect, but for otherwise-unconfigured installations, it stops dnsmasq
|
|
||||||
# from being vulnerable to DNS-reflection attacks.
|
|
||||||
|
|
||||||
DNSMASQ_OPTS="${DNSMASQ_OPTS} --local-service"
|
|
||||||
|
|
||||||
# If the dns-root-data package is installed, then the trust anchors will be
|
|
||||||
# available in ROOT_DS, in BIND zone-file format. Reformat as dnsmasq
|
|
||||||
# --trust-anchor options.
|
|
||||||
|
|
||||||
ROOT_DS="/usr/share/dns/root.ds"
|
|
||||||
|
|
||||||
if [ -f ${ROOT_DS} ]; then
|
|
||||||
DNSMASQ_OPTS="$DNSMASQ_OPTS `env LC_ALL=C sed -rne "s/^([.a-zA-Z0-9]+)([[:space:]]+[0-9]+)*([[:space:]]+IN)*[[:space:]]+DS[[:space:]]+/--trust-anchor=\1,/;s/[[:space:]]+/,/gp" $ROOT_DS | tr '\n' ' '`"
|
|
||||||
fi
|
|
||||||
|
|
||||||
checkconfig()
|
|
||||||
{
|
|
||||||
${DAEMON} --test ${CONFIG_DIR:+ -7 ${CONFIG_DIR}} ${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}} >/dev/null 2>&1
|
|
||||||
}
|
|
||||||
|
|
||||||
start_resolvconf()
|
|
||||||
{
|
|
||||||
# If interface "lo" is explicitly disabled in /etc/default/dnsmasq
|
|
||||||
# Then dnsmasq won't be providing local DNS, so don't add it to
|
|
||||||
# the resolvconf server set.
|
|
||||||
for interface in ${DNSMASQ_EXCEPT}; do
|
|
||||||
[ ${interface} = lo ] && return
|
|
||||||
done
|
|
||||||
|
|
||||||
# Also skip this if DNS functionality is disabled in /etc/dnsmasq.conf
|
|
||||||
if grep -qs '^port=0' /etc/dnsmasq.conf; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -x /sbin/resolvconf ] ; then
|
|
||||||
echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.${NAME}${INSTANCE:+.${INSTANCE}}
|
|
||||||
fi
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
stop_resolvconf()
|
|
||||||
{
|
|
||||||
if [ -x /sbin/resolvconf ] ; then
|
|
||||||
/sbin/resolvconf -d lo.${NAME}${INSTANCE:+.${INSTANCE}}
|
|
||||||
fi
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
-40
@@ -1,40 +0,0 @@
|
|||||||
Description: Remove or replace privacy breaching logos and forms
|
|
||||||
Lintian complains about these by issuing the tags privacy-breach-logo and
|
|
||||||
privacy-breach-donation.
|
|
||||||
Forwarded: not-needed
|
|
||||||
Author: Sven Geuer <debmaint@g-e-u-e-r.de>
|
|
||||||
Last-Update: 2023-11-18
|
|
||||||
|
|
||||||
--- a/doc.html
|
|
||||||
+++ b/doc.html
|
|
||||||
@@ -1,14 +1,11 @@
|
|
||||||
<HTML>
|
|
||||||
<HEAD>
|
|
||||||
<TITLE> Dnsmasq - network services for small networks.</TITLE>
|
|
||||||
-<link rel="icon" href="http://www.thekelleys.org.uk/dnsmasq/images/favicon.ico">
|
|
||||||
</HEAD>
|
|
||||||
<BODY BGCOLOR="WHITE">
|
|
||||||
<table width="100%" border="0" cellpadding="0" cellspacing="0">
|
|
||||||
<tr>
|
|
||||||
-<td align="left" valign="middle"><img border="0" src="http://www.thekelleys.org.uk/dnsmasq/images/icon.png" /></td>
|
|
||||||
<td align="middle" valign="middle"><h1>Dnsmasq</h1></td>
|
|
||||||
-<td align="right" valign="middle"><img border="0" src="http://www.thekelleys.org.uk/dnsmasq/images/icon.png" /></td></tr>
|
|
||||||
</table>
|
|
||||||
Dnsmasq provides network infrastructure for small networks: DNS, DHCP, router advertisement and network boot. It is designed to be
|
|
||||||
lightweight and have a small footprint, suitable for resource constrained routers and firewalls. It has also been widely used
|
|
||||||
@@ -88,14 +85,6 @@
|
|
||||||
Dnsmasq is mainly written and maintained by Simon Kelley. For most of its life, dnsmasq has been a spare-time project.
|
|
||||||
These days I'm working on it as my main activity.
|
|
||||||
I don't have an employer or anyone who pays me regularly to work on dnsmasq. If you'd like to make
|
|
||||||
-a contribution towards my expenses, please use the donation button below.
|
|
||||||
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
|
|
||||||
-<input type="hidden" name="cmd" value="_s-xclick">
|
|
||||||
-<input type="hidden" name="hosted_button_id" value="V3X9GVW5GX6DA">
|
|
||||||
-<input type="image" src="https://www.paypalobjects.com/en_US/GB/i/btn/btn_donateCC_LG.gif" border="0" name="submit" alt="PayPal – The safer, easier way to pay online.">
|
|
||||||
-<img alt="" border="0" src="https://www.paypalobjects.com/en_GB/i/scr/pixel.gif" width="1" height="1">
|
|
||||||
-</form>
|
|
||||||
-
|
|
||||||
-
|
|
||||||
+a contribution towards my expenses, please use the donation button at <A HREF="https://www.thekelleys.org.uk/dnsmasq/doc.html">the project's home page</A>.
|
|
||||||
</BODY>
|
|
||||||
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
eliminate-privacy-breaches.patch
|
|
||||||
Vendored
+22
@@ -0,0 +1,22 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ -x /etc/init.d/dnsmasq ]; then
|
||||||
|
update-rc.d dnsmasq defaults 15 85 >/dev/null
|
||||||
|
|
||||||
|
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
|
||||||
|
if [ -e /var/run/dnsmasq/dnsmasq.pid ]; then
|
||||||
|
ACTION=restart
|
||||||
|
else
|
||||||
|
ACTION=start
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -x /usr/sbin/invoke-rc.d ] ; then
|
||||||
|
invoke-rc.d dnsmasq $ACTION || true
|
||||||
|
else
|
||||||
|
/etc/init.d/dnsmasq $ACTION || true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
Vendored
+6
@@ -0,0 +1,6 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ purge = "$1" ]; then
|
||||||
|
update-rc.d dnsmasq remove >/dev/null
|
||||||
|
fi
|
||||||
Vendored
+14
@@ -0,0 +1,14 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ "$1" = "remove" ]; then
|
||||||
|
if [ -x /usr/sbin/invoke-rc.d ] ; then
|
||||||
|
invoke-rc.d dnsmasq stop || true
|
||||||
|
else
|
||||||
|
/etc/init.d/dnsmasq stop || true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
|
||||||
|
|
||||||
Vendored
+3
-7
@@ -31,7 +31,7 @@ Notes on configuring dnsmasq as packaged for Debian.
|
|||||||
as the first nameserver address in /etc/resolv.conf.
|
as the first nameserver address in /etc/resolv.conf.
|
||||||
|
|
||||||
(6) In the absence of resolvconf, dns-nameservers lines in
|
(6) In the absence of resolvconf, dns-nameservers lines in
|
||||||
/etc/network/interfaces are ignored. If you do not use
|
/etc/network/interfaces are ignored. If you do do not use
|
||||||
resolvconf, list 127.0.0.1 as the first nameserver address
|
resolvconf, list 127.0.0.1 as the first nameserver address
|
||||||
in /etc/resolv.conf and configure your nameservers using
|
in /etc/resolv.conf and configure your nameservers using
|
||||||
"server=<IP-address>" lines in /etc/dnsmasq.conf.
|
"server=<IP-address>" lines in /etc/dnsmasq.conf.
|
||||||
@@ -54,20 +54,16 @@ Notes on configuring dnsmasq as packaged for Debian.
|
|||||||
nodhcp : omit DHCP support.
|
nodhcp : omit DHCP support.
|
||||||
nodhcp6 : omit DHCPv6 support.
|
nodhcp6 : omit DHCPv6 support.
|
||||||
noscript : omit lease-change script support.
|
noscript : omit lease-change script support.
|
||||||
uselua : provide support for lease-change scripts written
|
use_lua : provide support for lease-change scripts written
|
||||||
in Lua.
|
in Lua.
|
||||||
noipv6 : omit IPv6 support.
|
noipv6 : omit IPv6 support.
|
||||||
nodbus : omit DBus support.
|
nodbus : omit DBus support.
|
||||||
noconntrack : omit connection tracking support.
|
noconntrack : omit connection tracking support.
|
||||||
noipset : omit IPset support.
|
|
||||||
nonftset : omit nftset support.
|
|
||||||
nortc : compile alternate mode suitable for systems without an RTC.
|
nortc : compile alternate mode suitable for systems without an RTC.
|
||||||
noi18n : omit translations and internationalisation support.
|
noi18n : omit translations and internationalisation support.
|
||||||
noidn : omit international domain name support, must be
|
noidn : omit international domain name support, must be
|
||||||
combined with noi18n to be effective.
|
combined with noi18n to be effective.
|
||||||
gitversion : set the version of the produced packages from the
|
|
||||||
git-derived versioning information on the source,
|
|
||||||
rather than the debian changelog.
|
|
||||||
|
|
||||||
(9) Dnsmasq comes as three packages - dnsmasq-utils, dnsmasq-base and
|
(9) Dnsmasq comes as three packages - dnsmasq-utils, dnsmasq-base and
|
||||||
dnsmasq. Dnsmasq-base provides the dnsmasq executable and
|
dnsmasq. Dnsmasq-base provides the dnsmasq executable and
|
||||||
|
|||||||
+13
-27
@@ -1,22 +1,23 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# Script to update the resolver list for dnsmasq
|
# Script to update the resolver list for dnsmasq
|
||||||
#
|
#
|
||||||
# N.B. Resolvconf may run us even if dnsmasq is not (yet) running.
|
# N.B. Resolvconf may run us even if dnsmasq is not running.
|
||||||
# If dnsmasq is installed then we go ahead and update the resolver list
|
# If dnsmasq is installed then we go ahead and update
|
||||||
# in case dnsmasq is started later.
|
# the resolver list in case dnsmasq is started later.
|
||||||
#
|
#
|
||||||
# Assumption: On entry, PWD contains the resolv.conf-type files.
|
# Assumption: On entry, PWD contains the resolv.conf-type files
|
||||||
#
|
#
|
||||||
# This file is part of the dnsmasq package.
|
# Requires bash because it uses a non-POSIX printf extension.
|
||||||
|
#
|
||||||
|
# Licensed under the GNU GPL. See /usr/share/common-licenses/GPL.
|
||||||
#
|
#
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
RUN_DIR="/run/dnsmasq"
|
RUN_DIR="/var/run/dnsmasq"
|
||||||
RSLVRLIST_FILE="${RUN_DIR}/resolv.conf"
|
RSLVRLIST_FILE="${RUN_DIR}/resolv.conf"
|
||||||
TMP_FILE="${RSLVRLIST_FILE}_new.$$"
|
TMP_FILE="${RSLVRLIST_FILE}_new.$$"
|
||||||
MY_NAME_FOR_RESOLVCONF="dnsmasq"
|
|
||||||
|
|
||||||
[ -x /usr/sbin/dnsmasq ] || exit 0
|
[ -x /usr/sbin/dnsmasq ] || exit 0
|
||||||
[ -x /lib/resolvconf/list-records ] || exit 1
|
[ -x /lib/resolvconf/list-records ] || exit 1
|
||||||
@@ -26,7 +27,7 @@ PATH=/bin:/sbin
|
|||||||
report_err() { echo "$0: Error: $*" >&2 ; }
|
report_err() { echo "$0: Error: $*" >&2 ; }
|
||||||
|
|
||||||
# Stores arguments (minus duplicates) in RSLT, separated by spaces
|
# Stores arguments (minus duplicates) in RSLT, separated by spaces
|
||||||
# Doesn't work properly if an argument itself contains whitespace
|
# Doesn't work properly if an argument itself contain whitespace
|
||||||
uniquify()
|
uniquify()
|
||||||
{
|
{
|
||||||
RSLT=""
|
RSLT=""
|
||||||
@@ -44,22 +45,7 @@ if [ ! -d "$RUN_DIR" ] && ! mkdir --parents --mode=0755 "$RUN_DIR" ; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
RSLVCNFFILES=""
|
RSLVCNFFILES="$(/lib/resolvconf/list-records | sed -e '/^lo.dnsmasq$/d')"
|
||||||
for F in $(/lib/resolvconf/list-records --after "lo.$MY_NAME_FOR_RESOLVCONF") ; do
|
|
||||||
case "$F" in
|
|
||||||
"lo.$MY_NAME_FOR_RESOLVCONF")
|
|
||||||
# Omit own record
|
|
||||||
;;
|
|
||||||
lo.*)
|
|
||||||
# Include no more records after one for a local nameserver
|
|
||||||
RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
RSLVCNFFILES="${RSLVCNFFILES:+$RSLVCNFFILES }$F"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
NMSRVRS=""
|
NMSRVRS=""
|
||||||
if [ "$RSLVCNFFILES" ] ; then
|
if [ "$RSLVCNFFILES" ] ; then
|
||||||
@@ -70,8 +56,8 @@ fi
|
|||||||
# Dnsmasq uses the mtime of $RSLVRLIST_FILE, with a resolution of one second,
|
# Dnsmasq uses the mtime of $RSLVRLIST_FILE, with a resolution of one second,
|
||||||
# to detect changes in the file. This means that if a resolvconf update occurs
|
# to detect changes in the file. This means that if a resolvconf update occurs
|
||||||
# within one second of the previous one then dnsmasq may fail to notice the
|
# within one second of the previous one then dnsmasq may fail to notice the
|
||||||
# more recent change. To work around this problem we sleep one second here
|
# more recent change. To work around this problem we sleep here to ensure
|
||||||
# if necessary in order to ensure that the new mtime is different.
|
# that the new mtime is different.
|
||||||
if [ -f "$RSLVRLIST_FILE" ] && [ "$(ls -go --time-style='+%s' "$RSLVRLIST_FILE" | { read p h s t n ; echo "$t" ; })" = "$(date +%s)" ] ; then
|
if [ -f "$RSLVRLIST_FILE" ] && [ "$(ls -go --time-style='+%s' "$RSLVRLIST_FILE" | { read p h s t n ; echo "$t" ; })" = "$(date +%s)" ] ; then
|
||||||
sleep 1
|
sleep 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
File mode changed.
Vendored
+160
-87
@@ -1,127 +1,200 @@
|
|||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
# -*- makefile -*-
|
# debian/rules file - for dnsmasq.
|
||||||
|
# Copyright 2001-2011 by Simon Kelley
|
||||||
|
# Based on the sample in the debian hello package which carries the following:
|
||||||
|
# Copyright 1994,1995 by Ian Jackson.
|
||||||
|
# I hereby give you perpetual unlimited permission to copy,
|
||||||
|
# modify and relicense this file, provided that you do not remove
|
||||||
|
# my name from the file itself. (I assert my moral right of
|
||||||
|
# paternity under the Copyright, Designs and Patents Act 1988.)
|
||||||
|
# This file may have to be extensively modified
|
||||||
|
|
||||||
# Uncomment this to turn on verbose mode.
|
package=dnsmasq-base
|
||||||
export DH_VERBOSE=1
|
|
||||||
|
|
||||||
# Make sure lintian does not complain about missing hardenings.
|
CFLAGS = $(shell export DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS); dpkg-buildflags --get CFLAGS)
|
||||||
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
|
CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
|
||||||
|
CFLAGS += -Wall -W
|
||||||
|
|
||||||
include /usr/share/dpkg/architecture.mk
|
LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
|
||||||
|
|
||||||
PREFIX = /usr
|
|
||||||
# Upstream does not handle CPPFLAGS, so we add it to CFLAGS here.
|
|
||||||
CFLAGS += $(CPPFLAGS)
|
|
||||||
COPTS =
|
COPTS =
|
||||||
|
|
||||||
|
TARGET = install-i18n
|
||||||
|
|
||||||
|
DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
|
||||||
|
|
||||||
ifeq (,$(filter nodbus,$(DEB_BUILD_OPTIONS)))
|
ifeq (,$(filter nodbus,$(DEB_BUILD_OPTIONS)))
|
||||||
COPTS += -DHAVE_DBUS
|
COPTS += -DHAVE_DBUS
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq (,$(filter noidn, $(DEB_BUILD_OPTIONS)))
|
|
||||||
COPTS += -DHAVE_LIBIDN2
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq (,$(filter nonftset, $(DEB_BUILD_OPTIONS)))
|
|
||||||
COPTS += -DHAVE_NFTSET
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (,$(filter noconntrack,$(DEB_BUILD_OPTIONS)))
|
ifeq (,$(filter noconntrack,$(DEB_BUILD_OPTIONS)))
|
||||||
ifeq ($(DEB_HOST_ARCH_OS),linux)
|
ifeq ($(DEB_BUILD_ARCH_OS),linux)
|
||||||
COPTS += -DHAVE_CONNTRACK
|
COPTS += -DHAVE_CONNTRACK
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter noipset,$(DEB_BUILD_OPTIONS)))
|
|
||||||
COPTS += -DNO_IPSET
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (,$(filter nodhcp6,$(DEB_BUILD_OPTIONS)))
|
ifneq (,$(filter nodhcp6,$(DEB_BUILD_OPTIONS)))
|
||||||
COPTS += -DNO_DHCP6
|
COPTS += -DNO_DHCP6
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter noipv6,$(DEB_BUILD_OPTIONS)))
|
ifneq (,$(filter noipv6,$(DEB_BUILD_OPTIONS)))
|
||||||
COPTS += -DNO_IPV6
|
COPTS += -DNO_IPV6
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter notftp,$(DEB_BUILD_OPTIONS)))
|
ifneq (,$(filter notftp,$(DEB_BUILD_OPTIONS)))
|
||||||
COPTS += -DNO_TFTP
|
COPTS += -DNO_TFTP
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter nodhcp,$(DEB_BUILD_OPTIONS)))
|
ifneq (,$(filter nodhcp,$(DEB_BUILD_OPTIONS)))
|
||||||
COPTS += -DNO_DHCP
|
COPTS += -DNO_DHCP
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter noscript,$(DEB_BUILD_OPTIONS)))
|
ifneq (,$(filter noscript,$(DEB_BUILD_OPTIONS)))
|
||||||
COPTS += -DNO_SCRIPT
|
COPTS += -DNO_SCRIPT
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter nortc,$(DEB_BUILD_OPTIONS)))
|
ifneq (,$(filter nortc,$(DEB_BUILD_OPTIONS)))
|
||||||
COPTS += -DHAVE_BROKEN_RTC
|
COPTS += -DHAVE_BROKEN_RTC
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (,$(filter nodnssec,$(DEB_BUILD_OPTIONS)))
|
ifneq (,$(filter noi18n,$(DEB_BUILD_OPTIONS)))
|
||||||
COPTS += -DHAVE_DNSSEC
|
TARGET = install
|
||||||
|
ifeq (,$(filter noidn, $(DEB_BUILD_OPTIONS)))
|
||||||
|
COPTS += -DHAVE_IDN
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq (,$(filter uselua,$(DEB_BUILD_OPTIONS)))
|
||||||
|
COPTS += -DHAVE_LUASCRIPT
|
||||||
|
endif
|
||||||
|
|
||||||
%:
|
clean:
|
||||||
# Ubuntu and derivates do not support runit, see
|
$(checkdir)
|
||||||
# https://bugs.debian.org/960401 for details.
|
rm -rf debian/daemon debian/base debian/utils debian/*~ debian/files debian/substvars debian/utils-substvars
|
||||||
if dpkg-vendor --derives-from Ubuntu; then \
|
make clean
|
||||||
dh $@; \
|
make -C contrib/wrt clean
|
||||||
else \
|
|
||||||
dh $@ --with runit; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Upstream builds and installs in one go, so do we.
|
binary-indep: checkroot
|
||||||
override_dh_auto_build:
|
$(checkdir)
|
||||||
|
rm -rf debian/daemon
|
||||||
|
install -m 755 \
|
||||||
|
-d debian/daemon/DEBIAN \
|
||||||
|
-d debian/daemon/usr/share/doc \
|
||||||
|
-d debian/daemon/etc/init.d \
|
||||||
|
-d debian/daemon/etc/dnsmasq.d \
|
||||||
|
-d debian/daemon/etc/resolvconf/update.d \
|
||||||
|
-d debian/daemon/usr/lib/resolvconf/dpkg-event.d \
|
||||||
|
-d debian/daemon/etc/default \
|
||||||
|
-d debian/daemon/lib/systemd/system \
|
||||||
|
-d debian/daemon/etc/insserv.conf.d
|
||||||
|
install -m 644 debian/conffiles debian/daemon/DEBIAN
|
||||||
|
install -m 755 debian/postinst debian/postrm debian/prerm debian/daemon/DEBIAN
|
||||||
|
install -m 755 debian/init debian/daemon/etc/init.d/dnsmasq
|
||||||
|
install -m 755 debian/resolvconf debian/daemon/etc/resolvconf/update.d/dnsmasq
|
||||||
|
install -m 755 debian/resolvconf-package debian/daemon/usr/lib/resolvconf/dpkg-event.d/dnsmasq
|
||||||
|
install -m 644 debian/default debian/daemon/etc/default/dnsmasq
|
||||||
|
install -m 644 dnsmasq.conf.example debian/daemon/etc/dnsmasq.conf
|
||||||
|
install -m 644 debian/readme.dnsmasq.d debian/daemon/etc/dnsmasq.d/README
|
||||||
|
install -m 644 debian/systemd.service debian/daemon/lib/systemd/system/dnsmasq.service
|
||||||
|
install -m 644 debian/insserv debian/daemon/etc/insserv.conf.d/dnsmasq
|
||||||
|
ln -s $(package) debian/daemon/usr/share/doc/dnsmasq
|
||||||
|
cd debian/daemon && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
|
||||||
|
dpkg-gencontrol -pdnsmasq -Pdebian/daemon
|
||||||
|
chown -R root.root debian/daemon
|
||||||
|
chmod -R g-ws debian/daemon
|
||||||
|
dpkg --build debian/daemon ..
|
||||||
|
|
||||||
override_dh_auto_install:
|
binary-arch: checkroot
|
||||||
dh_auto_build -p dnsmasq-base --no-parallel -- install-i18n \
|
$(checkdir)
|
||||||
BUILDDIR=debian/auto-build/dnsmasq-base \
|
rm -rf debian/base
|
||||||
DESTDIR=$(CURDIR)/debian/dnsmasq-base \
|
install -m 755 \
|
||||||
PREFIX=$(PREFIX) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
|
-d debian/base/DEBIAN \
|
||||||
COPTS="$(COPTS)"
|
-d debian/base/etc/dbus-1/system.d \
|
||||||
dh_auto_build -p dnsmasq-base-lua --no-parallel -- install-i18n \
|
-d debian/base/usr/share/doc/$(package) \
|
||||||
BUILDDIR=debian/auto-build/dnsmasq-base-lua \
|
-d debian/base/usr/share/doc/$(package)/examples \
|
||||||
DESTDIR=$(CURDIR)/debian/dnsmasq-base-lua \
|
-d debian/base/var/run \
|
||||||
PREFIX=$(PREFIX) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
|
-d debian/base/var/lib/misc
|
||||||
COPTS="$(COPTS) -DHAVE_LUASCRIPT"
|
make $(TARGET) PREFIX=/usr DESTDIR=`pwd`/debian/base CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" COPTS="$(COPTS)" CC=gcc
|
||||||
dh_auto_build -p dnsmasq-utils -D contrib/lease-tools
|
ifeq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
|
||||||
|
install -m 644 doc.html debian/base/usr/share/doc/$(package)/.
|
||||||
override_dh_auto_clean:
|
install -m 644 setup.html debian/base/usr/share/doc/$(package)/.
|
||||||
dh_auto_clean -p dnsmasq-base -- \
|
install -m 644 dnsmasq.conf.example debian/base/usr/share/doc/$(package)/examples/.
|
||||||
BUILDDIR=debian/auto-build/dnsmasq-base
|
install -m 644 FAQ debian/base/usr/share/doc/$(package)/.
|
||||||
dh_auto_clean -p dnsmasq-base-lua -- \
|
gzip -9 debian/base/usr/share/doc/$(package)/FAQ
|
||||||
BUILDDIR=debian/auto-build/dnsmasq-base-lua
|
install -m 644 CHANGELOG debian/base/usr/share/doc/$(package)/changelog
|
||||||
rm -rf debian/auto-build
|
gzip -9 debian/base/usr/share/doc/$(package)/changelog
|
||||||
dh_auto_clean -p dnsmasq-utils -D contrib/lease-tools
|
install -m 644 CHANGELOG.archive debian/base/usr/share/doc/$(package)/changelog.archive
|
||||||
|
gzip -9 debian/base/usr/share/doc/$(package)/changelog.archive
|
||||||
override_dh_install:
|
install -m 644 dbus/DBus-interface debian/base/usr/share/doc/$(package)/.
|
||||||
dh_install -p dnsmasq-utils --sourcedir=contrib/lease-tools
|
gzip -9 debian/base/usr/share/doc/$(package)/DBus-interface
|
||||||
dh_install --remaining-packages
|
endif
|
||||||
|
install -m 644 debian/dnsmasq-base.conffiles debian/base/DEBIAN/conffiles
|
||||||
# If 'nodoc' is absent from DEB_BUILD_OPTIONS, Correct name or location of
|
install -m 755 debian/dnsmasq-base.postinst debian/base/DEBIAN/postinst
|
||||||
# some doc files.
|
install -m 755 debian/dnsmasq-base.postrm debian/base/DEBIAN/postrm
|
||||||
# We would prefer do this via dh-exec if it would support dh_installdocs.
|
install -m 644 debian/changelog debian/base/usr/share/doc/$(package)/changelog.Debian
|
||||||
ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
|
gzip -9 debian/base/usr/share/doc/$(package)/changelog.Debian
|
||||||
execute_after_dh_installdocs:
|
install -m 644 debian/readme debian/base/usr/share/doc/$(package)/README.Debian
|
||||||
for d in $(CURDIR)/debian/dnsmasq-base*/usr/share/doc/dnsmasq-base*; do \
|
install -m 644 debian/copyright debian/base/usr/share/doc/$(package)/copyright
|
||||||
cd $$d; \
|
install -m 644 debian/dbus.conf debian/base/etc/dbus-1/system.d/dnsmasq.conf
|
||||||
mv readme README.Debian; \
|
gzip -9 debian/base/usr/share/man/man8/dnsmasq.8
|
||||||
mv CHANGELOG.archive changelog.archive; \
|
for f in debian/base/usr/share/man/*; do \
|
||||||
mkdir examples; \
|
if [ -f $$f/man8/dnsmasq.8 ]; then \
|
||||||
mv dnsmasq.conf.example examples/; \
|
gzip -9 $$f/man8/dnsmasq.8 ; \
|
||||||
|
fi \
|
||||||
done
|
done
|
||||||
|
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
|
||||||
|
strip -R .note -R .comment debian/base/usr/sbin/dnsmasq
|
||||||
|
endif
|
||||||
|
cd debian/base && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
|
||||||
|
dpkg-shlibdeps debian/base/usr/sbin/dnsmasq
|
||||||
|
dpkg-gencontrol -pdnsmasq-base -Pdebian/base
|
||||||
|
chown -R root.root debian/base
|
||||||
|
chmod -R g-ws debian/base
|
||||||
|
dpkg --build debian/base ..
|
||||||
|
|
||||||
|
ifeq ($(DEB_BUILD_ARCH_OS),linux)
|
||||||
|
rm -rf debian/utils
|
||||||
|
install -m 755 -d debian/utils/DEBIAN \
|
||||||
|
-d debian/utils/usr/share/man/man1 \
|
||||||
|
-d debian/utils/usr/bin \
|
||||||
|
-d debian/utils/usr/share/doc/dnsmasq-utils
|
||||||
|
make -C contrib/wrt PREFIX=/usr DESTDIR=`pwd`/debian/utils CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" COPTS="$(COPTS)" CC=gcc
|
||||||
|
install -m 755 contrib/wrt/dhcp_release debian/utils/usr/bin/dhcp_release
|
||||||
|
install -m 644 contrib/wrt/dhcp_release.1 debian/utils/usr/share/man/man1/dhcp_release.1
|
||||||
|
gzip -9 debian/utils/usr/share/man/man1/dhcp_release.1
|
||||||
|
install -m 755 contrib/wrt/dhcp_lease_time debian/utils/usr/bin/dhcp_lease_time
|
||||||
|
install -m 644 contrib/wrt/dhcp_lease_time.1 debian/utils/usr/share/man/man1/dhcp_lease_time.1
|
||||||
|
install -m 644 debian/copyright debian/utils/usr/share/doc/dnsmasq-utils/copyright
|
||||||
|
install -m 644 debian/changelog debian/utils/usr/share/doc/dnsmasq-utils/changelog.Debian
|
||||||
|
gzip -9 debian/utils/usr/share/doc/dnsmasq-utils/changelog.Debian
|
||||||
|
gzip -9 debian/utils/usr/share/man/man1/dhcp_lease_time.1
|
||||||
|
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
|
||||||
|
strip -R .note -R .comment debian/utils/usr/bin/dhcp_release
|
||||||
|
strip -R .note -R .comment debian/utils/usr/bin/dhcp_lease_time
|
||||||
|
endif
|
||||||
|
cd debian/utils && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | xargs -r0 md5sum > DEBIAN/md5sums
|
||||||
|
dpkg-shlibdeps -Tdebian/utils-substvars debian/utils/usr/bin/dhcp_release debian/utils/usr/bin/dhcp_lease_time
|
||||||
|
dpkg-gencontrol -Tdebian/utils-substvars -pdnsmasq-utils -Pdebian/utils
|
||||||
|
chown -R root.root debian/utils
|
||||||
|
chmod -R g-ws debian/utils
|
||||||
|
dpkg --build debian/utils ..
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# If 'nodoc' is present in DEB_BUILD_OPTIONS, drop the man pages already
|
define checkdir
|
||||||
# installed by the upstream build script. Then, let dh_installman do what
|
test -f Makefile -a -f debian/rules
|
||||||
# else needs doing.
|
endef
|
||||||
override_dh_installman:
|
|
||||||
ifneq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
|
# Below here is fairly generic really
|
||||||
rm -rf debian/dnsmasq-base*/usr/share/man
|
|
||||||
endif
|
binary: binary-arch binary-indep
|
||||||
dh_installman -p dnsmasq-utils --sourcedir=contrib/lease-tools
|
|
||||||
dh_installman --remaining-packages
|
build:
|
||||||
|
build-arch:
|
||||||
|
build-indep:
|
||||||
|
|
||||||
|
checkroot:
|
||||||
|
test root = "`whoami`"
|
||||||
|
|
||||||
|
.PHONY: binary binary-arch binary-indep clean checkroot
|
||||||
|
|
||||||
|
|
||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
3.0 (quilt)
|
1.0
|
||||||
Vendored
-34
@@ -1,34 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
. /usr/share/dnsmasq/init-system-common
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
checkconfig)
|
|
||||||
checkconfig
|
|
||||||
;;
|
|
||||||
start-resolvconf)
|
|
||||||
start_resolvconf
|
|
||||||
;;
|
|
||||||
stop-resolvconf)
|
|
||||||
stop_resolvconf
|
|
||||||
;;
|
|
||||||
exec)
|
|
||||||
# /run may be volatile, so we need to ensure that
|
|
||||||
# /run/dnsmasq exists here as well as in postinst
|
|
||||||
if [ ! -d /run/dnsmasq ]; then
|
|
||||||
mkdir /run/dnsmasq || { [ -d /run/dnsmasq ] || exit 2 ; }
|
|
||||||
chown dnsmasq:nogroup /run/dnsmasq || exit 2
|
|
||||||
fi
|
|
||||||
exec ${DAEMON} -x /run/dnsmasq/${NAME}${INSTANCE:+.${INSTANCE}}.pid \
|
|
||||||
${MAILHOSTNAME:+ -m ${MAILHOSTNAME}} \
|
|
||||||
${MAILTARGET:+ -t ${MAILTARGET}} \
|
|
||||||
${DNSMASQ_USER:+ -u ${DNSMASQ_USER}} \
|
|
||||||
${DNSMASQ_INTERFACES:+ ${DNSMASQ_INTERFACES}} \
|
|
||||||
${DHCP_LEASE:+ -l ${DHCP_LEASE}} \
|
|
||||||
${DOMAIN_SUFFIX:+ -s ${DOMAIN_SUFFIX}} \
|
|
||||||
${RESOLV_CONF:+ -r ${RESOLV_CONF}} \
|
|
||||||
${CACHESIZE:+ -c ${CACHESIZE}} \
|
|
||||||
${CONFIG_DIR:+ -7 ${CONFIG_DIR}} \
|
|
||||||
${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}}
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
Vendored
+33
@@ -0,0 +1,33 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=A lightweight DHCP and caching DNS server
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=dbus
|
||||||
|
BusName=uk.org.thekelleys.dnsmasq
|
||||||
|
|
||||||
|
# Test the config file and refuse starting if it is not valid.
|
||||||
|
ExecStartPre=/usr/sbin/dnsmasq --test
|
||||||
|
|
||||||
|
# We run dnsmasq via the /etc/init.d/dnsmasq script which acts as a
|
||||||
|
# wrapper picking up extra configuration files and then execs dnsmasq
|
||||||
|
# itself, when called with the "systemd-exec" function.
|
||||||
|
#
|
||||||
|
# It also adds the command-line flags
|
||||||
|
# --keep-in-foreground --pid-file --enable-dbus
|
||||||
|
# to disable writing a pid-file (not needed with systemd) and
|
||||||
|
# enable DBus by default because we use DBus activation.
|
||||||
|
#
|
||||||
|
ExecStart=/etc/init.d/dnsmasq systemd-exec
|
||||||
|
|
||||||
|
# The systemd-*-resolvconf functions configure (and deconfigure)
|
||||||
|
# resolvconf to work with the dnsmasq DNS server. They're called liek
|
||||||
|
# this to get correct error handling (ie don't start-resolvconf if the
|
||||||
|
# dnsmasq daemon fails to start.
|
||||||
|
ExecStartPost=/etc/init.d/dnsmasq systemd-start-resolvconf
|
||||||
|
ExecStop=/etc/init.d/dnsmasq systemd-stop-resolvconf
|
||||||
|
|
||||||
|
|
||||||
|
ExecReload=/bin/kill -HUP $MAINPID
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
Vendored
-41
@@ -1,41 +0,0 @@
|
|||||||
HOWTO
|
|
||||||
=====
|
|
||||||
dnsmasq comes with the possibility to run multiple systemd service instances on the same machine.
|
|
||||||
There is the main service which is enabled by default via `systemctl enable dnsmasq.service` and uses the configuration from `/etc/default/dnsmasq`.
|
|
||||||
|
|
||||||
Additional service instances can be enabled via `systemctl enable dnsmasq@<instance name>.service` that use the configuration from `/etc/default/dnsmasq.<instance name>`.
|
|
||||||
It is recommended to use a separate configuration file and directory for each instance.
|
|
||||||
Additionally make sure that all instances use either different ports and/or ip addresses to avoid binding collisions.
|
|
||||||
|
|
||||||
Example setup for an instance called "alt"
|
|
||||||
#1 File `/etc/dnsmasq.alt.conf` copied from `/etc/dnsmasq.conf`
|
|
||||||
#2 Directory `/etc/dnsmasq.alt.d`
|
|
||||||
#3 File `/etc/default/dnsmasq.alt` copied from `/etc/default/dnsmasq` with following adaptions:
|
|
||||||
* The options DNSMASQ_OPTS and CONFIG_DIR point to the correct configuration file and directory.
|
|
||||||
DNSMASQ_OPTS="... --conf-file=/etc/dnsmasq.alt.conf ..."
|
|
||||||
CONFIG_DIR=/etc/dnsmasq.alt.d,.dpkg-dist,.dpkg-old,.dpkg-new
|
|
||||||
* The option DNSMASQ_EXCEPT must contain "lo" to avoid that an instance becomes the machine's DNS resolver.
|
|
||||||
DNSMASQ_EXCEPT="lo"
|
|
||||||
* If the additional instance should bind to all IP addresses of a specific interface, e.g. "dnsalt01", then the following addition could be used:
|
|
||||||
DNSMASQ_OPTS="... --bind-dynamic --interface=dnsalt01 ..."
|
|
||||||
Additionally the main instance must be stopped from binding to interfaces that are used by other instances:
|
|
||||||
DNSMASQ_OPTS="... --bind-dynamic --except-interface=dnsalt* ..."
|
|
||||||
* If the additional instance should not use the machine's DNS resolver, normally that's the dnsmasq main instance, as upstream server, then the following addition could be used:
|
|
||||||
IGNORE_RESOLVCONF=yes
|
|
||||||
#4 Enable additional instance via `systemctl enable dnsmasq@alt.service`
|
|
||||||
#5 Start additional instance without reboot via `systemctl start dnsmasq@alt.service`
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
TODO
|
|
||||||
====
|
|
||||||
#1 - Found shortcoming on 2019-03-10
|
|
||||||
Only the option DNSMASQ_EXCEPT="lo" avoids that an DNS instance will be set as the machine's DNS resolver.
|
|
||||||
This may interfere with the wish to run an additional instance on a different port on the localhost addresses.
|
|
||||||
My suggestion in the initial Debian report [1] was to specify an explicit variable for this.
|
|
||||||
|
|
||||||
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=914305#5
|
|
||||||
|
|
||||||
|
|
||||||
#2 - Preferred configuration way
|
|
||||||
Should the variables DNSMASQ_INTERFACE and DNSMASQ_EXCEPT be used instead of --interface and --except-interface? (while "lo" still has to be in DNSMASQ_EXCEPT as of now)
|
|
||||||
Vendored
-7
@@ -1,7 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
. debian/tests/functions
|
|
||||||
|
|
||||||
check_compile_time_options
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
. debian/tests/functions
|
|
||||||
|
|
||||||
check_compile_time_options +lua
|
|
||||||
Vendored
-39
@@ -1,39 +0,0 @@
|
|||||||
Tests: compile-time-options
|
|
||||||
Depends: dnsmasq,
|
|
||||||
dnsmasq-base,
|
|
||||||
Restrictions: needs-root,
|
|
||||||
isolation-container,
|
|
||||||
|
|
||||||
Tests: compile-time-options+lua
|
|
||||||
Depends: dnsmasq,
|
|
||||||
dnsmasq-base-lua,
|
|
||||||
Restrictions: needs-root,
|
|
||||||
isolation-container,
|
|
||||||
|
|
||||||
Tests: get-address+query-dns+check-utils
|
|
||||||
Depends: bind9,
|
|
||||||
bind9-dnsutils,
|
|
||||||
dnsmasq,
|
|
||||||
dnsmasq-base,
|
|
||||||
dnsmasq-utils,
|
|
||||||
Restrictions: needs-root,
|
|
||||||
allow-stderr,
|
|
||||||
isolation-container,
|
|
||||||
|
|
||||||
Tests: get-address+query-dns+lua+alt
|
|
||||||
Depends: bind9,
|
|
||||||
bind9-dnsutils,
|
|
||||||
dnsmasq,
|
|
||||||
dnsmasq-base-lua,
|
|
||||||
Restrictions: needs-root,
|
|
||||||
allow-stderr,
|
|
||||||
isolation-container,
|
|
||||||
|
|
||||||
Tests: get-address+query-dns+sysv+alt
|
|
||||||
Depends: bind9,
|
|
||||||
bind9-dnsutils,
|
|
||||||
dnsmasq,
|
|
||||||
dnsmasq-base,
|
|
||||||
Restrictions: needs-root,
|
|
||||||
allow-stderr,
|
|
||||||
isolation-container,
|
|
||||||
Vendored
-151
@@ -1,151 +0,0 @@
|
|||||||
# -*- shell-script -*-
|
|
||||||
|
|
||||||
FUNCTIONS_DIR="debian/tests/functions.d"
|
|
||||||
|
|
||||||
match_or_exit () {
|
|
||||||
file_to_match="$1"
|
|
||||||
pattern_file="$2"
|
|
||||||
|
|
||||||
while read line_to_match <&3 && read pattern_line <&4 ; do
|
|
||||||
if [ "${line_to_match##$pattern_line}" ]; then
|
|
||||||
echo '!!! MISMATCH !!!' >&2
|
|
||||||
echo "Line: ${line_to_match}" >&2
|
|
||||||
echo "Pattern: ${pattern_line}" >&2
|
|
||||||
exit 1
|
|
||||||
fi;
|
|
||||||
done 3<"${file_to_match}" 4<"${pattern_file}"
|
|
||||||
}
|
|
||||||
|
|
||||||
linecount () {
|
|
||||||
wc -l $1 | cut -d' ' -f1
|
|
||||||
}
|
|
||||||
|
|
||||||
error_exit () {
|
|
||||||
echo "ERROR: $1"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
stop_dnsmasq_bind_networking () {
|
|
||||||
systemctl stop dnsmasq.service
|
|
||||||
systemctl stop named.service
|
|
||||||
systemctl stop networking.service
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_and_start_networking () {
|
|
||||||
#Add interfaces needed for the test
|
|
||||||
cat ${FUNCTIONS_DIR}/add-to.interfaces >> /etc/network/interfaces
|
|
||||||
systemctl start networking.service
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_and_start_bind () {
|
|
||||||
cp ${FUNCTIONS_DIR}/db.autopkg.test /etc/bind/
|
|
||||||
cat ${FUNCTIONS_DIR}/add-to.named.conf.local >> /etc/bind/named.conf.local
|
|
||||||
cp ${FUNCTIONS_DIR}/named.conf.options /etc/bind/named.conf.options
|
|
||||||
systemctl start named.service
|
|
||||||
}
|
|
||||||
|
|
||||||
configure_and_start_dnsmasq () {
|
|
||||||
alt_mode=0
|
|
||||||
lua_mode=0
|
|
||||||
sysv_mode=0
|
|
||||||
service='dnsmasq.service'
|
|
||||||
sysv_param2=''
|
|
||||||
conf_dir='/etc/dnsmasq.d'
|
|
||||||
|
|
||||||
while [ -n "$1" ]; do
|
|
||||||
case "$1" in
|
|
||||||
alt|lua|sysv) eval ${1}_mode=1 ;;
|
|
||||||
*) error_exit "configure_and_start_dnsmasq(): invalid flag '$1'"
|
|
||||||
esac
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ ${alt_mode} -eq 1 ]; then
|
|
||||||
cp ${FUNCTIONS_DIR}/dnsmasq.alt-autopkgtest.default /etc/default/dnsmasq.alt
|
|
||||||
cp /etc/dnsmasq.conf /etc/dnsmasq.alt.conf
|
|
||||||
mkdir /etc/dnsmasq.alt.d
|
|
||||||
service='dnsmasq@alt.service'
|
|
||||||
sysv_param2='alt'
|
|
||||||
conf_dir='/etc/dnsmasq.alt.d'
|
|
||||||
fi
|
|
||||||
|
|
||||||
cp ${FUNCTIONS_DIR}/dnsmasq-autopkgtest.conf "${conf_dir}"
|
|
||||||
|
|
||||||
if [ ${lua_mode} -eq 1 ]; then
|
|
||||||
mkdir -p /usr/local/share/dnsmasq
|
|
||||||
cp ${FUNCTIONS_DIR}/log.lua /usr/local/share/dnsmasq/
|
|
||||||
echo "dhcp-luascript=/usr/local/share/dnsmasq/log.lua\n" \
|
|
||||||
>>"${conf_dir}"/dnsmasq-autopkgtest.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ${sysv_mode} -eq 1 ]; then
|
|
||||||
SYSTEMCTL_SKIP_REDIRECT=1 /etc/init.d/dnsmasq start "${sysv_param2}"
|
|
||||||
else
|
|
||||||
systemctl enable "${service}"
|
|
||||||
systemctl start "${service}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
check_compile_time_options () {
|
|
||||||
journalctl -b -u dnsmasq
|
|
||||||
echo ~~~ Check compile time options...
|
|
||||||
journalctl -b -u dnsmasq -g '[a-z]+: ' --output cat >options.msg
|
|
||||||
cat options.msg
|
|
||||||
match_or_exit options.msg ${FUNCTIONS_DIR}/options${1}.patterns
|
|
||||||
}
|
|
||||||
|
|
||||||
get_address_on_veth1_and_check_the_result () {
|
|
||||||
echo ~~~ Get an address on veth1 and check the result...
|
|
||||||
ip netns exec clientnet ifup veth1
|
|
||||||
ip netns exec clientnet ip addr show dev veth1 >ip-addr.out 2>&1
|
|
||||||
cat ip-addr.out
|
|
||||||
match_or_exit ip-addr.out ${FUNCTIONS_DIR}/ip-addr.patterns
|
|
||||||
}
|
|
||||||
|
|
||||||
query_test_zone_records_and_check_the_result () {
|
|
||||||
echo ~~~ Query some test zone records and check the result...
|
|
||||||
ip netns exec clientnet dig +short SOA autopkg.test >dig.out 2>&1
|
|
||||||
ip netns exec clientnet dig +short NS autopkg.test >>dig.out 2>&1
|
|
||||||
ip netns exec clientnet dig +short A ns.autopkg.test >>dig.out 2>&1
|
|
||||||
ip netns exec clientnet dig +short A dhcp3.autopkg.test >>dig.out 2>&1
|
|
||||||
cat dig.out
|
|
||||||
if [ `linecount dig.out` -ne `linecount ${FUNCTIONS_DIR}/dig.patterns` ] ; then
|
|
||||||
error_exit 'empty or unexpected output'
|
|
||||||
fi
|
|
||||||
match_or_exit dig.out ${FUNCTIONS_DIR}/dig.patterns
|
|
||||||
}
|
|
||||||
|
|
||||||
check_utils () {
|
|
||||||
#Test dhcp_lease_time and dhcp_release
|
|
||||||
leases_file='/var/lib/misc/dnsmasq.leases'
|
|
||||||
client_ip_address=`cut -d' ' -f3 $leases_file`
|
|
||||||
client_mac_address=`cut -d' ' -f2 $leases_file`
|
|
||||||
echo ~~~ Test dhcp_lease_time...
|
|
||||||
if ! dhcp_lease_time $client_ip_address; then
|
|
||||||
error_exit "'dhcp_lease_time $client_ip_address' failed with return code $?"
|
|
||||||
else
|
|
||||||
#Add \n to dhcp_lease_time's output
|
|
||||||
echo ''
|
|
||||||
fi
|
|
||||||
echo ~~~ Test dhcp_release...
|
|
||||||
cat $leases_file
|
|
||||||
if ! dhcp_release veth0 $client_ip_address 1-$client_mac_address; then
|
|
||||||
error_exit "'dhcp_release veth0 $client_ip_address 1-$client_mac_address' failed with return code $?0"
|
|
||||||
fi
|
|
||||||
if [ -n "`cat $leases_file`" ]; then
|
|
||||||
cat $leases_file
|
|
||||||
error_exit "$leases_file is not empty"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
check_lua_log () {
|
|
||||||
log_file='/var/log/dnsmasq-lua.log'
|
|
||||||
echo ~~~ Check log file generated by lua script
|
|
||||||
ls -l ${log_file}
|
|
||||||
if [ -s ${log_file} ]; then
|
|
||||||
cat ${log_file}
|
|
||||||
match_or_exit ${log_file} ${FUNCTIONS_DIR}/log.patterns
|
|
||||||
else
|
|
||||||
error_exit "${log_file} is empty"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
-18
@@ -1,18 +0,0 @@
|
|||||||
|
|
||||||
auto dummy0
|
|
||||||
iface dummy0 inet static
|
|
||||||
pre-up ip link add dummy0 type dummy
|
|
||||||
address 192.168.141.1
|
|
||||||
netmask 255.255.255.248
|
|
||||||
post-down ip link del dummy0
|
|
||||||
|
|
||||||
auto veth0
|
|
||||||
iface veth0 inet static
|
|
||||||
pre-up ip netns add clientnet
|
|
||||||
pre-up ip link add veth0 type veth peer veth1 netns clientnet
|
|
||||||
address 192.168.142.1
|
|
||||||
netmask 255.255.255.248
|
|
||||||
post-down ip link del veth0
|
|
||||||
post-down ip netns del clientnet
|
|
||||||
|
|
||||||
iface veth1 inet dhcp
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
zone "autopkg.test" { type master; file "/etc/bind/db.autopkg.test"; };
|
|
||||||
|
|
||||||
-18
@@ -1,18 +0,0 @@
|
|||||||
$TTL 604800
|
|
||||||
@ IN SOA ns.autopkg.test. hostmaster.autopkg.test. (
|
|
||||||
2 ; Serial
|
|
||||||
604800 ; Refresh
|
|
||||||
86400 ; Retry
|
|
||||||
2419200 ; Expire
|
|
||||||
300 ) ; Negative Cache TTL
|
|
||||||
;
|
|
||||||
@ IN NS ns
|
|
||||||
ns IN A 192.168.141.1
|
|
||||||
host IN A 192.168.142.1
|
|
||||||
dhcp0 IN A 192.168.142.2
|
|
||||||
dhcp1 IN A 192.168.142.3
|
|
||||||
dhcp2 IN A 192.168.142.4
|
|
||||||
dhcp3 IN A 192.168.142.5
|
|
||||||
dhcp4 IN A 192.168.142.6
|
|
||||||
brdcst IN A 192.168.142.7
|
|
||||||
|
|
||||||
-4
@@ -1,4 +0,0 @@
|
|||||||
ns.autopkg.test. hostmaster.autopkg.test. 2 604800 86400 2419200 300
|
|
||||||
ns.autopkg.test.
|
|
||||||
192.168.141.1
|
|
||||||
192.168.142.5
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
no-resolv
|
|
||||||
server=/autopkg.test/192.168.141.1
|
|
||||||
listen-address=192.168.142.1,127.0.0.1
|
|
||||||
bind-interfaces
|
|
||||||
dhcp-range=192.168.142.2,192.168.142.6
|
|
||||||
dhcp-authoritative
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
# This file has six functions:
|
|
||||||
# 1) to completely disable starting this dnsmasq instance
|
|
||||||
# 2) to set DOMAIN_SUFFIX by running `dnsdomainname`
|
|
||||||
# 3) to select an alternative config file
|
|
||||||
# by setting DNSMASQ_OPTS to --conf-file=<file>
|
|
||||||
# 4) to tell dnsmasq to read the files in /etc/dnsmasq.d for
|
|
||||||
# more configuration variables.
|
|
||||||
# 5) to stop the resolvconf package from controlling dnsmasq's
|
|
||||||
# idea of which upstream nameservers to use.
|
|
||||||
# 6) to avoid using this dnsmasq instance as the system's default resolver
|
|
||||||
# by setting DNSMASQ_EXCEPT="lo"
|
|
||||||
# For upgraders from very old versions, all the shell variables set
|
|
||||||
# here in previous versions are still honored by the init script
|
|
||||||
# so if you just keep your old version of this file nothing will break.
|
|
||||||
|
|
||||||
#DOMAIN_SUFFIX=`dnsdomainname`
|
|
||||||
DNSMASQ_OPTS="--conf-file=/etc/dnsmasq.alt.conf"
|
|
||||||
|
|
||||||
# The dnsmasq daemon is run by default conforming to the Debian Policy.
|
|
||||||
# To disable the service,
|
|
||||||
# for SYSV init, use "update-rc.d dnsmasq disable",
|
|
||||||
# for systemd, use "systemctl disable dnsmasq".
|
|
||||||
|
|
||||||
# By default search this drop directory for configuration options.
|
|
||||||
# Libvirt leaves a file here to make the system dnsmasq play nice.
|
|
||||||
# Comment out this line if you don't want this. The dpkg-* are file
|
|
||||||
# endings which cause dnsmasq to skip that file. This avoids pulling
|
|
||||||
# in backups made by dpkg.
|
|
||||||
CONFIG_DIR=/etc/dnsmasq.alt.d,.dpkg-dist,.dpkg-old,.dpkg-new
|
|
||||||
|
|
||||||
# If the resolvconf package is installed, dnsmasq will use its output
|
|
||||||
# rather than the contents of /etc/resolv.conf to find upstream
|
|
||||||
# nameservers. Uncommenting this line inhibits this behaviour.
|
|
||||||
# Note that including a "resolv-file=<filename>" line in
|
|
||||||
# /etc/dnsmasq.conf is not enough to override resolvconf if it is
|
|
||||||
# installed: the line below must be uncommented.
|
|
||||||
#IGNORE_RESOLVCONF=yes
|
|
||||||
|
|
||||||
# If the resolvconf package is installed, dnsmasq will tell resolvconf
|
|
||||||
# to use dnsmasq under 127.0.0.1 as the system's default resolver.
|
|
||||||
# Uncommenting this line inhibits this behaviour.
|
|
||||||
#DNSMASQ_EXCEPT="lo"
|
|
||||||
-6
@@ -1,6 +0,0 @@
|
|||||||
?: veth1@if?: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
|
|
||||||
link/ether ??:??:??:??:??:?? brd ff:ff:ff:ff:ff:ff link-netnsid 0
|
|
||||||
inet 192.168.142.?/29 brd 192.168.142.7 scope global dynamic veth1
|
|
||||||
valid_lft 3[56][0-9][0-9]sec preferred_lft 3[56][0-9][0-9]sec
|
|
||||||
inet6 fe80::*:*:*:*/64 scope link*
|
|
||||||
valid_lft forever preferred_lft forever
|
|
||||||
Vendored
-40
@@ -1,40 +0,0 @@
|
|||||||
-- Lua script logging calls from dnsmasq
|
|
||||||
|
|
||||||
-- Open the log file in append mode
|
|
||||||
logfile = assert(io.open("/var/log/dnsmasq-lua.log", "a"))
|
|
||||||
|
|
||||||
-- Prepend date and time to a string and write the result to the log file
|
|
||||||
function __log(str)
|
|
||||||
logfile:write(os.date("!%FT%TZ ")..str.."\n")
|
|
||||||
end
|
|
||||||
|
|
||||||
-- flush the log file
|
|
||||||
function __flush_log()
|
|
||||||
logfile:flush()
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Log a call to init()
|
|
||||||
function init()
|
|
||||||
__log("initialising")
|
|
||||||
__flush_log()
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Log a call to shutdown()
|
|
||||||
function shutdown()
|
|
||||||
__log("shutting down")
|
|
||||||
__flush_log()
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Log a call to lease() including all arguments
|
|
||||||
function lease(operation, params)
|
|
||||||
local lines = {}
|
|
||||||
__log(operation.." lease")
|
|
||||||
for key,value in pairs(params) do
|
|
||||||
table.insert(lines, key..": "..value)
|
|
||||||
end
|
|
||||||
table.sort(lines)
|
|
||||||
for index,line in ipairs(lines) do
|
|
||||||
__log("\t"..line)
|
|
||||||
end
|
|
||||||
__flush_log()
|
|
||||||
end
|
|
||||||
-10
@@ -1,10 +0,0 @@
|
|||||||
????-??-??T??:??:??Z initialising
|
|
||||||
????-??-??T??:??:??Z add lease
|
|
||||||
????-??-??T??:??:??Z client_id: ??:??:??:??:??:??:??:??:??:??:??:??:??:??:??:??:??:??:??
|
|
||||||
????-??-??T??:??:??Z data_missing: 1.0
|
|
||||||
????-??-??T??:??:??Z hostname: ?*
|
|
||||||
????-??-??T??:??:??Z interface: veth0
|
|
||||||
????-??-??T??:??:??Z ip_address: 192.168.142.[2-6]
|
|
||||||
????-??-??T??:??:??Z lease_expires: [1-9]*
|
|
||||||
????-??-??T??:??:??Z mac_address: ??:??:??:??:??:??
|
|
||||||
????-??-??T??:??:??Z time_remaining: 3600.0
|
|
||||||
-6
@@ -1,6 +0,0 @@
|
|||||||
options {
|
|
||||||
directory "/var/cache/bind";
|
|
||||||
listen-on { 192.168.141.1; };
|
|
||||||
recursion no;
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
*: IPv6 GNU-getopt DBus no-UBus i18n IDN2 DHCP DHCPv6 Lua TFTP conntrack ipset nftset auth cryptohash DNSSEC loop-detect inotify dumpfile
|
|
||||||
Loaded 100 of 176 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user