summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--plugins/check_fping.c34
2 files changed, 31 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index ab8844f..ecfd67e 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,7 @@ This file documents the major additions and syntax changes between releases.
38 Fixed wrong perfdata label for output traffic in check_mrtgtraf (#2654308 - Gavin Williams) 38 Fixed wrong perfdata label for output traffic in check_mrtgtraf (#2654308 - Gavin Williams)
39 Fixed check_by_ssh interpretation of quotes in -C parameter (#1985246, #2268675) 39 Fixed check_by_ssh interpretation of quotes in -C parameter (#1985246, #2268675)
40 check_snmp now supports standard threshold ranges and doubles (floating numbers) in thresholds 40 check_snmp now supports standard threshold ranges and doubles (floating numbers) in thresholds
41 check_fping now supports passing target timeout and interval to fping (#2347686 - Martin Foster)
41 42
421.4.13 25th Sept 2008 431.4.13 25th Sept 2008
43 Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen) 44 Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 75c7860..b27389d 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -54,6 +54,8 @@ void print_usage (void);
54char *server_name = NULL; 54char *server_name = NULL;
55int packet_size = PACKET_SIZE; 55int packet_size = PACKET_SIZE;
56int packet_count = PACKET_COUNT; 56int packet_count = PACKET_COUNT;
57int target_timeout = 0;
58int packet_interval = 0;
57int verbose = FALSE; 59int verbose = FALSE;
58int cpl; 60int cpl;
59int wpl; 61int wpl;
@@ -73,6 +75,7 @@ main (int argc, char **argv)
73 char *server = NULL; 75 char *server = NULL;
74 char *command_line = NULL; 76 char *command_line = NULL;
75 char *input_buffer = NULL; 77 char *input_buffer = NULL;
78 char *option_string = "";
76 input_buffer = malloc (MAX_INPUT_BUFFER); 79 input_buffer = malloc (MAX_INPUT_BUFFER);
77 80
78 setlocale (LC_ALL, ""); 81 setlocale (LC_ALL, "");
@@ -88,8 +91,13 @@ main (int argc, char **argv)
88 server = strscpy (server, server_name); 91 server = strscpy (server, server_name);
89 92
90 /* compose the command */ 93 /* compose the command */
91 asprintf (&command_line, "%s -b %d -c %d %s", PATH_TO_FPING, 94 if (target_timeout)
92 packet_size, packet_count, server); 95 asprintf(&option_string, "%s-t %d ", option_string, target_timeout);
96 if (packet_interval)
97 asprintf(&option_string, "%s-p %d ", option_string, packet_interval);
98
99 asprintf (&command_line, "%s %s-b %d -c %d %s", PATH_TO_FPING,
100 option_string, packet_size, packet_count, server);
93 101
94 if (verbose) 102 if (verbose)
95 printf ("%s\n", command_line); 103 printf ("%s\n", command_line);
@@ -228,6 +236,8 @@ process_arguments (int argc, char **argv)
228 {"warning", required_argument, 0, 'w'}, 236 {"warning", required_argument, 0, 'w'},
229 {"bytes", required_argument, 0, 'b'}, 237 {"bytes", required_argument, 0, 'b'},
230 {"number", required_argument, 0, 'n'}, 238 {"number", required_argument, 0, 'n'},
239 {"target-timeout", required_argument, 0, 'T'},
240 {"interval", required_argument, 0, 'i'},
231 {"verbose", no_argument, 0, 'v'}, 241 {"verbose", no_argument, 0, 'v'},
232 {"version", no_argument, 0, 'V'}, 242 {"version", no_argument, 0, 'V'},
233 {"help", no_argument, 0, 'h'}, 243 {"help", no_argument, 0, 'h'},
@@ -248,7 +258,7 @@ process_arguments (int argc, char **argv)
248 } 258 }
249 259
250 while (1) { 260 while (1) {
251 c = getopt_long (argc, argv, "+hVvH:c:w:b:n:", longopts, &option); 261 c = getopt_long (argc, argv, "+hVvH:c:w:b:n:T:i:", longopts, &option);
252 262
253 if (c == -1 || c == EOF || c == 1) 263 if (c == -1 || c == EOF || c == 1)
254 break; 264 break;
@@ -309,6 +319,18 @@ process_arguments (int argc, char **argv)
309 else 319 else
310 usage (_("Packet count must be a positive integer")); 320 usage (_("Packet count must be a positive integer"));
311 break; 321 break;
322 case 'T': /* timeout in msec */
323 if (is_intpos (optarg))
324 target_timeout = atoi (optarg);
325 else
326 usage (_("Target timeout must be a positive integer"));
327 break;
328 case 'i': /* interval in msec */
329 if (is_intpos (optarg))
330 packet_interval = atoi (optarg);
331 else
332 usage (_("Interval must be a positive integer"));
333 break;
312 } 334 }
313 } 335 }
314 336
@@ -390,6 +412,10 @@ print_help (void)
390 printf (" %s (default: %d)\n", _("size of ICMP packet"),PACKET_SIZE); 412 printf (" %s (default: %d)\n", _("size of ICMP packet"),PACKET_SIZE);
391 printf (" %s\n", "-n, --number=INTEGER"); 413 printf (" %s\n", "-n, --number=INTEGER");
392 printf (" %s (default: %d)\n", _("number of ICMP packets to send"),PACKET_COUNT); 414 printf (" %s (default: %d)\n", _("number of ICMP packets to send"),PACKET_COUNT);
415 printf (" %s\n", "-T, --target-timeout=INTEGER");
416 printf (" %s (default: fping's default for -t)\n", _("Target timeout (ms)"),PACKET_COUNT);
417 printf (" %s\n", "-i, --interval=INTEGER");
418 printf (" %s (default: fping's default for -p)\n", _("Interval (ms) between sending packets"),PACKET_COUNT);
393 printf (_(UT_VERBOSE)); 419 printf (_(UT_VERBOSE));
394 printf ("\n"); 420 printf ("\n");
395 printf (" %s\n", _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)")); 421 printf (" %s\n", _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)"));
@@ -410,5 +436,5 @@ void
410print_usage (void) 436print_usage (void)
411{ 437{
412 printf (_("Usage:")); 438 printf (_("Usage:"));
413 printf (" %s <host_address> -w limit -c limit [-b size] [-n number]\n", progname); 439 printf (" %s <host_address> -w limit -c limit [-b size] [-n number] [-T number] [-i number]\n", progname);
414} 440}