sai-fixes

Author: lws-team

.sai.json

@@ -69,7 +69,7 @@
 		"w11/x86_64-amd/msvc": {
 			"default": false,
 			"build": [
-				"\"C:\\Program Files\\CMake\\bin\\cmake.exe\" -S . -B build -DOPENSSL_ROOT_DIR=\"C:\\Users\\andy\\vcpkg\\packages\\openssl_x64-windows\" -DLWS_EXT_PTHREAD_INCLUDE_DIR=\"C:\\Program Files (x86)\\pthreads\\include\" -DLWS_EXT_PTHREAD_LIBRARIES=\"C:\\Program Files (x86)\\pthreads\\lib\\x64\\libpthreadGC2.a\" ${cmake}",
+				"\"C:\\Program Files\\CMake\\bin\\cmake.exe\" -S . -B build -DLWS_WITH_SCHANNEL=0 -DOPENSSL_ROOT_DIR=\"C:\\Users\\andy\\vcpkg\\packages\\openssl_x64-windows\" -DLWS_EXT_PTHREAD_INCLUDE_DIR=\"C:\\Program Files (x86)\\pthreads\\include\" -DLWS_EXT_PTHREAD_LIBRARIES=\"C:\\Program Files (x86)\\pthreads\\lib\\x64\\libpthreadGC2.a\" ${cmake}",
 				"\"C:\\Program Files\\CMake\\bin\\cmake.exe\" --build build --config DEBUG --parallel %SAI_PARALLEL%",
 				"\"C:\\Program Files\\CMake\\bin\\ctest.exe\" --test-dir build -C DEBUG -j%SAI_PARALLEL% --output-on-failure --repeat until-pass:3"
 			]
@@ -120,10 +120,14 @@
 			"cmake":	"-DLWS_WITH_SYS_FAULT_INJECTION=1 -DLWS_WITH_MINIMAL_EXAMPLES=1 -DLWS_WITH_CBOR=1"
 		},
 		"esp32-heltec": {
-                        "cmake":        "-DLWS_IPV6=0",
+                        "cmake":        "-DLWS_IPV6=1",
                         "cpack":        "esp-heltec-wb32",
                         "platforms":    "none, freertos-espidf/xl6-esp32/gcc"
                 },
