Commit: 27e47ec02a3553a6e9b4e935a43dc28919d91c0d - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revisión: 27e47ec02a3553a6e9b4e935a43dc28919d91c0d (tree)
• Tiempo: 2011-11-12 00:40:56
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add routines for IPv6.
Fix bugs of simultaneous connection.
Add support for reusing control connection.

Cambiar Resumen

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: Resource/FFFTP.rc
• modified: Resource/resource.h
• modified: Resource_eng/FFFTP-eng.rc
• modified: Resource_eng/resource.h
• modified: common.h
• modified: connect.c
• modified: ftpproc.c
• modified: getput.c
• modified: history.c
• modified: hostman.c
• modified: main.c
• modified: registry.c
• modified: socket.c
• modified: socketwrapper.c

Diferencia incremental

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/Resource/FFFTP.rc
+++ b/Resource/FFFTP.rc
@@ -1364,6 +1364,7 @@ BEGIN
     EDITTEXT        HSET_THREAD_COUNT,72,8,17,12,ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Spin1",HSET_THREAD_COUNT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,89,7,9,14
     LTEXT           "(1`4)",-1,102,10,31,8
+    CONTROL         "ƒƒCƒ“ƒEƒBƒ“ƒhƒE‚̃\ƒPƒbƒg‚ðÄ—˜—p",HSET_REUSE_SOCKET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10
 END
 
 

--- a/Resource/resource.h
+++ b/Resource/resource.h
@@ -430,6 +430,7 @@
 #define HSET_THREAD_COUNT               1204
 #define HSET_THREAD_COUNT_SPN           1205
 #define HSET_UTF8BOM_CNV                1206
+#define HSET_REUSE_SOCKET               1207
 #define MENU_END                        40001
 #define MENU_EXIT                       40001
 #define MENU_CONNECT                    40003
@@ -616,7 +617,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        191
 #define _APS_NEXT_COMMAND_VALUE         40176
-#define _APS_NEXT_CONTROL_VALUE         1207
+#define _APS_NEXT_CONTROL_VALUE         1208
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

--- a/Resource_eng/FFFTP-eng.rc
+++ b/Resource_eng/FFFTP-eng.rc
@@ -1390,6 +1390,7 @@ BEGIN
     EDITTEXT        HSET_THREAD_COUNT,72,8,17,12,ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Spin1",HSET_THREAD_COUNT_SPN,"msctls_updown32",UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,89,7,9,14
     LTEXT           "(1 to 4 threads)",-1,102,10,53,8
+    CONTROL         "Reuse socket of the main window",HSET_REUSE_SOCKET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,27,131,10
 END
 
 

--- a/Resource_eng/resource.h
+++ b/Resource_eng/resource.h
@@ -430,6 +430,7 @@
 #define HSET_THREAD_COUNT               1204
 #define HSET_THREAD_COUNT_SPN           1205
 #define HSET_UTF8BOM_CNV                1206
+#define HSET_REUSE_SOCKET               1207
 #define MENU_END                        40001
 #define MENU_EXIT                       40001
 #define MENU_CONNECT                    40003
@@ -616,7 +617,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        191
 #define _APS_NEXT_COMMAND_VALUE         40176
-#define _APS_NEXT_CONTROL_VALUE         1207
+#define _APS_NEXT_CONTROL_VALUE         1208
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

