*/
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))
+ 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)) >= (unsigned long)(chptr->mode.mode & MODE_EXLIMIT ? ConfigChannel.max_bans_large : ConfigChannel.max_bans))
{
sendto_one(source_p, form_str(ERR_BANLISTFULL),
me.name, source_p->name, chptr->chname, realban);
{
static char mask_buf[BUFSIZE];
int old_mask_pos;
- char *nick, *user, *host, *forward = NULL;
- char splat[] = "*";
- char *t, *at, *ex, *ex2;
- char ne = 0, ue = 0, he = 0, fe = 0; /* save values at nick[NICKLEN], et all */
- char e2 = 0; /* save value that delimits forward channel */
+ const char *nick, *user, *host, *forward = NULL;
+ char *t, *at, *ex;
+ int nl, ul, hl, fl;
char *mask;
+ size_t masklen;
mask = LOCAL_COPY(idmask);
mask = check_string(mask);
collapse(mask);
+ masklen = strlen(mask);
- nick = user = host = splat;
+ nick = user = host = "*";
+ nl = ul = hl = 1;
+ fl = 0;
- if((size_t) BUFSIZE - mask_pos < strlen(mask) + 5)
+ if((size_t) BUFSIZE - mask_pos < masklen + 5)
return NULL;
old_mask_pos = mask_pos;
if (*mask == '$')
{
- mask_pos += rb_sprintf(mask_buf + mask_pos, "%s", mask) + 1;
+ memcpy(mask_buf + mask_pos, mask, masklen + 1);
+ mask_pos += masklen + 1;
t = mask_buf + old_mask_pos + 1;
if (*t == '!')
*t = '~';
return mask_buf + old_mask_pos;
}
- at = ex = ex2 = NULL;
- if((t = strchr(mask, '@')) != NULL)
+ at = ex = NULL;
+ if((t = memchr(mask, '@', masklen)) != NULL)
{
at = t;
- *t++ = '\0';
+ t++;
if(*t != '\0')
- host = t;
+ host = t, hl = strlen(t);
- if((t = strchr(mask, '!')) != NULL)
+ if((t = memchr(mask, '!', at - mask)) != NULL)
{
ex = t;
- *t++ = '\0';
- if(*t != '\0')
- user = t;
- if(*mask != '\0')
- nick = mask;
+ t++;
+ if(at != t)
+ user = t, ul = at - t;
+ if(ex != mask)
+ nick = mask, nl = ex - mask;
}
else
{
- if(*mask != '\0')
- user = mask;
+ if(at != mask)
+ user = mask, ul = at - mask;
}
- if((t = strchr(host, '!')) != NULL || (t = strchr(host, '$')) != NULL)
+ if((t = memchr(host, '!', hl)) != NULL ||
+ (t = memchr(host, '$', hl)) != NULL)
{
- ex2 = t;
- e2 = *t;
- *t++= '\0';
- if (*t != '\0')
- forward = t;
+ t++;
+ if (host + hl != t)
+ forward = t, fl = host + hl - t;
+ hl = t - 1 - host;
}
}
- else if((t = strchr(mask, '!')) != NULL)
+ else if((t = memchr(mask, '!', masklen)) != NULL)
{
ex = t;
- *t++ = '\0';
- if(*mask != '\0')
- nick = mask;
+ t++;
+ if(ex != mask)
+ nick = mask, nl = ex - mask;
if(*t != '\0')
- user = t;
+ user = t, ul = strlen(t);
}
- else if(strchr(mask, '.') != NULL || strchr(mask, ':') != NULL)
+ else if(memchr(mask, '.', masklen) != NULL ||
+ memchr(mask, ':', masklen) != NULL)
{
- if(*mask != '\0')
- host = mask;
+ host = mask, hl = masklen;
}
else
{
- if(*mask != '\0')
- nick = mask;
+ if(masklen > 0)
+ nick = mask, nl = masklen;
}
/* truncate values to max lengths */
- if(strlen(nick) > NICKLEN - 1)
- {
- ne = nick[NICKLEN - 1];
- nick[NICKLEN - 1] = '\0';
- }
- if(strlen(user) > USERLEN)
- {
- ue = user[USERLEN];
- user[USERLEN] = '\0';
- }
- if(strlen(host) > HOSTLEN)
- {
- he = host[HOSTLEN];
- host[HOSTLEN] = '\0';
+ if(nl > NICKLEN - 1)
+ nl = NICKLEN - 1;
+ if(ul > USERLEN)
+ ul = USERLEN;
+ if(hl > HOSTLEN)
+ hl = HOSTLEN;
+ if(fl > CHANNELLEN)
+ fl = CHANNELLEN;
+
+ memcpy(mask_buf + mask_pos, nick, nl), mask_pos += nl;
+ mask_buf[mask_pos++] = '!';
+ memcpy(mask_buf + mask_pos, user, ul), mask_pos += ul;
+ mask_buf[mask_pos++] = '@';
+ memcpy(mask_buf + mask_pos, host, hl), mask_pos += hl;
+ if (forward) {
+ mask_buf[mask_pos++] = '$';
+ memcpy(mask_buf + mask_pos, forward, fl), mask_pos += fl;
}
- if(forward && strlen(forward) > CHANNELLEN)
- {
- fe = forward[CHANNELLEN];
- forward[CHANNELLEN] = '\0';
- }
-
- if (forward)
- mask_pos += rb_sprintf(mask_buf + mask_pos, "%s!%s@%s$%s", nick, user, host, forward) + 1;
- else
- mask_pos += rb_sprintf(mask_buf + mask_pos, "%s!%s@%s", nick, user, host) + 1;
-
- /* restore mask, since we may need to use it again later */
- if(at)
- *at = '@';
- if(ex)
- *ex = '!';
- if(ex2)
- *ex2 = e2;
- if(ne)
- nick[NICKLEN - 1] = ne;
- if(ue)
- user[USERLEN] = ue;
- if(he)
- host[HOSTLEN] = he;
- if(fe)
- forward[CHANNELLEN] = fe;
+ mask_buf[mask_pos++] = '\0';
return mask_buf + old_mask_pos;
}
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count++].arg = NULL;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_DEL;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = NULL;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count++].arg = NULL;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_DEL;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = NULL;
return;
}
+ if(!allow_mode_change(source_p, chptr, CHFL_CHANOP, errors, c))
+ return;
+
if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
return;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count++].arg = NULL;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_DEL;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = NULL;
int alevel, int parc, int *parn,
const char **parv, int *errors, int dir, char c, long mode_type)
{
- char *mask, *raw_mask, *forward;
+ const char *mask, *raw_mask;
+ char *forward;
rb_dlink_list *list;
rb_dlink_node *ptr;
struct Ban *banptr;
int errorval;
const char *rpl_list_p;
const char *rpl_endlist_p;
- int caps;
int mems;
switch (mode_type)
rpl_list_p = form_str(RPL_BANLIST);
rpl_endlist_p = form_str(RPL_ENDOFBANLIST);
mems = ALL_MEMBERS;
- caps = 0;
break;
case CHFL_EXCEPTION:
errorval = SM_ERR_RPL_E;
rpl_list_p = form_str(RPL_EXCEPTLIST);
rpl_endlist_p = form_str(RPL_ENDOFEXCEPTLIST);
- caps = CAP_EX;
if(ConfigChannel.use_except || (dir == MODE_DEL))
mems = ONLY_CHANOPS;
errorval = SM_ERR_RPL_I;
rpl_list_p = form_str(RPL_INVITELIST);
rpl_endlist_p = form_str(RPL_ENDOFINVITELIST);
- caps = CAP_IE;
if(ConfigChannel.use_invex || (dir == MODE_DEL))
mems = ONLY_CHANOPS;
rpl_list_p = form_str(RPL_QUIETLIST);
rpl_endlist_p = form_str(RPL_ENDOFQUIETLIST);
mems = ALL_MEMBERS;
- caps = 0;
break;
default:
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
- mode_changes[mode_count].caps = caps;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = mems;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = mask;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_DEL;
- mode_changes[mode_count].caps = caps;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = mems;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = buf + old_removed_mask_pos;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
- mode_changes[mode_count].arg = targ_p->name;
- mode_changes[mode_count++].client = targ_p;
+ mode_changes[mode_count++].arg = targ_p->name;
mstptr->flags |= CHFL_CHANOP;
}
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_DEL;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
- mode_changes[mode_count].arg = targ_p->name;
- mode_changes[mode_count++].client = targ_p;
+ mode_changes[mode_count++].arg = targ_p->name;
mstptr->flags &= ~CHFL_CHANOP;
}
{
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
- mode_changes[mode_count].arg = targ_p->name;
- mode_changes[mode_count++].client = targ_p;
+ mode_changes[mode_count++].arg = targ_p->name;
mstptr->flags |= CHFL_VOICE;
}
{
mode_changes[mode_count].letter = 'v';
mode_changes[mode_count].dir = MODE_DEL;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
- mode_changes[mode_count].arg = targ_p->name;
- mode_changes[mode_count++].client = targ_p;
+ mode_changes[mode_count++].arg = targ_p->name;
mstptr->flags &= ~CHFL_VOICE;
}
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = limitstr;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_DEL;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = NULL;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = parv[(*parn)];
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_DEL;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = NULL;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems =
ConfigChannel.use_forward ? ALL_MEMBERS : ONLY_SERVERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_DEL;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = NULL;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = chptr->mode.key;
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_DEL;
- mode_changes[mode_count].caps = 0;
- mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = "*";