ForkMaster/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-13 18:28:34 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

use TPWS_OPT_SUFFIX in scripts

Browse Source
This commit is contained in:
bol-van 2024-09-20 09:52:31 +03:00
parent d6236cfe91
commit 1c162c0639
7 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init.d/macos/custom-tpws
View File

@ -7,6 +7,7 @@ zapret_custom_daemons()
# $1 - 1 - run, 0 - stop # $1 - 1 - run, 0 - stop
local opt="--user=root --port=$TPPORT_MY" local opt="--user=root --port=$TPPORT_MY"
filter_apply_hostlist_target opt filter_apply_hostlist_target opt
filter_apply_suffix opt "$TPWS_OPT_SUFFIX"
tpws_apply_binds opt tpws_apply_binds opt
opt="$opt $TPWS_OPT" opt="$opt $TPWS_OPT"
do_daemon $1 1 "$TPWS" "$opt" do_daemon $1 1 "$TPWS" "$opt"

2
init.d/macos/functions
View File

@ -164,6 +164,7 @@ zapret_do_daemons()
# MacOS requires root. kernel hardcoded requirement for /dev/pf ioctls # MacOS requires root. kernel hardcoded requirement for /dev/pf ioctls
opt="--user=root --port=$TPPORT" opt="--user=root --port=$TPPORT"
filter_apply_hostlist_target opt filter_apply_hostlist_target opt
filter_apply_suffix opt "$TPWS_OPT_SUFFIX"
tpws_apply_binds opt tpws_apply_binds opt
opt="$opt $TPWS_OPT" opt="$opt $TPWS_OPT"
do_daemon $1 1 "$TPWS" "$opt" do_daemon $1 1 "$TPWS" "$opt"
@ -176,6 +177,7 @@ zapret_do_daemons()
opt="--socks --user=$WS_USER --port=$TPPORT" opt="--socks --user=$WS_USER --port=$TPPORT"
tpws_apply_socks_binds opt tpws_apply_socks_binds opt
filter_apply_hostlist_target opt filter_apply_hostlist_target opt
filter_apply_suffix opt "$TPWS_OPT_SUFFIX"
opt="$opt $TPWS_OPT" opt="$opt $TPWS_OPT"
do_daemon $1 1 "$TPWS" "$opt" do_daemon $1 1 "$TPWS" "$opt"
;; ;;

1
init.d/openwrt/custom-tpws4http-nfqws4https
View File

@ -10,6 +10,7 @@ zapret_custom_daemons()
[ "$MODE_HTTP" = "1" ] && { [ "$MODE_HTTP" = "1" ] && {
opt="--port=$TPPORT $TPWS_OPT" opt="--port=$TPPORT $TPWS_OPT"
filter_apply_hostlist_target opt filter_apply_hostlist_target opt
filter_apply_suffix opt "$TPWS_OPT_SUFFIX"
run_tpws 1 "$opt" run_tpws 1 "$opt"
} }

2
init.d/openwrt/zapret
View File

@ -122,11 +122,13 @@ start_daemons_procd()
tpws) tpws)
opt="--port=$TPPORT $TPWS_OPT" opt="--port=$TPPORT $TPWS_OPT"
filter_apply_hostlist_target opt filter_apply_hostlist_target opt
filter_apply_suffix opt "$TPWS_OPT_SUFFIX"
run_tpws 1 "$opt" run_tpws 1 "$opt"
;; ;;
tpws-socks) tpws-socks)
opt="--port=$TPPORT $TPWS_OPT" opt="--port=$TPPORT $TPWS_OPT"
filter_apply_hostlist_target opt filter_apply_hostlist_target opt
filter_apply_suffix opt "$TPWS_OPT_SUFFIX"
run_tpws_socks 1 "$opt" run_tpws_socks 1 "$opt"
;; ;;
nfqws) nfqws)

1
init.d/sysv/custom-tpws4http-nfqws4https
View File

@ -10,6 +10,7 @@ zapret_custom_daemons()
[ "$MODE_HTTP" = "1" ] && { [ "$MODE_HTTP" = "1" ] && {
opt="--port=$TPPORT $TPWS_OPT" opt="--port=$TPPORT $TPWS_OPT"
filter_apply_hostlist_target opt filter_apply_hostlist_target opt
filter_apply_suffix opt "$TPWS_OPT_SUFFIX"
do_tpws $1 1 "$opt" do_tpws $1 1 "$opt"
} }

2
init.d/sysv/functions
View File

@ -291,11 +291,13 @@ zapret_do_daemons()
tpws) tpws)
opt="--port=$TPPORT $TPWS_OPT" opt="--port=$TPPORT $TPWS_OPT"
filter_apply_hostlist_target opt filter_apply_hostlist_target opt
filter_apply_suffix opt "$TPWS_OPT_SUFFIX"
do_tpws $1 1 "$opt" do_tpws $1 1 "$opt"
;; ;;
tpws-socks) tpws-socks)
opt="--port=$TPPORT $TPWS_OPT" opt="--port=$TPPORT $TPWS_OPT"
filter_apply_hostlist_target opt filter_apply_hostlist_target opt
filter_apply_suffix opt "$TPWS_OPT_SUFFIX"
do_tpws_socks $1 1 "$opt" do_tpws_socks $1 1 "$opt"
;; ;;
nfqws) nfqws)

2
install_easy.sh
View File

@ -112,7 +112,7 @@ select_mode_mode()
case $MODE in case $MODE in
tpws) tpws)
vars="TPWS_OPT" vars="TPWS_OPT TPWS_OPT_SUFFIX"
;; ;;
nfqws) nfqws)
vars="NFQWS_OPT_DESYNC NFQWS_OPT_DESYNC_SUFFIX NFQWS_OPT_DESYNC_HTTP NFQWS_OPT_DESYNC_HTTP_SUFFIX NFQWS_OPT_DESYNC_HTTPS NFQWS_OPT_DESYNC_HTTPS_SUFFIX NFQWS_OPT_DESYNC_HTTP6 NFQWS_OPT_DESYNC_HTTP6_SUFFIX NFQWS_OPT_DESYNC_HTTPS6 NFQWS_OPT_DESYNC_HTTPS6_SUFFIX NFQWS_OPT_DESYNC_QUIC NFQWS_OPT_DESYNC_QUIC_SUFFIX NFQWS_OPT_DESYNC_QUIC6 NFQWS_OPT_DESYNC_QUIC6_SUFFIX" vars="NFQWS_OPT_DESYNC NFQWS_OPT_DESYNC_SUFFIX NFQWS_OPT_DESYNC_HTTP NFQWS_OPT_DESYNC_HTTP_SUFFIX NFQWS_OPT_DESYNC_HTTPS NFQWS_OPT_DESYNC_HTTPS_SUFFIX NFQWS_OPT_DESYNC_HTTP6 NFQWS_OPT_DESYNC_HTTP6_SUFFIX NFQWS_OPT_DESYNC_HTTPS6 NFQWS_OPT_DESYNC_HTTPS6_SUFFIX NFQWS_OPT_DESYNC_QUIC NFQWS_OPT_DESYNC_QUIC_SUFFIX NFQWS_OPT_DESYNC_QUIC6 NFQWS_OPT_DESYNC_QUIC6_SUFFIX"