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

tls: add option to serialize ssl handshake

Browse source 
This is useful for memory constrained systems such as esp32
to improve heap usage minfree/watermark.

On esp32 with simultaneous_ssl_restriction = 2 (MQTT+H1),
Without this change, sys heap minfree ranges from 59k to 71k
  in 100 iterations, average 66.5k.
With this change, sys heap minfree ranges from 64k to 71k
  in 100 interations, average 68.7k
This commit is contained in:
Bing Zhao 2021-07-04 14:26:48 -07:00 • committed by Andy Green
parent 74799161b1
commit c604b9cb21
5 changed files with 57 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/libwebsockets/lws-context-vhost.h
View file

@ -453,6 +453,9 @@ struct lws_context_creation_info {
int simultaneous_ssl_restriction;
/**< CONTEXT: 0 (no limit) or limit of simultaneous SSL sessions
* possible.*/
int ssl_handshake_serialize;
/**< CONTEXT: 0 disables ssl handshake serialization (default).
* 1 enables ssl handshake serialization. */
int ssl_info_event_mask;
/**< VHOST: mask of ssl events to be reported on LWS_CALLBACK_SSL_INFO
* callback for connections on this vhost. The mask values are of

1
lib/core/context.c
View file

@ -910,6 +910,7 @@ lws_create_context(const struct lws_context_creation_info *info)
#if defined(LWS_WITH_TLS) && defined(LWS_WITH_NETWORK)
context->simultaneous_ssl_restriction =
info->simultaneous_ssl_restriction;
context->ssl_handshake_serialize = info->ssl_handshake_serialize;
#endif
context->options = info->options;

1
lib/core/private-lib-core.h
View file

@ -699,6 +699,7 @@ struct lws_context {
unsigned int max_http_header_pool;
int simultaneous_ssl_restriction;
int simultaneous_ssl;
int ssl_handshake_serialize;
#if defined(LWS_WITH_TLS_JIT_TRUST)
int vh_idle_grace_ms;
#endif

45
lib/tls/tls-client.c
View file

@ -24,6 +24,43 @@
#include "private-lib-core.h"
static int
lws_ssl_handshake_serialize(struct lws_context *ctx, struct lws *wsi)
{
struct lws_vhost *vh = ctx->vhost_list;
#if LWS_MAX_SMP > 1
int tsi = lws_pthread_self_to_tsi(ctx);
#else
int tsi = 0;
#endif
struct lws_context_per_thread *pt = &ctx->pt[tsi];
unsigned int n;
while (vh) {
for (n = 0; n < pt->fds_count; n++) {
struct lws *w = wsi_from_fd(ctx, pt->fds[n].fd);
if (!w || w->tsi != tsi || w->a.vhost != vh || wsi == w)
continue;
/* Now we found other vhost's wsi in process */
if (lwsi_role_mqtt(w)) {
/* MQTT TLS connection not established yet.
* Let it finish.
*/
if (lwsi_state(w) != LRS_ESTABLISHED)
return 1;
} else {
/* H1/H2 not finished yet. Let it finish. */
if (lwsi_state(w) != LRS_DEAD_SOCKET)
return 1;
}
}
vh = vh->vhost_next;
}
return 0;
}
static int
lws_ssl_client_connect1(struct lws *wsi, char *errbuf, size_t len)
{
@ -190,6 +227,14 @@ lws_client_create_tls(struct lws *wsi, const char **pcce, int do_c1)
return CCTLS_RETURN_ERROR;
}
wsi->tls_borrowed = 1;
if (wsi->a.context->ssl_handshake_serialize) {
if (lws_ssl_handshake_serialize(wsi->a.context, wsi)) {
lws_tls_restrict_return(wsi->a.context);
wsi->tls_borrowed = 0;
*pcce = "ssl handshake serialization";
return CCTLS_RETURN_ERROR;
}
}
}
#endif

7
minimal-examples/http-client/minimal-http-client-multi/minimal-http-client-multi.c
View file

@ -583,6 +583,13 @@ int main(int argc, const char **argv)
if ((p = lws_cmdline_option(argc, argv, "--limit")))
info.simultaneous_ssl_restriction = atoi(p);
if (lws_cmdline_option(argc, argv, "--ssl-handshake-serialize"))
/* We only consider simultaneous_ssl_restriction > 1 use cases.
* If ssl isn't limited or only 1 is allowed, we don't care.
*/
if (info.simultaneous_ssl_restriction > 1)
info.ssl_handshake_serialize = 1;
context = lws_create_context(&info);
if (!context) {
lwsl_err("lws init failed\n");