#include "client.h"
#include "common.h"
#include "hash.h"
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "send.h"
#include "cache.h"
#include "s_newconf.h"
+#define hash_cli_fd(x) (x % CLI_FD_MAX)
+
+static rb_dlink_list clientbyfdTable[U_MAX];
+
rb_dlink_list *clientTable;
rb_dlink_list *channelTable;
rb_dlink_list *idTable;
void
init_hash(void)
{
- 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);
+ clientTable = rb_malloc(sizeof(rb_dlink_list) * U_MAX);
+ idTable = rb_malloc(sizeof(rb_dlink_list) * U_MAX);
+ channelTable = rb_malloc(sizeof(rb_dlink_list) * CH_MAX);
+ hostTable = rb_malloc(sizeof(rb_dlink_list) * HOST_MAX);
+ resvTable = rb_malloc(sizeof(rb_dlink_list) * R_MAX);
}
#ifndef RICER_HASHING
rb_dlinkAdd(chptr, &chptr->node, &global_channel_list);
- chptr->channelts = CurrentTime; /* doesn't hurt to set it here */
+ chptr->channelts = rb_current_time(); /* doesn't hurt to set it here */
rb_dlinkAddAlloc(chptr, &channelTable[hashv]);
{
aconf = ptr->data;
- if(!irccmp(name, aconf->name))
+ if(!irccmp(name, aconf->host))
{
aconf->port++;
return aconf;
HASH_WALK_END
}
+void
+add_to_cli_fd_hash(struct Client *client_p)
+{
+ rb_dlinkAddAlloc(client_p, &clientbyfdTable[hash_cli_fd(rb_get_fd(client_p->localClient->F))]);
+}
+
+
+void
+del_from_cli_fd_hash(struct Client *client_p)
+{
+ unsigned int hashv;
+ hashv = hash_cli_fd(rb_get_fd(client_p->localClient->F));
+ rb_dlinkFindDestroy(client_p, &clientbyfdTable[hashv]);
+}
+
+struct Client *
+find_cli_fd_hash(int fd)
+{
+ struct Client *target_p;
+ rb_dlink_node *ptr;
+ unsigned int hashv;
+ hashv = hash_cli_fd(fd);
+ RB_DLINK_FOREACH(ptr, clientbyfdTable[hashv].head)
+ {
+ target_p = ptr->data;
+ if(rb_get_fd(target_p->localClient->F) == fd)
+ return target_p;
+ }
+ return NULL;
+}
+
static void
output_hash(struct Client *source_p, const char *name, int length, int *counts, int deepest)
{
unsigned long total = 0;
int i;
+ char buf[128];
sendto_one_numeric(source_p, RPL_STATSDEBUG,
"B :%s Hash Statistics", name);
- sendto_one_numeric(source_p, RPL_STATSDEBUG,
- "B :Size: %d Empty: %d (%.3f%%)",
- length, counts[0],
+ snprintf(buf, sizeof buf, "%.3f%%",
(float) ((counts[0]*100) / (float) length));
+ sendto_one_numeric(source_p, RPL_STATSDEBUG,
+ "B :Size: %d Empty: %d (%s)",
+ length, counts[0], buf);
for(i = 1; i < 11; i++)
{
/* dont want to divide by 0! --fl */
if(counts[0] != length)
- sendto_one_numeric(source_p, RPL_STATSDEBUG,
- "B :Average depth: %.3f/%.3f Highest depth: %d",
+ {
+ snprintf(buf, sizeof buf, "%.3f/%.3f",
(float) (total / (length - counts[0])),
- (float) (total / length), deepest);
+ (float) (total / length));
+ sendto_one_numeric(source_p, RPL_STATSDEBUG,
+ "B :Average depth: %s Highest depth: %d",
+ buf, deepest);
+ }
for(i = 0; i < 11; i++)
{