From 801b958a5c855816a36d92c7f533c485d9af8dcc Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 20 Feb 2014 14:00:54 +1100 Subject: [PATCH] s/DNS_EDNSOPTIONS/DNS_EDNSOPTIONS/ --- bin/dig/dighost.c | 8 ++++---- bin/named/client.c | 6 +++--- lib/dns/include/dns/message.h | 2 +- lib/dns/resolver.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 767a091cf7..e6bb08df31 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -2349,7 +2349,7 @@ setup_lookup(dig_lookup_t *lookup) { if (lookup->udpsize > 0 || lookup->dnssec || lookup->edns > -1 || lookup->ecs_addr != NULL) { - dns_ednsopt_t opts[DNS_OPT_EDNSOPTIONS]; + dns_ednsopt_t opts[DNS_EDNSOPTIONS]; int i = 0; if (lookup->udpsize == 0) @@ -2358,7 +2358,7 @@ setup_lookup(dig_lookup_t *lookup) { lookup->edns = 0; if (lookup->nsid) { - INSIST(i < DNS_OPT_EDNSOPTIONS); + INSIST(i < DNS_EDNSOPTIONS); opts[i].code = DNS_OPT_NSID; opts[i].length = 0; opts[i].value = NULL; @@ -2379,7 +2379,7 @@ setup_lookup(dig_lookup_t *lookup) { /* Round up prefix len to a multiple of 8 */ addrl = (prefixlen + 7) / 8; - INSIST(i < DNS_OPT_EDNSOPTIONS); + INSIST(i < DNS_EDNSOPTIONS); opts[i].code = DNS_OPT_CLIENT_SUBNET; opts[i].length = addrl + 4; check_result(result, "isc_buffer_allocate"); @@ -2408,7 +2408,7 @@ setup_lookup(dig_lookup_t *lookup) { #ifdef ISC_PLATFORM_USESIT if (lookup->sit) { - INSIST(i < DNS_OPT_EDNSOPTIONS); + INSIST(i < DNS_EDNSOPTIONS); opts[i].code = DNS_OPT_SIT; if (lookup->sitvalue != NULL) { isc_buffer_t b; diff --git a/bin/named/client.c b/bin/named/client.c index 19c296f377..52d813bca8 100644 --- a/bin/named/client.c +++ b/bin/named/client.c @@ -1377,7 +1377,7 @@ client_addopt(ns_client_t *client) { dns_view_t *view; dns_resolver_t *resolver; isc_uint16_t udpsize; - dns_ednsopt_t ednsopts[DNS_OPT_EDNSOPTIONS]; + dns_ednsopt_t ednsopts[DNS_EDNSOPTIONS]; int count = 0; unsigned int flags; @@ -1406,7 +1406,7 @@ client_addopt(ns_client_t *client) { } else nsidp = ns_g_server->server_id; - INSIST(count < DNS_OPT_EDNSOPTIONS); + INSIST(count < DNS_EDNSOPTIONS); ednsopts[count].code = DNS_OPT_NSID; ednsopts[count].length = strlen(nsidp); ednsopts[count].value = (unsigned char *)nsidp; @@ -1425,7 +1425,7 @@ client_addopt(ns_client_t *client) { compute_sit(client, now, nonce, &buf); - INSIST(count < DNS_OPT_EDNSOPTIONS); + INSIST(count < DNS_EDNSOPTIONS); ednsopts[count].code = DNS_OPT_SIT; ednsopts[count].length = SIT_SIZE; ednsopts[count].value = sit; diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h index 72b70719fd..a6cc1b4241 100644 --- a/lib/dns/include/dns/message.h +++ b/lib/dns/include/dns/message.h @@ -110,7 +110,7 @@ #define DNS_OPT_SIT 65001 /*%< SIT opt code */ /*%< The number of EDNS options we know about. */ -#define DNS_OPT_EDNSOPTIONS 3 +#define DNS_EDNSOPTIONS 3 #define DNS_MESSAGE_REPLYPRESERVE (DNS_MESSAGEFLAG_RD|DNS_MESSAGEFLAG_CD) #define DNS_MESSAGEEXTFLAG_REPLYPRESERVE (DNS_MESSAGEEXTFLAG_DO) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 4b87f5e4a8..0b421ca703 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -1837,7 +1837,7 @@ resquery_send(resquery_t *query) { isc_boolean_t cleanup_cctx = ISC_FALSE; isc_boolean_t secure_domain; isc_boolean_t connecting = ISC_FALSE; - dns_ednsopt_t ednsopts[DNS_OPT_EDNSOPTIONS]; + dns_ednsopt_t ednsopts[DNS_EDNSOPTIONS]; unsigned ednsopt = 0; isc_uint16_t hint = 0, udpsize = 0; /* No EDNS */ @@ -2065,7 +2065,7 @@ resquery_send(resquery_t *query) { #endif } if (reqnsid) { - INSIST(ednsopt < DNS_OPT_EDNSOPTIONS); + INSIST(ednsopt < DNS_EDNSOPTIONS); ednsopts[ednsopt].code = DNS_OPT_NSID; ednsopts[ednsopt].length = 0; ednsopts[ednsopt].value = NULL; @@ -2073,7 +2073,7 @@ resquery_send(resquery_t *query) { } #ifdef ISC_PLATFORM_USESIT if (reqsit) { - INSIST(ednsopt < DNS_OPT_EDNSOPTIONS); + INSIST(ednsopt < DNS_EDNSOPTIONS); ednsopts[ednsopt].code = DNS_OPT_SIT; ednsopts[ednsopt].length = (isc_uint16_t) dns_adb_getsit(fctx->adb,