eive/eive-obsw
eive/eive-obsw
12
3
Fork 0
Code Issues 4 Pull Requests 3 Releases 119 Wiki Activity

small logic fix
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2022-11-02 10:55:40 +01:00
parent 39778f9663
commit 14b8b00880
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mission/tmtc/CfdpTmFunnel.cpp
View File

@ -69,14 +69,16 @@ ReturnValue_t CfdpTmFunnel::handlePacket(TmTcMessage& msg) {
store_address_t origStoreId = newStoreId; store_address_t origStoreId = newStoreId;
for (unsigned int idx = 0; idx < destinations.size(); idx++) { for (unsigned int idx = 0; idx < destinations.size(); idx++) {
const auto& destVcidPair = destinations[idx]; const auto& destVcidPair = destinations[idx];
if (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, newPacketData, serSize); store_address_t storeId;
msg.setStorageId(storeId); result = tmStore.addData(&storeId, newPacketData, serSize);
} else { msg.setStorageId(storeId);
msg.setStorageId(origStoreId); } else {
msg.setStorageId(origStoreId);
}
} }
result = tmQueue->sendMessage(destVcidPair.first, &msg); result = tmQueue->sendMessage(destVcidPair.first, &msg);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {

18
mission/tmtc/PusTmFunnel.cpp
View File

@ -50,14 +50,16 @@ ReturnValue_t PusTmFunnel::handlePacket(TmTcMessage &message) {
for (unsigned int idx = 0; idx < destinations.size(); idx++) { for (unsigned int idx = 0; idx < destinations.size(); idx++) {
const auto &destVcidPair = destinations[idx]; const auto &destVcidPair = destinations[idx];
if (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, packetData, size); store_address_t storeId;
message.setStorageId(storeId); result = tmStore.addData(&storeId, packetData, size);
} else { message.setStorageId(storeId);
message.setStorageId(origStoreId); } else {
message.setStorageId(origStoreId);
}
} }
result = tmQueue->sendMessage(destVcidPair.first, &message); result = tmQueue->sendMessage(destVcidPair.first, &message);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {