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

blockcheck: speed up tpws check

Browse Source
This commit is contained in:
bol-van 2023-10-31 11:47:35 +03:00
parent 8c1d1cf37a
commit a6982865aa
1 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
blockcheck.sh
View File

@ -33,7 +33,7 @@ HDRTEMP=/tmp/zapret-hdr.txt
NFT_TABLE=blockcheck NFT_TABLE=blockcheck
[ -n "$DNSCHECK_DNS" ] || DNSCHECK_DNS="8.8.8.8 1.1.1.1 77.88.8.1" [ -n "$DNSCHECK_DNS" ] || DNSCHECK_DNS="8.8.8.8 1.1.1.1 77.88.8.1"
[ -n "$DNSCHECK_DOM" ] || DNSCHECK_DOM="pornhub.com putinhuylo.com rutracker.org www.torproject.org startmail.com" [ -n "$DNSCHECK_DOM" ] || DNSCHECK_DOM="pornhub.com putinhuylo.com rutracker.org www.torproject.org bbc.com"
DNSCHECK_DIG1=/tmp/dig1.txt DNSCHECK_DIG1=/tmp/dig1.txt
DNSCHECK_DIG2=/tmp/dig2.txt DNSCHECK_DIG2=/tmp/dig2.txt
DNSCHECK_DIGS=/tmp/digs.txt DNSCHECK_DIGS=/tmp/digs.txt
@ -58,6 +58,40 @@ exitp()
exit $1 exit $1
} }
fsleep_setup()
{
[ -n "$FSLEEP" ] || {
if sleep 0.1 2>/dev/null; then
FSLEEP=1
elif busybox usleep 1 2>/dev/null; then
FSLEEP=2
else
local errtext=$(read -t 0.001 2>&1)
if [ -z "$errtext" ]; then
FSLEEP=3
else
FSLEEP=0
fi
fi
}
}
minsleep()
{
case "$FSLEEP" in
1)
sleep 0.1
;;
2)
busybox usleep 100000
;;
3)
read -t 0.1
;;
*)
sleep 1
esac
}
IPT() IPT()
{ {
$IPTABLES -C "$@" >/dev/null 2>/dev/null || $IPTABLES -I "$@" $IPTABLES -C "$@" >/dev/null 2>/dev/null || $IPTABLES -I "$@"
@ -421,7 +455,7 @@ tpws_start()
"$TPWS" --uid $TPWS_UID:$TPWS_GID --bind-addr=$LOCALHOST --port=$TPPORT "$@" >/dev/null & "$TPWS" --uid $TPWS_UID:$TPWS_GID --bind-addr=$LOCALHOST --port=$TPPORT "$@" >/dev/null &
PID=$! PID=$!
# give some time to initialize # give some time to initialize
sleep 1 minsleep
} }
ws_kill() ws_kill()
{ {
@ -1014,6 +1048,7 @@ sigpipe()
exit 1 exit 1
} }
fsleep_setup
fix_sbin_path fix_sbin_path
check_system check_system
require_root require_root