dnsmasq: Support add-mac option
[openwrt/openwrt.git] / package / network / services / dnsmasq / files / dnsmasq.init
index 045fc7eb4cb2292a52fdcb7950dda0f19a09bd1c..b1f9e2e29010c4a5e06f6dc2bc8ccaa3fd022deb 100644 (file)
@@ -1,23 +1,44 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2007-2012 OpenWrt.org
 
-START=60
+START=19
 
 USE_PROCD=1
 PROG=/usr/sbin/dnsmasq
 
-DNS_SERVERS=""
-DOMAIN=""
-
 ADD_LOCAL_DOMAIN=1
 ADD_LOCAL_HOSTNAME=1
 
-CONFIGFILE="/var/etc/dnsmasq.conf"
+BASECONFIGFILE="/var/etc/dnsmasq.conf"
+BASEHOSTFILE="/tmp/hosts/dhcp"
+BASETIMESTAMPFILE="/etc/dnsmasq.time"
+TRUSTANCHORSFILE="/usr/share/dnsmasq/trust-anchors.conf"
+TIMEVALIDFILE="/var/state/dnsmasqsec"
+BASEDHCPSTAMPFILE="/var/run/dnsmasq"
 
 xappend() {
        local value="$1"
 
-       echo "${value#--}" >> $CONFIGFILE
+       echo "${value#--}" >> $CONFIGFILE_TMP
+}
+
+hex_to_hostid() {
+        local var="$1"
+        local hex="${2#0x}"     # strip optional "0x" prefix
+
+        if [ -n "${hex//[0-9a-fA-F]/}" ]; then
+                # is invalid hex literal
+                return 1
+        fi
+
+        # convert into host id
+        export "$var=$(
+                printf "%0x:%0x"  \
+                        $(((0x$hex >> 16) % 65536)) \
+                        $(( 0x$hex        % 256))
+        )"
+
+        return 0
 }
 
 dhcp_calc() {
@@ -33,6 +54,35 @@ dhcp_calc() {
        echo "$res"
 }
 
+dhcp_check() {
+       local ifname="$1"
+       local stamp="${BASEDHCPSTAMPFILE_CFG}.${ifname}.dhcp"
+       local rv=0
+
+       [ -s "$stamp" ] && return $(cat "$stamp")
+
+       # If there's no carrier yet, skip this interface.
+       # The init script will be called again once the link is up
+       case "$(devstatus "$ifname" | jsonfilter -e @.carrier)" in
+               false) return 1;;
+       esac
+
+       udhcpc -n -q -s /bin/true -t 1 -i "$ifname" >&- && rv=1 || rv=0
+
+       [ $rv -eq 1 ] && \
+               logger -t dnsmasq \
+                       "found already running DHCP-server on interface '$ifname'" \
+                       "refusing to start, use 'option force 1' to override"
+
+       echo $rv > "$stamp"
+       return $rv
+}
+
+log_once() {
+       pidof dnsmasq >/dev/null || \
+               logger -t dnsmasq "$@"
+}
+
 append_bool() {
        local section="$1"
        local option="$2"
@@ -46,8 +96,9 @@ append_parm() {
        local section="$1"
        local option="$2"
        local switch="$3"
+       local default="$4"
        local _loctmp
-       config_get _loctmp "$section" "$option"
+       config_get _loctmp "$section" "$option" "$default"
        [ -z "$_loctmp" ] && return 0
        xappend "$switch=$_loctmp"
 }
@@ -60,13 +111,17 @@ append_address() {
        xappend "--address=$1"
 }
 
+append_ipset() {
+       xappend "--ipset=$1"
+}
+
 append_interface() {
-       local ifname=$(uci_get_state network "$1" ifname "$1")
+       network_get_device ifname "$1" || return
        xappend "--interface=$ifname"
 }
 
 append_notinterface() {
-       local ifname=$(uci_get_state network "$1" ifname "$1")
+       network_get_device ifname "$1" || return
        xappend "--except-interface=$ifname"
 }
 
@@ -78,94 +133,18 @@ append_bogusnxdomain() {
        xappend "--bogus-nxdomain=$1"
 }
 
-dnsmasq() {
-       local cfg="$1"
-       append_bool "$cfg" authoritative "--dhcp-authoritative"
-       append_bool "$cfg" nodaemon "--no-daemon"
-       append_bool "$cfg" domainneeded "--domain-needed"
-       append_bool "$cfg" filterwin2k "--filterwin2k"
-       append_bool "$cfg" nohosts "--no-hosts"
-       append_bool "$cfg" nonegcache "--no-negcache"
-       append_bool "$cfg" strictorder "--strict-order"
-       append_bool "$cfg" logqueries "--log-queries"
-       append_bool "$cfg" noresolv "--no-resolv"
-       append_bool "$cfg" localise_queries "--localise-queries"
-       append_bool "$cfg" readethers "--read-ethers"
-       append_bool "$cfg" dbus "--enable-dbus"
-       append_bool "$cfg" boguspriv "--bogus-priv"
-       append_bool "$cfg" expandhosts "--expand-hosts"
-       append_bool "$cfg" enable_tftp "--enable-tftp"
-       append_bool "$cfg" nonwildcard "--bind-interfaces"
-       append_bool "$cfg" fqdn "--dhcp-fqdn"
-       append_bool "$cfg" proxydnssec "--proxy-dnssec"
-
-       append_parm "$cfg" dhcpscript "--dhcp-script"
-       append_parm "$cfg" cachesize "--cache-size"
-       append_parm "$cfg" dnsforwardmax "--dns-forward-max"
-       append_parm "$cfg" port "--port"
-       append_parm "$cfg" ednspacket_max "--edns-packet-max"
-       append_parm "$cfg" dhcpleasemax "--dhcp-lease-max"
-       append_parm "$cfg" "queryport" "--query-port"
-       append_parm "$cfg" "domain" "--domain"
-       append_parm "$cfg" "local" "--server"
-       config_list_foreach "$cfg" "server" append_server
-       config_list_foreach "$cfg" "address" append_address
-       config_list_foreach "$cfg" "interface" append_interface
-       config_list_foreach "$cfg" "notinterface" append_notinterface
-       config_list_foreach "$cfg" "addnhosts" append_addnhosts
-       config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
-       append_parm "$cfg" "leasefile" "--dhcp-leasefile"
-       append_parm "$cfg" "resolvfile" "--resolv-file"
-       append_parm "$cfg" "tftp_root" "--tftp-root"
-       append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
-       append_parm "$cfg" "local_ttl" "--local-ttl"
-
-       config_get DOMAIN "$cfg" domain
-
-       config_get_bool ADD_LOCAL_DOMAIN "$cfg" add_local_domain 1
-       config_get_bool ADD_LOCAL_HOSTNAME "$cfg" add_local_hostname 1
-
-       config_get_bool readethers "$cfg" readethers
-       [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
-
-       config_get leasefile $cfg leasefile
-       [ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
-       config_get_bool cachelocal "$cfg" cachelocal 1
-
-       config_get hostsfile "$cfg" dhcphostsfile
-       [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
-
-       mkdir -p /tmp/hosts
-       xappend "--addn-hosts=/tmp/hosts"
-
-       local rebind
-       config_get_bool rebind "$cfg" rebind_protection 1
-       [ $rebind -gt 0 ] && {
-               logger -t dnsmasq \
-                       "DNS rebinding protection is active," \
-                       "will discard upstream RFC1918 responses!"
-               xappend "--stop-dns-rebind"
-
-               local rebind_localhost
-               config_get_bool rebind_localhost "$cfg" rebind_localhost 0
-               [ $rebind_localhost -gt 0 ] && {
-                       logger -t dnsmasq "Allowing 127.0.0.0/8 responses"
-                       xappend "--rebind-localhost-ok"
-               }
-
-               append_rebind_domain() {
-                       logger -t dnsmasq "Allowing RFC1918 responses for domain $1"
-                       xappend "--rebind-domain-ok=$1"
-               }
-
-               config_list_foreach "$cfg" rebind_domain append_rebind_domain
-       }
-
-       dhcp_option_add "$cfg" "" 0
+append_pxe_service() {
+       xappend "--pxe-service=$1"
+}
 
-       xappend "--dhcp-broadcast=tag:needs-broadcast"
+filter_dnsmasq() {
+       local cfg="$1" func="$2" match_cfg="$3" found_cfg
 
-       echo >> $CONFIGFILE
+       # use entry when no instance entry set, or if it matches
+       config_get found_cfg "$cfg" "instance"
+       if [ -z "$found_cfg" -o "$found_cfg" = "$match_cfg" ]; then
+               $func $cfg
+       fi
 }
 
 dhcp_subscrid_add() {
@@ -248,6 +227,22 @@ dhcp_vendorclass_add() {
        dhcp_option_add "$cfg" "$networkid" "$force"
 }
 
+dhcp_match_add() {
+       local cfg="$1"
+
+       config_get networkid "$cfg" networkid
+       [ -n "$networkid" ] || return 0
+
+       config_get match "$cfg" match
+       [ -n "$match" ] || return 0
+
+       xappend "--dhcp-match=$networkid,$match"
+
+       config_get_bool force "$cfg" force 0
+
+       dhcp_option_add "$cfg" "$networkid" "$force"
+}
+
 dhcp_host_add() {
        local cfg="$1"
 
@@ -256,26 +251,45 @@ dhcp_host_add() {
        config_get networkid "$cfg" networkid
        [ -n "$networkid" ] && dhcp_option_add "$cfg" "$networkid" "$force"
 
+       config_get_bool enable "$cfg" enable 1
+       [ "$enable" = "0" ] && return 0
+
        config_get name "$cfg" name
        config_get ip "$cfg" ip
        [ -n "$ip" -o -n "$name" ] || return 0
 
+       config_get_bool dns "$cfg" dns 0
+       [ "$dns" = "1" -a -n "$ip" -a -n "$name" ] && {
+               echo "$ip $name${DOMAIN:+.$DOMAIN}" >> $HOSTFILE
+       }
+
        config_get mac "$cfg" mac
-       [ -z "$mac" ] && {
+       if [ -n "$mac" ]; then
+               # --dhcp-host=00:20:e0:3b:13:af,192.168.0.199,lap
+               macs=""
+               for m in $mac; do append macs "$m" ","; done
+       else
+               # --dhcp-host=lap,192.168.0.199
                [ -n "$name" ] || return 0
-               mac="$name"
+               macs="$name"
                name=""
-       }
-
-       macs=""
-       for m in $mac; do append macs "$m" ","; done
+       fi
 
        config_get tag "$cfg" tag
 
+       if [ "$DHCPv6CAPABLE" -eq 1 ]; then
+               config_get hostid "$cfg" hostid
+               if [ -n "$hostid" ]; then
+                       hex_to_hostid hostid "$hostid"
+               fi
+       fi
+
        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}"
+       config_get leasetime "$cfg" leasetime
+
+       xappend "--dhcp-host=$macs${networkid:+,net:$networkid}${broadcast:+,set:needs-broadcast}${tag:+,set:$tag}${ip:+,$ip${hostid:+,[::$hostid]}}${name:+,$name}${leasetime:+,$leasetime}"
 }
 
 dhcp_tag_add() {
@@ -317,12 +331,11 @@ dhcp_boot_add() {
        [ -n "$filename" ] || return 0
 
        config_get servername "$cfg" servername
-       [ -n "$servername" ] || return 0
-
        config_get serveraddress "$cfg" serveraddress
-       [ -n "$serveraddress" ] || return 0
 
-       xappend "--dhcp-boot=${networkid:+net:$networkid,}$filename,$servername,$serveraddress"
+       [ -n "$serveraddress" -a ! -n "$servername" ] && return 0
+
+       xappend "--dhcp-boot=${networkid:+net:$networkid,}${filename}${servername:+,$servername}${serveraddress:+,$serveraddress}"
 
        config_get_bool force "$cfg" force 0
 
@@ -335,6 +348,9 @@ dhcp_add() {
        config_get net "$cfg" interface
        [ -n "$net" ] || return 0
 
+       config_get dhcpv4 "$cfg" dhcpv4
+       [ "$dhcpv4" != "disabled" ] || return 0
+
        config_get networkid "$cfg" networkid
        [ -n "$networkid" ] || networkid="$net"
 
@@ -356,14 +372,7 @@ dhcp_add() {
 
        #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 -s /bin/true -t 1 -i $ifname >&- && {
-                       logger -t dnsmasq \
-                               "found already running DHCP-server on interface '$ifname'" \
-                               "refusing to start, use 'option force 1' to override"
-                       return 0
-               }
-       }
+       [ $force -gt 0 ] || dhcp_check "$ifname" || return 0
 
        config_get start "$cfg" start
        config_get limit "$cfg" limit
@@ -407,13 +416,10 @@ dhcp_domain_add() {
        [ -n "$ip" ] || return 0
 
        for name in $names; do
-               [ "${name%.*}" == "$name" ] && \
-                       name="$name${DOMAIN:+.$DOMAIN}"
-
-               record="${record:+$record/}$name"
+               record="${record:+$record }$name"
        done
 
-       xappend "--address=/$record/$ip"
+       echo "$ip $record" >> $HOSTFILE
 }
 
 dhcp_srv_add() {
@@ -487,74 +493,361 @@ dhcp_hostrecord_add() {
        xappend "--host-record=$record"
 }
 
-service_triggers()
-{
-       procd_add_reload_trigger "dhcp"
+dhcp_relay_add() {
+       local cfg="$1"
+       local local_addr server_addr interface
+
+       config_get local_addr "$cfg" local_addr
+       [ -n "$local_addr" ] || return 0
+
+       config_get server_addr "$cfg" server_addr
+       [ -n "$server_addr" ] || return 0
+
+       config_get interface "$cfg" interface
+       if [ -z "$interface" ]; then
+               xappend "--dhcp-relay=$local_addr,$server_addr"
+       else
+               xappend "--dhcp-relay=$local_addr,$server_addr,$interface"
+       fi
 }
 
-start_service() {
-       include /lib/functions
+dnsmasq_start()
+{
+       local cfg="$1" disabled
 
-       config_load dhcp
+       config_get_bool disabled "$cfg" disabled 0
+       [ "$disabled" -gt 0 ] && return 0
 
-       procd_open_instance
-       procd_set_param command $PROG -C $CONFIGFILE -k
-       procd_close_instance
+       # reset list of DOMAINS and DNS servers (for each dnsmasq instance)
+       DNS_SERVERS=""
+       DOMAIN=""
+       CONFIGFILE="${BASECONFIGFILE}.${cfg}"
+       CONFIGFILE_TMP="${CONFIGFILE}.$$"
+       HOSTFILE="${BASEHOSTFILE}.${cfg}"
+       TIMESTAMPFILE="${BASETIMESTAMPFILE}.${cfg}"
+       BASEDHCPSTAMPFILE_CFG="${BASEDHCPSTAMPFILE}.${cfg}"
 
        # before we can call xappend
+       mkdir -p /var/run/dnsmasq/
        mkdir -p $(dirname $CONFIGFILE)
+       mkdir -p $(dirname $HOSTFILE)
+       mkdir -p /var/lib/misc
+       chown dnsmasq:dnsmasq /var/run/dnsmasq
+
+       [ -f "$TIMESTAMPFILE" ] && rm -f "$TIMESTAMPFILE"
 
-       echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE
+       echo "# auto-generated config file from /etc/config/dhcp" > $CONFIGFILE_TMP
+       echo "# auto-generated config file from /etc/config/dhcp" > $HOSTFILE
 
        # if we did this last, we could override auto-generated config
        [ -f /etc/dnsmasq.conf ] && {
                xappend "--conf-file=/etc/dnsmasq.conf"
        }
 
-       args=""
-       config_foreach dnsmasq dnsmasq
-       config_foreach dhcp_host_add host
-       echo >> $CONFIGFILE
-       config_foreach dhcp_boot_add boot
-       config_foreach dhcp_mac_add mac
-       config_foreach dhcp_tag_add tag
-       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_hostrecord_add hostrecord
+       $PROG --version | grep -osqE "^Compile time options:.* DHCPv6( |$)" && DHCPv6CAPABLE=1 || DHCPv6CAPABLE=0
+
+       append_bool "$cfg" authoritative "--dhcp-authoritative"
+       append_bool "$cfg" nodaemon "--no-daemon"
+       append_bool "$cfg" domainneeded "--domain-needed"
+       append_bool "$cfg" filterwin2k "--filterwin2k"
+       append_bool "$cfg" nohosts "--no-hosts"
+       append_bool "$cfg" nonegcache "--no-negcache"
+       append_bool "$cfg" strictorder "--strict-order"
+       append_bool "$cfg" logqueries "--log-queries=extra"
+       append_bool "$cfg" noresolv "--no-resolv"
+       append_bool "$cfg" localise_queries "--localise-queries"
+       append_bool "$cfg" readethers "--read-ethers"
+       append_bool "$cfg" dbus "--enable-dbus"
+       append_bool "$cfg" boguspriv "--bogus-priv"
+       append_bool "$cfg" expandhosts "--expand-hosts"
+       config_get tftp_root "$cfg" "tftp_root"
+       [ -d "$tftp_root" ] && append_bool "$cfg" enable_tftp "--enable-tftp"
+       append_bool "$cfg" tftp_no_fail "--tftp-no-fail"
+       append_bool "$cfg" nonwildcard "--bind-dynamic"
+       append_bool "$cfg" fqdn "--dhcp-fqdn"
+       append_bool "$cfg" proxydnssec "--proxy-dnssec"
+       append_bool "$cfg" localservice "--local-service"
+       append_bool "$cfg" logdhcp "--log-dhcp"
+       append_bool "$cfg" quietdhcp "--quiet-dhcp"
+       append_bool "$cfg" sequential_ip "--dhcp-sequential-ip"
+       append_bool "$cfg" allservers "--all-servers"
+       append_bool "$cfg" noping "--no-ping"
+
+       append_parm "$cfg" dhcpscript "--dhcp-script"
+       append_parm "$cfg" cachesize "--cache-size"
+       append_parm "$cfg" dnsforwardmax "--dns-forward-max"
+       append_parm "$cfg" port "--port"
+       append_parm "$cfg" ednspacket_max "--edns-packet-max"
+       append_parm "$cfg" dhcpleasemax "--dhcp-lease-max"
+       append_parm "$cfg" "queryport" "--query-port"
+       append_parm "$cfg" "minport" "--min-port"
+       append_parm "$cfg" "maxport" "--max-port"
+       append_parm "$cfg" "domain" "--domain"
+       append_parm "$cfg" "local" "--server"
+       config_list_foreach "$cfg" "server" append_server
+       config_list_foreach "$cfg" "address" append_address
+       config_list_foreach "$cfg" "ipset" append_ipset
+       config_list_foreach "$cfg" "interface" append_interface
+       config_list_foreach "$cfg" "notinterface" append_notinterface
+       config_list_foreach "$cfg" "addnhosts" append_addnhosts
+       config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain
+       append_parm "$cfg" "leasefile" "--dhcp-leasefile" "/tmp/dhcp.leases"
+       append_parm "$cfg" "resolvfile" "--resolv-file" "/tmp/resolv.conf.auto"
+       append_parm "$cfg" "serversfile" "--servers-file"
+       append_parm "$cfg" "tftp_root" "--tftp-root"
+       append_parm "$cfg" "dhcp_boot" "--dhcp-boot"
+       append_parm "$cfg" "local_ttl" "--local-ttl"
+       append_parm "$cfg" "pxe_prompt" "--pxe-prompt"
+       config_list_foreach "$cfg" "pxe_service" append_pxe_service
+       config_get DOMAIN "$cfg" domain
+
+       config_get_bool ADD_LOCAL_DOMAIN "$cfg" add_local_domain 1
+       config_get_bool ADD_LOCAL_HOSTNAME "$cfg" add_local_hostname 1
+
+       config_get_bool readethers "$cfg" readethers
+       [ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers
+
+       config_get resolvfile $cfg resolvfile
+       config_get dhcpscript $cfg dhcpscript
+
+       config_get leasefile $cfg leasefile "/tmp/dhcp.leases"
+       [ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
+       config_get_bool cachelocal "$cfg" cachelocal 1
+
+       config_get_bool noresolv "$cfg" noresolv 0
+       if [ "$noresolv" != "1" ]; then
+               config_get resolvfile "$cfg" resolvfile "/tmp/resolv.conf.auto"
+               # So jail doesn't complain if file missing
+               [ -n "$resolvfile" -a \! -e "$resolvfile" ] && touch "$resolvfile"
+       fi
+
+       config_get hostsfile "$cfg" dhcphostsfile
+       [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
+
+       local rebind
+       config_get_bool rebind "$cfg" rebind_protection 1
+       [ $rebind -gt 0 ] && {
+               log_once \
+                       "DNS rebinding protection is active," \
+                       "will discard upstream RFC1918 responses!"
+               xappend "--stop-dns-rebind"
+
+               local rebind_localhost
+               config_get_bool rebind_localhost "$cfg" rebind_localhost 0
+               [ $rebind_localhost -gt 0 ] && {
+                       log_once "Allowing 127.0.0.0/8 responses"
+                       xappend "--rebind-localhost-ok"
+               }
+
+               append_rebind_domain() {
+                       log_once "Allowing RFC1918 responses for domain $1"
+                       xappend "--rebind-domain-ok=$1"
+               }
+
+               config_list_foreach "$cfg" rebind_domain append_rebind_domain
+       }
+
+       config_get_bool dnssec "$cfg" dnssec 0
+       [ "$dnssec" -gt 0 ] && {
+               xappend "--conf-file=$TRUSTANCHORSFILE"
+               xappend "--dnssec"
+               [ -x /etc/init.d/sysntpd ] && {
+                       /etc/init.d/sysntpd enabled
+                       [ "$?" -ne 0 -o "$(uci_get system.ntp.enabled)" = "1" ] && {
+                               [ -f "$TIMEVALIDFILE" ] || xappend "--dnssec-no-timecheck"
+                       }
+               }
+               append_bool "$cfg" dnsseccheckunsigned "--dnssec-check-unsigned"
+       }
+
+       config_get addmac "$cfg" addmac 0
+       [ "$addmac" != "0" ] && {
+               [ "$addmac" = "1" ] && addmac=
+               xappend "--add-mac${addmac:+="$addmac"}"
+       }
+
+       dhcp_option_add "$cfg" "" 0
+
+       xappend "--dhcp-broadcast=tag:needs-broadcast"
+
+       xappend "--addn-hosts=$HOSTFILE"
+
+       config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d"
+       [ ! -d "$dnsmasqconfdir" ] && mkdir -p $dnsmasqconfdir
+       xappend "--conf-dir=$dnsmasqconfdir"
+       xappend "--user=dnsmasq"
+       xappend "--group=dnsmasq"
+       echo >> $CONFIGFILE_TMP
+
+       config_get_bool enable_tftp "$cfg" enable_tftp 0
+       [ "$enable_tftp" -gt 0 ] && {
+               config_get tftp_root "$cfg" tftp_root
+               append EXTRA_MOUNT $tftp_root
+       }
+
+       config_foreach filter_dnsmasq host dhcp_host_add "$cfg"
+       echo >> $CONFIGFILE_TMP
+       config_foreach filter_dnsmasq boot dhcp_boot_add "$cfg"
+       config_foreach filter_dnsmasq mac dhcp_mac_add "$cfg"
+       config_foreach filter_dnsmasq tag dhcp_tag_add "$cfg"
+       config_foreach filter_dnsmasq vendorclass dhcp_vendorclass_add "$cfg"
+       config_foreach filter_dnsmasq userclass dhcp_userclass_add "$cfg"
+       config_foreach filter_dnsmasq circuitid dhcp_circuitid_add "$cfg"
+       config_foreach filter_dnsmasq remoteid dhcp_remoteid_add "$cfg"
+       config_foreach filter_dnsmasq subscrid dhcp_subscrid_add "$cfg"
+       config_foreach filter_dnsmasq match dhcp_match_add "$cfg"
+       config_foreach filter_dnsmasq domain dhcp_domain_add "$cfg"
+       config_foreach filter_dnsmasq hostrecord dhcp_hostrecord_add "$cfg"
+       config_foreach filter_dnsmasq relay dhcp_relay_add "$cfg"
 
        # add own hostname
-       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:+.$DOMAIN ${hostname%.$DOMAIN}}" "$lanaddr"
+       [ $ADD_LOCAL_HOSTNAME -eq 1 ] && {
+               local lanaddr lanaddr6
+               local ulaprefix="$(uci_get network @globals[0] ula_prefix)"
+               local hostname="$(uci_get system @system[0] hostname Lede)"
+
+               network_get_ipaddr lanaddr "lan" && {
+                       dhcp_domain_add "" "$hostname" "$lanaddr"
+               }
+
+               [ -n "$ulaprefix" ] && network_get_ipaddrs6 lanaddr6 "lan" && {
+                       for lanaddr6 in $lanaddr6; do
+                               case "$lanaddr6" in
+                                       "${ulaprefix%%:/*}"*)
+                                               dhcp_domain_add "" "$hostname" "$lanaddr6"
+                                       ;;
+                               esac
+                       done
+               }
        }
 
-       echo >> $CONFIGFILE
-       config_foreach dhcp_srv_add srvhost
-       config_foreach dhcp_mx_add mxhost
-       echo >> $CONFIGFILE
-       config_foreach dhcp_add dhcp
-       echo >> $CONFIGFILE
-       config_foreach dhcp_cname_add cname
-       echo >> $CONFIGFILE
-
-       rm -f /tmp/resolv.conf
-       [ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && {
-               echo "search $DOMAIN" >> /tmp/resolv.conf
+       echo >> $CONFIGFILE_TMP
+       config_foreach filter_dnsmasq srvhost dhcp_srv_add "$cfg"
+       config_foreach filter_dnsmasq mxhost dhcp_mx_add "$cfg"
+       echo >> $CONFIGFILE_TMP
+
+       config_get odhcpd_is_active odhcpd maindhcp
+       if [ "$odhcpd_is_active" != "1" ]; then
+               config_foreach filter_dnsmasq dhcp dhcp_add "$cfg"
+       fi
+
+       echo >> $CONFIGFILE_TMP
+       config_foreach filter_dnsmasq cname dhcp_cname_add "$cfg"
+       echo >> $CONFIGFILE_TMP
+
+       echo >> $CONFIGFILE_TMP
+       mv -f $CONFIGFILE_TMP $CONFIGFILE
+
+       [ "$resolvfile" = "/tmp/resolv.conf.auto" ] && {
+               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
        }
-       DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
-       for DNS_SERVER in $DNS_SERVERS ; do
-               echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
-       done
+
+       procd_open_instance $cfg
+       procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid
+       procd_set_param file $CONFIGFILE
+       procd_set_param respawn
+
+       local dnsmasqconffile="/etc/dnsmasq.${cfg}.conf"
+       if [ ! -r "$dnsmasqconffile" ]; then
+               dnsmasqconffile=/etc/dnsmasq.conf
+       fi
+
+       procd_add_jail dnsmasq ubus log
+       procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $dhcpscript /etc/hosts /etc/ethers $EXTRA_MOUNT
+       procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
+
+       procd_close_instance
+}
+
+dnsmasq_stop()
+{
+       local cfg="$1"
+
+       config_get resolvfile "$cfg" "resolvfile"
+
+       #relink /tmp/resolve.conf only for main instance
+       [ "$resolvfile" = "/tmp/resolv.conf.auto" ] && {
+               [ -f /tmp/resolv.conf ] && {
+                       rm -f /tmp/resolv.conf
+                       ln -s "$resolvfile" /tmp/resolv.conf
+               }
+       }
+
+       rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp
+}
+
+service_triggers()
+{
+       procd_add_reload_trigger "dhcp"
+       procd_add_raw_trigger "interface.*" 2000 /etc/init.d/dnsmasq reload
+}
+
+boot()
+{
+       BOOT=1
+       start "$@"
+}
+
+start_service() {
+       local instance="$1"
+       local instance_found=0
+
+       [ -n "$BOOT" ] && return
+
+       . /lib/functions/network.sh
+
+       config_cb() {
+               local type="$1"
+               local name="$2"
+               if [ "$type" = "dnsmasq" ]; then
+                       if [ -n "$instance" -a "$instance" = "$name" ]; then
+                               instance_found=1
+                       fi
+               fi
+       }
+
+       config_load dhcp
+
+       if [ -n "$instance" ]; then
+               [ "$instance_found" -gt 0 ] || return
+               dnsmasq_start "$instance"
+       else
+               config_foreach dnsmasq_start dnsmasq
+       fi
+}
+
+reload_service() {
+       rc_procd start_service "$@"
+       return 0
 }
 
 stop_service() {
-       [ -f /tmp/resolv.conf ] && {
-               rm -f /tmp/resolv.conf
-               ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+       local instance="$1"
+       local instance_found=0
+
+       config_cb() {
+               local type="$1"
+               local name="$2"
+               if [ "$type" = "dnsmasq" ]; then
+                       if [ -n "$instance" -a "$instance" = "$name" ]; then
+                               instance_found=1
+                       fi
+               fi
        }
+
+       config_load dhcp
+
+       if [ -n "$instance" ]; then
+               [ "$instance_found" -gt 0 ] || return
+               dnsmasq_stop "$instance"
+       else
+               config_foreach dnsmasq_stop dnsmasq
+       fi
 }