upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 09:20:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove DNS_DISPATCHATTR_MAKEQUERY

Browse source 
This attribute was set but was no longer being used.
This commit is contained in:
Evan Hunt 2020-12-16 23:33:42 -08:00 committed by Ondřej Surý
parent 5dcf55da03
commit 9fd375217d
8 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/nsupdate/nsupdate.c
View file

@ -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,

4
bin/tests/system/pipelined/pipequeries.c
View file

@ -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));

3
bin/tests/system/tkey/keycreate.c
View file

@ -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));

3
bin/tests/system/tkey/keydelete.c
View file

@ -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));

2
bin/tools/mdig.c
View file

@ -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;

5
lib/dns/include/dns/dispatch.h
View file

@ -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
/*@}*/

2
lib/dns/request.c
View file

@ -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 {

3
lib/dns/resolver.c
View file

@ -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;