diff --git a/init.d/openwrt/firewall.zapret.ipset b/init.d/openwrt/firewall.zapret.ipset new file mode 100644 index 0000000..be14cdd --- /dev/null +++ b/init.d/openwrt/firewall.zapret.ipset @@ -0,0 +1,4 @@ +. /opt/zapret/init.d/openwrt/functions + +create_ipset no-update + diff --git a/init.d/openwrt/firewall.zapret.ipset6 b/init.d/openwrt/firewall.zapret.ipset6 new file mode 120000 index 0000000..86fdc0f --- /dev/null +++ b/init.d/openwrt/firewall.zapret.ipset6 @@ -0,0 +1 @@ +firewall.zapret.ipset \ No newline at end of file diff --git a/init.d/openwrt/functions b/init.d/openwrt/functions index ad2f092..6962fda 100644 --- a/init.d/openwrt/functions +++ b/init.d/openwrt/functions @@ -1,5 +1,8 @@ . /lib/functions/network.sh +[ -n "$ZAPRET_BASE" ] || ZAPRET_BASE=/opt/zapret +. "$ZAPRET_BASE/config" + QNUM=200 TPPORT_HTTP=1188 TPPORT_HTTPS=1189 @@ -111,6 +114,7 @@ dnat6_target() fw_nfqws() { + [ "$DISABLE_IPV4" = "1" ] && return local DEVICE wan_iface network_find_wan_all wan_iface for ext_iface in $wan_iface; do @@ -121,6 +125,7 @@ fw_nfqws() } fw_nfqws6() { + [ "$DISABLE_IPV6" = "1" ] && return local DEVICE wan_iface network_find_wan6_all wan_iface for ext_iface in $wan_iface; do @@ -134,6 +139,7 @@ IPT_OWNER="-m owner ! --uid-owner $TPWS_USER" __fw_tpws() { # $1 - use https + [ "$DISABLE_IPV4" = "1" ] && return local DEVICE wan_iface network_find_wan_all wan_iface for ext_iface in $wan_iface; do @@ -158,6 +164,7 @@ fw_tpws_https() __fw_tpws6() { # $1 - use https + [ "$DISABLE_IPV6" = "1" ] && return local DEVICE wan_iface ip6 network_find_wan6_all wan_iface for ext_iface in $wan_iface; do diff --git a/init.d/openwrt/zapret b/init.d/openwrt/zapret index f1feb50..4e2221e 100755 --- a/init.d/openwrt/zapret +++ b/init.d/openwrt/zapret @@ -7,7 +7,6 @@ START=21 . /lib/functions/network.sh ZAPRET_BASE=/opt/zapret -# SHOULD EDIT config . "$ZAPRET_BASE/config" # !!!!! in openwrt firewall rules are configured separately @@ -83,9 +82,6 @@ start_service() { nfqws_all|nfqws_all_https) run_daemon 1 $NFQWS "$NFQWS_OPT_BASE $NFQWS_OPT" ;; - ipset) - create_ipset - ;; custom) # PLACEHOLDER echo !!! NEED ATTENTION !!!