mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

4045. [bug] Skip to next master on dns_request_createvia4 failure.

Browse Source 
[RT #25185]
This commit is contained in:
Mark Andrews 2015-01-22 15:56:50 +11:00
parent b3c4c896e3
commit 875574f1e4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
4045. [bug] Skip to next master on dns_request_createvia4 failure.
[RT #25185]
4044. [bug] Change 3955 was not complete, resulting in an assertion 4044. [bug] Change 3955 was not complete, resulting in an assertion
failure if the timing was just right. [RT #38352] failure if the timing was just right. [RT #38352]

10
lib/dns/zone.c
View File

@ -11674,14 +11674,11 @@ soa_query(isc_task_t *task, isc_event_t *event) {
goto cleanup; goto cleanup;
} }
/* again:
* XXX Optimisation: Create message when zone is setup and reuse.
*/
result = create_query(zone, dns_rdatatype_soa, &message); result = create_query(zone, dns_rdatatype_soa, &message);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto cleanup; goto cleanup;
again:
INSIST(zone->masterscnt > 0); INSIST(zone->masterscnt > 0);
INSIST(zone->curmaster < zone->masterscnt); INSIST(zone->curmaster < zone->masterscnt);
@ -11803,9 +11800,9 @@ soa_query(isc_task_t *task, isc_event_t *event) {
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
zone_idetach(&dummy); zone_idetach(&dummy);
zone_debuglog(zone, me, 1, zone_debuglog(zone, me, 1,
"dns_request_createvia2() failed: %s", "dns_request_createvia4() failed: %s",
dns_result_totext(result)); dns_result_totext(result));
goto cleanup; goto skip_master;
} else { } else {
if (isc_sockaddr_pf(&zone->masteraddr) == PF_INET) if (isc_sockaddr_pf(&zone->masteraddr) == PF_INET)
inc_stats(zone, dns_zonestatscounter_soaoutv4); inc_stats(zone, dns_zonestatscounter_soaoutv4);
@ -11831,6 +11828,7 @@ soa_query(isc_task_t *task, isc_event_t *event) {
skip_master: skip_master:
if (key != NULL) if (key != NULL)
dns_tsigkey_detach(&key); dns_tsigkey_detach(&key);
dns_message_destroy(&message);
/* /*
* Skip to next failed / untried master. * Skip to next failed / untried master.
*/ */