- Fix for dnstap with dnscrypt and dnstap without dnsoverquic.

NLnetLabs · Oct 16, 2024 · 0076736 · 0076736
1 parent f8e45ed
commit 0076736
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/doc/Changelog b/doc/Changelog
@@ -2,6 +2,9 @@
 	- Fix for dnsoverquic and dnstap to use the correct dnstap
 	  environment.
 
+16 October 2024: Wouter
+	- Fix for dnstap with dnscrypt and dnstap without dnsoverquic.
+
 14 October 2024: Wouter
 	- Fix to display warning if quic-port is set but dnsoverquic is not
 	  enabled when compiled.

diff --git a/util/netevent.c b/util/netevent.c
@@ -6676,12 +6676,19 @@ comm_point_send_reply(struct comm_reply *repinfo)
 #endif
 	} else {
 #ifdef USE_DNSTAP
-		struct dt_env* dtenv = repinfo->c->doq_socket
-			?repinfo->c->dtenv
-			:repinfo->c->tcp_parent->dtenv;
+		struct dt_env* dtenv =
+#ifdef HAVE_NGTCP2
+			repinfo->c->doq_socket
+			?repinfo->c->dtenv:
+#endif
+			repinfo->c->tcp_parent->dtenv;
 		struct sldns_buffer* dtbuffer = repinfo->c->tcp_req_info
 			?repinfo->c->tcp_req_info->spool_buffer
 			:repinfo->c->buffer;
+#ifdef USE_DNSCRYPT
+		if(repinfo->c->dnscrypt && repinfo->is_dnscrypted)
+			dtbuffer = repinfo->c->buffer;
+#endif
 		/*
 		 * sending src (client)/dst (local service) addresses over
 		 * DNSTAP from other callbacks