Merge pull request 'Cleaning up TCP and UDP code' (#459) from eive/fsfw:mueller/tcp-udp-tweaks into development

Reviewed-on: fsfw/fsfw#459

src/fsfw/osal/common/TcpTmTcBridge.cpp

@@ -1,6 +1,5 @@
 #include "fsfw/platform.h"
 #include "fsfw/osal/common/TcpTmTcBridge.h"
-#include "fsfw/osal/common/tcpipHelpers.h"
 
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/ipc/MutexGuard.h"
@@ -17,8 +16,6 @@
 
 #endif
 
-const std::string TcpTmTcBridge::DEFAULT_UDP_SERVER_PORT =  tcpip::DEFAULT_SERVER_PORT;
-
 TcpTmTcBridge::TcpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
         object_id_t tmStoreId, object_id_t tcStoreId):
         TmTcBridge(objectId, tcDestination, tmStoreId, tcStoreId) {

src/fsfw/osal/common/TcpTmTcBridge.h

@@ -2,7 +2,7 @@
 #define FSFW_OSAL_COMMON_TCPTMTCBRIDGE_H_
 
 #include "TcpIpBase.h"
-#include "../../tmtcservices/TmTcBridge.h"
+#include "fsfw/tmtcservices/TmTcBridge.h"
 
 #ifdef _WIN32
 
@@ -29,8 +29,6 @@ class TcpTmTcBridge:
         public TmTcBridge {
     friend class TcpTmTcServer;
 public:
-    /* The ports chosen here should not be used by any other process. */
-    static const std::string DEFAULT_UDP_SERVER_PORT;
 
     /**
      * Constructor

src/fsfw/osal/common/TcpTmTcServer.cpp

@@ -22,14 +22,14 @@
 #define FSFW_TCP_RECV_WIRETAPPING_ENABLED 0
 #endif
 
-const std::string TcpTmTcServer::DEFAULT_TCP_SERVER_PORT =  "7303";
+const std::string TcpTmTcServer::DEFAULT_SERVER_PORT = tcpip::DEFAULT_SERVER_PORT;
 
 TcpTmTcServer::TcpTmTcServer(object_id_t objectId, object_id_t tmtcTcpBridge,
         size_t receptionBufferSize, std::string customTcpServerPort):
         SystemObject(objectId), tmtcBridgeId(tmtcTcpBridge),
         tcpPort(customTcpServerPort), receptionBuffer(receptionBufferSize) {
     if(tcpPort == "") {
-        tcpPort = DEFAULT_TCP_SERVER_PORT;
+        tcpPort = DEFAULT_SERVER_PORT;
     }
 }
 
@@ -200,6 +200,10 @@ void TcpTmTcServer::setTcpBacklog(uint8_t tcpBacklog) {
     this->tcpBacklog = tcpBacklog;
 }
 
+std::string TcpTmTcServer::getTcpPort() const {
+    return tcpPort;
+}
+
 ReturnValue_t TcpTmTcServer::handleTmSending(socket_t connSocket) {
     // Access to the FIFO is mutex protected because it is filled by the bridge
     MutexGuard(tmtcBridge->mutex, tmtcBridge->timeoutType, tmtcBridge->mutexTimeoutMs);

src/fsfw/osal/common/TcpTmTcServer.h

@@ -3,13 +3,14 @@
 
 #include "TcpIpBase.h"
 
-#include "../../platform.h"
+#include "fsfw/platform.h"
-#include "../../ipc/messageQueueDefinitions.h"
+#include "fsfw/osal/common/tcpipHelpers.h"
-#include "../../ipc/MessageQueueIF.h"
+#include "fsfw/ipc/messageQueueDefinitions.h"
-#include "../../objectmanager/frameworkObjects.h"
+#include "fsfw/ipc/MessageQueueIF.h"
-#include "../../objectmanager/SystemObject.h"
+#include "fsfw/objectmanager/frameworkObjects.h"
-#include "../../storagemanager/StorageManagerIF.h"
+#include "fsfw/objectmanager/SystemObject.h"
-#include "../../tasks/ExecutableObjectIF.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
 
 #ifdef PLATFORM_UNIX
 #include <sys/socket.h>
@@ -41,8 +42,7 @@ class TcpTmTcServer:
         public TcpIpBase,
         public ExecutableObjectIF {
 public:
-    /* The ports chosen here should not be used by any other process. */
+    static const std::string DEFAULT_SERVER_PORT;
-    static const std::string DEFAULT_TCP_SERVER_PORT;
 
     static constexpr size_t ETHERNET_MTU_SIZE = 1500;
 
@@ -65,6 +65,8 @@ public:
     ReturnValue_t performOperation(uint8_t opCode) override;
     ReturnValue_t initializeAfterTaskCreation() override;
 
+    std::string getTcpPort() const;
+
 protected:
     StorageManagerIF* tcStore = nullptr;
     StorageManagerIF* tmStore = nullptr;

src/fsfw/osal/common/UdpTmTcBridge.cpp

@@ -17,13 +17,13 @@
 #define FSFW_UDP_SEND_WIRETAPPING_ENABLED    0
 #endif
 
-const std::string UdpTmTcBridge::DEFAULT_UDP_SERVER_PORT =  tcpip::DEFAULT_SERVER_PORT;
+const std::string UdpTmTcBridge::DEFAULT_SERVER_PORT =  tcpip::DEFAULT_SERVER_PORT;
 
 UdpTmTcBridge::UdpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
         std::string udpServerPort, object_id_t tmStoreId, object_id_t tcStoreId):
         TmTcBridge(objectId, tcDestination, tmStoreId, tcStoreId) {
     if(udpServerPort == "") {
-        this->udpServerPort = DEFAULT_UDP_SERVER_PORT;
+        this->udpServerPort = DEFAULT_SERVER_PORT;
     }
     else {
         this->udpServerPort = udpServerPort;
@@ -108,6 +108,10 @@ UdpTmTcBridge::~UdpTmTcBridge() {
     }
 }
 
+std::string UdpTmTcBridge::getUdpPort() const {
+    return udpServerPort;
+}
+
 ReturnValue_t UdpTmTcBridge::sendTm(const uint8_t *data, size_t dataLen) {
     int flags = 0;
 

src/fsfw/osal/common/UdpTmTcBridge.h

@@ -2,8 +2,8 @@
 #define FSFW_OSAL_COMMON_TMTCUDPBRIDGE_H_
 
 #include "TcpIpBase.h"
-#include "../../platform.h"
+#include "fsfw/platform.h"
-#include "../../tmtcservices/TmTcBridge.h"
+#include "fsfw/tmtcservices/TmTcBridge.h"
 
 #ifdef PLATFORM_WIN
 #include <ws2tcpip.h>
@@ -28,7 +28,7 @@ class UdpTmTcBridge:
     friend class UdpTcPollingTask;
 public:
     /* The ports chosen here should not be used by any other process. */
-    static const std::string DEFAULT_UDP_SERVER_PORT;
+    static const std::string DEFAULT_SERVER_PORT;
 
     UdpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
             std::string udpServerPort = "", object_id_t tmStoreId = objects::TM_STORE,
@@ -44,6 +44,8 @@ public:
 
     void checkAndSetClientAddress(sockaddr& clientAddress);
 
+    std::string getUdpPort() const;
+
 protected:
     virtual ReturnValue_t sendTm(const uint8_t * data, size_t dataLen) override;
 

src/fsfw/osal/common/tcpipCommon.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_OSAL_COMMON_TCPIPCOMMON_H_
 #define FSFW_OSAL_COMMON_TCPIPCOMMON_H_
 
-#include "../../timemanager/clockDefinitions.h"
+#include "fsfw/timemanager/clockDefinitions.h"
 #include <string>
 
 #ifdef _WIN32
@@ -13,7 +13,7 @@
 
 namespace tcpip {
 
-const char* const DEFAULT_SERVER_PORT = "7301";
+static constexpr char DEFAULT_SERVER_PORT[] = "7301";
 
 enum class Protocol {
     UDP,