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 pending: convert to lws_dll_lws

Browse source 
Also add a check for pending after accept, in case pending was aggregated.
This commit is contained in:
Andy Green 2018-11-05 14:43:50 +08:00
parent f6e6818ca7
commit 175f2a2d18
6 changed files with 36 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/core/service.c
View file

@ -515,10 +515,6 @@ int
lws_service_flag_pending(struct lws_context *context, int tsi)
{
struct lws_context_per_thread *pt = &context->pt[tsi];
#if defined(LWS_WITH_TLS)
struct lws *wsi, *wsi_next;
#endif
int forced = 0;
lws_pt_lock(pt, __func__);
@ -548,9 +544,10 @@ lws_service_flag_pending(struct lws_context *context, int tsi)
* service to use up the buffered incoming data, even though their
* network socket may have nothing
*/
wsi = pt->tls.pending_read_list;
while (wsi) {
wsi_next = wsi->tls.pending_read_list_next;
lws_start_foreach_dll_safe(struct lws_dll_lws *, p, p1,
pt->tls.pending_tls_head.next) {
struct lws *wsi = lws_container_of(p, struct lws, tls.pending_tls_list);
pt->fds[wsi->position_in_fds_table].revents |=
pt->fds[wsi->position_in_fds_table].events & LWS_POLLIN;
if (pt->fds[wsi->position_in_fds_table].revents & LWS_POLLIN) {
@ -564,8 +561,7 @@ lws_service_flag_pending(struct lws_context *context, int tsi)
__lws_ssl_remove_wsi_from_buffered_list(wsi);
}
wsi = wsi_next;
}
} lws_end_foreach_dll_safe(p, p1);
#endif
lws_pt_unlock(pt);

21
lib/tls/mbedtls/ssl.c
View file

@ -133,23 +133,12 @@ lws_ssl_capable_read(struct lws *wsi, unsigned char *buf, int len)
if (!wsi->tls.ssl)
goto bail;
if (!SSL_pending(wsi->tls.ssl))
goto bail;
if (SSL_pending(wsi->tls.ssl) &&
lws_dll_is_null(&wsi->tls.pending_tls_list)) {
if (wsi->tls.pending_read_list_next)
return n;
if (wsi->tls.pending_read_list_prev)
return n;
if (pt->tls.pending_read_list == wsi)
return n;
/* add us to the linked list of guys with pending ssl */
if (pt->tls.pending_read_list)
pt->tls.pending_read_list->tls.pending_read_list_prev = wsi;
wsi->tls.pending_read_list_next = pt->tls.pending_read_list;
wsi->tls.pending_read_list_prev = NULL;
pt->tls.pending_read_list = wsi;
lws_dll_lws_add_front(&wsi->tls.pending_tls_list,
&pt->tls.pending_tls_head);
}
return n;
bail:

11
lib/tls/openssl/openssl-server.c
View file

@ -486,10 +486,19 @@ lws_tls_server_accept(struct lws *wsi)
lwsl_notice("%s: client cert CN '%s'\n",
__func__, ir.ns.name);
else
lwsl_info("%s: couldn't get client cert CN\n", __func__);
lwsl_info("%s: no client cert CN\n", __func__);
lws_openssl_describe_cipher(wsi);
if (SSL_pending(wsi->tls.ssl) &&
lws_dll_is_null(&wsi->tls.pending_tls_list)) {
struct lws_context_per_thread *pt =
&wsi->context->pt[(int)wsi->tsi];
lws_dll_lws_add_front(&wsi->tls.pending_tls_list,
&pt->tls.pending_tls_head);
}
return LWS_SSL_CAPABLE_DONE;
}

21
lib/tls/openssl/ssl.c
View file

