From eafee9c3f91879afa82749fa1d8cd2b0b53a5d5c Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Mon, 28 Apr 2025 22:01:01 +0200 Subject: WIP: check_icmp refactor --- plugins-root/check_icmp.d/check_icmp_helpers.c | 142 +++++++++++++++++++++++++ plugins-root/check_icmp.d/check_icmp_helpers.h | 73 +++++++++++++ 2 files changed, 215 insertions(+) create mode 100644 plugins-root/check_icmp.d/check_icmp_helpers.c create mode 100644 plugins-root/check_icmp.d/check_icmp_helpers.h (limited to 'plugins-root/check_icmp.d') diff --git a/plugins-root/check_icmp.d/check_icmp_helpers.c b/plugins-root/check_icmp.d/check_icmp_helpers.c new file mode 100644 index 00000000..8f6d7362 --- /dev/null +++ b/plugins-root/check_icmp.d/check_icmp_helpers.c @@ -0,0 +1,142 @@ +#include "./config.h" +#include "states.h" +#include +#include +#include "./check_icmp_helpers.h" +#include "../../plugins/netutils.h" + +check_icmp_config check_icmp_config_init() { + check_icmp_config tmp = { + .source_ip = NULL, + + .order_mode = false, + .mos_mode = false, + .rta_mode = false, + .pl_mode = false, + .jitter_mode = false, + .score_mode = false, + + .min_hosts_alive = -1, + .icmp_data_size = DEFAULT_PING_DATA_SIZE, + .icmp_pkt_size = DEFAULT_PING_DATA_SIZE + ICMP_MINLEN, + .pkt_interval = DEFAULT_PKT_INTERVAL, + .target_interval = 0, + .crit = {.pl = DEFAULT_CRIT_PL, + .rta = DEFAULT_CRIT_RTA, + .jitter = 50.0, + .mos = 3.0, + .score = 70.0}, + .warn = {.pl = DEFAULT_WARN_PL, + .rta = DEFAULT_WARN_RTA, + .jitter = 40.0, + .mos = 3.5, + .score = 80.0}, + .pid = {}, + .mode = MODE_RTA, + .timeout = DEFAULT_TIMEOUT, + .ttl = DEFAULT_TTL, + + .packets = DEFAULT_NUMBER_OF_PACKETS, + .number_of_targets = 0, + .hosts = NULL, + }; + return tmp; +} + +ping_target ping_target_init() { + ping_target tmp = { + .rtmin = INFINITY, + + .jitter_min = INFINITY, + + .rta_status = STATE_OK, + .jitter_status = STATE_OK, + .mos_status = STATE_OK, + .score_status = STATE_OK, + .pl_status = STATE_OK, + .order_status = STATE_OK, + }; + + return tmp; +} + +check_icmp_state check_icmp_state_init() { + check_icmp_state tmp = {.icmp_sent = 0, .icmp_lost = 0, .icmp_recv = 0, .targets_down = 0}; + + return tmp; +} + +rta_host_create_wrapper rta_host_create(char *name, struct sockaddr_storage *address) { + struct sockaddr_in *sin; + struct sockaddr_in6 *sin6; + if (address_family == AF_INET) { + sin = (struct sockaddr_in *)address; + } else { + sin6 = (struct sockaddr_in6 *)address; + } + + rta_host_create_wrapper result = { + .errorcode = OK, + }; + + /* disregard obviously stupid addresses + * (I didn't find an ipv6 equivalent to INADDR_NONE) */ + if (((address_family == AF_INET && + (sin->sin_addr.s_addr == INADDR_NONE || sin->sin_addr.s_addr == INADDR_ANY))) || + (address_family == AF_INET6 && (sin6->sin6_addr.s6_addr == in6addr_any.s6_addr))) { + result.errorcode = ERROR; + return result; + } + + // TODO: Maybe add the following back in as a sanity check for the config + // /* no point in adding two identical IP's, so don't. ;) */ + // struct sockaddr_in *host_sin; + // struct sockaddr_in6 *host_sin6; + // struct rta_host *host = host_list; + + // while (host) { + // host_sin = (struct sockaddr_in *)&host->saddr_in; + // host_sin6 = (struct sockaddr_in6 *)&host->saddr_in; + + // if ((address_family == AF_INET && host_sin->sin_addr.s_addr == sin->sin_addr.s_addr) || + // (address_family == AF_INET6 && + // host_sin6->sin6_addr.s6_addr == sin6->sin6_addr.s6_addr)) { + // if (debug) { + // printf("Identical IP already exists. Not adding %s\n", name); + // } + // return -1; + // } + // host = host->next; + // } + + /* add the fresh ip */ + ping_target host = ping_target_init(); + + /* set the values. use calling name for output */ + host.name = strdup(name); + + /* fill out the sockaddr_storage struct */ + if (address_family == AF_INET) { + struct sockaddr_in *host_sin = (struct sockaddr_in *)&host.saddr_in; + host_sin->sin_family = AF_INET; + host_sin->sin_addr.s_addr = sin->sin_addr.s_addr; + } else { + struct sockaddr_in6 *host_sin6 = (struct sockaddr_in6 *)&host.saddr_in; + host_sin6->sin6_family = AF_INET6; + memcpy(host_sin6->sin6_addr.s6_addr, sin6->sin6_addr.s6_addr, + sizeof host_sin6->sin6_addr.s6_addr); + } + + result.host = host; + + return result; +} + +check_icmp_target_container check_icmp_target_container_init() { + check_icmp_target_container tmp = { + .name = NULL, + .number_of_targets = 0, + .target_list = NULL, + }; + return tmp; +} diff --git a/plugins-root/check_icmp.d/check_icmp_helpers.h b/plugins-root/check_icmp.d/check_icmp_helpers.h new file mode 100644 index 00000000..49f720ec --- /dev/null +++ b/plugins-root/check_icmp.d/check_icmp_helpers.h @@ -0,0 +1,73 @@ +#pragma once + +#include "../../lib/states.h" +#include +#include +#include +#include +#include +#include +#include + +typedef struct rta_host { + unsigned short id; /* id in **table, and icmp pkts */ + char *name; /* arg used for adding this 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 */ + 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 */ + + double rta; /* measured RTA */ + double rtmax; /* max rtt */ + double rtmin; /* min rtt */ + + double jitter; /* measured jitter */ + double jitter_max; /* jitter rtt maximum */ + double jitter_min; /* jitter rtt minimum */ + + double EffectiveLatency; + double mos; /* Mean opinion score */ + double score; /* score */ + + unsigned int last_tdiff; + unsigned int last_icmp_seq; /* Last ICMP_SEQ to check out of order pkts */ + unsigned char pl; /* measured packet loss */ + + mp_state_enum rta_status; // check result for RTA checks + mp_state_enum jitter_status; // check result for Jitter checks + mp_state_enum mos_status; // check result for MOS checks + mp_state_enum score_status; // check result for score checks + mp_state_enum pl_status; // check result for packet loss checks + mp_state_enum order_status; // check result for packet order checks + + struct rta_host *next; +} ping_target; + +ping_target ping_target_init(); + +typedef struct { + char *name; + ping_target *target_list; + unsigned int number_of_targets; +} check_icmp_target_container; + +check_icmp_target_container check_icmp_target_container_init(); + +typedef struct { + unsigned int icmp_sent; + unsigned int icmp_recv; + unsigned int icmp_lost; + unsigned short targets_down; +} check_icmp_state; + +check_icmp_state check_icmp_state_init(); + +typedef struct { + int errorcode; + ping_target host; +} rta_host_create_wrapper; + +rta_host_create_wrapper rta_host_create(char *name, struct sockaddr_storage *address); -- cgit v1.2.3-74-g34f1