![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index b61b41b503cc4ff6fd032293cd57504e2b49c91e..0c0f2e44f2872e0d4601e683c9b733dd596ecc3c 100644 (file)
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
*
*****************************************************************************/
-#define PROGNAME "check_pgsql"
+const char *progname = "check_ping";
#define REVISION "$Revision$"
#define COPYRIGHT "1999-2001"
#define AUTHOR "Ethan Galstad/Karl DeBisschop"
#define WARN_DUPLICATES "DUPLICATES FOUND! "
int process_arguments (int, char **);
-int call_getopt (int, char **);
int get_threshold (char *, float *, int *);
int validate_arguments (void);
int run_ping (char *);
if (process_arguments (argc, argv) == ERROR)
usage ("Could not parse arguments");
+ exit;
/* does the host address of number of packets argument come first? */
#ifdef PING_PACKETS_FIRST
- command_line =
- ssprintf (command_line, PING_COMMAND, max_packets, server_address);
+ asprintf (&command_line, PING_COMMAND, max_packets, server_address);
#else
- command_line =
- ssprintf (command_line, PING_COMMAND, server_address, max_packets);
+ asprintf (&command_line, PING_COMMAND, server_address, max_packets);
#endif
/* Set signal handling and alarm */
else if (pl >= wpl || rta >= wrta)
result = STATE_WARNING;
else if (pl < wpl && rta < wrta && pl >= 0 && rta >= 0)
- result = max (result, STATE_OK);
-
+ /* cannot use the max function because STATE_UNKNOWN is now 3 gt STATE_OK
+ result = max (result, STATE_OK); */
+ if( !( (result == STATE_WARNING) || (result == STATE_CRITICAL) ) ) {
+ result = STATE_OK;
+ }
+
if (display_html == TRUE)
printf ("<A HREF='%s/traceroute.cgi?%s'>", CGIURL, server_address);
if (pl == 100)
int
process_arguments (int argc, char **argv)
{
- int c;
+ int c = 1;
+
+#ifdef HAVE_GETOPT_H
+ int option_index = 0;
+ static struct option long_options[] = {
+ STD_LONG_OPTS,
+ {"packets", required_argument, 0, 'p'},
+ {"nohtml", no_argument, 0, 'n'},
+ {"link", no_argument, 0, 'L'},
+ {0, 0, 0, 0}
+ };
+#endif
+
+#define OPTCHARS "Vvht:c:w:H:p:nL"
if (argc < 2)
return ERROR;
strcpy (argv[c], "-n");
}
- c = 0;
- while ((c += call_getopt (argc - c, &argv[c])) < argc) {
-
- if (is_option (argv[c]))
- continue;
-
- if (server_address == NULL) {
- if (is_host (argv[c]) == FALSE) {
- printf ("Invalid host name/address: %s\n\n", argv[c]);
- return ERROR;
- }
- server_address = argv[c];
- }
- else if (wpl == UNKNOWN_PACKET_LOSS) {
- if (is_intpercent (argv[c]) == FALSE) {
- printf ("<wpl> (%s) must be an integer percentage\n", argv[c]);
- return ERROR;
- }
- wpl = atoi (argv[c]);
- }
- else if (cpl == UNKNOWN_PACKET_LOSS) {
- if (is_intpercent (argv[c]) == FALSE) {
- printf ("<cpl> (%s) must be an integer percentage\n", argv[c]);
- return ERROR;
- }
- cpl = atoi (argv[c]);
- }
- else if (wrta == UNKNOWN_TRIP_TIME) {
- if (is_negative (argv[c])) {
- printf ("<wrta> (%s) must be a non-negative number\n", argv[c]);
- return ERROR;
- }
- wrta = atof (argv[c]);
- }
- else if (crta == UNKNOWN_TRIP_TIME) {
- if (is_negative (argv[c])) {
- printf ("<crta> (%s) must be a non-negative number\n", argv[c]);
- return ERROR;
- }
- crta = atof (argv[c]);
- }
- else if (max_packets == -1) {
- if (is_intnonneg (argv[c])) {
- max_packets = atoi (argv[c]);
- }
- else {
- printf ("<max_packets> (%s) must be a non-negative number\n",
- argv[c]);
- return ERROR;
- }
- }
-
- }
-
- return validate_arguments ();
-}
-
-int
-call_getopt (int argc, char **argv)
-{
- int c, i = 0;
-
-#ifdef HAVE_GETOPT_H
- int option_index = 0;
- static struct option long_options[] = {
- {"help", no_argument, 0, 'h'},
- {"version", no_argument, 0, 'V'},
- {"verbose", no_argument, 0, 'v'},
- {"nohtml", no_argument, 0, 'n'},
- {"link", no_argument, 0, 'L'},
- {"timeout", required_argument, 0, 't'},
- {"critical", required_argument, 0, 'c'},
- {"warning", required_argument, 0, 'w'},
- {"hostname", required_argument, 0, 'H'},
- {"packets", required_argument, 0, 'p'},
- {0, 0, 0, 0}
- };
-#endif
-
while (1) {
#ifdef HAVE_GETOPT_H
- c =
- getopt_long (argc, argv, "+hVvt:c:w:H:p:nL", long_options,
- &option_index);
+ c = getopt_long (argc, argv, OPTCHARS, long_options, &option_index);
#else
- c = getopt (argc, argv, "+hVvt:c:w:H:p:nL");
+ c = getopt (argc, argv, OPTCHARS);
#endif
-
- i++;
-
- if (c == -1 || c == EOF || c == 1)
+ if (c == -1 || c == EOF)
break;
switch (c) {
- case 't':
- case 'c':
- case 'w':
- case 'H':
- case 'p':
- i++;
- }
-
- switch (c) {
- case '?': /* print short usage statement if args not parsable */
- usage2 ("Unknown argument", optarg);
- case 'h': /* help */
+ case '?': /* usage */
+ usage3 ("Unknown argument", optopt);
+ case 'h': /* help */
print_help ();
exit (STATE_OK);
- case 'V': /* version */
- print_revision (PROGNAME, REVISION);
+ case 'V': /* version */
+ print_revision (progname, REVISION);
exit (STATE_OK);
- case 't': /* timeout period */
+ case 't': /* timeout period */
timeout_interval = atoi (optarg);
break;
- case 'v': /* verbose mode */
+ case 'v': /* verbose mode */
verbose = TRUE;
break;
- case 'H': /* hostname */
+ case 'H': /* hostname */
if (is_host (optarg) == FALSE)
usage2 ("Invalid host name/address", optarg);
server_address = optarg;
break;
- case 'p': /* number of packets to send */
+ case 'p': /* number of packets to send */
if (is_intnonneg (optarg))
max_packets = atoi (optarg);
else
usage2 ("<max_packets> (%s) must be a non-negative number\n", optarg);
break;
- case 'n': /* no HTML */
+ case 'n': /* no HTML */
display_html = FALSE;
break;
- case 'L': /* show HTML */
+ case 'L': /* show HTML */
display_html = TRUE;
break;
case 'c':
}
}
- return i;
+ c = optind;
+ if (c == argc)
+ return validate_arguments ();
+
+ if (server_address == NULL) {
+ if (is_host (argv[c]) == FALSE) {
+ printf ("Invalid host name/address: %s\n\n", argv[c]);
+ return ERROR;
+ } else {
+ server_address = argv[c++];
+ if (c == argc)
+ return validate_arguments ();
+ }
+ }
+
+ if (wpl == UNKNOWN_PACKET_LOSS) {
+ if (is_intpercent (argv[c]) == FALSE) {
+ printf ("<wpl> (%s) must be an integer percentage\n", argv[c]);
+ return ERROR;
+ } else {
+ wpl = atoi (argv[c++]);
+ if (c == argc)
+ return validate_arguments ();
+ }
+ }
+
+ if (cpl == UNKNOWN_PACKET_LOSS) {
+ if (is_intpercent (argv[c]) == FALSE) {
+ printf ("<cpl> (%s) must be an integer percentage\n", argv[c]);
+ return ERROR;
+ } else {
+ cpl = atoi (argv[c++]);
+ if (c == argc)
+ return validate_arguments ();
+ }
+ }
+
+ if (wrta == UNKNOWN_TRIP_TIME) {
+ if (is_negative (argv[c])) {
+ printf ("<wrta> (%s) must be a non-negative number\n", argv[c]);
+ return ERROR;
+ } else {
+ wrta = atof (argv[c++]);
+ if (c == argc)
+ return validate_arguments ();
+ }
+ }
+
+ if (crta == UNKNOWN_TRIP_TIME) {
+ if (is_negative (argv[c])) {
+ printf ("<crta> (%s) must be a non-negative number\n", argv[c]);
+ return ERROR;
+ } else {
+ crta = atof (argv[c++]);
+ if (c == argc)
+ return validate_arguments ();
+ }
+ }
+
+ if (max_packets == -1) {
+ if (is_intnonneg (argv[c])) {
+ max_packets = atoi (argv[c++]);
+ } else {
+ printf ("<max_packets> (%s) must be a non-negative number\n", argv[c]);
+ return ERROR;
+ }
+ }
+
+ return validate_arguments ();
}
int
return OK;
else
usage2 ("%s: Warning threshold must be integer or percentage!\n\n", arg);
-
}
int
while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
if (strstr (input_buffer, "(DUP!)")) {
- result = max (result, STATE_WARNING);
+ /* cannot use the max function since STATE_UNKNOWN is max
+ result = max (result, STATE_WARNING); */
+ if( !(result == STATE_CRITICAL) ){
+ result = STATE_WARNING;
+ }
+
warn_text = realloc (warn_text, strlen (WARN_DUPLICATES) + 1);
if (warn_text == NULL)
terminate (STATE_UNKNOWN, "unable to realloc warn_text");
/* get the percent loss statistics */
if (sscanf
- (input_buffer,
- "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss",
- &pl) == 1
- || sscanf (input_buffer,
- "%*d packets transmitted, %*d packets received, %d%% packet loss",
- &pl) == 1)
+ (input_buffer, "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss",
+ &pl) == 1
+ || sscanf
+ (input_buffer, "%*d packets transmitted, %*d packets received, %d%% packet loss",
+ &pl) == 1
+ || sscanf
+ (input_buffer, "%*d packets transmitted, %*d packets received, %d%% loss, time", &pl) == 1
+ || sscanf
+ (input_buffer, "%*d packets transmitted, %*d received, %d%% loss, time", &pl) == 1
+ /* Suse 8.0 as reported by Richard * Brodie */
+ )
continue;
/* get the round trip average */
"round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f",
&rta) == 1
|| sscanf (input_buffer, "round-trip (ms) min/avg/max = %*f/%f/%*f",
- &rta) == 1)
+ &rta) == 1
+ || sscanf (input_buffer, "rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms",
+ &rta) == 1
+ )
continue;
}
else if (strstr (input_buffer, "Destination Host Unreachable"))
terminate (STATE_CRITICAL, "PING CRITICAL - Host Unreachable (%s)",
server_address);
+ else if (strstr (input_buffer, "unknown host" ) )
+ terminate (STATE_CRITICAL, "PING CRITICAL - Host not found (%s)",
+ server_address);
warn_text =
realloc (warn_text, strlen (warn_text) + strlen (input_buffer) + 2);
else
sprintf (warn_text, "%s %s", warn_text, input_buffer);
- if (strstr (input_buffer, "DUPLICATES FOUND"))
- result = max (result, STATE_WARNING);
+ if (strstr (input_buffer, "DUPLICATES FOUND")) {
+ if( !(result == STATE_CRITICAL) ){
+ result = STATE_WARNING;
+ }
+ }
else
- result = max (result, STATE_CRITICAL);
+ result = STATE_CRITICAL ;
}
(void) fclose (child_stderr);
/* close the pipe - WARNING if status is set */
if (spclose (child_process))
- result = max (result, STATE_WARNING);
+ result = max_state (result, STATE_WARNING);
return result;
}
-\f
+
void
print_usage (void)
" %s -h for detailed help\n"
" %s -V for version information\n",
#endif
- PROGNAME, OPTIONS, PROGNAME, PROGNAME);
+ progname, OPTIONS, progname, progname);
}
void
print_help (void)
{
- print_revision (PROGNAME, REVISION);
+ print_revision (progname, REVISION);
printf
("Copyright (c) %s %s <%s>\n\n%s\n",
COPYRIGHT, AUTHOR, EMAIL, SUMMARY);