mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

use netmgr for xfrin

Browse Source 
Use isc_nm_tcpdnsconnect() in xfrin.c for zone transfers.
This commit is contained in:
Evan Hunt
2020-09-06 00:38:50 -07:00
committed by Ondřej Surý
parent 917e365159
commit 49d53a4aa9
9 changed files with 251 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
lib/dns/zone.c
View File

@@ -545,6 +545,7 @@ struct dns_zonemgr {
isc_taskmgr_t *taskmgr;
isc_timermgr_t *timermgr;
isc_socketmgr_t *socketmgr;
isc_nm_t *netmgr;
isc_taskpool_t *zonetasks;
isc_taskpool_t *loadtasks;
isc_task_t *task;
@@ -774,6 +775,8 @@ zone_unload(dns_zone_t *zone);
static void
zone_expire(dns_zone_t *zone);
static void
zone_refresh(dns_zone_t *zone);
static void
zone_iattach(dns_zone_t *source, dns_zone_t **target);
static void
zone_idetach(dns_zone_t **zonep);
@@ -10966,11 +10969,13 @@ zone_maintenance(dns_zone_t *zone) {
case dns_zone_slave:
case dns_zone_mirror:
case dns_zone_stub:
LOCK_ZONE(zone);
if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH) &&
isc_time_compare(&now, &zone->refreshtime) >= 0)
{
dns_zone_refresh(zone);
zone_refresh(zone);
}
UNLOCK_ZONE(zone);
break;
default:
break;
@@ -11215,14 +11220,15 @@ failure:
zone_unload(zone);
}
void
dns_zone_refresh(dns_zone_t *zone) {
static void
zone_refresh(dns_zone_t *zone) {
isc_interval_t i;
uint32_t oldflags;
unsigned int j;
isc_result_t result;
REQUIRE(DNS_ZONE_VALID(zone));
REQUIRE(LOCKED_ZONE(zone));
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING)) {
return;
@@ -11233,7 +11239,6 @@ dns_zone_refresh(dns_zone_t *zone) {
* in progress at a time.
*/
LOCK_ZONE(zone);
oldflags = atomic_load(&zone->flags);
if (zone->masterscnt == 0) {
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_NOMASTERS);
@@ -11241,13 +11246,13 @@ dns_zone_refresh(dns_zone_t *zone) {
dns_zone_log(zone, ISC_LOG_ERROR,
"cannot refresh: no primaries");
}
goto unlock;
return;
}
DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_REFRESH);
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_NOEDNS);
DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_USEALTXFRSRC);
if ((oldflags & (DNS_ZONEFLG_REFRESH | DNS_ZONEFLG_LOADING)) != 0) {
goto unlock;
return;
}
/*
@@ -11279,7 +11284,12 @@ dns_zone_refresh(dns_zone_t *zone) {
}
/* initiate soa query */
queue_soa_query(zone);
unlock:
}
void
dns_zone_refresh(dns_zone_t *zone) {
LOCK_ZONE(zone);
zone_refresh(zone);
UNLOCK_ZONE(zone);
}
@@ -14392,6 +14402,13 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
dns_xfrin_shutdown(zone->xfr);
}
/*
* In case the shutdown didn't detach the xfr object...
*/
if (zone->xfr != NULL) {
dns_xfrin_detach(&zone->xfr);
}
/* Safe to release the zone now */
if (zone->zmgr != NULL) {
dns_zonemgr_releasezone(zone->zmgr, zone);
@@ -16882,7 +16899,7 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
/*
* Obtaining a lock on the zone->secure (see zone_send_secureserial)
* could result in a deadlock due to a LOR so we will spin if we
* can't obtain the both locks.
* can't obtain both locks.
*/
again:
LOCK_ZONE(zone);
@@ -17351,8 +17368,7 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
INSIST(task == zone->task);
if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING)) {
result = ISC_R_CANCELED;
goto cleanup;
CHECK(ISC_R_CANCELED);
}
TIME_NOW(&now);
@@ -17366,8 +17382,7 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
"got_transfer_quota: skipping zone transfer as "
"master %s (source %s) is unreachable (cached)",
master, source);
result = ISC_R_CANCELED;
goto cleanup;
CHECK(ISC_R_CANCELED);
}
isc_netaddr_fromsockaddr(&masterip, &zone->masteraddr);
@@ -17482,28 +17497,32 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
}
UNLOCK_ZONE(zone);
INSIST(isc_sockaddr_pf(&masteraddr) == isc_sockaddr_pf(&sourceaddr));
result = dns_xfrin_create(zone, xfrtype, &masteraddr, &sourceaddr, dscp,
zone->tsigkey, zone->mctx,
zone->zmgr->timermgr, zone->zmgr->socketmgr,
zone->task, zone_xfrdone, &zone->xfr);
if (result == ISC_R_SUCCESS) {
LOCK_ZONE(zone);
if (xfrtype == dns_rdatatype_axfr) {
if (isc_sockaddr_pf(&masteraddr) == PF_INET) {
inc_stats(zone, dns_zonestatscounter_axfrreqv4);
} else {
inc_stats(zone, dns_zonestatscounter_axfrreqv6);
}
} else if (xfrtype == dns_rdatatype_ixfr) {
if (isc_sockaddr_pf(&masteraddr) == PF_INET) {
inc_stats(zone, dns_zonestatscounter_ixfrreqv4);
} else {
inc_stats(zone, dns_zonestatscounter_ixfrreqv6);
}
}
UNLOCK_ZONE(zone);
if (zone->xfr != NULL) {
dns_xfrin_detach(&zone->xfr);
}
cleanup:
CHECK(dns_xfrin_create(zone, xfrtype, &masteraddr, &sourceaddr, dscp,
zone->tsigkey, zone->mctx, zone->zmgr->timermgr,
zone->zmgr->netmgr, zone->task, zone_xfrdone,
&zone->xfr));
LOCK_ZONE(zone);
if (xfrtype == dns_rdatatype_axfr) {
if (isc_sockaddr_pf(&masteraddr) == PF_INET) {
inc_stats(zone, dns_zonestatscounter_axfrreqv4);
} else {
inc_stats(zone, dns_zonestatscounter_axfrreqv6);
}
} else if (xfrtype == dns_rdatatype_ixfr) {
if (isc_sockaddr_pf(&masteraddr) == PF_INET) {
inc_stats(zone, dns_zonestatscounter_ixfrreqv4);
} else {
inc_stats(zone, dns_zonestatscounter_ixfrreqv6);
}
}
UNLOCK_ZONE(zone);
failure:
/*
* Any failure in this function is handled like a failed
* zone transfer. This ensures that we get removed from
@@ -17789,7 +17808,7 @@ dns_zone_first(dns_zonemgr_t *zmgr, dns_zone_t **first) {
isc_result_t
dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
isc_timermgr_t *timermgr, isc_socketmgr_t *socketmgr,
dns_zonemgr_t **zmgrp) {
isc_nm_t *netmgr, dns_zonemgr_t **zmgrp) {
dns_zonemgr_t *zmgr;
isc_result_t result;
@@ -17800,6 +17819,7 @@ dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
zmgr->taskmgr = taskmgr;
zmgr->timermgr = timermgr;
zmgr->socketmgr = socketmgr;
zmgr->netmgr = netmgr;
zmgr->zonetasks = NULL;
zmgr->loadtasks = NULL;
zmgr->mctxpool = NULL;