cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #32 from Elemental-IRCd/fix/chmode/separate-length-limits 

src/chmode: treat invex/ban/quiet/exception discretely
This commit is contained in:
Sam Dodrill 2014-11-21 04:30:29 +00:00
parent 219934c7ce 5ba9c76d22
commit cf6fdf5e76
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/chmode.c
View File

@ -216,6 +216,23 @@ get_channel_access(struct Client *source_p, struct membership *msptr)
return CHFL_PEON; return CHFL_PEON;
} }
/* check_bans_number()
*
* inputs - client, channel ban list
* outputs - 0 on ban being allowed, 1 on ban being disallowed
* side effects - none
*/
int
check_bans_number(struct Client *source_p, struct Channel *chptr, rb_dlink_list *list)
{
if (rb_dlink_list_length(list) >= (chptr->mode.mode & MODE_EXLIMIT ?
ConfigChannel.max_bans_large : ConfigChannel.max_bans)) {
return 0;
}
return 1;
}
/* add_id() /* add_id()
* *
* inputs - client, channel, id to add, type * inputs - client, channel, id to add, type
@ -235,12 +252,14 @@ add_id(struct Client *source_p, struct Channel *chptr, const char *banid,
* bans * bans
*/ */
if(MyClient(source_p)) { if(MyClient(source_p)) {
if((rb_dlink_list_length(&chptr->banlist) + rb_dlink_list_length(&chptr->exceptlist) + rb_dlink_list_length(&chptr->invexlist) + rb_dlink_list_length(&chptr->quietlist)) >= (chptr->mode.mode & MODE_EXLIMIT ? ConfigChannel.max_bans_large : ConfigChannel.max_bans)) { // don't let local client overflow the banlist
if (check_bans_number(source_p, chptr, list)) {
sendto_one(source_p, form_str(ERR_BANLISTFULL), sendto_one(source_p, form_str(ERR_BANLISTFULL),
me.name, source_p->name, chptr->chname, realban); me.name, source_p->name, chptr->chname, realban);
return 0; return 0;
} }
// also don't let local client set a redundant ban
RB_DLINK_FOREACH(ptr, list->head) { RB_DLINK_FOREACH(ptr, list->head) {
actualBan = ptr->data; actualBan = ptr->data;
if(mask_match(actualBan->banstr, realban)) if(mask_match(actualBan->banstr, realban))