X-Git-Url: http://git.sourceforge.jp/view?p=ffftp%2Fffftp.git;a=blobdiff_plain;f=socketwrapper.c;h=49a52380cfddd57a4fbbb3682c839ac4da2caeaa;hp=48ebfcf26c441f4fe238621c3c6904b506589a81;hb=ffd9ce66d16fb452725a6bb1b5d1ef848fcd2628;hpb=193bc37b9f55b9a1dd24a72e06203cb1503eab15

diff --git a/socketwrapper.c b/socketwrapper.c
index 48ebfcf..49a5238 100644
--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -2,15 +2,19 @@
 // Copyright (C) 2011 Suguru Kawamoto
 // ソケットラッパー
 // socket関連関数をOpenSSL用に置換
+// socket関連関数のIPv6対応
 // コンパイルにはOpenSSLのヘッダーファイルが必要
 // 実行にはOpenSSLのDLLが必要
 
+#include <ws2tcpip.h>
 #include <windows.h>
 #include <mmsystem.h>
 #include <openssl/ssl.h>
 
 #include "socketwrapper.h"
 #include "protectprocess.h"
+#include "mbswrapper.h"
+#include "punycode.h"
 
 typedef void (__cdecl* _SSL_load_error_strings)();
 typedef int (__cdecl* _SSL_library_init)();
@@ -30,15 +34,20 @@ typedef int (__cdecl* _SSL_read)(SSL*, void*, int);
 typedef int (__cdecl* _SSL_get_error)(SSL*, int);
 typedef X509* (__cdecl* _SSL_get_peer_certificate)(const SSL*);
 typedef long (__cdecl* _SSL_get_verify_result)(const SSL*);
+typedef SSL_SESSION* (__cdecl* _SSL_get_session)(SSL*);
+typedef int (__cdecl* _SSL_set_session)(SSL*, SSL_SESSION*);
+typedef X509_STORE* (__cdecl* _SSL_CTX_get_cert_store)(const SSL_CTX*);
 typedef BIO_METHOD* (__cdecl* _BIO_s_mem)();
 typedef BIO* (__cdecl* _BIO_new)(BIO_METHOD*);
 typedef int (__cdecl* _BIO_free)(BIO*);
+typedef BIO* (__cdecl* _BIO_new_mem_buf)(void*, int);
 typedef long (__cdecl* _BIO_ctrl)(BIO*, int, long, void*);
 typedef void (__cdecl* _X509_free)(X509*);
 typedef int (__cdecl* _X509_print_ex)(BIO*, X509*, unsigned long, unsigned long);
 typedef X509_NAME* (__cdecl* _X509_get_subject_name)(X509*);
-typedef X509_NAME* (__cdecl* _X509_get_issuer_name)(X509*);
 typedef int (__cdecl* _X509_NAME_print_ex)(BIO*, X509_NAME*, int, unsigned long);
+typedef X509* (__cdecl* _PEM_read_bio_X509)(BIO*, X509**, pem_password_cb*, void*);
+typedef int (__cdecl* _X509_STORE_add_cert)(X509_STORE*, X509*);
 
 _SSL_load_error_strings p_SSL_load_error_strings;
 _SSL_library_init p_SSL_library_init;
@@ -58,17 +67,22 @@ _SSL_read p_SSL_read;
 _SSL_get_error p_SSL_get_error;
 _SSL_get_peer_certificate p_SSL_get_peer_certificate;
 _SSL_get_verify_result p_SSL_get_verify_result;
+_SSL_get_session p_SSL_get_session;
+_SSL_set_session p_SSL_set_session;
+_SSL_CTX_get_cert_store p_SSL_CTX_get_cert_store;
 _BIO_s_mem p_BIO_s_mem;
 _BIO_new p_BIO_new;
 _BIO_free p_BIO_free;
+_BIO_new_mem_buf p_BIO_new_mem_buf;
 _BIO_ctrl p_BIO_ctrl;
 _X509_free p_X509_free;
 _X509_print_ex p_X509_print_ex;
 _X509_get_subject_name p_X509_get_subject_name;
-_X509_get_issuer_name p_X509_get_issuer_name;
 _X509_NAME_print_ex p_X509_NAME_print_ex;
+_PEM_read_bio_X509 p_PEM_read_bio_X509;
+_X509_STORE_add_cert p_X509_STORE_add_cert;
 
