From: Aydın Mercan <aydin@isc.org>
Date: Thu, 15 Feb 2024 10:30:42 +0000 (+0300)
Subject: Provide an early escape hatch for ns_client_transport_type
X-Git-Tag: v9.19.24~9^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f30008a71ce03c9e267945007a5362a9850833e3;p=thirdparty%2Fbind9.git

Provide an early escape hatch for ns_client_transport_type

Because some tests don't have a legtimate handle, provide a temporary
return early that should be fixed and removed before squashing. This
short circuiting is still correct until DoQ/DoH3 support is introduced.
---

diff --git a/lib/ns/client.c b/lib/ns/client.c
index 04447397af7..f6ccdd0c5bd 100644
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -123,9 +123,19 @@ static void
 compute_cookie(ns_client_t *client, uint32_t when, const unsigned char *secret,
 	       isc_buffer_t *buf);
 
+#ifdef HAVE_DNSTAP
 static dns_transport_type_t
 ns_client_transport_type(const ns_client_t *client) {
-	REQUIRE(client->handle != NULL);
+	/*
+	 * Early escape hatch for libtest/ns.c
+	 *
+	 * When DoQ support this had to be removed to get correct DoQ entries.
+	 */
+	if (!TCP_CLIENT(client)) {
+		return DNS_TRANSPORT_UDP;
+	}
+
+	INSIST(client->handle != NULL);
 
 	switch (isc_nm_socket_type(client->handle)) {
 	case isc_nm_udpsocket:
@@ -158,6 +168,7 @@ ns_client_transport_type(const ns_client_t *client) {
 
 	return DNS_TRANSPORT_UDP;
 }
+#endif /* HAVE_DNSTAP */
 
 void
 ns_client_recursing(ns_client_t *client) {