mac80211: fill some important capabilities into ht_capab in the hostapd config

[openwrt.git] / package / dnsmasq / files / dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 4fddc47..ba1bf72 100644 (file)
--- 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"
@@ -36,6 +37,18 @@ append_parm() {
        append args "$switch $_loctmp"
 }
 
+append_server() {
+       append args "-S $1"
+}
+
+append_interface() {
+       append args "-i $1"
+}
+
+append_notinterface() {
+       append args "-I $1"
+}
+
 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"
@@ -52,6 +65,8 @@ dnsmasq() {
        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" dnsforwardmax "-0"
        append_parm "$cfg" port "-p"
@@ -61,12 +76,22 @@ dnsmasq() {
        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
        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 leasefile $cfg leasefile
        [ -e "$leasefile" ] || touch "$leasefile"
        config_get_bool cachelocal "$cfg" cachelocal 1
+
+       config_get hostsfile "$cfg" dhcphostsfile
+       [ -e "$hostsfile" ] && append args "--dhcp-hostsfile=$hostsfile"
 }
 
 dhcp_subscrid_add() {
@@ -143,7 +168,7 @@ dhcp_host_add() {
        local cfg="$1"
 
        config_get name "$cfg" name
-       [ -n "$name" ] || return 0
+       [ -n "$name" ] && dhcp_option_add "$cfg" "$name"
 
        config_get mac "$cfg" mac
        [ -n "$mac" ] || return 0
@@ -151,9 +176,7 @@ dhcp_host_add() {
        config_get ip "$cfg" ip
        [ -n "$ip" ] || return 0
 
-       append args "--dhcp-host=$mac,$ip"
-
-       dhcp_option_add "$cfg" "$name"
+       append args "--dhcp-host=$mac,$ip${name:+,$name}"
 }
 
 dhcp_mac_add() {
@@ -174,7 +197,6 @@ dhcp_boot_add() {
        local cfg="$1"
 
        config_get name "$cfg" name
-       [ -n "$name" ] || return 0
 
        config_get filename "$cfg" filename
        [ -n "$filename" ] || return 0
@@ -185,7 +207,7 @@ dhcp_boot_add() {
        config_get serveraddress "$cfg" serveraddress
        [ -n "$serveraddress" ] || return 0
 
-       append args "--dhcp-boot=net:$name,$filename,$servername,$serveraddress"
+       append args "--dhcp-boot=${name:+net:$name,}$filename,$servername,$serveraddress"
 
        dhcp_option_add "$cfg" "$name"
 }
@@ -207,7 +229,7 @@ dhcp_add() {
                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 
-       append_bool "$cfg" ignore "-2 $ifname"
+       append_bool "$cfg" ignore "-2 $ifname" && return 0
 
        config_get proto "$net" proto
        [ static = "$proto" ] || return 0
@@ -219,7 +241,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 ] || {
-               udhcpc -n -q -R -s /bin/true -t 1 -i $ifname >&- && return 0
+               udhcpc -n -q -s /bin/true -t 1 -i $ifname >&- && return 0
        }
 
        config_get start "$cfg" start
@@ -249,6 +271,20 @@ dhcp_option_add() {
 
 }
 
+dhcp_domain_add() {
+       local cfg="$1"
+
+       config_get name "$cfg" name
+       [ -n "$name" ] || 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}"
+}
+
 start() {
        include /lib/network
        scan_interfaces
@@ -264,6 +300,7 @@ start() {
        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_add dhcp
 
        /usr/sbin/dnsmasq $args && {