diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/check_curl.c | 17 | ||||
-rw-r--r-- | plugins/check_http.c | 5 | ||||
-rw-r--r-- | plugins/check_snmp.c | 4 | ||||
-rw-r--r-- | plugins/popen.c | 2 | ||||
-rw-r--r-- | plugins/runcmd.c | 2 |
5 files changed, 19 insertions, 11 deletions
diff --git a/plugins/check_curl.c b/plugins/check_curl.c index 8f9a21d2..fbb197f7 100644 --- a/plugins/check_curl.c +++ b/plugins/check_curl.c | |||
@@ -223,6 +223,7 @@ curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN; | |||
223 | int curl_http_version = CURL_HTTP_VERSION_NONE; | 223 | int curl_http_version = CURL_HTTP_VERSION_NONE; |
224 | bool automatic_decompression = false; | 224 | bool automatic_decompression = false; |
225 | char *cookie_jar_file = NULL; | 225 | char *cookie_jar_file = NULL; |
226 | bool haproxy_protocol = false; | ||
226 | 227 | ||
227 | bool process_arguments (int, char**); | 228 | bool process_arguments (int, char**); |
228 | void handle_curl_option_return_code (CURLcode res, const char* option); | 229 | void handle_curl_option_return_code (CURLcode res, const char* option); |
@@ -520,6 +521,11 @@ check_http (void) | |||
520 | handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, socket_timeout), "CURLOPT_CONNECTTIMEOUT"); | 521 | handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, socket_timeout), "CURLOPT_CONNECTTIMEOUT"); |
521 | handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_TIMEOUT, socket_timeout), "CURLOPT_TIMEOUT"); | 522 | handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_TIMEOUT, socket_timeout), "CURLOPT_TIMEOUT"); |
522 | 523 | ||
524 | /* enable haproxy protocol */ | ||
525 | if (haproxy_protocol) { | ||
526 | handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HAPROXYPROTOCOL, 1L), "CURLOPT_HAPROXYPROTOCOL"); | ||
527 | } | ||
528 | |||
523 | // fill dns resolve cache to make curl connect to the given server_address instead of the host_name, only required for ssl, because we use the host_name later on to make SNI happy | 529 | // fill dns resolve cache to make curl connect to the given server_address instead of the host_name, only required for ssl, because we use the host_name later on to make SNI happy |
524 | if(use_ssl && host_name != NULL) { | 530 | if(use_ssl && host_name != NULL) { |
525 | if ( (res=lookup_host (server_address, addrstr, DEFAULT_BUFFER_SIZE/2)) != 0) { | 531 | if ( (res=lookup_host (server_address, addrstr, DEFAULT_BUFFER_SIZE/2)) != 0) { |
@@ -1384,7 +1390,8 @@ process_arguments (int argc, char **argv) | |||
1384 | CA_CERT_OPTION, | 1390 | CA_CERT_OPTION, |
1385 | HTTP_VERSION_OPTION, | 1391 | HTTP_VERSION_OPTION, |
1386 | AUTOMATIC_DECOMPRESSION, | 1392 | AUTOMATIC_DECOMPRESSION, |
1387 | COOKIE_JAR | 1393 | COOKIE_JAR, |
1394 | HAPROXY_PROTOCOL | ||
1388 | }; | 1395 | }; |
1389 | 1396 | ||
1390 | int option = 0; | 1397 | int option = 0; |
@@ -1431,6 +1438,7 @@ process_arguments (int argc, char **argv) | |||
1431 | {"http-version", required_argument, 0, HTTP_VERSION_OPTION}, | 1438 | {"http-version", required_argument, 0, HTTP_VERSION_OPTION}, |
1432 | {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION}, | 1439 | {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION}, |
1433 | {"cookie-jar", required_argument, 0, COOKIE_JAR}, | 1440 | {"cookie-jar", required_argument, 0, COOKIE_JAR}, |
1441 | {"haproxy-protocol", no_argument, 0, HAPROXY_PROTOCOL}, | ||
1434 | {0, 0, 0, 0} | 1442 | {0, 0, 0, 0} |
1435 | }; | 1443 | }; |
1436 | 1444 | ||
@@ -1841,6 +1849,9 @@ process_arguments (int argc, char **argv) | |||
1841 | case COOKIE_JAR: | 1849 | case COOKIE_JAR: |
1842 | cookie_jar_file = optarg; | 1850 | cookie_jar_file = optarg; |
1843 | break; | 1851 | break; |
1852 | case HAPROXY_PROTOCOL: | ||
1853 | haproxy_protocol = true; | ||
1854 | break; | ||
1844 | case '?': | 1855 | case '?': |
1845 | /* print short usage statement if args not parsable */ | 1856 | /* print short usage statement if args not parsable */ |
1846 | usage5 (); | 1857 | usage5 (); |
@@ -2060,6 +2071,8 @@ print_help (void) | |||
2060 | printf (" %s\n", _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)")); | 2071 | printf (" %s\n", _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)")); |
2061 | printf (" %s\n", "--enable-automatic-decompression"); | 2072 | printf (" %s\n", "--enable-automatic-decompression"); |
2062 | printf (" %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING).")); | 2073 | printf (" %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING).")); |
2074 | printf(" %s\n", "--haproxy-protocol"); | ||
2075 | printf(" %s\n", _("Send HAProxy proxy protocol v1 header (CURLOPT_HAPROXYPROTOCOL).")); | ||
2063 | printf (" %s\n", "---cookie-jar=FILE"); | 2076 | printf (" %s\n", "---cookie-jar=FILE"); |
2064 | printf (" %s\n", _("Store cookies in the cookie jar and send them out when requested.")); | 2077 | printf (" %s\n", _("Store cookies in the cookie jar and send them out when requested.")); |
2065 | printf ("\n"); | 2078 | printf ("\n"); |
@@ -2144,7 +2157,7 @@ print_usage (void) | |||
2144 | printf (" [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport|curl>]\n"); | 2157 | printf (" [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport|curl>]\n"); |
2145 | printf (" [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n"); | 2158 | printf (" [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n"); |
2146 | printf (" [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n"); | 2159 | printf (" [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n"); |
2147 | printf (" [-A string] [-k string] [-S <version>] [--sni]\n"); | 2160 | printf (" [-A string] [-k string] [-S <version>] [--sni] [--haproxy-protocol]\n"); |
2148 | printf (" [-T <content-type>] [-j method]\n"); | 2161 | printf (" [-T <content-type>] [-j method]\n"); |
2149 | printf (" [--http-version=<version>] [--enable-automatic-decompression]\n"); | 2162 | printf (" [--http-version=<version>] [--enable-automatic-decompression]\n"); |
2150 | printf (" [--cookie-jar=<cookie jar file>\n"); | 2163 | printf (" [--cookie-jar=<cookie jar file>\n"); |
diff --git a/plugins/check_http.c b/plugins/check_http.c index 110f1188..425ce86b 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
@@ -472,9 +472,8 @@ bool process_arguments (int argc, char **argv) | |||
472 | http_method = strdup (optarg); | 472 | http_method = strdup (optarg); |
473 | char *tmp; | 473 | char *tmp; |
474 | if ((tmp = strstr(http_method, ":")) != NULL) { | 474 | if ((tmp = strstr(http_method, ":")) != NULL) { |
475 | tmp[0] = '\0'; | 475 | tmp[0] = '\0'; // set the ":" in the middle to 0 |
476 | http_method = http_method; | 476 | http_method_proxy = ++tmp; // this points to the second part |
477 | http_method_proxy = ++tmp; | ||
478 | } | 477 | } |
479 | break; | 478 | break; |
480 | case 'd': /* string or substring */ | 479 | case 'd': /* string or substring */ |
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 7ee9d0ca..295aa9b5 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c | |||
@@ -691,7 +691,6 @@ process_arguments (int argc, char **argv) | |||
691 | { | 691 | { |
692 | char *ptr; | 692 | char *ptr; |
693 | int c = 1; | 693 | int c = 1; |
694 | int ii = 0; | ||
695 | size_t j = 0, jj = 0; | 694 | size_t j = 0, jj = 0; |
696 | 695 | ||
697 | int option = 0; | 696 | int option = 0; |
@@ -848,7 +847,6 @@ process_arguments (int argc, char **argv) | |||
848 | numoids = j; | 847 | numoids = j; |
849 | if (c == 'E' || c == 'e') { | 848 | if (c == 'E' || c == 'e') { |
850 | jj++; | 849 | jj++; |
851 | ii++; | ||
852 | while (j+1 >= eval_size) { | 850 | while (j+1 >= eval_size) { |
853 | eval_size += OID_COUNT_STEP; | 851 | eval_size += OID_COUNT_STEP; |
854 | eval_method = realloc(eval_method, eval_size * sizeof(*eval_method)); | 852 | eval_method = realloc(eval_method, eval_size * sizeof(*eval_method)); |
@@ -875,7 +873,6 @@ process_arguments (int argc, char **argv) | |||
875 | memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8); | 873 | memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8); |
876 | } | 874 | } |
877 | eval_method[jj++] = CRIT_STRING; | 875 | eval_method[jj++] = CRIT_STRING; |
878 | ii++; | ||
879 | break; | 876 | break; |
880 | case 'R': /* regex */ | 877 | case 'R': /* regex */ |
881 | cflags = REG_ICASE; | 878 | cflags = REG_ICASE; |
@@ -896,7 +893,6 @@ process_arguments (int argc, char **argv) | |||
896 | memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8); | 893 | memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8); |
897 | } | 894 | } |
898 | eval_method[jj++] = CRIT_REGEX; | 895 | eval_method[jj++] = CRIT_REGEX; |
899 | ii++; | ||
900 | break; | 896 | break; |
901 | 897 | ||
902 | /* Format */ | 898 | /* Format */ |
diff --git a/plugins/popen.c b/plugins/popen.c index 036bc608..54e63bc5 100644 --- a/plugins/popen.c +++ b/plugins/popen.c | |||
@@ -105,7 +105,7 @@ spopen (const char *cmdstring) | |||
105 | #endif | 105 | #endif |
106 | 106 | ||
107 | env[0] = strdup("LC_ALL=C"); | 107 | env[0] = strdup("LC_ALL=C"); |
108 | env[1] = '\0'; | 108 | env[1] = NULL; |
109 | 109 | ||
110 | /* if no command was passed, return with no error */ | 110 | /* if no command was passed, return with no error */ |
111 | if (cmdstring == NULL) | 111 | if (cmdstring == NULL) |
diff --git a/plugins/runcmd.c b/plugins/runcmd.c index 32fd6b96..ed49bb99 100644 --- a/plugins/runcmd.c +++ b/plugins/runcmd.c | |||
@@ -115,7 +115,7 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr) | |||
115 | if(!np_pids) NP_RUNCMD_INIT; | 115 | if(!np_pids) NP_RUNCMD_INIT; |
116 | 116 | ||
117 | env[0] = strdup("LC_ALL=C"); | 117 | env[0] = strdup("LC_ALL=C"); |
118 | env[1] = '\0'; | 118 | env[1] = NULL; |
119 | 119 | ||
120 | /* make copy of command string so strtok() doesn't silently modify it */ | 120 | /* make copy of command string so strtok() doesn't silently modify it */ |
121 | /* (the calling program may want to access it later) */ | 121 | /* (the calling program may want to access it later) */ |