Code

check_snmp now considers strings returned by SNMP that contain just
[nagiosplug.git] / plugins / check_snmp.c
index ca6d7a37b592327bd214cf393953dd404bb5e7dd..9d9194225b4ee8d5f9facffc3e022e7ff198e741 100644 (file)
@@ -1,37 +1,49 @@
-/******************************************************************************
-
- 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 2 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, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id$
-******************************************************************************/
+/*****************************************************************************
+* 
+* Nagios check_snmp plugin
+* 
+* License: GPL
+* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* 
+* Description:
+* 
+* This file contains the check_snmp plugin
+* 
+* Check status of remote machines and obtain system information via SNMP
+* 
+* 
+* 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/>.
+* 
+* 
+*****************************************************************************/
 
 const char *progname = "check_snmp";
-const char *revision = "$Revision$";
-const char *copyright = "1999-2004";
+const char *copyright = "1999-2007";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #include "common.h"
 #include "utils.h"
-#include "popen.h"
+#include "utils_cmd.h"
 
 #define DEFAULT_COMMUNITY "public"
 #define DEFAULT_PORT "161"
 #define DEFAULT_MIBLIST "ALL"
 #define DEFAULT_PROTOCOL "1"
+#define DEFAULT_TIMEOUT 1
+#define DEFAULT_RETRIES 5
 #define DEFAULT_AUTH_PROTOCOL "MD5"
+#define DEFAULT_PRIV_PROTOCOL "DES"
 #define DEFAULT_DELIMITER "="
 #define DEFAULT_OUTPUT_DELIMITER " "
 
@@ -41,100 +53,129 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #define CRIT_PRESENT 1
 #define CRIT_STRING 2
 #define CRIT_REGEX 4
-#define CRIT_GT 8
-#define CRIT_LT 16
-#define CRIT_GE 32
-#define CRIT_LE 64
-#define CRIT_EQ 128
-#define CRIT_NE 256
-#define CRIT_RANGE 512
-#define WARN_PRESENT 1024
-#define WARN_STRING 2048
-#define WARN_REGEX 4096
-#define WARN_GT 8192
-#define WARN_LT 16384
-#define WARN_GE 32768
-#define WARN_LE 65536
-#define WARN_EQ 131072
-#define WARN_NE 262144
-#define WARN_RANGE 524288
+#define WARN_PRESENT 8
+#define WARN_STRING 16
+#define WARN_REGEX 32
 
 #define MAX_OIDS 8
-#define MAX_DELIM_LENGTH 8
+
+/* Longopts only arguments */
+#define L_CALCULATE_RATE CHAR_MAX+1
+#define L_RATE_MULTIPLIER CHAR_MAX+2
+#define L_INVERT_SEARCH CHAR_MAX+3
+
+/* Gobble to string - stop incrementing c when c[0] match one of the
+ * characters in s */
+#define GOBBLE_TOS(c, s) while(c[0]!='\0' && strchr(s, c[0])==NULL) { c++; }
+/* Given c, keep track of backslashes (bk) and double-quotes (dq)
+ * from c[0] */
+#define COUNT_SEQ(c, bk, dq) switch(c[0]) {\
+       case '\\': \
+               if (bk) bk--; \
+               else bk++; \
+               break; \
+       case '"': \
+               if (!dq) { dq++; } \
+               else if(!bk) { dq--; } \
+               else { bk--; } \
+               break; \
+       }
+
+
 
 int process_arguments (int, char **);
 int validate_arguments (void);
-char *clarify_message (char *);
-int check_num (int);
-int lu_getll (unsigned long *, char *);
-int lu_getul (unsigned long *, char *);
 char *thisarg (char *str);
 char *nextarg (char *str);
 void print_usage (void);
 void print_help (void);
 
-#ifdef HAVE_REGEX_H
-#include <regex.h>
+#include "regex.h"
 char regex_expect[MAX_INPUT_BUFFER] = "";
 regex_t preg;
 regmatch_t pmatch[10];
-char timestamp[10] = "";
-char errbuf[MAX_INPUT_BUFFER];
+char errbuf[MAX_INPUT_BUFFER] = "";
+char perfstr[MAX_INPUT_BUFFER] = "| ";
 int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
 int eflags = 0;
 int errcode, excode;
-#endif
 
 char *server_address = NULL;
 char *community = NULL;
-char *authpriv = NULL;
+char **authpriv = NULL;
 char *proto = NULL;
 char *seclevel = NULL;
 char *secname = NULL;
 char *authproto = NULL;
+char *privproto = NULL;
 char *authpasswd = NULL;
 char *privpasswd = NULL;
-char *oid;
+char **oids = NULL;
 char *label;
 char *units;
 char *port;
+char *snmpcmd;
 char string_value[MAX_INPUT_BUFFER] = "";
+int  invert_search=0;
 char **labels = NULL;
 char **unitv = NULL;
 size_t nlabels = 0;
 size_t labels_size = 8;
 size_t nunits = 0;
 size_t unitv_size = 8;
-int verbose = FALSE;
-unsigned long lower_warn_lim[MAX_OIDS];
-unsigned long upper_warn_lim[MAX_OIDS];
-unsigned long lower_crit_lim[MAX_OIDS];
-unsigned long upper_crit_lim[MAX_OIDS];
-unsigned long response_value[MAX_OIDS];
-int check_warning_value = FALSE;
-int check_critical_value = FALSE;
-unsigned long eval_method[MAX_OIDS];
+int numoids = 0;
+int numauthpriv = 0;
+int verbose = 0;
+int usesnmpgetnext = FALSE;
+char *warning_thresholds = NULL;
+char *critical_thresholds = NULL;
+thresholds *thlds[MAX_OIDS];
+double response_value[MAX_OIDS];
+int retries = 0;
+int eval_method[MAX_OIDS];
 char *delimiter;
 char *output_delim;
