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

Merge branch 'each-route-socket-fixes' into 'main'

Browse Source 
fix route socket errors

See merge request isc-projects/bind9!5505
This commit is contained in:
Evan Hunt
2021-10-18 21:25:28 +00:00
parent 9e6ed31b91 32b50407bf
commit 8dd43a8fcd
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/isc/netmgr/netmgr.c
View File

@@ -2144,7 +2144,7 @@ isc__nm_get_read_req(isc_nmsocket_t *sock, isc_sockaddr_t *sockaddr) {
isc_nmhandle_attach(sock->statichandle, &req->handle); isc_nmhandle_attach(sock->statichandle, &req->handle);
break; break;
default: default:
if (atomic_load(&sock->client)) { if (atomic_load(&sock->client) && sock->statichandle != NULL) {
isc_nmhandle_attach(sock->statichandle, &req->handle); isc_nmhandle_attach(sock->statichandle, &req->handle);
} else { } else {
req->handle = isc__nmhandle_get(sock, sockaddr, NULL); req->handle = isc__nmhandle_get(sock, sockaddr, NULL);

26
lib/ns/interfacemgr.c
View File

@@ -116,6 +116,14 @@ route_recv(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
return; return;
} }
if (eresult == ISC_R_SHUTTINGDOWN) {
/*
* The mgr->route and mgr is detached in
* ns_interfacemgr_shutdown()
*/
return;
}
if (eresult != ISC_R_SUCCESS) { if (eresult != ISC_R_SUCCESS) {
if (eresult != ISC_R_CANCELED) { if (eresult != ISC_R_CANCELED) {
isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR, isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR,
@@ -124,6 +132,7 @@ route_recv(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
isc_result_totext(eresult)); isc_result_totext(eresult));
} }
isc_nmhandle_detach(&mgr->route); isc_nmhandle_detach(&mgr->route);
ns_interfacemgr_detach(&mgr);
return; return;
} }
@@ -136,6 +145,7 @@ route_recv(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
"recompile required", "recompile required",
rtm->rtm_version, RTM_VERSION); rtm->rtm_version, RTM_VERSION);
isc_nmhandle_detach(&mgr->route); isc_nmhandle_detach(&mgr->route);
ns_interfacemgr_detach(&mgr);
return; return;
} }
#endif /* ifdef RTM_VERSION */ #endif /* ifdef RTM_VERSION */
@@ -164,6 +174,7 @@ route_recv(isc_nmhandle_t *handle, isc_result_t eresult, isc_region_t *region,
if (done) { if (done) {
isc_nmhandle_detach(&mgr->route); isc_nmhandle_detach(&mgr->route);
ns_interfacemgr_detach(&mgr);
} }
return; return;
} }
@@ -181,6 +192,7 @@ route_connected(isc_nmhandle_t *handle, isc_result_t eresult, void *arg) {
INSIST(mgr->route == NULL); INSIST(mgr->route == NULL);
ns_interfacemgr_attach(mgr, &(ns_interfacemgr_t *){ NULL });
isc_nmhandle_attach(handle, &mgr->route); isc_nmhandle_attach(handle, &mgr->route);
isc_nm_read(handle, route_recv, mgr); isc_nm_read(handle, route_recv, mgr);
} }
@@ -283,9 +295,6 @@ ns_interfacemgr_destroy(ns_interfacemgr_t *mgr) {
isc_refcount_destroy(&mgr->references); isc_refcount_destroy(&mgr->references);
if (mgr->route != NULL) {
isc_nmhandle_detach(&mgr->route);
}
dns_aclenv_detach(&mgr->aclenv); dns_aclenv_detach(&mgr->aclenv);
ns_listenlist_detach(&mgr->listenon4); ns_listenlist_detach(&mgr->listenon4);
ns_listenlist_detach(&mgr->listenon6); ns_listenlist_detach(&mgr->listenon6);
@@ -346,19 +355,18 @@ ns_interfacemgr_shutdown(ns_interfacemgr_t *mgr) {
/*% /*%
* Shut down and detach all interfaces. * Shut down and detach all interfaces.
* By incrementing the generation count, we make purge_old_interfaces() * By incrementing the generation count, we make
* consider all interfaces "old". * purge_old_interfaces() consider all interfaces "old".
*/ */
mgr->generation++; mgr->generation++;
atomic_store(&mgr->shuttingdown, true); atomic_store(&mgr->shuttingdown, true);
LOCK(&mgr->lock); purge_old_interfaces(mgr);
if (mgr->route != NULL) { if (mgr->route != NULL) {
isc_nmhandle_detach(&mgr->route); isc_nmhandle_detach(&mgr->route);
ns_interfacemgr_detach(&mgr);
} }
UNLOCK(&mgr->lock);
purge_old_interfaces(mgr);
} }
static isc_result_t static isc_result_t