#include "hash.h"
#include "ircd.h"
#include "ircd_alloc.h"
-#include "ircd_policy.h"
+#include "ircd_features.h"
+#include "ircd_log.h"
#include "ircd_reply.h"
#include "ircd_string.h"
#include "list.h"
#include "s_misc.h"
#include "send.h"
#include "struct.h"
-#include "support.h"
#include "ircd_snprintf.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+static int
+netride_modes(int parc, char **parv, const char *curr_key)
+{
+ char *modes = parv[0];
+ int result = 0;
+
+ assert(modes && modes[0] == '+');
+ while (*modes) {
+ switch (*modes++) {
+ case 'i':
+ result |= MODE_INVITEONLY;
+ break;
+ case 'k':
+ if (strcmp(curr_key, *++parv))
+ result |= MODE_KEY;
+ break;
+ case 'l':
+ ++parv;
+ break;
+ case 'r':
+ result |= MODE_REGONLY;
+ break;
+ }
+ }
+ return result;
+}
+
/*
* ms_burst - server message handler
*
struct ModeBuf modebuf, *mbuf = 0;
struct Channel *chptr;
time_t timestamp;
- struct Membership *member;
- struct SLink *lp, **lp_p;
+ struct Membership *member, *nmember;
+ struct Ban *lp, **lp_p;
unsigned int parse_flags = (MODE_PARSE_FORCE | MODE_PARSE_BURST);
int param, nickpos = 0, banpos = 0;
char modestr[BUFSIZE], nickstr[BUFSIZE], banstr[BUFSIZE];
timestamp = atoi(parv[2]);
+ if (!chptr->creationtime || chptr->creationtime > timestamp) {
+ /*
+ * Kick local members if channel is +i or +k and our TS was larger
+ * than the burst TS (anti net.ride). The modes hack is here because
+ * we have to do this before mode_parse, as chptr may go away.
+ */
+ for (param = 3; param < parc; param++)
+ {
+ int check_modes;
+ if (parv[param][0] != '+')
+ continue;
+ check_modes = netride_modes(parc - param, parv + param, chptr->mode.key);
+ if (check_modes)
+ {
+ /* Clear any outstanding rogue invites */
+ mode_invite_clear(chptr);
+ for (member = chptr->members; member; member = nmember)
+ {
+ nmember = member->next_member;
+ if (!MyUser(member->user) || IsZombie(member))
+ continue;
+ /* Kick as netrider if key mismatch *or* remote channel is
+ * +i (unless user is an oper) *or* remote channel is +r
+ * (unless user has an account).
+ */
+ if (!(check_modes & MODE_KEY)
+ && (!(check_modes & MODE_INVITEONLY) || IsAnOper(member->user))
+ && (!(check_modes & MODE_REGONLY) || IsAccount(member->user)))
+ continue;
+ sendcmdto_serv_butone(&me, CMD_KICK, NULL, "%H %C :Net Rider", chptr, member->user);
+ sendcmdto_channel_butserv_butone(&his, CMD_KICK, chptr, NULL, 0, "%H %C :Net Rider", chptr, member->user);
+ make_zombie(member, member->user, &me, &me, chptr);
+ }
+ }
+ break;
+ }
+
+ /* If the channel had only locals, it went away by now. */
+ if (!(chptr = get_channel(sptr, parv[1], CGT_CREATE)))
+ return 0; /* can't create the channel? */
+ }
+
/* turn off burst joined flag */
for (member = chptr->members; member; member = member->next_member)
member->status &= ~(CHFL_BURST_JOINED|CHFL_BURST_ALREADY_OPPED|CHFL_BURST_ALREADY_VOICED);
if (!chptr->creationtime || chptr->creationtime > timestamp) {
chptr->creationtime = timestamp;
- modebuf_init(mbuf = &modebuf, &me, cptr, chptr, MODEBUF_DEST_CHANNEL);
+ modebuf_init(mbuf = &modebuf, &me, cptr, chptr,
+ MODEBUF_DEST_CHANNEL | MODEBUF_DEST_NOKEY);
modebuf_mode(mbuf, MODE_DEL | chptr->mode.mode); /* wipeout modes */
- chptr->mode.mode &= ~(MODE_ADD | MODE_DEL | MODE_PRIVATE | MODE_SECRET |
- MODE_MODERATED | MODE_TOPICLIMIT | MODE_INVITEONLY |
- MODE_NOPRIVMSGS);
+ chptr->mode.mode &= MODE_BURSTADDED | MODE_WASDELJOINS;
+
+ /* wipe out modes not represented in chptr->mode.mode */
+ if (chptr->mode.limit) {
+ modebuf_mode_uint(mbuf, MODE_DEL | MODE_LIMIT, chptr->mode.limit);
+ chptr->mode.limit = 0;
+ }
+ if (chptr->mode.key[0]) {
+ modebuf_mode_string(mbuf, MODE_DEL | MODE_KEY, chptr->mode.key, 0);
+ chptr->mode.key[0] = '\0';
+ }
+ if (chptr->mode.upass[0]) {
+ modebuf_mode_string(mbuf, MODE_DEL | MODE_UPASS, chptr->mode.upass, 0);
+ chptr->mode.upass[0] = '\0';
+ }
+ if (chptr->mode.apass[0]) {
+ modebuf_mode_string(mbuf, MODE_DEL | MODE_APASS, chptr->mode.apass, 0);
+ chptr->mode.apass[0] = '\0';
+ }
parse_flags |= (MODE_PARSE_SET | MODE_PARSE_WIPEOUT); /* wipeout keys */
/* mark bans for wipeout */
for (lp = chptr->banlist; lp; lp = lp->next)
- lp->flags |= CHFL_BURST_BAN_WIPEOUT;
+ lp->flags |= BAN_BURST_WIPEOUT;
+
+ /* clear topic set by netrider (if set) */
+ if (*chptr->topic) {
+ *chptr->topic = '\0';
+ *chptr->topic_nick = '\0';
+ chptr->topic_time = 0;
+ sendcmdto_channel_butserv_butone(&his, CMD_TOPIC, chptr, NULL, 0,
+ "%H :%s", chptr, chptr->topic);
+ }
} else if (chptr->creationtime == timestamp) {
- modebuf_init(mbuf = &modebuf, &me, cptr, chptr, MODEBUF_DEST_CHANNEL);
+ modebuf_init(mbuf = &modebuf, &me, cptr, chptr,
+ MODEBUF_DEST_CHANNEL | MODEBUF_DEST_NOKEY);
parse_flags |= MODE_PARSE_SET; /* set new modes */
}
case '%': /* parameter contains bans */
if (parse_flags & MODE_PARSE_SET) {
char *banlist = parv[param] + 1, *p = 0, *ban, *ptr;
- struct SLink *newban;
+ struct Ban *newban;
for (ban = ircd_strtok(&p, banlist, " "); ban;
ban = ircd_strtok(&p, 0, " ")) {
* shown below *sigh*
*/
for (lp = chptr->banlist; lp; lp = lp->next) {
- if (!ircd_strcmp(lp->value.ban.banstr, ban)) {
+ if (!ircd_strcmp(lp->banstr, ban)) {
ban = 0; /* don't add ban */
- lp->flags &= ~CHFL_BURST_BAN_WIPEOUT; /* not wiping out */
+ lp->flags &= ~BAN_BURST_WIPEOUT; /* not wiping out */
break; /* new ban already existed; don't even repropagate */
- } else if (!(lp->flags & CHFL_BURST_BAN_WIPEOUT) &&
- !mmatch(lp->value.ban.banstr, ban)) {
+ } else if (!(lp->flags & BAN_BURST_WIPEOUT) &&
+ !mmatch(lp->banstr, ban)) {
ban = 0; /* don't add ban unless wiping out bans */
break; /* new ban is encompassed by an existing one; drop */
- } else if (!mmatch(ban, lp->value.ban.banstr))
- lp->flags |= CHFL_BAN_OVERLAPPED; /* remove overlapping ban */
+ } else if (!mmatch(ban, lp->banstr))
+ lp->flags |= BAN_OVERLAPPED; /* remove overlapping ban */
if (!lp->next)
break;
for (ptr = ban; *ptr; ptr++) /* add ban to buffer */
banstr[banpos++] = *ptr;
- newban = make_link(); /* create new ban */
-
- DupString(newban->value.ban.banstr, ban);
-#ifdef HEAD_IN_SAND_BANWHO
- DupString(newban->value.ban.who, cli_name(&me));
-#else
- DupString(newban->value.ban.who, cli_name(sptr));
-#endif
- newban->value.ban.when = TStime();
-
- newban->flags = CHFL_BAN | CHFL_BURST_BAN; /* set flags */
- if ((ptr = strrchr(ban, '@')) && check_if_ipmask(ptr + 1))
- newban->flags |= CHFL_BAN_IPMASK;
-
+ newban = make_ban(ban); /* create new ban */
+ strcpy(newban->who, "*");
+ newban->when = TStime();
+ newban->flags |= BAN_BURSTED;
newban->next = 0;
if (lp)
lp->next = newban; /* link it in */
{
struct Client *acptr;
char *nicklist = parv[param], *p = 0, *nick, *ptr;
- int current_mode = CHFL_DEOPPED | CHFL_BURST_JOINED;
- int last_mode = CHFL_DEOPPED | CHFL_BURST_JOINED;
+ int current_mode, last_mode, base_mode;
int oplevel = -1; /* Mark first field with digits: means the same as 'o' (but with level). */
int last_oplevel = 0;
struct Membership* member;
+ base_mode = CHFL_DEOPPED | CHFL_BURST_JOINED;
+ if (chptr->mode.mode & MODE_DELJOINS)
+ base_mode |= CHFL_DELAYED;
+ current_mode = last_mode = base_mode;
+
for (nick = ircd_strtok(&p, nicklist, ","); nick;
nick = ircd_strtok(&p, 0, ",")) {
*/
oplevel = MAXOPLEVEL;
if (current_mode_needs_reset) {
- current_mode = CHFL_DEOPPED | CHFL_BURST_JOINED;
+ current_mode = base_mode;
current_mode_needs_reset = 0;
}
- current_mode = (current_mode & ~CHFL_DEOPPED) | CHFL_CHANOP;
+ current_mode = (current_mode & ~(CHFL_DEOPPED | CHFL_DELAYED)) | CHFL_CHANOP;
}
else if (*ptr == 'v') { /* has voice status */
if (current_mode_needs_reset) {
- current_mode = CHFL_DEOPPED | CHFL_BURST_JOINED;
+ current_mode = base_mode;
current_mode_needs_reset = 0;
}
- current_mode |= CHFL_VOICE;
- oplevel = -1; /* subsequential digits are an absolute op-level value. */
+ current_mode = (current_mode & ~CHFL_DELAYED) | CHFL_VOICE;
+ oplevel = -1; /* subsequent digits are an absolute op-level value. */
}
else if (isdigit(*ptr)) {
int level_increment = 0;
if (oplevel == -1) { /* op-level is absolute value? */
if (current_mode_needs_reset) {
- current_mode = CHFL_DEOPPED | CHFL_BURST_JOINED;
+ current_mode = base_mode;
current_mode_needs_reset = 0;
}
oplevel = 0;
}
- current_mode = (current_mode & ~CHFL_DEOPPED) | CHFL_CHANOP;
+ current_mode = (current_mode & ~(CHFL_DEOPPED | CHFL_DELAYED)) | CHFL_CHANOP;
do {
level_increment = 10 * level_increment + *ptr++ - '0';
} while(isdigit(*ptr));
if (current_mode & CHFL_VOICE)
nickstr[nickpos++] = 'v';
if (current_mode & CHFL_CHANOP)
- nickpos += ircd_snprintf(0, nickstr + nickpos, sizeof(nickstr) - nickpos, "%u", oplevel);
+ {
+ if (chptr->mode.apass[0])
+ nickpos += ircd_snprintf(0, nickstr + nickpos, sizeof(nickstr) - nickpos, "%u", oplevel);
+ else
+ nickstr[nickpos++] = 'o';
+ }
} else if (current_mode & CHFL_CHANOP && oplevel != last_oplevel) { /* if just op level changed... */
nickstr[nickpos++] = ':'; /* add a specifier */
nickpos += ircd_snprintf(0, nickstr + nickpos, sizeof(nickstr) - nickpos, "%u", oplevel - last_oplevel);
if (IsBurst(sptr) || !(member = find_member_link(chptr, acptr)))
{
add_user_to_channel(chptr, acptr, current_mode, oplevel);
- sendcmdto_channel_butserv_butone(acptr, CMD_JOIN, chptr, NULL, "%H", chptr);
+ if (!(current_mode & CHFL_DELAYED))
+ sendcmdto_channel_butserv_butone(acptr, CMD_JOIN, chptr, NULL, 0, "%H", chptr);
}
else
{
member->status |= CHFL_BURST_ALREADY_VOICED;
/* Synchronize with the burst. */
member->status |= CHFL_BURST_JOINED | (current_mode & (CHFL_CHANOP|CHFL_VOICE));
- member->oplevel = oplevel;
+ SetOpLevel(member, oplevel);
}
}
}
modebuf_mode_client(mbuf, MODE_DEL | CHFL_CHANOP, member->user);
if (member->status & CHFL_VOICE)
modebuf_mode_client(mbuf, MODE_DEL | CHFL_VOICE, member->user);
- member->status = ((member->status & ~(CHFL_CHANOP | CHFL_VOICE)) |
- CHFL_DEOPPED);
+ member->status = (member->status
+ & ~(CHFL_CHANNEL_MANAGER | CHFL_CHANOP | CHFL_VOICE))
+ | CHFL_DEOPPED;
}
}
lp = *lp_p;
/* remove ban from channel */
- if (lp->flags & (CHFL_BAN_OVERLAPPED | CHFL_BURST_BAN_WIPEOUT)) {
+ if (lp->flags & (BAN_OVERLAPPED | BAN_BURST_WIPEOUT)) {
+ char *bandup;
+ DupString(bandup, lp->banstr);
modebuf_mode_string(mbuf, MODE_DEL | MODE_BAN,
- lp->value.ban.banstr, 1); /* let it free banstr */
-
+ bandup, 1);
*lp_p = lp->next; /* clip out of list */
- MyFree(lp->value.ban.who); /* free who */
- free_link(lp); /* free ban */
+ free_ban(lp);
continue;
- } else if (lp->flags & CHFL_BURST_BAN) /* add ban to channel */
+ } else if (lp->flags & BAN_BURSTED) /* add ban to channel */
modebuf_mode_string(mbuf, MODE_ADD | MODE_BAN,
- lp->value.ban.banstr, 0); /* don't free banstr */
+ lp->banstr, 0); /* don't free banstr */
- lp->flags &= (CHFL_BAN | CHFL_BAN_IPMASK); /* reset the flag */
+ lp->flags &= BAN_IPMASK; /* reset the flag */
lp_p = &(*lp_p)->next;
}
}