sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netutils/ftpd: Do not terminate connection if CWD fails

Browse Source 
Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
This commit is contained in:
Petro Karashchenko 2022-04-03 14:17:20 +02:00 committed by Xiang Xiao
parent 124c1328a6
commit aaa950faee
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
netutils/ftpd/ftpd.c
View File

@ -484,7 +484,7 @@ ftpd_account_search_user(FAR struct ftpd_session_s *session,
FAR const char *user) FAR const char *user)
{ {
FAR struct ftpd_account_s *newaccount = NULL; FAR struct ftpd_account_s *newaccount = NULL;
FAR struct ftpd_account_s *account; const FAR struct ftpd_account_s *account;
uint8_t accountflags; uint8_t accountflags;
account = session->head; account = session->head;
@ -1656,24 +1656,20 @@ static int ftpd_changedir(FAR struct ftpd_session_s *session,
ret = stat(abspath, &st); ret = stat(abspath, &st);
if (ret < 0) if (ret < 0)
{ {
ret = -errno;
free(workpath); free(workpath);
free(abspath); free(abspath);
ftpd_response(session->cmd.sd, session->txtimeout, return ftpd_response(session->cmd.sd, session->txtimeout,
g_respfmt2, 550, ' ', rempath, g_respfmt2, 550, ' ', rempath,
": No such file or directory"); ": No such file or directory");
return ret;
} }
if (S_ISDIR(st.st_mode) == 0) if (S_ISDIR(st.st_mode) == 0)
{ {
free(workpath); free(workpath);
free(abspath); free(abspath);
ftpd_response(session->cmd.sd, session->txtimeout, return ftpd_response(session->cmd.sd, session->txtimeout,
g_respfmt2, 550, ' ', rempath, g_respfmt2, 550, ' ', rempath,
": No such file or directory"); ": No such file or directory");
return -ENOTDIR;
} }
free(abspath); free(abspath);
@ -2064,8 +2060,8 @@ static int ftpd_stream(FAR struct ftpd_session_s *session, int cmdtype)
wrbytes, errval); wrbytes, errval);
ftpd_response(session->cmd.sd, session->txtimeout, ftpd_response(session->cmd.sd, session->txtimeout,
g_respfmt1, 550, ' ', "Data send error !"); g_respfmt1, 550, ' ', "Data send error !");
ret = -errval; ret = -errval;
break; break;
} }
/* Get the next file offset */ /* Get the next file offset */
@ -4145,7 +4141,7 @@ static FAR void *ftpd_worker(FAR void *arg)
/* Send the welcoming message */ /* Send the welcoming message */
ret = ftpd_response(session->cmd.sd, session->txtimeout, ret = ftpd_response(session->cmd.sd, session->txtimeout,
g_respfmt1, 220, ' ', CONFIG_FTPD_SERVERID); g_respfmt1, 220, ' ', CONFIG_FTPD_SERVERID);
if (ret < 0) if (ret < 0)
{ {
nerr("ERROR: ftpd_response() failed: %d\n", ret); nerr("ERROR: ftpd_response() failed: %d\n", ret);

12
netutils/ftpd/ftpd.h
View File

@ -118,12 +118,12 @@ struct ftpd_stream_s
struct ftpd_session_s struct ftpd_session_s
{ {
FAR struct ftpd_server_s *server; const FAR struct ftpd_server_s *server;
FAR struct ftpd_account_s *head; const FAR struct ftpd_account_s *head;
bool loggedin; bool loggedin;
uint8_t flags; /* See TPD_SESSIONFLAG_* definitions */ uint8_t flags; /* See TPD_SESSIONFLAG_* definitions */
int rxtimeout; int rxtimeout;
int txtimeout; int txtimeout;
/* Command */ /* Command */