From 39abd7cdea86c76786a4f0459bb76bdaa5997a8e Mon Sep 17 00:00:00 2001 From: Alexander Palagin Date: Mon, 25 Jan 2021 12:59:17 +0200 Subject: [PATCH] always call lua callback when connection goes to STATE_DISCONNECTED (#28) --- websocket/src/websocket.cpp | 7 +------ websocket/src/websocket.h | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/websocket/src/websocket.cpp b/websocket/src/websocket.cpp index 7f988b2..00b84b0 100644 --- a/websocket/src/websocket.cpp +++ b/websocket/src/websocket.cpp @@ -195,7 +195,6 @@ static WebsocketConnection* CreateConnection(const char* url) conn->m_SSLSocket = 0; conn->m_Status = RESULT_OK; conn->m_HasHandshakeData = 0; - conn->m_WasConnected = 0; #if defined(HAVE_WSLAY) conn->m_Ctx = 0; @@ -572,10 +571,7 @@ static dmExtension::Result OnUpdate(dmExtension::Params* params) conn->m_BufferSize = 0; } - if (conn->m_WasConnected) - { - HandleCallback(conn, EVENT_DISCONNECTED, 0, conn->m_BufferSize); - } + HandleCallback(conn, EVENT_DISCONNECTED, 0, conn->m_BufferSize); g_Websocket.m_Connections.EraseSwap(i); --i; @@ -682,7 +678,6 @@ static dmExtension::Result OnUpdate(dmExtension::Params* params) #endif dmSocket::SetBlocking(conn->m_Socket, false); - conn->m_WasConnected = 1; SetState(conn, STATE_CONNECTED); HandleCallback(conn, EVENT_CONNECTED, 0, 0); } diff --git a/websocket/src/websocket.h b/websocket/src/websocket.h index 9464f4b..b54c30b 100644 --- a/websocket/src/websocket.h +++ b/websocket/src/websocket.h @@ -100,8 +100,7 @@ namespace dmWebsocket Result m_Status; uint8_t m_SSL:1; uint8_t m_HasHandshakeData:1; - uint8_t m_WasConnected:1; - uint8_t :6; + uint8_t :7; }; // Set error message