From a1a58143ec3e39b9cf76cdaeb84c6a07646a73e4 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 31 Aug 2021 19:00:05 -0700
Subject: [PATCH] Fix IPv6 address checks
- SOCK_cmpaddr returned inverted truth for IPv6 addresses.
This would prevent making a connection.
- Account for IPv6 address resolution. (bug: 5a627482)
---
src/i_tcp.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/i_tcp.c b/src/i_tcp.c
index cae97a7d10..3d5d302f84 100644
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@@ -427,7 +427,7 @@ static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
&& (b->ip4.sin_port == 0 || (a->ip4.sin_port == b->ip4.sin_port));
#ifdef HAVE_IPV6
else if (b->any.sa_family == AF_INET6)
- return memcmp(&a->ip6.sin6_addr, &b->ip6.sin6_addr, sizeof(b->ip6.sin6_addr))
+ return !memcmp(&a->ip6.sin6_addr, &b->ip6.sin6_addr, sizeof(b->ip6.sin6_addr))
&& (b->ip6.sin6_port == 0 || (a->ip6.sin6_port == b->ip6.sin6_port));
#endif
else
@@ -1156,6 +1156,7 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port)
SINT8 newnode = -1;
struct my_addrinfo *ai = NULL, *runp, hints;
int gaie;
+ size_t i;
if (!port || !port[0])
port = DEFAULTPORT;
@@ -1183,13 +1184,20 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port)
while (runp != NULL)
{
- // find ip of the server
- if (sendto(mysockets[0], NULL, 0, 0, runp->ai_addr, runp->ai_addrlen) == 0)
+ // test ip address of server
+ for (i = 0; i < mysocketses; ++i)
{
- memcpy(&clientaddress[newnode], runp->ai_addr, runp->ai_addrlen);
- break;
+ if (runp->ai_addr->sa_family == myfamily[i])
+ {
+ memcpy(&clientaddress[newnode], runp->ai_addr, runp->ai_addrlen);
+ break;
+ }
}
- runp = runp->ai_next;
+
+ if (i < mysocketses)
+ runp = runp->ai_next;
+ else
+ break;
}
I_freeaddrinfo(ai);
return newnode;
--
GitLab