diff options
| author | Andrei Belov <defan@nginx.com> | 2021-08-19 18:17:12 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2021-08-19 18:17:12 +0300 |
| commit | db442f1be7e713e6a219621ff97a51046590dbd6 (patch) | |
| tree | 913734275bc890ec175e51fcb0f36b01a3c52c24 /src/nxt_http_route_addr.c | |
| parent | a1d2ced6fc2317d36bc917c5d0ac339bc647dc34 (diff) | |
| parent | 13c0025dfa6e041563d0ad5dd81679b44522694c (diff) | |
| download | unit-db442f1be7e713e6a219621ff97a51046590dbd6.tar.gz unit-db442f1be7e713e6a219621ff97a51046590dbd6.tar.bz2 | |
Merged with the default branch.1.25.0-1
Diffstat (limited to '')
| -rw-r--r-- | src/nxt_http_route_addr.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/nxt_http_route_addr.c b/src/nxt_http_route_addr.c index 6d4955ed..2907a902 100644 --- a/src/nxt_http_route_addr.c +++ b/src/nxt_http_route_addr.c @@ -8,7 +8,6 @@ #include <nxt_http_route_addr.h> -static nxt_bool_t nxt_str_looks_like_ipv6(const nxt_str_t *str); #if (NXT_INET6) static nxt_bool_t nxt_valid_ipv6_blocks(u_char *c, size_t len); #endif @@ -57,7 +56,7 @@ nxt_http_route_addr_pattern_parse(nxt_mp_t *mp, goto parse_port; } - if (nxt_str_looks_like_ipv6(&addr)) { + if (nxt_inet6_probe(&addr)) { #if (NXT_INET6) u_char *end; uint8_t i; @@ -304,22 +303,6 @@ parse_port: } -static nxt_bool_t -nxt_str_looks_like_ipv6(const nxt_str_t *str) -{ - u_char *colon, *end; - - colon = nxt_memchr(str->start, ':', str->length); - - if (colon != NULL) { - end = str->start + str->length; - colon = nxt_memchr(colon + 1, ':', end - (colon + 1)); - } - - return (colon != NULL); -} - - #if (NXT_INET6) static nxt_bool_t |