Commit: 98a8ff5f501726ce2f71296138ab21e98eb68173 - ffftp (git)

Loweynet

Commit MetaInfo

• Revision: 98a8ff5f501726ce2f71296138ab21e98eb68173 (tree)
• Zeit: 2011-10-13 19:16:56
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of file deletion code on transfer thread (but it is unused).
Fix bugs on trying encrypted connection.
Remove log size limit for Windows 9x.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: connect.c
• modified: getput.c
• modified: hostman.c
• modified: socket.c
• modified: taskwin.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
@@ -921,6 +921,7 @@ typedef struct {
 	char DialEntry[RAS_NAME_LEN+1];		/* ダイアルアップエントリ */
 	// 暗号化通信対応
 	int CryptMode;						/* 暗号化通信モード (CRYPT_xxx) */
+	int UseNoEncryption;				/* 暗号化なしで接続する (YES/NO) */
 	int UseFTPES;						/* FTPESで接続する (YES/NO) */
 	int UseFTPIS;						/* FTPISで接続する (YES/NO) */
 	int UseSFTP;						/* SFTPで接続する (YES/NO) */

--- a/connect.c
+++ b/connect.c
@@ -57,7 +57,10 @@ static int SendInitCommand(char *Cmd);
 static void AskUseFireWall(char *Host, int *Fire, int *Pasv, int *List);
 static void SaveCurrentSetToHistory(void);
 static int ReConnectSkt(SOCKET *Skt);
-static SOCKET DoConnect(char *Host, char *User, char *Pass, char *Acct, int Port, int Fwall, int SavePass, int Security);
+// 暗号化通信対応
+//static SOCKET DoConnect(char *Host, char *User, char *Pass, char *Acct, int Port, int Fwall, int SavePass, int Security);
+static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char *User, char *Pass, char *Acct, int Port, int Fwall, int SavePass, int Security);
+static SOCKET DoConnect(HOSTDATA* HostData, char *Host, char *User, char *Pass, char *Acct, int Port, int Fwall, int SavePass, int Security);
 static int CheckOneTimePassword(char *Pass, char *Reply, int Type);
 static BOOL CALLBACK BlkHookFnc(void);
 static int Socks5MakeCmdPacket(SOCKS5REQUEST *Packet, char Cmd, int ValidIP, ulong IP, char *Host, ushort Port);
@@ -159,7 +162,9 @@ void ConnectProc(int Type, int Num)
 				Save = YES;
 
 			DisableUserOpe();
-			CmdCtrlSocket = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, Save, CurHost.Security);
+			// 暗号化通信対応
+//			CmdCtrlSocket = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, Save, CurHost.Security);
+			CmdCtrlSocket = DoConnect(&CurHost, CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, Save, CurHost.Security);
 			TrnCtrlSocket = CmdCtrlSocket;
 
 			if(CmdCtrlSocket != INVALID_SOCKET)
@@ -238,7 +243,9 @@ void QuickConnectProc(void)
 			SetSyncMoveMode(CurHost.SyncMove);
 
 			DisableUserOpe();
-			CmdCtrlSocket = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security);
+			// 暗号化通信対応
+//			CmdCtrlSocket = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security);
+			CmdCtrlSocket = DoConnect(&CurHost, CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security);
 			TrnCtrlSocket = CmdCtrlSocket;
 
 			if(CmdCtrlSocket != INVALID_SOCKET)
@@ -410,7 +417,9 @@ void DirectConnectProc(char *unc, int Kanji, int Kana, int Fkanji, int TrMode)
 		}
 
 		DisableUserOpe();
-		CmdCtrlSocket = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security);
+		// 暗号化通信対応
+//		CmdCtrlSocket = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security);
+		CmdCtrlSocket = DoConnect(&CurHost, CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security);
 		TrnCtrlSocket = CmdCtrlSocket;
 
 		if(CmdCtrlSocket != INVALID_SOCKET)
@@ -486,7 +495,9 @@ void HistoryConnectProc(int MenuCmd)
 			DispTransferType();
 
 			DisableUserOpe();
-			CmdCtrlSocket = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security);
+			// 暗号化通信対応
+//			CmdCtrlSocket = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security);
+			CmdCtrlSocket = DoConnect(&CurHost, CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security);
 			TrnCtrlSocket = CmdCtrlSocket;
 
 			if(CmdCtrlSocket != INVALID_SOCKET)
