Commit: ffd9ce66d16fb452725a6bb1b5d1ef848fcd2628 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revisión: ffd9ce66d16fb452725a6bb1b5d1ef848fcd2628 (tree)
• Tiempo: 2011-12-03 22:33:21
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of simultaneous connection.
Fix bugs of parsing MLSD response.

Cambiar Resumen

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: connect.c
• modified: filelist.c
• modified: getput.c
• modified: hostman.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/common.h
+++ b/common.h
@@ -954,6 +954,7 @@ typedef struct {
 	// 同時接続対応
 	int MaxThreadCount;					/* 同時接続数 */
 	int ReuseCmdSkt;					/* メインウィンドウのソケットを再利用する (YES/NO) */
+	int NoDisplayUI;					/* UIを表示しない (YES/NO) */
 	// FEAT対応
 	int Feature;						/* 利用可能な機能のフラグ (FEATURE_xxx) */
 	// MLSD対応

--- a/connect.c
+++ b/connect.c
@@ -1088,6 +1088,8 @@ int ReConnectTrnSkt(SOCKET *Skt, int *CancelCheckWork)
 	HostData.CurNameKanjiCode = HostData.NameKanjiCode;
 	// IPv6対応
 	HostData.CurNetType = HostData.NetType;
+	// 同時接続対応
+	HostData.NoDisplayUI = YES;
 	// 暗号化通信対応
 	// 同時接続対応
 //	if((*Skt = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)
@@ -1500,8 +1502,11 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
 						else
 						{
 							Anony = NO;
+							// 同時接続対応
+//							if((strlen(User) != 0) || 
+//							   (InputDialogBox(username_dlg, GetMainHwnd(), NULL, User, USER_NAME_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
 							if((strlen(User) != 0) || 
-							   (InputDialogBox(username_dlg, GetMainHwnd(), NULL, User, USER_NAME_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
+							   ((HostData->NoDisplayUI == NO) && (InputDialogBox(username_dlg, GetMainHwnd(), NULL, User, USER_NAME_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES)))
 							{
 								if(Anony == YES)
 								{
@@ -1567,8 +1572,11 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
 //									if((Sts = command(ContSock, Reply, &CancelFlg, "USER %s", Buf) / 100) == FTP_CONTINUE)
 									if((Sts = command(ContSock, Reply, CancelCheckWork, "USER %s", Buf) / 100) == FTP_CONTINUE)
 									{
+										// 同時接続対応
+//										if((strlen(Pass) != 0) || 
+//										   (InputDialogBox(passwd_dlg, GetMainHwnd(), NULL, Pass, PASSWORD_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
 										if((strlen(Pass) != 0) || 
-										   (InputDialogBox(passwd_dlg, GetMainHwnd(), NULL, Pass, PASSWORD_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
+										   ((HostData->NoDisplayUI == NO) && (InputDialogBox(passwd_dlg, GetMainHwnd(), NULL, Pass, PASSWORD_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES)))
 										{
 											CheckOneTimePassword(Pass, Reply, Security);
 
@@ -1582,7 +1590,9 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
 											if(Sts == FTP_ERROR)
 											{
 												strcpy(Pass, "");
-												if(InputDialogBox(re_passwd_dlg, GetMainHwnd(), NULL, Pass, PASSWORD_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES)
+												// 同時接続対応
+//												if(InputDialogBox(re_passwd_dlg, GetMainHwnd(), NULL, Pass, PASSWORD_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES)
+												if(HostData->NoDisplayUI == NO && InputDialogBox(re_passwd_dlg, GetMainHwnd(), NULL, Pass, PASSWORD_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES)
 													Continue = YES;
 												else
 													DoPrintf("No password specified.");
@@ -1590,8 +1600,11 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
 											}
 											else if(Sts == FTP_CONTINUE)
 											{
+												// 同時接続対応
+//												if((strlen(Acct) != 0) || 
+//												   (InputDialogBox(account_dlg, GetMainHwnd(), NULL, Acct, ACCOUNT_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
 												if((strlen(Acct) != 0) || 
-												   (InputDialogBox(account_dlg, GetMainHwnd(), NULL, Acct, ACCOUNT_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
+												   ((HostData->NoDisplayUI == NO) && (InputDialogBox(account_dlg, GetMainHwnd(), NULL, Acct, ACCOUNT_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES)))
 												{
 													// 同時接続対応
 //													Sts = command(ContSock, NULL, &CancelFlg, "ACCT %s", Acct) / 100;
@@ -1624,7 +1637,9 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
 							}
 							else if((SavePass == YES) && (ReInPass == YES))
 							{
-								if(DialogBox(GetFtpInst(), MAKEINTRESOURCE(savepass_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)
+								// 同時接続対応
+//								if(DialogBox(GetFtpInst(), MAKEINTRESOURCE(savepass_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)
+								if(HostData->NoDisplayUI == NO && DialogBox(GetFtpInst(), MAKEINTRESOURCE(savepass_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)
 									SetHostPassword(AskCurrentHost(), Pass);
 							}
 						}

--- a/filelist.c
+++ b/filelist.c
@@ -4911,6 +4911,7 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 							sTime.wHour = atoi_n(Value + 8, 2);
 							sTime.wMinute = atoi_n(Value + 10, 2);
 							sTime.wSecond = atoi_n(Value + 12, 2);
+							sTime.wMilliseconds = 0;
 							SystemTimeToFileTime(&sTime, Time);
 //							SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());
 							*InfoExist |= FINFO_DATE | FINFO_TIME;

--- a/getput.c
+++ b/getput.c
@@ -697,6 +697,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 	SOCKET TrnSkt;
 	RECT WndRect;
 	int i;
+	DWORD LastUsed;
 
 	hWndTrans = NULL;
 	Down = NO;
@@ -756,10 +757,13 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				{
 					ReleaseMutex(hListAccMutex);
 					ReConnectTrnSkt(&TrnSkt, &Canceled[ThreadCount]);
-					// 同時ログイン数制限に引っかかった可能性あり
-					// 負荷を下げるためにしばらく待機
-					if(TrnSkt == INVALID_SOCKET)
+					// 同時ログイン数制限対策
+					if(TrnSkt != INVALID_SOCKET)
+						LastUsed = timeGetTime();
+					else
 					{
+						// 同時ログイン数制限に引っかかった可能性あり
+						// 負荷を下げるために約10秒間待機
 						i = 10000;
 						while(NewCmdSkt != CmdSkt && i > 0)
 						{
@@ -780,15 +784,20 @@ static ULONG WINAPI TransferThread(void *Dummy)
 			{
 				if(TrnSkt != INVALID_SOCKET)
 				{
-					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)
+					// 同時ログイン数制限対策
+					// 10秒間は再利用を許可
+					if(timeGetTime() - LastUsed > 10000)
 					{
-						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);
+						}
 					}
 				}
 			}
@@ -1150,6 +1159,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 				SendMessage(hWndTrans, WM_SET_PACKET, 0, 0);
 			if(Pos != NULL)
 				strcpy(Pos->Cmd, "");
+			LastUsed = timeGetTime();
 		}
 //		else
 		else if(TransPacketBase == NULL)

--- a/hostman.c
+++ b/hostman.c
@@ -1345,6 +1345,7 @@ void CopyDefaultHost(HOSTDATA *Set)
 	// 同時接続対応
 	Set->MaxThreadCount = 1;
 	Set->ReuseCmdSkt = NO;
+	Set->NoDisplayUI = NO;
 	// MLSD対応
 	Set->Feature = 0;
 	Set->UseMLSD = YES;