Merge remote-tracking branch 'upstream/mueller/tcp-server' into mueller/master

2021-05-13 21:11:59 +02:00
parent a320e3e1ef c1d30aad13
commit 1e9c789287
13 changed files with 380 additions and 86 deletions
--- a/osal/common/UdpTcPollingTask.cpp
+++ b/osal/common/UdpTcPollingTask.cpp
@ -15,9 +15,9 @@
 #define FSFW_UDP_RECV_WIRETAPPING_ENABLED    0

 UdpTcPollingTask::UdpTcPollingTask(object_id_t objectId,
-        object_id_t tmtcUnixUdpBridge, size_t maxRecvSize,
+        object_id_t tmtcUdpBridge, size_t maxRecvSize,
        double timeoutSeconds): SystemObject(objectId),
-        tmtcBridgeId(tmtcUnixUdpBridge) {
+        tmtcBridgeId(tmtcUdpBridge) {
    if(frameSize > 0) {
        this->frameSize = frameSize;
    }