eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Bugfix for packet demultiplexing #704

Merged
meggert merged 4 commits from bugfix-packet-demux into main 2023-06-23 20:21:03 +02:00
Conversation 1 Commits 4 Files Changed 2 +12 -15
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b261779ebf - Show all commits

29
mission/tmtc/PusLiveDemux.cpp
View File

@ -11,28 +11,19 @@ ReturnValue_t PusLiveDemux::demultiplexPackets(StorageManagerIF& tmStore,
ReturnValue_t result = returnvalue::OK; ReturnValue_t result = returnvalue::OK;
for (unsigned int idx = 0; idx < destinations.size(); idx++) { for (unsigned int idx = 0; idx < destinations.size(); idx++) {
const auto& dest = destinations[idx]; const auto& dest = destinations[idx];
bool setOrigStoreId = false; if ((destinations.size() > 1) and (idx < (destinations.size() - 1))) {
if (destinations.size() > 1) { // Create copy of data to ensure each TM recipient has its own copy. That way, we don't need
if (idx < destinations.size() - 1) { // to bother with send order and where the data is deleted.
// Create copy of data to ensure each TM recipient has its own copy. That way, we don't need store_address_t storeId;
// to bother with send order and where the data is deleted. result = tmStore.addData(&storeId, tmData, tmSize);
store_address_t storeId; if (result == returnvalue::OK) {
result = tmStore.addData(&storeId, tmData, tmSize); message.setStorageId(storeId);
if (result == returnvalue::OK) {
message.setStorageId(storeId);
} else {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "PusLiveDemux::handlePacket: Store too full to create data copy"
<< std::endl;
#endif
}
} else { } else {
setOrigStoreId = true; #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "PusLiveDemux::handlePacket: Store too full to create data copy" << std::endl;
#endif
} }
} else { } else {
setOrigStoreId = true;
}
if (setOrigStoreId) {
message.setStorageId(origStoreId); message.setStorageId(origStoreId);
} }
result = ownerQueue.sendMessage(dest.queueId, &message); result = ownerQueue.sendMessage(dest.queueId, &message);