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

get rid of ECHON

Browse Source
This commit is contained in:
bol-van 2022-02-15 20:51:45 +03:00
parent c9165b0729
commit ef7cfd1f60
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
blockcheck.sh
View File

@ -27,7 +27,6 @@ ZAPRET_BASE="$EXEDIR"
[ -n "$MAX_TTL" ] || MAX_TTL=12 [ -n "$MAX_TTL" ] || MAX_TTL=12
HDRTEMP=/tmp/zapret-hdr.txt HDRTEMP=/tmp/zapret-hdr.txt
ECHON="echo -n"
NFT_TABLE=blockcheck NFT_TABLE=blockcheck
@ -214,33 +213,33 @@ check_prerequisites()
curl_translate_code() curl_translate_code()
{ {
# $1 - code # $1 - code
$ECHON $1 printf $1
case $1 in case $1 in
0) $ECHON ": ok" 0) printf ": ok"
;; ;;
1) $ECHON ": unsupported protocol" 1) printf ": unsupported protocol"
;; ;;
2) $ECHON ": early initialization code failed" 2) printf ": early initialization code failed"
;; ;;
3) $ECHON ": the URL was not properly formatted" 3) printf ": the URL was not properly formatted"
;; ;;
4) $ECHON ": feature not supported by libcurl" 4) printf ": feature not supported by libcurl"
;; ;;
5) $ECHON ": could not resolve proxy" 5) printf ": could not resolve proxy"
;; ;;
6) $ECHON ": could not resolve host" 6) printf ": could not resolve host"
;; ;;
7) $ECHON ": could not connect" 7) printf ": could not connect"
;; ;;
8) $ECHON ": invalid server reply" 8) printf ": invalid server reply"
;; ;;
9) $ECHON ": remote access denied" 9) printf ": remote access denied"
;; ;;
27) $ECHON ": out of memory" 27) printf ": out of memory"
;; ;;
28) $ECHON ": operation timed out" 28) printf ": operation timed out"
;; ;;
35) $ECHON ": SSL connect error" 35) printf ": SSL connect error"
;; ;;
esac esac
} }
@ -438,7 +437,7 @@ curl_test()
while [ $n -lt $REPEATS ]; do while [ $n -lt $REPEATS ]; do
n=$(($n+1)) n=$(($n+1))
[ $REPEATS -gt 1 ] && $ECHON "[attempt $n] " [ $REPEATS -gt 1 ] && printf "[attempt $n] "
$1 "$IPV" $2 && { $1 "$IPV" $2 && {
[ $REPEATS -gt 1 ] && echo 'AVAILABLE' [ $REPEATS -gt 1 ] && echo 'AVAILABLE'
continue continue
@ -788,12 +787,12 @@ ask_params()
echo echo
echo "specify domain(s) to test. multiple domains are space separated." echo "specify domain(s) to test. multiple domains are space separated."
$ECHON "domain(s) (default: $DOMAINS) : " printf "domain(s) (default: $DOMAINS) : "
local dom local dom
read dom read dom
[ -n "$dom" ] && DOMAINS="$dom" [ -n "$dom" ] && DOMAINS="$dom"
$ECHON "ip protocol version(s) - 4, 6 or 46 for both (default: 4) : " printf "ip protocol version(s) - 4, 6 or 46 for both (default: 4) : "
read IPVS read IPVS
[ -n "$IPVS" ] || IPVS=4 [ -n "$IPVS" ] || IPVS=4
[ "$IPVS" = 4 -o "$IPVS" = 6 -o "$IPVS" = 46 ] || { [ "$IPVS" = 4 -o "$IPVS" = 6 -o "$IPVS" = 46 ] || {
@ -840,7 +839,7 @@ ask_params()
echo echo
echo "sometimes ISPs use multiple DPIs or load balancing. bypass strategies may work unstable." echo "sometimes ISPs use multiple DPIs or load balancing. bypass strategies may work unstable."
$ECHON "how many times to repeat each test (default: 1) : " printf "how many times to repeat each test (default: 1) : "
read REPEATS read REPEATS
REPEATS=$((0+${REPEATS:-1})) REPEATS=$((0+${REPEATS:-1}))
[ "$REPEATS" = 0 ] && { [ "$REPEATS" = 0 ] && {

2
ipset/def.sh
View File

@ -128,7 +128,7 @@ zzsize()
if [ -f "$f" ]; then if [ -f "$f" ]; then
wc -c <"$f" | xargs wc -c <"$f" | xargs
else else
$ECHON -n 0 printf 0
fi fi
} }