mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

reduce memory consumption of rpz summary database

Browse Source 
use dynamically allocated names instead of fixednames in rpz.c
This commit is contained in:
Evan Hunt
2024-03-11 22:10:41 -07:00
parent 8b67476249
commit c0fcc2899e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dns/rpz.c
View File

@@ -174,8 +174,7 @@ struct dns_rpz_nm_zbits {
*/ */
typedef struct nmdata nmdata_t; typedef struct nmdata nmdata_t;
struct nmdata { struct nmdata {
dns_fixedname_t fn; dns_name_t name;
dns_name_t *name;
isc_mem_t *mctx; isc_mem_t *mctx;
isc_refcount_t references; isc_refcount_t references;
dns_rpz_nm_zbits_t set; dns_rpz_nm_zbits_t set;
@@ -1408,10 +1407,10 @@ new_nmdata(isc_mem_t *mctx, const dns_name_t *name, const nmdata_t *data) {
*newdata = (nmdata_t){ *newdata = (nmdata_t){
.set = data->set, .set = data->set,
.wild = data->wild, .wild = data->wild,
.name = DNS_NAME_INITEMPTY,
.references = ISC_REFCOUNT_INITIALIZER(1), .references = ISC_REFCOUNT_INITIALIZER(1),
}; };
newdata->name = dns_fixedname_initname(&newdata->fn); dns_name_dupwithoffsets(name, mctx, &newdata->name);
dns_name_copy(name, newdata->name);
isc_mem_attach(mctx, &newdata->mctx); isc_mem_attach(mctx, &newdata->mctx);
#ifdef DNS_RPZ_TRACE #ifdef DNS_RPZ_TRACE
@@ -2683,6 +2682,7 @@ dns_rpz_decode_cname(dns_rpz_zone_t *rpz, dns_rdataset_t *rdataset,
static void static void
destroy_nmdata(nmdata_t *data) { destroy_nmdata(nmdata_t *data) {
dns_name_free(&data->name, data->mctx);
isc_mem_putanddetach(&data->mctx, data, sizeof(nmdata_t)); isc_mem_putanddetach(&data->mctx, data, sizeof(nmdata_t));
} }
@@ -2710,7 +2710,7 @@ static size_t
qp_makekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval, qp_makekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval,
uint32_t ival ISC_ATTR_UNUSED) { uint32_t ival ISC_ATTR_UNUSED) {
nmdata_t *data = pval; nmdata_t *data = pval;
return (dns_qpkey_fromname(key, data->name)); return (dns_qpkey_fromname(key, &data->name));
} }
static void static void