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: improve graceful termination

Browse Source
This commit is contained in:
bol-van 2021-12-09 20:22:28 +03:00
parent 46af34c59c
commit 05d299e13d
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
blockcheck.sh
View File

@ -394,6 +394,7 @@ check_domain()
# in case was interrupted before # in case was interrupted before
nfqws_ipt_unprepare $2 nfqws_ipt_unprepare $2
tpws_ipt_unprepare $2
killall nfqws tpws 2>/dev/null killall nfqws tpws 2>/dev/null
echo "- checking without DPI bypass" echo "- checking without DPI bypass"
@ -432,6 +433,19 @@ check_domain_https()
check_domain curl_test_https 443 1 $1 check_domain curl_test_https 443 1 $1
} }
configure_ip_version()
{
if [ "$IPV" = 6 ]; then
IPTABLES=ip6tables;
LOCALHOST=::1;
LOCALHOST_IPT=[::1];
else
IPTABLES=iptables
LOCALHOST=127.0.0.1
LOCALHOST_IPT=127.0.0.1
fi
}
ask_params() ask_params()
{ {
echo echo
@ -450,10 +464,7 @@ ask_params()
echo invalid ip version. should be 4 or 6. echo invalid ip version. should be 4 or 6.
exitp 1 exitp 1
} }
IPTABLES=iptables configure_ip_version
LOCALHOST=127.0.0.1
LOCALHOST_IPT=127.0.0.1
[ "$IPV" = 6 ] && { IPTABLES=ip6tables; LOCALHOST=::1; LOCALHOST_IPT=[::1]; }
ENABLE_HTTP=1 ENABLE_HTTP=1
ask_yes_no_var ENABLE_HTTP "check http" ask_yes_no_var ENABLE_HTTP "check http"
@ -576,10 +587,12 @@ sigint()
# make sure we are not in a middle state that impacts connectivity # make sure we are not in a middle state that impacts connectivity
echo echo
echo terminating... echo terminating...
tpws_ipt_unprepare 80 [ -n "$IPV" ] && {
tpws_ipt_unprepare 443 tpws_ipt_unprepare 80
nfqws_ipt_unprepare 80 tpws_ipt_unprepare 443
nfqws_ipt_unprepare 443 nfqws_ipt_unprepare 80
nfqws_ipt_unprepare 443
}
killall nfqws tpws 2>/dev/null killall nfqws tpws 2>/dev/null
exitp 1 exitp 1
} }