From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 23 Mar 2012 11:19:56 +0000 (+0000)
Subject: dnsmasq: add keywords for SRV RR class/weight
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/a3026e2faebe31ba85185bf72983361d0da221c6

dnsmasq: add keywords for SRV RR class/weight

The SRV record also requires the class and weight fields... Currently you can overload the "port" keyword as:

	option port xxxx,class,weight

but this is counter-intuitive. Here we fix this.

Redux: make the port required.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31056 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index b0c2cd226..13f178384 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -360,9 +360,12 @@ dhcp_srv_add() {
 	[ -n "$target" ] || return 0
 
 	config_get port "$cfg" port
+	[ -n "$port" ] || return 0
 
-	local service="$srv,$target"
-	[ -n "$port" ] && service="$service,$port"
+	config_get class "$cfg" class
+	config_get weight "$cfg" weight
+
+	local service="$srv,$target,$port${class:+,$class${weight:+,$weight}}"
 
 	append args "-W $service"
 }