ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-03-12 15:34:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

dnsmasq: fix handlers for options filter_rr and cache_rr

Browse Source 
According to:
- https://github.com/openwrt/luci/blob/master/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js#L700
- https://github.com/openwrt/luci/blob/master/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js#L402

These two options should be of type `MultiValue` but here there're used as single value. This results in dnsmasq crashes when either of these options are set with multiple values, which leads to an invalid space-separated value.

As these options are designed to take multiple values, I think it's better to use list format eg. `list filter_rr 'AAAA'`, instead of `option filter_rr 'AAAA,HTTPS'`.

See: https://forum.openwrt.org/t/selecting-more-than-one-filter-arbitrary-rr-or-cache-arbitrary-rr-in-v24-10-0-crashes-dnsmasq/225801

Tested on 24.10.0

Signed-off-by: Eric ZHANG <ericzhangjx@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18149
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Eric ZHANG 2025-03-02 15:54:37 +08:00 committed by Christian Marangi
parent 40f1db9cb1
commit d136c24f7c
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -226,6 +226,14 @@ append_interface_name() {
xappend "--interface-name=$1,$2" xappend "--interface-name=$1,$2"
} }
append_filter_rr() {
xappend "--filter-rr=$1"
}
append_cache_rr() {
xappend "--cache-rr=$1"
}
filter_dnsmasq() { filter_dnsmasq() {
local cfg="$1" func="$2" match_cfg="$3" found_cfg local cfg="$1" func="$2" match_cfg="$3" found_cfg
@ -1000,8 +1008,8 @@ dnsmasq_start()
# deprecate or remove filter-X in favor of filter-rr? # deprecate or remove filter-X in favor of filter-rr?
append_bool "$cfg" filter_aaaa "--filter-AAAA" append_bool "$cfg" filter_aaaa "--filter-AAAA"
append_bool "$cfg" filter_a "--filter-A" append_bool "$cfg" filter_a "--filter-A"
append_parm "$cfg" filter_rr "--filter-rr" config_list_foreach "$cfg" filter_rr append_filter_rr
append_parm "$cfg" cache_rr "--cache-rr" config_list_foreach "$cfg" cache_rr append_cache_rr
append_parm "$cfg" logfacility "--log-facility" append_parm "$cfg" logfacility "--log-facility"
config_get logfacility "$cfg" "logfacility" config_get logfacility "$cfg" "logfacility"