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@gmail.com>
Tested-by: Vladimir Kochkovski <ask@getvladimir.com>
Link: https://github.com/openwrt/openwrt/pull/14975
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 4cfb1554240b2b17b6952ce318d90bb806352758..dc5d9a17c2427a984d131f6307bf434034293815 100755 (executable)
--- 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"