diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2022-10-16 21:04:22 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2022-10-16 21:08:33 +0000 |
| commit | 865f46b255599c4a645e84a4cbb5ea7abdc0e207 (patch) | |
| tree | 02a27786346a888bd8662ae86042fbc97de76b9e /contrib/unbound/util/net_help.c | |
| parent | 8cee2ebac54a1c4a6b9cc1ee877ead57e529b7c2 (diff) | |
| download | src-865f46b255599c4a645e84a4cbb5ea7abdc0e207.tar.gz src-865f46b255599c4a645e84a4cbb5ea7abdc0e207.zip | |
unbound: Reapply Vendor import 1.17.0
Reapply 643f9a0581e8aac7eb790ced1164748939829826. 64d318ea98b7 was a
mismerge during fake rebase. Let's reapply it.
Changes include: Added ACL per interface, proxy protocol and bug fixes.
Announcement: https://nlnetlabs.nl/news/2022/Oct/13/unbound-1.17.0-released/
Merge commit '643f9a0581e8aac7eb790ced1164748939829826' into main
Diffstat (limited to 'contrib/unbound/util/net_help.c')
| -rw-r--r-- | contrib/unbound/util/net_help.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/unbound/util/net_help.c b/contrib/unbound/util/net_help.c index 8153dbdd1818..54fad6986f3c 100644 --- a/contrib/unbound/util/net_help.c +++ b/contrib/unbound/util/net_help.c @@ -233,12 +233,11 @@ log_addr(enum verbosity_value v, const char* str, else verbose(v, "%s %s port %d", str, dest, (int)port); } -int +int extstrtoaddr(const char* str, struct sockaddr_storage* addr, - socklen_t* addrlen) + socklen_t* addrlen, int port) { char* s; - int port = UNBOUND_DNS_PORT; if((s=strchr(str, '@'))) { char buf[MAX_ADDR_STRLEN]; if(s-str >= MAX_ADDR_STRLEN) { @@ -255,7 +254,6 @@ extstrtoaddr(const char* str, struct sockaddr_storage* addr, return ipstrtoaddr(str, port, addr, addrlen); } - int ipstrtoaddr(const char* ip, int port, struct sockaddr_storage* addr, socklen_t* addrlen) |