Enhance routines for connections with FTPIS.

Fix bugs of parsing PASV replies.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 9d18a0a..7df235d 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 3953d38..2e44649 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/connect.c b/connect.c
index c0937e3..3f3acf5 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -1540,6 +1540,18 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
                                                                                Sts = FTP_ERROR;\r
                                                                }\r
 \r
+                                                               // FTPIS対応\r
+                                                               // "PBSZ 0"と"PROT P"は黙示的に設定されているはずだが念のため\r
+                                                               if(CryptMode == CRYPT_FTPIS)\r
+                                                               {\r
+                                                                       if((Sts = command(ContSock, Reply, CancelCheckWork, "PBSZ 0")) == 200)\r
+                                                                       {\r
+                                                                               if((Sts = command(ContSock, Reply, CancelCheckWork, "PROT P")) == 200)\r
+                                                                               {\r
+                                                                               }\r
+                                                                       }\r
+                                                               }\r
+\r
                                                                ReInPass = NO;\r
                                                                do\r
                                                                {\r

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