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

Rename DNS_SIGTYPE() to DNS_SIGTYPEPAIR()

Browse Source 
The DNS_SIGTYPE() macro "returns" dns_typepair_t, rename it to make this
fact more obvious and also to match DNS_TYPEPAIR() macro naming.
This commit is contained in:
Ondřej Surý 2025-08-12 07:47:03 +02:00
parent 6e2ca5e0d7
commit 74fe3db37c
No known key found for this signature in database
GPG Key ID: 2820F37E873DEA41
5 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocci/DNS_TYPEPAIR_VALUE.spatch
View File

@ -4,4 +4,4 @@ expression T;
@@ @@
- DNS_TYPEPAIR_VALUE(RRSIG, T) - DNS_TYPEPAIR_VALUE(RRSIG, T)
+ DNS_SIGTYPE(T) + DNS_SIGTYPEPAIR(T)

34
lib/dns/db_p.h
View File

@ -117,39 +117,39 @@ static inline bool
prio_type(dns_typepair_t type) { prio_type(dns_typepair_t type) {
switch (type) { switch (type) {
case dns_rdatatype_soa: case dns_rdatatype_soa:
case DNS_SIGTYPE(dns_rdatatype_soa): case DNS_SIGTYPEPAIR(dns_rdatatype_soa):
case dns_rdatatype_a: case dns_rdatatype_a:
case DNS_SIGTYPE(dns_rdatatype_a): case DNS_SIGTYPEPAIR(dns_rdatatype_a):
case dns_rdatatype_mx: case dns_rdatatype_mx:
case DNS_SIGTYPE(dns_rdatatype_mx): case DNS_SIGTYPEPAIR(dns_rdatatype_mx):
case dns_rdatatype_aaaa: case dns_rdatatype_aaaa:
case DNS_SIGTYPE(dns_rdatatype_aaaa): case DNS_SIGTYPEPAIR(dns_rdatatype_aaaa):
case dns_rdatatype_nsec: case dns_rdatatype_nsec:
case DNS_SIGTYPE(dns_rdatatype_nsec): case DNS_SIGTYPEPAIR(dns_rdatatype_nsec):
case dns_rdatatype_nsec3: case dns_rdatatype_nsec3:
case DNS_SIGTYPE(dns_rdatatype_nsec3): case DNS_SIGTYPEPAIR(dns_rdatatype_nsec3):
case dns_rdatatype_ns: case dns_rdatatype_ns:
case DNS_SIGTYPE(dns_rdatatype_ns): case DNS_SIGTYPEPAIR(dns_rdatatype_ns):
case dns_rdatatype_ds: case dns_rdatatype_ds:
case DNS_SIGTYPE(dns_rdatatype_ds): case DNS_SIGTYPEPAIR(dns_rdatatype_ds):
case dns_rdatatype_cname: case dns_rdatatype_cname:
case DNS_SIGTYPE(dns_rdatatype_cname): case DNS_SIGTYPEPAIR(dns_rdatatype_cname):
case dns_rdatatype_dname: case dns_rdatatype_dname:
case DNS_SIGTYPE(dns_rdatatype_dname): case DNS_SIGTYPEPAIR(dns_rdatatype_dname):
case dns_rdatatype_svcb: case dns_rdatatype_svcb:
case DNS_SIGTYPE(dns_rdatatype_svcb): case DNS_SIGTYPEPAIR(dns_rdatatype_svcb):
case dns_rdatatype_https: case dns_rdatatype_https:
case DNS_SIGTYPE(dns_rdatatype_https): case DNS_SIGTYPEPAIR(dns_rdatatype_https):
case dns_rdatatype_dnskey: case dns_rdatatype_dnskey:
case DNS_SIGTYPE(dns_rdatatype_dnskey): case DNS_SIGTYPEPAIR(dns_rdatatype_dnskey):
case dns_rdatatype_srv: case dns_rdatatype_srv:
case DNS_SIGTYPE(dns_rdatatype_srv): case DNS_SIGTYPEPAIR(dns_rdatatype_srv):
case dns_rdatatype_txt: case dns_rdatatype_txt:
case DNS_SIGTYPE(dns_rdatatype_txt): case DNS_SIGTYPEPAIR(dns_rdatatype_txt):
case dns_rdatatype_ptr: case dns_rdatatype_ptr:
case DNS_SIGTYPE(dns_rdatatype_ptr): case DNS_SIGTYPEPAIR(dns_rdatatype_ptr):
case dns_rdatatype_naptr: case dns_rdatatype_naptr:
case DNS_SIGTYPE(dns_rdatatype_naptr): case DNS_SIGTYPEPAIR(dns_rdatatype_naptr):
return true; return true;
} }
return false; return false;

4
lib/dns/include/dns/rdatatype.h
View File

@ -49,8 +49,8 @@
DNS__TYPEPAIR_VALUE(base, covers); \ DNS__TYPEPAIR_VALUE(base, covers); \
}) })
#define DNS_TYPEPAIR(type) DNS__TYPEPAIR_VALUE(type, dns_rdatatype_none) #define DNS_TYPEPAIR(type) DNS__TYPEPAIR_VALUE(type, dns_rdatatype_none)
#define DNS_SIGTYPE(type) DNS__TYPEPAIR_VALUE(dns_rdatatype_rrsig, type) #define DNS_SIGTYPEPAIR(type) DNS__TYPEPAIR_VALUE(dns_rdatatype_rrsig, type)
constexpr dns_typepair_t dns_typepair_none = DNS_TYPEPAIR(dns_rdatatype_none); constexpr dns_typepair_t dns_typepair_none = DNS_TYPEPAIR(dns_rdatatype_none);
constexpr dns_typepair_t dns_typepair_any = DNS_TYPEPAIR(dns_rdatatype_any); constexpr dns_typepair_t dns_typepair_any = DNS_TYPEPAIR(dns_rdatatype_any);

