Fixed unexpected server disconnection due to SSL_ERROR_SYSCALL with e…

…rrno == EAGAIN Seems like the documentation recommends just repeating the request
mumble-voip · Feb 14, 2023 · 3f8b439 · 3f8b439
1 parent ea53abd
commit 3f8b439
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Socket.hpp b/src/Socket.hpp
@@ -113,11 +113,11 @@ class Socket {
 				return Code::Memory;
 			case ETIMEDOUT:
 				return Code::Timeout;
+			case ECONNABORTED:
+				return Code::Cancel;
 #	if EAGAIN != EWOULDBLOCK
 			case EAGAIN:
 #	endif
-			case ECONNABORTED:
-				return Code::Cancel;
 			case EWOULDBLOCK:
 			case EINTR:
 				return Code::Retry;

diff --git a/src/TLS.cpp b/src/TLS.cpp
@@ -182,6 +182,9 @@ ::Code SocketTLS::interpretLibCode(const int code, const bool processed, const b
 		case SSL_ERROR_WANT_WRITE:
 			return WaitOut;
 		case SSL_ERROR_SYSCALL:
+			if (ERR_get_error() == 0 && osErrorToCode(osError()) == mumble::Code::Retry) {
+				return Retry;
+			}
 			m_closed = true;
 
 			if (!processed) {