Use the only working sourceforge.net mirror for gentext2fs, the others are ever not...

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

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index ec595af..7d32be0 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -23,7 +23,7 @@ append_bool() {
        local value="$3"
        local _loctmp
        config_get_bool _loctmp "$section" "$option"
-       [ "$_loctmp" -gt 0 ] && append args "$3"
+       [ "$_loctmp" -gt 0 ] && append args "$value"
 }
 
 append_parm() {
@@ -49,18 +49,27 @@ 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_parm "$cfg" dnsforwardmax "-0"
        append_parm "$cfg" port "-p"
        append_parm "$cfg" ednspacket_max "-P"
        append_parm "$cfg" dhcpleasemax "-X"
-
-       config_get addnhosts "$cfg" addnhosts
-       config_get interface "$cfg" interface
-       config_get exceptinterface "$cfg" exceptinterface
-       config_get queryport "$cfg" queryport
-       config_get domain "$cfg" domain
+       append_parm "$cfg" "addnhosts" "-H"
+       append_parm "$cfg" "queryport" "-Q"
+       append_parm "$cfg" "domain" "-s"
+       append_parm "$cfg" "local" "-S"
+       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 leasefile $cfg leasefile
+       [ -e "$leasefile" ] || touch "$leasefile"
+       config_get_bool cachelocal "$cfg" cachelocal 1
 }
 
 dhcp_subscrid_add() {
@@ -142,6 +151,8 @@ dhcp_host_add() {
        config_get mac "$cfg" mac
        [ -n "$mac" ] || return 0
 
+       config_get ip "$cfg" ip
+       [ -n "$ip" ] || return 0
 
        append args "--dhcp-host=$mac,$ip"
 
@@ -162,6 +173,27 @@ dhcp_mac_add() {
        dhcp_option_add "$cfg" "$name"
 }
 
+dhcp_boot_add() {
+       local cfg="$1"
+
+       config_get name "$cfg" name
+       [ -n "$name" ] || return 0
+
+       config_get filename "$cfg" filename
+       [ -n "$filename" ] || return 0
+
+       config_get servername "$cfg" servername
+       [ -n "$servername" ] || return 0
+
+       config_get serveraddress "$cfg" serveraddress
+       [ -n "$serveraddress" ] || return 0
+
+       append args "--dhcp-boot=net:$name,$filename,$servername,$serveraddress"
+
+       dhcp_option_add "$cfg" "$name"
+}
+
+
 dhcp_add() {
        local cfg="$1"
        config_get net "$cfg" interface
@@ -174,17 +206,18 @@ dhcp_add() {
        [ -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"
 
        config_get proto "$net" proto
        [ static = "$proto" ] || return 0
 
        config_get ipaddr "$net" ipaddr
-       config_get netmask "$net" netmask
+       config_get netmask "$cfg" netmask
+       [ -n "$netmask" ] || config_get netmask "$net" netmask
 
        #check for an already active dhcp server on the interface, unless 'force' is set
        config_get_bool force "$cfg" force 0
@@ -196,11 +229,13 @@ dhcp_add() {
        config_get limit "$cfg" limit
        config_get leasetime "$cfg" leasetime
        config_get options "$cfg" options
+       config_get_bool dynamicdhcp "$cfg" dynamicdhcp 1
 
        leasetime="${leasetime:-12h}"
        start="$(dhcp_calc "${start:-100}")"
        limit="$((${limit:-150} + 1))"
        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}"
 
        dhcp_option_add "$cfg" "$name"
@@ -210,13 +245,9 @@ 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"
+       config_get dhcp_option "$cfg" dhcp_option
+       for o in $dhcp_option; do
+               append args "-O $name","$o"
        done
 
 }
@@ -224,12 +255,12 @@ dhcp_option_add() {
 start() {
        include /lib/network
        scan_interfaces
-       config_load /var/state/network
        config_load dhcp
 
        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
@@ -248,5 +279,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
 }