-#define MAX_SSL_SOCKET 64
+#define MAX_SSL_SOCKET 16
 
 BOOL g_bOpenSSLLoaded;
 HMODULE g_hOpenSSL;
@@ -80,17 +94,18 @@ LPSSLCONFIRMCALLBACK g_pOpenSSLConfirmCallback;
 SSL_CTX* g_pOpenSSLCTX;
 SSL* g_pOpenSSLHandle[MAX_SSL_SOCKET];
 
-BOOL __stdcall DefaultSSLTimeoutCallback()
+BOOL __stdcall DefaultSSLTimeoutCallback(BOOL* pbAborted)
 {
 	Sleep(100);
-	return FALSE;
+	return *pbAborted;
 }
 
-BOOL __stdcall DefaultSSLConfirmCallback(BOOL bVerified, LPCSTR Certificate, LPCSTR CommonName)
+BOOL __stdcall DefaultSSLConfirmCallback(BOOL* pbAborted, BOOL bVerified, LPCSTR Certificate, LPCSTR CommonName)
 {
 	return bVerified;
 }
 
+// OpenSSLを初期化
 BOOL LoadOpenSSL()
 {
 	if(g_bOpenSSLLoaded)
@@ -104,8 +119,9 @@ BOOL LoadOpenSSL()
 	RegisterTrustedModuleSHA1Hash("\x01\x32\x7A\xAE\x69\x26\xE6\x58\xC7\x63\x22\x1E\x53\x5A\x78\xBC\x61\xC7\xB5\xC1");
 #endif
 	g_hOpenSSL = LoadLibrary("ssleay32.dll");
-	if(!g_hOpenSSL)
-		g_hOpenSSL = LoadLibrary("libssl32.dll");
+	// バージョン固定のためlibssl32.dllの読み込みは脆弱性の原因になり得るので廃止
+//	if(!g_hOpenSSL)
+//		g_hOpenSSL = LoadLibrary("libssl32.dll");
 	if(!g_hOpenSSL
 		|| !(p_SSL_load_error_strings = (_SSL_load_error_strings)GetProcAddress(g_hOpenSSL, "SSL_load_error_strings"))
 		|| !(p_SSL_library_init = (_SSL_library_init)GetProcAddress(g_hOpenSSL, "SSL_library_init"))
@@ -124,7 +140,10 @@ BOOL LoadOpenSSL()
 		|| !(p_SSL_read = (_SSL_read)GetProcAddress(g_hOpenSSL, "SSL_read"))
 		|| !(p_SSL_get_error = (_SSL_get_error)GetProcAddress(g_hOpenSSL, "SSL_get_error"))
 		|| !(p_SSL_get_peer_certificate = (_SSL_get_peer_certificate)GetProcAddress(g_hOpenSSL, "SSL_get_peer_certificate"))
-		|| !(p_SSL_get_verify_result = (_SSL_get_verify_result)GetProcAddress(g_hOpenSSL, "SSL_get_verify_result")))
+		|| !(p_SSL_get_verify_result = (_SSL_get_verify_result)GetProcAddress(g_hOpenSSL, "SSL_get_verify_result"))
+		|| !(p_SSL_get_session = (_SSL_get_session)GetProcAddress(g_hOpenSSL, "SSL_get_session"))
+		|| !(p_SSL_set_session = (_SSL_set_session)GetProcAddress(g_hOpenSSL, "SSL_set_session"))
+		|| !(p_SSL_CTX_get_cert_store = (_SSL_CTX_get_cert_store)GetProcAddress(g_hOpenSSL, "SSL_CTX_get_cert_store")))
 	{
 		if(g_hOpenSSL)
 			FreeLibrary(g_hOpenSSL);
@@ -136,12 +155,14 @@ BOOL LoadOpenSSL()
 		|| !(p_BIO_s_mem = (_BIO_s_mem)GetProcAddress(g_hOpenSSLCommon, "BIO_s_mem"))
 		|| !(p_BIO_new = (_BIO_new)GetProcAddress(g_hOpenSSLCommon, "BIO_new"))
 		|| !(p_BIO_free = (_BIO_free)GetProcAddress(g_hOpenSSLCommon, "BIO_free"))
+		|| !(p_BIO_new_mem_buf = (_BIO_new_mem_buf)GetProcAddress(g_hOpenSSLCommon, "BIO_new_mem_buf"))
 		|| !(p_BIO_ctrl = (_BIO_ctrl)GetProcAddress(g_hOpenSSLCommon, "BIO_ctrl"))
 		|| !(p_X509_free = (_X509_free)GetProcAddress(g_hOpenSSLCommon, "X509_free"))
 		|| !(p_X509_print_ex = (_X509_print_ex)GetProcAddress(g_hOpenSSLCommon, "X509_print_ex"))
 		|| !(p_X509_get_subject_name = (_X509_get_subject_name)GetProcAddress(g_hOpenSSLCommon, "X509_get_subject_name"))
-		|| !(p_X509_get_issuer_name = (_X509_get_issuer_name)GetProcAddress(g_hOpenSSLCommon, "X509_get_issuer_name"))
-		|| !(p_X509_NAME_print_ex = (_X509_NAME_print_ex)GetProcAddress(g_hOpenSSLCommon, "X509_NAME_print_ex")))
+		|| !(p_X509_NAME_print_ex = (_X509_NAME_print_ex)GetProcAddress(g_hOpenSSLCommon, "X509_NAME_print_ex"))
+		|| !(p_PEM_read_bio_X509 = (_PEM_read_bio_X509)GetProcAddress(g_hOpenSSLCommon, "PEM_read_bio_X509"))
+		|| !(p_X509_STORE_add_cert = (_X509_STORE_add_cert)GetProcAddress(g_hOpenSSLCommon, "X509_STORE_add_cert")))
 	{
 		if(g_hOpenSSL)
 			FreeLibrary(g_hOpenSSL);
@@ -160,6 +181,7 @@ BOOL LoadOpenSSL()
 	return TRUE;
 }
 
