From 5c32126d39521efca1c3c5b836ca2d42edede6e0 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Tue, 28 Mar 2023 16:45:52 +0800 Subject: tinyproxy: Update to 1.11.1 Signed-off-by: Zhang Rui --- net/tinyproxy/patches/120-fix_INET6.patch | 48 +++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 12 deletions(-) (limited to 'net/tinyproxy/patches/120-fix_INET6.patch') diff --git a/net/tinyproxy/patches/120-fix_INET6.patch b/net/tinyproxy/patches/120-fix_INET6.patch index 3911c18f0..6281a4223 100644 --- a/net/tinyproxy/patches/120-fix_INET6.patch +++ b/net/tinyproxy/patches/120-fix_INET6.patch @@ -1,16 +1,15 @@ --- a/src/sock.c +++ b/src/sock.c -@@ -39,8 +39,7 @@ - * returned if the bind succeeded. Otherwise, -1 is returned +@@ -63,7 +63,7 @@ static const char * family_string (int a * to indicate an error. */ --static int + static int -bind_socket (int sockfd, const char *addr, int family) -+static int bind_socket (int sockfd, const char *addr) ++bind_socket (int sockfd, const char *addr) { struct addrinfo hints, *res, *ressave; - -@@ -48,7 +47,7 @@ bind_socket (int sockfd, const char *add + int n; +@@ -72,14 +72,14 @@ bind_socket (int sockfd, const char *add assert (addr != NULL && strlen (addr) != 0); memset (&hints, 0, sizeof (struct addrinfo)); @@ -18,8 +17,33 @@ + hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; - /* The local port it not important */ -@@ -112,14 +111,12 @@ int opensock (const char *host, int port + /* The local port is not important */ + n = getaddrinfo (addr, NULL, &hints, &res); + if (n != 0) { + log_message (LOG_INFO, +- "bind_socket: getaddrinfo failed for %s: %s (af: %s)", addr, get_gai_error (n), family_string(family)); ++ "bind_socket: getaddrinfo failed for %s: %s", addr, get_gai_error (n)); + return -1; + } + +@@ -102,14 +102,14 @@ bind_socket (int sockfd, const char *add + * Try binding the given socket to supplied addresses, stopping when one succeeds. + */ + static int +-bind_socket_list (int sockfd, sblist *addresses, int family) ++bind_socket_list (int sockfd, sblist *addresses) + { + size_t nb_addresses = sblist_getsize(addresses); + size_t i; + + for (i = 0; i < nb_addresses; i++) { + const char *address = *(const char **)sblist_get(addresses, i); +- if (bind_socket(sockfd, address, family) >= 0) { ++ if (bind_socket(sockfd, address) >= 0) { + log_message(LOG_INFO, "Bound to %s", address); + return 0; + } +@@ -170,14 +170,12 @@ int opensock (const char *host, int port /* Bind to the specified address */ if (bind_to) { @@ -29,10 +53,10 @@ close (sockfd); continue; /* can't bind, so try again */ } - } else if (config.bind_address) { -- if (bind_socket (sockfd, config.bind_address, -- res->ai_family) < 0) { -+ if (bind_socket (sockfd, config.bind_address) < 0) { + } else if (config->bind_addrs) { +- if (bind_socket_list (sockfd, config->bind_addrs, +- res->ai_family) < 0) { ++ if (bind_socket_list (sockfd, config->bind_addrs) < 0) { close (sockfd); continue; /* can't bind, so try again */ } -- cgit v1.2.3