-char *miblist;
-
+char *miblist = NULL;
+int needmibs = FALSE;
+int calculate_rate = 0;
+int rate_multiplier = 1;
+state_data *previous_state;
+double previous_value[MAX_OIDS];
 
 
 int
 main (int argc, char **argv)
 {
-       int i = 0;
+       int i, len, line, total_oids;
+       unsigned int bk_count = 0, dq_count = 0;
        int iresult = STATE_UNKNOWN;
-       int found = 0;
-       int result = STATE_DEPENDENT;
-       char input_buffer[MAX_INPUT_BUFFER];
-       char *command_line = NULL;
+       int result = STATE_UNKNOWN;
+       int return_code = 0;
+       int external_error = 0;
+       char **command_line = NULL;
+       char *cl_hidden_auth = NULL;
+       char *oidname = NULL;
        char *response = NULL;
+       char *mult_resp = NULL;
        char *outbuff;
-       char *output;
        char *ptr = NULL;
-       char *p2 = NULL;
        char *show = NULL;
+       char *endptr = NULL;
+       char *th_warn=NULL;
+       char *th_crit=NULL;
+       char type[8] = "";
+       output chld_out, chld_err;
+       char *previous_string=NULL;
+       char *ap=NULL;
+       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;
+       char *conv = "12345678";
+       int is_counter=0;
 
        setlocale (LC_ALL, "");
        bindtextdomain (PACKAGE, LOCALEDIR);
@@ -144,133 +185,282 @@ main (int argc, char **argv)
        unitv = malloc (unitv_size);
        for (i = 0; i < MAX_OIDS; i++)
                eval_method[i] = CHECK_UNDEF;
-       i = 0;
 
-       oid = strdup ("");
        label = strdup ("SNMP");
        units = strdup ("");
        port = strdup (DEFAULT_PORT);
        outbuff = strdup ("");
-       output = strdup ("");
-       delimiter = strdup (DEFAULT_DELIMITER);
+       delimiter = strdup (" = ");
        output_delim = strdup (DEFAULT_OUTPUT_DELIMITER);
-       miblist = strdup (DEFAULT_MIBLIST);
+       timeout_interval = DEFAULT_TIMEOUT;
+       retries = DEFAULT_RETRIES;
 
-       if (process_arguments (argc, argv) != TRUE)
-               usage4 (_("Could not parse arguments"));
+       np_init( (char *) progname, argc, argv );
 
-       /* create the command line to execute */
-       asprintf (&command_line, "%s -t 1 -r %d -m %s -v %s %s %s:%s %s",
-                 PATH_TO_SNMPGET, timeout_interval - 1, miblist, proto,
-                 authpriv, server_address, port, oid);
-       if (verbose)
-               printf ("%s\n", command_line);
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
 
-       /* run the command */
-       child_process = spopen (command_line);
-       if (child_process == NULL) {
-               printf (_("Could not open pipe: %s\n"), command_line);
-               exit (STATE_UNKNOWN);
+       np_set_args(argc, argv);
+
+       if (process_arguments (argc, argv) == ERROR)
+               usage4 (_("Could not parse arguments"));
+
+       if(calculate_rate) {
+               if (!strcmp(label, "SNMP"))
+                       label = strdup("SNMP RATE");
+               time(&current_time);
+               i=0;
+               previous_state = np_state_read();
+               if(previous_state!=NULL) {
+                       /* Split colon separated values */
+                       previous_string = strdup((char *) previous_state->data);
+                       while((ap = strsep(&previous_string, ":")) != NULL) {
+                               if(verbose>2)
+                                       printf("State for %d=%s\n", i, ap);
+                               previous_value[i++]=strtod(ap,NULL);
+                       }
+               }
        }
 
-       child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
-       if (child_stderr == NULL) {
-               printf (_("Could not open stderr for %s\n"), command_line);
+       /* Populate the thresholds */
+       th_warn=warning_thresholds;
+       th_crit=critical_thresholds;
+       for (i=0; i<numoids; i++) {
+               char *w = th_warn ? strndup(th_warn, strcspn(th_warn, ",")) : NULL;
+               char *c = th_crit ? strndup(th_crit, strcspn(th_crit, ",")) : NULL;
+               /* Skip empty thresholds, while avoiding segfault */
+               set_thresholds(&thlds[i],
+                              w ? strpbrk(w, NP_THRESHOLDS_CHARS) : NULL,
+                              c ? strpbrk(c, NP_THRESHOLDS_CHARS) : NULL);
+               if (w) {
+                       th_warn=strchr(th_warn, ',');
+                       if (th_warn) th_warn++;
+                       free(w);
+               }
+               if (c) {
+                       th_crit=strchr(th_crit, ',');
+                       if (th_crit) th_crit++;
+                       free(c);
+               }
        }
 
-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
-               asprintf (&output, "%s%s", output, input_buffer);
+       /* Create the command array to execute */
+       if(usesnmpgetnext == TRUE) {
+               snmpcmd = strdup (PATH_TO_SNMPGETNEXT);
+       }else{
+               snmpcmd = strdup (PATH_TO_SNMPGET);
+       }
 
-       if (verbose)
-               printf ("%s\n", output);
+       /* 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 *));
+       command_line[0] = snmpcmd;
+       command_line[1] = strdup ("-t");
+       asprintf (&command_line[2], "%d", timeout_interval);
+       command_line[3] = strdup ("-r");
+       asprintf (&command_line[4], "%d", retries);
+       command_line[5] = strdup ("-m");
+       command_line[6] = strdup (miblist);
+       command_line[7] = "-v";
+       command_line[8] = strdup (proto);
+
+       for (i = 0; i < numauthpriv; i++) {
+               command_line[9 + i] = authpriv[i];
+       }
 
-       ptr = output;
+       asprintf (&command_line[9 + numauthpriv], "%s:%s", server_address, port);
 
-       while (ptr) {
+       /* This is just for display purposes, so it can remain a string */
+       asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s",
+               snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[authpriv]",
+               server_address, port);
 
-               ptr = strstr (ptr, delimiter);
-               if (ptr == NULL)
-                       break;
+       for (i = 0; i < numoids; i++) {
+               command_line[9 + numauthpriv + 1 + i] = oids[i];
+               asprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);    
+       }
 
-               ptr += strlen (delimiter);
-               ptr += strspn (ptr, " ");
+       command_line[9 + numauthpriv + 1 + numoids] = NULL;
 
-               found++;
+       if (verbose)
+               printf ("%s\n", cl_hidden_auth);
+
+       /* Run the command */
+       return_code = cmd_run_array (command_line, &chld_out, &chld_err, 0);
+
+       /* Due to net-snmp sometimes showing stderr messages with poorly formed MIBs,
+          only return state unknown if return code is non zero or there is no stdout.
+          Do this way so that if there is stderr, will get added to output, which helps problem diagnosis
+       */
+       if (return_code != 0)
+               external_error=1;
+       if (chld_out.lines == 0)
+               external_error=1;
+       if (external_error) {
+               if (chld_err.lines > 0) {
+                       printf (_("External command error: %s\n"), chld_err.line[0]);
+                       for (i = 1; i < chld_err.lines; i++) {
+                               printf ("%s\n", chld_err.line[i]);
+                       }
+               } else {
+                       printf(_("External command error with no output (return code: %d)\n"), return_code);
+               }
+               exit (STATE_UNKNOWN);
+       }
 
-               if (ptr[0] == '"') {
-                       ptr++;
-                       response = strpcpy (response, ptr, "\"");
-                       ptr = strpbrk (ptr, "\"");
-                       ptr += strspn (ptr, "\"\n");
+       if (verbose) {
+               for (i = 0; i < chld_out.lines; i++) {
+                       printf ("%s\n", chld_out.line[i]);
                }
-               else {
-                       response = strpcpy (response, ptr, "\n");
-                       ptr = strpbrk (ptr, "\n");
-                       ptr += strspn (ptr, "\n");
-                       while
-                               (strstr (ptr, delimiter) &&
-                                strstr (ptr, "\n") && strstr (ptr, "\n") < strstr (ptr, delimiter)) {
-                               response = strpcat (response, ptr, "\n");
-                               ptr = strpbrk (ptr, "\n");
-                       }
-                       if (ptr && strstr (ptr, delimiter) == NULL) {
-                               asprintf (&response, "%s%s", response, ptr);
-                               ptr = NULL;
-                       }
+       }
+
+       for (line=0, i=0; line < chld_out.lines; line++, i++) {
+               if(calculate_rate)
+                       conv = "%.10g";
+               else
+                       conv = "%.0f";
+
+               ptr = chld_out.line[line];
+               oidname = strpcpy (oidname, ptr, delimiter);
+               response = strstr (ptr, delimiter);
+               if (response == NULL)
+                       break;
+
+               if (verbose > 2) {
+                       printf("Processing oid %i (line %i)\n  oidname: %s\n  response: %s\n", i+1, line+1, oidname, response);
                }
 
+               /* Clean up type array - Sol10 does not necessarily zero it out */
+               bzero(type, sizeof(type));
+
+               is_counter=0;
                /* We strip out the datatype indicator for PHBs */
-               if (strstr (response, "Gauge: "))
+               if (strstr (response, "Gauge: ")) {
                        show = strstr (response, "Gauge: ") + 7;
-               else if (strstr (response, "Gauge32: "))
+                       is_numeric++;
+               } 
+               else if (strstr (response, "Gauge32: ")) {
                        show = strstr (response, "Gauge32: ") + 9;
-               else if (strstr (response, "Counter32: "))
+                       is_numeric++;
+               } 
+               else if (strstr (response, "Counter32: ")) {
                        show = strstr (response, "Counter32: ") + 11;
-               else if (strstr (response, "INTEGER: "))
+                       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;
-               else if (strstr (response, "STRING: "))
+                       is_numeric++;
+               }
+               else if (strstr (response, "STRING: ")) {
                        show = strstr (response, "STRING: ") + 8;
+                       conv = "%.10g";
+
+                       /* Get the rest of the string on multi-line strings */
+                       ptr = show;
+                       COUNT_SEQ(ptr, bk_count, dq_count)
+                       while (dq_count && ptr[0] != '\n' && ptr[0] != '\0') {
+                               ptr++;
+                               GOBBLE_TOS(ptr, "\n\"\\")
+                               COUNT_SEQ(ptr, bk_count, dq_count)
+                       }
+
+                       if (dq_count) { /* unfinished line */
+                               /* copy show verbatim first */
+                               if (!mult_resp) mult_resp = strdup("");
+                               asprintf (&mult_resp, "%s%s:\n%s\n", mult_resp, oids[i], show);
+                               /* then strip out unmatched double-quote from single-line output */
+                               if (show[0] == '"') show++;
+
+                               /* Keep reading until we match end of double-quoted string */
+                               for (line++; line < chld_out.lines; line++) {
+                                       ptr = chld_out.line[line];
+                                       asprintf (&mult_resp, "%s%s\n", mult_resp, ptr);
+
+                                       COUNT_SEQ(ptr, bk_count, dq_count)
+                                       while (dq_count && ptr[0] != '\n' && ptr[0] != '\0') {
+                                               ptr++;
+                                               GOBBLE_TOS(ptr, "\n\"\\")
+                                               COUNT_SEQ(ptr, bk_count, dq_count)
+                                       }
+                                       /* Break for loop before next line increment when done */
+                                       if (!dq_count) break;
+                               }
+                       }
+
+                       /* Allow numeric conversion if whole string is a number. Make concession for strings with " at beginning or end */
+                       /* This duplicates the conversion a bit later, but is cleaner to separate out the checking against the conversion */
+                       ptr = show;
+                       if (*ptr == '"')
+                               ptr++;
+                       if (*ptr != '\0' ) {
+                               strtod( ptr, &endptr );
+                               if (*endptr == '"')
+                                       endptr++;
+                               if (*endptr == '\0')
+                                       is_numeric=1;
+                       }
+
+               }
+               else if (strstr (response, "Timeticks: "))
+                       show = strstr (response, "Timeticks: ");
                else
                        show = response;
-               p2 = show;
 
                iresult = STATE_DEPENDENT;
 
-               /* Process this block for integer comparisons */
-               if (eval_method[i] & CRIT_GT ||
-                   eval_method[i] & CRIT_LT ||
-                   eval_method[i] & CRIT_GE ||
-                   eval_method[i] & CRIT_LE ||
-                   eval_method[i] & CRIT_EQ ||
-                   eval_method[i] & CRIT_NE ||
-                   eval_method[i] & WARN_GT ||
-                   eval_method[i] & WARN_LT ||
-                   eval_method[i] & WARN_GE ||
-                   eval_method[i] & WARN_LE ||
-                   eval_method[i] & WARN_EQ ||
-                   eval_method[i] & WARN_NE) {
-                       p2 = strpbrk (p2, "0123456789");
-                       if (p2 == NULL) 
-                               die (STATE_UNKNOWN,"No valid data returned");
-                       response_value[i] = strtoul (p2, NULL, 10);
-                       iresult = check_num (i);
-                       asprintf (&show, "%lu", response_value[i]);
+               /* Process this block for numeric comparisons */
+                if (is_numeric) {
+                       ptr = strpbrk (show, "0123456789");
+                       if (ptr == NULL)
+                               die (STATE_UNKNOWN,_("No valid data returned"));
+                       response_value[i] = strtod (ptr, NULL);
+
+                       if(calculate_rate) {
+                               if (previous_state!=NULL) {
+                                       duration = current_time-previous_state->time;
+                                       if(duration<=0)
+                                               die(STATE_UNKNOWN,_("Time duration between plugin calls is invalid"));
+                                       temp_double = response_value[i]-previous_value[i];
+                                       /* Simple overflow catcher (same as in rrdtool, rrd_update.c) */
+                                       if(is_counter) {
+                                               if(temp_double<(double)0.0)
+                                                       temp_double+=(double)4294967296.0; /* 2^32 */
+                                               if(temp_double<(double)0.0)
+                                                       temp_double+=(double)18446744069414584320.0; /* 2^64-2^32 */;
+                                       }
+                                       /* Convert to per second, then use multiplier */
+                                       temp_double = temp_double/duration*rate_multiplier;
+                                       iresult = get_status(temp_double, thlds[i]);
+                                       asprintf (&show, conv, temp_double);
+                               }
+                       } else {
+                               iresult = get_status(response_value[i], thlds[i]);
+                               asprintf (&show, conv, response_value[i]);
+                       }
                }
 
                /* Process this block for string matching */
                else if (eval_method[i] & CRIT_STRING) {
-                       if (strcmp (response, string_value))
-                               iresult = STATE_CRITICAL;
+                       if (strcmp (show, string_value))
+                               iresult = (invert_search==0) ? STATE_CRITICAL : STATE_OK;
                        else
-                               iresult = STATE_OK;
+                               iresult = (invert_search==0) ? STATE_OK : STATE_CRITICAL;
                }
 
                /* Process this block for regex matching */
                else if (eval_method[i] & CRIT_REGEX) {
-#ifdef HAVE_REGEX_H
                        excode = regexec (&preg, response, 10, pmatch, eflags);
                        if (excode == 0) {
-                               iresult = STATE_OK;
+                               iresult = (invert_search==0) ? STATE_OK : STATE_CRITICAL;
                        }
                        else if (excode != REG_NOMATCH) {
                                regerror (excode, &preg, errbuf, MAX_INPUT_BUFFER);
@@ -278,21 +468,18 @@ main (int argc, char **argv)
                                exit (STATE_CRITICAL);
                        }
                        else {
-                               iresult = STATE_CRITICAL;
+                               iresult = (invert_search==0) ? STATE_CRITICAL : STATE_OK;
                        }
-#else
-                       printf (_("%s UNKNOWN: call for regex which was not a compiled option"), label);
-                       exit (STATE_UNKNOWN);
-#endif
                }
 
                /* Process this block for existence-nonexistence checks */
+               /* TV: Should this be outside of this else block? */
                else {
                        if (eval_method[i] & CRIT_PRESENT)
                                iresult = STATE_CRITICAL;
                        else if (eval_method[i] & WARN_PRESENT)
                                iresult = STATE_WARNING;
-                       else if (response && iresult == STATE_DEPENDENT) 
+                       else if (response && iresult == STATE_DEPENDENT)
                                iresult = STATE_OK;
                }
 
@@ -300,43 +487,77 @@ main (int argc, char **argv)
                result = max_state (result, iresult);
 
                /* Prepend a label for this OID if there is one */
-               if (nlabels > (size_t)1 && (size_t)i < nlabels && labels[i] != NULL)
+               if (nlabels >= (size_t)1 && (size_t)i < nlabels && labels[i] != NULL)
                        asprintf (&outbuff, "%s%s%s %s%s%s", outbuff,
-                                 (i == 0) ? " " : output_delim,
-                                 labels[i], mark (iresult), show, mark (iresult));
+                               (i == 0) ? " " : output_delim,
+                               labels[i], mark (iresult), show, mark (iresult));
                else
                        asprintf (&outbuff, "%s%s%s%s%s", outbuff, (i == 0) ? " " : output_delim,
-                                 mark (iresult), show, mark (iresult));
+                               mark (iresult), show, mark (iresult));
 
                /* Append a unit string for this OID if there is one */
                if (nunits > (size_t)0 && (size_t)i < nunits && unitv[i] != NULL)
                        asprintf (&outbuff, "%s %s", outbuff, unitv[i]);
 
-               i++;
-
-       }                                                                                                                       /* end while (ptr) */
-
-       if (found == 0)
-               die (STATE_UNKNOWN,
-                    _("%s problem - No data received from host\nCMD: %s\n"),
-                    label,
-                    command_line);
-
-       /* WARNING if output found on stderr */
-       if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
-               result = max_state (result, STATE_WARNING);
-
-       /* close stderr */
-       (void) fclose (child_stderr);
-
-       /* close the pipe */
-       if (spclose (child_process))
-               result = max_state (result, STATE_WARNING);
+               /* Write perfdata with whatever can be parsed by strtod, if possible */
+               ptr = NULL;
+               strtod(show, &ptr);
+               if (ptr > show) {
+                       if (nlabels >= (size_t)1 && (size_t)i < nlabels && labels[i] != NULL)
+                               temp_string=labels[i];
+                       else
+                               temp_string=oidname;
+                       strncat(perfstr, temp_string, sizeof(perfstr)-strlen(perfstr)-1);
+                       strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
+                       len = sizeof(perfstr)-strlen(perfstr)-1;
+                       strncat(perfstr, show, len>ptr-show ? ptr-show : len);
+
+                       if (type)
+                               strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
+                       strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
+               }
+       }
+       total_oids=i;
+
+       /* Save state data, as all data collected now */
+       if(calculate_rate) {
+               string_length=1024;
+               state_string=malloc(string_length);
+               if(state_string==NULL)
+                       die(STATE_UNKNOWN, _("Cannot malloc"));
+               
+               current_length=0;
+               for(i=0; i<total_oids; i++) {
+                       asprintf(&temp_string,"%.0f",response_value[i]);
+                       if(temp_string==NULL)
+                               die(STATE_UNKNOWN,_("Cannot asprintf()"));
+                       response_length = strlen(temp_string);
+                       if(current_length+response_length>string_length) {
+                               string_length=current_length+1024;
+                               state_string=realloc(state_string,string_length);
+                               if(state_string==NULL)
+                                       die(STATE_UNKNOWN, _("Cannot realloc()"));
+                       }
+                       strcpy(&state_string[current_length],temp_string);
+                       current_length=current_length+response_length;
+                       state_string[current_length]=':';
+                       current_length++;
+                       free(temp_string);
+               }
+               state_string[--current_length]='\0';
+               if (verbose > 2)
+                       printf("State string=%s\n",state_string);
+               
+               /* This is not strictly the same as time now, but any subtle variations will cancel out */
+               np_state_write_string(current_time, state_string );
+               if(previous_state==NULL) {
+                       /* Or should this be highest state? */
+                       die( STATE_OK, _("No previous data to calculate rate - assume okay" ) );
+               }
+       }
 
-/*     if (nunits == 1 || i == 1) */
-/*             printf ("%s %s -%s %s\n", label, state_text (result), outbuff, units); */
-/*     else */
-       printf ("%s %s -%s\n", label, state_text (result), outbuff);
+       printf ("%s %s -%s %s\n", label, state_text (result), outbuff, perfstr);
+       if (mult_resp) printf ("%s", mult_resp);
 
        return result;
 }
