6 files changed, 99 insertions, 43 deletions

diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 32ba050..3b038cf 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -148,37 +148,37 @@ main (int argc, char **argv)
 
         /* report incoming traffic in Bytes/sec */
         if (incoming_rate < 1024) {
-                strcpy (incoming_speed_rating, "B/s");
+                strcpy (incoming_speed_rating, "B");
                 adjusted_incoming_rate = (double) incoming_rate;
         }
 
         /* report incoming traffic in KBytes/sec */
         else if (incoming_rate < (1024 * 1024)) {
-                strcpy (incoming_speed_rating, "KB/s");
+                strcpy (incoming_speed_rating, "KB");
                 adjusted_incoming_rate = (double) (incoming_rate / 1024.0);
         }
 
         /* report incoming traffic in MBytes/sec */
         else {
-                strcpy (incoming_speed_rating, "MB/s");
+                strcpy (incoming_speed_rating, "MB");
                 adjusted_incoming_rate = (double) (incoming_rate / 1024.0 / 1024.0);
         }
 
         /* report outgoing traffic in Bytes/sec */
         if (outgoing_rate < 1024) {
-                strcpy (outgoing_speed_rating, "B/s");
+                strcpy (outgoing_speed_rating, "B");
                 adjusted_outgoing_rate = (double) outgoing_rate;
         }
 
         /* report outgoing traffic in KBytes/sec */
         else if (outgoing_rate < (1024 * 1024)) {
-                strcpy (outgoing_speed_rating, "KB/s");
+                strcpy (outgoing_speed_rating, "KB");
                 adjusted_outgoing_rate = (double) (outgoing_rate / 1024.0);
         }
 
         /* report outgoing traffic in MBytes/sec */
         else {
-                strcpy (outgoing_speed_rating, "MB/s");
+                strcpy (outgoing_speed_rating, "MB");
                 adjusted_outgoing_rate = (double) (outgoing_rate / 1024.0 / 1024.0);
         }
 
@@ -191,7 +191,7 @@ main (int argc, char **argv)
                 result = STATE_WARNING;
         }
 
-        xasprintf (&error_message, _("%s. In = %0.1f %s, %s. Out = %0.1f %s|%s %s\n"),
+        xasprintf (&error_message, _("%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n"),
                   (use_average == TRUE) ? _("Avg") : _("Max"), adjusted_incoming_rate,
                   incoming_speed_rating, (use_average == TRUE) ? _("Avg") : _("Max"),
                   adjusted_outgoing_rate, outgoing_speed_rating,
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index fefbfb7..f621b0a 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -197,19 +197,40 @@ int main(int argc, char **argv){
 
         case CHECK_UPTIME:
 
-                xasprintf(&send_buffer, "%s&3", req_password);
-                fetch_data (server_address, server_port, send_buffer);
-                uptime=strtoul(recv_buffer,NULL,10);
-                updays = uptime / 86400;
-                uphours = (uptime % 86400) / 3600;
-                upminutes = ((uptime % 86400) % 3600) / 60;
-                xasprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s)|uptime=%lu"), updays, uphours, upminutes, uptime);
-                if (check_critical_value==TRUE && uptime <= critical_value)
-                        return_code=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && uptime <= warning_value)
-                        return_code=STATE_WARNING;
-                else
-                        return_code=STATE_OK;
+                if (value_list == NULL) {
+                        value_list = "minutes";
+                }
+                if (strncmp(value_list, "seconds", strlen("seconds") + 1 ) &&
+                        strncmp(value_list, "minutes", strlen("minutes") + 1) &&
+                        strncmp(value_list, "hours", strlen("hours") + 1) &&
+                        strncmp(value_list, "days", strlen("days") + 1)) {
+
+                        output_message = strdup (_("wrong -l argument"));
+                } else {
+                        xasprintf(&send_buffer, "%s&3", req_password);
+                        fetch_data (server_address, server_port, send_buffer);
+                        uptime=strtoul(recv_buffer,NULL,10);
+                        updays = uptime / 86400;
+                        uphours = (uptime % 86400) / 3600;
+                        upminutes = ((uptime % 86400) % 3600) / 60;
+
+                        if (!strncmp(value_list, "minutes", strlen("minutes")))
+                                uptime = uptime / 60;
+                        else if (!strncmp(value_list, "hours", strlen("hours")))
+                                uptime = uptime / 3600;
+                        else if (!strncmp(value_list, "days", strlen("days")))
+                                uptime = uptime / 86400;
+                        /* else uptime in seconds, nothing to do */
+
+                        xasprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu"),updays, uphours, upminutes, uptime);
+
+                        if (check_critical_value==TRUE && uptime <= critical_value)
+                                return_code=STATE_CRITICAL;
+                        else if (check_warning_value==TRUE && uptime <= warning_value)
+                                return_code=STATE_WARNING;
+                        else
+                                return_code=STATE_OK;
+                }
                 break;
 
         case CHECK_USEDDISKSPACE:
@@ -713,7 +734,9 @@ void print_help(void)
         printf ("  %s\n", "ie: -l 60,90,95,120,90,95");
         printf (" %s\n", "UPTIME =");
         printf ("  %s\n", _("Get the uptime of the machine."));
-        printf ("  %s\n", _("No specific parameters. No warning or critical threshold"));
+        printf ("  %s\n", _("-l <unit> "));
+        printf ("  %s\n", _("<unit> = seconds, minutes, hours, or days. (default: minutes)"));
+        printf ("  %s\n", _("Thresholds will use the unit specified above."));
         printf (" %s\n", "USEDDISKSPACE =");
         printf ("  %s\n", _("Size and percentage of disk use."));
         printf ("  %s\n", _("Request a -l parameter containing the drive letter only."));
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 1816bf5..00bd4d2 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -163,17 +163,17 @@ main (int argc, char **argv)
 
                 /* Part I - Server Check */
 
-                /* send the OPTIONS request */
-                sprintf (buffer, "DESCRIBE rtsp://%s:%d%s RTSP/1.0\n", host_name,
+                /* send the DESCRIBE request */
+                sprintf (buffer, "DESCRIBE rtsp://%s:%d%s RTSP/1.0\r\n", host_name,
                                                  server_port, server_url);
                 result = send (sd, buffer, strlen (buffer), 0);
 
                 /* send the header sync */
-                sprintf (buffer, "CSeq: 2\n");
+                sprintf (buffer, "CSeq: 2\r\n");
                 result = send (sd, buffer, strlen (buffer), 0);
 
                 /* send a newline so the server knows we're done with the request */
-                sprintf (buffer, "\n");
+                sprintf (buffer, "\r\n");
                 result = send (sd, buffer, strlen (buffer), 0);
 
                 /* watch for the REAL connection string */
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 2c62a23..9d966fa 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -104,6 +104,8 @@ int errcode, excode;
 
 char *server_address = NULL;
 char *community = NULL;
+char **contextargs = NULL;
+char *context = NULL;
 char **authpriv = NULL;
 char *proto = NULL;
 char *seclevel = NULL;
@@ -128,6 +130,7 @@ size_t nunits = 0;
 size_t unitv_size = OID_COUNT_STEP;
 int numoids = 0;
 int numauthpriv = 0;
+int numcontext = 0;
 int verbose = 0;
 int usesnmpgetnext = FALSE;
 char *warning_thresholds = NULL;
@@ -297,8 +300,8 @@ main (int argc, char **argv)
                 snmpcmd = strdup (PATH_TO_SNMPGET);
         }
 
-        /* 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 *));
+        /* 10 arguments to pass before context and authpriv options + 1 for host and numoids. Add one for terminating NULL */
+        command_line = calloc (10 + numcontext + numauthpriv + 1 + numoids + 1, sizeof (char *));
         command_line[0] = snmpcmd;
         command_line[1] = strdup ("-Le");
         command_line[2] = strdup ("-t");
@@ -310,23 +313,27 @@ main (int argc, char **argv)
         command_line[8] = "-v";
         command_line[9] = strdup (proto);
 
+        for (i = 0; i < numcontext; i++) {
+                command_line[10 + i] = contextargs[i];
+        }
+        
         for (i = 0; i < numauthpriv; i++) {
-                command_line[10 + i] = authpriv[i];
+                command_line[10 + numcontext + i] = authpriv[i];
         }
 
-        xasprintf (&command_line[10 + numauthpriv], "%s:%s", server_address, port);
+        xasprintf (&command_line[10 + numcontext + numauthpriv], "%s:%s", server_address, port);
 
         /* This is just for display purposes, so it can remain a string */
-        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]",
+        xasprintf(&cl_hidden_auth, "%s -Le -t %d -r %d -m %s -v %s %s %s %s:%s",
+                snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''", proto, "[context]", "[authpriv]",
                 server_address, port);
 
         for (i = 0; i < numoids; i++) {
-                command_line[10 + numauthpriv + 1 + i] = oids[i];
+                command_line[10 + numcontext + numauthpriv + 1 + i] = oids[i];
                 xasprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);   
         }
 
-        command_line[10 + numauthpriv + 1 + numoids] = NULL;
+        command_line[10 + numcontext + numauthpriv + 1 + numoids] = NULL;
 
         if (verbose)
                 printf ("%s\n", cl_hidden_auth);
@@ -567,6 +574,18 @@ main (int argc, char **argv)
                         len = sizeof(perfstr)-strlen(perfstr)-1;
                         strncat(perfstr, show, len>ptr-show ? ptr-show : len);
 
