From: George Thessalonikefs Date: Tue, 31 Oct 2023 21:41:06 +0000 (+0100) Subject: - Fix #941: dnscrypt doesn't work after upgrade to 1.18 with X-Git-Tag: release-1.19.0rc1~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d1d728d88d20d0e2c00e9facd020143516065bd;p=thirdparty%2Funbound.git - 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 e268a5203..5b024f3c3 100644 --- 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 c26b13e4a..141e48d48 100644 --- 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); }