--- a/common.h
+++ b/common.h
@@ -946,6 +946,7 @@ typedef struct {
 	char PrivateKey[PRIVATE_KEY_LEN+1];	/* テキスト形式の秘密鍵 */
 	// 同時接続対応
 	int MaxThreadCount;					/* 同時接続数 */
+	int ReuseCmdSkt;					/* メインウィンドウのソケットを再利用する (YES/NO) */
 	// FEAT対応
 	int Feature;						/* 利用可能な機能のフラグ (FEATURE_xxx) */
 	// MLSD対応
@@ -1006,6 +1007,7 @@ typedef struct historydata {
 	char PrivateKey[PRIVATE_KEY_LEN+1];	/* テキスト形式の秘密鍵 */
 	// 同時接続対応
 	int MaxThreadCount;					/* 同時接続数 */
+	int ReuseCmdSkt;					/* メインウィンドウのソケットを再利用する (YES/NO) */
 	// MLSD対応
 	int UseMLSD;						/* "MLSD"コマンドを使用する */
 	// IPv6対応
@@ -1428,6 +1430,7 @@ int AskUseSFTP(void);
 char *AskPrivateKey(void);
 // 同時接続対応
 int AskMaxThreadCount(void);
+int AskReuseCmdSkt(void);
 // FEAT対応
 int AskHostFeature(void);
 // MLSD対応

--- a/connect.c
+++ b/connect.c
@@ -990,9 +990,7 @@ int ReConnectCmdSkt(void)
 	int Sts;
 
 
-	// 同時接続対応
-//	if(CmdCtrlSocket != TrnCtrlSocket)
-	if(CmdCtrlSocket != TrnCtrlSocket && TrnCtrlSocket != INVALID_SOCKET)
+	if(CmdCtrlSocket != TrnCtrlSocket)
 		do_closesocket(TrnCtrlSocket);
 	TrnCtrlSocket = INVALID_SOCKET;
 
@@ -1150,10 +1148,13 @@ void SktShareProh(void)
 //SetTaskMsg("############### SktShareProh");
 
 		// 同時接続対応
-		// 転送スレッドがソケットを各自で用意
-		// TrnCtrlSocketはメインスレッド以外から使用されない
 //		CmdCtrlSocket = INVALID_SOCKET;
 //		ReConnectSkt(&CmdCtrlSocket);
+		if(CurHost.ReuseCmdSkt == YES)
+		{
+			CmdCtrlSocket = INVALID_SOCKET;
+			ReConnectSkt(&CmdCtrlSocket);
+		}
 	}
 	return;
 }
@@ -1174,8 +1175,10 @@ int AskShareProh(void)
 	int Sts;
 
 	Sts = YES;
+	// 同時接続対応
 //	if(CmdCtrlSocket == TrnCtrlSocket)
-//		Sts = NO;
+	if(CmdCtrlSocket == TrnCtrlSocket || TrnCtrlSocket == INVALID_SOCKET)
+		Sts = NO;
 
 	return(Sts);
 }
@@ -2475,6 +2478,11 @@ int AskMaxThreadCount(void)
 	return(CurHost.MaxThreadCount);
 }
 
