From: W.C.A. Wijngaards Date: Fri, 19 May 2023 14:36:31 +0000 (+0200) Subject: - Fix to remove unused variables from RPZ clientip data structure. X-Git-Tag: release-1.18.0rc1~24^2~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59fd48c2266c2da6c4f8a1791a366a9a56378fd6;p=thirdparty%2Funbound.git - Fix to remove unused variables from RPZ clientip data structure. --- diff --git a/doc/Changelog b/doc/Changelog index 8d07f417d..4e647d4df 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,6 @@ 19 May 2023: Wouter - Fix RPZ removal of client-ip, nsip, nsdname triggers from IXFR. + - Fix to remove unused variables from RPZ clientip data structure. 16 May 2023: Wouter - Fix #888: [FR] Use kernel timestamps for dnstap. diff --git a/services/rpz.h b/services/rpz.h index ae93af9a8..e6d8bf566 100644 --- a/services/rpz.h +++ b/services/rpz.h @@ -84,10 +84,11 @@ enum rpz_action { RPZ_CNAME_OVERRIDE_ACTION, /* RPZ CNAME action override*/ }; -struct clientip_synthesized_rrset{ +struct clientip_synthesized_rrset { struct regional* region; struct rbtree_type entries; - lock_rw_type lock; /* lock on the respip tree */ + /** lock on the entries tree */ + lock_rw_type lock; }; struct clientip_synthesized_rr { @@ -95,10 +96,6 @@ struct clientip_synthesized_rr { struct addr_tree_node node; /** lock on the node item */ lock_rw_type lock; - /** tag bitlist */ - uint8_t* taglist; - /** length of the taglist (in bytes) */ - size_t taglen; /** action for this address span */ enum rpz_action action; /** "local data" for this node */