+		"mbedtls4": {
+			"cmake":	"-DLWS_WITH_MBEDTLS=1 -DCMAKE_PREFIX_PATH=/opt/mbedtls -DLWS_WITH_MINIMAL_EXAMPLES=1",
+			"platforms":	"none, rocky9/aarch64-a72a55-rk3588/gcc"
+		},
 		"gnutls": {
 			"cmake":	"-DLWS_WITH_GNUTLS=1 -DLWS_GNUTLS_INCLUDE_DIRS=\"/opt/gnutls/lib/includes\" -DLWS_GNUTLS_LIBRARIES=\"/opt/gnutls/lib/.libs/libgnutls.so\" -DLWS_ROLE_QUIC=1",
 			"platforms":	"none, rocky9/aarch64-a72a55-rk3588/gcc"

CMakeLists.txt

@@ -256,6 +256,11 @@ if (LWS_WITH_BEARSSL)
 	set(LWS_WITH_HTTP3 0)
 endif()
 
+if (LWS_WITH_SSL AND NOT (LWS_WITH_BORINGSSL OR LWS_WITH_AWSLC OR LWS_WITH_MBEDTLS OR LWS_WITH_WOLFSSL OR LWS_WITH_CYASSL OR LWS_WITH_GNUTLS OR LWS_WITH_BEARSSL OR LWS_WITH_SCHANNEL))
+    set(LWS_ROLE_QUIC 0)
+    set(LWS_WITH_HTTP3 0)
+endif()
+
 if (WIN32 AND NOT (LWS_WITH_BORINGSSL OR LWS_WITH_AWSLC OR LWS_WITH_MBEDTLS OR LWS_WITH_WOLFSSL OR LWS_WITH_CYASSL OR LWS_WITH_BEARSSL OR LWS_WITH_GNUTLS))
 	set(LWS_SCHANNEL_DEFAULT ON)
 else()

README.md

@@ -102,7 +102,7 @@ and am starting to port more cases from there into SS-based examples.
 |Loop support, sul scheduler|default, event libs|same|
 |Supports comms mode|Client, Server, Raw|same|
 |Supports protocols|h1, h2, ws, mqtt (client)|same|
-|TLS support|mbedtls (including v3), openssl (including v3), wolfssl, boringssl, aws-lc, libressl|same|
+|TLS support|mbedtls (including v3 and v4, no QUIC), openssl (including v3), wolfssl, boringssl, aws-lc, libressl|same|
 |Serializable, proxiable, muxable, transportable|No|Yes|
 |Auto-allocated per-connection user object|pss specified in lws_protocols|Specified in ss info struct|
 |Connection User API|Protocol-specific lws_protocols cbs (> 100)|SS API (rx, tx, state callbacks only)|

include/libwebsockets/lws-genhash.h

@@ -132,7 +132,7 @@ struct lws_genhmac_ctx {
 	EVP_MD_CTX *ctx;
 	EVP_PKEY *key;
 #else
-#if defined(LWS_HAVE_HMAC_CTX_new) || defined(LWS_WITH_BORINGSSL)
+#if defined(LWS_HAVE_HMAC_CTX_new) || defined(LWS_WITH_BORINGSSL) || defined(LWS_WITH_AWSLC)
         HMAC_CTX *ctx;
 #else
         HMAC_CTX ctx;

include/libwebsockets/lws-secure-streams-policy.h

@@ -152,6 +152,7 @@ typedef struct lws_ss_trust_store {
 enum {
 	LWSSSP_H1,
 	LWSSSP_H2,
+	LWSSSP_H3,
 	LWSSSP_WS,
 	LWSSSP_MQTT,
 	LWSSSP_RAW,
@@ -267,6 +268,8 @@ typedef struct lws_ss_policy {
 //				} h1;
 //				struct { /* LWSSSP_H2 */
 //				} h2;
+//				struct { /* LWSSSP_H3 */
+//				} h3;
 				struct { /* LWSSSP_WS */
 					const char	*subprotocol;
 					uint8_t		binary;

lib/core-net/network.c

@@ -131,6 +131,7 @@ lws_get_addresses(struct lws_vhost *vh, void *ads, char *name,
 			memmove(rip, rip + 7, strlen(rip) - 6);
 
 		if (name) {
+#if !defined(LWS_PLAT_FREERTOS) && !defined(LWS_PLAT_OPTEE)
 			getnameinfo((struct sockaddr *)ads, sizeof(struct sockaddr_in6),
 				    name,
 #if defined(__ANDROID__)
@@ -139,6 +140,12 @@ lws_get_addresses(struct lws_vhost *vh, void *ads, char *name,
 				    (socklen_t)name_len,
 #endif
 				    NULL, 0, 0);
+#else
+			if (!lws_plat_inet_ntop(AF_INET6,
+					&((struct sockaddr_in6 *)ads)->sin6_addr,
+					name, (socklen_t)name_len))
+				name[0] = '\0';
+#endif
 		}
 
 		return 0;
@@ -148,8 +155,8 @@ lws_get_addresses(struct lws_vhost *vh, void *ads, char *name,
 		addr4.sin_family = AF_INET;
 		addr4.sin_addr = ((struct sockaddr_in *)ads)->sin_addr;
 
-#if !defined(LWS_PLAT_FREERTOS)
 		if (name) {
+#if !defined(LWS_PLAT_FREERTOS) && !defined(LWS_PLAT_OPTEE)
 			getnameinfo((struct sockaddr *)ads,
 					sizeof(struct sockaddr_in),
 					name,
@@ -159,8 +166,13 @@ lws_get_addresses(struct lws_vhost *vh, void *ads, char *name,
 					(socklen_t)name_len,
 #endif
 					NULL, 0, 0);
-		}
+#else
+			if (!lws_plat_inet_ntop(AF_INET,
+					&((struct sockaddr_in *)ads)->sin_addr,
+					name, (socklen_t)name_len))
+				name[0] = '\0';
 #endif
+		}
 	}
 
 	if (addr4.sin_family == AF_UNSPEC)
@@ -278,7 +290,7 @@ lws_socket_bind(struct lws_vhost *vhost, struct lws *wsi,
 #ifdef LWS_WITH_UNIX_SOCK
 	struct sockaddr_un serv_unix;
 #endif
-#ifdef LWS_WITH_IPV6
+#if defined(LWS_WITH_IPV6) && !defined(LWS_PLAT_FREERTOS) && !defined(LWS_PLAT_OPTEE)
 	struct sockaddr_in6 serv_addr6;
 #endif
 	struct sockaddr_in serv_addr4;
@@ -602,11 +614,13 @@ unsigned long
 lws_get_addr_scope(struct lws *wsi, const char *ifname_or_ipaddr)
 {
 	unsigned long scope;
-	char ip[NI_MAXHOST];
+#if !defined(LWS_PLAT_FREERTOS) && !defined(LWS_PLAT_OPTEE)
+	char ip[256];
 	unsigned int i;
-#if !defined(WIN32)
+#endif
+#if !defined(WIN32) && !defined(LWS_PLAT_FREERTOS) && !defined(LWS_PLAT_OPTEE)
 	struct ifaddrs *addrs, *addr;
-#else
+#elif defined(WIN32)
 	PIP_ADAPTER_ADDRESSES adapter, addrs = NULL;
 	PIP_ADAPTER_UNICAST_ADDRESS addr;
 	struct sockaddr_in6 *sockaddr;
@@ -631,7 +645,7 @@ lws_get_addr_scope(struct lws *wsi, const char *ifname_or_ipaddr)
 
 	scope = 0;
 
-#if !defined(WIN32)
+#if !defined(WIN32) && !defined(LWS_PLAT_FREERTOS) && !defined(LWS_PLAT_OPTEE)
 
 	getifaddrs(&addrs);
 	for (addr = addrs; addr; addr = addr->ifa_next) {
@@ -656,7 +670,28 @@ lws_get_addr_scope(struct lws *wsi, const char *ifname_or_ipaddr)
 		}
 	}
 	freeifaddrs(addrs);
-#else
+#elif defined(LWS_PLAT_FREERTOS)
+#if defined(LWS_AMAZON_RTOS) || defined(LWS_ESP_PLATFORM)
+#include <lwip/netif.h>
+#include <lwip/ip6_addr.h>
+	{
+		ip6_addr_t ip6;
+		struct netif *netif;
+		int j;
+
+		if (ip6addr_aton(ifname_or_ipaddr, &ip6)) {
+			for (netif = netif_list; netif != NULL; netif = netif->next) {
+				for (j = 0; j < LWIP_IPV6_NUM_ADDRESSES; j++) {
+					if (ip6_addr_isvalid(netif_ip6_addr_state(netif, j)) &&
+					    ip6_addr_cmp(&ip6, netif_ip6_addr(netif, j))) {
+						return netif_get_index(netif);
+					}
+				}
+			}
+		}
+	}
+#endif
+#elif defined(WIN32)
 
 	for (i = 0; i < 5; i++) {
 		ret = GetAdaptersAddresses(AF_INET6, GAA_FLAG_INCLUDE_PREFIX,

lib/core-net/output.c

@@ -355,6 +355,13 @@ lws_ssl_capable_write_no_ssl(struct lws *wsi, unsigned char *buf, size_t len)
 #endif
 				   len, 0, sa46_sockaddr(&wsi->udp->sa46),
 				   sa46_socklen(&wsi->udp->sa46));
+
+		if (n < 0 && LWS_ERRNO == LWS_EISCONN)
+			n = (int)sendto(wsi->desc.sockfd, (const char *)buf,
+#if defined(WIN32)
+				(int)
+#endif
+				   len, 0, NULL, 0);
 	} else
 #endif
 		if (wsi->role_ops->file_handle)

lib/core/context.c

@@ -337,6 +337,9 @@ static const char * const opts_str =
 #if defined(LWS_ROLE_H2)
 			"H2 "
 #endif
+#if defined(LWS_ROLE_H3)
+			"H3 "
+#endif
 #if defined(LWS_ROLE_WS)
 			"WS "
 #endif
@@ -415,15 +418,14 @@ lws_create_context(const struct lws_context_creation_info *info)
 #if defined(__ANDROID__)
 	struct rlimit rt;
 #endif
-	size_t
 #if defined(LWS_PLAT_FREERTOS)
 		/* smaller default, can set in info->pt_serv_buf_size */
-		s1 = 2048,
+		size_t s1 = 2048;
 #else
-		s1 = 4096,
+		size_t s1 = 4096;
 #endif
-		size = sizeof(struct lws_context);
 #endif
+	size_t size = sizeof(struct lws_context);
 #if !defined(LWS_PLAT_BAREMETAL) && defined(LWS_WITH_NETWORK)
 	int n;
 #endif
@@ -646,6 +648,7 @@ lws_create_context(const struct lws_context_creation_info *info)
 
 	if (!plev || lws_fi(&info->fic, "ctx_createfail_evlib_sel"))
 		goto fail_event_libs;
+#endif /* LWS_WITH_NETWORK */
 
 #if defined(LWS_WITH_NETWORK)
 	size += (size_t)plev->ops->evlib_size_ctx /* the ctx evlib priv */ +
@@ -661,6 +664,15 @@ lws_create_context(const struct lws_context_creation_info *info)
 		goto early_bail;
 	}
 
+	context->name			= info->vhost_name;
+	if (info->log_cx)
+		context->log_cx = info->log_cx;
+	else
+		context->log_cx = &log_cx;
+	lwsl_refcount_cx(context->log_cx, 1);
+
+#if defined(LWS_WITH_NETWORK)
+
 #if defined(LWS_WITH_SYS_STATE)
    // NOTE: we need to init this fields because they may be used in logger when context destroying
 	context->mgr_system.state_names = system_state_names;
@@ -704,12 +716,6 @@ lws_create_context(const struct lws_context_creation_info *info)
 	context->argc			= info->argc;
 	context->argv			= info->argv;
 #endif
-	context->name			= info->vhost_name;
-	if (info->log_cx)
-		context->log_cx = info->log_cx;
-	else
-		context->log_cx = &log_cx;
-	lwsl_refcount_cx(context->log_cx, 1);
 
 	context->system_ops = info->system_ops;
 

lib/event-libs/glib/glib.c

@@ -265,7 +265,8 @@ elops_accept_glib(struct lws *wsi)
 	struct lws_wsi_eventlibs_glib *wsipr = wsi_to_priv_glib(wsi);
 	int fd;
 
-	assert(!wsi_to_subclass(wsi));
+	if (wsi_to_subclass(wsi))
+		return 0;
 
 	wsi_to_subclass(wsi) = (struct lws_io_watcher_glib_subclass *)
 			g_source_new((GSourceFuncs *)&lws_glib_source_ops,

lib/roles/h3/ops-h3.c

@@ -610,7 +610,9 @@ lws_h3_create_unidi_stream(struct lws *nwsi, uint8_t type)
 
 	{
 		uint8_t pre[LWS_PRE + 16];
+#if (_LWS_ENABLED_LOGS & LLL_NOTICE)
 		int n;
+#endif
 		size_t send_len = 1;
 		pre[LWS_PRE] = type;
 		if (type == 0x00) {
@@ -643,11 +645,19 @@ lws_h3_create_unidi_stream(struct lws *nwsi, uint8_t type)
 				send_len = 6;
 			}
 
+#if (_LWS_ENABLED_LOGS & LLL_NOTICE)
 			n = lws_write(cwsi, &pre[LWS_PRE], send_len, LWS_WRITE_BINARY | LWS_WRITE_NO_FIN);
 			lwsl_notice("lws_h3_create_unidi_stream: lws_write control ret %d\n", n);
+#else
+			lws_write(cwsi, &pre[LWS_PRE], send_len, LWS_WRITE_BINARY | LWS_WRITE_NO_FIN);
+#endif
 		} else {
+#if (_LWS_ENABLED_LOGS & LLL_NOTICE)
 			n = lws_write(cwsi, &pre[LWS_PRE], 1, LWS_WRITE_BINARY | LWS_WRITE_NO_FIN);
 			lwsl_notice("lws_h3_create_unidi_stream: lws_write %d ret %d\n", type, n);
+#else
+			lws_write(cwsi, &pre[LWS_PRE], 1, LWS_WRITE_BINARY | LWS_WRITE_NO_FIN);
+#endif
 		}
 	}