+int AskReuseCmdSkt(void)
+{
+	return(CurHost.ReuseCmdSkt);
+}
+
 // FEAT対応
 int AskHostFeature(void)
 {

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -129,9 +129,6 @@ void DownLoadProc(int ChName, int ForceFile, int All)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		ExistNotify = YES;
 //		KeepTransferDialog(YES);
 
@@ -263,9 +260,6 @@ void DirectDownLoadProc(char *Fname)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		ExistNotify = YES;
 //		KeepTransferDialog(YES);
 
@@ -405,9 +399,6 @@ void MirrorDownloadProc(int Notify)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		Base = NULL;
 
 		if(Notify == YES)
@@ -879,9 +870,6 @@ void UpLoadListProc(int ChName, int All)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		// ローカル側で選ばれているファイルをFileListBaseに登録
 		FileListBase = NULL;
 		MakeSelectedFileList(WIN_LOCAL, YES, All, &FileListBase, &CancelFlg);
@@ -1050,9 +1038,6 @@ void UpLoadDragProc(WPARAM wParam)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		// ローカル側で選ばれているファイルをFileListBaseに登録
 		FileListBase = NULL;
 		MakeDroppedFileList(wParam, Cur, &FileListBase);
@@ -1212,9 +1197,6 @@ void MirrorUploadProc(int Notify)
 	{
 		DisableUserOpe();
 
-		// 同時接続対応
-		SktShareProh();
-
 		Base = NULL;
 
 		if(Notify == YES)

--- a/getput.c
+++ b/getput.c
@@ -41,7 +41,9 @@
 #include <string.h>
 #include <mbstring.h>
 #include <time.h>
-#include <winsock.h>
+// IPv6対応
+//#include <winsock.h>
+#include <winsock2.h>
 #include <windowsx.h>
 #include <commctrl.h>
 #include <process.h>
@@ -711,44 +713,53 @@ static ULONG WINAPI TransferThread(void *Dummy)
 			free(Pos);
 		}
 		NewCmdSkt = AskCmdCtrlSkt();
-		if(TransPacketBase && NewCmdSkt != INVALID_SOCKET && ThreadCount < AskMaxThreadCount())
+		if(AskReuseCmdSkt() == YES && ThreadCount == 0)
 		{
-			if(TrnSkt == INVALID_SOCKET || NewCmdSkt != CmdSkt)
+			if(TransPacketBase && ThreadCount < AskMaxThreadCount())
+				TrnSkt = AskTrnCtrlSkt();
+		}
+		else
+		{
+			if(TransPacketBase && NewCmdSkt != INVALID_SOCKET && ThreadCount < AskMaxThreadCount())
 			{
-				ReleaseMutex(hListAccMutex);
-				ReConnectTrnSkt(&TrnSkt, &Canceled[ThreadCount]);
-				// 同時ログイン数制限に引っかかった可能性あり
-				// 負荷を下げるためにしばらく待機
-				if(TrnSkt == INVALID_SOCKET)
+				if(TrnSkt == INVALID_SOCKET || NewCmdSkt != CmdSkt)
 				{
-					i = 10000;
-					while(NewCmdSkt != CmdSkt && i > 0)
+					ReleaseMutex(hListAccMutex);
+					ReConnectTrnSkt(&TrnSkt, &Canceled[ThreadCount]);
+					// 同時ログイン数制限に引っかかった可能性あり
+					// 負荷を下げるためにしばらく待機
+					if(TrnSkt == INVALID_SOCKET)
+					{
+						i = 10000;
+						while(NewCmdSkt != CmdSkt && i > 0)
+						{
+							BackgrndMessageProc();
+							Sleep(1);
+							i--;
+						}
+					}
+//					WaitForSingleObject(hListAccMutex, INFINITE);
+					while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
 					{
 						BackgrndMessageProc();
 						Sleep(1);
-						i--;
 					}
 				}
-//				WaitForSingleObject(hListAccMutex, INFINITE);
-				while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
-				{
-					BackgrndMessageProc();
-					Sleep(1);
-				}
 			}
-		}
-		else
-		{
-			if(TrnSkt != INVALID_SOCKET)
+			else
 			{
-				ReleaseMutex(hListAccMutex);
-				DoClose(TrnSkt);
-				TrnSkt = INVALID_SOCKET;
-//				WaitForSingleObject(hListAccMutex, INFINITE);
-				while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
+				if(TrnSkt != INVALID_SOCKET)
 				{
-					BackgrndMessageProc();
-					Sleep(1);
+					ReleaseMutex(hListAccMutex);
+					SendData(TrnSkt, "QUIT\r\n", 6, 0, &Canceled[ThreadCount]);
+					DoClose(TrnSkt);
+					TrnSkt = INVALID_SOCKET;
+//					WaitForSingleObject(hListAccMutex, INFINITE);
+					while(WaitForSingleObject(hListAccMutex, 0) == WAIT_TIMEOUT)
+					{
+						BackgrndMessageProc();
+						Sleep(1);
+					}
 				}
 			}
 		}
@@ -1017,7 +1028,8 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //			else if(strcmp(TransPacketBase->Cmd, "SETCUR") == 0)
 			else if(strcmp(Pos->Cmd, "SETCUR") == 0)
 			{
-				if(AskShareProh() == YES)
+//				if(AskShareProh() == YES)
+				if(AskReuseCmdSkt() == NO || AskShareProh() == YES)
 				{
 //					if(strcmp(CurDir, TransPacketBase->RemoteFile) != 0)
 					if(strcmp(CurDir[Pos->ThreadCount], Pos->RemoteFile) != 0)
@@ -1038,7 +1050,8 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //			else if(strcmp(TransPacketBase->Cmd, "BACKCUR") == 0)
 			else if(strcmp(Pos->Cmd, "BACKCUR") == 0)
 			{
-				if(AskShareProh() == NO)
+//				if(AskShareProh() == NO)
+				if(AskReuseCmdSkt() == YES && AskShareProh() == NO)
 				{
 //					if(strcmp(CurDir, TransPacketBase->RemoteFile) != 0)
 //						CommandProcTrn(NULL, "CWD %s", TransPacketBase->RemoteFile);
@@ -1172,8 +1185,14 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				Sleep(100);
 		}
 	}
-	if(TrnSkt != INVALID_SOCKET)
-		DoClose(TrnSkt);
+	if(AskReuseCmdSkt() == NO || ThreadCount > 0)
+	{
+		if(TrnSkt != INVALID_SOCKET)
+		{
+			SendData(TrnSkt, "QUIT\r\n", 6, 0, &Canceled[ThreadCount]);
+			DoClose(TrnSkt);
+		}
+	}
 	return 0;
 }
 
@@ -3722,6 +3741,59 @@ static int GetAdrsAndPort(char *Str, char *Adrs, int *Port, int Max)
 }
 
 
+// IPv6対応
+static int GetAdrsAndPortIPv6(char *Str, char *Adrs, int *Port, int Max, short *Family)
+{
+	char *Pos;
+	char *Btm;
+	int Sts;
+
+	Sts = FFFTP_FAIL;
+
+	Pos = strchr(Str, '|');
+	if(Pos != NULL)
+	{
+		Pos++;
+		Btm = strchr(Pos, '|');
+		if(Btm != NULL)
+		{
+			switch(atoi(Pos))
+			{
+			case 1:
+				*Family = AF_INET;
+				break;
+			case 2:
+				*Family = AF_INET6;
+				break;
+			}
+			Pos = Btm + 1;
+			Btm = strchr(Pos, '|');
+			if(Btm != NULL)
+			{
+				if((Btm - Pos) <= Max)
+				{
+					if((Btm - Pos) > 0)
+					{
+						strncpy(Adrs, Pos, Btm - Pos);
+						*(Adrs + (Btm - Pos)) = NUL;
+					}
+
+					Pos = Btm + 1;
+					Btm = strchr(Pos, '|');
+					if(Btm != NULL)
+					{
+						Btm++;
+						*Port = atoi(Pos);
+						Sts = FFFTP_SUCCESS;
+					}
+				}
+			}
+		}
+	}
+	return(Sts);
+}
+
+
 /*----- Windowsのスペシャルデバイスかどうかを返す -----------------------------
 *
 *	Parameter

--- a/history.c
+++ b/history.c
@@ -231,6 +231,7 @@ static void CopyHostToHistory(HOSTDATA *Host, HISTORYDATA *New)
 	strcpy(New->PrivateKey, Host->PrivateKey);
 	// 同時接続対応
 	New->MaxThreadCount = Host->MaxThreadCount;
+	New->ReuseCmdSkt = Host->ReuseCmdSkt;
 	// MLSD対応
 	New->UseMLSD = Host->UseMLSD;
 	// IPv6対応
@@ -292,6 +293,7 @@ void CopyHistoryToHost(HISTORYDATA *Hist, HOSTDATA *Host)
 	strcpy(Host->PrivateKey, Hist->PrivateKey);
 	// 同時接続対応
 	Host->MaxThreadCount = Hist->MaxThreadCount;
+	Host->ReuseCmdSkt = Hist->ReuseCmdSkt;
 	// MLSD対応
 	Host->UseMLSD = Hist->UseMLSD;
 	// IPv6対応

--- a/hostman.c
+++ b/hostman.c
@@ -1036,6 +1036,7 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
 		Set->UseSFTP = Pos->Set.UseSFTP;
 		// 同時接続対応
 		Set->MaxThreadCount = Pos->Set.MaxThreadCount;
+		Set->ReuseCmdSkt = Pos->Set.ReuseCmdSkt;
 		// MLSD対応
 		Set->UseMLSD = Pos->Set.UseMLSD;
 		// IPv6対応
@@ -1322,6 +1323,7 @@ void CopyDefaultHost(HOSTDATA *Set)
 	strcpy(Set->PrivateKey, "");
 	// 同時接続対応
 	Set->MaxThreadCount = 1;
+	Set->ReuseCmdSkt = NO;
 	// MLSD対応
 	Set->Feature = 0;
 	Set->UseMLSD = YES;
@@ -2213,6 +2215,7 @@ static BOOL CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP
 			SendDlgItemMessage(hDlg, HSET_THREAD_COUNT, EM_LIMITTEXT, (WPARAM)1, 0);
 			SetDecimalText(hDlg, HSET_THREAD_COUNT, TmpHost.MaxThreadCount);
 			SendDlgItemMessage(hDlg, HSET_THREAD_COUNT_SPN, UDM_SETRANGE, 0, (LPARAM)MAKELONG(MAX_DATA_CONNECTION, 1));
+			SendDlgItemMessage(hDlg, HSET_REUSE_SOCKET, BM_SETCHECK, TmpHost.ReuseCmdSkt, 0);
 			return(TRUE);
 
 		case WM_NOTIFY:
@@ -2222,6 +2225,7 @@ static BOOL CALLBACK Adv3SettingProc(HWND hDlg, UINT iMessage, WPARAM wParam, LP
 				case PSN_APPLY :
 					TmpHost.MaxThreadCount = GetDecimalText(hDlg, HSET_THREAD_COUNT);
 					CheckRange2(&TmpHost.MaxThreadCount, MAX_DATA_CONNECTION, 1);
+					TmpHost.ReuseCmdSkt = SendDlgItemMessage(hDlg, HSET_REUSE_SOCKET, BM_GETCHECK, 0, 0);
 					Apply = YES;
 					break;
 

--- a/main.c
+++ b/main.c
@@ -218,8 +218,6 @@ int MirUpDelNotify = YES;
 int MirDownDelNotify = YES; 
 int FolderAttr = NO;
 int FolderAttrNum = 777;
-// 同時接続対応
-int MaxThreadCount = 1;
 // 暗号化通信対応
 BYTE CertificateCacheHash[MAX_CERT_CACHE_HASH][20];
 

--- a/registry.c
+++ b/registry.c
@@ -479,6 +479,7 @@ void SaveRegistory(void)
 							SaveStr(hKey5, "PKey", Str, DefaultHist.PrivateKey);
 							// 同時接続対応
 							SaveIntNum(hKey5, "ThreadCount", Hist.MaxThreadCount, DefaultHist.MaxThreadCount);
+							SaveIntNum(hKey5, "ReuseCmdSkt", Hist.ReuseCmdSkt, DefaultHist.ReuseCmdSkt);
 							// MLSD対応
 							SaveIntNum(hKey5, "MLSD", Hist.UseMLSD, DefaultHist.UseMLSD);
 							// IPv6対応
@@ -560,6 +561,7 @@ void SaveRegistory(void)
 							SaveStr(hKey5, "PKey", Str, DefaultHost.PrivateKey);
 							// 同時接続対応
 							SaveIntNum(hKey5, "ThreadCount", Host.MaxThreadCount, DefaultHost.MaxThreadCount);
+							SaveIntNum(hKey5, "ReuseCmdSkt", Host.ReuseCmdSkt, DefaultHost.ReuseCmdSkt);
 							// MLSD対応
 							SaveIntNum(hKey5, "MLSD", Host.UseMLSD, DefaultHost.UseMLSD);
 							// IPv6対応
@@ -832,6 +834,7 @@ int LoadRegistory(void)
 					DecodePassword(Str, Hist.PrivateKey);
 					// 同時接続対応
 					ReadIntValueFromReg(hKey5, "ThreadCount", &Hist.MaxThreadCount);
+					ReadIntValueFromReg(hKey5, "ReuseCmdSkt", &Hist.ReuseCmdSkt);
 					// MLSD対応
 					ReadIntValueFromReg(hKey5, "MLSD", &Hist.UseMLSD);
 					// IPv6対応
@@ -922,6 +925,7 @@ int LoadRegistory(void)
 					DecodePassword(Str, Host.PrivateKey);
 					// 同時接続対応
 					ReadIntValueFromReg(hKey5, "ThreadCount", &Host.MaxThreadCount);
+					ReadIntValueFromReg(hKey5, "ReuseCmdSkt", &Host.ReuseCmdSkt);
 					// MLSD対応
 					ReadIntValueFromReg(hKey5, "MLSD", &Host.UseMLSD);
 					// IPv6対応

--- a/socket.c
+++ b/socket.c
@@ -28,6 +28,8 @@
 /============================================================================*/
 
 #define	STRICT
+// IPv6対応
+#include <ws2tcpip.h>
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,11 +49,12 @@
 
 
 
-#define FD_CONNECT_BIT		0x0001
-#define FD_CLOSE_BIT		0x0002
-#define FD_ACCEPT_BIT		0x0004
-#define FD_READ_BIT			0x0008
-#define FD_WRITE_BIT		0x0010
+// Winsock2で定義される定数と名前が重複し値が異なるため使用不可
+//#define FD_CONNECT_BIT		0x0001
+//#define FD_CLOSE_BIT		0x0002
+//#define FD_ACCEPT_BIT		0x0004
+//#define FD_READ_BIT			0x0008
+//#define FD_WRITE_BIT		0x0010
 
 
 
@@ -79,8 +82,8 @@ typedef struct {
 // 念のためテーブルを増量
 //#define MAX_SIGNAL_ENTRY		10
 //#define MAX_SIGNAL_ENTRY_DBASE	5
-#define MAX_SIGNAL_ENTRY		100
-#define MAX_SIGNAL_ENTRY_DBASE	50
+#define MAX_SIGNAL_ENTRY		16
+#define MAX_SIGNAL_ENTRY_DBASE	16
 
 
 
@@ -96,6 +99,8 @@ static int UnRegistAsyncTable(SOCKET s);
 static int UnRegistAsyncTableDbase(HANDLE Async);
 // UTF-8対応
 static HANDLE WSAAsyncGetHostByNameM(HWND hWnd, u_int wMsg, const char * name, char * buf, int buflen);
+// IPv6対応
+static HANDLE WSAAsyncGetHostByNameIPv6M(HWND hWnd, u_int wMsg, const char * name, char * buf, int buflen, short Family);
 
 
 /*===== 外部参照 =====*/
@@ -335,22 +340,22 @@ static int AskAsyncDone(SOCKET s, int *Error, int Mask)
 			*Error = Signal[Pos].Error;
 			if(Signal[Pos].Error != 0)
 				Sts = YES;
-			if((Mask & FD_CONNECT_BIT) && (Signal[Pos].FdConnect != 0))
+			if((Mask & FD_CONNECT) && (Signal[Pos].FdConnect != 0))
 			{
 				Sts = YES;
 #if DBG_MSG
 				DoPrintf("### Ask: connect (Sts=%d, Error=%d)", Sts, *Error);
 #endif
 			}
-			if((Mask & FD_CLOSE_BIT) && (Signal[Pos].FdClose != 0))
-//			if(Mask & FD_CLOSE_BIT)
+			if((Mask & FD_CLOSE) && (Signal[Pos].FdClose != 0))
+//			if(Mask & FD_CLOSE)
 			{
 				Sts = YES;
 #if DBG_MSG
 				DoPrintf("### Ask: close (Sts=%d, Error=%d)", Sts, *Error);
 #endif
 			}
-			if((Mask & FD_ACCEPT_BIT) && (Signal[Pos].FdAccept != 0))
+			if((Mask & FD_ACCEPT) && (Signal[Pos].FdAccept != 0))
 			{
 				Signal[Pos].FdAccept = 0;
 				Sts = YES;
@@ -358,7 +363,7 @@ static int AskAsyncDone(SOCKET s, int *Error, int Mask)
 				DoPrintf("### Ask: accept (Sts=%d, Error=%d)", Sts, *Error);
 #endif
 			}
-			if((Mask & FD_READ_BIT) && (Signal[Pos].FdRead != 0))
+			if((Mask & FD_READ) && (Signal[Pos].FdRead != 0))
 			{
 				Signal[Pos].FdRead = 0;
 				Sts = YES;
@@ -366,7 +371,7 @@ static int AskAsyncDone(SOCKET s, int *Error, int Mask)
 				DoPrintf("### Ask: read (Sts=%d, Error=%d)", Sts, *Error);
 #endif
 			}
-			if((Mask & FD_WRITE_BIT) && (Signal[Pos].FdWrite != 0))
+			if((Mask & FD_WRITE) && (Signal[Pos].FdWrite != 0))
 			{
 				Signal[Pos].FdWrite = 0;
 				Sts = YES;
@@ -382,7 +387,7 @@ static int AskAsyncDone(SOCKET s, int *Error, int Mask)
 
 	if(Pos == MAX_SIGNAL_ENTRY)
 	{
-		if(Mask & FD_CLOSE_BIT)
+		if(Mask & FD_CLOSE)
 		{
 				Sts = YES;
 		}
@@ -662,7 +667,9 @@ struct hostent *do_gethostbyname(const char *Name, char *Buf, int Len, int *Canc
 
 	// UTF-8対応
 //	hAsync = WSAAsyncGetHostByName(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);
-	hAsync = WSAAsyncGetHostByNameM(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);
+	// IPv6対応
+//	hAsync = WSAAsyncGetHostByNameM(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len);
+	hAsync = WSAAsyncGetHostByNameIPv6M(hWndSocket, WM_ASYNC_DBASE, Name, Buf, Len, AF_INET);
 	if(hAsync != NULL)
 	{
 		RegistAsyncTableDbase(hAsync);
@@ -731,7 +738,7 @@ int do_closesocket(SOCKET s)
 	if(Ret == SOCKET_ERROR)
 	{
 		Error = 0;
-		while((CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_CLOSE_BIT) != YES))
+		while((CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_CLOSE) != YES))
 		{
 			Sleep(1);
 			if(BackgrndMessageProc() == YES)
@@ -778,7 +785,9 @@ int do_connect(SOCKET s, const struct sockaddr *name, int namelen, int *CancelCh
 #if DBG_MSG
 	DoPrintf("## Async set: FD_CONNECT|FD_CLOSE|FD_ACCEPT|FD_READ|FD_WRITE");
 #endif
-	Ret = WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE);
+	// 高速化のためFD_READとFD_WRITEを使用しない
+//	Ret = WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE);
+	Ret = WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT);
 	if(Ret != SOCKET_ERROR)
 	{
 		Ret = connect(s, name, namelen);
@@ -787,7 +796,7 @@ int do_connect(SOCKET s, const struct sockaddr *name, int namelen, int *CancelCh
 			do
 			{
 				Error = 0;
-				while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_CONNECT_BIT) != YES))
+				while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_CONNECT) != YES))
 				{
 					Sleep(1);
 					if(BackgrndMessageProc() == YES)
@@ -859,9 +868,9 @@ SOCKET do_accept(SOCKET s, struct sockaddr *addr, int *addrlen)
 	Ret2 = INVALID_SOCKET;
 	Error = 0;
 
-	while((CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_ACCEPT_BIT) != YES))
+	while((CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_ACCEPT) != YES))
 	{
-		if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)
+		if(AskAsyncDone(s, &Error, FD_CLOSE) == YES)
 		{
 			Error = 1;
 			break;
@@ -947,29 +956,30 @@ int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOutErr, int *Cance
 
 	// FTPS対応
 	// OpenSSLでは受信確認はFD_READが複数回受信される可能性がある
-//	while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_READ_BIT) != YES))
-	while(!IsSSLAttached(s) && (*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_READ_BIT) != YES))
-	{
-		if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)
-		{
-			Ret = 0;
-			break;
-		}
-		Sleep(1);
-		if(BackgrndMessageProc() == YES)
-			*CancelCheckWork = YES;
-		else if(TimeOut != 0)
-		{
-			time(&ElapseTime);
-			ElapseTime -= StartTime;
-			if(ElapseTime >= TimeOut)
-			{
-				DoPrintf("do_recv timed out");
-				*TimeOutErr = YES;
-				*CancelCheckWork = YES;
-			}
-		}
-	}
+//	while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_READ) != YES))
+	// 短時間にFD_READが2回以上通知される対策
+//	while(!IsSSLAttached(s) && (*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_READ) != YES))
+//	{
+//		if(AskAsyncDone(s, &Error, FD_CLOSE) == YES)
+//		{
+//			Ret = 0;
+//			break;
+//		}
+//		Sleep(1);
+//		if(BackgrndMessageProc() == YES)
+//			*CancelCheckWork = YES;
+//		else if(TimeOut != 0)
+//		{
+//			time(&ElapseTime);
+//			ElapseTime -= StartTime;
+//			if(ElapseTime >= TimeOut)
+//			{
+//				DoPrintf("do_recv timed out");
+//				*TimeOutErr = YES;
+//				*CancelCheckWork = YES;
+//			}
+//		}
+//	}
 
 	if(/*(Ret != 0) && */(Error == 0) && (*CancelCheckWork == NO) && (*TimeOutErr == NO))
 	{
@@ -1055,11 +1065,11 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 
 	// FTPS対応
 	// 送信バッファの空き確認には影響しないが念のため
-//	while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE_BIT) != YES))
+//	while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE) != YES))
 	// Windows 2000でFD_WRITEが通知されないことがあるバグ修正
-//	while(!IsSSLAttached(s) && (*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE_BIT) != YES))
+//	while(!IsSSLAttached(s) && (*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE) != YES))
 //	{
-//		if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)
+//		if(AskAsyncDone(s, &Error, FD_CLOSE) == YES)
 //		{
 //			Error = 1;
 //			break;
@@ -1145,7 +1155,7 @@ void RemoveReceivedData(SOCKET s)
 	int Error;
 	while((len = recvS(s, buf, sizeof(buf), MSG_PEEK)) >= 0)
 	{
-		AskAsyncDone(s, &Error, FD_READ_BIT);
+		AskAsyncDone(s, &Error, FD_READ);
 		recvS(s, buf, len, 0);
 	}
 }
