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

meier/tcpFix #23

Merged
muellerr merged 2 commits from meier/tcpFix into eive/develop 2021-10-09 13:28:49 +02:00
Conversation 1 Commits 2 Files Changed 2 +7 -1
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 tcpConfig.tcpFlags
); );
if(retval == 0) { if(retval == 0) {
// Client closed connection size_t availableReadData = ringBuffer.getAvailableReadData();
if(availableReadData > lastRingBufferSize) {
handleTcRingBufferData(availableReadData);
}
return; return;
} }
else if(retval > 0) { 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) { if(errorSrc == ErrorSources::SETSOCKOPT_CALL) {
srcString = "setsockopt call"; srcString = "setsockopt call";
} }
if(errorSrc == ErrorSources::BIND_CALL) {
srcString = "bind call";
}
else if(errorSrc == ErrorSources::SOCKET_CALL) { else if(errorSrc == ErrorSources::SOCKET_CALL) {
srcString = "socket call"; srcString = "socket call";
} }