Merge remote-tracking branch 'origin/main' into ordered-dumps

CHANGELOG.md

@@ -16,6 +16,13 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+# [v4.0.1] 2023-06-24
+
+## Fixed
+
+- `PusLiveDemux` packet demultiplexing bugfix where the demultiplexing did not work when there was
+  only one destination available.
+
 # [v4.0.0] 2023-06-22
 
 - `eive-tmtc` version v5.0.0

CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 4)
 set(OBSW_VERSION_MINOR 0)
-set(OBSW_VERSION_REVISION 0)
+set(OBSW_VERSION_REVISION 1)
 
 # set(CMAKE_VERBOSE TRUE)
 

mission/tmtc/PusLiveDemux.cpp

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