+                        if (warning_thresholds) {
+                                strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1);
+                                strncat(perfstr, warning_thresholds, sizeof(perfstr)-strlen(perfstr)-1);
+                        }
+
+                        if (critical_thresholds) {
+                                if (!warning_thresholds)
+                                        strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1);
+                                strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1);
+                                strncat(perfstr, critical_thresholds, sizeof(perfstr)-strlen(perfstr)-1);
+                        }
+
                         if (type)
                                 strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
                         strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
@@ -646,6 +665,7 @@ process_arguments (int argc, char **argv)
                 {"retries", required_argument, 0, 'e'},
                 {"miblist", required_argument, 0, 'm'},
                 {"protocol", required_argument, 0, 'P'},
+                {"context", required_argument, 0, 'N'},
                 {"seclevel", required_argument, 0, 'L'},
                 {"secname", required_argument, 0, 'U'},
                 {"authproto", required_argument, 0, 'a'},
@@ -675,7 +695,7 @@ process_arguments (int argc, char **argv)
         }
 
         while (1) {
-                c = getopt_long (argc, argv, "nhvVOt:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:L:U:a:x:A:X:",
+                c = getopt_long (argc, argv, "nhvVOt:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:",
                                                                          longopts, &option);
 
                 if (c == -1 || c == EOF)
@@ -713,6 +733,9 @@ process_arguments (int argc, char **argv)
                 case 'P':       /* SNMP protocol version */
                         proto = optarg;
                         break;
+                case 'N':       /* SNMPv3 context */
+                        context = optarg;
+                        break;
                 case 'L':       /* security level */
                         seclevel = optarg;
                         break;
@@ -960,6 +983,13 @@ validate_arguments ()
                 authpriv[1] = strdup (community);
         }
         else if ( strcmp (proto, "3") == 0 ) {          /* snmpv3 args */
+                if (!(context == NULL)) {
+                        numcontext = 2;
+                        contextargs = calloc (numcontext, sizeof (char *));
+                        contextargs[0] = strdup ("-n");
+                        contextargs[1] = strdup (context);
+                }
+                
                 if (seclevel == NULL)
                         xasprintf(&seclevel, "noAuthNoPriv");
 
@@ -1103,6 +1133,8 @@ print_help (void)
         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", "-N, --context=CONTEXT");
+        printf ("    %s\n", _("SNMPv3 context"));
         printf (" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]");
         printf ("    %s\n", _("SNMPv3 securityLevel"));
         printf (" %s\n", "-a, --authproto=[MD5|SHA]");
@@ -1210,6 +1242,6 @@ print_usage (void)
         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");
+        printf ("[-m miblist] [-P snmp version] [-N context] [-L seclevel] [-U secname]\n");
+        printf ("[-a authproto] [-A authpasswd] [-x privproto] [-X privpasswd]\n");
 }
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index b6187d6..3658965 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -253,18 +253,18 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol
 
                 if (remote_version && strcmp(remote_version, ssh_server)) {
                         printf
-                                (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
+                                (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"),
                                  ssh_server, ssh_proto, remote_version);
                         close(sd);
-                        exit (STATE_WARNING);
+                        exit (STATE_CRITICAL);
                 }
 
                 if (remote_protocol && strcmp(remote_protocol, ssh_proto)) {
                         printf
-                                (_("SSH WARNING - %s (protocol %s) protocol version mismatch, expected '%s'\n"),
+                                (_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"),
                                  ssh_server, ssh_proto, remote_protocol);
                         close(sd);
-                        exit (STATE_WARNING);
+                        exit (STATE_CRITICAL);
                 }
 
                 elapsed_time = (double)deltime(tv) / 1.0e6;
@@ -307,10 +307,10 @@ print_help (void)
         printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (" %s\n", "-r, --remote-version=STRING");
-  printf ("    %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
+  printf ("    %s\n", _("Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
 
         printf (" %s\n", "-P, --remote-protocol=STRING");
-  printf ("    %s\n", _("Warn if protocol doesn't match expected protocol version (ex: 2.0)"));
+  printf ("    %s\n", _("Alert if protocol doesn't match expected protocol version (ex: 2.0)"));
 
         printf (UT_VERBOSE);
 
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 88a2a2a..25e0bac 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 * 
-* Monitoring check_disk plugin
+* Monitoring check_swap plugin
 * 
 * License: GPL
 * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
@@ -352,6 +352,7 @@ main (int argc, char **argv)
                 percent_used = 100 * ((double) used_swap_mb) / ((double) total_swap_mb);
         } else {
                 percent_used = 100;
+                status = "- Swap is either disabled, not present, or of zero size. ";
         }
 
         result = max_state (result, check_swap (percent_used, free_swap_mb));