+// OpenSSLを解放
 void FreeOpenSSL()
 {
 	int i;
@@ -187,6 +209,7 @@ void FreeOpenSSL()
 	g_bOpenSSLLoaded = FALSE;
 }
 
+// OpenSSLが使用可能かどうか確認
 BOOL IsOpenSSLLoaded()
 {
 	return g_bOpenSSLLoaded;
@@ -217,7 +240,7 @@ SSL** FindSSLPointerFromSocket(SOCKET s)
 	return NULL;
 }
 
-BOOL ConfirmSSLCertificate(SSL* pSSL)
+BOOL ConfirmSSLCertificate(SSL* pSSL, BOOL* pbAborted)
 {
 	BOOL bResult;
 	BOOL bVerified;
@@ -263,7 +286,7 @@ BOOL ConfirmSSLCertificate(SSL* pSSL)
 		}
 		p_X509_free(pX509);
 	}
-	if(p_SSL_get_verify_result(pSSL) == X509_V_OK)
+	if(pX509 && p_SSL_get_verify_result(pSSL) == X509_V_OK)
 		bVerified = TRUE;
 	pCN = pSubject;
 	while(pCN)
@@ -278,7 +301,7 @@ BOOL ConfirmSSLCertificate(SSL* pSSL)
 		if(pCN = strchr(pCN, ','))
 			pCN++;
 	}
-	bResult = g_pOpenSSLConfirmCallback(bVerified, pData, pCN);
+	bResult = g_pOpenSSLConfirmCallback(pbAborted, bVerified, pData, pCN);
 	if(pData)
 		free(pData);
 	if(pSubject)
@@ -305,23 +328,103 @@ void SetSSLConfirmCallback(LPSSLCONFIRMCALLBACK pCallback)
 	LeaveCriticalSection(&g_OpenSSLLock);
 }
 
