Merge branch 'fanf-adb-cleanup' into 'main'

A couple of small ADB cleanups

See merge request isc-projects/bind9!6219
This commit is contained in:
Tony Finch
2022-05-03 12:37:38 +00:00
2 changed files with 6 additions and 3 deletions

View File

@@ -1,3 +1,6 @@
5884. [cleanup] Reduce struct padding in ADB address entries, and use a
binary hash function to find addresses. [GL !6219]
5883. [cleanup] Move netmgr/uv-compat.{c,h} to <isc/uv.h>, so
the compatibility libuv shims could be used outside
the network manager. [GL !6199]

View File

@@ -232,16 +232,16 @@ struct dns_adbentry {
dns_adb_t *adb;
dns_adbentrybucket_t *bucket;
unsigned int nh;
unsigned int flags;
unsigned int srtt;
uint16_t udpsize;
unsigned int completed;
unsigned int timeouts;
unsigned char plain;
unsigned char plainto;
unsigned char edns;
unsigned char ednsto;
unsigned int nh;
uint16_t udpsize;
uint8_t mode;
atomic_uint_fast32_t quota;
@@ -2114,7 +2114,7 @@ dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_taskmgr_t *taskmgr,
isc_ht_init(&adb->namebuckets, adb->mctx, 1, ISC_HT_CASE_INSENSITIVE);
isc_rwlock_init(&adb->names_lock, 0, 0);
isc_ht_init(&adb->entrybuckets, adb->mctx, 1, ISC_HT_CASE_INSENSITIVE);
isc_ht_init(&adb->entrybuckets, adb->mctx, 1, ISC_HT_CASE_SENSITIVE);
isc_rwlock_init(&adb->entries_lock, 0, 0);
isc_mutex_init(&adb->lock);