stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix TCP keepalive use in UNIX systems

Browse source
This commit is contained in:
Aurelian Pop 2014-07-29 15:36:06 +03:00
parent 78228ed5cb
commit d07ea3bf40
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/context.c
View file

@ -122,6 +122,10 @@ libwebsocket_create_context(struct lws_context_creation_info *info)
context->http_proxy_address[0] = '\0'; context->http_proxy_address[0] = '\0';
context->options = info->options; context->options = info->options;
context->iface = info->iface; context->iface = info->iface;
context->ka_time = info->ka_time;
context->ka_interval = info->ka_interval;
context->ka_probes = info->ka_probes;
/* to reduce this allocation, */ /* to reduce this allocation, */
context->max_fds = getdtablesize(); context->max_fds = getdtablesize();
lwsl_notice(" static allocation: %u + (%u x %u fds) = %u bytes\n", lwsl_notice(" static allocation: %u + (%u x %u fds) = %u bytes\n",

6
lib/lws-plat-unix.c
View file

@ -173,17 +173,17 @@ lws_plat_set_socket_options(struct libwebsocket_context *context, int fd)
#else #else
/* set the keepalive conditions we want on it too */ /* set the keepalive conditions we want on it too */
optval = context->ka_time; optval = context->ka_time;
if (setsockopt(fd, IPPROTO_IP, TCP_KEEPIDLE, if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE,
(const void *)&optval, optlen) < 0) (const void *)&optval, optlen) < 0)
return 1; return 1;
optval = context->ka_interval; optval = context->ka_interval;
if (setsockopt(fd, IPPROTO_IP, TCP_KEEPINTVL, if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL,
(const void *)&optval, optlen) < 0) (const void *)&optval, optlen) < 0)
return 1; return 1;
optval = context->ka_probes; optval = context->ka_probes;
if (setsockopt(fd, IPPROTO_IP, TCP_KEEPCNT, if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT,
(const void *)&optval, optlen) < 0) (const void *)&optval, optlen) < 0)
return 1; return 1;
#endif #endif