README.md

@@ -251,21 +251,13 @@ You then need to run `scp` with the `-P 1535` flag with `localhost` as the targe
 
 ## Port forwarding for TMTC commanding
 
-If you are using the UDP communication interface, you can use:
+You can enable port forwarding for TMTC commanding with the following command:
 
 ```sh
 ssh -L 1536:192.168.133.10:7301 eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 -t /bin/bash
 ```
 
-This forwards UDP TMTC packets on port `1536` of localhost to the TMTC reception port of the Q7S.
-
-For TCP, you can use
-
-```sh
-ssh -L 1537:192.168.133.10:7301 eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 -t /bin/bash
-```
-
-This forwards TCP TMTC packets on port `1537` of localhost to the TMTC reception port of the Q7S.
+This forwards TMTC packets on port `1536` of localhost to the TMTC reception port of the Q7S.
 
 ## Set up all port forwarding at once
 

bsp_q7s/core/CoreController.cpp

@@ -780,14 +780,6 @@ ReturnValue_t CoreController::initWatchdogFifo() {
 
 void CoreController::initPrint() {
 #if OBSW_VERBOSE_LEVEL >= 1
-#if OBSW_USE_TMTC_TCP_BRIDGE == 0
-    sif::info << "Created UDP server for TMTC commanding with listener port " <<
-            UdpTmTcBridge::DEFAULT_SERVER_PORT << std::endl;
-#else
-    sif::info << "Created TCP server for TMTC commanding with listener port " <<
-            TcpTmTcServer::DEFAULT_SERVER_PORT << std::endl;
-#endif
-
     if(watchdogFifoFd > 0) {
         sif::info << "Opened watchdog FIFO successfully.." << std::endl;
     }

bsp_q7s/core/ObjectFactory.cpp

@@ -139,11 +139,15 @@ void ObjectFactory::produce(void* args){
 #endif /* TE7020 != 0 */
 
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
-    new UdpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
+    auto udpBridge = new UdpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
     new UdpTcPollingTask(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
+    sif::info << "Created UDP server for TMTC commanding with listener port " <<
+            udpBridge->getUdpPort() << std::endl;
 #else
     new TcpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR);
-    new TcpTmTcServer(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
+    auto tcpServer = new TcpTmTcServer(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
+    sif::info << "Created TCP server for TMTC commanding with listener port " <<
+            tcpServer->getTcpPort() << std::endl;
 #endif
 
     /* Test Task */

fsfw

@@ -1 +1 @@
-Subproject commit ba5e2ad8bb97faf22702fa9aaaf47931db7ca6bb
+Subproject commit 1ac372cb89fabc868aa9cc6ef024f822c744eaed

scripts/q7s-port-tcp.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-echo "Setting up all Q7S ports"
-echo "-L 1534:192.168.133.10:1534 for connection to TCF agent"
-echo "-L 1535:192.168.133.10:22 for file transfers"
-echo "-L 1537:192.168.133.10:7303 to TMTC commanding using TCP"
-
-ssh -L 1534:192.168.133.10:1534 \
-   -L 1535:192.168.133.10:22 \
-   -L 1537:192.168.133.10:7301 \
-   eive@2001:7c0:2018:1099:babe:0:e1fe:f1a5 \
-   -t 'CONSOLE_PREFIX="[Q7S Tunnel]" /bin/bash'

scripts/q7s-port.sh

@@ -2,7 +2,7 @@
 echo "Setting up all Q7S ports"
 echo "-L 1534:192.168.133.10:1534 for connection to TCF agent"
 echo "-L 1535:192.168.133.10:22 for file transfers"
-echo "-L 1536:192.168.133.10:7301 to TMTC commanding using UDP"
+echo "-L 1536:192.168.133.10:7301 for TMTC commanding"
 
 ssh -L 1534:192.168.133.10:1534 \
    -L 1535:192.168.133.10:22 \