diff options
Diffstat (limited to 'web/attachments/428489-check_ping-seconds-perfdata.diff')
-rw-r--r-- | web/attachments/428489-check_ping-seconds-perfdata.diff | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/web/attachments/428489-check_ping-seconds-perfdata.diff b/web/attachments/428489-check_ping-seconds-perfdata.diff new file mode 100644 index 0000000..78b01f6 --- /dev/null +++ b/web/attachments/428489-check_ping-seconds-perfdata.diff | |||
@@ -0,0 +1,67 @@ | |||
1 | diff -u -p -b check_ping.c.v0 check_ping.c | ||
2 | --- check_ping.c.v0 2011-11-15 13:00:48.823063478 +0100 | ||
3 | +++ check_ping.c 2011-11-15 13:28:40.819060887 +0100 | ||
4 | @@ -54,6 +54,7 @@ void print_usage (void); | ||
5 | void print_help (void); | ||
6 | |||
7 | int display_html = FALSE; | ||
8 | +int perfdata_seconds = FALSE; | ||
9 | int wpl = UNKNOWN_PACKET_LOSS; | ||
10 | int cpl = UNKNOWN_PACKET_LOSS; | ||
11 | float wrta = UNKNOWN_TRIP_TIME; | ||
12 | @@ -163,6 +164,12 @@ main (int argc, char **argv) | ||
13 | printf ("</A>"); | ||
14 | |||
15 | /* Print performance data */ | ||
16 | + if (perfdata_seconds) | ||
17 | + printf("|%s", fperfdata ("rta", (double) (rta/1000), "s", | ||
18 | + wrta>0?TRUE:FALSE, wrta/1000, | ||
19 | + crta>0?TRUE:FALSE, crta/1000, | ||
20 | + TRUE, 0, FALSE, 0)); | ||
21 | + else | ||
22 | printf("|%s", fperfdata ("rta", (double) rta, "ms", | ||
23 | wrta>0?TRUE:FALSE, wrta, | ||
24 | crta>0?TRUE:FALSE, crta, | ||
25 | @@ -200,6 +207,7 @@ process_arguments (int argc, char **argv | ||
26 | {"link", no_argument, 0, 'L'}, | ||
27 | {"use-ipv4", no_argument, 0, '4'}, | ||
28 | {"use-ipv6", no_argument, 0, '6'}, | ||
29 | + {"seconds", no_argument, 0, 's'}, | ||
30 | {0, 0, 0, 0} | ||
31 | }; | ||
32 | |||
33 | @@ -214,7 +222,7 @@ process_arguments (int argc, char **argv | ||
34 | } | ||
35 | |||
36 | while (1) { | ||
37 | - c = getopt_long (argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option); | ||
38 | + c = getopt_long (argc, argv, "VvhnL46st:c:w:H:p:", longopts, &option); | ||
39 | |||
40 | if (c == -1 || c == EOF) | ||
41 | break; | ||
42 | @@ -283,6 +291,9 @@ process_arguments (int argc, char **argv | ||
43 | case 'w': | ||
44 | get_threshold (optarg, &wrta, &wpl); | ||
45 | break; | ||
46 | + case 's': | ||
47 | + perfdata_seconds = TRUE; | ||
48 | + break; | ||
49 | } | ||
50 | } | ||
51 | |||
52 | @@ -578,6 +589,8 @@ print_help (void) | ||
53 | printf (_("(Default: %d)\n"), DEFAULT_MAX_PACKETS); | ||
54 | printf (" %s\n", "-L, --link"); | ||
55 | printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)")); | ||
56 | + printf (" %s\n", "-s, --seconds"); | ||
57 | + printf (" %s\n", _("output performance data in seconds rather than milliseconds")); | ||
58 | |||
59 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | ||
60 | |||
61 | @@ -600,5 +613,5 @@ print_usage (void) | ||
62 | { | ||
63 | printf ("%s\n", _("Usage:")); | ||
64 | printf ("%s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n", progname); | ||
65 | - printf (" [-p packets] [-t timeout] [-4|-6]\n"); | ||
66 | + printf (" [-p packets] [-t timeout] [-4|-6] [-s]\n"); | ||
67 | } | ||