From 274f29d7e460899c7e04c0ed3cff362de8dde482 Mon Sep 17 00:00:00 2001 From: JCash Date: Sun, 27 Sep 2020 17:02:14 +0200 Subject: [PATCH] moved error checking code outside of socket implementation --- websocket/src/socket.cpp | 4 +--- websocket/src/wslay_callbacks.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/websocket/src/socket.cpp b/websocket/src/socket.cpp index d67e1a5..72eb6a0 100644 --- a/websocket/src/socket.cpp +++ b/websocket/src/socket.cpp @@ -56,9 +56,7 @@ dmSocket::Result Receive(WebsocketConnection* conn, void* buffer, int length, in sr = dmSocket::Receive(conn->m_Socket, buffer, length, received_bytes); int num_bytes = received_bytes ? (uint32_t)*received_bytes : 0; - if (sr == dmSocket::RESULT_OK && num_bytes == 0) - return dmSocket::RESULT_CONNABORTED; - if (sr == dmSocket::RESULT_OK) + if (sr == dmSocket::RESULT_OK && num_bytes > 0) DebugPrint(2, "Received bytes:", buffer, num_bytes); return sr; diff --git a/websocket/src/wslay_callbacks.cpp b/websocket/src/wslay_callbacks.cpp index f4bffce..82c2ac7 100644 --- a/websocket/src/wslay_callbacks.cpp +++ b/websocket/src/wslay_callbacks.cpp @@ -86,7 +86,7 @@ ssize_t WSL_RecvCallback(wslay_event_context_ptr ctx, uint8_t *buf, size_t len, dmSocket::Result socket_result = Receive(conn, buf, len, &r); if (dmSocket::RESULT_OK == socket_result && r == 0) - socket_result = dmSocket::RESULT_WOULDBLOCK; + socket_result = dmSocket::RESULT_CONNABORTED; if (dmSocket::RESULT_OK != socket_result) {