*/
#include "channel.h"
#include "client.h"
-#include "gline.h" /* bad_channel */
#include "hash.h"
#include "ircd.h"
#include "ircd_alloc.h"
assert(m->channel == chptr);
if (m->user == cptr)
return m;
- m=m->next_member;
+ m = m->next_member;
}
}
/* Users on the other hand aren't allowed on more than 15 channels. 50%
assert(m->user == cptr);
if (m->channel == chptr)
return m;
- m=m->next_channel;
+ m = m->next_channel;
}
}
return 0;
return who;
if (!(who = get_history(user, KILLCHASETIMELIMIT))) {
- sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, sptr->name, user);
+ send_reply(sptr, ERR_NOSUCHNICK, user);
return 0;
}
if (chasing)
}
if (MyUser(cptr) && !removed_bans && (len > MAXBANLENGTH || (cnt >= MAXBANS)))
{
- sendto_one(cptr, err_str(ERR_BANLISTFULL), me.name, cptr->name,
- chptr->chname, banid);
+ send_reply(cptr, ERR_BANLISTFULL, chptr->chname, banid);
return -1;
}
if (change)
assert(0 != ban->value.ban.who);
strcpy(ban->value.ban.who, cptr->name);
- ban->value.ban.when = CurrentTime;
+ ban->value.ban.when = TStime();
ban->flags = CHFL_BAN; /* This bit is never used I think... */
if ((ip_start = strrchr(banid, '@')) && check_if_ipmask(ip_start + 1))
ban->flags |= CHFL_BAN_IPMASK;
assert(0 != chptr);
for (lp = chptr->banlist; lp; lp = lp->next)
- sendto_one(cptr, rpl_str(RPL_BANLIST), me.name, cptr->name,
- chptr->chname, lp->value.ban.banstr, lp->value.ban.who,
- lp->value.ban.when);
- sendto_one(cptr, rpl_str(RPL_ENDOFBANLIST), me.name, cptr->name,
- chptr->chname);
+ send_reply(cptr, RPL_BANLIST, chptr->chname, lp->value.ban.banstr,
+ lp->value.ban.who, lp->value.ban.when);
+
+ send_reply(cptr, RPL_ENDOFBANLIST, chptr->chname);
}
/*
if (!(member_x = find_member_link(chptr, who)) ||
(MyUser(sptr) && IsZombie(member_x)))
{
- sendto_one(cptr, err_str(ERR_USERNOTINCHANNEL),
- me.name, cptr->name, who->name, chptr->chname);
+ send_reply(cptr, ERR_USERNOTINCHANNEL, who->name, chptr->chname);
break;
}
/*
* XXX - CHECKME
*/
if (MyUser(cptr)) {
- sendto_one(cptr, err_str(ERR_ISCHANSERVICE), me.name,
- cptr->name, parv[0], chptr->chname);
+ send_reply(cptr, ERR_ISCHANSERVICE, parv[0], chptr->chname);
break;
}
else {
if (whatt == MODE_DEL && IsOperOnLocalChannel(who, chptr->chname) &&
(who != sptr) && MyUser(cptr) && *curr == 'o')
{
- sendto_one(cptr, err_str(ERR_ISOPERLCHAN), me.name,
- cptr->name, parv[0], chptr->chname);
+ send_reply(cptr, ERR_ISOPERLCHAN, parv[0], chptr->chname);
break;
}
#endif
if (whatt == MODE_ADD)
{
if (*mode->key && !IsServer(cptr))
- sendto_one(cptr, err_str(ERR_KEYSET),
- me.name, cptr->name, chptr->chname);
+ send_reply(cptr, ERR_KEYSET, chptr->chname);
else if (!*mode->key || IsServer(cptr))
{
lp = &chops[opcnt++];
newmode &= ~*ip;
}
else if (!IsServer(cptr))
- sendto_one(cptr, err_str(ERR_UNKNOWNMODE),
- me.name, cptr->name, *curr);
+ send_reply(cptr, ERR_UNKNOWNMODE, *curr);
break;
}
curr++;
/* Bounce here */
if (!hacknotice && *bmodebuf && chptr->creationtime)
{
- sendto_one(cptr, "%s " TOK_MODE " %s %s %s " TIME_T_FMT,
- NumServ(&me), chptr->chname, bmodebuf, nbparambuf,
- *badop == 2 ? (time_t) 0 : chptr->creationtime);
+ sendcmdto_one(&me, CMD_MODE, cptr, "%H %s %s %Tu", chptr, bmodebuf,
+ nbparambuf, *badop == 2 ? (time_t) 0 : chptr->creationtime);
}
/* If there are possibly bans to re-add, bounce them now */
if (add_banid_called && bounce)
{
len[0] = strlen(ban[0]->value.ban.banstr);
cnt = 1; /* We already got one ban :) */
+ /* XXX sendbuf used to send ban bounces! */
sblen = sprintf_irc(sendbuf, ":%s MODE %s +b",
me.name, chptr->chname) - sendbuf;
total_len = sblen + 1 + len[0]; /* 1 = ' ' */
struct Membership* member_z;
struct Client *acptr;
if (IsServer(sptr))
+ /* XXX sendbuf used to send ban bounces! */
psblen = sprintf_irc(sendbuf, ":%s MODE %s -b",
sptr->name, chptr->chname) - sendbuf;
else /* We rely on IsRegistered(sptr) being true for MODE */
{
struct SLink *lp;
int overrideJoin = 0;
+
+ /*
+ * Now a banned user CAN join if invited -- Nemesi
+ * Now a user CAN escape channel limit if invited -- bfriendly
+ * Now a user CAN escape anything if invited -- Isomer
+ */
+ for (lp = sptr->user->invited; lp; lp = lp->next)
+ if (lp->value.chptr == chptr)
+ return 0;
+
#ifdef OPER_WALK_THROUGH_LMODES
/* An oper can force a join on a local channel using "OVERRIDE" as the key.
a HACK(4) notice will be sent if he would not have been supposed
overrideJoin = MAGIC_OPER_OVERRIDE;
}
#endif
- /*
- * Now a banned user CAN join if invited -- Nemesi
- * Now a user CAN escape channel limit if invited -- bfriendly
- */
- if ((chptr->mode.mode & MODE_INVITEONLY) || (is_banned(sptr, chptr, NULL)
- || (chptr->mode.limit && chptr->users >= chptr->mode.limit)))
- {
- for (lp = sptr->user->invited; lp; lp = lp->next)
- if (lp->value.chptr == chptr)
- break;
- if (!lp)
- {
- if (chptr->mode.limit && chptr->users >= chptr->mode.limit)
- return (overrideJoin + ERR_CHANNELISFULL);
- /*
- * This can return an "Invite only" msg instead of the "You are banned"
- * if _both_ conditions are true, but who can say what is more
- * appropriate ? checking again IsBanned would be _SO_ cpu-xpensive !
- */
- return overrideJoin + ((chptr->mode.mode & MODE_INVITEONLY) ?
- ERR_INVITEONLYCHAN : ERR_BANNEDFROMCHAN);
- }
- }
+ if (chptr->mode.mode & MODE_INVITEONLY)
+ return overrideJoin + ERR_INVITEONLYCHAN;
+
+ if (chptr->mode.limit && chptr->users >= chptr->mode.limit)
+ return overrideJoin + ERR_CHANNELISFULL;
+
+ if (is_banned(sptr, chptr, NULL))
+ return overrideJoin + ERR_BANNEDFROMCHAN;
+
/*
* now using compall (above) to test against a whole key ring -Kev
*/
if (*chptr->mode.key && (EmptyString(key) || compall(chptr->mode.key, key)))
- return overrideJoin + (ERR_BADCHANNELKEY);
+ return overrideJoin + ERR_BADCHANNELKEY;
+ if (overrideJoin)
+ return ERR_DONTCHEAT;
+
return 0;
}
chptr->topic_time < args->max_topic_time)))
{
if (ShowChannel(cptr,chptr))
- sendto_one(cptr, rpl_str(RPL_LIST), me.name, cptr->name,
- chptr->chname,
- chptr->users, chptr->topic);
+ send_reply(cptr, RPL_LIST, chptr->chname, chptr->users,
+ chptr->topic);
chptr = chptr->next;
break;
}
{
MyFree(cptr->listing);
cptr->listing = NULL;
- sendto_one(cptr, rpl_str(RPL_LISTEND), me.name, cptr->name);
+ send_reply(cptr, RPL_LISTEND);
break;
}
}
}
}
-
+/* XXX AIEEEE! sendbuf is an institution here :( */
void add_token_to_sendbuf(char *token, size_t *sblenp, int *firstp,
int *send_itp, char is_a_ban, int mode)
{
if (*count == -1) /* initialize ? */
{
+ /* XXX sendbuf used! */
sbp = sbpi =
sprintf_irc(sendbuf, ":%s MODE %s -", sptr->name, chptr->chname);
pb = parabuf;
if (MyUser(who)) /* server 4 */
{
if (IsServer(cptr)) /* Case b) ? */
- sendto_one(cptr, PartFmt1, who->name, chptr->chname);
+ sendcmdto_one(who, CMD_PART, cptr, "%H", chptr);
remove_user_from_channel(who, chptr);
return;
}
return count;
}
+/* XXX we can probably get rid of send_user_joins */
void send_user_joins(struct Client *cptr, struct Client *user)
{
struct Membership* chan;
* This function prepares sendbuf with the server notices and wallops
* to be sent for all hacks. -Ghostwolf 18-May-97
*/
-
+/* XXX let's get rid of this if we can */
void send_hack_notice(struct Client *cptr, struct Client *sptr, int parc,
char *parv[], int badop, int mtype)
{
/* If we're building a user visible MODE or HACK... */
if (mbuf->mb_dest & (MODEBUF_DEST_CHANNEL | MODEBUF_DEST_HACK2 |
- MODEBUF_DEST_HACK3 | MODEBUF_DEST_HACK4)) {
+ MODEBUF_DEST_HACK3 | MODEBUF_DEST_HACK4 |
+ MODEBUF_DEST_LOG)) {
/* Set up the parameter strings */
addstr[0] = '\0';
addstr_i = 0;
/* send the messages off to their destination */
if (mbuf->mb_dest & MODEBUF_DEST_HACK2) {
- sendto_op_mask(SNO_HACK2, "HACK(2): %s MODE %s %s%s%s%s%s%s [" TIME_T_FMT
- "]", app_source->name, mbuf->mb_channel->chname,
- rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "", addbuf,
- remstr, addstr, mbuf->mb_channel->creationtime);
- sendto_serv_butone(mbuf->mb_connect, "%s " TOK_DESYNCH
- " :HACK: %s MODE %s %s%s%s%s%s%s [" TIME_T_FMT "]",
- NumServ(&me), app_source->name,
- mbuf->mb_channel->chname, rembuf_i ? "-" : "", rembuf,
- addbuf_i ? "+" : "", addbuf, remstr, addstr,
- mbuf->mb_channel->creationtime);
+ sendto_opmask_butone(0, SNO_HACK2, "HACK(2): %s MODE %s %s%s%s%s%s%s "
+ "[%Tu]", app_source->name, mbuf->mb_channel->chname,
+ rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "",
+ addbuf, remstr, addstr,
+ mbuf->mb_channel->creationtime);
+ sendcmdto_serv_butone(&me, CMD_DESYNCH, mbuf->mb_connect,
+ ":HACK: %s MODE %s %s%s%s%s%s%s [%Tu]",
+ app_source->name, mbuf->mb_channel->chname,
+ rembuf_i ? "-" : "", rembuf,
+ addbuf_i ? "+" : "", addbuf, remstr, addstr,
+ mbuf->mb_channel->creationtime);
}
if (mbuf->mb_dest & MODEBUF_DEST_HACK3)
- sendto_op_mask(SNO_HACK3, "BOUNCE or HACK(3): %s MODE %s %s%s%s%s%s%s ["
- TIME_T_FMT "]", app_source->name,
- mbuf->mb_channel->chname, rembuf_i ? "-" : "", rembuf,
- addbuf_i ? "+" : "", addbuf, remstr, addstr,
- mbuf->mb_channel->creationtime);
+ sendto_opmask_butone(0, SNO_HACK3, "BOUNCE or HACK(3): %s MODE %s "
+ "%s%s%s%s%s%s [%Tu]", app_source->name,
+ mbuf->mb_channel->chname, rembuf_i ? "-" : "",
+ rembuf, addbuf_i ? "+" : "", addbuf, remstr, addstr,
+ mbuf->mb_channel->creationtime);
if (mbuf->mb_dest & MODEBUF_DEST_HACK4)
- sendto_op_mask(SNO_HACK4, "HACK(4): %s MODE %s %s%s%s%s%s%s [" TIME_T_FMT
- "]", app_source->name, mbuf->mb_channel->chname,
- rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "", addbuf,
- remstr, addstr, mbuf->mb_channel->creationtime);
+ sendto_opmask_butone(0, SNO_HACK4, "HACK(4): %s MODE %s %s%s%s%s%s%s "
+ "[%Tu]", app_source->name, mbuf->mb_channel->chname,
+ rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "",
+ addbuf, remstr, addstr,
+ mbuf->mb_channel->creationtime);
+
+#ifdef OPATH
+ if (mbuf->mb_dest & MODEBUF_DEST_LOG) {
+ write_log(OPATH, "%Tu %#C OPMODE %H %s%s%s%s%s%s\n", TStime(),
+ mbuf->mb_source, mbuf->mb_channel, rembuf_i ? "-" : "", rembuf,
+ addbuf_i ? "+" : "", addbuf, remstr, addstr);
+ }
+#endif
if (mbuf->mb_dest & MODEBUF_DEST_CHANNEL)
- sendto_channel_butserv(mbuf->mb_channel, app_source,
- ":%s MODE %s %s%s%s%s%s%s", app_source->name,
- mbuf->mb_channel->chname, rembuf_i ? "-" : "",
- rembuf, addbuf_i ? "+" : "", addbuf, remstr,
- addstr);
+ sendcmdto_channel_butserv(app_source, CMD_MODE, mbuf->mb_channel,
+ "%H %s%s%s%s%s%s", mbuf->mb_channel,
+ rembuf_i ? "-" : "", rembuf,
+ addbuf_i ? "+" : "", addbuf, remstr, addstr);
}
/* Now are we supposed to propagate to other servers? */
if (mbuf->mb_dest & MODEBUF_DEST_OPMODE) {
/* If OPMODE was set, we're propagating the mode as an OPMODE message */
- if (IsServer(mbuf->mb_source))
- sendto_serv_butone(mbuf->mb_connect, "%s " TOK_OPMODE
- " %s %s%s%s%s%s%s", NumServ(mbuf->mb_source),
- mbuf->mb_channel->chname, rembuf_i ? "-" : "",
- rembuf, addbuf_i ? "+" : "", addbuf, remstr,
- addstr);
- else
- sendto_serv_butone(mbuf->mb_connect, "%s%s " TOK_OPMODE
- " %s %s%s%s%s%s%s", NumNick(mbuf->mb_source),
- mbuf->mb_channel->chname, rembuf_i ? "-" : "",
- rembuf, addbuf_i ? "+" : "", addbuf, remstr,
- addstr);
+ sendcmdto_serv_butone(mbuf->mb_source, CMD_OPMODE, mbuf->mb_connect,
+ "%H %s%s%s%s%s%s", mbuf->mb_channel,
+ rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "",
+ addbuf, remstr, addstr);
} else if (mbuf->mb_dest & MODEBUF_DEST_BOUNCE) {
/*
* If HACK2 was set, we're bouncing; we send the MODE back to the
* connection we got it from with the senses reversed and a TS of 0;
* origin is us
*/
- sendto_one(mbuf->mb_connect, "%s " TOK_MODE " %s %s%s%s%s%s%s "
- TIME_T_FMT, NumServ(&me), mbuf->mb_channel->chname,
- addbuf_i ? "-" : "", addbuf, rembuf_i ? "+" : "", rembuf,
- addstr, remstr, mbuf->mb_channel->creationtime);
+ sendcmdto_one(&me, CMD_MODE, mbuf->mb_connect, "%H %s%s%s%s%s%s %Tu",
+ mbuf->mb_channel, addbuf_i ? "-" : "", addbuf,
+ rembuf_i ? "+" : "", rembuf, addstr, remstr,
+ mbuf->mb_channel->creationtime);
} else {
/*
* We're propagating a normal MODE command to the rest of the network;
* we send the actual channel TS unless this is a HACK3 or a HACK4
*/
if (IsServer(mbuf->mb_source))
- sendto_serv_butone(mbuf->mb_connect, "%s " TOK_MODE " %s %s%s%s%s%s%s "
- TIME_T_FMT, NumServ(mbuf->mb_source),
- mbuf->mb_channel->chname, rembuf_i ? "-" : "",
- rembuf, addbuf_i ? "+" : "", addbuf, remstr,
- addstr, (mbuf->mb_dest & MODEBUF_DEST_HACK4) ? 0 :
- mbuf->mb_channel->creationtime);
+ sendcmdto_serv_butone(mbuf->mb_source, CMD_MODE, mbuf->mb_connect,
+ "%H %s%s%s%s%s%s %Tu", mbuf->mb_channel,
+ rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "",
+ addbuf, remstr, addstr,
+ (mbuf->mb_dest & MODEBUF_DEST_HACK4) ? 0 :
+ mbuf->mb_channel->creationtime);
else
- sendto_serv_butone(mbuf->mb_connect, "%s%s " TOK_MODE
- " %s %s%s%s%s%s%s", NumNick(mbuf->mb_source),
- mbuf->mb_channel->chname, rembuf_i ? "-" : "",
- rembuf, addbuf_i ? "+" : "", addbuf, remstr,
- addstr);
+ sendcmdto_serv_butone(mbuf->mb_source, CMD_MODE, mbuf->mb_connect,
+ "%H %s%s%s%s%s%s", mbuf->mb_channel,
+ rembuf_i ? "-" : "", rembuf, addbuf_i ? "+" : "",
+ addbuf, remstr, addstr);
}
}
if (mbuf->mb_count++ == i) /* don't overwrite our hard work */
continue;
- }
+ } else if (MB_TYPE(mbuf, i) & MODE_FREE)
+ MyFree(MB_STRING(mbuf, i)); /* free string if needed */
MB_TYPE(mbuf, i) = 0;
MB_UINT(mbuf, i) = 0;
* MODE_ADD or MODE_DEL
*/
void
-modebuf_mode_string(struct ModeBuf *mbuf, unsigned int mode, char *string)
+modebuf_mode_string(struct ModeBuf *mbuf, unsigned int mode, char *string,
+ int free)
{
assert(0 != mbuf);
assert(0 != (mode & (MODE_ADD | MODE_DEL)));
- MB_TYPE(mbuf, mbuf->mb_count) = mode;
+ MB_TYPE(mbuf, mbuf->mb_count) = mode | (free ? MODE_FREE : 0);
MB_STRING(mbuf, mbuf->mb_count) = string;
/* when we've reached the maximal count, flush the buffer */
void
mode_invite_clear(struct Channel *chan)
{
- while (chptr->invites)
- del_invite(chptr->invites->value.cptr, chptr);
+ while (chan->invites)
+ del_invite(chan->invites->value.cptr, chan);
}
/* What we've done for mode_parse so far... */
struct Client *sptr;
struct Channel *chptr;
int parc;
- char *parv[];
+ char **parv;
unsigned int flags;
unsigned int dir;
unsigned int done;
int args_used;
int max_args;
int numbans;
- struct Slink banlist[MAXPARA];
+ struct SLink banlist[MAXPARA];
struct {
unsigned int flag;
struct Client *client;
send_notoper(struct ParseState *state)
{
if (state->done & DONE_NOTOPER)
- return 0;
+ return;
- sendto_one(state->sptr, err_str(state->flags & MODE_PARSE_NOTOPER ?
- (ERR_CHANOPRIVSNEEDED : ERR_NOTONCHANNEL)),
- me.name, state->sptr->name, state->chptr->chname);
+ send_reply(state->sptr, (state->flags & MODE_PARSE_NOTOPER) ?
+ ERR_CHANOPRIVSNEEDED : ERR_NOTONCHANNEL, state->chptr->chname);
state->done |= DONE_NOTOPER;
}
t_limit = atoi(state->parv[state->args_used++]); /* grab arg */
state->parc--;
- state->maxargs--;
+ state->max_args--;
if (!t_limit) /* if it was zero, ignore it */
return;
modebuf_mode_uint(state->mbuf, state->dir | flag_p[0], t_limit);
- if (state->flags & MODE_PARSE_SET) /* set the limit */
+ if (state->flags & MODE_PARSE_SET) { /* set the limit */
if (state->dir & MODE_ADD) {
state->chptr->mode.mode |= flag_p[0];
state->chptr->mode.limit = t_limit;
state->chptr->mode.mode &= flag_p[0];
state->chptr->mode.limit = 0;
}
+ }
}
/*
return;
}
- s = t_str = state->parv[state->args_used++]; /* grab arg */
+ t_str = state->parv[state->args_used++]; /* grab arg */
state->parc--;
- state->maxargs--;
+ state->max_args--;
/* If they're not an oper, they can't change modes */
if (state->flags & (MODE_PARSE_NOTOPER | MODE_PARSE_NOTMEMBER)) {
t_len = KEYLEN + 1;
/* clean up the key string */
+ s = t_str;
while (*++s > ' ' && *s != ':' && --t_len)
;
*s = '\0';
if (!(state->flags & MODE_PARSE_FORCE))
if ((state->dir == MODE_ADD && *state->chptr->mode.key) ||
(state->dir == MODE_DEL &&
- ircd_strcmp(state->chptr->mode->key, t_str))) {
- sendto_one(state->sptr, err_str(ERR_KEYSET), me.name, state->sptr->name,
- state->chptr->chname);
+ ircd_strcmp(state->chptr->mode.key, t_str))) {
+ send_reply(state->sptr, ERR_KEYSET, state->chptr->chname);
return;
}
if (state->flags & MODE_PARSE_BOUNCE) {
if (*state->chptr->mode.key) /* reset old key */
modebuf_mode_string(state->mbuf, MODE_DEL | flag_p[0],
- state->chptr->mode.key);
+ state->chptr->mode.key, 0);
else /* remove new bogus key */
- modebuf_mode_string(state->mbuf, MODE_ADD | flag_p[0], t_str);
+ modebuf_mode_string(state->mbuf, MODE_ADD | flag_p[0], t_str, 0);
} else /* send new key */
- modebuf_mode_string(state->mbuf, state->dir | flag_p[0], t_str);
+ modebuf_mode_string(state->mbuf, state->dir | flag_p[0], t_str, 0);
if (state->flags & MODE_PARSE_SET) {
if (state->dir == MODE_ADD) /* set the new key */
mode_parse_ban(struct ParseState *state, int *flag_p)
{
char *t_str, *s;
- struct SLink *ban, *newban;
+ struct SLink *ban, *newban = 0;
if (state->parc <= 0) { /* Not enough args, send ban list */
if (MyUser(state->sptr) && !(state->done & DONE_BANLIST)) {
t_str = state->parv[state->args_used++]; /* grab arg */
state->parc--;
- state->maxargs--;
+ state->max_args--;
/* If they're not an oper, they can't change modes */
if (state->flags & (MODE_PARSE_NOTOPER | MODE_PARSE_NOTMEMBER)) {
return;
}
+ t_str = collapse(pretty_mask(t_str));
+
/* remember the ban for the moment... */
if (state->dir == MODE_ADD) {
newban = state->banlist + (state->numbans++);
newban->next = 0;
- newban->value.ban.banstr = tstr;
- newban->value.ban.who = sptr->who;
- newban->value.ban.when = CurrentTime;
+ DupString(newban->value.ban.banstr, t_str);
+ newban->value.ban.who = state->sptr->name;
+ newban->value.ban.when = TStime();
newban->flags = CHFL_BAN | MODE_ADD;
newban->flags |= CHFL_BAN_IPMASK;
}
+ if (!state->chptr->banlist) {
+ state->chptr->banlist = newban; /* add our ban with its flags */
+ state->done |= DONE_BANCLEAN;
+ return;
+ }
+
/* Go through all bans */
for (ban = state->chptr->banlist; ban; ban = ban->next) {
/* first, clean the ban flags up a bit */
if (!ircd_strcmp(ban->value.ban.banstr, t_str)) {
if (state->done & DONE_BANCLEAN) /* If we're cleaning, finish */
break;
- } else if (!mmatch(ban->value.ban.banstr, t_str))
- newban->flags |= CHFL_BAN_OVERLAPPED; /* our ban overlaps */
- else if (!mmatch(t_str, ban->value.ban.banstr))
+ continue;
+ } else if (!mmatch(ban->value.ban.banstr, t_str)) {
+ if (!(ban->flags & MODE_DEL))
+ newban->flags |= CHFL_BAN_OVERLAPPED; /* our ban overlaps */
+ } else if (!mmatch(t_str, ban->value.ban.banstr))
ban->flags |= MODE_DEL; /* mark ban for deletion: overlapping */
- else if (!ban->next)
+
+ if (!ban->next) {
ban->next = newban; /* add our ban with its flags */
+ break; /* get out of loop */
+ }
}
}
state->done |= DONE_BANCLEAN;
mode_process_bans(struct ParseState *state)
{
struct SLink *ban, *newban, *prevban, *nextban;
+ int count = 0;
+ int len = 0;
+ int banlen;
int changed = 0;
for (prevban = 0, ban = state->chptr->banlist; ban; ban = nextban) {
+ count++;
+ banlen = strlen(ban->value.ban.banstr);
+ len += banlen;
nextban = ban->next;
- if (ban->flags & MODE_DEL) { /* Deleted a ban? */
+ if ((ban->flags & (MODE_DEL | MODE_ADD)) == (MODE_DEL | MODE_ADD)) {
+ if (prevban)
+ prevban->next = 0; /* Break the list; ban isn't a real ban */
+ else
+ state->chptr->banlist = 0;
+
+ count--;
+ len -= banlen;
+
+ MyFree(ban->value.ban.banstr);
+
+ continue;
+ } else if (ban->flags & MODE_DEL) { /* Deleted a ban? */
modebuf_mode_string(state->mbuf, MODE_DEL | MODE_BAN,
- ban->value.ban.banstr);
+ ban->value.ban.banstr,
+ state->flags & MODE_PARSE_SET);
if (state->flags & MODE_PARSE_SET) { /* Ok, make it take effect */
if (prevban) /* clip it out of the list... */
else
state->chptr->banlist = ban->next;
- MyFree(ban->value.ban.banstr); /* free it */
+ count--;
+ len -= banlen;
+
MyFree(ban->value.ban.who);
free_link(ban);
} else
ban->flags &= (CHFL_BAN | CHFL_BAN_IPMASK); /* unset other flags */
} else if (ban->flags & MODE_ADD) { /* adding a ban? */
- prevban->next = 0; /* Break the list; ban isn't a real ban */
+ if (prevban)
+ prevban->next = 0; /* Break the list; ban isn't a real ban */
+ else
+ state->chptr->banlist = 0;
/* If we're supposed to ignore it, do so. */
if (ban->flags & CHFL_BAN_OVERLAPPED &&
!(state->flags & MODE_PARSE_BOUNCE)) {
- prevban = ban;
- continue;
- }
-
- /* add the ban to the buffer */
- modebuf_mode_string(state->mbuf, MODE_ADD | MODE_BAN,
- ban->value.ban.banstr);
-
- if (state->flags & MODE_PARSE_SET) { /* create a new ban */
- newban = make_link();
- newban->value.ban.banstr = DupString(ban->value.ban.banstr);
- newban->value.ban.who = DupString(ban->value.ban.who);
- newban->value.ban.when = ban->value.ban.when;
- newban->flags = ban->flags & (CHFL_BAN | CHFL_BAN_IPMASK);
+ count--;
+ len -= banlen;
- newban->next = state->chptr->banlist; /* and link it in */
- state->chptr->banlist = newban;
-
- changed++;
+ MyFree(ban->value.ban.banstr);
+ } else {
+ if (state->flags & MODE_PARSE_SET && MyUser(state->sptr) &&
+ (len > MAXBANLENGTH || count >= MAXBANS)) {
+ send_reply(state->sptr, ERR_BANLISTFULL, state->chptr->chname,
+ ban->value.ban.banstr);
+ count--;
+ len -= banlen;
+
+ MyFree(ban->value.ban.banstr);
+ } else {
+ /* add the ban to the buffer */
+ modebuf_mode_string(state->mbuf, MODE_ADD | MODE_BAN,
+ ban->value.ban.banstr,
+ !(state->flags & MODE_PARSE_SET));
+
+ if (state->flags & MODE_PARSE_SET) { /* create a new ban */
+ newban = make_link();
+ newban->value.ban.banstr = ban->value.ban.banstr;
+ DupString(newban->value.ban.who, ban->value.ban.who);
+ newban->value.ban.when = ban->value.ban.when;
+ newban->flags = ban->flags & (CHFL_BAN | CHFL_BAN_IPMASK);
+
+ newban->next = state->chptr->banlist; /* and link it in */
+ state->chptr->banlist = newban;
+
+ changed++;
+ }
+ }
}
}
- prevban = ban; /* keep track of where we've been */
+ prevban = ban;
} /* for (prevban = 0, ban = state->chptr->banlist; ban; ban = nextban) { */
if (changed) /* if we changed the ban list, we must invalidate the bans */
- mode_ban_invalidate(chptr);
+ mode_ban_invalidate(state->chptr);
}
/*
if (MyUser(state->sptr))
need_more_params(state->sptr, state->dir == MODE_ADD ?
(flag_p[0] == MODE_CHANOP ? "MODE +o" : "MODE +v") :
- (flag_p[0] == MODE_VOICE ? "MODE -o" : "MODE -v"));
+ (flag_p[0] == MODE_CHANOP ? "MODE -o" : "MODE -v"));
return;
}
t_str = state->parv[state->args_used++]; /* grab arg */
state->parc--;
- state->maxargs--;
+ state->max_args--;
/* If they're not an oper, they can't change modes */
if (state->flags & (MODE_PARSE_NOTOPER | MODE_PARSE_NOTMEMBER)) {
else
acptr = findNUser(t_str);
+ if (!acptr)
+ return; /* find_chasing() already reported an error to the user */
+
for (i = 0; i < MAXPARA; i++) /* find an element to stick them in */
if (!state->cli_change[i].flag || (state->cli_change[i].client == acptr &&
state->cli_change[i].flag & flag_p[0]))
break; /* found a slot */
/* Store what we're doing to them */
- state->cli_change.flag = state->dir | flag_p[0];
- state->cli_change.client = acptr;
+ state->cli_change[i].flag = state->dir | flag_p[0];
+ state->cli_change[i].client = acptr;
}
/*
int i;
struct Membership *member;
- for (i = 0; state->cli_change[i].flags; i++) {
+ for (i = 0; state->cli_change[i].flag; i++) {
+ assert(0 != state->cli_change[i].client);
+
/* look up member link */
if (!(member = find_member_link(state->chptr,
state->cli_change[i].client)) ||
(MyUser(state->sptr) && IsZombie(member))) {
if (MyUser(state->sptr))
- sendto_one(state->sptr, err_str(ERR_USERNOTINCHANNEL), me.name,
- state->sptr->name, state->cli_change[i].client->name,
- state->chptr->chname);
+ send_reply(state->sptr, ERR_USERNOTINCHANNEL,
+ state->cli_change[i].client->name, state->chptr->chname);
continue;
}
- if ((state->cli_change[i].flags & MODE_ADD &&
- (state->cli_change[i].flags & member->status)) ||
- (state->cli_change[i].flags & MODE_DEL &&
- !(state->cli_change[i].flags & member->status)))
+ if ((state->cli_change[i].flag & MODE_ADD &&
+ (state->cli_change[i].flag & member->status)) ||
+ (state->cli_change[i].flag & MODE_DEL &&
+ !(state->cli_change[i].flag & member->status)))
continue; /* no change made, don't do anything */
/* see if the deop is allowed */
- if (state->cli_change[i].flags & (MODE_DEL | MODE_CHANOP) ==
+ if ((state->cli_change[i].flag & (MODE_DEL | MODE_CHANOP)) ==
(MODE_DEL | MODE_CHANOP)) {
/* prevent +k users from being deopped */
if (IsChannelService(state->cli_change[i].client)) {
- if (flags & MODE_PARSE_FORCE) /* it was forced */
- sendto_op_mask(SNO_HACK4, ":%s NOTICE * :*** Notice -- "
- "Deop of +k user on %s by %s",me.name,
- state->chptr->chname,
- (IsServer(state->sptr->name) ? state->sptr->name :
- state->sptr->user->server->name));
+ if (state->flags & MODE_PARSE_FORCE) /* it was forced */
+ sendto_opmask_butone(0, SNO_HACK4, "Deop of +k user on %H by %s",
+ state->chptr,
+ (IsServer(state->sptr) ? state->sptr->name :
+ state->sptr->user->server->name));
else if (MyUser(state->sptr) && state->flags & MODE_PARSE_SET) {
- sendto_one(state->sptr, err_str(ERR_ISCHANSERVICE), me.name,
- state->sptr->name, state->cli_change[i].client->name,
- state->chptr->chname);
+ send_reply(state->sptr, ERR_ISCHANSERVICE,
+ state->cli_change[i].client->name, state->chptr->chname);
continue;
}
}
if (MyUser(state->sptr) && state->cli_change[i].client != state->sptr &&
IsOperOnLocalChannel(state->cli_change[i].client,
state->chptr->chname)) {
- sendto_one(state->sptr, err_str(ERR_ISOPERLCHAN), me.name,
- state->sptr->name, state->cli_change[i].client->name,
- state->chptr->chname);
+ send_reply(state->sptr, ERR_ISOPERLCHAN,
+ state->cli_change[i].client->name, state->chptr->chname);
continue;
}
#endif
}
/* accumulate the change */
- modebuf_mode_client(state->mbuf, state->cli_change[i].flags,
+ modebuf_mode_client(state->mbuf, state->cli_change[i].flag,
state->cli_change[i].client);
/* actually effect the change */
if (state->flags & MODE_PARSE_SET) {
- if (state->cli_change[i].flags & MODE_ADD)
- member->status |= (state->cli_change[i].flags &
+ if (state->cli_change[i].flag & MODE_ADD) {
+ member->status |= (state->cli_change[i].flag &
(MODE_CHANOP | MODE_VOICE));
- else
- member->status &= ~(state->cli_change[i].flags &
+ if (state->cli_change[i].flag & MODE_CHANOP)
+ ClearDeopped(member);
+ } else
+ member->status &= ~(state->cli_change[i].flag &
(MODE_CHANOP | MODE_VOICE));
}
} /* for (i = 0; state->cli_change[i].flags; i++) { */
/* make +p and +s mutually exclusive */
if (state->dir == MODE_ADD && flag_p[0] & (MODE_SECRET | MODE_PRIVATE)) {
- if (flag_p[0] == MODE_SECRET)
- modebuf_mode(state->mbuf, MODE_DEL | MODE_SECRET);
- else
+ if (flag_p[0] == MODE_SECRET && (state->chptr->mode.mode & MODE_PRIVATE))
modebuf_mode(state->mbuf, MODE_DEL | MODE_PRIVATE);
+ else if (flag_p[0] == MODE_PRIVATE &&
+ (state->chptr->mode.mode & MODE_SECRET))
+ modebuf_mode(state->mbuf, MODE_DEL | MODE_SECRET);
}
if (state->flags & MODE_PARSE_SET) { /* set the flags */
MODE_KEY, 'k',
MODE_BAN, 'b',
MODE_LIMIT, 'l',
+ MODE_ADD, '+',
+ MODE_DEL, '-',
0x0, 0x0
};
int i;
int *flag_p;
char *modestr;
- struct ParseState state = { mbuf, cptr, sptr, chptr, parc, parv, flags,
- MODE_ADD, 0, 0, MAXMODEPARAMS, 0 };
+ struct ParseState state;
assert(0 != cptr);
assert(0 != sptr);
assert(0 != parc);
assert(0 != parv);
+ state.mbuf = mbuf;
+ state.cptr = cptr;
+ state.sptr = sptr;
+ state.chptr = chptr;
+ state.parc = parc;
+ state.parv = parv;
+ state.flags = flags;
+ state.dir = MODE_ADD;
+ state.done = 0;
+ state.args_used = 0;
+ state.max_args = MAXMODEPARAMS;
+ state.numbans = 0;
+
for (i = 0; i < MAXPARA; i++) { /* initialize ops/voices arrays */
+ state.banlist[i].next = 0;
+ state.banlist[i].value.ban.banstr = 0;
+ state.banlist[i].value.ban.who = 0;
+ state.banlist[i].value.ban.when = 0;
+ state.banlist[i].flags = 0;
state.cli_change[i].flag = 0;
state.cli_change[i].client = 0;
}
if (!flag_p[0]) { /* didn't find it? complain and continue */
if (MyUser(state.sptr))
- sendto_one(state.sptr, err_str(ERR_UNKNOWNMODE), me.name,
- state.sptr->name, *modestr);
+ send_reply(state.sptr, ERR_UNKNOWNMODE, *modestr);
continue;
}
switch (*modestr) {
case '+': /* switch direction to MODE_ADD */
- state.dir = MODE_ADD;
- break;
case '-': /* switch direction to MODE_DEL */
- state.dir = MODE_DEL;
+ state.dir = flag_p[0];
break;
case 'l': /* deal with limits */
break;
default: /* deal with other modes */
+ mode_parse_mode(&state, flag_p);
break;
} /* switch (*modestr) { */
} /* for (; *modestr; modestr++) { */
if (IsServer(state.sptr) && !state.parc && IsDigit(*modestr)) {
time_t recv_ts;
- if (state.flags & MODE_PARSE_NOSET) /* don't set earlier TS if we're */
- break; /* then going to bounce the mode! */
+ if (!(state.flags & MODE_PARSE_SET)) /* don't set earlier TS if */
+ break; /* we're then going to bounce the mode! */
recv_ts = atoi(modestr);
mode_process_bans(&state);
/* process client changes */
- if (state.cli_change[i].flags)
+ if (state.cli_change[0].flag)
mode_process_clients(&state);
return state.args_used; /* tell our parent how many args we gobbled */
projects / ircu2.10.12-pk.git / blobdiff