mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-27 00:52:36 +00:00
Revert "dnsmasq: add config option for connmark DNS filtering"
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:
parent
b1df48caac
commit
2a9d7ecd27
@ -172,10 +172,6 @@ append_ipset() {
|
||||
xappend "--ipset=$1"
|
||||
}
|
||||
|
||||
append_connmark_allowlist() {
|
||||
xappend "--connmark-allowlist=$1"
|
||||
}
|
||||
|
||||
append_interface() {
|
||||
network_get_device ifname "$1" || ifname="$1"
|
||||
xappend "--interface=$ifname"
|
||||
@ -917,14 +913,6 @@ dnsmasq_start()
|
||||
config_list_foreach "$cfg" "rev_server" append_rev_server
|
||||
config_list_foreach "$cfg" "address" append_address
|
||||
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" ] || {
|
||||
config_list_foreach "$cfg" "interface" append_interface
|
||||
config_list_foreach "$cfg" "notinterface" append_notinterface
|
||||
|
Loading…
Reference in New Issue
Block a user