2 Commits
2.2.1 ... 2.2.3

Author SHA1 Message Date
VitaliiTihobrazov-Melsoft
0f841f16af fix: the connection must be closed in other states (#41) 2021-04-12 22:45:09 +02:00
Björn Ritzl
97cca427d7 Reduced thread name length (#39)
pthread_setname_np() restricts thread name length to 16 characters.
2021-03-18 20:41:03 +01:00

View File

@@ -251,10 +251,7 @@ static void CloseConnection(WebsocketConnection* conn)
// we want it to send this message in the polling
if (conn->m_State == STATE_CONNECTED) {
#if defined(HAVE_WSLAY)
// close the connection and immediately transition to the DISCONNECTED
// state
WSL_Close(conn->m_Ctx);
SetState(conn, STATE_DISCONNECTED);
#else
// start disconnecting by closing the WebSocket through the JS API
// we transition to the DISCONNECTED state when we receive the
@@ -264,6 +261,11 @@ static void CloseConnection(WebsocketConnection* conn)
#endif
}
#if defined(HAVE_WSLAY)
// close the connection and immediately transition to the DISCONNECTED
// state
SetState(conn, STATE_DISCONNECTED);
#endif
}
static bool IsConnectionValid(WebsocketConnection* conn)
@@ -819,7 +821,7 @@ static dmExtension::Result OnUpdate(dmExtension::Params* params)
emscripten_websocket_set_onclose_callback(ws, conn, Emscripten_WebSocketOnClose);
emscripten_websocket_set_onmessage_callback(ws, conn, Emscripten_WebSocketOnMessage);
#else
conn->m_ConnectionThread = dmThread::New((dmThread::ThreadStart)ConnectionWorker, 0x80000, conn, "WebSocketConnectionThread");
conn->m_ConnectionThread = dmThread::New((dmThread::ThreadStart)ConnectionWorker, 0x80000, conn, "WSConnect");
#endif
SetState(conn, STATE_CONNECTING);
}