diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2021-06-26 20:30:58 +0100 |
|---|---|---|
| committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2021-06-26 20:30:58 +0100 |
| commit | 2a9d7ecd278a8a5ef8bcc63ead65a9cbccd37621 (patch) | |
| tree | 28f858112253895e52b5478d4ae796566eabe085 | |
| parent | b1df48caac1b3f75a65768a5abf8de84801edbf0 (diff) | |
| download | upstream-2a9d7ecd278a8a5ef8bcc63ead65a9cbccd37621.tar.gz upstream-2a9d7ecd278a8a5ef8bcc63ead65a9cbccd37621.tar.bz2 upstream-2a9d7ecd278a8a5ef8bcc63ead65a9cbccd37621.zip | |
Revert "dnsmasq: add config option for connmark DNS filtering"
This reverts commit dea4bae7c2b963af02e1e3e3bdb5cd656a5ea3d3.
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>
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasq.init | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 3e06218a43..44e7d2d4f9 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -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 |