From 1c4e85af19d9a70ddbd46708debf73e663a713d6 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Mon, 27 May 2019 19:04:12 -0700 Subject: [PATCH] luci-app-accesscontrol: change to DNS filter method --- package/lean/luci-app-accesscontrol/Makefile | 2 +- .../luci-app-accesscontrol/root/etc/init.d/mia | 16 ++++++++++------ .../root/etc/uci-defaults/mia | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/package/lean/luci-app-accesscontrol/Makefile b/package/lean/luci-app-accesscontrol/Makefile index 5e3ceebd4c..7c07807ba5 100644 --- a/package/lean/luci-app-accesscontrol/Makefile +++ b/package/lean/luci-app-accesscontrol/Makefile @@ -11,7 +11,7 @@ LUCI_DEPENDS:= LUCI_PKGARCH:=all PKG_NAME:=luci-app-accesscontrol PKG_VERSION:=1 -PKG_RELEASE:=7 +PKG_RELEASE:=9 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-accesscontrol/root/etc/init.d/mia b/package/lean/luci-app-accesscontrol/root/etc/init.d/mia index 018e9f2d41..c252427504 100755 --- a/package/lean/luci-app-accesscontrol/root/etc/init.d/mia +++ b/package/lean/luci-app-accesscontrol/root/etc/init.d/mia @@ -6,7 +6,7 @@ # See /LICENSE for more information. # -START=99 +START=30 CONFIG=mia @@ -65,17 +65,21 @@ del_rule(){ } start(){ + stop enable=$(uci get mia.@basic[0].enable) [ $enable -eq 0 ] && exit 0 - iptables -t filter -D FORWARD -m comment --comment "Rule For Control" -j MIA 2>/dev/null - iptables -t filter -F MIA 2>/dev/null - iptables -t filter -X MIA 2>/dev/null iptables -t filter -N MIA - iptables -t filter -I FORWARD -m comment --comment "Rule For Control" -j MIA + iptables -I INPUT -p udp --dport 53 -m comment --comment "Rule For Control" -j MIA + iptables -I INPUT -p tcp --dport 53 -m comment --comment "Rule For Control" -j MIA + iptables -t nat -A PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53 -m comment --comment "Rule For Control" + iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53 -m comment --comment "Rule For Control" add_rule } stop(){ - iptables -t filter -D FORWARD -m comment --comment "Rule For Control" -j MIA 2>/dev/null + iptables -D INPUT -p udp --dport 53 -m comment --comment "Rule For Control" -j MIA 2>/dev/null + iptables -D INPUT -p tcp --dport 53 -m comment --comment "Rule For Control" -j MIA 2>/dev/null + iptables -t nat -D PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53 -m comment --comment "Rule For Control" 2>/dev/null + iptables -t nat -D PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53 -m comment --comment "Rule For Control" 2>/dev/null iptables -t filter -F MIA 2>/dev/null iptables -t filter -X MIA 2>/dev/null } diff --git a/package/lean/luci-app-accesscontrol/root/etc/uci-defaults/mia b/package/lean/luci-app-accesscontrol/root/etc/uci-defaults/mia index 3e47eda297..e0d2c31334 100755 --- a/package/lean/luci-app-accesscontrol/root/etc/uci-defaults/mia +++ b/package/lean/luci-app-accesscontrol/root/etc/uci-defaults/mia @@ -8,7 +8,7 @@ uci -q batch <<-EOF >/dev/null delete firewall.mia set firewall.mia=include set firewall.mia.type=script - set firewall.mia.path=/var/etc/mia.include + set firewall.mia.path=/etc/mia.include set firewall.mia.reload=1 commit firewall EOF