kernel: add KEY_WPS_BUTTON definition

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

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 8704149..47c4c2d 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -3,6 +3,7 @@
 
 START=60
 DNS_SERVERS=""
 
 START=60
 DNS_SERVERS=""

+DOMAIN=""

 
 dhcp_calc() {
        local ip="$1"
 
 dhcp_calc() {
        local ip="$1"


@@ -40,6 +41,18 @@ append_server() {
        append args "-S $1"
 }
 
        append args "-S $1"
 }
 

+append_interface() {
+       append args "-i $1"
+}
+
+append_notinterface() {
+       append args "-I $1"
+}
+
+append_addnhosts() {
+       append args "-H $1"
+}
+

 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"
 dnsmasq() {
        local cfg="$1"
        append_bool "$cfg" authoritative "-K"


@@ -57,131 +70,144 @@ dnsmasq() {
        append_bool "$cfg" boguspriv "-b"
        append_bool "$cfg" expandhosts "-E"
        append_bool "$cfg" enable_tftp "--enable-tftp"
        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"
        append_parm "$cfg" ednspacket_max "-P"
        append_parm "$cfg" dhcpleasemax "-X"
 
        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
        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

        append_parm "$cfg" "leasefile" "-l"
        append_parm "$cfg" "resolvfile" "-r"
        append_parm "$cfg" "tftp_root" "--tftp-root"
        append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
 
        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"
        config_get_bool cachelocal "$cfg" cachelocal 1
        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() {
        local cfg="$1"
 
 }
 
 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
 
 
        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"
 
 }
 
 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
 
 
        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"
 
 }
 
 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
 
 
        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"
 
 }
 
 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
 
 
        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"
 
 }
 
 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
 
 
        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
 }
 
 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
 
 
        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"
 
 }
 
 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
 
 
        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"
 
 }
 
 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
 
        config_get filename "$cfg" filename
        [ -n "$filename" ] || return 0


@@ -192,9 +218,9 @@ dhcp_boot_add() {
        config_get serveraddress "$cfg" serveraddress
        [ -n "$serveraddress" ] || return 0
 
        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"

 }
 
 
 }
 
 


@@ -203,8 +229,8 @@ dhcp_add() {
        config_get net "$cfg" interface
        [ -n "$net" ] || return 0
 
        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 ifname "$net" ifname
        [ -n "$ifname" ] || return 0


@@ -214,7 +240,7 @@ dhcp_add() {
                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 
                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
 
        config_get proto "$net" proto
        [ static = "$proto" ] || return 0


@@ -237,25 +263,45 @@ dhcp_add() {
 
        leasetime="${leasetime:-12h}"
        start="$(dhcp_calc "${start:-100}")"
 
        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
        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"
 }
 
 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
 
        config_get dhcp_option "$cfg" dhcp_option
        for o in $dhcp_option; do

-               append args "-O $name","$o"
+               append args "-O $networkid","$o"

        done
 
 }
 
        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
+               append args "-A /$name/$ip"
+               [ -n "$raddr" ] && \
+                       append args "--ptr-record=$raddr,$name"
+       done
+}
+

 start() {
        include /lib/network
        scan_interfaces
 start() {
        include /lib/network
        scan_interfaces


@@ -271,10 +317,12 @@ start() {
        config_foreach dhcp_circuitid_add circuitid
        config_foreach dhcp_remoteid_add remoteid
        config_foreach dhcp_subscrid_add subscrid
        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 && {
                rm -f /tmp/resolv.conf
        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
                DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
                for DNS_SERVER in $DNS_SERVERS ; do
                        echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf