From a3026e2faebe31ba85185bf72983361d0da221c6 Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 23 Mar 2012 11:19:56 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31056 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/files/dnsmasq.init | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init index b0c2cd226f..13f178384a 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" } -- 2.11.0