@ -318,23 +318,12 @@ lws_ssl_capable_read(struct lws *wsi, unsigned char *buf, int len)
if (!wsi->tls.ssl)
goto bail;
if (!SSL_pending(wsi->tls.ssl))
goto bail;
if (SSL_pending(wsi->tls.ssl) &&
lws_dll_is_null(&wsi->tls.pending_tls_list)) {
if (wsi->tls.pending_read_list_next)
return n;
if (wsi->tls.pending_read_list_prev)
return n;
if (pt->tls.pending_read_list == wsi)
return n;
/* add us to the linked list of guys with pending ssl */
if (pt->tls.pending_read_list)
pt->tls.pending_read_list->tls.pending_read_list_prev = wsi;
wsi->tls.pending_read_list_next = pt->tls.pending_read_list;
wsi->tls.pending_read_list_prev = NULL;
pt->tls.pending_read_list = wsi;
lws_dll_lws_add_front(&wsi->tls.pending_tls_list,
&pt->tls.pending_tls_head);
}
return n;
bail:

6
lib/tls/private.h
View file

@ -115,7 +115,7 @@ struct lws_context_tls {
};
struct lws_pt_tls {
struct lws *pending_read_list; /* linked list */
struct lws_dll_lws pending_tls_head;
};
struct lws_tls_ss_pieces;
@ -149,7 +149,7 @@ struct lws_vhost_tls {
struct lws_lws_tls {
lws_tls_conn *ssl;
lws_tls_bio *client_bio;
struct lws *pending_read_list_prev, *pending_read_list_next;
struct lws_dll_lws pending_tls_list;
unsigned int use_ssl;
unsigned int redirect_to_https:1;
};
@ -280,4 +280,4 @@ lws_ssl_info_callback(const lws_tls_conn *ssl, int where, int ret);
int
lws_tls_fake_POLLIN_for_buffered(struct lws_context_per_thread *pt);
#endif
#endif

35
lib/tls/tls.c
View file

@ -30,18 +30,18 @@
int
lws_tls_fake_POLLIN_for_buffered(struct lws_context_per_thread *pt)
{
struct lws *wsi, *wsi_next;
int ret = 0;
wsi = pt->tls.pending_read_list;
while (wsi && wsi->position_in_fds_table != LWS_NO_FDS_POS) {
wsi_next = wsi->tls.pending_read_list_next;
lws_start_foreach_dll_safe(struct lws_dll_lws *, p, p1,
pt->tls.pending_tls_head.next) {
struct lws *wsi = lws_container_of(p, struct lws,
tls.pending_tls_list);
pt->fds[wsi->position_in_fds_table].revents |=
pt->fds[wsi->position_in_fds_table].events & LWS_POLLIN;
ret |= pt->fds[wsi->position_in_fds_table].revents & LWS_POLLIN;
wsi = wsi_next;
}
} lws_end_foreach_dll_safe(p, p1);
return !!ret;
}
@ -49,29 +49,10 @@ lws_tls_fake_POLLIN_for_buffered(struct lws_context_per_thread *pt)
void
__lws_ssl_remove_wsi_from_buffered_list(struct lws *wsi)
{
struct lws_context *context = wsi->context;
struct lws_context_per_thread *pt = &context->pt[(int)wsi->tsi];
if (!wsi->tls.pending_read_list_prev &&
!wsi->tls.pending_read_list_next &&
pt->tls.pending_read_list != wsi)
/* we are not on the list */
if (lws_dll_is_null(&wsi->tls.pending_tls_list))
return;
/* point previous guy's next to our next */
if (!wsi->tls.pending_read_list_prev)
pt->tls.pending_read_list = wsi->tls.pending_read_list_next;
else
wsi->tls.pending_read_list_prev->tls.pending_read_list_next =
wsi->tls.pending_read_list_next;
/* point next guy's previous to our previous */
if (wsi->tls.pending_read_list_next)
wsi->tls.pending_read_list_next->tls.pending_read_list_prev =
wsi->tls.pending_read_list_prev;
wsi->tls.pending_read_list_prev = NULL;
wsi->tls.pending_read_list_next = NULL;
lws_dll_lws_remove(&wsi->tls.pending_tls_list);
}
void