Make isc_ht optionally case insensitive

Previously, the isc_ht API would always take the key as a literal input
to the hashing function.  Change the isc_ht_init() function to take an
'options' argument, in which ISC_HT_CASE_SENSITIVE or _INSENSITIVE can
be specified, to determine whether to use case-sensitive hashing in
isc_hash32() when hashing the key.

diff --git a/bin/plugins/filter-a.c b/bin/plugins/filter-a.c
index 2ba52df081f6dfebddf7aaef30ccc30e75b2e6d0..ac05305e18f54be5e8cea2180e93db76429a6a64 100644 (file)
--- a/bin/plugins/filter-a.c
+++ b/bin/plugins/filter-a.c
@@ -347,7 +347,7 @@ plugin_register(const char *parameters, const void *cfg, const char *cfg_file,
                                       cfg_line, mctx, lctx, actx));
        }
 
-       isc_ht_init(&inst->ht, mctx, 16);
+       isc_ht_init(&inst->ht, mctx, 1, ISC_HT_CASE_SENSITIVE);
        isc_mutex_init(&inst->hlock);
 
        /*

diff --git a/bin/plugins/filter-aaaa.c b/bin/plugins/filter-aaaa.c
index 7f6fac12ac72107772839d8b6201d803ae94495c..a83f0f5dde9878fc16289f5a70fb02a849ad55cb 100644 (file)
--- a/bin/plugins/filter-aaaa.c
+++ b/bin/plugins/filter-aaaa.c
@@ -350,7 +350,7 @@ plugin_register(const char *parameters, const void *cfg, const char *cfg_file,
                                       cfg_line, mctx, lctx, actx));
        }
 
-       isc_ht_init(&inst->ht, mctx, 16);
+       isc_ht_init(&inst->ht, mctx, 1, ISC_HT_CASE_SENSITIVE);
        isc_mutex_init(&inst->hlock);
 
        /*

diff --git a/bin/tests/system/hooks/driver/test-async.c b/bin/tests/system/hooks/driver/test-async.c
index 577d5de6f84971b214a47512938a5abed3572c05..90ff1fb33ad4babe5b28cc058fff07c5b80dea8f 100644 (file)
--- a/bin/tests/system/hooks/driver/test-async.c
+++ b/bin/tests/system/hooks/driver/test-async.c
@@ -143,7 +143,7 @@ plugin_register(const char *parameters, const void *cfg, const char *cfg_file,
        *inst = (async_instance_t){ .mctx = NULL };
        isc_mem_attach(mctx, &inst->mctx);
 
-       isc_ht_init(&inst->ht, mctx, 16);
+       isc_ht_init(&inst->ht, mctx, 1, ISC_HT_CASE_SENSITIVE);
        isc_mutex_init(&inst->hlock);
 
        /*

diff --git a/lib/dns/catz.c b/lib/dns/catz.c
index b02157618a5fa94553751edc010ceccbadf5decf..9be7b91ed8e9fa4c4db53e35f7f79307b2960b1a 100644 (file)
--- a/lib/dns/catz.c
+++ b/lib/dns/catz.c
@@ -392,9 +392,9 @@ dns_catz_zones_merge(dns_catz_zone_t *target, dns_catz_zone_t *newzone) {
 
        dns_name_format(&target->name, czname, DNS_NAME_FORMATSIZE);
 
-       isc_ht_init(&toadd, target->catzs->mctx, 16);
+       isc_ht_init(&toadd, target->catzs->mctx, 1, ISC_HT_CASE_SENSITIVE);
 
-       isc_ht_init(&tomod, target->catzs->mctx, 16);
+       isc_ht_init(&tomod, target->catzs->mctx, 1, ISC_HT_CASE_SENSITIVE);
 
        isc_ht_iter_create(newzone->entries, &iter1);
 
@@ -579,7 +579,7 @@ dns_catz_new_zones(dns_catz_zones_t **catzsp, dns_catz_zonemodmethods_t *zmm,
 
        isc_refcount_init(&new_zones->refs, 1);
 
-       isc_ht_init(&new_zones->zones, mctx, 4);
+       isc_ht_init(&new_zones->zones, mctx, 4, ISC_HT_CASE_SENSITIVE);
 
        isc_mem_attach(mctx, &new_zones->mctx);
        new_zones->zmm = zmm;
@@ -630,7 +630,7 @@ dns_catz_new_zone(dns_catz_zones_t *catzs, dns_catz_zone_t **zonep,
        dns_name_init(&new_zone->name, NULL);
        dns_name_dup(name, catzs->mctx, &new_zone->name);
 
-       isc_ht_init(&new_zone->entries, catzs->mctx, 4);
+       isc_ht_init(&new_zone->entries, catzs->mctx, 4, ISC_HT_CASE_SENSITIVE);
 
        new_zone->updatetimer = NULL;
        isc_timer_create(catzs->timermgr, catzs->updater,

diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index aa611d7c730fb710fefa5d59ad950c727d9d0b92..d0feec756e89adde611fdfda88faa591f33e929f 100644 (file)
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -1530,7 +1530,7 @@ dns_rpz_new_zone(dns_rpz_zones_t *rpzs, dns_rpz_zone_t **rpzp) {
         * simplifies update_from_db
         */
 
