From 21d00bd29d46795bbe752ca3a674d410f3fc7f1a Mon Sep 17 00:00:00 2001
From: yrutschle <git1@rutschle.net>
Date: Sun, 10 Apr 2022 08:45:01 +0200
Subject: [PATCH] remove globals for hash size

---
 hash.c           |  19 +++++++++----------
 hash.h           |   2 +-
 hashtest/htest   | Bin 24992 -> 24992 bytes
 hashtest/htest.c |   4 +++-
 udp-listener.c   |   4 +++-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/hash.c b/hash.c
index caaeab0..608a552 100644
--- a/hash.c
+++ b/hash.c
@@ -42,12 +42,10 @@
 typedef void* hash_item;
 #include "hash.h"
 
-static const int h_keylen = 5; /* How many bits in the hash key? (hash is 2^h_keylen big) */
-static const int hash_size = (1 << h_keylen); /* 8 => 256 */
-static const int keymask = hash_size - 1;  /* 8 => 11111111 */
 static void* const FREE = NULL;
 
 struct hash {
+    int hash_size;      /* Max number of items in the hash */
     int item_cnt;       /* Number of items in the hash */
     gap_array* data;
 
@@ -60,15 +58,16 @@ typedef struct hash hash;
 
 static int hash_make_key(hash* h, hash_item item)
 {
-    return h->hash_make_key(item) & keymask;
+    return h->hash_make_key(item) % h->hash_size;
 }
 
 
-hash* hash_init(hash_make_key_fn make_key, hash_cmp_item_fn cmp_item)
+hash* hash_init(int hash_size, hash_make_key_fn make_key, hash_cmp_item_fn cmp_item)
 {
     hash* h = malloc(sizeof(*h));
     if (!h) return NULL;
 
+    h->hash_size = hash_size;
     h->item_cnt = 0;
     h->data = gap_init(hash_size);
     h->hash_make_key = make_key;
@@ -80,7 +79,7 @@ hash* hash_init(hash_make_key_fn make_key, hash_cmp_item_fn cmp_item)
 /* Return the index following i in h */
 static int hash_next_index(hash* h, int i)
 {
-    return (i + 1) % hash_size;
+    return (i + 1) % h->hash_size;
 }
 
 /* Returns the index in h of specified address, -1 if not found 
@@ -98,7 +97,7 @@ static int hash_find_index(hash* h, hash_item item)
     fprintf(stderr, "searching %d\n", index);
 #endif
     while (cnx != FREE) {
-        if (cnt++ > hash_size) return -1;
+        if (cnt++ > h->hash_size) return -1;
 
         if (!h->cmp_item(cnx, item))
             break;
@@ -129,7 +128,7 @@ static int distance(int current_index, hash* h, hash_item item)
     if (wanted_index <= current_index)
         return current_index - wanted_index;
     else
-        return current_index - wanted_index + hash_size;
+        return current_index - wanted_index + h->hash_size;
 }
 
 
@@ -139,7 +138,7 @@ int hash_insert(hash* h, hash_item new)
     int index = bubble_wanted_index;
     gap_array* hash = h->data;
 
-    if (h->item_cnt == hash_size)
+    if (h->item_cnt == h->hash_size)
         return -1;
 
     hash_item curr_item = gap_get(hash, index);
@@ -208,7 +207,7 @@ void hash_dump(hash* h, char* filename)
     }
     
     fprintf(out, "<hash elem=%d>\n", h->item_cnt);
-    for (int i = 0; i < hash_size; i++) {
+    for (int i = 0; i < h->hash_size; i++) {
         hash_item item = gap_get(h->data, i);
         int idx = 0;
 
diff --git a/hash.h b/hash.h
index e774186..66d79ab 100644
--- a/hash.h
+++ b/hash.h
@@ -13,7 +13,7 @@ typedef int (*hash_make_key_fn)(hash_item item);
 /* Function that compares two items: returns 0 if they are the same */
 typedef int (*hash_cmp_item_fn)(hash_item item1, hash_item item2);
 
-hash* hash_init(hash_make_key_fn make_key, hash_cmp_item_fn cmp_item);
+hash* hash_init(int hash_size, hash_make_key_fn make_key, hash_cmp_item_fn cmp_item);
 
 int hash_insert(hash* h, hash_item new);
 int hash_remove(hash* h, hash_item item);
diff --git a/hashtest/htest b/hashtest/htest
index aa2447526547353ea416ba87418fc12ae95593e5..90a62e30ef31bb95ef126b32291644f1d5a8ab1e 100755
GIT binary patch
delta 2416
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

delta 2412
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
H*<<@3zGh;E

diff --git a/hashtest/htest.c b/hashtest/htest.c
index 2c5e688..dacb27e 100644
--- a/hashtest/htest.c
+++ b/hashtest/htest.c
@@ -19,6 +19,8 @@
 #include <string.h>
 
 
+/* tests have been written for a hash that holds 32 items */
+#define HASH_SIZE 32
 
 #define STR_LENGTH 16
 struct hash_item {
@@ -55,7 +57,7 @@ static void htest_next_key(FILE* f, char* action, int* key, char str[STR_LENGTH]
 
 int main(int argc, char* argv[])
 {
-    hash* h = hash_init(&hash_make_key, &cmp_item);
+    hash* h = hash_init(HASH_SIZE, &hash_make_key, &cmp_item);
     char action;
     hash_item item;
     int line = 0;
diff --git a/udp-listener.c b/udp-listener.c
index 7c45892..0f72193 100644
--- a/udp-listener.c
+++ b/udp-listener.c
@@ -27,6 +27,8 @@
 #include "sslh-conf.h"
 #include "udp-listener.h"
 
+/* How many concurrent connections we manage */
+#define HASH_SIZE 1024
 
 /* returns date at which this socket times out. */
 static int udp_timeout(struct connection* cnx)
@@ -91,7 +93,7 @@ static int hash_make_key(hash_item new)
  * */
 void udp_init(struct loop_info* fd_info)
 {
-    fd_info->hash_sources = hash_init(&hash_make_key, &cnx_cmp);
+    fd_info->hash_sources = hash_init(HASH_SIZE, &hash_make_key, &cnx_cmp);
 }