ForkMaster/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-01-04 07:20:35 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

blockcheck: graceful quit when piping output

Browse Source
This commit is contained in:
bol-van 2021-12-24 13:19:52 +03:00
parent f6f4abb04c
commit 006fd8d760
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
blockcheck.sh
View File

@ -782,11 +782,8 @@ check_dns()
} }
sigint() unprepare_all()
{ {
# make sure we are not in a middle state that impacts connectivity
echo
echo terminating...
[ -n "$IPV" ] && { [ -n "$IPV" ] && {
tpws_ipt_unprepare 80 tpws_ipt_unprepare 80
tpws_ipt_unprepare 443 tpws_ipt_unprepare 443
@ -794,8 +791,23 @@ sigint()
pktws_ipt_unprepare 443 pktws_ipt_unprepare 443
} }
ws_kill ws_kill
}
sigint()
{
# make sure we are not in a middle state that impacts connectivity
echo
echo terminating...
unprepare_all
exitp 1 exitp 1
} }
sigpipe()
{
# make sure we are not in a middle state that impacts connectivity
# must not write anything here to stdout
unprepare_all
exit 1
}
check_system check_system
check_prerequisites check_prerequisites
@ -804,10 +816,12 @@ check_dns
ask_params ask_params
PID= PID=
trap 'sigint' 2 trap sigint INT
trap sigpipe PIPE
[ "$ENABLE_HTTP" = 1 ] && check_domain_http $DOMAIN [ "$ENABLE_HTTP" = 1 ] && check_domain_http $DOMAIN
[ "$ENABLE_HTTPS_TLS12" = 1 ] && check_domain_https_tls12 $DOMAIN [ "$ENABLE_HTTPS_TLS12" = 1 ] && check_domain_https_tls12 $DOMAIN
[ "$ENABLE_HTTPS_TLS13" = 1 ] && check_domain_https_tls13 $DOMAIN [ "$ENABLE_HTTPS_TLS13" = 1 ] && check_domain_https_tls13 $DOMAIN
trap - 2 trap - PIPE
trap - INT
exitp 0 exitp 0