- Fix for dnstap with dnscrypt and dnstap without dnsoverquic.

diff --git a/doc/Changelog b/doc/Changelog
index 0e5564926e2b6ff07a7485a1d3897c23f7820f9f..fde05db51292c0714112be2f4c2e37f15914ca7e 100644 (file)
--- 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
index db190b2c27c842a1c014bb1659572754709e5487..b36f00f1a2aa4f95fd31459dc465afa1ab4c812a 100644 (file)
--- 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