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

Change type of rr type parameter

Browse Source 
We use dns_rdatatype_t for type, replace uint16_t with the right type
definition.
This commit is contained in:
Matthijs Mekking
2025-02-06 16:31:57 +01:00
parent ea192f3376
commit 5a7b233ff3
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/dns/include/dns/qp.h
View File

@@ -469,7 +469,8 @@ dns_qpmulti_memusage(dns_qpmulti_t *multi);
size_t
dns_qpkey_fromname(dns_qpkey_t key, const dns_name_t *name);
size_t
dns_qpkey_fromnametype(dns_qpkey_t key, const dns_name_t *name, uint16_t type);
dns_qpkey_fromnametype(dns_qpkey_t key, const dns_name_t *name,
dns_rdatatype_t type);
/*%<
* Convert a DNS name and RR type into a trie lookup key.
*
@@ -519,8 +520,8 @@ isc_result_t
dns_qp_getname(dns_qpreadable_t qpr, const dns_name_t *name, void **pval_r,
uint32_t *ival_r);
isc_result_t
dns_qp_getnametype(dns_qpreadable_t qpr, const dns_name_t *name, uint16_t type,
void **pval_r, uint32_t *ival_r);
dns_qp_getnametype(dns_qpreadable_t qpr, const dns_name_t *name,
dns_rdatatype_t type, void **pval_r, uint32_t *ival_r);
/*%<
* Find a leaf in a qp-trie that matches the given DNS name and RR type.
*
@@ -537,9 +538,9 @@ dns_qp_getnametype(dns_qpreadable_t qpr, const dns_name_t *name, uint16_t type,
*/
isc_result_t
dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name, uint16_t type,
dns_name_t *foundname, dns_qpiter_t *iter, dns_qpchain_t *chain,
void **pval_r, uint32_t *ival_r);
dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name,
dns_rdatatype_t type, dns_name_t *foundname, dns_qpiter_t *iter,
dns_qpchain_t *chain, void **pval_r, uint32_t *ival_r);
/*%<
* Look up a leaf in a qp-trie that is equal to, or an ancestor domain of,
* 'name', matching 'type'.
@@ -619,8 +620,8 @@ isc_result_t
dns_qp_deletename(dns_qp_t *qp, const dns_name_t *name, void **pval_r,
uint32_t *ival_r);
isc_result_t
dns_qp_deletenametype(dns_qp_t *qp, const dns_name_t *name, uint16_t type,
void **pval_r, uint32_t *ival_r);
dns_qp_deletenametype(dns_qp_t *qp, const dns_name_t *name,
dns_rdatatype_t type, void **pval_r, uint32_t *ival_r);
/*%<
* Delete a leaf from a qp-trie that matches the given DNS name and RR type
*

17
lib/dns/qp.c
View File

@@ -275,7 +275,8 @@ initialize_bits_for_rrtype(void) {
* dot in a zone file).
*/
size_t
dns_qpkey_fromnametype(dns_qpkey_t key, const dns_name_t *name, uint16_t type) {
dns_qpkey_fromnametype(dns_qpkey_t key, const dns_name_t *name,
dns_rdatatype_t type) {
uint32_t bits;
size_t len = 0, label;
dns_fixedname_t fixed;
@@ -1864,8 +1865,8 @@ dns_qp_deletekey(dns_qp_t *qp, const dns_qpkey_t search_key,
}
isc_result_t
dns_qp_deletenametype(dns_qp_t *qp, const dns_name_t *name, uint16_t type,
void **pval_r, uint32_t *ival_r) {
dns_qp_deletenametype(dns_qp_t *qp, const dns_name_t *name,
dns_rdatatype_t type, void **pval_r, uint32_t *ival_r) {
dns_qpkey_t key;
size_t keylen = dns_qpkey_fromnametype(key, name, type);
return dns_qp_deletekey(qp, key, keylen, pval_r, ival_r);
@@ -2120,8 +2121,8 @@ dns_qp_getkey(dns_qpreadable_t qpr, const dns_qpkey_t search_key,
}
isc_result_t
dns_qp_getnametype(dns_qpreadable_t qpr, const dns_name_t *name, uint16_t type,
void **pval_r, uint32_t *ival_r) {
dns_qp_getnametype(dns_qpreadable_t qpr, const dns_name_t *name,
dns_rdatatype_t type, void **pval_r, uint32_t *ival_r) {
dns_qpkey_t key;
size_t keylen = dns_qpkey_fromnametype(key, name, type);
return dns_qp_getkey(qpr, key, keylen, pval_r, ival_r);
@@ -2304,9 +2305,9 @@ fix_chain(dns_qpchain_t *chain, size_t offset) {
}
isc_result_t
dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name, uint16_t type,
dns_name_t *foundname, dns_qpiter_t *iter, dns_qpchain_t *chain,
void **pval_r, uint32_t *ival_r) {
dns_qp_lookup(dns_qpreadable_t qpr, const dns_name_t *name,
dns_rdatatype_t type, dns_name_t *foundname, dns_qpiter_t *iter,
dns_qpchain_t *chain, void **pval_r, uint32_t *ival_r) {
dns_qpreader_t *qp = dns_qpreader(qpr);
dns_qpkey_t search, found;
size_t searchlen, foundlen;