cm4

Author: lws-team

lib/core-net/adopt.c

@@ -834,6 +834,7 @@ lws_create_adopt_udp2(struct lws *wsi, const char *ads,
 
 #if defined(LWS_WITH_IPV6) && defined(IPV6_V6ONLY)
 		if (s->dest.sa4.sin_family == AF_INET6 &&
+		    !lws_sa46_is_ipv4_mapped(&s->dest) &&
 		    (!(wsi->a.vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_MODIFY) ||
 		     (wsi->a.vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_VALUE))) {
 			int opt = 1;
@@ -942,8 +943,7 @@ lws_create_adopt_udp2(struct lws *wsi, const char *ads,
 #endif
 
 bail:
-
-	/* caller must close */
+	lws_close_free_wsi(wsi, LWS_CLOSE_STATUS_NOSTATUS, "adopt udp2 fail");
 
 	return NULL;
 }
@@ -1024,6 +1024,7 @@ lws_create_adopt_udp2(struct lws *wsi, const char *ads,
 
 #if defined(LWS_WITH_IPV6) && defined(IPV6_V6ONLY)
 	if (dest.sa4.sin_family == AF_INET6 &&
+	    !lws_sa46_is_ipv4_mapped(&dest) &&
 	    (!(wsi->a.vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_MODIFY) ||
 	     (wsi->a.vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_VALUE))) {
 		int opt = 1;
@@ -1097,6 +1098,8 @@ lws_create_adopt_udp2(struct lws *wsi, const char *ads,
 resume:
 	compatible_close(sock.sockfd);
 bail:
+	lws_close_free_wsi(wsi, LWS_CLOSE_STATUS_NOSTATUS, "adopt udp2 fail");
+
 	return NULL;
 }
 #endif

lib/core-net/client/connect2.c

@@ -509,7 +509,12 @@ lws_client_connect_2_dnsreq_MAY_CLOSE_WSI(struct lws *wsi)
 		}
 #endif
 		n = lws_async_dns_query(wsi->a.context, wsi->tsi, adsin,
-				LWS_ADNS_RECORD_A, lws_client_connect_3_connect,
+#if defined(LWS_WITH_IPV6) && !defined(LWS_WITH_IPV4)
+				LWS_ADNS_RECORD_AAAA,
+#else
+				LWS_ADNS_RECORD_A,
+#endif
+				lws_client_connect_3_connect,
 				wsi, NULL, NULL);
 	}
 

lib/core-net/client/sort-dns.c

@@ -644,6 +644,10 @@ lws_sort_dns(struct lws *wsi, const struct addrinfo *result)
 		if (ai->ai_family == AF_INET6)
 			goto next;
 #endif
+#if !defined(LWS_WITH_IPV4)
+		if (ai->ai_family == AF_INET)
+			goto next;
+#endif
 
 		ds = lws_zalloc(sizeof(*ds), __func__);
 		if (!ds)

lib/core-net/network.c

@@ -944,6 +944,8 @@ lws_sa46_parse_numeric_address(const char *ads, lws_sockaddr46 *sa46)
 	uint8_t a[16];
 	int n;
 
+	memset(sa46, 0, sizeof(*sa46));
+
 	n = lws_parse_numeric_address(ads, a, sizeof(a));
 	if (n < 0)
 		return -1;

lib/roles/http/server/server.c

@@ -604,12 +604,14 @@ _lws_vhost_init_server(const struct lws_context_creation_info *info,
 #endif
 			if (!vhost->iface || !LWS_IPV6_ENABLED(vhost) || 
 			    (vhost->options & LWS_SERVER_OPTION_IPV6_V6ONLY_VALUE)) {
+#if defined(LWS_WITH_IPV4)
 				const char *ads4 = vhost->iface ? vhost->iface : "0.0.0.0";
 				if (!lws_create_adopt_udp(vhost, ads4, vhost->listen_port,
 							  LWS_CAUDP_BIND, "quic", vhost->iface, NULL,
 							  NULL, NULL, "quic_listen")) {
 					lwsl_vhost_err(vhost, "Failed to bind QUIC IPv4 UDP listener");
 				}
+#endif
 			}
 		}
 	}

lib/system/async-dns/async-dns.c

@@ -222,7 +222,12 @@ lws_async_dns_writeable(struct lws *wsi, lws_adns_q_t *q)
 	p = &pkt[LWS_PRE];
 	memset(p, 0, DHO_SIZEOF);
 
-#if defined(LWS_WITH_IPV6)
+#if !defined(LWS_WITH_IPV4)
+	which = 1;
+	q->sent[0]++;
+	q->sent[1]++;
+	q->asked = 2; /* AAAA response bit is 2 (1 << 1) */
+#elif defined(LWS_WITH_IPV6)
 	if (q->qtype != LWS_ADNS_RECORD_A && q->qtype != LWS_ADNS_RECORD_AAAA) {
 		which = 0;
 		q->sent[0]++;
@@ -1330,12 +1335,20 @@ lws_async_dns_query(struct lws_context *context, int tsi, const char *name,
 			m = lws_adns_scan_hostsfile(name, ads, sizeof(ads), qtype & 0xff);
 
 		if (m < 4 && !strcmp(name, "localhost")) {
+#if defined(LWS_WITH_IPV4)
 			if ((qtype & 0xff) == LWS_ADNS_RECORD_A) {
 				ads[0] = 127; ads[1] = 0; ads[2] = 0; ads[3] = 1;
 				m = 4;
 			}
+#endif
 #if defined(LWS_WITH_IPV6)
-			else if ((qtype & 0xff) == LWS_ADNS_RECORD_AAAA) {
+			if (
+#if defined(LWS_WITH_IPV4)
+				(qtype & 0xff) == LWS_ADNS_RECORD_AAAA
+#else
+				1
+#endif
+			) {
 				memset(ads, 0, 15); ads[15] = 1;
 				m = 16;
 			}

minimal-examples-lowlevel/http-client/minimal-http-client-timeout-h3/minimal-http-client-timeout-h3.c

@@ -288,7 +288,11 @@ connect_sul_cb(lws_sorted_usec_list_t *sul)
 		return;
 	}
 
+#if defined(LWS_WITH_IPV4)
 	if (connect_client(g_context, g_client_vh, "127.0.0.1", port))
+#else
+	if (connect_client(g_context, g_client_vh, "::1", port))
+#endif
 		interrupted = 1;
 }
 
@@ -323,8 +327,10 @@ main(int argc, const char **argv)
 	lws_cmdline_option_handle_builtin(argc, argv, &info);
 
 	info.options |= LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT |
-			LWS_SERVER_OPTION_EXPLICIT_VHOSTS |
-			LWS_SERVER_OPTION_DISABLE_IPV6;
+			LWS_SERVER_OPTION_EXPLICIT_VHOSTS;
+#if defined(LWS_WITH_IPV4)
+	info.options |= LWS_SERVER_OPTION_DISABLE_IPV6;
+#endif
 	info.protocols = server_protocols; /* used for the server vhost */
 	/*
 	 * Client reply timeout: short and deterministic for the test.  This is