@@ -360,19 +581,26 @@ process_arguments (int argc, char **argv)
                {"delimiter", required_argument, 0, 'd'},
                {"output-delimiter", required_argument, 0, 'D'},
                {"string", required_argument, 0, 's'},
+               {"timeout", required_argument, 0, 't'},
                {"regex", required_argument, 0, 'r'},
                {"ereg", required_argument, 0, 'r'},
                {"eregi", required_argument, 0, 'R'},
                {"label", required_argument, 0, 'l'},
                {"units", required_argument, 0, 'u'},
                {"port", required_argument, 0, 'p'},
+               {"retries", required_argument, 0, 'e'},
                {"miblist", required_argument, 0, 'm'},
                {"protocol", required_argument, 0, 'P'},
                {"seclevel", required_argument, 0, 'L'},
                {"secname", required_argument, 0, 'U'},
                {"authproto", required_argument, 0, 'a'},
+               {"privproto", required_argument, 0, 'x'},
                {"authpasswd", required_argument, 0, 'A'},
                {"privpasswd", required_argument, 0, 'X'},
+               {"next", no_argument, 0, 'n'},
+               {"rate", no_argument, 0, L_CALCULATE_RATE},
+               {"rate-multiplier", required_argument, 0, L_RATE_MULTIPLIER},
+               {"invert-search", no_argument, 0, L_INVERT_SEARCH},
                {0, 0, 0, 0}
        };
 
