Commit: d5878fa6cb48dc4d50810d608f13cc8128c1331b - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revisión: d5878fa6cb48dc4d50810d608f13cc8128c1331b (tree)
• Tiempo: 2012-09-06 17:50:44
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add conditions to send dummy commands for keep alive.
Set the interval of dummy commands to 60 seconds by default.

Cambiar Resumen

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: ftpproc.c
• modified: getput.c
• modified: hostman.c
• modified: main.c
• modified: remote.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
@@ -1611,7 +1611,7 @@ void ReformToVMSstylePathName(char *Path);
 void ReformVMSDirName(char *DirName, int Flg);
 #endif
 // 自動切断対策
-void NoopProc(void);
+void NoopProc(int Force);
 
 /*===== local.c =====*/
 
@@ -1654,7 +1654,9 @@ int DoDirListCmdSkt(char *AddOpt, char *Path, int Num, int *CancelCheckWork);
 #if defined(HAVE_TANDEM)
 void SwitchOSSProc(void);
 #endif
-int CommandProcCmd(char *Reply, char *fmt, ...);
+// 同時接続対応
+//int CommandProcCmd(char *Reply, char *fmt, ...);
+int CommandProcCmd(char *Reply, int* CancelCheckWork, char *fmt, ...);
 // 同時接続対応
 //int CommandProcTrn(char *Reply, char *fmt, ...);
 int CommandProcTrn(SOCKET cSkt, char *Reply, int* CancelCheckWork, char *fmt, ...);

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -3731,11 +3731,11 @@ static int RenameUnuseableName(char *Fname)
 
 // 自動切断対策
 // NOOPコマンドでは効果が無いホストが多いためLISTコマンドを使用
