eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'development' into mueller/tmstorage

This commit is contained in:
Steffen Gaisser 2020-12-22 17:35:26 +01:00
parent bc8c3da1b7 52d9a55d06
commit bda9546f51
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osal/windows/TmTcWinUdpBridge.cpp
View File

@ -138,6 +138,11 @@ void TmTcWinUdpBridge::handleBindError() {
<< "WSAStartup(...) call " << "necessary" << std::endl;
break;
}
case(WSAEADDRINUSE): {
sif::warning << "TmTcWinUdpBridge::handleBindError: WSAEADDRINUSE: "
<< "Port is already in use!" << std::endl;
break;
}
default: {
/*
https://docs.microsoft.com/en-us/windows/win32/winsock/

6
tmtcpacket/pus/TmPacketStored.h
View File

@ -1,5 +1,5 @@
#ifndef TMTCPACKET_PUS_TMPACKETSTORED_H_
#define TMTCPACKET_PUS_TMPACKETSTORED_H_
#ifndef FSFW_TMTCPACKET_PUS_TMPACKETSTORED_H_
#define FSFW_TMTCPACKET_PUS_TMPACKETSTORED_H_
#include "TmPacketBase.h"
@ -105,4 +105,4 @@ private:
};
#endif /* TMTCPACKET_PUS_TMPACKETSTORED_H_ */
#endif /* FSFW_TMTCPACKET_PUS_TMPACKETSTORED_H_ */