@@ -390,7 +618,7 @@ process_arguments (int argc, char **argv)
        }
 
        while (1) {
-               c = getopt_long (argc, argv, "hvVt:c:w:H:C:o:e:E:d:D:s:R:r:l:u:p:m:P:L:U:a:A:X:",
+               c = getopt_long (argc, argv, "nhvVt:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:L:U:a:x:A:X:",
                                                                         longopts, &option);
 
                if (c == -1 || c == EOF)
@@ -398,17 +626,15 @@ process_arguments (int argc, char **argv)
 
                switch (c) {
                case '?':       /* usage */
-                       printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-                       print_usage ();
-                       exit (STATE_UNKNOWN);
+                       usage5 ();
                case 'h':       /* help */
                        print_help ();
-                       exit (STATE_OK); 
+                       exit (STATE_OK);
                case 'V':       /* version */
-                       print_revision (progname, revision);
+                       print_revision (progname, NP_VERSION);
                        exit (STATE_OK);
                case 'v': /* verbose */
-                       verbose = TRUE;
+                       verbose++;
                        break;
 
        /* Connection info */
@@ -418,28 +644,34 @@ process_arguments (int argc, char **argv)
                case 'H':                                                                       /* Host or server */
                        server_address = optarg;
                        break;
-               case 'p':       /* TCP port number */
+               case 'p':       /* TCP port number */
                        port = optarg;
                        break;
-               case 'm':      /* List of MIBS  */
+               case 'm':       /* List of MIBS */
                        miblist = optarg;
                        break;
-               case 'P':     /* SNMP protocol version */
+               case 'n':       /* usesnmpgetnext */
+                       usesnmpgetnext = TRUE;
+                       break;
+               case 'P':       /* SNMP protocol version */
                        proto = optarg;
                        break;
-               case 'L':     /* security level */
+               case 'L':       /* security level */
                        seclevel = optarg;
                        break;
-               case 'U':     /* security username */
+               case 'U':       /* security username */
                        secname = optarg;
                        break;
-               case 'a':     /* auth protocol */
+               case 'a':       /* auth protocol */
                        authproto = optarg;
                        break;
-               case 'A':     /* auth passwd */
+               case 'x':       /* priv protocol */
+                       privproto = optarg;
+                       break;
+               case 'A':       /* auth passwd */
                        authpasswd = optarg;
                        break;
-               case 'X':     /* priv passwd */
+               case 'X':       /* priv passwd */
                        privpasswd = optarg;
                        break;
                case 't':       /* timeout period */
@@ -450,41 +682,38 @@ process_arguments (int argc, char **argv)
                        break;
 
        /* Test parameters */
-               case 'c':                                                                       /* critical time threshold */
-                       if (strspn (optarg, "0123456789:,") < strlen (optarg))
-                               usage2 (_("Invalid critical threshold: %s\n"), optarg);
-                       for (ptr = optarg; ptr && jj < MAX_OIDS; jj++) {
-                               if (lu_getll (&lower_crit_lim[jj], ptr) == 1)
-                                       eval_method[jj] |= CRIT_LT;
-                               if (lu_getul (&upper_crit_lim[jj], ptr) == 1)
-                                       eval_method[jj] |= CRIT_GT;
-                               (ptr = index (ptr, ',')) ? ptr++ : ptr;
-                       }
+               case 'c':                                                                       /* critical threshold */
+                       critical_thresholds = optarg;
                        break;
-               case 'w':                                                                       /* warning time threshold */
-                       if (strspn (optarg, "0123456789:,") < strlen (optarg))
-                               usage2 (_("Invalid warning threshold: %s\n"), optarg);
-                       for (ptr = optarg; ptr && ii < MAX_OIDS; ii++) {
-                               if (lu_getll (&lower_warn_lim[ii], ptr) == 1)
-                                       eval_method[ii] |= WARN_LT;
-                               if (lu_getul (&upper_warn_lim[ii], ptr) == 1)
-                                       eval_method[ii] |= WARN_GT;
-                               (ptr = index (ptr, ',')) ? ptr++ : ptr;
-                       }
+               case 'w':                                                                       /* warning threshold */
+                       warning_thresholds = optarg;
                        break;
-               case 'o':                                                                       /* object identifier */
                case 'e': /* PRELIMINARY - may change */
                case 'E': /* PRELIMINARY - may change */
-                       for (ptr = optarg; (ptr = index (ptr, ',')); ptr++)
-                               ptr[0] = ' '; /* relpace comma with space */
-                       for (ptr = optarg; (ptr = index (ptr, ' ')); ptr++)
-                               j++; /* count OIDs */
-                       asprintf (&oid, "%s %s", (oid?oid:""), optarg);
+                       if (!is_integer (optarg))
+                               usage2 (_("Retries interval must be a positive integer"), optarg);
+                       else
+                               retries = atoi(optarg);
+                       break;
+               case 'o':                                                                       /* object identifier */
+                       if ( strspn( optarg, "0123456789.," ) != strlen( optarg ) ) {
+                                       /*
+                                        * we have something other than digits, periods and comas,
+                                        * so we have a mib variable, rather than just an SNMP OID,
+                                        * so we have to actually read the mib files
+                                        */
+                                       needmibs = TRUE;
+                       }
+                       if (!oids) oids = calloc(MAX_OIDS, sizeof (char *));
+                       for (ptr = strtok(optarg, ", "); ptr != NULL && j < MAX_OIDS; ptr = strtok(NULL, ", "), j++) {
+                               oids[j] = strdup(ptr);
+                       }
+                       numoids = j;
                        if (c == 'E' || c == 'e') {
                                jj++;
                                ii++;
                        }
-                       if (c == 'E') 
+                       if (c == 'E')
                                eval_method[j+1] |= WARN_PRESENT;
                        else if (c == 'e')
                                eval_method[j+1] |= CRIT_PRESENT;
@@ -496,11 +725,8 @@ process_arguments (int argc, char **argv)
                        ii++;
                        break;
                case 'R':                                                                       /* regex */
-#ifdef HAVE_REGEX_H
                        cflags = REG_ICASE;
-#endif
                case 'r':                                                                       /* regex */
-#ifdef HAVE_REGEX_H
                        cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
                        strncpy (regex_expect, optarg, sizeof (regex_expect) - 1);
                        regex_expect[sizeof (regex_expect) - 1] = 0;
@@ -512,10 +738,6 @@ process_arguments (int argc, char **argv)
                        }
                        eval_method[jj++] = CRIT_REGEX;
                        ii++;
-#else
-                       printf (_("%s UNKNOWN: call for regex which was not a compiled option"), label);
-                       exit (STATE_UNKNOWN);
-#endif
                        break;
 
        /* Format */
@@ -526,14 +748,12 @@ process_arguments (int argc, char **argv)
                        output_delim = strscpy (output_delim, optarg);
                        break;
                case 'l':                                                                       /* label */
-                       label = optarg;
                        nlabels++;
                        if (nlabels >= labels_size) {
                                labels_size += 8;
                                labels = realloc (labels, labels_size);
                                if (labels == NULL)
-                                       die (STATE_UNKNOWN,
-                                                                                _("Could not realloc() labels[%d]"), nlabels);
+                                       die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
                        }
                        labels[nlabels - 1] = optarg;
                        ptr = thisarg (optarg);
@@ -545,7 +765,7 @@ process_arguments (int argc, char **argv)
                                        labels_size += 8;
                                        labels = realloc (labels, labels_size);
                                        if (labels == NULL)
-                                               die (STATE_UNKNOWN, _("Could not realloc() labels\n"));
+                                               die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
                                }
                                labels++;
                                ptr = thisarg (ptr);
@@ -562,8 +782,7 @@ process_arguments (int argc, char **argv)
                                unitv_size += 8;
                                unitv = realloc (unitv, unitv_size);
                                if (unitv == NULL)
-                                       die (STATE_UNKNOWN,
-                                                                                _("Could not realloc() units [%d]\n"), nunits);
+                                       die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
                        }
                        unitv[nunits - 1] = optarg;
                        ptr = thisarg (optarg);
