- Fix #941: dnscrypt doesn't work after upgrade to 1.18 with

  suggestion by dukeartem to also fix the udp_ancil with dnscrypt.

diff --git a/doc/Changelog b/doc/Changelog
index e268a5203aaa07a56553d8195ab368744879202a..5b024f3c3534d85663393ff2b8f6f39266788464 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+31 October 2023: George
+       - Fix #941: dnscrypt doesn't work after upgrade to 1.18 with
+         suggestion by dukeartem to also fix the udp_ancil with dnscrypt.
+
 30 October 2023: George
        - Merge #930 from Stuart Henderson: add void to
          log_ident_revert_to_default declaration.

diff --git a/util/netevent.c b/util/netevent.c
index c26b13e4a6852d5ff487d1da80e294ef34de9ff3..141e48d48b3f66aa88a370a6925f9f42095b19d0 100644 (file)
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -1070,7 +1070,13 @@ comm_point_udp_ancil_callback(int fd, short event, void* arg)
                fptr_ok(fptr_whitelist_comm_point(rep.c->callback));
                if((*rep.c->callback)(rep.c, rep.c->cb_arg, NETEVENT_NOERROR, &rep)) {
                        /* send back immediate reply */
-                       (void)comm_point_send_udp_msg_if(rep.c, rep.c->buffer,
+                       struct sldns_buffer *buffer;
+#ifdef USE_DNSCRYPT
+                       buffer = rep.c->dnscrypt_buffer;
+#else
+                       buffer = rep.c->buffer;
+#endif
+                       (void)comm_point_send_udp_msg_if(rep.c, buffer,
                                (struct sockaddr*)&rep.remote_addr,
                                rep.remote_addrlen, &rep);
                }