logging: use dedicated DOTAUTH log for experimental auth DoT

daemon/lua/kres-gen-29.lua

@@ -308,7 +308,7 @@ struct kr_server_selection {
 };
 typedef unsigned long log_groups_t;
 typedef int log_level_t;
-enum kr_log_groups_type {LOG_GRP_SYSTEM = 1, LOG_GRP_CACHE, LOG_GRP_IO, LOG_GRP_NETWORK, LOG_GRP_TA, LOG_GRP_TLS, LOG_GRP_GNUTLS, LOG_GRP_TLSCLIENT, LOG_GRP_XDP, LOG_GRP_ZIMPORT, LOG_GRP_ZSCANNER, LOG_GRP_DOH, LOG_GRP_DNSSEC, LOG_GRP_HINT, LOG_GRP_PLAN, LOG_GRP_ITERATOR, LOG_GRP_VALIDATOR, LOG_GRP_RESOLVER, LOG_GRP_SELECTION, LOG_GRP_ZCUT, LOG_GRP_COOKIES, LOG_GRP_STATISTICS, LOG_GRP_REBIND, LOG_GRP_WORKER, LOG_GRP_POLICY, LOG_GRP_TASENTINEL, LOG_GRP_TASIGNALING, LOG_GRP_TAUPDATE, LOG_GRP_DAF, LOG_GRP_DETECTTIMEJUMP, LOG_GRP_DETECTTIMESKEW, LOG_GRP_GRAPHITE, LOG_GRP_PREFILL, LOG_GRP_PRIMING, LOG_GRP_SRVSTALE, LOG_GRP_WATCHDOG, LOG_GRP_NSID, LOG_GRP_DNSTAP, LOG_GRP_TESTS, LOG_GRP_DEVEL};
+enum kr_log_groups_type {LOG_GRP_SYSTEM = 1, LOG_GRP_CACHE, LOG_GRP_IO, LOG_GRP_NETWORK, LOG_GRP_TA, LOG_GRP_TLS, LOG_GRP_GNUTLS, LOG_GRP_TLSCLIENT, LOG_GRP_XDP, LOG_GRP_ZIMPORT, LOG_GRP_ZSCANNER, LOG_GRP_DOH, LOG_GRP_DNSSEC, LOG_GRP_HINT, LOG_GRP_PLAN, LOG_GRP_ITERATOR, LOG_GRP_VALIDATOR, LOG_GRP_RESOLVER, LOG_GRP_SELECTION, LOG_GRP_ZCUT, LOG_GRP_COOKIES, LOG_GRP_STATISTICS, LOG_GRP_REBIND, LOG_GRP_WORKER, LOG_GRP_POLICY, LOG_GRP_TASENTINEL, LOG_GRP_TASIGNALING, LOG_GRP_TAUPDATE, LOG_GRP_DAF, LOG_GRP_DETECTTIMEJUMP, LOG_GRP_DETECTTIMESKEW, LOG_GRP_GRAPHITE, LOG_GRP_PREFILL, LOG_GRP_PRIMING, LOG_GRP_SRVSTALE, LOG_GRP_WATCHDOG, LOG_GRP_NSID, LOG_GRP_DNSTAP, LOG_GRP_TESTS, LOG_GRP_DOTAUTH, LOG_GRP_DEVEL};
 
 kr_layer_t kr_layer_t_static;
 _Bool kr_dbg_assertion_abort;

lib/log.c

@@ -64,6 +64,7 @@ log_group_names_t log_group_names[] = {
 	GRP_NAME_ITEM(LOG_GRP_NSID),
 	GRP_NAME_ITEM(LOG_GRP_DNSTAP),
 	GRP_NAME_ITEM(LOG_GRP_TESTS),
+	GRP_NAME_ITEM(LOG_GRP_DOTAUTH),
 	GRP_NAME_ITEM(LOG_GRP_DEVEL),
 	{ NULL,		-1 },
 };

lib/log.h

@@ -69,6 +69,7 @@ enum kr_log_groups_type {
 	LOG_GRP_NSID,
 	LOG_GRP_DNSTAP,
 	LOG_GRP_TESTS,
+	LOG_GRP_DOTAUTH,
 	/* ^^ Add new log groups above ^^. */
 	LOG_GRP_DEVEL,  /* Must be last entry in enum! */
 };
@@ -113,6 +114,7 @@ enum kr_log_groups_type {
 #define LOG_GRP_NSID_TAG		"nsid"
 #define LOG_GRP_DNSTAP_TAG		"dnstap"
 #define LOG_GRP_TESTS_TAG		"tests"
+#define LOG_GRP_DOTAUTH_TAG		"dotaut"
 #define LOG_GRP_DEVEL_TAG		"devel"
 
 KR_EXPORT

modules/experimental_dot_auth/experimental_dot_auth.lua

@@ -72,14 +72,14 @@ end
 function M.layer.consume(state, _, pkt)
 	-- Only successful answers
 	if state == kres.FAIL then return state end
-	-- log_debug(ffi.C.DOT, "%s", pkt:tostring())
+	-- log_debug(ffi.C.LOG_GRP_DOTAUTH, "%s", pkt:tostring())
 	local authority = pkt:section(kres.section.AUTHORITY)
 	local additional = pkt:section(kres.section.ADDITIONAL)
 	for _, rr in ipairs(authority) do
-		--log_debug(ffi.C.DOT, "%d %s", rr.type, kres.dname2str(rr.rdata))
+		--log_debug(ffi.C.LOG_GRP_DOTAUTH, "%d %s", rr.type, kres.dname2str(rr.rdata))
 		if rr.type == kres.type.NS then
 			local name = kres.dname2str(rr.rdata):upper()
-			-- log_debug(ffi.C.DOT, "NS %d", name:len())
+			-- log_debug(ffi.C.LOG_GRP_DOTAUTH, "NS %d", name:len())
 			if name:len() > 56 and str.starts(name, "DOT-") then
 				local k = basexx.to_base64(
 					basexx.from_base32(
@@ -107,7 +107,7 @@ function M.layer.consume(state, _, pkt)
 								C.inet_ntop(AF_INET6, ns_addr.sin6_addr, addrbuf, INET6_ADDRSTRLEN)
 							end
               net.tls_client(ffi.string(addrbuf).."@853", {k})
-							log_info(ffi.C.LOG_GRP_DOT, "Adding %s IP %s %s", name_add, ffi.string(addrbuf).."@853", k)
+							log_info(ffi.C.LOG_GRP_DOTAUTH, "Adding %s IP %s %s", name_add, ffi.string(addrbuf).."@853", k)
 						end
 					end
 				end