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 67c641b7cc3de953ecaa81a89eadd72429a7182c..bf3d85db0047ac9eace8213e4542f9d041af98e3 100644 (file)
--- 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 321e83eecaf4bd13adc5b890774a137e25d5a649..18d1b5c9b604abc670fb6781482680842af8a937 100644 (file)
--- 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;