-/* ircd-ratbox: an advanced Internet Relay Chat Daemon(ircd).
+/* charybdis
* operhash.c - Hashes nick!user@host{oper}
*
* Copyright (C) 2005 Lee Hardy <lee -at- leeh.co.uk>
- * Copyright (C) 2005 ircd-ratbox development team
+ * Copyright (C) 2005-2016 ircd-ratbox development team
+ * Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: operhash.c 26094 2008-09-19 15:33:46Z androsyn $
*/
-#include <ratbox_lib.h>
+
+#include <rb_lib.h>
#include "stdinc.h"
#include "match.h"
#include "hash.h"
#include "operhash.h"
+#include "rb_radixtree.h"
-#define OPERHASH_MAX_BITS 7
-#define OPERHASH_MAX (1<<OPERHASH_MAX_BITS)
-
-#define hash_opername(x) fnv_hash_upper((const unsigned char *)(x), OPERHASH_MAX_BITS)
+static rb_radixtree *operhash_tree = NULL;
struct operhash_entry
{
- char *name;
- int refcount;
+ unsigned int refcount;
+ char name[];
};
-static rb_dlink_list operhash_table[OPERHASH_MAX];
+void
+init_operhash(void)
+{
+ operhash_tree = rb_radixtree_create("operhash", NULL);
+}
const char *
operhash_add(const char *name)
{
struct operhash_entry *ohash;
- unsigned int hashv;
- rb_dlink_node *ptr;
+ size_t len;
if(EmptyString(name))
return NULL;
- hashv = hash_opername(name);
-
- RB_DLINK_FOREACH(ptr, operhash_table[hashv].head)
+ if((ohash = (struct operhash_entry *) rb_radixtree_retrieve(operhash_tree, name)) != NULL)
{
- ohash = ptr->data;
-
- if(!irccmp(ohash->name, name))
- {
- ohash->refcount++;
- return ohash->name;
- }
+ ohash->refcount++;
+ return ohash->name;
}
- ohash = rb_malloc(sizeof(struct operhash_entry));
+ len = strlen(name) + 1;
+ ohash = rb_malloc(sizeof(struct operhash_entry) + len);
ohash->refcount = 1;
- ohash->name = rb_strdup(name);
-
- rb_dlinkAddAlloc(ohash, &operhash_table[hashv]);
-
+ memcpy(ohash->name, name, len);
+ rb_radixtree_add(operhash_tree, ohash->name, ohash);
return ohash->name;
}
const char *
operhash_find(const char *name)
{
- struct operhash_entry *ohash;
- unsigned int hashv;
- rb_dlink_node *ptr;
-
- if(EmptyString(name))
- return NULL;
-
- hashv = hash_opername(name);
-
- RB_DLINK_FOREACH(ptr, operhash_table[hashv].head)
- {
- ohash = ptr->data;
-
- if(!irccmp(ohash->name, name))
- return ohash->name;
- }
-
- return NULL;
+ return rb_radixtree_retrieve(operhash_tree, name);
}
void
operhash_delete(const char *name)
{
- struct operhash_entry *ohash;
- unsigned int hashv;
- rb_dlink_node *ptr;
+ struct operhash_entry *ohash = rb_radixtree_retrieve(operhash_tree, name);
- if(EmptyString(name))
+ if(ohash == NULL)
return;
- hashv = hash_opername(name);
-
- RB_DLINK_FOREACH(ptr, operhash_table[hashv].head)
+ ohash->refcount--;
+ if(ohash->refcount == 0)
{
- ohash = ptr->data;
-
- if(irccmp(ohash->name, name))
- continue;
-
- ohash->refcount--;
-
- if(ohash->refcount == 0)
- {
- rb_free(ohash->name);
- rb_free(ohash);
- rb_dlinkDestroy(ptr, &operhash_table[hashv]);
- return;
- }
+ rb_radixtree_delete(operhash_tree, ohash->name);
+ rb_free(ohash);
}
}