Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: fixed session handling for ftp

This commit is contained in:
Andrew Tridgell 2019-11-02 21:04:47 +11:00
parent 056afa544d
commit a685e4cf83
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/GCS_MAVLink/GCS_FTP.cpp
View File

@ -181,10 +181,15 @@ void GCS_MAVLINK::ftp_worker(void) {
continue; continue;
} }
// reject anything not belonging to our current session, unless we are terminating a session, then just kill it and move on // check for session termination
if (((ftp.current_session >= 0) && (request.session != ftp.current_session)) if (request.session != ftp.current_session &&
&& ((request.opcode == FTP_OP::TerminateSession) || (request.opcode == FTP_OP::ResetSessions))) { (request.opcode == FTP_OP::TerminateSession || request.opcode == FTP_OP::ResetSessions)) {
// terminating a different session, just ack
reply.opcode = FTP_OP::Ack; reply.opcode = FTP_OP::Ack;
} else if (ftp.fd != -1 && request.session != ftp.current_session) {
// if we have an open file and the session isn't right
// then reject. This prevents IO on the wrong file
ftp_error(reply, FTP_ERROR::InvalidSession);
} else { } else {
// dispatch the command as needed // dispatch the command as needed
switch (request.opcode) { switch (request.opcode) {
@ -236,6 +241,7 @@ void GCS_MAVLINK::ftp_worker(void) {
break; break;
} }
ftp.mode = FTP_FILE_MODE::Read; ftp.mode = FTP_FILE_MODE::Read;
ftp.current_session = request.session;
reply.opcode = FTP_OP::Ack; reply.opcode = FTP_OP::Ack;
reply.size = sizeof(uint32_t); reply.size = sizeof(uint32_t);
@ -309,6 +315,7 @@ void GCS_MAVLINK::ftp_worker(void) {
break; break;
} }
ftp.mode = FTP_FILE_MODE::Write; ftp.mode = FTP_FILE_MODE::Write;
ftp.current_session = request.session;
reply.opcode = FTP_OP::Ack; reply.opcode = FTP_OP::Ack;
break; break;
@ -409,7 +416,6 @@ void GCS_MAVLINK::ftp_worker(void) {
read_size = AP::FS().read(fd, reply.data, sizeof(reply.data)); read_size = AP::FS().read(fd, reply.data, sizeof(reply.data));
if (read_size == -1) { if (read_size == -1) {
ftp_error(reply, FTP_ERROR::FailErrno); ftp_error(reply, FTP_ERROR::FailErrno);
AP::FS().close(fd);
break; break;
} }
checksum = crc_crc32(checksum, reply.data, MIN((size_t)read_size, sizeof(reply.data))); checksum = crc_crc32(checksum, reply.data, MIN((size_t)read_size, sizeof(reply.data)));