From 4f6bd425a230ca79ee9849e01bc64557f3dfdced Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 4 Apr 2013 13:37:58 +0000
Subject: [PATCH] Core: IpAddrInfo now supports selection of IP protocol (v4,
 v6, any) (thanks ebik)

git-svn-id: svn://ultimatepp.org/upp/trunk@5951 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Inet.h     |  9 +++++++--
 uppsrc/Core/Socket.cpp | 16 ++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/uppsrc/Core/Inet.h b/uppsrc/Core/Inet.h
index cc599959c..36a08590a 100644
--- a/uppsrc/Core/Inet.h
+++ b/uppsrc/Core/Inet.h
@@ -23,6 +23,7 @@ class IpAddrInfo {
 	struct Entry {
 		const char *host;
 		const char *port;
+		int         family;
 		int         status;
 		addrinfo   *addr;
 	};
@@ -33,6 +34,7 @@ class IpAddrInfo {
 	};
 
 	String host, port;
+	int    family;
 	Entry *entry;
 	Entry  exe[1];
 
@@ -45,9 +47,12 @@ class IpAddrInfo {
 	IpAddrInfo(const IpAddrInfo&);
 
 public:
-	void      Start(const String& host, int port);
+	enum IpAddrFamily {
+		FAMILY_ANY = 0, FAMILY_IPV4, FAMILY_IPV6
+	};
+	void      Start(const String& host, int port, int family = FAMILY_ANY);
 	bool      InProgress();
-	bool      Execute(const String& host, int port);
+	bool      Execute(const String& host, int port, int family = FAMILY_ANY);
 	addrinfo *GetResult();
 	void      Clear();
 
diff --git a/uppsrc/Core/Socket.cpp b/uppsrc/Core/Socket.cpp
index a9bbe7a53..1a660d34d 100644
--- a/uppsrc/Core/Socket.cpp
+++ b/uppsrc/Core/Socket.cpp
@@ -31,13 +31,14 @@ void IpAddrInfo::LeavePool()
 	IpAddrInfoPoolMutex.Leave();
 }
 
-int sGetAddrInfo(const char *host, const char *port, addrinfo **result)
+int sGetAddrInfo(const char *host, const char *port, int family, addrinfo **result)
 {
 	if(!host || !*host)
 		return EAI_NONAME;
 	addrinfo hints;
 	memset(&hints, 0, sizeof(addrinfo));
-	hints.ai_family = AF_UNSPEC;
+	const static int FamilyToAF[] = { AF_UNSPEC, AF_INET, AF_INET6 };
+	hints.ai_family = FamilyToAF[(family > 0 && family < __countof(FamilyToAF)) ? family : 0];
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_protocol = IPPROTO_TCP;
 
@@ -51,11 +52,12 @@ auxthread_t auxthread__ IpAddrInfo::Thread(void *ptr)
 	if(entry->status == WORKING) {
 		char host[1025];
 		char port[257];
+		int family = entry->family;
 		strcpy(host, entry->host);
 		strcpy(port, entry->port);
 		LeavePool();
 		addrinfo *result;
-		if(sGetAddrInfo(host, port, &result) == 0 && result) {
+		if(sGetAddrInfo(host, port, family, &result) == 0 && result) {
 			EnterPool();
 			if(entry->status == WORKING) {
 				entry->addr = result;
@@ -78,12 +80,12 @@ auxthread_t auxthread__ IpAddrInfo::Thread(void *ptr)
 	return 0;
 }
 
-bool IpAddrInfo::Execute(const String& host, int port)
+bool IpAddrInfo::Execute(const String& host, int port, int family)
 {
 	Clear();
 	entry = exe;
 	addrinfo *result;
-	entry->addr = sGetAddrInfo(~host, ~AsString(port), &result) == 0 ? result : NULL;
+	entry->addr = sGetAddrInfo(~host, ~AsString(port), family, &result) == 0 ? result : NULL;
 	return entry->addr;
 }
 
@@ -103,6 +105,7 @@ void IpAddrInfo::Start()
 				e->status = WORKING;
 				e->host = host;
 				e->port = port;
+				e->family = family;
 				StartAuxThread(&IpAddrInfo::Thread, e);
 			}
 			break;
@@ -111,11 +114,12 @@ void IpAddrInfo::Start()
 	LeavePool();
 }
 
-void IpAddrInfo::Start(const String& host_, int port_)
+void IpAddrInfo::Start(const String& host_, int port_, int family_)
 {
 	Clear();
 	port = AsString(port_);
 	host = host_;
+	family = family_;
 	Start();
 }