drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-26 20:20:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bol-van:master' into tpws-luci

Browse Source
This commit is contained in:
NewUse 2024-10-03 09:22:32 +03:00 committed by GitHub
commit a6bbe8b090
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
blockcheck.sh
View File

@ -348,6 +348,26 @@ check_system()
echo firewall type is $FWTYPE echo firewall type is $FWTYPE
} }
zp_already_running()
{
case "$UNAME" in
CYGWIN)
win_process_exists $PKTWSD || win_process_exists goodbyedpi
;;
*)
process_exists $PKTWSD || process_exists tpws
esac
}
check_already()
{
echo \* checking already running zapret processes
if zp_already_running; then
echo "!!! WARNING. some dpi bypass processes already running !!!"
echo "!!! WARNING. blockcheck requires all DPI bypass methods disabled !!!"
echo "!!! WARNING. pls stop all dpi bypass instances that may interfere with blockcheck !!!"
fi
}
freebsd_module_loaded() freebsd_module_loaded()
{ {
# $1 - module name # $1 - module name
@ -885,17 +905,17 @@ tpws_curl_test()
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
# $3,$4,$5, ... - tpws params # $3,$4,$5, ... - tpws params
echo - checking tpws $3 $4 $5 $6 $7 $8 $9 $TPWS_EXTRA echo - checking tpws $3 $4 $5 $6 $7 $8 $9 $TPWS_EXTRA "$TPWS_EXTRA_1" "$TPWS_EXTRA_2" "$TPWS_EXTRA_3" "$TPWS_EXTRA_4" "$TPWS_EXTRA_5" "$TPWS_EXTRA_6" "$TPWS_EXTRA_7" "$TPWS_EXTRA_8" "$TPWS_EXTRA_9"
local ALL_PROXY="socks5://127.0.0.1:$SOCKS_PORT" local ALL_PROXY="socks5://127.0.0.1:$SOCKS_PORT"
ws_curl_test tpws_start "$@" $TPWS_EXTRA ws_curl_test tpws_start "$@" $TPWS_EXTRA "$TPWS_EXTRA_1" "$TPWS_EXTRA_2" "$TPWS_EXTRA_3" "$TPWS_EXTRA_4" "$TPWS_EXTRA_5" "$TPWS_EXTRA_6" "$TPWS_EXTRA_7" "$TPWS_EXTRA_8" "$TPWS_EXTRA_9"
} }
pktws_curl_test() pktws_curl_test()
{ {
# $1 - test function # $1 - test function
# $2 - domain # $2 - domain
# $3,$4,$5, ... - nfqws/dvtws params # $3,$4,$5, ... - nfqws/dvtws params
echo - checking $PKTWSD ${WF:+$WF }$3 $4 $5 $6 $7 $8 $9 $PKTWS_EXTRA echo - checking $PKTWSD ${WF:+$WF }$3 $4 $5 $6 $7 $8 $9 $PKTWS_EXTRA "$PKTWS_EXTRA_1" "$PKTWS_EXTRA_2" "$PKTWS_EXTRA_3" "$PKTWS_EXTRA_4" "$PKTWS_EXTRA_5" "$PKTWS_EXTRA_6" "$PKTWS_EXTRA_7" "$PKTWS_EXTRA_8" "$PKTWS_EXTRA_9"
ws_curl_test pktws_start "$@" $PKTWS_EXTRA ws_curl_test pktws_start "$@" $PKTWS_EXTRA "$PKTWS_EXTRA_1" "$PKTWS_EXTRA_2" "$PKTWS_EXTRA_3" "$PKTWS_EXTRA_4" "$PKTWS_EXTRA_5" "$PKTWS_EXTRA_6" "$PKTWS_EXTRA_7" "$PKTWS_EXTRA_8" "$PKTWS_EXTRA_9"
} }
xxxws_curl_test_update() xxxws_curl_test_update()
{ {
@ -1796,6 +1816,7 @@ sigsilent()
fsleep_setup fsleep_setup
fix_sbin_path fix_sbin_path
check_system check_system
check_already
[ "$UNAME" = CYGWIN ] || require_root [ "$UNAME" = CYGWIN ] || require_root
check_prerequisites check_prerequisites
trap sigint_cleanup INT trap sigint_cleanup INT

16
common/base.sh
View File

@ -313,6 +313,22 @@ shell_name()
} }
} }
process_exists()
{
if exists pgrep; then
pgrep ^$1$ >/dev/null
elif exists pidof; then
pidof $1 >/dev/null
else
return 1
fi
}
win_process_exists()
{
tasklist /NH /FI "IMAGENAME eq ${1}.exe" | grep -q "^${1}.exe"
}
std_ports() std_ports()
{ {
HTTP_PORTS=${HTTP_PORTS:-80} HTTP_PORTS=${HTTP_PORTS:-80}

3
init.d/openwrt/zapret
View File

@ -185,7 +185,8 @@ start_daemons()
} }
stop_daemons() stop_daemons()
{ {
procd_kill "$(basename ${basescript:-$initscript})" "$1" local svc="$(basename ${basescript:-$initscript})"
procd_running "$svc" "$1" && procd_kill "$svc" "$1"
} }
restart_daemons() restart_daemons()
{ {