emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ftpgetput: preparations for ESPV support, no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2018-02-04 18:49:31 +01:00
parent 565af23222
commit daa643205f
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
networking/ftpgetput.c
View File

@@ -174,24 +174,25 @@ For example, vsftp happily answers
TODO2: need to stop ignoring IP address in PASV response. TODO2: need to stop ignoring IP address in PASV response.
*/ */
//if (ftpcmd("EPSV", NULL) != 229) {
if (ftpcmd("PASV", NULL) != 227) {
ftp_die("PASV");
}
if (ftpcmd("PASV", NULL) != 227) { /* Response is "NNN garbageN1,N2,N3,N4,P1,P2[)garbage]
ftp_die("PASV"); * Server's IP is N1.N2.N3.N4 (we ignore it)
} * Server's port for data connection is P1*256+P2 */
buf_ptr = strrchr(buf, ')');
if (buf_ptr) *buf_ptr = '\0';
/* Response is "NNN garbageN1,N2,N3,N4,P1,P2[)garbage] buf_ptr = strrchr(buf, ',');
* Server's IP is N1.N2.N3.N4 (we ignore it) *buf_ptr = '\0';
* Server's port for data connection is P1*256+P2 */ port_num = xatoul_range(buf_ptr + 1, 0, 255);
buf_ptr = strrchr(buf, ')');
if (buf_ptr) *buf_ptr = '\0';
buf_ptr = strrchr(buf, ','); buf_ptr = strrchr(buf, ',');
*buf_ptr = '\0'; *buf_ptr = '\0';
port_num = xatoul_range(buf_ptr + 1, 0, 255); port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256;
//}
buf_ptr = strrchr(buf, ',');
*buf_ptr = '\0';
port_num += xatoul_range(buf_ptr + 1, 0, 255) * 256;
set_nport(&lsa->u.sa, htons(port_num)); set_nport(&lsa->u.sa, htons(port_num));
return xconnect_stream(lsa); return xconnect_stream(lsa);