KSat/fsfw
19
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

FSFW Update #28

Merged
jgerhards merged 782 commits from fsfw_update into develop 2023-05-28 23:43:22 +02:00
Conversation 0 Commits 782 Files Changed 960 +15863 -10253
899 changed files with 15863 additions and 10253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dc79b7ba00 - Show all commits

10
src/fsfw/cfdp/handler/DestHandler.cpp
View File

@@ -21,13 +21,15 @@ ReturnValue_t cfdp::DestHandler::performStateMachine() {
if (step == TransactionStep::IDLE) { if (step == TransactionStep::IDLE) {
ReturnValue_t status = returnvalue::OK; ReturnValue_t status = returnvalue::OK;
ReturnValue_t result; ReturnValue_t result;
for (const auto& info : dp.packetListRef) { for(auto infoIter = dp.packetListRef.begin(); infoIter != dp.packetListRef.end();) {
if (info.pduType == PduType::FILE_DIRECTIVE and if (infoIter->pduType == PduType::FILE_DIRECTIVE and
info.directiveType == FileDirectives::METADATA) { infoIter->directiveType == FileDirectives::METADATA) {
result = handleMetadataPdu(info); result = handleMetadataPdu(*infoIter);
if (result != OK) { if (result != OK) {
status = result; status = result;
} }
fp.tcStore->deleteData(infoIter->storeId);
dp.packetListRef.erase(infoIter++);
} }
} }
if (step != TransactionStep::IDLE) { if (step != TransactionStep::IDLE) {