From: Philip Homburg <philip@nlnetlabs.nl>
Date: Thu, 7 Sep 2023 14:23:11 +0000 (+0200)
Subject: Avoid calling comm_point_udp_ancil_callback from comm_point_create_udp
X-Git-Tag: release-1.19.0rc1~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c8f0e0fc5056e95fed87206ef6f81aed4d209d1;p=thirdparty%2Funbound.git

Avoid calling comm_point_udp_ancil_callback from comm_point_create_udp
---

diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 259347a36..753550978 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -1327,7 +1327,9 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
 			log_warn("socket timestamping is not available");
 		}
 		if(!port_insert(list, s, is_dnscrypt
-			?listen_type_udp_dnscrypt:listen_type_udp,
+			?listen_type_udp_dnscrypt :
+			(sock_queue_timeout ?
+				listen_type_udpancil:listen_type_udp),
 			is_pp2, ub_sock)) {
 			sock_close(s);
 			if(ub_sock->addr)
diff --git a/util/netevent.c b/util/netevent.c
index 9f4a6e6c3..2c03cfd60 100644
--- a/util/netevent.c
+++ b/util/netevent.c
@@ -3854,11 +3854,7 @@ comm_point_create_udp(struct comm_base *base, int fd, sldns_buffer* buffer,
 	evbits = UB_EV_READ | UB_EV_PERSIST;
 	/* ub_event stuff */
 	c->ev->ev = ub_event_new(base->eb->base, c->fd, evbits,
-#if defined(USE_WINSOCK) || !(defined(AF_INET6) && defined(IPV6_PKTINFO) && defined(HAVE_RECVMSG))
 		comm_point_udp_callback, c);
-#else
-		comm_point_udp_ancil_callback, c);
-#endif
 	if(c->ev->ev == NULL) {
 		log_err("could not baseset udp event");
 		comm_point_delete(c);