1 files changed, 173 insertions, 470 deletions

diff --git a/lib/utils_base.c b/lib/utils_base.c
index f8592f41..28e6dc47 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -1,30 +1,31 @@
 /*****************************************************************************
-*
-* utils_base.c
-*
-* License: GPL
-* Copyright (c) 2006 Monitoring Plugins Development Team
-*
-* Library of useful functions for plugins
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * utils_base.c
+ *
+ * License: GPL
+ * Copyright (c) 2006 - 2024 Monitoring Plugins Development Team
+ *
+ * Library of useful functions for plugins
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "../plugins/common.h"
+#include "states.h"
 #include <stdarg.h>
 #include "utils_base.h"
 #include <ctype.h>
@@ -33,94 +34,87 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#define np_free(ptr) { if(ptr) { free(ptr); ptr = NULL; } }
+#define np_free(ptr)                                                                               \
+        {                                                                                              \
+                if (ptr) {                                                                                 \
+                        free(ptr);                                                                             \
+                        ptr = NULL;                                                                            \
+                }                                                                                          \
+        }
 
-monitoring_plugin *this_monitoring_plugin=NULL;
+monitoring_plugin *this_monitoring_plugin = NULL;
 
-int timeout_state = STATE_CRITICAL;
+mp_state_enum timeout_state = STATE_CRITICAL;
 unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
 
-bool _np_state_read_file(FILE *);
+bool _np_state_read_file(FILE *state_file);
 
-void np_init( char *plugin_name, int argc, char **argv ) {
-        if (this_monitoring_plugin==NULL) {
+void np_init(char *plugin_name, int argc, char **argv) {
+        if (this_monitoring_plugin == NULL) {
                 this_monitoring_plugin = calloc(1, sizeof(monitoring_plugin));
-                if (this_monitoring_plugin==NULL) {
-                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                            strerror(errno));
+                if (this_monitoring_plugin == NULL) {
+                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
                 }
                 this_monitoring_plugin->plugin_name = strdup(plugin_name);
-                if (this_monitoring_plugin->plugin_name==NULL)
+                if (this_monitoring_plugin->plugin_name == NULL) {
                         die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
+                }
                 this_monitoring_plugin->argc = argc;
                 this_monitoring_plugin->argv = argv;
         }
 }
 
-void np_set_args( int argc, char **argv ) {
-        if (this_monitoring_plugin==NULL)
+void np_set_args(int argc, char **argv) {
+        if (this_monitoring_plugin == NULL) {
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
+        }
 
         this_monitoring_plugin->argc = argc;
         this_monitoring_plugin->argv = argv;
 }
 
-
-void np_cleanup() {
-        if (this_monitoring_plugin!=NULL) {
-                if(this_monitoring_plugin->state!=NULL) {
-                        if(this_monitoring_plugin->state->state_data) {
-                                np_free(this_monitoring_plugin->state->state_data->data);
-                                np_free(this_monitoring_plugin->state->state_data);
-                        }
-                        np_free(this_monitoring_plugin->state->name);
-                        np_free(this_monitoring_plugin->state);
-                }
+void np_cleanup(void) {
+        if (this_monitoring_plugin != NULL) {
                 np_free(this_monitoring_plugin->plugin_name);
                 np_free(this_monitoring_plugin);
         }
-        this_monitoring_plugin=NULL;
+        this_monitoring_plugin = NULL;
 }
 
 /* Hidden function to get a pointer to this_monitoring_plugin for testing */
-void _get_monitoring_plugin( monitoring_plugin **pointer ){
-        *pointer = this_monitoring_plugin;
-}
+void _get_monitoring_plugin(monitoring_plugin **pointer) { *pointer = this_monitoring_plugin; }
 
