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

unix: try to work around externally closed fds

Browse source
This commit is contained in:
Andy Green 2020-04-23 08:26:18 +01:00
parent 974b65a2f0
commit e72fe1bc4d
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/plat/unix/unix-fds.c
View file

@ -69,7 +69,6 @@ insert_wsi(const struct lws_context *context, struct lws *wsi)
p = context->lws_lookup;
done = &p[context->max_fds];
#if defined(_DEBUG)
/* confirm it doesn't already exist */
@ -79,18 +78,28 @@ insert_wsi(const struct lws_context *context, struct lws *wsi)
assert(p == done);
p = context->lws_lookup;
/* confirm fd doesn't already exist */
/* confirm fd isn't already in use by a wsi */
while (p != done && (!*p || (*p)->desc.sockfd != wsi->desc.sockfd))
p++;
if (p != done) {
lwsl_err("%s: wsi %p already says it has fd %d\n",
lwsl_warn("%s: wsi %p already lists fd %d, transferring\n",
__func__, *p, wsi->desc.sockfd);
assert(0);
/*
* So something closed that fd outside of the wsi activities...
* later the closed fd has been reused for something else.
*
* Work around it by invalidating the old guy's fd, mark him
* as unable to do any transfers and close him.
*/
(*p)->desc.sockfd = LWS_SOCK_INVALID;
(*p)->position_in_fds_table = -1;
(*p)->socket_is_permanently_unusable = 1;
lws_set_timeout(*p, 1, LWS_TO_KILL_ASYNC);
}
p = context->lws_lookup;
#endif
/* find an empty slot */