check_snmp: Remove that is_numeric madness

Original patch to make Timeticks works as in check_snmp v1.4.14, it turns
out is_numeric isn't so useful and treating all types as numeric works
best for backwards-compatibility. This is how it used to work in 1.4.14.

As a special case, I also make calculate_rate look up for numeric values
as it would otherwise return the last value instead.

1 files changed, 4 insertions, 8 deletions

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 9d91942..cb7fb7a 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -170,7 +170,6 @@ main (int argc, char **argv)
         char *state_string=NULL;
         size_t response_length, current_length, string_length;
         char *temp_string=NULL;
-        int is_numeric=0;
         time_t current_time;
         double temp_double;
         time_t duration;
@@ -336,29 +335,24 @@ main (int argc, char **argv)
                 /* We strip out the datatype indicator for PHBs */
                 if (strstr (response, "Gauge: ")) {
                         show = strstr (response, "Gauge: ") + 7;
-                        is_numeric++;
                 } 
                 else if (strstr (response, "Gauge32: ")) {
                         show = strstr (response, "Gauge32: ") + 9;
-                        is_numeric++;
                 } 
                 else if (strstr (response, "Counter32: ")) {
                         show = strstr (response, "Counter32: ") + 11;
-                        is_numeric++;
                         is_counter=1;
                         if(!calculate_rate) 
                                 strcpy(type, "c");
                 }
                 else if (strstr (response, "Counter64: ")) {
                         show = strstr (response, "Counter64: ") + 11;
-                        is_numeric++;
                         is_counter=1;
                         if(!calculate_rate)
                                 strcpy(type, "c");
                 }
                 else if (strstr (response, "INTEGER: ")) {
                         show = strstr (response, "INTEGER: ") + 9;
-                        is_numeric++;
                 }
                 else if (strstr (response, "STRING: ")) {
                         show = strstr (response, "STRING: ") + 8;
@@ -410,15 +404,17 @@ main (int argc, char **argv)
                         }
 
                 }
-                else if (strstr (response, "Timeticks: "))
+                else if (strstr (response, "Timeticks: ")) {
                         show = strstr (response, "Timeticks: ");
+                }
                 else
                         show = response;
 
                 iresult = STATE_DEPENDENT;
 
                 /* Process this block for numeric comparisons */
-                 if (is_numeric) {
+                /* Make some special values,like Timeticks numeric only if a threshold is defined */
+                if (thlds[i]->warning || thlds[i]->critical || calculate_rate) {
                         ptr = strpbrk (show, "0123456789");
                         if (ptr == NULL)
                                 die (STATE_UNKNOWN,_("No valid data returned"));