@@ -1168,7 +1178,7 @@ int CheckClosedAndReconnect(void)
 //SetTaskMsg("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
 
 	Sts = FFFTP_SUCCESS;
-	if(AskAsyncDone(AskCmdCtrlSkt(), &Error, FD_CLOSE_BIT) == YES)
+	if(AskAsyncDone(AskCmdCtrlSkt(), &Error, FD_CLOSE) == YES)
 	{
 		Sts = ReConnectCmdSkt();
 	}
@@ -1177,6 +1187,138 @@ int CheckClosedAndReconnect(void)
 
 
 
+// IPv6対応
+
+typedef struct
+{
+	HANDLE h;
+	HWND hWnd;
+	u_int wMsg;
+	char * name;
+	char * buf;
+	int buflen;
+	short Family;
+} GETHOSTBYNAMEDATA;
+
+static 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用
+static 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;
+}
+
 // UTF-8対応
 
 static BOOL ConvertStringToPunycode(LPSTR Output, DWORD Count, LPCSTR Input)
@@ -1279,3 +1421,16 @@ static HANDLE WSAAsyncGetHostByNameM(HWND hWnd, u_int wMsg, const char * name, c
 	return r;
 }
 
+static 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;
+}
+

--- a/socketwrapper.c
+++ b/socketwrapper.c
@@ -70,7 +70,7 @@ _X509_print_ex p_X509_print_ex;
 _X509_get_subject_name p_X509_get_subject_name;
 _X509_NAME_print_ex p_X509_NAME_print_ex;
 
-#define MAX_SSL_SOCKET 64
+#define MAX_SSL_SOCKET 16
 
 BOOL g_bOpenSSLLoaded;
 HMODULE g_hOpenSSL;