{
struct timeval tv;
gettimeofday(&tv, NULL);
- return (tv.tv_sec * 1000000) + tv.tv_usec;
+ return ((unsigned long long)tv.tv_sec * 1000000LL) + tv.tv_usec;
}
LWS_VISIBLE int libwebsockets_get_random(struct libwebsocket_context *context,
{
}
-#ifdef LWS_USE_LIBEV
-LWS_VISIBLE void
-libwebsocket_accept_cb(struct ev_loop *loop, struct ev_io *watcher, int revents)
-{
- struct libwebsocket_pollfd eventfd;
- struct lws_io_watcher *lws_io = (struct lws_io_watcher*)watcher;
- struct libwebsocket_context *context = lws_io->context;
-
- if (revents & EV_ERROR)
- return;
-
- eventfd.fd = watcher->fd;
- eventfd.revents = EV_NONE;
- if (revents & EV_READ)
- eventfd.revents |= LWS_POLLIN;
-
- if (revents & EV_WRITE)
- eventfd.revents |= LWS_POLLOUT;
-
- libwebsocket_service_fd(context,&eventfd);
-}
-
-LWS_VISIBLE void
-libwebsocket_sigint_cb(
- struct ev_loop *loop, struct ev_signal* watcher, int revents)
-{
- ev_break(loop, EVBREAK_ALL);
-}
-
-LWS_VISIBLE int
-libwebsocket_initloop(
- struct libwebsocket_context *context,
- struct ev_loop *loop)
-{
- int status = 0;
- int backend;
- const char * backend_name;
- struct ev_io *w_accept = (ev_io *)&context->w_accept;
- struct ev_signal *w_sigint = (ev_signal *)&context->w_sigint;
-
- if (!loop)
- loop = ev_default_loop(0);
-
- context->io_loop = loop;
-
- /*
- * Initialize the accept w_accept with the listening socket
- * and register a callback for read operations:
- */
- ev_io_init(w_accept, libwebsocket_accept_cb,
- context->listen_service_fd, EV_READ);
- ev_io_start(context->io_loop,w_accept);
- ev_signal_init(w_sigint, libwebsocket_sigint_cb, SIGINT);
- ev_signal_start(context->io_loop,w_sigint);
- backend = ev_backend(loop);
-
- switch (backend) {
- case EVBACKEND_SELECT:
- backend_name = "select";
- break;
- case EVBACKEND_POLL:
- backend_name = "poll";
- break;
- case EVBACKEND_EPOLL:
- backend_name = "epoll";
- break;
- case EVBACKEND_KQUEUE:
- backend_name = "kqueue";
- break;
- case EVBACKEND_DEVPOLL:
- backend_name = "/dev/poll";
- break;
- case EVBACKEND_PORT:
- backend_name = "Solaris 10 \"port\"";
- break;
- default:
- backend_name = "Unknown libev backend";
- break;
- };
-
- lwsl_notice(" libev backend: %s\n", backend_name);
-
- return status;
-}
-
-#endif /* LWS_USE_LIBEV */
-
/**
* libwebsocket_cancel_service() - Cancel servicing of pending websocket activity
* @context: Websocket context
int n;
int m;
char buf;
+ struct libwebsocket *wsi, *wsi_next;
/* stay dead once we are dead */
- if (context == NULL)
+ if (!context)
return 1;
-#ifdef LWS_USE_LIBEV
- if (context->io_loop && LWS_LIBEV_ENABLED(context))
- ev_run(context->io_loop, 0);
-#endif /* LWS_USE_LIBEV */
+ lws_libev_run(context);
+
context->service_tid = context->protocols[0].callback(context, NULL,
LWS_CALLBACK_GET_THREAD_ID, NULL, NULL, 0);
+#ifdef LWS_OPENSSL_SUPPORT
+ /* if we know we have non-network pending data, do not wait in poll */
+ if (lws_ssl_anybody_has_buffered_read(context))
+ timeout_ms = 0;
+#endif
n = poll(context->fds, context->fds_count, timeout_ms);
context->service_tid = 0;
+#ifdef LWS_OPENSSL_SUPPORT
+ if (!lws_ssl_anybody_has_buffered_read(context) && n == 0) {
+#else
if (n == 0) /* poll timeout */ {
+#endif
libwebsocket_service_fd(context, NULL);
return 0;
}
return 0;
}
+#ifdef LWS_OPENSSL_SUPPORT
+ /*
+ * For all guys with buffered SSL read data already saved up, if they
+ * are not flowcontrolled, fake their POLLIN status so they'll get
+ * service to use up the buffered incoming data, even though their
+ * network socket may have nothing
+ */
+
+ wsi = context->pending_read_list;
+ while (wsi) {
+ wsi_next = wsi->pending_read_list_next;
+ context->fds[wsi->sock].revents |=
+ context->fds[wsi->sock].events & POLLIN;
+ if (context->fds[wsi->sock].revents & POLLIN) {
+ /*
+ * he's going to get serviced now, take him off the
+ * list of guys with buffered SSL. If he still has some
+ * at the end of the service, he'll get put back on the
+ * list then.
+ */
+ lws_ssl_remove_wsi_from_buffered_list(context, wsi);
+ }
+ wsi = wsi_next;
+ }
+#endif
+
/* any socket with events to service? */
for (n = 0; n < context->fds_count; n++) {
+
if (!context->fds[n].revents)
continue;
int optval = 1;
socklen_t optlen = sizeof(optval);
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+ defined(__OpenBSD__)
struct protoent *tcp_proto;
#endif
(const void *)&optval, optlen) < 0)
return 1;
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+ defined(__CYGWIN__) || defined(__OpenBSD__)
/*
* didn't find a way to set these per-socket, need to
#else
/* set the keepalive conditions we want on it too */
optval = context->ka_time;
- if (setsockopt(fd, IPPROTO_IP, TCP_KEEPIDLE,
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE,
(const void *)&optval, optlen) < 0)
return 1;
optval = context->ka_interval;
- if (setsockopt(fd, IPPROTO_IP, TCP_KEEPINTVL,
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL,
(const void *)&optval, optlen) < 0)
return 1;
optval = context->ka_probes;
- if (setsockopt(fd, IPPROTO_IP, TCP_KEEPCNT,
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT,
(const void *)&optval, optlen) < 0)
return 1;
#endif
/* Disable Nagle */
optval = 1;
-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
- setsockopt(fd, SOL_TCP, TCP_NODELAY, (const void *)&optval, optlen);
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
+ !defined(__OpenBSD__)
+ if (setsockopt(fd, SOL_TCP, TCP_NODELAY, (const void *)&optval, optlen) < 0)
+ return 1;
#else
tcp_proto = getprotobyname("TCP");
- setsockopt(fd, tcp_proto->p_proto, TCP_NODELAY, &optval, optlen);
+ if (setsockopt(fd, tcp_proto->p_proto, TCP_NODELAY, &optval, optlen) < 0)
+ return 1;
#endif
/* We are nonblocking... */
- fcntl(fd, F_SETFL, O_NONBLOCK);
+ if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
+ return 1;
return 0;
}
lwsl_warn("setgid: %s\n", strerror(LWS_ERRNO));
if (info->uid != -1)
if (setuid(info->uid))
- lwsl_warn("setuid: %s\n", strerror(LWS_ERRNO));
+ lwsl_warn("setuid: %s\n", strerror(LWS_ERRNO));
}
LWS_VISIBLE int
lws_plat_init_fd_tables(struct libwebsocket_context *context)
{
-#ifdef LWS_USE_LIBEV
- if (LWS_LIBEV_ENABLED(context)) {
- context->w_accept.context = context;
- context->w_sigint.context = context;
+ if (lws_libev_init_fd_table(context))
+ /* libev handled it instead */
return 0;
- }
-#endif
+
if (pipe(context->dummy_pipe_fds)) {
lwsl_err("Unable to create pipe\n");
return 1;
context->fds[0].events = LWS_POLLIN;
context->fds[0].revents = 0;
context->fds_count = 1;
-
+
context->fd_random = open(SYSTEM_RANDOM_FILEPATH, O_RDONLY);
if (context->fd_random < 0) {
lwsl_err("Unable to open random device %s %d\n",
sigaddset(&mask, SIGUSR2);
sigprocmask(SIG_BLOCK, &mask, NULL);
-
+
signal(SIGPIPE, sigpipe_handler);
return 0;
break;
#ifdef LWS_USE_IPV6
case AF_INET6:
- if (rc >= 0)
- break;
memcpy(&addr6->sin6_addr,
&((struct sockaddr_in6 *)ifc->ifa_addr)->sin6_addr,
sizeof(struct in6_addr));
}
freeifaddrs(ifr);
-
+
+ if (rc == -1) {
+ /* check if bind to IP adddress */
+#ifdef LWS_USE_IPV6
+ if (inet_pton(AF_INET6, ifname, &addr6->sin6_addr) == 1)
+ rc = 0;
+ else
+#endif
+ if (inet_pton(AF_INET, ifname, &addr->sin_addr) == 1)
+ rc = 0;
+ }
+
return rc;
}
lws_plat_insert_socket_into_fds(struct libwebsocket_context *context,
struct libwebsocket *wsi)
{
-#ifdef LWS_USE_LIBEV
- if (context && context->io_loop && LWS_LIBEV_ENABLED(context))
- ev_io_start(context->io_loop, (struct ev_io *)&wsi->w_read);
-#endif /* LWS_USE_LIBEV */
+ lws_libev_io(context, wsi, LWS_EV_START | LWS_EV_READ);
context->fds[context->fds_count++].revents = 0;
}
if (ret < 0)
return LWS_INVALID_FILE;
- fstat(ret, &stat_buf);
+ if (fstat(ret, &stat_buf) < 0) {
+ close(ret);
+ return LWS_INVALID_FILE;
+ }
*filelen = stat_buf.st_size;
return ret;
}
#ifdef LWS_USE_IPV6
LWS_VISIBLE const char *
lws_plat_inet_ntop(int af, const void *src, char *dst, int cnt)
-{
+{
return inet_ntop(af, src, dst, cnt);
}
-#endif
\ No newline at end of file
+#endif
projects / platform / upstream / libwebsockets.git / blobdiff