upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-24 07:41:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fanf-simplify-view-detach' into 'main'

Browse source 
Simplify locking in dns_view_detach()

See merge request isc-projects/bind9!7538
This commit is contained in:
Tony Finch 2023-02-16 13:44:28 +00:00
commit d3e2b680d0
1 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lib/dns/view.c
View file

@ -522,36 +522,15 @@ dns_view_detach(dns_view_t **viewp) {
if (view->resolver != NULL) {
resolver = view->resolver;
view->resolver = NULL;
UNLOCK(&view->lock);
dns_resolver_shutdown(resolver);
dns_resolver_detach(&resolver);
LOCK(&view->lock);
}
if (view->adb != NULL) {
adb = view->adb;
view->adb = NULL;
UNLOCK(&view->lock);
dns_adb_shutdown(adb);
dns_adb_detach(&adb);
LOCK(&view->lock);
}
if (view->requestmgr != NULL) {
requestmgr = view->requestmgr;
view->requestmgr = NULL;
UNLOCK(&view->lock);
dns_requestmgr_shutdown(requestmgr);
dns_requestmgr_detach(&requestmgr);
LOCK(&view->lock);
}
if (view->zonetable != NULL) {
zt = view->zonetable;
view->zonetable = NULL;
@ -559,7 +538,6 @@ dns_view_detach(dns_view_t **viewp) {
dns_zt_flush(zt);
}
}
if (view->managed_keys != NULL) {
mkzone = view->managed_keys;
view->managed_keys = NULL;
@ -582,15 +560,25 @@ dns_view_detach(dns_view_t **viewp) {
}
UNLOCK(&view->lock);
/* Need to detach zt and zones outside view lock */
/* Detach outside view lock */
if (resolver != NULL) {
dns_resolver_shutdown(resolver);
dns_resolver_detach(&resolver);
}
if (adb != NULL) {
dns_adb_shutdown(adb);
dns_adb_detach(&adb);
}
if (requestmgr != NULL) {
dns_requestmgr_shutdown(requestmgr);
dns_requestmgr_detach(&requestmgr);
}
if (zt != NULL) {
dns_zt_detach(&zt);
}
if (mkzone != NULL) {
dns_zone_detach(&mkzone);
}
if (rdzone != NULL) {
dns_zone_detach(&rdzone);
}