d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cope with the following reply on PASV (without paren). need more tests.

Browse Source 
227 Entering Passive Mode x,x,x,x,x,x,x

Obtained from:	KAME (1.8->1.9)
This commit is contained in:
ume 2000-09-17 16:44:51 +00:00
parent a272c78c36
commit 2c04393077
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/faithd/ftp.c
View File

@ -449,7 +449,10 @@ ftp_copyresult(int src, int dst, enum state state)
#endif
case LPSV:
case EPSV:
/* expecting "227 Entering Passive Mode (x,x,x,x,x,x,x)" */
/*
* expecting "227 Entering Passive Mode (x,x,x,x,x,x,x)"
* (in some cases result comes without paren)
*/
if (code != 227) {
passivefail0:
close(wport6);
@ -469,11 +472,12 @@ ftp_copyresult(int src, int dst, enum state state)
* PASV result -> LPSV/EPSV result
*/
p = param;
while (*p && *p != '(')
while (*p && *p != '(' && !isdigit(*p)) /*)*/
p++;
if (!*p)
goto passivefail0; /*XXX*/
p++;
if (*p == '(') /*)*/
p++;
n = sscanf(p, "%u,%u,%u,%u,%u,%u",
&ho[0], &ho[1], &ho[2], &ho[3], &po[0], &po[1]);
if (n != 6)
@ -595,7 +599,7 @@ ftp_copyresult(int src, int dst, enum state state)
* EPSV result -> PORT result
*/
p = param;
while (*p && *p != '(')
while (*p && *p != '(') /*)*/
p++;
if (!*p)
goto passivefail1; /*XXX*/