fix monitor.c

This commit is contained in:
William Pitcock 2008-04-01 20:03:40 -05:00
parent 301061562a
commit 95b3551e55

View file

@ -37,7 +37,7 @@
#include "hash.h"
#include "numeric.h"
struct monitor *monitorTable[MONITOR_HASH_SIZE];
struct monitor *monitorTable[MONITOR_HASH_SIZE];
static rb_bh *monitor_heap;
void
@ -49,40 +49,40 @@ init_monitor(void)
static inline unsigned int
hash_monitor_nick(const char *name)
{
return fnv_hash_upper((const unsigned char *)name, MONITOR_HASH_BITS, 0);
return fnv_hash_upper((const unsigned char *)name, MONITOR_HASH_BITS);
}
struct monitor *
find_monitor(const char *name, int add)
{
struct monitor *monptr;
unsigned int hashv = hash_monitor_nick(name);
for(monptr = monitorTable[hashv]; monptr; monptr = monptr->hnext)
{
if(!irccmp(monptr->name, name))
return monptr;
}
if(add)
{
monptr = rb_bh_alloc(monitor_heap);
rb_strlcpy(monptr->name, name, sizeof(monptr->name));
monptr->hnext = monitorTable[hashv];
monitorTable[hashv] = monptr;
return monptr;
}
struct monitor *monptr;
unsigned int hashv = hash_monitor_nick(name);
for(monptr = monitorTable[hashv]; monptr; monptr = monptr->hnext)
{
if(!irccmp(monptr->name, name))
return monptr;
}
if(add)
{
monptr = rb_bh_alloc(monitor_heap);
rb_strlcpy(monptr->name, name, sizeof(monptr->name));
monptr->hnext = monitorTable[hashv];
monitorTable[hashv] = monptr;
return monptr;
}
return NULL;
}
void
free_monitor(struct monitor *monptr)
{
rb_bh_free(monitor_heap, monptr);
void
free_monitor(struct monitor *monptr)
{
rb_bh_free(monitor_heap, monptr);
}
/* monitor_signon()
@ -95,15 +95,15 @@ free_monitor(struct monitor *monptr)
void
monitor_signon(struct Client *client_p)
{
char buf[USERHOST_REPLYLEN];
struct monitor *monptr = find_monitor(client_p->name, 0);
/* noones watching this nick */
if(monptr == NULL)
return;
rb_snprintf(buf, sizeof(buf), "%s!%s@%s", client_p->name, client_p->username, client_p->host);
char buf[USERHOST_REPLYLEN];
struct monitor *monptr = find_monitor(client_p->name, 0);
/* noones watching this nick */
if(monptr == NULL)
return;
rb_snprintf(buf, sizeof(buf), "%s!%s@%s", client_p->name, client_p->username, client_p->host);
sendto_monitor(monptr, form_str(RPL_MONONLINE), me.name, "*", buf);
}
@ -117,30 +117,30 @@ monitor_signon(struct Client *client_p)
void
monitor_signoff(struct Client *client_p)
{
struct monitor *monptr = find_monitor(client_p->name, 0);
/* noones watching this nick */
if(monptr == NULL)
return;
sendto_monitor(monptr, form_str(RPL_MONOFFLINE), me.name, "*",
struct monitor *monptr = find_monitor(client_p->name, 0);
/* noones watching this nick */
if(monptr == NULL)
return;
sendto_monitor(monptr, form_str(RPL_MONOFFLINE), me.name, "*",
client_p->name);
}
void
clear_monitor(struct Client *client_p)
{
struct monitor *monptr;
rb_dlink_node *ptr, *next_ptr;
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->monitor_list.head)
{
monptr = ptr->data;
rb_dlinkFindDestroy(client_p, &monptr->users);
rb_free_rb_dlink_node(ptr);
}
client_p->localClient->monitor_list.head = client_p->localClient->monitor_list.tail = NULL;
struct monitor *monptr;
rb_dlink_node *ptr, *next_ptr;
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->monitor_list.head)
{
monptr = ptr->data;
rb_dlinkFindDestroy(client_p, &monptr->users);
rb_free_rb_dlink_node(ptr);
}
client_p->localClient->monitor_list.head = client_p->localClient->monitor_list.tail = NULL;
client_p->localClient->monitor_list.length = 0;
}