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

update missed extpoll calls to use correct args for ssl

Browse source 
http://libwebsockets.org/trac/ticket/15#comment:16

Reported-by: Joakim Soderberg <joakim.soderberg@gmail.com>
Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2013-02-19 19:19:51 +08:00
parent 799ecbf773
commit 0c2f4d865a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/client.c
View file

@ -101,7 +101,7 @@ int lws_client_socket_service(struct libwebsocket_context *context,
/* external POLL support via protocol 0 */
context->protocols[0].callback(context, wsi,
LWS_CALLBACK_CLEAR_MODE_POLL_FD,
(void *)(long)wsi->sock, NULL, POLLOUT);
wsi->user_space, (void *)(long)wsi->sock, POLLOUT);
/* we can retry this... just cook the SSL BIO the first time */

8
lib/server.c
View file

@ -328,7 +328,7 @@ int lws_server_socket_service(struct libwebsocket_context *context,
/* external POLL support via protocol 0 */
context->protocols[0].callback(context, wsi,
LWS_CALLBACK_CLEAR_MODE_POLL_FD,
(void *)(long)wsi->sock, NULL, POLLOUT);
wsi->user_space, (void *)(long)wsi->sock, POLLOUT);
lws_latency_pre(context, wsi);
n = SSL_accept(wsi->ssl);
@ -347,7 +347,8 @@ int lws_server_socket_service(struct libwebsocket_context *context,
/* external POLL support via protocol 0 */
context->protocols[0].callback(context, wsi,
LWS_CALLBACK_SET_MODE_POLL_FD,
(void *)(long)wsi->sock, NULL, POLLIN);
wsi->user_space,
(void *)(long)wsi->sock, POLLIN);
lwsl_info("SSL_ERROR_WANT_READ\n");
break;
}
@ -358,7 +359,8 @@ int lws_server_socket_service(struct libwebsocket_context *context,
/* external POLL support via protocol 0 */
context->protocols[0].callback(context, wsi,
LWS_CALLBACK_SET_MODE_POLL_FD,
(void *)(long)wsi->sock, NULL, POLLOUT);
wsi->user_space,
(void *)(long)wsi->sock, POLLOUT);
break;
}
lwsl_debug("SSL_accept failed skt %u: %s\n",