Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add client side IPv6 support 

* Properly format IPv6 addresses (so that parsing later on will work again)
 * Resolve names to all address families, not just IPv4

Addresses #452

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7363 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2009-05-09 17:21:29 +00:00 committed by Git SVN Gateway
parent 4a90601536
commit 3b80e3a63c
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/netplay/netplay.c
View File

@ -371,8 +371,23 @@ static int addressToText(const struct sockaddr* addr, char* buf, size_t size)
(int)(address[2]),
(int)(address[3]));
}
case AF_INET6:
{
uint16_t* address = (uint16_t*)&((const struct sockaddr_in6*)addr)->sin6_addr.s6_addr;
return snprintf(buf, size,
"%x:%x:%x:%x:%x:%x:%x:%x",
(int)ntohs(address[0]),
(int)ntohs(address[1]),
(int)ntohs(address[2]),
(int)ntohs(address[3]),
(int)ntohs(address[4]),
(int)ntohs(address[5]),
(int)ntohs(address[6]),
(int)ntohs(address[7]));
}
default:
ASSERT(!"Unknown address famliy", "Got non IPv4 address!");
ASSERT(!"Unknown address famliy", "Got non IPv4 or IPv6 address!");
return -1;
}
}
@ -986,7 +1001,7 @@ static struct addrinfo* resolveHost(const char* host, unsigned int port)
struct addrinfo hint;
int error;
hint.ai_family = AF_INET;
hint.ai_family = AF_UNSPEC;
hint.ai_socktype = SOCK_STREAM;
hint.ai_protocol = 0;
hint.ai_flags = (AI_V4MAPPED | AI_ADDRCONFIG);