Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FTP Manager - List directory ack - Remove offset check #11346

Merged
merged 1 commit into from
Apr 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/Vehicle/FTPManager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -518,13 +518,7 @@ void FTPManager::_listDirectoryAckOrNak(const MavlinkFTP::Request* ackOrNak)
return;
}

qCDebug(FTPManagerLog) << QString("_listDirectoryAckOrNak: Ack offset(%1) size(%2)").arg(ackOrNak->hdr.offset).arg(ackOrNak->hdr.size);

if (ackOrNak->hdr.offset != _listDirectoryState.expectedOffset) {
qCDebug(FTPManagerLog) << "_listDirectoryAckOrNak: incoming offset incorrect offset:expectedOffset" <<ackOrNak->hdr.offset << _listDirectoryState.expectedOffset;
_listDirectoryComplete(tr("List directory failed"));
return;
}
qCDebug(FTPManagerLog) << QString("_listDirectoryAckOrNak: Ack size(%1)").arg(ackOrNak->hdr.size);

// Parse entries in ackOrNak->data into _listDirectoryState.rgDirectoryList
const char* curDataPtr = (const char*)ackOrNak->data;
Expand Down