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

Refactor cleanup code in the qp-trie for the forwarders table

Browse Source 
Instead of duplicating the destroy_forwarders() code in the cleanup
sections, just call dns_forwarders_detach() every time - in case of
failure, the forwarders aren't going to be attached, and forwarders
object will be destroyed right away.
This commit is contained in:
Ondřej Surý
2023-08-17 12:39:10 +02:00
parent 01c758ea3a
commit 2e3eae6b91
1 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/dns/forward.c
View File

@@ -121,26 +121,8 @@ dns_fwdtable_addfwd(dns_fwdtable_t *fwdtable, const dns_name_t *name,
dns_qp_compact(qp, DNS_QPGC_MAYBE);
dns_qpmulti_commit(fwdtable->table, &qp);
if (result == ISC_R_SUCCESS) {
dns_forwarders_detach(&forwarders);
} else {
goto cleanup;
}
dns_forwarders_detach(&forwarders);
return (ISC_R_SUCCESS);
cleanup:
while (!ISC_LIST_EMPTY(forwarders->fwdrs)) {
fwd = ISC_LIST_HEAD(forwarders->fwdrs);
ISC_LIST_UNLINK(forwarders->fwdrs, fwd, link);
if (fwd->tlsname != NULL) {
dns_name_free(fwd->tlsname, fwdtable->mctx);
isc_mem_put(fwdtable->mctx, fwd->tlsname,
sizeof(*fwd->tlsname));
}
isc_mem_put(fwdtable->mctx, fwd, sizeof(*fwd));
}
isc_mem_put(fwdtable->mctx, forwarders, sizeof(*forwarders));
return (result);
}
@@ -171,21 +153,8 @@ dns_fwdtable_add(dns_fwdtable_t *fwdtable, const dns_name_t *name,
dns_qp_compact(qp, DNS_QPGC_MAYBE);
dns_qpmulti_commit(fwdtable->table, &qp);
if (result == ISC_R_SUCCESS) {
dns_forwarders_detach(&forwarders);
} else {
goto cleanup;
}
dns_forwarders_detach(&forwarders);
return (ISC_R_SUCCESS);
cleanup:
while (!ISC_LIST_EMPTY(forwarders->fwdrs)) {
fwd = ISC_LIST_HEAD(forwarders->fwdrs);
ISC_LIST_UNLINK(forwarders->fwdrs, fwd, link);
isc_mem_put(fwdtable->mctx, fwd, sizeof(*fwd));
}
isc_mem_put(fwdtable->mctx, forwarders, sizeof(*forwarders));
return (result);
}