projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add block-extroot, a package for using an external filesystem as rootfs (patch by...
[openwrt.git] / package / dnsmasq / files / dnsmasq.init
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 8a5dc9a..7955fdb 100644 (file)
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -2,11 +2,13 @@
 # Copyright (C) 2007 OpenWrt.org
 
 START=60
 # Copyright (C) 2007 OpenWrt.org
 
 START=60
+DNS_SERVERS=""
+DOMAIN=""
 
 dhcp_calc() {
        local ip="$1"
        local res=0
 
 dhcp_calc() {
        local ip="$1"
        local res=0
-       
+
        while [ -n "$ip" ]; do
                part="${ip%%.*}"
                res="$(($res * 256))"
        while [ -n "$ip" ]; do
                part="${ip%%.*}"
                res="$(($res * 256))"
@@ -20,9 +22,35 @@ append_bool() {
        local section="$1"
        local option="$2"
        local value="$3"
        local section="$1"
        local option="$2"
        local value="$3"
-       local _tmp
-       config_get_bool _tmp "$section" "$option"
-       [ "$_tmp" -gt 0 ] && append args "$3"
+       local _loctmp
+       config_get_bool _loctmp "$section" "$option"
+       [ "$_loctmp" -gt 0 ] && append args "$value"
+}
+
+append_parm() {
+       local section="$1"
+       local option="$2"
+       local switch="$3"
+       local _loctmp
+       config_get _loctmp "$section" "$option"
+       [ -z "$_loctmp" ] && return 0
+       append args "$switch $_loctmp"
+}
+
+append_server() {
+       append args "-S $1"
+}
+
+append_interface() {
+       append args "-i $1"
+}
+
+append_notinterface() {
+       append args "-I $1"
+}
+
+append_addnhosts() {
+       append args "-H $1"
 }
 
 dnsmasq() {
 }
 
 dnsmasq() {
@@ -31,191 +59,238 @@ dnsmasq() {
        append_bool "$cfg" nodaemon "-d"
        append_bool "$cfg" domainneeded "-D"
        append_bool "$cfg" filterwin2k "-f"
        append_bool "$cfg" nodaemon "-d"
        append_bool "$cfg" domainneeded "-D"
        append_bool "$cfg" filterwin2k "-f"
-       append_bool "$cfg" nohosts "-I $nohosts"
+       append_bool "$cfg" nohosts "-h"
        append_bool "$cfg" nonegcache "-N"
        append_bool "$cfg" strictorder "-o"
        append_bool "$cfg" logqueries "-q"
        append_bool "$cfg" nonegcache "-N"
        append_bool "$cfg" strictorder "-o"
        append_bool "$cfg" logqueries "-q"
-       append_bool "$cfg" noresolv "-I $noresolv"
-       append_bool "$cfg" localise_queries "-I $localise_queries"
+       append_bool "$cfg" noresolv "-R"
+       append_bool "$cfg" localise_queries "-y"
        append_bool "$cfg" readethers "-Z"
        append_bool "$cfg" readethers "-Z"
-       append_bool "$cfg" dbus "-l"
-       
-       config_get dnsforwardmax "$cfg" dnsforwardmax
-       dnsforwardmax="${dnsforwardmax:-150}"
-       append args "-0 $dnsforwardmax"
-       
-       config_get port "$cfg" port
-       port="${port:-53}"
-       append args "-p $port"
-       
-       config_get ednspacket_max "$cfg" ednspacket_max
-       ednspacket_max="${ednspacket_max:-1280}"
-       append args "-P $ednspacket_max"
-       
-       config_get dhcpleasemax "$cfg" dhcpleasemax
-       dhcpleasemax="${dhcpleasemax:-150}"
-       append args "-X $dhcpleasemax"
-       
-       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_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"
+       append_parm "$cfg" ednspacket_max "-P"
+       append_parm "$cfg" dhcpleasemax "-X"
+       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"
+
+       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() {
        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"
-       
-       dhcp_option_add "$cfg" "$name"
+
+       append args "--dhcp-subscrid=$networkid,$subscriberid"
+
+       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"
-       
-       dhcp_option_add "$cfg" "$name"
+
+       append args "--dhcp-remoteid=$networkid,$remoteid"
+
+       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"
-       
-       dhcp_option_add "$cfg" "$name"
+
+       append args "--dhcp-circuitid=$networkid,$circuitid"
+
+       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"
-       
-       dhcp_option_add "$cfg" "$name"
+
+       append args "--dhcp-userclass=$networkid,$userclass"
+
+       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"
-       
-       dhcp_option_add "$cfg" "$name"
+
+       append args "--dhcp-vendorclass=$networkid,$vendorclass"
+
+       dhcp_option_add "$cfg" "$networkid"
 }
 
 dhcp_host_add() {
        local cfg="$1"
 }
 
 dhcp_host_add() {
        local cfg="$1"
-       
+
        config_get name "$cfg" name
        config_get name "$cfg" name
-       [ -n "$name" ] || return 0
-       
+
+       config_get networkid "$cfg" networkid
+       [ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid"
+
        config_get mac "$cfg" mac
        [ -n "$mac" ] || return 0
 
        config_get mac "$cfg" mac
        [ -n "$mac" ] || return 0
 
-       
-       append args "--dhcp-host=$mac,$ip"
-       
-       dhcp_option_add "$cfg" "$name"
+       config_get ip "$cfg" ip
+       [ -n "$ip" ] || return 0
+
+       append args "--dhcp-host=$mac,${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"
-       
-       dhcp_option_add "$cfg" "$name"
+
+       append args "--dhcp-mac=$networkid,$mac"
+
+       dhcp_option_add "$cfg" "$networkid"
 }
 
 }
 
+dhcp_boot_add() {
+       local cfg="$1"
+
+       config_get networkid "$cfg" networkid
+
+       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=${networkid:+net:$networkid,}$filename,$servername,$serveraddress"
+
+       dhcp_option_add "$cfg" "$networkid"
+}
+
+
 dhcp_add() {
        local cfg="$1"
        config_get net "$cfg" interface
        [ -n "$net" ] || return 0
 
 dhcp_add() {
        local cfg="$1"
        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
 
-       append_bool "$cfg" ingore "-I $ifname"
+       config_get dnsserver "$net" dns
+       [ "$cachelocal" = "0" -a -n "$dnsserver" ] && {
+               DNS_SERVERS="$DNS_SERVERS $dnsserver"
+       }
+
+       append_bool "$cfg" ignore "-2 $ifname" && return 0
 
        config_get proto "$net" proto
        [ static = "$proto" ] || return 0
 
        config_get ipaddr "$net" ipaddr
 
        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
        [ "$force" -gt 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 -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
        config_get limit "$cfg" limit
        config_get leasetime "$cfg" leasetime
        config_get options "$cfg" options
        config_get start "$cfg" start
        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))"
 
        leasetime="${leasetime:-12h}"
        start="$(dhcp_calc "${start:-100}")"
        limit="$((${limit:-150} + 1))"
-       eval "$(ipcalc.sh $ipaddr $netmask $start $end)"
-       append args "--dhcp-range=$name,$START,$END,$NETMASK,$leasetime${options:+ $options}"
-       
-       dhcp_option_add "$cfg" "$name"
+       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_option_add "$cfg" "$networkid"
 }
 
 }
 
-dhcp_option_add () {
+dhcp_option_add() {
        local cfg="$1"
        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"
+       local networkid="$2"
+
+       config_get dhcp_option "$cfg" dhcp_option
+       for o in $dhcp_option; do
+               append args "-O $networkid","$o"
        done
 
 }
 
        done
 
 }
 
+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
 start() {
        include /lib/network
        scan_interfaces
@@ -224,23 +299,31 @@ start() {
        args=""
        config_foreach dnsmasq dnsmasq
        config_foreach dhcp_host_add host
        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
        config_foreach dhcp_circuitid_add circuitid
        config_foreach dhcp_remoteid_add remoteid
        config_foreach dhcp_subscrid_add subscrid
        config_foreach dhcp_mac_add mac
        config_foreach dhcp_vendorclass_add vendorclass
        config_foreach dhcp_userclass_add userclass
        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
-               cat > /tmp/resolv.conf <<EOF
-nameserver 127.0.0.1
-search lan
-EOF
+               [ -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
+               done
        }
 }
 
 stop() {
        }
 }
 
 stop() {
+       [ -f /tmp/resolv.conf ] && {
+               rm -f /tmp/resolv.conf
+               ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+       }
        killall dnsmasq
        killall dnsmasq
+       return 0
 }
 }
Personal OpenWRT clone
This page took 0.035562 seconds and 4 git commands to generate.