mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
dnsmasq: add logfacility file to jail mounts
This commit is contained in:
coolsnowwolf
parent
e50a86b90f
commit
a1b503c6ad
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2006-2016 OpenWrt.org
|
||||
# Copyright (C) 2006-2022 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
|
||||
@ -19,57 +19,13 @@ BASEDHCPSTAMPFILE="/var/run/dnsmasq"
|
||||
DHCPBOGUSHOSTNAMEFILE="/usr/share/dnsmasq/dhcpbogushostname.conf"
|
||||
RFC6761FILE="/usr/share/dnsmasq/rfc6761.conf"
|
||||
DHCPSCRIPT="/usr/lib/dnsmasq/dhcp-script.sh"
|
||||
DHCPSCRIPT_DEPENDS="/usr/share/libubox/jshn.sh /usr/bin/jshn /bin/ubus"
|
||||
|
||||
DNSMASQ_DHCP_VER=4
|
||||
|
||||
dnsmasq_ignore_opt() {
|
||||
local opt="$1"
|
||||
|
||||
if [ -z "$dnsmasq_features" ]; then
|
||||
dnsmasq_features="$(dnsmasq --version | grep -m1 'Compile time options:' | cut -d: -f2) "
|
||||
[ "${dnsmasq_features#* DHCP }" = "$dnsmasq_features" ] || dnsmasq_has_dhcp=1
|
||||
[ "${dnsmasq_features#* DHCPv6 }" = "$dnsmasq_features" ] || dnsmasq_has_dhcp6=1
|
||||
[ "${dnsmasq_features#* DNSSEC }" = "$dnsmasq_features" ] || dnsmasq_has_dnssec=1
|
||||
[ "${dnsmasq_features#* TFTP }" = "$dnsmasq_features" ] || dnsmasq_has_tftp=1
|
||||
[ "${dnsmasq_features#* ipset }" = "$dnsmasq_features" ] || dnsmasq_has_ipset=1
|
||||
[ "${dnsmasq_features#* nftset }" = "$dnsmasq_features" ] || dnsmasq_has_nftset=1
|
||||
fi
|
||||
|
||||
case "$opt" in
|
||||
dhcp-duid|\
|
||||
ra-param)
|
||||
[ -z "$dnsmasq_has_dhcp6" ] ;;
|
||||
dhcp-*|\
|
||||
bootp-*|\
|
||||
pxe-*)
|
||||
[ -z "$dnsmasq_has_dhcp" ] ;;
|
||||
dnssec*|\
|
||||
trust-anchor)
|
||||
if [ -z "$dnsmasq_has_dnssec" ]; then
|
||||
echo "dnsmasq: \"$opt\" requested, but dnssec support is not available" >&2
|
||||
exit 1
|
||||
fi
|
||||
return 1
|
||||
;;
|
||||
tftp-*)
|
||||
[ -z "$dnsmasq_has_tftp" ] ;;
|
||||
ipset)
|
||||
[ -z "$dnsmasq_has_ipset" ] ;;
|
||||
nftset)
|
||||
[ -z "$dnsmasq_has_nftset" ] ;;
|
||||
*)
|
||||
return 1
|
||||
esac
|
||||
}
|
||||
|
||||
xappend() {
|
||||
local value="${1#--}"
|
||||
local opt="${value%%=*}"
|
||||
local value="$1"
|
||||
|
||||
if ! dnsmasq_ignore_opt "$opt"; then
|
||||
echo "$value" >>$CONFIGFILE_TMP
|
||||
fi
|
||||
echo "${value#--}" >> $CONFIGFILE_TMP
|
||||
}
|
||||
|
||||
hex_to_hostid() {
|
||||
@ -111,14 +67,19 @@ dhcp_check() {
|
||||
|
||||
[ -s "$stamp" ] && return $(cat "$stamp")
|
||||
|
||||
# If interface is down, skip it.
|
||||
# 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 @.up)" in
|
||||
case "$(devstatus "$ifname" | jsonfilter -e @.carrier)" in
|
||||
false) return 1;;
|
||||
esac
|
||||
|
||||
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
|
||||
}
|
||||
@ -172,8 +133,8 @@ append_address() {
|
||||
xappend "--address=$1"
|
||||
}
|
||||
|
||||
append_connmark_allowlist() {
|
||||
xappend "--connmark-allowlist=$1"
|
||||
append_ipset() {
|
||||
xappend "--ipset=$1"
|
||||
}
|
||||
|
||||
append_interface() {
|
||||
@ -190,26 +151,7 @@ append_notinterface() {
|
||||
xappend "--except-interface=$ifname"
|
||||
}
|
||||
|
||||
ismounted() {
|
||||
local filename="$1"
|
||||
local dirname
|
||||
for dirname in $EXTRA_MOUNT ; do
|
||||
case "$filename" in
|
||||
"${dirname}/"* | "${dirname}" )
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
append_extramount() {
|
||||
ismounted "$1" || append EXTRA_MOUNT "$1"
|
||||
}
|
||||
|
||||
append_addnhosts() {
|
||||
append_extramount "$1"
|
||||
xappend "--addn-hosts=$1"
|
||||
}
|
||||
|
||||
@ -230,7 +172,7 @@ filter_dnsmasq() {
|
||||
|
||||
# use entry when no instance entry set, or if it matches
|
||||
config_get found_cfg "$cfg" "instance"
|
||||
if [ -z "$found_cfg" ] || [ "$found_cfg" = "$match_cfg" ]; then
|
||||
if [ -z "$found_cfg" -o "$found_cfg" = "$match_cfg" ]; then
|
||||
$func $cfg
|
||||
fi
|
||||
}
|
||||
@ -244,7 +186,7 @@ dhcp_subscrid_add() {
|
||||
config_get subscriberid "$cfg" subscriberid
|
||||
[ -n "$subscriberid" ] || return 0
|
||||
|
||||
xappend "--dhcp-subscrid=set:$networkid,$subscriberid"
|
||||
xappend "--dhcp-subscrid=$networkid,$subscriberid"
|
||||
|
||||
config_get_bool force "$cfg" force 0
|
||||
|
||||
@ -260,7 +202,7 @@ dhcp_remoteid_add() {
|
||||
config_get remoteid "$cfg" remoteid
|
||||
[ -n "$remoteid" ] || return 0
|
||||
|
||||
xappend "--dhcp-remoteid=set:$networkid,$remoteid"
|
||||
xappend "--dhcp-remoteid=$networkid,$remoteid"
|
||||
|
||||
config_get_bool force "$cfg" force 0
|
||||
|
||||
@ -277,7 +219,7 @@ dhcp_circuitid_add() {
|
||||
config_get circuitid "$cfg" circuitid
|
||||
[ -n "$circuitid" ] || return 0
|
||||
|
||||
xappend "--dhcp-circuitid=set:$networkid,$circuitid"
|
||||
xappend "--dhcp-circuitid=$networkid,$circuitid"
|
||||
|
||||
config_get_bool force "$cfg" force 0
|
||||
|
||||
@ -293,7 +235,7 @@ dhcp_userclass_add() {
|
||||
config_get userclass "$cfg" userclass
|
||||
[ -n "$userclass" ] || return 0
|
||||
|
||||
xappend "--dhcp-userclass=set:$networkid,$userclass"
|
||||
xappend "--dhcp-userclass=$networkid,$userclass"
|
||||
|
||||
config_get_bool force "$cfg" force 0
|
||||
|
||||
@ -310,7 +252,7 @@ dhcp_vendorclass_add() {
|
||||
config_get vendorclass "$cfg" vendorclass
|
||||
[ -n "$vendorclass" ] || return 0
|
||||
|
||||
xappend "--dhcp-vendorclass=set:$networkid,$vendorclass"
|
||||
xappend "--dhcp-vendorclass=$networkid,$vendorclass"
|
||||
|
||||
config_get_bool force "$cfg" force 0
|
||||
|
||||
@ -326,7 +268,7 @@ dhcp_match_add() {
|
||||
config_get match "$cfg" match
|
||||
[ -n "$match" ] || return 0
|
||||
|
||||
xappend "--dhcp-match=set:$networkid,$match"
|
||||
xappend "--dhcp-match=$networkid,$match"
|
||||
|
||||
config_get_bool force "$cfg" force 0
|
||||
|
||||
@ -335,7 +277,7 @@ dhcp_match_add() {
|
||||
|
||||
dhcp_host_add() {
|
||||
local cfg="$1"
|
||||
local hosttag nametime addrs duids macs tags mtags
|
||||
local hosttag nametime addrs duids macs tags
|
||||
|
||||
config_get_bool force "$cfg" force 0
|
||||
|
||||
@ -349,10 +291,10 @@ dhcp_host_add() {
|
||||
config_get ip "$cfg" ip
|
||||
config_get hostid "$cfg" hostid
|
||||
|
||||
[ -z "$ip" ] && [ -z "$name" ] && [ -z "$hostid" ] && return 0
|
||||
[ -n "$ip" -o -n "$name" -o -n "$hostid" ] || return 0
|
||||
|
||||
config_get_bool dns "$cfg" dns 0
|
||||
[ "$dns" = "1" ] && [ -n "$ip" ] && [ -n "$name" ] && {
|
||||
[ "$dns" = "1" -a -n "$ip" -a -n "$name" ] && {
|
||||
echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE_TMP
|
||||
}
|
||||
|
||||
@ -360,24 +302,19 @@ dhcp_host_add() {
|
||||
config_get duid "$cfg" duid
|
||||
config_get tag "$cfg" tag
|
||||
|
||||
add_tag() {
|
||||
mtags="${mtags}tag:$1,"
|
||||
}
|
||||
config_list_foreach "$cfg" match_tag add_tag
|
||||
|
||||
if [ -n "$mac" ]; then
|
||||
# --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap
|
||||
# many MAC are possible to track a laptop ON/OFF dock
|
||||
for m in $mac; do append macs "$m" ","; done
|
||||
fi
|
||||
|
||||
if [ $DNSMASQ_DHCP_VER -eq 6 ] && [ -n "$duid" ]; then
|
||||
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" ] && [ -z "$duids" ]; then
|
||||
if [ -z "$macs" -a -z "$duids" ]; then
|
||||
# --dhcp-host=lap,192.168.0.199,[::beef]
|
||||
[ -n "$name" ] || return 0
|
||||
macs="$name"
|
||||
@ -402,9 +339,9 @@ dhcp_host_add() {
|
||||
|
||||
if [ $DNSMASQ_DHCP_VER -eq 6 ]; then
|
||||
addrs="${ip:+,$ip}${hostid:+,[::$hostid]}"
|
||||
xappend "--dhcp-host=$mtags$macs${duids:+,$duids}$hosttag$addrs$nametime"
|
||||
xappend "--dhcp-host=$macs${duids:+,$duids}$hosttag$addrs$nametime"
|
||||
else
|
||||
xappend "--dhcp-host=$mtags$macs$hosttag${ip:+,$ip}$nametime"
|
||||
xappend "--dhcp-host=$macs$hosttag${ip:+,$ip}$nametime"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -444,7 +381,7 @@ dhcp_this_host_add() {
|
||||
dhcp_domain_add "" "$routername" "$lanaddr"
|
||||
fi
|
||||
|
||||
if [ -n "$ulaprefix" ] && [ -n "$lanaddrs6" ] ; then
|
||||
if [ -n "$ulaprefix" -a -n "$lanaddrs6" ] ; then
|
||||
for lanaddr6 in $lanaddrs6 ; do
|
||||
case "$lanaddr6" in
|
||||
"${ulaprefix%%:/*}"*)
|
||||
@ -500,7 +437,7 @@ dhcp_boot_add() {
|
||||
config_get servername "$cfg" servername
|
||||
config_get serveraddress "$cfg" serveraddress
|
||||
|
||||
[ -n "$serveraddress" ] && [ ! -n "$servername" ] && return 0
|
||||
[ -n "$serveraddress" -a ! -n "$servername" ] && return 0
|
||||
|
||||
xappend "--dhcp-boot=${networkid:+net:$networkid,}${filename}${servername:+,$servername}${serveraddress:+,$serveraddress}"
|
||||
|
||||
@ -545,12 +482,7 @@ dhcp_add() {
|
||||
|
||||
#check for an already active dhcp server on the interface, unless 'force' is set
|
||||
config_get_bool force "$cfg" force 0
|
||||
[ $force -gt 0 ] || dhcp_check "$ifname" || {
|
||||
logger -t dnsmasq \
|
||||
"found already running DHCP-server on interface '$ifname'" \
|
||||
"refusing to start, use 'option force 1' to override"
|
||||
return 0
|
||||
}
|
||||
[ $force -gt 0 ] || dhcp_check "$ifname" || return 0
|
||||
|
||||
config_get start "$cfg" start 100
|
||||
config_get limit "$cfg" limit 150
|
||||
@ -599,7 +531,7 @@ dhcp_add() {
|
||||
fi
|
||||
|
||||
|
||||
if [ $DNSMASQ_DHCP_VER -eq 6 ] && [ "$ra" = "server" ] ; then
|
||||
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.
|
||||
|
||||
@ -797,83 +729,26 @@ dhcp_relay_add() {
|
||||
fi
|
||||
}
|
||||
|
||||
dnsmasq_ipset_add() {
|
||||
local cfg="$1"
|
||||
local ipsets nftsets domains
|
||||
|
||||
add_ipset() {
|
||||
ipsets="${ipsets:+$ipsets,}$1"
|
||||
}
|
||||
|
||||
add_nftset() {
|
||||
local IFS=,
|
||||
for set in $1; do
|
||||
local fam="$family"
|
||||
[ -n "$fam" ] || fam=$(echo "$set" | sed -nre \
|
||||
's#^.*[^0-9]([46])$|^.*[-_]([46])[-_].*$|^([46])[^0-9].*$#\1\2\3#p')
|
||||
[ -n "$fam" ] || \
|
||||
fam=$(nft -t list set "$table_family" "$table" "$set" 2>&1 | sed -nre \
|
||||
's#^\t\ttype .*\bipv([46])_addr\b.*$#\1#p')
|
||||
|
||||
[ -n "$fam" ] || \
|
||||
logger -t dnsmasq "Cannot infer address family from non-existent nftables set '$set'"
|
||||
|
||||
nftsets="${nftsets:+$nftsets,}${fam:+$fam#}$table_family#$table#$set"
|
||||
done
|
||||
}
|
||||
|
||||
add_domain() {
|
||||
# leading '/' is expected
|
||||
domains="$domains/$1"
|
||||
}
|
||||
|
||||
config_get table "$cfg" table 'fw4'
|
||||
config_get table_family "$cfg" table_family 'inet'
|
||||
if [ "$table_family" = "ip" ] ; then
|
||||
family="4"
|
||||
elif [ "$table_family" = "ip6" ] ; then
|
||||
family="6"
|
||||
else
|
||||
config_get family "$cfg" family
|
||||
fi
|
||||
|
||||
config_list_foreach "$cfg" "name" add_ipset
|
||||
config_list_foreach "$cfg" "name" add_nftset
|
||||
config_list_foreach "$cfg" "domain" add_domain
|
||||
|
||||
if [ -z "$ipsets" ] || [ -z "$nftsets" ] || [ -z "$domains" ]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
xappend "--ipset=$domains/$ipsets"
|
||||
xappend "--nftset=$domains/$nftsets"
|
||||
}
|
||||
|
||||
dnsmasq_start()
|
||||
{
|
||||
local cfg="$1"
|
||||
local disabled user_dhcpscript logfacility
|
||||
local resolvfile resolvdir localuse=0
|
||||
local cfg="$1" disabled resolvfile user_dhcpscript
|
||||
|
||||
config_get_bool disabled "$cfg" disabled 0
|
||||
[ "$disabled" -gt 0 ] && return 0
|
||||
|
||||
# reset list of DOMAINS, DNS servers and EXTRA mounts (for each dnsmasq instance)
|
||||
# reset list of DOMAINS and DNS servers (for each dnsmasq instance)
|
||||
DNS_SERVERS=""
|
||||
DOMAIN=""
|
||||
EXTRA_MOUNT=""
|
||||
CONFIGFILE="${BASECONFIGFILE}.${cfg}"
|
||||
CONFIGFILE_TMP="${CONFIGFILE}.$$"
|
||||
HOSTFILE="${BASEHOSTFILE}.${cfg}"
|
||||
HOSTFILE_TMP="${HOSTFILE}.$$"
|
||||
HOSTFILE_DIR="$(dirname "$HOSTFILE")"
|
||||
BASEDHCPSTAMPFILE_CFG="${BASEDHCPSTAMPFILE}.${cfg}"
|
||||
|
||||
# before we can call xappend
|
||||
umask u=rwx,g=rx,o=rx
|
||||
mkdir -p /var/run/dnsmasq/
|
||||
mkdir -p $(dirname $CONFIGFILE)
|
||||
mkdir -p "$HOSTFILE_DIR"
|
||||
mkdir -p $(dirname $HOSTFILE)
|
||||
mkdir -p /var/lib/misc
|
||||
chown dnsmasq:dnsmasq /var/run/dnsmasq
|
||||
|
||||
@ -893,13 +768,13 @@ dnsmasq_start()
|
||||
$PROG --version | grep -osqE "^Compile time options:.* DHCPv6( |$)" && DHCPv6CAPABLE=1 || DHCPv6CAPABLE=0
|
||||
|
||||
|
||||
if [ -x /usr/sbin/odhcpd ] && [ -x /etc/init.d/odhcpd ] ; then
|
||||
if [ -x /usr/sbin/odhcpd -a -x /etc/init.d/odhcpd ] ; then
|
||||
local odhcpd_is_main odhcpd_is_enabled
|
||||
config_get odhcpd_is_main odhcpd maindhcp 0
|
||||
/etc/init.d/odhcpd enabled && odhcpd_is_enabled=1 || odhcpd_is_enabled=0
|
||||
|
||||
|
||||
if [ "$odhcpd_is_enabled" -eq 0 ] && [ "$DHCPv6CAPABLE" -eq 1 ] ; then
|
||||
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
|
||||
@ -922,7 +797,7 @@ dnsmasq_start()
|
||||
if [ -x /etc/init.d/dhcpd ] ; then
|
||||
/etc/init.d/dhcpd enabled && DNSMASQ_DHCP_VER=0
|
||||
fi
|
||||
if [ -x /etc/init.d/dhcpd6 ] && [ "$DNSMASQ_DHCP_VER" -gt 0 ] ; then
|
||||
if [ -x /etc/init.d/dhcpd6 -a "$DNSMASQ_DHCP_VER" -gt 0 ] ; then
|
||||
/etc/init.d/dhcpd6 enabled && DNSMASQ_DHCP_VER=4
|
||||
fi
|
||||
fi
|
||||
@ -938,16 +813,8 @@ dnsmasq_start()
|
||||
append_bool "$cfg" noresolv "--no-resolv"
|
||||
append_bool "$cfg" localise_queries "--localise-queries"
|
||||
append_bool "$cfg" readethers "--read-ethers"
|
||||
|
||||
local instance_name="dnsmasq.$cfg"
|
||||
if [ "$cfg" = "$DEFAULT_INSTANCE" ]; then
|
||||
instance_name="dnsmasq"
|
||||
fi
|
||||
config_get_bool dbus "$cfg" "dbus" 0
|
||||
[ $dbus -gt 0 ] && xappend "--enable-dbus=uk.org.thekelleys.$instance_name"
|
||||
config_get_bool ubus "$cfg" "ubus" 1
|
||||
[ $ubus -gt 0 ] && xappend "--enable-ubus=$instance_name"
|
||||
|
||||
append_bool "$cfg" dbus "--enable-dbus"
|
||||
append_bool "$cfg" ubus "--enable-ubus" 1
|
||||
append_bool "$cfg" expandhosts "--expand-hosts"
|
||||
config_get tftp_root "$cfg" "tftp_root"
|
||||
[ -n "$tftp_root" ] && mkdir -p "$tftp_root" && append_bool "$cfg" enable_tftp "--enable-tftp"
|
||||
@ -961,14 +828,13 @@ dnsmasq_start()
|
||||
append_bool "$cfg" sequential_ip "--dhcp-sequential-ip"
|
||||
append_bool "$cfg" allservers "--all-servers"
|
||||
append_bool "$cfg" noping "--no-ping"
|
||||
append_bool "$cfg" rapidcommit "--dhcp-rapid-commit"
|
||||
append_bool "$cfg" scriptarp "--script-arp"
|
||||
|
||||
append_bool "$cfg" filter_aaaa "--filter-AAAA"
|
||||
append_bool "$cfg" filter_a "--filter-A"
|
||||
append_bool "$cfg" filter_aaaa "--filter-aaaa"
|
||||
|
||||
append_parm "$cfg" logfacility "--log-facility"
|
||||
config_get logfacility "$cfg" "logfacility"
|
||||
|
||||
append_parm "$cfg" mini_ttl "--min-ttl"
|
||||
|
||||
append_parm "$cfg" cachesize "--cache-size"
|
||||
append_parm "$cfg" dnsforwardmax "--dns-forward-max"
|
||||
append_parm "$cfg" port "--port"
|
||||
@ -978,50 +844,24 @@ dnsmasq_start()
|
||||
append_parm "$cfg" "minport" "--min-port"
|
||||
append_parm "$cfg" "maxport" "--max-port"
|
||||
append_parm "$cfg" "domain" "--domain"
|
||||
append_parm "$cfg" "local" "--local"
|
||||
append_parm "$cfg" "local" "--server"
|
||||
config_list_foreach "$cfg" "listen_address" append_listenaddress
|
||||
config_list_foreach "$cfg" "server" append_server
|
||||
config_list_foreach "$cfg" "rev_server" append_rev_server
|
||||
config_list_foreach "$cfg" "address" append_address
|
||||
|
||||
local connmark_allowlist_enable
|
||||
config_get connmark_allowlist_enable "$cfg" connmark_allowlist_enable 0
|
||||
[ "$connmark_allowlist_enable" -gt 0 ] && {
|
||||
append_parm "$cfg" "connmark_allowlist_enable" "--connmark-allowlist-enable"
|
||||
config_list_foreach "$cfg" "connmark_allowlist" append_connmark_allowlist
|
||||
}
|
||||
|
||||
config_list_foreach "$cfg" "ipset" append_ipset
|
||||
[ -n "$BOOT" ] || {
|
||||
config_list_foreach "$cfg" "interface" append_interface
|
||||
config_list_foreach "$cfg" "notinterface" append_notinterface
|
||||
}
|
||||
config_get_bool ignore_hosts_dir "$cfg" ignore_hosts_dir 0
|
||||
if [ "$ignore_hosts_dir" = "1" ]; then
|
||||
xappend "--addn-hosts=$HOSTFILE"
|
||||
append EXTRA_MOUNT "$HOSTFILE"
|
||||
else
|
||||
xappend "--addn-hosts=$HOSTFILE_DIR"
|
||||
append EXTRA_MOUNT "$HOSTFILE_DIR"
|
||||
fi
|
||||
config_list_foreach "$cfg" "addnhosts" append_addnhosts
|
||||
config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
|
||||
append_parm "$cfg" "leasefile" "--dhcp-leasefile" "/tmp/dhcp.leases"
|
||||
|
||||
local serversfile
|
||||
config_get serversfile "$cfg" "serversfile"
|
||||
[ -n "$serversfile" ] && {
|
||||
xappend "--servers-file=$serversfile"
|
||||
append EXTRA_MOUNT "$serversfile"
|
||||
}
|
||||
|
||||
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" "max_ttl" "--max-ttl"
|
||||
append_parm "$cfg" "min_cache_ttl" "--min-cache-ttl"
|
||||
append_parm "$cfg" "max_cache_ttl" "--max-cache-ttl"
|
||||
append_parm "$cfg" "pxe_prompt" "--pxe-prompt"
|
||||
append_parm "$cfg" "tftp_unique_root" "--tftp-unique-root"
|
||||
config_list_foreach "$cfg" "pxe_service" append_pxe_service
|
||||
config_get DOMAIN "$cfg" domain
|
||||
|
||||
@ -1038,22 +878,20 @@ dnsmasq_start()
|
||||
config_get user_dhcpscript $cfg dhcpscript
|
||||
if has_handler || [ -n "$user_dhcpscript" ]; then
|
||||
xappend "--dhcp-script=$DHCPSCRIPT"
|
||||
xappend "--script-arp"
|
||||
fi
|
||||
|
||||
config_get leasefile $cfg leasefile "/tmp/dhcp.leases"
|
||||
[ -n "$leasefile" ] && [ ! -e "$leasefile" ] && touch "$leasefile"
|
||||
[ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
|
||||
config_get_bool cachelocal "$cfg" cachelocal 1
|
||||
|
||||
config_get_bool noresolv "$cfg" noresolv 0
|
||||
if [ "$noresolv" != "1" ]; then
|
||||
config_get resolvfile "$cfg" resolvfile /tmp/resolv.conf.d/resolv.conf.auto
|
||||
[ -n "$resolvfile" ] && [ ! -e "$resolvfile" ] && touch "$resolvfile"
|
||||
xappend "--resolv-file=$resolvfile"
|
||||
[ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto" ] && localuse=1
|
||||
resolvdir="$(dirname "$resolvfile")"
|
||||
config_get resolvfile "$cfg" resolvfile "/tmp/resolv.conf.d/resolv.conf.auto.auto"
|
||||
# So jail doesn't complain if file missing
|
||||
[ -n "$resolvfile" -a \! -e "$resolvfile" ] && touch "$resolvfile"
|
||||
fi
|
||||
config_get_bool localuse "$cfg" localuse "$localuse"
|
||||
|
||||
[ -n "$resolvfile" ] && xappend "--resolv-file=$resolvfile"
|
||||
|
||||
config_get hostsfile "$cfg" dhcphostsfile
|
||||
[ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
|
||||
@ -1086,12 +924,12 @@ dnsmasq_start()
|
||||
xappend "--conf-file=$TRUSTANCHORSFILE"
|
||||
xappend "--dnssec"
|
||||
[ -x /etc/init.d/sysntpd ] && {
|
||||
if /etc/init.d/sysntpd enabled || [ "$(uci_get system.ntp.enabled)" = "1" ] ; then
|
||||
/etc/init.d/sysntpd enabled
|
||||
[ "$?" -ne 0 -o "$(uci_get system.ntp.enabled)" = "1" ] && {
|
||||
[ -f "$TIMEVALIDFILE" ] || xappend "--dnssec-no-timecheck"
|
||||
fi
|
||||
}
|
||||
config_get_bool dnsseccheckunsigned "$cfg" dnsseccheckunsigned 1
|
||||
[ "$dnsseccheckunsigned" -eq 0 ] && xappend "--dnssec-check-unsigned=no"
|
||||
}
|
||||
append_bool "$cfg" dnsseccheckunsigned "--dnssec-check-unsigned"
|
||||
}
|
||||
|
||||
config_get addmac "$cfg" addmac 0
|
||||
@ -1105,6 +943,7 @@ dnsmasq_start()
|
||||
|
||||
xappend "--dhcp-broadcast=tag:needs-broadcast"
|
||||
|
||||
xappend "--addn-hosts=$(dirname $HOSTFILE)"
|
||||
|
||||
config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d"
|
||||
xappend "--conf-dir=$dnsmasqconfdir"
|
||||
@ -1172,62 +1011,46 @@ dnsmasq_start()
|
||||
echo >> $CONFIGFILE_TMP
|
||||
|
||||
echo >> $CONFIGFILE_TMP
|
||||
config_foreach filter_dnsmasq ipset dnsmasq_ipset_add "$cfg"
|
||||
echo >> $CONFIGFILE_TMP
|
||||
|
||||
mv -f $CONFIGFILE_TMP $CONFIGFILE
|
||||
mv -f $HOSTFILE_TMP $HOSTFILE
|
||||
|
||||
[ "$localuse" -gt 0 ] && {
|
||||
rm -f /tmp/resolv.conf
|
||||
[ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto.auto" ] && {
|
||||
rm -f /tmp/resolv.conf.d/resolv.conf.auto
|
||||
[ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && {
|
||||
echo "search $DOMAIN" >> /tmp/resolv.conf
|
||||
echo "search $DOMAIN" >> /tmp/resolv.conf.d/resolv.conf.auto
|
||||
}
|
||||
DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
|
||||
[ -e /proc/sys/net/ipv6 ] && DNS_SERVERS="$DNS_SERVERS ::1"
|
||||
for DNS_SERVER in $DNS_SERVERS ; do
|
||||
echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
|
||||
echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf.d/resolv.conf.auto
|
||||
done
|
||||
}
|
||||
|
||||
config_list_foreach "$cfg" addnmount append_extramount
|
||||
|
||||
procd_open_instance $cfg
|
||||
procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid
|
||||
procd_set_param file $CONFIGFILE
|
||||
[ -n "$user_dhcpscript" ] && procd_set_param env USER_DHCPSCRIPT="$user_dhcpscript"
|
||||
procd_set_param respawn
|
||||
|
||||
local instance_ifc instance_netdev
|
||||
config_get instance_ifc "$cfg" interface
|
||||
[ -n "$instance_ifc" ] && network_get_device instance_netdev "$instance_ifc" &&
|
||||
[ -n "$instance_netdev" ] && procd_set_param netdev $instance_netdev
|
||||
|
||||
procd_add_jail dnsmasq ubus log
|
||||
procd_add_jail_mount $CONFIGFILE $DHCPBOGUSHOSTNAMEFILE $DHCPSCRIPT $DHCPSCRIPT_DEPENDS
|
||||
procd_add_jail_mount $EXTRA_MOUNT $RFC6761FILE $TRUSTANCHORSFILE
|
||||
procd_add_jail_mount $dnsmasqconffile $dnsmasqconfdir $resolvdir $user_dhcpscript
|
||||
procd_add_jail_mount /etc/passwd /etc/group /etc/TZ /etc/hosts /etc/ethers
|
||||
procd_add_jail_mount_rw /var/run/dnsmasq/ /var/etc/ $leasefile
|
||||
case "$logfacility" in */*)
|
||||
[ ! -e "$logfacility" ] && touch "$logfacility"
|
||||
procd_add_jail_mount_rw "$logfacility"
|
||||
esac
|
||||
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
|
||||
procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
|
||||
|
||||
procd_close_instance
|
||||
}
|
||||
|
||||
dnsmasq_stop()
|
||||
{
|
||||
local cfg="$1"
|
||||
local noresolv resolvfile localuse=0
|
||||
local cfg="$1" resolvfile
|
||||
|
||||
config_get_bool noresolv "$cfg" noresolv 0
|
||||
config_get resolvfile "$cfg" "resolvfile"
|
||||
|
||||
[ "$noresolv" = 0 ] && [ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto" ] && localuse=1
|
||||
config_get_bool localuse "$cfg" localuse "$localuse"
|
||||
[ "$localuse" -gt 0 ] && ln -sf "/tmp/resolv.conf.d/resolv.conf.auto" /tmp/resolv.conf
|
||||
#relink /tmp/resolve.conf only for main instance
|
||||
[ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto.auto" ] && {
|
||||
[ -f /tmp/resolv.conf.d/resolv.conf.auto ] && {
|
||||
rm -f /tmp/resolv.conf.d/resolv.conf.auto
|
||||
ln -s "$resolvfile" /tmp/resolv.conf.d/resolv.conf.auto
|
||||
}
|
||||
}
|
||||
|
||||
rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp
|
||||
}
|
||||
@ -1239,7 +1062,7 @@ add_interface_trigger()
|
||||
config_get interface "$1" interface
|
||||
config_get_bool ignore "$1" ignore 0
|
||||
|
||||
[ -n "$interface" ] && [ $ignore -eq 0 ] && procd_add_interface_trigger "interface.*" "$interface" /etc/init.d/dnsmasq reload
|
||||
[ -n "$interface" -a $ignore -eq 0 ] && procd_add_interface_trigger "interface.*" "$interface" /etc/init.d/dnsmasq reload
|
||||
}
|
||||
|
||||
service_triggers()
|
||||
@ -1260,7 +1083,6 @@ boot()
|
||||
start_service() {
|
||||
local instance="$1"
|
||||
local instance_found=0
|
||||
local first_instance=""
|
||||
|
||||
. /lib/functions/network.sh
|
||||
|
||||
@ -1268,30 +1090,13 @@ start_service() {
|
||||
local type="$1"
|
||||
local name="$2"
|
||||
if [ "$type" = "dnsmasq" ]; then
|
||||
if [ -n "$instance" ] && [ "$instance" = "$name" ]; then
|
||||
if [ -n "$instance" -a "$instance" = "$name" ]; then
|
||||
instance_found=1
|
||||
fi
|
||||
if [ -z "$DEFAULT_INSTANCE" ]; then
|
||||
local disabled
|
||||
config_get_bool disabled "$name" disabled 0
|
||||
if [ "$disabled" -eq 0 ]; then
|
||||
# First enabled section will be assigned default instance name.
|
||||
# Unnamed sections get precedence over named sections.
|
||||
if expr "$cfg" : 'cfg[0-9a-f]*$' >/dev/null = "9"; then # See uci_fixup_section.
|
||||
DEFAULT_INSTANCE="$name" # Unnamed config section.
|
||||
elif [ -z "$first_instance" ]; then
|
||||
first_instance="$name"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
DEFAULT_INSTANCE=""
|
||||
config_load dhcp
|
||||
if [ -z "$DEFAULT_INSTANCE" ]; then
|
||||
DEFAULT_INSTANCE="$first_instance" # No unnamed config section was found.
|
||||
fi
|
||||
|
||||
if [ -n "$instance" ]; then
|
||||
[ "$instance_found" -gt 0 ] || return
|
||||
@ -1314,7 +1119,7 @@ stop_service() {
|
||||
local type="$1"
|
||||
local name="$2"
|
||||
if [ "$type" = "dnsmasq" ]; then
|
||||
if [ -n "$instance" ] && [ "$instance" = "$name" ]; then
|
||||
if [ -n "$instance" -a "$instance" = "$name" ]; then
|
||||
instance_found=1
|
||||
fi
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user