-void NoopProc(void)
+void NoopProc(int Force)
 {
 	int CancelCheckWork;
 	CancelCheckWork = NO;
-	if(AskConnecting() == YES && AskUserOpeDisabled() == NO)
+	if(Force == YES || (AskConnecting() == YES && AskUserOpeDisabled() == NO))
 	{
 		if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
 		{

--- a/getput.c
+++ b/getput.c
@@ -184,6 +184,8 @@ extern int FolderAttr;
 extern int FolderAttrNum;
 // 同時接続対応
 extern int SendQuit;
+// 自動切断対策
+extern time_t LastDataConnectionTime;
 
 
 /*----- ファイル転送スレッドを起動する ----------------------------------------
@@ -2260,6 +2262,8 @@ static int DownloadFile(TRANSPACKET *Pkt, SOCKET dSkt, int CreateMode, int *Canc
 	if(shutdown(dSkt, 1) != 0)
 		ReportWSError("shutdown", WSAGetLastError());
 
+	// 自動切断対策
+	LastDataConnectionTime = time(NULL);
 	DoClose(dSkt);
 
 	if(ForceAbort == NO)
@@ -3535,6 +3539,8 @@ static int UploadFile(TRANSPACKET *Pkt, SOCKET dSkt)
 		Pkt->Abort = ABORT_ERROR;
 	}
 
+	// 自動切断対策
+	LastDataConnectionTime = time(NULL);
 	if(shutdown(dSkt, 1) != 0)
 		ReportWSError("shutdown", WSAGetLastError());
 

--- a/hostman.c
+++ b/hostman.c
@@ -1356,7 +1356,7 @@ void CopyDefaultHost(HOSTDATA *Set)
 	Set->NetType = NTYPE_AUTO;
 	Set->CurNetType = NTYPE_AUTO;
 	// 自動切断対策
-	Set->NoopInterval = 0;
+	Set->NoopInterval = 60;
 	// 再転送対応
 	Set->TransferErrorMode = EXIST_OVW;
 	Set->TransferErrorNotify = YES;

--- a/main.c
+++ b/main.c
@@ -35,6 +35,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <mbstring.h>
+// 自動切断対策
+#include <time.h>
 #include <malloc.h>
 #include <windowsx.h>
 #include <commctrl.h>
@@ -248,6 +250,9 @@ int DispFileIcon = NO;
 int MakeAllDir = YES;
 // UTF-8対応
 int LocalKanjiCode = KANJI_SJIS;
+// 自動切断対策
+int NoopEnable = NO;
+time_t LastDataConnectionTime = 0;
 
 
 
@@ -939,9 +944,8 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 						SendMessage(GetLocalHwnd(), LVM_ENSUREVISIBLE, (WPARAM)Pos, (LPARAM)TRUE);
 					}
 				}
-				break;
-			case 2:
-				NoopProc();
+				if(NoopEnable == YES && AskNoopInterval() > 0 && time(NULL) - LastDataConnectionTime >= AskNoopInterval())
+					NoopProc(NO);
 				break;
 			}
 			break;
@@ -955,20 +959,18 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 			{
 				case MENU_CONNECT :
 					// 自動切断対策
-					KillTimer(hWnd, 2);
+					NoopEnable = NO;
 					ConnectProc(DLG_TYPE_CON, -1);
 					// 自動切断対策
-					if(AskNoopInterval() > 0)
-						SetTimer(hWnd, 2, AskNoopInterval() * 1000, NULL);
+					NoopEnable = YES;
 					break;
 
 				case MENU_CONNECT_NUM :
 					// 自動切断対策
-					KillTimer(hWnd, 2);
+					NoopEnable = NO;
 					ConnectProc(DLG_TYPE_CON, (int)lParam);
 					// 自動切断対策
-					if(AskNoopInterval() > 0)
-						SetTimer(hWnd, 2, AskNoopInterval() * 1000, NULL);
+					NoopEnable = YES;
 					if(AskConnecting() == YES)
 					{
 						if(HIWORD(wParam) & OPT_MIRROR)
@@ -990,20 +992,18 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 
 				case MENU_SET_CONNECT :
 					// 自動切断対策
-					KillTimer(hWnd, 2);
+					NoopEnable = NO;
 					ConnectProc(DLG_TYPE_SET, -1);
 					// 自動切断対策
-					if(AskNoopInterval() > 0)
-						SetTimer(hWnd, 2, AskNoopInterval() * 1000, NULL);
+					NoopEnable = YES;
 					break;
 
 				case MENU_QUICK :
 					// 自動切断対策
-					KillTimer(hWnd, 2);
+					NoopEnable = NO;
 					QuickConnectProc();
 					// 自動切断対策
-					if(AskNoopInterval() > 0)
-						SetTimer(hWnd, 2, AskNoopInterval() * 1000, NULL);
+					NoopEnable = YES;
 					break;
 
 				case MENU_DISCONNECT :
@@ -1038,11 +1038,10 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 				case MENU_HIST_19 :
 				case MENU_HIST_20 :
 					// 自動切断対策
-					KillTimer(hWnd, 2);
+					NoopEnable = NO;
 					HistoryConnectProc(LOWORD(wParam));
 					// 自動切断対策
-					if(AskNoopInterval() > 0)
-						SetTimer(hWnd, 2, AskNoopInterval() * 1000, NULL);
+					NoopEnable = YES;
 					break;
 
 				case MENU_UPDIR :

--- a/remote.c
+++ b/remote.c
@@ -66,6 +66,8 @@ extern int SendQuit;
 
 // 同時接続対応
 extern int CancelFlg;
+// 自動切断対策
+extern time_t LastDataConnectionTime;
 
 /*===== ローカルなワーク =====*/
 
@@ -96,13 +98,19 @@ int DoCWD(char *Path, int Disp, int ForceGet, int ErrorBell)
 	Sts = FTP_COMPLETE * 100;
 
 	if(strcmp(Path, "..") == 0)
-		Sts = CommandProcCmd(NULL, "CDUP");
+		// 同時接続対応
+//		Sts = CommandProcCmd(NULL, "CDUP");
+		Sts = CommandProcCmd(NULL, &CancelFlg, "CDUP");
 	else if(strcmp(Path, "") != 0)
 	{
 		if((AskHostType() != HTYPE_VMS) || (strchr(Path, '[') != NULL))
-			Sts = CommandProcCmd(NULL, "CWD %s", Path);
+			// 同時接続対応
+//			Sts = CommandProcCmd(NULL, "CWD %s", Path);
+			Sts = CommandProcCmd(NULL, &CancelFlg, "CWD %s", Path);
 		else
-			Sts = CommandProcCmd(NULL, "CWD [.%s]", Path);	/* VMS用 */
+			// 同時接続対応
+//			Sts = CommandProcCmd(NULL, "CWD [.%s]", Path);	/* VMS用 */
+			Sts = CommandProcCmd(NULL, &CancelFlg, "CWD [.%s]", Path);	/* VMS用 */
 	}
 
 	if((Sts/100 >= FTP_CONTINUE) && (ErrorBell == YES))
@@ -220,12 +228,16 @@ static int DoPWD(char *Buf)
 
 	if(PwdCommandType == PWD_XPWD)
 	{
-		Sts = CommandProcCmd(Tmp, "XPWD");
+		// 同時接続対応
+//		Sts = CommandProcCmd(Tmp, "XPWD");
+		Sts = CommandProcCmd(Tmp, &CancelFlg, "XPWD");
 		if(Sts/100 != FTP_COMPLETE)
 			PwdCommandType = PWD_PWD;
 	}
 	if(PwdCommandType == PWD_PWD)
-		Sts = CommandProcCmd(Tmp, "PWD");
+		// 同時接続対応
+//		Sts = CommandProcCmd(Tmp, "PWD");
+		Sts = CommandProcCmd(Tmp, &CancelFlg, "PWD");
 
 	if(Sts/100 == FTP_COMPLETE)
 	{
@@ -279,11 +291,17 @@ int DoMKD(char *Path)
 {
 	int Sts;
 
-	Sts = CommandProcCmd(NULL, "MKD %s", Path);
+	// 同時接続対応
+//	Sts = CommandProcCmd(NULL, "MKD %s", Path);
+	Sts = CommandProcCmd(NULL, &CancelFlg, "MKD %s", Path);
 
 	if(Sts/100 >= FTP_CONTINUE)
 		SoundPlay(SND_ERROR);
 
+	// 自動切断対策
+	if(CancelFlg == NO && AskNoopInterval() > 0 && time(NULL) - LastDataConnectionTime >= AskNoopInterval())
+		NoopProc(YES);
+
 	return(Sts/100);
 }
 
@@ -301,11 +319,17 @@ int DoRMD(char *Path)
 {
 	int Sts;
 
-	Sts = CommandProcCmd(NULL, "RMD %s", Path);
+	// 同時接続対応
+//	Sts = CommandProcCmd(NULL, "RMD %s", Path);
+	Sts = CommandProcCmd(NULL, &CancelFlg, "RMD %s", Path);
 
 	if(Sts/100 >= FTP_CONTINUE)
 		SoundPlay(SND_ERROR);
 
+	// 自動切断対策
+	if(CancelFlg == NO && AskNoopInterval() > 0 && time(NULL) - LastDataConnectionTime >= AskNoopInterval())
+		NoopProc(YES);
+
 	return(Sts/100);
 }
 
@@ -323,11 +347,17 @@ int DoDELE(char *Path)
 {
 	int Sts;
 
-	Sts = CommandProcCmd(NULL, "DELE %s", Path);
+	// 同時接続対応
+//	Sts = CommandProcCmd(NULL, "DELE %s", Path);
+	Sts = CommandProcCmd(NULL, &CancelFlg, "DELE %s", Path);
 
 	if(Sts/100 >= FTP_CONTINUE)
 		SoundPlay(SND_ERROR);
 
+	// 自動切断対策
+	if(CancelFlg == NO && AskNoopInterval() > 0 && time(NULL) - LastDataConnectionTime >= AskNoopInterval())
+		NoopProc(YES);
+
 	return(Sts/100);
 }
 
@@ -346,7 +376,9 @@ int DoRENAME(char *Src, char *Dst)
 {
 	int Sts;
 
-	Sts = CommandProcCmd(NULL, "RNFR %s", Src);
+	// 同時接続対応
+//	Sts = CommandProcCmd(NULL, "RNFR %s", Src);
+	Sts = CommandProcCmd(NULL, &CancelFlg, "RNFR %s", Src);
 	if(Sts == 350)
 		// 同時接続対応
 //		Sts = command(AskCmdCtrlSkt(), NULL, &CheckCancelFlg, "RNTO %s", Dst);
@@ -355,6 +387,10 @@ int DoRENAME(char *Src, char *Dst)
 	if(Sts/100 >= FTP_CONTINUE)
 		SoundPlay(SND_ERROR);
 
+	// 自動切断対策
+	if(CancelFlg == NO && AskNoopInterval() > 0 && time(NULL) - LastDataConnectionTime >= AskNoopInterval())
+		NoopProc(YES);
+
 	return(Sts/100);
 }
 
@@ -373,11 +409,17 @@ int DoCHMOD(char *Path, char *Mode)
 {
 	int Sts;
 
-	Sts = CommandProcCmd(NULL, "%s %s %s", AskHostChmodCmd(), Mode, Path);
+	// 同時接続対応
+//	Sts = CommandProcCmd(NULL, "%s %s %s", AskHostChmodCmd(), Mode, Path);
+	Sts = CommandProcCmd(NULL, &CancelFlg, "%s %s %s", AskHostChmodCmd(), Mode, Path);
 
 	if(Sts/100 >= FTP_CONTINUE)
 		SoundPlay(SND_ERROR);
 
+	// 自動切断対策
+	if(CancelFlg == NO && AskNoopInterval() > 0 && time(NULL) - LastDataConnectionTime >= AskNoopInterval())
+		NoopProc(YES);
+
 	return(Sts/100);
 }
 
@@ -681,7 +723,9 @@ static int DoDirList(HWND hWnd, SOCKET cSkt, char *AddOpt, char *Path, int Num,
 *		コマンドコントロールソケットを使う
 *----------------------------------------------------------------------------*/
 
-int CommandProcCmd(char *Reply, char *fmt, ...)
+// 同時接続対応
+//int CommandProcCmd(char *Reply, char *fmt, ...)
+int CommandProcCmd(char *Reply, int* CancelCheckWork, char *fmt, ...)
 {
 	va_list Args;
 	char Cmd[1024];
@@ -703,7 +747,7 @@ int CommandProcCmd(char *Reply, char *fmt, ...)
 //		{
 			// 同時接続対応
 //			Sts = command(AskCmdCtrlSkt(), Reply, &CheckCancelFlg, "%s", Cmd);
-			Sts = command(AskCmdCtrlSkt(), Reply, &CancelFlg, "%s", Cmd);
+			Sts = command(AskCmdCtrlSkt(), Reply, CancelCheckWork, "%s", Cmd);
 //		}
 //	}
 	return(Sts);