fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

this should work for both OSes

Browse Source
This commit is contained in:
Robin Müller 2021-09-28 17:38:35 +02:00
parent a619087fef
commit b1a9c90087
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fsfw/osal/common/TcpTmTcServer.cpp
View File

@ -177,7 +177,7 @@ void TcpTmTcServer::handleServerOperation(socket_t& connSocket) {
ringBuffer.writeData(receptionBuffer.data(), retval); ringBuffer.writeData(receptionBuffer.data(), retval);
} }
else if(retval < 0) { else if(retval < 0) {
int errorValue = GetLastError(); int errorValue = getLastSocketError();
#if defined PLATFORM_UNIX #if defined PLATFORM_UNIX
int wouldBlockValue = EAGAIN; int wouldBlockValue = EAGAIN;
#elif defined PLATFORM_WIN #elif defined PLATFORM_WIN
@ -387,6 +387,7 @@ void TcpTmTcServer::handleSocketError(ConstStorageAccessor &accessor) {
} }
} }
#if defined PLATFORM_WIN
void TcpTmTcServer::setSocketNonBlocking(socket_t &connSocket) { void TcpTmTcServer::setSocketNonBlocking(socket_t &connSocket) {
u_long iMode = 1; u_long iMode = 1;
int iResult = ioctlsocket(connSocket, FIONBIO, &iMode); int iResult = ioctlsocket(connSocket, FIONBIO, &iMode);
@ -402,3 +403,4 @@ void TcpTmTcServer::setSocketNonBlocking(socket_t &connSocket) {
#endif #endif
} }
} }
#endif