Commit: 28c49ec2cf7accdfadcbbd8b0670ea80809e4513 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 28c49ec2cf7accdfadcbbd8b0670ea80809e4513 (tree)
• Zeit: 2011-11-18 00:55:30
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Enhance routines for connections with FTPIS.
Fix bugs of parsing PASV replies.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: connect.c
• modified: getput.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/connect.c
+++ b/connect.c
@@ -1540,6 +1540,18 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
 										Sts = FTP_ERROR;
 								}
 
+								// FTPIS対応
+								// "PBSZ 0"と"PROT P"は黙示的に設定されているはずだが念のため
+								if(CryptMode == CRYPT_FTPIS)
+								{
+									if((Sts = command(ContSock, Reply, CancelCheckWork, "PBSZ 0")) == 200)
+									{
+										if((Sts = command(ContSock, Reply, CancelCheckWork, "PROT P")) == 200)
+										{
+										}
+									}
+								}
+
 								ReInPass = NO;
 								do
 								{

--- a/getput.c
+++ b/getput.c
@@ -3784,6 +3784,8 @@ static int GetAdrsAndPortIPv4(SOCKET Skt, char *Str, char *Adrs, int *Port, int
 {
 	char *Pos;
 	char *Btm;
+	// コンマではなくドットを返すホストがあるため
+	char *OldBtm;
 	int Sts;
 
 	Sts = FFFTP_FAIL;
@@ -3799,24 +3801,30 @@ static int GetAdrsAndPortIPv4(SOCKET Skt, char *Str, char *Adrs, int *Port, int
 		if(Btm != NULL)
 		{
 			Btm++;
-			Btm = strchr(Btm, ',');
 			// コンマではなくドットを返すホストがあるため
+//			Btm = strchr(Btm, ',');
+			OldBtm = Btm;
+			Btm = strchr(OldBtm, ',');
 			if(Btm == NULL)
-				Btm = strchr(Btm, '.');
+				Btm = strchr(OldBtm, '.');
 			if(Btm != NULL)
 			{
 				Btm++;
-				Btm = strchr(Btm, ',');
 				// コンマではなくドットを返すホストがあるため
+//				Btm = strchr(Btm, ',');
+				OldBtm = Btm;
+				Btm = strchr(OldBtm, ',');
 				if(Btm == NULL)
-					Btm = strchr(Btm, '.');
+					Btm = strchr(OldBtm, '.');
 				if(Btm != NULL)
 				{
 					Btm++;
-					Btm = strchr(Btm, ',');
 					// コンマではなくドットを返すホストがあるため
+//					Btm = strchr(Btm, ',');
+					OldBtm = Btm;
+					Btm = strchr(OldBtm, ',');
 					if(Btm == NULL)
-						Btm = strchr(Btm, '.');
+						Btm = strchr(OldBtm, '.');
 					if(Btm != NULL)
 					{
 						if((Btm - Pos) <= Max)