X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ad7c749604db97b4c734d5c22e2c9195c93ec5ad..f7a2edf410595e53cf4ca5d742c98f835e9435bf:/package/dnsmasq/files/dnsmasq.init?ds=inline diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index ba1bf721d..4acba5b84 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -23,8 +23,8 @@ append_bool() { local option="$2" local value="$3" local _loctmp - config_get_bool _loctmp "$section" "$option" - [ "$_loctmp" -gt 0 ] && append args "$value" + config_get_bool _loctmp "$section" "$option" 0 + [ $_loctmp -gt 0 ] && append args "$value" } append_parm() { @@ -42,11 +42,21 @@ append_server() { } append_interface() { - append args "-i $1" + local ifname=$(uci_get_state network "$1" ifname "$1") + append args "-i $ifname" } append_notinterface() { - append args "-I $1" + local ifname=$(uci_get_state network "$1" ifname "$1") + append args "-I $ifname" +} + +append_addnhosts() { + append args "-H $1" +} + +append_bogusnxdomain() { + append args "-B $1" } dnsmasq() { @@ -68,17 +78,19 @@ dnsmasq() { append_bool "$cfg" enable_tftp "--enable-tftp" append_bool "$cfg" nonwildcard "-z" + append_parm "$cfg" cachesize "-c" append_parm "$cfg" dnsforwardmax "-0" append_parm "$cfg" port "-p" append_parm "$cfg" ednspacket_max "-P" append_parm "$cfg" dhcpleasemax "-X" - append_parm "$cfg" "addnhosts" "-H" append_parm "$cfg" "queryport" "-Q" append_parm "$cfg" "domain" "-s" append_parm "$cfg" "local" "-S" config_list_foreach "$cfg" "server" append_server config_list_foreach "$cfg" "interface" append_interface config_list_foreach "$cfg" "notinterface" append_notinterface + config_list_foreach "$cfg" "addnhosts" append_addnhosts + config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain append_parm "$cfg" "leasefile" "-l" append_parm "$cfg" "resolvfile" "-r" append_parm "$cfg" "tftp_root" "--tftp-root" @@ -86,117 +98,147 @@ dnsmasq() { config_get DOMAIN "$cfg" domain + config_get_bool readethers "$cfg" readethers + [ "$readethers" = "1" ] && [ -e "/etc/ethers" ] || touch /etc/ethers + config_get leasefile $cfg leasefile - [ -e "$leasefile" ] || touch "$leasefile" + [ -n "$leasefile" ] && [ -e "$leasefile" ] || touch "$leasefile" config_get_bool cachelocal "$cfg" cachelocal 1 config_get hostsfile "$cfg" dhcphostsfile [ -e "$hostsfile" ] && append args "--dhcp-hostsfile=$hostsfile" + + local rebind + config_get_bool rebind "$cfg" rebind_protection 1 + [ $rebind -gt 0 ] && { + logger -t dnsmasq \ + "DNS rebinding protection is active," \ + "will discard upstream RFC1918 responses!" + append args "--stop-dns-rebind" + + local rebind_localhost + config_get_bool rebind_localhost "$cfg" rebind_localhost 0 + [ $rebind_localhost -gt 0 ] && { + logger -t dnsmasq "Allowing 127.0.0.0/8 responses" + append args "--rebind-localhost-ok" + } + + append_rebind_domain() { + logger -t dnsmasq "Allowing RFC1918 responses for domain $1" + append args "--rebind-domain-ok=$1" + } + + config_list_foreach "$cfg" rebind_domain append_rebind_domain + } } dhcp_subscrid_add() { local cfg="$1" - config_get name "$cfg" name - [ -n "$name" ] || return 0 + config_get networkid "$cfg" networkid + [ -n "$networkid" ] || return 0 config_get subscriberid "$cfg" subscriberid [ -n "$subscriberid" ] || return 0 - append args "--dhcp-subscrid=$name,$subscriberid" + append args "--dhcp-subscrid=$networkid,$subscriberid" - dhcp_option_add "$cfg" "$name" + dhcp_option_add "$cfg" "$networkid" } dhcp_remoteid_add() { local cfg="$1" - config_get name "$cfg" name - [ -n "$name" ] || return 0 + config_get networkid "$cfg" networkid + [ -n "$networkid" ] || return 0 config_get remoteid "$cfg" remoteid [ -n "$remoteid" ] || return 0 - append args "--dhcp-remoteid=$name,$remoteid" + append args "--dhcp-remoteid=$networkid,$remoteid" - dhcp_option_add "$cfg" "$name" + dhcp_option_add "$cfg" "$networkid" } dhcp_circuitid_add() { local cfg="$1" - config_get name "$cfg" name - [ -n "$name" ] || return 0 + config_get networkid "$cfg" networkid + [ -n "$networkid" ] || return 0 config_get circuitid "$cfg" circuitid [ -n "$circuitid" ] || return 0 - append args "--dhcp-circuitid=$name,$circuitid" + append args "--dhcp-circuitid=$networkid,$circuitid" - dhcp_option_add "$cfg" "$name" + dhcp_option_add "$cfg" "$networkid" } dhcp_userclass_add() { local cfg="$1" - config_get name "$cfg" name - [ -n "$name" ] || return 0 + config_get networkid "$cfg" networkid + [ -n "$networkid" ] || return 0 config_get userclass "$cfg" userclass [ -n "$userclass" ] || return 0 - append args "--dhcp-userclass=$name,$userclass" + append args "--dhcp-userclass=$networkid,$userclass" - dhcp_option_add "$cfg" "$name" + dhcp_option_add "$cfg" "$networkid" } dhcp_vendorclass_add() { local cfg="$1" - config_get name "$cfg" name - [ -n "$name" ] || return 0 + config_get networkid "$cfg" networkid + [ -n "$networkid" ] || return 0 config_get vendorclass "$cfg" vendorclass [ -n "$vendorclass" ] || return 0 - append args "--dhcp-vendorclass=$name,$vendorclass" + append args "--dhcp-vendorclass=$networkid,$vendorclass" - dhcp_option_add "$cfg" "$name" + dhcp_option_add "$cfg" "$networkid" } dhcp_host_add() { local cfg="$1" config_get name "$cfg" name - [ -n "$name" ] && dhcp_option_add "$cfg" "$name" - config_get mac "$cfg" mac - [ -n "$mac" ] || return 0 + config_get networkid "$cfg" networkid + [ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid" config_get ip "$cfg" ip [ -n "$ip" ] || return 0 - append args "--dhcp-host=$mac,$ip${name:+,$name}" + macs="" + config_get mac "$cfg" mac + for m in $mac; do append macs "$m" ","; done + [ -n "$macs" ] || return 0 + + append args "--dhcp-host=$macs,${networkid:+net:$networkid,}$ip${name:+,$name}" } dhcp_mac_add() { local cfg="$1" - config_get name "$cfg" name - [ -n "$name" ] || return 0 + config_get networkid "$cfg" networkid + [ -n "$networkid" ] || return 0 config_get mac "$cfg" mac [ -n "$mac" ] || return 0 - append args "--dhcp-mac=$name,$mac" + append args "--dhcp-mac=$networkid,$mac" - dhcp_option_add "$cfg" "$name" + dhcp_option_add "$cfg" "$networkid" } dhcp_boot_add() { local cfg="$1" - config_get name "$cfg" name + config_get networkid "$cfg" networkid config_get filename "$cfg" filename [ -n "$filename" ] || return 0 @@ -207,9 +249,9 @@ dhcp_boot_add() { config_get serveraddress "$cfg" serveraddress [ -n "$serveraddress" ] || return 0 - append args "--dhcp-boot=${name:+net:$name,}$filename,$servername,$serveraddress" + append args "--dhcp-boot=${networkid:+net:$networkid,}$filename,$servername,$serveraddress" - dhcp_option_add "$cfg" "$name" + dhcp_option_add "$cfg" "$networkid" } @@ -218,8 +260,8 @@ dhcp_add() { config_get net "$cfg" interface [ -n "$net" ] || return 0 - config_get name "$cfg" name - [ -n "$name" ] || name="$net" + config_get networkid "$cfg" networkid + [ -n "$networkid" ] || networkid="$net" config_get ifname "$net" ifname [ -n "$ifname" ] || return 0 @@ -240,8 +282,13 @@ 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 ] || { - udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && return 0 + [ $force -gt 0 ] || { + udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && { + logger -t dnsmasq \ + "found already running DHCP-server on interface '$ifname'" \ + "refusing to start, use 'option force 1' to override" + return 0 + } } config_get start "$cfg" start @@ -252,37 +299,68 @@ dhcp_add() { leasetime="${leasetime:-12h}" start="$(dhcp_calc "${start:-100}")" - limit="$((${limit:-150} + 1))" + limit="${limit:-150}" eval "$(ipcalc.sh $ipaddr $netmask $start $limit)" if [ "$dynamicdhcp" = "0" ]; then END="static"; fi - append args "--dhcp-range=$name,$START,$END,$NETMASK,$leasetime${options:+ $options}" + append args "--dhcp-range=$networkid,$START,$END,$NETMASK,$leasetime${options:+ $options}" - dhcp_option_add "$cfg" "$name" + dhcp_option_add "$cfg" "$networkid" } dhcp_option_add() { local cfg="$1" - local name="$2" + local networkid="$2" config_get dhcp_option "$cfg" dhcp_option for o in $dhcp_option; do - append args "-O $name","$o" + append args "-O $networkid","$o" done } dhcp_domain_add() { local cfg="$1" + local ip name names - config_get name "$cfg" name - [ -n "$name" ] || return 0 + config_get names "$cfg" name + [ -n "$names" ] || return 0 config_get ip "$cfg" ip [ -n "$ip" ] || return 0 local oIFS="$IFS"; IFS="."; set -- $ip; IFS="$oIFS" - append args "-A /$name${DOMAIN:+.$DOMAIN}/$ip" - append args "--ptr-record=$4.$3.$2.$1.in-addr.arpa,$name${DOMAIN:+.$DOMAIN}" + local raddr="${4:+$4.$3.$2.$1.in-addr.arpa}" + + for name in $names; do + local fqdn="$name" + + [ "${fqdn%.*}" == "$fqdn" ] && \ + fqdn="$fqdn${DOMAIN:+.$DOMAIN}" + + append args "-A /$fqdn/$ip" + + [ -n "$raddr" ] && { + append args "--ptr-record=$raddr,$fqdn" + raddr="" + } + done +} + +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 + + local service="$srv,$target" + [ -n "$port" ] && service="$service,$port" + + append args "-W $service" } start() { @@ -301,10 +379,12 @@ start() { config_foreach dhcp_remoteid_add remoteid config_foreach dhcp_subscrid_add subscrid config_foreach dhcp_domain_add domain + config_foreach dhcp_srv_add srvhost config_foreach dhcp_add dhcp /usr/sbin/dnsmasq $args && { rm -f /tmp/resolv.conf + [ -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