From f986da9ae279a79135dd2e451d9de585483faf5b Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Sat, 4 Jan 2025 09:11:30 +0300
Subject: [PATCH 1/4] blockcheck: wait for child processes on terminate

---
 blockcheck.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blockcheck.sh b/blockcheck.sh
index 57124b9..8ced77c 100755
--- a/blockcheck.sh
+++ b/blockcheck.sh
@@ -2049,6 +2049,7 @@ unprepare_all()
 {
 	# make sure we are not in a middle state that impacts connectivity
 	ws_kill
+	wait
 	[ -n "$IPV" ] && {
 		pktws_ipt_unprepare_tcp 80
 		pktws_ipt_unprepare_tcp 443

From d00034504390a1856b962448e79a155a3dc65c28 Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Sat, 4 Jan 2025 18:11:30 +0300
Subject: [PATCH 2/4] blockcheck: SKIP_IPBLOCK, remove hardcoded ports

---
 blockcheck.sh  | 20 ++++++++++----------
 docs/readme.md |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/blockcheck.sh b/blockcheck.sh
index 8ced77c..f0b33e2 100755
--- a/blockcheck.sh
+++ b/blockcheck.sh
@@ -1575,7 +1575,7 @@ check_domain_http_tcp()
 
 	check_domain_prolog $1 $2 $4 || return
 
-	check_dpi_ip_block $1 $4
+	[ "$SKIP_IPBLOCK" = 1 ] || check_dpi_ip_block $1 $4
 
 	[ "$SKIP_TPWS" = 1 ] || {
 		echo
@@ -1621,22 +1621,22 @@ check_domain_http_udp()
 check_domain_http()
 {
 	# $1 - domain
-	check_domain_http_tcp curl_test_http 80 0 $1
+	check_domain_http_tcp curl_test_http $HTTP_PORT 0 $1
 }
 check_domain_https_tls12()
 {
 	# $1 - domain
-	check_domain_http_tcp curl_test_https_tls12 443 1 $1
+	check_domain_http_tcp curl_test_https_tls12 $HTTPS_PORT 1 $1
 }
 check_domain_https_tls13()
 {
 	# $1 - domain
-	check_domain_http_tcp curl_test_https_tls13 443 2 $1
+	check_domain_http_tcp curl_test_https_tls13 $HTTPS_PORT 2 $1
 }
 check_domain_http3()
 {
 	# $1 - domain
-	check_domain_http_udp curl_test_http3 443 $1
+	check_domain_http_udp curl_test_http3 $QUIC_PORT $1
 }
 
 configure_ip_version()
@@ -2051,9 +2051,9 @@ unprepare_all()
 	ws_kill
 	wait
 	[ -n "$IPV" ] && {
-		pktws_ipt_unprepare_tcp 80
-		pktws_ipt_unprepare_tcp 443
-		pktws_ipt_unprepare_udp 443
+		pktws_ipt_unprepare_tcp $HTTP_PORT
+		pktws_ipt_unprepare_tcp $HTTPS_PORT
+		pktws_ipt_unprepare_udp $QUIC_PORT
 	}
 	cleanup
 	rm -f "${HDRTEMP}"* "${PARALLEL_OUT}"*
@@ -2102,10 +2102,10 @@ for dom in $DOMAINS; do
 	for IPV in $IPVS; do
 		configure_ip_version
 		[ "$ENABLE_HTTP" = 1 ] && {
-			check_domain_port_block $dom $HTTP_PORT
+			[ "$SKIP_IPBLOCK" = 1 ] || check_domain_port_block $dom $HTTP_PORT
 			check_domain_http $dom
 		}
-		[ "$ENABLE_HTTPS_TLS12" = 1 -o "$ENABLE_HTTPS_TLS13" = 1 ] && check_domain_port_block $dom $HTTPS_PORT
+		[ "$ENABLE_HTTPS_TLS12" = 1 -o "$ENABLE_HTTPS_TLS13" = 1 ] && [ "$SKIP_IPBLOCK" != 1 ] && check_domain_port_block $dom $HTTPS_PORT
 		[ "$ENABLE_HTTPS_TLS12" = 1 ] && check_domain_https_tls12 $dom
 		[ "$ENABLE_HTTPS_TLS13" = 1 ] && check_domain_https_tls13 $dom
 		[ "$ENABLE_HTTP3" = 1 ] && check_domain_http3 $dom
diff --git a/docs/readme.md b/docs/readme.md
index 9894a6f..9c49dd8 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -1442,6 +1442,7 @@ SCANLEVEL=quick|standard|force - уровень сканирования
 BATCH=1 - пакетный режим без вопросов и ожидания ввода в консоли
 HTTP_PORT, HTTPS_PORT, QUIC_PORT - номера портов для соответствующих протоколов
 SKIP_DNSCHECK=1 - отказ от проверки DNS
+SKIP_IPBLOCK=1 - отказ от тестов блокировки по порту или IP
 SKIP_TPWS=1 - отказ от тестов tpws
 SKIP_PKTWS=1 - отказ от тестов nfqws/dvtws/winws
 PKTWS_EXTRA, TPWS_EXTRA - дополнительные параметры nfqws/dvtws/winws и tpws
@@ -1712,7 +1713,7 @@ DISABLE_IPV6=1
 ```
 
 Количество потоков для многопоточного DNS ресолвера mdig (1..100).
-Чем их больше, тем быстрее, но не обидится ли на долбежку ваш DNS сервер?\
+Чем их больше, тем быстрее, но не обидется ли на долбежку ваш DNS сервер?\
 `MDIG_THREADS=30`
 
 Место для хранения временных файлов. При скачивании огромных реестров в `/tmp` места может не хватить.

From 41693b100865215bebd16a9b0b4322a8a83eb43b Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Sun, 5 Jan 2025 12:52:37 +0300
Subject: [PATCH 3/4] blockcheck: minor old shell compat

---
 blockcheck.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blockcheck.sh b/blockcheck.sh
index f0b33e2..3d84040 100755
--- a/blockcheck.sh
+++ b/blockcheck.sh
@@ -974,7 +974,7 @@ curl_test()
 		rm -f "${PARALLEL_OUT}"*
 		for n in $(seq -s ' ' 1 $REPEATS); do
 			$1 "$IPV" $2 $3 "$4" >"${PARALLEL_OUT}_$n" &
-			pids=${pids:+$pids }$!
+			pids="${pids:+$pids }$!"
 		done
 		n=1
 		for p in $pids; do

From f21bd0c63c4997cad7d792c29053a2a7556663e8 Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Sun, 5 Jan 2025 15:09:47 +0300
Subject: [PATCH 4/4] update git files

---
 .gitattributes | 2 --
 .gitignore     | 1 -
 2 files changed, 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index b3d6cea..8ecdb83 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,3 @@
 * text=auto eol=lf
-binaries/win64/readme.txt eol=crlf
-binaries/win32/readme.txt eol=crlf
 *.cmd eol=crlf
 *.bat eol=crlf
diff --git a/.gitignore b/.gitignore
index d49c4be..a32f4fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ nfq/nfqws
 nfq/winws.exe
 tpws/tpws
 binaries/my/
-init.d/**/custom
 ipset/zapret-ip*.txt
 ipset/zapret-ip*.gz
 ipset/zapret-hosts*.txt