Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2026-01-27 12:50:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

diag: Fix bugs in dwc.sh

Browse Source
This commit is contained in:
remittor
2026-01-11 19:08:35 +03:00
parent d45d07df82
commit a71965b382
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zapret/dwc.sh
View File

@@ -81,7 +81,7 @@ while IFS='|' read -r TAG PROVIDER TIMES URL; do
DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')" DST_IP="$( ping -c1 "$DOMAIN" 2>/dev/null | sed -n '1s/.*(\([0-9.]*\)).*/\1/p')"
fi fi
curl -k $URL --resolve $DOMAIN:443:$DST_IP -o /dev/null -s -w '%{size_download}\n' --max-time $CURL_TIMEOUT --range 0-$CURL_RANGETO curl -k $URL --resolve $DOMAIN:443:$DST_IP -o /dev/null -s -w '%{size_download}\n' --max-time $CURL_TIMEOUT --range 0-$CURL_RANGETO
) >"$ZAP_TMP_DIR/$ID3.$TAG.txt" 2>&1 & ) >"$ZAP_TMP_DIR/$ID3=$TAG=$PROVIDER.txt" 2>&1 &
done <<EOF done <<EOF
$(printf '%s\n' "$TEST_SUITE" | sed -n ' $(printf '%s\n' "$TEST_SUITE" | sed -n '
s/.*id:[[:space:]]*"\([^"]*\)".*provider:[[:space:]]*"\([^"]*\)".*times:[[:space:]]*\([0-9]\+\).*url:[[:space:]]*"\([^"]*\)".*/\1|\2|\3|\4/p s/.*id:[[:space:]]*"\([^"]*\)".*provider:[[:space:]]*"\([^"]*\)".*times:[[:space:]]*\([0-9]\+\).*url:[[:space:]]*"\([^"]*\)".*/\1|\2|\3|\4/p
@@ -90,11 +90,12 @@ EOF
wait wait
for file in $(ls "$ZAP_TMP_DIR"/*.txt | sort); do printf '%s\n' "$ZAP_TMP_DIR"/*.txt | sort | while IFS= read -r file; do
[ -f "$file" ] || continue [ -f "$file" ] || continue
tag="${file##*/}" FNAME="${file##*/}"
tag="${tag%.txt}" ID=$( echo "$FNAME" | cut -d= -f1)
tag="${tag#*.}" TAG=$( echo "$FNAME" | cut -d= -f2)
PROVIDER=$(echo "$FNAME" | cut -d= -f3 | sed 's/\.txt$//' )
res=$( cat "$file" ) res=$( cat "$file" )
res=$( trim "$res" ) res=$( trim "$res" )
status= status=
@@ -112,7 +113,7 @@ for file in $(ls "$ZAP_TMP_DIR"/*.txt | sort); do
status="[ OK ]" status="[ OK ]"
fi fi
fi fi
printf '%12s: %s \n' "$tag" "$status" printf '%12s / %-13s: %s \n' "$TAG" "$PROVIDER" "$status"
done done
return 0 return 0