Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

sspc: close sequencing fixes

Browse source
This commit is contained in:
Andy Green 2020-12-21 23:11:59 +00:00
parent d8551a4be8
commit 44ad73e07c
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/secure-streams/secure-streams-client.c
View file

@ -171,7 +171,7 @@ callback_sspc_client(struct lws *wsi, enum lws_callback_reasons reason,
lwsl_info("%s: RAW_RX: rx %d\n", __func__, (int)len);
if (!h || !h->cwsi) {
lwsl_err("%s: rx with bad conn state\n", __func__);
lwsl_info("%s: rx when client ss destroyed\n", __func__);
return -1;
}
@ -535,8 +535,10 @@ lws_sspc_destroy(lws_sspc_handle_t **ph)
if (h->dsh)
lws_dsh_destroy(&h->dsh);
if (h->cwsi)
if (h->cwsi) {
lws_set_opaque_user_data(h->cwsi, NULL);
h->cwsi = NULL;
}
/* clean out any pending metadata changes that didn't make it */

2
lib/secure-streams/secure-streams-process.c
View file

@ -317,7 +317,7 @@ callback_ss_proxy(struct lws *wsi, enum lws_callback_reasons reason,
*/
lws_wsi_close(cw, LWS_TO_KILL_ASYNC);
conn->wsi = NULL;
conn->ss->wsi = NULL;
lws_ss_destroy(&conn->ss);
/* conn may have gone */

4
minimal-examples/secure-streams/minimal-secure-streams-testsfail/CMakeLists.txt
View file

@ -66,9 +66,9 @@ if (requirements)
if (VALGRIND)
add_test(NAME sspc-minimaltf COMMAND
${VALGRIND} --tool=memcheck --leak-check=yes --num-callers=20
$<TARGET_FILE:lws-minimal-secure-streams-testsfail-client> -i +${CTEST_SOCKET_PATH})
$<TARGET_FILE:lws-minimal-secure-streams-testsfail-client> -i +${CTEST_SOCKET_PATH} -d1039)
else()
add_test(NAME sspc-minimaltf COMMAND lws-minimal-secure-streams-testsfail-client -i +${CTEST_SOCKET_PATH})
add_test(NAME sspc-minimaltf COMMAND lws-minimal-secure-streams-testsfail-client -i +${CTEST_SOCKET_PATH} -d1039)
endif()
set_tests_properties(sspc-minimaltf PROPERTIES