![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 1e1657b4f91651ce02fb30baa60e5715b14ae781..7b844f76678c432b83f440fd54b25659acbd5454 100644 (file)
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
* Nagios check_snmp plugin
*
* License: GPL
-* Copyright (c) 1999-2006 nagios-plugins team
+* Copyright (c) 1999-2007 nagios-plugins team
*
* Last Modified: $Date$
*
*
* This file contains the check_snmp plugin
*
-* Check status of remote machines and obtain sustem information via SNMP
+* Check status of remote machines and obtain system information via SNMP
*
*
* License Information:
const char *progname = "check_snmp";
const char *revision = "$Revision$";
-const char *copyright = "1999-2006";
+const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
#include "common.h"
int validate_arguments (void);
char *clarify_message (char *);
int check_num (int);
-int lu_getll (unsigned long *, char *);
-int lu_getul (unsigned long *, char *);
+int llu_getll (unsigned long long *, char *);
+int llu_getul (unsigned long long *, char *);
char *thisarg (char *str);
char *nextarg (char *str);
void print_usage (void);
size_t unitv_size = 8;
int verbose = FALSE;
int usesnmpgetnext = 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];
+unsigned long long lower_warn_lim[MAX_OIDS];
+unsigned long long upper_warn_lim[MAX_OIDS];
+unsigned long long lower_crit_lim[MAX_OIDS];
+unsigned long long upper_crit_lim[MAX_OIDS];
+unsigned long long response_value[MAX_OIDS];
int check_warning_value = FALSE;
int check_critical_value = FALSE;
int retries = 0;
-unsigned long eval_method[MAX_OIDS];
+unsigned long long eval_method[MAX_OIDS];
char *delimiter;
char *output_delim;
char *miblist = NULL;
int result = STATE_DEPENDENT;
char input_buffer[MAX_INPUT_BUFFER];
char *command_line = NULL;
+ char *cl_hidden_auth = NULL;
char *response = NULL;
char *outbuff;
char *output;
/* create the command line to execute */
if(usesnmpgetnext == TRUE) {
asprintf(&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
- PATH_TO_SNMPGETNEXT, timeout_interval, retries, miblist, proto,
- authpriv, server_address, port, oid);
+ PATH_TO_SNMPGETNEXT, timeout_interval, retries, miblist, proto,
+ authpriv, server_address, port, oid);
+ asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+ PATH_TO_SNMPGETNEXT, timeout_interval, retries, miblist, proto,
+ "[authpriv]", server_address, port, oid);
}else{
asprintf (&command_line, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
- PATH_TO_SNMPGET, timeout_interval, retries, miblist, proto,
- authpriv, server_address, port, oid);
+ PATH_TO_SNMPGET, timeout_interval, retries, miblist, proto,
+ authpriv, server_address, port, oid);
+ asprintf(&cl_hidden_auth, "%s -t %d -r %d -m %s -v %s %s %s:%s %s",
+ PATH_TO_SNMPGET, timeout_interval, retries, miblist, proto,
+ "[authpriv]", server_address, port, oid);
}
if (verbose)
/* run the command */
child_process = spopen (command_line);
if (child_process == NULL) {
- printf (_("Could not open pipe: %s\n"), command_line);
+ printf (_("Could not open pipe: %s\n"), cl_hidden_auth);
exit (STATE_UNKNOWN);
}
+#if 0 /* Removed May 29, 2007 */
child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
if (child_stderr == NULL) {
- printf (_("Could not open stderr for %s\n"), command_line);
+ printf (_("Could not open stderr for %s\n"), cl_hidden_auth);
}
+#endif
while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
asprintf (&output, "%s%s", output, input_buffer);
ptr = output;
- strcat(perfstr, "| ");
+ strncat(perfstr, "| ", sizeof(perfstr)-strlen(perfstr)-1);
while (ptr) {
char *foo;
+ unsigned int copylen;
foo = strstr (ptr, delimiter);
- strncat(perfstr, ptr, foo-ptr);
+ copylen = foo-ptr;
+ if (copylen > sizeof(perfstr)-strlen(perfstr)-1)
+ copylen = sizeof(perfstr)-strlen(perfstr)-1;
+ strncat(perfstr, ptr, copylen);
ptr = foo;
if (ptr == NULL)
show = strstr (response, "Counter32: ") + 11;
strcpy(type, "c");
}
+ else if (strstr (response, "Counter64: ")) {
+ show = strstr (response, "Counter64: ") + 11;
+ strcpy(type, "c");
+ }
else if (strstr (response, "INTEGER: "))
show = strstr (response, "INTEGER: ") + 9;
else if (strstr (response, "STRING: "))
die (STATE_UNKNOWN,_("No valid data returned"));
response_value[i] = strtoul (p2, NULL, 10);
iresult = check_num (i);
- asprintf (&show, "%lu", response_value[i]);
+ asprintf (&show, "%llu", response_value[i]);
}
/* Process this block for string matching */
/* Prepend a label for this OID if there is one */
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)
i++;
- strcat(perfstr, "=");
- strcat(perfstr, show);
+ strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
+ strncat(perfstr, show, sizeof(perfstr)-strlen(perfstr)-1);
if (type)
- strcat(perfstr, type);
- strcat(perfstr, " ");
+ strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
+ strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
} /* end while (ptr) */
if (found == 0)
die (STATE_UNKNOWN,
- _("%s problem - No data received from host\nCMD: %s\n"),
- label,
- command_line);
+ _("%s problem - No data received from host\nCMD: %s\n"),
+ label,
+ cl_hidden_auth);
+#if 0 /* Removed May 29, 2007 */
/* 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);
+#endif
/* close the pipe */
- if (spclose (child_process))
- result = max_state (result, STATE_WARNING);
+ if (spclose (child_process)) {
+ if (result == STATE_OK)
+ result = STATE_UNKNOWN;
+ asprintf (&outbuff, "%s (%s)", outbuff, _("snmpget returned an error status"));
+ }
/* if (nunits == 1 || i == 1) */
/* printf ("%s %s -%s %s\n", label, state_text (result), outbuff, units); */
switch (c) {
case '?': /* usage */
- usage2 (_("Unknown argument"), optarg);
+ usage5 ();
case 'h': /* help */
print_help ();
exit (STATE_OK);
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 'n': /* usesnmpgetnext */
+ case 'n': /* usesnmpgetnext */
usesnmpgetnext = TRUE;
break;
- case 'P': /* SNMP protocol version */
+ 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 'A': /* auth passwd */
authpasswd = optarg;
break;
- case 'X': /* priv passwd */
+ case 'X': /* priv passwd */
privpasswd = optarg;
break;
case 't': /* timeout period */
/* Test parameters */
case 'c': /* critical time threshold */
if (strspn (optarg, "0123456789:,") < strlen (optarg))
- usage2 (_("Invalid critical threshold: %s\n"), optarg);
+ usage2 (_("Invalid critical threshold"), optarg);
for (ptr = optarg; ptr && jj < MAX_OIDS; jj++) {
- if (lu_getll (&lower_crit_lim[jj], ptr) == 1)
+ if (llu_getll (&lower_crit_lim[jj], ptr) == 1)
eval_method[jj] |= CRIT_LT;
- if (lu_getul (&upper_crit_lim[jj], ptr) == 1)
+ if (llu_getul (&upper_crit_lim[jj], ptr) == 1)
eval_method[jj] |= CRIT_GT;
(ptr = index (ptr, ',')) ? ptr++ : ptr;
}
break;
case 'w': /* warning time threshold */
if (strspn (optarg, "0123456789:,") < strlen (optarg))
- usage2 (_("Invalid warning threshold: %s\n"), optarg);
+ usage2 (_("Invalid warning threshold"), optarg);
for (ptr = optarg; ptr && ii < MAX_OIDS; ii++) {
- if (lu_getll (&lower_warn_lim[ii], ptr) == 1)
+ if (llu_getll (&lower_warn_lim[ii], ptr) == 1)
eval_method[ii] |= WARN_LT;
- if (lu_getul (&upper_warn_lim[ii], ptr) == 1)
+ if (llu_getul (&upper_warn_lim[ii], ptr) == 1)
eval_method[ii] |= WARN_GT;
(ptr = index (ptr, ',')) ? ptr++ : ptr;
}
retries = atoi(optarg);
break;
case 'o': /* object identifier */
- if ( strspn( optarg, "0123456789." ) != strlen( optarg ) ) {
+ if ( strspn( optarg, "0123456789.," ) != strlen( optarg ) ) {
/*
- * we have something other than digits and periods, so we
- * have a mib variable, rather than just an SNMP OID, so
- * we have to actually read the mib files
+ * 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 (proto == NULL || (strcmp(proto,DEFAULT_PROTOCOL) == 0) ) { /* default protocol version */
+ if (proto == NULL || (strcmp(proto,DEFAULT_PROTOCOL) == 0) ) { /* default protocol version */
asprintf(&proto, DEFAULT_PROTOCOL);
asprintf(&authpriv, "%s%s", "-c ", community);
}
- else if ( strcmp (proto, "2c") == 0 ) { /* snmpv2c args */
+ else if ( strcmp (proto, "2c") == 0 ) { /* snmpv2c args */
asprintf(&authpriv, "%s%s", "-c ", community);
}
- else if ( strcmp (proto, "3") == 0 ) { /* snmpv3 args */
+ else if ( strcmp (proto, "3") == 0 ) { /* snmpv3 args */
asprintf(&proto, "%s", "3");
if ( (strcmp(seclevel, "noAuthNoPriv") == 0) || seclevel == NULL ) {
int
-lu_getll (unsigned long *ll, char *str)
+llu_getll (unsigned long 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)
+ if (sscanf (str, "%llu%[:]", ll, tmp) == 2)
return 1;
return 0;
}
int
-lu_getul (unsigned long *ul, char *str)
+llu_getul (unsigned long long *ul, char *str)
{
char tmp[100];
- if (sscanf (str, "%lu%[^,]", ul, tmp) == 1)
+ if (sscanf (str, "%llu%[^,]", ul, tmp) == 1)
return 1;
- if (sscanf (str, ":%lu%[^,]", ul, tmp) == 1)
+ if (sscanf (str, ":%llu%[^,]", ul, tmp) == 1)
return 1;
- if (sscanf (str, "%*u:%lu%[^,]", ul, tmp) == 1)
+ if (sscanf (str, "%*u:%llu%[^,]", ul, tmp) == 1)
return 1;
return 0;
}
/* Authentication Tokens*/
printf (" %s\n", "-C, --community=STRING");
- printf (" %s\n", _("Optional community string for SNMP communication"));
- printf (_("(default is \"%s\")"),DEFAULT_COMMUNITY);
+ 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 crypt passwd (DES)"));
+ printf (" %s\n", _("SNMPv3 privacy password"));
/* OID Stuff */
printf (" %s\n", "-o, --oid=OID(s)");