Skip to content

Commit

Permalink
Revert "dnsmasq: add config option for connmark DNS filtering"
Browse files Browse the repository at this point in the history
This reverts commit dea4bae.

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>
  • Loading branch information
ldir-EDB0 authored and aiamadeus committed Jun 27, 2021
1 parent 9441993 commit 61eafab
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions package/network/services/dnsmasq/files/dnsmasq.init
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -921,14 +917,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
Expand Down

0 comments on commit 61eafab

Please sign in to comment.