sai-fixes

Author: lws-team

.sai.json

@@ -156,7 +156,7 @@
 			"cmake":	"-DLWS_SUPPRESS_DEPRECATED_API_WARNINGS=1 -DLWS_WITH_ACME=1 -DLWS_WITH_MINIMAL_EXAMPLES=1 -DCMAKE_BUILD_TYPE=RELEASE -DLWS_WITH_GENCRYPTO=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_NTPCLIENT=1"
 		},
 		"async_dnssec": {
-			"cmake":	"-DLWS_SUPPRESS_DEPRECATED_API_WARNINGS=1 -DCMAKE_BUILD_TYPE=DEBUG -DLWS_WITH_GENCRYPTO=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_ASYNC_DNS_DNSSEC=1"
+			"cmake":	"-DLWS_SUPPRESS_DEPRECATED_API_WARNINGS=1 -DCMAKE_BUILD_TYPE=DEBUG -DLWS_WITH_GENCRYPTO=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_ASYNC_DNS_DNSSEC=1 -DLWS_WITH_AUTHORITATIVE_DNS=1"
 		},
 
 		"secure-streams": {
@@ -258,7 +258,7 @@
 		# only applies to the coverity builder, and on pushes to "coverity" branch
 
 		"coverity": {
-			"cmake":	"-DLWS_WITHOUT_EXTENSIONS=0 -DLWS_WITH_CGI=1 -DLWS_IPV6=1 -DLWS_WITH_HTTP_PROXY=1 -DLWS_WITH_RANGES=1 -DLWS_WITH_THREADPOOL=1 -DLWS_WITH_CBOR=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_COSE=1 -DLWS_WITH_SYS_DHCP_CLIENT=1 -DLWS_WITH_FTS=1 -DLWS_WITH_STRUCT_SQLITE3=1 -DLWS_ROLE_DBUS=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_ASYNC_DNS_DNSSEC=1 -DLWS_WITH_WEBRTC=1 -DLWS_WITH_DHT=1 -DLWS_WITH_ASYNC_QUEUE=1  -DLWS_WITH_SYS_FAULT_INJECTION=1 -DLWS_WITH_TLS_JIT_TRUST=1 -DLWS_ROLE_MQTT=1 -DLWS_ROLE_RAW_PROXY=1 -DLWS_WITH_EVENT_LIBS=1 -DLWS_WITH_LIBUV=1 -DLWS_WITH_STRUCT_JSON=1 -DLWS_WITH_LWS_DSH=1 -DLWS_WITH_SECURE_STREAMS_PROXY_API=1",
+			"cmake":	"-DLWS_WITHOUT_EXTENSIONS=0 -DLWS_WITH_CGI=1 -DLWS_IPV6=1 -DLWS_WITH_HTTP_PROXY=1 -DLWS_WITH_RANGES=1 -DLWS_WITH_THREADPOOL=1 -DLWS_WITH_CBOR=1 -DLWS_WITH_JOSE=1 -DLWS_WITH_COSE=1 -DLWS_WITH_SYS_DHCP_CLIENT=1 -DLWS_WITH_FTS=1 -DLWS_WITH_STRUCT_SQLITE3=1 -DLWS_ROLE_DBUS=1 -DLWS_WITH_SYS_ASYNC_DNS=1 -DLWS_WITH_SYS_ASYNC_DNS_DNSSEC=1 -DLWS_WITH_WEBRTC=1 -DLWS_WITH_DHT=1 -DLWS_WITH_ASYNC_QUEUE=1  -DLWS_WITH_SYS_FAULT_INJECTION=1 -DLWS_WITH_TLS_JIT_TRUST=1 -DLWS_ROLE_MQTT=1 -DLWS_ROLE_RAW_PROXY=1 -DLWS_WITH_EVENT_LIBS=1 -DLWS_WITH_LIBUV=1 -DLWS_WITH_STRUCT_JSON=1 -DLWS_WITH_LWS_DSH=1 -DLWS_WITH_SECURE_STREAMS_PROXY_API=1 -DLWS_WITH_AUTHORITATIVE_DNS=1 -DLWS_WITH_DHT=1 -DLWS_WITH_DHT_BACKEND=1 -DLWS_WITH_PLUGINS=1",
 			"platforms":	"none, coverity/x86_64/gcc",
 			"cpack":	"export STAMP=`git log -1 --pretty=format:%h` && rm -f libwebsockets.tgz && tar czvf libwebsockets.tgz cov-int && script -q -c \"cat /etc/coverity/secrets.sh | lws-minimal-http-client-post-form https://scan.coverity.com:443/builds?project=warmcat%2Flibwebsockets --form file=@libwebsockets.tgz --form version=${STAMP} --form 'description=lws qa'\" /dev/null",
 			"branches":	"coverity"

include/libwebsockets.h

@@ -879,7 +879,9 @@ lws_fx_string(const lws_fx_t *a, char *buf, size_t size);
 #include <libwebsockets/lws-jrpc.h>
 
 #include <libwebsockets/lws-async-dns.h>
+#if defined(LWS_WITH_AUTHORITATIVE_DNS)
 #include <libwebsockets/lws-auth-dns.h>
+#endif
 
 #if defined(LWS_WITH_TLS)
 

minimal-examples-lowlevel/raw/minimal-raw-dht/minimal-raw-dht.c

@@ -342,7 +342,9 @@ int main(int argc, const char **argv)
 		pvos[16].value = "1";
 
 
+#if defined(LWS_WITH_PLUGINS)
 	static const char * const d_plugin_dirs[] = { NULL };
+#endif
 
 	app_protocols[0].name = "http";
 	app_protocols[0].callback = lws_callback_http_dummy;
@@ -353,7 +355,9 @@ int main(int argc, const char **argv)
 	info.options				= LWS_SERVER_OPTION_EXPLICIT_VHOSTS | LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT;
 	info.pvo				= pvos;
 	info.protocols				= app_protocols;
+#if defined(LWS_WITH_PLUGINS)
 	info.plugin_dirs			= d_plugin_dirs;
+#endif
 	info.fd_limit_per_thread		= 100;
 
         nl.name					= "app";

plugins/CMakeLists.txt

@@ -286,16 +286,18 @@ if (LWS_WITH_DHT)
 		target_compile_definitions(protocol_lws_dht_object_store PRIVATE LWS_BUILDING_SHARED)
 	endif()
 
-	create_plugin(protocol_lws_dht_dnssec ""
-		      "protocol_lws_dht_dnssec/protocol_lws_dht_dnssec.c" "" "")
-	if (NOT LWS_WITH_PLUGINS_BUILTIN)
-		target_compile_definitions(protocol_lws_dht_dnssec PRIVATE LWS_BUILDING_SHARED)
-	endif()
+	if (LWS_WITH_AUTHORITATIVE_DNS)
+		create_plugin(protocol_lws_dht_dnssec ""
+			      "protocol_lws_dht_dnssec/protocol_lws_dht_dnssec.c" "" "")
+		if (NOT LWS_WITH_PLUGINS_BUILTIN)
+			target_compile_definitions(protocol_lws_dht_dnssec PRIVATE LWS_BUILDING_SHARED)
+		endif()
 
-	create_plugin(protocol_lws_dht_dnssec_monitor ""
-		      "protocol_lws_dht_dnssec_monitor/protocol_lws_dht_dnssec_monitor.c" "" "")
-	if (NOT LWS_WITH_PLUGINS_BUILTIN)
-		target_compile_definitions(protocol_lws_dht_dnssec_monitor PRIVATE LWS_BUILDING_SHARED)
+		create_plugin(protocol_lws_dht_dnssec_monitor ""
+			      "protocol_lws_dht_dnssec_monitor/protocol_lws_dht_dnssec_monitor.c" "" "")
+		if (NOT LWS_WITH_PLUGINS_BUILTIN)
+			target_compile_definitions(protocol_lws_dht_dnssec_monitor PRIVATE LWS_BUILDING_SHARED)
+		endif()
 	endif()
 endif()