From: Michał Kępień <michal@isc.org>
Date: Tue, 14 Jun 2022 11:13:32 +0000 (+0200)
Subject: Drop the 'fetchhandle' and 'fetch' fields
X-Git-Tag: v9.19.3~48^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e187b893d03f6d3dbba0962a3280d3d9722b1e2;p=thirdparty%2Fbind9.git

Drop the 'fetchhandle' and 'fetch' fields

Drop the 'fetchhandle' field from ns_client_t as all code using it has
been migrated to use the recursion-type-specific HANDLE_RECTYPE_*()
macros.

Drop the 'fetch' field from ns_query_t as all code using it has been
migrated to use the recursion-type-specific FETCH_RECTYPE_*() macros.
---

diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h
index 67c641b7cc3..bf3d85db004 100644
--- a/lib/ns/include/ns/client.h
+++ b/lib/ns/include/ns/client.h
@@ -174,7 +174,6 @@ struct ns_client {
 	isc_nmhandle_t  *sendhandle;  /* Waiting for send callback */
 	isc_nmhandle_t  *reqhandle;   /* Waiting for request callback
 					 (query, update, notify) */
-	isc_nmhandle_t *fetchhandle;  /* Waiting for recursive fetch */
 	isc_nmhandle_t *updatehandle; /* Waiting for update callback */
 	unsigned char  *tcpbuf;
 	dns_message_t  *message;
diff --git a/lib/ns/include/ns/query.h b/lib/ns/include/ns/query.h
index 321e83eecaf..18d1b5c9b60 100644
--- a/lib/ns/include/ns/query.h
+++ b/lib/ns/include/ns/query.h
@@ -104,7 +104,6 @@ struct ns_query {
 	bool		 authdbset;
 	bool		 isreferral;
 	isc_mutex_t	 fetchlock;
-	dns_fetch_t	    *fetch;
 	ns_hookasync_t  *hookactx;
 	dns_rpz_st_t    *rpz_st;
 	isc_bufferlist_t namebufs;