Commit: e9a6d523e00faf31fcec49598aaea96681d5b53c - ffftp (git)

Loweynet

Commit MetaInfo

• Revisão: e9a6d523e00faf31fcec49598aaea96681d5b53c (tree)
• Hora: 2012-02-16 23:16:12
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Fix bugs of hanging on exit.

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• 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/socket.c
+++ b/socket.c
@@ -930,7 +930,9 @@ SOCKET do_accept(SOCKET s, struct sockaddr *addr, int *addrlen)
 				DoPrintf("## Async set: FD_CONNECT|FD_CLOSE|FD_ACCEPT|FD_READ|FD_WRITE");
 #endif
 				RegistAsyncTable(Ret2);
-				if(WSAAsyncSelect(Ret2, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE) == SOCKET_ERROR)
+				// 高速化のためFD_READとFD_WRITEを使用しない
+//				if(WSAAsyncSelect(Ret2, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT | FD_READ | FD_WRITE) == SOCKET_ERROR)
+				if(WSAAsyncSelect(Ret2, hWndSocket, WM_ASYNC_SOCKET, FD_CONNECT | FD_CLOSE | FD_ACCEPT) == SOCKET_ERROR)
 				{
 					do_closesocket(Ret2);
 					Ret2 = INVALID_SOCKET;
@@ -1190,10 +1192,10 @@ void RemoveReceivedData(SOCKET s)
 {
 	char buf[1024];
 	int len;
-	int Error;
-	while((len = FTPS_recv(s, buf, sizeof(buf), MSG_PEEK)) >= 0)
+//	int Error;
+	while((len = FTPS_recv(s, buf, sizeof(buf), MSG_PEEK)) > 0)
 	{
-		AskAsyncDone(s, &Error, FD_READ);
+//		AskAsyncDone(s, &Error, FD_READ);
 		FTPS_recv(s, buf, len, 0);
 	}
 }