Reuse new function from rt46864 for similar block elsewhere.
(cherry picked from commit e7a93321f0)
This commit is contained in:
+2
-8
@@ -3987,10 +3987,7 @@ fctx_try(fetchctx_t *fctx, isc_boolean_t retrying, isc_boolean_t badcache) {
|
||||
if (addrinfo == NULL) {
|
||||
/* We have no more addresses. Start over. */
|
||||
fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE);
|
||||
fctx_cleanupfinds(fctx);
|
||||
fctx_cleanupaltfinds(fctx);
|
||||
fctx_cleanupforwaddrs(fctx);
|
||||
fctx_cleanupaltaddrs(fctx);
|
||||
fctx_cleanupall(fctx);
|
||||
result = fctx_getaddresses(fctx, badcache);
|
||||
if (result == DNS_R_WAIT) {
|
||||
/*
|
||||
@@ -9045,10 +9042,7 @@ rctx_nextserver(respctx_t *rctx, dns_adbaddrinfo_t *addrinfo,
|
||||
fctx->ns_ttl = fctx->nameservers.ttl;
|
||||
fctx->ns_ttl_ok = ISC_TRUE;
|
||||
fctx_cancelqueries(fctx, ISC_TRUE, ISC_FALSE);
|
||||
fctx_cleanupfinds(fctx);
|
||||
fctx_cleanupaltfinds(fctx);
|
||||
fctx_cleanupforwaddrs(fctx);
|
||||
fctx_cleanupaltaddrs(fctx);
|
||||
fctx_cleanupall(fctx);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user