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

Merge branch '797-handle-timeouts-when-qminimizing' into 'master'

Browse Source 
Don't retry query on timeout if we're qname minimizing

Closes #797

See merge request isc-projects/bind9!1293
This commit is contained in:
Evan Hunt
2019-01-16 14:21:08 -05:00
parent bbb0947ee1 cfa2804e5a
commit 3d5826b75b
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
5138. [bug] Under some circumstances named could hit an assertion
failure when doing qname minimization when using
forwarders. [GL #797]
5137. [func] named now logs messages whenever a mirror zone becomes 5137. [func] named now logs messages whenever a mirror zone becomes
usable or unusable for resolution purposes. [GL #818] usable or unusable for resolution purposes. [GL #818]

13
lib/dns/resolver.c
View File

@@ -4040,9 +4040,11 @@ fctx_try(fetchctx_t *fctx, bool retrying, bool badcache) {
options &= ~DNS_FETCHOPT_QMINIMIZE; options &= ~DNS_FETCHOPT_QMINIMIZE;
fctx_increference(fctx); fctx_increference(fctx);
task = res->buckets[bucketnum].task; task = res->buckets[bucketnum].task;
fctx_stoptimer(fctx);
result = dns_resolver_createfetch(fctx->res, &fctx->qminname, result = dns_resolver_createfetch(fctx->res, &fctx->qminname,
fctx->qmintype, &fctx->domain, fctx->qmintype, &fctx->domain,
&fctx->nameservers, NULL, NULL, 0, &fctx->nameservers,
NULL, NULL, 0,
options, 0, fctx->qc, task, options, 0, fctx->qc, task,
resume_qmin, fctx, resume_qmin, fctx,
&fctx->qminrrset, NULL, &fctx->qminrrset, NULL,
@@ -4371,13 +4373,12 @@ fctx_timeout(isc_task_t *task, isc_event_t *event) {
* timer. * timer.
*/ */
result = fctx_starttimer(fctx); result = fctx_starttimer(fctx);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS) {
fctx_done(fctx, result, __LINE__); fctx_done(fctx, result, __LINE__);
else } else {
/* /* Keep trying */
* Keep trying.
*/
fctx_try(fctx, true, false); fctx_try(fctx, true, false);
}
} }
isc_event_free(&event); isc_event_free(&event);