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() {
}
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() {
local cfg="$1"
append_bool "$cfg" authoritative "-K"
append_bool "$cfg" enable_tftp "--enable-tftp"
append_bool "$cfg" nonwildcard "-z"
+ append_parm "$cfg" dhcpscript "-6"
+ append_parm "$cfg" cachesize "-c"
append_parm "$cfg" dnsforwardmax "-0"
append_parm "$cfg" port "-p"
append_parm "$cfg" ednspacket_max "-P"
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"
config_get DOMAIN "$cfg" domain
config_get_bool readethers "$cfg" readethers
- [ "$readethers" = "1" ] && [ -e "/etc/ethers" ] || touch /etc/ethers
+ [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
config_get leasefile $cfg leasefile
- [ -e "$leasefile" ] || touch "$leasefile"
+ [ -n "$leasefile" -a \! -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() {
dhcp_host_add() {
local cfg="$1"
- config_get name "$cfg" name
-
config_get networkid "$cfg" networkid
[ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid"
+ config_get name "$cfg" name
config_get ip "$cfg" ip
- [ -n "$ip" ] || return 0
+ [ -n "$ip" ] || [ -n "$name" ] || return 0
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}"
+ append args "--dhcp-host=$macs${networkid:+,net:$networkid}${ip:+,$ip}${name:+,$name}"
}
dhcp_mac_add() {
DNS_SERVERS="$DNS_SERVERS $dnsserver"
}
- append_bool "$cfg" ignore "-2 '$ifname'" && return 0
+ append_bool "$cfg" ignore "-2 $ifname" && return 0
config_get proto "$net" proto
[ static = "$proto" ] || return 0
#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
leasetime="${leasetime:-12h}"
start="$(dhcp_calc "${start:-100}")"
limit="${limit:-150}"
+ [ "$limit" -gt 0 ] && limit=$((limit-1))
eval "$(ipcalc.sh $ipaddr $netmask $start $limit)"
if [ "$dynamicdhcp" = "0" ]; then END="static"; fi
append args "--dhcp-range=$networkid,$START,$END,$NETMASK,$leasetime${options:+ $options}"
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() {
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
ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
}
- killall dnsmasq
+ service_kill dnsmasq /var/run/dnsmasq.pid
return 0
}
projects / openwrt.git / blobdiff