From 9fd375217d3ada22068992daf8d12076fcf063a7 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Wed, 16 Dec 2020 23:33:42 -0800 Subject: [PATCH] Remove DNS_DISPATCHATTR_MAKEQUERY This attribute was set but was no longer being used. --- bin/nsupdate/nsupdate.c | 6 ++---- bin/tests/system/pipelined/pipequeries.c | 4 +--- bin/tests/system/tkey/keycreate.c | 3 +-- bin/tests/system/tkey/keydelete.c | 3 +-- bin/tools/mdig.c | 2 +- lib/dns/include/dns/dispatch.h | 5 ----- lib/dns/request.c | 2 +- lib/dns/resolver.c | 3 +-- 8 files changed, 8 insertions(+), 20 deletions(-) diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index ce2a48c4d0..d0a2895d01 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -937,8 +937,7 @@ setup_system(void) { set_source_ports(dispatchmgr); if (have_ipv6) { - attrs = (DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY | - DNS_DISPATCHATTR_IPV6); + attrs = (DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_IPV6); isc_sockaddr_any6(&bind_any6); result = dns_dispatch_createudp(dispatchmgr, socketmgr, taskmgr, &bind_any6, 4, 2, 3, 5, attrs, @@ -947,8 +946,7 @@ setup_system(void) { } if (have_ipv4) { - attrs = (DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY | - DNS_DISPATCHATTR_IPV4); + attrs = (DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_IPV4); isc_sockaddr_any(&bind_any); result = dns_dispatch_createudp(dispatchmgr, socketmgr, taskmgr, &bind_any, 4, 2, 3, 5, attrs, diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c index e8aa99dbd1..0adf5036ff 100644 --- a/bin/tests/system/pipelined/pipequeries.c +++ b/bin/tests/system/pipelined/pipequeries.c @@ -275,9 +275,7 @@ main(int argc, char *argv[]) { RUNCHECK(isc_task_create(taskmgr, 0, &task)); RUNCHECK(dns_dispatchmgr_create(mctx, &dispatchmgr)); - attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY | - DNS_DISPATCHATTR_IPV4; - + attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_IPV4; RUNCHECK(dns_dispatch_createudp(dispatchmgr, socketmgr, taskmgr, have_src ? &srcaddr : &bind_any, 4, 2, 3, 5, attrs, &dispatchv4)); diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c index 1b9d500893..b5ca6fdb48 100644 --- a/bin/tests/system/tkey/keycreate.c +++ b/bin/tests/system/tkey/keycreate.c @@ -241,8 +241,7 @@ main(int argc, char *argv[]) { RUNCHECK(dns_dispatchmgr_create(mctx, &dispatchmgr)); isc_sockaddr_any(&bind_any); - attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY | - DNS_DISPATCHATTR_IPV4; + attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_IPV4; RUNCHECK(dns_dispatch_createudp(dispatchmgr, socketmgr, taskmgr, &bind_any, 4, 2, 3, 5, attrs, &dispatchv4)); diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c index eabb3f0c7e..d4caf2940d 100644 --- a/bin/tests/system/tkey/keydelete.c +++ b/bin/tests/system/tkey/keydelete.c @@ -184,8 +184,7 @@ main(int argc, char **argv) { RUNCHECK(isc_task_create(taskmgr, 0, &task)); RUNCHECK(dns_dispatchmgr_create(mctx, &dispatchmgr)); isc_sockaddr_any(&bind_any); - attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY | - DNS_DISPATCHATTR_IPV4; + attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_IPV4; RUNCHECK(dns_dispatch_createudp(dispatchmgr, socketmgr, taskmgr, &bind_any, 4, 2, 3, 5, attrs, &dispatchv4)); diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index d379285ed7..4578fd9472 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -2128,7 +2128,7 @@ main(int argc, char *argv[]) { RUNCHECK(isc_task_create(taskmgr, 0, &task)); RUNCHECK(dns_dispatchmgr_create(mctx, &dispatchmgr)); - attrs = DNS_DISPATCHATTR_UDP | DNS_DISPATCHATTR_MAKEQUERY; + attrs = DNS_DISPATCHATTR_UDP; if (have_ipv4) { isc_sockaddr_any(&bind_any); attrs |= DNS_DISPATCHATTR_IPV4; diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h index e4fc0cc727..dfae6ff87e 100644 --- a/lib/dns/include/dns/dispatch.h +++ b/lib/dns/include/dns/dispatch.h @@ -114,17 +114,12 @@ struct dns_dispatchset { * * _IPV4, _IPV6 * The dispatcher uses an IPv4 or IPv6 socket. - * - * _MAKEQUERY - * The dispatcher can be used to issue queries to other servers, and - * accept replies from them. */ #define DNS_DISPATCHATTR_PRIVATE 0x00000001U #define DNS_DISPATCHATTR_TCP 0x00000002U #define DNS_DISPATCHATTR_UDP 0x00000004U #define DNS_DISPATCHATTR_IPV4 0x00000008U #define DNS_DISPATCHATTR_IPV6 0x00000010U -#define DNS_DISPATCHATTR_MAKEQUERY 0x00000040U #define DNS_DISPATCHATTR_CONNECTED 0x00000080U /*@}*/ diff --git a/lib/dns/request.c b/lib/dns/request.c index a4ca668e18..c9256377d3 100644 --- a/lib/dns/request.c +++ b/lib/dns/request.c @@ -556,7 +556,7 @@ create_tcp_dispatch(bool newtcp, dns_requestmgr_t *requestmgr, goto cleanup; } - attrs = DNS_DISPATCHATTR_TCP | DNS_DISPATCHATTR_MAKEQUERY; + attrs = DNS_DISPATCHATTR_TCP; if (isc_sockaddr_pf(destaddr) == AF_INET) { attrs |= DNS_DISPATCHATTR_IPV4; } else { diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 66bebaaa6f..14f82f3a73 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -2999,8 +2999,7 @@ resquery_connected(isc_task_t *task, isc_event_t *event) { */ attrs = DNS_DISPATCHATTR_TCP | DNS_DISPATCHATTR_PRIVATE | - DNS_DISPATCHATTR_CONNECTED | - DNS_DISPATCHATTR_MAKEQUERY; + DNS_DISPATCHATTR_CONNECTED; if (isc_sockaddr_pf(&query->addrinfo->sockaddr) == AF_INET) { attrs |= DNS_DISPATCHATTR_IPV4;