+// SSLルート証明書を設定
+// PEM形式のみ指定可能
+BOOL SetSSLRootCertificate(const void* pData, DWORD Length)
+{
+	BOOL r;
+	X509_STORE* pStore;
+	BYTE* p;
+	BYTE* pBegin;
+	BYTE* pEnd;
+	BIO* pBIO;
+	X509* pX509;
+	if(!g_bOpenSSLLoaded)
+		return FALSE;
+	r = FALSE;
+	EnterCriticalSection(&g_OpenSSLLock);
+	if(!g_pOpenSSLCTX)
+		g_pOpenSSLCTX = p_SSL_CTX_new(p_SSLv23_method());
+	if(g_pOpenSSLCTX)
+	{
+		if(pStore = p_SSL_CTX_get_cert_store(g_pOpenSSLCTX))
+		{
+			p = (BYTE*)pData;
+			pBegin = NULL;
+			pEnd = NULL;
+			while(Length > 0)
+			{
+				if(!pBegin)
+				{
+					if(Length < 27)
+						break;
+					if(memcmp(p, "-----BEGIN CERTIFICATE-----", 27) == 0)
+						pBegin = p;
+				}
+				else if(!pEnd)
+				{
+					if(Length < 25)
+						break;
+					if(memcmp(p, "-----END CERTIFICATE-----", 25) == 0)
+						pEnd = p + 25;
+				}
+				if(pBegin && pEnd)
+				{
+					if(pBIO = p_BIO_new_mem_buf(pBegin, (int)((size_t)pEnd - (size_t)pBegin)))
+					{
+						if(pX509 = p_PEM_read_bio_X509(pBIO, NULL, NULL, NULL))
+						{
+							if(p_X509_STORE_add_cert(pStore, pX509) == 1)
+								r = TRUE;
+							p_X509_free(pX509);
+						}
+						p_BIO_free(pBIO);
+					}
+					pBegin = NULL;
+					pEnd = NULL;
+				}
+				p++;
+				Length--;
+			}
+		}
+	}
+	LeaveCriticalSection(&g_OpenSSLLock);
+	return r;
+}
+
+// ワイルドカードの比較
+// 主にSSL証明書のCN確認用
 BOOL IsHostNameMatched(LPCSTR HostName, LPCSTR CommonName)
 {
 	BOOL bResult;
-	char* pAsterisk;
+	const char* pAsterisk;
+	size_t BeforeAsterisk;
+	const char* pBeginAsterisk;
+	const char* pEndAsterisk;
+	const char* pDot;
 	bResult = FALSE;
 	if(HostName && CommonName)
 	{
 		if(pAsterisk = strchr(CommonName, '*'))
 		{
-			if(_strnicmp(HostName, CommonName, ((size_t)pAsterisk - (size_t)CommonName) / sizeof(char)) == 0)
+			BeforeAsterisk = ((size_t)pAsterisk - (size_t)CommonName) / sizeof(char);
+			pBeginAsterisk = HostName + BeforeAsterisk;
+			while(*pAsterisk == '*')
+			{
+				pAsterisk++;
+			}
+			pEndAsterisk = HostName + strlen(HostName) - strlen(pAsterisk);
+			// "*"より前は大文字小文字を無視して完全一致
+			if(_strnicmp(HostName, CommonName, BeforeAsterisk) == 0)
 			{
-				while(*pAsterisk == '*')
+				// "*"より後は大文字小文字を無視して完全一致
+				if(_stricmp(pEndAsterisk, pAsterisk) == 0)
 				{
-					pAsterisk++;
+					// "*"と一致する範囲に"."が含まれてはならない
+					pDot = strchr(pBeginAsterisk, '.');
+					if(!pDot || pDot >= pEndAsterisk)
+						bResult = TRUE;
 				}
-				if(_stricmp(HostName + strlen(HostName) - strlen(pAsterisk), pAsterisk) == 0)
-					bResult = TRUE;
 			}
 		}
 		else if(_stricmp(HostName, CommonName) == 0)
@@ -330,11 +433,16 @@ BOOL IsHostNameMatched(LPCSTR HostName, LPCSTR CommonName)
 	return bResult;
 }
 
-BOOL AttachSSL(SOCKET s)
+// SSLセッションを開始
+BOOL AttachSSL(SOCKET s, SOCKET parent, BOOL* pbAborted)
 {
 	BOOL r;
 	DWORD Time;
 	SSL** ppSSL;
+	SSL** ppSSLParent;
+	SSL_SESSION* pSession;
+	int Return;
+	int Error;
 	if(!g_bOpenSSLLoaded)
 		return FALSE;
 	r = FALSE;
@@ -350,18 +458,53 @@ BOOL AttachSSL(SOCKET s)
 			{
 				if(p_SSL_set_fd(*ppSSL, s) != 0)
 				{
-					r = TRUE;
+					if(parent != INVALID_SOCKET)
+					{
+						if(ppSSLParent = FindSSLPointerFromSocket(parent))
+						{
+							if(pSession = p_SSL_get_session(*ppSSLParent))
+							{
+								if(p_SSL_set_session(*ppSSL, pSession) == 1)
+								{
+								}
+							}
+						}
+					}
 					// SSLのネゴシエーションには時間がかかる場合がある
-					while(p_SSL_connect(*ppSSL) != 1)
+					r = TRUE;
+					while(r)
 					{
-						LeaveCriticalSection(&g_OpenSSLLock);
-						if(g_pOpenSSLTimeoutCallback() || (g_OpenSSLTimeout > 0 && timeGetTime() - Time >= g_OpenSSLTimeout))
+						Return = p_SSL_connect(*ppSSL);
+						if(Return == 1)
+							break;
+						Error = p_SSL_get_error(*ppSSL, Return);
+						if(Error == SSL_ERROR_WANT_READ || Error == SSL_ERROR_WANT_WRITE)
+						{
+							LeaveCriticalSection(&g_OpenSSLLock);
+							if(g_pOpenSSLTimeoutCallback(pbAborted) || (g_OpenSSLTimeout > 0 && timeGetTime() - Time >= g_OpenSSLTimeout))
+								r = FALSE;
+							EnterCriticalSection(&g_OpenSSLLock);
+						}
+						else
+							r = FALSE;
+					}
+					if(r)
+					{
+						if(ConfirmSSLCertificate(*ppSSL, pbAborted))
+						{
+						}
+						else
 						{
+							LeaveCriticalSection(&g_OpenSSLLock);
 							DetachSSL(s);
 							r = FALSE;
 							EnterCriticalSection(&g_OpenSSLLock);
-							break;
 						}
+					}
+					else
+					{
+						LeaveCriticalSection(&g_OpenSSLLock);
+						DetachSSL(s);
 						EnterCriticalSection(&g_OpenSSLLock);
 					}
 				}
@@ -371,14 +514,6 @@ BOOL AttachSSL(SOCKET s)
 					DetachSSL(s);
 					EnterCriticalSection(&g_OpenSSLLock);
 				}
-				if(ConfirmSSLCertificate(*ppSSL))
-				{
-				}
-				else
-				{
-					DetachSSL(s);
-					r = FALSE;
-				}
 			}
 		}
 	}
