plugins: modernize to C99

lws-team · lws-team · commit b49152d90d98 · 2026-03-05T05:51:18.000Z
Having added a member to lws_plugin_protocol, it's a good time to change
the old struct initializer format to C9, since we'll have to visit them all
anyway.

Also modernize the event lib struct while we're at it.
diff --git a/lib/event-libs/glib/glib.c b/lib/event-libs/glib/glib.c
@@ -506,10 +506,10 @@ LWS_VISIBLE
 #endif
 const lws_plugin_evlib_t evlib_glib = {
 	.hdr = {
-		"glib event loop",
-		"lws_evlib_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "glib event loop",
+		._class = "lws_evlib_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.ops	= &event_loop_ops_glib
diff --git a/lib/event-libs/libev/libev.c b/lib/event-libs/libev/libev.c
@@ -458,10 +458,10 @@ LWS_VISIBLE
 #endif
 const lws_plugin_evlib_t evlib_ev = {
 	.hdr = {
-		"libev event loop",
-		"lws_evlib_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "libev event loop",
+		._class = "lws_evlib_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.ops	= &event_loop_ops_ev
diff --git a/lib/event-libs/libevent/libevent.c b/lib/event-libs/libevent/libevent.c
@@ -510,10 +510,10 @@ LWS_VISIBLE
 #endif
 const lws_plugin_evlib_t evlib_event = {
 	.hdr = {
-		"libevent event loop",
-		"lws_evlib_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "libevent event loop",
+		._class = "lws_evlib_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.ops	= &event_loop_ops_event
diff --git a/lib/event-libs/libuv/libuv.c b/lib/event-libs/libuv/libuv.c
@@ -941,10 +941,10 @@ LWS_VISIBLE
 #endif
 const lws_plugin_evlib_t evlib_uv = {
 	.hdr = {
-		"libuv event loop",
-		"lws_evlib_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "libuv event loop",
+		._class = "lws_evlib_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.ops	= &event_loop_ops_uv
diff --git a/lib/event-libs/poll/poll.c b/lib/event-libs/poll/poll.c
@@ -52,10 +52,10 @@ struct lws_event_loop_ops event_loop_ops_poll = {
 
 const lws_plugin_evlib_t evlib_poll = {
 	.hdr = {
-		"poll",
-		"lws_evlib_plugin",
-		"n/a",
-		LWS_PLUGIN_API_MAGIC
+		.name = "poll",
+		._class = "lws_evlib_plugin",
+		.lws_build_hash = "n/a",
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.ops	= &event_loop_ops_poll
diff --git a/lib/event-libs/sdevent/sdevent.c b/lib/event-libs/sdevent/sdevent.c
@@ -436,10 +436,10 @@ LWS_VISIBLE
 #endif
 const lws_plugin_evlib_t evlib_sd = {
 		.hdr = {
-				"systemd event loop",
-				"lws_evlib_plugin",
-				LWS_BUILD_HASH,
-				LWS_PLUGIN_API_MAGIC
+				.name = "systemd event loop",
+				._class = "lws_evlib_plugin",
+				.lws_build_hash = LWS_BUILD_HASH,
+				.api_magic = LWS_PLUGIN_API_MAGIC
 		},
 
 		.ops	= &event_loop_ops_sdevent
diff --git a/lib/event-libs/uloop/uloop.c b/lib/event-libs/uloop/uloop.c
@@ -316,10 +316,10 @@ LWS_VISIBLE
 #endif
 const lws_plugin_evlib_t evlib_uloop = {
 	.hdr = {
-		"uloop event loop",
-		"lws_evlib_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "uloop event loop",
+		._class = "lws_evlib_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.ops	= &event_loop_ops_uloop
diff --git a/plugins/acme-client/protocol_lws_acme_client.c b/plugins/acme-client/protocol_lws_acme_client.c
@@ -1622,10 +1622,10 @@ LWS_VISIBLE const struct lws_protocols lws_acme_client_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_acme_client = {
 	.hdr = {
-		"acme client",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "acme client",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = lws_acme_client_protocols,
diff --git a/plugins/captcha-ratelimit/protocol_lws_captcha_ratelimit.c b/plugins/captcha-ratelimit/protocol_lws_captcha_ratelimit.c
@@ -75,10 +75,10 @@ LWS_VISIBLE const struct lws_protocols captcha_ratelimit_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_captcha_ratelimit = {
 	.hdr = {
-		"lws captcha ratelimit",
-		 "lws_protocol_plugin",
-		 LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "lws captcha ratelimit",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = captcha_ratelimit_protocols,
diff --git a/plugins/deaddrop/protocol_lws_deaddrop.c b/plugins/deaddrop/protocol_lws_deaddrop.c
@@ -955,10 +955,10 @@ LWS_VISIBLE const struct lws_protocols deaddrop_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t deaddrop = {
 	.hdr = {
-		"deaddrop",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "deaddrop",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = deaddrop_protocols,
diff --git a/plugins/latency/protocol_lws_latency.c b/plugins/latency/protocol_lws_latency.c
@@ -113,10 +113,10 @@ LWS_VISIBLE const struct lws_protocols lws_latency_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_latency = {
 	.hdr = {
-		"lws latency",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "lws latency",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = lws_latency_protocols,
diff --git a/plugins/lws-login/protocol_lws_login.c b/plugins/lws-login/protocol_lws_login.c
@@ -139,9 +139,12 @@ callback_lws_login(struct lws *wsi, enum lws_callback_reasons reason,
 			if (!strncmp(vhd->asset_dir, "file://", 7))
 				vhd->asset_dir += 7;
 
-		lws_pvo_get_str(in, "jwt-issuer", &vhd->jwt_issuer);
-		lws_pvo_get_str(in, "jwt-audience", &vhd->jwt_audience);
-		lws_pvo_get_str(in, "cookie-name", &vhd->cookie_name);
+		if (lws_pvo_get_str(in, "jwt-issuer", &vhd->jwt_issuer))
+			lwsl_info("%s: default jwt-issuer\n", __func__);
+		if (lws_pvo_get_str(in, "jwt-audience", &vhd->jwt_audience))
+			lwsl_info("%s: default jwt-audience\n", __func__);
+		if (lws_pvo_get_str(in, "cookie-name", &vhd->cookie_name))
+			lwsl_info("%s: default cookie-name\n", __func__);
 		if (!lws_pvo_get_str(in, "jwt-alg", &cp))
 			lws_strncpy(vhd->jwt_alg, cp, sizeof(vhd->jwt_alg));
 		if (!lws_pvo_get_str(in, "jwt-expiry", &cp))
@@ -293,10 +296,10 @@ LWS_VISIBLE const struct lws_protocols protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_login = {
 	.hdr = {
-		"lws login",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "lws login",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = protocols,
diff --git a/plugins/lws-webrtc-mixer/protocol_lws_webrtc_mixer.c b/plugins/lws-webrtc-mixer/protocol_lws_webrtc_mixer.c
@@ -1118,13 +1118,12 @@ LWS_VISIBLE const struct lws_protocols mixer_protocols[] = {
 };
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_webrtc_mixer = {
-	.hdr =
-	{
-		"lws webrtc mixer",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC,
-		90, /* priority */
+	.hdr = {
+		.name = "lws webrtc mixer",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC,
+		.priority = 90,
 	},
 	.protocols = mixer_protocols,
 	.count_protocols = LWS_ARRAY_SIZE(mixer_protocols),
diff --git a/plugins/protocol_client_loopback_test.c b/plugins/protocol_client_loopback_test.c
@@ -185,10 +185,10 @@ LWS_VISIBLE const struct lws_protocols client_loopback_test_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t client_loopback_test = {
 	.hdr = {
-		"client loopback test",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "client loopback test",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = client_loopback_test_protocols,
diff --git a/plugins/protocol_dumb_increment.c b/plugins/protocol_dumb_increment.c
@@ -127,10 +127,10 @@ LWS_VISIBLE const struct lws_protocols dumb_increment_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t dumb_increment = {
 	.hdr = {
-		"dumb increment",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "dumb increment",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = dumb_increment_protocols,
diff --git a/plugins/protocol_fulltext_demo.c b/plugins/protocol_fulltext_demo.c
@@ -274,10 +274,10 @@ LWS_VISIBLE const struct lws_protocols fulltext_demo_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t fulltext_demo = {
 	.hdr = {
-		"fulltext demo",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "fulltext demo",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = fulltext_demo_protocols,
diff --git a/plugins/protocol_lws_auth_dns.c b/plugins/protocol_lws_auth_dns.c
@@ -390,10 +390,10 @@ LWS_VISIBLE const struct lws_protocols lws_auth_dns_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_auth_dns = {
 	.hdr = {
-		"lws auth dns",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "lws auth dns",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 	.protocols = lws_auth_dns_protocols,
 	.count_protocols = LWS_ARRAY_SIZE(lws_auth_dns_protocols),
diff --git a/plugins/protocol_lws_dht_object_store.c b/plugins/protocol_lws_dht_object_store.c
@@ -27,7 +27,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifndef _WIN32
 #include <arpa/inet.h>
+#endif
+#include <errno.h>
 #include <sys/stat.h>
 
 #define LWS_DHT_FRAGMENT_SIZE		(1024 * 1024)
@@ -598,10 +601,10 @@ LWS_VISIBLE const struct lws_protocols lws_dht_object_store_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t protocol_lws_dht_object_store = {
 	.hdr = {
-		"lws dht object store",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "lws dht object store",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 	.protocols = lws_dht_object_store_protocols,
 	.count_protocols = LWS_ARRAY_SIZE(lws_dht_object_store_protocols) - 1,
diff --git a/plugins/protocol_lws_dht_store.c b/plugins/protocol_lws_dht_store.c
@@ -104,7 +104,8 @@ callback_lws_dht_store(struct lws *wsi, enum lws_callback_reasons reason,
 		if (!lws_pvo_get_str(in, "dht-port", &pvo_val))
 			vhd->dht_port = atoi(pvo_val);
 
-		lws_pvo_get_str(in, "dht-iface", &vhd->dht_iface);
+		if (lws_pvo_get_str(in, "dht-iface", &vhd->dht_iface))
+			lwsl_info("no pvo for dht-iface\n");
 
 		lwsl_user("%s: init: path '%s', port %d\n", __func__,
 				vhd->storage_path, vhd->dht_port);
@@ -149,10 +150,10 @@ static const struct lws_protocols protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_dht_store = {
 	.hdr = {
-		"lws dht store",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "lws dht store",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = protocols,
diff --git a/plugins/protocol_lws_mirror.c b/plugins/protocol_lws_mirror.c
@@ -490,10 +490,10 @@ LWS_VISIBLE const struct lws_protocols lws_mirror_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_mirror = {
 	.hdr = {
-		"lws mirror",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "lws mirror",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = lws_mirror_protocols,
diff --git a/plugins/protocol_lws_openmetrics_export.c b/plugins/protocol_lws_openmetrics_export.c
@@ -1203,10 +1203,10 @@ LWS_VISIBLE const struct lws_protocols lws_openmetrics_export_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_openmetrics_export = {
 	.hdr = {
-		"lws OpenMetrics export",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "lws OpenMetrics export",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = lws_openmetrics_export_protocols,
diff --git a/plugins/protocol_lws_raw_test.c b/plugins/protocol_lws_raw_test.c
@@ -289,10 +289,10 @@ LWS_VISIBLE const struct lws_protocols lws_raw_test_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_raw_test = {
 	.hdr = {
-		"lws raw test",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "lws raw test",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = lws_raw_test_protocols,
diff --git a/plugins/protocol_lws_sshd_demo.c b/plugins/protocol_lws_sshd_demo.c
@@ -465,10 +465,10 @@ LWS_VISIBLE const struct lws_protocols lws_sshd_demo_protocols[] = {
 
 LWS_VISIBLE const lws_plugin_protocol_t lws_sshd_demo = {
 	.hdr = {
-		"lws sshd demo",
-		"lws_protocol_plugin",
-		LWS_BUILD_HASH,
-		LWS_PLUGIN_API_MAGIC
+		.name = "lws sshd demo",
+		._class = "lws_protocol_plugin",
+		.lws_build_hash = LWS_BUILD_HASH,
+		.api_magic = LWS_PLUGIN_API_MAGIC
 	},
 
 	.protocols = lws_sshd_demo_protocols,
diff --git a/plugins/protocol_lws_status.c b/plugins/protocol_lws_status.c
diff --git a/plugins/protocol_lws_webrtc.c b/plugins/protocol_lws_webrtc.c
diff --git a/plugins/protocol_post_demo.c b/plugins/protocol_post_demo.c
diff --git a/plugins/protocol_urlarg.c b/plugins/protocol_urlarg.c
diff --git a/plugins/raw-proxy/protocol_lws_raw_proxy.c b/plugins/raw-proxy/protocol_lws_raw_proxy.c
diff --git a/plugins/ssh-base/sshd.c b/plugins/ssh-base/sshd.c
diff --git a/plugins/ssh-base/telnet.c b/plugins/ssh-base/telnet.c
