2006-10-04 20:05:48 +00:00
|
|
|
#!/bin/sh /etc/rc.common
|
2012-07-01 11:32:46 +00:00
|
|
|
# Copyright (C) 2007-2012 OpenWrt.org
|
2006-10-04 20:05:48 +00:00
|
|
|
|
2016-07-29 12:56:35 +00:00
|
|
|
START=19
|
2011-11-07 22:58:45 +00:00
|
|
|
|
2013-09-17 21:45:30 +00:00
|
|
|
USE_PROCD=1
|
|
|
|
PROG=/usr/sbin/dnsmasq
|
2011-11-07 22:58:45 +00:00
|
|
|
|
2012-07-01 11:32:46 +00:00
|
|
|
ADD_LOCAL_DOMAIN=1
|
|
|
|
ADD_LOCAL_HOSTNAME=1
|
dnsmasq: expand 'add_local_hostname' fexibility including FQDN
ref commit 612e2276b4a2f57fcbbe79b95bec4a46e89d748c
ref commit ec63e3bf1312ab4c666f7417ca9844857214047f
'option add_local_hostname' scripted implementation statically assigns
this host in auto generated host file at init. If IFUP or other signals
do not occur, then address changes are not tracked. The script doesn't
apply all the addresses at an interface. This may make logs obscure.
The script only puts the bare host name (maybe not FQDN) in host file,
but if '--exapandhosts' is enabled, then /etc/hosts entries will be
suffixed, and "127.0.0.1 localhost" becomes "localhost.lan".
dnsmasq provides an option to perform this function, but it is rather
greedy. '--interface-name=<name>,<iface>' will assign the name to all
IP on the specified interface (except link local). This is a useful
feature, but some setups depend on the original restrictive behavior.
'option add_local_fqdn' is added to enhance the feature set, but
if not entered or empty string, then it will default to original
option and behavior. This new option has a few settings. At each
increased setting the most detailed name becomes the PTR record:
0 - same as add_local_hostname 0 or disabled
1 - same as add_local_hostname 1
2 - assigns the bare host name to all IP w/ --dnsmasq-interface
3 - assigns the FQDN and host to all IP w/ --dnsmasq-interface
4 - assigns <iface>.<host>.<domain> and above w/ --dnsmasq-nterface
'option add_wan_fqdn' is added to run the same procedure on
inferred WAN intefaces. If an interface has 'config dhcp' and
'option ignore 1' set, then it is considered WAN. The original
option would only run on DHCP serving interfaces.
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-01-14 02:37:25 +00:00
|
|
|
ADD_WAN_FQDN=0
|
|
|
|
ADD_LOCAL_FQDN=""
|
2012-07-01 11:32:46 +00:00
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
BASECONFIGFILE="/var/etc/dnsmasq.conf"
|
|
|
|
BASEHOSTFILE="/tmp/hosts/dhcp"
|
2014-06-18 10:04:29 +00:00
|
|
|
TRUSTANCHORSFILE="/usr/share/dnsmasq/trust-anchors.conf"
|
2016-06-14 10:00:21 +00:00
|
|
|
TIMEVALIDFILE="/var/state/dnsmasqsec"
|
2016-10-12 08:33:16 +00:00
|
|
|
BASEDHCPSTAMPFILE="/var/run/dnsmasq"
|
dnsmasq: bump to v2.80
Cherry-picked & squashed from relevant commits from master:
dnsmasq v2.80 release
Change from rc1:
91421cb Fix compiler warning.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 6c4d3d705a0d6e508de94dc49736c250ecdae27c)
dnsmasq: remove creation of /etc/ethers
Remove creation of file /etc/ethers in dnsmasq init script as the
file is now created by default in the base-files package by
commit fa3301a28e
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 6c227e45cb6a97c61d9fa2ffa35cebee2a048739)
dnsmasq: bump to dnsmasq v2.80test5
Refresh patches
Remove 240-ubus patch as upstream accepted.
Add uci option ubus which allows to enable/disable ubus support (enabled
by default)
Upstream commits since last bump:
da8b651 Implement --address=/example.com/#
c5db8f9 Tidy 7f876b64c22b2b18412e2e3d8506ee33e42db7c
974a6d0 Add --caa-record
b758b67 Improve logging of RRs from --dns-rr.
9bafdc6 Tidy up file parsing code.
97f876b Properly deal with unaligned addresses in DHCPv6 packets.
cbfbd17 Fix broken DNSSEC records in previous.
b6f926f Don't return NXDOMAIN to empty non-terminals.
c822620 Add --dhcp-name-match
397c050 Handle case of --auth-zone but no --auth-server.
1682d15 Add missing EDNS0 section. EDNS0 section missing in replies to EDNS0-containing queries where answer generated from --local=/<domain>/
dd33e98 Fix crash parsing a --synth-domain with no prefix. Problem introduced in 2.79/6b2b564ac34cb3c862f168e6b1457f9f0b9ca69c
c16d966 Add copyright to src/metrics.h
1dfed16 Remove C99 only code.
6f835ed Format fixes - ubus.c
9d6fd17 dnsmasq.c fix OPT_UBUS option usage
8c1b6a5 New metrics and ubus files.
8dcdb33 Add --enable-ubus option.
aba8bbb Add collection of metrics
caf4d57 Add OpenWRT ubus patch
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 3d377f4375c6e4a66c6741bbd2549ad53ef671b3)
dnsmasq: bump to dnsmasq 2.80test6
Refresh patches
Changes since latest bump:
af3bd07 Man page typo.
d682099 Picky changes to 47b45b2967c931fed3c89a2e6a8df9f9183a5789
47b45b2 Fix lengths of interface names
2b38e38 Minor improvements in lease-tools
282eab7 Mark die function as never returning
c346f61 Handle ANY queries in context of da8b6517decdac593e7ce24bde2824dd841725c8
03212e5 Manpage typo.
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 43d4b8e89e68fcab00698ee3b70a58c74813a6a7)
dnsmasq: Handle memory allocation failure in make_non_terminals()
Backport upstream commit:
ea6cc33 Handle memory allocation failure in make_non_terminals()
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 687168ccd9154b1fb7a470fa8f42ce64a135f51d)
dnsmasq: Change behavior when RD bit unset in queries.
Backport upstream commit
Change anti cache-snooping behaviour with queries with the
recursion-desired bit unset. Instead to returning SERVFAIL, we
now always forward, and never answer from the cache. This
allows "dig +trace" command to work.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 6c4cbe94bd940b5c061e27744eb78805764d6b34)
dnsmasq: bump to v2.80test7
Bump to latest test release:
3a610a0 Finesse allocation of memory for "struct crec" cache entries.
48b090c Fix b6f926fbefcd2471699599e44f32b8d25b87b471 to not SEGV on startup (rarely).
4139298 Change behavior when RD bit unset in queries.
51cc10f Add warning about 0.0.0.0 and :: addresses to man page.
ea6cc33 Handle memory allocation failure in make_non_terminals()
ad03967 Add debian/tmpfiles.conf
f4fd07d Debian bugfix.
e3c08a3 Debian packaging fix. (restorecon)
118011f Debian packaging fix. (tmpfiles.d)
Delete our own backports of ea6cc33 & 4139298, so the only real changes
here, since we don't care about the Debian stuff are 48b090c & 3a610a0
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit d9a37d8d1eb7d117d5aa44924064a4a3b5517ddd)
dnsmasq: bump to v2.80test8
e1791f3 Fix logging of DNSSEC queries in TCP mode. Destination server address was misleading.
0fdf3c1 Fix dhcp-match-name to match hostname, not complete FQDN.
ee1df06 Tweak strategy for confirming SLAAC addresses.
1e87eba Clarify manpage for --auth-sec-servers
0893347 Make interface spec optional in --auth-server.
7cbf497 Example config file fix for CERT Vulnerability VU#598349.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 30cc5b0bf4f3cdfe950ca7fc380a34c81dd9d7e4)
dnsmasq: add dhcp-ignore-names support - CERT VU#598349
dnsmasq v2.80test8 adds the ability to ignore dhcp client's requests for
specific hostnames. Clients claiming certain hostnames and thus
claiming DNS namespace represent a potential security risk. e.g. a
malicious host could claim 'wpad' for itself and redirect other web
client requests to it for nefarious purpose. See CERT VU#598349 for more
details.
Some Samsung TVs are claiming the hostname 'localhost', it is believed
not (yet) for nefarious purposes.
/usr/share/dnsmasq/dhcpbogushostname.conf contains a list of hostnames
in correct syntax to be excluded. e.g.
dhcp-name-match=set:dhcp_bogus_hostname,localhost
Inclusion of this file is controlled by uci option dhcpbogushostname
which is enabled by default.
To be absolutely clear, DHCP leases to these requesting hosts are still
permitted, but they do NOT get to claim ownership of the hostname
itself and hence put into DNS for other hosts to be confused/manipulate by.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit a45f4f50e16cd2d0370a4470c3ede0c6c7754ba9)
dnsmasq: fix compile issue
Fix compile issue in case HAVE_BROKEN_RTC is enabled
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 39e5e17045aceb2bfbd6b5c6ecfd6cfbce2f3311)
dnsmasq: bump to v2.80rc1
53792c9 fix typo
df07182 Update German translation.
Remove local patch 001-fix-typo which is a backport of the above 53792c9
There is no practical difference between our test8 release and this rc
release, but this does at least say 'release candidate'
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit b8bc672f247a68bc6f72f08f9352cd7aaa5cb9c4)
dnsmasq: fix dnsmasq failure to start when ujail'd
This patch fixes jailed dnsmasq running into the following issue:
|dnsmasq[1]: cannot read /usr/share/dnsmasq/dhcpbogushostname.conf: No such file or directory
|dnsmasq[1]: FAILED to start up
|procd: Instance dnsmasq::cfg01411c s in a crash loop 6 crashes, 0 seconds since last crash
Fixes: a45f4f50e16 ("dnsmasq: add dhcp-ignore-names support - CERT VU#598349")
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
[bump package release]
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 583466bb5b374b29b6b7cba6f065e97c4734f742)
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2018-08-19 18:52:00 +00:00
|
|
|
DHCPBOGUSHOSTNAMEFILE="/usr/share/dnsmasq/dhcpbogushostname.conf"
|
2017-02-20 10:15:55 +00:00
|
|
|
RFC6761FILE="/usr/share/dnsmasq/rfc6761.conf"
|
2017-05-06 10:56:26 +00:00
|
|
|
DHCPSCRIPT="/usr/lib/dnsmasq/dhcp-script.sh"
|
2012-04-02 22:31:21 +00:00
|
|
|
|
2016-12-22 18:20:25 +00:00
|
|
|
DNSMASQ_DHCP_VER=4
|
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend() {
|
|
|
|
local value="$1"
|
|
|
|
|
2016-06-13 13:21:47 +00:00
|
|
|
echo "${value#--}" >> $CONFIGFILE_TMP
|
2012-04-02 22:31:21 +00:00
|
|
|
}
|
|
|
|
|
2015-08-31 17:11:41 +00:00
|
|
|
hex_to_hostid() {
|
2016-12-22 18:24:12 +00:00
|
|
|
local var="$1"
|
|
|
|
local hex="${2#0x}" # strip optional "0x" prefix
|
|
|
|
|
|
|
|
if [ -n "${hex//[0-9a-fA-F]/}" ]; then
|
|
|
|
# is invalid hex literal
|
|
|
|
return 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
# convert into host id
|
|
|
|
export "$var=$(
|
|
|
|
printf "%0x:%0x" \
|
|
|
|
$(((0x$hex >> 16) % 65536)) \
|
|
|
|
$(( 0x$hex % 65536))
|
|
|
|
)"
|
|
|
|
|
|
|
|
return 0
|
2015-08-31 17:11:41 +00:00
|
|
|
}
|
|
|
|
|
2007-03-17 13:31:13 +00:00
|
|
|
dhcp_calc() {
|
|
|
|
local ip="$1"
|
|
|
|
local res=0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2007-03-17 13:31:13 +00:00
|
|
|
while [ -n "$ip" ]; do
|
|
|
|
part="${ip%%.*}"
|
|
|
|
res="$(($res * 256))"
|
|
|
|
res="$(($res + $part))"
|
|
|
|
[ "${ip%.*}" != "$ip" ] && ip="${ip#*.}" || ip=
|
|
|
|
done
|
|
|
|
echo "$res"
|
|
|
|
}
|
|
|
|
|
2013-12-21 13:31:28 +00:00
|
|
|
dhcp_check() {
|
|
|
|
local ifname="$1"
|
2016-10-12 08:33:16 +00:00
|
|
|
local stamp="${BASEDHCPSTAMPFILE_CFG}.${ifname}.dhcp"
|
2013-12-21 13:31:28 +00:00
|
|
|
local rv=0
|
|
|
|
|
|
|
|
[ -s "$stamp" ] && return $(cat "$stamp")
|
|
|
|
|
2016-07-29 12:26:55 +00:00
|
|
|
# If there's no carrier yet, skip this interface.
|
|
|
|
# The init script will be called again once the link is up
|
|
|
|
case "$(devstatus "$ifname" | jsonfilter -e @.carrier)" in
|
|
|
|
false) return 1;;
|
|
|
|
esac
|
|
|
|
|
2013-12-21 13:31:28 +00:00
|
|
|
udhcpc -n -q -s /bin/true -t 1 -i "$ifname" >&- && rv=1 || rv=0
|
|
|
|
|
|
|
|
[ $rv -eq 1 ] && \
|
|
|
|
logger -t dnsmasq \
|
|
|
|
"found already running DHCP-server on interface '$ifname'" \
|
|
|
|
"refusing to start, use 'option force 1' to override"
|
|
|
|
|
|
|
|
echo $rv > "$stamp"
|
|
|
|
return $rv
|
|
|
|
}
|
|
|
|
|
|
|
|
log_once() {
|
|
|
|
pidof dnsmasq >/dev/null || \
|
|
|
|
logger -t dnsmasq "$@"
|
|
|
|
}
|
|
|
|
|
2017-06-09 14:24:12 +00:00
|
|
|
has_handler() {
|
|
|
|
local file
|
|
|
|
|
|
|
|
for file in /etc/hotplug.d/dhcp/* /etc/hotplug.d/tftp/* /etc/hotplug.d/neigh/*; do
|
|
|
|
[ -f "$file" ] && return 0
|
|
|
|
done
|
|
|
|
|
|
|
|
return 1
|
|
|
|
}
|
|
|
|
|
2007-08-29 18:40:52 +00:00
|
|
|
append_bool() {
|
|
|
|
local section="$1"
|
|
|
|
local option="$2"
|
|
|
|
local value="$3"
|
2017-02-24 10:08:30 +00:00
|
|
|
local default="$4"
|
2007-09-25 23:16:31 +00:00
|
|
|
local _loctmp
|
2017-02-24 10:08:30 +00:00
|
|
|
[ -z "$default" ] && default="0"
|
|
|
|
config_get_bool _loctmp "$section" "$option" "$default"
|
2012-04-02 22:31:21 +00:00
|
|
|
[ $_loctmp -gt 0 ] && xappend "$value"
|
2007-09-25 23:16:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
append_parm() {
|
|
|
|
local section="$1"
|
|
|
|
local option="$2"
|
|
|
|
local switch="$3"
|
2015-12-17 02:23:03 +00:00
|
|
|
local default="$4"
|
2007-09-25 23:16:31 +00:00
|
|
|
local _loctmp
|
2015-12-17 02:23:03 +00:00
|
|
|
config_get _loctmp "$section" "$option" "$default"
|
2007-09-25 23:16:31 +00:00
|
|
|
[ -z "$_loctmp" ] && return 0
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "$switch=$_loctmp"
|
2007-08-29 18:40:52 +00:00
|
|
|
}
|
|
|
|
|
2009-01-27 22:58:11 +00:00
|
|
|
append_server() {
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--server=$1"
|
2009-01-27 22:58:11 +00:00
|
|
|
}
|
|
|
|
|
2017-06-28 15:07:39 +00:00
|
|
|
append_rev_server() {
|
|
|
|
xappend "--rev-server=$1"
|
|
|
|
}
|
|
|
|
|
2012-07-05 17:54:14 +00:00
|
|
|
append_address() {
|
|
|
|
xappend "--address=$1"
|
|
|
|
}
|
|
|
|
|
2014-12-17 05:59:12 +00:00
|
|
|
append_ipset() {
|
|
|
|
xappend "--ipset=$1"
|
|
|
|
}
|
|
|
|
|
2009-05-05 09:33:56 +00:00
|
|
|
append_interface() {
|
2017-07-10 08:53:29 +00:00
|
|
|
network_get_device ifname "$1" || ifname="$1"
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--interface=$ifname"
|
2009-05-05 09:33:56 +00:00
|
|
|
}
|
|
|
|
|
2017-10-12 21:16:06 +00:00
|
|
|
append_listenaddress() {
|
|
|
|
xappend "--listen-address=$1"
|
|
|
|
}
|
|
|
|
|
2009-09-16 18:15:31 +00:00
|
|
|
append_notinterface() {
|
2017-07-10 08:53:29 +00:00
|
|
|
network_get_device ifname "$1" || ifname="$1"
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--except-interface=$ifname"
|
2009-09-16 18:15:31 +00:00
|
|
|
}
|
|
|
|
|
2009-11-22 11:52:08 +00:00
|
|
|
append_addnhosts() {
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--addn-hosts=$1"
|
2009-11-22 11:52:08 +00:00
|
|
|
}
|
|
|
|
|
2010-08-11 10:37:33 +00:00
|
|
|
append_bogusnxdomain() {
|
2013-09-23 21:58:36 +00:00
|
|
|
xappend "--bogus-nxdomain=$1"
|
2010-08-11 10:37:33 +00:00
|
|
|
}
|
|
|
|
|
2015-03-13 08:39:08 +00:00
|
|
|
append_pxe_service() {
|
|
|
|
xappend "--pxe-service=$1"
|
|
|
|
}
|
|
|
|
|
2017-05-02 15:05:07 +00:00
|
|
|
append_interface_name() {
|
|
|
|
xappend "--interface-name=$1,$2"
|
|
|
|
}
|
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
filter_dnsmasq() {
|
|
|
|
local cfg="$1" func="$2" match_cfg="$3" found_cfg
|
2012-04-02 22:31:21 +00:00
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
# use entry when no instance entry set, or if it matches
|
|
|
|
config_get found_cfg "$cfg" "instance"
|
|
|
|
if [ -z "$found_cfg" -o "$found_cfg" = "$match_cfg" ]; then
|
|
|
|
$func $cfg
|
2015-12-17 02:23:03 +00:00
|
|
|
fi
|
2007-08-29 18:40:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
dhcp_subscrid_add() {
|
|
|
|
local cfg="$1"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2010-01-08 00:03:08 +00:00
|
|
|
config_get networkid "$cfg" networkid
|
|
|
|
[ -n "$networkid" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2007-08-29 18:40:52 +00:00
|
|
|
config_get subscriberid "$cfg" subscriberid
|
|
|
|
[ -n "$subscriberid" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--dhcp-subscrid=$networkid,$subscriberid"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-05-19 20:17:56 +00:00
|
|
|
config_get_bool force "$cfg" force 0
|
|
|
|
|
|
|
|
dhcp_option_add "$cfg" "$networkid" "$force"
|
2007-08-29 18:40:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
dhcp_remoteid_add() {
|
|
|
|
local cfg="$1"
|
|
|
|
|
2010-01-08 00:03:08 +00:00
|
|
|
config_get networkid "$cfg" networkid
|
|
|
|
[ -n "$networkid" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2007-08-29 18:40:52 +00:00
|
|
|
config_get remoteid "$cfg" remoteid
|
|
|
|
[ -n "$remoteid" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--dhcp-remoteid=$networkid,$remoteid"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-05-19 20:17:56 +00:00
|
|
|
config_get_bool force "$cfg" force 0
|
|
|
|
|
|
|
|
dhcp_option_add "$cfg" "$networkid" "$force"
|
2007-08-29 18:40:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
dhcp_circuitid_add() {
|
2016-12-22 18:20:25 +00:00
|
|
|
# TODO: DHCPV6 does not have circuitid; catch "option6:"
|
2007-08-29 18:40:52 +00:00
|
|
|
local cfg="$1"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2010-01-08 00:03:08 +00:00
|
|
|
config_get networkid "$cfg" networkid
|
|
|
|
[ -n "$networkid" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2007-08-29 18:40:52 +00:00
|
|
|
config_get circuitid "$cfg" circuitid
|
|
|
|
[ -n "$circuitid" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--dhcp-circuitid=$networkid,$circuitid"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-05-19 20:17:56 +00:00
|
|
|
config_get_bool force "$cfg" force 0
|
|
|
|
|
|
|
|
dhcp_option_add "$cfg" "$networkid" "$force"
|
2007-08-29 18:40:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
dhcp_userclass_add() {
|
|
|
|
local cfg="$1"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2010-01-08 00:03:08 +00:00
|
|
|
config_get networkid "$cfg" networkid
|
|
|
|
[ -n "$networkid" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2007-08-29 18:40:52 +00:00
|
|
|
config_get userclass "$cfg" userclass
|
|
|
|
[ -n "$userclass" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--dhcp-userclass=$networkid,$userclass"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-05-19 20:17:56 +00:00
|
|
|
config_get_bool force "$cfg" force 0
|
|
|
|
|
|
|
|
dhcp_option_add "$cfg" "$networkid" "$force"
|
2007-08-29 18:40:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
dhcp_vendorclass_add() {
|
2016-12-22 18:20:25 +00:00
|
|
|
# TODO: DHCPV6 vendor class has stricter definitions; catch? fixup?
|
2007-08-29 18:40:52 +00:00
|
|
|
local cfg="$1"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2010-01-08 00:03:08 +00:00
|
|
|
config_get networkid "$cfg" networkid
|
|
|
|
[ -n "$networkid" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2007-08-29 18:40:52 +00:00
|
|
|
config_get vendorclass "$cfg" vendorclass
|
|
|
|
[ -n "$vendorclass" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--dhcp-vendorclass=$networkid,$vendorclass"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-05-19 20:17:56 +00:00
|
|
|
config_get_bool force "$cfg" force 0
|
|
|
|
|
|
|
|
dhcp_option_add "$cfg" "$networkid" "$force"
|
2007-08-29 18:40:52 +00:00
|
|
|
}
|
|
|
|
|
2016-09-02 11:51:09 +00:00
|
|
|
dhcp_match_add() {
|
|
|
|
local cfg="$1"
|
|
|
|
|
|
|
|
config_get networkid "$cfg" networkid
|
|
|
|
[ -n "$networkid" ] || return 0
|
|
|
|
|
|
|
|
config_get match "$cfg" match
|
|
|
|
[ -n "$match" ] || return 0
|
|
|
|
|
|
|
|
xappend "--dhcp-match=$networkid,$match"
|
|
|
|
|
|
|
|
config_get_bool force "$cfg" force 0
|
|
|
|
|
|
|
|
dhcp_option_add "$cfg" "$networkid" "$force"
|
|
|
|
}
|
|
|
|
|
2007-08-29 18:40:52 +00:00
|
|
|
dhcp_host_add() {
|
|
|
|
local cfg="$1"
|
2017-11-28 11:38:40 +00:00
|
|
|
local hosttag nametime addrs duids macs tags
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-05-19 20:17:56 +00:00
|
|
|
config_get_bool force "$cfg" force 0
|
|
|
|
|
2010-01-08 00:03:08 +00:00
|
|
|
config_get networkid "$cfg" networkid
|
2012-05-19 20:17:56 +00:00
|
|
|
[ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid" "$force"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2016-04-17 12:52:54 +00:00
|
|
|
config_get_bool enable "$cfg" enable 1
|
|
|
|
[ "$enable" = "0" ] && return 0
|
|
|
|
|
2011-05-24 09:12:50 +00:00
|
|
|
config_get name "$cfg" name
|
2007-11-05 14:14:06 +00:00
|
|
|
config_get ip "$cfg" ip
|
2016-12-22 18:20:25 +00:00
|
|
|
config_get hostid "$cfg" hostid
|
|
|
|
|
|
|
|
[ -n "$ip" -o -n "$name" -o -n "$hostid" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2014-08-28 06:27:53 +00:00
|
|
|
config_get_bool dns "$cfg" dns 0
|
|
|
|
[ "$dns" = "1" -a -n "$ip" -a -n "$name" ] && {
|
2017-12-07 09:11:50 +00:00
|
|
|
echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE_TMP
|
2014-08-28 06:27:53 +00:00
|
|
|
}
|
|
|
|
|
2010-03-08 23:28:55 +00:00
|
|
|
config_get mac "$cfg" mac
|
2016-12-22 18:20:25 +00:00
|
|
|
config_get duid "$cfg" duid
|
|
|
|
config_get tag "$cfg" tag
|
|
|
|
|
2014-08-28 06:27:57 +00:00
|
|
|
if [ -n "$mac" ]; then
|
|
|
|
# --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap
|
2016-12-22 18:20:25 +00:00
|
|
|
# many MAC are possible to track a laptop ON/OFF dock
|
2014-08-28 06:27:57 +00:00
|
|
|
for m in $mac; do append macs "$m" ","; done
|
2016-12-22 18:20:25 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if [ $DNSMASQ_DHCP_VER -eq 6 -a -n "$duid" ]; then
|
|
|
|
# --dhcp-host=id:00:03:00:01:12:00:00:01:02:03,[::beef],lap
|
|
|
|
# one (virtual) machine gets one DUID per RFC3315
|
|
|
|
duids="id:${duid// */}"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ -z "$macs" -a -z "$duids" ]; then
|
|
|
|
# --dhcp-host=lap,192.168.0.199,[::beef]
|
2013-01-02 15:14:19 +00:00
|
|
|
[ -n "$name" ] || return 0
|
2014-08-28 06:27:57 +00:00
|
|
|
macs="$name"
|
2013-01-02 15:14:19 +00:00
|
|
|
name=""
|
2014-08-28 06:27:57 +00:00
|
|
|
fi
|
2010-03-08 23:28:55 +00:00
|
|
|
|
2016-12-22 18:20:25 +00:00
|
|
|
if [ -n "$hostid" ]; then
|
2017-08-25 12:21:48 +00:00
|
|
|
hex_to_hostid hostid "$hostid"
|
2015-08-31 17:11:41 +00:00
|
|
|
fi
|
|
|
|
|
2017-08-25 06:10:21 +00:00
|
|
|
if [ -n "$tag" ]; then
|
|
|
|
for t in $tag; do append tags "$t" ",set:"; done
|
|
|
|
fi
|
|
|
|
|
2013-10-11 18:33:15 +00:00
|
|
|
config_get_bool broadcast "$cfg" broadcast 0
|
2016-02-26 09:13:03 +00:00
|
|
|
config_get leasetime "$cfg" leasetime
|
|
|
|
|
2016-12-22 18:20:25 +00:00
|
|
|
[ "$broadcast" = "0" ] && broadcast= || broadcast=",set:needs-broadcast"
|
|
|
|
|
2017-08-25 06:10:21 +00:00
|
|
|
hosttag="${networkid:+,set:${networkid}}${tags:+,set:${tags}}$broadcast"
|
2016-12-22 18:20:25 +00:00
|
|
|
nametime="${name:+,$name}${leasetime:+,$leasetime}"
|
|
|
|
|
|
|
|
if [ $DNSMASQ_DHCP_VER -eq 6 ]; then
|
|
|
|
addrs="${ip:+,$ip}${hostid:+,[::$hostid]}"
|
|
|
|
xappend "--dhcp-host=$macs${duids:+,$duids}$hosttag$addrs$nametime"
|
|
|
|
else
|
|
|
|
xappend "--dhcp-host=$macs$hosttag${ip:+,$ip}$nametime"
|
|
|
|
fi
|
dnsmasq: add support for set: and tag: pairs
On my network, I have a variety of machines and appliances, some of which need different configuration issues than the default options.
For example:
config host
option name 'client'
option mac '00:01:02:03:04:05'
option ip '192.168.1.20'
option tag 'acme'
config tag acme
option force '1'
list dhcp_option 'option:router,192.168.1.253'
list dhcp_option 'option:domain-name,acme.com'
list dhcp_option 'option:domain-search,acme.com,redfish-solutions.com'
which allows me to override the default router for my client's host, as well as its domain-name, and its domain-search.
this causes the following config lines:
dhcp-host=00:01:02:03:04:05,set:acme,192.168.1.20,client
dhcp-option-force=tag:acme,option:router,192.168.1.253
dhcp-option-force=tag:acme,option:domain-name,acme.com
dhcp-option-force=tag:acme,option:domain-search:acme.com,redfish-solutions.com
This could be useful elsewhere, for instance, if you have an IP CCTV that you don't want to have a default-route, etc.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
SVN-Revision: 31815
2012-05-19 20:17:54 +00:00
|
|
|
}
|
|
|
|
|
dnsmasq: expand 'add_local_hostname' fexibility including FQDN
ref commit 612e2276b4a2f57fcbbe79b95bec4a46e89d748c
ref commit ec63e3bf1312ab4c666f7417ca9844857214047f
'option add_local_hostname' scripted implementation statically assigns
this host in auto generated host file at init. If IFUP or other signals
do not occur, then address changes are not tracked. The script doesn't
apply all the addresses at an interface. This may make logs obscure.
The script only puts the bare host name (maybe not FQDN) in host file,
but if '--exapandhosts' is enabled, then /etc/hosts entries will be
suffixed, and "127.0.0.1 localhost" becomes "localhost.lan".
dnsmasq provides an option to perform this function, but it is rather
greedy. '--interface-name=<name>,<iface>' will assign the name to all
IP on the specified interface (except link local). This is a useful
feature, but some setups depend on the original restrictive behavior.
'option add_local_fqdn' is added to enhance the feature set, but
if not entered or empty string, then it will default to original
option and behavior. This new option has a few settings. At each
increased setting the most detailed name becomes the PTR record:
0 - same as add_local_hostname 0 or disabled
1 - same as add_local_hostname 1
2 - assigns the bare host name to all IP w/ --dnsmasq-interface
3 - assigns the FQDN and host to all IP w/ --dnsmasq-interface
4 - assigns <iface>.<host>.<domain> and above w/ --dnsmasq-nterface
'option add_wan_fqdn' is added to run the same procedure on
inferred WAN intefaces. If an interface has 'config dhcp' and
'option ignore 1' set, then it is considered WAN. The original
option would only run on DHCP serving interfaces.
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-01-14 02:37:25 +00:00
|
|
|
dhcp_this_host_add() {
|
|
|
|
local net="$1"
|
|
|
|
local ifname="$2"
|
|
|
|
local mode="$3"
|
|
|
|
local routerstub routername ifdashname
|
|
|
|
local lanaddr lanaddr6 lanaddrs6 ulaprefix
|
|
|
|
|
|
|
|
if [ "$mode" -gt 0 ] ; then
|
|
|
|
ifdashname="${ifname//./-}"
|
|
|
|
routerstub="$( md5sum /etc/os-release )"
|
|
|
|
routerstub="router-${routerstub// */}"
|
|
|
|
routername="$( uci_get system @system[0] hostname $routerstub )"
|
|
|
|
|
|
|
|
if [ "$mode" -gt 1 ] ; then
|
|
|
|
if [ "$mode" -gt 2 ] ; then
|
|
|
|
if [ "$mode" -gt 3 ] ; then
|
2017-05-08 20:38:58 +00:00
|
|
|
append_interface_name "$ifdashname.$routername.$DOMAIN" "$ifname"
|
dnsmasq: expand 'add_local_hostname' fexibility including FQDN
ref commit 612e2276b4a2f57fcbbe79b95bec4a46e89d748c
ref commit ec63e3bf1312ab4c666f7417ca9844857214047f
'option add_local_hostname' scripted implementation statically assigns
this host in auto generated host file at init. If IFUP or other signals
do not occur, then address changes are not tracked. The script doesn't
apply all the addresses at an interface. This may make logs obscure.
The script only puts the bare host name (maybe not FQDN) in host file,
but if '--exapandhosts' is enabled, then /etc/hosts entries will be
suffixed, and "127.0.0.1 localhost" becomes "localhost.lan".
dnsmasq provides an option to perform this function, but it is rather
greedy. '--interface-name=<name>,<iface>' will assign the name to all
IP on the specified interface (except link local). This is a useful
feature, but some setups depend on the original restrictive behavior.
'option add_local_fqdn' is added to enhance the feature set, but
if not entered or empty string, then it will default to original
option and behavior. This new option has a few settings. At each
increased setting the most detailed name becomes the PTR record:
0 - same as add_local_hostname 0 or disabled
1 - same as add_local_hostname 1
2 - assigns the bare host name to all IP w/ --dnsmasq-interface
3 - assigns the FQDN and host to all IP w/ --dnsmasq-interface
4 - assigns <iface>.<host>.<domain> and above w/ --dnsmasq-nterface
'option add_wan_fqdn' is added to run the same procedure on
inferred WAN intefaces. If an interface has 'config dhcp' and
'option ignore 1' set, then it is considered WAN. The original
option would only run on DHCP serving interfaces.
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-01-14 02:37:25 +00:00
|
|
|
fi
|
|
|
|
|
2017-05-08 20:38:58 +00:00
|
|
|
append_interface_name "$routername.$DOMAIN" "$ifname"
|
dnsmasq: expand 'add_local_hostname' fexibility including FQDN
ref commit 612e2276b4a2f57fcbbe79b95bec4a46e89d748c
ref commit ec63e3bf1312ab4c666f7417ca9844857214047f
'option add_local_hostname' scripted implementation statically assigns
this host in auto generated host file at init. If IFUP or other signals
do not occur, then address changes are not tracked. The script doesn't
apply all the addresses at an interface. This may make logs obscure.
The script only puts the bare host name (maybe not FQDN) in host file,
but if '--exapandhosts' is enabled, then /etc/hosts entries will be
suffixed, and "127.0.0.1 localhost" becomes "localhost.lan".
dnsmasq provides an option to perform this function, but it is rather
greedy. '--interface-name=<name>,<iface>' will assign the name to all
IP on the specified interface (except link local). This is a useful
feature, but some setups depend on the original restrictive behavior.
'option add_local_fqdn' is added to enhance the feature set, but
if not entered or empty string, then it will default to original
option and behavior. This new option has a few settings. At each
increased setting the most detailed name becomes the PTR record:
0 - same as add_local_hostname 0 or disabled
1 - same as add_local_hostname 1
2 - assigns the bare host name to all IP w/ --dnsmasq-interface
3 - assigns the FQDN and host to all IP w/ --dnsmasq-interface
4 - assigns <iface>.<host>.<domain> and above w/ --dnsmasq-nterface
'option add_wan_fqdn' is added to run the same procedure on
inferred WAN intefaces. If an interface has 'config dhcp' and
'option ignore 1' set, then it is considered WAN. The original
option would only run on DHCP serving interfaces.
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-01-14 02:37:25 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
# All IP addresses discovered by dnsmasq will be labeled (except fe80::)
|
2017-05-08 20:38:58 +00:00
|
|
|
append_interface_name "$routername" "$ifname"
|
dnsmasq: expand 'add_local_hostname' fexibility including FQDN
ref commit 612e2276b4a2f57fcbbe79b95bec4a46e89d748c
ref commit ec63e3bf1312ab4c666f7417ca9844857214047f
'option add_local_hostname' scripted implementation statically assigns
this host in auto generated host file at init. If IFUP or other signals
do not occur, then address changes are not tracked. The script doesn't
apply all the addresses at an interface. This may make logs obscure.
The script only puts the bare host name (maybe not FQDN) in host file,
but if '--exapandhosts' is enabled, then /etc/hosts entries will be
suffixed, and "127.0.0.1 localhost" becomes "localhost.lan".
dnsmasq provides an option to perform this function, but it is rather
greedy. '--interface-name=<name>,<iface>' will assign the name to all
IP on the specified interface (except link local). This is a useful
feature, but some setups depend on the original restrictive behavior.
'option add_local_fqdn' is added to enhance the feature set, but
if not entered or empty string, then it will default to original
option and behavior. This new option has a few settings. At each
increased setting the most detailed name becomes the PTR record:
0 - same as add_local_hostname 0 or disabled
1 - same as add_local_hostname 1
2 - assigns the bare host name to all IP w/ --dnsmasq-interface
3 - assigns the FQDN and host to all IP w/ --dnsmasq-interface
4 - assigns <iface>.<host>.<domain> and above w/ --dnsmasq-nterface
'option add_wan_fqdn' is added to run the same procedure on
inferred WAN intefaces. If an interface has 'config dhcp' and
'option ignore 1' set, then it is considered WAN. The original
option would only run on DHCP serving interfaces.
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-01-14 02:37:25 +00:00
|
|
|
|
|
|
|
else
|
|
|
|
# This uses a static host file entry for only limited addresses.
|
|
|
|
# Use dnsmasq option "--expandhosts" to enable FQDN on host files.
|
|
|
|
ulaprefix="$(uci_get network @globals[0] ula_prefix)"
|
|
|
|
network_get_ipaddr lanaddr "$net"
|
|
|
|
network_get_ipaddrs6 lanaddrs6 "$net"
|
|
|
|
|
|
|
|
if [ -n "$lanaddr" ] ; then
|
|
|
|
dhcp_domain_add "" "$routername" "$lanaddr"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ -n "$ulaprefix" -a -n "$lanaddrs6" ] ; then
|
|
|
|
for lanaddr6 in $lanaddrs6 ; do
|
|
|
|
case "$lanaddr6" in
|
|
|
|
"${ulaprefix%%:/*}"*)
|
2017-08-25 12:21:48 +00:00
|
|
|
dhcp_domain_add "" "$routername" "$lanaddr6"
|
|
|
|
;;
|
dnsmasq: expand 'add_local_hostname' fexibility including FQDN
ref commit 612e2276b4a2f57fcbbe79b95bec4a46e89d748c
ref commit ec63e3bf1312ab4c666f7417ca9844857214047f
'option add_local_hostname' scripted implementation statically assigns
this host in auto generated host file at init. If IFUP or other signals
do not occur, then address changes are not tracked. The script doesn't
apply all the addresses at an interface. This may make logs obscure.
The script only puts the bare host name (maybe not FQDN) in host file,
but if '--exapandhosts' is enabled, then /etc/hosts entries will be
suffixed, and "127.0.0.1 localhost" becomes "localhost.lan".
dnsmasq provides an option to perform this function, but it is rather
greedy. '--interface-name=<name>,<iface>' will assign the name to all
IP on the specified interface (except link local). This is a useful
feature, but some setups depend on the original restrictive behavior.
'option add_local_fqdn' is added to enhance the feature set, but
if not entered or empty string, then it will default to original
option and behavior. This new option has a few settings. At each
increased setting the most detailed name becomes the PTR record:
0 - same as add_local_hostname 0 or disabled
1 - same as add_local_hostname 1
2 - assigns the bare host name to all IP w/ --dnsmasq-interface
3 - assigns the FQDN and host to all IP w/ --dnsmasq-interface
4 - assigns <iface>.<host>.<domain> and above w/ --dnsmasq-nterface
'option add_wan_fqdn' is added to run the same procedure on
inferred WAN intefaces. If an interface has 'config dhcp' and
'option ignore 1' set, then it is considered WAN. The original
option would only run on DHCP serving interfaces.
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-01-14 02:37:25 +00:00
|
|
|
esac
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
dnsmasq: add support for set: and tag: pairs
On my network, I have a variety of machines and appliances, some of which need different configuration issues than the default options.
For example:
config host
option name 'client'
option mac '00:01:02:03:04:05'
option ip '192.168.1.20'
option tag 'acme'
config tag acme
option force '1'
list dhcp_option 'option:router,192.168.1.253'
list dhcp_option 'option:domain-name,acme.com'
list dhcp_option 'option:domain-search,acme.com,redfish-solutions.com'
which allows me to override the default router for my client's host, as well as its domain-name, and its domain-search.
this causes the following config lines:
dhcp-host=00:01:02:03:04:05,set:acme,192.168.1.20,client
dhcp-option-force=tag:acme,option:router,192.168.1.253
dhcp-option-force=tag:acme,option:domain-name,acme.com
dhcp-option-force=tag:acme,option:domain-search:acme.com,redfish-solutions.com
This could be useful elsewhere, for instance, if you have an IP CCTV that you don't want to have a default-route, etc.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
SVN-Revision: 31815
2012-05-19 20:17:54 +00:00
|
|
|
dhcp_tag_add() {
|
2016-12-22 18:20:25 +00:00
|
|
|
# NOTE: dnsmasq has explicit "option6:" prefix for DHCPv6 so no collisions
|
dnsmasq: add support for set: and tag: pairs
On my network, I have a variety of machines and appliances, some of which need different configuration issues than the default options.
For example:
config host
option name 'client'
option mac '00:01:02:03:04:05'
option ip '192.168.1.20'
option tag 'acme'
config tag acme
option force '1'
list dhcp_option 'option:router,192.168.1.253'
list dhcp_option 'option:domain-name,acme.com'
list dhcp_option 'option:domain-search,acme.com,redfish-solutions.com'
which allows me to override the default router for my client's host, as well as its domain-name, and its domain-search.
this causes the following config lines:
dhcp-host=00:01:02:03:04:05,set:acme,192.168.1.20,client
dhcp-option-force=tag:acme,option:router,192.168.1.253
dhcp-option-force=tag:acme,option:domain-name,acme.com
dhcp-option-force=tag:acme,option:domain-search:acme.com,redfish-solutions.com
This could be useful elsewhere, for instance, if you have an IP CCTV that you don't want to have a default-route, etc.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
SVN-Revision: 31815
2012-05-19 20:17:54 +00:00
|
|
|
local cfg="$1"
|
|
|
|
|
|
|
|
tag="$cfg"
|
|
|
|
|
|
|
|
[ -n "$tag" ] || return 0
|
|
|
|
|
|
|
|
config_get_bool force "$cfg" force 0
|
|
|
|
[ "$force" = "0" ] && force=
|
|
|
|
|
|
|
|
config_get option "$cfg" dhcp_option
|
|
|
|
for o in $option; do
|
|
|
|
xappend "--dhcp-option${force:+-force}=tag:$tag,$o"
|
|
|
|
done
|
2007-08-29 18:40:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
dhcp_mac_add() {
|
2007-03-17 13:31:13 +00:00
|
|
|
local cfg="$1"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2010-01-08 00:03:08 +00:00
|
|
|
config_get networkid "$cfg" networkid
|
|
|
|
[ -n "$networkid" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2007-08-29 18:40:52 +00:00
|
|
|
config_get mac "$cfg" mac
|
|
|
|
[ -n "$mac" ] || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--dhcp-mac=$networkid,$mac"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2010-01-08 00:03:08 +00:00
|
|
|
dhcp_option_add "$cfg" "$networkid"
|
2007-08-29 18:40:52 +00:00
|
|
|
}
|
2007-03-17 13:31:13 +00:00
|
|
|
|
2008-07-05 13:43:55 +00:00
|
|
|
dhcp_boot_add() {
|
2016-12-22 18:20:25 +00:00
|
|
|
# TODO: BOOTURL is different between DHCPv4 and DHCPv6
|
2008-07-05 13:43:55 +00:00
|
|
|
local cfg="$1"
|
|
|
|
|
2010-01-08 00:03:08 +00:00
|
|
|
config_get networkid "$cfg" networkid
|
2008-07-05 13:43:55 +00:00
|
|
|
|
|
|
|
config_get filename "$cfg" filename
|
|
|
|
[ -n "$filename" ] || return 0
|
|
|
|
|
|
|
|
config_get servername "$cfg" servername
|
|
|
|
config_get serveraddress "$cfg" serveraddress
|
|
|
|
|
2015-03-13 08:38:35 +00:00
|
|
|
[ -n "$serveraddress" -a ! -n "$servername" ] && return 0
|
|
|
|
|
|
|
|
xappend "--dhcp-boot=${networkid:+net:$networkid,}${filename}${servername:+,$servername}${serveraddress:+,$serveraddress}"
|
2008-07-05 13:43:55 +00:00
|
|
|
|
2012-05-19 20:17:56 +00:00
|
|
|
config_get_bool force "$cfg" force 0
|
|
|
|
|
|
|
|
dhcp_option_add "$cfg" "$networkid" "$force"
|
2008-07-05 13:43:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-29 18:40:52 +00:00
|
|
|
dhcp_add() {
|
|
|
|
local cfg="$1"
|
2016-12-22 18:20:25 +00:00
|
|
|
local dhcp6range="::"
|
|
|
|
local nettag
|
2017-06-20 09:45:49 +00:00
|
|
|
local tags
|
2016-12-22 18:20:25 +00:00
|
|
|
|
2007-03-17 13:31:13 +00:00
|
|
|
config_get net "$cfg" interface
|
|
|
|
[ -n "$net" ] || return 0
|
2007-08-29 18:40:52 +00:00
|
|
|
|
2010-01-08 00:03:08 +00:00
|
|
|
config_get networkid "$cfg" networkid
|
|
|
|
[ -n "$networkid" ] || networkid="$net"
|
2007-08-29 18:40:52 +00:00
|
|
|
|
2013-12-16 16:47:41 +00:00
|
|
|
network_get_device ifname "$net" || return 0
|
2007-08-29 18:40:52 +00:00
|
|
|
|
2013-12-16 16:47:41 +00:00
|
|
|
[ "$cachelocal" = "0" ] && network_get_dnsserver dnsserver "$net" && {
|
2007-09-10 20:24:18 +00:00
|
|
|
DNS_SERVERS="$DNS_SERVERS $dnsserver"
|
|
|
|
}
|
|
|
|
|
dnsmasq: expand 'add_local_hostname' fexibility including FQDN
ref commit 612e2276b4a2f57fcbbe79b95bec4a46e89d748c
ref commit ec63e3bf1312ab4c666f7417ca9844857214047f
'option add_local_hostname' scripted implementation statically assigns
this host in auto generated host file at init. If IFUP or other signals
do not occur, then address changes are not tracked. The script doesn't
apply all the addresses at an interface. This may make logs obscure.
The script only puts the bare host name (maybe not FQDN) in host file,
but if '--exapandhosts' is enabled, then /etc/hosts entries will be
suffixed, and "127.0.0.1 localhost" becomes "localhost.lan".
dnsmasq provides an option to perform this function, but it is rather
greedy. '--interface-name=<name>,<iface>' will assign the name to all
IP on the specified interface (except link local). This is a useful
feature, but some setups depend on the original restrictive behavior.
'option add_local_fqdn' is added to enhance the feature set, but
if not entered or empty string, then it will default to original
option and behavior. This new option has a few settings. At each
increased setting the most detailed name becomes the PTR record:
0 - same as add_local_hostname 0 or disabled
1 - same as add_local_hostname 1
2 - assigns the bare host name to all IP w/ --dnsmasq-interface
3 - assigns the FQDN and host to all IP w/ --dnsmasq-interface
4 - assigns <iface>.<host>.<domain> and above w/ --dnsmasq-nterface
'option add_wan_fqdn' is added to run the same procedure on
inferred WAN intefaces. If an interface has 'config dhcp' and
'option ignore 1' set, then it is considered WAN. The original
option would only run on DHCP serving interfaces.
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-01-14 02:37:25 +00:00
|
|
|
append_bool "$cfg" ignore "--no-dhcp-interface=$ifname" && {
|
|
|
|
# Many ISP do not have useful names for DHCP customers (your WAN).
|
|
|
|
dhcp_this_host_add "$net" "$ifname" "$ADD_WAN_FQDN"
|
|
|
|
return 0
|
|
|
|
}
|
2007-08-29 18:40:52 +00:00
|
|
|
|
2017-09-14 12:49:10 +00:00
|
|
|
network_get_subnet subnet "$net" || return 0
|
|
|
|
network_get_protocol proto "$net" || return 0
|
|
|
|
|
2013-12-16 16:47:41 +00:00
|
|
|
# Do not support non-static interfaces for now
|
2007-03-17 13:31:13 +00:00
|
|
|
[ static = "$proto" ] || return 0
|
2007-08-29 18:40:52 +00:00
|
|
|
|
2013-12-16 16:47:41 +00:00
|
|
|
# Override interface netmask with dhcp config if applicable
|
|
|
|
config_get netmask "$cfg" netmask "${subnet##*/}"
|
2007-03-17 13:31:13 +00:00
|
|
|
|
2007-08-29 18:40:52 +00:00
|
|
|
#check for an already active dhcp server on the interface, unless 'force' is set
|
2007-03-17 13:31:13 +00:00
|
|
|
config_get_bool force "$cfg" force 0
|
2013-12-21 13:31:28 +00:00
|
|
|
[ $force -gt 0 ] || dhcp_check "$ifname" || return 0
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2016-12-22 18:20:25 +00:00
|
|
|
config_get start "$cfg" start 100
|
|
|
|
config_get limit "$cfg" limit 150
|
|
|
|
config_get leasetime "$cfg" leasetime 12h
|
2007-03-31 00:39:55 +00:00
|
|
|
config_get options "$cfg" options
|
2007-11-28 03:02:20 +00:00
|
|
|
config_get_bool dynamicdhcp "$cfg" dynamicdhcp 1
|
2007-03-17 13:31:13 +00:00
|
|
|
|
2016-12-22 18:20:25 +00:00
|
|
|
config_get dhcpv4 "$cfg" dhcpv4
|
|
|
|
config_get dhcpv6 "$cfg" dhcpv6
|
|
|
|
|
|
|
|
config_get ra "$cfg" ra
|
|
|
|
config_get ra_management "$cfg" ra_management
|
|
|
|
config_get ra_preference "$cfg" ra_preference
|
2017-05-12 09:26:49 +00:00
|
|
|
config_get dns "$cfg" dns
|
2016-12-22 18:20:25 +00:00
|
|
|
|
2017-05-02 15:05:07 +00:00
|
|
|
config_list_foreach "$cfg" "interface_name" append_interface_name "$ifname"
|
|
|
|
|
dnsmasq: expand 'add_local_hostname' fexibility including FQDN
ref commit 612e2276b4a2f57fcbbe79b95bec4a46e89d748c
ref commit ec63e3bf1312ab4c666f7417ca9844857214047f
'option add_local_hostname' scripted implementation statically assigns
this host in auto generated host file at init. If IFUP or other signals
do not occur, then address changes are not tracked. The script doesn't
apply all the addresses at an interface. This may make logs obscure.
The script only puts the bare host name (maybe not FQDN) in host file,
but if '--exapandhosts' is enabled, then /etc/hosts entries will be
suffixed, and "127.0.0.1 localhost" becomes "localhost.lan".
dnsmasq provides an option to perform this function, but it is rather
greedy. '--interface-name=<name>,<iface>' will assign the name to all
IP on the specified interface (except link local). This is a useful
feature, but some setups depend on the original restrictive behavior.
'option add_local_fqdn' is added to enhance the feature set, but
if not entered or empty string, then it will default to original
option and behavior. This new option has a few settings. At each
increased setting the most detailed name becomes the PTR record:
0 - same as add_local_hostname 0 or disabled
1 - same as add_local_hostname 1
2 - assigns the bare host name to all IP w/ --dnsmasq-interface
3 - assigns the FQDN and host to all IP w/ --dnsmasq-interface
4 - assigns <iface>.<host>.<domain> and above w/ --dnsmasq-nterface
'option add_wan_fqdn' is added to run the same procedure on
inferred WAN intefaces. If an interface has 'config dhcp' and
'option ignore 1' set, then it is considered WAN. The original
option would only run on DHCP serving interfaces.
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-01-14 02:37:25 +00:00
|
|
|
# Put the router host name on this DHCP served interface address(es)
|
|
|
|
dhcp_this_host_add "$net" "$ifname" "$ADD_LOCAL_FQDN"
|
|
|
|
|
2016-12-22 18:20:25 +00:00
|
|
|
start="$( dhcp_calc "$start" )"
|
2017-06-20 09:45:49 +00:00
|
|
|
|
|
|
|
add_tag() {
|
|
|
|
tags="${tags}tag:$1,"
|
|
|
|
}
|
|
|
|
config_list_foreach "$cfg" tag add_tag
|
|
|
|
|
2016-12-22 18:20:25 +00:00
|
|
|
nettag="${networkid:+set:${networkid},}"
|
|
|
|
|
|
|
|
if [ "$limit" -gt 0 ] ; then
|
|
|
|
limit=$((limit-1))
|
|
|
|
fi
|
|
|
|
|
2013-12-16 16:47:41 +00:00
|
|
|
eval "$(ipcalc.sh "${subnet%%/*}" $netmask $start $limit)"
|
2016-12-22 18:20:25 +00:00
|
|
|
|
|
|
|
if [ "$dynamicdhcp" = "0" ] ; then
|
|
|
|
END="static"
|
|
|
|
dhcp6range="::,static"
|
|
|
|
else
|
|
|
|
dhcp6range="::1000,::ffff"
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$dhcpv4" != "disabled" ] ; then
|
2017-06-20 09:45:49 +00:00
|
|
|
xappend "--dhcp-range=$tags$nettag$START,$END,$NETMASK,$leasetime${options:+ $options}"
|
2016-12-22 18:20:25 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if [ $DNSMASQ_DHCP_VER -eq 6 -a "$ra" = "server" ] ; then
|
|
|
|
# Note: dnsmasq cannot just be a DHCPv6 server (all-in-1)
|
|
|
|
# and let some other machine(s) send RA pointing to it.
|
|
|
|
|
|
|
|
case $ra_preference in
|
|
|
|
*high*)
|
|
|
|
xappend "--ra-param=$ifname,high,0,7200"
|
|
|
|
;;
|
|
|
|
*low*)
|
|
|
|
xappend "--ra-param=$ifname,low,0,7200"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
# Send UNSOLICITED RA at default interval and live for 2 hours.
|
|
|
|
# TODO: convert flexible lease time into route life time (only seconds).
|
|
|
|
xappend "--ra-param=$ifname,0,7200"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
if [ "$dhcpv6" = "disabled" ] ; then
|
|
|
|
ra_management="3"
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
case $ra_management in
|
|
|
|
0)
|
|
|
|
# SLACC with DCHP for extended options
|
|
|
|
xappend "--dhcp-range=$nettag::,constructor:$ifname,ra-stateless,ra-names"
|
|
|
|
;;
|
|
|
|
2)
|
|
|
|
# DHCP address and RA only for management redirection
|
|
|
|
xappend "--dhcp-range=$nettag$dhcp6range,constructor:$ifname,$leasetime"
|
|
|
|
;;
|
|
|
|
3)
|
|
|
|
# SLAAC only but dnsmasq attempts to link HOSTNAME, DHCPv4 MAC, and SLAAC
|
|
|
|
xappend "--dhcp-range=$nettag::,constructor:$ifname,ra-only,ra-names"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
# SLAAC and full DHCP
|
|
|
|
xappend "--dhcp-range=$nettag$dhcp6range,constructor:$ifname,slaac,ra-names,$leasetime"
|
|
|
|
;;
|
|
|
|
esac
|
2017-05-12 09:26:49 +00:00
|
|
|
|
|
|
|
if [ -n "$dns" ]; then
|
|
|
|
dnss=""
|
|
|
|
for d in $dns; do append dnss "[$d]" ","; done
|
|
|
|
else
|
|
|
|
dnss="[::]"
|
|
|
|
fi
|
|
|
|
|
|
|
|
dhcp_option_append "option6:dns-server,$dnss" "$networkid"
|
2016-12-22 18:20:25 +00:00
|
|
|
fi
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2017-06-21 14:48:41 +00:00
|
|
|
dhcp_option_add "$cfg" "$networkid" 0
|
|
|
|
dhcp_option_add "$cfg" "$networkid" 2
|
2007-08-29 18:40:52 +00:00
|
|
|
}
|
|
|
|
|
2017-04-26 20:37:27 +00:00
|
|
|
dhcp_option_append() {
|
|
|
|
local option="$1"
|
|
|
|
local networkid="$2"
|
|
|
|
local force="$3"
|
|
|
|
|
|
|
|
xappend "--dhcp-option${force:+-force}=${networkid:+$networkid,}$option"
|
|
|
|
}
|
|
|
|
|
2007-09-25 23:16:31 +00:00
|
|
|
dhcp_option_add() {
|
2016-12-22 18:20:25 +00:00
|
|
|
# NOTE: dnsmasq has explicit "option6:" prefix for DHCPv6 so no collisions
|
2007-08-29 18:40:52 +00:00
|
|
|
local cfg="$1"
|
2010-01-08 00:03:08 +00:00
|
|
|
local networkid="$2"
|
2012-05-19 20:17:56 +00:00
|
|
|
local force="$3"
|
2017-06-21 14:48:41 +00:00
|
|
|
local opt="dhcp_option"
|
2012-05-19 20:17:56 +00:00
|
|
|
|
|
|
|
[ "$force" = "0" ] && force=
|
2017-06-21 14:48:41 +00:00
|
|
|
[ "$force" = "2" ] && opt="dhcp_option_force"
|
2007-09-25 23:16:31 +00:00
|
|
|
|
2017-04-26 20:37:27 +00:00
|
|
|
local list_len
|
2017-06-21 14:48:41 +00:00
|
|
|
config_get list_len "$cfg" "${opt}_LENGTH"
|
2017-04-26 20:37:27 +00:00
|
|
|
|
|
|
|
if [ -n "$list_len" ]; then
|
2017-06-21 14:48:41 +00:00
|
|
|
config_list_foreach "$cfg" "$opt" dhcp_option_append "$networkid" "$force"
|
2017-04-26 20:37:27 +00:00
|
|
|
else
|
2017-06-21 14:48:41 +00:00
|
|
|
config_get dhcp_option "$cfg" "$opt"
|
2007-08-29 18:40:52 +00:00
|
|
|
|
2017-06-21 14:48:41 +00:00
|
|
|
[ -n "$dhcp_option" ] && echo "Warning: the 'option $opt' syntax is deprecated, use 'list $opt'" >&2
|
2017-05-04 20:33:37 +00:00
|
|
|
|
2017-04-26 20:37:27 +00:00
|
|
|
local option
|
|
|
|
for option in $dhcp_option; do
|
|
|
|
dhcp_option_append "$option" "$networkid" "$force"
|
|
|
|
done
|
|
|
|
fi
|
2007-03-17 13:31:13 +00:00
|
|
|
}
|
|
|
|
|
2009-10-05 16:58:06 +00:00
|
|
|
dhcp_domain_add() {
|
|
|
|
local cfg="$1"
|
2013-06-17 11:55:30 +00:00
|
|
|
local ip name names record
|
2009-10-05 16:58:06 +00:00
|
|
|
|
2011-12-01 21:34:45 +00:00
|
|
|
config_get names "$cfg" name "$2"
|
2010-04-02 22:56:22 +00:00
|
|
|
[ -n "$names" ] || return 0
|
2009-10-05 16:58:06 +00:00
|
|
|
|
2011-12-01 21:34:45 +00:00
|
|
|
config_get ip "$cfg" ip "$3"
|
2009-10-05 16:58:06 +00:00
|
|
|
[ -n "$ip" ] || return 0
|
|
|
|
|
2010-04-02 22:56:22 +00:00
|
|
|
for name in $names; do
|
2014-08-28 06:27:49 +00:00
|
|
|
record="${record:+$record }$name"
|
2010-04-02 22:56:22 +00:00
|
|
|
done
|
2013-06-17 11:55:30 +00:00
|
|
|
|
2017-12-07 09:11:50 +00:00
|
|
|
echo "$ip $record" >> $HOSTFILE_TMP
|
2009-10-05 16:58:06 +00:00
|
|
|
}
|
|
|
|
|
2010-05-08 12:35:29 +00:00
|
|
|
dhcp_srv_add() {
|
|
|
|
local cfg="$1"
|
|
|
|
|
|
|
|
config_get srv "$cfg" srv
|
|
|
|
[ -n "$srv" ] || return 0
|
|
|
|
|
|
|
|
config_get target "$cfg" target
|
|
|
|
[ -n "$target" ] || return 0
|
|
|
|
|
|
|
|
config_get port "$cfg" port
|
2012-03-23 11:19:56 +00:00
|
|
|
[ -n "$port" ] || return 0
|
2010-05-08 12:35:29 +00:00
|
|
|
|
2012-03-23 11:19:56 +00:00
|
|
|
config_get class "$cfg" class
|
|
|
|
config_get weight "$cfg" weight
|
|
|
|
|
|
|
|
local service="$srv,$target,$port${class:+,$class${weight:+,$weight}}"
|
2010-05-08 12:35:29 +00:00
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--srv-host=$service"
|
2010-05-08 12:35:29 +00:00
|
|
|
}
|
|
|
|
|
2012-03-23 11:19:58 +00:00
|
|
|
dhcp_mx_add() {
|
|
|
|
local cfg="$1"
|
2012-03-23 11:26:47 +00:00
|
|
|
local domain relay pref
|
2012-03-23 11:19:58 +00:00
|
|
|
|
2012-03-23 11:26:47 +00:00
|
|
|
config_get domain "$cfg" domain
|
2012-03-23 11:19:58 +00:00
|
|
|
[ -n "$domain" ] || return 0
|
|
|
|
|
|
|
|
config_get relay "$cfg" relay
|
|
|
|
[ -n "$relay" ] || return 0
|
|
|
|
|
|
|
|
config_get pref "$cfg" pref 0
|
|
|
|
|
|
|
|
local service="$domain,$relay,$pref"
|
|
|
|
|
2012-05-19 20:17:19 +00:00
|
|
|
xappend "--mx-host=$service"
|
2012-03-23 11:19:58 +00:00
|
|
|
}
|
|
|
|
|
2011-10-20 12:12:26 +00:00
|
|
|
dhcp_cname_add() {
|
|
|
|
local cfg="$1"
|
|
|
|
local cname target
|
|
|
|
|
|
|
|
config_get cname "$cfg" cname
|
|
|
|
[ -n "$cname" ] || return 0
|
|
|
|
|
|
|
|
config_get target "$cfg" target
|
|
|
|
[ -n "$target" ] || return 0
|
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
xappend "--cname=${cname},${target}"
|
2011-10-20 12:12:26 +00:00
|
|
|
}
|
|
|
|
|
2013-06-17 11:55:30 +00:00
|
|
|
dhcp_hostrecord_add() {
|
|
|
|
local cfg="$1"
|
|
|
|
local names addresses record val
|
|
|
|
|
|
|
|
config_get names "$cfg" name "$2"
|
|
|
|
if [ -z "$names" ]; then
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
|
|
|
|
config_get addresses "$cfg" ip "$3"
|
|
|
|
if [ -z "$addresses" ]; then
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
|
|
|
|
for val in $names $addresses; do
|
|
|
|
record="${record:+$record,}$val"
|
|
|
|
done
|
|
|
|
|
|
|
|
xappend "--host-record=$record"
|
|
|
|
}
|
|
|
|
|
2016-02-26 08:35:48 +00:00
|
|
|
dhcp_relay_add() {
|
|
|
|
local cfg="$1"
|
|
|
|
local local_addr server_addr interface
|
|
|
|
|
|
|
|
config_get local_addr "$cfg" local_addr
|
|
|
|
[ -n "$local_addr" ] || return 0
|
|
|
|
|
|
|
|
config_get server_addr "$cfg" server_addr
|
|
|
|
[ -n "$server_addr" ] || return 0
|
|
|
|
|
|
|
|
config_get interface "$cfg" interface
|
|
|
|
if [ -z "$interface" ]; then
|
|
|
|
xappend "--dhcp-relay=$local_addr,$server_addr"
|
|
|
|
else
|
2017-03-29 09:39:35 +00:00
|
|
|
network_get_device ifname "$interface" || return
|
|
|
|
xappend "--dhcp-relay=$local_addr,$server_addr,$ifname"
|
2016-02-26 08:35:48 +00:00
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
dnsmasq_start()
|
2016-07-29 12:56:35 +00:00
|
|
|
{
|
2019-02-18 14:11:19 +00:00
|
|
|
local cfg="$1"
|
|
|
|
local disabled user_dhcpscript
|
2019-02-20 06:58:51 +00:00
|
|
|
local resolvfile localuse=0
|
2013-12-21 13:31:28 +00:00
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
config_get_bool disabled "$cfg" disabled 0
|
|
|
|
[ "$disabled" -gt 0 ] && return 0
|
2016-07-29 12:56:35 +00:00
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
# reset list of DOMAINS and DNS servers (for each dnsmasq instance)
|
|
|
|
DNS_SERVERS=""
|
|
|
|
DOMAIN=""
|
|
|
|
CONFIGFILE="${BASECONFIGFILE}.${cfg}"
|
|
|
|
CONFIGFILE_TMP="${CONFIGFILE}.$$"
|
|
|
|
HOSTFILE="${BASEHOSTFILE}.${cfg}"
|
2017-12-07 09:11:50 +00:00
|
|
|
HOSTFILE_TMP="${HOSTFILE}.$$"
|
2016-10-12 08:33:16 +00:00
|
|
|
BASEDHCPSTAMPFILE_CFG="${BASEDHCPSTAMPFILE}.${cfg}"
|
2007-03-17 13:31:13 +00:00
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
# before we can call xappend
|
2015-03-26 10:58:30 +00:00
|
|
|
mkdir -p /var/run/dnsmasq/
|
2012-04-02 22:31:21 +00:00
|
|
|
mkdir -p $(dirname $CONFIGFILE)
|
2016-10-12 08:33:16 +00:00
|
|
|
mkdir -p $(dirname $HOSTFILE)
|
2015-03-26 10:58:30 +00:00
|
|
|
mkdir -p /var/lib/misc
|
2016-09-05 08:01:19 +00:00
|
|
|
chown dnsmasq:dnsmasq /var/run/dnsmasq
|
2015-03-26 10:58:30 +00:00
|
|
|
|
2016-06-13 13:21:47 +00:00
|
|
|
echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE_TMP
|
2017-12-07 09:11:50 +00:00
|
|
|
echo "# auto-generated config file from /etc/config/dhcp" > $HOSTFILE_TMP
|
2012-04-02 22:31:21 +00:00
|
|
|
|
2017-11-15 19:20:44 +00:00
|
|
|
local dnsmasqconffile="/etc/dnsmasq.${cfg}.conf"
|
|
|
|
if [ ! -r "$dnsmasqconffile" ]; then
|
|
|
|
dnsmasqconffile=/etc/dnsmasq.conf
|
|
|
|
fi
|
|
|
|
|
2012-04-02 22:31:21 +00:00
|
|
|
# if we did this last, we could override auto-generated config
|
2017-11-15 19:20:44 +00:00
|
|
|
[ -f "${dnsmasqconffile}" ] && {
|
|
|
|
xappend "--conf-file=${dnsmasqconffile}"
|
2012-04-02 22:31:21 +00:00
|
|
|
}
|
|
|
|
|
2015-08-31 17:11:41 +00:00
|
|
|
$PROG --version | grep -osqE "^Compile time options:.* DHCPv6( |$)" && DHCPv6CAPABLE=1 || DHCPv6CAPABLE=0
|
|
|
|
|
2016-12-22 18:20:25 +00:00
|
|
|
|
|
|
|
if [ -x /usr/sbin/odhcpd -a -x /etc/init.d/odhcpd ] ; then
|
|
|
|
local odhcpd_is_main odhcpd_is_enabled
|
2017-04-16 16:21:49 +00:00
|
|
|
config_get odhcpd_is_main odhcpd maindhcp 0
|
2016-12-22 18:20:25 +00:00
|
|
|
/etc/init.d/odhcpd enabled && odhcpd_is_enabled=1 || odhcpd_is_enabled=0
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$odhcpd_is_enabled" -eq 0 -a "$DHCPv6CAPABLE" -eq 1 ] ; then
|
|
|
|
# DHCP V4 and V6 in DNSMASQ
|
|
|
|
DNSMASQ_DHCP_VER=6
|
|
|
|
elif [ "$odhcpd_is_main" -gt 0 ] ; then
|
|
|
|
# ODHCPD is doing it all
|
|
|
|
DNSMASQ_DHCP_VER=0
|
|
|
|
else
|
|
|
|
# You have ODHCPD but use DNSMASQ for DHCPV4
|
|
|
|
DNSMASQ_DHCP_VER=4
|
|
|
|
fi
|
|
|
|
|
|
|
|
elif [ "$DHCPv6CAPABLE" -eq 1 ] ; then
|
|
|
|
# DHCP V4 and V6 in DNSMASQ
|
|
|
|
DNSMASQ_DHCP_VER=6
|
|
|
|
else
|
|
|
|
DNSMASQ_DHCP_VER=4
|
|
|
|
fi
|
|
|
|
|
2017-04-05 18:31:01 +00:00
|
|
|
# Allow DHCP/DHCPv6 to be handled by ISC DHCPD
|
|
|
|
if [ -x /usr/sbin/dhcpd ] ; then
|
|
|
|
if [ -x /etc/init.d/dhcpd ] ; then
|
|
|
|
/etc/init.d/dhcpd enabled && DNSMASQ_DHCP_VER=0
|
|
|
|
fi
|
|
|
|
if [ -x /etc/init.d/dhcpd6 -a "$DNSMASQ_DHCP_VER" -gt 0 ] ; then
|
|
|
|
/etc/init.d/dhcpd6 enabled && DNSMASQ_DHCP_VER=4
|
|
|
|
fi
|
|
|
|
fi
|
2016-12-22 18:20:25 +00:00
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
append_bool "$cfg" authoritative "--dhcp-authoritative"
|
|
|
|
append_bool "$cfg" nodaemon "--no-daemon"
|
|
|
|
append_bool "$cfg" domainneeded "--domain-needed"
|
|
|
|
append_bool "$cfg" filterwin2k "--filterwin2k"
|
|
|
|
append_bool "$cfg" nohosts "--no-hosts"
|
|
|
|
append_bool "$cfg" nonegcache "--no-negcache"
|
|
|
|
append_bool "$cfg" strictorder "--strict-order"
|
|
|
|
append_bool "$cfg" logqueries "--log-queries=extra"
|
|
|
|
append_bool "$cfg" noresolv "--no-resolv"
|
|
|
|
append_bool "$cfg" localise_queries "--localise-queries"
|
|
|
|
append_bool "$cfg" readethers "--read-ethers"
|
|
|
|
append_bool "$cfg" dbus "--enable-dbus"
|
dnsmasq: bump to v2.80
Cherry-picked & squashed from relevant commits from master:
dnsmasq v2.80 release
Change from rc1:
91421cb Fix compiler warning.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 6c4d3d705a0d6e508de94dc49736c250ecdae27c)
dnsmasq: remove creation of /etc/ethers
Remove creation of file /etc/ethers in dnsmasq init script as the
file is now created by default in the base-files package by
commit fa3301a28e
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 6c227e45cb6a97c61d9fa2ffa35cebee2a048739)
dnsmasq: bump to dnsmasq v2.80test5
Refresh patches
Remove 240-ubus patch as upstream accepted.
Add uci option ubus which allows to enable/disable ubus support (enabled
by default)
Upstream commits since last bump:
da8b651 Implement --address=/example.com/#
c5db8f9 Tidy 7f876b64c22b2b18412e2e3d8506ee33e42db7c
974a6d0 Add --caa-record
b758b67 Improve logging of RRs from --dns-rr.
9bafdc6 Tidy up file parsing code.
97f876b Properly deal with unaligned addresses in DHCPv6 packets.
cbfbd17 Fix broken DNSSEC records in previous.
b6f926f Don't return NXDOMAIN to empty non-terminals.
c822620 Add --dhcp-name-match
397c050 Handle case of --auth-zone but no --auth-server.
1682d15 Add missing EDNS0 section. EDNS0 section missing in replies to EDNS0-containing queries where answer generated from --local=/<domain>/
dd33e98 Fix crash parsing a --synth-domain with no prefix. Problem introduced in 2.79/6b2b564ac34cb3c862f168e6b1457f9f0b9ca69c
c16d966 Add copyright to src/metrics.h
1dfed16 Remove C99 only code.
6f835ed Format fixes - ubus.c
9d6fd17 dnsmasq.c fix OPT_UBUS option usage
8c1b6a5 New metrics and ubus files.
8dcdb33 Add --enable-ubus option.
aba8bbb Add collection of metrics
caf4d57 Add OpenWRT ubus patch
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 3d377f4375c6e4a66c6741bbd2549ad53ef671b3)
dnsmasq: bump to dnsmasq 2.80test6
Refresh patches
Changes since latest bump:
af3bd07 Man page typo.
d682099 Picky changes to 47b45b2967c931fed3c89a2e6a8df9f9183a5789
47b45b2 Fix lengths of interface names
2b38e38 Minor improvements in lease-tools
282eab7 Mark die function as never returning
c346f61 Handle ANY queries in context of da8b6517decdac593e7ce24bde2824dd841725c8
03212e5 Manpage typo.
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 43d4b8e89e68fcab00698ee3b70a58c74813a6a7)
dnsmasq: Handle memory allocation failure in make_non_terminals()
Backport upstream commit:
ea6cc33 Handle memory allocation failure in make_non_terminals()
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 687168ccd9154b1fb7a470fa8f42ce64a135f51d)
dnsmasq: Change behavior when RD bit unset in queries.
Backport upstream commit
Change anti cache-snooping behaviour with queries with the
recursion-desired bit unset. Instead to returning SERVFAIL, we
now always forward, and never answer from the cache. This
allows "dig +trace" command to work.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 6c4cbe94bd940b5c061e27744eb78805764d6b34)
dnsmasq: bump to v2.80test7
Bump to latest test release:
3a610a0 Finesse allocation of memory for "struct crec" cache entries.
48b090c Fix b6f926fbefcd2471699599e44f32b8d25b87b471 to not SEGV on startup (rarely).
4139298 Change behavior when RD bit unset in queries.
51cc10f Add warning about 0.0.0.0 and :: addresses to man page.
ea6cc33 Handle memory allocation failure in make_non_terminals()
ad03967 Add debian/tmpfiles.conf
f4fd07d Debian bugfix.
e3c08a3 Debian packaging fix. (restorecon)
118011f Debian packaging fix. (tmpfiles.d)
Delete our own backports of ea6cc33 & 4139298, so the only real changes
here, since we don't care about the Debian stuff are 48b090c & 3a610a0
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit d9a37d8d1eb7d117d5aa44924064a4a3b5517ddd)
dnsmasq: bump to v2.80test8
e1791f3 Fix logging of DNSSEC queries in TCP mode. Destination server address was misleading.
0fdf3c1 Fix dhcp-match-name to match hostname, not complete FQDN.
ee1df06 Tweak strategy for confirming SLAAC addresses.
1e87eba Clarify manpage for --auth-sec-servers
0893347 Make interface spec optional in --auth-server.
7cbf497 Example config file fix for CERT Vulnerability VU#598349.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 30cc5b0bf4f3cdfe950ca7fc380a34c81dd9d7e4)
dnsmasq: add dhcp-ignore-names support - CERT VU#598349
dnsmasq v2.80test8 adds the ability to ignore dhcp client's requests for
specific hostnames. Clients claiming certain hostnames and thus
claiming DNS namespace represent a potential security risk. e.g. a
malicious host could claim 'wpad' for itself and redirect other web
client requests to it for nefarious purpose. See CERT VU#598349 for more
details.
Some Samsung TVs are claiming the hostname 'localhost', it is believed
not (yet) for nefarious purposes.
/usr/share/dnsmasq/dhcpbogushostname.conf contains a list of hostnames
in correct syntax to be excluded. e.g.
dhcp-name-match=set:dhcp_bogus_hostname,localhost
Inclusion of this file is controlled by uci option dhcpbogushostname
which is enabled by default.
To be absolutely clear, DHCP leases to these requesting hosts are still
permitted, but they do NOT get to claim ownership of the hostname
itself and hence put into DNS for other hosts to be confused/manipulate by.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit a45f4f50e16cd2d0370a4470c3ede0c6c7754ba9)
dnsmasq: fix compile issue
Fix compile issue in case HAVE_BROKEN_RTC is enabled
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 39e5e17045aceb2bfbd6b5c6ecfd6cfbce2f3311)
dnsmasq: bump to v2.80rc1
53792c9 fix typo
df07182 Update German translation.
Remove local patch 001-fix-typo which is a backport of the above 53792c9
There is no practical difference between our test8 release and this rc
release, but this does at least say 'release candidate'
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit b8bc672f247a68bc6f72f08f9352cd7aaa5cb9c4)
dnsmasq: fix dnsmasq failure to start when ujail'd
This patch fixes jailed dnsmasq running into the following issue:
|dnsmasq[1]: cannot read /usr/share/dnsmasq/dhcpbogushostname.conf: No such file or directory
|dnsmasq[1]: FAILED to start up
|procd: Instance dnsmasq::cfg01411c s in a crash loop 6 crashes, 0 seconds since last crash
Fixes: a45f4f50e16 ("dnsmasq: add dhcp-ignore-names support - CERT VU#598349")
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
[bump package release]
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 583466bb5b374b29b6b7cba6f065e97c4734f742)
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2018-08-19 18:52:00 +00:00
|
|
|
append_bool "$cfg" ubus "--enable-ubus" 1
|
2016-10-12 08:33:16 +00:00
|
|
|
append_bool "$cfg" expandhosts "--expand-hosts"
|
|
|
|
config_get tftp_root "$cfg" "tftp_root"
|
2017-05-02 17:31:17 +00:00
|
|
|
[ -n "$tftp_root" ] && mkdir -p "$tftp_root" && append_bool "$cfg" enable_tftp "--enable-tftp"
|
2016-10-12 08:33:16 +00:00
|
|
|
append_bool "$cfg" tftp_no_fail "--tftp-no-fail"
|
2017-02-24 10:08:30 +00:00
|
|
|
append_bool "$cfg" nonwildcard "--bind-dynamic" 1
|
2016-10-12 08:33:16 +00:00
|
|
|
append_bool "$cfg" fqdn "--dhcp-fqdn"
|
|
|
|
append_bool "$cfg" proxydnssec "--proxy-dnssec"
|
|
|
|
append_bool "$cfg" localservice "--local-service"
|
2016-10-31 14:00:06 +00:00
|
|
|
append_bool "$cfg" logdhcp "--log-dhcp"
|
2016-10-12 08:33:16 +00:00
|
|
|
append_bool "$cfg" quietdhcp "--quiet-dhcp"
|
|
|
|
append_bool "$cfg" sequential_ip "--dhcp-sequential-ip"
|
|
|
|
append_bool "$cfg" allservers "--all-servers"
|
|
|
|
append_bool "$cfg" noping "--no-ping"
|
|
|
|
|
2016-12-21 19:53:39 +00:00
|
|
|
append_parm "$cfg" logfacility "--log-facility"
|
2017-05-06 10:56:26 +00:00
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
append_parm "$cfg" cachesize "--cache-size"
|
|
|
|
append_parm "$cfg" dnsforwardmax "--dns-forward-max"
|
|
|
|
append_parm "$cfg" port "--port"
|
|
|
|
append_parm "$cfg" ednspacket_max "--edns-packet-max"
|
|
|
|
append_parm "$cfg" dhcpleasemax "--dhcp-lease-max"
|
|
|
|
append_parm "$cfg" "queryport" "--query-port"
|
|
|
|
append_parm "$cfg" "minport" "--min-port"
|
|
|
|
append_parm "$cfg" "maxport" "--max-port"
|
|
|
|
append_parm "$cfg" "domain" "--domain"
|
|
|
|
append_parm "$cfg" "local" "--server"
|
2017-10-12 21:16:06 +00:00
|
|
|
config_list_foreach "$cfg" "listen_address" append_listenaddress
|
2016-10-12 08:33:16 +00:00
|
|
|
config_list_foreach "$cfg" "server" append_server
|
2017-06-28 15:07:39 +00:00
|
|
|
config_list_foreach "$cfg" "rev_server" append_rev_server
|
2016-10-12 08:33:16 +00:00
|
|
|
config_list_foreach "$cfg" "address" append_address
|
|
|
|
config_list_foreach "$cfg" "ipset" append_ipset
|
2018-07-17 11:42:17 +00:00
|
|
|
[ -n "$BOOT" ] || {
|
|
|
|
config_list_foreach "$cfg" "interface" append_interface
|
|
|
|
config_list_foreach "$cfg" "notinterface" append_notinterface
|
|
|
|
}
|
2016-10-12 08:33:16 +00:00
|
|
|
config_list_foreach "$cfg" "addnhosts" append_addnhosts
|
|
|
|
config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
|
|
|
|
append_parm "$cfg" "leasefile" "--dhcp-leasefile" "/tmp/dhcp.leases"
|
|
|
|
append_parm "$cfg" "serversfile" "--servers-file"
|
|
|
|
append_parm "$cfg" "tftp_root" "--tftp-root"
|
|
|
|
append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
|
|
|
|
append_parm "$cfg" "local_ttl" "--local-ttl"
|
|
|
|
append_parm "$cfg" "pxe_prompt" "--pxe-prompt"
|
|
|
|
config_list_foreach "$cfg" "pxe_service" append_pxe_service
|
|
|
|
config_get DOMAIN "$cfg" domain
|
|
|
|
|
|
|
|
config_get_bool ADD_LOCAL_DOMAIN "$cfg" add_local_domain 1
|
|
|
|
config_get_bool ADD_LOCAL_HOSTNAME "$cfg" add_local_hostname 1
|
dnsmasq: expand 'add_local_hostname' fexibility including FQDN
ref commit 612e2276b4a2f57fcbbe79b95bec4a46e89d748c
ref commit ec63e3bf1312ab4c666f7417ca9844857214047f
'option add_local_hostname' scripted implementation statically assigns
this host in auto generated host file at init. If IFUP or other signals
do not occur, then address changes are not tracked. The script doesn't
apply all the addresses at an interface. This may make logs obscure.
The script only puts the bare host name (maybe not FQDN) in host file,
but if '--exapandhosts' is enabled, then /etc/hosts entries will be
suffixed, and "127.0.0.1 localhost" becomes "localhost.lan".
dnsmasq provides an option to perform this function, but it is rather
greedy. '--interface-name=<name>,<iface>' will assign the name to all
IP on the specified interface (except link local). This is a useful
feature, but some setups depend on the original restrictive behavior.
'option add_local_fqdn' is added to enhance the feature set, but
if not entered or empty string, then it will default to original
option and behavior. This new option has a few settings. At each
increased setting the most detailed name becomes the PTR record:
0 - same as add_local_hostname 0 or disabled
1 - same as add_local_hostname 1
2 - assigns the bare host name to all IP w/ --dnsmasq-interface
3 - assigns the FQDN and host to all IP w/ --dnsmasq-interface
4 - assigns <iface>.<host>.<domain> and above w/ --dnsmasq-nterface
'option add_wan_fqdn' is added to run the same procedure on
inferred WAN intefaces. If an interface has 'config dhcp' and
'option ignore 1' set, then it is considered WAN. The original
option would only run on DHCP serving interfaces.
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2017-01-14 02:37:25 +00:00
|
|
|
config_get ADD_LOCAL_FQDN "$cfg" add_local_fqdn ""
|
|
|
|
config_get ADD_WAN_FQDN "$cfg" add_wan_fqdn 0
|
|
|
|
|
|
|
|
if [ -z "$ADD_LOCAL_FQDN" ] ; then
|
|
|
|
# maintain support for previous UCI
|
|
|
|
ADD_LOCAL_FQDN="$ADD_LOCAL_HOSTNAME"
|
|
|
|
fi
|
2016-10-12 08:33:16 +00:00
|
|
|
|
2017-05-06 10:56:26 +00:00
|
|
|
config_get user_dhcpscript $cfg dhcpscript
|
2017-06-09 14:24:12 +00:00
|
|
|
if has_handler || [ -n "$user_dhcpscript" ]; then
|
|
|
|
xappend "--dhcp-script=$DHCPSCRIPT"
|
|
|
|
fi
|
2016-10-12 08:33:16 +00:00
|
|
|
|
|
|
|
config_get leasefile $cfg leasefile "/tmp/dhcp.leases"
|
|
|
|
[ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
|
|
|
|
config_get_bool cachelocal "$cfg" cachelocal 1
|
|
|
|
|
2017-06-14 20:50:48 +00:00
|
|
|
config_get_bool noresolv "$cfg" noresolv 0
|
|
|
|
if [ "$noresolv" != "1" ]; then
|
2019-02-18 14:11:19 +00:00
|
|
|
config_get resolvfile "$cfg" resolvfile /tmp/resolv.conf.auto
|
|
|
|
[ -n "$resolvfile" -a ! -e "$resolvfile" ] && touch "$resolvfile"
|
|
|
|
xappend "--resolv-file=$resolvfile"
|
|
|
|
[ "$resolvfile" = "/tmp/resolv.conf.auto" ] && localuse=1
|
2017-06-14 20:50:48 +00:00
|
|
|
fi
|
2019-02-20 06:58:51 +00:00
|
|
|
config_get_bool localuse "$cfg" localuse "$localuse"
|
2017-06-14 20:50:48 +00:00
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
config_get hostsfile "$cfg" dhcphostsfile
|
|
|
|
[ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
|
|
|
|
|
|
|
|
local rebind
|
|
|
|
config_get_bool rebind "$cfg" rebind_protection 1
|
|
|
|
[ $rebind -gt 0 ] && {
|
|
|
|
log_once \
|
|
|
|
"DNS rebinding protection is active," \
|
|
|
|
"will discard upstream RFC1918 responses!"
|
|
|
|
xappend "--stop-dns-rebind"
|
|
|
|
|
|
|
|
local rebind_localhost
|
|
|
|
config_get_bool rebind_localhost "$cfg" rebind_localhost 0
|
|
|
|
[ $rebind_localhost -gt 0 ] && {
|
|
|
|
log_once "Allowing 127.0.0.0/8 responses"
|
|
|
|
xappend "--rebind-localhost-ok"
|
|
|
|
}
|
|
|
|
|
|
|
|
append_rebind_domain() {
|
|
|
|
log_once "Allowing RFC1918 responses for domain $1"
|
|
|
|
xappend "--rebind-domain-ok=$1"
|
|
|
|
}
|
|
|
|
|
|
|
|
config_list_foreach "$cfg" rebind_domain append_rebind_domain
|
|
|
|
}
|
|
|
|
|
|
|
|
config_get_bool dnssec "$cfg" dnssec 0
|
|
|
|
[ "$dnssec" -gt 0 ] && {
|
|
|
|
xappend "--conf-file=$TRUSTANCHORSFILE"
|
|
|
|
xappend "--dnssec"
|
|
|
|
[ -x /etc/init.d/sysntpd ] && {
|
|
|
|
/etc/init.d/sysntpd enabled
|
|
|
|
[ "$?" -ne 0 -o "$(uci_get system.ntp.enabled)" = "1" ] && {
|
|
|
|
[ -f "$TIMEVALIDFILE" ] || xappend "--dnssec-no-timecheck"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
append_bool "$cfg" dnsseccheckunsigned "--dnssec-check-unsigned"
|
|
|
|
}
|
|
|
|
|
2016-11-03 20:44:29 +00:00
|
|
|
config_get addmac "$cfg" addmac 0
|
|
|
|
[ "$addmac" != "0" ] && {
|
|
|
|
[ "$addmac" = "1" ] && addmac=
|
|
|
|
xappend "--add-mac${addmac:+="$addmac"}"
|
|
|
|
}
|
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
dhcp_option_add "$cfg" "" 0
|
2017-06-21 14:48:41 +00:00
|
|
|
dhcp_option_add "$cfg" "" 2
|
2016-10-12 08:33:16 +00:00
|
|
|
|
|
|
|
xappend "--dhcp-broadcast=tag:needs-broadcast"
|
|
|
|
|
2018-05-24 08:27:07 +00:00
|
|
|
xappend "--addn-hosts=$(dirname $HOSTFILE)"
|
2016-10-12 08:33:16 +00:00
|
|
|
|
|
|
|
config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d"
|
|
|
|
xappend "--conf-dir=$dnsmasqconfdir"
|
2018-06-11 09:17:52 +00:00
|
|
|
dnsmasqconfdir="${dnsmasqconfdir%%,*}"
|
|
|
|
[ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir
|
2016-10-12 08:33:16 +00:00
|
|
|
xappend "--user=dnsmasq"
|
|
|
|
xappend "--group=dnsmasq"
|
|
|
|
echo >> $CONFIGFILE_TMP
|
|
|
|
|
|
|
|
config_get_bool enable_tftp "$cfg" enable_tftp 0
|
|
|
|
[ "$enable_tftp" -gt 0 ] && {
|
|
|
|
config_get tftp_root "$cfg" tftp_root
|
|
|
|
append EXTRA_MOUNT $tftp_root
|
|
|
|
}
|
|
|
|
|
|
|
|
config_foreach filter_dnsmasq host dhcp_host_add "$cfg"
|
2016-06-13 13:21:47 +00:00
|
|
|
echo >> $CONFIGFILE_TMP
|
dnsmasq: bump to v2.80
Cherry-picked & squashed from relevant commits from master:
dnsmasq v2.80 release
Change from rc1:
91421cb Fix compiler warning.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 6c4d3d705a0d6e508de94dc49736c250ecdae27c)
dnsmasq: remove creation of /etc/ethers
Remove creation of file /etc/ethers in dnsmasq init script as the
file is now created by default in the base-files package by
commit fa3301a28e
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 6c227e45cb6a97c61d9fa2ffa35cebee2a048739)
dnsmasq: bump to dnsmasq v2.80test5
Refresh patches
Remove 240-ubus patch as upstream accepted.
Add uci option ubus which allows to enable/disable ubus support (enabled
by default)
Upstream commits since last bump:
da8b651 Implement --address=/example.com/#
c5db8f9 Tidy 7f876b64c22b2b18412e2e3d8506ee33e42db7c
974a6d0 Add --caa-record
b758b67 Improve logging of RRs from --dns-rr.
9bafdc6 Tidy up file parsing code.
97f876b Properly deal with unaligned addresses in DHCPv6 packets.
cbfbd17 Fix broken DNSSEC records in previous.
b6f926f Don't return NXDOMAIN to empty non-terminals.
c822620 Add --dhcp-name-match
397c050 Handle case of --auth-zone but no --auth-server.
1682d15 Add missing EDNS0 section. EDNS0 section missing in replies to EDNS0-containing queries where answer generated from --local=/<domain>/
dd33e98 Fix crash parsing a --synth-domain with no prefix. Problem introduced in 2.79/6b2b564ac34cb3c862f168e6b1457f9f0b9ca69c
c16d966 Add copyright to src/metrics.h
1dfed16 Remove C99 only code.
6f835ed Format fixes - ubus.c
9d6fd17 dnsmasq.c fix OPT_UBUS option usage
8c1b6a5 New metrics and ubus files.
8dcdb33 Add --enable-ubus option.
aba8bbb Add collection of metrics
caf4d57 Add OpenWRT ubus patch
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 3d377f4375c6e4a66c6741bbd2549ad53ef671b3)
dnsmasq: bump to dnsmasq 2.80test6
Refresh patches
Changes since latest bump:
af3bd07 Man page typo.
d682099 Picky changes to 47b45b2967c931fed3c89a2e6a8df9f9183a5789
47b45b2 Fix lengths of interface names
2b38e38 Minor improvements in lease-tools
282eab7 Mark die function as never returning
c346f61 Handle ANY queries in context of da8b6517decdac593e7ce24bde2824dd841725c8
03212e5 Manpage typo.
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 43d4b8e89e68fcab00698ee3b70a58c74813a6a7)
dnsmasq: Handle memory allocation failure in make_non_terminals()
Backport upstream commit:
ea6cc33 Handle memory allocation failure in make_non_terminals()
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 687168ccd9154b1fb7a470fa8f42ce64a135f51d)
dnsmasq: Change behavior when RD bit unset in queries.
Backport upstream commit
Change anti cache-snooping behaviour with queries with the
recursion-desired bit unset. Instead to returning SERVFAIL, we
now always forward, and never answer from the cache. This
allows "dig +trace" command to work.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 6c4cbe94bd940b5c061e27744eb78805764d6b34)
dnsmasq: bump to v2.80test7
Bump to latest test release:
3a610a0 Finesse allocation of memory for "struct crec" cache entries.
48b090c Fix b6f926fbefcd2471699599e44f32b8d25b87b471 to not SEGV on startup (rarely).
4139298 Change behavior when RD bit unset in queries.
51cc10f Add warning about 0.0.0.0 and :: addresses to man page.
ea6cc33 Handle memory allocation failure in make_non_terminals()
ad03967 Add debian/tmpfiles.conf
f4fd07d Debian bugfix.
e3c08a3 Debian packaging fix. (restorecon)
118011f Debian packaging fix. (tmpfiles.d)
Delete our own backports of ea6cc33 & 4139298, so the only real changes
here, since we don't care about the Debian stuff are 48b090c & 3a610a0
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit d9a37d8d1eb7d117d5aa44924064a4a3b5517ddd)
dnsmasq: bump to v2.80test8
e1791f3 Fix logging of DNSSEC queries in TCP mode. Destination server address was misleading.
0fdf3c1 Fix dhcp-match-name to match hostname, not complete FQDN.
ee1df06 Tweak strategy for confirming SLAAC addresses.
1e87eba Clarify manpage for --auth-sec-servers
0893347 Make interface spec optional in --auth-server.
7cbf497 Example config file fix for CERT Vulnerability VU#598349.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 30cc5b0bf4f3cdfe950ca7fc380a34c81dd9d7e4)
dnsmasq: add dhcp-ignore-names support - CERT VU#598349
dnsmasq v2.80test8 adds the ability to ignore dhcp client's requests for
specific hostnames. Clients claiming certain hostnames and thus
claiming DNS namespace represent a potential security risk. e.g. a
malicious host could claim 'wpad' for itself and redirect other web
client requests to it for nefarious purpose. See CERT VU#598349 for more
details.
Some Samsung TVs are claiming the hostname 'localhost', it is believed
not (yet) for nefarious purposes.
/usr/share/dnsmasq/dhcpbogushostname.conf contains a list of hostnames
in correct syntax to be excluded. e.g.
dhcp-name-match=set:dhcp_bogus_hostname,localhost
Inclusion of this file is controlled by uci option dhcpbogushostname
which is enabled by default.
To be absolutely clear, DHCP leases to these requesting hosts are still
permitted, but they do NOT get to claim ownership of the hostname
itself and hence put into DNS for other hosts to be confused/manipulate by.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit a45f4f50e16cd2d0370a4470c3ede0c6c7754ba9)
dnsmasq: fix compile issue
Fix compile issue in case HAVE_BROKEN_RTC is enabled
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 39e5e17045aceb2bfbd6b5c6ecfd6cfbce2f3311)
dnsmasq: bump to v2.80rc1
53792c9 fix typo
df07182 Update German translation.
Remove local patch 001-fix-typo which is a backport of the above 53792c9
There is no practical difference between our test8 release and this rc
release, but this does at least say 'release candidate'
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit b8bc672f247a68bc6f72f08f9352cd7aaa5cb9c4)
dnsmasq: fix dnsmasq failure to start when ujail'd
This patch fixes jailed dnsmasq running into the following issue:
|dnsmasq[1]: cannot read /usr/share/dnsmasq/dhcpbogushostname.conf: No such file or directory
|dnsmasq[1]: FAILED to start up
|procd: Instance dnsmasq::cfg01411c s in a crash loop 6 crashes, 0 seconds since last crash
Fixes: a45f4f50e16 ("dnsmasq: add dhcp-ignore-names support - CERT VU#598349")
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
[bump package release]
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 583466bb5b374b29b6b7cba6f065e97c4734f742)
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2018-08-19 18:52:00 +00:00
|
|
|
|
|
|
|
config_get_bool dhcpbogushostname "$cfg" dhcpbogushostname 1
|
|
|
|
[ "$dhcpbogushostname" -gt 0 ] && {
|
|
|
|
xappend "--dhcp-ignore-names=tag:dhcp_bogus_hostname"
|
|
|
|
[ -r "$DHCPBOGUSHOSTNAMEFILE" ] && xappend "--conf-file=$DHCPBOGUSHOSTNAMEFILE"
|
|
|
|
}
|
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
config_foreach filter_dnsmasq boot dhcp_boot_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq mac dhcp_mac_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq tag dhcp_tag_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq vendorclass dhcp_vendorclass_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq userclass dhcp_userclass_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq circuitid dhcp_circuitid_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq remoteid dhcp_remoteid_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq subscrid dhcp_subscrid_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq match dhcp_match_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq domain dhcp_domain_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq hostrecord dhcp_hostrecord_add "$cfg"
|
2018-07-17 11:42:17 +00:00
|
|
|
[ -n "$BOOT" ] || config_foreach filter_dnsmasq relay dhcp_relay_add "$cfg"
|
2013-06-17 11:55:30 +00:00
|
|
|
|
2016-06-13 13:21:47 +00:00
|
|
|
echo >> $CONFIGFILE_TMP
|
2016-10-12 08:33:16 +00:00
|
|
|
config_foreach filter_dnsmasq srvhost dhcp_srv_add "$cfg"
|
|
|
|
config_foreach filter_dnsmasq mxhost dhcp_mx_add "$cfg"
|
2016-06-13 13:21:47 +00:00
|
|
|
echo >> $CONFIGFILE_TMP
|
2014-01-17 14:00:09 +00:00
|
|
|
|
2017-02-20 10:15:55 +00:00
|
|
|
config_get_bool boguspriv "$cfg" boguspriv 1
|
|
|
|
[ "$boguspriv" -gt 0 ] && {
|
|
|
|
xappend "--bogus-priv"
|
|
|
|
[ -r "$RFC6761FILE" ] && xappend "--conf-file=$RFC6761FILE"
|
|
|
|
}
|
2016-12-22 18:20:25 +00:00
|
|
|
|
|
|
|
if [ "$DNSMASQ_DHCP_VER" -gt 4 ] ; then
|
|
|
|
# Enable RA feature for when/if it is constructed,
|
|
|
|
# and RA is selected per interface pool (RA, DHCP, or both),
|
|
|
|
# but no one (should) want RA broadcast in syslog
|
2018-07-17 11:42:17 +00:00
|
|
|
[ -n "$BOOT" ] || config_foreach filter_dnsmasq dhcp dhcp_add "$cfg"
|
2016-12-22 18:20:25 +00:00
|
|
|
xappend "--enable-ra"
|
|
|
|
xappend "--quiet-ra"
|
2017-02-03 10:13:59 +00:00
|
|
|
append_bool "$cfg" quietdhcp "--quiet-dhcp6"
|
2016-12-22 18:20:25 +00:00
|
|
|
|
|
|
|
elif [ "$DNSMASQ_DHCP_VER" -gt 0 ] ; then
|
2018-07-17 11:42:17 +00:00
|
|
|
[ -n "$BOOT" ] || config_foreach filter_dnsmasq dhcp dhcp_add "$cfg"
|
2014-01-17 14:00:09 +00:00
|
|
|
fi
|
|
|
|
|
2016-12-22 18:20:25 +00:00
|
|
|
|
2016-06-13 13:21:47 +00:00
|
|
|
echo >> $CONFIGFILE_TMP
|
2016-10-12 08:33:16 +00:00
|
|
|
config_foreach filter_dnsmasq cname dhcp_cname_add "$cfg"
|
|
|
|
echo >> $CONFIGFILE_TMP
|
|
|
|
|
2016-06-13 13:21:47 +00:00
|
|
|
echo >> $CONFIGFILE_TMP
|
|
|
|
mv -f $CONFIGFILE_TMP $CONFIGFILE
|
2017-12-07 09:11:50 +00:00
|
|
|
mv -f $HOSTFILE_TMP $HOSTFILE
|
2007-08-29 18:40:52 +00:00
|
|
|
|
2019-02-18 14:11:19 +00:00
|
|
|
[ "$localuse" -gt 0 ] && {
|
2017-06-14 20:50:48 +00:00
|
|
|
rm -f /tmp/resolv.conf
|
|
|
|
[ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && {
|
|
|
|
echo "search $DOMAIN" >> /tmp/resolv.conf
|
|
|
|
}
|
|
|
|
DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
|
|
|
|
for DNS_SERVER in $DNS_SERVERS ; do
|
|
|
|
echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
|
|
|
|
done
|
|
|
|
}
|
2016-02-25 09:24:31 +00:00
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
procd_open_instance $cfg
|
|
|
|
procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid
|
2016-02-25 09:24:31 +00:00
|
|
|
procd_set_param file $CONFIGFILE
|
2017-05-06 10:56:26 +00:00
|
|
|
[ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript"
|
2016-02-25 09:24:31 +00:00
|
|
|
procd_set_param respawn
|
|
|
|
|
|
|
|
procd_add_jail dnsmasq ubus log
|
dnsmasq: bump to v2.80
Cherry-picked & squashed from relevant commits from master:
dnsmasq v2.80 release
Change from rc1:
91421cb Fix compiler warning.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 6c4d3d705a0d6e508de94dc49736c250ecdae27c)
dnsmasq: remove creation of /etc/ethers
Remove creation of file /etc/ethers in dnsmasq init script as the
file is now created by default in the base-files package by
commit fa3301a28e
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 6c227e45cb6a97c61d9fa2ffa35cebee2a048739)
dnsmasq: bump to dnsmasq v2.80test5
Refresh patches
Remove 240-ubus patch as upstream accepted.
Add uci option ubus which allows to enable/disable ubus support (enabled
by default)
Upstream commits since last bump:
da8b651 Implement --address=/example.com/#
c5db8f9 Tidy 7f876b64c22b2b18412e2e3d8506ee33e42db7c
974a6d0 Add --caa-record
b758b67 Improve logging of RRs from --dns-rr.
9bafdc6 Tidy up file parsing code.
97f876b Properly deal with unaligned addresses in DHCPv6 packets.
cbfbd17 Fix broken DNSSEC records in previous.
b6f926f Don't return NXDOMAIN to empty non-terminals.
c822620 Add --dhcp-name-match
397c050 Handle case of --auth-zone but no --auth-server.
1682d15 Add missing EDNS0 section. EDNS0 section missing in replies to EDNS0-containing queries where answer generated from --local=/<domain>/
dd33e98 Fix crash parsing a --synth-domain with no prefix. Problem introduced in 2.79/6b2b564ac34cb3c862f168e6b1457f9f0b9ca69c
c16d966 Add copyright to src/metrics.h
1dfed16 Remove C99 only code.
6f835ed Format fixes - ubus.c
9d6fd17 dnsmasq.c fix OPT_UBUS option usage
8c1b6a5 New metrics and ubus files.
8dcdb33 Add --enable-ubus option.
aba8bbb Add collection of metrics
caf4d57 Add OpenWRT ubus patch
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 3d377f4375c6e4a66c6741bbd2549ad53ef671b3)
dnsmasq: bump to dnsmasq 2.80test6
Refresh patches
Changes since latest bump:
af3bd07 Man page typo.
d682099 Picky changes to 47b45b2967c931fed3c89a2e6a8df9f9183a5789
47b45b2 Fix lengths of interface names
2b38e38 Minor improvements in lease-tools
282eab7 Mark die function as never returning
c346f61 Handle ANY queries in context of da8b6517decdac593e7ce24bde2824dd841725c8
03212e5 Manpage typo.
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 43d4b8e89e68fcab00698ee3b70a58c74813a6a7)
dnsmasq: Handle memory allocation failure in make_non_terminals()
Backport upstream commit:
ea6cc33 Handle memory allocation failure in make_non_terminals()
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 687168ccd9154b1fb7a470fa8f42ce64a135f51d)
dnsmasq: Change behavior when RD bit unset in queries.
Backport upstream commit
Change anti cache-snooping behaviour with queries with the
recursion-desired bit unset. Instead to returning SERVFAIL, we
now always forward, and never answer from the cache. This
allows "dig +trace" command to work.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 6c4cbe94bd940b5c061e27744eb78805764d6b34)
dnsmasq: bump to v2.80test7
Bump to latest test release:
3a610a0 Finesse allocation of memory for "struct crec" cache entries.
48b090c Fix b6f926fbefcd2471699599e44f32b8d25b87b471 to not SEGV on startup (rarely).
4139298 Change behavior when RD bit unset in queries.
51cc10f Add warning about 0.0.0.0 and :: addresses to man page.
ea6cc33 Handle memory allocation failure in make_non_terminals()
ad03967 Add debian/tmpfiles.conf
f4fd07d Debian bugfix.
e3c08a3 Debian packaging fix. (restorecon)
118011f Debian packaging fix. (tmpfiles.d)
Delete our own backports of ea6cc33 & 4139298, so the only real changes
here, since we don't care about the Debian stuff are 48b090c & 3a610a0
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit d9a37d8d1eb7d117d5aa44924064a4a3b5517ddd)
dnsmasq: bump to v2.80test8
e1791f3 Fix logging of DNSSEC queries in TCP mode. Destination server address was misleading.
0fdf3c1 Fix dhcp-match-name to match hostname, not complete FQDN.
ee1df06 Tweak strategy for confirming SLAAC addresses.
1e87eba Clarify manpage for --auth-sec-servers
0893347 Make interface spec optional in --auth-server.
7cbf497 Example config file fix for CERT Vulnerability VU#598349.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 30cc5b0bf4f3cdfe950ca7fc380a34c81dd9d7e4)
dnsmasq: add dhcp-ignore-names support - CERT VU#598349
dnsmasq v2.80test8 adds the ability to ignore dhcp client's requests for
specific hostnames. Clients claiming certain hostnames and thus
claiming DNS namespace represent a potential security risk. e.g. a
malicious host could claim 'wpad' for itself and redirect other web
client requests to it for nefarious purpose. See CERT VU#598349 for more
details.
Some Samsung TVs are claiming the hostname 'localhost', it is believed
not (yet) for nefarious purposes.
/usr/share/dnsmasq/dhcpbogushostname.conf contains a list of hostnames
in correct syntax to be excluded. e.g.
dhcp-name-match=set:dhcp_bogus_hostname,localhost
Inclusion of this file is controlled by uci option dhcpbogushostname
which is enabled by default.
To be absolutely clear, DHCP leases to these requesting hosts are still
permitted, but they do NOT get to claim ownership of the hostname
itself and hence put into DNS for other hosts to be confused/manipulate by.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit a45f4f50e16cd2d0370a4470c3ede0c6c7754ba9)
dnsmasq: fix compile issue
Fix compile issue in case HAVE_BROKEN_RTC is enabled
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 39e5e17045aceb2bfbd6b5c6ecfd6cfbce2f3311)
dnsmasq: bump to v2.80rc1
53792c9 fix typo
df07182 Update German translation.
Remove local patch 001-fix-typo which is a backport of the above 53792c9
There is no practical difference between our test8 release and this rc
release, but this does at least say 'release candidate'
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit b8bc672f247a68bc6f72f08f9352cd7aaa5cb9c4)
dnsmasq: fix dnsmasq failure to start when ujail'd
This patch fixes jailed dnsmasq running into the following issue:
|dnsmasq[1]: cannot read /usr/share/dnsmasq/dhcpbogushostname.conf: No such file or directory
|dnsmasq[1]: FAILED to start up
|procd: Instance dnsmasq::cfg01411c s in a crash loop 6 crashes, 0 seconds since last crash
Fixes: a45f4f50e16 ("dnsmasq: add dhcp-ignore-names support - CERT VU#598349")
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
[bump package release]
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 583466bb5b374b29b6b7cba6f065e97c4734f742)
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2018-08-19 18:52:00 +00:00
|
|
|
procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE $DHCPBOGUSHOSTNAMEFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT
|
2016-10-12 08:33:16 +00:00
|
|
|
procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
|
2016-02-25 09:24:31 +00:00
|
|
|
|
|
|
|
procd_close_instance
|
2006-10-04 20:05:48 +00:00
|
|
|
}
|
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
dnsmasq_stop()
|
|
|
|
{
|
2019-02-18 14:11:19 +00:00
|
|
|
local cfg="$1"
|
2019-02-20 06:58:51 +00:00
|
|
|
local noresolv resolvfile localuse=0
|
2016-10-12 08:33:16 +00:00
|
|
|
|
2019-02-18 14:11:19 +00:00
|
|
|
config_get_bool noresolv "$cfg" noresolv 0
|
2017-06-14 20:50:48 +00:00
|
|
|
config_get resolvfile "$cfg" "resolvfile"
|
|
|
|
|
2019-02-18 14:11:19 +00:00
|
|
|
[ "$noresolv" = 0 -a "$resolvfile" = "/tmp/resolv.conf.auto" ] && localuse=1
|
2019-02-20 06:58:51 +00:00
|
|
|
config_get_bool localuse "$cfg" localuse "$localuse"
|
2019-02-18 14:11:19 +00:00
|
|
|
[ "$localuse" -gt 0 ] && ln -sf "/tmp/resolv.conf.auto" /tmp/resolv.conf
|
2016-10-12 08:33:16 +00:00
|
|
|
|
|
|
|
rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp
|
|
|
|
}
|
|
|
|
|
2018-05-07 22:37:48 +00:00
|
|
|
add_interface_trigger()
|
|
|
|
{
|
|
|
|
local interface ignore
|
|
|
|
|
|
|
|
config_get interface "$1" interface
|
|
|
|
config_get_bool ignore "$1" ignore 0
|
|
|
|
|
|
|
|
[ -n "$interface" -a $ignore -eq 0 ] && procd_add_interface_trigger "interface.*" "$interface" /etc/init.d/dnsmasq reload
|
|
|
|
}
|
|
|
|
|
2016-10-12 08:33:16 +00:00
|
|
|
service_triggers()
|
|
|
|
{
|
2017-12-19 14:08:48 +00:00
|
|
|
procd_add_reload_trigger "dhcp" "system"
|
2018-05-07 22:37:48 +00:00
|
|
|
|
|
|
|
config_load dhcp
|
|
|
|
config_foreach add_interface_trigger dhcp
|
2018-07-17 11:42:17 +00:00
|
|
|
config_foreach add_interface_trigger relay
|
|
|
|
}
|
|
|
|
|
|
|
|
boot()
|
|
|
|
{
|
|
|
|
BOOT=1
|
|
|
|
start "$@"
|
2016-10-12 08:33:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
start_service() {
|
|
|
|
local instance="$1"
|
|
|
|
local instance_found=0
|
|
|
|
|
|
|
|
. /lib/functions/network.sh
|
|
|
|
|
|
|
|
config_cb() {
|
|
|
|
local type="$1"
|
|
|
|
local name="$2"
|
|
|
|
if [ "$type" = "dnsmasq" ]; then
|
|
|
|
if [ -n "$instance" -a "$instance" = "$name" ]; then
|
|
|
|
instance_found=1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
config_load dhcp
|
|
|
|
|
|
|
|
if [ -n "$instance" ]; then
|
|
|
|
[ "$instance_found" -gt 0 ] || return
|
|
|
|
dnsmasq_start "$instance"
|
|
|
|
else
|
|
|
|
config_foreach dnsmasq_start dnsmasq
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2013-12-21 13:31:28 +00:00
|
|
|
reload_service() {
|
|
|
|
rc_procd start_service "$@"
|
2017-12-19 15:11:58 +00:00
|
|
|
procd_send_signal dnsmasq "$@"
|
2013-12-21 13:31:28 +00:00
|
|
|
}
|
|
|
|
|
2013-09-17 21:45:30 +00:00
|
|
|
stop_service() {
|
2016-10-12 08:33:16 +00:00
|
|
|
local instance="$1"
|
|
|
|
local instance_found=0
|
|
|
|
|
|
|
|
config_cb() {
|
|
|
|
local type="$1"
|
|
|
|
local name="$2"
|
|
|
|
if [ "$type" = "dnsmasq" ]; then
|
|
|
|
if [ -n "$instance" -a "$instance" = "$name" ]; then
|
|
|
|
instance_found=1
|
|
|
|
fi
|
|
|
|
fi
|
2008-09-07 15:22:25 +00:00
|
|
|
}
|
2016-10-12 08:33:16 +00:00
|
|
|
|
|
|
|
config_load dhcp
|
|
|
|
|
|
|
|
if [ -n "$instance" ]; then
|
|
|
|
[ "$instance_found" -gt 0 ] || return
|
|
|
|
dnsmasq_stop "$instance"
|
|
|
|
else
|
|
|
|
config_foreach dnsmasq_stop dnsmasq
|
|
|
|
fi
|
2006-10-04 20:05:48 +00:00
|
|
|
}
|