fixes

Author: lws-team

include/libwebsockets/lws-system.h

@@ -182,10 +182,12 @@ typedef enum {
 	LWS_CPD_NO_INTERNET,	/* we couldn't touch anything */
 } lws_cpd_result_t;
 
+#if defined(LWS_WITH_NETWORK)
 typedef enum {
 	LWS_EXTIP_SRC_DHT,
 	LWS_EXTIP_SRC_EXTIP
 } lws_extip_src_t;
+#endif
 
 typedef void (*lws_attach_cb_t)(struct lws_context *context, int tsi, void *opaque);
 struct lws_attach_item;
@@ -269,6 +271,7 @@ typedef struct lws_system_ops {
 #endif
 } lws_system_ops_t;
 
+#if defined(LWS_WITH_NETWORK)
 /**
  * lws_extip_report() - update external IP tracking state from callback
  *
@@ -298,6 +301,7 @@ lws_extip_report(struct lws_context *cx, lws_extip_src_t src, const lws_sockaddr
  */
 LWS_VISIBLE LWS_EXTERN int
 lws_extip_get_best(struct lws_context *cx, int af, lws_sockaddr46 *sa46);
+#endif
 
 #if defined(LWS_WITH_SYS_STATE)
 

lib/plat/unix/unix-spawn.c

