From: David Schweikert Date: Tue, 28 Jul 2020 06:24:08 +0000 (+0200) Subject: Merge branch 'develop' of github.com:schweikert/fping into develop X-Git-Url: https://git.gsnw.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac3eb34ad7773190878b603d49ef54e77dad8d6a;p=fping.git Merge branch 'develop' of github.com:schweikert/fping into develop --- ac3eb34ad7773190878b603d49ef54e77dad8d6a diff --cc src/fping.c index 5f83954,1efd4f8..605e834 --- a/src/fping.c +++ b/src/fping.c @@@ -1359,10 -1391,15 +1375,15 @@@ void main_loop( break; } + /* end of loop was requested by interrupt signal handler */ + if (finish_requested) { + break; + } + /* Receive replies */ /* (this is what sleeps during each loop iteration) */ - dbg_printf("waiting up to %ld ms\n", wait_time/100); - if (wait_for_reply(wait_time)) { + dbg_printf("waiting up to %ld ms\n", wait_time_ns / 1000000); + if (wait_for_reply(wait_time_ns)) { while (wait_for_reply(0)) ; /* process other replies in the queue */ }