#include "sys.h"
#include "whowas.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
static unsigned int membershipAllocCount;
/** Freelist for struct Membership*'s */
static struct Membership* membershipFreeList;
-
-void del_invite(struct Client *, struct Channel *);
-
-const char* const PartFmt1 = ":%s " MSG_PART " %s";
-const char* const PartFmt2 = ":%s " MSG_PART " %s :%s";
-const char* const PartFmt1serv = "%s%s " TOK_PART " %s";
-const char* const PartFmt2serv = "%s%s " TOK_PART " %s :%s";
-
-
-static struct SLink* next_ban;
-static struct SLink* prev_ban;
-static struct SLink* removed_bans_list;
-
-/**
- * Use a global variable to remember if an oper set a mode on a local channel.
- * Ugly, but the only way to do it without changing set_mode intensively.
- */
-int LocalChanOperMode = 0;
+/** Freelist for struct Ban*'s */
+static struct Ban* free_bans;
#if !defined(NDEBUG)
/** return the length (>=0) of a chain of links.
}
#endif
+/** Set the mask for a ban, checking for IP masks.
+ * @param[in,out] ban Ban structure to modify.
+ * @param[in] banstr Mask to ban.
+ */
+static void
+set_ban_mask(struct Ban *ban, const char *banstr)
+{
+ char *sep;
+ MyFree(ban->banstr);
+ if (!banstr)
+ return;
+ DupString(ban->banstr, banstr);
+ sep = strrchr(banstr, '@');
+ if (sep) {
+ ban->nu_len = sep - banstr;
+ if (ipmask_parse(sep + 1, &ban->address, &ban->addrbits))
+ ban->flags |= BAN_IPMASK;
+ }
+}
+
+/** Allocate a new Ban structure.
+ * @param[in] banstr Ban mask to use.
+ * @return Newly allocated ban.
+ */
+struct Ban *
+make_ban(const char *banstr)
+{
+ struct Ban *ban;
+ if (free_bans) {
+ ban = free_bans;
+ free_bans = free_bans->next;
+ }
+ else if (!(ban = MyMalloc(sizeof(*ban))))
+ return NULL;
+ memset(ban, 0, sizeof(*ban));
+ set_ban_mask(ban, banstr);
+ return ban;
+}
+
+/** Deallocate a ban structure.
+ * @param[in] ban Ban to deallocate.
+ */
+void
+free_ban(struct Ban *ban)
+{
+ MyFree(ban->who);
+ MyFree(ban->banstr);
+ ban->next = free_bans;
+ free_bans = ban;
+}
+
/** return the struct Membership* that represents a client on a channel
* This function finds a struct Membership* which holds the state about
* a client on a specific channel. The code is smart enough to iterate
return who;
}
-/** build up a hostmask
- * Create a string of form "foo!bar@fubar" given foo, bar and fubar
- * as the parameters. If NULL, they become "*".
- * @param namebuf the buffer to build the hostmask into. Must be at least
- * NICKLEN+USERLEN+HOSTLEN+3 charactors long.
- * @param nick The nickname
- * @param name The ident
- * @param host the hostname
- * @returns namebuf
- * @see make_nick_user_ip()
- */
-static char *make_nick_user_host(char *namebuf, const char *nick,
- const char *name, const char *host)
-{
-#define NUH_BUFSIZE (NICKLEN + USERLEN + HOSTLEN + 3)
- ircd_snprintf(0, namebuf, NUH_BUFSIZE, "%s!%s@%s", nick, name, host);
- return namebuf;
-}
-
-/** Create a hostmask using an IP address
- * Create a string of form "foo!bar@123.456.789.123" given foo, bar and the
- * IP-number as the parameters. If NULL, they become "*".
- *
- * @param ipbuf Buffer at least NICKLEN+USERLEN+SOCKIPLEN+4 to hold the final
- * match.
- * @param nick The nickname (or NULL for *)
- * @param name The ident (or NULL for *)
- * @param ip The IP address
- * @returns ipbuf
- * @see make_nick_user_host()
- */
-#define NUI_BUFSIZE (NICKLEN + USERLEN + SOCKIPLEN + 4)
-static char *make_nick_user_ip(char *ipbuf, char *nick, char *name,
- const struct irc_in_addr *ip)
-{
- ircd_snprintf(0, ipbuf, NUI_BUFSIZE, "%s!%s@%s", nick, name, ircd_ntoa(ip));
- return ipbuf;
-}
-
/** Decrement the count of users, and free if empty.
* Subtract one user from channel i (and free channel * block, if channel
* became empty).
* who then will educate them on the use of Apass/upass.
*/
- if (feature_bool(FEAT_OPLEVELS)) {
- if (TStime() - chptr->creationtime < 172800) /* Channel younger than 48 hours? */
+ if (!(chptr->mode.mode & MODE_APASS)) /* If no Apass, destroy now. */
+ destruct_channel(chptr);
+ else if (TStime() - chptr->creationtime < 172800) /* Channel younger than 48 hours? */
schedule_destruct_event_1m(chptr); /* Get rid of it in approximately 4-5 minutes */
else
schedule_destruct_event_48h(chptr); /* Get rid of it in approximately 48 hours */
- } else
- destruct_channel(chptr);
return 0;
}
*/
int destruct_channel(struct Channel* chptr)
{
- struct SLink *tmp;
- struct SLink *obtmp;
+ struct Ban *ban, *next;
assert(0 == chptr->members);
- /* Channel became (or was) empty: Remove channel */
- if (is_listed(chptr))
- {
- int i;
- for (i = 0; i <= HighestFd; i++)
- {
- struct Client *acptr = 0;
- if ((acptr = LocalClientArray[i]) && cli_listing(acptr) &&
- (cli_listing(acptr))->chptr == chptr)
- {
- list_next_channels(acptr, 1);
- break; /* Only one client can list a channel */
- }
- }
- }
/*
* Now, find all invite links from channel structure
*/
- while ((tmp = chptr->invites))
- del_invite(tmp->value.cptr, chptr);
+ while (chptr->invites)
+ del_invite(chptr->invites->value.cptr, chptr);
- tmp = chptr->banlist;
- while (tmp)
+ for (ban = chptr->banlist; ban; ban = next)
{
- obtmp = tmp;
- tmp = tmp->next;
- MyFree(obtmp->value.ban.banstr);
- MyFree(obtmp->value.ban.who);
- free_link(obtmp);
+ next = ban->next;
+ free_ban(ban);
}
if (chptr->prev)
chptr->prev->next = chptr->next;
return 0;
}
-/** add a ban to a channel
- *
- * `cptr' must be the client adding the ban.
- *
- * If `change' is true then add `banid' to channel `chptr'.
- * Returns 0 if the ban was added.
- * Returns -2 if the ban already existed and was marked CHFL_BURST_BAN_WIPEOUT.
- * Return -1 otherwise.
- *
- * Those bans that overlapped with `banid' are flagged with CHFL_BAN_OVERLAPPED
- * when `change' is false, otherwise they will be removed from the banlist.
- * Subsequently calls to next_overlapped_ban() or next_removed_overlapped_ban()
- * respectively will return these bans until NULL is returned.
- *
- * If `firsttime' is true, the ban list as returned by next_overlapped_ban()
- * is reset (unless a non-zero value is returned, in which case the
- * CHFL_BAN_OVERLAPPED flag might not have been reset!).
- *
- * @author Run
- * @param cptr Client adding the ban
- * @param chptr Channel to add the ban to
- * @param banid The actual ban.
- * @param change True if adding a ban, false if old bans should just be flagged
- * @param firsttime Reset the next_overlapped_ban() iteration.
- * @returns
- * 0 if the ban was added
- * -2 if the ban already existed and was marked CHFL_BURST_BAN_WIPEOUT
- * -1 otherwise
- */
-int add_banid(struct Client *cptr, struct Channel *chptr, char *banid,
- int change, int firsttime)
-{
- struct SLink* ban;
- struct SLink** banp;
- int cnt = 0;
- int removed_bans = 0;
- int len = strlen(banid);
-
- if (firsttime)
- {
- next_ban = NULL;
- assert(0 == prev_ban);
- assert(0 == removed_bans_list);
- }
- if (MyUser(cptr))
- collapse(banid);
- for (banp = &chptr->banlist; *banp;)
- {
- len += strlen((*banp)->value.ban.banstr);
- ++cnt;
- if (((*banp)->flags & CHFL_BURST_BAN_WIPEOUT))
- {
- if (!strcmp((*banp)->value.ban.banstr, banid))
- {
- (*banp)->flags &= ~CHFL_BURST_BAN_WIPEOUT;
- return -2;
- }
- }
- else if (!mmatch((*banp)->value.ban.banstr, banid))
- return -1;
- if (!mmatch(banid, (*banp)->value.ban.banstr))
- {
- struct SLink *tmp = *banp;
- if (change)
- {
- if (MyUser(cptr))
- {
- cnt--;
- len -= strlen(tmp->value.ban.banstr);
- }
- *banp = tmp->next;
- /* These will be sent to the user later as -b */
- tmp->next = removed_bans_list;
- removed_bans_list = tmp;
- removed_bans = 1;
- }
- else if (!(tmp->flags & CHFL_BURST_BAN_WIPEOUT))
- {
- tmp->flags |= CHFL_BAN_OVERLAPPED;
- if (!next_ban)
- next_ban = tmp;
- banp = &tmp->next;
- }
- else
- banp = &tmp->next;
- }
- else
- {
- if (firsttime)
- (*banp)->flags &= ~CHFL_BAN_OVERLAPPED;
- banp = &(*banp)->next;
- }
- }
- if (MyUser(cptr) && !removed_bans &&
- (len > (feature_int(FEAT_AVBANLEN) * feature_int(FEAT_MAXBANS)) ||
- (cnt >= feature_int(FEAT_MAXBANS))))
- {
- send_reply(cptr, ERR_BANLISTFULL, chptr->chname, banid);
- return -1;
- }
- if (change)
- {
- char* ip_start;
- struct Membership* member;
- ban = make_link();
- ban->next = chptr->banlist;
-
- ban->value.ban.banstr = (char*) MyMalloc(strlen(banid) + 1);
- assert(0 != ban->value.ban.banstr);
- strcpy(ban->value.ban.banstr, banid);
-
- if (IsServer(cptr) && feature_bool(FEAT_HIS_BANWHO))
- DupString(ban->value.ban.who, cli_name(&me));
- else
- DupString(ban->value.ban.who, cli_name(cptr));
- assert(0 != ban->value.ban.who);
-
- 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;
- chptr->banlist = ban;
-
- /*
- * Erase ban-valid-bit
- */
- for (member = chptr->members; member; member = member->next_member)
- ClearBanValid(member); /* `ban' == channel member ! */
- }
- return 0;
-}
-
-/** return the next ban that is removed
- * @returns the next ban that is removed because of overlapping
- */
-struct SLink *next_removed_overlapped_ban(void)
-{
- struct SLink *tmp = removed_bans_list;
- if (prev_ban)
- {
- if (prev_ban->value.ban.banstr) /* Can be set to NULL in set_mode() */
- MyFree(prev_ban->value.ban.banstr);
- MyFree(prev_ban->value.ban.who);
- free_link(prev_ban);
- prev_ban = 0;
- }
- if (tmp)
- removed_bans_list = removed_bans_list->next;
- prev_ban = tmp;
- return tmp;
-}
-
/** returns Membership * if a person is joined and not a zombie
* @param cptr Client
* @param chptr Channel
return (member && !IsZombie(member)) ? member : 0;
}
-/** return true if banned else false.
- *
+/** Searches for a ban from a banlist that matches a user.
+ * @param[in] cptr The client to test.
+ * @param[in] banlist The list of bans to test.
+ * @return Pointer to a matching ban, or NULL if none exit.
+ */
+struct Ban *find_ban(struct Client *cptr, struct Ban *banlist)
+{
+ char nu[NICKLEN + USERLEN + 2];
+ char tmphost[HOSTLEN + 1];
+ char *sr;
+ struct Ban *found;
+
+ /* Build nick!user and alternate host names. */
+ ircd_snprintf(0, nu, sizeof(nu), "%s!%s",
+ cli_name(cptr), cli_user(cptr)->username);
+ if (!IsAccount(cptr))
+ sr = NULL;
+ else if (HasHiddenHost(cptr))
+ sr = cli_user(cptr)->realhost;
+ else
+ {
+ ircd_snprintf(0, tmphost, HOSTLEN, "%s.%s",
+ cli_user(cptr)->account, feature_str(FEAT_HIDDEN_HOST));
+ sr = tmphost;
+ }
+
+ /* Walk through ban list. */
+ for (found = NULL; banlist; banlist = banlist->next) {
+ int res;
+ /* If we have found a positive ban already, only consider exceptions. */
+ if (found && !(banlist->flags & BAN_EXCEPTION))
+ continue;
+ /* Compare nick!user portion of ban. */
+ banlist->banstr[banlist->nu_len] = '\0';
+ res = match(banlist->banstr, nu);
+ banlist->banstr[banlist->nu_len] = '@';
+ if (res)
+ continue;
+ /* Compare host portion of ban. */
+ if (!((banlist->flags & BAN_IPMASK)
+ && ipmask_check(&cli_ip(cptr), &banlist->address, banlist->addrbits))
+ && match(banlist->banstr + banlist->nu_len + 1, cli_user(cptr)->host)
+ && !(sr && match(banlist->banstr + banlist->nu_len + 1, sr) == 0))
+ continue;
+ /* If an exception matches, no ban can match. */
+ if (banlist->flags & BAN_EXCEPTION)
+ return NULL;
+ /* Otherwise, remember this ban but keep searching for an exception. */
+ found = banlist;
+ }
+ return found;
+}
+
+/**
* This function returns true if the user is banned on the said channel.
* This function will check the ban cache if applicable, otherwise will
* do the comparisons and cache the result.
*
- * @param cptr The client to test
- * @param chptr The channel
- * @param member The Membership * of this client on this channel
- * (may be NULL if the member is not on the channel).
+ * @param[in] member The Membership to test for banned-ness.
+ * @return Non-zero if the member is banned, zero if not.
*/
-static int is_banned(struct Client *cptr, struct Channel *chptr,
- struct Membership* member)
+static int is_banned(struct Membership* member)
{
- struct SLink* tmp;
- char tmphost[HOSTLEN + 1];
- char nu_host[NUH_BUFSIZE];
- char nu_realhost[NUH_BUFSIZE];
- char nu_ip[NUI_BUFSIZE];
- char* s;
- char* sr = NULL;
- char* ip_s = NULL;
-
- if (!IsUser(cptr))
- return 0;
-
- if (member && IsBanValid(member))
+ if (IsBanValid(member))
return IsBanned(member);
- s = make_nick_user_host(nu_host, cli_name(cptr), (cli_user(cptr))->username,
- (cli_user(cptr))->host);
- if (IsAccount(cptr))
- {
- if (HasHiddenHost(cptr))
- {
- sr = make_nick_user_host(nu_realhost, cli_name(cptr),
- (cli_user(cptr))->username,
- cli_user(cptr)->realhost);
- }
- else
- {
- ircd_snprintf(0, tmphost, HOSTLEN, "%s.%s",
- cli_user(cptr)->account, feature_str(FEAT_HIDDEN_HOST));
- sr = make_nick_user_host(nu_realhost, cli_name(cptr),
- cli_user(cptr)->username,
- tmphost);
- }
- }
-
- for (tmp = chptr->banlist; tmp; tmp = tmp->next) {
- if ((tmp->flags & CHFL_BAN_IPMASK)) {
- if (!ip_s)
- ip_s = make_nick_user_ip(nu_ip, cli_name(cptr),
- (cli_user(cptr))->username, &cli_ip(cptr));
- if (match(tmp->value.ban.banstr, ip_s) == 0)
- break;
- }
- if (match(tmp->value.ban.banstr, s) == 0)
- break;
- else if (sr && match(tmp->value.ban.banstr, sr) == 0)
- break;
- }
-
- if (member) {
- SetBanValid(member);
- if (tmp) {
- SetBanned(member);
- return 1;
- }
- else {
- ClearBanned(member);
- return 0;
- }
+ SetBanValid(member);
+ if (find_ban(member->user, member->channel->banlist)) {
+ SetBanned(member);
+ return 1;
+ } else {
+ ClearBanned(member);
+ return 0;
}
-
- return (tmp != NULL);
}
/** add a user to a channel.
* but because of the amount of CPU time that is_banned chews
* we only check it for our clients.
*/
- if (MyUser(member->user) && is_banned(member->user, member->channel, member))
+ if (MyUser(member->user) && is_banned(member))
return 0;
if (IsDelayedJoin(member) && reveal)
((chptr->mode.mode & MODE_REGONLY) && !IsAccount(cptr)))
return 0;
else
- return !is_banned(cptr, chptr, NULL);
+ return !find_ban(cptr, chptr->banlist);
}
return member_can_send_to_channel(member, reveal);
}
for (member = (cli_user(cptr))->channel; member;
member = member->next_channel) {
if (!IsVoicedOrOpped(member) &&
- (is_banned(cptr, member->channel, member) ||
+ (is_banned(member) ||
(member->channel->mode.mode & MODE_MODERATED)))
return member->channel->chname;
}
int new_mode = 0;
size_t len;
struct Membership* member;
- struct SLink* lp2;
+ struct Ban* lp2;
char modebuf[MODEBUFLEN];
char parabuf[MODEBUFLEN];
struct MsgBuf *mb;
/* Attach all bans, space seperated " :%ban ban ..." */
for (first = 2; lp2; lp2 = lp2->next)
{
- len = strlen(lp2->value.ban.banstr);
+ len = strlen(lp2->banstr);
if (msgq_bufleft(mb) < len + 1 + first)
/* The +1 stands for the added ' '.
* The +first stands for the added ":%".
break;
}
msgq_append(&me, mb, " %s%s", first ? ":%" : "",
- lp2->value.ban.banstr);
+ lp2->banstr);
first = 0;
}
}
char *pretty_mask(char *mask)
{
static char star[2] = { '*', 0 };
- static char retmask[NUH_BUFSIZE];
+ static char retmask[NICKLEN + USERLEN + HOSTLEN + 3];
char *last_dot = NULL;
char *ptr;
host = ptr - HOSTLEN;
*host = '*';
}
- return make_nick_user_host(retmask, nick, user, host);
+ ircd_snprintf(0, retmask, sizeof(retmask), "%s!%s@%s", nick, user, host);
+ return retmask;
}
/** send a banlist to a client for a channel
*/
static void send_ban_list(struct Client* cptr, struct Channel* chptr)
{
- struct SLink* lp;
+ struct Ban* lp;
assert(0 != cptr);
assert(0 != chptr);
for (lp = chptr->banlist; lp; lp = lp->next)
- send_reply(cptr, RPL_BANLIST, chptr->chname, lp->value.ban.banstr,
- lp->value.ban.who, lp->value.ban.when);
+ send_reply(cptr, RPL_BANLIST, chptr->chname, lp->banstr,
+ lp->who, lp->when);
send_reply(cptr, RPL_ENDOFBANLIST, chptr->chname);
}
if ((chptr->mode.mode & MODE_REGONLY) && !IsAccount(sptr))
return overrideJoin + ERR_NEEDREGGEDNICK;
- if (is_banned(sptr, chptr, NULL))
+ if (find_ban(sptr, chptr->banlist))
return overrideJoin + ERR_BANNEDFROMCHAN;
/*
}
}
-/** List a set of channels
- * Lists a series of channels that match a filter, skipping channels that
- * have been listed before.
+/** @page zombie Explanation of Zombies
*
- * @param cptr Client to send the list to.
- * @param nr Number of channels to send this update.
- */
-void list_next_channels(struct Client *cptr, int nr)
-{
- struct ListingArgs *args = cli_listing(cptr);
- struct Channel *chptr = args->chptr;
- chptr->mode.mode &= ~MODE_LISTED;
- while (is_listed(chptr) || --nr >= 0)
- {
- for (; chptr; chptr = chptr->next)
- {
- if (!cli_user(cptr))
- continue;
- if (!(HasPriv(cptr, PRIV_LIST_CHAN) && IsAnOper(cptr)) &&
- SecretChannel(chptr) && !find_channel_member(cptr, chptr))
- continue;
- if (chptr->users > args->min_users && chptr->users < args->max_users &&
- chptr->creationtime > args->min_time &&
- chptr->creationtime < args->max_time &&
- (!(args->flags & LISTARG_TOPICLIMITS) || (*chptr->topic &&
- chptr->topic_time > args->min_topic_time &&
- chptr->topic_time < args->max_topic_time)))
- {
- if ((args->flags & LISTARG_SHOWSECRET) || ShowChannel(cptr,chptr))
- send_reply(cptr, RPL_LIST, chptr->chname, chptr->users,
- chptr->topic);
- chptr = chptr->next;
- break;
- }
- }
- if (!chptr)
- {
- MyFree(cli_listing(cptr));
- cli_listing(cptr) = NULL;
- send_reply(cptr, RPL_LISTEND);
- break;
- }
- }
- if (chptr)
- {
- (cli_listing(cptr))->chptr = chptr;
- chptr->mode.mode |= MODE_LISTED;
- }
-
- update_write(cptr);
-}
-
-/** @page zombie Explaination of Zombies
+ * Synopsis:
+ *
+ * A channel member is turned into a zombie when he is kicked from a
+ * channel but his server has not acknowledged the kick. Servers that
+ * see the member as a zombie can accept actions he performed before
+ * being kicked, without allowing chanop operations from outsiders or
+ * desyncing the network.
*
* Consider:
* <pre>
int args_used;
int max_args;
int numbans;
- struct SLink banlist[MAXPARA];
+ struct Ban banlist[MAXPARA];
struct {
unsigned int flag;
struct Client *client;
}
/* If they are not the channel manager, they are not allowed to change it */
- if (MyUser(state->sptr) && !IsChannelManager(state->member)) {
+ if (MyUser(state->sptr) && !(state->flags & MODE_PARSE_FORCE || IsChannelManager(state->member))) {
if (*state->chptr->mode.apass) {
send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
"Use /JOIN", state->chptr->chname, "<AdminPass>.");
}
/* If they are not the channel manager, they are not allowed to change it */
- if (MyUser(state->sptr) && !IsChannelManager(state->member)) {
+ if (MyUser(state->sptr) && !(state->flags & MODE_PARSE_FORCE || IsChannelManager(state->member))) {
if (*state->chptr->mode.apass) {
send_reply(state->sptr, ERR_NOTMANAGER, state->chptr->chname,
"Use /JOIN", state->chptr->chname, "<AdminPass>.");
}
}
+/** Compare one ban's extent to another.
+ * This works very similarly to mmatch() but it knows about CIDR masks
+ * and ban exceptions. If both bans are CIDR-based, compare their
+ * address bits; otherwise, use mmatch().
+ * @param[in] old_ban One ban.
+ * @param[in] new_ban Another ban.
+ * @return Zero if \a old_ban is a superset of \a new_ban, non-zero otherwise.
+ */
+static int
+bmatch(struct Ban *old_ban, struct Ban *new_ban)
+{
+ int res;
+ assert(old_ban != NULL);
+ assert(new_ban != NULL);
+ /* A ban is never treated as a superset of an exception. */
+ if (!(old_ban->flags & BAN_EXCEPTION)
+ && (new_ban->flags & BAN_EXCEPTION))
+ return 1;
+ /* If either is not an address mask, match the text masks. */
+ if ((old_ban->flags & new_ban->flags & BAN_IPMASK) == 0)
+ return mmatch(old_ban->banstr, new_ban->banstr);
+ /* If the old ban has a longer prefix than new, it cannot be a superset. */
+ if (old_ban->addrbits > new_ban->addrbits)
+ return 1;
+ /* Compare the masks before the hostname part. */
+ old_ban->banstr[old_ban->nu_len] = new_ban->banstr[new_ban->nu_len] = '\0';
+ res = mmatch(old_ban->banstr, new_ban->banstr);
+ old_ban->banstr[old_ban->nu_len] = new_ban->banstr[new_ban->nu_len] = '@';
+ if (res)
+ return res;
+ /* Compare the addresses. */
+ return !ipmask_check(&new_ban->address, &old_ban->address, old_ban->addrbits);
+}
+
+/** Add a ban from a ban list and mark bans that should be removed
+ * because they overlap.
+ *
+ * There are three invariants for a ban list. First, no ban may be
+ * more specific than another ban. Second, no exception may be more
+ * specific than another exception. Finally, no ban may be more
+ * specific than any exception.
+ *
+ * @param[in,out] banlist Pointer to head of list.
+ * @param[in] newban Ban (or exception) to add (or remove).
+ * @return Zero if \a newban could be applied, non-zero if not.
+ */
+int apply_ban(struct Ban **banlist, struct Ban *newban, int do_free)
+{
+ struct Ban *ban;
+ size_t count = 0;
+
+ assert(newban->flags & (BAN_ADD|BAN_DEL));
+ if (newban->flags & BAN_ADD) {
+ size_t totlen = 0;
+ /* If a less specific entry is found, fail. */
+ for (ban = *banlist; ban; ban = ban->next) {
+ if (!bmatch(ban, newban)) {
+ if (do_free)
+ free_ban(newban);
+ return 1;
+ }
+ if (!(ban->flags & (BAN_OVERLAPPED|BAN_DEL))) {
+ count++;
+ totlen += strlen(ban->banstr);
+ }
+ }
+ /* Mark more specific entries and add this one to the end of the list. */
+ while ((ban = *banlist) != NULL) {
+ if (!bmatch(newban, ban)) {
+ ban->flags |= BAN_OVERLAPPED | BAN_DEL;
+ }
+ banlist = &ban->next;
+ }
+ *banlist = newban;
+ return 0;
+ } else if (newban->flags & BAN_DEL) {
+ size_t remove_count = 0;
+ /* Mark more specific entries. */
+ for (ban = *banlist; ban; ban = ban->next) {
+ if (!bmatch(newban, ban)) {
+ ban->flags |= BAN_OVERLAPPED | BAN_DEL;
+ remove_count++;
+ }
+ }
+ if (do_free)
+ free_ban(newban);
+ else
+ MyFree(newban->banstr);
+ /* If no matches were found, fail. */
+ return remove_count ? 0 : 3;
+ }
+ if (do_free)
+ free_ban(newban);
+ return 4;
+}
+
/*
* Helper function to convert bans
*/
mode_parse_ban(struct ParseState *state, int *flag_p)
{
char *t_str, *s;
- struct SLink *ban, *newban = 0;
+ struct Ban *ban, *newban;
if (state->parc <= 0) { /* Not enough args, send ban list */
if (MyUser(state->sptr) && !(state->done & DONE_BANLIST)) {
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;
-
- DupString(newban->value.ban.banstr, t_str);
- newban->value.ban.who = cli_name(state->sptr);
- newban->value.ban.when = TStime();
-
- newban->flags = CHFL_BAN | MODE_ADD;
-
- if ((s = strrchr(t_str, '@')) && check_if_ipmask(s + 1))
- newban->flags |= CHFL_BAN_IPMASK;
- }
-
- if (!state->chptr->banlist) {
- state->chptr->banlist = newban; /* add our ban with its flags */
+ /* Clear all ADD/DEL/OVERLAPPED flags from ban list. */
+ if (!(state->done & DONE_BANCLEAN)) {
+ for (ban = state->chptr->banlist; ban; ban = ban->next)
+ ban->flags &= ~(BAN_ADD | BAN_DEL | BAN_OVERLAPPED);
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 (!(state->done & DONE_BANCLEAN))
- /* Note: We're overloading *lots* of bits here; be careful! */
- ban->flags &= ~(MODE_ADD | MODE_DEL | CHFL_BAN_OVERLAPPED);
-
- /* Bit meanings:
- *
- * MODE_ADD - Ban was added; if we're bouncing modes,
- * then we'll remove it below; otherwise,
- * we'll have to allocate a real ban
- *
- * MODE_DEL - Ban was marked for deletion; if we're
- * bouncing modes, we'll have to re-add it,
- * otherwise, we'll have to remove it
- *
- * CHFL_BAN_OVERLAPPED - The ban we added turns out to overlap
- * with a ban already set; if we're
- * bouncing modes, we'll have to bounce
- * this one; otherwise, we'll just ignore
- * it when we process added bans
- */
-
- if (state->dir == MODE_DEL && !ircd_strcmp(ban->value.ban.banstr, t_str)) {
- ban->flags |= MODE_DEL; /* delete one ban */
-
- if (state->done & DONE_BANCLEAN) /* If we're cleaning, finish */
- break;
- } else if (state->dir == MODE_ADD) {
- /* if the ban already exists, don't worry about it */
- if (!ircd_strcmp(ban->value.ban.banstr, t_str)) {
- newban->flags &= ~MODE_ADD; /* don't add ban at all */
- MyFree(newban->value.ban.banstr); /* stopper a leak */
- state->numbans--; /* deallocate last ban */
- if (state->done & DONE_BANCLEAN) /* If we're cleaning, finish */
- break;
- } 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 */
-
- if (!ban->next && (newban->flags & MODE_ADD))
- {
- ban->next = newban; /* add our ban with its flags */
- break; /* get out of loop */
- }
- }
- }
- state->done |= DONE_BANCLEAN;
+ /* remember the ban for the moment... */
+ newban = state->banlist + (state->numbans++);
+ newban->next = 0;
+ newban->flags = ((state->dir == MODE_ADD) ? BAN_ADD : BAN_DEL)
+ | (*flag_p == 'b' ? 0 : BAN_EXCEPTION);
+ newban->banstr = NULL;
+ set_ban_mask(newban, collapse(pretty_mask(t_str)));
+ newban->who = cli_name(state->sptr);
+ newban->when = TStime();
+ apply_ban(&state->chptr->banlist, newban, 0);
}
/*
static void
mode_process_bans(struct ParseState *state)
{
- struct SLink *ban, *newban, *prevban, *nextban;
+ struct Ban *ban, *newban, *prevban, *nextban;
int count = 0;
int len = 0;
int banlen;
for (prevban = 0, ban = state->chptr->banlist; ban; ban = nextban) {
count++;
- banlen = strlen(ban->value.ban.banstr);
+ banlen = strlen(ban->banstr);
len += banlen;
nextban = ban->next;
- if ((ban->flags & (MODE_DEL | MODE_ADD)) == (MODE_DEL | MODE_ADD)) {
+ if ((ban->flags & (BAN_DEL | BAN_ADD)) == (BAN_DEL | BAN_ADD)) {
if (prevban)
prevban->next = 0; /* Break the list; ban isn't a real ban */
else
count--;
len -= banlen;
- MyFree(ban->value.ban.banstr);
+ MyFree(ban->banstr);
continue;
- } else if (ban->flags & MODE_DEL) { /* Deleted a ban? */
+ } else if (ban->flags & BAN_DEL) { /* Deleted a ban? */
modebuf_mode_string(state->mbuf, MODE_DEL | MODE_BAN,
- ban->value.ban.banstr,
- state->flags & MODE_PARSE_SET);
+ ban->banstr, 1);
if (state->flags & MODE_PARSE_SET) { /* Ok, make it take effect */
if (prevban) /* clip it out of the list... */
count--;
len -= banlen;
- MyFree(ban->value.ban.who);
- free_link(ban);
+ ban->banstr = NULL; /* modebuf_mode_string() gave ownership of
+ * the ban string to state->mbuf */
+ free_ban(ban);
changed++;
continue; /* next ban; keep prevban like it is */
} else
- ban->flags &= (CHFL_BAN | CHFL_BAN_IPMASK); /* unset other flags */
- } else if (ban->flags & MODE_ADD) { /* adding a ban? */
+ ban->flags &= BAN_IPMASK; /* unset other flags */
+ } else if (ban->flags & BAN_ADD) { /* adding a 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 &&
+ if (ban->flags & BAN_OVERLAPPED &&
!(state->flags & MODE_PARSE_BOUNCE)) {
count--;
len -= banlen;
-
- MyFree(ban->value.ban.banstr);
+ MyFree(ban->banstr);
} else {
if (state->flags & MODE_PARSE_SET && MyUser(state->sptr) &&
(len > (feature_int(FEAT_AVBANLEN) * feature_int(FEAT_MAXBANS)) ||
count > feature_int(FEAT_MAXBANS))) {
send_reply(state->sptr, ERR_BANLISTFULL, state->chptr->chname,
- ban->value.ban.banstr);
+ ban->banstr);
count--;
len -= banlen;
-
- MyFree(ban->value.ban.banstr);
+ MyFree(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));
+ ban->banstr, 1);
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 = make_ban(ban->banstr);
+ DupString(newban->who, ban->who);
+ newban->when = ban->when;
+ newban->flags = ban->flags & BAN_IPMASK;
newban->next = state->chptr->banlist; /* and link it in */
state->chptr->banlist = newban;
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].who = 0;
+ state.banlist[i].when = 0;
state.banlist[i].flags = 0;
state.cli_change[i].flag = 0;
state.cli_change[i].client = 0;
projects / ircu2.10.12-pk.git / blobdiff