OSDN Git Service

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