naming adaptions

naming fixes
2021-07-26 13:50:45 +02:00 · 2021-07-26 11:46:58 +02:00
5 changed files with 8 additions and 7 deletions
--- a/src/fsfw/osal/common/TcpTmTcBridge.cpp
+++ b/src/fsfw/osal/common/TcpTmTcBridge.cpp
@@ -17,7 +17,7 @@

 #endif

-const std::string TcpTmTcBridge::DEFAULT_UDP_SERVER_PORT =  tcpip::DEFAULT_SERVER_PORT;
+const std::string TcpTmTcBridge::DEFAULT_SERVER_PORT =  tcpip::DEFAULT_TCP_SERVER_PORT;

 TcpTmTcBridge::TcpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
        object_id_t tmStoreId, object_id_t tcStoreId):
--- a/src/fsfw/osal/common/TcpTmTcBridge.h
+++ b/src/fsfw/osal/common/TcpTmTcBridge.h
@@ -29,8 +29,8 @@ 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;
+    // The ports chosen here should not be used by any other process
+    static const std::string DEFAULT_SERVER_PORT;

    /**
     * Constructor
--- a/src/fsfw/osal/common/UdpTmTcBridge.cpp
+++ b/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_UDP_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;
--- a/src/fsfw/osal/common/UdpTmTcBridge.h
+++ b/src/fsfw/osal/common/UdpTmTcBridge.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,
--- a/src/fsfw/osal/common/tcpipCommon.h
+++ b/src/fsfw/osal/common/tcpipCommon.h
@@ -13,7 +13,8 @@

 namespace tcpip {

-const char* const DEFAULT_SERVER_PORT = "7301";
+const char* const DEFAULT_UDP_SERVER_PORT = "7301";
+const char* const DEFAULT_TCP_SERVER_PORT = "7303";

 enum class Protocol {
    UDP,
Author	SHA1	Message	Date
Robin Mueller	54c028f913	naming adaptions	2021-07-26 13:50:45 +02:00
Robin Mueller	1f6a5e635f	naming fixes	2021-07-26 11:46:58 +02:00