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

always call lua callback when connection goes to STATE_DISCONNECTED (#28)

Browse Source
This commit is contained in:
Alexander Palagin 2021-01-25 12:59:17 +02:00 committed by GitHub
parent f988413a74
commit 39abd7cdea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
websocket/src/websocket.cpp
View File

@ -195,7 +195,6 @@ static WebsocketConnection* CreateConnection(const char* url)
conn->m_SSLSocket = 0; conn->m_SSLSocket = 0;
conn->m_Status = RESULT_OK; conn->m_Status = RESULT_OK;
conn->m_HasHandshakeData = 0; conn->m_HasHandshakeData = 0;
conn->m_WasConnected = 0;
#if defined(HAVE_WSLAY) #if defined(HAVE_WSLAY)
conn->m_Ctx = 0; conn->m_Ctx = 0;
@ -572,10 +571,7 @@ static dmExtension::Result OnUpdate(dmExtension::Params* params)
conn->m_BufferSize = 0; 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); g_Websocket.m_Connections.EraseSwap(i);
--i; --i;
@ -682,7 +678,6 @@ static dmExtension::Result OnUpdate(dmExtension::Params* params)
#endif #endif
dmSocket::SetBlocking(conn->m_Socket, false); dmSocket::SetBlocking(conn->m_Socket, false);
conn->m_WasConnected = 1;
SetState(conn, STATE_CONNECTED); SetState(conn, STATE_CONNECTED);
HandleCallback(conn, EVENT_CONNECTED, 0, 0); HandleCallback(conn, EVENT_CONNECTED, 0, 0);
} }

3
websocket/src/websocket.h
View File

@ -100,8 +100,7 @@ namespace dmWebsocket
Result m_Status; Result m_Status;
uint8_t m_SSL:1; uint8_t m_SSL:1;
uint8_t m_HasHandshakeData:1; uint8_t m_HasHandshakeData:1;
uint8_t m_WasConnected:1; uint8_t :7;
uint8_t :6;
}; };
// Set error message // Set error message