9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ircd: operhash: rewrite to use irc_radixtree

Browse source
This commit is contained in:
William Pitcock 2016-01-09 01:08:15 -06:00
parent db891ac3ca
commit b02a913bc8
2 changed files with 35 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ircd/ircd.c
View file

@ -68,6 +68,7 @@
#include "privilege.h" #include "privilege.h"
#include "bandbi.h" #include "bandbi.h"
#include "authd.h" #include "authd.h"
#include "operhash.h"
/* /quote set variables */ /* /quote set variables */
struct SetOptions GlobalSetOptions; struct SetOptions GlobalSetOptions;
@ -571,6 +572,9 @@ charybdis_main(int argc, char *argv[])
*/ */
setup_corefile(); setup_corefile();
/* initialise operhash fairly early. */
init_operhash();
memset(&me, 0, sizeof(me)); memset(&me, 0, sizeof(me));
memset(&meLocalUser, 0, sizeof(meLocalUser)); memset(&meLocalUser, 0, sizeof(meLocalUser));
me.localClient = &meLocalUser; me.localClient = &meLocalUser;

107
ircd/operhash.c
View file

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