clear down wsi_lookup on allocation and clear pollfd revents if serviced
This should get rid of a valgrind uninitialized report when using extpoll,
and gives a new way to share the poll loop with external sockets.
If a pollfd says it has something, you can just pass it to
libwebsocket_serice_fd() whether it is a socket handled by lws or not.
If it sees it is a lws socket, the traffic will be handled and
pollfd->revents will be zeroed now.
If the socket is foreign to lws, it leaves revents alone. So you can see
if you should service by checking the pollfd revents after letting
lws try to service it.
Signed-off-by: Andy Green <andy.green@linaro.org>
diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index e94e809..e2d7731 100644
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -874,9 +874,12 @@
if (libwebsocket_service_timeout_check(context, wsi,
tv.tv_sec))
/* he did time out... */
- if (m == our_fd)
+ if (m == our_fd) {
/* it was the guy we came to service! */
timed_out = 1;
+ /* mark as handled */
+ pollfd->revents = 0;
+ }
}
}
@@ -891,6 +894,16 @@
/* no, here to service a socket descriptor */
+ wsi = context->lws_lookup[pollfd->fd];
+ if (wsi == NULL)
+ /* not lws connection ... leave revents alone and return */
+ return 0;
+
+ /*
+ * so that caller can tell we handled, past here we need to
+ * zero down pollfd->revents after handling
+ */
+
/*
* deal with listen service piggybacking
* every listen_service_modulo services of other fds, we
@@ -935,21 +948,14 @@
/* okay, what we came here to do... */
- wsi = context->lws_lookup[pollfd->fd];
- if (wsi == NULL) {
- if (pollfd->fd > 11)
- lwsl_err("unexpected NULL wsi fd=%d fds_count=%d\n",
- pollfd->fd, context->fds_count);
- return 0;
- }
-
switch (wsi->mode) {
#ifndef LWS_NO_SERVER
case LWS_CONNMODE_HTTP_SERVING:
case LWS_CONNMODE_SERVER_LISTENER:
case LWS_CONNMODE_SSL_ACK_PENDING:
- return lws_server_socket_service(context, wsi, pollfd);
+ n = lws_server_socket_service(context, wsi, pollfd);
+ goto handled;
#endif
case LWS_CONNMODE_WS_SERVING:
@@ -963,9 +969,7 @@
lwsl_debug("Session Socket %p (fd=%d) dead\n",
(void *)wsi, pollfd->fd);
- libwebsocket_close_and_free_session(context, wsi,
- LWS_CLOSE_STATUS_NOSTATUS);
- return 0;
+ goto close_and_handled;
}
/* the guy requested a callback when it was OK to write */
@@ -975,9 +979,7 @@
if (lws_handle_POLLOUT_event(context, wsi,
pollfd) < 0) {
lwsl_info("libwebsocket_service_fd: closing\n");
- libwebsocket_close_and_free_session(
- context, wsi, LWS_CLOSE_STATUS_NOSTATUS);
- return 0;
+ goto close_and_handled;
}
@@ -1008,15 +1010,13 @@
lwsl_debug("Socket read returned %d\n",
eff_buf.token_len);
if (errno != EINTR && errno != EAGAIN)
- libwebsocket_close_and_free_session(context,
- wsi, LWS_CLOSE_STATUS_NOSTATUS);
- return 0;
+ goto close_and_handled;
+ n = 0;
+ goto handled;
}
if (!eff_buf.token_len) {
lwsl_info("closing connection due to 0 length read\n");
- libwebsocket_close_and_free_session(context, wsi,
- LWS_CLOSE_STATUS_NOSTATUS);
- return 0;
+ goto close_and_handled;
}
/*
@@ -1047,10 +1047,7 @@
if (m < 0) {
lwsl_ext(
"Extension reports fatal error\n");
- libwebsocket_close_and_free_session(
- context, wsi,
- LWS_CLOSE_STATUS_NOSTATUS);
- return 0;
+ goto close_and_handled;
}
if (m)
more = 1;
@@ -1062,9 +1059,11 @@
n = libwebsocket_read(context, wsi,
(unsigned char *)eff_buf.token,
eff_buf.token_len);
- if (n < 0)
+ if (n < 0) {
/* we closed wsi */
- return 0;
+ n = 0;
+ goto handled;
+ }
}
#ifndef LWS_NO_EXTENSIONS
eff_buf.token = NULL;
@@ -1082,11 +1081,23 @@
#ifdef LWS_NO_CLIENT
break;
#else
- return lws_client_socket_service(context, wsi, pollfd);
+ n = lws_client_socket_service(context, wsi, pollfd);
+ goto handled;
#endif
}
- return 0;
+ n = 0;
+ goto handled;
+
+close_and_handled:
+ libwebsocket_close_and_free_session(
+ context, wsi,
+ LWS_CLOSE_STATUS_NOSTATUS);
+ n = 0;
+
+handled:
+ pollfd->revents = 0;
+ return n;
}
@@ -1750,6 +1761,8 @@
free(context);
return NULL;
}
+ memset(context->lws_lookup, 0, sizeof(struct libwebsocket *) *
+ context->max_fds);
context->fds_count = 0;
#ifndef LWS_NO_EXTENSIONS