1 files changed, 36 insertions, 27 deletions

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 8a8ee18..7c3bc4b 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 */
@@ -138,6 +139,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[MAX_OIDS];
@@ -200,8 +202,8 @@ main (int argc, char **argv)
         bindtextdomain (PACKAGE, LOCALEDIR);
         textdomain (PACKAGE);
 
-        labels = malloc (labels_size);
-        unitv = malloc (unitv_size);
+        labels = malloc (labels_size * sizeof(*labels));
+        unitv = malloc (unitv_size * sizeof(*unitv));
         for (i = 0; i < MAX_OIDS; i++)
                 eval_method[i] = CHECK_UNDEF;
 
@@ -274,35 +276,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);
@@ -429,7 +432,7 @@ main (int argc, char **argv)
                         ptr = strpbrk (show, "0123456789");
                         if (ptr == NULL)
                                 die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show);
-                        response_value[i] = strtod (ptr, NULL);
+                        response_value[i] = strtod (ptr, NULL) + offset;
 
                         if(calculate_rate) {
                                 if (previous_state!=NULL) {
@@ -618,6 +621,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}
@@ -768,9 +772,9 @@ process_arguments (int argc, char **argv)
                         break;
                 case 'l':                                                                       /* label */
                         nlabels++;
-                        if (nlabels >= labels_size) {
+                        if (nlabels > labels_size) {
                                 labels_size += 8;
-                                labels = realloc (labels, labels_size);
+                                labels = realloc (labels, labels_size * sizeof(*labels));
                                 if (labels == NULL)
                                         die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
                         }
@@ -780,13 +784,13 @@ process_arguments (int argc, char **argv)
                         if (ptr[0] == '\'')
                                 labels[nlabels - 1] = ptr + 1;
                         while (ptr && (ptr = nextarg (ptr))) {
-                                if (nlabels >= labels_size) {
+                                nlabels++;
+                                if (nlabels > labels_size) {
                                         labels_size += 8;
-                                        labels = realloc (labels, labels_size);
+                                        labels = realloc (labels, labels_size * sizeof(*labels));
                                         if (labels == NULL)
                                                 die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
                                 }
-                                nlabels++;
                                 ptr = thisarg (ptr);
                                 if (ptr[0] == '\'')
                                         labels[nlabels - 1] = ptr + 1;
@@ -797,9 +801,9 @@ process_arguments (int argc, char **argv)
                 case 'u':                                                                       /* units */
                         units = optarg;
                         nunits++;
-                        if (nunits >= unitv_size) {
+                        if (nunits > unitv_size) {
                                 unitv_size += 8;
-                                unitv = realloc (unitv, unitv_size);
+                                unitv = realloc (unitv, unitv_size * sizeof(*unitv));
                                 if (unitv == NULL)
                                         die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
                         }
@@ -809,9 +813,9 @@ process_arguments (int argc, char **argv)
                         if (ptr[0] == '\'')
                                 unitv[nunits - 1] = ptr + 1;
                         while (ptr && (ptr = nextarg (ptr))) {
-                                if (nunits >= unitv_size) {
+                                if (nunits > unitv_size) {
                                         unitv_size += 8;
-                                        unitv = realloc (unitv, unitv_size);
+                                        unitv = realloc (unitv, unitv_size * sizeof(*unitv));
                                         if (units == NULL)
                                                 die (STATE_UNKNOWN, _("Could not realloc() units\n"));
                                 }
@@ -832,6 +836,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;
@@ -1080,6 +1087,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");