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

smp: additional vhost locks

Browse source
This commit is contained in:
Andy Green 2020-08-31 08:52:54 +01:00
parent b49a1460e9
commit 8235db7726
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/core-net/adopt.c
View file

@ -186,8 +186,10 @@ lws_adopt_descriptor_vhost1(struct lws_vhost *vh, lws_adoption_type type,
* join him to the vhost's list of these kinds of incomplete wsi until
* he gets another identity (he may do async dns now...)
*/
lws_vhost_lock(new_wsi->a.vhost);
lws_dll2_add_head(&new_wsi->vh_awaiting_socket,
&new_wsi->a.vhost->vh_awaiting_socket_owner);
lws_vhost_unlock(new_wsi->a.vhost);
return new_wsi;
@ -377,8 +379,10 @@ lws_adopt_descriptor_vhost2(struct lws *new_wsi, lws_adoption_type type,
}
#endif
lws_vhost_lock(new_wsi->a.vhost);
/* he has fds visibility now, remove from vhost orphan list */
lws_dll2_remove(&new_wsi->vh_awaiting_socket);
lws_vhost_unlock(new_wsi->a.vhost);
/*
* by deferring callback to this point, after insertion to fds,

5
lib/core-net/close.c
View file

@ -71,8 +71,11 @@ __lws_reset_wsi(struct lws *wsi)
}
#endif
if (wsi->a.vhost)
if (wsi->a.vhost) {
lws_vhost_lock(wsi->a.vhost);
lws_dll2_remove(&wsi->vh_awaiting_socket);
lws_vhost_unlock(wsi->a.vhost);
}
/*
* Protocol user data may be allocated either internally by lws