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

Compare commits

base: drygdryg:9d797f3dbc73cf643d2afd1d93c9ba3b2333d464
Branches Tags
drygdryg:master
drygdryg:v69.4
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64
..
compare: drygdryg:8ec0ce067d3fb36d57127f18b94d50d11c1e6a54
Branches Tags
drygdryg:master
drygdryg:v69.4
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64

No commits in common. "9d797f3dbc73cf643d2afd1d93c9ba3b2333d464" and "8ec0ce067d3fb36d57127f18b94d50d11c1e6a54" have entirely different histories.
9d797f3dbc ... 8ec0ce067d

2 changed files with 4 additions and 41 deletions
Show Stats Expand all files Collapse all files

29
blockcheck.sh
View File

@ -348,26 +348,6 @@ check_system()
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()
{
# $1 - module name
@ -905,17 +885,17 @@ tpws_curl_test()
# $1 - test function
# $2 - domain
# $3,$4,$5, ... - tpws params
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"
echo - checking tpws $3 $4 $5 $6 $7 $8 $9 $TPWS_EXTRA
local ALL_PROXY="socks5://127.0.0.1:$SOCKS_PORT"
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"
ws_curl_test tpws_start "$@" $TPWS_EXTRA
}
pktws_curl_test()
{
# $1 - test function
# $2 - domain
# $3,$4,$5, ... - nfqws/dvtws params
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 "$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"
echo - checking $PKTWSD ${WF:+$WF }$3 $4 $5 $6 $7 $8 $9 $PKTWS_EXTRA
ws_curl_test pktws_start "$@" $PKTWS_EXTRA
}
xxxws_curl_test_update()
{
@ -1816,7 +1796,6 @@ sigsilent()
fsleep_setup
fix_sbin_path
check_system
check_already
[ "$UNAME" = CYGWIN ] || require_root
check_prerequisites
trap sigint_cleanup INT

16
common/base.sh
View File

@ -313,22 +313,6 @@ 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()
{
HTTP_PORTS=${HTTP_PORTS:-80}