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

clean up; fix hashes

Browse Source
This commit is contained in:
Michael Graff
1999-10-29 22:09:31 +00:00
parent 790d7082a7
commit ebdd11e847
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/dns/adb.c
View File

@@ -72,10 +72,10 @@
#define DNS_ADBFETCH_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBFETCH_MAGIC) #define DNS_ADBFETCH_VALID(x) ISC_MAGIC_VALID(x, DNS_ADBFETCH_MAGIC)
/* /*
* Lengths of lists needs to be powers of two. * Lengths of lists needs to be small primes.
*/ */
#define DNS_ADBNAMELIST_LENGTH 32 /* how many buckets for names */ #define DNS_ADBNAMELIST_LENGTH 31 /* how many buckets for names */
#define DNS_ADBENTRYLIST_LENGTH 32 /* how many buckets for addresses */ #define DNS_ADBENTRYLIST_LENGTH 31 /* how many buckets for addresses */
#define CLEAN_SECONDS 20 /* clean this many seconds initially */ #define CLEAN_SECONDS 20 /* clean this many seconds initially */
@@ -146,9 +146,9 @@ struct dns_adbname {
unsigned int partial_result; unsigned int partial_result;
unsigned int query_pending; unsigned int query_pending;
isc_boolean_t dead; isc_boolean_t dead;
int lock_bucket;
isc_stdtime_t expire_v4; isc_stdtime_t expire_v4;
isc_stdtime_t expire_v6; isc_stdtime_t expire_v6;
int lock_bucket;
dns_adbnamehooklist_t v4; dns_adbnamehooklist_t v4;
dns_adbnamehooklist_t v6; dns_adbnamehooklist_t v6;
dns_adbfetch_t *fetch_a; dns_adbfetch_t *fetch_a;
@@ -164,7 +164,6 @@ struct dns_adbfetch {
dns_adbentry_t *entry; dns_adbentry_t *entry;
dns_fetch_t *fetch; dns_fetch_t *fetch;
dns_rdataset_t rdataset; dns_rdataset_t rdataset;
ISC_LINK(dns_adbfetch_t) plink;
}; };
/* /*
@@ -1038,7 +1037,6 @@ new_adbfetch(dns_adb_t *adb)
goto err; goto err;
dns_rdataset_init(&f->rdataset); dns_rdataset_init(&f->rdataset);
ISC_LINK_INIT(f, plink);
f->magic = DNS_ADBFETCH_MAGIC; f->magic = DNS_ADBFETCH_MAGIC;
@@ -1062,8 +1060,6 @@ free_adbfetch(dns_adb_t *adb, dns_adbfetch_t **fetch)
f = *fetch; f = *fetch;
*fetch = NULL; *fetch = NULL;
INSIST(!ISC_LINK_LINKED(f, plink));
f->magic = 0; f->magic = 0;
if (f->namehook != NULL) if (f->namehook != NULL)
@@ -1154,8 +1150,7 @@ find_name_and_lock(dns_adb_t *adb, dns_name_t *name, int *bucketp)
dns_adbname_t *adbname; dns_adbname_t *adbname;
int bucket; int bucket;
bucket = dns_name_hash(name, ISC_FALSE); bucket = dns_name_hash(name, ISC_FALSE) % DNS_ADBNAMELIST_LENGTH;
bucket &= (DNS_ADBNAMELIST_LENGTH - 1);
if (*bucketp == DNS_ADB_INVALIDBUCKET) { if (*bucketp == DNS_ADB_INVALIDBUCKET) {
LOCK(&adb->namelocks[bucket]); LOCK(&adb->namelocks[bucket]);
@@ -1194,8 +1189,7 @@ find_entry_and_lock(dns_adb_t *adb, isc_sockaddr_t *addr, int *bucketp)
dns_adbentry_t *entry; dns_adbentry_t *entry;
int bucket; int bucket;
bucket = isc_sockaddr_hash(addr, ISC_TRUE); bucket = isc_sockaddr_hash(addr, ISC_TRUE) % DNS_ADBENTRYLIST_LENGTH;
bucket &= (DNS_ADBENTRYLIST_LENGTH - 1);
if (*bucketp == DNS_ADB_INVALIDBUCKET) { if (*bucketp == DNS_ADB_INVALIDBUCKET) {
LOCK(&adb->entrylocks[bucket]); LOCK(&adb->entrylocks[bucket]);