1 files changed, 32 insertions, 21 deletions

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index c73562b..9ca845d 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -63,6 +63,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #define L_CALCULATE_RATE CHAR_MAX+1
 #define L_RATE_MULTIPLIER CHAR_MAX+2
 #define L_INVERT_SEARCH CHAR_MAX+3
+#define L_OFFSET CHAR_MAX+4
 
 /* Gobble to string - stop incrementing c when c[0] match one of the
  * characters in s */
@@ -142,6 +143,7 @@ char *output_delim;
 char *miblist = NULL;
 int needmibs = FALSE;
 int calculate_rate = 0;
+double offset = 0.0;
 int rate_multiplier = 1;
 state_data *previous_state;
 double *previous_value;
@@ -153,16 +155,18 @@ static char *fix_snmp_range(char *th)
 {
         double left, right;
         char *colon, *ret;
-        if (!(colon = strchr(th, ':')))
+
+        if ((colon = strchr(th, ':')) == NULL || *(colon + 1) == '\0')
                 return th;
-        *colon = 0;
 
         left = strtod(th, NULL);
         right = strtod(colon + 1, NULL);
-        if (right >= left) {
+        if (right >= left)
                 return th;
-        }
-        ret = malloc(strlen(th) + strlen(colon + 1) + 2);
+
+        if ((ret = malloc(strlen(th) + 2)) == NULL)
+                die(STATE_UNKNOWN, _("Cannot malloc"));
+        *colon = '\0';
         sprintf(ret, "@%s:%s", colon + 1, th);
         free(th);
         return ret;
@@ -292,35 +296,36 @@ main (int argc, char **argv)
                 snmpcmd = strdup (PATH_TO_SNMPGET);
         }
 
-        /* 9 arguments to pass before authpriv options + 1 for host and numoids. Add one for terminating NULL */
-        command_line = calloc (9 + numauthpriv + 1 + numoids + 1, sizeof (char *));
+        /* 10 arguments to pass before authpriv options + 1 for host and numoids. Add one for terminating NULL */
+        command_line = calloc (10 + numauthpriv + 1 + numoids + 1, sizeof (char *));
         command_line[0] = snmpcmd;
-        command_line[1] = strdup ("-t");
-        xasprintf (&command_line[2], "%d", timeout_interval);
-        command_line[3] = strdup ("-r");
-        xasprintf (&command_line[4], "%d", retries);
-        command_line[5] = strdup ("-m");
-        command_line[6] = strdup (miblist);
-        command_line[7] = "-v";
-        command_line[8] = strdup (proto);
+        command_line[1] = strdup ("-Le");
+        command_line[2] = strdup ("-t");
+        xasprintf (&command_line[3], "%d", timeout_interval);
+        command_line[4] = strdup ("-r");
+        xasprintf (&command_line[5], "%d", retries);
+        command_line[6] = strdup ("-m");
+        command_line[7] = strdup (miblist);
+        command_line[8] = "-v";
+        command_line[9] = strdup (proto);
 
         for (i = 0; i < numauthpriv; i++) {
-                command_line[9 + i] = authpriv[i];
+                command_line[10 + i] = authpriv[i];
         }
 
-        xasprintf (&command_line[9 + numauthpriv], "%s:%s", server_address, port);
+        xasprintf (&command_line[10 + numauthpriv], "%s:%s", server_address, port);
 
         /* This is just for display purposes, so it can remain a string */
-        xasprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s",
+        xasprintf(&cl_hidden_auth, "%s -Le -t %d -r %d -m %s -v %s %s %s:%s",
                 snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[authpriv]",
                 server_address, port);
 
         for (i = 0; i < numoids; i++) {
-                command_line[9 + numauthpriv + 1 + i] = oids[i];
+                command_line[10 + numauthpriv + 1 + i] = oids[i];
                 xasprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);   
         }
 
-        command_line[9 + numauthpriv + 1 + numoids] = NULL;
+        command_line[10 + numauthpriv + 1 + numoids] = NULL;
 
         if (verbose)
                 printf ("%s\n", cl_hidden_auth);
@@ -451,7 +456,7 @@ main (int argc, char **argv)
                                 response_size += OID_COUNT_STEP;
                                 response_value = realloc(response_value, response_size * sizeof(*response_value));
                         }
-                        response_value[i] = strtod (ptr, NULL);
+                        response_value[i] = strtod (ptr, NULL) + offset;
 
                         if(calculate_rate) {
                                 if (previous_state!=NULL) {
@@ -640,6 +645,7 @@ process_arguments (int argc, char **argv)
                 {"next", no_argument, 0, 'n'},
                 {"rate", no_argument, 0, L_CALCULATE_RATE},
                 {"rate-multiplier", required_argument, 0, L_RATE_MULTIPLIER},
+                {"offset", required_argument, 0, L_OFFSET},
                 {"invert-search", no_argument, 0, L_INVERT_SEARCH},
                 {"perf-oids", no_argument, 0, 'O'},
                 {0, 0, 0, 0}
@@ -872,6 +878,9 @@ process_arguments (int argc, char **argv)
                         if(!is_integer(optarg)||((rate_multiplier=atoi(optarg))<=0))
                                 usage2(_("Rate multiplier must be a positive integer"),optarg);
                         break;
+                case L_OFFSET:
+                        offset=strtod(optarg,NULL);
+                        break;
                 case L_INVERT_SEARCH:
                         invert_search=1;
                         break;
@@ -1120,6 +1129,8 @@ print_help (void)
         printf ("    %s\n", _("Enable rate calculation. See 'Rate Calculation' below"));
         printf (" %s\n", "--rate-multiplier");
         printf ("    %s\n", _("Converts rate per second. For example, set to 60 to convert to per minute"));
+        printf (" %s\n", "--offset=OFFSET");
+        printf ("    %s\n", _("Add/substract the specified OFFSET to numeric sensor data"));
 
         /* Tests Against Strings */
         printf (" %s\n", "-s, --string=STRING");