X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/85e49e4898d55395c4dc6694280356f3d26f2748..244e2944c6b2f4efaf7d4375951ae2cf503823cd:/package/dnsmasq/files/dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index de9b92d52..ba1bf721d 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -3,6 +3,7 @@
 
 START=60
 DNS_SERVERS=""
+DOMAIN=""
 
 dhcp_calc() {
 	local ip="$1"
@@ -40,6 +41,14 @@ append_server() {
 	append args "-S $1"
 }
 
+append_interface() {
+	append args "-i $1"
+}
+
+append_notinterface() {
+	append args "-I $1"
+}
+
 dnsmasq() {
 	local cfg="$1"
 	append_bool "$cfg" authoritative "-K"
@@ -57,6 +66,7 @@ dnsmasq() {
 	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"
@@ -67,14 +77,21 @@ dnsmasq() {
 	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
 	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() {
@@ -151,7 +168,7 @@ dhcp_host_add() {
 	local cfg="$1"
 
 	config_get name "$cfg" name
-	[ -n "$name" ] || return 0
+	[ -n "$name" ] && dhcp_option_add "$cfg" "$name"
 
 	config_get mac "$cfg" mac
 	[ -n "$mac" ] || return 0
@@ -159,9 +176,7 @@ dhcp_host_add() {
 	config_get ip "$cfg" ip
 	[ -n "$ip" ] || return 0
 
-	append args "--dhcp-host=$mac,$ip"
-
-	dhcp_option_add "$cfg" "$name"
+	append args "--dhcp-host=$mac,$ip${name:+,$name}"
 }
 
 dhcp_mac_add() {
@@ -182,7 +197,6 @@ dhcp_boot_add() {
 	local cfg="$1"
 
 	config_get name "$cfg" name
-	[ -n "$name" ] || return 0
 
 	config_get filename "$cfg" filename
 	[ -n "$filename" ] || return 0
@@ -193,7 +207,7 @@ dhcp_boot_add() {
 	config_get serveraddress "$cfg" serveraddress
 	[ -n "$serveraddress" ] || return 0
 
-	append args "--dhcp-boot=net:$name,$filename,$servername,$serveraddress"
+	append args "--dhcp-boot=${name:+net:$name,}$filename,$servername,$serveraddress"
 
 	dhcp_option_add "$cfg" "$name"
 }
@@ -215,7 +229,7 @@ dhcp_add() {
 		DNS_SERVERS="$DNS_SERVERS $dnsserver"
 	}
 
-	append_bool "$cfg" ignore "-2 $ifname"
+	append_bool "$cfg" ignore "-2 $ifname" && return 0
 
 	config_get proto "$net" proto
 	[ static = "$proto" ] || return 0
@@ -227,7 +241,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 -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
@@ -257,6 +271,20 @@ dhcp_option_add() {
 
 }
 
+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
@@ -272,6 +300,7 @@ start() {
 	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 && {