From a01d522c4cac11eb31510758d42fe744eb21471d Mon Sep 17 00:00:00 2001
From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com>
Date: Sat, 17 May 2025 11:26:54 +0200
Subject:  WIP - check_icmp refactor 6

---
 plugins-root/check_icmp.d/check_icmp_helpers.c | 22 ++++++++++------------
 plugins-root/check_icmp.d/check_icmp_helpers.h | 13 +------------
 plugins-root/check_icmp.d/config.h             |  4 ++++
 3 files changed, 15 insertions(+), 24 deletions(-)

(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
index 58e13581..a2b54c6a 100644
--- a/plugins-root/check_icmp.d/check_icmp_helpers.c
+++ b/plugins-root/check_icmp.d/check_icmp_helpers.c
@@ -10,12 +10,15 @@ unsigned int timeout = DEFAULT_TIMEOUT;
 
 check_icmp_config check_icmp_config_init() {
 	check_icmp_config tmp = {
-		.order_mode = false,
-		.mos_mode = false,
-		.rta_mode = false,
-		.pl_mode = false,
-		.jitter_mode = false,
-		.score_mode = false,
+		.modes =
+			{
+				.order_mode = false,
+				.mos_mode = false,
+				.rta_mode = false,
+				.pl_mode = false,
+				.jitter_mode = false,
+				.score_mode = false,
+			},
 
 		.min_hosts_alive = -1,
 		.crit = {.pl = DEFAULT_CRIT_PL,
@@ -56,12 +59,7 @@ ping_target ping_target_init() {
 
 		.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,
+		.found_out_of_order_packets = false,
 	};
 
 	return tmp;
diff --git a/plugins-root/check_icmp.d/check_icmp_helpers.h b/plugins-root/check_icmp.d/check_icmp_helpers.h
index 3e798f72..68c39b4a 100644
--- a/plugins-root/check_icmp.d/check_icmp_helpers.h
+++ b/plugins-root/check_icmp.d/check_icmp_helpers.h
@@ -20,7 +20,6 @@ typedef struct rta_host {
 	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 */
 
@@ -28,20 +27,10 @@ typedef struct rta_host {
 	double jitter_max; /* jitter rtt maximum */
 	double jitter_min; /* jitter rtt minimum */
 
-	double EffectiveLatency;
-	double mos;   /* Mean opinion score */
-	double score; /* score */
-
 	time_t 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
+	bool found_out_of_order_packets;
 
 	struct rta_host *next;
 } ping_target;
diff --git a/plugins-root/check_icmp.d/config.h b/plugins-root/check_icmp.d/config.h
index 3599c0f0..aa33c991 100644
--- a/plugins-root/check_icmp.d/config.h
+++ b/plugins-root/check_icmp.d/config.h
@@ -48,6 +48,10 @@ typedef struct {
 	bool pl_mode;
 	bool jitter_mode;
 	bool score_mode;
+} check_icmp_mode_switches;
+
+typedef struct {
+	check_icmp_mode_switches modes;
 
 	int min_hosts_alive;
 	check_icmp_threshold crit;
-- 
cgit v1.2.3-74-g34f1