check_icmp: Remove signal handling and timeouts

The timeout option was redundant in that the runtime
of check_icmp was always limited by the input parameters
and therefore timeout gets removed with this commit to
avoid that confusion.

The rest of the signal handlings was removed too, since
the added complexity does not provide sufficient returns.
If check_icmp gets a signal, it now dies like most other
programs instead of trying to save some things and return a
(arguably wrong) result.

4 files changed, 16 insertions, 53 deletions

diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 7360b435..55405b8a 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -431,8 +431,7 @@ check_icmp_config_wrapper process_arguments(int argc, char **argv) {
                                 }
                                 break;
                         case 't':
-                                timeout = (unsigned int)strtoul(optarg, NULL, 0);
-                                // TODO die here and complain about wrong input
+                                // WARNING Deprecated since execution time is determined by the other factors
                                 break;
                         case 'H': {
                                 add_host_wrapper host_add_result =
@@ -895,21 +894,6 @@ int main(int argc, char **argv) {
                 }
         }
 
-        struct sigaction sig_action;
-        sig_action.sa_handler = NULL;
-        sig_action.sa_sigaction = check_icmp_timeout_handler;
-        sigfillset(&sig_action.sa_mask);
-        sig_action.sa_flags = SA_NODEFER | SA_RESTART | SA_SIGINFO;
-
-        sigaction(SIGINT, &sig_action, NULL);
-        sigaction(SIGHUP, &sig_action, NULL);
-        sigaction(SIGTERM, &sig_action, NULL);
-        sigaction(SIGALRM, &sig_action, NULL);
-        if (debug) {
-                printf("Setting alarm timeout to %u seconds\n", timeout);
-        }
-        alarm(timeout);
-
         /* make sure we don't wait any longer than necessary */
         struct timeval prog_start;
         gettimeofday(&prog_start, NULL);
diff --git a/plugins-root/check_icmp.d/check_icmp_helpers.c b/plugins-root/check_icmp.d/check_icmp_helpers.c
index 7a936cc9..ec786305 100644
--- a/plugins-root/check_icmp.d/check_icmp_helpers.c
+++ b/plugins-root/check_icmp.d/check_icmp_helpers.c
@@ -132,22 +132,3 @@ unsigned int ping_target_list_append(ping_target *list, ping_target *elem) {
 
         return result;
 }
-
-void check_icmp_timeout_handler(int signal, siginfo_t *info, void *ucontext) {
-        // Ignore unused arguments
-        (void)info;
-        (void)ucontext;
-        mp_subcheck timeout_sc = mp_subcheck_init();
-        timeout_sc = mp_set_subcheck_state(timeout_sc, socket_timeout_state);
-
-        if (signal == SIGALRM) {
-                xasprintf(&timeout_sc.output, _("timeout after %d seconds\n"), timeout);
-        } else {
-                xasprintf(&timeout_sc.output, _("timeout after %d seconds\n"), timeout);
-        }
-
-        mp_check overall = mp_check_init();
-        mp_add_subcheck_to_check(&overall, timeout_sc);
-
-        mp_exit(overall);
-}
diff --git a/plugins-root/check_icmp.d/check_icmp_helpers.h b/plugins-root/check_icmp.d/check_icmp_helpers.h
index 1b9372ce..dc6ea40b 100644
--- a/plugins-root/check_icmp.d/check_icmp_helpers.h
+++ b/plugins-root/check_icmp.d/check_icmp_helpers.h
@@ -66,5 +66,3 @@ typedef struct {
 
 ping_target_create_wrapper ping_target_create(struct sockaddr_storage address);
 unsigned int ping_target_list_append(ping_target *list, ping_target *elem);
-
-void check_icmp_timeout_handler(int, siginfo_t *, void *);
diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t
index 2c1d12e6..e68617cd 100644
--- a/plugins-root/t/check_icmp.t
+++ b/plugins-root/t/check_icmp.t
@@ -33,12 +33,12 @@ my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
 my $res;
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -w 10000ms,100% -c 10000ms,100%"
+        "$sudo ./check_icmp -H $host_responsive -w 100ms,100% -c 100ms,100%"
         );
 is( $res->return_code, 0, "Syntax ok" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -w 0ms,0% -c 10000ms,100%"
+        "$sudo ./check_icmp -H $host_responsive -w 0ms,0% -c 100ms,100%"
         );
 is( $res->return_code, 1, "Syntax ok, with forced warning" );
 
@@ -48,32 +48,32 @@ $res = NPTest->testCmd(
 is( $res->return_code, 2, "Syntax ok, with forced critical" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -t 2"
+        "$sudo ./check_icmp -H $host_nonresponsive -w 100ms,100% -c 100ms,100%"
         );
 is( $res->return_code, 2, "Timeout - host nonresponsive" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -w 10000ms,100% -c 10000ms,100%"
+        "$sudo ./check_icmp -w 100ms,100% -c 100ms,100%"
         );
 is( $res->return_code, 3, "No hostname" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 0 -t 2"
+        "$sudo ./check_icmp -H $host_nonresponsive -w 100ms,100% -c 100ms,100% -n 1 -m 0"
         );
 is( $res->return_code, 0, "One host nonresponsive - zero required" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 1 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 100ms,100% -c 100ms,100% -n 1 -m 1"
         );
 is( $res->return_code, 0, "One of two host nonresponsive - one required" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 2"
+        "$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 100ms,100% -c 100ms,100% -n 1 -m 2"
         );
 is( $res->return_code, 2, "One of two host nonresponsive - two required" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -s 127.0.15.15 -w 10000ms,100% -c 10000ms,100% -n 1 -m 2"
+        "$sudo ./check_icmp -H $host_responsive -s 127.0.15.15 -w 100ms,100% -c 100ms,100% -n 1 -m 2"
         );
 is( $res->return_code, 0, "IPv4 source_ip accepted" );
 
@@ -83,35 +83,35 @@ $res = NPTest->testCmd(
 is( $res->return_code, 0, "Try max packet size" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -R 100,100 -n 1 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -R 100,100 -n 1"
         );
 is( $res->return_code, 0, "rta works" );
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -P 80,90 -n 1 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -P 80,90 -n 1"
         );
 is( $res->return_code, 0, "pl works" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -J 80,90 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -J 80,90"
         );
 is( $res->return_code, 0, "jitter works" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -M 4,3 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -M 4,3"
         );
 is( $res->return_code, 0, "mos works" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -S 80,70 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -S 80,70"
         );
 is( $res->return_code, 0, "score works" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -O -t 2"
+        "$sudo ./check_icmp -H $host_responsive -O"
         );
 is( $res->return_code, 0, "order works" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -O -S 80,70 -M 4,3 -J 80,90 -P 80,90 -R 100,100 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -O -S 80,70 -M 4,3 -J 80,90 -P 80,90 -R 100,100"
         );
 is( $res->return_code, 0, "order works" );