new minor release

- Updates TCP server to allow re-using address (SO_REUSEADDR option)

CHANGELOG.md

@@ -17,9 +17,16 @@ change warranting a new major release:
 
 # [unreleased]
 
+# [v1.22.1] 2023-01-30
+
+## Changed
+
+- Updated FSFW to include addition where the `SO_REUSEADDR` option is set
+  on the TCP server, which should improve its ergonomics.
+
 # [v1.22.0] 2023-01-28
 
-TMTC version: v2.6.0
+TMTC version: v2.6.1
 
 ## Added
 

CMakeLists.txt

@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 1)
 set(OBSW_VERSION_MINOR_IF_GIT_FAILS 22)
-set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0)
+set(OBSW_VERSION_REVISION_IF_GIT_FAILS 1)
 
 # set(CMAKE_VERBOSE TRUE)
 

mission/core/GenericFactory.cpp

@@ -108,7 +108,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
 #endif
 #if OBSW_ADD_TMTC_TCP_SERVER == 1
   auto tcpBridge = new TcpTmTcBridge(objects::TCP_TMTC_SERVER, objects::CCSDS_PACKET_DISTRIBUTOR);
-  auto tcpServer = new TcpTmTcServer(objects::TCP_TMTC_POLLING_TASK, objects::TCP_TMTC_SERVER);
+  TcpTmTcServer::TcpConfig cfg(true, true);
+  auto tcpServer = new TcpTmTcServer(objects::TCP_TMTC_POLLING_TASK, objects::TCP_TMTC_SERVER, cfg);
   // TCP is stream based. Use packet ID as start marker when parsing for space packets
   tcpServer->setSpacePacketParsingOptions({common::PUS_PACKET_ID, common::CFDP_PACKET_ID});
   sif::info << "Created TCP server for TMTC commanding with listener port "