X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6df5e6f2088d39e117540ab60345b65f32cfeadb..291f78f21ab699d2650a7f308ac8c58ccf85275e:/package/dnsmasq/files/dnsmasq.init?ds=sidebyside diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index 1a2461263..0b74d419e 100644 --- a/package/dnsmasq/files/dnsmasq.init +++ b/package/dnsmasq/files/dnsmasq.init @@ -3,6 +3,7 @@ START=60 DNS_SERVERS="" +DOMAIN="" dhcp_calc() { local ip="$1" @@ -22,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() { @@ -36,6 +37,28 @@ append_parm() { append args "$switch $_loctmp" } +append_server() { + append args "-S $1" +} + +append_interface() { + local ifname=$(uci_get_state network "$1" ifname "$1") + append args "-i $ifname" +} + +append_notinterface() { + 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() { local cfg="$1" append_bool "$cfg" authoritative "-K" @@ -49,143 +72,206 @@ dnsmasq() { append_bool "$cfg" noresolv "-R" append_bool "$cfg" localise_queries "-y" append_bool "$cfg" readethers "-Z" - append_bool "$cfg" dbus "-l" + append_bool "$cfg" dbus "-1" append_bool "$cfg" boguspriv "-b" append_bool "$cfg" expandhosts "-E" + 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" + append_parm "$cfg" "dhcp_boot" "--dhcp-boot" + + 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" ] || return 0 - 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" + macs="" + config_get mac "$cfg" mac + for m in $mac; do append macs "$m" ","; done + [ -n "$macs" ] || return 0 - dhcp_option_add "$cfg" "$name" + 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" "$networkid" +} + +dhcp_boot_add() { + local cfg="$1" + + config_get networkid "$cfg" networkid + + config_get filename "$cfg" filename + [ -n "$filename" ] || return 0 - dhcp_option_add "$cfg" "$name" + config_get servername "$cfg" servername + [ -n "$servername" ] || return 0 + + config_get serveraddress "$cfg" serveraddress + [ -n "$serveraddress" ] || return 0 + + append args "--dhcp-boot=${networkid:+net:$networkid,}$filename,$servername,$serveraddress" + + dhcp_option_add "$cfg" "$networkid" } + dhcp_add() { local cfg="$1" 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 config_get dnsserver "$net" dns - [ -n "$dnsserver" ] && { + [ "$cachelocal" = "0" -a -n "$dnsserver" ] && { DNS_SERVERS="$DNS_SERVERS $dnsserver" } - append_bool "$cfg" ignore "-I $ifname" + append_bool "$cfg" ignore "-2 '$ifname'" && return 0 config_get proto "$net" proto [ static = "$proto" ] || return 0 @@ -196,8 +282,8 @@ 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 -R -s /bin/true -t 1 -i $ifname >&- && return 0 + [ $force -gt 0 ] || { + udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && return 0 } config_get start "$cfg" start @@ -208,27 +294,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" - - for count in $(seq 0 100); do - eval current_value=\$CONFIG_"$cfg"_dhcp"$count" - if [ -z "$current_value" ]; then - let "count-=1" - break - fi - append args "-O $name","$current_value" + local networkid="$2" + + config_get dhcp_option "$cfg" dhcp_option + for o in $dhcp_option; do + append args "-O $networkid","$o" + done + +} + +dhcp_domain_add() { + local cfg="$1" + local ip name names + + 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" + 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() { @@ -239,16 +366,20 @@ start() { args="" config_foreach dnsmasq dnsmasq config_foreach dhcp_host_add host + config_foreach dhcp_boot_add boot config_foreach dhcp_mac_add mac config_foreach dhcp_vendorclass_add vendorclass config_foreach dhcp_userclass_add userclass config_foreach dhcp_circuitid_add circuitid 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 @@ -257,5 +388,10 @@ start() { } stop() { + [ -f /tmp/resolv.conf ] && { + rm -f /tmp/resolv.conf + ln -s /tmp/resolv.conf.auto /tmp/resolv.conf + } killall dnsmasq + return 0 }