mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

style changes from [RT #45321]

Browse Source
This commit is contained in:
Mark Andrews
2017-08-09 07:48:57 +10:00
parent 2013c9751d
commit bcb2df226f
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/dns/resolver.c
View File

@@ -3702,6 +3702,8 @@ fctx_getaddresses(fetchctx_t *fctx, isc_boolean_t badcache) {
dns_resolver_addbadcache(res, &fctx->name, dns_resolver_addbadcache(res, &fctx->name,
fctx->type, &expire); fctx->type, &expire);
result = ISC_R_FAILURE;
/* /*
* If all of the addresses found were over the * If all of the addresses found were over the
* fetches-per-server quota, return the configured * fetches-per-server quota, return the configured
@@ -3710,8 +3712,7 @@ fctx_getaddresses(fetchctx_t *fctx, isc_boolean_t badcache) {
if (all_spilled) { if (all_spilled) {
result = res->quotaresp[dns_quotatype_server]; result = res->quotaresp[dns_quotatype_server];
inc_stats(res, dns_resstatscounter_serverquota); inc_stats(res, dns_resstatscounter_serverquota);
} else }
result = ISC_R_FAILURE;
} }
} else { } else {
/* /*
@@ -3959,10 +3960,11 @@ fctx_try(fetchctx_t *fctx, isc_boolean_t retrying, isc_boolean_t badcache) {
return; return;
} }
addrinfo = fctx_nextaddress(fctx);
/* Try to find an address that isn't over quota */ /* Try to find an address that isn't over quota */
while ((addrinfo = fctx_nextaddress(fctx)) != NULL) while (addrinfo != NULL && dns_adbentry_overquota(addrinfo->entry))
if (! dns_adbentry_overquota(addrinfo->entry)) addrinfo = fctx_nextaddress(fctx);
break;
if (addrinfo == NULL) { if (addrinfo == NULL) {
/* We have no more addresses. Start over. */ /* We have no more addresses. Start over. */
@@ -3987,10 +3989,11 @@ fctx_try(fetchctx_t *fctx, isc_boolean_t retrying, isc_boolean_t badcache) {
return; return;
} }
while ((addrinfo = fctx_nextaddress(fctx)) != NULL) { addrinfo = fctx_nextaddress(fctx);
if (! dns_adbentry_overquota(addrinfo->entry))
break; while (addrinfo != NULL &&
} dns_adbentry_overquota(addrinfo->entry))
addrinfo = fctx_nextaddress(fctx);
/* /*
* While we may have addresses from the ADB, they * While we may have addresses from the ADB, they