dnsmasq: switch to /lib/functions/network.sh

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

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 630c07d..045fc7e 100644 (file)
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -3,7 +3,8 @@
 
 START=60
 
-SERVICE_USE_PID=1
+USE_PROCD=1
+PROG=/usr/sbin/dnsmasq
 
 DNS_SERVERS=""
 DOMAIN=""
@@ -74,7 +75,7 @@ append_addnhosts() {
 }
 
 append_bogusnxdomain() {
-    xappend "--bogus-nxdomain=$1"
+       xappend "--bogus-nxdomain=$1"
 }
 
 dnsmasq() {
@@ -162,6 +163,8 @@ dnsmasq() {
 
        dhcp_option_add "$cfg" "" 0
 
+       xappend "--dhcp-broadcast=tag:needs-broadcast"
+
        echo >> $CONFIGFILE
 }
 
@@ -269,7 +272,10 @@ dhcp_host_add() {
 
        config_get tag "$cfg" tag
 
-       xappend "--dhcp-host=$macs${networkid:+,net:$networkid}${tag:+,set:$tag}${ip:+,$ip}${name:+,$name}"
+       config_get_bool broadcast "$cfg" broadcast 0
+       [ "$broadcast" = "0" ] && broadcast=
+
+       xappend "--dhcp-host=$macs${networkid:+,net:$networkid}${broadcast:+,set:needs-broadcast}${tag:+,set:$tag}${ip:+,$ip}${name:+,$name}"
 }
 
 dhcp_tag_add() {
@@ -332,22 +338,21 @@ dhcp_add() {
        config_get networkid "$cfg" networkid
        [ -n "$networkid" ] || networkid="$net"
 
-       config_get ifname "$net" ifname
-       [ -n "$ifname" ] || return 0
+       network_get_subnet subnet "$net" || return 0
+       network_get_device ifname "$net" || return 0
+       network_get_protocol proto "$net" || return 0
 
-       config_get dnsserver "$net" dns
-       [ "$cachelocal" = "0" -a -n "$dnsserver" ] && {
+       [ "$cachelocal" = "0" ] && network_get_dnsserver dnsserver "$net" && {
                DNS_SERVERS="$DNS_SERVERS $dnsserver"
        }
 
        append_bool "$cfg" ignore "--no-dhcp-interface=$ifname" && return 0
 
-       config_get proto "$net" proto
+       # Do not support non-static interfaces for now
        [ static = "$proto" ] || return 0
 
-       config_get ipaddr "$net" ipaddr
-       config_get netmask "$cfg" netmask
-       [ -n "$netmask" ] || config_get netmask "$net" netmask
+       # Override interface netmask with dhcp config if applicable
+       config_get netmask "$cfg" netmask "${subnet##*/}"
 
        #check for an already active dhcp server on the interface, unless 'force' is set
        config_get_bool force "$cfg" force 0
@@ -370,7 +375,7 @@ dhcp_add() {
        start="$(dhcp_calc "${start:-100}")"
        limit="${limit:-150}"
        [ "$limit" -gt 0 ] && limit=$((limit-1))
-       eval "$(ipcalc.sh $ipaddr $netmask $start $limit)"
+       eval "$(ipcalc.sh "${subnet%%/*}" $netmask $start $limit)"
        if [ "$dynamicdhcp" = "0" ]; then END="static"; fi
        xappend "--dhcp-range=$networkid,$START,$END,$NETMASK,$leasetime${options:+ $options}"
 
@@ -402,6 +407,9 @@ dhcp_domain_add() {
        [ -n "$ip" ] || return 0
 
        for name in $names; do
+               [ "${name%.*}" == "$name" ] && \
+                       name="$name${DOMAIN:+.$DOMAIN}"
+
                record="${record:+$record/}$name"
        done
 
@@ -479,15 +487,20 @@ dhcp_hostrecord_add() {
        xappend "--host-record=$record"
 }
 
-start() {
-       include /lib/network
-       scan_interfaces
+service_triggers()
+{
+       procd_add_reload_trigger "dhcp"
+}
 
-       local lanaddr
-       config_get lanaddr "lan" ipaddr
+start_service() {
+       include /lib/functions
 
        config_load dhcp
 
+       procd_open_instance
+       procd_set_param command $PROG -C $CONFIGFILE -k
+       procd_close_instance
+
        # before we can call xappend
        mkdir -p $(dirname $CONFIGFILE)
 
@@ -514,9 +527,10 @@ start() {
        config_foreach dhcp_hostrecord_add hostrecord
 
        # add own hostname
-       [ $ADD_LOCAL_HOSTNAME -eq 1 ] && [ -n "$lanaddr" ] && {
+       local lanaddr
+       [ $ADD_LOCAL_HOSTNAME -eq 1 ] && network_get_ipaddr lanaddr "lan" && {
                local hostname="$(uci_get system @system[0] hostname OpenWrt)"
-               dhcp_hostrecord_add "" "$hostname${DOMAIN:+.$DOMAIN $hostname}" "$lanaddr"
+               dhcp_hostrecord_add "" "${hostname%.$DOMAIN}${DOMAIN:+.$DOMAIN ${hostname%.$DOMAIN}}" "$lanaddr"
        }
 
        echo >> $CONFIGFILE
@@ -528,23 +542,19 @@ start() {
        config_foreach dhcp_cname_add cname
        echo >> $CONFIGFILE
 
-       service_start /usr/sbin/dnsmasq -C $CONFIGFILE && {
-               rm -f /tmp/resolv.conf
-               [ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -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
+       rm -f /tmp/resolv.conf
+       [ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -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() {
-       service_stop /usr/sbin/dnsmasq && {
-               [ -f /tmp/resolv.conf ] && {
-                       rm -f /tmp/resolv.conf
-                       ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
-               }
+stop_service() {
+       [ -f /tmp/resolv.conf ] && {
+               rm -f /tmp/resolv.conf
+               ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
        }
 }