eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

CFDP FSFW Integration #111

Merged
muellerr merged 170 commits from cfdp-integration into develop 2022-09-16 11:11:22 +02:00
Conversation 0 Commits 170 Files Changed 293 +6 -4
1 changed files with 6 additions and 4 deletions
Show Stats 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) {