From 73ea6a1c3a7a4a7f3ab14230b80e783e57a7d830 Mon Sep 17 00:00:00 2001
From: Oisin Canty <o.canty@f5.com>
Date: Thu, 12 Aug 2021 08:23:09 +0000
Subject: Introduced nxt_sockaddr_parse_optport() for addresses w/o ports.

---
 src/nxt_http_route_addr.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'src/nxt_http_route_addr.c')

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
-- 
cgit