X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_fping.c;h=4e6533fa359e537f6be0076b7ba6b4bef69d609c;hb=25d1ee331dbe4977a4a1a756c67f32bd51d9b070;hp=5a24ab455a0afb6622115a3a6e9c4c8d0ee27107;hpb=fa4efcdf6df1096ff1f6740c7f44b213b47dc9d3;p=nagiosplug.git
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 5a24ab4..4e6533f 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -5,8 +5,6 @@
* License: GPL
* Copyright (c) 2000-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_disk plugin
@@ -28,12 +26,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_fping";
-const char *revision = "$Revision$";
const char *copyright = "2000-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
@@ -58,6 +54,8 @@ void print_usage (void);
char *server_name = NULL;
int packet_size = PACKET_SIZE;
int packet_count = PACKET_COUNT;
+int target_timeout = 0;
+int packet_interval = 0;
int verbose = FALSE;
int cpl;
int wpl;
@@ -77,20 +75,29 @@ main (int argc, char **argv)
char *server = NULL;
char *command_line = NULL;
char *input_buffer = NULL;
+ char *option_string = "";
input_buffer = malloc (MAX_INPUT_BUFFER);
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
+ /* Parse extra opts if any */
+ argv=np_extra_opts (&argc, argv, progname);
+
if (process_arguments (argc, argv) == ERROR)
usage4 (_("Could not parse arguments"));
server = strscpy (server, server_name);
/* compose the command */
- asprintf (&command_line, "%s -b %d -c %d %s", PATH_TO_FPING,
- packet_size, packet_count, server);
+ if (target_timeout)
+ asprintf(&option_string, "%s-t %d ", option_string, target_timeout);
+ if (packet_interval)
+ asprintf(&option_string, "%s-p %d ", option_string, packet_interval);
+
+ asprintf (&command_line, "%s %s-b %d -c %d %s", PATH_TO_FPING,
+ option_string, packet_size, packet_count, server);
if (verbose)
printf ("%s\n", command_line);
@@ -204,7 +211,7 @@ textscan (char *buf)
die (status, _("FPING %s - %s (loss=%.0f%% )|%s\n"),
state_text (status), server_name, loss ,
perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100));
-
+
}
else {
status = max_state (status, STATE_WARNING);
@@ -229,6 +236,8 @@ process_arguments (int argc, char **argv)
{"warning", required_argument, 0, 'w'},
{"bytes", required_argument, 0, 'b'},
{"number", required_argument, 0, 'n'},
+ {"target-timeout", required_argument, 0, 'T'},
+ {"interval", required_argument, 0, 'i'},
{"verbose", no_argument, 0, 'v'},
{"version", no_argument, 0, 'V'},
{"help", no_argument, 0, 'h'},
@@ -249,7 +258,7 @@ process_arguments (int argc, char **argv)
}
while (1) {
- c = getopt_long (argc, argv, "+hVvH:c:w:b:n:", longopts, &option);
+ c = getopt_long (argc, argv, "+hVvH:c:w:b:n:T:i:", longopts, &option);
if (c == -1 || c == EOF || c == 1)
break;
@@ -261,7 +270,7 @@ process_arguments (int argc, char **argv)
print_help ();
exit (STATE_OK);
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'v': /* verbose mode */
verbose = TRUE;
@@ -310,6 +319,18 @@ process_arguments (int argc, char **argv)
else
usage (_("Packet count must be a positive integer"));
break;
+ case 'T': /* timeout in msec */
+ if (is_intpos (optarg))
+ target_timeout = atoi (optarg);
+ else
+ usage (_("Target timeout must be a positive integer"));
+ break;
+ case 'i': /* interval in msec */
+ if (is_intpos (optarg))
+ packet_interval = atoi (optarg);
+ else
+ usage (_("Interval must be a positive integer"));
+ break;
}
}
@@ -365,20 +386,21 @@ void
print_help (void)
{
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf ("Copyright (c) 1999 Didi Rieder \n");
printf (COPYRIGHT, copyright, email);
printf ("%s\n", _("This plugin will use the fping command to ping the specified host for a fast check"));
-
+
printf ("%s\n", _("Note that it is necessary to set the suid flag on fping."));
printf ("\n\n");
-
+
print_usage ();
- printf (_(UT_HELP_VRSN));
+ printf (UT_HELP_VRSN);
+ printf (UT_EXTRA_OPTS);
printf (" %s\n", "-H, --hostname=HOST");
printf (" %s\n", _("name or IP Address of host to ping (IP Address bypasses name lookup, reducing system load)"));
@@ -387,15 +409,26 @@ print_help (void)
printf (" %s\n", "-c, --critical=THRESHOLD");
printf (" %s\n", _("critical threshold pair"));
printf (" %s\n", "-b, --bytes=INTEGER");
- printf (" %s\n", _("size of ICMP packet (default: %d)"),PACKET_SIZE);
+ printf (" %s (default: %d)\n", _("size of ICMP packet"),PACKET_SIZE);
printf (" %s\n", "-n, --number=INTEGER");
- printf (" %s\n", _("number of ICMP packets to send (default: %d)"),PACKET_COUNT);
- printf (_(UT_VERBOSE));
+ printf (" %s (default: %d)\n", _("number of ICMP packets to send"),PACKET_COUNT);
+ printf (" %s\n", "-T, --target-timeout=INTEGER");
+ printf (" %s (default: fping's default for -t)\n", _("Target timeout (ms)"),PACKET_COUNT);
+ printf (" %s\n", "-i, --interval=INTEGER");
+ printf (" %s (default: fping's default for -p)\n", _("Interval (ms) between sending packets"),PACKET_COUNT);
+ printf (UT_VERBOSE);
printf ("\n");
- printf (" %s\n", _("THRESHOLD is ,%% where is the round trip average travel time (ms)"));
- printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and is the percentage of"));
- printf (" %s\n", _("packet loss to trigger an alarm state."));
- printf (_(UT_SUPPORT));
+ printf (" %s\n", _("THRESHOLD is ,%% where is the round trip average travel time (ms)"));
+ printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and is the percentage of"));
+ printf (" %s\n", _("packet loss to trigger an alarm state."));
+
+#ifdef NP_EXTRA_OPTS
+ printf ("\n");
+ printf ("%s\n", _("Notes:"));
+ printf (UT_EXTRA_OPTS_NOTES);
+#endif
+
+ printf (UT_SUPPORT);
}
@@ -403,5 +436,5 @@ void
print_usage (void)
{
printf (_("Usage:"));
- printf (" %s -w limit -c limit [-b size] [-n number]\n", progname);
+ printf (" %s -w limit -c limit [-b size] [-n number] [-T number] [-i number]\n", progname);
}