@@ -585,7 +804,18 @@ process_arguments (int argc, char **argv)
                                        unitv[nunits - 1] = ptr;
                        }
                        break;
-
+               case L_CALCULATE_RATE:
+                       if(calculate_rate==0)
+                               np_enable_state(NULL, 1);
+                       calculate_rate = 1;
+                       break;
+               case L_RATE_MULTIPLIER:
+                       if(!is_integer(optarg)||((rate_multiplier=atoi(optarg))<=0))
+                               usage2(_("Rate multiplier must be a positive integer"),optarg);
+                       break;
+               case L_INVERT_SEARCH:
+                       invert_search=1;
+                       break;
                }
        }
 
@@ -607,13 +837,11 @@ process_arguments (int argc, char **argv)
 
 <para>&PROTO_validate_arguments;</para>
 
-<para>Given a database name, this function returns TRUE if the string
-is a valid PostgreSQL database name, and returns false if it is
-not.</para>
+<para>Checks to see if the default miblist needs to be loaded. Also verifies
+the authentication and authorization combinations based on protocol version
+selected.</para>
 
-<para>Valid PostgreSQL database names are less than &NAMEDATALEN;
-characters long and consist of letters, numbers, and underscores. The
-first character cannot be a number, however.</para>
+<para></para>
 
 </sect3>
 -@@
