[openwrt/openwrt] dnsmasq: add handling of `filter-rr` to init script

LEDE Commits lede-commits at lists.infradead.org
Sun Oct 20 12:57:15 PDT 2024


hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/9857b41fe9767cf8f4cc87332eacec83dc310588

commit 9857b41fe9767cf8f4cc87332eacec83dc310588
Author: Paul Donald <newtwen+github at gmail.com>
AuthorDate: Tue Apr 2 03:16:02 2024 +0200

    dnsmasq: add handling of `filter-rr` to init script
    
    dnsmasq v2.90 introduced `--filter-rr=<rrtype>[,<rrtype>...]`.
    
    uci config usage:
    
    config dnsmasq
        ...
        option filter_rr 'AAAA,CNAME,NXDOMAIN,SRV,...'
    
    The dnsmasq instance internally builds a linked list of RR to filter
    from the individually supplied parameters, so it's harmless to provide
    synonyms:
    
    ... --filter-A --filter-rr=A ...
    
    See https://forum.openwrt.org/t/resolving-query-type-65-to-local-address-for-ios-clients-in-dnsmasq/179504/23
    
    Tested on: 23.05.2
    
    Signed-off-by: Paul Donald <newtwen+github at gmail.com>
    Tested-by: Vladimir Kochkovski <ask at getvladimir.com>
    Link: https://github.com/openwrt/openwrt/pull/14975
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 package/network/services/dnsmasq/files/dnsmasq.init | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 4cfb155424..dc5d9a17c2 100755
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -973,8 +973,10 @@ dnsmasq_start()
 	append_bool "$cfg" rapidcommit "--dhcp-rapid-commit"
 	append_bool "$cfg" scriptarp "--script-arp"
 
+	# deprecate or remove filter-X in favor of filter-rr?
 	append_bool "$cfg" filter_aaaa "--filter-AAAA"
 	append_bool "$cfg" filter_a "--filter-A"
+	append_parm "$cfg" filter_rr "--filter-rr"
 
 	append_parm "$cfg" logfacility "--log-facility"
 	config_get logfacility "$cfg" "logfacility"




More information about the lede-commits mailing list