@@ -959,6 +970,8 @@ int ReConnectTrnSkt(SOCKET *Skt)
 {
 //	char Path[FMAX_PATH+1];
 	int Sts;
+	// 暗号化通信対応
+	HOSTDATA HostData;
 
 	Sts = FFFTP_FAIL;
 
@@ -969,7 +982,18 @@ int ReConnectTrnSkt(SOCKET *Skt)
 	if(*Skt != INVALID_SOCKET)
 		do_closesocket(*Skt);
 	/* 再接続 */
-	if((*Skt = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)
+	// 暗号化通信対応
+	HostData = CurHost;
+	if(HostData.CryptMode != CRYPT_NONE)
+		HostData.UseNoEncryption = NO;
+	if(HostData.CryptMode != CRYPT_FTPES)
+		HostData.UseFTPES = NO;
+	if(HostData.CryptMode != CRYPT_FTPIS)
+		HostData.UseFTPIS = NO;
+	if(HostData.CryptMode != CRYPT_SFTP)
+		HostData.UseSFTP = NO;
+//	if((*Skt = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)
+	if((*Skt = DoConnect(&HostData, CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)
 	{
 //		AskRemoteCurDir(Path, FMAX_PATH);
 //		DoCWD(Path, YES, YES, YES);
@@ -1007,7 +1031,9 @@ static int ReConnectSkt(SOCKET *Skt)
 	if(*Skt != INVALID_SOCKET)
 		do_closesocket(*Skt);
 	/* 再接続 */
-	if((*Skt = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)
+	// 暗号化通信対応
+//	if((*Skt = DoConnect(CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)
+	if((*Skt = DoConnect(&CurHost, CurHost.HostAdrs, CurHost.UserName, CurHost.PassWord, CurHost.Account, CurHost.Port, CurHost.FireWall, NO, CurHost.Security)) != INVALID_SOCKET)
 	{
 		AskRemoteCurDir(Path, FMAX_PATH);
 		DoCWD(Path, YES, YES, YES);
@@ -1216,7 +1242,8 @@ int AskConnecting(void)
 *			none	Connect host →                                              USER user(h) →      PASS pass(h) → ACCT acct
 *----------------------------------------------------------------------------*/
 
-static SOCKET DoConnect(char *Host, char *User, char *Pass, char *Acct, int Port, int Fwall, int SavePass, int Security)
+// 暗号化通信対応
+static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char *User, char *Pass, char *Acct, int Port, int Fwall, int SavePass, int Security)
 {
 	int Sts;
 	int Flg;
@@ -1232,143 +1259,173 @@ static SOCKET DoConnect(char *Host, char *User, char *Pass, char *Acct, int Port
 	char TmpBuf[ONELINE_BUF_SIZE];
 	struct linger LingerOpt;
 
-	if(Fwall == YES)
-		Fwall = FwallType;
-	else
-		Fwall = FWALL_NONE;
+	// 暗号化通信対応
+	ContSock = INVALID_SOCKET;
 
-	TryConnect = YES;
-	CancelFlg = NO;
+	if(CryptMode == CRYPT_NONE || CryptMode == CRYPT_FTPES || CryptMode == CRYPT_FTPIS)
+	{
+		if(Fwall == YES)
+			Fwall = FwallType;
+		else
+			Fwall = FWALL_NONE;
+
+		TryConnect = YES;
+		CancelFlg = NO;
 #if 0
-//	WSASetBlockingHook(BlkHookFnc);
+//		WSASetBlockingHook(BlkHookFnc);
 #endif
 
-	ContSock = INVALID_SOCKET;
+		ContSock = INVALID_SOCKET;
 
-	HostPort = Port;
-	Tmp = Host;
-	if(((Fwall >= FWALL_FU_FP_SITE) && (Fwall <= FWALL_OPEN)) ||
-	   (Fwall == FWALL_SIDEWINDER) ||
-	   (Fwall == FWALL_FU_FP))
-	{
-		Tmp = FwallHost;
-		Port = FwallPort;
-	}
+		HostPort = Port;
+		Tmp = Host;
+		if(((Fwall >= FWALL_FU_FP_SITE) && (Fwall <= FWALL_OPEN)) ||
+		   (Fwall == FWALL_SIDEWINDER) ||
+		   (Fwall == FWALL_FU_FP))
+		{
+			Tmp = FwallHost;
+			Port = FwallPort;
+		}
 
-	if(strlen(Tmp) != 0)
-	{
-		if((ContSock = connectsock(Tmp, Port, "", &CancelFlg)) != INVALID_SOCKET)
+		if(strlen(Tmp) != 0)
 		{
-			// バッファを無効
+			if((ContSock = connectsock(Tmp, Port, "", &CancelFlg)) != INVALID_SOCKET)
+			{
+				// バッファを無効
 #ifdef DISABLE_CONTROL_NETWORK_BUFFERS
-			int BufferSize = 0;
-			setsockopt(ContSock, SOL_SOCKET, SO_SNDBUF, (char*)&BufferSize, sizeof(int));
-			setsockopt(ContSock, SOL_SOCKET, SO_RCVBUF, (char*)&BufferSize, sizeof(int));
+				int BufferSize = 0;
+				setsockopt(ContSock, SOL_SOCKET, SO_SNDBUF, (char*)&BufferSize, sizeof(int));
+				setsockopt(ContSock, SOL_SOCKET, SO_RCVBUF, (char*)&BufferSize, sizeof(int));
 #endif
-			while((Sts = ReadReplyMessage(ContSock, Buf, 1024, &CancelFlg, TmpBuf) / 100) == FTP_PRELIM)
-				;
+				// FTPIS対応
+//				while((Sts = ReadReplyMessage(ContSock, Buf, 1024, &CancelFlg, TmpBuf) / 100) == FTP_PRELIM)
+//					;
+				if(CryptMode == CRYPT_FTPIS)
+				{
+					if(AttachSSL(ContSock))
+					{
+						while((Sts = ReadReplyMessage(ContSock, Buf, 1024, &CancelFlg, TmpBuf) / 100) == FTP_PRELIM)
+							;
+						if((Sts = command(ContSock, Reply, &CancelFlg, "PBSZ 0")) == 200)
+						{
+							if((Sts = command(ContSock, Reply, &CancelFlg, "PROT P")) == 200)
+							{
+							}
+							else
+								Sts = FTP_ERROR;
+						}
+						else
+							Sts = FTP_ERROR;
+					}
+					else
+						Sts = FTP_ERROR;
+				}
+				else
+				{
+					while((Sts = ReadReplyMessage(ContSock, Buf, 1024, &CancelFlg, TmpBuf) / 100) == FTP_PRELIM)
+						;
+				}
 
-			if(Sts == FTP_COMPLETE)
-			{
-				Flg = 1;
-				if(setsockopt(ContSock, SOL_SOCKET, SO_OOBINLINE, (LPSTR)&Flg, sizeof(Flg)) == SOCKET_ERROR)
-					ReportWSError("setsockopt", WSAGetLastError());
-				// データ転送用ソケットのTCP遅延転送が無効されているので念のため
-				if(setsockopt(ContSock, IPPROTO_TCP, TCP_NODELAY, (LPSTR)&Flg, sizeof(Flg)) == SOCKET_ERROR)
-					ReportWSError("setsockopt", WSAGetLastError());
+				if(Sts == FTP_COMPLETE)
+				{
+					Flg = 1;
+					if(setsockopt(ContSock, SOL_SOCKET, SO_OOBINLINE, (LPSTR)&Flg, sizeof(Flg)) == SOCKET_ERROR)
+						ReportWSError("setsockopt", WSAGetLastError());
+					// データ転送用ソケットのTCP遅延転送が無効されているので念のため
+					if(setsockopt(ContSock, IPPROTO_TCP, TCP_NODELAY, (LPSTR)&Flg, sizeof(Flg)) == SOCKET_ERROR)
+						ReportWSError("setsockopt", WSAGetLastError());
 //#pragma aaa
-				Flg = 1;
-				if(setsockopt(ContSock, SOL_SOCKET, SO_KEEPALIVE, (LPSTR)&Flg, sizeof(Flg)) == SOCKET_ERROR)
-					ReportWSError("setsockopt", WSAGetLastError());
-				LingerOpt.l_onoff = 1;
-				LingerOpt.l_linger = 90;
-				if(setsockopt(ContSock, SOL_SOCKET, SO_LINGER, (LPSTR)&LingerOpt, sizeof(LingerOpt)) == SOCKET_ERROR)
-					ReportWSError("setsockopt", WSAGetLastError());
+					Flg = 1;
+					if(setsockopt(ContSock, SOL_SOCKET, SO_KEEPALIVE, (LPSTR)&Flg, sizeof(Flg)) == SOCKET_ERROR)
+						ReportWSError("setsockopt", WSAGetLastError());
+					LingerOpt.l_onoff = 1;
+					LingerOpt.l_linger = 90;
+					if(setsockopt(ContSock, SOL_SOCKET, SO_LINGER, (LPSTR)&LingerOpt, sizeof(LingerOpt)) == SOCKET_ERROR)
+						ReportWSError("setsockopt", WSAGetLastError());
 ///////
 
 
-				/*===== 認証を行なう =====*/
+					/*===== 認証を行なう =====*/
 
-				Sts = FTP_COMPLETE;
-				if((Fwall == FWALL_FU_FP_SITE) ||
-				   (Fwall == FWALL_FU_FP_USER) ||
-				   (Fwall == FWALL_FU_FP))
-				{
-					if((Sts = command(ContSock, Reply, &CancelFlg, "USER %s", FwallUser) / 100) == FTP_CONTINUE)
+					Sts = FTP_COMPLETE;
+					if((Fwall == FWALL_FU_FP_SITE) ||
+					   (Fwall == FWALL_FU_FP_USER) ||
+					   (Fwall == FWALL_FU_FP))
 					{
-						CheckOneTimePassword(FwallPass, Reply, FwallSecurity);
-						Sts = command(ContSock, NULL, &CancelFlg, "PASS %s", Reply) / 100;
+						if((Sts = command(ContSock, Reply, &CancelFlg, "USER %s", FwallUser) / 100) == FTP_CONTINUE)
+						{
+							CheckOneTimePassword(FwallPass, Reply, FwallSecurity);
+							Sts = command(ContSock, NULL, &CancelFlg, "PASS %s", Reply) / 100;
+						}
 					}
-				}
-				else if(Fwall == FWALL_SIDEWINDER)
-				{
-					Sts = command(ContSock, Reply, &CancelFlg, "USER %s:%s%c%s", FwallUser, FwallPass, FwallDelimiter, Host) / 100;
-				}
-				if((Sts != FTP_COMPLETE) && (Sts != FTP_CONTINUE))
-				{
-					SetTaskMsg(MSGJPN006);
-					DoClose(ContSock);
-					ContSock = INVALID_SOCKET;
-				}
-				else
-				{
-					if((Fwall == FWALL_FU_FP_SITE) || (Fwall == FWALL_OPEN))
+					else if(Fwall == FWALL_SIDEWINDER)
 					{
-						Flg = 0;
-						if(Fwall == FWALL_OPEN)
-							Flg = 2;
-						if(FwallLower == YES)
-							Flg++;
-
-						if(HostPort == PORT_NOR)
-							Sts = command(ContSock, NULL, &CancelFlg, "%s %s", SiteTbl[Flg], Host) / 100;
-						else
-							Sts = command(ContSock, NULL, &CancelFlg, "%s %s %d", SiteTbl[Flg], Host, HostPort) / 100;
+						Sts = command(ContSock, Reply, &CancelFlg, "USER %s:%s%c%s", FwallUser, FwallPass, FwallDelimiter, Host) / 100;
 					}
-
 					if((Sts != FTP_COMPLETE) && (Sts != FTP_CONTINUE))
 					{
-						SetTaskMsg(MSGJPN007, Host);
+						SetTaskMsg(MSGJPN006);
 						DoClose(ContSock);
 						ContSock = INVALID_SOCKET;
 					}
 					else
 					{
-						Anony = NO;
-						if((strlen(User) != 0) || 
-						   (InputDialogBox(username_dlg, GetMainHwnd(), NULL, User, USER_NAME_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
+						if((Fwall == FWALL_FU_FP_SITE) || (Fwall == FWALL_OPEN))
 						{
-							if(Anony == YES)
-							{
-								strcpy(User, "anonymous");
-								strcpy(Pass, UserMailAdrs);
-							}
+							Flg = 0;
+							if(Fwall == FWALL_OPEN)
+								Flg = 2;
+							if(FwallLower == YES)
+								Flg++;
+
+							if(HostPort == PORT_NOR)
+								Sts = command(ContSock, NULL, &CancelFlg, "%s %s", SiteTbl[Flg], Host) / 100;
+							else
+								Sts = command(ContSock, NULL, &CancelFlg, "%s %s %d", SiteTbl[Flg], Host, HostPort) / 100;
+						}
 
-							if((Fwall == FWALL_FU_FP_USER) || (Fwall == FWALL_USER))
+						if((Sts != FTP_COMPLETE) && (Sts != FTP_CONTINUE))
+						{
+							SetTaskMsg(MSGJPN007, Host);
+							DoClose(ContSock);
+							ContSock = INVALID_SOCKET;
+						}
+						else
+						{
+							Anony = NO;
+							if((strlen(User) != 0) || 
+							   (InputDialogBox(username_dlg, GetMainHwnd(), NULL, User, USER_NAME_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
 							{
-								if(HostPort == PORT_NOR)
-									sprintf(Buf, "%s%c%s", User, FwallDelimiter, Host);
+								if(Anony == YES)
+								{
+									strcpy(User, "anonymous");
+									strcpy(Pass, UserMailAdrs);
+								}
+
+								if((Fwall == FWALL_FU_FP_USER) || (Fwall == FWALL_USER))
+								{
+									if(HostPort == PORT_NOR)
+										sprintf(Buf, "%s%c%s", User, FwallDelimiter, Host);
+									else
+										sprintf(Buf, "%s%c%s %d", User, FwallDelimiter, Host, HostPort);
+								}
 								else
-									sprintf(Buf, "%s%c%s %d", User, FwallDelimiter, Host, HostPort);
-							}
-							else
-								strcpy(Buf, User);
+									strcpy(Buf, User);
 
-							// FTPES対応
-							// 2回以上呼ばれる事があるため既にFTPESで接続していても再確認
-							if(CurHost.CryptMode == CRYPT_NONE || CurHost.CryptMode == CRYPT_FTPES)
-							{
-								if(IsOpenSSLLoaded() && CurHost.UseFTPES == YES && (Sts = command(ContSock, Reply, &CancelFlg, "AUTH TLS")) == 234)
+								// FTPES対応
+								if(CryptMode == CRYPT_FTPES)
 								{
-									// SSLに切り替え
-									SetTaskMsg(MSGJPN315);
-									CurHost.CryptMode = CRYPT_FTPES;
-									if(AttachSSL(ContSock))
+									if(IsOpenSSLLoaded() && (Sts = command(ContSock, Reply, &CancelFlg, "AUTH TLS")) == 234)
 									{
-										if((Sts = command(ContSock, Reply, &CancelFlg, "PBSZ 0")) == 200)
+										if(AttachSSL(ContSock))
 										{
-											if((Sts = command(ContSock, Reply, &CancelFlg, "PROT P")) == 200)
+											if((Sts = command(ContSock, Reply, &CancelFlg, "PBSZ 0")) == 200)
 											{
+												if((Sts = command(ContSock, Reply, &CancelFlg, "PROT P")) == 200)
+												{
+												}
+												else
+													Sts = FTP_ERROR;
 											}
 											else
 												Sts = FTP_ERROR;
@@ -1379,129 +1436,160 @@ static SOCKET DoConnect(char *Host, char *User, char *Pass, char *Acct, int Port
 									else
 										Sts = FTP_ERROR;
 								}
-								else
-								{
-									// 暗号化なし
-									CurHost.CryptMode = CRYPT_NONE;
-									SetTaskMsg(MSGJPN314);
-								}
-							}
 
-							ReInPass = NO;
-							do
-							{
-								Continue = NO;
-								if((Sts = command(ContSock, Reply, &CancelFlg, "USER %s", Buf) / 100) == FTP_CONTINUE)
+								ReInPass = NO;
+								do
 								{
-									if((strlen(Pass) != 0) || 
-									   (InputDialogBox(passwd_dlg, GetMainHwnd(), NULL, Pass, PASSWORD_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
+									// FTPES対応
+									if(Sts == FTP_ERROR)
+										break;
+									Continue = NO;
+									if((Sts = command(ContSock, Reply, &CancelFlg, "USER %s", Buf) / 100) == FTP_CONTINUE)
 									{
-										CheckOneTimePassword(Pass, Reply, Security);
+										if((strlen(Pass) != 0) || 
+										   (InputDialogBox(passwd_dlg, GetMainHwnd(), NULL, Pass, PASSWORD_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
+										{
+											CheckOneTimePassword(Pass, Reply, Security);
 
-										/* パスワードがスペース1個の時はパスワードの実体なしとする */
-										if(strcmp(Reply, " ") == 0)
-											strcpy(Reply, "");
+											/* パスワードがスペース1個の時はパスワードの実体なしとする */
+											if(strcmp(Reply, " ") == 0)
+												strcpy(Reply, "");
 
-										Sts = command(ContSock, NULL, &CancelFlg, "PASS %s", Reply) / 100;
-										if(Sts == FTP_ERROR)
-										{
-											strcpy(Pass, "");
-											if(InputDialogBox(re_passwd_dlg, GetMainHwnd(), NULL, Pass, PASSWORD_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES)
-												Continue = YES;
-											else
-												DoPrintf("No password specified.");
-											ReInPass = YES;
-										}
-										else if(Sts == FTP_CONTINUE)
-										{
-											if((strlen(Acct) != 0) || 
-											   (InputDialogBox(account_dlg, GetMainHwnd(), NULL, Acct, ACCOUNT_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
+											Sts = command(ContSock, NULL, &CancelFlg, "PASS %s", Reply) / 100;
+											if(Sts == FTP_ERROR)
 											{
-												Sts = command(ContSock, NULL, &CancelFlg, "ACCT %s", Acct) / 100;
+												strcpy(Pass, "");
+												if(InputDialogBox(re_passwd_dlg, GetMainHwnd(), NULL, Pass, PASSWORD_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES)
+													Continue = YES;
+												else
+													DoPrintf("No password specified.");
+												ReInPass = YES;
+											}
+											else if(Sts == FTP_CONTINUE)
+											{
+												if((strlen(Acct) != 0) || 
+												   (InputDialogBox(account_dlg, GetMainHwnd(), NULL, Acct, ACCOUNT_LEN+1, &Anony, IDH_HELP_TOPIC_0000001) == YES))
+												{
+													Sts = command(ContSock, NULL, &CancelFlg, "ACCT %s", Acct) / 100;
+												}
+												else
+													DoPrintf("No account specified");
 											}
-											else
-												DoPrintf("No account specified");
 										}
-									}
-									else
-									{
-										Sts = FTP_ERROR;
-										DoPrintf("No password specified.");
+										else
+										{
+											Sts = FTP_ERROR;
+											DoPrintf("No password specified.");
+										}
 									}
 								}
+								while(Continue == YES);
+							}
+							else
+							{
+								Sts = FTP_ERROR;
+								DoPrintf("No user name specified");
 							}
-							while(Continue == YES);
-						}
-						else
-						{
-							Sts = FTP_ERROR;
-							DoPrintf("No user name specified");
-						}
 
-						if(Sts != FTP_COMPLETE)
-						{
-							SetTaskMsg(MSGJPN008, Host);
-							DoClose(ContSock);
-							ContSock = INVALID_SOCKET;
-						}
-						else if((SavePass == YES) && (ReInPass == YES))
-						{
-							if(DialogBox(GetFtpInst(), MAKEINTRESOURCE(savepass_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)
-								SetHostPassword(AskCurrentHost(), Pass);
+							if(Sts != FTP_COMPLETE)
+							{
+								SetTaskMsg(MSGJPN008, Host);
+								DoClose(ContSock);
+								ContSock = INVALID_SOCKET;
+							}
+							else if((SavePass == YES) && (ReInPass == YES))
+							{
+								if(DialogBox(GetFtpInst(), MAKEINTRESOURCE(savepass_dlg), GetMainHwnd(), ExeEscDialogProc) == YES)
+									SetHostPassword(AskCurrentHost(), Pass);
+							}
 						}
 					}
 				}
-			}
-			else
-			{
+				else
+				{
 //#pragma aaa
-				SetTaskMsg(MSGJPN009/*"接続できません(1) %x", ContSock*/);
-				DoClose(ContSock);
-				ContSock = INVALID_SOCKET;
+					SetTaskMsg(MSGJPN009/*"接続できません(1) %x", ContSock*/);
+					DoClose(ContSock);
+					ContSock = INVALID_SOCKET;
+				}
 			}
 		}
-	}
-	else
-	{
-
-		if(((Fwall >= FWALL_FU_FP_SITE) && (Fwall <= FWALL_OPEN)) ||
-		   (Fwall == FWALL_FU_FP))
-			SetTaskMsg(MSGJPN010);
 		else
-			SetTaskMsg(MSGJPN011);
-	}
+		{
+
+			if(((Fwall >= FWALL_FU_FP_SITE) && (Fwall <= FWALL_OPEN)) ||
+			   (Fwall == FWALL_FU_FP))
+				SetTaskMsg(MSGJPN010);
+			else
+				SetTaskMsg(MSGJPN011);
+		}
 
 #if 0
-//	WSAUnhookBlockingHook();
+//		WSAUnhookBlockingHook();
 #endif
-	TryConnect = NO;
+		TryConnect = NO;
 
-	// FEAT対応
-	// ホストの機能を確認
-	if(ContSock != INVALID_SOCKET)
-	{
-		if((Sts = command(ContSock, Reply, &CancelFlg, "FEAT")) == 211)
+		// FEAT対応
+		// ホストの機能を確認
+		if(ContSock != INVALID_SOCKET)
 		{
-			// 改行文字はReadReplyMessageで消去されるため区切り文字に空白を使用
+			if((Sts = command(ContSock, Reply, &CancelFlg, "FEAT")) == 211)
+			{
+				// 改行文字はReadReplyMessageで消去されるため区切り文字に空白を使用
+				// UTF-8対応
+				if(strstr(Reply, " UTF8 "))
+					HostData->Feature |= FEATURE_UTF8;
+				// MLST対応
+				if(strstr(Reply, " MLST ") || strstr(Reply, " MLSD "))
+					HostData->Feature |= FEATURE_MLSD;
+			}
 			// UTF-8対応
-			if(strstr(Reply, " UTF8 "))
-				CurHost.Feature |= FEATURE_UTF8;
-			// MLST対応
-			if(strstr(Reply, " MLST ") || strstr(Reply, " MLSD "))
-				CurHost.Feature |= FEATURE_MLSD;
-		}
-		// UTF-8対応
-		if(CurHost.NameKanjiCode == KANJI_AUTO && (CurHost.Feature & FEATURE_UTF8))
-		{
-			if((Sts = command(ContSock, Reply, &CancelFlg, "OPTS UTF8 ON")) == 200)
+			if(HostData->NameKanjiCode == KANJI_AUTO && (HostData->Feature & FEATURE_UTF8))
 			{
+				if((Sts = command(ContSock, Reply, &CancelFlg, "OPTS UTF8 ON")) == 200)
+				{
+				}
 			}
 		}
 	}
+	else if(CryptMode == CRYPT_SFTP)
+	{
+	}
 
 	return(ContSock);
 }
 
+static SOCKET DoConnect(HOSTDATA* HostData, char *Host, char *User, char *Pass, char *Acct, int Port, int Fwall, int SavePass, int Security)
+{
+	SOCKET ContSock;
+	ContSock = INVALID_SOCKET;
+	if(ContSock == INVALID_SOCKET && HostData->UseSFTP == YES)
+	{
+		SetTaskMsg(MSGJPN317);
+		if((ContSock = DoConnectCrypt(CRYPT_SFTP, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)
+			HostData->CryptMode = CRYPT_SFTP;
+	}
+//	if(ContSock == INVALID_SOCKET && HostData->UseFTPIS == YES)
+//	{
+//		SetTaskMsg(MSGJPN316);
+//		if((ContSock = DoConnectCrypt(CRYPT_FTPIS, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)
+//			HostData->CryptMode = CRYPT_FTPIS;
+//	}
+	if(ContSock == INVALID_SOCKET && HostData->UseFTPES == YES)
+	{
+		SetTaskMsg(MSGJPN315);
+		if((ContSock = DoConnectCrypt(CRYPT_FTPES, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)
+			HostData->CryptMode = CRYPT_FTPES;
+	}
+	if(ContSock == INVALID_SOCKET && HostData->UseNoEncryption == YES)
+	{
+		SetTaskMsg(MSGJPN314);
+		if((ContSock = DoConnectCrypt(CRYPT_NONE, HostData, Host, User, Pass, Acct, Port, Fwall, SavePass, Security)) != INVALID_SOCKET)
+			HostData->CryptMode = CRYPT_NONE;
+	}
+	return ContSock;
+}
+
 
 /*----- ワンタイムパスワードのチェック ----------------------------------------
 *
@@ -2240,6 +2328,11 @@ int AskCryptMode(void)
 	return(CurHost.CryptMode);
 }
 
+int AskUseNoEncryption(void)
+{
+	return(CurHost.UseNoEncryption);
+}
+
 int AskUseFTPES(void)
 {
 	return(CurHost.UseFTPES);

--- a/getput.c
+++ b/getput.c
@@ -900,7 +900,6 @@ static ULONG WINAPI TransferThread(void *Dummy)
 //			else if(strncmp(TransPacketBase->Cmd, "R-DELE", 6) == 0)
 			else if(strncmp(Pos->Cmd, "R-DELE", 6) == 0)
 			{
-				ReleaseMutex(hListAccMutex);
 //				DispTransFileInfo(TransPacketBase, MSGJPN081, FALSE, YES);
 				DispTransFileInfo(Pos, MSGJPN081, FALSE, YES);
 
@@ -917,6 +916,7 @@ static ULONG WINAPI TransferThread(void *Dummy)
 						CommandProcTrn(TrnSkt, NULL, "%s%s", Pos->Cmd+2, Pos->RemoteFile);
 					}
 				}
+				ReleaseMutex(hListAccMutex);
 			}
 			/* ディレクトリ作成（常にローカル側） */
 //			else if(strncmp(TransPacketBase->Cmd, "L-MKD", 5) == 0)

--- a/hostman.c
+++ b/hostman.c
@@ -1312,6 +1312,7 @@ void CopyDefaultHost(HOSTDATA *Set)
 	strcpy(Set->DialEntry, "");
 	// 暗号化通信対応
 	Set->CryptMode = CRYPT_NONE;
+	Set->UseNoEncryption = YES;
 	Set->UseFTPES = YES;
 	Set->UseFTPIS = YES;
 	Set->UseSFTP = YES;

--- a/socket.c
+++ b/socket.c
@@ -740,10 +740,7 @@ int do_closesocket(SOCKET s)
 
 	// FTPS対応
 //	Ret = closesocket(s);
-	if(AskCryptMode() == CRYPT_FTPES || AskCryptMode() == CRYPT_FTPIS)
-		Ret = closesocketS(s);
-	else
-		Ret = closesocketS(s);
+	Ret = closesocketS(s);
 	if(Ret == SOCKET_ERROR)
 	{
 		Error = 0;
@@ -970,7 +967,7 @@ 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(AskCryptMode() == CRYPT_NONE && (*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)
 		{
@@ -1003,10 +1000,7 @@ int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOutErr, int *Cance
 
 			// FTPS対応
 //			Ret = recv(s, buf, len, flags);
-			if(AskCryptMode() == CRYPT_FTPES || AskCryptMode() == CRYPT_FTPIS)
-				Ret = recvS(s, buf, len, flags);
-			else
-				Ret = recv(s, buf, len, flags);
+			Ret = recvS(s, buf, len, flags);
 			if(Ret != SOCKET_ERROR)
 				break;
 			Error = WSAGetLastError();
@@ -1015,11 +1009,8 @@ int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOutErr, int *Cance
 				break;
 			// FTPS対応
 			// 受信確認をバイパスしたためここでタイムアウトの確認
-			if(AskCryptMode() == CRYPT_FTPES || AskCryptMode() == CRYPT_FTPIS)
-			{
-				if(BackgrndMessageProc() == YES)
-					*CancelCheckWork = YES;
-			}
+			if(BackgrndMessageProc() == YES)
+				*CancelCheckWork = YES;
 			else if(TimeOut != 0)
 			{
 				time(&ElapseTime);
@@ -1080,7 +1071,7 @@ 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(AskCryptMode() == CRYPT_NONE && (*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)
 		{
@@ -1114,10 +1105,7 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 
 			// FTPS対応
 //			Ret = send(s, buf, len, flags);
-			if(AskCryptMode() == CRYPT_FTPES || AskCryptMode() == CRYPT_FTPIS)
-				Ret = sendS(s, buf, len, flags);
-			else
-				Ret = send(s, buf, len, flags);
+			Ret = sendS(s, buf, len, flags);
 			if(Ret != SOCKET_ERROR)
 			{
 #if DBG_MSG
@@ -1131,11 +1119,8 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 				break;
 			// FTPS対応
 			// 送信バッファ確認をバイパスしたためここでタイムアウトの確認
-			if(AskCryptMode() == CRYPT_FTPES || AskCryptMode() == CRYPT_FTPIS)
-			{
-				if(BackgrndMessageProc() == YES)
-					*CancelCheckWork = YES;
-			}
+			if(BackgrndMessageProc() == YES)
+				*CancelCheckWork = YES;
 			else if(TimeOut != 0)
 			{
 				time(&ElapseTime);

--- a/taskwin.c
+++ b/taskwin.c
@@ -42,7 +42,8 @@
 #include "common.h"
 #include "resource.h"
 
-#define TASK_BUFSIZE	(16*1024)
+// Windows 9x系をサポートしないため不要
+//#define TASK_BUFSIZE	(16*1024)
 
 
 
@@ -90,7 +91,9 @@ int MakeTaskWindow(HWND hWnd, HINSTANCE hInst)
 
 	if(hWndTask != NULL)
 	{
-		SendMessage(hWndTask, EM_LIMITTEXT, TASK_BUFSIZE, 0);
+		// Windows 9x系をサポートしないため不要
+//		SendMessage(hWndTask, EM_LIMITTEXT, TASK_BUFSIZE, 0);
+		SendMessage(hWndTask, EM_LIMITTEXT, 0x7fffffff, 0);
 
 		if(ListFont != NULL)
 			SendMessage(hWndTask, WM_SETFONT, (WPARAM)ListFont, MAKELPARAM(TRUE, 0));
@@ -177,16 +180,17 @@ void SetTaskMsg(char *szFormat, ...)
 				Pos = SendMessage(GetTaskWnd(), WM_GETTEXTLENGTH, 0, 0);
 
 				/* テキストサイズのリミット値をチェック */
-				if((Pos + strlen(szBuf)) >= TASK_BUFSIZE)
-				{
-					/* リミットを越えそうなら、先頭部分を切り捨てる */
-					Pos = SendMessage(GetTaskWnd(), EM_LINEFROMCHAR, TASK_BUFSIZE/10, 0) + 1;
-					Pos = SendMessage(GetTaskWnd(), EM_LINEINDEX, Pos, 0);
-					SendMessage(GetTaskWnd(), EM_SETSEL, 0, Pos);
-					SendMessage(GetTaskWnd(), EM_REPLACESEL, FALSE, (LPARAM)"");
-
-					Pos = SendMessage(GetTaskWnd(), WM_GETTEXTLENGTH, 0, 0);
-				}
+				// Windows 9x系をサポートしないため不要
+//				if((Pos + strlen(szBuf)) >= TASK_BUFSIZE)
+//				{
+//					/* リミットを越えそうなら、先頭部分を切り捨てる */
+//					Pos = SendMessage(GetTaskWnd(), EM_LINEFROMCHAR, TASK_BUFSIZE/10, 0) + 1;
+//					Pos = SendMessage(GetTaskWnd(), EM_LINEINDEX, Pos, 0);
+//					SendMessage(GetTaskWnd(), EM_SETSEL, 0, Pos);
+//					SendMessage(GetTaskWnd(), EM_REPLACESEL, FALSE, (LPARAM)"");
+//
+//					Pos = SendMessage(GetTaskWnd(), WM_GETTEXTLENGTH, 0, 0);
+//				}
 
 				SendMessage(GetTaskWnd(), EM_SETSEL, Pos, Pos);
 				SendMessage(GetTaskWnd(), EM_REPLACESEL, FALSE, (LPARAM)szBuf);