mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw into mueller/master

Browse Source
This commit is contained in:
Robin Müller
2021-03-10 13:31:43 +01:00
parent d5a065eaa8 bb5b7bed40
commit 5095fd206f
22 changed files with 104 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osal/windows/TmTcWinUdpBridge.cpp
View File

@ -1,6 +1,6 @@
#include "TmTcWinUdpBridge.h"
#include <fsfw/ipc/MutexHelper.h>
#include <fsfw/ipc/MutexGuard.h>
#if defined(_MSC_VER)
#include <BaseTsd.h>
@ -120,7 +120,7 @@ ReturnValue_t TmTcWinUdpBridge::sendTm(const uint8_t *data, size_t dataLen) {
}
void TmTcWinUdpBridge::checkAndSetClientAddress(sockaddr_in newAddress) {
MutexHelper lock(mutex, MutexIF::TimeoutType::WAITING, 10);
MutexGuard lock(mutex, MutexIF::TimeoutType::WAITING, 10);
#if FSFW_CPP_OSTREAM_ENABLED == 1 && FSFW_UDP_SEND_WIRETAPPING_ENABLED == 1
char ipAddress [15];