20
lib/dns/qpcache.c
View File

@ -1279,7 +1279,7 @@ static bool
both_headers(dns_slabheader_t *header, dns_rdatatype_t type, both_headers(dns_slabheader_t *header, dns_rdatatype_t type,
dns_slabheader_t **foundp, dns_slabheader_t **foundsigp) { dns_slabheader_t **foundp, dns_slabheader_t **foundsigp) {
dns_typepair_t typepair = DNS_TYPEPAIR_VALUE(type, 0); dns_typepair_t typepair = DNS_TYPEPAIR_VALUE(type, 0);
dns_typepair_t sigpair = DNS_SIGTYPE(type); dns_typepair_t sigpair = DNS_SIGTYPEPAIR(type);
bool done = related_headers(header, typepair, sigpair, foundp, bool done = related_headers(header, typepair, sigpair, foundp,
foundsigp, NULL); foundsigp, NULL);
@ -1671,7 +1671,7 @@ qpcache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
found = NULL; found = NULL;
foundsig = NULL; foundsig = NULL;
typepair = DNS_TYPEPAIR(type); typepair = DNS_TYPEPAIR(type);
sigpair = DNS_SIGTYPE(type); sigpair = DNS_SIGTYPEPAIR(type);
nsheader = NULL; nsheader = NULL;
nsecheader = NULL; nsecheader = NULL;
nssig = NULL; nssig = NULL;
@ -1749,11 +1749,11 @@ qpcache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
foundsig = cnamesig; foundsig = cnamesig;
} else { } else {
/* Look for CNAME signature instead */ /* Look for CNAME signature instead */
sigpair = DNS_SIGTYPE(dns_rdatatype_cname); sigpair = DNS_SIGTYPEPAIR(dns_rdatatype_cname);
foundsig = NULL; foundsig = NULL;
} }
break; break;
case DNS_SIGTYPE(dns_rdatatype_cname): case DNS_SIGTYPEPAIR(dns_rdatatype_cname):
if (!cname_ok) { if (!cname_ok) {
break; break;
} }
@ -1764,7 +1764,7 @@ qpcache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
/* Remember the NS rdataset */ /* Remember the NS rdataset */
nsheader = header; nsheader = header;
break; break;
case DNS_SIGTYPE(dns_rdatatype_ns): case DNS_SIGTYPEPAIR(dns_rdatatype_ns):
/* ...and its signature */ /* ...and its signature */
nssig = header; nssig = header;
break; break;
@ -1772,7 +1772,7 @@ qpcache_find(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version,
case dns_rdatatype_nsec: case dns_rdatatype_nsec:
nsecheader = header; nsecheader = header;
break; break;
case DNS_SIGTYPE(dns_rdatatype_nsec): case DNS_SIGTYPEPAIR(dns_rdatatype_nsec):
nsecsig = header; nsecsig = header;
break; break;
@ -1951,7 +1951,7 @@ seek_ns_headers(qpc_search_t *search, qpcnode_t *node, dns_dbnode_t **nodep,
for (header = node->data; header != NULL; header = header_next) { for (header = node->data; header != NULL; header = header_next) {
header_next = header->next; header_next = header->next;
bool ns = header->typepair == DNS_TYPEPAIR(dns_rdatatype_ns) || bool ns = header->typepair == DNS_TYPEPAIR(dns_rdatatype_ns) ||
header->typepair == DNS_SIGTYPE(dns_rdatatype_ns); header->typepair == DNS_SIGTYPEPAIR(dns_rdatatype_ns);
if (check_stale_header(header, search, &header_prev)) { if (check_stale_header(header, search, &header_prev)) {
if (ns) { if (ns) {
/* /*
@ -2119,7 +2119,7 @@ qpcache_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
NODE_RDLOCK(nlock, &nlocktype); NODE_RDLOCK(nlock, &nlocktype);
typepair = DNS_TYPEPAIR_VALUE(type, covers); typepair = DNS_TYPEPAIR_VALUE(type, covers);
sigpair = !dns_rdatatype_issig(type) ? DNS_SIGTYPE(type) sigpair = !dns_rdatatype_issig(type) ? DNS_SIGTYPEPAIR(type)
: dns_typepair_none; : dns_typepair_none;
for (header = qpnode->data; header != NULL; header = header_next) { for (header = qpnode->data; header != NULL; header = header_next) {
@ -2582,7 +2582,7 @@ add(qpcache_t *qpdb, qpcnode_t *qpnode,
dns_rdatatype_t rdtype = DNS_TYPEPAIR_TYPE(newheader->typepair); dns_rdatatype_t rdtype = DNS_TYPEPAIR_TYPE(newheader->typepair);
dns_rdatatype_t covers = DNS_TYPEPAIR_COVERS(newheader->typepair); dns_rdatatype_t covers = DNS_TYPEPAIR_COVERS(newheader->typepair);
dns_typepair_t sigpair = !dns_rdatatype_issig(rdtype) dns_typepair_t sigpair = !dns_rdatatype_issig(rdtype)
? DNS_SIGTYPE(rdtype) ? DNS_SIGTYPEPAIR(rdtype)
: dns_typepair_none; : dns_typepair_none;
REQUIRE(rdtype != dns_rdatatype_none); REQUIRE(rdtype != dns_rdatatype_none);
@ -2822,7 +2822,7 @@ find_header:
(header->typepair == DNS_TYPEPAIR(dns_rdatatype_a) || (header->typepair == DNS_TYPEPAIR(dns_rdatatype_a) ||
header->typepair == DNS_TYPEPAIR(dns_rdatatype_aaaa) || header->typepair == DNS_TYPEPAIR(dns_rdatatype_aaaa) ||
header->typepair == DNS_TYPEPAIR(dns_rdatatype_ds) || header->typepair == DNS_TYPEPAIR(dns_rdatatype_ds) ||
header->typepair == DNS_SIGTYPE(dns_rdatatype_ds)) && header->typepair == DNS_SIGTYPEPAIR(dns_rdatatype_ds)) &&
EXISTS(header) && EXISTS(newheader) && EXISTS(header) && EXISTS(newheader) &&
header->trust >= newheader->trust && header->trust >= newheader->trust &&
dns_rdataslab_equal(header, newheader)) dns_rdataslab_equal(header, newheader))

19
lib/dns/qpzone.c
View File

@ -445,7 +445,7 @@ resign_sooner(void *v1, void *v2) {
return h1->resign < h2->resign || return h1->resign < h2->resign ||
(h1->resign == h2->resign && h1->resign_lsb < h2->resign_lsb) || (h1->resign == h2->resign && h1->resign_lsb < h2->resign_lsb) ||
(h1->resign == h2->resign && h1->resign_lsb == h2->resign_lsb && (h1->resign == h2->resign && h1->resign_lsb == h2->resign_lsb &&
h2->typepair == DNS_SIGTYPE(dns_rdatatype_soa)); h2->typepair == DNS_SIGTYPEPAIR(dns_rdatatype_soa));
} }
/*% /*%
@ -1646,7 +1646,7 @@ qpzone_findrdataset(dns_db_t *db, dns_dbnode_t *dbnode,
typepair = DNS_TYPEPAIR_VALUE(type, covers); typepair = DNS_TYPEPAIR_VALUE(type, covers);
if (covers == dns_rdatatype_none) { if (covers == dns_rdatatype_none) {
sigpair = DNS_SIGTYPE(type); sigpair = DNS_SIGTYPEPAIR(type);
} else { } else {
sigpair = dns_typepair_none; sigpair = dns_typepair_none;
} }
@ -3111,7 +3111,7 @@ find_closest_nsec(qpz_search_t *search, dns_dbnode_t **nodep,
dns_rdatatype_t matchtype = nsec3 ? dns_rdatatype_nsec3 dns_rdatatype_t matchtype = nsec3 ? dns_rdatatype_nsec3
: dns_rdatatype_nsec; : dns_rdatatype_nsec;
dns_typepair_t typepair = DNS_TYPEPAIR(matchtype); dns_typepair_t typepair = DNS_TYPEPAIR(matchtype);
dns_typepair_t sigpair = DNS_SIGTYPE(matchtype); dns_typepair_t sigpair = DNS_SIGTYPEPAIR(matchtype);
bool wraps = nsec3; bool wraps = nsec3;
bool first = true; bool first = true;
bool need_sig = secure; bool need_sig = secure;
@ -3280,7 +3280,7 @@ qpzone_check_zonecut(qpznode_t *node, void *arg DNS__DB_FLARG) {
header_next = header->next; header_next = header->next;
if (header->typepair == dns_rdatatype_ns || if (header->typepair == dns_rdatatype_ns ||
header->typepair == dns_rdatatype_dname || header->typepair == dns_rdatatype_dname ||
header->typepair == DNS_SIGTYPE(dns_rdatatype_dname)) header->typepair == DNS_SIGTYPEPAIR(dns_rdatatype_dname))
{ {
do { do {
if (header->serial <= search->serial && if (header->serial <= search->serial &&
@ -3298,7 +3298,7 @@ qpzone_check_zonecut(qpznode_t *node, void *arg DNS__DB_FLARG) {
if (header->typepair == dns_rdatatype_dname) { if (header->typepair == dns_rdatatype_dname) {
dname_header = header; dname_header = header;
} else if (header->typepair == } else if (header->typepair ==
DNS_SIGTYPE(dns_rdatatype_dname)) DNS_SIGTYPEPAIR(dns_rdatatype_dname))
{ {
sigdname_header = header; sigdname_header = header;
} else if (node != search->qpdb->origin || } else if (node != search->qpdb->origin ||
@ -3603,7 +3603,7 @@ found:
* We now go looking for rdata... * We now go looking for rdata...
*/ */
sigpair = DNS_SIGTYPE(type); sigpair = DNS_SIGTYPEPAIR(type);
empty_node = true; empty_node = true;
for (header = node->data; header != NULL; header = header_next) { for (header = node->data; header != NULL; header = header_next) {
header_next = header->next; header_next = header->next;
@ -3707,7 +3707,7 @@ found:
if (cnamesig != NULL) { if (cnamesig != NULL) {
foundsig = cnamesig; foundsig = cnamesig;
} else { } else {
sigpair = DNS_SIGTYPE( sigpair = DNS_SIGTYPEPAIR(
dns_rdatatype_cname); dns_rdatatype_cname);
} }
} }
@ -3739,7 +3739,8 @@ found:
*/ */
nsecheader = header; nsecheader = header;
} else if (header->typepair == } else if (header->typepair ==
DNS_SIGTYPE(dns_rdatatype_nsec) && DNS_SIGTYPEPAIR(
dns_rdatatype_nsec) &&
!search.version->havensec3) !search.version->havensec3)
{ {
/* /*
@ -3749,7 +3750,7 @@ found:
nsecsig = header; nsecsig = header;
} else if (cname_ok && } else if (cname_ok &&
header->typepair == header->typepair ==
DNS_SIGTYPE(dns_rdatatype_cname)) DNS_SIGTYPEPAIR(dns_rdatatype_cname))
{ {
/* /*
* If we get a CNAME match, we'll also need * If we get a CNAME match, we'll also need