drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-04-19 21:42:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

openwrt: remove any fw activity (create_ipset) from init script. move to fw3 include

Browse Source
This commit is contained in:
bolvan 2019-05-16 11:24:14 +03:00
parent 92ba726869
commit e10a3d881b
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init.d/openwrt/firewall.zapret.ipset Normal file
View File

@ -0,0 +1,4 @@
. /opt/zapret/init.d/openwrt/functions
create_ipset no-update

1
init.d/openwrt/firewall.zapret.ipset6 Symbolic link
View File

@ -0,0 +1 @@
firewall.zapret.ipset

7
init.d/openwrt/functions
View File

@ -1,5 +1,8 @@
. /lib/functions/network.sh . /lib/functions/network.sh
[ -n "$ZAPRET_BASE" ] || ZAPRET_BASE=/opt/zapret
. "$ZAPRET_BASE/config"
QNUM=200 QNUM=200
TPPORT_HTTP=1188 TPPORT_HTTP=1188
TPPORT_HTTPS=1189 TPPORT_HTTPS=1189
@ -111,6 +114,7 @@ dnat6_target()
fw_nfqws() fw_nfqws()
{ {
[ "$DISABLE_IPV4" = "1" ] && return
local DEVICE wan_iface local DEVICE wan_iface
network_find_wan_all wan_iface network_find_wan_all wan_iface
for ext_iface in $wan_iface; do for ext_iface in $wan_iface; do
@ -121,6 +125,7 @@ fw_nfqws()
} }
fw_nfqws6() fw_nfqws6()
{ {
[ "$DISABLE_IPV6" = "1" ] && return
local DEVICE wan_iface local DEVICE wan_iface
network_find_wan6_all wan_iface network_find_wan6_all wan_iface
for ext_iface in $wan_iface; do for ext_iface in $wan_iface; do
@ -134,6 +139,7 @@ IPT_OWNER="-m owner ! --uid-owner $TPWS_USER"
__fw_tpws() __fw_tpws()
{ {
# $1 - use https # $1 - use https
[ "$DISABLE_IPV4" = "1" ] && return
local DEVICE wan_iface local DEVICE wan_iface
network_find_wan_all wan_iface network_find_wan_all wan_iface
for ext_iface in $wan_iface; do for ext_iface in $wan_iface; do
@ -158,6 +164,7 @@ fw_tpws_https()
__fw_tpws6() __fw_tpws6()
{ {
# $1 - use https # $1 - use https
[ "$DISABLE_IPV6" = "1" ] && return
local DEVICE wan_iface ip6 local DEVICE wan_iface ip6
network_find_wan6_all wan_iface network_find_wan6_all wan_iface
for ext_iface in $wan_iface; do for ext_iface in $wan_iface; do

4
init.d/openwrt/zapret
View File

@ -7,7 +7,6 @@ START=21
. /lib/functions/network.sh . /lib/functions/network.sh
ZAPRET_BASE=/opt/zapret ZAPRET_BASE=/opt/zapret
# SHOULD EDIT config
. "$ZAPRET_BASE/config" . "$ZAPRET_BASE/config"
# !!!!! in openwrt firewall rules are configured separately # !!!!! in openwrt firewall rules are configured separately
@ -83,9 +82,6 @@ start_service() {
nfqws_all|nfqws_all_https) nfqws_all|nfqws_all_https)
run_daemon 1 $NFQWS "$NFQWS_OPT_BASE $NFQWS_OPT" run_daemon 1 $NFQWS "$NFQWS_OPT_BASE $NFQWS_OPT"
;; ;;
ipset)
create_ipset
;;
custom) custom)
# PLACEHOLDER # PLACEHOLDER
echo !!! NEED ATTENTION !!! echo !!! NEED ATTENTION !!!