From 19514d21b90f3ed5e1925fa2a96b3bb9cfc40f02 Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 12 Mar 2025 11:24:53 +0100 Subject: check_ping: clang-format --- plugins/check_ping.c | 138 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 52 deletions(-) (limited to 'plugins/check_ping.c') diff --git a/plugins/check_ping.c b/plugins/check_ping.c index 4aafaf41..526b8618 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -89,8 +89,9 @@ int main(int argc, char **argv) { /* Parse extra opts if any */ argv = np_extra_opts(&argc, argv, progname); - if (process_arguments(argc, argv) == ERROR) + if (process_arguments(argc, argv) == ERROR) { usage4(_("Could not parse arguments")); + } /* Set signal handling and alarm */ if (signal(SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) { @@ -108,15 +109,16 @@ int main(int argc, char **argv) { for (i = 0; i < n_addresses; i++) { #ifdef PING6_COMMAND - if (address_family != AF_INET && is_inet6_addr(addresses[i])) + if (address_family != AF_INET && is_inet6_addr(addresses[i])) { rawcmd = strdup(PING6_COMMAND); - else + } else { rawcmd = strdup(PING_COMMAND); + } #else rawcmd = strdup(PING_COMMAND); #endif - /* does the host address of number of packets argument come first? */ + /* does the host address of number of packets argument come first? */ #ifdef PING_PACKETS_FIRST # ifdef PING_HAS_TIMEOUT xasprintf(&cmd, rawcmd, timeout_interval, max_packets, addresses[i]); @@ -127,8 +129,9 @@ int main(int argc, char **argv) { xasprintf(&cmd, rawcmd, addresses[i], max_packets); #endif - if (verbose >= 2) + if (verbose >= 2) { printf("CMD: %s\n", cmd); + } /* run the command */ this_result = run_ping(cmd, addresses[i]); @@ -138,24 +141,29 @@ int main(int argc, char **argv) { die(STATE_UNKNOWN, _("CRITICAL - Could not interpret output from ping command\n")); } - if (pl >= cpl || rta >= crta || rta < 0) + if (pl >= cpl || rta >= crta || rta < 0) { this_result = STATE_CRITICAL; - else if (pl >= wpl || rta >= wrta) + } else if (pl >= wpl || rta >= wrta) { this_result = STATE_WARNING; - else if (pl >= 0 && rta >= 0) + } else if (pl >= 0 && rta >= 0) { this_result = max_state(STATE_OK, this_result); + } - if (n_addresses > 1 && this_result != STATE_UNKNOWN) + if (n_addresses > 1 && this_result != STATE_UNKNOWN) { die(STATE_OK, "%s is alive\n", addresses[i]); + } - if (display_html == true) + if (display_html == true) { printf("", CGIURL, addresses[i]); - if (pl == 100) + } + if (pl == 100) { printf(_("PING %s - %sPacket loss = %d%%"), state_text(this_result), warn_text, pl); - else + } else { printf(_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"), state_text(this_result), warn_text, pl, rta); - if (display_html == true) + } + if (display_html == true) { printf(""); + } /* Print performance data */ if (pl != 100) { @@ -166,8 +174,9 @@ int main(int argc, char **argv) { } printf(" %s\n", perfdata("pl", (long)pl, "%", wpl > 0 ? true : false, wpl, cpl > 0 ? true : false, cpl, true, 0, false, 0)); - if (verbose >= 2) + if (verbose >= 2) { printf("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl); + } result = max_state(result, this_result); free(rawcmd); @@ -191,21 +200,25 @@ int process_arguments(int argc, char **argv) { {"use-ipv6", no_argument, 0, '6'}, {0, 0, 0, 0}}; - if (argc < 2) + if (argc < 2) { return ERROR; + } for (c = 1; c < argc; c++) { - if (strcmp("-to", argv[c]) == 0) + if (strcmp("-to", argv[c]) == 0) { strcpy(argv[c], "-t"); - if (strcmp("-nohtml", argv[c]) == 0) + } + if (strcmp("-nohtml", argv[c]) == 0) { strcpy(argv[c], "-n"); + } } while (1) { c = getopt_long(argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option); - if (c == -1 || c == EOF) + if (c == -1 || c == EOF) { break; + } switch (c) { case '?': /* usage */ @@ -241,8 +254,9 @@ int process_arguments(int argc, char **argv) { if (n_addresses > max_addr) { max_addr *= 2; addresses = realloc(addresses, sizeof(char *) * max_addr); - if (addresses == NULL) + if (addresses == NULL) { die(STATE_UNKNOWN, _("Could not realloc() addresses\n")); + } } addresses[n_addresses - 1] = ptr; if ((ptr = index(ptr, ','))) { @@ -254,10 +268,11 @@ int process_arguments(int argc, char **argv) { } break; case 'p': /* number of packets to send */ - if (is_intnonneg(optarg)) + if (is_intnonneg(optarg)) { max_packets = atoi(optarg); - else + } else { usage2(_(" (%s) must be a non-negative number\n"), optarg); + } break; case 'n': /* no HTML */ display_html = false; @@ -275,8 +290,9 @@ int process_arguments(int argc, char **argv) { } c = optind; - if (c == argc) + if (c == argc) { return validate_arguments(); + } if (addresses[0] == NULL) { if (!is_host(argv[c])) { @@ -284,8 +300,9 @@ int process_arguments(int argc, char **argv) { } else { addresses[0] = argv[c++]; n_addresses++; - if (c == argc) + if (c == argc) { return validate_arguments(); + } } } @@ -295,8 +312,9 @@ int process_arguments(int argc, char **argv) { return ERROR; } else { wpl = atoi(argv[c++]); - if (c == argc) + if (c == argc) { return validate_arguments(); + } } } @@ -306,8 +324,9 @@ int process_arguments(int argc, char **argv) { return ERROR; } else { cpl = atoi(argv[c++]); - if (c == argc) + if (c == argc) { return validate_arguments(); + } } } @@ -317,8 +336,9 @@ int process_arguments(int argc, char **argv) { return ERROR; } else { wrta = atof(argv[c++]); - if (c == argc) + if (c == argc) { return validate_arguments(); + } } } @@ -328,8 +348,9 @@ int process_arguments(int argc, char **argv) { return ERROR; } else { crta = atof(argv[c++]); - if (c == argc) + if (c == argc) { return validate_arguments(); + } } } @@ -346,12 +367,13 @@ int process_arguments(int argc, char **argv) { } int get_threshold(char *arg, float *trta, int *tpl) { - if (is_intnonneg(arg) && sscanf(arg, "%f", trta) == 1) + if (is_intnonneg(arg) && sscanf(arg, "%f", trta) == 1) { return OK; - else if (strpbrk(arg, ",:") && strstr(arg, "%") && sscanf(arg, "%f%*[:,]%d%%", trta, tpl) == 2) + } else if (strpbrk(arg, ",:") && strstr(arg, "%") && sscanf(arg, "%f%*[:,]%d%%", trta, tpl) == 2) { return OK; - else if (strstr(arg, "%") && sscanf(arg, "%d%%", tpl) == 1) + } else if (strstr(arg, "%") && sscanf(arg, "%d%%", tpl) == 1) { return OK; + } usage2(_("%s: Warning threshold must be integer or percentage!\n\n"), arg); return STATE_UNKNOWN; @@ -381,16 +403,19 @@ int validate_arguments() { return ERROR; } - if (max_packets == -1) + if (max_packets == -1) { max_packets = DEFAULT_MAX_PACKETS; + } max_seconds = crta / 1000.0 * max_packets + max_packets; - if (max_seconds > timeout_interval) + if (max_seconds > timeout_interval) { timeout_interval = (int)max_seconds; + } for (i = 0; i < n_addresses; i++) { - if (!is_host(addresses[i])) + if (!is_host(addresses[i])) { usage2(_("Invalid hostname/address"), addresses[i]); + } } if (n_addresses == 0) { @@ -405,17 +430,20 @@ int run_ping(const char *cmd, const char *addr) { int result = STATE_UNKNOWN; int match; - if ((child_process = spopen(cmd)) == NULL) + if ((child_process = spopen(cmd)) == NULL) { die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd); + } child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r"); - if (child_stderr == NULL) + if (child_stderr == NULL) { printf(_("Cannot open stderr for %s\n"), cmd); + } while (fgets(buf, MAX_INPUT_BUFFER - 1, child_process)) { - if (verbose >= 3) + if (verbose >= 3) { printf("Output: %s", buf); + } result = max_state(result, error_scan(buf, addr)); @@ -430,8 +458,9 @@ int run_ping(const char *cmd, const char *addr) { (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &pl, &match) && match) || (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) || (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) || - (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &pl, &match) && match)) + (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &pl, &match) && match)) { continue; + } /* get the round trip average */ else if ((sscanf(buf, "round-trip min/avg/max = %*f/%f/%*f%n", &rta, &match) && match) || @@ -442,13 +471,15 @@ int run_ping(const char *cmd, const char *addr) { (sscanf(buf, "round-trip (ms) min/avg/max = %*f/%f/%*f%n", &rta, &match) && match) || (sscanf(buf, "round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n", &rta, &match) && match) || (sscanf(buf, "rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n", &rta, &match) && match) || - (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %fms%n", &rta, &match) && match)) + (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %fms%n", &rta, &match) && match)) { continue; + } } /* this is needed because there is no rta if all packets are lost */ - if (pl == 100) + if (pl == 100) { rta = crta; + } /* check stderr, setting at least WARNING if there is output here */ /* Add warning into warn_text */ @@ -474,39 +505,42 @@ int run_ping(const char *cmd, const char *addr) { spclose(child_process); - if (warn_text == NULL) + if (warn_text == NULL) { warn_text = strdup(""); + } return result; } int error_scan(char buf[MAX_INPUT_BUFFER], const char *addr) { - if (strstr(buf, "Network is unreachable") || strstr(buf, "Destination Net Unreachable") || strstr(buf, "No route")) + if (strstr(buf, "Network is unreachable") || strstr(buf, "Destination Net Unreachable") || strstr(buf, "No route")) { die(STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)\n"), addr); - else if (strstr(buf, "Destination Host Unreachable") || strstr(buf, "Address unreachable")) + } else if (strstr(buf, "Destination Host Unreachable") || strstr(buf, "Address unreachable")) { die(STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)\n"), addr); - else if (strstr(buf, "Destination Port Unreachable") || strstr(buf, "Port unreachable")) + } else if (strstr(buf, "Destination Port Unreachable") || strstr(buf, "Port unreachable")) { die(STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"), addr); - else if (strstr(buf, "Destination Protocol Unreachable")) + } else if (strstr(buf, "Destination Protocol Unreachable")) { die(STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"), addr); - else if (strstr(buf, "Destination Net Prohibited")) + } else if (strstr(buf, "Destination Net Prohibited")) { die(STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)\n"), addr); - else if (strstr(buf, "Destination Host Prohibited")) + } else if (strstr(buf, "Destination Host Prohibited")) { die(STATE_CRITICAL, _("CRITICAL - Host Prohibited (%s)\n"), addr); - else if (strstr(buf, "Packet filtered") || strstr(buf, "Administratively prohibited")) + } else if (strstr(buf, "Packet filtered") || strstr(buf, "Administratively prohibited")) { die(STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)\n"), addr); - else if (strstr(buf, "unknown host")) + } else if (strstr(buf, "unknown host")) { die(STATE_CRITICAL, _("CRITICAL - Host not found (%s)\n"), addr); - else if (strstr(buf, "Time to live exceeded") || strstr(buf, "Time exceeded")) + } else if (strstr(buf, "Time to live exceeded") || strstr(buf, "Time exceeded")) { die(STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)\n"), addr); - else if (strstr(buf, "Destination unreachable: ")) + } else if (strstr(buf, "Destination unreachable: ")) { die(STATE_CRITICAL, _("CRITICAL - Destination Unreachable (%s)\n"), addr); + } if (strstr(buf, "(DUP!)") || strstr(buf, "DUPLICATES FOUND")) { - if (warn_text == NULL) + if (warn_text == NULL) { warn_text = strdup(_(WARN_DUPLICATES)); - else if (!strstr(warn_text, _(WARN_DUPLICATES)) && xasprintf(&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1) + } else if (!strstr(warn_text, _(WARN_DUPLICATES)) && xasprintf(&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1) { die(STATE_UNKNOWN, _("Unable to realloc warn_text\n")); + } return (STATE_WARNING); } -- cgit v1.2.3-74-g34f1 From 29c0998cdf0fdb00685df305c0d9e6fcd90eadd6 Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 12 Mar 2025 11:57:34 +0100 Subject: check_ping: general refactoring --- plugins/check_ping.c | 236 ++++++++++++++++++++++++++------------------------- 1 file changed, 119 insertions(+), 117 deletions(-) (limited to 'plugins/check_ping.c') diff --git a/plugins/check_ping.c b/plugins/check_ping.c index 526b8618..d79a4a61 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -66,18 +66,12 @@ static int max_addr = 1; static int max_packets = -1; static int verbose = 0; -static float rta = UNKNOWN_TRIP_TIME; -static int pl = UNKNOWN_PACKET_LOSS; +static float round_trip_average = UNKNOWN_TRIP_TIME; +static int packet_loss = UNKNOWN_PACKET_LOSS; static char *warn_text; int main(int argc, char **argv) { - char *cmd = NULL; - char *rawcmd = NULL; - int result = STATE_UNKNOWN; - int this_result = STATE_UNKNOWN; - int i; - setlocale(LC_ALL, ""); setlocale(LC_NUMERIC, "C"); bindtextdomain(PACKAGE, LOCALEDIR); @@ -106,8 +100,9 @@ int main(int argc, char **argv) { alarm(timeout_interval); #endif - for (i = 0; i < n_addresses; i++) { - + int result = STATE_UNKNOWN; + char *rawcmd = NULL; + for (int i = 0; i < n_addresses; i++) { #ifdef PING6_COMMAND if (address_family != AF_INET && is_inet6_addr(addresses[i])) { rawcmd = strdup(PING6_COMMAND); @@ -118,6 +113,8 @@ int main(int argc, char **argv) { rawcmd = strdup(PING_COMMAND); #endif + char *cmd = NULL; + /* does the host address of number of packets argument come first? */ #ifdef PING_PACKETS_FIRST # ifdef PING_HAS_TIMEOUT @@ -134,18 +131,18 @@ int main(int argc, char **argv) { } /* run the command */ - this_result = run_ping(cmd, addresses[i]); + int this_result = run_ping(cmd, addresses[i]); - if (pl == UNKNOWN_PACKET_LOSS || rta < 0.0) { + if (packet_loss == UNKNOWN_PACKET_LOSS || round_trip_average < 0.0) { printf("%s\n", cmd); die(STATE_UNKNOWN, _("CRITICAL - Could not interpret output from ping command\n")); } - if (pl >= cpl || rta >= crta || rta < 0) { + if (packet_loss >= cpl || round_trip_average >= crta || round_trip_average < 0) { this_result = STATE_CRITICAL; - } else if (pl >= wpl || rta >= wrta) { + } else if (packet_loss >= wpl || round_trip_average >= wrta) { this_result = STATE_WARNING; - } else if (pl >= 0 && rta >= 0) { + } else if (packet_loss >= 0 && round_trip_average >= 0) { this_result = max_state(STATE_OK, this_result); } @@ -153,26 +150,28 @@ int main(int argc, char **argv) { die(STATE_OK, "%s is alive\n", addresses[i]); } - if (display_html == true) { + if (display_html) { printf("", CGIURL, addresses[i]); } - if (pl == 100) { - printf(_("PING %s - %sPacket loss = %d%%"), state_text(this_result), warn_text, pl); + if (packet_loss == 100) { + printf(_("PING %s - %sPacket loss = %d%%"), state_text(this_result), warn_text, packet_loss); } else { - printf(_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"), state_text(this_result), warn_text, pl, rta); + printf(_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"), state_text(this_result), warn_text, packet_loss, + round_trip_average); } - if (display_html == true) { + if (display_html) { printf(""); } /* Print performance data */ - if (pl != 100) { + if (packet_loss != 100) { printf("|%s", - fperfdata("rta", (double)rta, "ms", wrta > 0 ? true : false, wrta, crta > 0 ? true : false, crta, true, 0, false, 0)); + fperfdata("rta", (double)round_trip_average, "ms", (bool)(wrta > 0), wrta, (bool)(crta > 0), crta, true, 0, false, 0)); } else { printf("| rta=U;%f;%f;;", wrta, crta); } - printf(" %s\n", perfdata("pl", (long)pl, "%", wpl > 0 ? true : false, wpl, cpl > 0 ? true : false, cpl, true, 0, false, 0)); + + printf(" %s\n", perfdata("pl", (long)packet_loss, "%", (bool)(wpl > 0), wpl, (bool)(cpl > 0), cpl, true, 0, false, 0)); if (verbose >= 2) { printf("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl); @@ -188,10 +187,6 @@ int main(int argc, char **argv) { /* process command-line arguments */ int process_arguments(int argc, char **argv) { - int c = 1; - char *ptr; - - int option = 0; static struct option longopts[] = {STD_LONG_OPTS, {"packets", required_argument, 0, 'p'}, {"nohtml", no_argument, 0, 'n'}, @@ -204,23 +199,24 @@ int process_arguments(int argc, char **argv) { return ERROR; } - for (c = 1; c < argc; c++) { - if (strcmp("-to", argv[c]) == 0) { - strcpy(argv[c], "-t"); + for (int index = 1; index < argc; index++) { + if (strcmp("-to", argv[index]) == 0) { + strcpy(argv[index], "-t"); } - if (strcmp("-nohtml", argv[c]) == 0) { - strcpy(argv[c], "-n"); + if (strcmp("-nohtml", argv[index]) == 0) { + strcpy(argv[index], "-n"); } } - while (1) { - c = getopt_long(argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option); + int option = 0; + while (true) { + int option_index = getopt_long(argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option); - if (c == -1 || c == EOF) { + if (option_index == -1 || option_index == EOF) { break; } - switch (c) { + switch (option_index) { case '?': /* usage */ usage5(); case 'h': /* help */ @@ -247,9 +243,9 @@ int process_arguments(int argc, char **argv) { usage(_("IPv6 support not available\n")); #endif break; - case 'H': /* hostname */ - ptr = optarg; - while (1) { + case 'H': /* hostname */ { + char *ptr = optarg; + while (true) { n_addresses++; if (n_addresses > max_addr) { max_addr *= 2; @@ -266,7 +262,7 @@ int process_arguments(int argc, char **argv) { break; } } - break; + } break; case 'p': /* number of packets to send */ if (is_intnonneg(optarg)) { max_packets = atoi(optarg); @@ -289,76 +285,72 @@ int process_arguments(int argc, char **argv) { } } - c = optind; - if (c == argc) { + int arg_counter = optind; + if (arg_counter == argc) { return validate_arguments(); } if (addresses[0] == NULL) { - if (!is_host(argv[c])) { - usage2(_("Invalid hostname/address"), argv[c]); + if (!is_host(argv[arg_counter])) { + usage2(_("Invalid hostname/address"), argv[arg_counter]); } else { - addresses[0] = argv[c++]; + addresses[0] = argv[arg_counter++]; n_addresses++; - if (c == argc) { + if (arg_counter == argc) { return validate_arguments(); } } } if (wpl == UNKNOWN_PACKET_LOSS) { - if (!is_intpercent(argv[c])) { - printf(_(" (%s) must be an integer percentage\n"), argv[c]); + if (!is_intpercent(argv[arg_counter])) { + printf(_(" (%s) must be an integer percentage\n"), argv[arg_counter]); return ERROR; - } else { - wpl = atoi(argv[c++]); - if (c == argc) { - return validate_arguments(); - } + } + wpl = atoi(argv[arg_counter++]); + if (arg_counter == argc) { + return validate_arguments(); } } if (cpl == UNKNOWN_PACKET_LOSS) { - if (!is_intpercent(argv[c])) { - printf(_(" (%s) must be an integer percentage\n"), argv[c]); + if (!is_intpercent(argv[arg_counter])) { + printf(_(" (%s) must be an integer percentage\n"), argv[arg_counter]); return ERROR; - } else { - cpl = atoi(argv[c++]); - if (c == argc) { - return validate_arguments(); - } + } + cpl = atoi(argv[arg_counter++]); + if (arg_counter == argc) { + return validate_arguments(); } } if (wrta < 0.0) { - if (is_negative(argv[c])) { - printf(_(" (%s) must be a non-negative number\n"), argv[c]); + if (is_negative(argv[arg_counter])) { + printf(_(" (%s) must be a non-negative number\n"), argv[arg_counter]); return ERROR; - } else { - wrta = atof(argv[c++]); - if (c == argc) { - return validate_arguments(); - } + } + wrta = atof(argv[arg_counter++]); + if (arg_counter == argc) { + return validate_arguments(); } } if (crta < 0.0) { - if (is_negative(argv[c])) { - printf(_(" (%s) must be a non-negative number\n"), argv[c]); + if (is_negative(argv[arg_counter])) { + printf(_(" (%s) must be a non-negative number\n"), argv[arg_counter]); return ERROR; - } else { - crta = atof(argv[c++]); - if (c == argc) { - return validate_arguments(); - } + } + crta = atof(argv[arg_counter++]); + if (arg_counter == argc) { + return validate_arguments(); } } if (max_packets == -1) { - if (is_intnonneg(argv[c])) { - max_packets = atoi(argv[c++]); + if (is_intnonneg(argv[arg_counter])) { + max_packets = atoi(argv[arg_counter++]); } else { - printf(_(" (%s) must be a non-negative number\n"), argv[c]); + printf(_(" (%s) must be a non-negative number\n"), argv[arg_counter]); return ERROR; } } @@ -369,9 +361,13 @@ int process_arguments(int argc, char **argv) { int get_threshold(char *arg, float *trta, int *tpl) { if (is_intnonneg(arg) && sscanf(arg, "%f", trta) == 1) { return OK; - } else if (strpbrk(arg, ",:") && strstr(arg, "%") && sscanf(arg, "%f%*[:,]%d%%", trta, tpl) == 2) { + } + + if (strpbrk(arg, ",:") && strstr(arg, "%") && sscanf(arg, "%f%*[:,]%d%%", trta, tpl) == 2) { return OK; - } else if (strstr(arg, "%") && sscanf(arg, "%d%%", tpl) == 1) { + } + + if (strstr(arg, "%") && sscanf(arg, "%d%%", tpl) == 1) { return OK; } @@ -380,25 +376,32 @@ int get_threshold(char *arg, float *trta, int *tpl) { } int validate_arguments() { - float max_seconds; - int i; - if (wrta < 0.0) { printf(_(" was not set\n")); return ERROR; - } else if (crta < 0.0) { + } + + if (crta < 0.0) { printf(_(" was not set\n")); return ERROR; - } else if (wpl == UNKNOWN_PACKET_LOSS) { + } + + if (wpl == UNKNOWN_PACKET_LOSS) { printf(_(" was not set\n")); return ERROR; - } else if (cpl == UNKNOWN_PACKET_LOSS) { + } + + if (cpl == UNKNOWN_PACKET_LOSS) { printf(_(" was not set\n")); return ERROR; - } else if (wrta > crta) { + } + + if (wrta > crta) { printf(_(" (%f) cannot be larger than (%f)\n"), wrta, crta); return ERROR; - } else if (wpl > cpl) { + } + + if (wpl > cpl) { printf(_(" (%d) cannot be larger than (%d)\n"), wpl, cpl); return ERROR; } @@ -407,12 +410,12 @@ int validate_arguments() { max_packets = DEFAULT_MAX_PACKETS; } - max_seconds = crta / 1000.0 * max_packets + max_packets; + float max_seconds = (crta / 1000.0 * max_packets) + max_packets; if (max_seconds > timeout_interval) { - timeout_interval = (int)max_seconds; + timeout_interval = (unsigned int)max_seconds; } - for (i = 0; i < n_addresses; i++) { + for (int i = 0; i < n_addresses; i++) { if (!is_host(addresses[i])) { usage2(_("Invalid hostname/address"), addresses[i]); } @@ -426,10 +429,6 @@ int validate_arguments() { } int run_ping(const char *cmd, const char *addr) { - char buf[MAX_INPUT_BUFFER]; - int result = STATE_UNKNOWN; - int match; - if ((child_process = spopen(cmd)) == NULL) { die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd); } @@ -439,8 +438,9 @@ int run_ping(const char *cmd, const char *addr) { printf(_("Cannot open stderr for %s\n"), cmd); } + char buf[MAX_INPUT_BUFFER]; + int result = STATE_UNKNOWN; while (fgets(buf, MAX_INPUT_BUFFER - 1, child_process)) { - if (verbose >= 3) { printf("Output: %s", buf); } @@ -448,37 +448,39 @@ int run_ping(const char *cmd, const char *addr) { result = max_state(result, error_scan(buf, addr)); /* get the percent loss statistics */ - match = 0; - if ((sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n", &pl, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n", &pl, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% packet loss%n", &pl, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% loss, time%n", &pl, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, %d%% loss, time%n", &pl, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &pl, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) || - (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) || - (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &pl, &match) && match)) { + int match = 0; + if ((sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n", &packet_loss, &match) && + match) || + (sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n", &packet_loss, &match) && + match) || + (sscanf(buf, "%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n", &packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% packet loss%n", &packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% loss, time%n", &packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted, %*d received, %d%% loss, time%n", &packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n", &packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n", &packet_loss, &match) && match) || + (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &packet_loss, &match) && match)) { continue; } /* get the round trip average */ - else if ((sscanf(buf, "round-trip min/avg/max = %*f/%f/%*f%n", &rta, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/mdev = %*f/%f/%*f/%*f%n", &rta, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/sdev = %*f/%f/%*f/%*f%n", &rta, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/stddev = %*f/%f/%*f/%*f%n", &rta, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f%n", &rta, &match) && match) || - (sscanf(buf, "round-trip (ms) min/avg/max = %*f/%f/%*f%n", &rta, &match) && match) || - (sscanf(buf, "round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n", &rta, &match) && match) || - (sscanf(buf, "rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n", &rta, &match) && match) || - (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %fms%n", &rta, &match) && match)) { + if ((sscanf(buf, "round-trip min/avg/max = %*f/%f/%*f%n", &round_trip_average, &match) && match) || + (sscanf(buf, "round-trip min/avg/max/mdev = %*f/%f/%*f/%*f%n", &round_trip_average, &match) && match) || + (sscanf(buf, "round-trip min/avg/max/sdev = %*f/%f/%*f/%*f%n", &round_trip_average, &match) && match) || + (sscanf(buf, "round-trip min/avg/max/stddev = %*f/%f/%*f/%*f%n", &round_trip_average, &match) && match) || + (sscanf(buf, "round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f%n", &round_trip_average, &match) && match) || + (sscanf(buf, "round-trip (ms) min/avg/max = %*f/%f/%*f%n", &round_trip_average, &match) && match) || + (sscanf(buf, "round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n", &round_trip_average, &match) && match) || + (sscanf(buf, "rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n", &round_trip_average, &match) && match) || + (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %fms%n", &round_trip_average, &match) && match)) { continue; } } /* this is needed because there is no rta if all packets are lost */ - if (pl == 100) { - rta = crta; + if (packet_loss == 100) { + round_trip_average = crta; } /* check stderr, setting at least WARNING if there is output here */ -- cgit v1.2.3-74-g34f1 From ae60d6d8d818191afba08819c5a62673b98ef29a Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 12 Mar 2025 13:03:17 +0100 Subject: Refactor check_ping --- plugins/Makefile.am | 1 + plugins/check_ping.c | 319 ++++++++++++++++++++++-------------------- plugins/check_ping.d/config.h | 46 ++++++ 3 files changed, 218 insertions(+), 148 deletions(-) create mode 100644 plugins/check_ping.d/config.h (limited to 'plugins/check_ping.c') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 9ea6e85e..10a12168 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -63,6 +63,7 @@ EXTRA_DIST = t \ check_mrtg.d \ check_apt.d \ check_pgsql.d \ + check_ping.d \ check_by_ssh.d \ check_smtp.d \ check_mysql.d \ diff --git a/plugins/check_ping.c b/plugins/check_ping.c index d79a4a61..fcf68f81 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -36,39 +36,35 @@ const char *email = "devel@monitoring-plugins.org"; #include "netutils.h" #include "popen.h" #include "utils.h" +#include "check_ping.d/config.h" +#include "../lib/states.h" #include -#define WARN_DUPLICATES "DUPLICATES FOUND! " -#define UNKNOWN_TRIP_TIME -1.0 /* -1 seconds */ +#define WARN_DUPLICATES "DUPLICATES FOUND! " -enum { - UNKNOWN_PACKET_LOSS = 200, /* 200% */ - DEFAULT_MAX_PACKETS = 5 /* default no. of ICMP ECHO packets */ -}; +typedef struct { + int errorcode; + check_ping_config config; +} check_ping_config_wrapper; +static check_ping_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/); +static check_ping_config_wrapper validate_arguments(check_ping_config_wrapper /*config_wrapper*/); -static int process_arguments(int /*argc*/, char ** /*argv*/); -static int get_threshold(char * /*arg*/, float * /*trta*/, int * /*tpl*/); -static int validate_arguments(void); -static int run_ping(const char *cmd, const char *addr); -static int error_scan(char buf[MAX_INPUT_BUFFER], const char *addr); +static int get_threshold(char * /*arg*/, double * /*trta*/, int * /*tpl*/); + +typedef struct { + mp_state_enum state; + double round_trip_average; + int packet_loss; +} ping_result; +static ping_result run_ping(const char *cmd, const char *addr, double /*crta*/); + +static mp_state_enum error_scan(char buf[MAX_INPUT_BUFFER], const char *addr); static void print_help(void); void print_usage(void); -static bool display_html = false; -static int wpl = UNKNOWN_PACKET_LOSS; -static int cpl = UNKNOWN_PACKET_LOSS; -static float wrta = UNKNOWN_TRIP_TIME; -static float crta = UNKNOWN_TRIP_TIME; -static char **addresses = NULL; -static int n_addresses = 0; -static int max_addr = 1; -static int max_packets = -1; static int verbose = 0; -static float round_trip_average = UNKNOWN_TRIP_TIME; -static int packet_loss = UNKNOWN_PACKET_LOSS; - static char *warn_text; int main(int argc, char **argv) { @@ -77,16 +73,16 @@ int main(int argc, char **argv) { bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - addresses = malloc(sizeof(char *) * max_addr); - addresses[0] = NULL; - /* Parse extra opts if any */ argv = np_extra_opts(&argc, argv, progname); - if (process_arguments(argc, argv) == ERROR) { + check_ping_config_wrapper tmp_config = process_arguments(argc, argv); + if (tmp_config.errorcode == ERROR) { usage4(_("Could not parse arguments")); } + const check_ping_config config = tmp_config.config; + /* Set signal handling and alarm */ if (signal(SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) { usage4(_("Cannot catch SIGALRM")); @@ -102,9 +98,9 @@ int main(int argc, char **argv) { int result = STATE_UNKNOWN; char *rawcmd = NULL; - for (int i = 0; i < n_addresses; i++) { + for (size_t i = 0; i < config.n_addresses; i++) { #ifdef PING6_COMMAND - if (address_family != AF_INET && is_inet6_addr(addresses[i])) { + if (address_family != AF_INET && is_inet6_addr(config.addresses[i])) { rawcmd = strdup(PING6_COMMAND); } else { rawcmd = strdup(PING_COMMAND); @@ -118,12 +114,12 @@ int main(int argc, char **argv) { /* does the host address of number of packets argument come first? */ #ifdef PING_PACKETS_FIRST # ifdef PING_HAS_TIMEOUT - xasprintf(&cmd, rawcmd, timeout_interval, max_packets, addresses[i]); + xasprintf(&cmd, rawcmd, timeout_interval, config.max_packets, config.addresses[i]); # else - xasprintf(&cmd, rawcmd, max_packets, addresses[i]); + xasprintf(&cmd, rawcmd, config.max_packets, addresses[i]); # endif #else - xasprintf(&cmd, rawcmd, addresses[i], max_packets); + xasprintf(&cmd, rawcmd, addresses[i], config.max_packets); #endif if (verbose >= 2) { @@ -131,53 +127,55 @@ int main(int argc, char **argv) { } /* run the command */ - int this_result = run_ping(cmd, addresses[i]); - if (packet_loss == UNKNOWN_PACKET_LOSS || round_trip_average < 0.0) { + ping_result pinged = run_ping(cmd, config.addresses[i], config.crta); + + if (pinged.packet_loss == UNKNOWN_PACKET_LOSS || pinged.round_trip_average < 0.0) { printf("%s\n", cmd); die(STATE_UNKNOWN, _("CRITICAL - Could not interpret output from ping command\n")); } - if (packet_loss >= cpl || round_trip_average >= crta || round_trip_average < 0) { - this_result = STATE_CRITICAL; - } else if (packet_loss >= wpl || round_trip_average >= wrta) { - this_result = STATE_WARNING; - } else if (packet_loss >= 0 && round_trip_average >= 0) { - this_result = max_state(STATE_OK, this_result); + if (pinged.packet_loss >= config.cpl || pinged.round_trip_average >= config.crta || pinged.round_trip_average < 0) { + pinged.state = STATE_CRITICAL; + } else if (pinged.packet_loss >= config.wpl || pinged.round_trip_average >= config.wrta) { + pinged.state = STATE_WARNING; + } else if (pinged.packet_loss >= 0 && pinged.round_trip_average >= 0) { + pinged.state = max_state(STATE_OK, pinged.state); } - if (n_addresses > 1 && this_result != STATE_UNKNOWN) { - die(STATE_OK, "%s is alive\n", addresses[i]); + if (config.n_addresses > 1 && pinged.state != STATE_UNKNOWN) { + die(STATE_OK, "%s is alive\n", config.addresses[i]); } - if (display_html) { - printf("", CGIURL, addresses[i]); + if (config.display_html) { + printf("", CGIURL, config.addresses[i]); } - if (packet_loss == 100) { - printf(_("PING %s - %sPacket loss = %d%%"), state_text(this_result), warn_text, packet_loss); + if (pinged.packet_loss == 100) { + printf(_("PING %s - %sPacket loss = %d%%"), state_text(pinged.state), warn_text, pinged.packet_loss); } else { - printf(_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"), state_text(this_result), warn_text, packet_loss, - round_trip_average); + printf(_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"), state_text(pinged.state), warn_text, pinged.packet_loss, + pinged.round_trip_average); } - if (display_html) { + if (config.display_html) { printf(""); } /* Print performance data */ - if (packet_loss != 100) { - printf("|%s", - fperfdata("rta", (double)round_trip_average, "ms", (bool)(wrta > 0), wrta, (bool)(crta > 0), crta, true, 0, false, 0)); + if (pinged.packet_loss != 100) { + printf("|%s", fperfdata("rta", pinged.round_trip_average, "ms", (bool)(config.wrta > 0), config.wrta, + (bool)(config.crta > 0), config.crta, true, 0, false, 0)); } else { - printf("| rta=U;%f;%f;;", wrta, crta); + printf("| rta=U;%f;%f;;", config.wrta, config.crta); } - printf(" %s\n", perfdata("pl", (long)packet_loss, "%", (bool)(wpl > 0), wpl, (bool)(cpl > 0), cpl, true, 0, false, 0)); + printf(" %s\n", perfdata("pl", (long)pinged.packet_loss, "%", (bool)(config.wpl > 0), config.wpl, (bool)(config.cpl > 0), + config.cpl, true, 0, false, 0)); if (verbose >= 2) { - printf("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl); + printf("%f:%d%% %f:%d%%\n", config.wrta, config.wpl, config.crta, config.cpl); } - result = max_state(result, this_result); + result = max_state(result, pinged.state); free(rawcmd); free(cmd); } @@ -186,7 +184,7 @@ int main(int argc, char **argv) { } /* process command-line arguments */ -int process_arguments(int argc, char **argv) { +check_ping_config_wrapper process_arguments(int argc, char **argv) { static struct option longopts[] = {STD_LONG_OPTS, {"packets", required_argument, 0, 'p'}, {"nohtml", no_argument, 0, 'n'}, @@ -195,8 +193,14 @@ int process_arguments(int argc, char **argv) { {"use-ipv6", no_argument, 0, '6'}, {0, 0, 0, 0}}; + check_ping_config_wrapper result = { + .errorcode = OK, + .config = check_ping_config_init(), + }; + if (argc < 2) { - return ERROR; + result.errorcode = ERROR; + return result; } for (int index = 1; index < argc; index++) { @@ -209,6 +213,7 @@ int process_arguments(int argc, char **argv) { } int option = 0; + size_t max_addr = MAX_ADDR_START; while (true) { int option_index = getopt_long(argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option); @@ -246,15 +251,15 @@ int process_arguments(int argc, char **argv) { case 'H': /* hostname */ { char *ptr = optarg; while (true) { - n_addresses++; - if (n_addresses > max_addr) { + result.config.n_addresses++; + if (result.config.n_addresses > max_addr) { max_addr *= 2; - addresses = realloc(addresses, sizeof(char *) * max_addr); - if (addresses == NULL) { + result.config.addresses = realloc(result.config.addresses, sizeof(char *) * max_addr); + if (result.config.addresses == NULL) { die(STATE_UNKNOWN, _("Could not realloc() addresses\n")); } } - addresses[n_addresses - 1] = ptr; + result.config.addresses[result.config.n_addresses - 1] = ptr; if ((ptr = index(ptr, ','))) { strcpy(ptr, ""); ptr += sizeof(char); @@ -265,105 +270,110 @@ int process_arguments(int argc, char **argv) { } break; case 'p': /* number of packets to send */ if (is_intnonneg(optarg)) { - max_packets = atoi(optarg); + result.config.max_packets = atoi(optarg); } else { usage2(_(" (%s) must be a non-negative number\n"), optarg); } break; case 'n': /* no HTML */ - display_html = false; + result.config.display_html = false; break; case 'L': /* show HTML */ - display_html = true; + result.config.display_html = true; break; case 'c': - get_threshold(optarg, &crta, &cpl); + get_threshold(optarg, &result.config.crta, &result.config.cpl); break; case 'w': - get_threshold(optarg, &wrta, &wpl); + get_threshold(optarg, &result.config.wrta, &result.config.wpl); break; } } int arg_counter = optind; if (arg_counter == argc) { - return validate_arguments(); + return validate_arguments(result); } - if (addresses[0] == NULL) { + if (result.config.addresses[0] == NULL) { if (!is_host(argv[arg_counter])) { usage2(_("Invalid hostname/address"), argv[arg_counter]); } else { - addresses[0] = argv[arg_counter++]; - n_addresses++; + result.config.addresses[0] = argv[arg_counter++]; + result.config.n_addresses++; if (arg_counter == argc) { - return validate_arguments(); + return validate_arguments(result); } } } - if (wpl == UNKNOWN_PACKET_LOSS) { + if (result.config.wpl == UNKNOWN_PACKET_LOSS) { if (!is_intpercent(argv[arg_counter])) { printf(_(" (%s) must be an integer percentage\n"), argv[arg_counter]); - return ERROR; + result.errorcode = ERROR; + return result; } - wpl = atoi(argv[arg_counter++]); + result.config.wpl = atoi(argv[arg_counter++]); if (arg_counter == argc) { - return validate_arguments(); + return validate_arguments(result); } } - if (cpl == UNKNOWN_PACKET_LOSS) { + if (result.config.cpl == UNKNOWN_PACKET_LOSS) { if (!is_intpercent(argv[arg_counter])) { printf(_(" (%s) must be an integer percentage\n"), argv[arg_counter]); - return ERROR; + result.errorcode = ERROR; + return result; } - cpl = atoi(argv[arg_counter++]); + result.config.cpl = atoi(argv[arg_counter++]); if (arg_counter == argc) { - return validate_arguments(); + return validate_arguments(result); } } - if (wrta < 0.0) { + if (result.config.wrta < 0.0) { if (is_negative(argv[arg_counter])) { printf(_(" (%s) must be a non-negative number\n"), argv[arg_counter]); - return ERROR; + result.errorcode = ERROR; + return result; } - wrta = atof(argv[arg_counter++]); + result.config.wrta = atof(argv[arg_counter++]); if (arg_counter == argc) { - return validate_arguments(); + return validate_arguments(result); } } - if (crta < 0.0) { + if (result.config.crta < 0.0) { if (is_negative(argv[arg_counter])) { printf(_(" (%s) must be a non-negative number\n"), argv[arg_counter]); - return ERROR; + result.errorcode = ERROR; + return result; } - crta = atof(argv[arg_counter++]); + result.config.crta = atof(argv[arg_counter++]); if (arg_counter == argc) { - return validate_arguments(); + return validate_arguments(result); } } - if (max_packets == -1) { + if (result.config.max_packets == -1) { if (is_intnonneg(argv[arg_counter])) { - max_packets = atoi(argv[arg_counter++]); + result.config.max_packets = atoi(argv[arg_counter++]); } else { printf(_(" (%s) must be a non-negative number\n"), argv[arg_counter]); - return ERROR; + result.errorcode = ERROR; + return result; } } - return validate_arguments(); + return validate_arguments(result); } -int get_threshold(char *arg, float *trta, int *tpl) { - if (is_intnonneg(arg) && sscanf(arg, "%f", trta) == 1) { +int get_threshold(char *arg, double *trta, int *tpl) { + if (is_intnonneg(arg) && sscanf(arg, "%lf", trta) == 1) { return OK; } - if (strpbrk(arg, ",:") && strstr(arg, "%") && sscanf(arg, "%f%*[:,]%d%%", trta, tpl) == 2) { + if (strpbrk(arg, ",:") && strstr(arg, "%") && sscanf(arg, "%lf%*[:,]%d%%", trta, tpl) == 2) { return OK; } @@ -375,60 +385,66 @@ int get_threshold(char *arg, float *trta, int *tpl) { return STATE_UNKNOWN; } -int validate_arguments() { - if (wrta < 0.0) { +check_ping_config_wrapper validate_arguments(check_ping_config_wrapper config_wrapper) { + if (config_wrapper.config.wrta < 0.0) { printf(_(" was not set\n")); - return ERROR; + config_wrapper.errorcode = ERROR; + return config_wrapper; } - if (crta < 0.0) { + if (config_wrapper.config.crta < 0.0) { printf(_(" was not set\n")); - return ERROR; + config_wrapper.errorcode = ERROR; + return config_wrapper; } - if (wpl == UNKNOWN_PACKET_LOSS) { + if (config_wrapper.config.wpl == UNKNOWN_PACKET_LOSS) { printf(_(" was not set\n")); - return ERROR; + config_wrapper.errorcode = ERROR; + return config_wrapper; } - if (cpl == UNKNOWN_PACKET_LOSS) { + if (config_wrapper.config.cpl == UNKNOWN_PACKET_LOSS) { printf(_(" was not set\n")); - return ERROR; + config_wrapper.errorcode = ERROR; + return config_wrapper; } - if (wrta > crta) { - printf(_(" (%f) cannot be larger than (%f)\n"), wrta, crta); - return ERROR; + if (config_wrapper.config.wrta > config_wrapper.config.crta) { + printf(_(" (%f) cannot be larger than (%f)\n"), config_wrapper.config.wrta, config_wrapper.config.crta); + config_wrapper.errorcode = ERROR; + return config_wrapper; } - if (wpl > cpl) { - printf(_(" (%d) cannot be larger than (%d)\n"), wpl, cpl); - return ERROR; + if (config_wrapper.config.wpl > config_wrapper.config.cpl) { + printf(_(" (%d) cannot be larger than (%d)\n"), config_wrapper.config.wpl, config_wrapper.config.cpl); + config_wrapper.errorcode = ERROR; + return config_wrapper; } - if (max_packets == -1) { - max_packets = DEFAULT_MAX_PACKETS; + if (config_wrapper.config.max_packets == -1) { + config_wrapper.config.max_packets = DEFAULT_MAX_PACKETS; } - float max_seconds = (crta / 1000.0 * max_packets) + max_packets; + double max_seconds = (config_wrapper.config.crta / 1000.0 * config_wrapper.config.max_packets) + config_wrapper.config.max_packets; if (max_seconds > timeout_interval) { timeout_interval = (unsigned int)max_seconds; } - for (int i = 0; i < n_addresses; i++) { - if (!is_host(addresses[i])) { - usage2(_("Invalid hostname/address"), addresses[i]); + for (size_t i = 0; i < config_wrapper.config.n_addresses; i++) { + if (!is_host(config_wrapper.config.addresses[i])) { + usage2(_("Invalid hostname/address"), config_wrapper.config.addresses[i]); } } - if (n_addresses == 0) { + if (config_wrapper.config.n_addresses == 0) { usage(_("You must specify a server address or host name")); } - return OK; + return config_wrapper; } -int run_ping(const char *cmd, const char *addr) { +ping_result run_ping(const char *cmd, const char *addr, double crta) { if ((child_process = spopen(cmd)) == NULL) { die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd); } @@ -439,48 +455,55 @@ int run_ping(const char *cmd, const char *addr) { } char buf[MAX_INPUT_BUFFER]; - int result = STATE_UNKNOWN; + ping_result result = { + .state = STATE_UNKNOWN, + .packet_loss = UNKNOWN_PACKET_LOSS, + .round_trip_average = UNKNOWN_TRIP_TIME, + }; + while (fgets(buf, MAX_INPUT_BUFFER - 1, child_process)) { if (verbose >= 3) { printf("Output: %s", buf); } - result = max_state(result, error_scan(buf, addr)); + result.state = max_state(result.state, error_scan(buf, addr)); /* get the percent loss statistics */ int match = 0; - if ((sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n", &packet_loss, &match) && + if ((sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) && + match) || + (sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n", &result.packet_loss, + &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n", &packet_loss, &match) && + (sscanf(buf, "%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n", &result.packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n", &packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% packet loss%n", &packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% loss, time%n", &packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, %d%% loss, time%n", &packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n", &packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n", &packet_loss, &match) && match) || - (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &packet_loss, &match) && match)) { + (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% packet loss%n", &result.packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% loss, time%n", &result.packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted, %*d received, %d%% loss, time%n", &result.packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &result.packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) && match) || + (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) && match) || + (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &result.packet_loss, &match) && match)) { continue; } /* get the round trip average */ - if ((sscanf(buf, "round-trip min/avg/max = %*f/%f/%*f%n", &round_trip_average, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/mdev = %*f/%f/%*f/%*f%n", &round_trip_average, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/sdev = %*f/%f/%*f/%*f%n", &round_trip_average, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/stddev = %*f/%f/%*f/%*f%n", &round_trip_average, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f%n", &round_trip_average, &match) && match) || - (sscanf(buf, "round-trip (ms) min/avg/max = %*f/%f/%*f%n", &round_trip_average, &match) && match) || - (sscanf(buf, "round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n", &round_trip_average, &match) && match) || - (sscanf(buf, "rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n", &round_trip_average, &match) && match) || - (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %fms%n", &round_trip_average, &match) && match)) { + if ((sscanf(buf, "round-trip min/avg/max = %*f/%lf/%*f%n", &result.round_trip_average, &match) && match) || + (sscanf(buf, "round-trip min/avg/max/mdev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) && match) || + (sscanf(buf, "round-trip min/avg/max/sdev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) && match) || + (sscanf(buf, "round-trip min/avg/max/stddev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) && match) || + (sscanf(buf, "round-trip min/avg/max/std-dev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) && match) || + (sscanf(buf, "round-trip (ms) min/avg/max = %*f/%lf/%*f%n", &result.round_trip_average, &match) && match) || + (sscanf(buf, "round-trip (ms) min/avg/max/stddev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) && match) || + (sscanf(buf, "rtt min/avg/max/mdev = %*f/%lf/%*f/%*f ms%n", &result.round_trip_average, &match) && match) || + (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %lfms%n", &result.round_trip_average, &match) && match)) { continue; } } /* this is needed because there is no rta if all packets are lost */ - if (packet_loss == 100) { - round_trip_average = crta; + if (result.packet_loss == 100) { + result.round_trip_average = crta; } /* check stderr, setting at least WARNING if there is output here */ @@ -492,8 +515,8 @@ int run_ping(const char *cmd, const char *addr) { if (verbose >= 3) { printf("Got stderr: %s", buf); } - if ((result = error_scan(buf, addr)) == STATE_OK) { - result = STATE_WARNING; + if ((result.state = error_scan(buf, addr)) == STATE_OK) { + result.state = STATE_WARNING; if (warn_text == NULL) { warn_text = strdup(_("System call sent warnings to stderr ")); } else { @@ -514,7 +537,7 @@ int run_ping(const char *cmd, const char *addr) { return result; } -int error_scan(char buf[MAX_INPUT_BUFFER], const char *addr) { +mp_state_enum error_scan(char buf[MAX_INPUT_BUFFER], const char *addr) { if (strstr(buf, "Network is unreachable") || strstr(buf, "Destination Net Unreachable") || strstr(buf, "No route")) { die(STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)\n"), addr); } else if (strstr(buf, "Destination Host Unreachable") || strstr(buf, "Address unreachable")) { @@ -543,10 +566,10 @@ int error_scan(char buf[MAX_INPUT_BUFFER], const char *addr) { } else if (!strstr(warn_text, _(WARN_DUPLICATES)) && xasprintf(&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1) { die(STATE_UNKNOWN, _("Unable to realloc warn_text\n")); } - return (STATE_WARNING); + return STATE_WARNING; } - return (STATE_OK); + return STATE_OK; } void print_help(void) { diff --git a/plugins/check_ping.d/config.h b/plugins/check_ping.d/config.h new file mode 100644 index 00000000..eb2735a7 --- /dev/null +++ b/plugins/check_ping.d/config.h @@ -0,0 +1,46 @@ +#pragma once + +#include "../../config.h" +#include +#include + +enum { + UNKNOWN_PACKET_LOSS = 200, /* 200% */ + DEFAULT_MAX_PACKETS = 5 /* default no. of ICMP ECHO packets */ +}; + +#define UNKNOWN_TRIP_TIME -1.0 /* -1 seconds */ + +#define MAX_ADDR_START 1 + +typedef struct { + bool display_html; + int max_packets; + + char **addresses; + size_t n_addresses; + + int wpl; + int cpl; + double wrta; + double crta; +} check_ping_config; + +check_ping_config check_ping_config_init() { + check_ping_config tmp = { + .display_html = false, + .max_packets = -1, + + .addresses = NULL, + .n_addresses = 0, + + .wpl = UNKNOWN_PACKET_LOSS, + .cpl = UNKNOWN_PACKET_LOSS, + .wrta = UNKNOWN_TRIP_TIME, + .crta = UNKNOWN_TRIP_TIME, + }; + + tmp.addresses = calloc(MAX_ADDR_START, sizeof(char *)); + tmp.addresses[0] = NULL; + return tmp; +} -- cgit v1.2.3-74-g34f1 From a609c0214fb4fbeb86ab75e7dff4f4c7deedcc3b Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 12 Mar 2025 16:16:53 +0100 Subject: remove nagios reference Narrow down sscanf expression --- plugins/check_ping.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'plugins/check_ping.c') diff --git a/plugins/check_ping.c b/plugins/check_ping.c index fcf68f81..8d8ae7df 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -162,8 +162,8 @@ int main(int argc, char **argv) { /* Print performance data */ if (pinged.packet_loss != 100) { - printf("|%s", fperfdata("rta", pinged.round_trip_average, "ms", (bool)(config.wrta > 0), config.wrta, - (bool)(config.crta > 0), config.crta, true, 0, false, 0)); + printf("|%s", fperfdata("rta", pinged.round_trip_average, "ms", (bool)(config.wrta > 0), config.wrta, (bool)(config.crta > 0), + config.crta, true, 0, false, 0)); } else { printf("| rta=U;%f;%f;;", config.wrta, config.crta); } @@ -470,33 +470,36 @@ ping_result run_ping(const char *cmd, const char *addr, double crta) { /* get the percent loss statistics */ int match = 0; - if ((sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) && + if ((sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) == + 1 && match) || (sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n", &result.packet_loss, - &match) && + &match) == 1 && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n", &result.packet_loss, &match) && + (sscanf(buf, "%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n", &result.packet_loss, &match) == 1 && match) || - (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% packet loss%n", &result.packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% loss, time%n", &result.packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, %d%% loss, time%n", &result.packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &result.packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) && match) || - (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) && match) || - (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &result.packet_loss, &match) && match)) { + (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% packet loss%n", &result.packet_loss, &match) == 1 && match) || + (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% loss, time%n", &result.packet_loss, &match) == 1 && match) || + (sscanf(buf, "%*d packets transmitted, %*d received, %d%% loss, time%n", &result.packet_loss, &match) == 1 && match) || + (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &result.packet_loss, &match) && match) == 1 || + (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) == 1 && + match) || + (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) == 1 && + match) || + (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &result.packet_loss, &match) == 1 && match)) { continue; } /* get the round trip average */ - if ((sscanf(buf, "round-trip min/avg/max = %*f/%lf/%*f%n", &result.round_trip_average, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/mdev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/sdev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/stddev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) && match) || - (sscanf(buf, "round-trip min/avg/max/std-dev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) && match) || - (sscanf(buf, "round-trip (ms) min/avg/max = %*f/%lf/%*f%n", &result.round_trip_average, &match) && match) || - (sscanf(buf, "round-trip (ms) min/avg/max/stddev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) && match) || - (sscanf(buf, "rtt min/avg/max/mdev = %*f/%lf/%*f/%*f ms%n", &result.round_trip_average, &match) && match) || - (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %lfms%n", &result.round_trip_average, &match) && match)) { + if ((sscanf(buf, "round-trip min/avg/max = %*f/%lf/%*f%n", &result.round_trip_average, &match) == 1 && match) || + (sscanf(buf, "round-trip min/avg/max/mdev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) == 1 && match) || + (sscanf(buf, "round-trip min/avg/max/sdev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) == 1 && match) || + (sscanf(buf, "round-trip min/avg/max/stddev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) == 1 && match) || + (sscanf(buf, "round-trip min/avg/max/std-dev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) == 1 && match) || + (sscanf(buf, "round-trip (ms) min/avg/max = %*f/%lf/%*f%n", &result.round_trip_average, &match) == 1 && match) || + (sscanf(buf, "round-trip (ms) min/avg/max/stddev = %*f/%lf/%*f/%*f%n", &result.round_trip_average, &match) == 1 && match) || + (sscanf(buf, "rtt min/avg/max/mdev = %*f/%lf/%*f/%*f ms%n", &result.round_trip_average, &match) == 1 && match) || + (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %lfms%n", &result.round_trip_average, &match) == 1 && match)) { continue; } } @@ -610,9 +613,7 @@ void print_help(void) { printf("\n"); printf("%s\n", _("This plugin uses the ping command to probe the specified host for packet loss")); - printf("%s\n", _("(percentage) and round trip average (milliseconds). It can produce HTML output")); - printf("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in")); - printf("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/")); + printf("%s\n", _("(percentage) and round trip average (milliseconds). It can produce HTML output.")); printf(UT_SUPPORT); } -- cgit v1.2.3-74-g34f1 From 04c5e4024fd922cdae4b6b302668af44187c1193 Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 12 Mar 2025 17:26:32 +0100 Subject: Fix another sscanf instance --- plugins/check_ping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/check_ping.c') diff --git a/plugins/check_ping.c b/plugins/check_ping.c index 8d8ae7df..940b9475 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -481,7 +481,8 @@ ping_result run_ping(const char *cmd, const char *addr, double crta) { (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% packet loss%n", &result.packet_loss, &match) == 1 && match) || (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% loss, time%n", &result.packet_loss, &match) == 1 && match) || (sscanf(buf, "%*d packets transmitted, %*d received, %d%% loss, time%n", &result.packet_loss, &match) == 1 && match) || - (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &result.packet_loss, &match) && match) == 1 || + (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &result.packet_loss, &match) == 1 && match) == + 1 || (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) == 1 && match) || (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n", &result.packet_loss, &match) == 1 && -- cgit v1.2.3-74-g34f1