mueller/master #37
@ -51,7 +51,6 @@ ReturnValue_t TcpTmTcServer::initialize() {
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
tcStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TC_STORE);
|
||||
if (tcStore == nullptr) {
|
||||
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
||||
@ -178,7 +177,7 @@ void TcpTmTcServer::handleServerOperation(socket_t& connSocket) {
|
||||
ringBuffer.writeData(receptionBuffer.data(), retval);
|
||||
}
|
||||
else if(retval < 0) {
|
||||
int errorValue = GetLastError();
|
||||
int errorValue = getLastSocketError();
|
||||
#if defined PLATFORM_UNIX
|
||||
int wouldBlockValue = EAGAIN;
|
||||
#elif defined PLATFORM_WIN
|
||||
@ -388,6 +387,7 @@ void TcpTmTcServer::handleSocketError(ConstStorageAccessor &accessor) {
|
||||
}
|
||||
}
|
||||
|
||||
#if defined PLATFORM_WIN
|
||||
void TcpTmTcServer::setSocketNonBlocking(socket_t &connSocket) {
|
||||
u_long iMode = 1;
|
||||
int iResult = ioctlsocket(connSocket, FIONBIO, &iMode);
|
||||
@ -403,3 +403,4 @@ void TcpTmTcServer::setSocketNonBlocking(socket_t &connSocket) {
|
||||
#endif
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -69,6 +69,8 @@ protected:
|
||||
SpacePacketData localData;
|
||||
};
|
||||
|
||||
namespace spacepacket {
|
||||
|
||||
constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid) {
|
||||
return (0x18 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
|
||||
}
|
||||
@ -77,4 +79,6 @@ constexpr uint16_t getTmSpacePacketIdFromApid(uint16_t apid) {
|
||||
return (0x08 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif /* SPACEPACKET_H_ */
|
||||
|
Loading…
x
Reference in New Issue
Block a user