From e536918804255bf035ba78e5ddb9171b01f02761 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 28 Sep 2021 15:09:56 +0200
Subject: [PATCH] wiretapping in runtime config now

---
 src/fsfw/osal/common/TcpTmTcServer.cpp | 24 +++++++++++++++---------
 src/fsfw/osal/common/TcpTmTcServer.h   |  5 ++++-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/fsfw/osal/common/TcpTmTcServer.cpp b/src/fsfw/osal/common/TcpTmTcServer.cpp
index e320b46b..5be9373e 100644
--- a/src/fsfw/osal/common/TcpTmTcServer.cpp
+++ b/src/fsfw/osal/common/TcpTmTcServer.cpp
@@ -5,12 +5,13 @@
 #include "TcpTmTcBridge.h"
 #include "tcpipHelpers.h"
 
+#include "fsfw/tmtcservices/SpacePacketParser.h"
 #include "fsfw/tasks/TaskFactory.h"
+#include "fsfw/globalfunctions/arrayprinter.h"
 #include "fsfw/container/SharedRingBuffer.h"
 #include "fsfw/ipc/MessageQueueSenderIF.h"
 #include "fsfw/ipc/MutexGuard.h"
 #include "fsfw/objectmanager/ObjectManager.h"
-
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/tmtcservices/TmTcMessage.h"
 
@@ -20,11 +21,6 @@
 #elif defined(PLATFORM_UNIX)
 #include <netdb.h>
 #endif
-#include <chrono>
-
-#ifndef FSFW_TCP_RECV_WIRETAPPING_ENABLED
-#define FSFW_TCP_RECV_WIRETAPPING_ENABLED 0
-#endif
 
 const std::string TcpTmTcServer::DEFAULT_SERVER_PORT = tcpip::DEFAULT_SERVER_PORT;
 
@@ -202,9 +198,11 @@ void TcpTmTcServer::handleServerOperation(socket_t& connSocket) {
 }
 
 ReturnValue_t TcpTmTcServer::handleTcReception(uint8_t* spacePacket, size_t packetSize) {
-#if FSFW_TCP_RECV_WIRETAPPING_ENABLED == 1
-    arrayprinter::print(receptionBuffer.data(), bytesRead);
-#endif
+    if(wiretappingEnabled) {
+        sif::info << "Received TC:" << std::endl;
+        arrayprinter::print(spacePacket, packetSize);
+    }
+
     if(spacePacket == nullptr or packetSize == 0) {
         return HasReturnvaluesIF::RETURN_FAILED;
     }
@@ -268,6 +266,10 @@ ReturnValue_t TcpTmTcServer::handleTmSending(socket_t connSocket, bool& tmSent)
         if(result != HasReturnvaluesIF::RETURN_OK) {
             return result;
         }
+        if(wiretappingEnabled) {
+            sif::info << "Sending TM:" << std::endl;
+            arrayprinter::print(storeAccessor.data(), storeAccessor.size());
+        }
         int retval = send(connSocket,
                 reinterpret_cast<const char*>(storeAccessor.data()),
                 storeAccessor.size(),
@@ -346,6 +348,10 @@ ReturnValue_t TcpTmTcServer::handleTcRingBufferData(size_t availableReadData) {
     return status;
 }
 
+void TcpTmTcServer::enableWiretapping(bool enable) {
+    this->wiretappingEnabled = enable;
+}
+
 void TcpTmTcServer::handleSocketError(ConstStorageAccessor &accessor) {
     // Don't delete data
     accessor.release();
diff --git a/src/fsfw/osal/common/TcpTmTcServer.h b/src/fsfw/osal/common/TcpTmTcServer.h
index a0a31655..d5214848 100644
--- a/src/fsfw/osal/common/TcpTmTcServer.h
+++ b/src/fsfw/osal/common/TcpTmTcServer.h
@@ -1,7 +1,6 @@
 #ifndef FSFW_OSAL_COMMON_TCP_TMTC_SERVER_H_
 #define FSFW_OSAL_COMMON_TCP_TMTC_SERVER_H_
 
-#include <fsfw/tmtcservices/SpacePacketParser.h>
 #include "TcpIpBase.h"
 
 #include "fsfw/platform.h"
@@ -22,6 +21,7 @@
 #include <vector>
 
 class TcpTmTcBridge;
+class SpacePacketParser;
 
 /**
  * @brief   TCP server implementation
@@ -91,6 +91,8 @@ public:
             ReceptionModes receptionMode = ReceptionModes::SPACE_PACKETS);
     virtual~ TcpTmTcServer();
 
+    void enableWiretapping(bool enable);
+
     /**
      * Get a handle to the TCP configuration struct, which can be used to configure TCP
      * properties
@@ -113,6 +115,7 @@ private:
     //! TMTC bridge is cached.
     object_id_t tmtcBridgeId = objects::NO_OBJECT;
     TcpTmTcBridge* tmtcBridge = nullptr;
+    bool wiretappingEnabled = false;
 
     ReceptionModes receptionMode;
     TcpConfig tcpConfig;