philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a refcounting issue in the whowas list handling.

Browse Source 
When a user in one of the whowas lists rejoins, their entry is removed from
the whowas list (and added to a channel nicklist).  However the count of
entries in the whowas list wasn't being decremented, so eventually the client
thinks the lists are full when they're really empty... at this point only one
user at a time can be in the lists (so /WHOLEFT after a netsplit would only
show one user).



git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@77 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2009-10-16 12:35:56 +00:00
parent cb306c8947
commit b2a282feaa
4 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog
View File

@@ -1,7 +1,10 @@
[Changes 1.2c01] [Changes 1.2c01]
* Fix a refcounting issue in the whowas list handling, which should make
the listing of users that left in a netsplit right again. (caf)
* Improve argument-handling in /hostname command - now supports doing * Improve argument-handling in /hostname command - now supports doing
/hostname 2 to switch to second vhost. /hostname 2 to switch to second vhost. (caf)
* Change the display of server stats so that the averages (eg. users per * Change the display of server stats so that the averages (eg. users per
channel) are correctly rounded. (caf) channel) are correctly rounded. (caf)

8
include/whowas.h
View File

@@ -2,9 +2,9 @@
#ifndef _WhoWas_h #ifndef _WhoWas_h
#define _WhoWas_h #define _WhoWas_h
#define whowas_userlist_max 300 #define WHOWAS_USERLIST_MAX 300
#define whowas_reg_max 500 #define WHOWAS_REG_MAX 500
#define whowas_chan_max 20 #define WHOWAS_CHAN_MAX 20
#include "hash.h" #include "hash.h"
typedef struct _whowaschan_str { typedef struct _whowaschan_str {
@@ -38,7 +38,7 @@ typedef struct _whowas_wrap_str {
HashEntry NickListTable[WHOWASLIST_HASHSIZE]; HashEntry NickListTable[WHOWASLIST_HASHSIZE];
} WhowasWrapList; } WhowasWrapList;
WhowasList *check_whowas_buffer (char *, char *, char *, int); WhowasList *check_whowas_buffer (char *, char *, char *);
WhowasList *check_whowas_nick_buffer (char *, char *, int); WhowasList *check_whowas_nick_buffer (char *, char *, int);
WhowasList *check_whosplitin_buffer (char *, char *, char *, int); WhowasList *check_whosplitin_buffer (char *, char *, char *, int);

2
source/names.c
View File

@@ -357,7 +357,7 @@ ChannelList *BX_add_to_channel(char *channel, char *nick, int server, int oper,
if (!(new = find_nicklist_in_channellist(nick, chan, 0))) if (!(new = find_nicklist_in_channellist(nick, chan, 0)))
{ {
if (!(whowas = check_whowas_buffer(nick, userhost, channel, 1))) if (!(whowas = check_whowas_buffer(nick, userhost, channel)))
{ {
new = (NickList *) new_malloc(sizeof(NickList)); new = (NickList *) new_malloc(sizeof(NickList));

32
source/whowas.c
View File

@@ -57,11 +57,23 @@ static int whowas_userlist_count = 0;
static int whowas_reg_count = 0; static int whowas_reg_count = 0;
static int whowas_chan_count = 0; static int whowas_chan_count = 0;
extern WhowasList *check_whowas_buffer(char *nick, char *userhost, char *channel, int unlink) extern WhowasList *check_whowas_buffer(char *nick, char *userhost, char *channel)
{ {
WhowasList *tmp = NULL; WhowasList *tmp;
if (!(tmp = find_userhost_channel(userhost, channel, unlink, &whowas_userlist_list)))
tmp = find_userhost_channel(userhost, channel, unlink, &whowas_reg_list); tmp = find_userhost_channel(userhost, channel, 1, &whowas_userlist_list);
if (tmp)
{
whowas_userlist_count--;
return tmp;
}
tmp = find_userhost_channel(userhost, channel, 1, &whowas_reg_list);
if (tmp)
{
whowas_reg_count--;
}
return tmp; return tmp;
} }
@@ -111,11 +123,11 @@ void add_to_whowas_buffer(NickList *nicklist, char *channel, char *server1, char
if (nicklist->userlist) if (nicklist->userlist)
{ {
if (whowas_userlist_count >= whowas_userlist_max) if (whowas_userlist_count >= WHOWAS_USERLIST_MAX)
{ {
whowas_userlist_count -= whowas_userlist_count -=
remove_oldest_whowas(&whowas_userlist_list, 0, remove_oldest_whowas(&whowas_userlist_list, 0,
(whowas_userlist_max + 1) - whowas_userlist_count); (whowas_userlist_count + 1) - WHOWAS_USERLIST_MAX);
} }
new = (WhowasList *) new_malloc(sizeof(WhowasList)); new = (WhowasList *) new_malloc(sizeof(WhowasList));
new->has_ops = nick_isop(nicklist); new->has_ops = nick_isop(nicklist);
@@ -130,11 +142,11 @@ void add_to_whowas_buffer(NickList *nicklist, char *channel, char *server1, char
} }
else else
{ {
if (whowas_reg_count >= whowas_reg_max) if (whowas_reg_count >= WHOWAS_REG_MAX)
{ {
whowas_reg_count -= whowas_reg_count -=
remove_oldest_whowas(&whowas_reg_list, 0, remove_oldest_whowas(&whowas_reg_list, 0,
(whowas_reg_max + 1) - whowas_reg_count); (whowas_reg_count + 1) - WHOWAS_REG_MAX);
} }
new = (WhowasList *) new_malloc(sizeof(WhowasList)); new = (WhowasList *) new_malloc(sizeof(WhowasList));
new->has_ops = nick_isop(nicklist); new->has_ops = nick_isop(nicklist);
@@ -299,11 +311,11 @@ void add_to_whowas_chan_buffer(ChannelList *channel)
WhowasChanList *new; WhowasChanList *new;
WhowasChanList **slot; WhowasChanList **slot;
if (whowas_chan_count >= whowas_chan_max) if (whowas_chan_count >= WHOWAS_CHAN_MAX)
{ {
whowas_chan_count -= whowas_chan_count -=
remove_oldest_chan_whowas(&whowas_chan_list, 0, remove_oldest_chan_whowas(&whowas_chan_list, 0,
(whowas_chan_max + 1) - whowas_chan_count); (whowas_chan_count + 1) - WHOWAS_CHAN_MAX);
} }
new = (WhowasChanList *) new_malloc(sizeof(WhowasChanList)); new = (WhowasChanList *) new_malloc(sizeof(WhowasChanList));