-void
-die (int result, const char *fmt, ...)
-{
-        if(fmt!=NULL) {
+void die(int result, const char *fmt, ...) {
+        if (fmt != NULL) {
                 va_list ap;
-                va_start (ap, fmt);
-                vprintf (fmt, ap);
-                va_end (ap);
+                va_start(ap, fmt);
+                vprintf(fmt, ap);
+                va_end(ap);
         }
 
-        if(this_monitoring_plugin!=NULL) {
+        if (this_monitoring_plugin != NULL) {
                 np_cleanup();
         }
-        exit (result);
+        exit(result);
 }
 
-void set_range_start (range *this, double value) {
+void set_range_start(range *this, double value) {
         this->start = value;
         this->start_infinity = false;
 }
 
-void set_range_end (range *this, double value) {
+void set_range_end(range *this, double value) {
         this->end = value;
         this->end_infinity = false;
 }
 
-range
-*parse_range_string (char *str) {
+range *parse_range_string(char *str) {
         range *temp_range;
         double start;
         double end;
         char *end_str;
 
-        temp_range = (range *) calloc(1, sizeof(range));
+        temp_range = (range *)calloc(1, sizeof(range));
 
         /* Set defaults */
         temp_range->start = 0;
@@ -140,10 +134,10 @@ range
                 if (str[0] == '~') {
                         temp_range->start_infinity = true;
                 } else {
-                        start = strtod(str, NULL);      /* Will stop at the ':' */
+                        start = strtod(str, NULL); /* Will stop at the ':' */
                         set_range_start(temp_range, start);
                 }
-                end_str++;              /* Move past the ':' */
+                end_str++; /* Move past the ':' */
         } else {
                 end_str = str;
         }
@@ -152,8 +146,7 @@ range
                 set_range_end(temp_range, end);
         }
 
-        if (temp_range->start_infinity == true ||
-                temp_range->end_infinity == true ||
+        if (temp_range->start_infinity || temp_range->end_infinity ||
                 temp_range->start <= temp_range->end) {
                 return temp_range;
         }
@@ -162,14 +155,12 @@ range
 }
 
 /* returns 0 if okay, otherwise 1 */
-int
-_set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string)
-{
+int _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string) {
         thresholds *temp_thresholds = NULL;
 
-        if ((temp_thresholds = calloc(1, sizeof(thresholds))) == NULL)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
+        if ((temp_thresholds = calloc(1, sizeof(thresholds))) == NULL) {
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+        }
 
         temp_thresholds->warning = NULL;
         temp_thresholds->critical = NULL;
@@ -190,9 +181,7 @@ _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_st
         return 0;
 }
 
-void
-set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string)
-{
+void set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string) {
         switch (_set_thresholds(my_thresholds, warn_string, critical_string)) {
         case 0:
                 return;
@@ -206,16 +195,18 @@ set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_str
 
 void print_thresholds(const char *threshold_name, thresholds *my_threshold) {
         printf("%s - ", threshold_name);
-        if (! my_threshold) {
+        if (!my_threshold) {
                 printf("Threshold not set");
         } else {
                 if (my_threshold->warning) {
-                        printf("Warning: start=%g end=%g; ", my_threshold->warning->start, my_threshold->warning->end);
+                        printf("Warning: start=%g end=%g; ", my_threshold->warning->start,
+                                   my_threshold->warning->end);
                 } else {
                         printf("Warning not set; ");
                 }
                 if (my_threshold->critical) {
-                        printf("Critical: start=%g end=%g", my_threshold->critical->start, my_threshold->critical->end);
+                        printf("Critical: start=%g end=%g", my_threshold->critical->start,
+                                   my_threshold->critical->end);
                 } else {
                         printf("Critical not set");
                 }
@@ -223,9 +214,38 @@ void print_thresholds(const char *threshold_name, thresholds *my_threshold) {
         printf("\n");
 }
 
+/* Returns true if alert should be raised based on the range, false otherwise */
+bool mp_check_range(const mp_perfdata_value value, const mp_range my_range) {
+        bool is_inside = false;
+
+        if (!my_range.end_infinity && !my_range.start_infinity) {
+                // range:  .........|---inside---|...........
+                // value
+                is_inside = ((cmp_perfdata_value(value, my_range.start) >= 0) &&
+                                         (cmp_perfdata_value(value, my_range.end) <= 0));
+        } else if (!my_range.start_infinity && my_range.end_infinity) {
+                // range:  .........|---inside---------
+                // value
+                is_inside = (cmp_perfdata_value(value, my_range.start) >= 0);
+        } else if (my_range.start_infinity && !my_range.end_infinity) {
+                // range:  -inside--------|....................
+                // value
+                is_inside = (cmp_perfdata_value(value, my_range.end) == -1);
+        } else {
+                // range from -inf to inf, so always inside
+                is_inside = true;
+        }
+
+        if ((is_inside && my_range.alert_on_inside_range == INSIDE) ||
+                (!is_inside && my_range.alert_on_inside_range == OUTSIDE)) {
+                return true;
+        }
+
+        return false;
+}
+
 /* Returns true if alert should be raised based on the range */
-bool check_range(double value, range *my_range)
-{
+bool check_range(double value, range *my_range) {
         bool no = false;
         bool yes = true;
 
@@ -234,73 +254,71 @@ bool check_range(double value, range *my_range)
                 yes = false;
         }
 
-        if (my_range->end_infinity == false && my_range->start_infinity == false) {
+        if (!my_range->end_infinity && !my_range->start_infinity) {
                 if ((my_range->start <= value) && (value <= my_range->end)) {
                         return no;
-                } else {
-                        return yes;
                 }
-        } else if (my_range->start_infinity == false && my_range->end_infinity == true) {
+                return yes;
+        }
+
+        if (!my_range->start_infinity && my_range->end_infinity) {
                 if (my_range->start <= value) {
                         return no;
-                } else {
-                        return yes;
                 }
-        } else if (my_range->start_infinity == true && my_range->end_infinity == false) {
+                return yes;
+        }
+
+        if (my_range->start_infinity && !my_range->end_infinity) {
                 if (value <= my_range->end) {
                         return no;
-                } else {
-                        return yes;
                 }
-        } else {
-                return no;
+                return yes;
         }
+        return no;
 }
 
 /* Returns status */
-int
-get_status(double value, thresholds *my_thresholds)
-{
+mp_state_enum get_status(double value, thresholds *my_thresholds) {
         if (my_thresholds->critical != NULL) {
-                if (check_range(value, my_thresholds->critical) == true) {
+                if (check_range(value, my_thresholds->critical)) {
                         return STATE_CRITICAL;
                 }
         }
         if (my_thresholds->warning != NULL) {
-                if (check_range(value, my_thresholds->warning) == true) {
+                if (check_range(value, my_thresholds->warning)) {
                         return STATE_WARNING;
                 }
         }
         return STATE_OK;
 }
 
-char *np_escaped_string (const char *string) {
+char *np_escaped_string(const char *string) {
         char *data;
-        int i, j=0;
+        int write_index = 0;
         data = strdup(string);
-        for (i=0; data[i]; i++) {
+        for (int i = 0; data[i]; i++) {
                 if (data[i] == '\\') {
-                        switch(data[++i]) {
-                                case 'n':
-                                        data[j++] = '\n';
-                                        break;
-                                case 'r':
-                                        data[j++] = '\r';
-                                        break;
-                                case 't':
-                                        data[j++] = '\t';
-                                        break;
-                                case '\\':
-                                        data[j++] = '\\';
-                                        break;
-                                default:
-                                        data[j++] = data[i];
+                        switch (data[++i]) {
+                        case 'n':
+                                data[write_index++] = '\n';
+                                break;
+                        case 'r':
+                                data[write_index++] = '\r';
+                                break;
+                        case 't':
+                                data[write_index++] = '\t';
+                                break;
+                        case '\\':
+                                data[write_index++] = '\\';
+                                break;
+                        default:
+                                data[write_index++] = data[i];
                         }
                 } else {
-                        data[j++] = data[i];
+                        data[write_index++] = data[i];
                 }
         }
-        data[j] = '\0';
+        data[write_index] = '\0';
         return data;
 }
 
@@ -313,33 +331,43 @@ int np_check_if_root(void) { return (geteuid() == 0); }
  * data strings.
  */
 char *np_extract_value(const char *varlist, const char *name, char sep) {
-        char *tmp=NULL, *value=NULL;
-        int i;
+        char *tmp = NULL;
+        char *value = NULL;
 
-        while (1) {
+        while (true) {
                 /* Strip any leading space */
-                for (; isspace(varlist[0]); varlist++);
+                for (; isspace(varlist[0]); varlist++) {
+                        ;
+                }
 
                 if (strncmp(name, varlist, strlen(name)) == 0) {
                         varlist += strlen(name);
                         /* strip trailing spaces */
-                        for (; isspace(varlist[0]); varlist++);
+                        for (; isspace(varlist[0]); varlist++) {
+                                ;
+                        }
 
                         if (varlist[0] == '=') {
                                 /* We matched the key, go past the = sign */
                                 varlist++;
                                 /* strip leading spaces */
-                                for (; isspace(varlist[0]); varlist++);
+                                for (; isspace(varlist[0]); varlist++) {
+                                        ;
+                                }
 
                                 if ((tmp = index(varlist, sep))) {
                                         /* Value is delimited by a comma */
-                                        if (tmp-varlist == 0) continue;
-                                        value = (char *)calloc(1, tmp-varlist+1);
-                                        strncpy(value, varlist, tmp-varlist);
-                                        value[tmp-varlist] = '\0';
+                                        if (tmp - varlist == 0) {
+                                                continue;
+                                        }
+                                        value = (char *)calloc(1, (unsigned long)(tmp - varlist + 1));
+                                        strncpy(value, varlist, (unsigned long)(tmp - varlist));
+                                        value[tmp - varlist] = '\0';
                                 } else {
                                         /* Value is delimited by a \0 */
-                                        if (strlen(varlist) == 0) continue;
+                                        if (strlen(varlist) == 0) {
+                                                continue;
+                                        }
                                         value = (char *)calloc(1, strlen(varlist) + 1);
                                         strncpy(value, varlist, strlen(varlist));
                                         value[strlen(varlist)] = '\0';
@@ -357,14 +385,16 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
         }
 
         /* Clean-up trailing spaces/newlines */
-        if (value) for (i=strlen(value)-1; isspace(value[i]); i--) value[i] = '\0';
+        if (value) {
+                for (unsigned long i = strlen(value) - 1; isspace(value[i]); i--) {
+                        value[i] = '\0';
+                }
+        }
 
         return value;
 }
 
-const char *
-state_text (int result)
-{
+const char *state_text(mp_state_enum result) {
         switch (result) {
         case STATE_OK:
                 return "OK";
@@ -383,345 +413,18 @@ state_text (int result)
  * Read a string representing a state (ok, warning... or numeric: 0, 1) and
  * return the corresponding STATE_ value or ERROR)
  */
-int mp_translate_state (char *state_text) {
-        if (!strcasecmp(state_text,"OK") || !strcmp(state_text,"0"))
+int mp_translate_state(char *state_text) {
+        if (!strcasecmp(state_text, "OK") || !strcmp(state_text, "0")) {
                 return STATE_OK;
-        if (!strcasecmp(state_text,"WARNING") || !strcmp(state_text,"1"))
-                return STATE_WARNING;
-        if (!strcasecmp(state_text,"CRITICAL") || !strcmp(state_text,"2"))
-                return STATE_CRITICAL;
-        if (!strcasecmp(state_text,"UNKNOWN") || !strcmp(state_text,"3"))
-                return STATE_UNKNOWN;
-        return ERROR;
-}
-
-/*
- * Returns a string to use as a keyname, based on an md5 hash of argv, thus
- * hopefully a unique key per service/plugin invocation. Use the extra-opts
- * parse of argv, so that uniqueness in parameters are reflected there.
- */
-char *_np_state_generate_key() {
-        int i;
-        char **argv = this_monitoring_plugin->argv;
-        char keyname[41];
-        char *p=NULL;
-
-        unsigned char result[256];
-
-#ifdef USE_OPENSSL
-        /*
-         * This code path is chosen if openssl is available (which should be the most common
-         * scenario). Alternatively, the gnulib implementation/
-         *
-         */
-        EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-
-        EVP_DigestInit(ctx, EVP_sha256());
-
-        for(i=0; i<this_monitoring_plugin->argc; i++) {
-                EVP_DigestUpdate(ctx, argv[i], strlen(argv[i]));
-        }
-
-        EVP_DigestFinal(ctx, result, NULL);
-#else
-
-        struct sha256_ctx ctx;
-
-        for(i=0; i<this_monitoring_plugin->argc; i++) {
-                sha256_process_bytes(argv[i], strlen(argv[i]), &ctx);
-        }
-
-        sha256_finish_ctx(&ctx, result);
-#endif // FOUNDOPENSSL
-
-        for (i=0; i<20; ++i) {
-                sprintf(&keyname[2*i], "%02x", result[i]);
         }
-
-        keyname[40]='\0';
-
-        p = strdup(keyname);
-        if(p==NULL) {
-                die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
-        }
-        return p;
-}
-
-void _cleanup_state_data() {
-        if (this_monitoring_plugin->state->state_data!=NULL) {
-                np_free(this_monitoring_plugin->state->state_data->data);
-                np_free(this_monitoring_plugin->state->state_data);
-        }
-}
-
-/*
- * Internal function. Returns either:
- *   envvar NAGIOS_PLUGIN_STATE_DIRECTORY
- *   statically compiled shared state directory
- */
-char* _np_state_calculate_location_prefix(){
-        char *env_dir;
-
-        /* Do not allow passing MP_STATE_PATH in setuid plugins
-         * for security reasons */
-        if (!mp_suid()) {
-                env_dir = getenv("MP_STATE_PATH");
-                if(env_dir && env_dir[0] != '\0')
-                        return env_dir;
-                /* This is the former ENV, for backward-compatibility */
-                env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY");
-                if(env_dir && env_dir[0] != '\0')
-                        return env_dir;
-        }
-
-        return NP_STATE_DIR_PREFIX;
-}
-
-/*
- * Initiatializer for state routines.
- * Sets variables. Generates filename. Returns np_state_key. die with
- * UNKNOWN if exception
- */
-void np_enable_state(char *keyname, int expected_data_version) {
-        state_key *this_state = NULL;
-        char *temp_filename = NULL;
-        char *temp_keyname = NULL;
-        char *p=NULL;
-        int ret;
-
-        if(this_monitoring_plugin==NULL)
-                die(STATE_UNKNOWN, _("This requires np_init to be called"));
-
-        this_state = (state_key *) calloc(1, sizeof(state_key));
-        if(this_state==NULL)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
-
-        if(keyname==NULL) {
-                temp_keyname = _np_state_generate_key();
-        } else {
-                temp_keyname = strdup(keyname);
-                if(temp_keyname==NULL)
-                        die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
-        }
-        /* Die if invalid characters used for keyname */
-        p = temp_keyname;
-        while(*p!='\0') {
-                if(! (isalnum(*p) || *p == '_')) {
-                        die(STATE_UNKNOWN, _("Invalid character for keyname - only alphanumerics or '_'"));
-                }
-                p++;
-        }
-        this_state->name=temp_keyname;
-        this_state->plugin_name=this_monitoring_plugin->plugin_name;
-        this_state->data_version=expected_data_version;
-        this_state->state_data=NULL;
-
-        /* Calculate filename */
-        ret = asprintf(&temp_filename, "%s/%lu/%s/%s",
-            _np_state_calculate_location_prefix(), (unsigned long)geteuid(),
-            this_monitoring_plugin->plugin_name, this_state->name);
-        if (ret < 0)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
-
-        this_state->_filename=temp_filename;
-
-        this_monitoring_plugin->state = this_state;
-}
-
-/*
- * Will return NULL if no data is available (first run). If key currently
- * exists, read data. If state file format version is not expected, return
- * as if no data. Get state data version number and compares to expected.
- * If numerically lower, then return as no previous state. die with UNKNOWN
- * if exceptional error.
- */
-state_data *np_state_read() {
-        state_data *this_state_data=NULL;
-        FILE *statefile;
-        bool rc = false;
-
-        if(this_monitoring_plugin==NULL)
-                die(STATE_UNKNOWN, _("This requires np_init to be called"));
-
-        /* Open file. If this fails, no previous state found */
-        statefile = fopen( this_monitoring_plugin->state->_filename, "r" );
-        if(statefile!=NULL) {
-
-                this_state_data = (state_data *) calloc(1, sizeof(state_data));
-                if(this_state_data==NULL)
-                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                            strerror(errno));
-
-                this_state_data->data=NULL;
-                this_monitoring_plugin->state->state_data = this_state_data;
-
-                rc = _np_state_read_file(statefile);
-
-                fclose(statefile);
-        }
-
-        if(!rc) {
-                _cleanup_state_data();
-        }
-
-        return this_monitoring_plugin->state->state_data;
-}
-
-/*
- * Read the state file
- */
-bool _np_state_read_file(FILE *f) {
-        bool status = false;
-        size_t pos;
-        char *line;
-        int i;
-        int failure=0;
-        time_t current_time, data_time;
-        enum { STATE_FILE_VERSION, STATE_DATA_VERSION, STATE_DATA_TIME, STATE_DATA_TEXT, STATE_DATA_END } expected=STATE_FILE_VERSION;
-
-        time(&current_time);
-
-        /* Note: This introduces a limit of 1024 bytes in the string data */
-        line = (char *) calloc(1, 1024);
-        if(line==NULL)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
-
-        while(!failure && (fgets(line,1024,f))!=NULL){
-                pos=strlen(line);
-                if(line[pos-1]=='\n') {
-                        line[pos-1]='\0';
-                }
-
-                if(line[0] == '#') continue;
-
-                switch(expected) {
-                        case STATE_FILE_VERSION:
-                                i=atoi(line);
-                                if(i!=NP_STATE_FORMAT_VERSION)
-                                        failure++;
-                                else
-                                        expected=STATE_DATA_VERSION;
-                                break;
-                        case STATE_DATA_VERSION:
-                                i=atoi(line);
-                                if(i != this_monitoring_plugin->state->data_version)
-                                        failure++;
-                                else
-                                        expected=STATE_DATA_TIME;
-                                break;
-                        case STATE_DATA_TIME:
-                                /* If time > now, error */
-                                data_time=strtoul(line,NULL,10);
-                                if(data_time > current_time)
-                                        failure++;
-                                else {
-                                        this_monitoring_plugin->state->state_data->time = data_time;
-                                        expected=STATE_DATA_TEXT;
-                                }
-                                break;
-                        case STATE_DATA_TEXT:
-                                this_monitoring_plugin->state->state_data->data = strdup(line);
-                                if(this_monitoring_plugin->state->state_data->data==NULL)
-                                        die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
-                                expected=STATE_DATA_END;
-                                status=true;
-                                break;
-                        case STATE_DATA_END:
-                                ;
-                }
-        }
-
-        np_free(line);
-        return status;
-}
-
-/*
- * If time=NULL, use current time. Create state file, with state format
- * version, default text. Writes version, time, and data. Avoid locking
- * problems - use mv to write and then swap. Possible loss of state data if
- * two things writing to same key at same time.
- * Will die with UNKNOWN if errors
- */
-void np_state_write_string(time_t data_time, char *data_string) {
-        FILE *fp;
-        char *temp_file=NULL;
-        int fd=0, result=0;
-        time_t current_time;
-        char *directories=NULL;
-        char *p=NULL;
-
-        if(data_time==0)
-                time(&current_time);
-        else
-                current_time=data_time;
-
-        /* If file doesn't currently exist, create directories */
-        if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
-                result = asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
-                if(result < 0)
-                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                            strerror(errno));
-
-                for(p=directories+1; *p; p++) {
-                        if(*p=='/') {
-                                *p='\0';
-                                if((access(directories,F_OK)!=0) && (mkdir(directories, S_IRWXU)!=0)) {
-                                        /* Can't free this! Otherwise error message is wrong! */
-                                        /* np_free(directories); */
-                                        die(STATE_UNKNOWN, _("Cannot create directory: %s"), directories);
-                                }
-                                *p='/';
-                        }
-                }
-                np_free(directories);
-        }
-
-        result = asprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename);
-        if(result < 0)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
-
-        if((fd=mkstemp(temp_file))==-1) {
-                np_free(temp_file);
-                die(STATE_UNKNOWN, _("Cannot create temporary filename"));
-        }
-
-        fp=(FILE *)fdopen(fd,"w");
-        if(fp==NULL) {
-                close(fd);
-                unlink(temp_file);
-                np_free(temp_file);
-                die(STATE_UNKNOWN, _("Unable to open temporary state file"));
+        if (!strcasecmp(state_text, "WARNING") || !strcmp(state_text, "1")) {
+                return STATE_WARNING;
         }
-
-        fprintf(fp,"# NP State file\n");
-        fprintf(fp,"%d\n",NP_STATE_FORMAT_VERSION);
-        fprintf(fp,"%d\n",this_monitoring_plugin->state->data_version);
-        fprintf(fp,"%lu\n",current_time);
-        fprintf(fp,"%s\n",data_string);
-
-        fchmod(fd, S_IRUSR | S_IWUSR | S_IRGRP);
-
-        fflush(fp);
-
-        result=fclose(fp);
-
-        fsync(fd);
-
-        if(result!=0) {
-                unlink(temp_file);
-                np_free(temp_file);
-                die(STATE_UNKNOWN, _("Error writing temp file"));
+        if (!strcasecmp(state_text, "CRITICAL") || !strcmp(state_text, "2")) {
+                return STATE_CRITICAL;
         }
-
-        if(rename(temp_file, this_monitoring_plugin->state->_filename)!=0) {
-                unlink(temp_file);
-                np_free(temp_file);
-                die(STATE_UNKNOWN, _("Cannot rename state temp file"));
+        if (!strcasecmp(state_text, "UNKNOWN") || !strcmp(state_text, "3")) {
+                return STATE_UNKNOWN;
         }
-
-        np_free(temp_file);
+        return ERROR;
 }