Fix remote buffer overflow CERT VU#434904

The problem is in the sort_rrset() function and allows a remote attacker to overwrite memory. Any dnsmasq instance with DNSSEC enabled is vulnerable.
2026-11-04 13:48:30 +00:00 · 2020-11-11 23:25:04 +00:00
118 changed files with 16585 additions and 37571 deletions
@@ -7,4 +7,8 @@ src/.copts_*
 contrib/lease-tools/dhcp_lease_time
 contrib/lease-tools/dhcp_release
 contrib/lease-tools/dhcp_release6
-
+debian/files
+debian/substvars
+debian/utils-substvars
+debian/trees/
+debian/build/
@@ -1,6 +0,0 @@
-[submodule "debian"]
-	path = debian
-	url = git://thekelleys.org.uk/dnsmasq-debian.git
-[submodule "submodules/dnsmasq-debian"]
-	path = submodules/dnsmasq-debian
-	url = https://thekelleys.org.uk/git/dnsmasq-debian
@@ -1,709 +1,7 @@
-version 2.93
-	Fix a corner-case in DNSSEC validation with wildcards. If we have
-	a wildcard record *.example.com and recieve a query for
-	a.example.com then that's OK, but we have to check that there isn't
-	an actual a.example.com record. The corner case is when we get a
-	query for *.example.com in that case the non-existence check
-	is not required, was being done. Thanks to Jan Breig for
-	spotting this.
-
-	Enable support for inotify on FreeBSD 15.0-RELEASE, which added
-	Linux-compatible inotify support.
-
-	Fix DNSSEC failure with spurious RRSIGs. The presence of wrong
-	RRSIG RRs in replies caused DNSSEC validation to fail even
-	when the RRs do not require validation because the zone is
-	unsigned. Note that, at the time of this commit, Google
-	DNS appears to have the same bug, so if you're using 8.8.8.8
-	or friends as upstream, resolving the broken zones
-	(eg rivcoed.org) will still fail. Thanks to Petr Menšík
-	for the bug report.
-
-	Fix DNSSEC fail with CNAME replies to DS queries. As CNAME reply
-	to a DNSSEC query was confusing the validation logic. It now
-	accepts a signed CNAME reply to a DS query as proof that no DS
-	exists at the domain. This fixes the DS/zone break detection logic.
-
-	Fix regression in 2.92 release which broke DHCPv6 when a DHCP
-	relay is in use. Many thanks to Jørgen Søvik for help
-	finding this bug.
-	
-	Modify the inotify implementation so that inotify watches are
-	only created after dnsmasq has changed permissions and userid.
-	This means that the permissions used when creating the watches
-	are the same as used for accessing watched files, which makes
-	more sense and avoids odd and confusing error conditions.
-
-	
-version 2.92
-        Redesign the interaction between DNSSEC validation and per-domain
-	servers, specified as --server=/<domain>/<ip-address>. This should
-	just work in all cases now. If the normal chain-of-trust exists into
-	the delegated domain then whether the domain is signed or not, DNSSEC
-	validation will function normally. In the case the delegated domain
-	is an "overlay" on top of the global DNS and no NS and/or DS records
-	exist connecting it to the global dns, then if the domain is
-	unsigned the situation will be handled by synthesising a
-	proof-of-non-existence-of-DS for the domain and queries will be
-	answered unvalidated; this action will be logged. A signed domain
-	without chain-of-trust can be validated if a suitable trust-anchor
-	is provided using --trust-anchor. This change should be backwards
-	compatible for all existing working configurations; it extends the
-	space of possible configurations which are functional.
-
-	Fix a couple of problems with DNSSEC validation and DNAME. One
-	could cause validation failure on correct domains, and the other
-	would fail to spot an invalid domain. Thanks to Graham Clinch
-	for spotting the problem.
-
-	Add --log-queries=auth option to only log replies from the auth DNS
-	facility.
-
-	Fix some edge-cases with domains and --address and --server. There
-	has been some regressions with this in previous releases. This change
-	fixes the priority order from lower to highest as:
-	--address with a IPv4 or IPv6 address (as long as the query matches the type)
-        --address with # for all-zeros, as long as the query is A or AAAA)
-        --address with no address, which returns NXDOMAIN or NOERROR for all types.
-        --server with address set to # to use the unqualified servers.
-        --server with matching domain.
-        --server without domain or from /etc/resolv.conf.
-
-	Fix problems with ipset or nftset and TCP DNS transport. Previously
-	this was racy, and insertion of addresses could fail on a busy server
-	when DNS-over-TCP transport was involved.
-
-	DNSSEC validation change for reverse lookups in RFC-1918 ranges and friends.
-    	The large public DNS services seem not to return proof-of-nonexistence
-	for DS records at the start of RFC-1918 in-addr.arpa domains and the their
-	IPv6 equivalents. 10.in-addr.arpa, 168.192.in-addr.arpa etc.
-	Since dnsmasq already has an option which instructs it not bother
-	upstream servers with pointless queries about these address ranges,
-	namely --bogus-priv, we extend that to enable behaviour which allows
-	dnsmasq to assume that insecure NXDOMAIN replies for these domains
-	are expected and to assume that the domains are legitimately unsigned.
-	This behaviour only matters when some address range is directed to
-	another upstream server using --rev-server. In that case it allows
-	replies from that server to pass DNSSEC validation. Without such a
-	server configured, queries are never sent upstream so they are never
-	validated and the new behaviour is moot.
-
-	Add support for leasequery to the dnsmasq DHCPv4 server.
-	This has to be specifically enabled with the --leasequery option.
-	Many thanks to JAXPORT, Jacksonville Port Authority for sponsoring
-	this enhancement to dnsmasq.
-
-	Fix failure to cache PTR RRs when a reply contains more than one answer.
-	Thanks to Dmitry for spotting this.
-
-	Add TFTP options windowsize (RFC 7440) and timeout (RFC 2349).
-	
-	Change the behaviour of the DHCPv6 server when a REBIND message
-	is received but no lease exists. Under these circumstances a new
-	lease is created _only_ when the --dhcp-authoritative option is
-	set. This matches the behavior of the DHCPv4 server.
-
-	Add --dhcp-split-relay option. This makes a DHCPv4 relay which
-	is functional when client and server networks aren't mutually
-	route-able.
-
-	Fix failure to add client MAC address to queries in TCP mode.
-	The options which cause	dnsmasq	to decorate a DNS query	with the MAC
-	address	on the originating client can fail when the query is sent
-	using TCP. Thanks to Bruno Ravara for spotting and
-	characterising this bug.
-
-	
-version 2.91
-	Fix spurious "resource limit exceeded messages". Thanks to 
-	Dominik Derigs for the bug report.
-
-	Fix out-of-bounds heap read in order_qsort().
-	We only need to order two server records on the ->serial field.
-	Literal address records are smaller and don't have
-	this field and don't need to be ordered on it.
-	To actually provoke this bug seems to need the same server-literal
-	to be repeated twice, e.g., --address=/a/1.1.1.1 --address-/a/1.1.1.1
-	which is clearly rare in the wild, but if it did exist it could
-	provoke a SIGSEGV. Thanks to Daniel Rhea for fuzzing this one.
-
-	Fix buffer overflow when configured lease-change script name
-	is too long.
-	Thanks to Daniel Rhea for finding this one.
-
-	Improve behaviour in the face of non-responsive upstream TCP DNS
-	servers. Without shorter timeouts, clients are blocked for too long
-	and fail with their own timeouts.
-
-	Set --fast-dns-retries by default when doing DNSSEC. A single
-	downstream query can trigger many upstream queries. On an
-	unreliable network, there may not be enough downstream retries
-	to ensure that all these queries complete.
-
-	Improve behaviour in the face of truncated answers to queries
-	for DNSSEC records. Getting these answers by TCP doesn't now
-	involve a faked truncated answer to the downstream client to
-	force it to move to TCP. This improves performance and robustness
-	in the face of broken clients which can't fall back to TCP.
-
-	No longer remove data from truncated upstream answers. If an
-	upstream replies with a truncated answer, but the answer has some
-	RRs included, return those RRs, rather than returning and
-	empty answer.
-
-	Fix handling of EDNS0 UDP packet sizes.
-	When talking upstream we always add a pseudo header, and set the
-        UDP packet size to --edns-packet-max. Answering queries from
-	downstream, we get the answer (either from upstream or local
-	data) If local data won't fit the advertised size (or 512 if
-	there's not an EDNS0 header) return truncated. If upstream
-        returns truncated, do likewise. If upstream is OK, but the
-	answer is too big for downstream, truncate the answer.
-
-	Modify the behaviour of --synth-domain for IPv6.
-	When deriving a domain name from an IPv6 address, an address
-	such as 1234:: would become 1234--.example.com, which is
-	not legal in IDNA2008. Stop using the :: compression method,
-	so 1234:: becomes
-	1234-0000-0000-0000-0000-0000-0000-0000.example.com
-
-	Fix broken dhcp-relay on *BSD. Thanks to Harold for finding
-	this problem.
-
-	Add --dhcp-option-pxe config. This acts almost exactly like
-	--dhcp-option except that the defined option is only sent when
-	replying to PXE clients. More importantly, these options are sent
-	in reply PXE clients when dnsmasq in acting in PXE proxy mode. In
-	PXE proxy mode, the set of options sent is defined by the PXE standard
-	and the normal set of options is not sent. This config allows arbitrary
-	options in PXE-proxy replies. A typical use-case is to send option
-	175 to iPXE. Thanks to Jason Berry for finding the requirement for
-	this.
-
-	Support PXE proxy-DHCP and DHCP-relay at the same time.
-        When using PXE proxy-DHCP, dnsmasq supplies PXE information to
-        the client, which also talks to another "normal" DHCP server
-        for address allocation and similar. The normal DHCP server may
-        be on the local network, but it may also be remote, and accessed via
-        a DHCP relay. This change allows dnsmasq to act as both a
-        PXE proxy-DHCP server AND a DHCP relay for the same network.
-
-	Fix erroneous "DNSSEC validated" state with non-DNSSEC
-	upstream servers.  Thanks to Dominik Derigs for the bug report.
-
-	Handle queries with EDNS client subnet fields better. If dnsmasq
-	is configured to add an EDNS client subnet to a query, it is careful
-	to suppress use of the cache, since a cached answer may not be valid
-	for a query with a different client subnet. Extend this behaviour
-	to queries which arrive a dnsmasq already carrying an EDNS client
-	subnet.
-
-	Handle DS queries to auth zones. When dnsmasq is configured to
-	act as an authoritative server and has an authoritative zone
-	configured, and receives a query for that zone _as_forwarder_
-	it answers the query directly rather than forwarding it. This
-	doesn't affect the answer, but it saves dnsmasq forwarding the
-	query to the recursor upstream, which then bounces it back to dnsmasq
-	in auth mode. The exception should be when the query is for the root
-	of zone, for a DS RR. The answer to that has to come from the parent,
-	via the recursor, and will typically be a proof-of-non-existence
-	since dnsmasq doesn't support signed zones. This patch suppresses
-	local answers and forces forwarding to the upstream recursor for such
-	queries. It stops breakage when a DNSSEC validating client makes
-	queries to dnsmasq acting as forwarder for a zone for which it is
-	authoritative.
-
-	Implement "DNS-0x20 encoding", for extra protection against
-	reply-spoof attacks. Since DNS queries are case-insensitive,
-	it's possible to randomly flip the case of letters in a query
-	and still get the correct answer back.
-	This adds an extra dimension for a cache-poisoning attacker
-	to guess when sending replies in-the-blind since it's expected
-	that the legitimate answer will have the same  pattern of upper
-	and lower case as the query, so any replies which don't can be
-	ignored as malicious. The amount of extra entropy clearly depends
-	on the number of a-z and A-Z characters in the query, and this
-	implementation puts a hard limit of 32 bits to make resource
-	allocation easy. This about doubles entropy over the standard
-	random ID and random port combination. This technique can interact
-	badly with rare broken DNS servers which don't preserve the case
-	of the query in their reply. The first time a reply is returned
-	which matches the query in all respects except case, a warning
-	will be logged. In this release, 0x020-encoding is default-off
-	and must be explicitly enabled with --do-0x20-encoding. In future
-	releases it may default on. You can avoid a future release
-	changing the behaviour of an installation with --no-x20-encode.
-	
-	Fix a long-standing problem when two queries which are identical
-	in every respect _except_ case, get combined by dnsmasq. If
-	dnsmasq gets eg, two queries for example.com and Example.com
-	in quick succession it will get the answer for example.com from
-	upstream and send that answer to both requestors. This means that
-	the query for Example.com will get an answer for example.com, and
-	in the modern DNS, that answer may not be accepted.
-
-	
-version 2.90
-	Fix reversion in --rev-server introduced in 2.88 which
-	caused breakage if the prefix length is not exactly divisible
-	by 8 (IPv4) or 4 (IPv6).
-
-	Fix possible SEGV when there server(s) for a particular
-	domain are configured, but no server which is not qualified
-	for a particular domain. Thanks to Daniel Danzberger for
-	spotting this bug.
-
-	Set the default maximum DNS UDP packet size to 1232. This
-	has been the recommended value since 2020 because it's the
-	largest value that avoid fragmentation, and fragmentation
-	is just not reliable on the modern internet, especially
-	for IPv6. It's still possible to override this with
-	--edns-packet-max for special circumstances.
-
-	Add --no-dhcpv4-interface and --no-dhcpv6-interface for
-	better control over which interfaces are providing DHCP service.
-
-	Fix issue with stale caching: After replying with stale data,
-	dnsmasq sends the query upstream to refresh the cache asynchronously
-	and sometimes sends the wrong packet: packet length can be wrong,
-	and if an EDE marking stale data is added to the answer that can
-	end up in the query also. This bug only seems to cause problems
-	when the upstream server is a DOH/DOT proxy. Thanks to Justin He
-	for the bug report.
-
-	Add configurable caching for arbitrary RR-types.
-
-	Add --filter-rr option, to filter arbitrary RR-types.
-	--filter-rr=ANY has a special meaning: it filters the
-	answers to queries for the ANY RR-type.
-	
-	Add limits on the resources used to do DNSSEC validation.
-	DNSSEC introduces a potential CPU DoS, because a crafted domain
-	can force a validator to a large number of cryptographic
-	operations whilst attempting to do validation. When using TCP
-	transport a DNSKEY RRset contain thousands of members and any
-	RRset can have thousands of signatures. The potential number
-	of signature validations to follow the RFC for validation
-	for one RRset is the cross product of the keys and signatures,
-	so millions. In practice, the actual numbers are much lower,
-	so attacks can be mitigated by limiting the amount of
-	cryptographic "work" to a much lower amount. The actual
-	limits are number a signature validation fails per RRset(20),
-	number of signature validations and hash computations
-	per query(200), number of sub-queries  to fetch  DS and DNSKEY
-	RRsets per query(40), and the number of iterations in a
-	NSEC3 record(150). These values are sensible, but there is, as yet,
-	no standardisation on the values for a "conforming" domain, so a
-	new option --dnssec-limit is provided should they need to be altered.
-	The algorithm to validate DS records has also been altered to reduce
-	the maximum work from cross product of the number of DS records and
-	number of DNSKEYs to the cross product of the number of DS records
-	and supported DS digest types. As the number of DS digest types
-	is in single figures, this reduces the exposure.
-
-	Credit is due to Elias Heftrig, Haya Schulmann, Niklas Vogel,
-	and Michael Waidner from the German National Research Center for
-	Applied Cybersecurity ATHENE for finding this vulnerability.
-
-	CVE 2023-50387 and CVE 2023-50868 apply.
-	Note that this a security vulnerability only when DNSSEC validation
-	is enabled.
-	
-	Fix memory-leak when attempting to cache SRV records with zero TTL.
-	Thanks to Damian Sawicki for the bug report.
-
-	Add --max-tcp-connections option to make limit on TCP handling
-	processes configurable.  Also keep stats on how near the limit
-	we're getting, to help with tuning. Patch from Damian Sawicki.
-
-	
-version 2.89
-        Fix bug introduced in 2.88 (commit fe91134b) which can result
-	in corruption of the DNS cache internal data structures and
-	logging of "cache internal error". This has only been seen
-	in one place in the wild, and it took considerable effort
-	to even generate a test case to reproduce it, but there's
-	no way to be sure it won't strike, and the effect is to break
-	the cache badly. Installations with DNSSEC enabled are more
-	likely to see the problem, but not running DNSSEC does not
-	guarantee that it won't happen. Thanks to Timo van Roermund
-	for reporting the bug and for his great efforts in chasing
-	it down.
-
-
-version 2.88
-	Fix bug in --dynamic-host when an interface has /16 IPv4
-  	address. Thanks to Mark Dietzer for spotting this.
-
-	Add --fast-dns-retry option. This gives dnsmasq the ability
-	to originate retries for upstream DNS queries itself, rather
-	than relying on the downstream client. This is most useful
-	when doing DNSSEC over unreliable upstream networks. It comes
-	with some cost in memory usage and network bandwidth.
-
-	Add --use-stale-cache option. When set, if a DNS name exists
-	in the cache, but its time-to-live has expired, dnsmasq will
-	return the data anyway. (It attempts to refresh the
-	data with an upstream query after returning the stale data.)
-	This can improve speed and reliability. It comes
-	at the expense of sometimes returning out-of-date data and
-	less efficient cache utilisation, since old data cannot be
-	flushed when its TTL expires, so the cache becomes
-	strictly least-recently-used.
-
-	Add --port-limit option which allows tuning for robustness in
-	the face of some upstream network errors. Thanks to
-	Prashant Kumar Singh, Ravi Nagayach and Mike Danilov,
-	all of Amazon Web Services, for their efforts in developing this
-	and the stale-cache and fast-retry options.
-
-	Make --hostsdir (but NOT --dhcp-hostsdir and --dhcp-optsdir)
-	handle removal of whole files or entries within files.
-	Thanks to Dominik Derigs for the initial patches for this.
-
-	Fix bug, introduced in 2.87, which could result in DNS
-	servers being removed from the configuration when reloading
-	server configuration from DBus, or re-reading /etc/resolv.conf
-	Only servers from the same source should be replaced, but some
-	servers from other sources (i.e., hard coded or another dynamic source)
-	could mysteriously disappear. Thanks to all reporting this,
-	but especially Christopher J. Madsen who reduced the problem
-	to an easily reproducible case which saved much labour in
-	finding it.
-
-	Add --no-round-robin option.
-
-	Allow domain names as well as IP addresses when specifying
-	upstream DNS servers. There are some gotchas associated with this
-	(it will mysteriously fail to work if the dnsmasq instance
-	being started is in the path from the system resolver to the DNS),
-	and a seemingly sensible configuration like
-	--server=domain.name@1.2.3.4 is unactionable if domain.name
-	only resolves to an IPv6 address). There are, however,
-	cases where is can be useful. Thanks to Dominik Derigs for
-	the patch.
-
-	Handle DS records for unsupported crypto algorithms correctly.
-	Such a DS, as long as it is validated, should allow answers
-	in the domain it attests to be returned as unvalidated, and not
-	as a validation error.
-
-	Optimise reading large numbers of --server options. When re-reading
-	upstream servers from /etc/resolv.conf or other sources that
-	can change dnsmasq tries to avoid memory fragmentation by re-using
-	existing records that are being re-read unchanged. This involves
-	searching all the server records for each new one installed.
-	During startup this search is pointless, and can cause long
-	start times with thousands of --server options because the work
-	needed is O(n^2). Handle this case more intelligently.
-	Thanks to Ye Zhou for spotting the problem and an initial patch.
-	
-	If we detect that a DNS reply from upstream is malformed don't
-	return it to the requestor; send a SEVFAIL rcode instead.
-
-	
-version 2.87
-        Allow arbitrary prefix lengths in --rev-server and
-	--domain=....,local
-
-	Replace --address=/#/..... functionality which got
-	missed in the 2.86 domain search rewrite.
-
-	Add --nftset option, like --ipset but for the newer nftables.
-	Thanks to Chen Zhenge for the patch.
-	
-	Add --filter-A and --filter-AAAA options, to remove IPv4 or IPv6
-	addresses from DNS answers.
-
-	Fix crash doing netbooting when --port is set to zero
-	to disable the DNS server. Thanks to Drexl Johannes
-	for the bug report.
-
-	Generalise --dhcp-relay. Sending via broadcast/multicast is
-	now supported for both IPv4 and IPv6 and the configuration
-	syntax made easier (but backwards compatible).
-	
-	Add snooping of IPv6 prefix-delegations to the DHCP-relay system.
-
-	Finesse parsing of --dhcp-remoteid and --dhcp-subscrid. To be treated
-	as hex, the pattern must consist of only hex digits AND contain
-	at least one ':'. Thanks to Bengt-Erik Sandstrom who tripped
-	over a pattern consisting of a decimal number which was interpreted
-	surprisingly.
-
-	Include client address in TFTP file-not-found error reports.
-	Thanks to Stefan Rink for the initial patch, which has been
-	re-worked by me (srk). All bugs mine.
-
-	Note in manpage the change in behaviour of -address. This behaviour
-	actually changed in v2.86, but was undocumented there. From 2.86 on,
-	(eg) --address=/example.com/1.2.3.4 ONLY applies to A queries. All other
-	types of query will be sent upstream. Pre 2.86, that would catch the
-	whole example.com domain and queries for other types would get
-	a local NODATA answer. The pre-2.86 behaviour is still available,
-	by configuring --address=/example.com/1.2.3.4 --local=/example.com/
-
-        Fix problem with binding DHCP sockets to an individual interface.
-	Despite the fact that the system call tales the interface _name_ as
-	a parameter, it actually, binds the socket to interface _index_.
-	Deleting the interface and creating a new one with the same name
-	leaves the socket bound to the old index. (Creating new sockets
-	always allocates a fresh index, they are not reused). We now
-	take this behaviour into account and keep up with changing indexes.
-
-	Add --conf-script configuration option.
-
-	Enhance --domain to accept, for instance,
-	--domain=net2.thekelleys.org.uk,eth2 so that hosts get a domain
-	which reflects the interface they are attached to in a way which
-	doesn't require hard-coding addresses. Thanks to Sten Spans for
-	the idea.
-
-	Fix write-after-free error in DHCPv6 server code.
-	CVE-2022-0934 refers.
-	
-	Add the ability to specify destination port in
-	DHCP-relay mode. This change also removes a previous bug
-	where --dhcp-alternate-port would affect the port used
-	to relay _to_ as well as the port being listened on.
-	The new feature allows configuration to provide bug-for-bug
-	compatibility, if required. Thanks to Damian Kaczkowski 
-	for the feature suggestion.
-
-	Bound the value of UDP packet size in the EDNS0 header of
-	forwarded queries to the configured or default value of
-	edns-packet-max. There's no point letting a client set a larger
-	value if we're unable to return the answer. Thanks to Bertie
-	Taylor for pointing out the problem and supplying the patch.
-	
-	Fix problem with the configuration
-	
-	--server=/some.domain/# --address=/#/<ip> --server=<server_ip>
-
-	This would return <ip> for queries in some.domain, rather than
-	forwarding the query via the default server.
-
-	Tweak DHCPv6 relay code so that packets relayed towards a server
-	have source address on the server-facing network, not the
-	client facing network. Thanks to Luis Thomas for spotting this
-	and initial patch.
-
-
-version 2.86
-	Handle DHCPREBIND requests in the DHCPv6 server code.
-	Thanks to Aichun Li for spotting this omission, and the initial
-	patch.
-
-	Fix bug which caused dnsmasq to lose track of processes forked
-	to handle TCP DNS connections under heavy load. The code
-	checked that at least one free process table slot was
-	available before listening on TCP sockets, but didn't take
-	into account that more than one TCP connection could
-	arrive, so that check was not sufficient to ensure that
-	there would be slots for all new processes. It compounded
-	this error by silently failing to store the process when
-	it did run out of slots. Even when this bug is triggered,
-	all the right things happen, and answers are still returned.
-	Only under very exceptional circumstances, does the bug
-	manifest itself: see
-	https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2021q2/014976.html
-	Thanks to Tijs Van Buggenhout for finding the conditions under
-	which the bug manifests itself, and then working out
-	exactly what was going on.
-
-	Major rewrite of the DNS server and domain handling code.
-	This should be largely transparent, but it drastically
-	improves performance and reduces memory foot-print when
-	configuring large numbers domains of the form
-	local=/adserver.com/
-	or
-	local=/adserver.com/#
-	Lookup times now grow as log-to-base-2 of the number of domains,
-	rather than greater than linearly, as before.
-	The change makes multiple addresses associated with a domain work
-	address=/example.com/1.2.3.4
-	address=/example.com/5.6.7.8
-	It also handles multiple upstream servers for a domain better; using
-	the same try/retry algorithms as non domain-specific servers. This
-	also applies to DNSSEC-generated queries.
-	Finally, some of the oldest and gnarliest code in dnsmasq has had
-	a significant clean-up. It's far from perfect, but it _is_ better.
-
-	Revise resource handling for number of concurrent DNS queries. This
-	used to have a global limit, but that has a problem when using
-	different servers for different upstream domains. Queries which are
-	routed by domain to an upstream server which is not responding will
-	build up and trigger the limit, which breaks DNS service for
-	all other domains which could be handled by other servers. The
-	change is to make the limit per server-group, where a server group
-	is the set of servers configured for a particular domain. In the
-	common case, where only default servers are declared, there is
-	no effective change.
-
-	Improve efficiency of DNSSEC. The sharing point for DNSSEC RR data
-	used to be when it entered the cache, having been validated. After
-	that queries requiring the KEY or DS records would share the cached
-	values. There is a common case in dual-stack hosts that queries for
-	A and AAAA records for the same domain are made simultaneously.
-	If required keys were not in the cache, this would result in two
-	requests being sent upstream for the same key data (and all the
-	subsequent chain-of-trust queries.) Now we combine these requests
-	and elide the duplicates, resulting in fewer queries upstream
-	and better performance. To keep a better handle on what's
-	going on, the "extra" logging mode has been modified to associate
-	queries and answers  for DNSSEC queries in the same way as ordinary
-	queries. The requesting address and port have been removed from
-	DNSSEC logging lines, since this is no longer strictly defined.
-
-	Connection track mark based DNS query filtering. Thanks to
-	Etan Kissling for implementing this It extends query filtering
-	support beyond what is currently possible
-	with the `--ipset` configuration option, by adding support for:
-	1) Specifying allowlists on a per-client basis, based on their
-	   associated Linux connection track mark.
-	2) Dynamic configuration of allowlists via Ubus.
-	3) Reporting when a DNS query resolves or is rejected via Ubus.
-	4) DNS name patterns containing wildcards.
-	Disallowed queries are not forwarded; they are rejected
-	with a REFUSED error code.
-
-	Allow smaller than 64 prefix lengths in synth-domain, with caveats.
-	--synth-domain=1234:4567::/56,example.com is now valid.
-
-	Make domains generated by --synth-domain appear in replies
-	when in authoritative mode.
-
-	Ensure CAP_NET_ADMIN capability is available when
-	conntrack is configured. Thanks to Yick Xie for spotting
-	the lack of this.
-
-	When --dhcp-hostsfile --dhcp-optsfile and --addn-hosts are
-	given a directory as argument, define the order in which
-	files within that directory are read (alphabetical order
-	of filename). Thanks to Ed Wildgoose for the initial patch
-	and motivation for this.
-
-	Allow adding IP address to nftables set in addition to
-	ipset.
-
-	
-version 2.85
-        Fix problem with DNS retries in 2.83/2.84.
-        The new logic in 2.83/2.84 which merges distinct requests
-	for the same domain causes problems with clients which do
-	retries as distinct requests (differing IDs and/or source ports.)
-	The retries just get piggy-backed on the first, failed, request.
-        The logic is now changed so that distinct requests for repeated
-        queries still get merged into a single ID/source port, but
-	they now always trigger a re-try upstream.
-        Thanks to Nicholas Mu for his analysis.
-
-	Tweak sort order of tags in get-version. v2.84 sorts
-	before v2.83, but v2.83 sorts before v2.83rc1 and 2.83rc1
-	sorts before v2.83test1. This fixes the problem which lead
-	to 2.84 announcing itself as 2.84rc2.
-
- 	Avoid treating a --dhcp-host which has an IPv6 address
-	as eligible for use with DHCPv4 on the grounds that it has
-	no address, and vice-versa. Thanks to Viktor Papp for
-	spotting the problem. (This bug was fixed was back in 2.67, and
-	then regressed in 2.81).
-
-	Add --dynamic-host option: A and AAAA records which take their
-	network part from the network of a local interface. Useful
-	for routers with dynamically prefixes. Thanks
-	to Fred F for the suggestion.
-
-	Teach --bogus-nxdomain and --ignore-address to take an IPv4 subnet.
-
-	Use random source ports where possible if source
-	addresses/interfaces in use.
-	CVE-2021-3448 applies. Thanks to Petr Menšík for spotting this.
-	It's possible to specify the source address or interface to be
-	used when contacting upstream name servers: server=8.8.8.8@1.2.3.4
-	or server=8.8.8.8@1.2.3.4#66 or server=8.8.8.8@eth0, and all of
-	these have, until now, used a single socket, bound to a fixed
-	port. This was originally done to allow an error (non-existent
-	interface, or non-local address) to be detected at start-up. This
-	means that any upstream servers specified in such a way don't use
-	random source ports, and are more susceptible to cache-poisoning
-	attacks.
-	We now use random ports where possible, even when the
-	source is specified, so server=8.8.8.8@1.2.3.4 or
-	server=8.8.8.8@eth0 will use random source
-	ports. server=8.8.8.8@1.2.3.4#66 or any use of --query-port will
-	use the explicitly configured port, and should only be done with
-	understanding of the security implications.
-	Note that this change changes non-existing interface, or non-local
-	source address errors from fatal to run-time. The error will be
-	logged and communication with the server not possible.
-
-	Change the method of allocation of random source ports for DNS.
-	Previously, without min-port or max-port configured, dnsmasq would
-	default to the compiled in defaults for those, which are 1024 and
-	65535. Now, when neither are configured, it defaults instead to
-	the kernel's ephemeral port range, which is typically
-	32768 to 60999 on Linux systems. This change eliminates the
-	possibility that dnsmasq may be using a registered port > 1024
-	when a long-running daemon starts up and wishes to claim it.
-	This change does likely slightly reduce the number of random ports
-	and therefore the protection from reply spoofing. The older
-	behaviour can be restored using the min-port and max-port config
-	switches should that be a concern.
-
-	Scale the size of the DNS random-port pool based on the
-	value of the --dns-forward-max configuration.
-
-	Tweak TFTP code to check sender of all received packets, as
-	specified in RFC 1350 para 4.
-
-	Support some wildcard matching of input tags to --tag-if.
-	Thanks to Geoff Back for the idea and the patch.
-
-	
-version 2.84
-	Fix a problem, introduced in 2.83, which could see DNS replies
-	being sent via the wrong socket. On machines running both
-	IPv4 and IPv6 this could result in sporadic messages of
-	the form "failed to send packet: Network is unreachable" and
-	the lost of the query. Since the error is sporadic and of
-	low probability, the client retry would normally succeed.
-
-	Change HAVE_NETTLEHASH compile-time to HAVE_CRYPTOHASH.
-
-
 version 2.83
-	Use the values of --min-port and --max-port in outgoing
-	TCP connections to upstream DNS servers.
-
 	Fix a remote buffer overflow problem in the DNSSEC code. Any
 	dnsmasq with DNSSEC compiled in and enabled is vulnerable to this,
-	referenced by CVE-2020-25681, CVE-2020-25682, CVE-2020-25683
-	CVE-2020-25687.
-
-	Be sure to only accept UDP DNS query replies at the address
-	from which the query was originated. This keeps as much entropy
-	in the {query-ID, random-port} tuple as possible, to help defeat
-	cache poisoning attacks. Refer: CVE-2020-25684.
-
-	Use the SHA-256 hash function to verify that DNS answers
-	received are for the questions originally asked. This replaces
-	the slightly insecure SHA-1 (when compiled with DNSSEC) or
-	the very insecure CRC32 (otherwise). Refer: CVE-2020-25685.
-
-	Handle multiple identical near simultaneous DNS queries better.
-	Previously, such queries would all be forwarded
-	independently. This is, in theory, inefficient but in practise
-	not a problem, _except_ that is means that an answer for any
-	of the forwarded queries will be accepted and cached.
-	An attacker can send a query multiple times, and for each repeat,
-	another {port, ID} becomes capable of accepting the answer he is
-	sending in the blind, to random IDs and ports. The chance of a
-	successful attack is therefore multiplied by the number of repeats
-	of the query. The new behaviour detects repeated queries and
-	merely stores the clients sending repeats so that when the
-	first query completes, the answer can be sent to all the
-	clients who asked. Refer: CVE-2020-25686.
+	referenced by CERT VU#434904.
 	

 version 2.82
@@ -829,22 +127,22 @@ version 2.80
        but those which used the default of no checking will need to be
        altered to explicitly select no checking. The new default is
        because switching off checking for unsigned replies is
-	inherently dangerous. Not only does it open the possibility of forged
+	inherently dangerous. Not only does it open the possiblity of forged
        replies, but it allows everything to appear to be working even
        when the upstream namesevers do not support DNSSEC, and in this
-        case no DNSSEC validation at all is occurring.
+        case no DNSSEC validation at all is occuring.

        Fix DHCP broken-ness when --no-ping AND --dhcp-sequential-ip
 	are set. Thanks to Daniel Miess for help with this.

-	Add a facility to store DNS packets sent/received in a
+	Add a facilty to store DNS packets sent/recieved in a
 	pcap-format file for later debugging. The file location
 	is given by the --dumpfile option, and a bitmap controlling
 	which packets should be dumped is given by the --dumpmask
 	option.

 	Handle the case of both standard and constructed dhcp-ranges on the
-	same interface better. We don't now construct a dhcp-range if there's
+	same interface better. We don't now contruct a dhcp-range if there's
 	already one specified. This allows the specified interface to
 	have different parameters and avoids advertising the same
 	prefix twice. Thanks to Luis Marsano for spotting this case.
@@ -1314,7 +612,7 @@ version 2.73

 	Use inotify for checking on updates to /etc/resolv.conf and
 	friends under Linux. This fixes race conditions when the files are 
-	updated rapidly and saves CPU by not polling. To build
+	updated rapidly and saves CPU by noy polling. To build
 	a binary that runs on old Linux kernels without inotify,
 	use make COPTS=-DNO_INOTIFY

@@ -1654,7 +952,7 @@ version 2.68
 	are dynamic and works much better than the previous
 	work-around which exempted constructed DHCP ranges from the
 	IP address filtering. As a consequence, that work-around
-	is removed. Under certain circumstances, this change will
+	is removed. Under certain circumstances, this change wil
 	break existing configuration: if you're relying on the
 	constructed-range exception, you need to change --auth-zone
 	to specify the same interface as is used to construct your
@@ -2111,7 +1409,7 @@ version 2.61

 	Set the environment variable DNSMASQ_LOG_DHCP when running
 	the script id --log-dhcp is in effect, so that script can
-	tailor their logging verbosity. Suggestion from Malte
+	taylor their logging verbosity. Suggestion from Malte
 	Forkel.

 	Arrange that addresses specified with --listen-address
@@ -1,12 +1,12 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

-                            Preamble
+			    Preamble

  The licenses for most software are designed to take away your
 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
 Foundation's software and to any other program whose authors commit to
 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.

  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
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  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
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 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
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 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
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 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 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
 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
 POSSIBILITY OF SUCH DAMAGES.

-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -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.

    <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
    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
    GNU General Public License for more details.

-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+

 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
 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'.
    This is free software, and you are welcome to redistribute it
    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
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
@@ -236,7 +236,7 @@ Q: What network types are supported by the DHCP server?
 A: Ethernet (and 802.11 wireless) are supported on all platforms. On
   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
   modes". This is unfortunate as it requires users configuring dnsmasq
@@ -1,4 +1,4 @@
-# dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+# dnsmasq is Copyright (c) 2000-2016 Simon Kelley
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@ LDFLAGS       =
 COPTS         = 
 RPM_OPT_FLAGS = 
 LIBS          = 
-LUA           = lua

 #################################################################

@@ -54,34 +53,31 @@ top?=$(CURDIR)

 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` 
-ubus_libs =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_UBUS "" --copy '-lubox -lubus'`
+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_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn` 
 idn2_cflags =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --cflags libidn2`
 idn2_libs =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2`
 ct_cflags =     `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack`
 ct_libs =       `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack`
-lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags $(LUA)` 
-lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs $(LUA)` 
-nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC     $(PKG_CONFIG) --cflags 'nettle hogweed'`
-nettle_libs =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC     $(PKG_CONFIG) --libs 'nettle hogweed'`
+lua_cflags =    `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.2` 
+lua_libs =      `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2` 
+nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed`
+nettle_libs =   `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed`
 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)`\"'
+version =     -DVERSION='\"`$(top)/bld/get-version $(top)`\"'

-sum?=$(shell echo $(CC) -DDNSMASQ_COMPILE_FLAGS="$(CFLAGS)" -DDNSMASQ_COMPILE_OPTS $(COPTS) -E $(top)/$(SRC)/dnsmasq.h | ( md5sum 2>/dev/null || md5 ) | cut -f 1 -d ' ')
-sum!=echo $(CC) -DDNSMASQ_COMPILE_FLAGS="$(CFLAGS)" -DDNSMASQ_COMPILE_OPTS $(COPTS) -E $(top)/$(SRC)/dnsmasq.h | ( md5sum 2>/dev/null || md5 ) | cut -f 1 -d ' '
+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 \
       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 \
-       dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o pattern.o \
+       dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.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 domain-match.o nftset.o
+       poll.o rrfilter.o edns0.o arp.o crypto.o dump.o ubus.o metrics.o

 hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
       dns-protocol.h radv-protocol.h ip6addr.h metrics.h
@@ -89,8 +85,8 @@ hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
 all : $(BUILDDIR)
 	@cd $(BUILDDIR) && $(MAKE) \
 top="$(top)" \
- build_cflags="$(version) $(dbus_cflags) $(idn2_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags) $(nettle_cflags) $(nft_cflags)" \
- build_libs="$(dbus_libs) $(idn2_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs) $(ubus_libs) $(nft_libs)" \
+ build_cflags="$(version) $(dbus_cflags) $(idn2_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags) $(nettle_cflags)" \
+ build_libs="$(dbus_libs) $(idn2_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs) $(ubus_libs)" \
 -f $(top)/Makefile dnsmasq 

 mostly_clean :
@@ -102,7 +98,9 @@ clean : mostly_clean
 	rm -f core */core
 	rm -f *~ contrib/*/*~ */*~

-install : all
+install : all install-common
+
+install-common :
 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
 	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
 	$(INSTALL) -m 644 $(MAN)/dnsmasq.8 $(DESTDIR)$(MANDIR)/man8 
@@ -112,18 +110,14 @@ all-i18n : $(BUILDDIR)
 	@cd $(BUILDDIR) && $(MAKE) \
 top="$(top)" \
 i18n=-DLOCALEDIR=\'\"$(LOCALEDIR)\"\' \
- build_cflags="$(version) $(dbus_cflags) $(idn2_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags) $(nettle_cflags) $(nft_cflags)" \
- build_libs="$(dbus_libs) $(idn2_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs) $(ubus_libs) $(nft_libs)"  \
+ build_cflags="$(version) $(dbus_cflags) $(idn2_cflags) $(idn_cflags) $(ct_cflags) $(lua_cflags) $(nettle_cflags)" \
+ build_libs="$(dbus_libs) $(idn2_libs) $(idn_libs) $(ct_libs) $(lua_libs) $(sunos_libs) $(nettle_libs) $(gmp_libs) $(ubus_libs)"  \
 -f $(top)/Makefile dnsmasq
 	for f in `cd $(PO); echo *.po`; do \
 		cd $(top) && cd $(BUILDDIR) && $(MAKE) top="$(top)" -f $(top)/Makefile $${f%.po}.mo; \
 	done

-install-i18n : all-i18n
-	$(INSTALL) -d $(DESTDIR)$(BINDIR)
-	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
-	$(INSTALL) -m 644 $(MAN)/dnsmasq.8 $(DESTDIR)$(MANDIR)/man8 
-	$(INSTALL) -m 755 $(BUILDDIR)/dnsmasq $(DESTDIR)$(BINDIR)
+install-i18n : all-i18n install-common
 	cd $(BUILDDIR); $(top)/bld/install-mo $(DESTDIR)$(LOCALEDIR) $(INSTALL)
 	cd $(MAN); ../bld/install-man $(DESTDIR)$(MANDIR) $(INSTALL)

@@ -11,14 +11,13 @@ LOCAL_SRC_FILES :=  bpf.c cache.c dbus.c dhcp.c dnsmasq.c \
 		    radv.c slaac.c auth.c ipset.c domain.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 \
-                    domain-match.c nftset.c
+		    crypto.c dump.c ubus.c

 LOCAL_MODULE := dnsmasq

 LOCAL_C_INCLUDES := external/dnsmasq/src

-LOCAL_CFLAGS := -O2 -g -W -Wall -D__ANDROID__ -DNO_TFTP -DNO_SCRIPT
+LOCAL_CFLAGS := -O2 -g -W -Wall -D__ANDROID__ -DNO_IPV6 -DNO_TFTP -DNO_SCRIPT
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc libcutils

 LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -llog
@@ -9,10 +9,7 @@
 # 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.
 # 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
-# that, eg v2.64 comes before v2.63, but v2.63 comes before v2.63rc1
-# and v2.63rc1 comes before v2.63test1
-
+# first. This favours, eg v2.63 over 2.63rc6.

 # Change directory to the toplevel source directory.
 if test -z "$1" || ! test -d "$1" || ! cd "$1"; then
@@ -31,7 +28,7 @@ else
     vers=`cat $1/VERSION | sed 's/[(), ]/,/ g' | tr ',' '\n' | grep ^v[0-9]`

     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 -r | head -n 1 | sed 's/^v//'
     else
         cat $1/VERSION
     fi
@@ -1,37 +1,35 @@
 #!/bin/sh

+search=$1
+shift
+pkg=$1
+shift
+op=$1
+shift
+
 in=`cat`

-search()
-{
-    grep "^\#[[:space:]]*define[[:space:]]*$1" config.h >/dev/null 2>&1 || \
-    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
-
+if grep "^\#[[:space:]]*define[[:space:]]*$search" config.h >/dev/null 2>&1 || \
+    echo $in | grep $search >/dev/null 2>&1; 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="$*"
+	elif grep "^\#[[:space:]]*define[[:space:]]*$pkg" config.h >/dev/null 2>&1 || \
+		 echo $in | grep $pkg >/dev/null 2>&1; then
 	    pkg=""
 	else 
-	    pkg="$lib"
+	    pkg="$*"
 	fi
-    elif search "${search}_STATIC"; then
-	pkg=`$pkg  --static $op $lib`
+    elif grep "^\#[[:space:]]*define[[:space:]]*${search}_STATIC" config.h >/dev/null 2>&1 || \
+	     echo $in | grep ${search}_STATIC >/dev/null 2>&1; then
+	pkg=`$pkg  --static $op $*`
    else
-	pkg=`$pkg $op $lib`
+	pkg=`$pkg $op $*`
    fi
    
-    if search "${search}_STATIC"; then
+    if grep "^\#[[:space:]]*define[[:space:]]*${search}_STATIC" config.h >/dev/null 2>&1 || \
+	   echo $in | grep ${search}_STATIC >/dev/null 2>&1; then
 	if [ $op = "--libs" ] || [ $op = "--copy" ]; then
 	    echo "-Wl,-Bstatic $pkg -Wl,-Bdynamic"
 	else
@@ -42,4 +40,3 @@ if search "$search"; then
    fi
 fi

-done
@@ -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 dependency 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 always '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
+
@@ -153,11 +153,7 @@ int main(int argc, char **argv)
      exit(1);
    }
 
-  if (inet_pton(AF_INET, argv[1], &lease) < 1)
-    {
-      fprintf(stderr, "invalid address: %s\n", argv[1]);
-      exit(1);
-    }
+  lease.s_addr = inet_addr(argv[1]);
   
  memset(&packet, 0, sizeof(packet));
 
@@ -180,8 +176,8 @@ int main(int argc, char **argv)
  
  *(p++) = OPTION_END;
 
-  dest.sin_family = AF_INET;
-  (void)inet_pton(AF_INET, "127.0.0.1", &dest.sin_addr);
+  dest.sin_family = AF_INET; 
+  dest.sin_addr.s_addr = inet_addr("127.0.0.1");
  dest.sin_port = ntohs(DHCP_SERVER_PORT);
  
  if (sendto(fd, &packet, sizeof(packet), 0, 
@@ -280,7 +280,6 @@ int main(int argc, char **argv)
  
  /* This voodoo fakes up a packet coming from the correct interface, which really matters for 
     a DHCP server */
-  memset(&ifr, 0, sizeof(ifr));
  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)
@@ -289,12 +288,13 @@ int main(int argc, char **argv)
      exit(1);
    }
  
-  if (inet_pton(AF_INET, argv[2], &lease.s_addr) < 1)
+  if (inet_addr(argv[2]) == INADDR_NONE)
    {
      perror("invalid ip address");
      exit(1);
    }
  
+  lease.s_addr = inet_addr(argv[2]);
  server = find_interface(lease, nl, if_nametoindex(argv[1]), fd, &ifr);
  
  memset(&packet, 0, sizeof(packet));
@@ -318,12 +318,6 @@ void usage(const char* arg, FILE* stream)
  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;
@@ -349,19 +343,18 @@ int send_release_packet(const char* iface, struct dhcp6_packet* packet)
    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);
+    inet_pton(AF_INET6, "::", &client_addr.sin6_addr);
+    bind(sock, (struct sockaddr*)&client_addr, sizeof(struct sockaddr_in6));
+    inet_pton(AF_INET6, DHCP6_MULTICAST_ADDRESS, &server_addr.sin6_addr);
    server_addr.sin6_port = htons(DHCP6_SERVER_PORT);
-    ssize_t recv_size = 0;
-    int result;
+    int16_t recv_size = 0;
    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);
+	  {
+	    perror("sendto failed");
+            exit(4);
+	  }
 	
        recv_size = recvfrom(sock, response, sizeof(response), MSG_DONTWAIT, NULL, 0);
        if (recv_size == -1)
@@ -374,18 +367,16 @@ int send_release_packet(const char* iface, struct dhcp6_packet* packet)
 	    else
 	      {
                perror("recvfrom");
-		result = UNSPEC_FAIL;
 	      }
 	  }
-	else
+	
+        int16_t result = parse_packet(response, recv_size);
+        if (result == NOT_REPLY_CODE)
 	  {
-	    result = parse_packet(response, recv_size);
-	    if (result == NOT_REPLY_CODE)
-	      {
-		sleep(1);
-		continue;
-	      }
+            sleep(1);
+            continue;
 	  }
+
        close(sock);
        return result;
      }
@@ -1,695 +0,0 @@
-/* leasequery is Copyright (c) 2025 Simon Kelley
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991, or
-   (at your option) version 3 dated 29 June, 2007.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* Author's email: simon@thekelleys.org.uk */
-
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <limits.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <errno.h>
-#include <pwd.h>
-#include <grp.h>
-#include <netdb.h>
-#include <linux/types.h>
-#include <linux/capability.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-typedef unsigned long long u64;
-
-#define INADDRSZ        4
-#define ADDRSTRLEN      46
-
-#define option_len(opt) ((int)(((unsigned char *)(opt))[1]))
-#define option_ptr(opt, i) ((void *)&(((unsigned char *)(opt))[2u+(unsigned int)(i)]))
-
-#define DHCP_CHADDR_MAX  16
-#define DHCP_SERVER_PORT 67
-#define DHCP_CLIENT_PORT 68
-#define BOOTREQUEST      1
-#define BOOTREPLY        2
-
-#define DHCP_COOKIE              0x63825363
-
-#define DHCPLEASEQUERY          10
-#define DHCPLEASEUNASSIGNED     11
-#define DHCPLEASEUNKNOWN        12
-#define DHCPLEASEACTIVE         13
-
-#define OPTION_END               255
-#define OPTION_ROUTER            3
-#define OPTION_VENDOR_CLASS_OPT  43
-#define OPTION_LEASE_TIME        51
-#define OPTION_MESSAGE_TYPE      53
-#define OPTION_SERVER_IDENTIFIER 54
-#define OPTION_REQUESTED_OPTIONS 55
-#define OPTION_VENDOR_ID         60
-#define OPTION_CLIENT_ID         61
-
-/* flags in top of length field for DHCP-option tables */
-#define OT_ADDR_LIST    0x8000
-#define OT_RFC1035_NAME 0x4000
-#define OT_INTERNAL     0x2000
-#define OT_NAME         0x1000
-#define OT_CSTRING      0x0800
-#define OT_DEC          0x0400 
-#define OT_TIME         0x0200
-
-#define GETSHORT(s, cp) do { \
-	unsigned char *t_cp = (unsigned char *)(cp); \
-	(s) = ((u16)t_cp[0] << 8) \
-	    | ((u16)t_cp[1]) \
-	    ; \
-	(cp) += 2; \
-  } while(0)
-
-#define GETLONG(l, cp) do { \
-	unsigned char *t_cp = (unsigned char *)(cp); \
-	(l) = ((u32)t_cp[0] << 24) \
-	    | ((u32)t_cp[1] << 16) \
-	    | ((u32)t_cp[2] << 8) \
-	    | ((u32)t_cp[3]) \
-	    ; \
-	(cp) += 4; \
-  } while (0)
-
-#define PUTSHORT(s, cp) do { \
-	u16 t_s = (u16)(s); \
-	unsigned char *t_cp = (unsigned char *)(cp); \
-	*t_cp++ = t_s >> 8; \
-	*t_cp   = t_s; \
-	(cp) += 2; \
-  } while(0)
-
-#define PUTLONG(l, cp) do { \
-	u32 t_l = (u32)(l); \
-	unsigned char *t_cp = (unsigned char *)(cp); \
-	*t_cp++ = t_l >> 24; \
-	*t_cp++ = t_l >> 16; \
-	*t_cp++ = t_l >> 8; \
-	*t_cp   = t_l; \
-	(cp) += 4; \
-  } while (0)
-
-union all_addr {
-  struct in_addr addr4;
-  struct in6_addr addr6;
-};
-  
-struct dhcp_packet_with_opts{
-  struct dhcp_packet {
-    unsigned char op, htype, hlen, hops;
-    unsigned int xid;
-    unsigned short secs, flags;
-    struct in_addr ciaddr, yiaddr, siaddr, giaddr;
-    unsigned char chaddr[DHCP_CHADDR_MAX], sname[64], file[128];
-  } header;
-  unsigned char options[312];
-};
-
-static const struct opttab_t {
-  char *name;
-  u16 val, size;
-} opttab[] = {
-  { "netmask", 1, OT_ADDR_LIST },
-  { "time-offset", 2, 4 },
-  { "router", 3, OT_ADDR_LIST  },
-  { "dns-server", 6, OT_ADDR_LIST },
-  { "log-server", 7, OT_ADDR_LIST },
-  { "lpr-server", 9, OT_ADDR_LIST },
-  { "hostname", 12, OT_INTERNAL | OT_NAME },
-  { "boot-file-size", 13, 2 | OT_DEC },
-  { "domain-name", 15, OT_NAME },
-  { "swap-server", 16, OT_ADDR_LIST },
-  { "root-path", 17, OT_NAME },
-  { "extension-path", 18, OT_NAME },
-  { "ip-forward-enable", 19, 1 },
-  { "non-local-source-routing", 20, 1 },
-  { "policy-filter", 21, OT_ADDR_LIST },
-  { "max-datagram-reassembly", 22, 2 | OT_DEC },
-  { "default-ttl", 23, 1 | OT_DEC },
-  { "mtu", 26, 2 | OT_DEC },
-  { "all-subnets-local", 27, 1 },
-  { "broadcast", 28, OT_INTERNAL | OT_ADDR_LIST },
-  { "router-discovery", 31, 1 },
-  { "router-solicitation", 32, OT_ADDR_LIST },
-  { "static-route", 33, OT_ADDR_LIST },
-  { "trailer-encapsulation", 34, 1 },
-  { "arp-timeout", 35, 4 | OT_DEC },
-  { "ethernet-encap", 36, 1 },
-  { "tcp-ttl", 37, 1 },
-  { "tcp-keepalive", 38, 4 | OT_DEC },
-  { "nis-domain", 40, OT_NAME },
-  { "nis-server", 41, OT_ADDR_LIST },
-  { "ntp-server", 42, OT_ADDR_LIST },
-  { "vendor-encap", 43, OT_INTERNAL },
-  { "netbios-ns", 44, OT_ADDR_LIST },
-  { "netbios-dd", 45, OT_ADDR_LIST },
-  { "netbios-nodetype", 46, 1 },
-  { "netbios-scope", 47, 0 },
-  { "x-windows-fs", 48, OT_ADDR_LIST },
-  { "x-windows-dm", 49, OT_ADDR_LIST },
-  { "requested-address", 50, OT_INTERNAL | OT_ADDR_LIST },
-  { "lease-time", 51, OT_INTERNAL | OT_TIME },
-  { "option-overload", 52, OT_INTERNAL },
-  { "message-type", 53, OT_INTERNAL | OT_DEC },
-  { "server-identifier", 54, OT_INTERNAL | OT_ADDR_LIST },
-  { "parameter-request", 55, OT_INTERNAL },
-  { "message", 56, OT_INTERNAL },
-  { "max-message-size", 57, OT_INTERNAL },
-  { "T1", 58, OT_TIME},
-  { "T2", 59, OT_TIME},
-  { "vendor-class", 60, OT_NAME },
-  { "client-id", 61, OT_INTERNAL },
-  { "nis+-domain", 64, OT_NAME },
-  { "nis+-server", 65, OT_ADDR_LIST },
-  { "tftp-server", 66, OT_NAME },
-  { "bootfile-name", 67, OT_NAME },
-  { "mobile-ip-home", 68, OT_ADDR_LIST }, 
-  { "smtp-server", 69, OT_ADDR_LIST }, 
-  { "pop3-server", 70, OT_ADDR_LIST }, 
-  { "nntp-server", 71, OT_ADDR_LIST }, 
-  { "irc-server", 74, OT_ADDR_LIST }, 
-  { "user-class", 77, 0 },
-  { "rapid-commit", 80, 0 },
-  { "FQDN", 81, OT_INTERNAL },
-  { "agent-info", 82, OT_INTERNAL },
-  { "last-transaction", 91, 4 | OT_TIME },
-  { "associated-ip", 92, OT_ADDR_LIST },
-  { "client-arch", 93, 2 | OT_DEC },
-  { "client-interface-id", 94, 0 },
-  { "client-machine-id", 97, 0 },
-  { "posix-timezone", 100, OT_NAME }, /* RFC 4833, Sec. 2 */
-  { "tzdb-timezone", 101, OT_NAME }, /* RFC 4833, Sec. 2 */
-  { "ipv6-only", 108, 4 | OT_DEC },  /* RFC 8925 */ 
-  { "subnet-select", 118, OT_INTERNAL },
-  { "domain-search", 119, OT_RFC1035_NAME },
-  { "sip-server", 120, 0 },
-  { "classless-static-route", 121, 0 },
-  { "vendor-id-encap", 125, 0 },
-  { "tftp-server-address", 150, OT_ADDR_LIST },
-  { "server-ip-address", 255, OT_ADDR_LIST }, /* special, internal only, sets siaddr */
-  { NULL, 0, 0 }
-};
-
-static void prettyprint_time(char *buf, unsigned int t);
-static char *print_mac(char *buff, unsigned char *mac, int len);
-
-int lookup_dhcp_opt(char *name)
-{
-  const struct opttab_t *t = opttab;
-  int i;
-
-  for (i = 0; t[i].name; i++)
-    if (strcasecmp(t[i].name, name) == 0)
-      return t[i].val;
-  
-  return -1;
-}
-
-char *option_string(unsigned int opt, unsigned char *val, int opt_len, char *buf, int buf_len)
-{
-  int o, i, j, nodecode = 0;
-  const struct opttab_t *ot = opttab;
-  char addrbuff[ADDRSTRLEN];
-  
-  for (o = 0; ot[o].name; o++)
-    if (ot[o].val == opt)
-      {
-	if (buf)
-	  {
-	    memset(buf, 0, buf_len);
-	    
-	    if (ot[o].size & OT_ADDR_LIST) 
-	      {
-		union all_addr addr;
-		int addr_len = INADDRSZ;
-
-		for (buf[0]= 0, i = 0; i <= opt_len - addr_len; i += addr_len) 
-		  {
-		    if (i != 0)
-		      strncat(buf, ", ", buf_len - strlen(buf));
-		    /* align */
-		    memcpy(&addr, &val[i], addr_len); 
-		    inet_ntop(AF_INET, &val[i], addrbuff, ADDRSTRLEN);
-		    strncat(buf, addrbuff, buf_len - strlen(buf));
-		  }
-	      }
-	    else if (ot[o].size & OT_NAME)
-		for (i = 0, j = 0; i < opt_len && j < buf_len ; i++)
-		  {
-		    char c = val[i];
-		    if (isprint((unsigned char)c))
-		      buf[j++] = c;
-		  }
-	    else if ((ot[o].size & (OT_DEC | OT_TIME)) && opt_len != 0)
-	      {
-		unsigned int dec = 0;
-		
-		for (i = 0; i < opt_len; i++)
-		  dec = (dec << 8) | val[i]; 
-
-		if (ot[o].size & OT_TIME)
-		  prettyprint_time(buf, dec);
-		else
-		  sprintf(buf, "%u", dec);
-	      }
-	    else
-	      nodecode = 1;
-	  }
-	break;
-      }
-
-  if (opt_len != 0 && buf && (!ot[o].name || nodecode))
-    {
-      int trunc  = 0;
-      if (opt_len > 14)
-	{
-	  trunc = 1;
-	  opt_len = 14;
-	}
-      print_mac(buf, val, opt_len);
-      if (trunc)
-	strncat(buf, "...", buf_len - strlen(buf));
-    
-
-    }
-
-  return ot[o].name ? ot[o].name : "";
-
-}
-
-static void prettyprint_time(char *buf, unsigned int t)
-{
-  if (t == 0xffffffff)
-    sprintf(buf, "infinite");
-  else
-    {
-      unsigned int x, p = 0;
-       if ((x = t/86400))
-	p += sprintf(&buf[p], "%ud", x);
-       if ((x = (t/3600)%24))
-	p += sprintf(&buf[p], "%uh", x);
-      if ((x = (t/60)%60))
-	p += sprintf(&buf[p], "%um", x);
-      if ((x = t%60))
-	sprintf(&buf[p], "%us", x);
-    }
-}
-
-static char *print_mac(char *buff, unsigned char *mac, int len)
-{
-  char *p = buff;
-  int i;
-   
-  if (len == 0)
-    sprintf(p, "<null>");
-  else
-    for (i = 0; i < len; i++)
-      p += sprintf(p, "%.2x%s", mac[i], (i == len - 1) ? "" : ":");
-  
-  return buff;
-}
-
-static unsigned char *dhcp_skip_opts(struct dhcp_packet_with_opts *pktp)
-{
-  unsigned char *start = (unsigned char *)(((unsigned int *)&pktp->options[0]) + 1);
-  while (*start != 0)
-    start += start[1] + 2;
-  return start;
-}
-
-static unsigned char *dhcp_find_opt(struct dhcp_packet_with_opts *pktp, int optno)
-{
-  unsigned char *start = (unsigned char *)(((unsigned int *)&pktp->options[0]) + 1);
-  while (*start != OPTION_END)
-    {
-      if (*start == optno)
-	return start;
-      start += start[1] + 2;
-    }
-
-  return NULL;
-}
-
-static void option_put(struct dhcp_packet_with_opts *pktp, int opt, int len, unsigned int val)
-{
-  int i;
-  unsigned char *p = dhcp_skip_opts(pktp);
-  
-  if (p) 
-    {
-      *p++ = opt;
-      *p++ = len;
-      for (i = 0; i < len; i++)
-      *(p++) = val >> (8 * (len - (i + 1)));
-    }
-}
-
-static void option_put_string(struct dhcp_packet_with_opts *pktp, int opt, 
-			      const char *string, int null_term)
-{
-  unsigned char *p;
-  size_t len = strlen(string);
-
-  if (null_term && len != 255)
-    len++;
-
-  if ((p = dhcp_skip_opts(pktp)))
-    {
-      *p++ = opt;
-      *p++ = len;
-      memcpy(p, string, len);
-    }
-}
-
-
-/* in may equal out, when maxlen may be -1 (No max len). 
-   Return -1 for extraneous no-hex chars found. */
-int parse_hex(char *in, unsigned char *out, int maxlen, 
-	      unsigned int *wildcard_mask, int *mac_type)
-{
-  int done = 0, mask = 0, i = 0;
-  char *r;
-    
-  if (mac_type)
-    *mac_type = 0;
-  
-  while (!done && (maxlen == -1 || i < maxlen))
-    {
-      for (r = in; *r != 0 && *r != ':' && *r != '-' && *r != ' '; r++)
-	if (*r != '*' && !isxdigit((unsigned char)*r))
-	  return -1;
-      
-      if (*r == 0)
-	done = 1;
-      
-      if (r != in )
-	{
-	  if (*r == '-' && i == 0 && mac_type)
-	   {
-	      *r = 0;
-	      *mac_type = strtol(in, NULL, 16);
-	      mac_type = NULL;
-	   }
-	  else
-	    {
-	      *r = 0;
-	      if (strcmp(in, "*") == 0)
-		{
-		  mask = (mask << 1) | 1;
-		  i++;
-		}
-	      else
-		{
-		  int j, bytes = (1 + (r - in))/2;
-		  for (j = 0; j < bytes; j++)
-		    { 
-		      char sav;
-		      if (j < bytes - 1)
-			{
-			  sav = in[(j+1)*2];
-			  in[(j+1)*2] = 0;
-			}
-		      /* checks above allow mix of hexdigit and *, which
-			 is illegal. */
-		      if (strchr(&in[j*2], '*'))
-			return -1;
-		      out[i] = strtol(&in[j*2], NULL, 16);
-		      mask = mask << 1;
-		      if (++i == maxlen)
-			break; 
-		      if (j < bytes - 1)
-			in[(j+1)*2] = sav;
-		    }
-		}
-	    }
-	}
-      in = r+1;
-    }
-  
-  if (wildcard_mask)
-    *wildcard_mask = mask;
-
-  return i;
-}
-
-static char *split_chr(char *s, char c)
-{
-  char *comma, *p;
-
-  if (!s || !(comma = strchr(s, c)))
-    return NULL;
-  
-  p = comma;
-  *comma = ' ';
-  
-  for (; *comma == ' '; comma++);
-  
-  for (; (p >= s) && *p == ' '; p--)
-    *p = 0;
-  
-  return comma;
-}
-
-static char *split(char *s)
-{
-  return split_chr(s, ',');
-}
-
-
-int main(int argc, char **argv)
-{
-  int fd;
-  struct ifreq ifr;
-  struct in_addr iface_addr, server_addr, lease_addr;
-  struct dhcp_packet_with_opts pkt;
-  struct sockaddr_in saddr;
-  unsigned char *p;
-  ssize_t sz;
-  unsigned char mac[DHCP_CHADDR_MAX], clid[256], req_options[256];
-  char buff[500];
-  int clid_len = 0, mac_len = 0, mac_type = 0, opts_len = 0;
-  unsigned short port = DHCP_SERVER_PORT;
-  unsigned int xid;
-  struct timeval tv;
-  
-  gettimeofday(&tv, NULL);
-  srand(tv.tv_usec);
-  xid = rand();
-  server_addr.s_addr = lease_addr.s_addr = iface_addr.s_addr = 0;
-  
-  if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) == -1)
-    {
-      perror("leasequery: cannot create socket");
-      exit(1);
-    }
-  
-  while (1)
-    {
-      int option = getopt(argc, argv, "i:s:l:m:c:p:r:");
-
-      if (option == -1)
-	break;
-      
-      switch (option) 
-	{
-	default:
-	  fprintf(stderr,
-		  "-p <port>             port on DHCP server.\n"
-		  "-i <interface>        exit interface to DHCP server.\n"
-		  "-s <inet-addr>        DHCP server address.\n"
-		  "-l <inet-addr>        Query lease by IP address.\n"
-		  "-m <MAC-addr>         Query lease by MAC address.\n"
-		  "-c <hex>              Query lease by client-id.\n"
-		  "-r <name>|<int>[,...] List of options to return.\n");
-	  exit(1);
-		  		  
-	case 'p':
-	  port = atoi(optarg);
-	  break;
-	  
-	case 'i':
-	  strncpy(ifr.ifr_name, optarg, IF_NAMESIZE);
-	   ifr.ifr_addr.sa_family = AF_INET;
-	   if (ioctl(fd, SIOCGIFADDR, &ifr) == -1)
-	    {
-	      perror("leasequery: cannot get interface address");
-	      exit(1);
-	    }
-
-	  iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
-	  break;
-
-	case 's':
-	  if (inet_pton(AF_INET, optarg, &server_addr) <= 0)
-	    {
-	      fprintf(stderr, "leasequery: bad server address\n");
-	      exit(1);
-	    }
-	  break;
-
-	case 'l':
-	  if (inet_pton(AF_INET, optarg, &lease_addr) <= 0)
-	    {
-	      fprintf(stderr, "leasequery: bad lease address\n");
-	      exit(1);
-	    }
-	  break;
-
-	case 'm':
-	  mac_type = 1; /* default ethernet */
-	  mac_len = parse_hex(optarg, mac, DHCP_CHADDR_MAX, NULL, &mac_type);
-	  if (!mac_type)
-	    mac_type  = 1; /* default ethernet */
-	  break;
-
-	case 'c':
-	  clid_len = parse_hex(optarg, clid, 256, NULL, NULL);
-	  break;
-
-	case 'r':
-	  {
-	    char *comma;
-	    int opt;
-	    
-	    while (optarg)
-	      {
-		comma = split(optarg);
-		
-		if ((opt = lookup_dhcp_opt(optarg)) != -1 || (opt = atoi(optarg)) != 0) 
-		  req_options[opts_len++] = opt;
-		
-		optarg = comma;
-	      }
-	    
-	    break;
-	  }
-	}
-    }
-
-  if (!server_addr.s_addr)
-    {
-      fprintf(stderr, "leasequery: no server address\n");
-      exit(1);
-    }
-    
-  memset(&pkt, 0, sizeof pkt);
-  pkt.header.op = BOOTREQUEST;
-  pkt.header.xid = xid;
-  pkt.header.ciaddr = lease_addr;
-  pkt.header.hlen = mac_len;
-  pkt.header.htype = mac_type;
-  memcpy(pkt.header.chaddr, mac, mac_len);
-  *((unsigned int *)&pkt.options[0]) = htonl(DHCP_COOKIE);
-
-  /* Dnsmasq extension. */
-  pkt.header.giaddr.s_addr = iface_addr.s_addr ? iface_addr.s_addr : INADDR_BROADCAST;
-    
-  option_put(&pkt, OPTION_MESSAGE_TYPE, 1, DHCPLEASEQUERY);
-  
-  if (clid_len != 0)
-    {
-      p = dhcp_skip_opts(&pkt);
-      *p++ = OPTION_CLIENT_ID;
-      *p++ = clid_len;
-      memcpy(p, clid, clid_len);
-    }
-  
-  if (opts_len != 0)
-    {
-      p = dhcp_skip_opts(&pkt); 
-      *p++ = OPTION_REQUESTED_OPTIONS;
-      *p++ = opts_len;
-      memcpy(p, req_options, opts_len);
-    }
-  
-  if (iface_addr.s_addr)
-    {
-      saddr.sin_family = AF_INET;
-      saddr.sin_port = htons(port);
-      saddr.sin_addr.s_addr = iface_addr.s_addr;
-      
-      if (bind(fd, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in)))
-	{
-	  perror("leasequery: cannot bind DHCP server socket");
-	  exit(1);
-	}
-    }
-	  
-  saddr.sin_family = AF_INET;
-  saddr.sin_port = htons(port);
-  saddr.sin_addr = server_addr;
-
-  while((sz = sendto(fd, &pkt, dhcp_skip_opts(&pkt) - ((unsigned char *)&pkt), 0, (struct sockaddr *)&saddr, sizeof(saddr))) == -1 &&
-	errno == EINTR);
-
-  if (sz == -1)
-    {
-      perror("leasequery: sendto()");
-      exit(1);
-    }
-  
-  sz = recv(fd, &pkt, sizeof(pkt), 0);
-
-  if (sz == -1)
-    {
-      perror("leasequery: recv()");
-      exit(1);
-    }
-  
-  if (sz >= sizeof(pkt.header) &&
-      pkt.header.op == BOOTREPLY &&
-      (p = dhcp_find_opt(&pkt, OPTION_MESSAGE_TYPE)) &&
-      pkt.header.xid == xid)
-    {
-      if (p[2] == DHCPLEASEUNASSIGNED)
-	printf("UNASSIGNED\n");
-      else if (p[2] == DHCPLEASEUNKNOWN)
-	printf("UNKNOWN\n");
-      else if (p[2] == DHCPLEASEACTIVE)
-	{
-	  print_mac(buff, pkt.header.chaddr, pkt.header.hlen);
-	  printf("ACTIVE %s %s\n", inet_ntoa(pkt.header.ciaddr), buff);
-      
-	  p = (unsigned char *)(((unsigned int *)&pkt.options[0]) + 1);
-	  
-	  while (*p != OPTION_END)
-	    {
-	      if (*p != OPTION_MESSAGE_TYPE)
-		{
-		  char *optname = option_string(p[0], option_ptr(p, 0), option_len(p), buff, 500);
-		  
-		  printf("size:%3d option:%3d %s  %s\n", option_len(p), p[0], optname, buff);
-		}
-	      p += p[1] + 2;
-	    }
-	}
-    }
-}
@@ -44,22 +44,10 @@ 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
 ----------
 Returns nothing. Takes a set of arguments representing the new
@@ -260,15 +248,6 @@ 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
 ----------
@@ -1 +0,0 @@
-submodules/dnsmasq-debian/debian
@@ -0,0 +1,5 @@
+/etc/init.d/dnsmasq
+/etc/default/dnsmasq
+/etc/dnsmasq.conf
+/etc/resolvconf/update.d/dnsmasq
+/etc/insserv.conf.d/dnsmasq
@@ -0,0 +1,66 @@
+Source: dnsmasq
+Section: net
+Priority: optional
+Build-depends: gettext, libnetfilter-conntrack-dev [linux-any],
+               libidn2-dev, libdbus-1-dev (>=0.61), libgmp-dev, 
+               nettle-dev (>=2.4-3), libbsd-dev [kfreebsd-any],
+	       liblua5.2-dev, dh-runit, debhelper-compat (= 10),
+               pkg-config
+Maintainer: Simon Kelley <simon@thekelleys.org.uk>
+Homepage: http://www.thekelleys.org.uk/dnsmasq/doc.html
+Vcs-Git: http://thekelleys.org.uk/git/dnsmasq.git
+Vcs-Browser: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git
+Standards-Version: 3.9.8
+
+Package: dnsmasq
+Architecture: all
+Depends: netbase, dnsmasq-base,
+         init-system-helpers (>= 1.18~), lsb-base (>= 3.0-6), ${misc:Depends}
+Suggests: resolvconf
+Breaks: ${runit:Breaks}
+Conflicts: resolvconf (<<1.15), ${runit:Conflicts}
+Description: Small caching DNS proxy and DHCP/TFTP server
+ Dnsmasq is a 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/TFTP for network booting of diskless machines.
+
+Package: dnsmasq-base
+Architecture: any
+Depends: adduser, ${shlibs:Depends}
+Breaks: dnsmasq (<< 2.63-1~)
+Replaces: dnsmasq (<< 2.63-1~), dnsmasq-base
+Recommends: dns-root-data
+Provides: dnsmasq-base
+Conflicts: dnsmasq-base-lua
+Description: Small caching DNS proxy and DHCP/TFTP server
+ 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.
+
+Package: dnsmasq-base-lua
+Architecture: any
+Depends: adduser, ${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
+ 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
+Architecture: linux-any
+Depends: ${shlibs:Depends}
+Conflicts: dnsmasq (<<2.40)
+Description: Utilities for manipulating DHCP leases
+ Small utilities to query a DHCP server's lease database and
+ remove leases from it. These programs are distributed with dnsmasq
+ and may not work correctly with other DHCP servers.
@@ -0,0 +1,21 @@
+dnsmasq is Copyright (c) 2000-2020 Simon Kelley
+
+It was downloaded from: http://www.thekelleys.org.uk/dnsmasq/
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991, or
+   (at your option) version 3 dated 29 June, 2007.
+ 
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+On Debian GNU/Linux systems, the text of the GNU general public license is 
+available in the file /usr/share/common-licenses/GPL-2 or 
+/usr/share/common-licenses/GPL-3
+
+The Debian package of dnsmasq was created by Simon Kelley with assistance 
+from Lars Bahner.
+
@@ -0,0 +1,18 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+	<policy user="root">
+		<allow own="uk.org.thekelleys.dnsmasq"/>
+		<allow send_destination="uk.org.thekelleys.dnsmasq"/>
+	</policy>
+        <policy user="dnsmasq">
+                <allow own="uk.org.thekelleys.dnsmasq"/>
+                <allow send_destination="uk.org.thekelleys.dnsmasq"/>
+        </policy>
+	<policy context="default">
+                <deny own="uk.org.thekelleys.dnsmasq"/>
+                <deny send_destination="uk.org.thekelleys.dnsmasq"/>
+        </policy>
+</busconfig>
+
@@ -0,0 +1,42 @@
+# 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"
+
+# Whether or not to run the dnsmasq daemon; set to 0 to disable.
+# Note that this is only valid when using SYSV init. For systemd,
+# use "systemctl disable dnsmasq"
+ENABLED=1
+
+# 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.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"
@@ -0,0 +1 @@
+/etc/dbus-1/system.d/dnsmasq.conf
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+
+# 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 [ -z "`id -u dnsmasq 2> /dev/null`" ]; then
+    adduser --system  --home /var/lib/misc --gecos "dnsmasq" \
+            --no-create-home --disabled-password \
+            --quiet dnsmasq || true
+  fi
+
+  # Make the directory where we keep the pid file - this
+  # has to be owned by "dnsmasq" so that the file can be unlinked.
+  # This is only actually used by the dnsmasq binary package, not
+  # dnsmasq-base, but it's much easier to create it here so that
+  # we don't have synchronisation issues with the creation of the
+  # dnsmasq user. 
+  if [ ! -d /run/dnsmasq ]; then
+    mkdir /run/dnsmasq
+    chown dnsmasq:nogroup /run/dnsmasq
+  fi
+fi
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if [ purge = "$1" ]; then
+   if [ -x "$(command -v deluser)" ]; then
+     deluser --quiet --system dnsmasq > /dev/null || true
+  else
+     echo >&2 "not removing dnsmasq system account because deluser command was not found"
+  fi
+  rm -rf /run/dnsmasq
+fi
@@ -0,0 +1 @@
+debian/dnsmasq.runscript name=dnsmasq,logscript,presubj
@@ -0,0 +1,5 @@
+#!/bin/sh -eu
+if [ -x /sbin/resolvconf ] ; then
+	/sbin/resolvconf -d lo.dnsmasq
+fi
+
@@ -0,0 +1,43 @@
+#!/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
@@ -0,0 +1,325 @@
+#!/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
+
+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.
+ENABLED=1
+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
+
+# 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.
+test -e /usr/share/dnsmasq/installed-marker || exit 0
+
+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=/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
+
+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
+}
+
+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()
+{
+    # 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}
+}
+
+stop_resolvconf()
+{
+    if [ -x /sbin/resolvconf ] ; then
+        /sbin/resolvconf -d lo.${NAME}${INSTANCE:+.${INSTANCE}}
+    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 /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)
+    test "${ENABLED}" != "0" || exit 0
+    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
+    if [ "${ENABLED}" != "0" ]; then
+        log_daemon_msg "Stopping ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"
+    fi
+    stop
+    RETVAL="${?}"
+    if [ "${ENABLED}" = "0" ]; then
+        case "${RETVAL}" in
+          0) log_daemon_msg "Stopping ${DESC}" "${NAME}${INSTANCE:+.${INSTANCE}}"; 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
+    ;;
+  checkconfig)
+    ${DAEMON} --test ${CONFIG_DIR:+ -7 ${CONFIG_DIR}} ${DNSMASQ_OPTS:+ ${DNSMASQ_OPTS}} >/dev/null 2>&1
+    RETVAL="${?}"
+    exit ${RETVAL}
+    ;;
+  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}${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`
+    ;;
+  systemd-start-resolvconf)
+    start_resolvconf
+    ;;
+  systemd-stop-resolvconf)
+    stop_resolvconf
+    ;;
+  systemd-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 ] || return 2 ; }
+        chown dnsmasq:nogroup /run/dnsmasq || return 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}}
+    ;;
+  *)
+    echo "Usage: /etc/init.d/${NAME} {start|stop|restart|force-reload|dump-stats|status}" >&2
+    exit 3
+    ;;
+esac
+
+exit 0
@@ -0,0 +1 @@
+$named dnsmasq
@@ -0,0 +1,2 @@
+# This file indicates dnsmasq (and not just dnsmasq-base) is installed.
+# It is an implementation detail of the dnsmasq init script.
@@ -0,0 +1,3 @@
+# dnsmasq-base and dnsmasq-base-lua are mutually exclusive and both
+# provide /usr/share/doc/dnsmasq-base
+dnsmasq-base-lua binary: usr-share-doc-symlink-without-dependency dnsmasq-base
@@ -0,0 +1,38 @@
+#!/bin/sh
+set -e
+
+# Code copied from dh_systemd_enable ----------------------
+# This will only remove masks created by d-s-h on package removal.
+deb-systemd-helper unmask dnsmasq.service >/dev/null || true
+
+# was-enabled defaults to true, so new installations run enable.
+if deb-systemd-helper --quiet was-enabled dnsmasq.service; then
+	# Enables the unit on first installation, creates new
+	# symlinks on upgrades if the unit file has changed.
+	deb-systemd-helper enable dnsmasq.service >/dev/null || true
+else
+	# Update the statefile to add new symlinks (if any), which need to be
+	# cleaned up on purge. Also remove old symlinks.
+	deb-systemd-helper update-state dnsmasq.service >/dev/null || true
+fi
+# End code copied from dh_systemd_enable ------------------
+
+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 /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
+
+
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+if [ purge = "$1" ]; then
+   update-rc.d dnsmasq remove >/dev/null
+fi
+
+# Code copied from dh_systemd_enable ----------------------
+if [ "$1" = "remove" ]; then
+	if [ -x "/usr/bin/deb-systemd-helper" ]; then
+		deb-systemd-helper mask dnsmasq.service >/dev/null
+	fi
+fi
+
+if [ "$1" = "purge" ]; then
+	if [ -x "/usr/bin/deb-systemd-helper" ]; then
+		deb-systemd-helper purge dnsmasq.service >/dev/null
+		deb-systemd-helper unmask dnsmasq.service >/dev/null
+	fi
+fi
+# End code copied from dh_systemd_enable ------------------
+
@@ -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
+
+
@@ -0,0 +1,79 @@
+Notes on configuring dnsmasq as packaged for Debian.
+
+(1) To configure dnsmasq edit /etc/dnsmasq.conf. The file is well
+    commented; see also the dnsmasq.8 man page for explanation of
+    the options. The file /etc/default/dnsmasq also exists but it
+    shouldn't need to be touched in most cases. To set up DHCP
+    options you might need to refer to a copy of RFC 2132. This is 
+    available on Debian systems in the package doc-rfc-std as the file
+    /usr/share/doc/RFC/draft-standard/rfc2132.txt.gz .
+
+(2) Installing the dnsmasq package also creates the directory
+    /etc/dnsmasq.d which is searched by dnsmasq for configuration file
+    fragments. This behaviour can be disabled by editing 
+    /etc/default/dnsmasq.
+
+(3) If the Debian resolvconf package is installed then, regardless
+    of what interface configuration daemons are employed, the list of
+    nameservers to which dnsmasq should forward queries can be found
+    in /var/run/dnsmasq/resolv.conf; also, 127.0.0.1 is listed as the
+    first nameserver address in /etc/resolv.conf. This works using the
+    default configurations of resolvconf and dnsmasq.
+
+(4) In the absence of resolvconf, if you are using dhcpcd then
+    dnsmasq should read the list of nameservers from the automatically
+    generated file /etc/dhcpc/resolv.conf.  You should list 127.0.0.1
+    as the first nameserver address in /etc/resolv.conf.
+
+(5) In the absence of resolvconf, if you are using pppd then
+    dnsmasq should read the list of nameservers from the automatically
+    generated file /etc/ppp/resolv.conf.  You should list 127.0.0.1
+    as the first nameserver address in /etc/resolv.conf.
+
+(6) In the absence of resolvconf, dns-nameservers lines in 
+    /etc/network/interfaces are ignored. If you do not use
+    resolvconf, list 127.0.0.1 as the first nameserver address
+    in /etc/resolv.conf and configure your nameservers using
+    "server=<IP-address>" lines in /etc/dnsmasq.conf.
+
+(7) If you run multiple DNS servers on a single machine, each
+    listening on a different interface, then it is necessary to use 
+    the bind-interfaces option by uncommenting "bind-interfaces" in 
+    /etc/dnsmasq.conf. This option stops dnsmasq from binding the 
+    wildcard address and allows servers listening on port 53 on
+    interfaces not in use by dnsmasq to work. The Debian 
+    libvirt package will add a configuration file in /etc/dnsmasq.d
+    which does this so that the "system" dnsmasq and "private" dnsmasq
+    instances started by libvirt do not clash.
+
+(8) The following options are supported in DEB_BUILD_OPTIONS
+      noopt       : compile without optimisation.
+      nostrip     : don't remove symbols from binary. 
+      nodocs      : omit documentation.
+      notftp      : omit TFTP support.
+      nodhcp      : omit DHCP support.
+      nodhcp6     : omit DHCPv6 support.
+      noscript    : omit lease-change script support.
+      uselua      : provide support for lease-change scripts written
+                    in Lua.
+      noipv6      : omit IPv6 support.
+      nodbus      : omit DBus support.
+      noconntrack : omit connection tracking support. 
+      noipset     : omit IPset support.
+      nortc       : compile alternate mode suitable for systems without an RTC.
+      noi18n      : omit translations and internationalisation support.
+      noidn       : omit international domain name support, must be
+                    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
+    dnsmasq. Dnsmasq-base provides the dnsmasq executable and
+    documentation (including this file). Dnsmasq, which depends on
+    dnsmasq-base, provides the init script and configuration
+    infrastructure. This file assumes that both are installed. It is
+    possible to install only dnsmasq-base and use dnsmasq as a
+    non-"system" daemon. Libvirt, for instance, does this.
+    Dnsmasq-utils provides the utilities dhcp_release and 
+    dhcp_lease_time.
@@ -0,0 +1,7 @@
+# All files in this directory will be read by dnsmasq as 
+# configuration files, except if their names end in 
+# ".dpkg-dist",".dpkg-old" or ".dpkg-new"
+#
+# This can be changed by editing /etc/default/dnsmasq
+
+
@@ -0,0 +1,84 @@
+#!/bin/sh
+#
+# Script to update the resolver list for dnsmasq
+#
+# N.B. Resolvconf may run us even if dnsmasq is not (yet) running.
+# If dnsmasq is installed then we go ahead and update the resolver list
+# in case dnsmasq is started later.
+#
+# Assumption: On entry, PWD contains the resolv.conf-type files.
+#
+# This file is part of the dnsmasq package.
+#
+
+set -e
+
+RUN_DIR="/run/dnsmasq"
+RSLVRLIST_FILE="${RUN_DIR}/resolv.conf"
+TMP_FILE="${RSLVRLIST_FILE}_new.$$"
+MY_NAME_FOR_RESOLVCONF="dnsmasq"
+
+[ -x /usr/sbin/dnsmasq ] || exit 0
+[ -x /lib/resolvconf/list-records ] || exit 1
+
+PATH=/bin:/sbin
+
+report_err() { echo "$0: Error: $*" >&2 ; }
+
+# Stores arguments (minus duplicates) in RSLT, separated by spaces
+# Doesn't work properly if an argument itself contains whitespace
+uniquify()
+{
+	RSLT=""
+	while [ "$1" ] ; do
+		for E in $RSLT ; do
+			[ "$1" = "$E" ] && { shift ; continue 2 ; }
+		done
+		RSLT="${RSLT:+$RSLT }$1"
+		shift
+	done
+}
+
+if [ ! -d "$RUN_DIR" ] && ! mkdir --parents --mode=0755 "$RUN_DIR" ; then
+	report_err "Failed trying to create directory $RUN_DIR"
+	exit 1
+fi
+
+RSLVCNFFILES=""
+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=""
+if [ "$RSLVCNFFILES" ] ; then
+	uniquify $(sed -n -e 's/^[[:space:]]*nameserver[[:space:]]\+//p' $RSLVCNFFILES)
+	NMSRVRS="$RSLT"
+fi
+
+# 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
+# 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
+# if necessary in order to ensure 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
+	sleep 1
+fi
+
+clean_up() { rm -f "$TMP_FILE" ; }
+trap clean_up EXIT
+: >| "$TMP_FILE"
+for N in $NMSRVRS ; do echo "nameserver $N" >> "$TMP_FILE" ; done
+mv -f "$TMP_FILE" "$RSLVRLIST_FILE"
+
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Resolvconf packaging event hook script for the dnsmasq package
+restart_dnsmasq() {
+    if which invoke-rc.d >/dev/null 2>&1 ; then
+        invoke-rc.d dnsmasq restart
+    elif [ -x /etc/init.d/dnsmasq ] ; then
+        /etc/init.d/dnsmasq restart
+    fi
+}
+
+case "$1" in
+  install) restart_dnsmasq ;;
+esac
@@ -0,0 +1,305 @@
+#!/usr/bin/make -f
+# debian/rules file - for dnsmasq.
+# Copyright 2001-2020 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
+
+package=dnsmasq-base
+
+dpkg_buildflags := DEB_BUILD_MAINT_OPTIONS="hardening=+all,+pie,+bindnow" dpkg-buildflags
+
+CFLAGS = $(shell $(dpkg_buildflags) --get CFLAGS)
+CFLAGS += $(shell $(dpkg_buildflags) --get CPPFLAGS)
+CFLAGS += -Wall -W
+
+LDFLAGS = $(shell $(dpkg_buildflags) --get LDFLAGS)
+
+DEB_COPTS = $(COPTS)
+
+TARGET = install-i18n
+
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+BUILD_DATE := $(shell dpkg-parsechangelog --show-field Date)
+
+ifeq ($(origin CC),default)
+     CC = $(DEB_HOST_GNU_TYPE)-gcc
+endif
+
+# Support non-cross-builds on systems without gnu-triplet-binaries for pkg-config.
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+     PKG_CONFIG=pkg-config
+else
+     PKG_CONFIG=$(DEB_HOST_GNU_TYPE)-pkg-config	
+endif
+
+# Force package version based on git tags.
+ifneq (,$(filter gitversion,$(DEB_BUILD_OPTIONS)))
+     PACKAGE_VERSION = $(shell bld/get-version `pwd` |  sed 's/test/~&/; s/[a-z]/~&/;  s/-/./g; s/$$/-1/; s/^/-v/';)
+endif
+
+ifeq (,$(filter nodbus,$(DEB_BUILD_OPTIONS)))
+     DEB_COPTS += -DHAVE_DBUS
+endif
+
+ifeq (,$(filter noidn, $(DEB_BUILD_OPTIONS)))
+	DEB_COPTS += -DHAVE_LIBIDN2
+endif
+
+ifeq (,$(filter noconntrack,$(DEB_BUILD_OPTIONS)))
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+     DEB_COPTS += -DHAVE_CONNTRACK
+endif
+endif
+
+ifneq (,$(filter noipset,$(DEB_BUILD_OPTIONS)))
+     DEB_COPTS += -DNO_IPSET
+endif
+
+ifneq (,$(filter nodhcp6,$(DEB_BUILD_OPTIONS)))
+     DEB_COPTS += -DNO_DHCP6
+endif
+
+ifneq (,$(filter noipv6,$(DEB_BUILD_OPTIONS)))
+     DEB_COPTS += -DNO_IPV6
+endif
+
+ifneq (,$(filter notftp,$(DEB_BUILD_OPTIONS)))
+     DEB_COPTS += -DNO_TFTP
+endif
+
+ifneq (,$(filter nodhcp,$(DEB_BUILD_OPTIONS)))
+     DEB_COPTS += -DNO_DHCP
+endif
+
+ifneq (,$(filter noscript,$(DEB_BUILD_OPTIONS)))
+     DEB_COPTS += -DNO_SCRIPT
+endif
+
+ifneq (,$(filter nortc,$(DEB_BUILD_OPTIONS)))
+     DEB_COPTS += -DHAVE_BROKEN_RTC
+endif
+
+ifneq (,$(filter noi18n,$(DEB_BUILD_OPTIONS)))
+     TARGET = install
+endif
+
+ifneq (,$(filter uselua,$(DEB_BUILD_OPTIONS)))
+     DEB_COPTS += -DHAVE_LUASCRIPT
+endif
+
+ifeq (,$(filter nodnssec,$(DEB_BUILD_OPTIONS)))
+     DEB_COPTS += -DHAVE_DNSSEC
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+     # For strlcpy in FreeBSD
+     LIBS += $(shell ${PKG_CONFIG} --libs libbsd-overlay)
+     CFLAGS += $(shell ${PKG_CONFIG} --cflags libbsd-overlay)
+endif
+
+define build_tree
+	rm -rf $1
+	install -m 755 \
+		-d $1/DEBIAN \
+		-d $1/etc/dbus-1/system.d \
+	        -d $1/usr/share/doc/$(package) \
+		-d $1/usr/share/doc/$(package)/examples \
+		-d $1/usr/share/$(package) \
+	        -d $1/var/lib/misc
+
+endef
+
+define add_docs
+# Need to remove paypal links in Debian Package for policy reasons.
+	sed -e /\<H2\>Donations/Q -e /icon.png/d doc.html -e /favicon.ico/d >$1/usr/share/doc/$(package)/doc.html
+	echo "</BODY>" >>$1/usr/share/doc/$(package)/doc.html 
+	install -m 644 setup.html $1/usr/share/doc/$(package)/.
+	install -m 644 dnsmasq.conf.example $1/usr/share/doc/$(package)/examples/.
+	install -m 644 FAQ $1/usr/share/doc/$(package)/.
+	gzip -9n $1/usr/share/doc/$(package)/FAQ
+	install -m 644 CHANGELOG $1/usr/share/doc/$(package)/changelog
+	gzip -9n $1/usr/share/doc/$(package)/changelog
+	install -m 644 CHANGELOG.archive $1/usr/share/doc/$(package)/changelog.archive
+	gzip -9n $1/usr/share/doc/$(package)/changelog.archive
+	install -m 644 dbus/DBus-interface $1/usr/share/doc/$(package)/.
+	gzip -9n $1/usr/share/doc/$(package)/DBus-interface	
+	install -m 644 debian/systemd_howto $1/usr/share/doc/$(package)/.
+	gzip -9n $1/usr/share/doc/$(package)/systemd_howto
+	gzip -9n $1/usr/share/man/man8/dnsmasq.8
+	for f in $1/usr/share/man/*; do \
+		if [ -f $$f/man8/dnsmasq.8 ]; then \
+                       gzip -9n $$f/man8/dnsmasq.8 ; \
+                fi \
+	done
+endef
+
+define add_files
+	install -m 644 trust-anchors.conf $1/usr/share/$(package)/.
+	install -m 644 debian/dnsmasq-base.conffiles $1/DEBIAN/conffiles
+	install -m 755 debian/dnsmasq-base.postinst $1/DEBIAN/postinst
+	install -m 755 debian/dnsmasq-base.postrm  $1/DEBIAN/postrm
+	install -m 644 debian/changelog $1/usr/share/doc/$(package)/changelog.Debian
+	gzip -9n $1/usr/share/doc/$(package)/changelog.Debian
+	install -m 644 debian/readme $1/usr/share/doc/$(package)/README.Debian
+	install -m 644 debian/copyright $1/usr/share/doc/$(package)/copyright
+	install -m 644 debian/dbus.conf $1/etc/dbus-1/system.d/dnsmasq.conf
+endef
+
+clean:
+	$(checkdir)
+	make BUILDDIR=debian/build/no-lua clean
+	make BUILDDIR=debian/build/lua clean
+	make -C contrib/lease-tools clean
+	rm -rf debian/build debian/trees debian/*~ debian/files debian/substvars debian/utils-substvars
+
+binary-indep:	checkroot
+	$(checkdir)
+	rm -rf debian/trees/daemon
+	install -m 755 \
+	        -d debian/trees/daemon/DEBIAN \
+		-d debian/trees/daemon/usr/share/doc/dnsmasq \
+	        -d debian/trees/daemon/etc/init.d \
+		-d debian/trees/daemon/etc/dnsmasq.d \
+	        -d debian/trees/daemon/etc/resolvconf/update.d \
+		-d debian/trees/daemon/usr/lib/resolvconf/dpkg-event.d \
+		-d debian/trees/daemon/usr/share/dnsmasq \
+		-d debian/trees/daemon/usr/share/doc/dnsmasq \
+	        -d debian/trees/daemon/etc/default \
+		-d debian/trees/daemon/lib/systemd/system \
+		-d debian/trees/daemon/usr/lib/tmpfiles.d \
+                -d debian/trees/daemon/etc/insserv.conf.d
+	install -m 644 debian/conffiles debian/trees/daemon/DEBIAN
+	install -m 755 debian/postinst debian/postrm debian/prerm debian/trees/daemon/DEBIAN
+	if ! dpkg-vendor --derives-from Ubuntu; then \
+                rm -f debian/dnsmasq.postinst.debhelper debian/dnsmasq.postrm.debhelper; \
+	      	dh_runit -pdnsmasq -Pdebian/trees/daemon; \
+		cat debian/dnsmasq.postinst.debhelper >> debian/trees/daemon/DEBIAN/postinst; \
+		cat debian/dnsmasq.postrm.debhelper   >> debian/trees/daemon/DEBIAN/postrm; \
+		cd debian/trees/daemon && find etc/sv -type f -printf '/%p\n' >>DEBIAN/conffiles; \
+	fi
+	install -m 755 debian/init debian/trees/daemon/etc/init.d/dnsmasq
+	install -m 755 debian/resolvconf debian/trees/daemon/etc/resolvconf/update.d/dnsmasq
+	install -m 755 debian/resolvconf-package debian/trees/daemon/usr/lib/resolvconf/dpkg-event.d/dnsmasq
+	install -m 644 debian/installed-marker debian/trees/daemon/usr/share/dnsmasq
+	install -m 644 debian/default debian/trees/daemon/etc/default/dnsmasq
+	install -m 644 dnsmasq.conf.example debian/trees/daemon/etc/dnsmasq.conf
+	install -m 644 debian/readme.dnsmasq.d debian/trees/daemon/etc/dnsmasq.d/README
+	install -m 644 debian/systemd.service debian/trees/daemon/lib/systemd/system/dnsmasq.service
+	install -m 644 debian/systemd@.service debian/trees/daemon/lib/systemd/system/dnsmasq@.service
+	install -m 644 debian/tmpfiles.conf debian/trees/daemon/usr/lib/tmpfiles.d/dnsmasq.conf
+	install -m 644 debian/insserv debian/trees/daemon/etc/insserv.conf.d/dnsmasq
+	install -m 644 debian/copyright debian/trees/daemon/usr/share/doc/dnsmasq/copyright
+	install -m 644 debian/changelog debian/trees/daemon/usr/share/doc/dnsmasq/changelog.Debian
+	gzip -9n debian/trees/daemon/usr/share/doc/dnsmasq/changelog.Debian
+	cd debian/trees/daemon && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums	
+	dpkg-gencontrol $(PACKAGE_VERSION) -Tdebian/dnsmasq.substvars -pdnsmasq -Pdebian/trees/daemon
+	find debian/trees/daemon -depth -newermt '$(BUILD_DATE)' -print0 | xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	chown -R root.root debian/trees/daemon
+	chmod -R g-ws debian/trees/daemon
+	dpkg --build debian/trees/daemon ..
+
+binary-arch:	checkroot 
+	$(call build_tree,debian/trees/base)
+	make $(TARGET) BUILDDIR=debian/build/no-lua PREFIX=/usr DESTDIR=`pwd`/debian/trees/base CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" COPTS="$(DEB_COPTS)" CC=$(CC) PKG_CONFIG=$(PKG_CONFIG) LIBS="$(LIBS)"
+ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
+	$(call add_docs,debian/trees/base)
+else	
+	rm -rf debian/trees/base/usr/share/man
+endif
+	$(call add_files,debian/trees/base)
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	$(DEB_HOST_GNU_TYPE)-strip -R .note -R .comment debian/trees/base/usr/sbin/dnsmasq
+endif
+	cd debian/trees/base && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums
+	dpkg-shlibdeps --warnings=1 debian/trees/base/usr/sbin/dnsmasq
+	dpkg-gencontrol $(PACKAGE_VERSION) -pdnsmasq-base -Pdebian/trees/base
+	find debian/trees/base -depth -newermt '$(BUILD_DATE)' -print0 | xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	chown -R root.root debian/trees/base
+	chmod -R g-ws debian/trees/base 
+	dpkg --build debian/trees/base ..
+
+	$(call build_tree,debian/trees/lua-base)
+	make $(TARGET) BUILDDIR=debian/build/lua PREFIX=/usr DESTDIR=`pwd`/debian/trees/lua-base CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" COPTS="-DHAVE_LUASCRIPT $(DEB_COPTS)" CC=$(CC) PKG_CONFIG=$(PKG_CONFIG) LIBS="$(LIBS)"
+ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
+	$(call add_docs,debian/trees/lua-base)
+else	
+	rm -rf debian/trees/lua-base/usr/share/man
+endif
+	$(call add_files,debian/trees/lua-base)
+	install -m 755 -d debian/trees/lua-base/usr/share/lintian/overrides
+	install -m 644 debian/lintian-override debian/trees/lua-base/usr/share/lintian/overrides/dnsmasq-base-lua
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	$(DEB_HOST_GNU_TYPE)-strip -R .note -R .comment debian/trees/lua-base/usr/sbin/dnsmasq
+endif
+	ln -s $(package) debian/trees/lua-base/usr/share/doc/dnsmasq-base-lua
+	cd debian/trees/lua-base && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums
+	dpkg-shlibdeps --warnings=1 debian/trees/lua-base/usr/sbin/dnsmasq
+	dpkg-gencontrol $(PACKAGE_VERSION) -pdnsmasq-base-lua -Pdebian/trees/lua-base
+	find debian/trees/lua-base -depth -newermt '$(BUILD_DATE)' -print0 | xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	chown -R root.root debian/trees/lua-base
+	chmod -R g-ws debian/trees/lua-base 
+	dpkg --build debian/trees/lua-base ..
+
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	rm -rf debian/trees/utils
+	install -m 755 -d debian/trees/utils/DEBIAN \
+	               -d debian/trees/utils/usr/bin \
+                       -d debian/trees/utils/usr/share/doc/dnsmasq-utils
+ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
+	install -m 755 -d debian/trees/utils/usr/share/man/man1
+endif
+	make -C contrib/lease-tools PREFIX=/usr DESTDIR=`pwd`/debian/trees/utils CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" COPTS="$(DEB_COPTS)" CC=$(CC) PKG_CONFIG=$(PKG_CONFIG) LIBS="$(LIBS)"
+	install -m 755 contrib/lease-tools/dhcp_release debian/trees/utils/usr/bin/dhcp_release
+	install -m 755 contrib/lease-tools/dhcp_release6 debian/trees/utils/usr/bin/dhcp_release6
+	install -m 755 contrib/lease-tools/dhcp_lease_time debian/trees/utils/usr/bin/dhcp_lease_time
+ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
+	install -m 644 contrib/lease-tools/dhcp_release.1 debian/trees/utils/usr/share/man/man1/dhcp_release.1
+	gzip -9n debian/trees/utils/usr/share/man/man1/dhcp_release.1
+	install -m 644 contrib/lease-tools/dhcp_release6.1 debian/trees/utils/usr/share/man/man1/dhcp_release6.1
+	gzip -9n debian/trees/utils/usr/share/man/man1/dhcp_release6.1
+	install -m 644 contrib/lease-tools/dhcp_lease_time.1 debian/trees/utils/usr/share/man/man1/dhcp_lease_time.1
+	gzip -9n debian/trees/utils/usr/share/man/man1/dhcp_lease_time.1
+endif
+	install -m 644 debian/copyright debian/trees/utils/usr/share/doc/dnsmasq-utils/copyright
+	install -m 644 debian/changelog debian/trees/utils/usr/share/doc/dnsmasq-utils/changelog.Debian
+	gzip -9n debian/trees/utils/usr/share/doc/dnsmasq-utils/changelog.Debian
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	$(DEB_HOST_GNU_TYPE)-strip -R .note -R .comment debian/trees/utils/usr/bin/dhcp_release
+	$(DEB_HOST_GNU_TYPE)-strip -R .note -R .comment debian/trees/utils/usr/bin/dhcp_release6
+	$(DEB_HOST_GNU_TYPE)-strip -R .note -R .comment debian/trees/utils/usr/bin/dhcp_lease_time
+endif	
+	cd debian/trees/utils && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0' | LC_ALL=C sort -z | xargs -r0 md5sum > DEBIAN/md5sums
+	dpkg-shlibdeps -Tdebian/utils-substvars debian/trees/utils/usr/bin/dhcp_release debian/trees/utils/usr/bin/dhcp_release6 debian/trees/utils/usr/bin/dhcp_lease_time 
+	dpkg-gencontrol $(PACKAGE_VERSION) -Tdebian/utils-substvars -pdnsmasq-utils -Pdebian/trees/utils
+	find debian/trees/utils -depth -newermt '$(BUILD_DATE)' -print0 | xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
+	chown -R root.root debian/trees/utils
+	chmod -R g-ws debian/trees/utils 
+	dpkg --build debian/trees/utils ..
+endif
+
+define checkdir
+	test -f Makefile -a -f debian/rules
+endef
+
+# Below here is fairly generic really
+
+binary:		binary-arch binary-indep
+
+build:		
+build-arch:
+build-indep:
+
+checkroot:
+	test root = "`whoami`"
+
+.PHONY: binary binary-arch binary-indep clean checkroot
+
+
@@ -0,0 +1 @@
+1.0
@@ -0,0 +1,31 @@
+[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=/etc/init.d/dnsmasq checkconfig
+
+# 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.
+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 like
+# 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
@@ -0,0 +1,31 @@
+[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=/etc/init.d/dnsmasq checkconfig "%i"
+
+# 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.
+ExecStart=/etc/init.d/dnsmasq systemd-exec "%i"
+
+# The systemd-*-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=/etc/init.d/dnsmasq systemd-start-resolvconf "%i"
+ExecStop=/etc/init.d/dnsmasq systemd-stop-resolvconf "%i"
+
+
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
@@ -0,0 +1,41 @@
+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)
@@ -0,0 +1 @@
+d /run/dnsmasq 755 dnsmasq nogroup
@@ -27,8 +27,8 @@

 # Replies which are not DNSSEC signed may be legitimate, because the domain
 # is unsigned, or may be forgeries. Setting this option tells dnsmasq to
-# check that an unsigned reply is OK, by finding a secure proof that a DS
-# record somewhere between the root and the domain does not exist.
+# check that an unsigned reply is OK, by finding a secure proof that a DS 
+# record somewhere between the root and the domain does not exist. 
 # The cost of setting this is that even queries in unsigned domains will need
 # one or more extra DNS queries to verify.
 #dnssec-check-unsigned
@@ -85,16 +85,6 @@
 # subdomains to the vpn and search ipsets:
 #ipset=/yahoo.com/google.com/vpn,search

-# Add the IPs of all queries to yahoo.com, google.com, and their
-# subdomains to netfilters sets, which is equivalent to
-# 'nft add element ip test vpn { ... }; nft add element ip test search { ... }'
-#nftset=/yahoo.com/google.com/ip#test#vpn,ip#test#search
-
-# Use netfilters sets for both IPv4 and IPv6:
-# This adds all addresses in *.yahoo.com to vpn4 and vpn6 for IPv4 and IPv6 addresses.
-#nftset=/yahoo.com/4#ip#test#vpn4
-#nftset=/yahoo.com/6#ip#test#vpn6
-
 # You can control how dnsmasq talks to a server: this forces
 # queries to 10.1.2.3 to be routed via eth1
 # server=10.1.2.3@eth1
@@ -193,11 +183,11 @@
 #dhcp-range=1234::2, 1234::500, 64, 12h

 # Do Router Advertisements, BUT NOT DHCP for this subnet.
-#dhcp-range=1234::, ra-only
+#dhcp-range=1234::, ra-only 

 # Do Router Advertisements, BUT NOT DHCP for this subnet, also try and
-# add names to the DNS for the IPv6 address of SLAAC-configured dual-stack
-# hosts. Use the DHCPv4 lease to derive the name, network segment and
+# add names to the DNS for the IPv6 address of SLAAC-configured dual-stack 
+# hosts. Use the DHCPv4 lease to derive the name, network segment and 
 # MAC address and assume that the host will also have an
 # IPv6 address calculated using the SLAAC algorithm.
 #dhcp-range=1234::, ra-names
@@ -220,9 +210,9 @@
 #dhcp-range=1234::, ra-stateless, ra-names

 # Do router advertisements for all subnets where we're doing DHCPv6
-# Unless overridden by ra-stateless, ra-names, et al, the router
+# Unless overridden by ra-stateless, ra-names, et al, the router 
 # advertisements will have the M and O bits set, so that the clients
-# get addresses and configuration from DHCPv6, and the A bit reset, so the
+# get addresses and configuration from DHCPv6, and the A bit reset, so the 
 # clients don't use SLAAC addresses.
 #enable-ra

@@ -295,11 +285,11 @@
 # any machine with Ethernet address starting 11:22:33:
 #dhcp-host=11:22:33:*:*:*,set:red

-# Give a fixed IPv6 address and name to client with
+# Give a fixed IPv6 address and name to client with 
 # DUID 00:01:00:01:16:d2:83:fc:92:d4:19:e2:d8:b2
 # Note the MAC addresses CANNOT be used to identify DHCPv6 clients.
 # Note also that the [] around the IPv6 address are obligatory.
-#dhcp-host=id:00:01:00:01:16:d2:83:fc:92:d4:19:e2:d8:b2, fred, [1234::5]
+#dhcp-host=id:00:01:00:01:16:d2:83:fc:92:d4:19:e2:d8:b2, fred, [1234::5] 

 # Ignore any clients which are not specified in dhcp-host lines
 # or /etc/ethers. Equivalent to ISC "deny unknown-clients".
@@ -355,7 +345,7 @@
 # Send DHCPv6 option. Note [] around IPv6 addresses.
 #dhcp-option=option6:dns-server,[1234::77],[1234::88]

-# Send DHCPv6 option for namservers as the machine running
+# Send DHCPv6 option for namservers as the machine running 
 # dnsmasq and another.
 #dhcp-option=option6:dns-server,[::],[1234::88]

@@ -394,7 +384,7 @@

 # The following DHCP options set up dnsmasq in the same way as is specified
 # for the ISC dhcpcd in
-# https://web.archive.org/web/20040313070105/http://us1.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt
+# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt
 # adapted for a typical dnsmasq installation where the host running
 # dnsmasq is also the host running samba.
 # you may want to uncomment some or all of them if you use
@@ -560,7 +550,7 @@
 # Set the DHCP server to enable DHCPv4 Rapid Commit Option per RFC 4039.
 # In this mode it will respond to a DHCPDISCOVER message including a Rapid Commit
 # option with a DHCPACK including a Rapid Commit option and fully committed address
-# and configuration information. This must only be enabled if either the server is
+# and configuration information. This must only be enabled if either the server is 
 # the only server for the subnet, or multiple servers are present and they each
 # commit a binding for all clients.
 #dhcp-rapid-commit
@@ -664,7 +654,7 @@
 # Provide an alias for a "local" DNS name. Note that this _only_ works
 # for targets which are names from DHCP or /etc/hosts. Give host
 # "bert" another name, bertrand
-#cname=bertrand,bert
+#cname=bertand,bert

 # For debugging purposes, log each DNS query as it passes through
 # dnsmasq.
@@ -95,5 +95,7 @@ a contribution towards my expenses, please use the donation button below.
 <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>
+
+
 </BODY>
-</HTML>
+
@@ -229,5 +229,3 @@ contents of the cache to the syslog.

 <P>For a complete listing of options please take a look at the manpage
 dnsmasq(8).
-</BODY>
-</HTML>
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ struct arp_record {
 static struct arp_record *arps = NULL, *old = NULL, *freelist = NULL;
 static time_t last = 0;

-static int filter_mac(int family, void *addrp, char *mac, size_t maclen, void *parmv)
+static int filter_mac(int family, char *addrp, char *mac, size_t maclen, void *parmv)
 {
  struct arp_record *arp;

@@ -111,26 +111,22 @@ int find_mac(union mysockaddr *addr, unsigned char *mac, int lazy, time_t now)

 again:
  
-  /* If the database is less then INTERVAL old, look in there.
-     
-     If we're a child process, we always rely on the existing cache we
-     inherited from the parent, since we don't have a netlink socket.
-  */
-  if (difftime(now, last) < INTERVAL || daemon->pipe_to_parent != -1)
+  /* If the database is less then INTERVAL old, look in there */
+  if (difftime(now, last) < INTERVAL)
    {
      /* addr == NULL -> just make cache up-to-date */
      if (!addr)
 	return 0;
-	
+
      for (arp = arps; arp; arp = arp->next)
 	{
 	  if (addr->sa.sa_family != arp->family)
 	    continue;
-	  
+	    
 	  if (arp->family == AF_INET &&
 	      arp->addr.addr4.s_addr != addr->in.sin_addr.s_addr)
 	    continue;
-	  
+	    
 	  if (arp->family == AF_INET6 && 
 	      !IN6_ARE_ADDR_EQUAL(&arp->addr.addr6, &addr->in6.sin6_addr))
 	    continue;
@@ -145,10 +141,6 @@ int find_mac(union mysockaddr *addr, unsigned char *mac, int lazy, time_t now)
 	}
    }

-  /* Not in cache in child, no go. */
-  if (daemon->pipe_to_parent != -1)
-    return 0;
-  
  /* Not found, try the kernel */
  if (!updated)
     {
@@ -160,7 +152,7 @@ int find_mac(union mysockaddr *addr, unsigned char *mac, int lazy, time_t now)
 	 if (arp->status != ARP_EMPTY)
 	   arp->status = ARP_MARK;
       
-       iface_enumerate(AF_UNSPEC, NULL, (callback_t){.af_unspec=filter_mac});
+       iface_enumerate(AF_UNSPEC, NULL, filter_mac);
       
       /* Remove all unconfirmed entries to old list. */
       for (arp = arps, up = &arps; arp; arp = tmp)
@@ -238,3 +230,5 @@ int do_arp_script_run(void)

  return 0;
 }
+
+
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -96,16 +96,16 @@ int in_zone(struct auth_zone *zone, char *name, char **cut)
 }


-size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t now,
-		   union mysockaddr *peer_addr, int local_query) 
+size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t now, union mysockaddr *peer_addr, 
+		   int local_query, int do_bit, int have_pseudoheader) 
 {
  char *name = daemon->namebuff;
  unsigned char *p, *ansp;
  int qtype, qclass, rc;
  int nameoffset, axfroffset = 0;
-  int anscount = 0, authcount = 0;
+  int q, anscount = 0, authcount = 0;
  struct crec *crecp;
-  int  auth = !local_query, trunc = 0, nxdomain = 1, soa = 0, ns = 0, axfr = 0, out_of_zone = 0, notimp = 0;
+  int  auth = !local_query, trunc = 0, nxdomain = 1, soa = 0, ns = 0, axfr = 0;
  struct auth_zone *zone = NULL;
  struct addrlist *subnet = NULL;
  char *cut;
@@ -116,20 +116,18 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
  union all_addr addr;
  struct cname *a, *candidate;
  unsigned int wclen;
-  unsigned int log_flags = local_query ? 0 : F_NOERR;
  
-  if (ntohs(header->qdcount) != 1)
+  if (ntohs(header->qdcount) == 0 || OPCODE(header) != QUERY )
    return 0;

  /* determine end of question section (we put answers there) */
  if (!(ansp = skip_questions(header, qlen)))
    return 0; /* bad packet */
  
+  /* now process each question, answers go in RRs after the question */
  p = (unsigned char *)(header+1);

-  if (OPCODE(header) != QUERY)
-    notimp = 1;
-  else
+  for (q = ntohs(header->qdcount); q != 0; q--)
    {
      unsigned int flag = 0;
      int found = 0;
@@ -139,7 +137,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
      nameoffset = p - (unsigned char *)header;

      /* now extract name as .-concatenated string into name */
-      if (!extract_name(header, qlen, &p, name, EXTR_NAME_EXTRACT, 4))
+      if (!extract_name(header, qlen, &p, name, 1, 4))
 	return 0; /* bad packet */
 
      GETSHORT(qtype, p); 
@@ -148,8 +146,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
      if (qclass != C_IN)
 	{
 	  auth = 0;
-	  out_of_zone = 1;
-	  goto done;
+	  continue;
 	}

      if ((qtype == T_PTR || qtype == T_SOA || qtype == T_NS) &&
@@ -162,9 +159,8 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	  
 	  if (!zone)
 	    {
-	      out_of_zone = 1;
 	      auth = 0;
-	      goto done;
+	      continue;
 	    }
 	  else if (qtype == T_SOA)
 	    soa = 1, found = 1;
@@ -212,7 +208,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	      if (local_query || in_zone(zone, intr->name, NULL))
 		{	
 		  found = 1;
-		  log_query(log_flags | flag | F_REVERSE | F_CONFIG, intr->name, &addr, NULL, 0);
+		  log_query(flag | F_REVERSE | F_CONFIG, intr->name, &addr, NULL);
 		  if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, 
 					  daemon->auth_ttl, NULL,
 					  T_PTR, C_IN, "d", intr->name))
@@ -236,7 +232,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 		      strcat(name, ".");
 		      strcat(name, zone->domain);
 		    }
-		  log_query(log_flags | flag | F_DHCP | F_REVERSE, name, &addr, record_source(crecp->uid), 0);
+		  log_query(flag | F_DHCP | F_REVERSE, name, &addr, record_source(crecp->uid));
 		  found = 1;
 		  if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, 
 					  daemon->auth_ttl, NULL,
@@ -245,7 +241,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 		}
 	      else if (crecp->flags & (F_DHCP | F_HOSTS) && (local_query || in_zone(zone, name, NULL)))
 		{
-		  log_query(log_flags | (crecp->flags & ~F_FORWARD), name, &addr, record_source(crecp->uid), 0);
+		  log_query(crecp->flags & ~F_FORWARD, name, &addr, record_source(crecp->uid));
 		  found = 1;
 		  if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, 
 					  daemon->auth_ttl, NULL,
@@ -257,23 +253,12 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 		    
 	    } while ((crecp = cache_find_by_addr(crecp, &addr, now, flag)));

-	  if (!found && is_rev_synth(flag, &addr, name) && (local_query || in_zone(zone, name, NULL)))
-	    {
-	      log_query(log_flags | F_CONFIG | F_REVERSE | flag, name, &addr, NULL, 0);
-	      found = 1;
-	      
-	      if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, 
-				      daemon->auth_ttl, NULL,
-				      T_PTR, C_IN, "d", name))
-		anscount++;
-	    }
-
 	  if (found)
 	    nxdomain = 0;
 	  else
-	    log_query(log_flags | flag | F_NEG | F_NXDOMAIN | F_REVERSE | (auth ? F_AUTH : 0), NULL, &addr, NULL, 0);
+	    log_query(flag | F_NEG | F_NXDOMAIN | F_REVERSE | (auth ? F_AUTH : 0), NULL, &addr, NULL);

-	  goto done;
+	  continue;
 	}
      
    cname_restart:
@@ -288,9 +273,8 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	  
 	  if (!zone)
 	    {
-	      out_of_zone = 1;
 	      auth = 0;
-	      goto done;
+	      continue;
 	    }
 	}

@@ -302,7 +286,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	    if (rc == 2 && qtype == T_MX)
 	      {
 		found = 1;
-		log_query(log_flags | F_CONFIG | F_RRNAME, name, NULL, "<MX>", 0);
+		log_query(F_CONFIG | F_RRNAME, name, NULL, "<MX>"); 
 		if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, daemon->auth_ttl,
 					NULL, T_MX, C_IN, "sd", rec->weight, rec->target))
 		  anscount++;
@@ -317,7 +301,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	    if (rc == 2 && qtype == T_SRV)
 	      {
 		found = 1;
-		log_query(log_flags | F_CONFIG | F_RRNAME, name, NULL, "<SRV>", 0);
+		log_query(F_CONFIG | F_RRNAME, name, NULL, "<SRV>"); 
 		if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, daemon->auth_ttl,
 					NULL, T_SRV, C_IN, "sssd", 
 					rec->priority, rec->weight, rec->srvport, rec->target))
@@ -351,7 +335,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	    if (rc == 2 && txt->class == qtype)
 	      {
 		found = 1;
-		log_query(log_flags | F_CONFIG | F_RRNAME, name, NULL, NULL, txt->class);
+		log_query(F_CONFIG | F_RRNAME, name, NULL, querystr(NULL, txt->class)); 
 		if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, daemon->auth_ttl,
 					NULL, txt->class, C_IN, "t", txt->len, txt->txt))
 		  anscount++;
@@ -365,7 +349,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	    if (rc == 2 && qtype == T_TXT)
 	      {
 		found = 1;
-		log_query(log_flags | F_CONFIG | F_RRNAME, name, NULL, "<TXT>", 0);
+		log_query(F_CONFIG | F_RRNAME, name, NULL, "<TXT>"); 
 		if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, daemon->auth_ttl,
 					NULL, T_TXT, C_IN, "t", txt->len, txt->txt))
 		  anscount++;
@@ -379,7 +363,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	     if (rc == 2 && qtype == T_NAPTR)
 	       {
 		 found = 1;
-		 log_query(log_flags | F_CONFIG | F_RRNAME, name, NULL, "<NAPTR>", 0);
+		 log_query(F_CONFIG | F_RRNAME, name, NULL, "<NAPTR>");
 		 if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, daemon->auth_ttl, 
 					 NULL, T_NAPTR, C_IN, "sszzzd", 
 					 na->order, na->pref, na->flags, na->services, na->regexp, na->replace))
@@ -409,23 +393,13 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 		       continue;

 		     found = 1;
-		     log_query(log_flags | F_FORWARD | F_CONFIG | flag, name, &addrlist->addr, NULL, 0);
+		     log_query(F_FORWARD | F_CONFIG | flag, name, &addrlist->addr, NULL);
 		     if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, 
 					     daemon->auth_ttl, NULL, qtype, C_IN, 
 					     qtype == T_A ? "4" : "6", &addrlist->addr))
 		       anscount++;
 		   }
 	     }
-
-       if (!found && is_name_synthetic(flag, name, &addr) )
-	 {
-	   nxdomain = 0;
-	   
-	   log_query(log_flags | F_FORWARD | F_CONFIG | flag, name, &addr, NULL, 0);
-	   if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, 
-				   daemon->auth_ttl, NULL, qtype, C_IN, qtype == T_A ? "4" : "6", &addr))
-	     anscount++;
-	 }
       
      if (!cut)
 	{
@@ -434,7 +408,8 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	  if (qtype == T_SOA)
 	    {
 	      auth = soa = 1; /* inhibits auth section */
-	      log_query(log_flags | F_RRNAME | F_AUTH, zone->domain, NULL, "<SOA>", 0);
+	      found = 1;
+	      log_query(F_RRNAME | F_AUTH, zone->domain, NULL, "<SOA>");
 	    }
      	  else if (qtype == T_AXFR)
 	    {
@@ -469,14 +444,16 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	      soa = 1; /* inhibits auth section */
 	      ns = 1; /* ensure we include NS records! */
 	      axfr = 1;
+	      found = 1;
 	      axfroffset = nameoffset;
-	      log_query(log_flags | F_RRNAME | F_AUTH, zone->domain, NULL, "<AXFR>", 0);
+	      log_query(F_RRNAME | F_AUTH, zone->domain, NULL, "<AXFR>");
 	    }
      	  else if (qtype == T_NS)
 	    {
 	      auth = 1;
 	      ns = 1; /* inhibits auth section */
-	      log_query(log_flags | F_RRNAME | F_AUTH, zone->domain, NULL, "<NS>", 0);
+	      found = 1;
+	      log_query(F_RRNAME | F_AUTH, zone->domain, NULL, "<NS>"); 
 	    }
 	}
      
@@ -494,8 +471,9 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 			(local_query || filter_zone(zone, flag, &(crecp->addr))))
 		      {
 			*cut = '.'; /* restore domain part */
-			log_query(log_flags | crecp->flags, name, &crecp->addr, record_source(crecp->uid), 0);
+			log_query(crecp->flags, name, &crecp->addr, record_source(crecp->uid));
 			*cut  = 0; /* remove domain part */
+			found = 1;
 			if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, 
 						daemon->auth_ttl, NULL, qtype, C_IN, 
 						qtype == T_A ? "4" : "6", &crecp->addr))
@@ -515,7 +493,8 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 		 nxdomain = 0;
 		 if ((crecp->flags & flag) && (local_query || filter_zone(zone, flag, &(crecp->addr))))
 		   {
-		     log_query(log_flags | (crecp->flags & ~F_REVERSE), name, &crecp->addr, record_source(crecp->uid), 0);
+		     log_query(crecp->flags, name, &crecp->addr, record_source(crecp->uid));
+		     found = 1;
 		     if (add_resource_record(header, limit, &trunc, nameoffset, &ansp, 
 					     daemon->auth_ttl, NULL, qtype, C_IN, 
 					     qtype == T_A ? "4" : "6", &crecp->addr))
@@ -562,7 +541,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	  
 	  if (candidate)
 	    {
-	      log_query(log_flags | F_CONFIG | F_CNAME, name, NULL, NULL, 0);
+	      log_query(F_CONFIG | F_CNAME, name, NULL, NULL);
 	      strcpy(name, candidate->target);
 	      if (!strchr(name, '.'))
 		{
@@ -580,18 +559,16 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	  else if (cache_find_non_terminal(name, now))
 	    nxdomain = 0;

-	  log_query(log_flags | flag | F_NEG | (nxdomain ? F_NXDOMAIN : 0) | F_FORWARD | F_AUTH, name, NULL, NULL, 0);
+	  log_query(flag | F_NEG | (nxdomain ? F_NXDOMAIN : 0) | F_FORWARD | F_AUTH, name, NULL, NULL);
 	}
      
    }
-
- done:
  
  /* Add auth section */
  if (auth && zone)
    {
      char *authname;
-      int newoffset = ansp - (unsigned char *)header, offset = 0;
+      int newoffset, offset = 0;

      if (!subnet)
 	authname = zone->domain;
@@ -612,7 +589,7 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 	      if (subnet->prefixlen >= 16 )
 		p += sprintf(p, "%u.", a & 0xff);
 	      a = a >> 8;
-	      sprintf(p, "%u.in-addr.arpa", a & 0xff);
+	      p += sprintf(p, "%u.in-addr.arpa", a & 0xff);
 	      
 	    }
 	  else
@@ -625,13 +602,14 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
 		  int dig = ((unsigned char *)&subnet->addr.addr6)[i>>3];
 		  p += sprintf(p, "%.1x.", (i>>2) & 1 ? dig & 15 : dig >> 4);
 		}
-	      sprintf(p, "ip6.arpa");
+	      p += sprintf(p, "ip6.arpa");
 	      
 	    }
 	}
      
      /* handle NS and SOA in auth section or for explicit queries */
-      if (((anscount == 0 && !ns) || soa) &&
+       newoffset = ansp - (unsigned char *)header;
+       if (((anscount == 0 && !ns) || soa) &&
 	  add_resource_record(header, limit, &trunc, 0, &ansp, 
 			      daemon->auth_ttl, NULL, T_SOA, C_IN, "ddlllll",
 			      authname, daemon->authserver,  daemon->hostmaster,
@@ -649,10 +627,11 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
      if (anscount != 0 || ns)
 	{
 	  struct name_list *secondary;
-	 	  
+	  
 	  /* Only include the machine running dnsmasq if it's acting as an auth server */
 	  if (daemon->authinterface)
 	    {
+	      newoffset = ansp - (unsigned char *)header;
 	      if (add_resource_record(header, limit, &trunc, -offset, &ansp, 
 				      daemon->auth_ttl, NULL, T_NS, C_IN, "d", offset == 0 ? authname : NULL, daemon->authserver))
 		{
@@ -667,11 +646,9 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n

 	  if (!subnet)
 	    for (secondary = daemon->secondary_forward_server; secondary; secondary = secondary->next)
-	      if (add_resource_record(header, limit, &trunc, -offset, &ansp, 
-				      daemon->auth_ttl, NULL, T_NS, C_IN, "d", offset == 0 ? authname : NULL, secondary->name))
+	      if (add_resource_record(header, limit, &trunc, offset, &ansp, 
+				      daemon->auth_ttl, NULL, T_NS, C_IN, "d", secondary->name))
 		{
-		  if (offset == 0) 
-		    offset = newoffset;
 		  if (ns) 
 		    anscount++;
 		  else
@@ -872,44 +849,24 @@ size_t answer_auth(struct dns_header *header, char *limit, size_t qlen, time_t n
  
  /* truncation */
  if (trunc)
-    {
-      header->hb3 |= HB3_TC;
-      if (!(ansp = skip_questions(header, qlen)))
-	return 0; /* bad packet */
-      anscount = authcount = 0;
-      log_query(log_flags | F_AUTH, "reply", NULL, "truncated", 0);
-    }
+    header->hb3 |= HB3_TC;
  
  if ((auth || local_query) && nxdomain)
    SET_RCODE(header, NXDOMAIN);
  else
    SET_RCODE(header, NOERROR); /* no error */
-  
  header->ancount = htons(anscount);
  header->nscount = htons(authcount);
  header->arcount = htons(0);

-  if ((!local_query && out_of_zone) || notimp)
-    {
-      if (out_of_zone)
-	{
-	  addr.log.rcode = REFUSED;
-	  addr.log.ede = EDE_NOT_AUTH;
-	}
-      else
-	{
-	  addr.log.rcode = NOTIMP;
-	  addr.log.ede = EDE_UNSET;
-	}
+  /* Advertise our packet size limit in our reply */
+  if (have_pseudoheader)
+    return add_pseudoheader(header,  ansp - (unsigned char *)header, (unsigned char *)limit, daemon->edns_pktsz, 0, NULL, 0, do_bit, 0);

-      SET_RCODE(header, addr.log.rcode); 
-      header->ancount = htons(0);
-      header->nscount = htons(0);
-      log_query(log_flags | F_UPSTREAM | F_RCODE, "error", &addr, NULL, 0);
-      return resize_packet(header,  ansp - (unsigned char *)header, NULL, 0);
-    }
-  
  return ansp - (unsigned char *)header;
 }
  
 #endif  
+  
+
+
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 static struct blockdata *keyblock_free;
 static unsigned int blockdata_count, blockdata_hwm, blockdata_alloced;

-static void add_blocks(int n)
+static void blockdata_expand(int n)
 {
  struct blockdata *new = whine_malloc(n * sizeof(struct blockdata));
  
@@ -47,72 +47,61 @@ void blockdata_init(void)

  /* Note that daemon->cachesize is enforced to have non-zero size if OPT_DNSSEC_VALID is set */  
  if (option_bool(OPT_DNSSEC_VALID))
-    add_blocks(daemon->cachesize);
+    blockdata_expand(daemon->cachesize);
 }

 void blockdata_report(void)
 {
-  my_syslog(LOG_INFO, _("pool memory in use %zu, max %zu, allocated %zu"), 
+  my_syslog(LOG_INFO, _("pool memory in use %u, max %u, allocated %u"), 
 	    blockdata_count * sizeof(struct blockdata),  
 	    blockdata_hwm * sizeof(struct blockdata),  
 	    blockdata_alloced * sizeof(struct blockdata));
 } 

-static struct blockdata *new_block(void)
-{
-  struct blockdata *block;
-
-  if (!keyblock_free)
-    add_blocks(50);
-  
-  if (keyblock_free)
-    {
-      block = keyblock_free;
-      keyblock_free = block->next;
-      blockdata_count++;
-      if (blockdata_hwm < blockdata_count)
-	blockdata_hwm = blockdata_count;
-      block->next = NULL;
-      return block;
-    }
-  
-  return NULL;
-}
-
 static struct blockdata *blockdata_alloc_real(int fd, char *data, size_t len)
 {
  struct blockdata *block, *ret = NULL;
  struct blockdata **prev = &ret;
  size_t blen;

-  do
+  while (len > 0)
    {
-      if (!(block = new_block()))
+      if (!keyblock_free)
+	blockdata_expand(50);
+      
+      if (keyblock_free)
+	{
+	  block = keyblock_free;
+	  keyblock_free = block->next;
+	  blockdata_count++; 
+	}
+      else
 	{
 	  /* failed to alloc, free partial chain */
 	  blockdata_free(ret);
 	  return NULL;
 	}
-
-      if ((blen = len > KEYBLOCK_LEN ? KEYBLOCK_LEN : len) > 0)
-	{
-	  if (data)
-	    {
-	      memcpy(block->key, data, blen);
-	      data += blen;
-	    }
-	  else if (!read_write(fd, block->key, blen, RW_READ))
-	    {
-	      /* failed read free partial chain */
-	      blockdata_free(ret);
-	      return NULL;
-	    }
-	}
+       
+      if (blockdata_hwm < blockdata_count)
+	blockdata_hwm = blockdata_count; 
      
+      blen = len > KEYBLOCK_LEN ? KEYBLOCK_LEN : len;
+      if (data)
+	{
+	  memcpy(block->key, data, blen);
+	  data += blen;
+	}
+      else if (!read_write(fd, block->key, blen, 1))
+	{
+	  /* failed read free partial chain */
+	  blockdata_free(ret);
+	  return NULL;
+	}
      len -= blen;
      *prev = block;
      prev = &block->next;
-    } while (len != 0);
+      block->next = NULL;
+    }
  
  return ret;
 }
@@ -122,58 +111,6 @@ struct blockdata *blockdata_alloc(char *data, size_t len)
  return blockdata_alloc_real(0, data, len);
 }

-/* Add data to the end of the block. 
-   newlen is length of new data, NOT total new length. 
-   Use blockdata_alloc(NULL, 0) to make empty block to add to. */
-int blockdata_expand(struct blockdata *block, size_t oldlen, char *data, size_t newlen)
-{
-  struct blockdata *b;
-  
-  /* find size of current final block */
-  for (b = block; oldlen > KEYBLOCK_LEN && b;  b = b->next, oldlen -= KEYBLOCK_LEN);
-
-  /* chain to short for length, something is broken */
-  if (oldlen > KEYBLOCK_LEN)
-    {
-      blockdata_free(block);
-      return 0;
-    }
-
-  while (1)
-    {
-      struct blockdata *new;
-      size_t blocksize = KEYBLOCK_LEN - oldlen;
-      size_t size = (newlen <= blocksize) ? newlen : blocksize;
-      
-      if (size != 0)
-	{
-	  memcpy(&b->key[oldlen], data, size);
-	  data += size;
-	  newlen -= size;
-	}
-      
-      /* full blocks from now on. */
-      oldlen = 0;
-
-      if (newlen == 0)
-	break;
-
-      if ((new = new_block()))
-	{
-	  b->next = new;
-	  b = new;
-	}
-      else
-	{
-	  /* failed to alloc, free partial chain */
-	  blockdata_free(block);
-	  return 0;
-	}
-    }
-
-  return 1;
-}
-
 void blockdata_free(struct blockdata *blocks)
 {
  struct blockdata *tmp;
@@ -193,22 +130,20 @@ void *blockdata_retrieve(struct blockdata *block, size_t len, void *data)
 {
  size_t blen;
  struct  blockdata *b;
-  uint8_t *d;
+  void *new, *d;
  
+  static unsigned int buff_len = 0;
+  static unsigned char *buff = NULL;
+   
  if (!data)
    {
-      static unsigned int buff_len = 0;
-      static unsigned char *buff = NULL;
-      uint8_t *new;
-      
      if (len > buff_len)
 	{
-	  blen = len + 1024;
-	  if (!(new = whine_realloc(buff, blen)))
+	  if (!(new = whine_malloc(len)))
 	    return NULL;
-
+	  if (buff)
+	    free(buff);
 	  buff = new;
-	  buff_len = blen;
 	}
      data = buff;
    }
@@ -230,7 +165,7 @@ void blockdata_write(struct blockdata *block, size_t len, int fd)
  for (; len > 0 && block; block = block->next)
    {
      size_t blen = len > KEYBLOCK_LEN ? KEYBLOCK_LEN : len;
-      read_write(fd, block->key, blen, RW_WRITE);
+      read_write(fd, block->key, blen, 0);
      len -= blen;
    }
 }
@@ -239,3 +174,4 @@ struct blockdata *blockdata_read(int fd, size_t len)
 {
  return blockdata_alloc_real(fd, NULL, len);
 }
+
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ static union all_addr del_addr;

 #if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__)

-int arp_enumerate(void *parm, callback_t callback)
+int arp_enumerate(void *parm, int (*callback)())
 {
  int mib[6];
  size_t needed;
@@ -91,7 +91,7 @@ int arp_enumerate(void *parm, callback_t callback)
      rtm = (struct rt_msghdr *)next;
      sin2 = (struct sockaddr_inarp *)(rtm + 1);
      sdl = (struct sockaddr_dl *)((char *)sin2 + SA_SIZE(sin2));
-      if (!callback.af_unspec(AF_INET, &sin2->sin_addr, LLADDR(sdl), sdl->sdl_alen, parm))
+      if (!(*callback)(AF_INET, &sin2->sin_addr, LLADDR(sdl), sdl->sdl_alen, parm))
 	return 0;
    }

@@ -100,7 +100,7 @@ int arp_enumerate(void *parm, callback_t callback)
 #endif /* defined(HAVE_BSD_NETWORK) && !defined(__APPLE__) */


-int iface_enumerate(int family, void *parm, callback_t callback)
+int iface_enumerate(int family, void *parm, int (*callback)())
 {
  struct ifaddrs *head, *addrs;
  int errsave, fd = -1, ret = 0;
@@ -126,110 +126,112 @@ int iface_enumerate(int family, void *parm, callback_t callback)
  
  for (addrs = head; addrs; addrs = addrs->ifa_next)
    {
-      int iface_index = if_nametoindex(addrs->ifa_name);
-      
-      if (iface_index == 0 || !addrs->ifa_addr || 
-	  addrs->ifa_addr->sa_family != family ||
-	  (!addrs->ifa_netmask && family != AF_LINK))
-	continue;
-      
-      if (family == AF_INET)
+      if (addrs->ifa_addr->sa_family == family)
 	{
-	  struct in_addr addr, netmask, broadcast;
-	  addr = ((struct sockaddr_in *) addrs->ifa_addr)->sin_addr;
-#ifdef HAVE_BSD_NETWORK
-	  if (del_family == AF_INET && del_addr.addr4.s_addr == addr.s_addr)
+	  int iface_index = if_nametoindex(addrs->ifa_name);
+
+	  if (iface_index == 0 || !addrs->ifa_addr || 
+	      (!addrs->ifa_netmask && family != AF_LINK))
 	    continue;
+
+	  if (family == AF_INET)
+	    {
+	      struct in_addr addr, netmask, broadcast;
+	      addr = ((struct sockaddr_in *) addrs->ifa_addr)->sin_addr;
+#ifdef HAVE_BSD_NETWORK
+	      if (del_family == AF_INET && del_addr.addr4.s_addr == addr.s_addr)
+		continue;
 #endif
-	  netmask = ((struct sockaddr_in *) addrs->ifa_netmask)->sin_addr;
-	  if (addrs->ifa_broadaddr)
-	    broadcast = ((struct sockaddr_in *) addrs->ifa_broadaddr)->sin_addr; 
-	  else 
-	    broadcast.s_addr = 0;	      
-	  if (!callback.af_inet(addr, iface_index, NULL, netmask, broadcast, parm))
-	    goto err;
-	}
-      else if (family == AF_INET6)
-	{
-	  struct in6_addr *addr = &((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_addr;
-	  unsigned char *netmask = (unsigned char *) &((struct sockaddr_in6 *) addrs->ifa_netmask)->sin6_addr;
-	  int scope_id = ((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_scope_id;
-	  int i, j, prefix = 0;
-	  u32 valid = 0xffffffff, preferred = 0xffffffff;
-	  int flags = 0;
+	      netmask = ((struct sockaddr_in *) addrs->ifa_netmask)->sin_addr;
+	      if (addrs->ifa_broadaddr)
+		broadcast = ((struct sockaddr_in *) addrs->ifa_broadaddr)->sin_addr; 
+	      else 
+		broadcast.s_addr = 0;	      
+	      if (!((*callback)(addr, iface_index, NULL, netmask, broadcast, parm)))
+		goto err;
+	    }
+	  else if (family == AF_INET6)
+	    {
+	      struct in6_addr *addr = &((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_addr;
+	      unsigned char *netmask = (unsigned char *) &((struct sockaddr_in6 *) addrs->ifa_netmask)->sin6_addr;
+	      int scope_id = ((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_scope_id;
+	      int i, j, prefix = 0;
+	      u32 valid = 0xffffffff, preferred = 0xffffffff;
+	      int flags = 0;
 #ifdef HAVE_BSD_NETWORK
-	  if (del_family == AF_INET6 && IN6_ARE_ADDR_EQUAL(&del_addr.addr6, addr))
-	    continue;
+	      if (del_family == AF_INET6 && IN6_ARE_ADDR_EQUAL(&del_addr.addr6, addr))
+		continue;
 #endif
 #if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__)
-	  struct in6_ifreq ifr6;
-	  
-	  memset(&ifr6, 0, sizeof(ifr6));
-	  safe_strncpy(ifr6.ifr_name, addrs->ifa_name, sizeof(ifr6.ifr_name));
-	  
-	  ifr6.ifr_addr = *((struct sockaddr_in6 *) addrs->ifa_addr);
-	  if (fd != -1 && ioctl(fd, SIOCGIFAFLAG_IN6, &ifr6) != -1)
-	    {
-	      if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_TENTATIVE)
-		flags |= IFACE_TENTATIVE;
-	      
-	      if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_DEPRECATED)
-		flags |= IFACE_DEPRECATED;
+	      struct in6_ifreq ifr6;
+
+	      memset(&ifr6, 0, sizeof(ifr6));
+	      safe_strncpy(ifr6.ifr_name, addrs->ifa_name, sizeof(ifr6.ifr_name));
 	      
+	      ifr6.ifr_addr = *((struct sockaddr_in6 *) addrs->ifa_addr);
+	      if (fd != -1 && ioctl(fd, SIOCGIFAFLAG_IN6, &ifr6) != -1)
+		{
+		  if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_TENTATIVE)
+		    flags |= IFACE_TENTATIVE;
+		  
+		  if (ifr6.ifr_ifru.ifru_flags6 & IN6_IFF_DEPRECATED)
+		    flags |= IFACE_DEPRECATED;
+
 #ifdef IN6_IFF_TEMPORARY
-	      if (!(ifr6.ifr_ifru.ifru_flags6 & (IN6_IFF_AUTOCONF | IN6_IFF_TEMPORARY)))
-		flags |= IFACE_PERMANENT;
+		  if (!(ifr6.ifr_ifru.ifru_flags6 & (IN6_IFF_AUTOCONF | IN6_IFF_TEMPORARY)))
+		    flags |= IFACE_PERMANENT;
 #endif
-	      
+
 #ifdef IN6_IFF_PRIVACY
-	      if (!(ifr6.ifr_ifru.ifru_flags6 & (IN6_IFF_AUTOCONF | IN6_IFF_PRIVACY)))
-		flags |= IFACE_PERMANENT;
+		  if (!(ifr6.ifr_ifru.ifru_flags6 & (IN6_IFF_AUTOCONF | IN6_IFF_PRIVACY)))
+		    flags |= IFACE_PERMANENT;
 #endif
-	    }
-	  
-	  ifr6.ifr_addr = *((struct sockaddr_in6 *) addrs->ifa_addr);
-	  if (fd != -1 && ioctl(fd, SIOCGIFALIFETIME_IN6, &ifr6) != -1)
-	    {
-	      valid = ifr6.ifr_ifru.ifru_lifetime.ia6t_vltime;
-	      preferred = ifr6.ifr_ifru.ifru_lifetime.ia6t_pltime;
-	    }
+		}
+	      
+	      ifr6.ifr_addr = *((struct sockaddr_in6 *) addrs->ifa_addr);
+	      if (fd != -1 && ioctl(fd, SIOCGIFALIFETIME_IN6, &ifr6) != -1)
+		{
+		  valid = ifr6.ifr_ifru.ifru_lifetime.ia6t_vltime;
+		  preferred = ifr6.ifr_ifru.ifru_lifetime.ia6t_pltime;
+		}
 #endif
-	  
-	  for (i = 0; i < IN6ADDRSZ; i++, prefix += 8) 
-	    if (netmask[i] != 0xff)
-	      break;
-	  
-	  if (i != IN6ADDRSZ && netmask[i]) 
-	    for (j = 7; j > 0; j--, prefix++) 
-	      if ((netmask[i] & (1 << j)) == 0)
-		break;
-	  
-	  /* voodoo to clear interface field in address */
-	  if (!option_bool(OPT_NOWILD) && IN6_IS_ADDR_LINKLOCAL(addr))
-	    {
-	      addr->s6_addr[2] = 0;
-	      addr->s6_addr[3] = 0;
-	    } 
-	  
-	  if (!callback.af_inet6(addr, prefix, scope_id, iface_index, flags,
-				 (unsigned int) preferred, (unsigned int)valid, parm))
-	    goto err;	      
-	}
-      
+	      	      
+	      for (i = 0; i < IN6ADDRSZ; i++, prefix += 8) 
+                if (netmask[i] != 0xff)
+		  break;
+	      
+	      if (i != IN6ADDRSZ && netmask[i]) 
+                for (j = 7; j > 0; j--, prefix++) 
+		  if ((netmask[i] & (1 << j)) == 0)
+		    break;
+	      
+	      /* voodoo to clear interface field in address */
+	      if (!option_bool(OPT_NOWILD) && IN6_IS_ADDR_LINKLOCAL(addr))
+		{
+		  addr->s6_addr[2] = 0;
+		  addr->s6_addr[3] = 0;
+		} 
+	     
+	      if (!((*callback)(addr, prefix, scope_id, iface_index, flags,
+				(int) preferred, (int)valid, parm)))
+		goto err;	      
+	    }
+
 #ifdef HAVE_DHCP6      
-      else if (family == AF_LINK)
-	{ 
-	  /* Assume ethernet again here */
-	  struct sockaddr_dl *sdl = (struct sockaddr_dl *) addrs->ifa_addr;
-	  if (sdl->sdl_alen != 0 && 
-	      !callback.af_local(iface_index, ARPHRD_ETHER, LLADDR(sdl), sdl->sdl_alen, parm))
-	    goto err;
-	}
+	  else if (family == AF_LINK)
+	    { 
+	      /* Assume ethernet again here */
+	      struct sockaddr_dl *sdl = (struct sockaddr_dl *) addrs->ifa_addr;
+	      if (sdl->sdl_alen != 0 && 
+		  !((*callback)(iface_index, ARPHRD_ETHER, LLADDR(sdl), sdl->sdl_alen, parm)))
+		goto err;
+	    }
 #endif 
+	}
    }
  
  ret = 1;
-  
+
 err:
  errsave = errno;
  freeifaddrs(head); 
@@ -438,3 +440,5 @@ void route_sock(void)
 }

 #endif /* HAVE_BSD_NETWORK */
+
+
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -15,26 +15,21 @@
 */

 #define FTABSIZ 150 /* max number of outstanding requests (default) */
-#define MAX_PROCS 20 /* default max no children for TCP requests */
+#define MAX_PROCS 20 /* max no children for TCP requests */
 #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */
 #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */
-#define TCP_TIMEOUT 5 /* timeout waiting to connect to an upstream server - double this for answer */
 #define TCP_BACKLOG 32  /* kernel backlog limit for TCP connections */
-#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from  /dnsflagday.net/2020 */
+#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */
+#define SAFE_PKTSZ 1280 /* "go anywhere" UDP packet size */
 #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */
-#define NAMEBLOCK_CHARS 1500 /* quantum of memory allocation for names from /etc/hosts */
-#define DNSSEC_LIMIT_WORK 40 /* Max number of queries to validate one question */
-#define DNSSEC_LIMIT_SIG_FAIL 20 /* Number of signature that can fail to validate in one answer */
-#define DNSSEC_LIMIT_CRYPTO 200 /* max no. of crypto operations to validate one query. */
-#define DNSSEC_LIMIT_NSEC3_ITERS 150 /* Max. number if iterations allowed in NSEC3 record. */
-#define DNSSEC_ASSUMED_DS_TTL 3600 /* TTL for negative DS records implied by server=/domain/ */
-#define TIMEOUT 10     /* drop UDP queries after TIMEOUT seconds */
-#define SMALL_PORT_RANGE 30 /* If DNS port range is smaller than this, use different allocation. */
+#define DNSSEC_WORK 50 /* Max number of queries to validate one question */
+#define TIMEOUT 10 /* drop UDP queries after TIMEOUT seconds */
 #define FORWARD_TEST 50 /* try all servers every 50 queries */
 #define FORWARD_TIME 20 /* or 20 seconds */
 #define UDP_TEST_TIME 60 /* How often to reset our idea of max packet size. */
 #define SERVERS_LOGGED 30 /* Only log this many servers when logging state */
 #define LOCALS_LOGGED 8 /* Only log this many local addresses when logging state */
+#define RANDOM_SOCKS 64 /* max simultaneous random ports */
 #define LEASE_RETRY 60 /* on error, retry writing leasefile after LEASE_RETRY seconds */
 #define CACHESIZ 150 /* default cache size */
 #define TTL_FLOOR_LIMIT 3600 /* don't allow --min-cache-ttl to raise TTL above this under any circumstances */
@@ -53,8 +48,6 @@
 #define CHUSER "nobody"
 #define CHGRP "dip"
 #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
-#define TFTP_MAX_WINDOW 32 /* max window size to negotiate */
-#define TFTP_TRANSFER_TIME 120 /* Abandon TFTP transfers after this long. Two mins. */
 #define LOG_MAX 5 /* log-queue length */
 #define RANDFILE "/dev/urandom"
 #define DNSMASQ_SERVICE "uk.org.thekelleys.dnsmasq" /* Default - may be overridden by config */
@@ -66,8 +59,6 @@
 #define SOA_EXPIRY 1209600 /* SOA expiry default */
 #define LOOP_TEST_DOMAIN "test" /* domain for loop testing, "test" is reserved by RFC 2606 and won't therefore clash */
 #define LOOP_TEST_TYPE T_TXT
-#define DEFAULT_FAST_RETRY 1000 /* ms, default delay before fast retry */
-#define STALE_CACHE_EXPIRY 86400 /* 1 day in secs, default maximum expiry time for stale cache data */
 
 /* compile-time options: uncomment below to enable or do eg.
   make COPTS=-DHAVE_BROKEN_RTC
@@ -125,10 +116,6 @@ HAVE_IPSET
    define this to include the ability to selectively add resolved ip addresses
    to given ipsets.

-HAVE_NFTSET
-    define this to include the ability to selectively add resolved ip addresses
-    to given nftables sets.
-
 HAVE_AUTH
   define this to include the facility to act as an authoritative DNS
   server for one or more zones.
@@ -143,8 +130,7 @@ HAVE_LOOP
   include functionality to probe for and remove DNS forwarding loops.

 HAVE_INOTIFY
-   use the Linux and FreeBSD >= 15 inotify facility
-   to efficiently re-read configuration files.
+   use the Linux inotify facility to efficiently re-read configuration files.

 NO_ID
   Don't report *.bind CHAOS info to clients, forward such requests upstream instead.
@@ -155,9 +141,7 @@ NO_SCRIPT
 NO_LARGEFILE
 NO_AUTH
 NO_DUMPFILE
-NO_LOOP
 NO_INOTIFY
-NO_IPSET
   these are available to explicitly disable compile time options which would 
   otherwise be enabled automatically or which are enabled  by default 
   in the distributed source tree. Building dnsmasq
@@ -204,7 +188,7 @@ RESOLVFILE
 /* #define HAVE_LIBIDN2 */
 /* #define HAVE_CONNTRACK */
 /* #define HAVE_DNSSEC */
-/* #define HAVE_NFTSET */
+

 /* Default locations for important system files. */

@@ -302,6 +286,7 @@ HAVE_SOCKADDR_SA_LEN
 #ifndef SOL_TCP
 #  define SOL_TCP IPPROTO_TCP
 #endif
+#define NO_IPSET

 #elif defined(__NetBSD__)
 #define HAVE_BSD_NETWORK
@@ -351,24 +336,10 @@ HAVE_SOCKADDR_SA_LEN
 #undef HAVE_AUTH
 #endif

-#if !defined(HAVE_LINUX_NETWORK)
-#undef HAVE_NFTSET
-#endif
-
 #if defined(NO_IPSET)
 #undef HAVE_IPSET
 #endif

-#if defined(HAVE_IPSET)
-#  if defined(HAVE_LINUX_NETWORK)
-#    define HAVE_LINUX_IPSET
-#  elif defined(HAVE_BSD_NETWORK)
-#    define HAVE_BSD_IPSET
-#  else
-#    undef HAVE_IPSET
-#  endif
-#endif
-
 #ifdef NO_LOOP
 #undef HAVE_LOOP
 #endif
@@ -377,20 +348,8 @@ HAVE_SOCKADDR_SA_LEN
 #undef HAVE_DUMPFILE
 #endif

-#if !defined(NO_INOTIFY)
-#  if defined (HAVE_LINUX_NETWORK)
-#    define HAVE_INOTIFY
-#  elif defined (__FreeBSD__) && __FreeBSD__ + 0 >= 15
-#    include <osreldate.h>
-#    if __FreeBSD_version >= 1500068 /* 15.0.0 */
-#      define HAVE_INOTIFY
-#    endif
-#  endif
-#endif
-
-/* This never compiles code, it's only used by the makefile to fingerprint builds. */
-#ifdef DNSMASQ_COMPILE_FLAGS
-static char *compile_flags = DNSMASQ_COMPILE_FLAGS;
+#if defined (HAVE_LINUX_NETWORK) && !defined(NO_INOTIFY)
+#define HAVE_INOTIFY
 #endif

 /* Define a string indicating which options are in use.
@@ -457,10 +416,6 @@ static char *compile_opts =
 "no-"
 #endif
 "ipset "
-#ifndef HAVE_NFTSET
-"no-"
-#endif
-"nftset "
 #ifndef HAVE_AUTH
 "no-"
 #endif
@@ -485,4 +440,7 @@ static char *compile_opts =
 #endif
 "dumpfile";

-#endif /* defined(DNSMASQ_COMPILE_OPTS) */
+#endif
+
+
+
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -82,4 +82,7 @@ static int callback(enum nf_conntrack_msg_type type, struct nf_conntrack *ct, vo
  return NFCT_CB_CONTINUE;
 }

-#endif /* HAVE_CONNTRACK */
+#endif
+  
+
+
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -16,31 +16,18 @@

 #include "dnsmasq.h"

-#if defined(HAVE_DNSSEC)
-
-/* Minimal version of nettle */
-
-/* bignum.h includes version.h and works on
-   earlier releases of nettle which don't have version.h */
-#include <nettle/bignum.h>
-#if !defined(NETTLE_VERSION_MAJOR)
-#  define NETTLE_VERSION_MAJOR 2
-#  define NETTLE_VERSION_MINOR 0
-#endif
-#define MIN_VERSION(major, minor) ((NETTLE_VERSION_MAJOR == (major) && NETTLE_VERSION_MINOR >= (minor)) || \
-				   (NETTLE_VERSION_MAJOR > (major)))
+#ifdef HAVE_DNSSEC

 #include <nettle/rsa.h>
 #include <nettle/ecdsa.h>
 #include <nettle/ecc-curve.h>
-#if MIN_VERSION(3, 1)
 #include <nettle/eddsa.h>
-#endif
-#if MIN_VERSION(3, 6)
+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR >= 6
 #  include <nettle/gostdsa.h>
 #endif
+#include <nettle/nettle-meta.h>
+#include <nettle/bignum.h>

-#if MIN_VERSION(3, 1)
 /* Implement a "hash-function" to the nettle API, which simply returns
   the input data, concatenated into a single, statically maintained, buffer.

@@ -93,15 +80,8 @@ static void null_hash_update(void *ctxv, size_t length, const uint8_t *src)
  memcpy(null_hash_buff + ctx->len, src, length);
  ctx->len += length;
 }
+ 

-/* The prototype changes in nettle 4.0 to omit the length argument */
-#if MIN_VERSION(4, 0)
-static void null_hash_digest(void *ctx, uint8_t *dst)
-{
-  ((struct null_hash_digest *)dst)->buff = null_hash_buff;
-  ((struct null_hash_digest *)dst)->len = ((struct null_hash_ctx *)ctx)->len;
-}
-#else
 static void null_hash_digest(void *ctx, size_t length, uint8_t *dst)
 {
  (void)length;
@@ -109,7 +89,6 @@ static void null_hash_digest(void *ctx, size_t length, uint8_t *dst)
  ((struct null_hash_digest *)dst)->buff = null_hash_buff;
  ((struct null_hash_digest *)dst)->len = ((struct null_hash_ctx *)ctx)->len;
 }
-#endif

 static struct nettle_hash null_hash = {
  "null_hash",
@@ -121,7 +100,35 @@ static struct nettle_hash null_hash = {
  (nettle_hash_digest_func *) null_hash_digest
 };

-#endif /* MIN_VERSION(3, 1) */
+/* Find pointer to correct hash function in nettle library */
+const struct nettle_hash *hash_find(char *name)
+{
+  if (!name)
+    return NULL;
+  
+  /* We provide a "null" hash which returns the input data as digest. */
+  if (strcmp(null_hash.name, name) == 0)
+    return &null_hash;
+
+  /* libnettle >= 3.4 provides nettle_lookup_hash() which avoids nasty ABI
+     incompatibilities if sizeof(nettle_hashes) changes between library
+     versions. It also #defines nettle_hashes, so use that to tell
+     if we have the new facilities. */
+  
+#ifdef nettle_hashes
+  return nettle_lookup_hash(name);
+#else
+  {
+    int i;
+
+    for (i = 0; nettle_hashes[i]; i++)
+      if (strcmp(nettle_hashes[i]->name, name) == 0)
+	return nettle_hashes[i];
+  }
+  
+  return NULL;
+#endif
+}

 /* expand ctx and digest memory allocations if necessary and init hash function */
 int hash_init(const struct nettle_hash *hash, void **ctxp, unsigned char **digestp)
@@ -135,18 +142,20 @@ int hash_init(const struct nettle_hash *hash, void **ctxp, unsigned char **diges

  if (ctx_sz < hash->context_size)
    {
-      if (!(new = whine_realloc(ctx, hash->context_size)))
+      if (!(new = whine_malloc(hash->context_size)))
 	return 0;
-      
+      if (ctx)
+	free(ctx);
      ctx = new;
      ctx_sz = hash->context_size;
    }
  
  if (digest_sz < hash->digest_size)
    {
-      if (!(new = whine_realloc(digest, hash->digest_size)))
+      if (!(new = whine_malloc(hash->digest_size)))
 	return 0;
-
+      if (digest)
+	free(digest);
      digest = new;
      digest_sz = hash->digest_size;
    }
@@ -158,7 +167,7 @@ int hash_init(const struct nettle_hash *hash, void **ctxp, unsigned char **diges

  return 1;
 }
-
+  
 static int dnsmasq_rsa_verify(struct blockdata *key_data, unsigned int key_len, unsigned char *sig, size_t sig_len,
 			      unsigned char *digest, size_t digest_len, int algo)
 {
@@ -222,7 +231,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
  static struct ecc_point *key_256 = NULL, *key_384 = NULL;
  static mpz_t x, y;
  static struct dsa_signature *sig_struct;
-#if !MIN_VERSION(3, 4)
+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4
 #define nettle_get_secp_256r1() (&nettle_secp_256r1)
 #define nettle_get_secp_384r1() (&nettle_secp_384r1)
 #endif
@@ -285,7 +294,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
  return nettle_ecdsa_verify(key, digest_len, digest, sig_struct);
 }

-#if MIN_VERSION(3, 6)
+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR >= 6
 static int dnsmasq_gostdsa_verify(struct blockdata *key_data, unsigned int key_len, 
 				  unsigned char *sig, size_t sig_len,
 				  unsigned char *digest, size_t digest_len, int algo)
@@ -313,20 +322,19 @@ static int dnsmasq_gostdsa_verify(struct blockdata *key_data, unsigned int key_l
      mpz_init(y);
    }
    
-  mpz_import(x, 32, -1, 1, 0, 0, p);
-  mpz_import(y, 32, -1, 1, 0, 0, p + 32);
+  mpz_import(x, 32 , 1, 1, 0, 0, p);
+  mpz_import(y, 32 , 1, 1, 0, 0, p + 32);

  if (!ecc_point_set(gost_key, x, y))
-    return 0; 
+    return 0;
  
-  mpz_import(sig_struct->s, 32, 1, 1, 0, 0, sig);
-  mpz_import(sig_struct->r, 32, 1, 1, 0, 0, sig + 32);
+  mpz_import(sig_struct->r, 32, 1, 1, 0, 0, sig);
+  mpz_import(sig_struct->s, 32, 1, 1, 0, 0, sig + 32);
  
  return nettle_gostdsa_verify(gost_key, digest_len, digest, sig_struct);
 }
 #endif

-#if MIN_VERSION(3, 1)
 static int dnsmasq_eddsa_verify(struct blockdata *key_data, unsigned int key_len, 
 				unsigned char *sig, size_t sig_len,
 				unsigned char *digest, size_t digest_len, int algo)
@@ -353,7 +361,7 @@ static int dnsmasq_eddsa_verify(struct blockdata *key_data, unsigned int key_len
 				   ((struct null_hash_digest *)digest)->buff,
 				   sig);
      
-#if MIN_VERSION(3, 6)
+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR >= 6
    case 16:
      if (key_len != ED448_KEY_SIZE ||
 	  sig_len != ED448_SIGNATURE_SIZE)
@@ -369,7 +377,6 @@ static int dnsmasq_eddsa_verify(struct blockdata *key_data, unsigned int key_len

  return 0;
 }
-#endif

 static int (*verify_func(int algo))(struct blockdata *key_data, unsigned int key_len, unsigned char *sig, size_t sig_len,
 			     unsigned char *digest, size_t digest_len, int algo)
@@ -385,23 +392,16 @@ static int (*verify_func(int algo))(struct blockdata *key_data, unsigned int key
    case 5: case 7: case 8: case 10:
      return dnsmasq_rsa_verify;

-#if MIN_VERSION(3, 6)
+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR >= 6
    case 12:
      return dnsmasq_gostdsa_verify;
 #endif
      
    case 13: case 14:
      return dnsmasq_ecdsa_verify;
-      
-#if MIN_VERSION(3, 1)
-    case 15:
-      return dnsmasq_eddsa_verify;
-#endif

-#if MIN_VERSION(3, 6)
-    case 16:
+    case 15: case 16:
      return dnsmasq_eddsa_verify;
-#endif
    }
  
  return NULL;
@@ -434,9 +434,7 @@ char *ds_digest_name(int digest)
    {
    case 1: return "sha1";
    case 2: return "sha256";
-#if MIN_VERSION(3, 6)
-    case 3: return "gosthash94cp";
-#endif
+    case 3: return "gosthash94";
    case 4: return "sha384";
    default: return NULL;
    }
@@ -455,17 +453,11 @@ char *algo_digest_name(int algo)
    case 7: return "sha1";        /* RSASHA1-NSEC3-SHA1 */
    case 8: return "sha256";      /* RSA/SHA-256 */
    case 10: return "sha512";     /* RSA/SHA-512 */
-#if MIN_VERSION(3, 6)
-    case 12: return "gosthash94cp"; /* ECC-GOST */ 
-#endif
+    case 12: return "gosthash94"; /* ECC-GOST */
    case 13: return "sha256";     /* ECDSAP256SHA256 */
    case 14: return "sha384";     /* ECDSAP384SHA384 */ 	
-#if MIN_VERSION(3, 1)
    case 15: return "null_hash";  /* ED25519 */
-#  if MIN_VERSION(3, 6)
    case 16: return "null_hash";  /* ED448 */
-#  endif
-#endif
    default: return NULL;
    }
 }
@@ -480,46 +472,4 @@ char *nsec3_digest_name(int digest)
    }
 }

-/* Find pointer to correct hash function in nettle library */
-const struct nettle_hash *hash_find(char *name)
-{
-  if (!name)
-    return NULL;
-  
-#if MIN_VERSION(3,1) && defined(HAVE_DNSSEC)
-  /* We provide a "null" hash which returns the input data as digest. */
-  if (strcmp(null_hash.name, name) == 0)
-    return &null_hash;
 #endif
-  
-  /* libnettle >= 3.4 provides nettle_lookup_hash() which avoids nasty ABI
-     incompatibilities if sizeof(nettle_hashes) changes between library
-     versions. */
-#if MIN_VERSION(3, 4)
-  return nettle_lookup_hash(name);
-#else
-  {
-    int i;
-
-    for (i = 0; nettle_hashes[i]; i++)
-      if (strcmp(nettle_hashes[i]->name, name) == 0)
-	return nettle_hashes[i];
-  }
-  
-  return NULL;
-#endif
-}
-
-/* The prototype changes in nettle 4.0 to omit the length argument */
-void nettle_digest_wrapper(const struct nettle_hash *hash, void *ctx, size_t length, uint8_t *dst)
-{
-#if MIN_VERSION(4, 0)
-  (void)length;
-  hash->digest(ctx, dst);
-#else
-  hash->digest(ctx, length, dst);
-#endif
-}
-
-
-#endif /* defined(HAVE_DNSSEC) */
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -52,15 +52,6 @@ const char* introspection_xml_template =
 "    <method name=\"SetFilterWin2KOption\">\n"
 "      <arg name=\"filterwin2k\" direction=\"in\" type=\"b\"/>\n"
 "    </method>\n"
-"    <method name=\"SetFilterA\">\n"
-"      <arg name=\"filter-a\" direction=\"in\" type=\"b\"/>\n"
-"    </method>\n"
-"    <method name=\"SetFilterAAAA\">\n"
-"      <arg name=\"filter-aaaa\" direction=\"in\" type=\"b\"/>\n"
-"    </method>\n"
-"    <method name=\"SetLocaliseQueriesOption\">\n"
-"      <arg name=\"localise-queries\" direction=\"in\" type=\"b\"/>\n"
-"    </method>\n"
 "    <method name=\"SetBogusPrivOption\">\n"
 "      <arg name=\"boguspriv\" direction=\"in\" type=\"b\"/>\n"
 "    </method>\n"
@@ -97,16 +88,10 @@ const char* introspection_xml_template =
 "    <method name=\"GetMetrics\">\n"
 "      <arg name=\"metrics\" direction=\"out\" type=\"a{su}\"/>\n"
 "    </method>\n"
-"    <method name=\"GetServerMetrics\">\n"
-"      <arg name=\"metrics\" direction=\"out\" type=\"a{ss}\"/>\n"
-"    </method>\n"
-"    <method name=\"ClearMetrics\">\n"
-"    </method>\n"
 "  </interface>\n"
 "</node>\n";

 static char *introspection_xml = NULL;
-static int watches_modified = 0;

 struct watch {
  DBusWatch *watch;      
@@ -128,15 +113,14 @@ static dbus_bool_t add_watch(DBusWatch *watch, void *data)
  w->watch = watch;
  w->next = daemon->watches;
  daemon->watches = w;
-  watches_modified++;

-  (void)data; /* no warning */
+  w = data; /* no warning */
  return TRUE;
 }

 static void remove_watch(DBusWatch *watch, void *data)
 {
-  struct watch **up, *w, *tmp;
+  struct watch **up, *w, *tmp;  
  
  for (up = &(daemon->watches), w = daemon->watches; w; w = tmp)
    {
@@ -145,26 +129,21 @@ static void remove_watch(DBusWatch *watch, void *data)
 	{
 	  *up = tmp;
 	  free(w);
-	  watches_modified++;
 	}
      else
 	up = &(w->next);
    }

-  (void)data; /* no warning */
+  w = data; /* no warning */
 }

-static DBusMessage* dbus_read_servers(DBusMessage *message)
+static void dbus_read_servers(DBusMessage *message)
 {
  DBusMessageIter iter;
  union  mysockaddr addr, source_addr;
  char *domain;
  
-  if (!dbus_message_iter_init(message, &iter))
-    {
-      return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS,
-                                    "Failed to initialize dbus message iter");
-    }
+  dbus_message_iter_init(message, &iter);

  mark_servers(SERV_FROM_DBUS);
  
@@ -236,14 +215,13 @@ static DBusMessage* dbus_read_servers(DBusMessage *message)
 	  domain = NULL;
 	
 	if (!skip)
-	  add_update_server(SERV_FROM_DBUS, &addr, &source_addr, NULL, domain, NULL);
+	  add_update_server(SERV_FROM_DBUS, &addr, &source_addr, NULL, domain);
     
      } while (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING); 
    }
   
  /* unlink and free anything still marked. */
  cleanup_servers();
-  return NULL;
 }

 #ifdef HAVE_LOOP
@@ -298,14 +276,9 @@ static DBusMessage* dbus_read_servers_ex(DBusMessage *message, int strings)
    {
      const char *str = NULL;
      union  mysockaddr addr, source_addr;
-      u16 flags = 0;
+      int flags = 0;
      char interface[IF_NAMESIZE];
      char *str_addr, *str_domain = NULL;
-      struct server_details sdetails = { 0 };
-      sdetails.addr = &addr;
-      sdetails.source_addr = &source_addr;
-      sdetails.interface = interface;
-      sdetails.flags = &flags;

      if (strings)
 	{
@@ -388,6 +361,24 @@ static DBusMessage* dbus_read_servers_ex(DBusMessage *message, int strings)
 	  strcpy(str_addr, str);
 	}

+      memset(&addr, 0, sizeof(addr));
+      memset(&source_addr, 0, sizeof(source_addr));
+      memset(&interface, 0, sizeof(interface));
+
+      /* parse the IP address */
+      if ((addr_err = parse_server(str_addr, &addr, &source_addr, (char *) &interface, &flags)))
+	{
+          error = dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
+                                                "Invalid IP address '%s': %s",
+                                                str, addr_err);
+          break;
+        }
+      
+      /* 0.0.0.0 for server address == NULL, for Dbus */
+      if (addr.in.sin_family == AF_INET &&
+          addr.in.sin_addr.s_addr == 0)
+        flags |= SERV_NO_ADDR;
+      
      if (strings)
 	{
 	  char *p;
@@ -401,31 +392,7 @@ static DBusMessage* dbus_read_servers_ex(DBusMessage *message, int strings)
 	    else 
 	      p = NULL;
 	    
-	     if (strings && strlen(str_addr) == 0)
-	       add_update_server(SERV_LITERAL_ADDRESS | SERV_FROM_DBUS, &addr, &source_addr, interface, str_domain, NULL);
-	     else
-	       {
-		 if ((addr_err = parse_server(str_addr, &sdetails)))
-		   {
-		     error = dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
-							   "Invalid IP address '%s': %s",
-							   str, addr_err);
-		     break;
-		   }
-		 
-		 while (parse_server_next(&sdetails))
-		   {
-		     if ((addr_err = parse_server_addr(&sdetails)))
-		       {
-			 error = dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
-							       "Invalid IP address '%s': %s",
-							       str, addr_err);
-			 break;
-		       }
-		     
-		     add_update_server(flags | SERV_FROM_DBUS, &addr, &source_addr, interface, str_domain, NULL);
-		   }
-	       }
+	    add_update_server(flags | SERV_FROM_DBUS, &addr, &source_addr, interface, str_domain);
 	  } while ((str_domain = p));
 	}
      else
@@ -439,83 +406,45 @@ static DBusMessage* dbus_read_servers_ex(DBusMessage *message, int strings)
 	    if (dbus_message_iter_get_arg_type(&string_iter) == DBUS_TYPE_STRING)
 	      dbus_message_iter_get_basic(&string_iter, &str);
 	    dbus_message_iter_next (&string_iter);
-
-	    if ((addr_err = parse_server(str_addr, &sdetails)))
-	      {
-		error = dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
-						      "Invalid IP address '%s': %s",
-						      str, addr_err);
-		break;
-	      }
 	    
-	    while (parse_server_next(&sdetails))
-	      {
-		if ((addr_err = parse_server_addr(&sdetails)))
-		  {
-		    error = dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
-							  "Invalid IP address '%s': %s",
-							  str, addr_err);
-		    break;
-		  }
-		
-		/* 0.0.0.0 for server address == NULL, for Dbus */
-		if (addr.in.sin_family == AF_INET &&
-		    addr.in.sin_addr.s_addr == 0)
-		  flags |= SERV_LITERAL_ADDRESS;
-		else
-		  flags &= ~SERV_LITERAL_ADDRESS;
-		
-		add_update_server(flags | SERV_FROM_DBUS, &addr, &source_addr, interface, str, NULL);
-	      }
+	    add_update_server(flags | SERV_FROM_DBUS, &addr, &source_addr, interface, str);
 	  } while (dbus_message_iter_get_arg_type(&string_iter) == DBUS_TYPE_STRING);
 	}
-      
-      if (sdetails.orig_hostinfo)
-	freeaddrinfo(sdetails.orig_hostinfo);
-      
+	 
      /* jump to next element in outer array */
      dbus_message_iter_next(&array_iter);
    }

  cleanup_servers();
-    
+
  if (dup)
    free(dup);

  return error;
 }

-static DBusMessage *dbus_get_bool(DBusMessage *message, dbus_bool_t *enabled, char *name)
+static DBusMessage *dbus_set_bool(DBusMessage *message, int flag, char *name)
 {
  DBusMessageIter iter;
+  dbus_bool_t enabled;

  if (!dbus_message_iter_init(message, &iter) || dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN)
    return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS, "Expected boolean argument");
  
-  dbus_message_iter_get_basic(&iter, enabled);
-  
-  if (*enabled)
-    my_syslog(LOG_INFO, _("Enabling --%s option from D-Bus"), name);
-  else
-    my_syslog(LOG_INFO, _("Disabling --%s option from D-Bus"), name);
-  
-  return NULL;
-}
+  dbus_message_iter_get_basic(&iter, &enabled);

-static DBusMessage *dbus_set_bool(DBusMessage *message, int flag, char *name)
-{
-  dbus_bool_t val;
-  DBusMessage *reply = dbus_get_bool(message, &val, name);
-  
-  if (!reply)
+  if (enabled)
+    { 
+      my_syslog(LOG_INFO, _("Enabling --%s option from D-Bus"), name);
+      set_option_bool(flag);
+    }
+  else
    {
-      if (val)
-	set_option_bool(flag);
-      else
-	reset_option_bool(flag);
+      my_syslog(LOG_INFO, _("Disabling --%s option from D-Bus"), name);
+      reset_option_bool(flag);
    }

-  return reply;
+  return NULL;
 }

 #ifdef HAVE_DHCP
@@ -530,8 +459,8 @@ static DBusMessage *dbus_add_lease(DBusMessage* message)
  union all_addr addr;
  time_t now = dnsmasq_time();
  unsigned char dhcp_chaddr[DHCP_CHADDR_MAX];
-  DBusMessageIter iter, array_iter;

+  DBusMessageIter iter, array_iter;
  if (!dbus_message_iter_init(message, &iter))
    return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS,
 				  "Failed to initialize dbus message iter");
@@ -599,10 +528,6 @@ static DBusMessage *dbus_add_lease(DBusMessage* message)

  if (inet_pton(AF_INET, ipaddr, &addr.addr4))
    {
-      if (!daemon->dhcp)
-	return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS,
-				      "DHCPv4 not configured");
-      
      if (ia_id != 0 || is_temporary)
 	return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS,
 				      "ia_id and is_temporary must be zero for IPv4 lease");
@@ -613,30 +538,17 @@ static DBusMessage *dbus_add_lease(DBusMessage* message)
 #ifdef HAVE_DHCP6
  else if (inet_pton(AF_INET6, ipaddr, &addr.addr6))
    {
-      if (!daemon->doing_dhcp6)
-	return dbus_message_new_error(message, DBUS_ERROR_INVALID_ARGS,
-				      "DHCPv6 not configured");
-      
      if (!(lease = lease6_find_by_addr(&addr.addr6, 128, 0)))
 	lease = lease6_allocate(&addr.addr6,
 				is_temporary ? LEASE_TA : LEASE_NA);
-      if (lease)
-	lease_set_iaid(lease, ia_id);
+      lease_set_iaid(lease, ia_id);
    }
 #endif
  else
    return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
 					 "Invalid IP address '%s'", ipaddr);
-
-  if (!lease) 
-    return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
-					 "unable to allocate lease for IP address '%s'", ipaddr);
-  
+   
  hw_len = parse_hex((char*)hwaddr, dhcp_chaddr, DHCP_CHADDR_MAX, NULL, &hw_type);
-  if (hw_len < 0)
-    return dbus_message_new_error_printf(message, DBUS_ERROR_INVALID_ARGS,
-					 "Invalid HW address '%s'", hwaddr);
-
  if (hw_type == 0 && hw_len != 0)
    hw_type = ARPHRD_ETHER;
  
@@ -654,7 +566,7 @@ static DBusMessage *dbus_add_lease(DBusMessage* message)

 static DBusMessage *dbus_del_lease(DBusMessage* message)
 {
-  struct dhcp_lease *lease = NULL;
+  struct dhcp_lease *lease;
  DBusMessageIter iter;
  const char *ipaddr;
  DBusMessage *reply;
@@ -672,10 +584,10 @@ static DBusMessage *dbus_del_lease(DBusMessage* message)
   
  dbus_message_iter_get_basic(&iter, &ipaddr);

-  if (inet_pton(AF_INET, ipaddr, &addr.addr4) && daemon->dhcp)
+  if (inet_pton(AF_INET, ipaddr, &addr.addr4))
    lease = lease_find_by_addr(addr.addr4);
 #ifdef HAVE_DHCP6
-  else if (inet_pton(AF_INET6, ipaddr, &addr.addr6) && daemon->doing_dhcp6)
+  else if (inet_pton(AF_INET6, ipaddr, &addr.addr6))
    lease = lease6_find_by_addr(&addr.addr6, 128, 0);
 #endif
  else
@@ -724,77 +636,6 @@ static DBusMessage *dbus_get_metrics(DBusMessage* message)
  return reply;
 }

-static void add_dict_entry(DBusMessageIter *container, const char *key, const char *val)
-{
-  DBusMessageIter dict;
-
-  dbus_message_iter_open_container(container, DBUS_TYPE_DICT_ENTRY, NULL, &dict);
-  dbus_message_iter_append_basic(&dict, DBUS_TYPE_STRING, &key);
-  dbus_message_iter_append_basic(&dict, DBUS_TYPE_STRING, &val);
-  dbus_message_iter_close_container(container, &dict);
-}
-
-static void add_dict_int(DBusMessageIter *container, const char *key, const unsigned int val)
-{
-  snprintf(daemon->namebuff, MAXDNAME, "%u", val);
-  
-  add_dict_entry(container, key, daemon->namebuff);
-}
-
-static DBusMessage *dbus_get_server_metrics(DBusMessage* message)
-{
-  DBusMessage *reply = dbus_message_new_method_return(message);
-  DBusMessageIter server_array, dict_array, server_iter;
-  struct server *serv;
-  
-  dbus_message_iter_init_append(reply, &server_iter);
-  dbus_message_iter_open_container(&server_iter, DBUS_TYPE_ARRAY, "a{ss}", &server_array);
-
-  /* sum counts from different records for same server */
-  for (serv = daemon->servers; serv; serv = serv->next)
-    serv->flags &= ~SERV_MARK;
-  
-  for (serv = daemon->servers; serv; serv = serv->next)
-    if (!(serv->flags & SERV_MARK))
-      {
-	unsigned int port;
-	unsigned int queries = 0, failed_queries = 0, nxdomain_replies = 0, retrys = 0;
-	unsigned int sigma_latency = 0, count_latency = 0;
-	
-	struct server *serv1;
-
-	for (serv1 = serv; serv1; serv1 = serv1->next)
-	  if (!(serv1->flags & SERV_MARK) && sockaddr_isequal(&serv->addr, &serv1->addr))
-	    {
-	      serv1->flags |= SERV_MARK;
-	      queries += serv1->queries;
-	      failed_queries += serv1->failed_queries;
-	      nxdomain_replies += serv1->nxdomain_replies;
-	      retrys += serv1->retrys;
-	      sigma_latency += serv1->query_latency;
-	      count_latency++;
-	    }
-	
-	dbus_message_iter_open_container(&server_array, DBUS_TYPE_ARRAY, "{ss}", &dict_array);
-	
-	port = prettyprint_addr(&serv->addr, daemon->namebuff);
-	add_dict_entry(&dict_array, "address", daemon->namebuff);
-	
-	add_dict_int(&dict_array, "port", port);
-	add_dict_int(&dict_array, "queries", queries);
-	add_dict_int(&dict_array, "failed_queries", failed_queries);
-	add_dict_int(&dict_array, "nxdomain", nxdomain_replies);
-	add_dict_int(&dict_array, "retries", retrys);
-	add_dict_int(&dict_array, "latency", sigma_latency/count_latency);
-	
-	dbus_message_iter_close_container(&server_array, &dict_array);
-      }
-  
-  dbus_message_iter_close_container(&server_iter, &server_array);
-  
-  return reply;
-}
-
 DBusHandlerResult message_handler(DBusConnection *connection, 
 				  DBusMessage *message, 
 				  void *user_data)
@@ -831,7 +672,7 @@ DBusHandlerResult message_handler(DBusConnection *connection,
 #endif
  else if (strcmp(method, "SetServers") == 0)
    {
-      reply = dbus_read_servers(message);
+      dbus_read_servers(message);
      new_servers = 1;
    }
  else if (strcmp(method, "SetServersEx") == 0)
@@ -848,46 +689,6 @@ DBusHandlerResult message_handler(DBusConnection *connection,
    {
      reply = dbus_set_bool(message, OPT_FILTER, "filterwin2k");
    }
-  else if (strcmp(method, "SetFilterA") == 0)
-    {
-      static int done = 0;
-      static struct rrlist list = { 0, NULL };
-      dbus_bool_t enabled;
-
-      if (!(reply = dbus_get_bool(message, &enabled, "filter-A")))
-	{
-	  if (!done)
-	    {
-	      done = 1;
-	      list.next = daemon->filter_rr;
-	      daemon->filter_rr = &list;
-	    }
-
-	  list.rr = enabled ? T_A : 0;
-	}
-    }
-  else if (strcmp(method, "SetFilterAAAA") == 0)
-    {
-      static int done = 0;
-      static struct rrlist list = { 0, NULL };
-      dbus_bool_t enabled;
-      
-      if (!(reply = dbus_get_bool(message, &enabled, "filter-AAAA")))
-	{
-	  if (!done)
-	    {
-	      done = 1;
-	      list.next = daemon->filter_rr;
-	      daemon->filter_rr = &list;
-	    }
-	  
-	  list.rr = enabled ? T_AAAA : 0;
-	}
-    }
-  else if (strcmp(method, "SetLocaliseQueriesOption") == 0)
-    {
-      reply = dbus_set_bool(message, OPT_LOCALISE, "localise-queries");
-    }
  else if (strcmp(method, "SetBogusPrivOption") == 0)
    {
      reply = dbus_set_bool(message, OPT_BOGUSPRIV, "bogus-priv");
@@ -906,14 +707,6 @@ DBusHandlerResult message_handler(DBusConnection *connection,
    {
      reply = dbus_get_metrics(message);
    }
-  else if (strcmp(method, "GetServerMetrics") == 0)
-    {
-      reply = dbus_get_server_metrics(message);
-    }
-  else if (strcmp(method, "ClearMetrics") == 0)
-    {
-      clear_metrics();
-    }
  else if (strcmp(method, "ClearCache") == 0)
    clear_cache = 1;
  else
@@ -922,7 +715,7 @@ DBusHandlerResult message_handler(DBusConnection *connection,
  if (new_servers)
    {
      my_syslog(LOG_INFO, _("setting upstream servers from DBus"));
-      check_servers(0);
+      check_servers();
      if (option_bool(OPT_RELOAD))
 	clear_cache = 1;
    }
@@ -930,7 +723,7 @@ DBusHandlerResult message_handler(DBusConnection *connection,
  if (clear_cache)
    clear_cache_and_reload(dnsmasq_time());
  
-  (void)user_data; /* no warning */
+  method = user_data; /* no warning */

  /* If no reply or no error, return nothing */
  if (!reply)
@@ -956,11 +749,8 @@ char *dbus_init(void)

  dbus_error_init (&dbus_error);
  if (!(connection = dbus_bus_get (DBUS_BUS_SYSTEM, &dbus_error)))
-    {
-      dbus_error_free(&dbus_error);
-      return NULL;
-    }
-  
+    return NULL;
+    
  dbus_connection_set_exit_on_disconnect(connection, FALSE);
  dbus_connection_set_watch_functions(connection, add_watch, remove_watch, 
 				      NULL, NULL, NULL);
@@ -994,52 +784,40 @@ void set_dbus_listeners(void)
      {
 	unsigned int flags = dbus_watch_get_flags(w->watch);
 	int fd = dbus_watch_get_unix_fd(w->watch);
-	int poll_flags = POLLERR;
 	
 	if (flags & DBUS_WATCH_READABLE)
-	  poll_flags |= POLLIN;
-	if (flags & DBUS_WATCH_WRITABLE)
-	  poll_flags |= POLLOUT;
+	  poll_listen(fd, POLLIN);
 	
-	poll_listen(fd, poll_flags);
+	if (flags & DBUS_WATCH_WRITABLE)
+	  poll_listen(fd, POLLOUT);
+	
+	poll_listen(fd, POLLERR);
      }
 }

-static int check_dbus_watches()
-{
-  struct watch *w;
-
-  watches_modified = 0;
-  for (w = daemon->watches; w; w = w->next)
-    if (dbus_watch_get_enabled(w->watch))
-      {
-	unsigned int flags = 0;
-	int fd = dbus_watch_get_unix_fd(w->watch);
-	int poll_flags = poll_check(fd, POLLIN|POLLOUT|POLLERR);
-
-	if ((poll_flags & POLLIN) != 0)
-	  flags |= DBUS_WATCH_READABLE;
-	if ((poll_flags & POLLOUT) != 0)
-	  flags |= DBUS_WATCH_WRITABLE;
-	if ((poll_flags & POLLERR) != 0)
-	  flags |= DBUS_WATCH_ERROR;
-
-	if (flags != 0)
-	  {
-	    dbus_watch_handle(w->watch, flags);
-	    if (watches_modified)
-	      return 0;
-	  }
-      }
-
-  return 1;
-}
-
 void check_dbus_listeners()
 {
  DBusConnection *connection = (DBusConnection *)daemon->dbus;
+  struct watch *w;

-  while (!check_dbus_watches()) ;
+  for (w = daemon->watches; w; w = w->next)
+    if (dbus_watch_get_enabled(w->watch))
+      {
+	unsigned int flags = 0;
+	int fd = dbus_watch_get_unix_fd(w->watch);
+	
+	if (poll_check(fd, POLLIN))
+	  flags |= DBUS_WATCH_READABLE;
+	
+	if (poll_check(fd, POLLOUT))
+	  flags |= DBUS_WATCH_WRITABLE;
+	
+	if (poll_check(fd, POLLERR))
+	  flags |= DBUS_WATCH_ERROR;
+
+	if (flags != 0)
+	  dbus_watch_handle(w->watch, flags);
+      }

  if (connection)
    {
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -79,46 +79,13 @@ ssize_t recv_dhcp_packet(int fd, struct msghdr *msg)
  return (msg->msg_flags & MSG_TRUNC) ? -1 : new_sz;
 }

-/* like match_netid() except that the check can have a trailing * for wildcard */
-/* started as a direct copy of match_netid() */
-int match_netid_wild(struct dhcp_netid *check, struct dhcp_netid *pool)
-{
-  struct dhcp_netid *tmp1;
-  
-  for (; check; check = check->next)
-    {
-      const int check_len = strlen(check->net);
-      const int is_wc = (check_len > 0 && check->net[check_len - 1] == '*');
-      
-      /* '#' for not is for backwards compat. */
-      if (check->net[0] != '!' && check->net[0] != '#')
-	{
-	  for (tmp1 = pool; tmp1; tmp1 = tmp1->next)
-	    if (is_wc ? (strncmp(check->net, tmp1->net, check_len-1) == 0) :
-		(strcmp(check->net, tmp1->net) == 0))
-	      break;
-	  if (!tmp1)
-	    return 0;
-	}
-      else
-	for (tmp1 = pool; tmp1; tmp1 = tmp1->next)
-	  if (is_wc ? (strncmp((check->net)+1, tmp1->net, check_len-2) == 0) :
-	      (strcmp((check->net)+1, tmp1->net) == 0))
-	    return 0;
-    }
-  return 1;
-}
-
 struct dhcp_netid *run_tag_if(struct dhcp_netid *tags)
 {
  struct tag_if *exprs;
  struct dhcp_netid_list *list;

-  /* this now uses match_netid_wild() above so that tag_if can
-   * be used to set a 'group of interfaces' tag.
-   */
  for (exprs = daemon->tag_if; exprs; exprs = exprs->next)
-    if (match_netid_wild(exprs->tag, tags))
+    if (match_netid(exprs->tag, tags, 1))
      for (list = exprs->set; list; list = list->next)
 	{
 	  list->list->next = tags;
@@ -128,41 +95,22 @@ struct dhcp_netid *run_tag_if(struct dhcp_netid *tags)
  return tags;
 }

-/* pxemode == 0 -> don't include dhcp-option-pxe options.
-   pxemode == 1 -> do include dhcp-option-pxe options.
-   pxemode == 2 -> include ONLY dhcp-option-pxe options. */
-int pxe_ok(struct dhcp_opt *opt, int pxemode)
-{
-  if (opt->flags & DHOPT_PXE_OPT)
-    {
-      if (pxemode != 0)
-	return 1;
-    }
-  else
-    {
-      if (pxemode != 2)
-	return 1;
-    }
-  
-  return 0;
-}

-struct dhcp_netid *option_filter(struct dhcp_netid *tags, struct dhcp_netid *context_tags, struct dhcp_opt *opts, int pxemode)
+struct dhcp_netid *option_filter(struct dhcp_netid *tags, struct dhcp_netid *context_tags, struct dhcp_opt *opts)
 {
  struct dhcp_netid *tagif = run_tag_if(tags);
  struct dhcp_opt *opt;
  struct dhcp_opt *tmp;  
-  
+
  /* flag options which are valid with the current tag set (sans context tags) */
  for (opt = opts; opt; opt = opt->next)
    {
      opt->flags &= ~DHOPT_TAGOK;
      if (!(opt->flags & (DHOPT_ENCAPSULATE | DHOPT_VENDOR | DHOPT_RFC3925)) &&
-	  match_netid(opt->netid, tagif, 0) &&
-	  pxe_ok(opt, pxemode))
+	  match_netid(opt->netid, tagif, 0))
 	opt->flags |= DHOPT_TAGOK;
    }
-  
+
  /* now flag options which are valid, including the context tags,
     otherwise valid options are inhibited if we found a higher priority one above */
  if (context_tags)
@@ -182,8 +130,7 @@ struct dhcp_netid *option_filter(struct dhcp_netid *tags, struct dhcp_netid *con

      for (opt = opts; opt; opt = opt->next)
 	if (!(opt->flags & (DHOPT_ENCAPSULATE | DHOPT_VENDOR | DHOPT_RFC3925 | DHOPT_TAGOK)) &&
-	    match_netid(opt->netid, tagif, 0) &&
-	    pxe_ok(opt, pxemode))
+	    match_netid(opt->netid, tagif, 0))
 	  {
 	    struct dhcp_opt *tmp;  
 	    for (tmp = opts; tmp; tmp = tmp->next) 
@@ -196,9 +143,7 @@ struct dhcp_netid *option_filter(struct dhcp_netid *tags, struct dhcp_netid *con
  
  /* now flag untagged options which are not overridden by tagged ones */
  for (opt = opts; opt; opt = opt->next)
-    if (!(opt->flags & (DHOPT_ENCAPSULATE | DHOPT_VENDOR | DHOPT_RFC3925 | DHOPT_TAGOK)) &&
-	!opt->netid &&
-	pxe_ok(opt, pxemode))
+    if (!(opt->flags & (DHOPT_ENCAPSULATE | DHOPT_VENDOR | DHOPT_RFC3925 | DHOPT_TAGOK)) && !opt->netid)
      {
 	for (tmp = opts; tmp; tmp = tmp->next) 
 	  if (tmp->opt == opt->opt && (tmp->flags & DHOPT_TAGOK))
@@ -208,7 +153,7 @@ struct dhcp_netid *option_filter(struct dhcp_netid *tags, struct dhcp_netid *con
 	else if (!tmp->netid)
 	  my_syslog(MS_DHCP | LOG_WARNING, _("Ignoring duplicate dhcp-option %d"), tmp->opt); 
      }
-  
+
  /* Finally, eliminate duplicate options later in the chain, and therefore earlier in the config file. */
  for (opt = opts; opt; opt = opt->next)
    if (opt->flags & DHOPT_TAGOK)
@@ -335,29 +280,31 @@ static int is_config_in_context(struct dhcp_context *context, struct dhcp_config
 {
  if (!context) /* called via find_config() from lease_update_from_configs() */
    return 1; 
-
-  if (!(config->flags & (CONFIG_ADDR | CONFIG_ADDR6)))
-    return 1;
  
 #ifdef HAVE_DHCP6
  if (context->flags & CONTEXT_V6)
    {
       struct addrlist *addr_list;

-       if (config->flags & CONFIG_ADDR6)
-	 for (; context; context = context->current)
-	   for (addr_list = config->addr6; addr_list; addr_list = addr_list->next)
-	     {
-	       if ((addr_list->flags & ADDRLIST_WILDCARD) && context->prefix == 64)
-		 return 1;
-	       
-	       if (is_same_net6(&addr_list->addr.addr6, &context->start6, context->prefix))
-		 return 1;
-	     }
+       if (!(config->flags & CONFIG_ADDR6))
+	 return 1;
+       
+        for (; context; context = context->current)
+	  for (addr_list = config->addr6; addr_list; addr_list = addr_list->next)
+	    {
+	      if ((addr_list->flags & ADDRLIST_WILDCARD) && context->prefix == 64)
+		return 1;
+	      
+	      if (is_same_net6(&addr_list->addr.addr6, &context->start6, context->prefix))
+		return 1;
+	    }
    }
  else
 #endif
    {
+      if (!(config->flags & CONFIG_ADDR))
+	return 1;
+      
      for (; context; context = context->current)
 	if ((config->flags & CONFIG_ADDR) && is_same_net(config->addr, context->start, context->netmask))
 	  return 1;
@@ -575,11 +522,11 @@ char *whichdevice(void)
    return NULL;
  
  for (if_tmp = daemon->if_names; if_tmp; if_tmp = if_tmp->next)
-    if (if_tmp->name && (!(if_tmp->flags & INAME_USED) || strchr(if_tmp->name, '*')))
+    if (if_tmp->name && (!if_tmp->used || strchr(if_tmp->name, '*')))
      return NULL;

  for (found = NULL, iface = daemon->interfaces; iface; iface = iface->next)
-    if (iface->dhcp4_ok || iface->dhcp6_ok)
+    if (iface->dhcp_ok)
      {
 	if (!found)
 	  found = iface;
@@ -588,16 +535,12 @@ char *whichdevice(void)
      }

  if (found)
-    {
-      char *ret = safe_malloc(strlen(found->name)+1);
-      strcpy(ret, found->name);
-      return ret;
-    }
-  
+    return found->name;
+
  return NULL;
 }
 
-static int bindtodevice(char *device, int fd)
+void  bindtodevice(char *device, int fd)
 {
  size_t len = strlen(device)+1;
  if (len > IFNAMSIZ)
@@ -605,33 +548,7 @@ static int bindtodevice(char *device, int fd)
  /* only allowed by root. */
  if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, device, len) == -1 &&
      errno != EPERM)
-    return 2;
-  
-  return 1;
-}
-
-int bind_dhcp_devices(char *bound_device)
-{
-  int ret = 0;
-
-  if (bound_device)
-    {
-      if (daemon->dhcp)
-	{
-	  if (!daemon->relay4)
-	    ret |= bindtodevice(bound_device, daemon->dhcpfd);
-	  
-	  if (daemon->enable_pxe && daemon->pxefd != -1)
-	    ret |= bindtodevice(bound_device, daemon->pxefd);
-	}
-      
-#if defined(HAVE_DHCP6)
-      if (daemon->doing_dhcp6 && !daemon->relay6)
-	ret |= bindtodevice(bound_device, daemon->dhcp6fd);
-#endif
-    }
-  
-  return ret;
+    die(_("failed to set SO_BINDTODEVICE on DHCP socket: %s"), NULL, EC_BADNET);
 }
 #endif

@@ -701,16 +618,10 @@ static const struct opttab_t {
  { "user-class", 77, 0 },
  { "rapid-commit", 80, 0 },
  { "FQDN", 81, OT_INTERNAL },
-  { "agent-info", 82, OT_INTERNAL },
-  { "last-transaction", 91, 4 | OT_TIME },
-  { "associated-ip", 92, OT_ADDR_LIST },
+  { "agent-id", 82, OT_INTERNAL },
  { "client-arch", 93, 2 | OT_DEC },
  { "client-interface-id", 94, 0 },
  { "client-machine-id", 97, 0 },
-  { "posix-timezone", 100, OT_NAME }, /* RFC 4833, Sec. 2 */
-  { "tzdb-timezone", 101, OT_NAME }, /* RFC 4833, Sec. 2 */
-  { "ipv6-only", 108, 4 | OT_DEC },  /* RFC 8925 */
-  { "captive-portal", 114, OT_NAME },  /* RFC 8910 */
  { "subnet-select", 118, OT_INTERNAL },
  { "domain-search", 119, OT_RFC1035_NAME },
  { "sip-server", 120, 0 },
@@ -747,12 +658,9 @@ static const struct opttab_t opttab6[] = {
  { "sntp-server", 31,  OT_ADDR_LIST },
  { "information-refresh-time", 32, OT_TIME },
  { "FQDN", 39, OT_INTERNAL | OT_RFC1035_NAME },
-  { "posix-timezone", 41, OT_NAME }, /* RFC 4833, Sec. 3 */
-  { "tzdb-timezone", 42, OT_NAME }, /* RFC 4833, Sec. 3 */
  { "ntp-server", 56, 0 /* OT_ADDR_LIST | OT_RFC1035_NAME */ },
  { "bootfile-url", 59, OT_NAME },
  { "bootfile-param", 60, OT_CSTRING },
-  { "captive-portal", 103, OT_NAME },  /* RFC 8910 */
  { NULL, 0, 0 }
 };
 #endif
@@ -864,7 +772,7 @@ char *option_string(int prot, unsigned int opt, unsigned char *val, int opt_len,
 		for (i = 0, j = 0; i < opt_len && j < buf_len ; i++)
 		  {
 		    char c = val[i];
-		    if (isprint((unsigned char)c))
+		    if (isprint((int)c))
 		      buf[j++] = c;
 		  }
 #ifdef HAVE_DHCP6
@@ -878,11 +786,11 @@ char *option_string(int prot, unsigned int opt, unsigned char *val, int opt_len,
 		    for (k = i + 1; k < opt_len && k < l && j < buf_len ; k++)
 		     {
 		       char c = val[k];
-		       if (isprint((unsigned char)c))
+		       if (isprint((int)c))
 			 buf[j++] = c;
 		     }
 		    i = l;
-		    if (i < opt_len && val[i] != 0 && j < buf_len)
+		    if (val[i] != 0 && j < buf_len)
 		      buf[j++] = '.';
 		  }
 	      }
@@ -892,23 +800,24 @@ char *option_string(int prot, unsigned int opt, unsigned char *val, int opt_len,
 		unsigned char *p;

 		i = 0, j = 0;
-		while (i + 2 <= opt_len)
+		while (1)
 		  {
 		    p = &val[i];
 		    GETSHORT(len, p);
-		    if (i + 2 + len > opt_len)
-		      break; /* malformed: body extends beyond option */
 		    for (k = 0; k < len && j < buf_len; k++)
 		      {
 		       char c = *p++;
-		       if (isprint((unsigned char)c))
+		       if (isprint((int)c))
 			 buf[j++] = c;
 		     }
-		    i += len + 2;
-		    if (i < opt_len && j < buf_len)
+		    i += len +2;
+		    if (i >= opt_len)
+		      break;
+
+		    if (j < buf_len)
 		      buf[j++] = ',';
 		  }
-	      }
+	      }	      
 #endif
 	    else if ((ot[o].size & (OT_DEC | OT_TIME)) && opt_len != 0)
 	      {
@@ -1043,37 +952,12 @@ void log_context(int family, struct dhcp_context *context)

 void log_relay(int family, struct dhcp_relay *relay)
 {
-  int broadcast = relay->server.addr4.s_addr == 0;
  inet_ntop(family, &relay->local, daemon->addrbuff, ADDRSTRLEN);
-  inet_ntop(family, &relay->server, daemon->namebuff, ADDRSTRLEN);
+  inet_ntop(family, &relay->server, daemon->namebuff, ADDRSTRLEN); 

-  if (family == AF_INET && relay->port != DHCP_SERVER_PORT)
-    sprintf(daemon->namebuff + strlen(daemon->namebuff), "#%u", relay->port);
-
-#ifdef HAVE_DHCP6
-  struct in6_addr multicast;
-
-  inet_pton(AF_INET6, ALL_SERVERS, &multicast);
-
-  if (family == AF_INET6)
-    {
-      broadcast = IN6_ARE_ADDR_EQUAL(&relay->server.addr6, &multicast);
-      if (relay->port != DHCPV6_SERVER_PORT)
-	sprintf(daemon->namebuff + strlen(daemon->namebuff), "#%u", relay->port);
-    }
-#endif
-  
-  
  if (relay->interface)
-    {
-      if (broadcast)
-	my_syslog(MS_DHCP | LOG_INFO, _("DHCP relay from %s via %s"), daemon->addrbuff, relay->interface);
-      else if (relay->split_mode)
-	my_syslog(MS_DHCP | LOG_INFO, _("DHCP split-relay from %s to %s via %s"), daemon->addrbuff, daemon->namebuff, relay->interface);
-      else
-	my_syslog(MS_DHCP | LOG_INFO, _("DHCP relay from %s to %s via %s"), daemon->addrbuff, daemon->namebuff, relay->interface);
-    }
-  else 
+    my_syslog(MS_DHCP | LOG_INFO, _("DHCP relay from %s to %s via %s"), daemon->addrbuff, daemon->namebuff, relay->interface);
+  else
    my_syslog(MS_DHCP | LOG_INFO, _("DHCP relay from %s to %s"), daemon->addrbuff, daemon->namebuff);
 }
   
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -57,8 +57,6 @@
 #define OPTION_RAPID_COMMIT      80
 #define OPTION_CLIENT_FQDN       81
 #define OPTION_AGENT_ID          82
-#define OPTION_LAST_TRANSACTION  91
-#define OPTION_ASSOCIATED_IP     92
 #define OPTION_ARCH              93
 #define OPTION_PXE_UUID          97
 #define OPTION_SUBNET_SELECT     118
@@ -66,14 +64,12 @@
 #define OPTION_SIP_SERVER        120
 #define OPTION_VENDOR_IDENT      124
 #define OPTION_VENDOR_IDENT_OPT  125
-#define OPTION_MUD_URL_V4        161
 #define OPTION_END               255

 #define SUBOPT_CIRCUIT_ID        1
 #define SUBOPT_REMOTE_ID         2
 #define SUBOPT_SUBNET_SELECT     5     /* RFC 3527 */
 #define SUBOPT_SUBSCR_ID         6     /* RFC 3393 */
-#define SUBOPT_FLAGS             10    /* RFC 5010 */
 #define SUBOPT_SERVER_OR         11    /* RFC 5107 */

 #define SUBOPT_PXE_BOOT_ITEM     71    /* PXE standard */
@@ -90,11 +86,6 @@
 #define DHCPNAK                  6
 #define DHCPRELEASE              7
 #define DHCPINFORM               8
-#define DHCPFORCERENEW           9
-#define DHCPLEASEQUERY          10
-#define DHCPLEASEUNASSIGNED     11
-#define DHCPLEASEUNKNOWN        12
-#define DHCPLEASEACTIVE         13

 #define BRDBAND_FORUM_IANA       3561 /* Broadband forum IANA enterprise */

@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@

 struct iface_param {
  struct dhcp_context *current;
+  struct dhcp_relay *relay;
+  struct in_addr relay_local;
  int ind;
 };

@@ -32,6 +34,8 @@ static int complete_context(struct in_addr local, int if_index, char *label,
 			    struct in_addr netmask, struct in_addr broadcast, void *vparam);
 static int check_listen_addrs(struct in_addr local, int if_index, char *label,
 			      struct in_addr netmask, struct in_addr broadcast, void *vparam);
+static int relay_upstream4(struct dhcp_relay *relay, struct dhcp_packet *mess, size_t sz, int iface_index);
+static struct dhcp_relay *relay_reply4(struct dhcp_packet *mess, char *arrival_interface);

 static int make_fd(int port)
 {
@@ -133,7 +137,7 @@ void dhcp_packet(time_t now, int pxe_fd)
  struct dhcp_packet *mess;
  struct dhcp_context *context;
  struct dhcp_relay *relay;
-  int is_relay_reply = 0, is_relay_use_source = 0;
+  int is_relay_reply = 0;
  struct iname *tmp;
  struct ifreq ifr;
  struct msghdr msg;
@@ -142,14 +146,13 @@ void dhcp_packet(time_t now, int pxe_fd)
  struct iovec iov;
  ssize_t sz; 
  int iface_index = 0, unicast_dest = 0, is_inform = 0, loopback = 0;
-  int rcvd_iface_index, relay_index;
+  int rcvd_iface_index;
  struct in_addr iface_addr;
  struct iface_param parm;
  time_t recvtime = now;
 #ifdef HAVE_LINUX_NETWORK
  struct arpreq arp_req;
  struct timeval tv;
-  struct in_addr dst_addr;
 #endif
  
  union {
@@ -174,13 +177,11 @@ void dhcp_packet(time_t now, int pxe_fd)
  if ((sz = recv_dhcp_packet(fd, &msg)) == -1 || 
      (sz < (ssize_t)(sizeof(*mess) - sizeof(mess->options)))) 
    return;
-  
-#if defined (HAVE_LINUX_NETWORK)
+    
+  #if defined (HAVE_LINUX_NETWORK)
  if (ioctl(fd, SIOCGSTAMP, &tv) == 0)
    recvtime = tv.tv_sec;

-  dst_addr.s_addr = 0;
-  
  if (msg.msg_controllen >= sizeof(struct cmsghdr))
    for (cmptr = CMSG_FIRSTHDR(&msg); cmptr; cmptr = CMSG_NXTHDR(&msg, cmptr))
      if (cmptr->cmsg_level == IPPROTO_IP && cmptr->cmsg_type == IP_PKTINFO)
@@ -191,8 +192,7 @@ void dhcp_packet(time_t now, int pxe_fd)
 	  } p;
 	  p.c = CMSG_DATA(cmptr);
 	  iface_index = p.p->ipi_ifindex;
-	  dst_addr = p.p->ipi_addr; 
-	  if (dst_addr.s_addr != INADDR_BROADCAST)
+	  if (p.p->ipi_addr.s_addr != INADDR_BROADCAST)
 	    unicast_dest = 1;
 	}

@@ -222,44 +222,12 @@ void dhcp_packet(time_t now, int pxe_fd)
 	  iface_index = *(p.i);
 	}
 #endif
-
-#ifdef HAVE_DUMPFILE
-  union mysockaddr *sockp = NULL;
-  
-#  ifdef HAVE_LINUX_NETWORK
-  union mysockaddr tosock;
-  
-  sockp = &tosock;
-  tosock.in.sin_port = htons(daemon->dhcp_server_port);
-  tosock.in.sin_addr = dst_addr;
-  tosock.sa.sa_family = AF_INET;
-#    ifdef HAVE_SOCKADDR_SA_LEN
-  tosock.in.sin_len = sizeof(struct sockaddr_in);
-#    endif
-#  endif
-  
-  dump_packet_udp(DUMP_DHCP, (void *)daemon->dhcp_packet.iov_base, sz, (union mysockaddr *)&dest, sockp, -1);
-#endif
-  	
+	
  if (!indextoname(daemon->dhcpfd, iface_index, ifr.ifr_name) ||
      ioctl(daemon->dhcpfd, SIOCGIFFLAGS, &ifr) != 0)
    return;
  
  mess = (struct dhcp_packet *)daemon->dhcp_packet.iov_base;
-  
-  /* Non-standard extension:
-     If giaddr == 255.255.255.255 we reply to the source
-     address in the request packet header. This makes
-     stand-alone leasequery clients easier, as they
-     can leave source address determination to the kernel.
-     In this case, set a flag and clear giaddr here,
-     to avoid massive relay confusion. */
-  if (mess->giaddr.s_addr == INADDR_BROADCAST)
-    {
-      mess->giaddr.s_addr = 0;
-      is_relay_use_source = 1;
-    }
-  
  loopback = !mess->giaddr.s_addr && (ifr.ifr_flags & IFF_LOOPBACK);
  
 #ifdef HAVE_LINUX_NETWORK
@@ -302,10 +270,10 @@ void dhcp_packet(time_t now, int pxe_fd)
    unicast_dest = 1;
 #endif
  
-  if ((relay_index = relay_reply4((struct dhcp_packet *)daemon->dhcp_packet.iov_base, (size_t)sz, ifr.ifr_name)))
+  if ((relay = relay_reply4((struct dhcp_packet *)daemon->dhcp_packet.iov_base, ifr.ifr_name)))
    {
      /* Reply from server, using us as relay. */
-      rcvd_iface_index = relay_index;
+      rcvd_iface_index = relay->iface_index;
      if (!indextoname(daemon->dhcpfd, rcvd_iface_index, ifr.ifr_name))
 	return;
      is_relay_reply = 1; 
@@ -327,17 +295,19 @@ void dhcp_packet(time_t now, int pxe_fd)
 	}
      
      for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-	if (tmp->name && (tmp->flags & INAME_4) && wildcard_match(tmp->name, ifr.ifr_name))
+	if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name))
 	  return;
      
-      /* unlinked contexts are marked by context->current == context */
+      /* unlinked contexts/relays are marked by context->current == context */
      for (context = daemon->dhcp; context; context = context->next)
 	context->current = context;
-
+      
      for (relay = daemon->relay4; relay; relay = relay->next)
-	relay->matchcount = 0;
+	relay->current = relay;
      
      parm.current = NULL;
+      parm.relay = NULL;
+      parm.relay_local.s_addr = 0;
      parm.ind = iface_index;
      
      if (!iface_check(AF_INET, (union all_addr *)&iface_addr, ifr.ifr_name, NULL))
@@ -350,7 +320,7 @@ void dhcp_packet(time_t now, int pxe_fd)
 	  match.ind = iface_index;
 	  
 	  if (!daemon->if_addrs ||
-	      !iface_enumerate(AF_INET, &match, (callback_t){.af_inet=check_listen_addrs}) ||
+	      !iface_enumerate(AF_INET, &match, check_listen_addrs) ||
 	      !match.matched)
 	    return;
 	  
@@ -359,20 +329,22 @@ void dhcp_packet(time_t now, int pxe_fd)
 	     there is more than one address on the interface in the same subnet */
 	  complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm);
 	}    
-            
-      if (!iface_enumerate(AF_INET, &parm, (callback_t){.af_inet=complete_context}))
+      
+      if (!iface_enumerate(AF_INET, &parm, complete_context))
+	return;
+
+      /* We're relaying this request */
+      if  (parm.relay_local.s_addr != 0 &&
+	   relay_upstream4(parm.relay, mess, (size_t)sz, iface_index))
 	return;

-      relay_upstream4(iface_addr, iface_index, mess, (size_t)sz, unicast_dest);
-       
      /* May have configured relay, but not DHCP server */
      if (!daemon->dhcp)
 	return;

      lease_prune(NULL, now); /* lose any expired leases */
-      iov.iov_len = dhcp_reply(parm.current, ifr.ifr_name, iface_index, (size_t)sz, now, unicast_dest,
-			       loopback, &is_inform, pxe_fd, iface_addr, recvtime,
-			       is_relay_use_source ? dest.sin_addr : mess->giaddr);
+      iov.iov_len = dhcp_reply(parm.current, ifr.ifr_name, iface_index, (size_t)sz, 
+			       now, unicast_dest, loopback, &is_inform, pxe_fd, iface_addr, recvtime);
      lease_update_file(now);
      lease_update_dns(0);
      
@@ -399,17 +371,11 @@ void dhcp_packet(time_t now, int pxe_fd)
      if (mess->ciaddr.s_addr != 0)
 	dest.sin_addr = mess->ciaddr;
    }
-  else if ((is_relay_use_source || mess->giaddr.s_addr) && !is_relay_reply)
+  else if (mess->giaddr.s_addr && !is_relay_reply)
    {
-      /* Send to BOOTP relay. */
-      if (is_relay_use_source)
-	/* restore as-received value */
-	mess->giaddr.s_addr = INADDR_BROADCAST;
-      else
-	{
-	  dest.sin_addr = mess->giaddr;
-	  dest.sin_port = htons(daemon->dhcp_server_port);
-	}
+      /* Send to BOOTP relay  */
+      dest.sin_port = htons(daemon->dhcp_server_port);
+      dest.sin_addr = mess->giaddr; 
    }
  else if (mess->ciaddr.s_addr)
    {
@@ -431,10 +397,6 @@ void dhcp_packet(time_t now, int pxe_fd)
      struct in_pktinfo *pkt;
      msg.msg_control = control_u.control;
      msg.msg_controllen = sizeof(control_u);
-
-      /* alignment padding passed to the kernel should not be uninitialised. */
-      memset(&control_u, 0, sizeof(control_u));
-
      cmptr = CMSG_FIRSTHDR(&msg);
      pkt = (struct in_pktinfo *)CMSG_DATA(cmptr);
      pkt->ipi_ifindex = rcvd_iface_index;
@@ -493,17 +455,6 @@ void dhcp_packet(time_t now, int pxe_fd)
 #elif defined(HAVE_BSD_NETWORK)
  else 
    {
-#ifdef HAVE_DUMPFILE
-      if (ntohs(mess->flags) & 0x8000)
-        dest.sin_addr.s_addr = INADDR_BROADCAST;
-      else
-        dest.sin_addr = mess->yiaddr;
-      dest.sin_port = htons(daemon->dhcp_client_port);
-      
-      dump_packet_udp(DUMP_DHCP, (void *)iov.iov_base, iov.iov_len, NULL,
-		      (union mysockaddr *)&dest, fd);
-#endif
-      
      send_via_bpf(mess, iov.iov_len, iface_addr, &ifr);
      return;
    }
@@ -512,21 +463,13 @@ void dhcp_packet(time_t now, int pxe_fd)
 #ifdef HAVE_SOLARIS_NETWORK
  setsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &iface_index, sizeof(iface_index));
 #endif
-
-#ifdef HAVE_DUMPFILE
-  dump_packet_udp(DUMP_DHCP, (void *)iov.iov_base, iov.iov_len, NULL,
-		  (union mysockaddr *)&dest, fd);
-#endif
  
  while(retry_send(sendmsg(fd, &msg, 0)));

  /* This can fail when, eg, iptables DROPS destination 255.255.255.255 */
  if (errno != 0)
-    {
-      inet_ntop(AF_INET, &dest.sin_addr, daemon->addrbuff, ADDRSTRLEN);
-      my_syslog(MS_DHCP | LOG_WARNING, _("Error sending DHCP packet to %s: %s"),
-		daemon->addrbuff, strerror(errno));
-    }
+    my_syslog(MS_DHCP | LOG_WARNING, _("Error sending DHCP packet to %s: %s"),
+	      inet_ntoa(dest.sin_addr), strerror(errno));
 }

 /* check against secondary interface addresses */
@@ -578,11 +521,10 @@ static void guess_range_netmask(struct in_addr addr, struct in_addr netmask)
 	    !(is_same_net(addr, context->start, netmask) &&
 	      is_same_net(addr, context->end, netmask)))
 	  {
-	    inet_ntop(AF_INET, &context->start, daemon->dhcp_buff, DHCP_BUFF_SZ);
-	    inet_ntop(AF_INET, &context->end, daemon->dhcp_buff2, DHCP_BUFF_SZ);
-	    inet_ntop(AF_INET, &netmask, daemon->addrbuff, ADDRSTRLEN);
+	    strcpy(daemon->dhcp_buff, inet_ntoa(context->start));
+	    strcpy(daemon->dhcp_buff2, inet_ntoa(context->end));
 	    my_syslog(MS_DHCP | LOG_WARNING, _("DHCP range %s -- %s is not consistent with netmask %s"),
-		      daemon->dhcp_buff, daemon->dhcp_buff2, daemon->addrbuff);
+		      daemon->dhcp_buff, daemon->dhcp_buff2, inet_ntoa(netmask));
 	  }	
 	context->netmask = netmask;
      }
@@ -667,20 +609,14 @@ static int complete_context(struct in_addr local, int if_index, char *label,
    }

  for (relay = daemon->relay4; relay; relay = relay->next)
-    if (!relay->split_mode && relay->local.addr4.s_addr == local.s_addr)
+    if (if_index == param->ind && relay->local.addr4.s_addr == local.s_addr && relay->current == relay &&
+	(param->relay_local.s_addr == 0 || param->relay_local.s_addr == local.s_addr))
      {
-	if (if_index == param->ind)
-	  relay->iface_index = if_index;
-	
-	/* More than one interface with the relay address breaks things. */
-	if (relay->matchcount++ == 1 && !relay->warned)
-	  {
-	    relay->warned = 1;
-	    inet_ntop(AF_INET, &local, daemon->addrbuff, ADDRSTRLEN);
-	    my_syslog(MS_DHCP | LOG_WARNING, _("DHCP relay address %s appears on more than one interface"), daemon->addrbuff);
-	  }
+	relay->current = param->relay;
+	param->relay = relay;
+	param->relay_local = local;	
      }
-  
+
  return 1;
 }
 	  
@@ -696,7 +632,7 @@ struct dhcp_context *address_available(struct dhcp_context *context,
  struct dhcp_context *tmp;

  for (tmp = context; tmp; tmp = tmp->current)
-    if (taddr.s_addr == tmp->router.s_addr)
+    if (taddr.s_addr == context->router.s_addr)
      return NULL;
  
  for (tmp = context; tmp; tmp = tmp->current)
@@ -964,14 +900,14 @@ void dhcp_read_ethers(void)
      
      lineno++;
      
-      while (strlen(buff) > 0 && isspace((unsigned char)buff[strlen(buff)-1]))
+      while (strlen(buff) > 0 && isspace((int)buff[strlen(buff)-1]))
 	buff[strlen(buff)-1] = 0;
      
      if ((*buff == '#') || (*buff == '+') || (*buff == 0))
 	continue;
      
-      for (ip = buff; *ip && !isspace((unsigned char)*ip); ip++);
-      for(; *ip && isspace((unsigned char)*ip); ip++)
+      for (ip = buff; *ip && !isspace((int)*ip); ip++);
+      for(; *ip && isspace((int)*ip); ip++)
 	*ip = 0;
      if (!*ip || parse_hex(buff, hwaddr, ETHER_ADDR_LEN, NULL, NULL) != ETHER_ADDR_LEN)
 	{
@@ -986,7 +922,7 @@ void dhcp_read_ethers(void)
      
      if (!*cp)
 	{
-	  if (inet_pton(AF_INET, ip, &addr.s_addr) < 1)
+	  if ((addr.s_addr = inet_addr(ip)) == (in_addr_t)-1)
 	    {
 	      my_syslog(MS_DHCP | LOG_ERR, _("bad address at %s line %d"), ETHERSFILE, lineno); 
 	      continue;
@@ -1121,4 +1057,74 @@ char *host_from_dns(struct in_addr addr)
  return NULL;
 }

+static int  relay_upstream4(struct dhcp_relay *relay, struct dhcp_packet *mess, size_t sz, int iface_index)
+{
+  /* ->local is same value for all relays on ->current chain */
+  union all_addr from;
+  
+  if (mess->op != BOOTREQUEST)
+    return 0;
+
+  /* source address == relay address */
+  from.addr4 = relay->local.addr4;
+  
+  /* already gatewayed ? */
+  if (mess->giaddr.s_addr)
+    {
+      /* if so check if by us, to stomp on loops. */
+      if (mess->giaddr.s_addr == relay->local.addr4.s_addr)
+	return 1;
+    }
+  else
+    {
+      /* plug in our address */
+      mess->giaddr.s_addr = relay->local.addr4.s_addr;
+    }
+
+  if ((mess->hops++) > 20)
+    return 1;
+
+  for (; relay; relay = relay->current)
+    {
+      union mysockaddr to;
+      
+      to.sa.sa_family = AF_INET;
+      to.in.sin_addr = relay->server.addr4;
+      to.in.sin_port = htons(daemon->dhcp_server_port);
+      
+      send_from(daemon->dhcpfd, 0, (char *)mess, sz, &to, &from, 0);
+      
+      if (option_bool(OPT_LOG_OPTS))
+	{
+	  inet_ntop(AF_INET, &relay->local, daemon->addrbuff, ADDRSTRLEN);
+	  my_syslog(MS_DHCP | LOG_INFO, _("DHCP relay %s -> %s"), daemon->addrbuff, inet_ntoa(relay->server.addr4));
+	}
+      
+      /* Save this for replies */
+      relay->iface_index = iface_index;
+    }
+  
+  return 1;
+}
+
+
+static struct dhcp_relay *relay_reply4(struct dhcp_packet *mess, char *arrival_interface)
+{
+  struct dhcp_relay *relay;
+
+  if (mess->giaddr.s_addr == 0 || mess->op != BOOTREPLY)
+    return NULL;
+
+  for (relay = daemon->relay4; relay; relay = relay->next)
+    {
+      if (mess->giaddr.s_addr == relay->local.addr4.s_addr)
+	{
+	  if (!relay->interface || wildcard_match(relay->interface, arrival_interface))
+	    return relay->iface_index != 0 ? relay : NULL;
+	}
+    }
+  
+  return NULL;	 
+}     
+
 #endif
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -55,15 +55,12 @@
 #define OPTION6_RECONF_ACCEPT   20
 #define OPTION6_DNS_SERVER      23
 #define OPTION6_DOMAIN_SEARCH   24
-#define OPTION6_IA_PD           25
-#define OPTION6_IAPREFIX        26
 #define OPTION6_REFRESH_TIME    32
 #define OPTION6_REMOTE_ID       37
 #define OPTION6_SUBSCRIBER_ID   38
 #define OPTION6_FQDN            39
 #define OPTION6_NTP_SERVER      56
 #define OPTION6_CLIENT_MAC      79
-#define OPTION6_MUD_URL         112

 #define NTP_SUBOPTION_SRV_ADDR  1
 #define NTP_SUBOPTION_MC_ADDR   2
@@ -75,3 +72,4 @@
 #define DHCP6NOBINDING   3
 #define DHCP6NOTONLINK   4
 #define DHCP6USEMULTI    5
+
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,7 +22,8 @@

 struct iface_param {
  struct dhcp_context *current;
-  struct in6_addr fallback, ll_addr, ula_addr;
+  struct dhcp_relay *relay;
+  struct in6_addr fallback, relay_local, ll_addr, ula_addr;
  int ind, addr_match;
 };

@@ -93,7 +94,7 @@ void dhcp6_packet(time_t now)
  struct iface_param parm;
  struct cmsghdr *cmptr;
  struct msghdr msg;
-  uint32_t if_index = 0;
+  int if_index = 0;
  union {
    struct cmsghdr align; /* this ensures alignment */
    char control6[CMSG_SPACE(sizeof(struct in6_pktinfo))];
@@ -104,8 +105,7 @@ void dhcp6_packet(time_t now)
  struct iname *tmp;
  unsigned short port;
  struct in6_addr dst_addr;
-  struct in6_addr all_servers;
-  
+
  memset(&dst_addr, 0, sizeof(dst_addr));

  msg.msg_control = control_u.control6;
@@ -134,42 +134,10 @@ void dhcp6_packet(time_t now)

  if (!indextoname(daemon->dhcp6fd, if_index, ifr.ifr_name))
    return;
-  
-#ifdef HAVE_LINUX_NETWORK
-  /* This works around a possible Linux kernel bug when using interfaces
-     enslaved to a VRF. The scope_id in the source address gets set
-     to the index of the VRF interface, not the slave. Fortunately,
-     the interface index returned by packetinfo is correct so we use
-     that instead. Log this once, so if it triggers in other circumstances
-     we've not anticipated and breaks things, we get some clues. */
-  if (from.sin6_scope_id != if_index)
-    {
-      static int logged = 0;
-      
-      if (!logged)
-	{
-	  my_syslog(MS_DHCP | LOG_WARNING,
-		    _("Working around kernel bug: faulty source address scope for VRF slave %s"),
-		    ifr.ifr_name);
-	  logged = 1;
-	}
-      
-      from.sin6_scope_id = if_index;
-    }
-#endif

-#ifdef HAVE_DUMPFILE
-  dump_packet_udp(DUMP_DHCPV6, (void *)daemon->dhcp_packet.iov_base, sz,
-		  (union mysockaddr *)&from, NULL, daemon->dhcp6fd);
-#endif
-
-  if (relay_reply6(&from, sz, ifr.ifr_name))
+  if ((port = relay_reply6(&from, sz, ifr.ifr_name)) != 0)
    {
-#ifdef HAVE_DUMPFILE
-      dump_packet_udp(DUMP_DHCPV6, (void *)daemon->outpacket.iov_base, save_counter(-1), NULL,
-		      (union mysockaddr *)&from, daemon->dhcp6fd);
-#endif
-      
+      from.sin6_port = htons(port);
      while (retry_send(sendto(daemon->dhcp6fd, daemon->outpacket.iov_base, 
 			       save_counter(-1), 0, (struct sockaddr *)&from, 
 			       sizeof(from))));
@@ -177,24 +145,24 @@ void dhcp6_packet(time_t now)
  else
    {
      struct dhcp_bridge *bridge, *alias;
-      int multicast_dest = 0;
-      
+
      for (tmp = daemon->if_except; tmp; tmp = tmp->next)
 	if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name))
 	  return;
      
      for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
-	if (tmp->name && (tmp->flags & INAME_6) &&
-	    wildcard_match(tmp->name, ifr.ifr_name))
+	if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name))
 	  return;
      
      parm.current = NULL;
+      parm.relay = NULL;
+      memset(&parm.relay_local, 0, IN6ADDRSZ);
      parm.ind = if_index;
      parm.addr_match = 0;
      memset(&parm.fallback, 0, IN6ADDRSZ);
      memset(&parm.ll_addr, 0, IN6ADDRSZ);
      memset(&parm.ula_addr, 0, IN6ADDRSZ);
-      
+
      /* If the interface on which the DHCPv6 request was received is
         an alias of some other interface (as specified by the
         --bridge-interface option), change parm.ind so that we look
@@ -234,33 +202,11 @@ void dhcp6_packet(time_t now)
 	  }

      for (relay = daemon->relay6; relay; relay = relay->next)
-	relay->matchcount = 0;
+	relay->current = relay;
+      
+      if (!iface_enumerate(AF_INET6, &parm, complete_context6))
+	return;

-      inet_pton(AF_INET6, ALL_RELAY_AGENTS_AND_SERVERS, &all_servers);
-      if (IN6_ARE_ADDR_EQUAL(&dst_addr, &all_servers))
-	multicast_dest = 1;
-      
-      inet_pton(AF_INET6, ALL_SERVERS, &all_servers);
-      if (IN6_ARE_ADDR_EQUAL(&dst_addr, &all_servers))
-	multicast_dest = 1;
-      else
-	{
-	  /* Ignore requests sent to the ALL_SERVERS multicast address for relay when
-	     we're listening there for DHCPv6 server reasons. */
-	  if (relay_upstream6(if_index, (size_t)sz, &from.sin6_addr, from.sin6_scope_id, now))
-	    return;
-	}
-      
-      if (!iface_enumerate(AF_INET6, &parm, (callback_t){.af_inet6=complete_context6}))
-	return;
-      
-      /* Check for a relay again after iface_enumerate/complete_context has had
-	 chance to fill in relay->iface_index fields. This handles first time through
-	 and any changes in interface config. */
-      if (!IN6_ARE_ADDR_EQUAL(&dst_addr, &all_servers) &&
-	  relay_upstream6(if_index, (size_t)sz, &from.sin6_addr, from.sin6_scope_id, now))
-	return;
-      
      if (daemon->if_names || daemon->if_addrs)
 	{
 	  
@@ -272,13 +218,26 @@ void dhcp6_packet(time_t now)
 	    return;
 	}
      
+      if (parm.relay)
+	{
+	  /* Ignore requests sent to the ALL_SERVERS multicast address for relay when
+	     we're listening there for DHCPv6 server reasons. */
+	  struct in6_addr all_servers;
+	  
+	  inet_pton(AF_INET6, ALL_SERVERS, &all_servers);
+	  
+	  if (!IN6_ARE_ADDR_EQUAL(&dst_addr, &all_servers))
+	    relay_upstream6(parm.relay, sz, &from.sin6_addr, from.sin6_scope_id, now);
+	  return;
+	}
+      
      /* May have configured relay, but not DHCP server */
      if (!daemon->doing_dhcp6)
 	return;
-      
+
      lease_prune(NULL, now); /* lose any expired leases */
      
-      port = dhcp6_reply(parm.current, multicast_dest, if_index, ifr.ifr_name, &parm.fallback, 
+      port = dhcp6_reply(parm.current, if_index, ifr.ifr_name, &parm.fallback, 
 			 &parm.ll_addr, &parm.ula_addr, sz, &from.sin6_addr, now);
      
      /* The port in the source address of the original request should
@@ -288,16 +247,11 @@ void dhcp6_packet(time_t now)
      if (port != 0)
 	{
 	  from.sin6_port = htons(port);
-	  
-#ifdef HAVE_DUMPFILE
-	  dump_packet_udp(DUMP_DHCPV6, (void *)daemon->outpacket.iov_base, save_counter(-1),
-			  NULL, (union mysockaddr *)&from, daemon->dhcp6fd);
-#endif 
-	  
-	  while (retry_send(sendto(daemon->dhcp6fd, daemon->outpacket.iov_base,
-				   save_counter(-1), 0, (struct sockaddr *)&from, sizeof(from))));
+	  while (retry_send(sendto(daemon->dhcp6fd, daemon->outpacket.iov_base, 
+				   save_counter(-1), 0, (struct sockaddr *)&from, 
+				   sizeof(from))));
 	}
-      
+
      /* These need to be called _after_ we send DHCPv6 packet, since lease_update_file()
 	 may trigger sending an RA packet, which overwrites our buffer. */
      lease_update_file(now);
@@ -338,7 +292,7 @@ void get_client_mac(struct in6_addr *client, int iface, unsigned char *mac, unsi
      if ((maclen = find_mac(&addr, mac, 0, now)) != 0)
 	break;
 	  
-      while(retry_send(sendto(daemon->icmp6fd, &neigh, sizeof(neigh), 0, &addr.sa, sizeof(addr))));
+      sendto(daemon->icmp6fd, &neigh, sizeof(neigh), 0, &addr.sa, sizeof(addr));
      
      ts.tv_sec = 0;
      ts.tv_nsec = 100000000; /* 100ms */
@@ -358,7 +312,6 @@ static int complete_context6(struct in6_addr *local,  int prefix,
  struct dhcp_relay *relay;
  struct iface_param *param = vparam;
  struct iname *tmp;
-  int match = !daemon->if_addrs;
 
  (void)scope; /* warning */
  
@@ -380,7 +333,7 @@ static int complete_context6(struct in6_addr *local,  int prefix,
  for (tmp = daemon->if_addrs; tmp; tmp = tmp->next)
    if (tmp->addr.sa.sa_family == AF_INET6 &&
 	IN6_ARE_ADDR_EQUAL(&tmp->addr.in6.sin6_addr, local))
-      match = param->addr_match = 1;
+      param->addr_match = 1;
  
  /* Determine a globally address on the arrival interface, even
     if we have no matching dhcp-context, because we're only
@@ -452,22 +405,16 @@ static int complete_context6(struct in6_addr *local,  int prefix,
 	      }
 	  }      
      }
-  
-  if (match)
-    for (relay = daemon->relay6; relay; relay = relay->next)
-      if (IN6_ARE_ADDR_EQUAL(local, &relay->local.addr6))
-	{
-	  relay->iface_index = if_index;

-	  /* More than one interface with the relay address breaks things. */
-	  if (relay->matchcount++ == 1 && !relay->warned)
-	    {
-	      relay->warned = 1;
-	      inet_ntop(AF_INET6, &local, daemon->addrbuff, ADDRSTRLEN);
-	      my_syslog(MS_DHCP | LOG_WARNING, _("DHCP relay address %s appears on more than one interface"), daemon->addrbuff);
-	    }
-	}
-  
+  for (relay = daemon->relay6; relay; relay = relay->next)
+    if (IN6_ARE_ADDR_EQUAL(local, &relay->local.addr6) && relay->current == relay &&
+	(IN6_IS_ADDR_UNSPECIFIED(&param->relay_local) || IN6_ARE_ADDR_EQUAL(local, &param->relay_local)))
+      {
+	relay->current = param->relay;
+	param->relay = relay;
+	param->relay_local = *local;
+      }
+     
  return 1;
 }

@@ -639,7 +586,7 @@ void make_duid(time_t now)
 	newnow = now - 946684800;
 #endif      
      
-      iface_enumerate(AF_LOCAL, &newnow, (callback_t){.af_local=make_duid1});
+      iface_enumerate(AF_LOCAL, &newnow, make_duid1);
      
      if(!daemon->duid)
 	die("Cannot create DHCPv6 server DUID: %s", NULL, EC_MISC);
@@ -689,7 +636,7 @@ struct cparam {

 static int construct_worker(struct in6_addr *local, int prefix, 
 			    int scope, int if_index, int flags, 
-			    unsigned int preferred, unsigned int valid, void *vparam)
+			    int preferred, int valid, void *vparam)
 {
  char ifrn_name[IFNAMSIZ];
  struct in6_addr start6, end6;
@@ -823,7 +770,7 @@ void dhcp_construct_contexts(time_t now)
    if (context->flags & CONTEXT_CONSTRUCTED)
      context->flags |= CONTEXT_GC;
   
-  iface_enumerate(AF_INET6, &param, (callback_t){.af_inet6=construct_worker});
+  iface_enumerate(AF_INET6, &param, construct_worker);

  for (up = &daemon->dhcp6, context = daemon->dhcp6; context; context = tmp)
    {
@@ -834,7 +781,7 @@ void dhcp_construct_contexts(time_t now)
 	{
 	  if ((context->flags & CONTEXT_RA) || option_bool(OPT_RA))
 	    {
-	      /* previously constructed context has gone; advertise its demise */
+	      /* previously constructed context has gone. advertise it's demise */
 	      context->flags |= CONTEXT_OLD;
 	      context->address_lost_time = now;
 	      /* Apply same ceiling of configured lease time as in radv.c */
@@ -878,4 +825,6 @@ void dhcp_construct_contexts(time_t now)
    }
 }

-#endif /* HAVE_DHCP6 */
+#endif
+
+
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -80,45 +80,8 @@

 #define EDNS0_OPTION_MAC            65001 /* dyndns.org temporary assignment */
 #define EDNS0_OPTION_CLIENT_SUBNET  8     /* IANA */
-#define EDNS0_OPTION_EDE            15    /* IANA - RFC 8914 */
 #define EDNS0_OPTION_NOMDEVICEID    65073 /* Nominum temporary assignment */
 #define EDNS0_OPTION_NOMCPEID       65074 /* Nominum temporary assignment */
-#define EDNS0_OPTION_UMBRELLA       20292 /* Cisco Umbrella temporary assignment */
-
-/* RFC-8914 extended errors, negative values are our definitions */
-#define EDE_US_SERVFAIL    -2  /* SERVFAIL from usptream */
-#define EDE_UNSET          -1  /* No extended DNS error available */
-#define EDE_OTHER           0  /* Other */
-#define EDE_USUPDNSKEY      1  /* Unsupported DNSKEY algo */
-#define EDE_USUPDS          2  /* Unsupported DS Digest */
-#define EDE_STALE           3  /* Stale answer */
-#define EDE_FORGED          4  /* Forged answer */
-#define EDE_DNSSEC_IND      5  /* DNSSEC Indeterminate  */
-#define EDE_DNSSEC_BOGUS    6  /* DNSSEC Bogus */
-#define EDE_SIG_EXP         7  /* Signature Expired */
-#define EDE_SIG_NYV         8  /* Signature Not Yet Valid  */
-#define EDE_NO_DNSKEY       9  /* DNSKEY missing */
-#define EDE_NO_RRSIG       10  /* RRSIGs missing */
-#define EDE_NO_ZONEKEY     11  /* No Zone Key Bit Set */
-#define EDE_NO_NSEC        12  /* NSEC Missing  */
-#define EDE_CACHED_ERR     13  /* Cached Error */
-#define EDE_NOT_READY      14  /* Not Ready */
-#define EDE_BLOCKED        15  /* Blocked */
-#define EDE_CENSORED       16  /* Censored */
-#define EDE_FILTERED       17  /* Filtered */
-#define EDE_PROHIBITED     18  /* Prohibited */
-#define EDE_STALE_NXD      19  /* Stale NXDOMAIN */
-#define EDE_NOT_AUTH       20  /* Not Authoritative */
-#define EDE_NOT_SUP        21  /* Not Supported */
-#define EDE_NO_AUTH        22  /* No Reachable Authority */
-#define EDE_NETERR         23  /* Network error */
-#define EDE_INVALID_DATA   24  /* Invalid Data */
-#define EDE_SIG_E_B_V      25  /* Signature Expired before Valid */
-#define EDE_TOO_EARLY      26  /* To Early */
-#define EDE_UNS_NS3_ITER   27  /* Unsupported NSEC3 Iterations Value */
-#define EDE_UNABLE_POLICY  28  /* Unable to conform to policy */
-#define EDE_SYNTHESIZED    29  /* Synthesized */
-

 struct dns_header {
  u16 id;
@@ -143,15 +106,15 @@ struct dns_header {
 #define RCODE(x)           ((x)->hb4 & HB4_RCODE)
 #define SET_RCODE(x, code) (x)->hb4 = ((x)->hb4 & ~HB4_RCODE) | code
  
-#define GETSHORT(s, cp) do { \
+#define GETSHORT(s, cp) { \
 	unsigned char *t_cp = (unsigned char *)(cp); \
 	(s) = ((u16)t_cp[0] << 8) \
 	    | ((u16)t_cp[1]) \
 	    ; \
 	(cp) += 2; \
-  } while(0)
+}

-#define GETLONG(l, cp) do { \
+#define GETLONG(l, cp) { \
 	unsigned char *t_cp = (unsigned char *)(cp); \
 	(l) = ((u32)t_cp[0] << 24) \
 	    | ((u32)t_cp[1] << 16) \
@@ -159,17 +122,17 @@ struct dns_header {
 	    | ((u32)t_cp[3]) \
 	    ; \
 	(cp) += 4; \
-  } while (0)
+}

-#define PUTSHORT(s, cp) do { \
+#define PUTSHORT(s, cp) { \
 	u16 t_s = (u16)(s); \
 	unsigned char *t_cp = (unsigned char *)(cp); \
 	*t_cp++ = t_s >> 8; \
 	*t_cp   = t_s; \
 	(cp) += 2; \
-  } while(0)
+}

-#define PUTLONG(l, cp) do { \
+#define PUTLONG(l, cp) { \
 	u32 t_l = (u32)(l); \
 	unsigned char *t_cp = (unsigned char *)(cp); \
 	*t_cp++ = t_l >> 24; \
@@ -177,7 +140,7 @@ struct dns_header {
 	*t_cp++ = t_l >> 8; \
 	*t_cp   = t_l; \
 	(cp) += 4; \
-  } while (0)
+}

 #define CHECK_LEN(header, pp, plen, len) \
    ((size_t)((pp) - (unsigned char *)(header) + (len)) <= (plen))
@@ -1,780 +0,0 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991, or
-   (at your option) version 3 dated 29 June, 2007.
- 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-     
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "dnsmasq.h"
-
-static int order(char *qdomain, size_t qlen, struct server *serv);
-static int order_qsort(const void *a, const void *b);
-static int order_servers(struct server *s, struct server *s2);
-
-/* If the server is USE_RESOLV or LITERAL_ADDRESS, it lives on the local_domains chain. */
-#define SERV_IS_LOCAL (SERV_USE_RESOLV | SERV_LITERAL_ADDRESS)
-
-void build_server_array(void)
-{
-  struct server *serv;
-  int count = 0;
-  
-  for (serv = daemon->servers; serv; serv = serv->next)
-#ifdef HAVE_LOOP
-    if (!(serv->flags & SERV_LOOP))
-#endif
-      {
-	count++;
-	if (serv->flags & SERV_WILDCARD)
-	  daemon->server_has_wildcard = 1;
-      }
-  
-  for (serv = daemon->local_domains; serv; serv = serv->next)
-    {
-      count++;
-      if (serv->flags & SERV_WILDCARD)
-	daemon->server_has_wildcard = 1;
-    }
-  
-  daemon->serverarraysz = count;
-
-  if (count > daemon->serverarrayhwm)
-    {
-      struct server **new;
-
-      count += 10; /* A few extra without re-allocating. */
-
-      if ((new = whine_malloc(count * sizeof(struct server *))))
-	{
-	  if (daemon->serverarray)
-	    free(daemon->serverarray);
-	  
-	  daemon->serverarray = new;
-	  daemon->serverarrayhwm = count;
-	}
-    }
-
-  count = 0;
-  
-  for (serv = daemon->servers; serv; serv = serv->next)
-#ifdef HAVE_LOOP
-    if (!(serv->flags & SERV_LOOP))
-#endif
-      {
-	daemon->serverarray[count] = serv;
-	serv->serial = count;
-	serv->last_server = -1;
-	count++;
-      }
-  
-  for (serv = daemon->local_domains; serv; serv = serv->next, count++)
-    daemon->serverarray[count] = serv;
-  
-  /* serverarray may be unallocated if we have no servers yet. */
-  if (daemon->serverarray)
-    qsort(daemon->serverarray, daemon->serverarraysz, sizeof(struct server *), order_qsort);
-  
-  /* servers need the location in the array to find all the whole
-     set of equivalent servers from a pointer to a single one. */
-  for (count = 0; count < daemon->serverarraysz; count++)
-    if (!(daemon->serverarray[count]->flags & SERV_IS_LOCAL))
-      daemon->serverarray[count]->arrayposn = count;
-}
-
-/* we're looking for the server whose domain is the longest exact match
-   to the RH end of qdomain, or a local address if the flags match.
-   Add '.' to the LHS of the query string so
-   server=/.example.com/ works.
-
-   A flag of F_SERVER returns an upstream server only.
-   A flag of F_DNSSECOK disables NODOTS servers from consideration.
-   A flag of F_DS returns parent domain server.
-   A flag of F_DOMAINSRV returns a domain-specific server only.
-   A flag of F_CONFIG returns anything that generates a local
-   reply of IPv4 or IPV6.
-   return 0 if nothing found, 1 otherwise.
-*/
-int lookup_domain(char *domain, int flags, int *lowout, int *highout)
-{
-  int rc, crop_query, nodots;
-  ssize_t qlen;
-  int try, high, low = 0;
-  int nlow = 0, nhigh = 0;
-  char *cp, *qdomain;
-  
-  /* may be no configured servers. */
-  if (daemon->serverarraysz == 0)
-    return 0;
-
-  /* DS records should come from the parent domain. */
-  if (flags & F_DS)
-    {
-      if ((cp = strchr(domain, '.')))
-	domain = cp+1;
-      else
-	domain = "";
-    }
-  
-  qdomain = domain;
-
-  /* find query length and presence of '.' */
-  for (cp = qdomain, nodots = 1, qlen = 0; *cp; qlen++, cp++)
-    if (*cp == '.')
-      nodots = 0;
-
-  /* Handle empty name, and searches for DNSSEC queries without
-     diverting to NODOTS servers. */
-  if (qlen == 0 || flags & F_DNSSECOK)
-    nodots = 0;
-
-  /* Search shorter and shorter RHS substrings for a match */
-  while (qlen >= 0)
-    {
-      /* Note that when we chop off a label, all the possible matches
-	 MUST be at a larger index than the nearest failing match with one more
-	 character, since the array is sorted longest to smallest. Hence 
-	 we don't reset low to zero here, we can go further below and crop the 
-	 search string to the size of the largest remaining server
-	 when this match fails. */
-      high = daemon->serverarraysz;
-      crop_query = 1;
-      
-      /* binary search */
-      while (1) 
-	{
-	  try = (low + high)/2;
-
-	  if ((rc = order(qdomain, qlen, daemon->serverarray[try])) == 0)
-	    break;
-	  
-	  if (rc < 0)
-	    {
-	      if (high == try)
-		{
-		  /* qdomain is longer or same length as longest domain, and try == 0 
-		     crop the query to the longest domain. */
-		  crop_query = qlen - daemon->serverarray[try]->domain_len;
-		  break;
-		}
-	      high = try;
-	    }
-	  else
-	    {
-	      if (low == try)
-		{
-		  /* try now points to the last domain that sorts before the query, so 
-		     we know that a substring of the query shorter than it is required to match, so
-		     find the largest domain that's shorter than try. Note that just going to
-		     try+1 is not optimal, consider searching bbb in (aaa,ccc,bb). try will point
-		     to aaa, since ccc sorts after bbb, but the first domain that has a chance to 
-		     match is bb. So find the length of the first domain later than try which is
-		     is shorter than it. 
-		     There's a nasty edge case when qdomain sorts before _any_ of the 
-		     server domains, where try _doesn't point_ to the last domain that sorts
-		     before the query, since no such domain exists. In that case, the loop 
-		     exits via the rc < 0 && high == try path above and this code is
-		     not executed. */
-		  ssize_t len, old = daemon->serverarray[try]->domain_len;
-		  while (++try != daemon->serverarraysz)
-		    {
-		      if (old != (len = daemon->serverarray[try]->domain_len))
-			{
-			  crop_query = qlen - len;
-			  break;
-			}
-		    }
-		  break;
-		}
-	      low = try;
-	    }
-	};
-      
-      if (rc == 0)
-	{
-	  int found = 1;
-
-	  if (daemon->server_has_wildcard)
-	    {
-	      /* if we have example.com and *example.com we need to check against *example.com, 
-		 but the binary search may have found either. Use the fact that example.com is sorted before *example.com
-		 We favour example.com in the case that both match (ie www.example.com) */
-	      while (try != 0 && order(qdomain, qlen, daemon->serverarray[try-1]) == 0)
-		try--;
-	      
-	      if (!(qdomain == domain || *qdomain == 0 || *(qdomain-1) == '.'))
-		{
-		  while (try < daemon->serverarraysz-1 && order(qdomain, qlen, daemon->serverarray[try+1]) == 0)
-		    try++;
-		  
-		  if (!(daemon->serverarray[try]->flags & SERV_WILDCARD))
-		     found = 0;
-		}
-	    }
-	  
-	  if (found && filter_servers(try, flags, &nlow, &nhigh))
-	    /* We have a match, but it may only be (say) an IPv6 address, and
-	       if the query wasn't for an AAAA record, it's no good, and we need
-	       to continue generalising */
-	    {
-	      /* We've matched a setting which says to use servers without a domain.
-		 Continue the search with empty query. We set the F_SERVER flag
-		 so that --address=/#/... doesn't match. */
-	      if (daemon->serverarray[nlow]->flags & SERV_USE_RESOLV)
-		{
-		  crop_query = qlen;
-		  flags |= F_SERVER;
-		}
-	      else
-		break;
-	    }
-	}
-      
-      /* crop_query must be at least one always. */
-      if (crop_query == 0)
-	crop_query = 1;
-
-      /* strip chars off the query based on the largest possible remaining match,
-	 then continue to the start of the next label unless we have a wildcard
-	 domain somewhere, in which case we have to go one at a time. */
-      qlen -= crop_query;
-      qdomain += crop_query;
-      if (!daemon->server_has_wildcard)
-	while (qlen > 0 &&  (*(qdomain-1) != '.'))
-	  qlen--, qdomain++;
-    }
-
-  /* domain has no dots, and we have at least one server configured to handle such,
-     These servers always sort to the very end of the array. 
-     A configured server eg server=/lan/ will take precdence. */
-  if (nodots &&
-      (daemon->serverarray[daemon->serverarraysz-1]->flags & SERV_FOR_NODOTS) &&
-      (nlow == nhigh || daemon->serverarray[nlow]->domain_len == 0))
-    {
-      filter_servers(daemon->serverarraysz-1, flags, &nlow, &nhigh);
-      qlen = 0;
-    }
-  
-  if (lowout)
-    *lowout = nlow;
-  
-  if (highout)
-    *highout = nhigh;
-
-  /* qlen == -1 when we failed to match even an empty query, if there are no default servers. */
-  if (nlow == nhigh || qlen == -1)
-    return 0;
-  
-  return 1;
-}
-
-int server_samegroup(struct server *a, struct server *b)
-{
-  return order_servers(a, b) == 0;
-}
-
-int filter_servers(int seed, int flags, int *lowout, int *highout)
-{
-  int nlow = seed, nhigh = seed;
-  int i;
-  
-  /* expand nlow and nhigh to cover all the records with the same domain 
-     nlow is the first, nhigh - 1 is the last. nlow=nhigh means no servers,
-     which can happen below. */
-  while (nlow > 0 && order_servers(daemon->serverarray[nlow-1], daemon->serverarray[nlow]) == 0)
-    nlow--;
-  
-  while (nhigh < daemon->serverarraysz-1 && order_servers(daemon->serverarray[nhigh], daemon->serverarray[nhigh+1]) == 0)
-    nhigh++;
-  
-  nhigh++;
-  
-#define SERV_LOCAL_ADDRESS (SERV_6ADDR | SERV_4ADDR | SERV_ALL_ZEROS)
-  
-  if (flags & F_CONFIG)
-    {
-      /* We're just lookin for any matches that return an RR. */
-      for (i = nlow; i < nhigh; i++)
-	if (daemon->serverarray[i]->flags & SERV_LOCAL_ADDRESS)
-	  break;
-      
-      /* failed, return failure. */
-      if (i == nhigh)
-	nhigh = nlow;
-    }
-  else
-    {
-      /* Now the matching server records are all between low and high.
-	 order_qsort() ensures that they are in the order
-	 IPv6 addr, IPv4 addr, return zero for both, no-data return,
-	 "use resolvconf" servers, domain-specific upstream servers.
-	 
-	 See which of those match our query in that priority order and narrow (low, high) */
-
-      for (i = nlow; i < nhigh && (daemon->serverarray[i]->flags & SERV_6ADDR); i++);
-      
-      if (!(flags & F_SERVER) && i != nlow && (flags & F_IPV6))
-	nhigh = i;
-      else
-	{
-	  nlow = i;
-	  
-	  for (i = nlow; i < nhigh && (daemon->serverarray[i]->flags & SERV_4ADDR); i++);
-	  
-	  if (!(flags & F_SERVER) && i != nlow && (flags & F_IPV4))
-	    nhigh = i;
-	  else
-	    {
-	      nlow = i;
-	      
-	      for (i = nlow; i < nhigh && (daemon->serverarray[i]->flags & SERV_ALL_ZEROS); i++);
-	      
-	      if (!(flags & F_SERVER) && i != nlow && (flags & (F_IPV4 | F_IPV6)))
-		nhigh = i;
-	      else
-		{
-		  nlow = i;
-		  
-		  /* now look for a NXDOMAIN answer  --local=/domain/ */
-		  for (i = nlow; i < nhigh && (daemon->serverarray[i]->flags & SERV_LITERAL_ADDRESS); i++);
-		  
-		  if (!(flags & (F_DOMAINSRV | F_SERVER)) && i != nlow)
-		    nhigh = i;
-		  else
-		    {
-		      nlow = i;
-		  
-		      /* return "use resolv.conf servers" if they exist */
-		      for (i = nlow; i < nhigh && (daemon->serverarray[i]->flags & SERV_USE_RESOLV); i++);
-		      
-		      if (i != nlow)
-			nhigh = i;
-		      else
-			{
-			  /* If we want a server for a particular domain, and this one isn't, return nothing. */
-			  if (nlow < daemon->serverarraysz && nlow != nhigh && (flags & F_DOMAINSRV) &&
-			      daemon->serverarray[nlow]->domain_len == 0 && !(daemon->serverarray[nlow]->flags & SERV_FOR_NODOTS))
-			    nlow = nhigh;
-			}
-		    }
-		}
-	    }
-	}
-    }
-
-  *lowout = nlow;
-  *highout = nhigh;
-  
-  return (nlow != nhigh);
-}
-
-int is_local_answer(time_t now, int first, char *name)
-{
-  int flags = 0;
-  int rc = 0;
-  
-  if ((flags = daemon->serverarray[first]->flags) & SERV_LITERAL_ADDRESS)
-    {
-      if (flags & SERV_4ADDR)
-	rc = F_IPV4;
-      else if (flags & SERV_6ADDR)
-	rc = F_IPV6;
-      else if (flags & SERV_ALL_ZEROS)
-	rc = F_IPV4 | F_IPV6;
-      else
-	{
-	  /* argument first is the first struct server which matches the query type;
-	     now roll back to the server which is just the same domain, to check if that 
-	     provides an answer of a different type. */
-
-	  for (;first > 0 && order_servers(daemon->serverarray[first-1], daemon->serverarray[first]) == 0; first--);
-	  
-	  if ((daemon->serverarray[first]->flags & SERV_LOCAL_ADDRESS) ||
-	      check_for_local_domain(name, now))
-	    rc = F_NOERR;
-	  else
-	    rc = F_NXDOMAIN;
-	}
-    }
-
-  return rc;
-}
-
-size_t make_local_answer(int flags, int gotname, size_t size, struct dns_header *header, char *name, char *limit, int first, int last, int ede)
-{
-  int trunc = 0, anscount = 0;
-  unsigned char *p;
-  int start;
-  union all_addr addr;
-  
-  setup_reply(header, flags, ede);
-
-  gotname &= ~(F_QUERY | F_DS);
-  
-  if (flags & (F_NXDOMAIN | F_NOERR))
-    log_query(flags | gotname | F_NEG | F_CONFIG | F_FORWARD, name, NULL, NULL, 0);
-
-  if (flags & F_RCODE)
-     {
-       union all_addr a;
-       a.log.rcode = RCODE(header);
-       a.log.ede = ede;
-       log_query(F_UPSTREAM | F_RCODE, "opcode", &a, NULL, 0);
-     }
-  
-  if (!(p = skip_questions(header, size)))
-    return 0;
-	  
-  if (flags & gotname & F_IPV4)
-    for (start = first; start != last; start++)
-      {
-	struct serv_addr4 *srv = (struct serv_addr4 *)daemon->serverarray[start];
-
-	if (srv->flags & SERV_ALL_ZEROS)
-	  memset(&addr, 0, sizeof(addr));
-	else
-	  addr.addr4 = srv->addr;
-	
-	if (add_resource_record(header, limit, &trunc, sizeof(struct dns_header), &p, daemon->local_ttl, NULL, T_A, C_IN, "4", &addr))
-	  anscount++;
-	log_query((flags | F_CONFIG | F_FORWARD) & ~F_IPV6, name, (union all_addr *)&addr, NULL, 0);
-      }
-  
-  if (flags & gotname & F_IPV6)
-    for (start = first; start != last; start++)
-      {
-	struct serv_addr6 *srv = (struct serv_addr6 *)daemon->serverarray[start];
-
-	if (srv->flags & SERV_ALL_ZEROS)
-	  memset(&addr, 0, sizeof(addr));
-	else
-	  addr.addr6 = srv->addr;
-	
-	if (add_resource_record(header, limit, &trunc, sizeof(struct dns_header), &p, daemon->local_ttl, NULL, T_AAAA, C_IN, "6", &addr))
-	  anscount++;
-	log_query((flags | F_CONFIG | F_FORWARD) & ~F_IPV4, name, (union all_addr *)&addr, NULL, 0);
-      }
-
-  if (trunc)
-    {
-      header->hb3 |= HB3_TC;
-      if (!(p = skip_questions(header, size)))
-	return 0; /* bad packet */
-      anscount  = 0;
-    }
-  
-  header->ancount = htons(anscount);
-  
-  return p - (unsigned char *)header;
-}
-
-#ifdef HAVE_DNSSEC
-int dnssec_server(struct server *server, char *keyname, int is_ds, int *firstp, int *lastp)
-{
-  int first, last, index;
-  
-  /* Find server to send DNSSEC query to. This will normally be the 
-     same as for the original query, but may be another if
-     servers for domains are involved. */		      
-  if (!lookup_domain(keyname, F_SERVER | F_DNSSECOK | (is_ds ? F_DS : 0), &first, &last))
-    return -1;
-
-  for (index = first; index != last; index++)
-    if (daemon->serverarray[index] == server)
-      break;
-	      
-  /* No match to server used for original query.
-     Use newly looked up set. */
-  if (index == last)
-    index =  daemon->serverarray[first]->last_server == -1 ?
-      first : daemon->serverarray[first]->last_server;
-
-  if (firstp)
-    *firstp = first;
-
-  if (lastp)
-    *lastp = last;
-   
-  return index;
-}
-#endif
-
-/* order by size, then by dictionary order */
-static int order(char *qdomain, size_t qlen, struct server *serv)
-{
-  size_t dlen = 0;
-    
-  /* servers for dotless names always sort last 
-     searched for name is never dotless. */
-  if (serv->flags & SERV_FOR_NODOTS)
-    return -1;
-
-  dlen = serv->domain_len;
-  
-  if (qlen < dlen)
-    return 1;
-  
-  if (qlen > dlen)
-    return -1;
-
-  return hostname_order(qdomain, serv->domain);
-}
-
-static int order_servers(struct server *s1, struct server *s2)
-{
-  int rc;
-
-  /* need full comparison of dotless servers in 
-     order_qsort() and filter_servers() */
-
-  if (s1->flags & SERV_FOR_NODOTS)
-     return (s2->flags & SERV_FOR_NODOTS) ? 0 : 1;
-   
-  if ((rc = order(s1->domain, s1->domain_len, s2)) != 0)
-    return rc;
-
-  /* For identical domains, sort wildcard ones first */
-  if (s1->flags & SERV_WILDCARD)
-    return (s2->flags & SERV_WILDCARD) ? 0 : 1;
-
-  return (s2->flags & SERV_WILDCARD) ? -1 : 0;
-}
-  
-static int order_qsort(const void *a, const void *b)
-{
-  int rc;
-  
-  struct server *s1 = *((struct server **)a);
-  struct server *s2 = *((struct server **)b);
-  
-  rc = order_servers(s1, s2);
-
-  /* Sort all literal NODATA and local IPV4 or IPV6 responses together,
-     in a very specific order  IPv6 literal, IPv4 literal, all-zero literal,
-     NXDOMAIN literal. We also include SERV_USE_RESOLV in this, so that
-     use-standard servers sort before ordinary servers. (SERV_USR_RESOLV set
-     implies that none of SERV_LITERAL_ADDRESS,SERV_4ADDR,SERV_6ADDR,SERV_ALL_ZEROS
-     are set) */
-  if (rc == 0)
-    rc = ((s2->flags & (SERV_LITERAL_ADDRESS | SERV_4ADDR | SERV_6ADDR | SERV_ALL_ZEROS | SERV_USE_RESOLV))) -
-      ((s1->flags & (SERV_LITERAL_ADDRESS | SERV_4ADDR | SERV_6ADDR | SERV_ALL_ZEROS | SERV_USE_RESOLV)));
-
-  /* Finally, order by appearance in /etc/resolv.conf etc, for --strict-order */
-  if (rc == 0)
-    if (!(s1->flags & SERV_IS_LOCAL) && !(s2->flags & SERV_IS_LOCAL))
-      rc = s1->serial - s2->serial;
-  
-  return rc;
-}
-
-
-/* When loading large numbers of server=.... lines during startup,
-   there's no possibility that there will be server records that can be reused, but
-   searching a long list for each server added grows as O(n^2) and slows things down.
-   This flag is set only if is known there may be free server records that can be reused.
-   There's a call to mark_servers(0) in read_opts() to reset the flag before
-   main config read. */
-
-static int maybe_free_servers = 0;
-
-/* Must be called before  add_update_server() to set daemon->servers_tail */
-void mark_servers(int flag)
-{
-  struct server *serv, *next, **up;
-
-  maybe_free_servers = !!flag;
-  
-  daemon->servers_tail = NULL;
-  
-  /* mark everything with argument flag */
-  for (serv = daemon->servers; serv; serv = serv->next)
-    {
-      if (serv->flags & flag)
-	serv->flags |= SERV_MARK;
-      else
-	serv->flags &= ~SERV_MARK;
-
-      daemon->servers_tail = serv;
-    }
-  
-  /* --address etc is different: since they are expected to be 
-     1) numerous and 2) not reloaded often. We just delete 
-     and recreate. */
-  if (flag)
-    for (serv = daemon->local_domains, up = &daemon->local_domains; serv; serv = next)
-      {
-	next = serv->next;
-
-	if (serv->flags & flag)
-	  {
-	    *up = next;
-	    free(serv->domain);
-	    free(serv);
-	  }
-	else 
-	  up = &serv->next;
-      }
-}
-
-void cleanup_servers(void)
-{
-  struct server *serv, *tmp, **up;
-
-  /* unlink and free anything still marked. */
-  for (serv = daemon->servers, up = &daemon->servers, daemon->servers_tail = NULL; serv; serv = tmp) 
-    {
-      tmp = serv->next;
-      if (serv->flags & SERV_MARK)
-       {
-         server_gone(serv);
-         *up = serv->next;
-	 free(serv->domain);
-	 free(serv);
-       }
-      else 
-	{
-	  up = &serv->next;
-	  daemon->servers_tail = serv;
-	}
-    }
-}
-
-int add_update_server(int flags,
-		      union mysockaddr *addr,
-		      union mysockaddr *source_addr,
-		      const char *interface,
-		      const char *domain,
-		      union all_addr *local_addr)
-{
-  struct server *serv = NULL;
-  char *alloc_domain;
-  
-  if (!domain)
-    domain = "";
-
-  /* .domain == domain, for historical reasons. */
-  if (*domain == '.')
-    while (*domain == '.') domain++;
-  else if (*domain == '*')
-    {
-      domain++;
-      if (*domain != 0)
-	flags |= SERV_WILDCARD;
-    }
-  
-  if (*domain == 0)
-    alloc_domain = whine_malloc(1);
-  else
-    alloc_domain = canonicalise((char *)domain, NULL);
-
-  if (!alloc_domain)
-    return 0;
-
-  if (flags & SERV_IS_LOCAL)
-    {
-      size_t size;
-      
-      if (flags & SERV_6ADDR)
-	size = sizeof(struct serv_addr6);
-      else if (flags & SERV_4ADDR)
-	size = sizeof(struct serv_addr4);
-      else
-	size = sizeof(struct serv_local);
-      
-      if (!(serv = whine_malloc(size)))
-	{
-	  free(alloc_domain);
-	  return 0;
-	}
-      
-      serv->next = daemon->local_domains;
-      daemon->local_domains = serv;
-      
-      if (flags & SERV_4ADDR)
-	((struct serv_addr4*)serv)->addr = local_addr->addr4;
-      
-      if (flags & SERV_6ADDR)
-	((struct serv_addr6*)serv)->addr = local_addr->addr6;
-    }
-  else
-    { 
-      /* Upstream servers. See if there is a suitable candidate, if so unmark
-	 and move to the end of the list, for order. The entry found may already
-	 be at the end. */
-      struct server **up, *tmp;
-
-      serv = NULL;
-      
-      if (maybe_free_servers)
-	for (serv = daemon->servers, up = &daemon->servers; serv; serv = tmp)
-	  {
-	    tmp = serv->next;
-	    if ((serv->flags & SERV_MARK) &&
-		hostname_isequal(alloc_domain, serv->domain))
-	      {
-		/* Need to move down? */
-		if (serv->next)
-		  {
-		    *up = serv->next;
-		    daemon->servers_tail->next = serv;
-		    daemon->servers_tail = serv;
-		    serv->next = NULL;
-		  }
-		break;
-	      }
-	    else
-	      up = &serv->next;
-	  }
-      
-      if (serv)
-	{
-	  free(alloc_domain);
-	  alloc_domain = serv->domain;
-	}
-      else
-	{
-	  if (!(serv = whine_malloc(sizeof(struct server))))
-	    {
-	      free(alloc_domain);
-	      return 0;
-	    }
-	  
-	  memset(serv, 0, sizeof(struct server));
-	  
-	  /* Add to the end of the chain, for order */
-	  if (daemon->servers_tail)
-	    daemon->servers_tail->next = serv;
-	  else
-	    daemon->servers = serv;
-	  daemon->servers_tail = serv;
-	}
-      
-#ifdef HAVE_LOOP
-      serv->uid = rand32();
-#endif      
-	  
-      if (interface)
-	safe_strncpy(serv->interface, interface, sizeof(serv->interface));
-      if (addr)
-	serv->addr = *addr;
-      if (source_addr)
-	serv->source_addr = *source_addr;
-
-      serv->tcpfd = -1;
-    }
-    
-  serv->flags = flags;
-  serv->domain = alloc_domain;
-  serv->domain_len = strlen(alloc_domain);
-    
-  return 1;
-}
-
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,17 +18,15 @@


 static struct cond_domain *search_domain(struct in_addr addr, struct cond_domain *c);
-static int match_domain(struct in_addr addr, struct cond_domain *c);
 static struct cond_domain *search_domain6(struct in6_addr *addr, struct cond_domain *c);
-static int match_domain6(struct in6_addr *addr, struct cond_domain *c);

-int is_name_synthetic(int flags, char *name, union all_addr *addrp)
+
+int is_name_synthetic(int flags, char *name, union all_addr *addr)
 {
  char *p;
  struct cond_domain *c = NULL;
  int prot = (flags & F_IPV6) ? AF_INET6 : AF_INET;
-  union all_addr addr;
-  
+
  for (c = daemon->synth_domains; c; c = c->next)
    {
      int found = 0;
@@ -75,7 +73,7 @@ int is_name_synthetic(int flags, char *name, union all_addr *addrp)
 		   if (!c->is6 &&
 		      index <= ntohl(c->end.s_addr) - ntohl(c->start.s_addr))
 		    {
-		      addr.addr4.s_addr = htonl(ntohl(c->start.s_addr) + index);
+		      addr->addr4.s_addr = htonl(ntohl(c->start.s_addr) + index);
 		      found = 1;
 		    }
 		} 
@@ -87,8 +85,8 @@ int is_name_synthetic(int flags, char *name, union all_addr *addrp)
 		      index <= addr6part(&c->end6) - addr6part(&c->start6))
 		    {
 		      u64 start = addr6part(&c->start6);
-		      addr.addr6 = c->start6;
-		      setaddr6part(&addr.addr6, start + index);
+		      addr->addr6 = c->start6;
+		      setaddr6part(&addr->addr6, start + index);
 		      found = 1;
 		    }
 		}
@@ -115,20 +113,50 @@ int is_name_synthetic(int flags, char *name, union all_addr *addrp)
 	  
 	  *p = 0;	
 	  
-	  /* swap . or : for - */
-	  for (p = tail; *p; p++)
-	    if (*p == '-')
-	      {
-		if (prot == AF_INET)
+	  if (prot == AF_INET6 && strstr(tail, "--ffff-") == tail)
+	    {
+	      /* special hack for v4-mapped. */
+	      memcpy(tail, "::ffff:", 7);
+	      for (p = tail + 7; *p; p++)
+		if (*p == '-')
 		  *p = '.';
-		else
-		  *p = ':';
-	      }
+	    }
+	  else
+	    {
+	      /* swap . or : for - */
+	      for (p = tail; *p; p++)
+		if (*p == '-')
+		  {
+		    if (prot == AF_INET)
+		      *p = '.';
+		    else
+		      *p = ':';
+		  }
+	    }
 	  
-	  if (hostname_isequal(c->domain, p+1) && inet_pton(prot, tail, &addr))
-	    found = (prot == AF_INET) ? match_domain(addr.addr4, c) : match_domain6(&addr.addr6, c);
+	  if (hostname_isequal(c->domain, p+1) && inet_pton(prot, tail, addr))
+	    {
+	      if (prot == AF_INET)
+		{
+		  if (!c->is6 &&
+		      ntohl(addr->addr4.s_addr) >= ntohl(c->start.s_addr) &&
+		      ntohl(addr->addr4.s_addr) <= ntohl(c->end.s_addr))
+		    found = 1;
+		}
+	      else
+		{
+		  u64 addrpart = addr6part(&addr->addr6);
+		  
+		  if (c->is6 &&
+		      is_same_net6(&addr->addr6, &c->start6, 64) &&
+		      addrpart >= addr6part(&c->start6) &&
+		      addrpart <= addr6part(&c->end6))
+		    found = 1;
+		}
+	    }
+
 	}
-      
+
      /* restore name */
      for (p = tail; *p; p++)
 	if (*p == '.' || *p == ':')
@@ -138,12 +166,7 @@ int is_name_synthetic(int flags, char *name, union all_addr *addrp)
      
      
      if (found)
-	{
-	  if (addrp)
-	    *addrp = addr;
-	  
-	  return 1;
-	}
+	return 1;
    }
  
  return 0;
@@ -175,16 +198,17 @@ int is_rev_synth(int flag, union all_addr *addr, char *name)
 	       *p = '-';
 	 }
       
-       strncat(name, ".", MAXDNAME - strlen(name) - 1);
-       strncat(name, c->domain, MAXDNAME - strlen(name) - 1);
+       strncat(name, ".", MAXDNAME);
+       strncat(name, c->domain, MAXDNAME);

       return 1;
     }

   if ((flag & F_IPV6) && (c = search_domain6(&addr->addr6, daemon->synth_domains))) 
     {
+       char *p;
+       
       *name = 0;
-
       if (c->indexed)
 	 {
 	   u64 index = addr6part(&addr->addr6) - addr6part(&c->start6);
@@ -192,53 +216,44 @@ int is_rev_synth(int flag, union all_addr *addr, char *name)
 	 }
       else
 	 {
-	   int i;
-	   char frag[6];
-
 	   if (c->prefix)
-	     strncpy(name, c->prefix, MAXDNAME);
-	   
-	   for (i = 0; i < 16; i += 2)
+	     strncpy(name, c->prefix, MAXDNAME - ADDRSTRLEN);
+       
+	   inet_ntop(AF_INET6, &addr->addr6, name + strlen(name), ADDRSTRLEN);
+
+	   /* IPv6 presentation address can start with ":", but valid domain names
+	      cannot start with "-" so prepend a zero in that case. */
+	   if (!c->prefix && *name == ':')
 	     {
-	       sprintf(frag, "%s%02x%02x",  i == 0 ? "" : "-", addr->addr6.s6_addr[i], addr->addr6.s6_addr[i+1]);
-	       strncat(name, frag, MAXDNAME - strlen(name) - 1);
+	       *name = '0';
+	       inet_ntop(AF_INET6, &addr->addr6, name+1, ADDRSTRLEN);
 	     }
+	   
+	   /* V4-mapped have periods.... */
+	   for (p = name; *p; p++)
+	     if (*p == ':' || *p == '.')
+	       *p = '-';
+	   
 	 }

-       strncat(name, ".", MAXDNAME - strlen(name) - 1);
-       strncat(name, c->domain, MAXDNAME - strlen(name) - 1);
-
+       strncat(name, ".", MAXDNAME);
+       strncat(name, c->domain, MAXDNAME);
+       
       return 1;
     }
-
+   
   return 0;
 }


-static int match_domain(struct in_addr addr, struct cond_domain *c)
-{
-  if (c->interface)
-    {
-      struct addrlist *al;
-      for (al = c->al; al; al = al->next)
-	if (!(al->flags & ADDRLIST_IPV6) &&
-	    is_same_net_prefix(addr, al->addr.addr4, al->prefixlen))
-	  return 1;
-    }
-  else if (!c->is6 &&
-	   ntohl(addr.s_addr) >= ntohl(c->start.s_addr) &&
-	   ntohl(addr.s_addr) <= ntohl(c->end.s_addr))
-    return 1;
-
-  return 0;
-}
-
 static struct cond_domain *search_domain(struct in_addr addr, struct cond_domain *c)
 {
  for (; c; c = c->next)
-    if (match_domain(addr, c))
+    if (!c->is6 &&
+	ntohl(addr.s_addr) >= ntohl(c->start.s_addr) &&
+        ntohl(addr.s_addr) <= ntohl(c->end.s_addr))
      return c;
-  
+
  return NULL;
 }

@@ -252,39 +267,16 @@ char *get_domain(struct in_addr addr)
  return daemon->domain_suffix;
 } 

-static int match_domain6(struct in6_addr *addr, struct cond_domain *c)
-{
-    
-  /* subnet from interface address. */
-  if (c->interface)
-    {
-      struct addrlist *al;
-      for (al = c->al; al; al = al->next)
-	if (al->flags & ADDRLIST_IPV6 &&
-	    is_same_net6(addr, &al->addr.addr6, al->prefixlen))
-	  return 1;
-    }
-  else if (c->is6)
-    {
-      if (c->prefixlen >= 64)
-	{
-	  u64 addrpart = addr6part(addr);
-	  if (is_same_net6(addr, &c->start6, 64) &&
-	      addrpart >= addr6part(&c->start6) &&
-	      addrpart <= addr6part(&c->end6))
-	    return 1;
-	}
-      else if (is_same_net6(addr, &c->start6, c->prefixlen))
-	return 1;
-    }
-    
-  return 0;
-}

 static struct cond_domain *search_domain6(struct in6_addr *addr, struct cond_domain *c)
 {
+  u64 addrpart = addr6part(addr);
+  
  for (; c; c = c->next)
-    if (match_domain6(addr, c))
+    if (c->is6 &&
+	is_same_net6(addr, &c->start6, 64) &&
+	addrpart >= addr6part(&c->start6) &&
+        addrpart <= addr6part(&c->end6))
      return c;
  
  return NULL;
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -18,11 +18,7 @@

 #ifdef HAVE_DUMPFILE

-#include <netinet/icmp6.h>
-
 static u32 packet_count;
-static void do_dump_packet(int mask, void *packet, size_t len,
-			   union mysockaddr *src, union mysockaddr *dst, int port, int proto);

 /* https://wiki.wireshark.org/Development/LibpcapFileFormat */
 struct pcap_hdr_s {
@@ -51,86 +47,39 @@ void dump_init(void)

  packet_count = 0;
  
-  header.magic_number = 0xa1b2c3d4;
-  header.version_major = 2;
-  header.version_minor = 4;
-  header.thiszone = 0;
-  header.sigfigs = 0;
-  header.snaplen = daemon->edns_pktsz + 200; /* slop for IP/UDP headers */
-  header.network = 101; /* DLT_RAW http://www.tcpdump.org/linktypes.html */
-
  if (stat(daemon->dump_file, &buf) == -1)
    {
      /* doesn't exist, create and add header */
+      header.magic_number = 0xa1b2c3d4;
+      header.version_major = 2;
+      header.version_minor = 4;
+      header.thiszone = 0;
+      header.sigfigs = 0;
+      header.snaplen = daemon->edns_pktsz + 200; /* slop for IP/UDP headers */
+      header.network = 101; /* DLT_RAW http://www.tcpdump.org/linktypes.html */
+
      if (errno != ENOENT ||
 	  (daemon->dumpfd = creat(daemon->dump_file, S_IRUSR | S_IWUSR)) == -1 ||
-	  !read_write(daemon->dumpfd, (void *)&header, sizeof(header), RW_WRITE))
+	  !read_write(daemon->dumpfd, (void *)&header, sizeof(header), 0))
 	die(_("cannot create %s: %s"), daemon->dump_file, EC_FILE);
    }
-  else if (S_ISFIFO(buf.st_mode))
-    {
-      /* File is named pipe (with wireshark on the other end, probably.)
-	 Send header. */
-      if  ((daemon->dumpfd = open(daemon->dump_file, O_APPEND | O_RDWR)) == -1 ||
-	   !read_write(daemon->dumpfd, (void *)&header, sizeof(header), RW_WRITE))
-	die(_("cannot open pipe %s: %s"), daemon->dump_file, EC_FILE);
-    }
  else if ((daemon->dumpfd = open(daemon->dump_file, O_APPEND | O_RDWR)) == -1 ||
-	   !read_write(daemon->dumpfd, (void *)&header, sizeof(header), RW_READ))
+	   !read_write(daemon->dumpfd, (void *)&header, sizeof(header), 1))
    die(_("cannot access %s: %s"), daemon->dump_file, EC_FILE);
  else if (header.magic_number != 0xa1b2c3d4)
    die(_("bad header in %s"), daemon->dump_file, EC_FILE);
  else
    {
      /* count existing records */
-      while (read_write(daemon->dumpfd, (void *)&pcap_header, sizeof(pcap_header), RW_READ))
+      while (read_write(daemon->dumpfd, (void *)&pcap_header, sizeof(pcap_header), 1))
 	{
-	  if (lseek(daemon->dumpfd, pcap_header.incl_len, SEEK_CUR) == (off_t)-1)
-	    break;
+	  lseek(daemon->dumpfd, pcap_header.incl_len, SEEK_CUR);
 	  packet_count++;
 	}
    }
 }

-void dump_packet_udp(int mask, void *packet, size_t len,
-		     union mysockaddr *src, union mysockaddr *dst, int fd)
-{
-  union mysockaddr fd_addr;
-  socklen_t addr_len = sizeof(fd_addr);
-
-  if (daemon->dumpfd != -1 && (mask & daemon->dump_mask))
-     {
-       /* if fd is negative it carries a port number (negated) 
-	  which we use as a source or destination when not otherwise
-	  specified so wireshark can ID the packet. 
-	  If both src and dst are specified, set this to -1 to avoid
-	  a spurious getsockname() call. */
-       int port = (fd < 0) ? -fd : -1;
-       
-       /* fd >= 0 is a file descriptor and the address of that file descriptor is used
-	  in place of a NULL src or dst. */
-       if (fd >= 0 && getsockname(fd, (struct sockaddr *)&fd_addr, &addr_len) != -1)
-	 {
-	   if (!src)
-	     src = &fd_addr;
-	   
-	   if (!dst)
-	     dst = &fd_addr;
-	 }
-       
-       do_dump_packet(mask, packet, len, src, dst, port, IPPROTO_UDP);
-     }
-}
-
-void dump_packet_icmp(int mask, void *packet, size_t len,
-		      union mysockaddr *src, union mysockaddr *dst)
-{
-  if (daemon->dumpfd != -1 && (mask & daemon->dump_mask))
-    do_dump_packet(mask, packet, len, src, dst, -1, IPPROTO_ICMP);
-}
-
-static void do_dump_packet(int mask, void *packet, size_t len,
-			   union mysockaddr *src, union mysockaddr *dst, int port, int proto)
+void dump_packet(int mask, void *packet, size_t len, union mysockaddr *src, union mysockaddr *dst)
 {
  struct ip ip;
  struct ip6_hdr ip6;
@@ -147,14 +96,13 @@ static void do_dump_packet(int mask, void *packet, size_t len,
  void *iphdr;
  size_t ipsz;
  int rc;
-     
-  /* if port != -1 it carries a port number 
-     which we use as a source or destination when not otherwise
-     specified so wireshark can ID the packet. 
-     If both src and dst are specified, set this to -1 to avoid
-     a spurious getsockname() call. */
-  udp.uh_sport = udp.uh_dport = htons(port < 0 ? 0 : port);
  
+  if (daemon->dumpfd == -1 || !(mask & daemon->dump_mask))
+    return;
+  
+  /* So wireshark can Id the packet. */
+  udp.uh_sport = udp.uh_dport = htons(NAMESERVER_PORT);
+
  if (src)
    family = src->sa.sa_family;
  else
@@ -167,16 +115,10 @@ static void do_dump_packet(int mask, void *packet, size_t len,
      memset(&ip6, 0, sizeof(ip6));
      
      ip6.ip6_vfc = 6 << 4;
+      ip6.ip6_plen = htons(sizeof(struct udphdr) + len);
+      ip6.ip6_nxt = IPPROTO_UDP;
      ip6.ip6_hops = 64;

-      if ((ip6.ip6_nxt = proto) == IPPROTO_UDP)
-	ip6.ip6_plen = htons(sizeof(struct udphdr) + len);
-      else
-	{
-	  proto = ip6.ip6_nxt = IPPROTO_ICMPV6;
-	  ip6.ip6_plen = htons(len);
-	}
-      
      if (src)
 	{
 	  memcpy(&ip6.ip6_src, &src->in6.sin6_addr, IN6ADDRSZ);
@@ -192,8 +134,9 @@ static void do_dump_packet(int mask, void *packet, size_t len,
      /* start UDP checksum */
      for (sum = 0, i = 0; i < IN6ADDRSZ; i+=2)
 	{
-	  sum += ntohs((ip6.ip6_src.s6_addr[i] << 8) + (ip6.ip6_src.s6_addr[i+1])) ;
-	  sum += ntohs((ip6.ip6_dst.s6_addr[i] << 8) + (ip6.ip6_dst.s6_addr[i+1])) ; 
+	  sum += ip6.ip6_src.s6_addr[i] + (ip6.ip6_src.s6_addr[i+1] << 8) ;
+	  sum += ip6.ip6_dst.s6_addr[i] + (ip6.ip6_dst.s6_addr[i+1] << 8) ;
+	  
 	}
    }
  else
@@ -204,15 +147,9 @@ static void do_dump_packet(int mask, void *packet, size_t len,
      
      ip.ip_v = IPVERSION;
      ip.ip_hl = sizeof(struct ip) / 4;
+      ip.ip_len = htons(sizeof(struct ip) + sizeof(struct udphdr) + len); 
      ip.ip_ttl = IPDEFTTL;
-
-      if ((ip.ip_p = proto) == IPPROTO_UDP)
-	ip.ip_len = htons(sizeof(struct ip) + sizeof(struct udphdr) + len);
-      else
-	{
-	  ip.ip_len = htons(sizeof(struct ip) + len);
-	  proto = ip.ip_p = IPPROTO_ICMP;
-	}
+      ip.ip_p = IPPROTO_UDP;
      
      if (src)
 	{
@@ -233,7 +170,7 @@ static void do_dump_packet(int mask, void *packet, size_t len,
 	sum = (sum & 0xffff) + (sum >> 16);  
      ip.ip_sum = (sum == 0xffff) ? sum : ~sum;
      
-      /* start UDP/ICMP checksum */
+      /* start UDP checksum */
      sum = ip.ip_src.s_addr & 0xffff;
      sum += (ip.ip_src.s_addr >> 16) & 0xffff;
      sum += ip.ip_dst.s_addr & 0xffff;
@@ -243,61 +180,31 @@ static void do_dump_packet(int mask, void *packet, size_t len,
  if (len & 1)
    ((unsigned char *)packet)[len] = 0; /* for checksum, in case length is odd. */

-  if (proto == IPPROTO_UDP)
-    {
-      /* Add Remaining part of the pseudoheader. Note that though the
-	 IPv6 pseudoheader is very different to the IPv4 one, the 
-	 net result of this calculation is correct as long as the 
-	 packet length is less than 65536, which is fine for us. */
-      sum += htons(IPPROTO_UDP);
-      sum += htons(sizeof(struct udphdr) + len);
-      
-      udp.uh_sum = 0;
-      udp.uh_ulen = htons(sizeof(struct udphdr) + len);
-      
-      for (i = 0; i < sizeof(struct udphdr)/2; i++)
-	sum += ((u16 *)&udp)[i];
-      for (i = 0; i < (len + 1) / 2; i++)
-	sum += ((u16 *)packet)[i];
-      while (sum >> 16)
-	sum = (sum & 0xffff) + (sum >> 16);
-      udp.uh_sum = (sum == 0xffff) ? sum : ~sum;
+  udp.uh_sum = 0;
+  udp.uh_ulen = htons(sizeof(struct udphdr) + len);
+  sum += htons(IPPROTO_UDP);
+  sum += htons(sizeof(struct udphdr) + len);
+  for (i = 0; i < sizeof(struct udphdr)/2; i++)
+    sum += ((u16 *)&udp)[i];
+  for (i = 0; i < (len + 1) / 2; i++)
+    sum += ((u16 *)packet)[i];
+  while (sum >> 16)
+    sum = (sum & 0xffff) + (sum >> 16);
+  udp.uh_sum = (sum == 0xffff) ? sum : ~sum;

-      pcap_header.incl_len = pcap_header.orig_len = ipsz + sizeof(udp) + len;
-    }
-  else
-    {
-      /* ICMP - ICMPv6 packet is a superset of ICMP */
-      struct icmp6_hdr *icmp = packet;
-      
-      /* See comment in UDP code above. */
-      sum += htons(proto);
-      sum += htons(len);
-      
-      icmp->icmp6_cksum = 0;
-      for (i = 0; i < (len + 1) / 2; i++)
-	sum += ((u16 *)packet)[i];
-      while (sum >> 16)
-	sum = (sum & 0xffff) + (sum >> 16);
-      icmp->icmp6_cksum = (sum == 0xffff) ? sum : ~sum;
-
-      pcap_header.incl_len = pcap_header.orig_len = ipsz + len;
-    }
-    
  rc = gettimeofday(&time, NULL);
  pcap_header.ts_sec = time.tv_sec;
  pcap_header.ts_usec = time.tv_usec;
+  pcap_header.incl_len = pcap_header.orig_len = ipsz + sizeof(udp) + len;
  
  if (rc == -1 ||
-      !read_write(daemon->dumpfd, (void *)&pcap_header, sizeof(pcap_header), RW_WRITE) ||
-      !read_write(daemon->dumpfd, iphdr, ipsz, RW_WRITE) ||
-      (proto == IPPROTO_UDP && !read_write(daemon->dumpfd, (void *)&udp, sizeof(udp), RW_WRITE)) ||
-      !read_write(daemon->dumpfd, (void *)packet, len, RW_WRITE))
+      !read_write(daemon->dumpfd, (void *)&pcap_header, sizeof(pcap_header), 0) ||
+      !read_write(daemon->dumpfd, iphdr, ipsz, 0) ||
+      !read_write(daemon->dumpfd, (void *)&udp, sizeof(udp), 0) ||
+      !read_write(daemon->dumpfd, (void *)packet, len, 0))
    my_syslog(LOG_ERR, _("failed to write packet dump"));
-  else if (option_bool(OPT_EXTRALOG) && (mask & 0x00ff))
-    my_syslog(LOG_INFO, _("%u dumping packet %u mask 0x%04x"),  daemon->log_display_id, ++packet_count, mask);
  else
-    my_syslog(LOG_INFO, _("dumping packet %u mask 0x%04x"), ++packet_count, mask);
+    my_syslog(LOG_INFO, _("dumping UDP packet %u mask 0x%04x"), ++packet_count, mask);

 }

@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -96,14 +96,11 @@ unsigned char *find_pseudoheader(struct dns_header *header, size_t plen, size_t
 }
 

-/* replace == 0 ->don't replace existing option
-   replace == 1 ->replace existing or add option
-   replace == 2 ->relpace existing option only.
-*/
+/* replace == 2 ->delete existing option only. */
 size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *limit, 
-			int optno, unsigned char *opt, size_t optlen, int set_do, int replace)
+			unsigned short udp_sz, int optno, unsigned char *opt, size_t optlen, int set_do, int replace)
 { 
-  unsigned char *lenp = NULL, *datap = NULL, *p, *udp_len, *buff = NULL;
+  unsigned char *lenp, *datap, *p, *udp_len, *buff = NULL;
  int rdlen = 0, is_sign, is_last;
  unsigned short flags = set_do ? 0x8000 : 0, rcode = 0;

@@ -117,10 +114,9 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
      /* Existing header */
      int i;
      unsigned short code, len;
-      
-      p = udp_len;

-      PUTSHORT(daemon->edns_pktsz, p);
+      p = udp_len;
+      GETSHORT(udp_sz, p);
      GETSHORT(rcode, p);
      GETSHORT(flags, p);

@@ -182,7 +178,7 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
 	    memcpy(buff, datap, rdlen);	      
 	  
 	  /* now, delete OPT RR */
-	  rrfilter(header, &plen, RRFILTER_EDNS0);
+	  plen = rrfilter(header, plen, 0);
 	  
 	  /* Now, force addition of a new one */
 	  p = NULL;	  
@@ -195,18 +191,21 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l
      if (!(p = skip_questions(header, plen)) ||
 	  !(p = skip_section(p, 
 			     ntohs(header->ancount) + ntohs(header->nscount) + ntohs(header->arcount), 
-			     header, plen)) ||
-	  p + 11 > limit)
-	{
-	  free(buff);
-	  return plen; /* bad packet */
-	}
-
+			     header, plen)))
+      {
+	free(buff);
+	return plen;
+      }
+      if (p + 11 > limit)
+      {
+        free(buff);
+        return plen; /* Too big */
+      }
      *p++ = 0; /* empty name */
      PUTSHORT(T_OPT, p);
-      PUTSHORT(daemon->edns_pktsz, p); /* max packet length, 512 if not given in EDNS0 header */
-      PUTSHORT(rcode, p);  /* extended RCODE and version */
-      PUTSHORT(flags, p);  /* DO flag */
+      PUTSHORT(udp_sz, p); /* max packet length, 512 if not given in EDNS0 header */
+      PUTSHORT(rcode, p);    /* extended RCODE and version */
+      PUTSHORT(flags, p); /* DO flag */
      lenp = p;
      PUTSHORT(rdlen, p);    /* RDLEN */
      datap = p;
@@ -249,7 +248,7 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l

 size_t add_do_bit(struct dns_header *header, size_t plen, unsigned char *limit)
 {
-  return add_pseudoheader(header, plen, (unsigned char *)limit, 0, NULL, 0, 1, 0);
+  return add_pseudoheader(header, plen, (unsigned char *)limit, PACKETSZ, 0, NULL, 0, 1, 0);
 }

 static unsigned char char64(unsigned char c)
@@ -265,71 +264,38 @@ static void encoder(unsigned char *in, char *out)
  out[3] = char64(in[2]);
 }

-/* This function needs to call find_mac if any option which requires a MAC address is enabled
-   and used below. If you add a new MAC consumer, modify this, otherwise your
-   new EDNS0 option won't work in TCP mode. */
-void edns0_needs_mac(union mysockaddr *addr, time_t now)
+static size_t add_dns_client(struct dns_header *header, size_t plen, unsigned char *limit, union mysockaddr *l3, time_t now)
 {
-  if (option_bool(OPT_MAC_B64) || option_bool(OPT_MAC_HEX) || option_bool(OPT_ADD_MAC))
-    find_mac(addr, NULL, 0, now);
-}
-
-/* OPT_ADD_MAC = MAC is added (if available)
-   OPT_ADD_MAC + OPT_STRIP_MAC = MAC is replaced, if not available, it is only removed
-   OPT_STRIP_MAC = MAC is removed */
-static size_t add_dns_client(struct dns_header *header, size_t plen, unsigned char *limit,
-			     union mysockaddr *l3, time_t now, int *cacheablep)
-{
-  int replace = 0, maclen = 0;
+  int maclen, replace = 2; /* can't get mac address, just delete any incoming. */
  unsigned char mac[DHCP_CHADDR_MAX];
-  char encode[18]; /* handle 6 byte MACs ONLY */
+  char encode[18]; /* handle 6 byte MACs */

-  if ((option_bool(OPT_MAC_B64) || option_bool(OPT_MAC_HEX)) && (maclen = find_mac(l3, mac, 1, now)) == 6)
+  if ((maclen = find_mac(l3, mac, 1, now)) == 6)
    {
-      if (option_bool(OPT_STRIP_MAC))
-	 replace = 1;
-       *cacheablep = 0;
-    
-       if (option_bool(OPT_MAC_HEX))
-	 print_mac(encode, mac, maclen);
-       else
-	 {
-	   encoder(mac, encode);
-	   encoder(mac+3, encode+4);
-	   encode[8] = 0;
-	 }
+      replace = 1;
+
+      if (option_bool(OPT_MAC_HEX))
+	print_mac(encode, mac, maclen);
+      else
+	{
+	  encoder(mac, encode);
+	  encoder(mac+3, encode+4);
+	  encode[8] = 0;
+	}
    }
-  else if (option_bool(OPT_STRIP_MAC))
-    replace = 2;

-  if (replace != 0 || maclen == 6)
-    plen = add_pseudoheader(header, plen, limit, EDNS0_OPTION_NOMDEVICEID, (unsigned char *)encode, strlen(encode), 0, replace);
-
-  return plen;
+  return add_pseudoheader(header, plen, limit, PACKETSZ, EDNS0_OPTION_NOMDEVICEID, (unsigned char *)encode, strlen(encode), 0, replace); 
 }


-/* OPT_ADD_MAC = MAC is added (if available)
-   OPT_ADD_MAC + OPT_STRIP_MAC = MAC is replaced, if not available, it is only removed
-   OPT_STRIP_MAC = MAC is removed */
-static size_t add_mac(struct dns_header *header, size_t plen, unsigned char *limit,
-		      union mysockaddr *l3, time_t now, int *cacheablep)
+static size_t add_mac(struct dns_header *header, size_t plen, unsigned char *limit, union mysockaddr *l3, time_t now)
 {
-  int maclen = 0, replace = 0;
+  int maclen;
  unsigned char mac[DHCP_CHADDR_MAX];
-    
-  if (option_bool(OPT_ADD_MAC) && (maclen = find_mac(l3, mac, 1, now)) != 0)
-    {
-      *cacheablep = 0;
-      if (option_bool(OPT_STRIP_MAC))
-	replace = 1;
-    }
-  else if (option_bool(OPT_STRIP_MAC))
-    replace = 2;
-  
-  if (replace != 0 || maclen != 0)
-    plen = add_pseudoheader(header, plen, limit, EDNS0_OPTION_MAC, mac, maclen, 0, replace);

+  if ((maclen = find_mac(l3, mac, 1, now)) != 0)
+    plen = add_pseudoheader(header, plen, limit, PACKETSZ, EDNS0_OPTION_MAC, mac, maclen, 0, 0); 
+    
  return plen; 
 }

@@ -347,18 +313,17 @@ static void *get_addrp(union mysockaddr *addr, const short family)
  return &addr->in.sin_addr;
 }

-static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source, int *cacheablep)
+static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source)
 {
  /* http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-02 */
  
  int len;
  void *addrp = NULL;
  int sa_family = source->sa.sa_family;
-  int cacheable = 0;
-  
+
  opt->source_netmask = 0;
  opt->scope_netmask = 0;
-    
+
  if (source->sa.sa_family == AF_INET6 && daemon->add_subnet6)
    {
      opt->source_netmask = daemon->add_subnet6->mask;
@@ -366,7 +331,6 @@ static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source,
 	{
 	  sa_family = daemon->add_subnet6->addr.sa.sa_family;
 	  addrp = get_addrp(&daemon->add_subnet6->addr, sa_family);
-	  cacheable = 1;
 	} 
      else 
 	addrp = &source->in6.sin6_addr;
@@ -379,7 +343,6 @@ static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source,
 	{
 	  sa_family = daemon->add_subnet4->addr.sa.sa_family;
 	  addrp = get_addrp(&daemon->add_subnet4->addr, sa_family);
-	  cacheable = 1; /* Address is constant */
 	} 
 	else 
 	  addrp = &source->in.sin_addr;
@@ -387,6 +350,8 @@ static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source,
  
  opt->family = htons(sa_family == AF_INET6 ? 2 : 1);
  
+  len = 0;
+  
  if (addrp && opt->source_netmask != 0)
    {
      len = ((opt->source_netmask - 1) >> 3) + 1;
@@ -394,183 +359,79 @@ static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source,
      if (opt->source_netmask & 7)
 	opt->addr[len-1] &= 0xff << (8 - (opt->source_netmask & 7));
    }
-  else
-    {
-      cacheable = 1; /* No address ever supplied. */
-      len = 0;
-    }
-
-  if (cacheablep)
-    *cacheablep = cacheable;
  
  return len + 4;
 }
 
-/* OPT_CLIENT_SUBNET = client subnet is added
-   OPT_CLIENT_SUBNET + OPT_STRIP_ECS = client subnet is replaced
-   OPT_STRIP_ECS = client subnet is removed */
-static size_t add_source_addr(struct dns_header *header, size_t plen, unsigned char *limit,
-			      union mysockaddr *source, int *cacheable)
+static size_t add_source_addr(struct dns_header *header, size_t plen, unsigned char *limit, union mysockaddr *source)
 {
  /* http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-02 */
  
-  int replace = 0, len = 0;
+  int len;
  struct subnet_opt opt;
  
-  if (option_bool(OPT_CLIENT_SUBNET))
-    {
-      if (option_bool(OPT_STRIP_ECS))
-	replace = 1;
-      len = calc_subnet_opt(&opt, source, cacheable);
-    }
-  else if (option_bool(OPT_STRIP_ECS))
-    replace = 2;
-  else
-    {
-      unsigned char *pheader;
-      /* If we still think the data is cacheable, and we're not
-	 messing with EDNS client subnet ourselves, see if the client
-	 sent a client subnet. If so, mark the data as uncacheable */
-      if (*cacheable &&
-	  (pheader = find_pseudoheader(header, plen, NULL, NULL, NULL, NULL)) &&
-	  !check_source(header, plen, pheader, NULL))
-	*cacheable = 0;
-      
-      return plen;
-    }
-  
-  return add_pseudoheader(header, plen, (unsigned char *)limit, EDNS0_OPTION_CLIENT_SUBNET, (unsigned char *)&opt, len, 0, replace);
+  len = calc_subnet_opt(&opt, source);
+  return add_pseudoheader(header, plen, (unsigned char *)limit, PACKETSZ, EDNS0_OPTION_CLIENT_SUBNET, (unsigned char *)&opt, len, 0, 0);
 }

 int check_source(struct dns_header *header, size_t plen, unsigned char *pseudoheader, union mysockaddr *peer)
 {
-  /* Section 9.2, Check that subnet option (if any) in reply matches.
-     if peer == NULL, this degrades to a check for the existence of and EDNS0 client-subnet option. */
+  /* Section 9.2, Check that subnet option in reply matches. */
  
  int len, calc_len;
  struct subnet_opt opt;
  unsigned char *p;
  int code, i, rdlen;
  
-  if (peer)
-    calc_len = calc_subnet_opt(&opt, peer, NULL);
+   calc_len = calc_subnet_opt(&opt, peer);
   
-  if (!(p = skip_name(pseudoheader, header, plen, 10)))
-    return 1;
-  
-  p += 8; /* skip UDP length and RCODE */
-  
-  GETSHORT(rdlen, p);
-  if (!CHECK_LEN(header, p, plen, rdlen))
-    return 1; /* bad packet */
-  
-  /* check if option there */
-  for (i = 0; i + 4 < rdlen; i += len + 4)
+   if (!(p = skip_name(pseudoheader, header, plen, 10)))
+     return 1;
+   
+   p += 8; /* skip UDP length and RCODE */
+   
+   GETSHORT(rdlen, p);
+   if (!CHECK_LEN(header, p, plen, rdlen))
+     return 1; /* bad packet */
+   
+   /* check if option there */
+   for (i = 0; i + 4 < rdlen; i += len + 4)
     {
       GETSHORT(code, p);
       GETSHORT(len, p);
-       if (i + 4 + len > rdlen)
-	 break; /* malformed: option body extends beyond RDATA */
       if (code == EDNS0_OPTION_CLIENT_SUBNET)
 	 {
-	   if (peer)
-	     {
-	       /* make sure this doesn't mismatch. */
-	       opt.scope_netmask = p[3];
-	       if (len != calc_len || memcmp(p, &opt, len) != 0)
-		 return 0;
-	     }
-	   else if (((struct subnet_opt *)p)->source_netmask != 0)
+	   /* make sure this doesn't mismatch. */
+	   opt.scope_netmask = p[3];
+	   if (len != calc_len || memcmp(p, &opt, len) != 0)
 	     return 0;
 	 }
       p += len;
     }
-  
-  return 1;
+   
+   return 1;
 }

-/* See https://docs.umbrella.com/umbrella-api/docs/identifying-dns-traffic for
- * detailed information on packet formating.
- */
-#define UMBRELLA_VERSION    1
-#define UMBRELLA_TYPESZ     2
-
-#define UMBRELLA_ASSET      0x0004
-#define UMBRELLA_ASSETSZ    sizeof(daemon->umbrella_asset)
-#define UMBRELLA_ORG        0x0008
-#define UMBRELLA_ORGSZ      sizeof(daemon->umbrella_org)
-#define UMBRELLA_IPV4       0x0010
-#define UMBRELLA_IPV6       0x0020
-#define UMBRELLA_DEVICE     0x0040
-#define UMBRELLA_DEVICESZ   sizeof(daemon->umbrella_device)
-
-struct umbrella_opt {
-  u8 magic[4] ATTRIBUTE_NONSTRING;
-  u8 version;
-  u8 flags;
-  /* We have 4 possible fields since we'll never send both IPv4 and
-   * IPv6, so using the larger of the two to calculate max buffer size.
-   * Each field also has a type header.  So the following accounts for
-   * the type headers and each field size to get a max buffer size.
-   */
-  u8 fields[4 * UMBRELLA_TYPESZ + UMBRELLA_ORGSZ + IN6ADDRSZ + UMBRELLA_DEVICESZ + UMBRELLA_ASSETSZ];
-};
-
-static size_t add_umbrella_opt(struct dns_header *header, size_t plen, unsigned char *limit, union mysockaddr *source, int *cacheable)
-{
-  *cacheable = 0;
-
-  struct umbrella_opt opt = {{"ODNS"}, UMBRELLA_VERSION, 0, {0}};
-  u8 *u = &opt.fields[0];
-  int family = source->sa.sa_family;
-  int size = family == AF_INET ? INADDRSZ : IN6ADDRSZ;
-
-  if (daemon->umbrella_org)
-    {
-      PUTSHORT(UMBRELLA_ORG, u);
-      PUTLONG(daemon->umbrella_org, u);
-    }
-  
-  PUTSHORT(family == AF_INET ? UMBRELLA_IPV4 : UMBRELLA_IPV6, u);
-  memcpy(u, get_addrp(source, family), size);
-  u += size;
-  
-  if (option_bool(OPT_UMBRELLA_DEVID))
-    {
-      PUTSHORT(UMBRELLA_DEVICE, u);
-      memcpy(u, (char *)&daemon->umbrella_device, UMBRELLA_DEVICESZ);
-      u += UMBRELLA_DEVICESZ;
-    }
-
-  if (daemon->umbrella_asset)
-    {
-      PUTSHORT(UMBRELLA_ASSET, u);
-      PUTLONG(daemon->umbrella_asset, u);
-    }
-  
-  return add_pseudoheader(header, plen, (unsigned char *)limit, EDNS0_OPTION_UMBRELLA, (unsigned char *)&opt, u - (u8 *)&opt, 0, 1);
-}
-
-/* Set *check_subnet if we add a client subnet option, which needs to checked 
-   in the reply. Set *cacheable to zero if we add an option which the answer
-   may depend on. */
 size_t add_edns0_config(struct dns_header *header, size_t plen, unsigned char *limit, 
-			union mysockaddr *source, time_t now, int *cacheable)    
+			union mysockaddr *source, time_t now, int *check_subnet)    
 {
-  *cacheable = 1;
-  
-  plen  = add_mac(header, plen, limit, source, now, cacheable);
-  plen = add_dns_client(header, plen, limit, source, now, cacheable);
+  *check_subnet = 0;
+
+  if (option_bool(OPT_ADD_MAC))
+    plen  = add_mac(header, plen, limit, source, now);
  
+  if (option_bool(OPT_MAC_B64) || option_bool(OPT_MAC_HEX))
+    plen = add_dns_client(header, plen, limit, source, now);
+
  if (daemon->dns_client_id)
-    plen = add_pseudoheader(header, plen, limit, EDNS0_OPTION_NOMCPEID, 
+    plen = add_pseudoheader(header, plen, limit, PACKETSZ, EDNS0_OPTION_NOMCPEID, 
 			    (unsigned char *)daemon->dns_client_id, strlen(daemon->dns_client_id), 0, 1);
-
-  if (option_bool(OPT_UMBRELLA))
-    plen = add_umbrella_opt(header, plen, limit, source, cacheable);
  
-  plen = add_source_addr(header, plen, limit, source, cacheable);
-
+  if (option_bool(OPT_CLIENT_SUBNET))
+    {
+      plen = add_source_addr(header, plen, limit, source); 
+      *check_subnet = 1;
+    }
+	  
  return plen;
 }
-
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -196,7 +196,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 	}
      
      /* we read zero bytes when pipe closed: this is our signal to exit */ 
-      if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), RW_READ))
+      if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1))
 	{
 #ifdef HAVE_LUASCRIPT
 	  if (daemon->luascript)
@@ -233,13 +233,9 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 	  is6 = (data.flags != AF_INET);
 	  data.action = ACTION_ARP;
 	}
-       else if (data.action == ACTION_RELAY_SNOOP)
-	 {
-	   is6 = 1;
-	   action_str = "relay-snoop";
-	 }
-       else
-	 continue;
+       else 
+	continue;
+
      	
      /* stringify MAC into dhcp_buff */
      p = daemon->dhcp_buff;
@@ -258,7 +254,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 	continue;
      
      if (!read_write(pipefd[0], buf, 
-		      data.hostname_len + data.ed_len + data.clid_len, RW_READ))
+		      data.hostname_len + data.ed_len + data.clid_len, 1))
 	continue;

      /* CLID into packet */
@@ -291,7 +287,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 	  char *dot;
 	  hostname = (char *)buf;
 	  hostname[data.hostname_len - 1] = 0;
-	  if (data.action != ACTION_TFTP && data.action != ACTION_RELAY_SNOOP)
+	  if (data.action != ACTION_TFTP)
 	    {
 	      if (!legal_hostname(hostname))
 		hostname = NULL;
@@ -337,24 +333,6 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 		  lua_call(lua, 2, 0);	/* pass 2 values, expect 0 */
 		}
 	    }
-	  else if (data.action == ACTION_RELAY_SNOOP)
-	    {
-	      lua_getglobal(lua, "snoop"); 
-	      if (lua_type(lua, -1) != LUA_TFUNCTION)
-		lua_pop(lua, 1); /* tftp function optional */
-	      else
-		{
-		  lua_pushstring(lua, action_str); /* arg1 - action */
-		  lua_newtable(lua);               /* arg2 - data table */
-		  lua_pushstring(lua, daemon->addrbuff);
-		  lua_setfield(lua, -2, "client_address");
-		  lua_pushstring(lua, hostname);
-		  lua_setfield(lua, -2, "prefix"); 
-		  lua_pushstring(lua, data.interface);
-		  lua_setfield(lua, -2, "client_interface");
-		  lua_call(lua, 2, 0);	/* pass 2 values, expect 0 */
-		}
-	    }
 	  else if (data.action == ACTION_ARP)
 	    {
 	      lua_getglobal(lua, "arp"); 
@@ -421,9 +399,6 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 	      
 	      end = extradata + data.ed_len;
 	      buf = extradata;
-
-	      lua_pushnumber(lua, data.ed_len == 0 ? 1 : 0);
-	      lua_setfield(lua, -2, "data_missing");
 	      
 	      if (!is6)
 		buf = grab_extradata_lua(buf, end, "vendor_class");
@@ -451,17 +426,14 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 		  buf = grab_extradata_lua(buf, end, "subscriber_id");
 		  buf = grab_extradata_lua(buf, end, "remote_id");
 		}
-
-	      buf = grab_extradata_lua(buf, end, "requested_options");
-	      buf = grab_extradata_lua(buf, end, "mud_url");
+	      
 	      buf = grab_extradata_lua(buf, end, "tags");
 	      
 	      if (is6)
 		buf = grab_extradata_lua(buf, end, "relay_address");
 	      else if (data.giaddr.s_addr != 0)
 		{
-		  inet_ntop(AF_INET, &data.giaddr, daemon->dhcp_buff2, ADDRSTRLEN);
-		  lua_pushstring(lua, daemon->dhcp_buff2);
+		  lua_pushstring(lua, inet_ntoa(data.giaddr));
 		  lua_setfield(lua, -2, "relay_address");
 		}
 	      
@@ -581,7 +553,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 	  close(pipeout[1]);
 	}
      
-      if (data.action != ACTION_TFTP && data.action != ACTION_ARP && data.action != ACTION_RELAY_SNOOP)
+      if (data.action != ACTION_TFTP && data.action != ACTION_ARP)
 	{
 #ifdef HAVE_DHCP6
 	  my_setenv("DNSMASQ_IAID", is6 ? daemon->dhcp_buff3 : NULL, &err);
@@ -604,9 +576,6 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 	  
 	  end = extradata + data.ed_len;
 	  buf = extradata;
-
-	  if (data.ed_len == 0)
-	    my_setenv("DNSMASQ_DATA_MISSING", "1", &err);
 	  
 	  if (!is6)
 	    buf = grab_extradata(buf, end, "DNSMASQ_VENDOR_CLASS", &err);
@@ -635,21 +604,15 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 	      buf = grab_extradata(buf, end, "DNSMASQ_CIRCUIT_ID", &err);
 	      buf = grab_extradata(buf, end, "DNSMASQ_SUBSCRIBER_ID", &err);
 	      buf = grab_extradata(buf, end, "DNSMASQ_REMOTE_ID", &err);
+	      buf = grab_extradata(buf, end, "DNSMASQ_REQUESTED_OPTIONS", &err);
 	    }
 	  
-	  buf = grab_extradata(buf, end, "DNSMASQ_REQUESTED_OPTIONS", &err);
-	  buf = grab_extradata(buf, end, "DNSMASQ_MUD_URL", &err);
 	  buf = grab_extradata(buf, end, "DNSMASQ_TAGS", &err);
-	  	  
+
 	  if (is6)
 	    buf = grab_extradata(buf, end, "DNSMASQ_RELAY_ADDRESS", &err);
-	  else
-	    {
-	      const char *giaddr = NULL;
-	      if (data.giaddr.s_addr != 0)
-		  giaddr = inet_ntop(AF_INET, &data.giaddr, daemon->dhcp_buff2, ADDRSTRLEN);
-	      my_setenv("DNSMASQ_RELAY_ADDRESS", giaddr, &err);
-	    }
+	  else 
+	    my_setenv("DNSMASQ_RELAY_ADDRESS", data.giaddr.s_addr != 0 ? inet_ntoa(data.giaddr) : NULL, &err); 
 	  
 	  for (i = 0; buf; i++)
 	    {
@@ -672,9 +635,6 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
 	fcntl(event_fd, F_SETFD, i | FD_CLOEXEC);
      close(pipefd[0]);

-      if (data.action == ACTION_RELAY_SNOOP)
-	strcpy(daemon->packet, data.interface);
-      
      p =  strrchr(daemon->lease_change_command, '/');
      if (err == 0)
 	{
@@ -740,11 +700,9 @@ static unsigned char *grab_extradata_lua(unsigned char *buf, unsigned char *end,
  if (!buf || (buf == end))
    return NULL;

-  for (next = buf; ; next++)
+  for (next = buf; *next != 0; next++)
    if (next == end)
      return NULL;
-    else if (*next == 0)
-      break;
  
  if (next != buf)
    {
@@ -847,29 +805,6 @@ void queue_script(int action, struct dhcp_lease *lease, char *hostname, time_t n
  bytes_in_buf = p - (unsigned char *)buf;
 }

-#ifdef HAVE_DHCP6
-void queue_relay_snoop(struct in6_addr *client, int if_index, struct in6_addr *prefix, int prefix_len)
-{
-  /* no script */
-  if (daemon->helperfd == -1)
-    return;
-  
-  inet_ntop(AF_INET6, prefix, daemon->addrbuff, ADDRSTRLEN);
-
-  /* 5 for /nnn and zero on the end of the prefix. */
-  buff_alloc(sizeof(struct script_data) + ADDRSTRLEN + 5);
-  memset(buf, 0, sizeof(struct script_data));
-
-  buf->action = ACTION_RELAY_SNOOP;
-  buf->addr6 = *client;
-  buf->hostname_len = sprintf((char *)(buf+1), "%s/%u", daemon->addrbuff, prefix_len) + 1;
-  
-  indextoname(daemon->dhcp6fd, if_index, buf->interface);
-
-  bytes_in_buf = sizeof(struct script_data) + buf->hostname_len;
-}
-#endif
-
 #ifdef HAVE_TFTP
 /* This nastily re-uses DHCP-fields for TFTP stuff */
 void queue_tftp(off_t file_len, char *filename, union mysockaddr *peer)
@@ -947,4 +882,7 @@ void helper_write(void)
    }
 }

-#endif /* HAVE_SCRIPT */
+#endif
+
+
+
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ static char *inotify_buffer;
   points to, made absolute if relative.
   If path doesn't exist or is not a symlink, return NULL.
   Return value is malloc'ed */
-static char *my_readlink(int errfd, char *path)
+static char *my_readlink(char *path)
 {
  ssize_t rc, size = 64;
  char *buf;
@@ -59,10 +59,7 @@ static char *my_readlink(int errfd, char *path)
 	      return NULL;
 	    }
 	  else
-	    {
-	      send_event(errfd, EVENT_LINK_ERR, errno, path);
-	      _exit(0);
-	    }
+	    die(_("cannot access path %s: %s"), path, EC_MISC);
 	}
      else if (rc < size-1)
 	{
@@ -88,19 +85,16 @@ static char *my_readlink(int errfd, char *path)
    }
 }

-void inotify_dnsmasq_init(int errfd)
+void inotify_dnsmasq_init()
 {
  struct resolvc *res;
  inotify_buffer = safe_malloc(INOTIFY_SZ);
  daemon->inotifyfd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
  
  if (daemon->inotifyfd == -1)
-    {
-      send_event(errfd, EVENT_INOTFY_ERR, errno, NULL);
-      _exit(0);
-    }
-  
-  if (daemon->port == 0 || option_bool(OPT_NO_RESOLV))
+    die(_("failed to create inotify: %s"), NULL, EC_MISC);
+
+  if (option_bool(OPT_NO_RESOLV))
    return;
  
  for (res = daemon->resolv_files; res; res = res->next)
@@ -111,13 +105,10 @@ void inotify_dnsmasq_init(int errfd)
      strcpy(path, res->name);

      /* Follow symlinks until we reach a non-symlink, or a non-existent file. */
-      while ((new_path = my_readlink(errfd, path)))
+      while ((new_path = my_readlink(path)))
 	{
 	  if (links-- == 0)
-	    {
-	      send_event(errfd, EVENT_TMSL_ERR, 0, res->name);
-	      _exit(0);
-	    }
+	    die(_("too many symlinks following %s"), res->name, EC_MISC);
 	  free(path);
 	  path = new_path;
 	}
@@ -133,146 +124,86 @@ void inotify_dnsmasq_init(int errfd)
 	  *d = '/';
 	  
 	  if (res->wd == -1 && errno == ENOENT)
-	    {
-	      send_event(errfd, EVENT_RESOLV_ERR, 0, res->name);
-	      _exit(0);
-	    }
+	    die(_("directory %s for resolv-file is missing, cannot poll"), res->name, EC_MISC);
 	}	  
 	 
      if (res->wd == -1)
-	{
-	  send_event(errfd, EVENT_IFILE_ERR, errno, res->name);
-	  _exit(0);
-	}
-      	
+	die(_("failed to create inotify for %s: %s"), res->name, EC_MISC);
+	
    }
 }

-static struct hostsfile *dyndir_addhosts(struct dyndir *dd, char *file)
-{
-  /* Check if this file is already known in dd->files */
-  struct hostsfile *ah;
-  size_t dirlen = strlen(dd->dname);
-  
-  /* ah->fname always starts with the string in dd->dname */
-  for (ah = dd->files; ah; ah = ah->next)
-    if (ah->fname[dirlen] == '/' &&
-        strcmp(&ah->fname[dirlen+1], file) == 0)
-      return ah;
-        
-  /* Not known, create new hostsfile record for this dyndir */
-  if ((ah = whine_malloc(sizeof(struct hostsfile))))
-    {
-      char *path;
-
-      if (!(path = whine_malloc(dirlen + strlen(file) + 2)))
-	{
-	  free(ah);
-	  return NULL;
-	}
-      
-      strcpy(path, dd->dname);
-      strcat(path, "/");
-      strcat(path, file);
-      
-      /* Add this file to the tip of the linked list */
-      ah->next = dd->files;
-      dd->files = ah;
-      
-      /* Copy flags, set index and the full file path */
-      ah->flags = dd->flags;
-      ah->index = daemon->host_index++;
-      ah->fname = path;
-    }
-  
-  return ah;
-}
-

 /* initialisation for dynamic-dir. Set inotify watch for each directory, and read pre-existing files */
 void set_dynamic_inotify(int flag, int total_size, struct crec **rhash, int revhashsz)
 {
-  struct dyndir *dd;
-
-  for (dd = daemon->dynamic_dirs; dd; dd = dd->next)
+  struct hostsfile *ah;
+  
+  for (ah = daemon->dynamic_dirs; ah; ah = ah->next)
    {
      DIR *dir_stream = NULL;
      struct dirent *ent;
      struct stat buf;
-
-      if (!(dd->flags & flag))
+     
+      if (!(ah->flags & flag))
 	continue;
-
-      if (stat(dd->dname, &buf) == -1)
+ 
+      if (stat(ah->fname, &buf) == -1 || !(S_ISDIR(buf.st_mode)))
 	{
 	  my_syslog(LOG_ERR, _("bad dynamic directory %s: %s"), 
-		    dd->dname, strerror(errno));
+		    ah->fname, strerror(errno));
 	  continue;
 	}
-
-      if (!(S_ISDIR(buf.st_mode)))
-	{
-	  my_syslog(LOG_ERR, _("bad dynamic directory %s: %s"), 
-		    dd->dname, _("not a directory"));
-	  continue;
-	}
-
-       if (!(dd->flags & AH_WD_DONE))
+      
+       if (!(ah->flags & AH_WD_DONE))
 	 {
-	   dd->wd = inotify_add_watch(daemon->inotifyfd, dd->dname, IN_CLOSE_WRITE | IN_MOVED_TO | IN_DELETE);
-	   dd->flags |= AH_WD_DONE;
+	   ah->wd = inotify_add_watch(daemon->inotifyfd, ah->fname, IN_CLOSE_WRITE | IN_MOVED_TO);
+	   ah->flags |= AH_WD_DONE;
 	 }

       /* Read contents of dir _after_ calling add_watch, in the hope of avoiding
 	  a race which misses files being added as we start */
-       if (dd->wd == -1 || !(dir_stream = opendir(dd->dname)))
+       if (ah->wd == -1 || !(dir_stream = opendir(ah->fname)))
 	 {
 	   my_syslog(LOG_ERR, _("failed to create inotify for %s: %s"),
-		     dd->dname, strerror(errno));
+		     ah->fname, strerror(errno));
 	   continue;
 	 }

       while ((ent = readdir(dir_stream)))
 	 {
+	   size_t lendir = strlen(ah->fname);
 	   size_t lenfile = strlen(ent->d_name);
-	   	   
+	   char *path;
+	   
 	   /* ignore emacs backups and dotfiles */
 	   if (lenfile == 0 || 
 	       ent->d_name[lenfile - 1] == '~' ||
 	       (ent->d_name[0] == '#' && ent->d_name[lenfile - 1] == '#') ||
 	       ent->d_name[0] == '.')
 	     continue;
-
-	   if (dd->flags & AH_HOSTS)
+	   
+	   if ((path = whine_malloc(lendir + lenfile + 2)))
 	     {
-	       struct hostsfile *ah;
-
-	       /* ignore non-regular files */
-	       if ((ah = dyndir_addhosts(dd, ent->d_name)) &&
-		   stat(ah->fname, &buf) != -1 && S_ISREG(buf.st_mode))
-		 total_size = read_hostsfile(ah->fname, ah->index, total_size, rhash, revhashsz);
-	     }
-#ifdef HAVE_DHCP
-	   else if (dd->flags & (AH_DHCP_HST | AH_DHCP_OPT))
-	     {
-	       char *path;
+	       strcpy(path, ah->fname);
+	       strcat(path, "/");
+	       strcat(path, ent->d_name);
 	       
-	       if ((path = whine_malloc(strlen(dd->dname) + lenfile + 2)))
+	       /* ignore non-regular files */
+	       if (stat(path, &buf) != -1 && S_ISREG(buf.st_mode))
 		 {
-		   strcpy(path, dd->dname);
-		   strcat(path, "/");
-		   strcat(path, ent->d_name);
-		   
-		   /* ignore non-regular files */
-		   if (stat(path, &buf) != -1 && S_ISREG(buf.st_mode))
-		     option_read_dynfile(path, dd->flags);
-		   
-		   free(path);
-		 }
-	     }
+		   if (ah->flags & AH_HOSTS)
+		     total_size = read_hostsfile(path, ah->index, total_size, rhash, revhashsz);
+#ifdef HAVE_DHCP
+		   else if (ah->flags & (AH_DHCP_HST | AH_DHCP_OPT))
+		     option_read_dynfile(path, ah->flags);
 #endif		   
+		 }
+
+	       free(path);
+	     }
 	 }
-       
+
       closedir(dir_stream);
    }
 }
@@ -280,10 +211,8 @@ void set_dynamic_inotify(int flag, int total_size, struct crec **rhash, int revh
 int inotify_check(time_t now)
 {
  int hit = 0;
-  struct dyndir *dd;
+  struct hostsfile *ah;

-  (void)now;
-  
  while (1)
    {
      int rc;
@@ -313,28 +242,23 @@ int inotify_check(time_t now)
 	    if (res->wd == in->wd && strcmp(res->file, in->name) == 0)
 	      hit = 1;

-	  for (dd = daemon->dynamic_dirs; dd; dd = dd->next)
-	    if (dd->wd == in->wd)
+	  for (ah = daemon->dynamic_dirs; ah; ah = ah->next)
+	    if (ah->wd == in->wd)
 	      {
-		if (dd->flags & AH_HOSTS)
+		size_t lendir = strlen(ah->fname);
+		char *path;
+		
+		if ((path = whine_malloc(lendir + in->len + 2)))
 		  {
-		    struct hostsfile *ah;
-		    if ((ah = dyndir_addhosts(dd, in->name)))
+		    strcpy(path, ah->fname);
+		    strcat(path, "/");
+		    strcat(path, in->name);
+		     
+		    my_syslog(LOG_INFO, _("inotify, new or changed file %s"), path);
+
+		    if (ah->flags & AH_HOSTS)
 		      {
-			const unsigned int removed = cache_remove_uid(ah->index);
-
-			/* Is this is a deletion event? */
-			if (in->mask & IN_DELETE)
-			  my_syslog(LOG_INFO, _("inotify: %s removed"), ah->fname);
-			else 
-			  my_syslog(LOG_INFO, _("inotify: %s new or modified"), ah->fname);
-
-			if (removed > 0)
-			  my_syslog(LOG_INFO, _("inotify: flushed %u names read from %s"), removed, ah->fname);
-			
-			/* (Re-)load hostsfile only if this event isn't triggered by deletion */
-			if (!(in->mask & IN_DELETE))
-			  read_hostsfile(ah->fname, ah->index, 0, NULL, 0);
+			read_hostsfile(path, ah->index, 0, NULL, 0);
 #ifdef HAVE_DHCP
 			if (daemon->dhcp || daemon->doing_dhcp6) 
 			  {
@@ -346,21 +270,10 @@ int inotify_check(time_t now)
 			  }
 #endif
 		      }
-		  }
 #ifdef HAVE_DHCP
-		else if (!(in->mask & IN_DELETE))
-		  {
-		    char *path;
-
-		    if ((path = whine_malloc(strlen(dd->dname) + in->len + 2)))
+		    else if (ah->flags & AH_DHCP_HST)
 		      {
-			strcpy(path, dd->dname);
-			strcat(path, "/");
-			strcat(path, in->name);
-			
-			my_syslog(LOG_INFO, _("inotify: %s new or modified"), path);
-
-			if ((dd->flags & AH_DHCP_HST) && option_read_dynfile(path, AH_DHCP_HST))
+			if (option_read_dynfile(path, AH_DHCP_HST))
 			  {
 			    /* Propagate the consequences of loading a new dhcp-host */
 			    dhcp_update_configs(daemon->dhcp_conf);
@@ -368,20 +281,18 @@ int inotify_check(time_t now)
 			    lease_update_file(now); 
 			    lease_update_dns(1);
 			  }
-			
-			if (dd->flags & AH_DHCP_OPT)
-			  option_read_dynfile(path, AH_DHCP_OPT);
-		    
-			free(path);
 		      }
-		  }
+		    else if (ah->flags & AH_DHCP_OPT)
+		      option_read_dynfile(path, AH_DHCP_OPT);
 #endif
-		
+		    
+		    free(path);
+		  }
 	      }
 	}
    }
-  
  return hit;
 }

 #endif  /* INOTIFY */
+  
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,3 +31,4 @@
         && ((__const uint32_t *) (a))[1] == 0                                \
         && ((__const uint32_t *) (a))[2] == 0                                \
         && ((__const uint32_t *) (a))[3] == 0)
+
@@ -16,7 +16,7 @@

 #include "dnsmasq.h"

-#if defined(HAVE_LINUX_IPSET)
+#if defined(HAVE_IPSET) && defined(HAVE_LINUX_NETWORK)

 #include <string.h>
 #include <errno.h>
@@ -75,11 +75,11 @@ static char *buffer;

 static inline void add_attr(struct nlmsghdr *nlh, uint16_t type, size_t len, const void *data)
 {
-  struct my_nlattr *attr = (struct my_nlattr *)((u8 *)nlh + NL_ALIGN(nlh->nlmsg_len));
+  struct my_nlattr *attr = (void *)nlh + NL_ALIGN(nlh->nlmsg_len);
  uint16_t payload_len = NL_ALIGN(sizeof(struct my_nlattr)) + len;
  attr->nla_type = type;
  attr->nla_len = payload_len;
-  memcpy((u8 *)attr + NL_ALIGN(sizeof(struct my_nlattr)), data, len);
+  memcpy((void *)attr + NL_ALIGN(sizeof(struct my_nlattr)), data, len);
  nlh->nlmsg_len += NL_ALIGN(payload_len);
 }

@@ -138,8 +138,8 @@ static int new_add_to_ipset(const char *setname, const union all_addr *ipaddr, i
  add_attr(nlh, 
 	   (af == AF_INET ? IPSET_ATTR_IPADDR_IPV4 : IPSET_ATTR_IPADDR_IPV6) | NLA_F_NET_BYTEORDER,
 	   addrsz, ipaddr);
-  nested[1]->nla_len = (u8 *)buffer + NL_ALIGN(nlh->nlmsg_len) - (u8 *)nested[1];
-  nested[0]->nla_len = (u8 *)buffer + NL_ALIGN(nlh->nlmsg_len) - (u8 *)nested[0];
+  nested[1]->nla_len = (void *)buffer + NL_ALIGN(nlh->nlmsg_len) - (void *)nested[1];
+  nested[0]->nla_len = (void *)buffer + NL_ALIGN(nlh->nlmsg_len) - (void *)nested[0];
 	
  while (retry_send(sendto(ipset_sock, buffer, nlh->nlmsg_len, 0,
 			   (struct sockaddr *)&snl, sizeof(snl))));
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
 */

 #include "dnsmasq.h"
+
 #ifdef HAVE_DHCP

 static struct dhcp_lease *leases = NULL, *old_leases = NULL;
@@ -25,9 +26,10 @@ static int read_leases(time_t now, FILE *leasestream)
  unsigned long ei;
  union all_addr addr;
  struct dhcp_lease *lease;
-  int opt_len, clid_len, hw_len, hw_type;
+  int clid_len, hw_len, hw_type;
  int items;
- 
+  char *domain = NULL;
+
  *daemon->dhcp_buff3 = *daemon->dhcp_buff2 = '\0';

  /* client-id max length is 255 which is 255*2 digits + 254 colons
@@ -55,36 +57,6 @@ static int read_leases(time_t now, FILE *leasestream)
 	    continue;
 	  }
 #endif
-
-	/* Weird backwards compatible way of adding extra fields to leases */
-	if ((strcmp(daemon->dhcp_buff3, "vendorclass") == 0 || strcmp(daemon->dhcp_buff3, "agent-info") == 0))
-	  {
-	    if (fscanf(leasestream, " %764s", daemon->packet) == 1)
-	      {
-		if (inet_pton(AF_INET, daemon->dhcp_buff2, &addr.addr4))
-		  lease = lease_find_by_addr(addr.addr4);
-#ifdef HAVE_DHCP6
-		else if (inet_pton(AF_INET6, daemon->dhcp_buff2, &addr.addr6))
-		  lease = lease6_find_by_plain_addr(&addr.addr6);
-#endif
-		else
-		  continue;
-		
-		if (lease)
-		  {
-		    opt_len = parse_hex(daemon->packet, (unsigned char *)daemon->packet, 255, NULL, NULL);
-		    if (opt_len < 0)
-		      continue;
-
-		    if (strcmp(daemon->dhcp_buff3, "vendorclass") == 0)
-		      lease_set_vendorclass(lease, (unsigned char *)daemon->packet, opt_len);
-		    else if (strcmp(daemon->dhcp_buff3, "agent-info") == 0)
-		      lease_set_agent_id(lease, (unsigned char *)daemon->packet, opt_len);
-		  }
-	      }
-
-	    continue;
-	  }
 	
 	if (fscanf(leasestream, " %64s %255s %764s",
 		   daemon->namebuff, daemon->dhcp_buff, daemon->packet) != 3)
@@ -97,12 +69,10 @@ static int read_leases(time_t now, FILE *leasestream)
 		
 	if (inet_pton(AF_INET, daemon->namebuff, &addr.addr4))
 	  {
-	    lease = lease4_allocate(addr.addr4);
-	    
+	    if ((lease = lease4_allocate(addr.addr4)))
+	      domain = get_domain(lease->addr);
 	    
 	    hw_len = parse_hex(daemon->dhcp_buff2, (unsigned char *)daemon->dhcp_buff2, DHCP_CHADDR_MAX, NULL, &hw_type);
-	    if (hw_len < 0)
-	      hw_len = 0;
 	    /* For backwards compatibility, no explicit MAC address type means ether. */
 	    if (hw_type == 0 && hw_len != 0)
 	      hw_type = ARPHRD_ETHER; 
@@ -120,7 +90,10 @@ static int read_leases(time_t now, FILE *leasestream)
 	      }
 	    
 	    if ((lease = lease6_allocate(&addr.addr6, lease_type)))
-	      lease_set_iaid(lease, strtoul(s, NULL, 10));
+	      {
+		lease_set_iaid(lease, strtoul(s, NULL, 10));
+		domain = get_domain6(&lease->addr6);
+	      }
 	  }
 #endif
 	else
@@ -135,17 +108,13 @@ static int read_leases(time_t now, FILE *leasestream)
 	  die (_("too many stored leases"), NULL, EC_MISC);

 	if (strcmp(daemon->packet, "*") != 0)
-	  {
-	    clid_len = parse_hex(daemon->packet, (unsigned char *)daemon->packet, 255, NULL, NULL);
-	    if (clid_len < 0)
-	      clid_len = 0;
-	  }
+	  clid_len = parse_hex(daemon->packet, (unsigned char *)daemon->packet, 255, NULL, NULL);
 	
 	lease_set_hwaddr(lease, (unsigned char *)daemon->dhcp_buff2, (unsigned char *)daemon->packet, 
 			 hw_len, hw_type, clid_len, now, 0);
 	
 	if (strcmp(daemon->dhcp_buff, "*") !=  0)
-	  lease_set_hostname(lease, daemon->dhcp_buff, 0, NULL, NULL);
+	  lease_set_hostname(lease, daemon->dhcp_buff, 0, domain, NULL);

 	ei = atol(daemon->dhcp_buff3);

@@ -186,10 +155,6 @@ void lease_init(time_t now)
 #ifdef HAVE_SCRIPT
      if (daemon->lease_change_command)
 	{
-	  /* 6 == strlen(" init") plus terminator */
-	  if (strlen(daemon->lease_change_command) + 6 > DHCP_BUFF_SZ)
-	    die(_("lease-change script name is too long"), NULL, EC_FILE);
-	  
 	  strcpy(daemon->dhcp_buff, daemon->lease_change_command);
 	  strcat(daemon->dhcp_buff, " init");
 	  leasestream = popen(daemon->dhcp_buff, "r");
@@ -287,8 +252,8 @@ void lease_update_file(time_t now)
 {
  struct dhcp_lease *lease;
  time_t next_event;
-  int i, err = 0, extras;
-  
+  int i, err = 0;
+
  if (file_dirty != 0 && daemon->lease_stream)
    {
      errno = 0;
@@ -296,11 +261,9 @@ void lease_update_file(time_t now)
      if (errno != 0 || ftruncate(fileno(daemon->lease_stream), 0) != 0)
 	err = errno;
      
-      for (extras = 0, lease = leases; lease; lease = lease->next)
+      for (lease = leases; lease; lease = lease->next)
 	{
-	  if (lease->agent_id || lease->vendorclass)
-	    extras = 1;
-	  
+
 #ifdef HAVE_DHCP6
 	  if (lease->flags & (LEASE_TA | LEASE_NA))
 	    continue;
@@ -373,37 +336,7 @@ void lease_update_file(time_t now)
 	    }
 	}
 #endif      
-
-      if (extras)
-	{
-	  /* Dump this at the end for least confusion with older parsing code. */
-	  for (lease = leases; lease; lease = lease->next)
-	    {
-#ifdef HAVE_DHCP6
-	      if (lease->flags & (LEASE_TA | LEASE_NA))
-		inet_ntop(AF_INET6, &lease->addr6, daemon->addrbuff, ADDRSTRLEN);
-	      else
-#endif
-		inet_ntop(AF_INET, &lease->addr, daemon->addrbuff, ADDRSTRLEN);
-	      
-	      if (lease->agent_id)
-		{
-		  ourprintf(&err, "agent-info %s ", daemon->addrbuff);
-		  for (i = 0; i < lease->agent_id_len - 1; i++)
-		    ourprintf(&err, "%.2x:", lease->agent_id[i]);
-		  ourprintf(&err, "%.2x\n", lease->agent_id[i]);
-		}
-	      
-	      if (lease->vendorclass)
-		{
-		  ourprintf(&err, "vendorclass %s ", daemon->addrbuff);
-		  for (i = 0; i < lease->vendorclass_len - 1; i++)
-		    ourprintf(&err, "%.2x:", lease->vendorclass[i]);
-		  ourprintf(&err, "%.2x\n", lease->vendorclass[i]);
-		}
-	    }
-	}
-      
+	  
      if (fflush(daemon->lease_stream) != 0 ||
 	  fsync(fileno(daemon->lease_stream)) < 0)
 	err = errno;
@@ -445,7 +378,7 @@ void lease_update_file(time_t now)
      if (next_event == 0 || difftime(next_event, LEASE_RETRY + now) > 0.0)
 	next_event = LEASE_RETRY + now;
      
-      my_syslog(MS_DHCP | LOG_ERR, _("failed to write %s: %s (retry in %u s)"), 
+      my_syslog(MS_DHCP | LOG_ERR, _("failed to write %s: %s (retry in %us)"), 
 		daemon->lease_file, strerror(err),
 		(unsigned int)difftime(next_event, now));
    }
@@ -479,7 +412,7 @@ static int find_interface_v4(struct in_addr local, int if_index, char *label,
 #ifdef HAVE_DHCP6
 static int find_interface_v6(struct in6_addr *local,  int prefix,
 			     int scope, int if_index, int flags, 
-			     unsigned int preferred, unsigned int valid, void *vparam)
+			     int preferred, int valid, void *vparam)
 {
  struct dhcp_lease *lease;

@@ -536,9 +469,9 @@ void lease_find_interfaces(time_t now)
  for (lease = leases; lease; lease = lease->next)
    lease->new_prefixlen = lease->new_interface = 0;

-  iface_enumerate(AF_INET, &now, (callback_t){.af_inet=find_interface_v4});
+  iface_enumerate(AF_INET, &now, find_interface_v4);
 #ifdef HAVE_DHCP6
-  iface_enumerate(AF_INET6, &now, (callback_t){.af_inet6=find_interface_v6});
+  iface_enumerate(AF_INET6, &now, find_interface_v6);
 #endif

  for (lease = leases; lease; lease = lease->next)
@@ -781,22 +714,6 @@ struct dhcp_lease *lease6_find_by_addr(struct in6_addr *net, int prefix, u64 add
  return NULL;
 } 

-struct dhcp_lease *lease6_find_by_plain_addr(struct in6_addr *addr)
-{
-  struct dhcp_lease *lease;
-    
-  for (lease = leases; lease; lease = lease->next)
-    {
-      if (!(lease->flags & (LEASE_TA | LEASE_NA)))
-	continue;
-      
-      if (IN6_ARE_ADDR_EQUAL(&lease->addr6, addr))
-	return lease;
-    }
-  
-  return NULL;
-}
-
 /* Find largest assigned address in context */
 u64 lease_find_max_addr6(struct dhcp_context *context)
 {
@@ -1029,36 +946,6 @@ static void kill_name(struct dhcp_lease *lease)
  lease->hostname = lease->fqdn = NULL;
 }

-void lease_calc_fqdns(void)
-{
-  struct dhcp_lease *lease;
-  
-  for (lease = leases; lease; lease = lease->next)
-    {
-      char *domain;
-
-      if (lease->hostname)
-	{
-#ifdef HAVE_DHCP6
-	  if (lease->flags & (LEASE_TA | LEASE_NA))
-	    domain = get_domain6(&lease->addr6);
-	  else
-#endif
-	    domain = get_domain(lease->addr);
-	  
-	  if (domain)
-	    {
-	      /* This is called only during startup, before forking, hence safe_malloc() */
-	      lease->fqdn = safe_malloc(strlen(lease->hostname) + strlen(domain) + 2);
-	      
-	      strcpy(lease->fqdn, lease->hostname);
-	      strcat(lease->fqdn, ".");
-	      strcat(lease->fqdn, domain);
-	    }
-	}
-    }
-}
-	  
 void lease_set_hostname(struct dhcp_lease *lease, const char *name, int auth, char *domain, char *config_domain)
 {
  struct dhcp_lease *lease_tmp;
@@ -1134,7 +1021,6 @@ void lease_set_hostname(struct dhcp_lease *lease, const char *name, int auth, ch
 	    }
 	
 	  kill_name(lease_tmp);
-	  lease_tmp->flags |= LEASE_CHANGED; /* run script on change */
 	  break;
 	}
    }
@@ -1168,46 +1054,6 @@ void lease_set_interface(struct dhcp_lease *lease, int interface, time_t now)
 #endif
 }

-void lease_set_agent_id(struct dhcp_lease *lease, unsigned char *new, int len)
-{
-
-  if (!lease->agent_id && !new)
-    return;
-  
-  if (lease->agent_id && new && lease->agent_id_len == len && memcmp(lease->agent_id, new, len) == 0)
-    return;
-
-  file_dirty = 1;
-  free(lease->agent_id);
-  lease->agent_id = NULL;
-  
-  if (new && (lease->agent_id = whine_malloc(len)))
-    {
-      memcpy(lease->agent_id, new, len);
-      lease->agent_id_len = len;
-    }
-}
-
-void lease_set_vendorclass(struct dhcp_lease *lease, unsigned char *new, int len)
-{
-  if (!lease->vendorclass && !new)
-    return;
-
-  if (lease->vendorclass && new && lease->vendorclass_len == len && memcmp(lease->vendorclass, new, len) == 0)
-    return;
-
-  file_dirty = 1;
-  free(lease->vendorclass);
-  lease->vendorclass = NULL;
-  
-  if (new && (lease->vendorclass = whine_malloc(len)))
-    {
-      memcpy(lease->vendorclass, new, len);
-      lease->vendorclass_len = len;
-    }
-}
-       
-
 void rerun_scripts(void)
 {
  struct dhcp_lease *lease;
@@ -1267,11 +1113,9 @@ int do_script_run(time_t now)
 #endif
 	  old_leases = lease->next;
 	  
-	  free(lease->hostname); 
+	  free(lease->old_hostname); 
 	  free(lease->clid);
 	  free(lease->extradata);
-	  free(lease->agent_id);
-	  free(lease->vendorclass);
 	  free(lease);
 	    
 	  return 1; 
@@ -1335,11 +1179,17 @@ void lease_add_extradata(struct dhcp_lease *lease, unsigned char *data, unsigned
  if ((lease->extradata_size - lease->extradata_len) < (len + 1))
    {
      size_t newsz = lease->extradata_len + len + 100;
-      unsigned char *new = whine_realloc(lease->extradata, newsz);
+      unsigned char *new = whine_malloc(newsz);
  
      if (!new)
 	return;
      
+      if (lease->extradata)
+	{
+	  memcpy(new, lease->extradata, lease->extradata_len);
+	  free(lease->extradata);
+	}
+
      lease->extradata = new;
      lease->extradata_size = newsz;
    }
@@ -1351,4 +1201,8 @@ void lease_add_extradata(struct dhcp_lease *lease, unsigned char *data, unsigned
 }
 #endif

-#endif /* HAVE_DHCP */
+#endif
+	  
+
+      
+
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -100,23 +100,10 @@ int log_start(struct passwd *ent_pw, int errfd)
  /* If we're running as root and going to change uid later,
     change the ownership here so that the file is always owned by
     the dnsmasq user. Then logrotate can just copy the owner.
-     Failure of the chown call is OK, (for instance when started as non-root).
-     
-     If we've created a file with group-id root, we also make
-     the file group-writable. This gives processes in the root group
-     write access to the file and avoids the problem that on some systems,
-     once the file is owned by the dnsmasq user, it can't be written
-     whilst dnsmasq is running as root during startup.
- */
-  if (log_to_file && !log_stderr && ent_pw && ent_pw->pw_uid != 0)
-    {
-      struct stat ls;
-      if (getgid() == 0 && fstat(log_fd, &ls) == 0 && ls.st_gid == 0 &&
-	  (ls.st_mode & S_IWGRP) == 0)
-	(void)fchmod(log_fd, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP);
-      if (fchown(log_fd, ent_pw->pw_uid, -1) != 0)
-	ret = errno;
-    }
+     Failure of the chown call is OK, (for instance when started as non-root) */
+  if (log_to_file && !log_stderr && ent_pw && ent_pw->pw_uid != 0 && 
+      fchown(log_fd, ent_pw->pw_uid, -1) != 0)
+    ret = errno;

  return ret;
 }
@@ -131,7 +118,7 @@ int log_reopen(char *log_file)
      /* NOTE: umask is set to 022 by the time this gets called */
      
      if (log_file)
-	log_fd = open(log_file, O_WRONLY|O_CREAT|O_APPEND, S_IRUSR|S_IWUSR|S_IRGRP);
+	log_fd = open(log_file, O_WRONLY|O_CREAT|O_APPEND, S_IRUSR|S_IWUSR|S_IRGRP);      
      else
 	{
 #if defined(HAVE_SOLARIS_NETWORK) || defined(__ANDROID__)
@@ -286,7 +273,7 @@ static void log_write(void)
 /* priority is one of LOG_DEBUG, LOG_INFO, LOG_NOTICE, etc. See sys/syslog.h.
   OR'd to priority can be MS_TFTP, MS_DHCP, ... to be able to do log separation between
   DNS, DHCP and TFTP services.
-   If OR'd with MS_DEBUG, the messages are suppressed unless --log-debug is set. */
+*/
 void my_syslog(int priority, const char *format, ...)
 {
  va_list ap;
@@ -303,13 +290,7 @@ void my_syslog(int priority, const char *format, ...)
    func = "-dhcp";
  else if ((LOG_FACMASK & priority) == MS_SCRIPT)
    func = "-script";
-  else if ((LOG_FACMASK & priority) == MS_DEBUG)
-    {
-      if (!option_bool(OPT_LOG_DEBUG))
-	return;
-      func = "-debug";
-    }
-  
+	    
 #ifdef LOG_PRI
  priority = LOG_PRI(priority);
 #else
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,10 +19,9 @@
 #ifdef HAVE_LOOP
 static ssize_t loop_make_probe(u32 uid);

-void loop_send_probes(void)
+void loop_send_probes()
 {
   struct server *serv;
-   struct randfd_list *rfds = NULL;
   
   if (!option_bool(OPT_LOOP_DETECT))
     return;
@@ -30,29 +29,34 @@ void loop_send_probes(void)
   /* Loop through all upstream servers not for particular domains, and send a query to that server which is
      identifiable, via the uid. If we see that query back again, then the server is looping, and we should not use it. */
   for (serv = daemon->servers; serv; serv = serv->next)
-     if (strlen(serv->domain) == 0 &&
-	 !(serv->flags & (SERV_FOR_NODOTS)))
+     if (!(serv->flags & 
+	   (SERV_LITERAL_ADDRESS | SERV_NO_ADDR | SERV_USE_RESOLV | SERV_NO_REBIND | SERV_HAS_DOMAIN | SERV_FOR_NODOTS | SERV_LOOP)))
       {
 	 ssize_t len = loop_make_probe(serv->uid);
 	 int fd;
+	 struct randfd *rfd = NULL;
 	 
-	 serv->flags &= ~SERV_LOOP;
+	 if (serv->sfd)
+	   fd = serv->sfd->fd;
+	 else 
+	   {
+	     if (!(rfd = allocate_rfd(serv->addr.sa.sa_family)))
+	       continue;
+	     fd = rfd->fd;
+	   }

-	 if ((fd = allocate_rfd(&rfds, serv)) == -1)
-	   continue;
-	 
 	 while (retry_send(sendto(fd, daemon->packet, len, 0, 
 				  &serv->addr.sa, sa_len(&serv->addr))));
+	 
+	 free_rfd(rfd);
       }
-
-   free_rfds(&rfds);
 }
  
 static ssize_t loop_make_probe(u32 uid)
 {
  struct dns_header *header = (struct dns_header *)daemon->packet;
  unsigned char *p = (unsigned char *)(header+1);
-  
+
  /* packet buffer overwritten */
  daemon->srv_save = NULL;
  
@@ -92,21 +96,21 @@ int detect_loop(char *query, int type)
    return 0;

  for (i = 0; i < 8; i++)
-    if (!isxdigit((unsigned char)query[i]))
+    if (!isxdigit(query[i]))
      return 0;

  uid = strtol(query, NULL, 16);

  for (serv = daemon->servers; serv; serv = serv->next)
-    if (strlen(serv->domain) == 0 &&
-	!(serv->flags & SERV_LOOP) &&
-	uid == serv->uid)
-      {
-	serv->flags |= SERV_LOOP;
-	check_servers(1); /* log new state - don't send more probes. */
-	return 1;
-      }
-  
+     if (!(serv->flags & 
+	   (SERV_LITERAL_ADDRESS | SERV_NO_ADDR | SERV_USE_RESOLV | SERV_NO_REBIND | SERV_HAS_DOMAIN | SERV_FOR_NODOTS | SERV_LOOP)) &&
+	 uid == serv->uid)
+       {
+	 serv->flags |= SERV_LOOP;
+	 check_servers(); /* log new state */
+	 return 1;
+       }
+
  return 0;
 }

@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,11 +22,6 @@ const char * metric_names[] = {
    "dns_queries_forwarded",
    "dns_auth_answered",
    "dns_local_answered",
-    "dns_stale_answered",
-    "dns_unanswered",
-    "dnssec_max_crypto_use",
-    "dnssec_max_sig_fail",
-    "dnssec_max_work",
    "bootp",
    "pxe",
    "dhcp_ack",
@@ -42,33 +37,8 @@ const char * metric_names[] = {
    "leases_pruned_4",
    "leases_allocated_6",
    "leases_pruned_6",
-    "tcp_connections",
-    "dhcp_leasequery",
-    "dhcp_lease_unassigned",
-    "dhcp_lease_actve",
-    "dhcp_lease_unknown"
 };

 const char* get_metric_name(int i) {
    return metric_names[i];
 }
-
-void clear_metrics(void)
-{
-  int i;
-  struct server *serv;
-  
-  for (i = 0; i < __METRIC_MAX; i++)
-    daemon->metrics[i] = 0;
-
-  for (serv = daemon->servers; serv; serv = serv->next)
-    {
-      serv->queries = 0;
-      serv->failed_queries = 0;
-      serv->failed_queries = 0;
-      serv->retrys = 0;
-      serv->nxdomain_replies = 0;
-      serv->query_latency = 0;
-    }
-}
-	
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley
   
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,11 +21,6 @@ enum {
  METRIC_DNS_QUERIES_FORWARDED,
  METRIC_DNS_AUTH_ANSWERED,
  METRIC_DNS_LOCAL_ANSWERED,
-  METRIC_DNS_STALE_ANSWERED,
-  METRIC_DNS_UNANSWERED_QUERY,
-  METRIC_CRYPTO_HWM,
-  METRIC_SIG_FAIL_HWM,
-  METRIC_WORK_HWM,
  METRIC_BOOTP,
  METRIC_PXE,
  METRIC_DHCPACK,
@@ -41,14 +36,8 @@ enum {
  METRIC_LEASES_PRUNED_4,
  METRIC_LEASES_ALLOCATED_6,
  METRIC_LEASES_PRUNED_6,
-  METRIC_TCP_CONNECTIONS,
-  METRIC_DHCPLEASEQUERY,
-  METRIC_DHCPLEASEUNASSIGNED,
-  METRIC_DHCPLEASEACTIVE,
-  METRIC_DHCPLEASEUNKNOWN,
  
  __METRIC_MAX,
 };

 const char* get_metric_name(int);
-void clear_metrics(void);
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2025 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2020 Simon Kelley

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -41,35 +41,35 @@

 #ifndef NDA_RTA
 #  define NDA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg)))) 
-#endif
-
-/* Used to request refresh of addresses or routes just once,
- * when multiple changes might be announced. */
-enum async_states {
-  STATE_NEWADDR = (1 << 0),
-  STATE_NEWROUTE = (1 << 1),
-};
+#endif 


 static struct iovec iov;
 static u32 netlink_pid;

-static unsigned nl_async(struct nlmsghdr *h, unsigned state);
-static void nl_multicast_state(unsigned state);
+static void nl_async(struct nlmsghdr *h);

 char *netlink_init(void)
 {
  struct sockaddr_nl addr;
  socklen_t slen = sizeof(addr);
+  int opt = 1;

  addr.nl_family = AF_NETLINK;
  addr.nl_pad = 0;
  addr.nl_pid = 0; /* autobind */
  addr.nl_groups = RTMGRP_IPV4_ROUTE;
-  addr.nl_groups |= RTMGRP_IPV4_IFADDR;  
+  if (option_bool(OPT_CLEVERBIND))
+    addr.nl_groups |= RTMGRP_IPV4_IFADDR;  
  addr.nl_groups |= RTMGRP_IPV6_ROUTE;
-  addr.nl_groups |= RTMGRP_IPV6_IFADDR;
+  if (option_bool(OPT_CLEVERBIND))
+    addr.nl_groups |= RTMGRP_IPV6_IFADDR;

+#ifdef HAVE_DHCP6
+  if (daemon->doing_ra || daemon->doing_dhcp6)
+    addr.nl_groups |= RTMGRP_IPV6_IFADDR;
+#endif
+  
  /* May not be able to have permission to set multicast groups don't die in that case */
  if ((daemon->netlinkfd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)) != -1)
    {
@@ -92,10 +92,14 @@ char *netlink_init(void)
  iov.iov_len = 100;
  iov.iov_base = safe_malloc(iov.iov_len);
  
+  if (daemon->kernel_version >= KERNEL_VERSION(2,6,30) &&
+      setsockopt(daemon->netlinkfd, SOL_NETLINK, NETLINK_NO_ENOBUFS, &opt, sizeof(opt)) == -1)
+    return _("warning: failed to set NETLINK_NO_ENOBUFS on netlink socket");
+  
  return NULL;
 }

-static ssize_t netlink_recv(int flags)
+static ssize_t netlink_recv(void)
 {
  struct msghdr msg;
  struct sockaddr_nl nladdr;
@@ -111,8 +115,7 @@ static ssize_t netlink_recv(int flags)
      msg.msg_iovlen = 1;
      msg.msg_flags = 0;
      
-      while ((rc = recvmsg(daemon->netlinkfd, &msg, flags | MSG_PEEK | MSG_TRUNC)) == -1 &&
-	     errno == EINTR);
+      while ((rc = recvmsg(daemon->netlinkfd, &msg, MSG_PEEK | MSG_TRUNC)) == -1 && errno == EINTR);
      
      /* make buffer big enough */
      if (rc != -1 && (msg.msg_flags & MSG_TRUNC))
@@ -129,7 +132,7 @@ static ssize_t netlink_recv(int flags)

      /* read it for real */
      msg.msg_flags = 0;
-      while ((rc = recvmsg(daemon->netlinkfd, &msg, flags)) == -1 && errno == EINTR);
+      while ((rc = recvmsg(daemon->netlinkfd, &msg, 0)) == -1 && errno == EINTR);
      
      /* Make sure this is from the kernel */
      if (rc == -1 || nladdr.nl_pid == 0)
@@ -148,35 +151,26 @@ static ssize_t netlink_recv(int flags)
  

 /* family = AF_UNSPEC finds ARP table entries.
-   family = AF_LOCAL finds MAC addresses.
-   returns 0 on failure, 1 on success, -1 when restart is required
-*/
-int iface_enumerate(int family, void *parm, callback_t callback)
+   family = AF_LOCAL finds MAC addresses. */
+int iface_enumerate(int family, void *parm, int (*callback)())
 {
  struct sockaddr_nl addr;
  struct nlmsghdr *h;
  ssize_t len;
  static unsigned int seq = 0;
  int callback_ok = 1;
-  unsigned state = 0;

  struct {
    struct nlmsghdr nlh;
    struct rtgenmsg g; 
  } req;

-  /* The netlink socket is not available in child processes. */
-  if (daemon->pipe_to_parent != -1)
-    {
-      my_syslog(LOG_ERR, _("BUG: called iface_enumerate() in child process"));
-      return 0;
-    }
-  
  memset(&req, 0, sizeof(req));
  memset(&addr, 0, sizeof(addr));

  addr.nl_family = AF_NETLINK;
 
+ again: 
  if (family == AF_UNSPEC)
    req.nlh.nlmsg_type = RTM_GETNEIGH;
  else if (family == AF_LOCAL)
@@ -199,12 +193,12 @@ int iface_enumerate(int family, void *parm, callback_t callback)
    
  while (1)
    {
-      if ((len = netlink_recv(0)) == -1)
+      if ((len = netlink_recv()) == -1)
 	{
 	  if (errno == ENOBUFS)
 	    {
-	      nl_multicast_state(state);
-	      return -1;
+	      sleep(1);
+	      goto again;
 	    }
 	  return 0;
 	}
@@ -213,7 +207,7 @@ int iface_enumerate(int family, void *parm, callback_t callback)
 	if (h->nlmsg_pid != netlink_pid || h->nlmsg_type == NLMSG_ERROR)
 	  {
 	    /* May be multicast arriving async */
-	    state = nl_async(h, state);
+	    nl_async(h);
 	  }
 	else if (h->nlmsg_seq != seq)
 	  {
@@ -254,7 +248,7 @@ int iface_enumerate(int family, void *parm, callback_t callback)
 		      }
 		    
 		    if (addr.s_addr && callback_ok)
-		      if (!callback.af_inet(addr, ifa->ifa_index, label,  netmask, broadcast, parm))
+		      if (!((*callback)(addr, ifa->ifa_index, label,  netmask, broadcast, parm)))
 			callback_ok = 0;
 		  }
 		else if (ifa->ifa_family == AF_INET6)
@@ -265,16 +259,7 @@ int iface_enumerate(int family, void *parm, callback_t callback)
 		    
 		    while (RTA_OK(rta, len1))
 		      {
-			/*
-			 * Important comment: (from if_addr.h)
-			 * IFA_ADDRESS is prefix address, rather than local interface address.
-			 * It makes no difference for normally configured broadcast interfaces,
-			 * but for point-to-point IFA_ADDRESS is DESTINATION address,
-			 * local address is supplied in IFA_LOCAL attribute.
-			 */
-			if (rta->rta_type == IFA_LOCAL)
-			  addrp = ((struct in6_addr *)(rta+1));
-			else if (rta->rta_type == IFA_ADDRESS && !addrp)
+			if (rta->rta_type == IFA_ADDRESS)
 			  addrp = ((struct in6_addr *)(rta+1)); 
 			else if (rta->rta_type == IFA_CACHEINFO)
 			  {
@@ -295,9 +280,9 @@ int iface_enumerate(int family, void *parm, callback_t callback)
 		      flags |= IFACE_PERMANENT;
    		    
 		    if (addrp && callback_ok)
-		      if (!callback.af_inet6(addrp, (int)(ifa->ifa_prefixlen), (int)(ifa->ifa_scope), 
+		      if (!((*callback)(addrp, (int)(ifa->ifa_prefixlen), (int)(ifa->ifa_scope), 
 					(int)(ifa->ifa_index), flags, 
-					(unsigned int)preferred, (unsigned int)valid, parm))
+					(int) preferred, (int)valid, parm)))
 			callback_ok = 0;
 		  }
 	      }
@@ -325,7 +310,7 @@ int iface_enumerate(int family, void *parm, callback_t callback)

 	    if (!(neigh->ndm_state & (NUD_NOARP | NUD_INCOMPLETE | NUD_FAILED)) &&
 		inaddr && mac && callback_ok)
-	      if (!callback.af_unspec(neigh->ndm_family, inaddr, mac, maclen, parm))
+	      if (!((*callback)(neigh->ndm_family, inaddr, mac, maclen, parm)))
 		callback_ok = 0;
 	  }
 #ifdef HAVE_DHCP6
@@ -349,35 +334,33 @@ int iface_enumerate(int family, void *parm, callback_t callback)
 	      }

 	    if (mac && callback_ok && !((link->ifi_flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) && 
-		!callback.af_local((int)link->ifi_index, (unsigned int)link->ifi_type, mac, maclen, parm))
+		!((*callback)((int)link->ifi_index, (unsigned int)link->ifi_type, mac, maclen, parm)))
 	      callback_ok = 0;
 	  }
 #endif
    }
 }

-static void nl_multicast_state(unsigned state)
+void netlink_multicast(void)
 {
  ssize_t len;
  struct nlmsghdr *h;
-
-  do {
-    /* don't risk blocking reading netlink messages here. */
-    while ((len = netlink_recv(MSG_DONTWAIT)) != -1)
+  int flags;
  
-      for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len))
-	state = nl_async(h, state);
-  } while (errno == ENOBUFS);
+  /* don't risk blocking reading netlink messages here. */
+  if ((flags = fcntl(daemon->netlinkfd, F_GETFL)) == -1 ||
+      fcntl(daemon->netlinkfd, F_SETFL, flags | O_NONBLOCK) == -1) 
+    return;
+  
+  if ((len = netlink_recv()) != -1)
+    for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len))
+      nl_async(h);
+  
+  /* restore non-blocking status */
+  fcntl(daemon->netlinkfd, F_SETFL, flags);
 }

-void netlink_multicast(void)
-{
-  unsigned state = 0;
-  nl_multicast_state(state);
-}
-
-
-static unsigned nl_async(struct nlmsghdr *h, unsigned state)
+static void nl_async(struct nlmsghdr *h)
 {
  if (h->nlmsg_type == NLMSG_ERROR)
    {
@@ -385,8 +368,7 @@ static unsigned nl_async(struct nlmsghdr *h, unsigned state)
      if (err->error != 0)
 	my_syslog(LOG_ERR, _("netlink returns error: %s"), strerror(-(err->error)));
    }
-  else if (h->nlmsg_pid == 0 && h->nlmsg_type == RTM_NEWROUTE &&
-	   (state & STATE_NEWROUTE)==0)
+  else if (h->nlmsg_pid == 0 && h->nlmsg_type == RTM_NEWROUTE) 
    {
      /* We arrange to receive netlink multicast messages whenever the network route is added.
 	 If this happens and we still have a DNS packet in the buffer, we re-send it.
@@ -398,17 +380,11 @@ static unsigned nl_async(struct nlmsghdr *h, unsigned state)
      if (rtm->rtm_type == RTN_UNICAST && rtm->rtm_scope == RT_SCOPE_LINK &&
 	  (rtm->rtm_table == RT_TABLE_MAIN ||
 	   rtm->rtm_table == RT_TABLE_LOCAL))
-	{
-	  queue_event(EVENT_NEWROUTE);
-	  state |= STATE_NEWROUTE;
-	}
+	queue_event(EVENT_NEWROUTE);
    }
-  else if ((h->nlmsg_type == RTM_NEWADDR || h->nlmsg_type == RTM_DELADDR) &&
-	   (state & STATE_NEWADDR)==0)
-    {
-      queue_event(EVENT_NEWADDR);
-      state |= STATE_NEWADDR;
-    }
-  return state;
+  else if (h->nlmsg_type == RTM_NEWADDR || h->nlmsg_type == RTM_DELADDR) 
+    queue_event(EVENT_NEWADDR);
 }
-#endif /* HAVE_LINUX_NETWORK */
+#endif
+
+
				`@@ -0,0 +1 @@`
				`debian/dnsmasq.runscript name=dnsmasq,logscript,presubj`