X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/b37021a45e15eef2e937aa11f185b48cf766d772..8e69bb4e903f428b14e2950cce9be39dc8ddd12c:/src/hash.c?ds=sidebyside

diff --git a/src/hash.c b/src/hash.c
index f10c5ae..2c82128 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -41,12 +41,11 @@
 #include "cache.h"
 #include "s_newconf.h"
 
-dlink_list *clientTable;
-dlink_list *channelTable;
-dlink_list *idTable;
-dlink_list *resvTable;
-dlink_list *hostTable; 
-dlink_list *helpTable;
+rb_dlink_list *clientTable;
+rb_dlink_list *channelTable;
+rb_dlink_list *idTable;
+rb_dlink_list *resvTable;
+rb_dlink_list *hostTable; 
 
 /*
  * look in whowas.c for the missing ...[WW_MAX]; entry
@@ -92,12 +91,11 @@ dlink_list *helpTable;
 void
 init_hash(void)
 {
-	clientTable = MyMalloc(sizeof(dlink_list) * U_MAX);
-	idTable = MyMalloc(sizeof(dlink_list) * U_MAX);
-	channelTable = MyMalloc(sizeof(dlink_list) * CH_MAX);
-	hostTable = MyMalloc(sizeof(dlink_list) * HOST_MAX);
-	resvTable = MyMalloc(sizeof(dlink_list) * R_MAX);
-	helpTable = MyMalloc(sizeof(dlink_list) * HELP_MAX);
+	clientTable = MyMalloc(sizeof(rb_dlink_list) * U_MAX);
+	idTable = MyMalloc(sizeof(rb_dlink_list) * U_MAX);
+	channelTable = MyMalloc(sizeof(rb_dlink_list) * CH_MAX);
+	hostTable = MyMalloc(sizeof(rb_dlink_list) * HOST_MAX);
+	resvTable = MyMalloc(sizeof(rb_dlink_list) * R_MAX);
 }
 
 #ifndef RICER_HASHING
@@ -111,7 +109,8 @@ fnv_hash_upper(const unsigned char *s, int bits)
          	h ^= ToUpper(*s++);
 		h += (h<<1) + (h<<4) + (h<<7) + (h << 8) + (h << 24);
 	}
-        h = (h >> bits) ^ (h & ((2^bits)-1));
+	if (bits < 32)
+		h = ((h >> bits) ^ h) & ((1<<bits)-1);
 	return h;
 }
 
@@ -125,7 +124,8 @@ fnv_hash(const unsigned char *s, int bits)
 		h ^= *s++;
 		h += (h<<1) + (h<<4) + (h<<7) + (h << 8) + (h << 24);
 	}
-        h = (h >> bits) ^ (h & ((2^bits)-1));
+	if (bits < 32)
+		h = ((h >> bits) ^ h) & ((1<<bits)-1);
 	return h;
 }
 
@@ -139,7 +139,8 @@ fnv_hash_len(const unsigned char *s, int bits, int len)
 		h ^= *s++;
 		h += (h<<1) + (h<<4) + (h<<7) + (h << 8) + (h << 24);
 	}
-        h = (h >> bits) ^ (h & ((2^bits)-1));
+	if (bits < 32)
+		h = ((h >> bits) ^ h) & ((1<<bits)-1);
 	return h;
 }
 
@@ -153,7 +154,8 @@ fnv_hash_upper_len(const unsigned char *s, int bits, int len)
          	h ^= ToUpper(*s++);
 		h += (h<<1) + (h<<4) + (h<<7) + (h << 8) + (h << 24);
 	}
-        h = (h >> bits) ^ (h & ((2^bits)-1));
+	if (bits < 32)
+		h = ((h >> bits) ^ h) & ((1<<bits)-1);
 	return h;
 }
 #endif
@@ -209,19 +211,6 @@ hash_resv(const char *name)
 	return fnv_hash_upper_len((const unsigned char *) name, R_MAX_BITS, 30);
 }
 
-static unsigned int
-hash_help(const char *name)
-{
-	unsigned int h = 0;
-
-	while(*name)
-	{
-		h += (unsigned int) (ToLower(*name++) & 0xDF);
-	}
-
-	return (h % HELP_MAX);
-}
-
 /* add_to_id_hash()
  *
  * adds an entry to the id hash table
@@ -235,7 +224,7 @@ add_to_id_hash(const char *name, struct Client *client_p)
 		return;
 
 	hashv = hash_id(name);
-	dlinkAddAlloc(client_p, &idTable[hashv]);
+	rb_dlinkAddAlloc(client_p, &idTable[hashv]);
 }
 
 /* add_to_client_hash()
@@ -253,7 +242,7 @@ add_to_client_hash(const char *name, struct Client *client_p)
 		return;
 
 	hashv = hash_nick(name);
-	dlinkAddAlloc(client_p, &clientTable[hashv]);
+	rb_dlinkAddAlloc(client_p, &clientTable[hashv]);
 }
 
 /* add_to_hostname_hash()
@@ -271,7 +260,7 @@ add_to_hostname_hash(const char *hostname, struct Client *client_p)
 		return;
 
 	hashv = hash_hostname(hostname);
-	dlinkAddAlloc(client_p, &hostTable[hashv]);
+	rb_dlinkAddAlloc(client_p, &hostTable[hashv]);
 }
 
 /* add_to_resv_hash()
@@ -289,19 +278,7 @@ add_to_resv_hash(const char *name, struct ConfItem *aconf)
 		return;
 
 	hashv = hash_resv(name);
-	dlinkAddAlloc(aconf, &resvTable[hashv]);
-}
-
-void
-add_to_help_hash(const char *name, struct cachefile *hptr)
-{
-	unsigned int hashv;
-
-	if(EmptyString(name) || hptr == NULL)
-		return;
-
-	hashv = hash_help(name);
-	dlinkAddAlloc(hptr, &helpTable[hashv]);
+	rb_dlinkAddAlloc(aconf, &resvTable[hashv]);
 }
 
 /* del_from_id_hash()
@@ -319,7 +296,7 @@ del_from_id_hash(const char *id, struct Client *client_p)
 		return;
 
 	hashv = hash_id(id);
-	dlinkFindDestroy(client_p, &idTable[hashv]);
+	rb_dlinkFindDestroy(client_p, &idTable[hashv]);
 }
 
 /* del_from_client_hash()
@@ -338,7 +315,7 @@ del_from_client_hash(const char *name, struct Client *client_p)
 		return;
 
 	hashv = hash_nick(name);
-	dlinkFindDestroy(client_p, &clientTable[hashv]);
+	rb_dlinkFindDestroy(client_p, &clientTable[hashv]);
 }
 
 /* del_from_channel_hash()
@@ -357,7 +334,7 @@ del_from_channel_hash(const char *name, struct Channel *chptr)
 		return;
 
 	hashv = hash_channel(name);
-	dlinkFindDestroy(chptr, &channelTable[hashv]);
+	rb_dlinkFindDestroy(chptr, &channelTable[hashv]);
 }
 
 /* del_from_hostname_hash()
@@ -374,7 +351,7 @@ del_from_hostname_hash(const char *hostname, struct Client *client_p)
 
 	hashv = hash_hostname(hostname);
 
-	dlinkFindDestroy(client_p, &hostTable[hashv]);
+	rb_dlinkFindDestroy(client_p, &hostTable[hashv]);
 }
 
 /* del_from_resv_hash()
@@ -393,22 +370,7 @@ del_from_resv_hash(const char *name, struct ConfItem *aconf)
 
 	hashv = hash_resv(name);
 
-	dlinkFindDestroy(aconf, &resvTable[hashv]);
-}
-
-void
-clear_help_hash(void)
-{
-	dlink_node *ptr;
-	dlink_node *next_ptr;
-	int i;
-
-	HASH_WALK_SAFE(i, HELP_MAX, ptr, next_ptr, helpTable)
-	{
-		free_cachefile(ptr->data);
-		dlinkDestroy(ptr, &helpTable[i]);
-	}
-	HASH_WALK_END
+	rb_dlinkFindDestroy(aconf, &resvTable[hashv]);
 }
 
 /* find_id()
@@ -419,7 +381,7 @@ struct Client *
 find_id(const char *name)
 {
 	struct Client *target_p;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	unsigned int hashv;
 
 	if(EmptyString(name))
@@ -427,7 +389,7 @@ find_id(const char *name)
 
 	hashv = hash_id(name);
 
-	DLINK_FOREACH(ptr, idTable[hashv].head)
+	RB_DLINK_FOREACH(ptr, idTable[hashv].head)
 	{
 		target_p = ptr->data;
 
@@ -446,7 +408,7 @@ struct Client *
 find_client(const char *name)
 {
 	struct Client *target_p;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	unsigned int hashv;
 
 	s_assert(name != NULL);
@@ -459,7 +421,7 @@ find_client(const char *name)
 
 	hashv = hash_nick(name);
 
-	DLINK_FOREACH(ptr, clientTable[hashv].head)
+	RB_DLINK_FOREACH(ptr, clientTable[hashv].head)
 	{
 		target_p = ptr->data;
 
@@ -478,7 +440,7 @@ struct Client *
 find_named_client(const char *name)
 {
 	struct Client *target_p;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	unsigned int hashv;
 
 	s_assert(name != NULL);
@@ -487,7 +449,7 @@ find_named_client(const char *name)
 
 	hashv = hash_nick(name);
 
-	DLINK_FOREACH(ptr, clientTable[hashv].head)
+	RB_DLINK_FOREACH(ptr, clientTable[hashv].head)
 	{
 		target_p = ptr->data;
 
@@ -506,7 +468,7 @@ struct Client *
 find_server(struct Client *source_p, const char *name)
 {
 	struct Client *target_p;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	unsigned int hashv;
   
 	if(EmptyString(name))
@@ -521,7 +483,7 @@ find_server(struct Client *source_p, const char *name)
 
 	hashv = hash_nick(name);
 
-	DLINK_FOREACH(ptr, clientTable[hashv].head)
+	RB_DLINK_FOREACH(ptr, clientTable[hashv].head)
 	{
 		target_p = ptr->data;
 
@@ -535,11 +497,11 @@ find_server(struct Client *source_p, const char *name)
 
 /* find_hostname()
  *
- * finds a hostname dlink list from the hostname hash table.
- * we return the full dlink list, because you can have multiple
+ * finds a hostname rb_dlink list from the hostname hash table.
+ * we return the full rb_dlink list, because you can have multiple
  * entries with the same hostname
  */
