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

Merge pull request 'meier/tcpFix' (#23) from meier/tcpFix into eive/develop 

Reviewed-on: #23
This commit is contained in:
Robin Müller 2021-10-09 13:28:49 +02:00
parent b6e4b1fc72 a578f0390b
commit b985bf5167
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,10 @@ void TcpTmTcServer::handleServerOperation(socket_t& connSocket) {
tcpConfig.tcpFlags
);
if(retval == 0) {
// Client closed connection
size_t availableReadData = ringBuffer.getAvailableReadData();
if(availableReadData > lastRingBufferSize) {
handleTcRingBufferData(availableReadData);
}
return;
}
else if(retval > 0) {

3
src/fsfw/osal/common/tcpipCommon.cpp
View File

@ -21,6 +21,9 @@ void tcpip::determineErrorStrings(Protocol protocol, ErrorSources errorSrc, std:
if(errorSrc == ErrorSources::SETSOCKOPT_CALL) {
srcString = "setsockopt call";
}
if(errorSrc == ErrorSources::BIND_CALL) {
srcString = "bind call";
}
else if(errorSrc == ErrorSources::SOCKET_CALL) {
srcString = "socket call";
}