@@ -624,164 +852,96 @@ first character cannot be a number, however.</para>
 int
 validate_arguments ()
 {
+       /* check whether to load locally installed MIBS (CPU/disk intensive) */
+       if (miblist == NULL) {
+               if ( needmibs == TRUE ) {
+                       miblist = strdup (DEFAULT_MIBLIST);
+               }else{
+                       miblist = "";                   /* don't read any mib files for numeric oids */
+               }
+       }
 
-       /* Need better checks to verify seclevel and authproto choices */
-       
-       if (seclevel == NULL) 
-               asprintf (&seclevel, "noAuthNoPriv");
+       /* Check server_address is given */
+       if (server_address == NULL)
+               die(STATE_UNKNOWN, _("No host specified\n"));
 
+       /* Check oid is given */
+       if (numoids == 0)
+               die(STATE_UNKNOWN, _("No OIDs specified\n"));
 
-       if (authproto == NULL ) 
-               asprintf(&authproto, DEFAULT_AUTH_PROTOCOL);
-       
-        
-       
-       if (proto == NULL || (strcmp(proto,DEFAULT_PROTOCOL) == 0) ) {        /* default protocol version */
+       if (proto == NULL)
                asprintf(&proto, DEFAULT_PROTOCOL);
-               asprintf(&authpriv, "%s%s", "-c ", community);
+
+       if ((strcmp(proto,"1") == 0) || (strcmp(proto, "2c")==0)) {     /* snmpv1 or snmpv2c */
+               numauthpriv = 2;
+               authpriv = calloc (numauthpriv, sizeof (char *));
+               authpriv[0] = strdup ("-c");
+               authpriv[1] = strdup (community);
        }
-       else if ( strcmp (proto, "3") == 0 ) {                 /* snmpv3 args */
-               asprintf(&proto, "%s", "3");
-               
-               if ( (strcmp(seclevel, "noAuthNoPriv") == 0) || seclevel == NULL ) {
-                       asprintf(&authpriv, "%s", "-l noAuthNoPriv" );
-               }
-               else if ( strcmp(seclevel, "authNoPriv") == 0 ) {
-                       if ( secname == NULL || authpasswd == NULL) {
-                               printf (_("Missing secname (%s) or authpassword (%s) ! \n)"),secname, authpasswd );
-                               print_usage ();
-                               exit (STATE_UNKNOWN);
+       else if ( strcmp (proto, "3") == 0 ) {          /* snmpv3 args */
+               if (seclevel == NULL)
+                       asprintf(&seclevel, "noAuthNoPriv");
+
+               if (strcmp(seclevel, "noAuthNoPriv") == 0) {
+                       numauthpriv = 2;
+                       authpriv = calloc (numauthpriv, sizeof (char *));
+                       authpriv[0] = strdup ("-l");
+                       authpriv[1] = strdup ("noAuthNoPriv");
+               } else {
+                       if (! ( (strcmp(seclevel, "authNoPriv")==0) || (strcmp(seclevel, "authPriv")==0) ) ) {
+                               usage2 (_("Invalid seclevel"), seclevel);
                        }
-                       asprintf(&authpriv, "-l authNoPriv -a %s -u %s -A %s ", authproto, secname, authpasswd);
-               }
-               else if ( strcmp(seclevel, "authPriv") == 0 ) {
-                       if ( secname == NULL || authpasswd == NULL || privpasswd == NULL ) {
-                               printf (("Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n"),secname, authpasswd,privpasswd );
-                               print_usage ();
-                               exit (STATE_UNKNOWN);
-                       }
-                       asprintf(&authpriv, "-l authPriv -a %s -u %s -A %s -x DES -X %s ", authproto, secname, authpasswd, privpasswd);
-               }
-               
-       }
-       else {
-               printf (_("Invalid SNMP version: %s\n"), proto);
-               print_usage ();
-               exit (STATE_UNKNOWN);                           
-       }
-                       
-       return OK;
-}
-
-
 
-char *
-clarify_message (char *msg)
-{
-       int i = 0;
-       int foo;
-       char tmpmsg_c[MAX_INPUT_BUFFER];
-       char *tmpmsg = (char *) &tmpmsg_c;
-       tmpmsg = strcpy (tmpmsg, msg);
-       if (!strncmp (tmpmsg, " Hex:", 5)) {
-               tmpmsg = strtok (tmpmsg, ":");
-               while ((tmpmsg = strtok (NULL, " "))) {
-                       foo = strtol (tmpmsg, NULL, 16);
-                       /* Translate chars that are not the same value in the printers
-                        * character set.
-                        */
-                       switch (foo) {
-                       case 208:
-                               {
-                                       foo = 197;
-                                       break;
-                               }
-                       case 216:
-                               {
-                                       foo = 196;
-                                       break;
-                               }
+                       if (authproto == NULL )
+                               asprintf(&authproto, DEFAULT_AUTH_PROTOCOL);
+
+                       if (secname == NULL)
+                               die(STATE_UNKNOWN, _("Required parameter: %s\n"), "secname");
+
+                       if (authpasswd == NULL)
+                               die(STATE_UNKNOWN, _("Required parameter: %s\n"), "authpasswd");
+
+                       if ( strcmp(seclevel, "authNoPriv") == 0 ) {
+                               numauthpriv = 8;
+                               authpriv = calloc (numauthpriv, sizeof (char *));
+                               authpriv[0] = strdup ("-l");
+                               authpriv[1] = strdup ("authNoPriv");
+                               authpriv[2] = strdup ("-a");
+                               authpriv[3] = strdup (authproto);
+                               authpriv[4] = strdup ("-u");
+                               authpriv[5] = strdup (secname);
+                               authpriv[6] = strdup ("-A");
+                               authpriv[7] = strdup (authpasswd);
+                       } else if ( strcmp(seclevel, "authPriv") == 0 ) {
+                               if (privproto == NULL )
+                                       asprintf(&privproto, DEFAULT_PRIV_PROTOCOL);
+
+                               if (privpasswd == NULL)
+                                       die(STATE_UNKNOWN, _("Required parameter: %s\n"), "privpasswd");
+
+                               numauthpriv = 12;
+                               authpriv = calloc (numauthpriv, sizeof (char *));
+                               authpriv[0] = strdup ("-l");
+                               authpriv[1] = strdup ("authPriv");
+                               authpriv[2] = strdup ("-a");
+                               authpriv[3] = strdup (authproto);
+                               authpriv[4] = strdup ("-u");
+                               authpriv[5] = strdup (secname);
+                               authpriv[6] = strdup ("-A");
+                               authpriv[7] = strdup (authpasswd);
+                               authpriv[8] = strdup ("-x");
+                               authpriv[9] = strdup (privproto);
+                               authpriv[10] = strdup ("-X");
+                               authpriv[11] = strdup (privpasswd);
                        }
-                       msg[i] = foo;
-                       i++;
                }
-               msg[i] = 0;
-       }
-       return (msg);
-}
-
-
-
-int
-check_num (int i)
-{
-       int result;
-       result = STATE_OK;
-       if (eval_method[i] & WARN_GT && eval_method[i] & WARN_LT &&
-                       lower_warn_lim[i] > upper_warn_lim[i]) {
-               if (response_value[i] <= lower_warn_lim[i] &&
-                               response_value[i] >= upper_warn_lim[i]) {
-                       result = STATE_WARNING;
-               }
-       }
-       else if
-               ((eval_method[i] & WARN_GT && response_value[i] > upper_warn_lim[i]) ||
-                (eval_method[i] & WARN_GE && response_value[i] >= upper_warn_lim[i]) ||
-                (eval_method[i] & WARN_LT && response_value[i] < lower_warn_lim[i]) ||
-                (eval_method[i] & WARN_LE && response_value[i] <= lower_warn_lim[i]) ||
-                (eval_method[i] & WARN_EQ && response_value[i] == upper_warn_lim[i]) ||
-                (eval_method[i] & WARN_NE && response_value[i] != upper_warn_lim[i])) {
-               result = STATE_WARNING;
-       }
 
-       if (eval_method[i] & CRIT_GT && eval_method[i] & CRIT_LT &&
-                       lower_crit_lim[i] > upper_crit_lim[i]) {
-               if (response_value[i] <= lower_crit_lim[i] &&
-                               response_value[i] >= upper_crit_lim[i]) {
-                       result = STATE_CRITICAL;
-               }
        }
-       else if
-               ((eval_method[i] & CRIT_GT && response_value[i] > upper_crit_lim[i]) ||
-                (eval_method[i] & CRIT_GE && response_value[i] >= upper_crit_lim[i]) ||
-                (eval_method[i] & CRIT_LT && response_value[i] < lower_crit_lim[i]) ||
-                (eval_method[i] & CRIT_LE && response_value[i] <= lower_crit_lim[i]) ||
-                (eval_method[i] & CRIT_EQ && response_value[i] == upper_crit_lim[i]) ||
-                (eval_method[i] & CRIT_NE && response_value[i] != upper_crit_lim[i])) {
-               result = STATE_CRITICAL;
+       else {
+               usage2 (_("Invalid SNMP version"), proto);
        }
 
-       return result;
-}
-
-
-
-int
-lu_getll (unsigned long *ll, char *str)
-{
-       char tmp[100];
-       if (strchr (str, ':') == NULL)
-               return 0;
-       if (strchr (str, ',') != NULL && (strchr (str, ',') < strchr (str, ':')))
-               return 0;
-       if (sscanf (str, "%lu%[:]", ll, tmp) == 2)
-               return 1;
-       return 0;
-}
-
-
-
-int
-lu_getul (unsigned long *ul, char *str)
-{
-       char tmp[100];
-       if (sscanf (str, "%lu%[^,]", ul, tmp) == 1)
-               return 1;
-       if (sscanf (str, ":%lu%[^,]", ul, tmp) == 1)
-               return 1;
-       if (sscanf (str, "%*u:%lu%[^,]", ul, tmp) == 1)
-               return 1;
-       return 0;
+       return OK;
 }
 
 
@@ -795,7 +955,7 @@ thisarg (char *str)
        str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
        if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
                if (strlen (str) == 1 || !strstr (str + 1, "'"))
-                       die (STATE_UNKNOWN, "Unbalanced quotes\n");
+                       die (STATE_UNKNOWN, _("Unbalanced quotes\n"));
        }
        return str;
 }
@@ -840,107 +1000,117 @@ nextarg (char *str)
 void
 print_help (void)
 {
-       print_revision (progname, revision);
+       print_revision (progname, NP_VERSION);
+
+       printf (COPYRIGHT, copyright, email);
 
-       printf (_(COPYRIGHT), copyright, email);
+       printf ("%s\n", _("Check status of remote machines and obtain system information via SNMP"));
 
-       printf (_("\
-Check status of remote machines and obtain sustem information via SNMP\n\n"));
+       printf ("\n\n");
 
        print_usage ();
 
-       printf (_(UT_HELP_VRSN));
+       printf (UT_HELP_VRSN);
+       printf (UT_EXTRA_OPTS);
 
-       printf (_(UT_HOST_PORT), 'p', DEFAULT_PORT);
+       printf (UT_HOST_PORT, 'p', DEFAULT_PORT);
 
        /* SNMP and Authentication Protocol */
-       printf (_("\
- -P, --protocol=[1|3]\n\
-    SNMP protocol version\n\
- -L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]\n\
-    SNMPv3 securityLevel\n\
- -a, --authproto=[MD5|SHA]\n\
-    SNMPv3 auth proto\n"));
+       printf (" %s\n", "-n, --next");
+       printf ("    %s\n", _("Use SNMP GETNEXT instead of SNMP GET"));
+       printf (" %s\n", "-P, --protocol=[1|2c|3]");
+       printf ("    %s\n", _("SNMP protocol version"));
+       printf (" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]");
+       printf ("    %s\n", _("SNMPv3 securityLevel"));
+       printf (" %s\n", "-a, --authproto=[MD5|SHA]");
+       printf ("    %s\n", _("SNMPv3 auth proto"));
+       printf (" %s\n", "-x, --privproto=[DES|AES]");
+       printf ("    %s\n", _("SNMPv3 priv proto (default DES)"));
 
        /* Authentication Tokens*/
-       printf (_("\
- -C, --community=STRING\n\
-    Optional community string for SNMP communication\n\
-    (default is \"%s\")\n\
- -U, --secname=USERNAME\n\
-    SNMPv3 username\n\
- -A, --authpassword=PASSWORD\n\
-    SNMPv3 authentication password\n\
- -X, --privpasswd=PASSWORD\n\
-    SNMPv3 crypt passwd (DES)\n"), DEFAULT_COMMUNITY);
+       printf (" %s\n", "-C, --community=STRING");
+       printf ("    %s ", _("Optional community string for SNMP communication"));
+       printf ("(%s \"%s\")\n", _("default is") ,DEFAULT_COMMUNITY);
+       printf (" %s\n", "-U, --secname=USERNAME");
+       printf ("    %s\n", _("SNMPv3 username"));
+       printf (" %s\n", "-A, --authpassword=PASSWORD");
+       printf ("    %s\n", _("SNMPv3 authentication password"));
+       printf (" %s\n", "-X, --privpasswd=PASSWORD");
+       printf ("    %s\n", _("SNMPv3 privacy password"));
 
        /* OID Stuff */
-       printf (_("\
- -o, --oid=OID(s)\n\
-    Object identifier(s) whose value you wish to query\n\
- -m, --miblist=STRING\n\
-    List of MIBS to be loaded (default = ALL)\n -d, --delimiter=STRING\n\
-    Delimiter to use when parsing returned data. Default is \"%s\"\n\
-    Any data on the right hand side of the delimiter is considered\n\
-    to be the data that should be used in the evaluation.\n"), DEFAULT_DELIMITER);
+       printf (" %s\n", "-o, --oid=OID(s)");
+       printf ("    %s\n", _("Object identifier(s) or SNMP variables whose value you wish to query"));
+       printf (" %s\n", "-m, --miblist=STRING");
+       printf ("    %s\n", _("List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"));
+       printf ("    %s\n", _("for symbolic OIDs.)"));
+       printf (" %s\n", "-d, --delimiter=STRING");
+       printf ("    %s \"%s\"\n", _("Delimiter to use when parsing returned data. Default is"), DEFAULT_DELIMITER);
+       printf ("    %s\n", _("Any data on the right hand side of the delimiter is considered"));
+       printf ("    %s\n", _("to be the data that should be used in the evaluation."));
 
        /* Tests Against Integers */
-       printf (_("\
- -w, --warning=INTEGER_RANGE(s)\n\
-    Range(s) which will not result in a WARNING status\n\
- -c, --critical=INTEGER_RANGE(s)\n\
-    Range(s) which will not result in a CRITICAL status\n"));
+       printf (" %s\n", "-w, --warning=THRESHOLD(s)");
+       printf ("    %s\n", _("Warning threshold range(s)"));
+       printf (" %s\n", "-c, --critical=THRESHOLD(s)");
+       printf ("    %s\n", _("Critical threshold range(s)"));
+       printf (" %s\n", "--rate");
+       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"));
 
        /* Tests Against Strings */
-       printf (_("\
- -s, --string=STRING\n\
-    Return OK state (for that OID) if STRING is an exact match\n\
- -r, --ereg=REGEX\n\
-    Return OK state (for that OID) if extended regular expression REGEX matches\n\
- -R, --eregi=REGEX\n\
-    Return OK state (for that OID) if case-insensitive extended REGEX matches\n\
- -l, --label=STRING\n\
-    Prefix label for output from plugin (default -s 'SNMP')\n"));
+       printf (" %s\n", "-s, --string=STRING");
+       printf ("    %s\n", _("Return OK state (for that OID) if STRING is an exact match"));
+       printf (" %s\n", "-r, --ereg=REGEX");
+       printf ("    %s\n", _("Return OK state (for that OID) if extended regular expression REGEX matches"));
+       printf (" %s\n", "-R, --eregi=REGEX");
+       printf ("    %s\n", _("Return OK state (for that OID) if case-insensitive extended REGEX matches"));
+       printf (" %s\n", "--invert-search");
+       printf ("    %s\n", _("Invert search result (CRITICAL if found)"));
 
        /* Output Formatting */
-       printf (_("\
- -u, --units=STRING\n\
-    Units label(s) for output data (e.g., 'sec.').\n\
- -D, --output-delimiter=STRING\n\
-    Separates output on multiple OID requests\n"));
-
-       printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
-
-       printf (_(UT_VERBOSE));
-
-       printf (_("\n\
-- This plugin uses the 'snmpget' command included with the NET-SNMP package.\n\
-  If you don't have the package installed, you will need to download it from\n\
-  http://net-snmp.sourceforge.net before you can use this plugin.\n"));
-
-       printf (_("\
-- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with\n\
-  internal spaces must be quoted) [max 8 OIDs]\n"));
-
-       printf (_("\
-- Ranges are inclusive and are indicated with colons. When specified as\n\
-  'min:max' a STATE_OK will be returned if the result is within the indicated\n\
-  range or is equal to the upper or lower bound. A non-OK state will be\n\
-  returned if the result is outside the specified range.\n"));
-
-       printf (_("\
-- If specified in the order 'max:min' a non-OK state will be returned if the\n\
-  result is within the (inclusive) range.\n"));
-
-       printf (_("\
-- Upper or lower bounds may be omitted to skip checking the respective limit.\n\
-- Bare integers are interpreted as upper limits.\n\
-- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'\n\
-- Note that only one string and one regex may be checked at present\n\
-- All evaluation methods other than PR, STR, and SUBSTR expect that the value\n\
-  returned from the SNMP query is an unsigned integer.\n"));
-
-       printf (_(UT_SUPPORT));
+       printf (" %s\n", "-l, --label=STRING");
+       printf ("    %s\n", _("Prefix label for output from plugin"));
+       printf (" %s\n", "-u, --units=STRING");
+       printf ("    %s\n", _("Units label(s) for output data (e.g., 'sec.')."));
+       printf (" %s\n", "-D, --output-delimiter=STRING");
+       printf ("    %s\n", _("Separates output on multiple OID requests"));
+
+       printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+       printf (" %s\n", "-e, --retries=INTEGER");
+       printf ("    %s\n", _("Number of retries to be used in the requests"));
+
+       printf (UT_VERBOSE);
+
+       printf ("\n");
+       printf ("%s\n", _("This plugin uses the 'snmpget' command included with the NET-SNMP package."));
+       printf ("%s\n", _("if you don't have the package installed, you will need to download it from"));
+       printf ("%s\n", _("http://net-snmp.sourceforge.net before you can use this plugin."));
+
+       printf ("\n");
+       printf ("%s\n", _("Notes:"));
+       printf (" %s\n", _("- Multiple OIDs may be indicated by a comma or space-delimited list (lists with"));
+       printf ("   %s %i %s\n", _("internal spaces must be quoted). Maximum:"), MAX_OIDS, _("OIDs."));
+
+       printf(" -%s", UT_THRESHOLDS_NOTES);
+
+       printf (" %s\n", _("- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'"));
+       printf (" %s\n", _("- Note that only one string and one regex may be checked at present"));
+       printf (" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value"));
+       printf ("   %s\n", _("returned from the SNMP query is an unsigned integer."));
+
+       printf("\n");
+       printf("%s\n", _("Rate Calculation:"));
+       printf(" %s\n", _("In many places, SNMP returns counters that are only meaningful when"));
+       printf(" %s\n", _("calculating the counter difference since the last check. check_snmp"));
+       printf(" %s\n", _("saves the last state information in a file so that the rate per second"));
+       printf(" %s\n", _("can be calculated. Use the --rate option to save state information."));
+       printf(" %s\n", _("On the first run, there will be no prior state - this will return with OK."));
+       printf(" %s\n", _("The state is uniquely determined by the arguments to the plugin, so"));
+       printf(" %s\n", _("changing the arguments will create a new state file."));
+
+       printf (UT_SUPPORT);
 }
 
 
@@ -948,13 +1118,10 @@ Check status of remote machines and obtain sustem information via SNMP\n\n"));
 void
 print_usage (void)
 {
-       printf ("\
-Usage: %s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range] \n\
-  [-C community] [-s string] [-r regex] [-R regexi] [-t timeout]\n\
-  [-l label] [-u units] [-p port-number] [-d delimiter]\n\
-  [-D output-delimiter] [-m miblist] [-P snmp version]\n\
-  [-L seclevel] [-U secname] [-a authproto] [-A authpasswd]\n\
-  [-X privpasswd]\n", progname);
-       
-       printf (UT_HLP_VRS, progname, progname);
+       printf ("%s\n", _("Usage:"));
+       printf ("%s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range]\n",progname);
+       printf ("[-C community] [-s string] [-r regex] [-R regexi] [-t timeout] [-e retries]\n");
+       printf ("[-l label] [-u units] [-p port-number] [-d delimiter] [-D output-delimiter]\n");
+       printf ("[-m miblist] [-P snmp version] [-L seclevel] [-U secname] [-a authproto]\n");
+       printf ("[-A authpasswd] [-x privproto] [-X privpasswd]\n");
 }