-       isc_ht_init(&zone->nodes, rpzs->mctx, 1);
+       isc_ht_init(&zone->nodes, rpzs->mctx, 1, ISC_HT_CASE_SENSITIVE);
 
        dns_name_init(&zone->origin, NULL);
        dns_name_init(&zone->client_ip, NULL);
@@ -1676,30 +1676,12 @@ static isc_result_t
 setup_update(dns_rpz_zone_t *rpz) {
        isc_result_t result;
        char domain[DNS_NAME_FORMATSIZE];
-       unsigned int nodecount;
-       uint32_t hashsize;
 
        dns_name_format(&rpz->origin, domain, DNS_NAME_FORMATSIZE);
        isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_MASTER,
                      ISC_LOG_INFO, "rpz: %s: reload start", domain);
 
-       nodecount = dns_db_nodecount(rpz->updb, dns_dbtree_main);
-       hashsize = 1;
-       while (nodecount != 0 &&
-              hashsize <= (DNS_RPZ_HTSIZE_MAX + DNS_RPZ_HTSIZE_DIV)) {
-               hashsize++;
-               nodecount >>= 1;
-       }
-
-       if (hashsize > DNS_RPZ_HTSIZE_DIV) {
-               hashsize -= DNS_RPZ_HTSIZE_DIV;
-       }
-
-       isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_MASTER,
-                     ISC_LOG_DEBUG(1), "rpz: %s: using hashtable size %d",
-                     domain, hashsize);
-
-       isc_ht_init(&rpz->newnodes, rpz->rpzs->mctx, hashsize);
+       isc_ht_init(&rpz->newnodes, rpz->rpzs->mctx, 1, ISC_HT_CASE_SENSITIVE);
 
        result = dns_db_createiterator(rpz->updb, DNS_DB_NONSEC3, &rpz->updbit);
        if (result != ISC_R_SUCCESS) {

diff --git a/lib/isc/ht.c b/lib/isc/ht.c
index fa805c9a517d594bf9ca11fa39ca6bdbae766d76..cc2b1395318507ce310ee90910a66cb1fef49c34 100644 (file)
--- a/lib/isc/ht.c
+++ b/lib/isc/ht.c
@@ -51,6 +51,7 @@ struct isc_ht {
        unsigned int magic;
        isc_mem_t *mctx;
        size_t count;
+       bool case_sensitive;
        size_t size[2];
        uint8_t hashbits[2];
        isc_ht_node_t **table[2];
@@ -234,15 +235,19 @@ hashtable_free(isc_ht_t *ht, const uint8_t idx) {
 }
 
 void
-isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits) {
+isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits,
+           unsigned int options) {
        isc_ht_t *ht = NULL;
+       bool case_sensitive = ((options & ISC_HT_CASE_INSENSITIVE) == 0);
 
        REQUIRE(htp != NULL && *htp == NULL);
        REQUIRE(mctx != NULL);
        REQUIRE(bits >= 1 && bits <= HT_MAX_BITS);
 
        ht = isc_mem_get(mctx, sizeof(*ht));
-       *ht = (isc_ht_t){ 0 };
+       *ht = (isc_ht_t){
+               .case_sensitive = case_sensitive,
+       };
 
        isc_mem_attach(mctx, &ht->mctx);
 
@@ -313,7 +318,7 @@ isc_ht_add(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize,
                maybe_rehash(ht, ht->count);
        }
 
-       hashval = isc_hash32(key, keysize, true);
+       hashval = isc_hash32(key, keysize, ht->case_sensitive);
 
        if (isc__ht_find(ht, key, keysize, hashval, ht->hindex) != NULL) {
                return (ISC_R_EXISTS);
@@ -361,7 +366,7 @@ isc_ht_find(const isc_ht_t *ht, const unsigned char *key,
        REQUIRE(key != NULL && keysize > 0);
        REQUIRE(valuep == NULL || *valuep == NULL);
 
-       hashval = isc_hash32(key, keysize, true);
+       hashval = isc_hash32(key, keysize, ht->case_sensitive);
 
        node = isc__ht_find(ht, key, keysize, hashval, ht->hindex);
        if (node == NULL) {
@@ -417,7 +422,7 @@ isc_ht_delete(isc_ht_t *ht, const unsigned char *key, const uint32_t keysize) {
        }
 
        hindex = ht->hindex;
-       hashval = isc_hash32(key, keysize, true);
+       hashval = isc_hash32(key, keysize, ht->case_sensitive);
 nexttable:
        result = isc__ht_delete(ht, key, keysize, hashval, hindex);
 

diff --git a/lib/isc/include/isc/ht.h b/lib/isc/include/isc/ht.h
index de347b945b3e28697d6466af13dadb83bc249107..163fbefb793381c651de2d46f07f514e7227a0e8 100644 (file)
--- a/lib/isc/include/isc/ht.h
+++ b/lib/isc/include/isc/ht.h
@@ -24,9 +24,15 @@
 typedef struct isc_ht     isc_ht_t;
 typedef struct isc_ht_iter isc_ht_iter_t;
 
+enum { ISC_HT_CASE_SENSITIVE = 0x00, ISC_HT_CASE_INSENSITIVE = 0x01 };
+
 /*%
  * Initialize hashtable at *htp, using memory context and size of (1<<bits)
  *
+ * If 'options' contains ISC_HT_CASE_INSENSITIVE, then upper- and lower-case
+ * letters in key values will generate the same hash values; this can be used
+ * when the key for a hash table is a DNS name.
+ *
  * Requires:
  *\li  'htp' is not NULL and '*htp' is NULL.
  *\li  'mctx' is a valid memory context.
@@ -34,7 +40,8 @@ typedef struct isc_ht_iter isc_ht_iter_t;
  *
  */
 void
-isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits);
+isc_ht_init(isc_ht_t **htp, isc_mem_t *mctx, uint8_t bits,
+           unsigned int options);
 
 /*%
  * Destroy hashtable, freeing everything

diff --git a/lib/isc/tests/ht_test.c b/lib/isc/tests/ht_test.c
index 39d8720b85f79da8c6f2e06d8be346ad2ccdbe27..2d3cbe142d384b84215f2bc8183059c5bba1d394 100644 (file)
--- a/lib/isc/tests/ht_test.c
+++ b/lib/isc/tests/ht_test.c
@@ -65,7 +65,7 @@ test_ht_full(uint8_t init_bits, uint8_t finish_bits, uintptr_t count) {
        isc_result_t result;
        uintptr_t i;
 
-       isc_ht_init(&ht, test_mctx, init_bits);
+       isc_ht_init(&ht, test_mctx, init_bits, ISC_HT_CASE_SENSITIVE);
        assert_non_null(ht);
 
        for (i = 1; i < count; i++) {
@@ -212,7 +212,7 @@ test_ht_iterator(void) {
        unsigned char key[16];
        size_t tksize;
 
-       isc_ht_init(&ht, test_mctx, HT_MIN_BITS);
+       isc_ht_init(&ht, test_mctx, HT_MIN_BITS, ISC_HT_CASE_SENSITIVE);
        assert_non_null(ht);
        for (i = 1; i <= count; i++) {
                /*

diff --git a/lib/isc/tls.c b/lib/isc/tls.c
index e85f549642f5287eb47d3e35d7eacbe80b9309e1..543fda7b2d9b3a350ecbf7799fca8b27b1b8efcd 100644 (file)
--- a/lib/isc/tls.c
+++ b/lib/isc/tls.c
@@ -1109,7 +1109,7 @@ isc_tlsctx_cache_new(isc_mem_t *mctx) {
        isc_refcount_init(&nc->references, 1);
        isc_mem_attach(mctx, &nc->mctx);
 
-       isc_ht_init(&nc->data, mctx, 5);
+       isc_ht_init(&nc->data, mctx, 5, ISC_HT_CASE_SENSITIVE);
        isc_rwlock_init(&nc->rwlock, 0, 0);
 
        return (nc);