KSat/fsfw
16
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

Bump FSFW #31

Merged
muellerr merged 139 commits from bump-fsfw into develop 2023-12-18 13:16:28 +01:00
Conversation 0 Commits 139 Files Changed 116 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9ef63825f3 - Show all commits

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

@ -356,15 +356,15 @@ ReturnValue_t cfdp::DestHandler::startTransaction(MetadataPduReader& reader,
transactionParams.fileSize); transactionParams.fileSize);
params.destFileName = transactionParams.destName.data(); params.destFileName = transactionParams.destName.data();
params.sourceFileName = transactionParams.sourceName.data(); params.sourceFileName = transactionParams.sourceName.data();
unsigned tlvIdx = 0; params.numberOfMsgsToUser = 0;
for (const auto& opt : tlvVec) { for (const auto& opt : tlvVec) {
if (opt.getType() == TlvType::MSG_TO_USER) { if (opt.getType() == TlvType::MSG_TO_USER) {
msgToUserVec[tlvIdx] = MessageToUserTlv(opt.getValue(), opt.getLengthField()); msgToUserVec[params.numberOfMsgsToUser] =
tlvIdx++; MessageToUserTlv(opt.getValue(), opt.getLengthField());
params.numberOfMsgsToUser++;
} }
} }
params.msgsToUserArray = msgToUserVec.data(); params.msgsToUserArray = msgToUserVec.data();
params.msgsToUserLen = tlvIdx;
destParams.user.metadataRecvdIndication(params); destParams.user.metadataRecvdIndication(params);
return result; return result;
} }

2
src/fsfw/cfdp/handler/UserBase.h
View File

@ -35,7 +35,7 @@ struct MetadataRecvdParams {
Fss fileSize{}; Fss fileSize{};
const char* sourceFileName = ""; const char* sourceFileName = "";
const char* destFileName = ""; const char* destFileName = "";
size_t msgsToUserLen = 0; size_t numberOfMsgsToUser = 0;
const MessageToUserTlv* msgsToUserArray = nullptr; const MessageToUserTlv* msgsToUserArray = nullptr;
}; };