-dlink_node *
+rb_dlink_node *
 find_hostname(const char *hostname)
 {
 	unsigned int hashv;
@@ -560,7 +522,7 @@ struct Channel *
 find_channel(const char *name)
 {
 	struct Channel *chptr;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	unsigned int hashv;
 
 	s_assert(name != NULL);
@@ -569,7 +531,7 @@ find_channel(const char *name)
 
 	hashv = hash_channel(name);
 
-	DLINK_FOREACH(ptr, channelTable[hashv].head)
+	RB_DLINK_FOREACH(ptr, channelTable[hashv].head)
 	{
 		chptr = ptr->data;
 
@@ -595,7 +557,7 @@ struct Channel *
 get_or_create_channel(struct Client *client_p, const char *chname, int *isnew)
 {
 	struct Channel *chptr;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	unsigned int hashv;
 	int len;
 	const char *s = chname;
@@ -621,7 +583,7 @@ get_or_create_channel(struct Client *client_p, const char *chname, int *isnew)
 
 	hashv = hash_channel(s);
 
-	DLINK_FOREACH(ptr, channelTable[hashv].head)
+	RB_DLINK_FOREACH(ptr, channelTable[hashv].head)
 	{
 		chptr = ptr->data;
 
@@ -638,11 +600,11 @@ get_or_create_channel(struct Client *client_p, const char *chname, int *isnew)
 
 	chptr = allocate_channel(s);
 
-	dlinkAdd(chptr, &chptr->node, &global_channel_list);
+	rb_dlinkAdd(chptr, &chptr->node, &global_channel_list);
 
 	chptr->channelts = CurrentTime;	/* doesn't hurt to set it here */
 
-	dlinkAddAlloc(chptr, &channelTable[hashv]);
+	rb_dlinkAddAlloc(chptr, &channelTable[hashv]);
 
 	return chptr;
 }
@@ -655,7 +617,7 @@ struct ConfItem *
 hash_find_resv(const char *name)
 {
 	struct ConfItem *aconf;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	unsigned int hashv;
 
 	s_assert(name != NULL);
@@ -664,7 +626,7 @@ hash_find_resv(const char *name)
 
 	hashv = hash_resv(name);
 
-	DLINK_FOREACH(ptr, resvTable[hashv].head)
+	RB_DLINK_FOREACH(ptr, resvTable[hashv].head)
 	{
 		aconf = ptr->data;
 
@@ -678,36 +640,12 @@ hash_find_resv(const char *name)
 	return NULL;
 }
 
-struct cachefile *
-hash_find_help(const char *name, int flags)
-{
-	struct cachefile *hptr;
-	dlink_node *ptr;
-	unsigned int hashv;
-
-	if(EmptyString(name))
-		return NULL;
-
-	hashv = hash_help(name);
-
-	DLINK_FOREACH(ptr, helpTable[hashv].head)
-	{
-		hptr = ptr->data;
-
-		if((irccmp(name, hptr->name) == 0) &&
-		   (hptr->flags & flags))
-			return hptr;
-	}
-
-	return NULL;
-}
-
 void
 clear_resv_hash(void)
 {
 	struct ConfItem *aconf;
-	dlink_node *ptr;
-	dlink_node *next_ptr;
+	rb_dlink_node *ptr;
+	rb_dlink_node *next_ptr;
 	int i;
 
 	HASH_WALK_SAFE(i, R_MAX, ptr, next_ptr, resvTable)
@@ -719,7 +657,7 @@ clear_resv_hash(void)
 			continue;
 
 		free_conf(ptr->data);
-		dlinkDestroy(ptr, &resvTable[i]);
+		rb_dlinkDestroy(ptr, &resvTable[i]);
 	}
 	HASH_WALK_END
 }
@@ -760,7 +698,7 @@ output_hash(struct Client *source_p, const char *name, int length, int *counts,
 	
 
 static void
-count_hash(struct Client *source_p, dlink_list *table, int length, const char *name)
+count_hash(struct Client *source_p, rb_dlink_list *table, int length, const char *name)
 {
 	int counts[11];
 	int deepest = 0;
@@ -770,13 +708,13 @@ count_hash(struct Client *source_p, dlink_list *table, int length, const char *n
 	
 	for(i = 0; i < length; i++)
 	{
-		if(dlink_list_length(&table[i]) >= 10)
+		if(rb_dlink_list_length(&table[i]) >= 10)
 			counts[10]++;
 		else
-			counts[dlink_list_length(&table[i])]++;
+			counts[rb_dlink_list_length(&table[i])]++;
 
-		if(dlink_list_length(&table[i]) > deepest)
-			deepest = dlink_list_length(&table[i]);
+		if(rb_dlink_list_length(&table[i]) > deepest)
+			deepest = rb_dlink_list_length(&table[i]);
 	}
 
 	output_hash(source_p, name, length, counts, deepest);