Partydeck/Websocket-Extension
3
0
Fork 0
mirror of https://github.com/defold/extension-websocket.git synced 2025-06-27 09:47:44 +02:00
Code Issues Projects Releases Wiki Activity

moved error checking code outside of socket implementation

Browse Source
This commit is contained in:
JCash 2020-09-27 17:02:14 +02:00
parent bd8569f49a
commit 274f29d7e4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
websocket/src/socket.cpp
View File

@ -56,9 +56,7 @@ dmSocket::Result Receive(WebsocketConnection* conn, void* buffer, int length, in
sr = dmSocket::Receive(conn->m_Socket, buffer, length, received_bytes); sr = dmSocket::Receive(conn->m_Socket, buffer, length, received_bytes);
int num_bytes = received_bytes ? (uint32_t)*received_bytes : 0; int num_bytes = received_bytes ? (uint32_t)*received_bytes : 0;
if (sr == dmSocket::RESULT_OK && num_bytes == 0) if (sr == dmSocket::RESULT_OK && num_bytes > 0)
return dmSocket::RESULT_CONNABORTED;
if (sr == dmSocket::RESULT_OK)
DebugPrint(2, "Received bytes:", buffer, num_bytes); DebugPrint(2, "Received bytes:", buffer, num_bytes);
return sr; return sr;

2
websocket/src/wslay_callbacks.cpp
View File

@ -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); dmSocket::Result socket_result = Receive(conn, buf, len, &r);
if (dmSocket::RESULT_OK == socket_result && r == 0) if (dmSocket::RESULT_OK == socket_result && r == 0)
socket_result = dmSocket::RESULT_WOULDBLOCK; socket_result = dmSocket::RESULT_CONNABORTED;
if (dmSocket::RESULT_OK != socket_result) if (dmSocket::RESULT_OK != socket_result)
{ {