1 files changed, 5 insertions, 47 deletions

diff --git a/plugins/check_snmp.d/config.h b/plugins/check_snmp.d/config.h
index e2e1d6c2..ca624a81 100644
--- a/plugins/check_snmp.d/config.h
+++ b/plugins/check_snmp.d/config.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "states.h"
 #include "thresholds.h"
-#include "utils_base.h"
+#include "states.h"
 #include <stdlib.h>
 #include <stdbool.h>
 #include <regex.h>
+#include "../common.h"
 
 // defines for snmp libs
 #define u_char  unsigned char
@@ -18,12 +18,8 @@
 #include <net-snmp/library/snmp.h>
 #include <net-snmp/session_api.h>
 
-const int DEFAULT_PROTOCOL = SNMP_VERSION_1;
-const char DEFAULT_PORT[] = "161";
-const char DEFAULT_OUTPUT_DELIMITER[] = " ";
-const int DEFAULT_RETRIES = 5;
-
-const int RANDOM_STATE_DATA_LENGTH_PREDICTION = 1024;
+#define DEFAULT_PORT "161"
+#define DEFAULT_RETRIES 5
 
 typedef struct eval_method {
         bool crit_string;
@@ -35,13 +31,9 @@ typedef struct check_snmp_test_unit {
         char *label;
         char *unit_value;
         eval_method eval_mthd;
+        mp_thresholds threshold;
 } check_snmp_test_unit;
 
-check_snmp_test_unit check_snmp_test_unit_init() {
-        check_snmp_test_unit tmp = {};
-        return tmp;
-}
-
 typedef struct check_snmp_config {
         // SNMP session to use
         struct snmp_session snmp_session;
@@ -55,7 +47,6 @@ typedef struct check_snmp_config {
 
         check_snmp_test_unit *test_units;
         size_t num_of_test_units;
-        mp_thresholds thresholds;
 
         // State if an empty value is encountered
         mp_state_enum nulloid_result;
@@ -72,36 +63,3 @@ typedef struct check_snmp_config {
         // Modify output
         bool use_perf_data_labels_from_input;
 } check_snmp_config;
-
-check_snmp_config check_snmp_config_init() {
-        check_snmp_config tmp = {
-                .use_getnext = false,
-
-                .ignore_mib_parsing_errors = false,
-                .need_mibs = false,
-
-                .test_units = NULL,
-                .num_of_test_units = 0,
-                .thresholds = mp_thresholds_init(),
-
-                .nulloid_result = STATE_UNKNOWN, // state to return if no result for query
-
-                .invert_search = true,
-                .regex_cmp_value = {},
-                .string_cmp_value = "",
-
-                .multiplier = 1.0,
-                .offset = 0,
-
-                .use_perf_data_labels_from_input = false,
-        };
-
-        snmp_sess_init(&tmp.snmp_session);
-
-        tmp.snmp_session.retries = DEFAULT_RETRIES;
-        tmp.snmp_session.version = DEFAULT_SNMP_VERSION;
-        tmp.snmp_session.securityLevel = SNMP_SEC_LEVEL_NOAUTH;
-        tmp.snmp_session.community = (unsigned char *)"public";
-        tmp.snmp_session.community_len = strlen("public");
-        return tmp;
-}