Commit: fad6e7c3240d47608cb07f6f2304e1e5091f995a - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: fad6e7c3240d47608cb07f6f2304e1e5091f995a (tree)
• Zeit: 2011-11-01 21:53:00
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of receiving data on Windows 2000.
Enhance routines for canceling or aborting.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: main.c
• modified: socket.c

Diff

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
@@ -1719,6 +1719,8 @@ int do_listen(SOCKET s,	int backlog);
 SOCKET do_accept(SOCKET s, struct sockaddr *addr, int *addrlen);
 int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOut, int *CancelCheckWork);
 int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int *CancelCheckWork);
+// 同時接続対応
+void RemoveReceivedData(SOCKET s);
 int CheckClosedAndReconnect(void);
 void CheckAllEventClosed(void);
 

--- a/main.c
+++ b/main.c
@@ -832,6 +832,10 @@ static LRESULT CALLBACK FtpWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
 	switch (message)
 	{
 		case WM_COMMAND :
+			// 同時接続対応
+			// 中断後に受信バッファに応答が残っていると次のコマンドの応答が正しく処理できない
+			if(CancelFlg == YES)
+				RemoveReceivedData(AskCmdCtrlSkt());
 			switch(LOWORD(wParam))
 			{
 				case MENU_CONNECT :

--- a/socket.c
+++ b/socket.c
@@ -1046,36 +1046,40 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 #if DBG_MSG
 	DoPrintf("## Async set: FD_CONNECT|FD_CLOSE|FD_ACCEPT|FD_READ|FD_WRITE");
 #endif
-	WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE);
+	// Windows 2000でFD_WRITEが通知されないことがあるバグ修正
+	// 毎回通知されたのはNT 4.0までのバグであり仕様ではない
+	// XP以降は互換性のためか毎回通知される
+//	WSAAsyncSelect(s, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE);
 	if(BackgrndMessageProc() == YES)
 		*CancelCheckWork = YES;
 
 	// FTPS対応
 	// 送信バッファの空き確認には影響しないが念のため
 //	while((*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE_BIT) != YES))
-	while(!IsSSLAttached(s) && (*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE_BIT) != YES))
-	{
-		if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)
-		{
-			Error = 1;
-			break;
-		}
-
-		Sleep(1);
-		if(BackgrndMessageProc() == YES)
-			*CancelCheckWork = YES;
-		else if(TimeOut != 0)
-		{
-			time(&ElapseTime);
-			ElapseTime -= StartTime;
-			if(ElapseTime >= TimeOut)
-			{
-				DoPrintf("do_write timed out");
-				*TimeOutErr = YES;
-				*CancelCheckWork = YES;
-			}
-		}
-	}
+	// Windows 2000でFD_WRITEが通知されないことがあるバグ修正
+//	while(!IsSSLAttached(s) && (*CancelCheckWork == NO) && (AskAsyncDone(s, &Error, FD_WRITE_BIT) != YES))
+//	{
+//		if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)
+//		{
+//			Error = 1;
+//			break;
+//		}
+//
+//		Sleep(1);
+//		if(BackgrndMessageProc() == YES)
+//			*CancelCheckWork = YES;
+//		else if(TimeOut != 0)
+//		{
+//			time(&ElapseTime);
+//			ElapseTime -= StartTime;
+//			if(ElapseTime >= TimeOut)
+//			{
+//				DoPrintf("do_write timed out");
+//				*TimeOutErr = YES;
+//				*CancelCheckWork = YES;
+//			}
+//		}
+//	}
 
 	if((Error == 0) && (*CancelCheckWork == NO) && (*TimeOutErr == NO))
 	{
@@ -1133,6 +1137,20 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 }
 
 
+// 同時接続対応
+void RemoveReceivedData(SOCKET s)
+{
+	char buf[1024];
+	int len;
+	int Error;
+	while((len = recvS(s, buf, sizeof(buf), MSG_PEEK)) >= 0)
+	{
+		AskAsyncDone(s, &Error, FD_READ_BIT);
+		recvS(s, buf, len, 0);
+	}
+}
+
+
 /*----- 
 *
 *	Parameter