diff options
| author | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2025-09-08 15:57:06 +0200 |
|---|---|---|
| committer | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2025-09-08 15:57:06 +0200 |
| commit | 87195f5511bf18db2a64f71ea9783ebbfb33c3a5 (patch) | |
| tree | 491157b89647d73ed6acb0e4e2ae7cdf7fffb01c /lib/utils_base.h | |
| parent | 1aefb1f9df5268ccbcd3ce38f5527ebca3896db6 (diff) | |
| download | monitoring-plugins-87195f5511bf18db2a64f71ea9783ebbfb33c3a5.tar.gz | |
check_snmp: refactoring + fixes
This commit moves the state retention logic to check_snmp as it is only
used there and I do not want it to be used at all, so it doesn't get a
place in the lib.
Otherwise this adapts tests and fixes the rate computing in the
refactored version of check_snmp.
Also fixes some bugs detected with the tests
Diffstat (limited to 'lib/utils_base.h')
| -rw-r--r-- | lib/utils_base.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/lib/utils_base.h b/lib/utils_base.h index 123066f8..f1c99a54 100644 --- a/lib/utils_base.h +++ b/lib/utils_base.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include "./perfdata.h" | 8 | #include "./perfdata.h" |
| 9 | #include "./thresholds.h" | 9 | #include "./thresholds.h" |
| 10 | 10 | ||
| 11 | |||
| 12 | #ifndef USE_OPENSSL | 11 | #ifndef USE_OPENSSL |
| 13 | # include "sha256.h" | 12 | # include "sha256.h" |
| 14 | #endif | 13 | #endif |
| @@ -26,25 +25,8 @@ | |||
| 26 | #define OUTSIDE 0 | 25 | #define OUTSIDE 0 |
| 27 | #define INSIDE 1 | 26 | #define INSIDE 1 |
| 28 | 27 | ||
| 29 | #define NP_STATE_FORMAT_VERSION 1 | ||
| 30 | |||
| 31 | typedef struct state_data_struct { | ||
| 32 | time_t time; | ||
| 33 | void *data; | ||
| 34 | int length; /* Of binary data */ | ||
| 35 | } state_data; | ||
| 36 | |||
| 37 | typedef struct state_key_struct { | ||
| 38 | char *name; | ||
| 39 | char *plugin_name; | ||
| 40 | int data_version; | ||
| 41 | char *_filename; | ||
| 42 | state_data *state_data; | ||
| 43 | } state_key; | ||
| 44 | |||
| 45 | typedef struct np_struct { | 28 | typedef struct np_struct { |
| 46 | char *plugin_name; | 29 | char *plugin_name; |
| 47 | state_key *state; | ||
| 48 | int argc; | 30 | int argc; |
| 49 | char **argv; | 31 | char **argv; |
| 50 | } monitoring_plugin; | 32 | } monitoring_plugin; |
| @@ -100,10 +82,6 @@ char *np_extract_value(const char *, const char *, char); | |||
| 100 | */ | 82 | */ |
| 101 | int mp_translate_state(char *); | 83 | int mp_translate_state(char *); |
| 102 | 84 | ||
| 103 | void np_enable_state(char *, int); | ||
| 104 | state_data *np_state_read(void); | ||
| 105 | void np_state_write_string(time_t, char *); | ||
| 106 | |||
| 107 | void np_init(char *, int argc, char **argv); | 85 | void np_init(char *, int argc, char **argv); |
| 108 | void np_set_args(int argc, char **argv); | 86 | void np_set_args(int argc, char **argv); |
| 109 | void np_cleanup(void); | 87 | void np_cleanup(void); |
