osal/host/MutexFactory.cpp

@@ -24,5 +24,7 @@ MutexIF* MutexFactory::createMutex() {
 }
 
 void MutexFactory::deleteMutex(MutexIF* mutex) {
-	delete mutex;
+    if(mutex != nullptr) {
+        delete mutex;
+    }
 }

osal/windows/TcWinTcpServer.cpp

@@ -71,8 +71,7 @@ ReturnValue_t TcWinTcpServer::initialize() {
 //    tcpAddress.sin_family = AF_INET;
 //    tcpAddress.sin_addr.s_addr = htonl(INADDR_ANY);
 
-    retval = bind(listenerTcpSocket, reinterpret_cast<const sockaddr*>(&tcpAddress),
-            tcpAddrLen);
+    retval = bind(listenerTcpSocket, addrResult->ai_addr, static_cast<int>(addrResult->ai_addrlen));
     if(retval == SOCKET_ERROR) {
         sif::warning << "TcWinTcpServer::TcWinTcpServer: Binding socket failed!" <<
                 std::endl;

osal/windows/TcWinUdpPollingTask.cpp

@@ -33,7 +33,7 @@ TcWinUdpPollingTask::~TcWinUdpPollingTask() {}
 ReturnValue_t TcWinUdpPollingTask::performOperation(uint8_t opCode) {
 	/* Poll for new UDP datagrams in permanent loop. */
 	while(true) {
-		//! Sender Address is cached here.
+		/* Sender Address is cached here. */
 		struct sockaddr_in senderAddress;
 		int senderAddressSize = sizeof(senderAddress);
 		int bytesReceived = recvfrom(serverUdpSocket,

osal/windows/TmTcWinUdpBridge.cpp

@@ -1,19 +1,34 @@
 #include "TmTcWinUdpBridge.h"
 
+#include <fsfw/serviceinterface/ServiceInterface.h>
 #include <fsfw/ipc/MutexGuard.h>
+#include <ws2tcpip.h>
 
-#if defined(_MSC_VER)
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-#endif
+const std::string TmTcWinUdpBridge::DEFAULT_UDP_SERVER_PORT =  "7301";
+const std::string TmTcWinUdpBridge::DEFAULT_UDP_CLIENT_PORT =  "7302";
 
 TmTcWinUdpBridge::TmTcWinUdpBridge(object_id_t objectId,
         object_id_t tcDestination, object_id_t tmStoreId, object_id_t tcStoreId,
-        uint16_t serverPort, uint16_t clientPort):
+        std::string udpServerPort, std::string udpClientPort):
         TmTcBridge(objectId, tcDestination, tmStoreId, tcStoreId) {
+    if(udpServerPort == "") {
+        udpServerPort = DEFAULT_UDP_SERVER_PORT;
+    }
+    else {
+        this->udpServerPort = udpServerPort;
+    }
+    if(udpClientPort == "") {
+        udpClientPort = DEFAULT_UDP_CLIENT_PORT;
+    }
+    else {
+        this->udpClientPort = udpClientPort;
+    }
+
     mutex = MutexFactory::instance()->createMutex();
     communicationLinkUp = false;
+}
 
+ReturnValue_t TmTcWinUdpBridge::initialize() {
     /* Initiates Winsock DLL. */
     WSAData wsaData;
     WORD wVersionRequested = MAKEWORD(2, 2);
@@ -22,71 +37,85 @@ TmTcWinUdpBridge::TmTcWinUdpBridge(object_id_t objectId,
         /* Tell the user that we could not find a usable */
         /* Winsock DLL.                                  */
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::error << "TmTcWinUdpBridge::TmTcWinUdpBridge:"
-                "WSAStartup failed with error: " << err << std::endl;
+        sif::error << "TmTcWinUdpBridge::TmTcWinUdpBridge: WSAStartup failed with error: " <<
+                err << std::endl;
+#else
+        sif::printError("TmTcWinUdpBridge::TmTcWinUdpBridge: WSAStartup failed with error: %d\n",
+                err);
 #endif
-        return;
+        return HasReturnvaluesIF::RETURN_FAILED;
     }
 
-    uint16_t setServerPort = DEFAULT_UDP_SERVER_PORT;
-    if(serverPort != 0xFFFF) {
-        setServerPort = serverPort;
-    }
+    struct addrinfo *addrResult = nullptr;
+    struct addrinfo hints;
 
-    uint16_t setClientPort = DEFAULT_UDP_CLIENT_PORT;
-    if(clientPort != 0xFFFF) {
-        setClientPort = clientPort;
-    }
+    ZeroMemory(&hints, sizeof (hints));
+    hints.ai_family = AF_INET;
+    hints.ai_socktype = SOCK_DGRAM;
+    hints.ai_protocol = IPPROTO_UDP;
+    hints.ai_flags = AI_PASSIVE;
 
     /* Set up UDP socket:
-    https://docs.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-socket
+    https://en.wikipedia.org/wiki/Getaddrinfo
+    Passing nullptr as the first parameter and specifying AI_PASSIVE in hints will cause
+    getaddrinfo to assign the address 0.0.0.0 (any address)
     */
-    serverSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    int retval = getaddrinfo(nullptr, udpServerPort.c_str(), &hints, &addrResult);
+    if (retval != 0) {
+#if FSFW_CPP_OSTREAM_ENABLED == 1
+        sif::warning << "TmTcWinUdpBridge::TmTcWinUdpBridge: Retrieving address info failed!" <<
+                std::endl;
+#endif
+        return HasReturnvaluesIF::RETURN_FAILED;
+    }
+
+    serverSocket = socket(addrResult->ai_family, addrResult->ai_socktype, addrResult->ai_protocol);
     if(serverSocket == INVALID_SOCKET) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
         sif::warning << "TmTcWinUdpBridge::TmTcWinUdpBridge: Could not open UDP socket!" <<
                 std::endl;
 #endif
         handleSocketError();
-        return;
-    }
-
-    serverAddress.sin_family = AF_INET;
-
-    /* Accept packets from any interface. (potentially insecure). */
-    serverAddress.sin_addr.s_addr = htonl(INADDR_ANY);
-    serverAddress.sin_port = htons(setServerPort);
-    serverAddressLen = sizeof(serverAddress);
-    int result = setsockopt(serverSocket, SOL_SOCKET, SO_REUSEADDR,
-            reinterpret_cast<const char*>(&serverSocketOptions),
-            sizeof(serverSocketOptions));
-    if(result != 0) {
-#if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::warning << "TmTcWinUdpBridge::TmTcWinUdpBridge: Could not set socket options!" <<
-                std::endl;
-#endif
-        handleSocketError();
+        return HasReturnvaluesIF::RETURN_FAILED;
     }
 
+//    serverAddress.sin_family = AF_INET;
+//
+//    /* Accept packets from any interface. (potentially insecure). */
+//    serverAddress.sin_addr.s_addr = htonl(INADDR_ANY);
+//    serverAddress.sin_port = htons(setServerPort);
+//    serverAddressLen = sizeof(serverAddress);
+//    int result = setsockopt(serverSocket, SOL_SOCKET, SO_REUSEADDR,
+//            reinterpret_cast<const char*>(&serverSocketOptions),
+//            sizeof(serverSocketOptions));
+//    if(result != 0) {
+//#if FSFW_CPP_OSTREAM_ENABLED == 1
+//        sif::warning << "TmTcWinUdpBridge::TmTcWinUdpBridge: Could not set socket options!" <<
+//                std::endl;
+//#endif
+//        handleSocketError();
+//    }
+//
     clientAddress.sin_family = AF_INET;
     clientAddress.sin_addr.s_addr = htonl(INADDR_ANY);
-    clientAddress.sin_port = htons(setClientPort);
+    clientAddress.sin_port = htons(7302);
     clientAddressLen = sizeof(clientAddress);
 
-    result = bind(serverSocket,
-            reinterpret_cast<struct sockaddr*>(&serverAddress),
-            serverAddressLen);
-    if(result != 0) {
+    retval = bind(serverSocket, addrResult->ai_addr, static_cast<int>(addrResult->ai_addrlen));
+    if(retval != 0) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
         sif::error << "TmTcWinUdpBridge::TmTcWinUdpBridge: Could not bind "
-                "local port " << setServerPort << " to server socket!"
-                << std::endl;
+                "local port " << udpServerPort << " to server socket!" << std::endl;
 #endif
         handleBindError();
     }
+    return HasReturnvaluesIF::RETURN_OK;
 }
 
 TmTcWinUdpBridge::~TmTcWinUdpBridge() {
+    if(mutex != nullptr) {
+        MutexFactory::instance()->deleteMutex(mutex);
+    }
     closesocket(serverSocket);
     WSACleanup();
 }
@@ -102,7 +131,7 @@ ReturnValue_t TmTcWinUdpBridge::sendTm(const uint8_t *data, size_t dataLen) {
             &clientAddress.sin_addr.s_addr, ipAddress, 15) << std::endl;
 #endif
 
-    ssize_t bytesSent = sendto(serverSocket,
+    int bytesSent = sendto(serverSocket,
             reinterpret_cast<const char*>(data), dataLen, flags,
             reinterpret_cast<sockaddr*>(&clientAddress), clientAddressLen);
     if(bytesSent == SOCKET_ERROR) {

osal/windows/TmTcWinUdpBridge.h

@@ -13,14 +13,16 @@ class TmTcWinUdpBridge: public TmTcBridge {
     friend class TcWinUdpPollingTask;
 public:
     /* The ports chosen here should not be used by any other process. */
-    static constexpr uint16_t DEFAULT_UDP_SERVER_PORT = 7301;
-    static constexpr uint16_t DEFAULT_UDP_CLIENT_PORT = 7302;
+    static const std::string DEFAULT_UDP_SERVER_PORT;
+    static const std::string DEFAULT_UDP_CLIENT_PORT;
 
     TmTcWinUdpBridge(object_id_t objectId, object_id_t tcDestination,
             object_id_t tmStoreId, object_id_t tcStoreId,
-            uint16_t serverPort = 0xFFFF,uint16_t clientPort = 0xFFFF);
+            std::string udpServerPort = "", std::string udpClientPort = "");
     virtual~ TmTcWinUdpBridge();
 
+    ReturnValue_t initialize() override;
+
     void checkAndSetClientAddress(sockaddr_in clientAddress);
 
 protected:
@@ -28,6 +30,8 @@ protected:
 
 private:
     SOCKET serverSocket = 0;
+    std::string udpServerPort;
+    std::string udpClientPort;
 
     const int serverSocketOptions = 0;