@@ -466,7 +466,11 @@ lws_spawn_piped(const struct lws_spawn_piped_info *i)
 							if (slave >= 0) {
 								struct termios t;
 								tcgetattr(slave, &t);
-								cfmakeraw(&t);
+								t.c_iflag &= (tcflag_t)~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
+								t.c_oflag &= (tcflag_t)~OPOST;
+								t.c_lflag &= (tcflag_t)~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+								t.c_cflag &= (tcflag_t)~(CSIZE | PARENB);
+								t.c_cflag |= CS8;
 								tcsetattr(slave, TCSANOW, &t);
 								lsp->pipe_fds[n][0] = master;
 								lsp->pipe_fds[n][1] = slave;
@@ -745,20 +749,29 @@ lws_spawn_piped(const struct lws_spawn_piped_info *i)
 	 * Bind the child's stdin / out / err to its side of our pipes
 	 */
 
-	for (m = 0; m < 3; m++) {
-		if (dup2(lsp->pipe_fds[m][m != 0], m) < 0) {
-			lwsl_err("%s: stdin dup2 failed\n", __func__);
-			goto bail3;
+	{
+		int cfd[3];
+
+		for (m = 0; m < 3; m++)
+			cfd[m] = lsp->pipe_fds[m][m != 0];
+
+		for (m = 0; m < 3; m++) {
+			if (cfd[m] < 0)
+				continue;
+			if (dup2(cfd[m], m) < 0) {
+				lwsl_err("%s: dup2 failed for fd index %d (oldfd %d, newfd %d): errno %d (%s)\n",
+					 __func__, m, cfd[m], m, errno, strerror(errno));
+				goto bail3;
+			}
 		}
-		/*
-		 * CLOEXEC on the lws-side of the pipe fds should have already
-		 * dealt with closing those for the child perspective.
-		 *
-		 * Now it has done the dup, the child should close its original
-		 * copies of its side of the pipes.
-		 */
 
-		close(lsp->pipe_fds[m][m != 0]);
+		for (m = 0; m < 3; m++) {
+			if (cfd[m] >= 0 && cfd[m] != 0 && cfd[m] != 1 && cfd[m] != 2) {
+				close(cfd[m]);
+				if (i->pty_mode && m == LWS_STDOUT)
+					cfd[LWS_STDERR] = -1; /* Prevent double close */
+			}
+		}
 	}
 
 #if defined(__sun) || !defined(LWS_HAVE_VFORK) || !defined(LWS_HAVE_EXECVPE)

lib/roles/http/server/lejp-conf.c

@@ -1329,7 +1329,6 @@ lwsws_get_config_vhosts(struct lws_context *context,
 		if (!vh)
 			return 1;
 
-		extern int lws_context_init_ssl_library(struct lws_context *cx, const struct lws_context_creation_info *info);
 		lws_context_init_ssl_library(context, &i);
 		lws_init_vhost_client_ssl(&i, vh);
 

lib/system/system.c

@@ -262,8 +262,6 @@ lws_system_do_attach(struct lws_context_per_thread *pt)
 	return 0;
 }
 
-#endif
-
 void
 lws_extip_report(struct lws_context *cx, lws_extip_src_t src,
                  const lws_sockaddr46 *sa46, int af, int status,
@@ -287,7 +285,9 @@ lws_extip_report(struct lws_context *cx, lws_extip_src_t src,
 	}
 
 	if (memcmp(&old, target, sizeof(*target))) {
+#if defined(LWS_WITH_IPV6)
 		int c = 0;
+#endif
 		char payload[128], buf4[64];
 		char *p = payload, *end = payload + sizeof(payload);
 
@@ -296,7 +296,9 @@ lws_extip_report(struct lws_context *cx, lws_extip_src_t src,
 		if (cx->ext_ipv4.sa4.sin_family == AF_INET) {
 			lws_sa46_write_numeric_address(&cx->ext_ipv4, buf4, sizeof(buf4));
 			p += lws_snprintf(p, lws_ptr_diff_size_t(end, p), "\"%s\"", buf4);
+#if defined(LWS_WITH_IPV6)
 			c++;
+#endif
 		}
 
 #if defined(LWS_WITH_IPV6)
@@ -340,3 +342,5 @@ lws_extip_get_best(struct lws_context *cx, int af, lws_sockaddr46 *sa46)
 		memset(sa46, 0, sizeof(*sa46));
 	return 1;
 }
+
+#endif

minimal-examples-lowlevel/api-tests/api-test-x509/main.c

@@ -43,7 +43,7 @@ int main(int argc, const char **argv)
 		return 1;
 	}
 
-	if (lws_x509_parse_from_pem(x509, test_cert, strlen(test_cert))) {
+	if (lws_x509_parse_from_pem(x509, test_cert, strlen(test_cert) + 1)) {
 		lwsl_err("lws_x509_parse_from_pem failed\n");
 		ret = 1;
 		goto bail;

minimal-examples-lowlevel/dbus-server/minimal-dbus-ws-proxy/protocol_lws_minimal_dbus_ws_proxy.c

@@ -217,14 +217,13 @@ static DBusHandlerResult
 dmh_connect(DBusConnection *c, DBusMessage *m, DBusMessage **reply, void *d)
 {
 	struct lws_dbus_ctx_wsproxy *wspctx = (struct lws_dbus_ctx_wsproxy *)d;
-	const char *prot = "", *ads = "", *path = "", *baduri = "Bad Uri",
+	const char *prot = "", *baduri = "Bad Uri",
 		   *connecting = "Connecting", *failed = "Failed", **pp;
 	struct lws_client_connect_info i;
 	char host[128];
 	const char *uri, *subprotocol;
 	lws_parse_uri_t *puri = NULL;
 	DBusError err;
-	int port = 0;
 
 	dbus_error_init(&err);
 

plugins/protocol_lws_dht_dnssec_monitor/protocol_lws_dht_dnssec_monitor.c

@@ -233,7 +233,7 @@ whois_cb(void *opaque, const struct lws_whois_results *res)
 				     now, now + 300);
 
 			if (lws_jwt_sign_compact(wqi->vhd->context, &wqi->vhd->auth_jwk, "HS256",
-						 jwt, &jwt_len, temp, sizeof(temp), jwt_payload)) {
+						 jwt, &jwt_len, temp, sizeof(temp), "%s", jwt_payload)) {
 				lwsl_err("[INSTRUMENT] %s: failed to generate jwt for whois\n", __func__);
 			}
 		}
@@ -359,7 +359,7 @@ calc_local_ds(struct vhd *vhd, const char *domain, char *out, size_t out_len)
 	memcpy(p, rdata, rdata_len);
 	size_t pay_len = (size_t)lws_ptr_diff(p + rdata_len, payload);
 
-	int htype = LWS_GENHASH_TYPE_SHA256;
+	enum lws_genhash_types htype = LWS_GENHASH_TYPE_SHA256;
 	int dtype = 2;
 	int dlen = 32;
 	if (alg == 14) {