#endif
int log_level = LLL_ERR | LLL_WARN | LLL_NOTICE;
-static void (*lwsl_emit)(int level, const char *line) = lwsl_emit_stderr;
-
+static void (*lwsl_emit)(int level, const char *line)
+#ifndef LWS_PLAT_OPTEE
+ = lwsl_emit_stderr
+#endif
+ ;
+#ifndef LWS_PLAT_OPTEE
static const char * const log_level_names[] = {
"ERR",
"WARN",
"EXTENSION",
"CLIENT",
"LATENCY",
+ "USER",
+ "?",
+ "?"
};
+#endif
void
lws_free_wsi(struct lws *wsi)
{
+ struct lws_context_per_thread *pt;
+ int n;
+
if (!wsi)
return;
+ pt = &wsi->context->pt[(int)wsi->tsi];
+
/* Protocol user data may be allocated either internally by lws
* or by specified the user.
* We should only free what we allocated. */
/* we may not have an ah, but may be on the waiting list... */
lwsl_info("ah det due to close\n");
+ /* we're closing, losing some rx is OK */
+ lws_header_table_force_to_detachable_state(wsi);
lws_header_table_detach(wsi, 0);
+ lws_pt_lock(pt);
+ for (n = 0; n < wsi->context->max_http_header_pool; n++) {
+ if (pt->ah_pool[n].in_use &&
+ pt->ah_pool[n].wsi == wsi) {
+ lwsl_err("%s: ah leak: wsi %p\n", __func__, wsi);
+ pt->ah_pool[n].in_use = 0;
+ pt->ah_pool[n].wsi = NULL;
+ pt->ah_count_in_use--;
+ }
+ }
+ lws_pt_unlock(pt);
+
wsi->context->count_wsi_allocated--;
lwsl_debug("%s: %p, remaining wsi %d\n", __func__, wsi,
wsi->context->count_wsi_allocated);
lws_free(wsi);
}
-static void
+void
lws_remove_from_timeout_list(struct lws *wsi)
{
struct lws_context_per_thread *pt = &wsi->context->pt[(int)wsi->tsi];
struct lws_context_per_thread *pt = &wsi->context->pt[(int)wsi->tsi];
time_t now;
+ if (secs == LWS_TO_KILL_SYNC) {
+ lws_remove_from_timeout_list(wsi);
+ lwsl_debug("synchronously killing %p\n", wsi);
+ lws_close_free_wsi(wsi, LWS_CLOSE_STATUS_NOSTATUS);
+ return;
+ }
+
lws_pt_lock(pt);
time(&now);
lws_remove_from_timeout_list(wsi);
}
+static void
+lws_remove_child_from_any_parent(struct lws *wsi)
+{
+ struct lws **pwsi;
+ int seen = 0;
+
+ if (!wsi->parent)
+ return;
+
+ /* detach ourselves from parent's child list */
+ pwsi = &wsi->parent->child_list;
+ while (*pwsi) {
+ if (*pwsi == wsi) {
+ lwsl_info("%s: detach %p from parent %p\n",
+ __func__, wsi, wsi->parent);
+
+ if (wsi->parent->protocol)
+ wsi->parent->protocol->callback(wsi,
+ LWS_CALLBACK_CHILD_CLOSING,
+ wsi->parent->user_space, wsi, 0);
+
+ *pwsi = wsi->sibling_list;
+ seen = 1;
+ break;
+ }
+ pwsi = &(*pwsi)->sibling_list;
+ }
+ if (!seen)
+ lwsl_err("%s: failed to detach from parent\n", __func__);
+
+ wsi->parent = NULL;
+}
+
+int
+lws_bind_protocol(struct lws *wsi, const struct lws_protocols *p)
+{
+// if (wsi->protocol == p)
+// return 0;
+ const struct lws_protocols *vp = wsi->vhost->protocols, *vpo;
+
+ if (wsi->protocol)
+ wsi->protocol->callback(wsi, LWS_CALLBACK_HTTP_DROP_PROTOCOL,
+ wsi->user_space, NULL, 0);
+ if (!wsi->user_space_externally_allocated)
+ lws_free_set_NULL(wsi->user_space);
+
+ lws_same_vh_protocol_remove(wsi);
+
+ wsi->protocol = p;
+ if (!p)
+ return 0;
+
+ if (lws_ensure_user_space(wsi))
+ return 1;
+
+ if (p > vp && p < &vp[wsi->vhost->count_protocols])
+ lws_same_vh_protocol_insert(wsi, p - vp);
+ else {
+ int n = wsi->vhost->count_protocols;
+ int hit = 0;
+
+ vpo = vp;
+
+ while (n--) {
+ if (p->name && vp->name && !strcmp(p->name, vp->name)) {
+ hit = 1;
+ lws_same_vh_protocol_insert(wsi, vp - vpo);
+ break;
+ }
+ vp++;
+ }
+ if (!hit)
+ lwsl_err("%s: protocol %p is not in vhost %s protocols list\n",
+ __func__, p, wsi->vhost->name);
+ }
+
+ if (wsi->protocol->callback(wsi, LWS_CALLBACK_HTTP_BIND_PROTOCOL,
+ wsi->user_space, NULL, 0))
+ return 1;
+
+ return 0;
+}
+
void
lws_close_free_wsi(struct lws *wsi, enum lws_close_status reason)
{
struct lws_context_per_thread *pt;
- struct lws **pwsi, *wsi1, *wsi2;
+ struct lws *wsi1, *wsi2;
struct lws_context *context;
struct lws_tokens eff_buf;
int n, m, ret;
+ lwsl_debug("%s: %p\n", __func__, wsi);
+
if (!wsi)
return;
}
#endif
- if (wsi->u.hdr.ah)
- /* we're closing, losing some rx is OK */
- wsi->u.hdr.ah->rxpos = wsi->u.hdr.ah->rxlen;
+ /* we're closing, losing some rx is OK */
+ lws_header_table_force_to_detachable_state(wsi);
context = wsi->context;
pt = &context->pt[(int)wsi->tsi];
+ lws_stats_atomic_bump(wsi->context, pt, LWSSTATS_C_API_CLOSE, 1);
/* if we have children, close them first */
if (wsi->child_list) {
wsi->child_list = NULL;
}
+ if (wsi->mode == LWSCM_RAW_FILEDESC) {
+ lws_remove_child_from_any_parent(wsi);
+ remove_wsi_socket_from_fds(wsi);
+ wsi->protocol->callback(wsi,
+ LWS_CALLBACK_RAW_CLOSE_FILE,
+ wsi->user_space, NULL, 0);
+ goto async_close;
+ }
+
#ifdef LWS_WITH_CGI
if (wsi->mode == LWSCM_CGI) {
/* we are not a network connection, but a handler for CGI io */
}
pcgi = &(*pcgi)->cgi_list;
}
+ if (wsi->cgi->headers_buf) {
+ lwsl_debug("close: freed cgi headers\n");
+ lws_free_set_NULL(wsi->cgi->headers_buf);
+ }
/* we have a cgi going, we must kill it */
wsi->cgi->being_closed = 1;
lws_cgi_kill(wsi);
}
#endif
+#if !defined(LWS_NO_CLIENT)
+ if (wsi->mode == LWSCM_HTTP_CLIENT ||
+ wsi->mode == LWSCM_WSCL_WAITING_CONNECT ||
+ wsi->mode == LWSCM_WSCL_WAITING_PROXY_REPLY ||
+ wsi->mode == LWSCM_WSCL_ISSUE_HANDSHAKE ||
+ wsi->mode == LWSCM_WSCL_ISSUE_HANDSHAKE2 ||
+ wsi->mode == LWSCM_WSCL_WAITING_SSL ||
+ wsi->mode == LWSCM_WSCL_WAITING_SERVER_REPLY ||
+ wsi->mode == LWSCM_WSCL_WAITING_EXTENSION_CONNECT ||
+ wsi->mode == LWSCM_WSCL_WAITING_SOCKS_GREETING_REPLY ||
+ wsi->mode == LWSCM_WSCL_WAITING_SOCKS_CONNECT_REPLY ||
+ wsi->mode == LWSCM_WSCL_WAITING_SOCKS_AUTH_REPLY)
+ if (wsi->u.hdr.stash)
+ lws_free_set_NULL(wsi->u.hdr.stash);
+#endif
+
+ if (wsi->mode == LWSCM_RAW) {
+ wsi->protocol->callback(wsi,
+ LWS_CALLBACK_RAW_CLOSE, wsi->user_space, NULL, 0);
+ wsi->socket_is_permanently_unusable = 1;
+ goto just_kill_connection;
+ }
+
if (wsi->mode == LWSCM_HTTP_SERVING_ACCEPTED &&
- wsi->u.http.fd != LWS_INVALID_FILE) {
- lws_plat_file_close(wsi, wsi->u.http.fd);
- wsi->u.http.fd = LWS_INVALID_FILE;
+ wsi->u.http.fop_fd != NULL) {
+ lws_vfs_file_close(&wsi->u.http.fop_fd);
wsi->vhost->protocols->callback(wsi,
LWS_CALLBACK_CLOSED_HTTP, wsi->user_space, NULL, 0);
wsi->told_user_closed = 1;
return;
/* we tried the polite way... */
+ case LWSS_WAITING_TO_SEND_CLOSE_NOTIFICATION:
case LWSS_AWAITING_CLOSE_ACK:
goto just_kill_connection;
if (!wsi->u.ws.close_in_ping_buffer_len) {
wsi->u.ws.close_in_ping_buffer_len = 2;
wsi->u.ws.ping_payload_buf[LWS_PRE] =
- (reason >> 16) & 0xff;
+ (reason >> 8) & 0xff;
wsi->u.ws.ping_payload_buf[LWS_PRE + 1] =
reason & 0xff;
}
#if defined (LWS_WITH_ESP8266)
wsi->close_is_pending_send_completion = 1;
#endif
- n = lws_write(wsi, &wsi->u.ws.ping_payload_buf[LWS_PRE],
- wsi->u.ws.close_in_ping_buffer_len,
- LWS_WRITE_CLOSE);
- if (n >= 0) {
- /*
- * we have sent a nice protocol level indication we
- * now wish to close, we should not send anything more
- */
- wsi->state = LWSS_AWAITING_CLOSE_ACK;
-
- /*
- * ...and we should wait for a reply for a bit
- * out of politeness
- */
- lws_set_timeout(wsi, PENDING_TIMEOUT_CLOSE_ACK, 1);
- lwsl_debug("sent close indication, awaiting ack\n");
- return;
- }
-
- lwsl_info("close: sending close packet failed, hanging up\n");
+ lwsl_debug("waiting for chance to send close\n");
+ wsi->waiting_to_send_close_frame = 1;
+ wsi->state = LWSS_WAITING_TO_SEND_CLOSE_NOTIFICATION;
+ lws_set_timeout(wsi, PENDING_TIMEOUT_CLOSE_SEND, 2);
+ lws_callback_on_writable(wsi);
- /* else, the send failed and we should just hang up */
+ return;
}
just_kill_connection:
- if (wsi->parent) {
- /* detach ourselves from parent's child list */
- pwsi = &wsi->parent->child_list;
- while (*pwsi) {
- if (*pwsi == wsi) {
- //lwsl_notice("%s: detach %p from parent %p\n",
- // __func__, wsi, wsi->parent);
- *pwsi = wsi->sibling_list;
- break;
- }
- pwsi = &(*pwsi)->sibling_list;
- }
- if (*pwsi)
- lwsl_err("%s: failed to detach from parent\n",
- __func__);
- }
+ lws_remove_child_from_any_parent(wsi);
+
#if 0
/* manage the vhost same protocol list entry */
* for the POLLIN to show a zero-size rx before coming back and doing
* the actual close.
*/
- if (wsi->state != LWSS_SHUTDOWN &&
+ if (wsi->mode != LWSCM_RAW &&
+ !(wsi->mode & LWSCM_FLAG_IMPLIES_CALLBACK_CLOSED_CLIENT_HTTP) &&
+ wsi->state != LWSS_SHUTDOWN &&
wsi->state != LWSS_CLIENT_UNCONNECTED &&
reason != LWS_CLOSE_STATUS_NOSTATUS_CONTEXT_DESTROY &&
!wsi->socket_is_permanently_unusable) {
- lwsl_info("%s: shutting down connection: %p (sock %d, state %d)\n", __func__, wsi, wsi->sock, wsi->state);
- n = shutdown(wsi->sock, SHUT_WR);
+#ifdef LWS_OPENSSL_SUPPORT
+ if (lws_is_ssl(wsi) && wsi->ssl)
+ {
+ lwsl_info("%s: shutting down SSL connection: %p (ssl %p, sock %d, state %d)\n", __func__, wsi, wsi->ssl, (int)(long)wsi->desc.sockfd, wsi->state);
+ n = SSL_shutdown(wsi->ssl);
+ if (n == 1) /* If finished the SSL shutdown, then do socket shutdown, else need to retry SSL shutdown */
+ n = shutdown(wsi->desc.sockfd, SHUT_WR);
+ else if (n == 0)
+ lws_change_pollfd(wsi, LWS_POLLOUT, LWS_POLLIN);
+ else /* n < 0 */
+ {
+ int shutdown_error = SSL_get_error(wsi->ssl, n);
+ lwsl_debug("SSL_shutdown returned %d, SSL_get_error: %d\n", n, shutdown_error);
+ if (shutdown_error == SSL_ERROR_WANT_READ) {
+ lws_change_pollfd(wsi, LWS_POLLOUT, LWS_POLLIN);
+ n = 0;
+ } else if (shutdown_error == SSL_ERROR_WANT_WRITE) {
+ lws_change_pollfd(wsi, LWS_POLLOUT, LWS_POLLOUT);
+ n = 0;
+ } else { // actual error occurred, just close the connection
+ n = shutdown(wsi->desc.sockfd, SHUT_WR);
+ }
+ }
+ }
+ else
+#endif
+ {
+ lwsl_info("%s: shutting down connection: %p (sock %d, state %d)\n", __func__, wsi, (int)(long)wsi->desc.sockfd, wsi->state);
+ n = shutdown(wsi->desc.sockfd, SHUT_WR);
+ }
if (n)
lwsl_debug("closing: shutdown (state %d) ret %d\n", wsi->state, LWS_ERRNO);
// This causes problems with disconnection when the events are half closing connection
// FD_READ | FD_CLOSE (33)
-#ifndef _WIN32_WCE
+#if !defined(_WIN32_WCE) && !defined(LWS_WITH_ESP32)
/* libuv: no event available to guarantee completion */
if (!LWS_LIBUV_ENABLED(context)) {
wsi->state = LWSS_SHUTDOWN;
lws_set_timeout(wsi, PENDING_TIMEOUT_SHUTDOWN_FLUSH,
context->timeout_secs);
+
return;
}
#endif
#endif
lwsl_info("%s: real just_kill_connection: %p (sockfd %d)\n", __func__,
- wsi, wsi->sock);
+ wsi, wsi->desc.sockfd);
#ifdef LWS_WITH_HTTP_PROXY
if (wsi->rw) {
lws_remove_from_timeout_list(wsi);
/* checking return redundant since we anyway close */
- if (wsi->sock != LWS_SOCK_INVALID)
+ if (wsi->desc.sockfd != LWS_SOCK_INVALID)
remove_wsi_socket_from_fds(wsi);
+ else
+ lws_same_vh_protocol_remove(wsi);
#if defined(LWS_WITH_ESP8266)
- espconn_disconnect(wsi->sock);
+ espconn_disconnect(wsi->desc.sockfd);
#endif
wsi->state = LWSS_DEAD_SOCKET;
lws_free_set_NULL(wsi->rxflow_buffer);
-
if (wsi->state_pre_close == LWSS_ESTABLISHED ||
wsi->mode == LWSCM_WS_SERVING ||
wsi->mode == LWSCM_WS_CLIENT) {
/* tell the user it's all over for this guy */
- if (wsi->protocol && wsi->protocol->callback &&
+ if (wsi->mode != LWSCM_RAW && wsi->protocol && wsi->protocol->callback &&
((wsi->state_pre_close == LWSS_ESTABLISHED) ||
(wsi->state_pre_close == LWSS_RETURNED_CLOSE_ALREADY) ||
(wsi->state_pre_close == LWSS_AWAITING_CLOSE_ACK) ||
+ (wsi->state_pre_close == LWSS_WAITING_TO_SEND_CLOSE_NOTIFICATION) ||
(wsi->state_pre_close == LWSS_FLUSHING_STORED_SEND_BEFORE_CLOSE) ||
(wsi->mode == LWSCM_WS_CLIENT && wsi->state_pre_close == LWSS_HTTP) ||
(wsi->mode == LWSCM_WS_SERVING && wsi->state_pre_close == LWSS_HTTP))) {
if (wsi->user_space) {
- lwsl_debug("%s: doing LWS_CALLBACK_HTTP_DROP_PROTOCOL for %p prot %s", __func__, wsi, wsi->protocol->name);
+ lwsl_debug("%s: doing LWS_CALLBACK_HTTP_DROP_PROTOCOL for %p prot %s\n", __func__, wsi, wsi->protocol->name);
wsi->protocol->callback(wsi,
LWS_CALLBACK_HTTP_DROP_PROTOCOL,
wsi->user_space, NULL, 0);
LWS_EXT_CB_DESTROY_ANY_WSI_CLOSING, NULL, 0) < 0)
lwsl_warn("ext destroy wsi failed\n");
+async_close:
+
wsi->socket_is_permanently_unusable = 1;
#ifdef LWS_USE_LIBUV
- if (LWS_LIBUV_ENABLED(context)) {
- lwsl_debug("%s: lws_libuv_closehandle: wsi %p\n", __func__, wsi);
- /* libuv has to do his own close handle processing asynchronously */
- lws_libuv_closehandle(wsi);
+ if (!wsi->parent_carries_io)
+ if (LWS_LIBUV_ENABLED(context)) {
+ if (wsi->listener) {
+ lwsl_debug("%s: stopping listner libuv poll\n", __func__);
+ uv_poll_stop(&wsi->w_read.uv_watcher);
+ }
+ lwsl_debug("%s: lws_libuv_closehandle: wsi %p\n", __func__, wsi);
+ /* libuv has to do his own close handle processing asynchronously */
+ lws_libuv_closehandle(wsi);
- return;
- }
+ return;
+ }
#endif
lws_close_free_wsi_final(wsi);
{
int n;
- if (!lws_ssl_close(wsi) && lws_socket_is_valid(wsi->sock)) {
+ if (!lws_ssl_close(wsi) && lws_socket_is_valid(wsi->desc.sockfd)) {
#if LWS_POSIX
- //lwsl_err("*** closing sockfd %d\n", wsi->sock);
- n = compatible_close(wsi->sock);
+ //lwsl_err("*** closing sockfd %d\n", wsi->desc.sockfd);
+ n = compatible_close(wsi->desc.sockfd);
if (n)
lwsl_debug("closing: close ret %d\n", LWS_ERRNO);
#else
- compatible_close(wsi->sock);
+ compatible_close(wsi->desc.sockfd);
(void)n;
#endif
- wsi->sock = LWS_SOCK_INVALID;
+ wsi->desc.sockfd = LWS_SOCK_INVALID;
}
/* outermost destroy notification for wsi (user_space still intact) */
return NULL;
}
-#if LWS_POSIX
+#if LWS_POSIX && !defined(LWS_WITH_ESP32)
LWS_VISIBLE int
interface_to_sa(struct lws_vhost *vh, const char *ifname, struct sockaddr_in *addr, size_t addrlen)
{
}
#endif
+#ifndef LWS_PLAT_OPTEE
#if LWS_POSIX
static int
lws_get_addresses(struct lws_vhost *vh, void *ads, char *name,
#ifdef LWS_USE_IPV6
if (LWS_IPV6_ENABLED(vh)) {
if (!lws_plat_inet_ntop(AF_INET6, &((struct sockaddr_in6 *)ads)->sin6_addr, rip, rip_len)) {
- lwsl_err("inet_ntop", strerror(LWS_ERRNO));
+ lwsl_err("inet_ntop: %s", strerror(LWS_ERRNO));
return -1;
}
ai.ai_family = PF_UNSPEC;
ai.ai_socktype = SOCK_STREAM;
ai.ai_flags = AI_CANONNAME;
-
+#if !defined(LWS_WITH_ESP32)
if (getnameinfo((struct sockaddr *)ads,
sizeof(struct sockaddr_in),
name, name_len, NULL, 0, 0))
return -1;
-
+#endif
if (!rip)
return 0;
}
#endif
+
LWS_VISIBLE const char *
lws_get_peer_simple(struct lws *wsi, char *name, int namelen)
{
int af = AF_INET;
void *p, *q;
+ if (wsi->parent_carries_io)
+ wsi = wsi->parent;
+
#ifdef LWS_USE_IPV6
if (LWS_IPV6_ENABLED(wsi->vhost)) {
len = sizeof(sin6);
}
olen = len;
- if (getpeername(wsi->sock, p, &len) < 0 || len > olen) {
+ if (getpeername(wsi->desc.sockfd, p, &len) < 0 || len > olen) {
lwsl_warn("getpeername: %s\n", strerror(LWS_ERRNO));
return NULL;
}
#endif
#endif
}
+#endif
LWS_VISIBLE void
lws_get_peer_addresses(struct lws *wsi, lws_sockfd_type fd, char *name,
int name_len, char *rip, int rip_len)
{
+#ifndef LWS_PLAT_OPTEE
#if LWS_POSIX
socklen_t len;
#ifdef LWS_USE_IPV6
bail:
lws_latency(context, wsi, "lws_get_peer_addresses", ret, 1);
-#else
+#endif
+#endif
(void)wsi;
(void)fd;
(void)name;
(void)name_len;
(void)rip;
(void)rip_len;
-#endif
+
}
LWS_EXTERN void *
return wsi->protocol;
}
+LWS_VISIBLE LWS_EXTERN const struct lws_protocols *
+lws_vhost_name_to_protocol(struct lws_vhost *vh, const char *name)
+{
+ int n;
+
+ for (n = 0; n < vh->count_protocols; n++)
+ if (!strcmp(name, vh->protocols[n].name))
+ return &vh->protocols[n];
+
+ return NULL;
+}
+
LWS_VISIBLE int
lws_callback_all_protocol(struct lws_context *context,
const struct lws_protocols *protocol, int reason)
return 0;
}
+LWS_VISIBLE LWS_EXTERN void
+lws_set_fops(struct lws_context *context, const struct lws_plat_file_ops *fops)
+{
+ context->fops = fops;
+}
+
+LWS_VISIBLE LWS_EXTERN lws_filepos_t
+lws_vfs_tell(lws_fop_fd_t fop_fd)
+{
+ return fop_fd->pos;
+}
+
+LWS_VISIBLE LWS_EXTERN lws_filepos_t
+lws_vfs_get_length(lws_fop_fd_t fop_fd)
+{
+ return fop_fd->len;
+}
+
+LWS_VISIBLE LWS_EXTERN uint32_t
+lws_vfs_get_mod_time(lws_fop_fd_t fop_fd)
+{
+ return fop_fd->mod_time;
+}
+
+LWS_VISIBLE lws_fileofs_t
+lws_vfs_file_seek_set(lws_fop_fd_t fop_fd, lws_fileofs_t offset)
+{
+ lws_fileofs_t ofs;
+ lwsl_debug("%s: seeking to %ld, len %ld\n", __func__, (long)offset, (long)fop_fd->len);
+ ofs = fop_fd->fops->LWS_FOP_SEEK_CUR(fop_fd, offset - fop_fd->pos);
+ lwsl_debug("%s: result %ld, fop_fd pos %ld\n", __func__, (long)ofs, (long)fop_fd->pos);
+ return ofs;
+}
+
+
+LWS_VISIBLE lws_fileofs_t
+lws_vfs_file_seek_end(lws_fop_fd_t fop_fd, lws_fileofs_t offset)
+{
+ return fop_fd->fops->LWS_FOP_SEEK_CUR(fop_fd, fop_fd->len + fop_fd->pos + offset);
+}
+
+
+const struct lws_plat_file_ops *
+lws_vfs_select_fops(const struct lws_plat_file_ops *fops, const char *vfs_path,
+ const char **vpath)
+{
+ const struct lws_plat_file_ops *pf;
+ const char *p = vfs_path;
+ int n;
+
+ *vpath = NULL;
+
+ /* no non-platform fops, just use that */
+
+ if (!fops->next)
+ return fops;
+
+ /*
+ * scan the vfs path looking for indications we are to be
+ * handled by a specific fops
+ */
+
+ while (p && *p) {
+ if (*p != '/') {
+ p++;
+ continue;
+ }
+ /* the first one is always platform fops, so skip */
+ pf = fops->next;
+ while (pf) {
+ n = 0;
+ while (n < ARRAY_SIZE(pf->fi) && pf->fi[n].sig) {
+ if (p >= vfs_path + pf->fi[n].len)
+ if (!strncmp(p - (pf->fi[n].len - 1),
+ pf->fi[n].sig,
+ pf->fi[n].len - 1)) {
+ *vpath = p + 1;
+ return pf;
+ }
+
+ n++;
+ }
+ pf = pf->next;
+ }
+ p++;
+ }
+
+ return fops;
+}
+
+LWS_VISIBLE LWS_EXTERN lws_fop_fd_t LWS_WARN_UNUSED_RESULT
+lws_vfs_file_open(const struct lws_plat_file_ops *fops, const char *vfs_path,
+ lws_fop_flags_t *flags)
+{
+ const char *vpath = "";
+ const struct lws_plat_file_ops *selected = lws_vfs_select_fops(
+ fops, vfs_path, &vpath);
+
+ return selected->LWS_FOP_OPEN(fops, vfs_path, vpath, flags);
+}
+
+
/**
* lws_now_secs() - seconds since 1970-1-1
*
LWS_VISIBLE int
lws_get_socket_fd(struct lws *wsi)
{
- return wsi->sock;
+ return wsi->desc.sockfd;
}
#endif
if (!proxy)
return -1;
+ /* we have to deal with a possible redundant leading http:// */
+ if (!strncmp(proxy, "http://", 7))
+ proxy += 7;
+
p = strchr(proxy, '@');
if (p) { /* auth is around */
return -1;
}
+#if defined(LWS_WITH_SOCKS5)
+LWS_VISIBLE int
+lws_set_socks(struct lws_vhost *vhost, const char *socks)
+{
+#if !defined(LWS_WITH_ESP8266)
+ char *p_at, *p_colon;
+ char user[96];
+ char password[96];
+
+ if (!socks)
+ return -1;
+
+ vhost->socks_user[0] = '\0';
+ vhost->socks_password[0] = '\0';
+
+ p_at = strchr(socks, '@');
+ if (p_at) { /* auth is around */
+ if ((unsigned int)(p_at - socks) > (sizeof(user)
+ + sizeof(password) - 2)) {
+ lwsl_err("Socks auth too long\n");
+ goto bail;
+ }
+
+ p_colon = strchr(socks, ':');
+ if (p_colon) {
+ if ((unsigned int)(p_colon - socks) > (sizeof(user)
+ - 1) ) {
+ lwsl_err("Socks user too long\n");
+ goto bail;
+ }
+ if ((unsigned int)(p_at - p_colon) > (sizeof(password)
+ - 1) ) {
+ lwsl_err("Socks password too long\n");
+ goto bail;
+ }
+ }
+ strncpy(vhost->socks_user, socks, p_colon - socks);
+ strncpy(vhost->socks_password, p_colon + 1,
+ p_at - (p_colon + 1));
+
+ lwsl_info(" Socks auth, user: %s, password: %s\n",
+ vhost->socks_user, vhost->socks_password );
+
+ socks = p_at + 1;
+ }
+
+ strncpy(vhost->socks_proxy_address, socks,
+ sizeof(vhost->socks_proxy_address) - 1);
+ vhost->socks_proxy_address[sizeof(vhost->socks_proxy_address) - 1]
+ = '\0';
+
+ p_colon = strchr(vhost->socks_proxy_address, ':');
+ if (!p_colon && !vhost->socks_proxy_port) {
+ lwsl_err("socks_proxy needs to be address:port\n");
+ return -1;
+ } else {
+ if (p_colon) {
+ *p_colon = '\0';
+ vhost->socks_proxy_port = atoi(p_colon + 1);
+ }
+ }
+
+ lwsl_info(" Socks %s:%u\n", vhost->socks_proxy_address,
+ vhost->socks_proxy_port);
+
+ return 0;
+
+bail:
+#endif
+ return -1;
+}
+#endif
+
LWS_VISIBLE const struct lws_protocols *
lws_get_protocol(struct lws *wsi)
{
LWS_VISIBLE int
lws_is_final_fragment(struct lws *wsi)
{
- lwsl_info("%s: final %d, rx pk length %d, draining %d", __func__,
- wsi->u.ws.final, wsi->u.ws.rx_packet_length,
- wsi->u.ws.rx_draining_ext);
+ lwsl_info("%s: final %d, rx pk length %ld, draining %ld\n", __func__,
+ wsi->u.ws.final, (long)wsi->u.ws.rx_packet_length,
+ (long)wsi->u.ws.rx_draining_ext);
return wsi->u.ws.final && !wsi->u.ws.rx_packet_length && !wsi->u.ws.rx_draining_ext;
}
+LWS_VISIBLE int
+lws_is_first_fragment(struct lws *wsi)
+{
+ return wsi->u.ws.first_fragment;
+}
+
LWS_VISIBLE unsigned char
lws_get_reserved_bits(struct lws *wsi)
{
return 1;
}
} else
- lwsl_info("%s: %p protocol pss %u, user_space=%d\n",
- __func__, wsi, wsi->protocol->per_session_data_size,
+ lwsl_info("%s: %p protocol pss %lu, user_space=%p\n",
+ __func__, wsi, (long)wsi->protocol->per_session_data_size,
wsi->user_space);
return 0;
}
LWS_VISIBLE int
lwsl_timestamp(int level, char *p, int len)
{
+#ifndef LWS_PLAT_OPTEE
time_t o_now = time(NULL);
unsigned long long now;
struct tm *ptm = NULL;
(int)(now % 10000), log_level_names[n]);
return n;
}
-
+#endif
return 0;
}
+#ifndef LWS_PLAT_OPTEE
LWS_VISIBLE void lwsl_emit_stderr(int level, const char *line)
{
#if !defined(LWS_WITH_ESP8266)
fprintf(stderr, "%s%s", buf, line);
#endif
}
+#endif
LWS_VISIBLE void _lws_logv(int filter, const char *format, va_list vl)
{
lwsl_emit = func;
}
+LWS_VISIBLE int lwsl_visible(int level)
+{
+ return log_level & level;
+}
+
LWS_VISIBLE int
lws_is_ssl(struct lws *wsi)
{
#endif
}
+#ifdef LWS_OPENSSL_SUPPORT
+LWS_VISIBLE SSL*
+lws_get_ssl(struct lws *wsi)
+{
+ return wsi->ssl;
+}
+#endif
+
LWS_VISIBLE int
lws_partial_buffered(struct lws *wsi)
{
LWS_VISIBLE struct lws_plat_file_ops *
lws_get_fops(struct lws_context *context)
{
- return &context->fops;
+ return (struct lws_plat_file_ops *)context->fops;
}
LWS_VISIBLE LWS_EXTERN struct lws_context *
return wsi->user_space;
}
+LWS_VISIBLE LWS_EXTERN void
+lws_set_wsi_user(struct lws *wsi, void *data)
+{
+ if (wsi->user_space_externally_allocated)
+ wsi->user_space = data;
+ else
+ lwsl_err("%s: Cannot set internally-allocated user_space\n",
+ __func__);
+}
+
LWS_VISIBLE LWS_EXTERN struct lws *
lws_get_parent(const struct lws *wsi)
{
}
LWS_VISIBLE LWS_EXTERN void
+lws_set_parent_carries_io(struct lws *wsi)
+{
+ wsi->parent_carries_io = 1;
+}
+
+LWS_VISIBLE LWS_EXTERN void *
+lws_get_opaque_parent_data(const struct lws *wsi)
+{
+ return wsi->opaque_parent_data;
+}
+
+LWS_VISIBLE LWS_EXTERN void
+lws_set_opaque_parent_data(struct lws *wsi, void *data)
+{
+ wsi->opaque_parent_data = data;
+}
+
+LWS_VISIBLE LWS_EXTERN int
+lws_get_child_pending_on_writable(const struct lws *wsi)
+{
+ return wsi->parent_pending_cb_on_writable;
+}
+
+LWS_VISIBLE LWS_EXTERN void
+lws_clear_child_pending_on_writable(struct lws *wsi)
+{
+ wsi->parent_pending_cb_on_writable = 0;
+}
+
+LWS_VISIBLE LWS_EXTERN int
+lws_get_close_length(struct lws *wsi)
+{
+ return wsi->u.ws.close_in_ping_buffer_len;
+}
+
+LWS_VISIBLE LWS_EXTERN unsigned char *
+lws_get_close_payload(struct lws *wsi)
+{
+ return &wsi->u.ws.ping_payload_buf[LWS_PRE];
+}
+
+LWS_VISIBLE LWS_EXTERN void
lws_close_reason(struct lws *wsi, enum lws_close_status status,
unsigned char *buf, size_t len)
{
LWS_EXTERN int
_lws_rx_flow_control(struct lws *wsi)
{
+ struct lws *wsic = wsi->child_list;
+
+ /* if he has children, do those if they were changed */
+ while (wsic) {
+ if (wsic->rxflow_change_to & LWS_RXFLOW_PENDING_CHANGE)
+ _lws_rx_flow_control(wsic);
+
+ wsic = wsic->sibling_list;
+ }
+
/* there is no pending change */
if (!(wsi->rxflow_change_to & LWS_RXFLOW_PENDING_CHANGE)) {
- lwsl_debug("%s: no pending change\n", __func__);
+// lwsl_debug("%s: no pending change\n", __func__);
return 0;
}
else if (!strcmp(*prot, "https") || !strcmp(*prot, "wss"))
*port = 443;
- while (*p && *p != ':' && *p != '/')
- p++;
+ if (*p == '[')
+ {
+ ++(*ads);
+ while (*p && *p != ']')
+ p++;
+ if (*p)
+ *p++ = '\0';
+ }
+ else
+ {
+ while (*p && *p != ':' && *p != '/')
+ p++;
+ }
if (*p == ':') {
*p++ = '\0';
*port = atoi(p);
struct sockaddr_in6 serv_addr6;
#endif
struct sockaddr_in serv_addr4;
- socklen_t len = sizeof(struct sockaddr);
+#ifndef LWS_PLAT_OPTEE
+ socklen_t len = sizeof(struct sockaddr_storage);
+#endif
int n;
- struct sockaddr_in sin;
+ struct sockaddr_storage sin;
struct sockaddr *v;
#ifdef LWS_USE_UNIX_SOCK
} else
#endif
-#ifdef LWS_USE_IPV6
+#if defined(LWS_USE_IPV6) && !defined(LWS_WITH_ESP32)
if (LWS_IPV6_ENABLED(vhost)) {
v = (struct sockaddr *)&serv_addr6;
n = sizeof(struct sockaddr_in6);
bzero((char *) &serv_addr6, sizeof(serv_addr6));
- if (iface &&
- interface_to_sa(vhost, iface,
- (struct sockaddr_in *)v, n) < 0) {
- lwsl_err("Unable to find interface %s\n", iface);
- return -1;
- }
-
if (iface) {
- struct ifaddrs *addrs, *addr;
- char ip[NI_MAXHOST];
- unsigned int i;
-
- getifaddrs(&addrs);
- for (addr = addrs; addr; addr = addr->ifa_next) {
- if (!addr->ifa_addr ||
- addr->ifa_addr->sa_family != AF_INET6)
- continue;
-
- getnameinfo(addr->ifa_addr,
- sizeof(struct sockaddr_in6),
- ip, sizeof(ip),
- NULL, 0, NI_NUMERICHOST);
-
- i = 0;
- while (ip[i])
- if (ip[i++] == '%') {
- ip[i - 1] = '\0';
- break;
- }
-
- if (!strcmp(ip, iface)) {
- serv_addr6.sin6_scope_id =
- if_nametoindex(addr->ifa_name);
- break;
- }
+ if (interface_to_sa(vhost, iface,
+ (struct sockaddr_in *)v, n) < 0) {
+ lwsl_err("Unable to find interface %s\n", iface);
+ return -1;
}
- freeifaddrs(addrs);
+ serv_addr6.sin6_scope_id = lws_get_addr_scope(iface);
}
serv_addr6.sin6_family = AF_INET6;
bzero((char *) &serv_addr4, sizeof(serv_addr4));
serv_addr4.sin_addr.s_addr = INADDR_ANY;
serv_addr4.sin_family = AF_INET;
+#if !defined(LWS_WITH_ESP32)
if (iface &&
interface_to_sa(vhost, iface,
lwsl_err("Unable to find interface %s\n", iface);
return -1;
}
-
+#endif
serv_addr4.sin_port = htons(port);
} /* ipv4 */
return -1;
}
+#ifndef LWS_PLAT_OPTEE
if (getsockname(sockfd, (struct sockaddr *)&sin, &len) == -1)
lwsl_warn("getsockname: %s\n", strerror(LWS_ERRNO));
else
- port = ntohs(sin.sin_port);
+#endif
+#if defined(LWS_USE_IPV6)
+ port = (sin.ss_family == AF_INET6) ?
+ ntohs(((struct sockaddr_in6 *) &sin)->sin6_port) :
+ ntohs(((struct sockaddr_in *) &sin)->sin_port);
+#else
+ port = ntohs(((struct sockaddr_in *) &sin)->sin_port);
+#endif
#endif
return port;
}
+#if defined(LWS_USE_IPV6)
+LWS_EXTERN unsigned long
+lws_get_addr_scope(const char *ipaddr)
+{
+ unsigned long scope = 0;
+
+#ifndef WIN32
+ struct ifaddrs *addrs, *addr;
+ char ip[NI_MAXHOST];
+ unsigned int i;
+
+ getifaddrs(&addrs);
+ for (addr = addrs; addr; addr = addr->ifa_next) {
+ if (!addr->ifa_addr ||
+ addr->ifa_addr->sa_family != AF_INET6)
+ continue;
+
+ getnameinfo(addr->ifa_addr,
+ sizeof(struct sockaddr_in6),
+ ip, sizeof(ip),
+ NULL, 0, NI_NUMERICHOST);
+
+ i = 0;
+ while (ip[i])
+ if (ip[i++] == '%') {
+ ip[i - 1] = '\0';
+ break;
+ }
+
+ if (!strcmp(ip, ipaddr)) {
+ scope = if_nametoindex(addr->ifa_name);
+ break;
+ }
+ }
+ freeifaddrs(addrs);
+#else
+ PIP_ADAPTER_ADDRESSES adapter, addrs = NULL;
+ PIP_ADAPTER_UNICAST_ADDRESS addr;
+ ULONG size = 0;
+ DWORD ret;
+ struct sockaddr_in6 *sockaddr;
+ char ip[NI_MAXHOST];
+ unsigned int i;
+ int found = 0;
+
+ for (i = 0; i < 5; i++)
+ {
+ ret = GetAdaptersAddresses(AF_INET6, GAA_FLAG_INCLUDE_PREFIX,
+ NULL, addrs, &size);
+ if ((ret == NO_ERROR) || (ret == ERROR_NO_DATA)) {
+ break;
+ } else if (ret == ERROR_BUFFER_OVERFLOW)
+ {
+ if (addrs)
+ free(addrs);
+ addrs = (IP_ADAPTER_ADDRESSES *) malloc(size);
+ } else
+ {
+ if (addrs)
+ {
+ free(addrs);
+ addrs = NULL;
+ }
+ lwsl_err("Failed to get IPv6 address table (%d)", ret);
+ break;
+ }
+ }
+
+ if ((ret == NO_ERROR) && (addrs))
+ {
+ adapter = addrs;
+ while ((adapter) && (!found))
+ {
+ addr = adapter->FirstUnicastAddress;
+ while ((addr) && (!found))
+ {
+ if (addr->Address.lpSockaddr->sa_family == AF_INET6)
+ {
+ sockaddr = (struct sockaddr_in6 *) (addr->Address.lpSockaddr);
+
+ lws_plat_inet_ntop(sockaddr->sin6_family, &sockaddr->sin6_addr,
+ ip, sizeof(ip));
+
+ if (!strcmp(ip, ipaddr)) {
+ scope = sockaddr->sin6_scope_id;
+ found = 1;
+ break;
+ }
+ }
+ addr = addr->Next;
+ }
+ adapter = adapter->Next;
+ }
+ }
+ if (addrs)
+ free(addrs);
+#endif
+
+ return scope;
+}
+#endif
+
LWS_EXTERN void
lws_restart_ws_ping_pong_timer(struct lws *wsi)
{
info.uid = context->uid;
info.gid = context->gid;
+#if defined(LWS_HAVE_SYS_CAPABILITY_H) && defined(LWS_HAVE_LIBCAP)
+ memcpy(info.caps, context->caps, sizeof(info.caps));
+ info.count_caps = context->count_caps;
+#endif
+
if (lws_check_opt(context->options, LWS_SERVER_OPTION_EXPLICIT_VHOSTS))
lws_plat_drop_app_privileges(&info);
n = vsnprintf(str, size, format, ap);
va_end(ap);
- if (n >= size)
+ if (n >= (int)size)
return size;
return n;
new_wsi->protocol = context->vhost_list->protocols;
new_wsi->user_space = NULL;
new_wsi->ietf_spec_revision = 0;
- new_wsi->sock = LWS_SOCK_INVALID;
+ new_wsi->desc.sockfd = LWS_SOCK_INVALID;
context->count_wsi_allocated++;
return new_wsi;
return -1;
}
+ wsi->cgi->response_code = HTTP_STATUS_OK;
+
cgi = wsi->cgi;
cgi->wsi = wsi; /* set cgi's owning wsi */
// cgi->pipe_fds[n][!!(n == 0)], cgi->pipe_fds[n][!(n == 0)]);
/* read side is 0, stdin we want the write side, others read */
- cgi->stdwsi[n]->sock = cgi->pipe_fds[n][!!(n == 0)];
+ cgi->stdwsi[n]->desc.sockfd = cgi->pipe_fds[n][!!(n == 0)];
if (fcntl(cgi->pipe_fds[n][!!(n == 0)], F_SETFL, O_NONBLOCK) < 0) {
lwsl_err("%s: setting NONBLOCK failed\n", __func__);
goto bail2;
}
for (n = 0; n < 3; n++) {
- lws_libuv_accept(cgi->stdwsi[n], cgi->stdwsi[n]->sock);
+ lws_libuv_accept(cgi->stdwsi[n], cgi->stdwsi[n]->desc);
if (insert_wsi_socket_into_fds(wsi->context, cgi->stdwsi[n]))
goto bail3;
cgi->stdwsi[n]->parent = wsi;
lws_change_pollfd(cgi->stdwsi[LWS_STDERR], LWS_POLLOUT, LWS_POLLIN);
lwsl_debug("%s: fds in %d, out %d, err %d\n", __func__,
- cgi->stdwsi[LWS_STDIN]->sock, cgi->stdwsi[LWS_STDOUT]->sock,
- cgi->stdwsi[LWS_STDERR]->sock);
+ cgi->stdwsi[LWS_STDIN]->desc.sockfd,
+ cgi->stdwsi[LWS_STDOUT]->desc.sockfd,
+ cgi->stdwsi[LWS_STDERR]->desc.sockfd);
lws_set_timeout(wsi, PENDING_TIMEOUT_CGI, timeout_secs);
* Actually having made the env, as a cgi we don't need the ah
* any more
*/
- if (wsi->u.hdr.ah->rxpos == wsi->u.hdr.ah->rxlen)
+ if (lws_header_table_is_in_detachable_state(wsi))
lws_header_table_detach(wsi, 0);
/* we are ready with the redirection pipes... run the thing */
* process is OK. Stuff that happens after the execvpe() is OK.
*/
- for (n = 0; n < 3; n++)
+ for (n = 0; n < 3; n++) {
if (dup2(cgi->pipe_fds[n][!(n == 0)], n) < 0) {
lwsl_err("%s: stdin dup2 failed\n", __func__);
goto bail3;
}
+ close(cgi->pipe_fds[n][!(n == 0)]);
+ }
#if !defined(LWS_HAVE_VFORK) || !defined(LWS_HAVE_EXECVPE)
for (m = 0; m < n; m++) {
return -1;
}
+/* we have to parse out these headers in the CGI output */
+
+static const char * const significant_hdr[SIGNIFICANT_HDR_COUNT] = {
+ "content-length: ",
+ "location: ",
+ "status: ",
+ "transfer-encoding: chunked",
+};
+
LWS_VISIBLE LWS_EXTERN int
lws_cgi_write_split_stdout_headers(struct lws *wsi)
{
- int n, m, match = 0, lp = 0;
- static const char * const content_length = "content-length: ";
- char buf[LWS_PRE + 1024], *start = &buf[LWS_PRE], *p = start,
- *end = &buf[sizeof(buf) - 1 - LWS_PRE], c, l[12];
+ int n, m;
+ unsigned char buf[LWS_PRE + 1024], *start = &buf[LWS_PRE], *p = start,
+ *end = &buf[sizeof(buf) - 1 - LWS_PRE];
+ char c;
if (!wsi->cgi)
return -1;
* payload chunks, since they need to be
* handled separately
*/
+
+ switch (wsi->hdr_state) {
+
+ case LHCS_RESPONSE:
+ lwsl_info("LHCS_RESPONSE: issuing response %d\n",
+ wsi->cgi->response_code);
+ if (lws_add_http_header_status(wsi, wsi->cgi->response_code, &p, end))
+ return 1;
+ if (lws_add_http_header_by_token(wsi, WSI_TOKEN_CONNECTION,
+ (unsigned char *)"close", 5, &p, end))
+ return 1;
+ n = lws_write(wsi, start, p - start,
+ LWS_WRITE_HTTP_HEADERS);
+
+ /* finalize cached headers before dumping them */
+ if (lws_finalize_http_header(wsi,
+ (unsigned char **)&wsi->cgi->headers_pos,
+ (unsigned char *)wsi->cgi->headers_end)) {
+
+ lwsl_notice("finalize failed\n");
+ return -1;
+ }
+
+ wsi->hdr_state = LHCS_DUMP_HEADERS;
+ wsi->reason_bf |= 8;
+ lws_callback_on_writable(wsi);
+ /* back to the loop for writeability again */
+ return 0;
+
+ case LHCS_DUMP_HEADERS:
+
+ n = wsi->cgi->headers_pos - wsi->cgi->headers_dumped;
+ if (n > 512)
+ n = 512;
+
+ lwsl_debug("LHCS_DUMP_HEADERS: %d\n", n);
+
+ m = lws_write(wsi, (unsigned char *)wsi->cgi->headers_dumped,
+ n, LWS_WRITE_HTTP_HEADERS);
+ if (m < 0) {
+ lwsl_debug("%s: write says %d\n", __func__, m);
+ return -1;
+ }
+ wsi->cgi->headers_dumped += n;
+ if (wsi->cgi->headers_dumped == wsi->cgi->headers_pos) {
+ wsi->hdr_state = LHCS_PAYLOAD;
+ lws_free_set_NULL(wsi->cgi->headers_buf);
+ lwsl_debug("freed cgi headers\n");
+ } else {
+ wsi->reason_bf |= 8;
+ lws_callback_on_writable(wsi);
+ }
+
+ /* writeability becomes uncertain now we wrote
+ * something, we must return to the event loop
+ */
+ return 0;
+ }
+
+ if (!wsi->cgi->headers_buf) {
+ /* if we don't already have a headers buf, cook one up */
+ n = 2048;
+ wsi->cgi->headers_buf = malloc(n);
+ if (!wsi->cgi->headers_buf) {
+ lwsl_err("OOM\n");
+ return -1;
+ }
+
+ lwsl_debug("allocated cgi hdrs\n");
+ wsi->cgi->headers_pos = wsi->cgi->headers_buf;
+ wsi->cgi->headers_dumped = wsi->cgi->headers_pos;
+ wsi->cgi->headers_end = wsi->cgi->headers_buf + n - 1;
+
+ for (n = 0; n < SIGNIFICANT_HDR_COUNT; n++) {
+ wsi->cgi->match[n] = 0;
+ wsi->cgi->lp = 0;
+ }
+ }
+
n = read(lws_get_socket_fd(wsi->cgi->stdwsi[LWS_STDOUT]), &c, 1);
if (n < 0) {
if (errno != EAGAIN) {
}
else
n = 0;
+
+ if (wsi->cgi->headers_pos >= wsi->cgi->headers_end - 4) {
+ lwsl_notice("CGI headers larger than buffer size\n");
+
+ return -1;
+ }
}
if (n) {
- lwsl_debug("-- 0x%02X %c\n", (unsigned char)c, c);
+ lwsl_debug("-- 0x%02X %c %d %d\n", (unsigned char)c, c, wsi->cgi->match[1], wsi->hdr_state);
+ if (!c)
+ return -1;
switch (wsi->hdr_state) {
case LCHS_HEADER:
- if (!content_length[match] &&
- (c >= '0' && c <= '9') &&
- lp < sizeof(l) - 1) {
- l[lp++] = c;
- l[lp] = '\0';
- wsi->cgi->content_length = atol(l);
+ hdr:
+ for (n = 0; n < SIGNIFICANT_HDR_COUNT; n++) {
+ /* significant headers with numeric decimal payloads */
+ if (!significant_hdr[n][wsi->cgi->match[n]] &&
+ (c >= '0' && c <= '9') &&
+ wsi->cgi->lp < sizeof(wsi->cgi->l) - 1) {
+ wsi->cgi->l[wsi->cgi->lp++] = c;
+ wsi->cgi->l[wsi->cgi->lp] = '\0';
+ switch (n) {
+ case SIGNIFICANT_HDR_CONTENT_LENGTH:
+ wsi->cgi->content_length = atoll(wsi->cgi->l);
+ break;
+ case SIGNIFICANT_HDR_STATUS:
+ wsi->cgi->response_code = atol(wsi->cgi->l);
+ lwsl_debug("Status set to %d\n", wsi->cgi->response_code);
+ break;
+ default:
+ break;
+ }
+ }
+ /* hits up to the NUL are sticky until next hdr */
+ if (significant_hdr[n][wsi->cgi->match[n]]) {
+ if (tolower(c) == significant_hdr[n][wsi->cgi->match[n]])
+ wsi->cgi->match[n]++;
+ else
+ wsi->cgi->match[n] = 0;
+ }
}
- if (tolower(c) == content_length[match])
- match++;
- else
- match = 0;
/* some cgi only send us \x0a for EOL */
if (c == '\x0a') {
wsi->hdr_state = LCHS_SINGLE_0A;
- *p++ = '\x0d';
+ *wsi->cgi->headers_pos++ = '\x0d';
}
- *p++ = c;
- if (c == '\x0d') {
+ *wsi->cgi->headers_pos++ = c;
+ if (c == '\x0d')
wsi->hdr_state = LCHS_LF1;
- break;
+
+ if (wsi->hdr_state != LCHS_HEADER &&
+ !significant_hdr[SIGNIFICANT_HDR_TRANSFER_ENCODING][wsi->cgi->match[SIGNIFICANT_HDR_TRANSFER_ENCODING]]) {
+ lwsl_debug("cgi produced chunked\n");
+ wsi->cgi->explicitly_chunked = 1;
+ }
+
+ /* presence of Location: mandates 302 retcode */
+ if (wsi->hdr_state != LCHS_HEADER &&
+ !significant_hdr[SIGNIFICANT_HDR_LOCATION][wsi->cgi->match[SIGNIFICANT_HDR_LOCATION]]) {
+ lwsl_debug("CGI: Location hdr seen\n");
+ wsi->cgi->response_code = 302;
}
break;
case LCHS_LF1:
- *p++ = c;
+ *wsi->cgi->headers_pos++ = c;
if (c == '\x0a') {
wsi->hdr_state = LCHS_CR2;
break;
break;
}
wsi->hdr_state = LCHS_HEADER;
- match = 0;
- *p++ = c;
- break;
+ for (n = 0; n < SIGNIFICANT_HDR_COUNT; n++)
+ wsi->cgi->match[n] = 0;
+ wsi->cgi->lp = 0;
+ goto hdr;
+
case LCHS_LF2:
case LCHS_SINGLE_0A:
m = wsi->hdr_state;
if (c == '\x0a') {
- lwsl_debug("Content-Length: %ld\n", wsi->cgi->content_length);
- wsi->hdr_state = LHCS_PAYLOAD;
+ lwsl_debug("Content-Length: %lld\n", (unsigned long long)wsi->cgi->content_length);
+ wsi->hdr_state = LHCS_RESPONSE;
/* drop the \0xa ... finalize will add it if needed */
- if (lws_finalize_http_header(wsi,
- (unsigned char **)&p,
- (unsigned char *)end))
- return -1;
break;
}
if (m == LCHS_LF2)
/* we got \r\n\r[^\n]... it's unreasonable */
return -1;
/* we got \x0anext header, it's reasonable */
- *p++ = c;
+ *wsi->cgi->headers_pos++ = c;
wsi->hdr_state = LCHS_HEADER;
+ for (n = 0; n < SIGNIFICANT_HDR_COUNT; n++)
+ wsi->cgi->match[n] = 0;
+ wsi->cgi->lp = 0;
break;
case LHCS_PAYLOAD:
break;
}
/* ran out of input, ended the headers, or filled up the headers buf */
- if (!n || wsi->hdr_state == LHCS_PAYLOAD || (p + 4) == end) {
-
- m = lws_write(wsi, (unsigned char *)start,
- p - start, LWS_WRITE_HTTP_HEADERS);
- if (m < 0) {
- lwsl_debug("%s: write says %d\n", __func__, m);
- return -1;
- }
- /* writeability becomes uncertain now we wrote
- * something, we must return to the event loop
- */
-
+ if (!n || wsi->hdr_state == LHCS_PAYLOAD)
return 0;
- }
}
+ /* payload processing */
+
n = read(lws_get_socket_fd(wsi->cgi->stdwsi[LWS_STDOUT]),
start, sizeof(buf) - LWS_PRE);
while (n > 0) {
/* find finished guys but don't reap yet */
- n = waitpid(-1, &status, WNOHANG | WNOWAIT);
+ n = waitpid(-1, &status, WNOHANG);
if (n <= 0)
continue;
lwsl_debug("%s: observed PID %d terminated\n", __func__, n);
if (cgi->pid <= 0)
continue;
+ /* finish sending cached headers */
+ if (cgi->headers_buf)
+ continue;
+
/* wait for stdout to be drained */
if (cgi->content_length > cgi->content_length_seen)
continue;
if (cgi->content_length) {
- lwsl_debug("%s: wsi %p: expected content length seen: %ld\n",
- __func__, cgi->wsi, cgi->content_length_seen);
+ lwsl_debug("%s: wsi %p: expected content length seen: %lld\n",
+ __func__, cgi->wsi, (unsigned long long)cgi->content_length_seen);
}
/* reap it */
if (n == cgi->pid) {
lwsl_debug("%s: found PID %d on cgi list\n",
__func__, n);
+
+ if (!cgi->content_length && cgi->explicitly_chunked) {
+ /*
+ * well, if he sends chunked... give him 5s after the
+ * cgi terminated to send buffered
+ */
+ cgi->chunked_grace++;
+ continue;
+ }
+
/* defeat kill() */
cgi->pid = 0;
lws_cgi_kill(cgi->wsi);
if (cgi->pid <= 0)
continue;
+ /* we deferred killing him after reaping his PID */
+ if (cgi->chunked_grace) {
+ cgi->chunked_grace++;
+ if (cgi->chunked_grace < 5)
+ continue;
+ goto finish_him;
+ }
+
+ /* finish sending cached headers */
+ if (cgi->headers_buf)
+ continue;
+
/* wait for stdout to be drained */
if (cgi->content_length > cgi->content_length_seen)
continue;
- if (cgi->content_length) {
- lwsl_debug("%s: wsi %p: expected content length seen: %ld\n",
- __func__, cgi->wsi, cgi->content_length_seen);
- }
+ if (cgi->content_length)
+ lwsl_debug("%s: wsi %p: expected content length seen: %lld\n",
+ __func__, cgi->wsi, (unsigned long long)cgi->content_length_seen);
/* reap it */
if (waitpid(cgi->pid, &status, WNOHANG) > 0) {
+ if (!cgi->content_length) {
+ /*
+ * well, if he sends chunked... give him 5s after the
+ * cgi terminated to send buffered
+ */
+ cgi->chunked_grace++;
+ continue;
+ }
+finish_him:
lwsl_debug("%s: found PID %d on cgi list\n",
__func__, cgi->pid);
/* defeat kill() */
#endif
/* general anti zombie defence */
- n = waitpid(-1, &status, WNOHANG);
+// n = waitpid(-1, &status, WNOHANG);
//if (n > 0)
// lwsl_notice("%s: anti-zombie wait says %d\n", __func__, n);
const struct lws_vhost *vh = context->vhost_list;
const struct lws_context_per_thread *pt;
time_t t = time(NULL);
- int n, cc = 0, listening = 0, cgi_count = 0;
+ int n, listening = 0, cgi_count = 0;
struct lws_conn_stats cs;
double d = 0;
#ifdef LWS_WITH_CGI
buf += lws_snprintf(buf, end - buf, "\"contexts\":[\n");
- if (cc++)
- buf += lws_snprintf(buf, end - buf, ",");
-
buf += lws_snprintf(buf, end - buf, "{ "
"\"context_uptime\":\"%ld\",\n"
"\"cgi_spawned\":\"%d\",\n"
}
#endif
+
+#if defined(LWS_WITH_STATS)
+
+LWS_VISIBLE LWS_EXTERN uint64_t
+lws_stats_get(struct lws_context *context, int index)
+{
+ if (index >= LWSSTATS_SIZE)
+ return 0;
+
+ return context->lws_stats[index];
+}
+
+LWS_VISIBLE LWS_EXTERN void
+lws_stats_log_dump(struct lws_context *context)
+{
+ struct lws_vhost *v = context->vhost_list;
+ int n;
+
+ if (!context->updated)
+ return;
+
+ context->updated = 0;
+
+ lwsl_notice("\n");
+ lwsl_notice("LWS internal statistics dump ----->\n");
+ lwsl_notice("LWSSTATS_C_CONNECTIONS: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_CONNECTIONS));
+ lwsl_notice("LWSSTATS_C_API_CLOSE: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_API_CLOSE));
+ lwsl_notice("LWSSTATS_C_API_READ: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_API_READ));
+ lwsl_notice("LWSSTATS_C_API_LWS_WRITE: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_API_LWS_WRITE));
+ lwsl_notice("LWSSTATS_C_API_WRITE: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_API_WRITE));
+ lwsl_notice("LWSSTATS_C_WRITE_PARTIALS: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_WRITE_PARTIALS));
+ lwsl_notice("LWSSTATS_C_WRITEABLE_CB_REQ: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_WRITEABLE_CB_REQ));
+ lwsl_notice("LWSSTATS_C_WRITEABLE_CB_EFF_REQ: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_WRITEABLE_CB_EFF_REQ));
+ lwsl_notice("LWSSTATS_C_WRITEABLE_CB: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_WRITEABLE_CB));
+ lwsl_notice("LWSSTATS_C_SSL_CONNECTIONS_FAILED: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_SSL_CONNECTIONS_FAILED));
+ lwsl_notice("LWSSTATS_C_SSL_CONNECTIONS_ACCEPTED: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_SSL_CONNECTIONS_ACCEPTED));
+ lwsl_notice("LWSSTATS_C_SSL_CONNS_HAD_RX: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_SSL_CONNS_HAD_RX));
+
+ lwsl_notice("LWSSTATS_C_TIMEOUTS: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_TIMEOUTS));
+ lwsl_notice("LWSSTATS_C_SERVICE_ENTRY: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_C_SERVICE_ENTRY));
+ lwsl_notice("LWSSTATS_B_READ: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_B_READ));
+ lwsl_notice("LWSSTATS_B_WRITE: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_B_WRITE));
+ lwsl_notice("LWSSTATS_B_PARTIALS_ACCEPTED_PARTS: %8llu\n", (unsigned long long)lws_stats_get(context, LWSSTATS_B_PARTIALS_ACCEPTED_PARTS));
+ lwsl_notice("LWSSTATS_MS_SSL_CONNECTIONS_ACCEPTED_DELAY: %8llums\n", (unsigned long long)lws_stats_get(context, LWSSTATS_MS_SSL_CONNECTIONS_ACCEPTED_DELAY) / 1000);
+ if (lws_stats_get(context, LWSSTATS_C_SSL_CONNECTIONS_ACCEPTED))
+ lwsl_notice(" Avg accept delay: %8llums\n",
+ (unsigned long long)(lws_stats_get(context, LWSSTATS_MS_SSL_CONNECTIONS_ACCEPTED_DELAY) /
+ lws_stats_get(context, LWSSTATS_C_SSL_CONNECTIONS_ACCEPTED)) / 1000);
+ lwsl_notice("LWSSTATS_MS_SSL_RX_DELAY: %8llums\n", (unsigned long long)lws_stats_get(context, LWSSTATS_MS_SSL_RX_DELAY) / 1000);
+ if (lws_stats_get(context, LWSSTATS_C_SSL_CONNS_HAD_RX))
+ lwsl_notice(" Avg accept-rx delay: %8llums\n",
+ (unsigned long long)(lws_stats_get(context, LWSSTATS_MS_SSL_RX_DELAY) /
+ lws_stats_get(context, LWSSTATS_C_SSL_CONNS_HAD_RX)) / 1000);
+
+ lwsl_notice("LWSSTATS_MS_WRITABLE_DELAY: %8lluus\n",
+ (unsigned long long)lws_stats_get(context, LWSSTATS_MS_WRITABLE_DELAY));
+ lwsl_notice("LWSSTATS_MS_WORST_WRITABLE_DELAY: %8lluus\n",
+ (unsigned long long)lws_stats_get(context, LWSSTATS_MS_WORST_WRITABLE_DELAY));
+ if (lws_stats_get(context, LWSSTATS_C_WRITEABLE_CB))
+ lwsl_notice(" Avg writable delay: %8lluus\n",
+ (unsigned long long)(lws_stats_get(context, LWSSTATS_MS_WRITABLE_DELAY) /
+ lws_stats_get(context, LWSSTATS_C_WRITEABLE_CB)));
+ lwsl_notice("Simultaneous SSL restriction: %8d/%d/%d\n", context->simultaneous_ssl,
+ context->simultaneous_ssl_restriction, context->ssl_gate_accepts);
+
+ lwsl_notice("Live wsi: %8d\n", context->count_wsi_allocated);
+
+#if defined(LWS_WITH_STATS)
+ context->updated = 1;
+#endif
+
+ while (v) {
+ if (v->lserv_wsi) {
+
+ struct lws_context_per_thread *pt = &context->pt[(int)v->lserv_wsi->tsi];
+ struct lws_pollfd *pfd;
+
+ pfd = &pt->fds[v->lserv_wsi->position_in_fds_table];
+
+ lwsl_notice(" Listen port %d actual POLLIN: %d\n",
+ v->listen_port, (int)pfd->events & LWS_POLLIN);
+ }
+
+ v = v->vhost_next;
+ }
+
+ for (n = 0; n < context->count_threads; n++) {
+ struct lws_context_per_thread *pt = &context->pt[n];
+ struct lws *wl;
+ int m = 0;
+
+ lwsl_notice("PT %d\n", n + 1);
+
+ lws_pt_lock(pt);
+
+ lwsl_notice(" AH in use / max: %d / %d\n",
+ pt->ah_count_in_use,
+ context->max_http_header_pool);
+
+ wl = pt->ah_wait_list;
+ while (wl) {
+ m++;
+ wl = wl->u.hdr.ah_wait_list;
+ }
+
+ lwsl_notice(" AH wait list count / actual: %d / %d\n",
+ pt->ah_wait_list_length, m);
+
+ lws_pt_unlock(pt);
+ }
+
+ lwsl_notice("\n");
+}
+
+void
+lws_stats_atomic_bump(struct lws_context * context,
+ struct lws_context_per_thread *pt, int index, uint64_t bump)
+{
+ lws_pt_lock(pt);
+ context->lws_stats[index] += bump;
+ if (index != LWSSTATS_C_SERVICE_ENTRY)
+ context->updated = 1;
+ lws_pt_unlock(pt);
+}
+
+void
+lws_stats_atomic_max(struct lws_context * context,
+ struct lws_context_per_thread *pt, int index, uint64_t val)
+{
+ lws_pt_lock(pt);
+ if (val > context->lws_stats[index]) {
+ context->lws_stats[index] = val;
+ context->updated = 1;
+ }
+ lws_pt_unlock(pt);
+}
+
+#endif
projects / platform / upstream / libwebsockets.git / blobdiff