WIP - check_icmp refactor 2

3 files changed, 154 insertions, 3 deletions

diff --git a/plugins-root/check_icmp.d/check_icmp_helpers.c b/plugins-root/check_icmp.d/check_icmp_helpers.c
index 8f6d7362..2efe6e59 100644
--- a/plugins-root/check_icmp.d/check_icmp_helpers.c
+++ b/plugins-root/check_icmp.d/check_icmp_helpers.c
@@ -5,6 +5,9 @@
 #include "./check_icmp_helpers.h"
 #include "../../plugins/netutils.h"
 
+// timeout as a global variable to make it available to the timeout handler
+unsigned int timeout = DEFAULT_TIMEOUT;
+
 check_icmp_config check_icmp_config_init() {
         check_icmp_config tmp = {
                 .source_ip = NULL,
@@ -33,11 +36,14 @@ check_icmp_config check_icmp_config_init() {
                                  .score = 80.0},
                 .pid = {},
                 .mode = MODE_RTA,
-                .timeout = DEFAULT_TIMEOUT,
                 .ttl = DEFAULT_TTL,
 
                 .packets = DEFAULT_NUMBER_OF_PACKETS,
+
                 .number_of_targets = 0,
+                .targets = NULL,
+
+                .number_of_hosts = 0,
                 .hosts = NULL,
         };
         return tmp;
@@ -140,3 +146,43 @@ check_icmp_target_container check_icmp_target_container_init() {
         };
         return tmp;
 }
+
+unsigned int ping_target_list_append(ping_target *list, ping_target *elem) {
+        if (elem == NULL || list == NULL) {
+                return 0;
+        }
+
+        while (list->next != NULL) {
+                list = list->next;
+        }
+
+        list->next = elem;
+
+        unsigned int result = 1;
+
+        while (elem->next != NULL) {
+                result++;
+                elem = elem->next;
+        }
+
+        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 49f720ec..7e8a4d9f 100644
--- a/plugins-root/check_icmp.d/check_icmp_helpers.h
+++ b/plugins-root/check_icmp.d/check_icmp_helpers.h
@@ -15,7 +15,7 @@ typedef struct rta_host {
         char *msg;                                    /* icmp error message, if any */
         struct sockaddr_storage saddr_in;             /* the address of this host */
         struct sockaddr_storage error_addr;           /* stores address of error replies */
-        unsigned long long time_waited;               /* total time waited, in usecs */
+        time_t time_waited;               /* total time waited, in usecs */
         unsigned int icmp_sent, icmp_recv, icmp_lost; /* counters */
         unsigned char icmp_type, icmp_code;           /* type and code from errors */
         unsigned short flags;                         /* control/status flags */
@@ -32,7 +32,7 @@ typedef struct rta_host {
         double mos;   /* Mean opinion score */
         double score; /* score */
 
-        unsigned int last_tdiff;
+        time_t last_tdiff;
         unsigned int last_icmp_seq; /* Last ICMP_SEQ to check out of order pkts */
         unsigned char pl;           /* measured packet loss */
 
@@ -71,3 +71,6 @@ typedef struct {
 } rta_host_create_wrapper;
 
 rta_host_create_wrapper rta_host_create(char *name, 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/check_icmp.d/config.h b/plugins-root/check_icmp.d/config.h
new file mode 100644
index 00000000..deae9bec
--- /dev/null
+++ b/plugins-root/check_icmp.d/config.h
@@ -0,0 +1,102 @@
+#pragma once
+
+#include "../../config.h"
+#include "../../lib/states.h"
+#include <stddef.h>
+#include <netinet/in_systm.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/icmp6.h>
+#include <arpa/inet.h>
+#include "./check_icmp_helpers.h"
+
+/* threshold structure. all values are maximum allowed, exclusive */
+typedef struct threshold {
+        unsigned char pl; /* max allowed packet loss in percent */
+        unsigned int rta; /* roundtrip time average, microseconds */
+        double jitter;    /* jitter time average, microseconds */
+        double mos;       /* MOS */
+        double score;     /* Score */
+} threshold;
+
+typedef struct {
+        char *source_ip;
+
+        bool order_mode;
+        bool mos_mode;
+        bool rta_mode;
+        bool pl_mode;
+        bool jitter_mode;
+        bool score_mode;
+
+        int min_hosts_alive;
+        unsigned short icmp_data_size;
+        unsigned short icmp_pkt_size;
+        unsigned int pkt_interval;
+        unsigned int target_interval;
+        threshold crit;
+        threshold warn;
+        pid_t pid;
+
+        int mode;
+        unsigned long ttl;
+
+        unsigned short packets;
+
+        unsigned short number_of_targets;
+        ping_target *targets;
+
+        unsigned short number_of_hosts;
+        check_icmp_target_container *hosts;
+} check_icmp_config;
+
+check_icmp_config check_icmp_config_init();
+
+/* the data structure */
+typedef struct icmp_ping_data {
+        struct timeval stime; /* timestamp (saved in protocol struct as well) */
+        unsigned short ping_id;
+} icmp_ping_data;
+
+#define MAX_IP_PKT_SIZE        65536 /* (theoretical) max IP packet size */
+#define IP_HDR_SIZE            20
+#define MAX_PING_DATA          (MAX_IP_PKT_SIZE - IP_HDR_SIZE - ICMP_MINLEN)
+#define MIN_PING_DATA_SIZE     sizeof(struct icmp_ping_data)
+#define DEFAULT_PING_DATA_SIZE (MIN_PING_DATA_SIZE + 44)
+
+/* 80 msec packet interval by default */
+#define DEFAULT_PKT_INTERVAL    80000
+#define DEFAULT_TARGET_INTERVAL 0
+
+#define DEFAULT_WARN_RTA 200000
+#define DEFAULT_CRIT_RTA 500000
+#define DEFAULT_WARN_PL  40
+#define DEFAULT_CRIT_PL  80
+
+#define DEFAULT_TIMEOUT 10
+#define DEFAULT_TTL     64
+
+/* the different modes of this program are as follows:
+ * MODE_RTA: send all packets no matter what (mimic check_icmp and check_ping)
+ * MODE_HOSTCHECK: Return immediately upon any sign of life
+ *                 In addition, sends packets to ALL addresses assigned
+ *                 to this host (as returned by gethostbyname() or
+ *                 gethostbyaddr() and expects one host only to be checked at
+ *                 a time.  Therefore, any packet response what so ever will
+ *                 count as a sign of life, even when received outside
+ *                 crit.rta limit. Do not misspell any additional IP's.
+ * MODE_ALL:  Requires packets from ALL requested IP to return OK (default).
+ * MODE_ICMP: implement something similar to check_icmp (MODE_RTA without
+ *            tcp and udp args does this)
+ */
+#define MODE_RTA       0
+#define MODE_HOSTCHECK 1
+#define MODE_ALL       2
+#define MODE_ICMP      3
+
+#define DEFAULT_NUMBER_OF_PACKETS 5
+
+#define PACKET_BACKOFF_FACTOR 1.5
+#define TARGET_BACKOFF_FACTOR 1.5