ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Make dns_xfrin_shutdown() safe to run from a different loop

Browse Source 
If the current loop is different than the zone transfer's loop then
run the shutdown operation asynchronously.

(cherry picked from commit 3d1179501a)
This commit is contained in:
Aram Sargsyan
2024-06-11 10:57:15 +00:00
committed by Arаm Sаrgsyаn
parent 2886a08c1f
commit c76d083d4d
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/dns/xfrin.c
View File

@@ -16,6 +16,7 @@
#include <inttypes.h>
#include <stdbool.h>
#include <isc/async.h>
#include <isc/atomic.h>
#include <isc/mem.h>
#include <isc/random.h>
@@ -1048,11 +1049,26 @@ dns_xfrin_gettsigkeyname(const dns_xfrin_t *xfr) {
return (dst_key_name(xfr->tsigkey->key));
}
static void
xfrin_shutdown(void *arg) {
dns_xfrin_t *xfr = arg;
REQUIRE(VALID_XFRIN(xfr));
xfrin_fail(xfr, ISC_R_CANCELED, "shut down");
dns_xfrin_detach(&xfr);
}
void
dns_xfrin_shutdown(dns_xfrin_t *xfr) {
REQUIRE(VALID_XFRIN(xfr));
xfrin_fail(xfr, ISC_R_CANCELED, "shut down");
if (xfr->loop != isc_loop()) {
dns_xfrin_ref(xfr);
isc_async_run(xfr->loop, xfrin_shutdown, xfr);
} else {
xfrin_fail(xfr, ISC_R_CANCELED, "shut down");
}
}
#if DNS_XFRIN_TRACE