[adm5120] more license cleanups

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

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index ec595af..4425504 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"
        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() {
 }
 
 append_parm() {


@@ -50,17 +50,19 @@ dnsmasq() {
        append_bool "$cfg" localise_queries "-y"
        append_bool "$cfg" readethers "-Z"
        append_bool "$cfg" dbus "-l"
        append_bool "$cfg" localise_queries "-y"
        append_bool "$cfg" readethers "-Z"
        append_bool "$cfg" dbus "-l"

+       append_bool "$cfg" boguspriv "-b"
+       append_bool "$cfg" expandhosts "-E"

 
        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"

-
-       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"

 }
 
 dhcp_subscrid_add() {
 }
 
 dhcp_subscrid_add() {


@@ -142,6 +144,8 @@ dhcp_host_add() {
        config_get mac "$cfg" mac
        [ -n "$mac" ] || return 0
 
        config_get mac "$cfg" mac
        [ -n "$mac" ] || return 0
 

+       config_get ip "$cfg" ip
+       [ -n "$ip" ] || return 0

 
        append args "--dhcp-host=$mac,$ip"
 
 
        append args "--dhcp-host=$mac,$ip"
 


@@ -184,7 +188,8 @@ dhcp_add() {
        [ static = "$proto" ] || return 0
 
        config_get ipaddr "$net" ipaddr
        [ 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
 
        #check for an already active dhcp server on the interface, unless 'force' is set
        config_get_bool force "$cfg" force 0


@@ -196,11 +201,13 @@ dhcp_add() {
        config_get limit "$cfg" limit
        config_get leasetime "$cfg" leasetime
        config_get options "$cfg" options
        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)"
 
        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"
        append args "--dhcp-range=$name,$START,$END,$NETMASK,$leasetime${options:+ $options}"
 
        dhcp_option_add "$cfg" "$name"