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.

1 files changed, 1 insertions, 17 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);