-/*=============================================================================\r
+/*=============================================================================\r
*\r
-* \83\\83P\83b\83g\r
+* ソケット\r
*\r
===============================================================================\r
/ Copyright (C) 1997-2007 Sota. All rights reserved.\r
/============================================================================*/\r
\r
#define STRICT\r
+// IPv6対応\r
+#include <ws2tcpip.h>\r
#include <windows.h>\r
#include <stdio.h>\r
#include <stdlib.h>\r
\r
#include "common.h"\r
#include "resource.h"\r
+// UTF-8対応\r
+#include "punycode.h"\r
\r
#define USE_THIS 1\r
#define DBG_MSG 0\r
\r
\r
\r
-#define FD_CONNECT_BIT 0x0001\r
-#define FD_CLOSE_BIT 0x0002\r
-#define FD_ACCEPT_BIT 0x0004\r
-#define FD_READ_BIT 0x0008\r
-#define FD_WRITE_BIT 0x0010\r
+// Winsock2で定義される定数と名前が重複し値が異なるため使用不可\r
+//#define FD_CONNECT_BIT 0x0001\r
+//#define FD_CLOSE_BIT 0x0002\r
+//#define FD_ACCEPT_BIT 0x0004\r
+//#define FD_READ_BIT 0x0008\r
+//#define FD_WRITE_BIT 0x0010\r
\r
\r
\r
} ASYNCSIGNALDATABASE;\r
\r
\r
-// \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
-// \94O\82Ì\82½\82ß\83e\81[\83u\83\8b\82ð\91\9d\97Ê\r
+// スレッド衝突のバグ修正\r
+// 念のためテーブルを増量\r
//#define MAX_SIGNAL_ENTRY 10\r
//#define MAX_SIGNAL_ENTRY_DBASE 5\r
-#define MAX_SIGNAL_ENTRY 100\r
-#define MAX_SIGNAL_ENTRY_DBASE 50\r
+#define MAX_SIGNAL_ENTRY 16\r
+#define MAX_SIGNAL_ENTRY_DBASE 16\r
\r
\r
\r
\r
-/*===== \83v\83\8d\83g\83^\83C\83v =====*/\r
+/*===== プロトタイプ =====*/\r
\r
static LRESULT CALLBACK SocketWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);\r
static int AskAsyncDone(SOCKET s, int *Error, int Mask);\r
static int RegistAsyncTableDbase(HANDLE Async);\r
static int UnRegistAsyncTable(SOCKET s);\r
static int UnRegistAsyncTableDbase(HANDLE Async);\r
+// UTF-8対応\r
+static HANDLE WSAAsyncGetHostByNameM(HWND hWnd, u_int wMsg, const char * name, char * buf, int buflen);\r
+// IPv6対応\r
+static HANDLE WSAAsyncGetHostByNameIPv6M(HWND hWnd, u_int wMsg, const char * name, char * buf, int buflen, short Family);\r
\r
\r
-/*===== \8aO\95\94\8eQ\8fÆ =====*/\r
+/*===== 外部参照 =====*/\r
\r
extern int TimeOut;\r
\r
\r
-/*===== \83\8d\81[\83J\83\8b\82È\83\8f\81[\83N =====*/\r
+/*===== ローカルなワーク =====*/\r
\r
static const char SocketWndClass[] = "FFFTPSocketWnd";\r
static HWND hWndSocket;\r
static ASYNCSIGNALDATABASE SignalDbase[MAX_SIGNAL_ENTRY_DBASE];\r
\r
//static HANDLE hAsyncTblAccMutex;\r
-// \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+// スレッド衝突のバグ修正\r
static HANDLE hAsyncTblAccMutex;\r
\r
\r
* Parameter\r
*\r
* Return Value\r
-* int \83X\83e\81[\83^\83X\r
-* SUCCESS/FAIL\r
+* int ステータス\r
+* FFFTP_SUCCESS/FFFTP_FAIL\r
*----------------------------------------------------------------------------*/\r
\r
int MakeSocketWin(HWND hWnd, HINSTANCE hInst)\r
wClass.hIconSm = NULL;\r
RegisterClassEx(&wClass);\r
\r
- Sts = FAIL;\r
+ Sts = FFFTP_FAIL;\r
hWndSocket = CreateWindowEx(0, SocketWndClass, NULL,\r
WS_BORDER | WS_POPUP,\r
0, 0, 0, 0,\r
{\r
// hAsyncTblAccMutex = CreateMutex(NULL, FALSE, NULL);\r
\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
// for(i = 0; i < MAX_SIGNAL_ENTRY; i++)\r
// Signal[i].Socket = INVALID_SOCKET;\r
// for(i = 0; i < MAX_SIGNAL_ENTRY_DBASE; i++)\r
for(i = 0; i < MAX_SIGNAL_ENTRY_DBASE; i++)\r
SignalDbase[i].Async = 0;\r
}\r
- Sts = SUCCESS;\r
+ Sts = FFFTP_SUCCESS;\r
}\r
return(Sts);\r
}\r
/*----- \r
*\r
* Parameter\r
-* \82È\82µ\r
+* なし\r
*\r
* Return Value\r
-* \82È\82µ\r
+* なし\r
*----------------------------------------------------------------------------*/\r
\r
void DeleteSocketWin(void)\r
{\r
// CloseHandle(hAsyncTblAccMutex);\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
CloseHandle(hAsyncTblAccMutex);\r
hAsyncTblAccMutex = NULL;\r
\r
/*----- \r
*\r
* Parameter\r
-* HWND hWnd : \83E\83C\83\93\83h\83E\83n\83\93\83h\83\8b\r
-* UINT message : \83\81\83b\83Z\81[\83W\94Ô\8d\86\r
-* WPARAM wParam : \83\81\83b\83Z\81[\83W\82Ì WPARAM \88ø\90\94\r
-* LPARAM lParam : \83\81\83b\83Z\81[\83W\82Ì LPARAM \88ø\90\94\r
+* HWND hWnd : ウインドウハンドル\r
+* UINT message : メッセージ番号\r
+* WPARAM wParam : メッセージの WPARAM 引数\r
+* LPARAM lParam : メッセージの LPARAM 引数\r
*\r
* Return Value\r
* BOOL TRUE/FALSE\r
switch(message)\r
{\r
case WM_ASYNC_SOCKET :\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
WaitForSingleObject(hAsyncTblAccMutex, INFINITE);\r
for(Pos = 0; Pos < MAX_SIGNAL_ENTRY; Pos++)\r
{\r
break;\r
}\r
}\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
ReleaseMutex(hAsyncTblAccMutex);\r
break;\r
\r
case WM_ASYNC_DBASE :\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // APIの仕様上ハンドルが登録される前にウィンドウメッセージが呼び出される可能性あり\r
+ RegistAsyncTableDbase((HANDLE)wParam);\r
+ // スレッド衝突のバグ修正\r
WaitForSingleObject(hAsyncTblAccMutex, INFINITE);\r
for(Pos = 0; Pos < MAX_SIGNAL_ENTRY_DBASE; Pos++)\r
{\r
break;\r
}\r
}\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
ReleaseMutex(hAsyncTblAccMutex);\r
break;\r
\r
int Sts;\r
int Pos;\r
\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
WaitForSingleObject(hAsyncTblAccMutex, INFINITE);\r
Sts = NO;\r
*Error = 0;\r
*Error = Signal[Pos].Error;\r
if(Signal[Pos].Error != 0)\r
Sts = YES;\r
- if((Mask & FD_CONNECT_BIT) && (Signal[Pos].FdConnect != 0))\r
+ if((Mask & FD_CONNECT) && (Signal[Pos].FdConnect != 0))\r
{\r
Sts = YES;\r
#if DBG_MSG\r
DoPrintf("### Ask: connect (Sts=%d, Error=%d)", Sts, *Error);\r
#endif\r
}\r
- if((Mask & FD_CLOSE_BIT) && (Signal[Pos].FdClose != 0))\r
-// if(Mask & FD_CLOSE_BIT)\r
+ if((Mask & FD_CLOSE) && (Signal[Pos].FdClose != 0))\r
+// if(Mask & FD_CLOSE)\r
{\r
Sts = YES;\r
#if DBG_MSG\r
DoPrintf("### Ask: close (Sts=%d, Error=%d)", Sts, *Error);\r
#endif\r
}\r
- if((Mask & FD_ACCEPT_BIT) && (Signal[Pos].FdAccept != 0))\r
+ if((Mask & FD_ACCEPT) && (Signal[Pos].FdAccept != 0))\r
{\r
Signal[Pos].FdAccept = 0;\r
Sts = YES;\r
DoPrintf("### Ask: accept (Sts=%d, Error=%d)", Sts, *Error);\r
#endif\r
}\r
- if((Mask & FD_READ_BIT) && (Signal[Pos].FdRead != 0))\r
+ if((Mask & FD_READ) && (Signal[Pos].FdRead != 0))\r
{\r
Signal[Pos].FdRead = 0;\r
Sts = YES;\r
DoPrintf("### Ask: read (Sts=%d, Error=%d)", Sts, *Error);\r
#endif\r
}\r
- if((Mask & FD_WRITE_BIT) && (Signal[Pos].FdWrite != 0))\r
+ if((Mask & FD_WRITE) && (Signal[Pos].FdWrite != 0))\r
{\r
Signal[Pos].FdWrite = 0;\r
Sts = YES;\r
break;\r
}\r
}\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
ReleaseMutex(hAsyncTblAccMutex);\r
\r
if(Pos == MAX_SIGNAL_ENTRY)\r
{\r
- if(Mask & FD_CLOSE_BIT)\r
+ if(Mask & FD_CLOSE)\r
{\r
Sts = YES;\r
}\r
int Sts;\r
int Pos;\r
\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
WaitForSingleObject(hAsyncTblAccMutex, INFINITE);\r
Sts = NO;\r
*Error = 0;\r
break;\r
}\r
}\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
ReleaseMutex(hAsyncTblAccMutex);\r
\r
if(Pos == MAX_SIGNAL_ENTRY_DBASE)\r
int Sts;\r
int Pos;\r
\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
WaitForSingleObject(hAsyncTblAccMutex, INFINITE);\r
Sts = NO;\r
for(Pos = 0; Pos < MAX_SIGNAL_ENTRY; Pos++)\r
{\r
if(Signal[Pos].Socket == s)\r
{\r
- MessageBox(GetMainHwnd(), "Async socket already registerd.", "FFFTP inner error", MB_OK);\r
- break;\r
+ // 強制的に閉じられたソケットがあると重複する可能性あり\r
+// MessageBox(GetMainHwnd(), "Async socket already registerd.", "FFFTP inner error", MB_OK);\r
+// break;\r
+ Signal[Pos].Socket = INVALID_SOCKET;\r
}\r
}\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
ReleaseMutex(hAsyncTblAccMutex);\r
\r
if(Pos == MAX_SIGNAL_ENTRY)\r
{\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
WaitForSingleObject(hAsyncTblAccMutex, INFINITE);\r
for(Pos = 0; Pos < MAX_SIGNAL_ENTRY; Pos++)\r
{\r
break;\r
}\r
}\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
ReleaseMutex(hAsyncTblAccMutex);\r
\r
if(Pos == MAX_SIGNAL_ENTRY)\r
int Sts;\r
int Pos;\r
\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
WaitForSingleObject(hAsyncTblAccMutex, INFINITE);\r
Sts = NO;\r
for(Pos = 0; Pos < MAX_SIGNAL_ENTRY_DBASE; Pos++)\r
{\r
if(SignalDbase[Pos].Async == Async)\r
{\r
- MessageBox(GetMainHwnd(), "Async handle already registerd.", "FFFTP inner error", MB_OK);\r
+ // 強制的に閉じられたハンドルがあると重複する可能性あり\r
+// MessageBox(GetMainHwnd(), "Async handle already registerd.", "FFFTP inner error", MB_OK);\r
+ // APIの仕様上ハンドルが登録される前にウィンドウメッセージが呼び出される可能性あり\r
break;\r
}\r
}\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
ReleaseMutex(hAsyncTblAccMutex);\r
\r
if(Pos == MAX_SIGNAL_ENTRY_DBASE)\r
{\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
WaitForSingleObject(hAsyncTblAccMutex, INFINITE);\r
for(Pos = 0; Pos < MAX_SIGNAL_ENTRY; Pos++)\r
{\r
break;\r
}\r
}\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
ReleaseMutex(hAsyncTblAccMutex);\r
\r
if(Pos == MAX_SIGNAL_ENTRY_DBASE)\r
int Sts;\r
int Pos;\r
\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
WaitForSingleObject(hAsyncTblAccMutex, INFINITE);\r
Sts = NO;\r
for(Pos = 0; Pos < MAX_SIGNAL_ENTRY; Pos++)\r
break;\r
}\r
}\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
ReleaseMutex(hAsyncTblAccMutex);\r
return(Sts);\r
}\r
int Sts;\r
int Pos;\r
\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
WaitForSingleObject(hAsyncTblAccMutex, INFINITE);\r
Sts = NO;\r
for(Pos = 0; Pos < MAX_SIGNAL_ENTRY_DBASE; Pos++)\r
break;\r
}\r
}\r
- // \83X\83\8c\83b\83h\8fÕ\93Ë\82Ì\83o\83O\8fC\90³\r
+ // スレッド衝突のバグ修正\r
ReleaseMutex(hAsyncTblAccMutex);\r
return(Sts);\r
}\r
\r
\r
\r
-struct hostent *do_gethostbyname(const char *Name, char *Buf, int Len, int *CancelCheckWork)\r
+// IPv6対応\r
+//struct hostent *do_gethostbyname(const char *Name, char *Buf, int Len, int *CancelCheckWork)\r
+struct hostent *do_gethostbynameIPv4(const char *Name, char *Buf, int Len, int *CancelCheckWork)\r
{\r
#if USE_THIS\r
struct hostent *Ret;\r
DoPrintf("# Start gethostbyname");\r
#endif\r
Ret = NULL;\r
- *CancelCheckWork = NO;\r
+ // 同時接続対応\r
+// *CancelCheckWork = NO;\r
\r
- hAsync = WSAAsyncGetHostByName(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);\r
+ // UTF-8対応\r
+// hAsync = WSAAsyncGetHostByName(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);\r
+ hAsync = WSAAsyncGetHostByNameM(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);\r
+ if(hAsync != NULL)\r
+ {\r
+ RegistAsyncTableDbase(hAsync);\r
+ while((*CancelCheckWork == NO) && (AskAsyncDoneDbase(hAsync, &Error) != YES))\r
+ {\r
+ Sleep(1);\r
+ if(BackgrndMessageProc() == YES)\r
+ *CancelCheckWork = YES;\r
+ }\r
+\r
+ if(*CancelCheckWork == YES)\r
+ {\r
+ WSACancelAsyncRequest(hAsync);\r
+ }\r
+ else if(Error == 0)\r
+ {\r
+ Ret = (struct hostent *)Buf;\r
+ }\r
+ UnRegistAsyncTableDbase(hAsync);\r
+ }\r
+ return(Ret);\r
+#else\r
+ return(gethostbyname(Name));\r
+#endif\r
+}\r
+\r
+\r
+struct hostent *do_gethostbynameIPv6(const char *Name, char *Buf, int Len, int *CancelCheckWork)\r
+{\r
+#if USE_THIS\r
+ struct hostent *Ret;\r
+ HANDLE hAsync;\r
+ int Error;\r
+\r
+#if DBG_MSG\r
+ DoPrintf("# Start gethostbyname");\r
+#endif\r
+ Ret = NULL;\r
+ // 同時接続対応\r
+// *CancelCheckWork = NO;\r
+\r
+ // UTF-8対応\r
+// hAsync = WSAAsyncGetHostByName(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);\r
+ hAsync = WSAAsyncGetHostByNameIPv6M(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len, AF_INET6);\r
if(hAsync != NULL)\r
{\r
RegistAsyncTableDbase(hAsync);\r
#endif\r
CancelCheckWork = NO;\r
\r
- // FTPS\91Î\89\9e\r
+ // スレッド衝突のバグ修正\r
+ WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, 0);\r
+ UnRegistAsyncTable(s);\r
+ // FTPS対応\r
// Ret = closesocket(s);\r
- if(AskCryptMode() == CRYPT_FTPES || AskCryptMode() == CRYPT_FTPIS)\r
- Ret = closesocketS(s);\r
- else\r
- Ret = closesocket(s);\r
+ Ret = closesocketS(s);\r
if(Ret == SOCKET_ERROR)\r
{\r
Error = 0;\r
- while((CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_CLOSE_BIT) != YES))\r
+ while((CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_CLOSE) != YES))\r
{\r
Sleep(1);\r
if(BackgrndMessageProc() == YES)\r
Ret = 0;\r
}\r
\r
- WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, 0);\r
+ // スレッド衝突のバグ修正\r
+// WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, 0);\r
if(BackgrndMessageProc() == YES)\r
CancelCheckWork = YES;\r
- UnRegistAsyncTable(s);\r
+ // スレッド衝突のバグ修正\r
+// UnRegistAsyncTable(s);\r
\r
#if DBG_MSG\r
DoPrintf("# Exit close");\r
#if DBG_MSG\r
DoPrintf("# Start connect (S=%x)", s);\r
#endif\r
- *CancelCheckWork = NO;\r
+ // 同時接続対応\r
+// *CancelCheckWork = NO;\r
\r
#if DBG_MSG\r
DoPrintf("## Async set: FD_CONNECT|FD_CLOSE|FD_ACCEPT|FD_READ|FD_WRITE");\r
#endif\r
- Ret = WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE);\r
+ // 高速化のためFD_READとFD_WRITEを使用しない\r
+// Ret = WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE);\r
+ Ret = WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT);\r
if(Ret != SOCKET_ERROR)\r
{\r
- // FTPS\91Î\89\9e\r
-// Ret = connect(s, name, namelen);\r
- if(AskCryptMode() == CRYPT_FTPIS)\r
- Ret = connectS(s, name, namelen);\r
- else\r
- Ret = connect(s, name, namelen);\r
+ Ret = connect(s, name, namelen);\r
if(Ret == SOCKET_ERROR)\r
{\r
do\r
{\r
Error = 0;\r
- while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_CONNECT_BIT) != YES))\r
+ while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_CONNECT) != YES))\r
{\r
Sleep(1);\r
if(BackgrndMessageProc() == YES)\r
Ret2 = INVALID_SOCKET;\r
Error = 0;\r
\r
- while((CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_ACCEPT_BIT) != YES))\r
+ while((CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_ACCEPT) != YES))\r
{\r
- if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)\r
+ if(AskAsyncDone(s, &Error, FD_CLOSE) == YES)\r
{\r
Error = 1;\r
break;\r
{\r
do\r
{\r
- // FTPS\91Î\89\9e\r
-// Ret2 = accept(s, addr, addrlen);\r
- if(AskCryptMode() == CRYPT_FTPIS)\r
- Ret2 = acceptS(s, addr, addrlen);\r
- else\r
- Ret2 = accept(s, addr, addrlen);\r
+ Ret2 = accept(s, addr, addrlen);\r
if(Ret2 != INVALID_SOCKET)\r
{\r
#if DBG_MSG\r
\r
\r
\r
-/*----- recv\91\8a\93\96\82Ì\8aÖ\90\94 --------------------------------------------------------\r
+/*----- recv相当の関数 --------------------------------------------------------\r
*\r
* Parameter\r
-* SOCKET s : \83\\83P\83b\83g\r
-* char *buf : \83f\81[\83^\82ð\93Ç\82Ý\8d\9e\82Þ\83o\83b\83t\83@\r
-* int len : \92·\82³\r
-* int flags : recv\82É\97^\82¦\82é\83t\83\89\83O\r
-* int *TimeOutErr : \83^\83C\83\80\83A\83E\83g\82µ\82½\82©\82Ç\82¤\82©\82ð\95Ô\82·\83\8f\81[\83N\r
+* SOCKET s : ソケット\r
+* char *buf : データを読み込むバッファ\r
+* int len : 長さ\r
+* int flags : recvに与えるフラグ\r
+* int *TimeOutErr : タイムアウトしたかどうかを返すワーク\r
*\r
* Return Value\r
-* int : recv\82Ì\96ß\82è\92l\82Æ\93¯\82¶\r
+* int : recvの戻り値と同じ\r
*\r
* Note\r
-* \83^\83C\83\80\83A\83E\83g\82Ì\8e\9e\82Í TimeOut=YES\81ARet=SOCKET_ERROR \82É\82È\82é\r
+* タイムアウトの時は TimeOut=YES、Ret=SOCKET_ERROR になる\r
*----------------------------------------------------------------------------*/\r
int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOutErr, int *CancelCheckWork)\r
{\r
DoPrintf("# Start recv (S=%x)", s);\r
#endif\r
*TimeOutErr = NO;\r
- *CancelCheckWork = NO;\r
+ // 同時接続対応\r
+// *CancelCheckWork = NO;\r
Ret = SOCKET_ERROR;\r
Error = 0;\r
\r
if(TimeOut != 0)\r
time(&StartTime);\r
\r
- // FTPS\91Î\89\9e\r
- // OpenSSL\82Å\82Í\8eó\90M\8am\94F\82ÍFD_READ\82ª\95¡\90\94\89ñ\8eó\90M\82³\82ê\82é\89Â\94\\90«\82ª\82 \82é\r
-// while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_READ_BIT) != YES))\r
- while(AskCryptMode() == CRYPT_NONE && (*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_READ_BIT) != YES))\r
- {\r
- if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)\r
- {\r
- Ret = 0;\r
- break;\r
- }\r
- Sleep(1);\r
- if(BackgrndMessageProc() == YES)\r
- *CancelCheckWork = YES;\r
- else if(TimeOut != 0)\r
- {\r
- time(&ElapseTime);\r
- ElapseTime -= StartTime;\r
- if(ElapseTime >= TimeOut)\r
- {\r
- DoPrintf("do_recv timed out");\r
- *TimeOutErr = YES;\r
- *CancelCheckWork = YES;\r
- }\r
- }\r
- }\r
+ // FTPS対応\r
+ // OpenSSLでは受信確認はFD_READが複数回受信される可能性がある\r
+// while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_READ) != YES))\r
+ // 短時間にFD_READが2回以上通知される対策\r
+// while(!IsSSLAttached(s) && (*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_READ) != YES))\r
+// {\r
+// if(AskAsyncDone(s, &Error, FD_CLOSE) == YES)\r
+// {\r
+// Ret = 0;\r
+// break;\r
+// }\r
+// Sleep(1);\r
+// if(BackgrndMessageProc() == YES)\r
+// *CancelCheckWork = YES;\r
+// else if(TimeOut != 0)\r
+// {\r
+// time(&ElapseTime);\r
+// ElapseTime -= StartTime;\r
+// if(ElapseTime >= TimeOut)\r
+// {\r
+// DoPrintf("do_recv timed out");\r
+// *TimeOutErr = YES;\r
+// *CancelCheckWork = YES;\r
+// }\r
+// }\r
+// }\r
\r
if(/*(Ret != 0) && */(Error == 0) && (*CancelCheckWork == NO) && (*TimeOutErr == NO))\r
{\r
DoPrintf("## recv()");\r
#endif\r
\r
- // FTPS\91Î\89\9e\r
+ // FTPS対応\r
// Ret = recv(s, buf, len, flags);\r
- if(AskCryptMode() == CRYPT_FTPES || AskCryptMode() == CRYPT_FTPIS)\r
- Ret = recvS(s, buf, len, flags);\r
- else\r
- Ret = recv(s, buf, len, flags);\r
+ Ret = recvS(s, buf, len, flags);\r
if(Ret != SOCKET_ERROR)\r
break;\r
Error = WSAGetLastError();\r
Sleep(1);\r
if(BackgrndMessageProc() == YES)\r
break;\r
- // FTPS\91Î\89\9e\r
- // \8eó\90M\8am\94F\82ð\83o\83C\83p\83X\82µ\82½\82½\82ß\82±\82±\82Å\83^\83C\83\80\83A\83E\83g\82Ì\8am\94F\r
- if(AskCryptMode() == CRYPT_FTPES || AskCryptMode() == CRYPT_FTPIS)\r
- {\r
- if(BackgrndMessageProc() == YES)\r
- *CancelCheckWork = YES;\r
- }\r
+ // FTPS対応\r
+ // 受信確認をバイパスしたためここでタイムアウトの確認\r
+ if(BackgrndMessageProc() == YES)\r
+ *CancelCheckWork = YES;\r
else if(TimeOut != 0)\r
{\r
time(&ElapseTime);\r
DoPrintf("# Start send (S=%x)", s);\r
#endif\r
*TimeOutErr = NO;\r
- *CancelCheckWork = NO;\r
+ // 同時接続対応\r
+// *CancelCheckWork = NO;\r
Ret = SOCKET_ERROR;\r
Error = 0;\r
\r
#if DBG_MSG\r
DoPrintf("## Async set: FD_CONNECT|FD_CLOSE|FD_ACCEPT|FD_READ|FD_WRITE");\r
#endif\r
- WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE);\r
+ // Windows 2000でFD_WRITEが通知されないことがあるバグ修正\r
+ // 毎回通知されたのはNT 4.0までのバグであり仕様ではない\r
+ // XP以降は互換性のためか毎回通知される\r
+// WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE);\r
if(BackgrndMessageProc() == YES)\r
*CancelCheckWork = YES;\r
\r
- // FTPS\91Î\89\9e\r
- // \91\97\90M\83o\83b\83t\83@\82Ì\8bó\82«\8am\94F\82É\82Í\89e\8b¿\82µ\82È\82¢\82ª\94O\82Ì\82½\82ß\r
-// while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE_BIT) != YES))\r
- while(AskCryptMode() == CRYPT_NONE && (*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE_BIT) != YES))\r
- {\r
- if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)\r
- {\r
- Error = 1;\r
- break;\r
- }\r
-\r
- Sleep(1);\r
- if(BackgrndMessageProc() == YES)\r
- *CancelCheckWork = YES;\r
- else if(TimeOut != 0)\r
- {\r
- time(&ElapseTime);\r
- ElapseTime -= StartTime;\r
- if(ElapseTime >= TimeOut)\r
- {\r
- DoPrintf("do_write timed out");\r
- *TimeOutErr = YES;\r
- *CancelCheckWork = YES;\r
- }\r
- }\r
- }\r
+ // FTPS対応\r
+ // 送信バッファの空き確認には影響しないが念のため\r
+// while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE) != YES))\r
+ // Windows 2000でFD_WRITEが通知されないことがあるバグ修正\r
+// while(!IsSSLAttached(s) && (*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE) != YES))\r
+// {\r
+// if(AskAsyncDone(s, &Error, FD_CLOSE) == YES)\r
+// {\r
+// Error = 1;\r
+// break;\r
+// }\r
+//\r
+// Sleep(1);\r
+// if(BackgrndMessageProc() == YES)\r
+// *CancelCheckWork = YES;\r
+// else if(TimeOut != 0)\r
+// {\r
+// time(&ElapseTime);\r
+// ElapseTime -= StartTime;\r
+// if(ElapseTime >= TimeOut)\r
+// {\r
+// DoPrintf("do_write timed out");\r
+// *TimeOutErr = YES;\r
+// *CancelCheckWork = YES;\r
+// }\r
+// }\r
+// }\r
\r
if((Error == 0) && (*CancelCheckWork == NO) && (*TimeOutErr == NO))\r
{\r
DoPrintf("## send()");\r
#endif\r
\r
- // FTPS\91Î\89\9e\r
+ // FTPS対応\r
// Ret = send(s, buf, len, flags);\r
- if(AskCryptMode() == CRYPT_FTPES || AskCryptMode() == CRYPT_FTPIS)\r
- Ret = sendS(s, buf, len, flags);\r
- else\r
- Ret = send(s, buf, len, flags);\r
+ Ret = sendS(s, buf, len, flags);\r
if(Ret != SOCKET_ERROR)\r
{\r
#if DBG_MSG\r
Sleep(1);\r
if(BackgrndMessageProc() == YES)\r
break;\r
- // FTPS\91Î\89\9e\r
- // \91\97\90M\83o\83b\83t\83@\8am\94F\82ð\83o\83C\83p\83X\82µ\82½\82½\82ß\82±\82±\82Å\83^\83C\83\80\83A\83E\83g\82Ì\8am\94F\r
- if(AskCryptMode() == CRYPT_FTPES || AskCryptMode() == CRYPT_FTPIS)\r
- {\r
- if(BackgrndMessageProc() == YES)\r
- *CancelCheckWork = YES;\r
- }\r
+ // FTPS対応\r
+ // 送信バッファ確認をバイパスしたためここでタイムアウトの確認\r
+ if(BackgrndMessageProc() == YES)\r
+ *CancelCheckWork = YES;\r
else if(TimeOut != 0)\r
{\r
time(&ElapseTime);\r
}\r
\r
\r
+// 同時接続対応\r
+void RemoveReceivedData(SOCKET s)\r
+{\r
+ char buf[1024];\r
+ int len;\r
+ int Error;\r
+ while((len = recvS(s, buf, sizeof(buf), MSG_PEEK)) >= 0)\r
+ {\r
+ AskAsyncDone(s, &Error, FD_READ);\r
+ recvS(s, buf, len, 0);\r
+ }\r
+}\r
+\r
+\r
/*----- \r
*\r
* Parameter\r
*\r
* Return Value\r
-* int \83X\83e\81[\83^\83X\r
-* SUCCESS/FAIL\r
+* int ステータス\r
+* FFFTP_SUCCESS/FFFTP_FAIL\r
*----------------------------------------------------------------------------*/\r
\r
int CheckClosedAndReconnect(void)\r
\r
//SetTaskMsg("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");\r
\r
- Sts = SUCCESS;\r
- if(AskAsyncDone(AskCmdCtrlSkt(), &Error, FD_CLOSE_BIT) == YES)\r
+ Sts = FFFTP_SUCCESS;\r
+ if(AskAsyncDone(AskCmdCtrlSkt(), &Error, FD_CLOSE) == YES)\r
{\r
Sts = ReConnectCmdSkt();\r
}\r
\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
+static 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
+static 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
+// UTF-8対応\r
+\r
+static BOOL ConvertStringToPunycode(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
+static 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(ConvertStringToPunycode(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
+static 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
+static 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
OSDN Git Service
