EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "dnsmasq: add config option for connmark DNS filtering"

Browse Source 
This reverts commit dea4bae7c2.

dnsmasq v2.86test3 has some issues with ubus and needs reverting, hence
this needs reverting.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant 2021-06-26 20:30:58 +01:00
parent b1df48caac
commit 2a9d7ecd27
1 changed files with 0 additions and 12 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

@ -172,10 +172,6 @@ append_ipset() {
xappend "--ipset=$1" xappend "--ipset=$1"
} }
append_connmark_allowlist() {
xappend "--connmark-allowlist=$1"
}
append_interface() { append_interface() {
network_get_device ifname "$1" || ifname="$1" network_get_device ifname "$1" || ifname="$1"
xappend "--interface=$ifname" xappend "--interface=$ifname"
@ -917,14 +913,6 @@ dnsmasq_start()
config_list_foreach "$cfg" "rev_server" append_rev_server config_list_foreach "$cfg" "rev_server" append_rev_server
config_list_foreach "$cfg" "address" append_address config_list_foreach "$cfg" "address" append_address
config_list_foreach "$cfg" "ipset" append_ipset config_list_foreach "$cfg" "ipset" append_ipset
local connmark_allowlist_enable
config_get connmark_allowlist_enable "$cfg" connmark_allowlist_enable 0
[ "$connmark_allowlist_enable" -gt 0 ] && {
append_parm "$cfg" "connmark_allowlist_enable" "--connmark-allowlist-enable"
config_list_foreach "$cfg" "connmark_allowlist" append_connmark_allowlist
}
[ -n "$BOOT" ] || { [ -n "$BOOT" ] || {
config_list_foreach "$cfg" "interface" append_interface config_list_foreach "$cfg" "interface" append_interface
config_list_foreach "$cfg" "notinterface" append_notinterface config_list_foreach "$cfg" "notinterface" append_notinterface