@@ -386,6 +521,7 @@ BOOL AttachSSL(SOCKET s)
 	return r;
 }
 
+// SSLセッションを終了
 BOOL DetachSSL(SOCKET s)
 {
 	BOOL r;
@@ -405,6 +541,8 @@ BOOL DetachSSL(SOCKET s)
 	return r;
 }
 
+// SSLとしてマークされているか確認
+// マークされていればTRUEを返す
 BOOL IsSSLAttached(SOCKET s)
 {
 	SSL** ppSSL;
@@ -414,7 +552,7 @@ BOOL IsSSLAttached(SOCKET s)
 	ppSSL = FindSSLPointerFromSocket(s);
 	LeaveCriticalSection(&g_OpenSSLLock);
 	if(!ppSSL)
-		return TRUE;
+		return FALSE;
 	return TRUE;
 }
 
@@ -433,11 +571,15 @@ int listenS(SOCKET s, int backlog)
 	return listen(s, backlog);
 }
 
+// accept相当の関数
+// ただし初めからSSLのネゴシエーションを行う
 SOCKET acceptS(SOCKET s, struct sockaddr *addr, int *addrlen)
 {
 	SOCKET r;
+	BOOL bAborted;
 	r = accept(s, addr, addrlen);
-	if(!AttachSSL(r))
+	bAborted = FALSE;
+	if(!AttachSSL(r, INVALID_SOCKET, &bAborted))
 	{
 		closesocket(r);
 		return INVALID_SOCKET;
@@ -445,21 +587,27 @@ SOCKET acceptS(SOCKET s, struct sockaddr *addr, int *addrlen)
 	return r;
 }
 
+// connect相当の関数
+// ただし初めからSSLのネゴシエーションを行う
 int connectS(SOCKET s, const struct sockaddr *name, int namelen)
 {
 	int r;
+	BOOL bAborted;
 	r = connect(s, name, namelen);
-	if(!AttachSSL(r))
+	bAborted = FALSE;
+	if(!AttachSSL(r, INVALID_SOCKET, &bAborted))
 		return SOCKET_ERROR;
 	return r;
 }
 
+// closesocket相当の関数
 int closesocketS(SOCKET s)
 {
 	DetachSSL(s);
 	return closesocket(s);
 }
 
+// send相当の関数
 int sendS(SOCKET s, const char * buf, int len, int flags)
 {
 	SSL** ppSSL;
@@ -473,6 +621,7 @@ int sendS(SOCKET s, const char * buf, int len, int flags)
 	return p_SSL_write(*ppSSL, buf, len);
 }
 
+// recv相当の関数
 int recvS(SOCKET s, char * buf, int len, int flags)
 {
 	SSL** ppSSL;
@@ -488,3 +637,355 @@ int recvS(SOCKET s, char * buf, int len, int flags)
 	return p_SSL_read(*ppSSL, buf, len);
 }
 
+// IPv6対応
+
+typedef struct
+{
+	HANDLE h;
+	HWND hWnd;
+	u_int wMsg;
+	char * name;
+	char * buf;
+	int buflen;
+	short Family;
+} GETHOSTBYNAMEDATA;
+
+DWORD WINAPI WSAAsyncGetHostByNameIPv6ThreadProc(LPVOID lpParameter)
+{
+	GETHOSTBYNAMEDATA* pData;
+	struct hostent* pHost;
+	struct addrinfo* pAddr;
+	struct addrinfo* p;
+	pHost = NULL;
+	pData = (GETHOSTBYNAMEDATA*)lpParameter;
+	if(getaddrinfo(pData->name, NULL, NULL, &pAddr) == 0)
+	{
+		p = pAddr;
+		while(p)
+		{
+			if(p->ai_family == pData->Family)
+			{
+				switch(p->ai_family)
+				{
+				case AF_INET:
+					pHost = (struct hostent*)pData->buf;
+					if((size_t)pData->buflen >= sizeof(struct hostent) + sizeof(char*) * 2 + sizeof(struct in_addr)
+						&& p->ai_addrlen >= sizeof(struct sockaddr_in))
+					{
+						pHost->h_name = NULL;
+						pHost->h_aliases = NULL;
+						pHost->h_addrtype = p->ai_family;
+						pHost->h_length = sizeof(struct in_addr);
+						pHost->h_addr_list = (char**)(&pHost[1]);
+						pHost->h_addr_list[0] = (char*)(&pHost->h_addr_list[2]);
+						pHost->h_addr_list[1] = NULL;
+						memcpy(pHost->h_addr_list[0], &((struct sockaddr_in*)p->ai_addr)->sin_addr, sizeof(struct in_addr));
+						PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(sizeof(struct hostent) + sizeof(char*) * 2 + p->ai_addrlen));
+					}
+					else
+						PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(WSAENOBUFS << 16));
+					break;
+				case AF_INET6:
+					pHost = (struct hostent*)pData->buf;
+					if((size_t)pData->buflen >= sizeof(struct hostent) + sizeof(char*) * 2 + sizeof(struct in6_addr)
+						&& p->ai_addrlen >= sizeof(struct sockaddr_in6))
+					{
+						pHost->h_name = NULL;
+						pHost->h_aliases = NULL;
+						pHost->h_addrtype = p->ai_family;
+						pHost->h_length = sizeof(struct in6_addr);
+						pHost->h_addr_list = (char**)(&pHost[1]);
+						pHost->h_addr_list[0] = (char*)(&pHost->h_addr_list[2]);
+						pHost->h_addr_list[1] = NULL;
+						memcpy(pHost->h_addr_list[0], &((struct sockaddr_in6*)p->ai_addr)->sin6_addr, sizeof(struct in6_addr));
+						PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(sizeof(struct hostent) + sizeof(char*) * 2 + p->ai_addrlen));
+					}
+					else
+						PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(WSAENOBUFS << 16));
+					break;
+				}
+			}
+			if(pHost)
+				break;
+			p = p->ai_next;
+		}
+		if(!p)
+			PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(ERROR_INVALID_FUNCTION << 16));
+		freeaddrinfo(pAddr);
+	}
+	else
+		PostMessage(pData->hWnd, pData->wMsg, (WPARAM)pData->h, (LPARAM)(ERROR_INVALID_FUNCTION << 16));
+	free(pData->name);
+	free(pData);
+	// CreateThreadが返すハンドルが重複するのを回避
+	Sleep(10000);
+	return 0;
+}
+
+// IPv6対応のWSAAsyncGetHostByName相当の関数
+// FamilyにはAF_INETまたはAF_INET6を指定可能
+// ただしANSI用
+HANDLE WSAAsyncGetHostByNameIPv6(HWND hWnd, u_int wMsg, const char * name, char * buf, int buflen, short Family)
+{
+	HANDLE hResult;
+	GETHOSTBYNAMEDATA* pData;
+	hResult = NULL;
+	if(pData = malloc(sizeof(GETHOSTBYNAMEDATA)))
+	{
+		pData->hWnd = hWnd;
+		pData->wMsg = wMsg;
+		if(pData->name = malloc(sizeof(char) * (strlen(name) + 1)))
+		{
+			strcpy(pData->name, name);
+			pData->buf = buf;
+			pData->buflen = buflen;
+			pData->Family = Family;
+			if(pData->h = CreateThread(NULL, 0, WSAAsyncGetHostByNameIPv6ThreadProc, pData, CREATE_SUSPENDED, NULL))
+			{
+				ResumeThread(pData->h);
+				hResult = pData->h;
+			}
+		}
+	}
+	if(!hResult)
+	{
+		if(pData)
+		{
+			if(pData->name)
+				free(pData->name);
+			free(pData);
+		}
+	}
+	return hResult;
+}
+
+// WSAAsyncGetHostByNameIPv6用のWSACancelAsyncRequest相当の関数
+int WSACancelAsyncRequestIPv6(HANDLE hAsyncTaskHandle)
+{
+	int Result;
+	Result = SOCKET_ERROR;
+	if(TerminateThread(hAsyncTaskHandle, 0))
+		Result = 0;
+	return Result;
+}
+
+char* AddressToStringIPv6(char* str, void* in6)
+{
+	char* pResult;
+	unsigned char* p;
+	int MaxZero;
+	int MaxZeroLen;
+	int i;
+	int j;
+	char Tmp[5];
+	pResult = str;
+	p = (unsigned char*)in6;
+	MaxZero = 8;
+	MaxZeroLen = 1;
+	for(i = 0; i < 8; i++)
+	{
+		for(j = i; j < 8; j++)
+		{
+			if(p[j * 2] != 0 || p[j * 2 + 1] != 0)
+				break;
+		}
+		if(j - i > MaxZeroLen)
+		{
+			MaxZero = i;
+			MaxZeroLen = j - i;
+		}
+	}
+	strcpy(str, "");
+	for(i = 0; i < 8; i++)
+	{
+		if(i == MaxZero)
+		{
+			if(i == 0)
+				strcat(str, ":");
+			strcat(str, ":");
+		}
+		else if(i < MaxZero || i >= MaxZero + MaxZeroLen)
+		{
+			sprintf(Tmp, "%x", (((int)p[i * 2] & 0xff) << 8) | ((int)p[i * 2 + 1] & 0xff));
+			strcat(str, Tmp);
+			if(i < 7)
+				strcat(str, ":");
+		}
+	}
+	return pResult;
+}
+
+// IPv6対応のinet_ntoa相当の関数
+// ただしANSI用
+char* inet6_ntoa(struct in6_addr in6)
+{
+	char* pResult;
+	static char Adrs[40];
+	pResult = NULL;
+	memset(Adrs, 0, sizeof(Adrs));
+	pResult = AddressToStringIPv6(Adrs, &in6);
+	return pResult;
+}
+
+// IPv6対応のinet_addr相当の関数
+// ただしANSI用
+struct in6_addr inet6_addr(const char* cp)
+{
+	struct in6_addr Result;
+	int AfterZero;
+	int i;
+	char* p;
+	memset(&Result, 0, sizeof(Result));
+	AfterZero = 0;
+	for(i = 0; i < 8; i++)
+	{
+		if(!cp)
+		{
+			memset(&Result, 0xff, sizeof(Result));
+			break;
+		}
+		if(i >= AfterZero)
+		{
+			if(strncmp(cp, ":", 1) == 0)
+			{
+				cp = cp + 1;
+				if(i == 0 && strncmp(cp, ":", 1) == 0)
+					cp = cp + 1;
+				p = (char*)cp;
+				AfterZero = 7;
+				while(p = strstr(p, ":"))
+				{
+					p = p + 1;
+					AfterZero--;
+				}
+			}
+			else
+			{
+				Result.u.Word[i] = (USHORT)strtol(cp, &p, 16);
+				Result.u.Word[i] = ((Result.u.Word[i] & 0xff00) >> 8) | ((Result.u.Word[i] & 0x00ff) << 8);
+				if(strncmp(p, ":", 1) != 0 && strlen(p) > 0)
+				{
+					memset(&Result, 0xff, sizeof(Result));
+					break;
+				}
+				if(cp = strstr(cp, ":"))
+					cp = cp + 1;
+			}
+		}
+	}
+	return Result;
+}
+
+BOOL ConvertDomainNameToPunycode(LPSTR Output, DWORD Count, LPCSTR Input)
+{
+	BOOL bResult;
+	punycode_uint* pUnicode;
+	punycode_uint* p;
+	BOOL bNeeded;
+	LPCSTR InputString;
+	punycode_uint Length;
+	punycode_uint OutputLength;
+	bResult = FALSE;
+	if(pUnicode = malloc(sizeof(punycode_uint) * strlen(Input)))
+	{
+		p = pUnicode;
+		bNeeded = FALSE;
+		InputString = Input;
+		Length = 0;
+		while(*InputString != '\0')
+		{
+			*p = (punycode_uint)GetNextCharM(InputString, &InputString);
+			if(*p >= 0x80)
+				bNeeded = TRUE;
+			p++;
+			Length++;
+		}
+		if(bNeeded)
+		{
+			if(Count >= strlen("xn--") + 1)
+			{
+				strcpy(Output, "xn--");
+				OutputLength = Count - strlen("xn--");
+				if(punycode_encode(Length, pUnicode, NULL, (punycode_uint*)&OutputLength, Output + strlen("xn--")) == punycode_success)
+				{
+					Output[strlen("xn--") + OutputLength] = '\0';
+					bResult = TRUE;
+				}
+			}
+		}
+		free(pUnicode);
+	}
+	if(!bResult)
+	{
+		if(Count >= strlen(Input) + 1)
+		{
+			strcpy(Output, Input);
+			bResult = TRUE;
+		}
+	}
+	return bResult;
+}
+
+BOOL ConvertNameToPunycode(LPSTR Output, LPCSTR Input)
+{
+	BOOL bResult;
+	DWORD Length;
+	char* pm0;
+	char* pm1;
+	char* p;
+	char* pNext;
+	bResult = FALSE;
+	Length = strlen(Input);
+	if(pm0 = AllocateStringM(Length + 1))
+	{
+		if(pm1 = AllocateStringM(Length * 4 + 1))
+		{
+			strcpy(pm0, Input);
+			p = pm0;
+			while(p)
+			{
+				if(pNext = strchr(p, '.'))
+				{
+					*pNext = '\0';
+					pNext++;
+				}
+				if(ConvertDomainNameToPunycode(pm1, Length * 4, p))
+					strcat(Output, pm1);
+				if(pNext)
+					strcat(Output, ".");
+				p = pNext;
+			}
+			bResult = TRUE;
+			FreeDuplicatedString(pm1);
+		}
+		FreeDuplicatedString(pm0);
+	}
+	return bResult;
+}
+
+HANDLE WSAAsyncGetHostByNameM(HWND hWnd, u_int wMsg, const char * name, char * buf, int buflen)
+{
+	HANDLE r = NULL;
+	char* pa0 = NULL;
+	if(pa0 = AllocateStringA(strlen(name) * 4))
+	{
+		if(ConvertNameToPunycode(pa0, name))
+			r = WSAAsyncGetHostByName(hWnd, wMsg, pa0, buf, buflen);
+	}
+	FreeDuplicatedString(pa0);
+	return r;
+}
+
+HANDLE WSAAsyncGetHostByNameIPv6M(HWND hWnd, u_int wMsg, const char * name, char * buf, int buflen, short Family)
+{
+	HANDLE r = NULL;
+	char* pa0 = NULL;
+	if(pa0 = AllocateStringA(strlen(name) * 4))
+	{
+		if(ConvertNameToPunycode(pa0, name))
+			r = WSAAsyncGetHostByNameIPv6(hWnd, wMsg, pa0, buf, buflen, Family);
+	}
+	FreeDuplicatedString(pa0);
+	return r;
+}
+