Updated FSFW to upstream development #5

Manually merged
muellerr merged 103 commits from mueller/master into development 2021-03-20 15:54:34 +01:00
2 changed files with 1 additions and 2 deletions
Showing only changes of commit cf120e2d86 - Show all commits

View File

@ -93,7 +93,7 @@ ReturnValue_t TmTcWinUdpBridge::initialize() {
if(retval != 0) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "TmTcWinUdpBridge::TmTcWinUdpBridge: Could not bind "
"local port " << udpServerPort << " to server socket!" << std::endl;
"local port (" << udpServerPort << ") to server socket!" << std::endl;
#endif
freeaddrinfo(addrResult);
tcpip::handleError(tcpip::Protocol::UDP, tcpip::ErrorSources::BIND_CALL);

View File

@ -4,7 +4,6 @@
#include "../../tmtcservices/TmTcBridge.h"
#include <winsock2.h>
#include <windows.h>
//! Debugging preprocessor define.
#define FSFW_UDP_SEND_WIRETAPPING_ENABLED 0