From d604f8d3d18a83e7c7e0adcfd44cf9bffc68be57 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 9 Aug 2021 18:23:18 +0200 Subject: [PATCH] one port is okay --- README.md | 12 ++---------- bsp_q7s/core/CoreController.cpp | 8 -------- bsp_q7s/core/ObjectFactory.cpp | 8 ++++++-- fsfw | 2 +- scripts/q7s-port-tcp.sh | 11 ----------- scripts/{q7s-port-udp.sh => q7s-port.sh} | 2 +- 6 files changed, 10 insertions(+), 33 deletions(-) delete mode 100755 scripts/q7s-port-tcp.sh rename scripts/{q7s-port-udp.sh => q7s-port.sh} (84%) diff --git a/README.md b/README.md index 2e2c8b96..def12cf0 100644 --- a/README.md +++ b/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 diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp index bb699d8b..b7394cb9 100644 --- a/bsp_q7s/core/CoreController.cpp +++ b/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; } diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index 31e244ab..5d083741 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/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 */ diff --git a/fsfw b/fsfw index ba5e2ad8..1ac372cb 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit ba5e2ad8bb97faf22702fa9aaaf47931db7ca6bb +Subproject commit 1ac372cb89fabc868aa9cc6ef024f822c744eaed diff --git a/scripts/q7s-port-tcp.sh b/scripts/q7s-port-tcp.sh deleted file mode 100755 index 4d0aef4a..00000000 --- a/scripts/q7s-port-tcp.sh +++ /dev/null @@ -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' diff --git a/scripts/q7s-port-udp.sh b/scripts/q7s-port.sh similarity index 84% rename from scripts/q7s-port-udp.sh rename to scripts/q7s-port.sh index 21393083..e475e8b7 100755 --- a/scripts/q7s-port-udp.sh +++ b/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 \