Merge branch 'master' into fix/shellcheckrefs/pull/1459/head

1 files changed, 27 insertions, 5 deletions

diff --git a/lib/utils_base.c b/lib/utils_base.c
index 3822bcf..08fa215 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -37,6 +37,9 @@
 
 monitoring_plugin *this_monitoring_plugin=NULL;
 
+unsigned int timeout_state = STATE_CRITICAL;
+unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
+
 int _np_state_read_file(FILE *);
 
 void np_init( char *plugin_name, int argc, char **argv ) {
@@ -87,10 +90,13 @@ void _get_monitoring_plugin( monitoring_plugin **pointer ){
 void
 die (int result, const char *fmt, ...)
 {
-        va_list ap;
-        va_start (ap, fmt);
-        vprintf (fmt, ap);
-        va_end (ap);
+        if(fmt!=NULL) {
+                va_list ap;
+                va_start (ap, fmt);
+                vprintf (fmt, ap);
+                va_end (ap);
+        }
+
         if(this_monitoring_plugin!=NULL) {
                 np_cleanup();
         }
@@ -122,6 +128,7 @@ range
         temp_range->end = 0;
         temp_range->end_infinity = TRUE;
         temp_range->alert_on = OUTSIDE;
+        temp_range->text = strdup(str);
 
         if (str[0] == '@') {
                 temp_range->alert_on = INSIDE;
@@ -356,6 +363,22 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
         return value;
 }
 
+const char *
+state_text (int result)
+{
+        switch (result) {
+        case STATE_OK:
+                return "OK";
+        case STATE_WARNING:
+                return "WARNING";
+        case STATE_CRITICAL:
+                return "CRITICAL";
+        case STATE_DEPENDENT:
+                return "DEPENDENT";
+        default:
+                return "UNKNOWN";
+        }
+}
 
 /*
  * Read a string representing a state (ok, warning... or numeric: 0, 1) and
@@ -684,4 +707,3 @@ void np_state_write_string(time_t data_time, char *data_string) {
 
         np_free(temp_file);
 }
-