From a6982865aa4a81fd91353df54f3a0038ac2ce858 Mon Sep 17 00:00:00 2001 From: bol-van Date: Tue, 31 Oct 2023 11:47:35 +0300 Subject: [PATCH] blockcheck: speed up tpws check --- blockcheck.sh | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/blockcheck.sh b/blockcheck.sh index d6108de..e069f72 100755 --- a/blockcheck.sh +++ b/blockcheck.sh @@ -33,7 +33,7 @@ HDRTEMP=/tmp/zapret-hdr.txt NFT_TABLE=blockcheck [ -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_DIG2=/tmp/dig2.txt DNSCHECK_DIGS=/tmp/digs.txt @@ -58,6 +58,40 @@ exitp() 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() { $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 & PID=$! # give some time to initialize - sleep 1 + minsleep } ws_kill() { @@ -1014,6 +1048,7 @@ sigpipe() exit 1 } +fsleep_setup fix_sbin_path check_system require_root