m_sjoin.c gone, merged with m_join.c
This commit is contained in:
Valery Yatsko
parent
b8730cbf86
commit
8cc12805d7
4 changed files with 619 additions and 894 deletions
|
|
@ -44,6 +44,7 @@
|
|||
|
||||
static int m_join(struct Client *, struct Client *, int, const char **);
|
||||
static int ms_join(struct Client *, struct Client *, int, const char **);
|
||||
static int ms_sjoin(struct Client *, struct Client *, int, const char **);
|
||||
|
||||
static int h_can_create_channel;
|
||||
static int h_channel_join;
|
||||
|
|
@ -53,7 +54,12 @@ struct Message join_msgtab = {
|
|||
{mg_unreg, {m_join, 2}, {ms_join, 2}, mg_ignore, mg_ignore, {m_join, 2}}
|
||||
};
|
||||
|
||||
mapi_clist_av1 join_clist[] = { &join_msgtab, NULL };
|
||||
struct Message sjoin_msgtab = {
|
||||
"SJOIN", 0, 0, 0, MFLG_SLOW,
|
||||
{mg_unreg, mg_ignore, mg_ignore, {ms_sjoin, 0}, mg_ignore, mg_ignore}
|
||||
};
|
||||
|
||||
mapi_clist_av1 join_clist[] = { &join_msgtab, &sjoin_msgtab, NULL };
|
||||
|
||||
mapi_hlist_av1 join_hlist[] = {
|
||||
{ "can_create_channel", &h_can_create_channel },
|
||||
|
|
@ -69,9 +75,14 @@ static int check_channel_name_loc(struct Client *source_p, const char *name);
|
|||
static void set_final_mode(struct Mode *mode, struct Mode *oldmode);
|
||||
static void remove_our_modes(struct Channel *chptr, struct Client *source_p);
|
||||
|
||||
static void remove_ban_list(struct Channel *chptr, struct Client *source_p,
|
||||
rb_dlink_list * list, char c, int cap, int mems);
|
||||
|
||||
static char modebuf[MODEBUFLEN];
|
||||
static char parabuf[MODEBUFLEN];
|
||||
static const char *para[MAXMODEPARAMS];
|
||||
static char *mbuf;
|
||||
static int pargs;
|
||||
|
||||
/* Check what we will forward to, without sending any notices to the user
|
||||
* -- jilles
|
||||
|
|
@ -516,6 +527,527 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
|
||||
{
|
||||
static char buf_nick[BUFSIZE];
|
||||
static char buf_uid[BUFSIZE];
|
||||
static const char empty_modes[] = "0";
|
||||
struct Channel *chptr;
|
||||
struct Client *target_p, *fakesource_p;
|
||||
time_t newts;
|
||||
time_t oldts;
|
||||
static struct Mode mode, *oldmode;
|
||||
const char *modes;
|
||||
int args = 0;
|
||||
int keep_our_modes = 1;
|
||||
int keep_new_modes = 1;
|
||||
int fl;
|
||||
int isnew;
|
||||
int mlen_nick, mlen_uid;
|
||||
int len_nick;
|
||||
int len_uid;
|
||||
int len;
|
||||
int joins = 0;
|
||||
const char *s;
|
||||
char *ptr_nick;
|
||||
char *ptr_uid;
|
||||
char *p;
|
||||
int i, joinc = 0, timeslice = 0;
|
||||
static char empty[] = "";
|
||||
rb_dlink_node *ptr, *next_ptr;
|
||||
|
||||
if(!IsChannelName(parv[2]) || !check_channel_name(parv[2]))
|
||||
return 0;
|
||||
|
||||
/* SJOIN's for local channels can't happen. */
|
||||
if(*parv[2] == '&')
|
||||
return 0;
|
||||
|
||||
modebuf[0] = parabuf[0] = mode.key[0] = mode.forward[0] = '\0';
|
||||
pargs = mode.mode = mode.limit = mode.join_num = mode.join_time = 0;
|
||||
|
||||
/* Hide connecting server on netburst -- jilles */
|
||||
if (ConfigServerHide.flatten_links && !HasSentEob(source_p))
|
||||
fakesource_p = &me;
|
||||
else
|
||||
fakesource_p = source_p;
|
||||
|
||||
mbuf = modebuf;
|
||||
newts = atol(parv[1]);
|
||||
|
||||
s = parv[3];
|
||||
while (*s)
|
||||
{
|
||||
switch (*(s++))
|
||||
{
|
||||
case 'i':
|
||||
mode.mode |= MODE_INVITEONLY;
|
||||
break;
|
||||
case 'n':
|
||||
mode.mode |= MODE_NOPRIVMSGS;
|
||||
break;
|
||||
case 'p':
|
||||
mode.mode |= MODE_PRIVATE;
|
||||
break;
|
||||
case 's':
|
||||
mode.mode |= MODE_SECRET;
|
||||
break;
|
||||
case 'm':
|
||||
mode.mode |= MODE_MODERATED;
|
||||
break;
|
||||
case 't':
|
||||
mode.mode |= MODE_TOPICLIMIT;
|
||||
break;
|
||||
case 'r':
|
||||
mode.mode |= MODE_REGONLY;
|
||||
break;
|
||||
case 'L':
|
||||
mode.mode |= MODE_EXLIMIT;
|
||||
break;
|
||||
case 'P':
|
||||
mode.mode |= MODE_PERMANENT;
|
||||
break;
|
||||
case 'c':
|
||||
mode.mode |= MODE_NOCOLOR;
|
||||
break;
|
||||
case 'g':
|
||||
mode.mode |= MODE_FREEINVITE;
|
||||
break;
|
||||
case 'z':
|
||||
mode.mode |= MODE_OPMODERATE;
|
||||
break;
|
||||
case 'F':
|
||||
mode.mode |= MODE_FREETARGET;
|
||||
break;
|
||||
case 'Q':
|
||||
mode.mode |= MODE_DISFORWARD;
|
||||
break;
|
||||
case 'f':
|
||||
strlcpy(mode.forward, parv[4 + args], sizeof(mode.forward));
|
||||
args++;
|
||||
if(parc < 5 + args)
|
||||
return 0;
|
||||
break;
|
||||
case 'j':
|
||||
sscanf(parv[4 + args], "%d:%d", &joinc, ×lice);
|
||||
args++;
|
||||
mode.join_num = joinc;
|
||||
mode.join_time = timeslice;
|
||||
if(parc < 5 + args)
|
||||
return 0;
|
||||
break;
|
||||
case 'k':
|
||||
strlcpy(mode.key, parv[4 + args], sizeof(mode.key));
|
||||
args++;
|
||||
if(parc < 5 + args)
|
||||
return 0;
|
||||
break;
|
||||
case 'l':
|
||||
mode.limit = atoi(parv[4 + args]);
|
||||
args++;
|
||||
if(parc < 5 + args)
|
||||
return 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(parv[args + 4])
|
||||
{
|
||||
s = parv[args + 4];
|
||||
|
||||
/* remove any leading spaces */
|
||||
while (*s == ' ')
|
||||
s++;
|
||||
}
|
||||
else
|
||||
s = "";
|
||||
|
||||
if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
|
||||
return 0; /* channel name too long? */
|
||||
|
||||
|
||||
oldts = chptr->channelts;
|
||||
oldmode = &chptr->mode;
|
||||
|
||||
#ifdef IGNORE_BOGUS_TS
|
||||
if(newts < 800000000)
|
||||
{
|
||||
sendto_realops_snomask(SNO_DEBUG, L_ALL,
|
||||
"*** Bogus TS %ld on %s ignored from %s",
|
||||
(long) newts, chptr->chname, client_p->name);
|
||||
|
||||
newts = (oldts == 0) ? oldts : 800000000;
|
||||
}
|
||||
#else
|
||||
if(!isnew && !newts && oldts)
|
||||
{
|
||||
sendto_channel_local(ALL_MEMBERS, chptr,
|
||||
":%s NOTICE %s :*** Notice -- TS for %s "
|
||||
"changed from %ld to 0",
|
||||
me.name, chptr->chname, chptr->chname, (long) oldts);
|
||||
sendto_realops_snomask(SNO_GENERAL, L_ALL,
|
||||
"Server %s changing TS on %s from %ld to 0",
|
||||
source_p->name, chptr->chname, (long) oldts);
|
||||
}
|
||||
#endif
|
||||
|
||||
if(isnew)
|
||||
chptr->channelts = newts;
|
||||
|
||||
else if(newts == 0 || oldts == 0)
|
||||
chptr->channelts = 0;
|
||||
else if(newts == oldts)
|
||||
;
|
||||
else if(newts < oldts)
|
||||
{
|
||||
/* If configured, kick people trying to join +i/+k
|
||||
* channels by recreating them on split servers.
|
||||
* Don't kick if the source has sent EOB (services
|
||||
* deopping everyone by TS-1 SJOIN).
|
||||
* -- jilles */
|
||||
if (ConfigChannel.kick_on_split_riding &&
|
||||
!HasSentEob(source_p) &&
|
||||
((mode.mode & MODE_INVITEONLY) ||
|
||||
(mode.key[0] != 0 && irccmp(mode.key, oldmode->key) != 0)))
|
||||
{
|
||||
struct membership *msptr;
|
||||
struct Client *who;
|
||||
int l = rb_dlink_list_length(&chptr->members);
|
||||
int b = rb_dlink_list_length(&chptr->banlist) +
|
||||
rb_dlink_list_length(&chptr->exceptlist) +
|
||||
rb_dlink_list_length(&chptr->invexlist) +
|
||||
rb_dlink_list_length(&chptr->quietlist);
|
||||
|
||||
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->locmembers.head)
|
||||
{
|
||||
msptr = ptr->data;
|
||||
who = msptr->client_p;
|
||||
sendto_one(who, ":%s KICK %s %s :Net Rider",
|
||||
me.name, chptr->chname, who->name);
|
||||
|
||||
sendto_server(NULL, chptr, CAP_TS6, NOCAPS,
|
||||
":%s KICK %s %s :Net Rider",
|
||||
me.id, chptr->chname,
|
||||
who->id);
|
||||
sendto_server(NULL, chptr, NOCAPS, CAP_TS6,
|
||||
":%s KICK %s %s :Net Rider",
|
||||
me.name, chptr->chname, who->name);
|
||||
remove_user_from_channel(msptr);
|
||||
if (--l == 0)
|
||||
break;
|
||||
}
|
||||
if (l == 0)
|
||||
{
|
||||
/* Channel was emptied, create a new one */
|
||||
if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
|
||||
return 0; /* oops! */
|
||||
|
||||
/* If the source does not do TS6,
|
||||
* nontimestamped bans have been sent to it,
|
||||
* but we have just lost those here. Let's
|
||||
* warn the channel about this. Because
|
||||
* of the kicks, any users on the channel
|
||||
* will be at client_p. -- jilles */
|
||||
if (!has_id(source_p) && b > 0)
|
||||
sendto_one(client_p, ":%s NOTICE %s :*** Notice -- possible ban desync on %s, please remove any bans just added by servers", get_id(&me, client_p), parv[2], parv[2]);
|
||||
oldmode = &chptr->mode;
|
||||
}
|
||||
}
|
||||
keep_our_modes = NO;
|
||||
chptr->channelts = newts;
|
||||
}
|
||||
else
|
||||
keep_new_modes = NO;
|
||||
|
||||
if(!keep_new_modes)
|
||||
mode = *oldmode;
|
||||
else if(keep_our_modes)
|
||||
{
|
||||
mode.mode |= oldmode->mode;
|
||||
if(oldmode->limit > mode.limit)
|
||||
mode.limit = oldmode->limit;
|
||||
if(strcmp(mode.key, oldmode->key) < 0)
|
||||
strcpy(mode.key, oldmode->key);
|
||||
if(oldmode->join_num > mode.join_num ||
|
||||
(oldmode->join_num == mode.join_num &&
|
||||
oldmode->join_time > mode.join_time))
|
||||
{
|
||||
mode.join_num = oldmode->join_num;
|
||||
mode.join_time = oldmode->join_time;
|
||||
}
|
||||
if(irccmp(mode.forward, oldmode->forward) < 0)
|
||||
strcpy(mode.forward, oldmode->forward);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* If setting -j, clear join throttle state -- jilles */
|
||||
if (!mode.join_num)
|
||||
chptr->join_count = chptr->join_delta = 0;
|
||||
}
|
||||
|
||||
set_final_mode(&mode, oldmode);
|
||||
chptr->mode = mode;
|
||||
|
||||
/* Lost the TS, other side wins, so remove modes on this side */
|
||||
if(!keep_our_modes)
|
||||
{
|
||||
remove_our_modes(chptr, fakesource_p);
|
||||
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
|
||||
{
|
||||
del_invite(chptr, ptr->data);
|
||||
}
|
||||
sendto_channel_local(ALL_MEMBERS, chptr,
|
||||
":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to %ld",
|
||||
me.name, chptr->chname, chptr->chname,
|
||||
(long) oldts, (long) newts);
|
||||
/* Update capitalization in channel name, this makes the
|
||||
* capitalization timestamped like modes are -- jilles */
|
||||
strcpy(chptr->chname, parv[2]);
|
||||
}
|
||||
|
||||
if(*modebuf != '\0')
|
||||
sendto_channel_local(ALL_MEMBERS, chptr, ":%s MODE %s %s %s",
|
||||
fakesource_p->name, chptr->chname, modebuf, parabuf);
|
||||
|
||||
*modebuf = *parabuf = '\0';
|
||||
|
||||
if(parv[3][0] != '0' && keep_new_modes)
|
||||
modes = channel_modes(chptr, source_p);
|
||||
else
|
||||
modes = empty_modes;
|
||||
|
||||
mlen_nick = rb_sprintf(buf_nick, ":%s SJOIN %ld %s %s :",
|
||||
source_p->name, (long) chptr->channelts, parv[2], modes);
|
||||
ptr_nick = buf_nick + mlen_nick;
|
||||
|
||||
/* working on the presumption eventually itll be more efficient to
|
||||
* build a TS6 buffer without checking its needed..
|
||||
*/
|
||||
mlen_uid = rb_sprintf(buf_uid, ":%s SJOIN %ld %s %s :",
|
||||
use_id(source_p), (long) chptr->channelts, parv[2], modes);
|
||||
ptr_uid = buf_uid + mlen_uid;
|
||||
|
||||
mbuf = modebuf;
|
||||
para[0] = para[1] = para[2] = para[3] = empty;
|
||||
pargs = 0;
|
||||
len_nick = len_uid = 0;
|
||||
|
||||
/* if theres a space, theres going to be more than one nick, change the
|
||||
* first space to \0, so s is just the first nick, and point p to the
|
||||
* second nick
|
||||
*/
|
||||
if((p = strchr(s, ' ')) != NULL)
|
||||
{
|
||||
*p++ = '\0';
|
||||
}
|
||||
|
||||
*mbuf++ = '+';
|
||||
|
||||
while (s)
|
||||
{
|
||||
fl = 0;
|
||||
|
||||
for (i = 0; i < 2; i++)
|
||||
{
|
||||
if(*s == '@')
|
||||
{
|
||||
fl |= CHFL_CHANOP;
|
||||
s++;
|
||||
}
|
||||
else if(*s == '+')
|
||||
{
|
||||
fl |= CHFL_VOICE;
|
||||
s++;
|
||||
}
|
||||
}
|
||||
|
||||
/* if the client doesnt exist or is fake direction, skip. */
|
||||
if(!(target_p = find_client(s)) ||
|
||||
(target_p->from != client_p) || !IsPerson(target_p))
|
||||
goto nextnick;
|
||||
|
||||
/* we assume for these we can fit at least one nick/uid in.. */
|
||||
|
||||
/* check we can fit another status+nick+space into a buffer */
|
||||
if((mlen_nick + len_nick + NICKLEN + 3) > (BUFSIZE - 3))
|
||||
{
|
||||
*(ptr_nick - 1) = '\0';
|
||||
sendto_server(client_p->from, NULL, NOCAPS, CAP_TS6, "%s", buf_nick);
|
||||
ptr_nick = buf_nick + mlen_nick;
|
||||
len_nick = 0;
|
||||
}
|
||||
|
||||
if((mlen_uid + len_uid + IDLEN + 3) > (BUFSIZE - 3))
|
||||
{
|
||||
*(ptr_uid - 1) = '\0';
|
||||
sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid);
|
||||
ptr_uid = buf_uid + mlen_uid;
|
||||
len_uid = 0;
|
||||
}
|
||||
|
||||
if(keep_new_modes)
|
||||
{
|
||||
if(fl & CHFL_CHANOP)
|
||||
{
|
||||
*ptr_nick++ = '@';
|
||||
*ptr_uid++ = '@';
|
||||
len_nick++;
|
||||
len_uid++;
|
||||
}
|
||||
if(fl & CHFL_VOICE)
|
||||
{
|
||||
*ptr_nick++ = '+';
|
||||
*ptr_uid++ = '+';
|
||||
len_nick++;
|
||||
len_uid++;
|
||||
}
|
||||
}
|
||||
|
||||
/* copy the nick to the two buffers */
|
||||
len = rb_sprintf(ptr_nick, "%s ", target_p->name);
|
||||
ptr_nick += len;
|
||||
len_nick += len;
|
||||
len = rb_sprintf(ptr_uid, "%s ", use_id(target_p));
|
||||
ptr_uid += len;
|
||||
len_uid += len;
|
||||
|
||||
if(!keep_new_modes)
|
||||
fl = 0;
|
||||
|
||||
if(!IsMember(target_p, chptr))
|
||||
{
|
||||
add_user_to_channel(chptr, target_p, fl);
|
||||
sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
|
||||
target_p->name,
|
||||
target_p->username, target_p->host, parv[2]);
|
||||
joins++;
|
||||
}
|
||||
|
||||
if(fl & CHFL_CHANOP)
|
||||
{
|
||||
*mbuf++ = 'o';
|
||||
para[pargs++] = target_p->name;
|
||||
|
||||
/* a +ov user.. bleh */
|
||||
if(fl & CHFL_VOICE)
|
||||
{
|
||||
/* its possible the +o has filled up MAXMODEPARAMS, if so, start
|
||||
* a new buffer
|
||||
*/
|
||||
if(pargs >= MAXMODEPARAMS)
|
||||
{
|
||||
*mbuf = '\0';
|
||||
sendto_channel_local(ALL_MEMBERS, chptr,
|
||||
":%s MODE %s %s %s %s %s %s",
|
||||
fakesource_p->name, chptr->chname,
|
||||
modebuf,
|
||||
para[0], para[1], para[2], para[3]);
|
||||
mbuf = modebuf;
|
||||
*mbuf++ = '+';
|
||||
para[0] = para[1] = para[2] = para[3] = NULL;
|
||||
pargs = 0;
|
||||
}
|
||||
|
||||
*mbuf++ = 'v';
|
||||
para[pargs++] = target_p->name;
|
||||
}
|
||||
}
|
||||
else if(fl & CHFL_VOICE)
|
||||
{
|
||||
*mbuf++ = 'v';
|
||||
para[pargs++] = target_p->name;
|
||||
}
|
||||
|
||||
if(pargs >= MAXMODEPARAMS)
|
||||
{
|
||||
*mbuf = '\0';
|
||||
sendto_channel_local(ALL_MEMBERS, chptr,
|
||||
":%s MODE %s %s %s %s %s %s",
|
||||
fakesource_p->name,
|
||||
chptr->chname,
|
||||
modebuf, para[0], para[1], para[2], para[3]);
|
||||
mbuf = modebuf;
|
||||
*mbuf++ = '+';
|
||||
para[0] = para[1] = para[2] = para[3] = NULL;
|
||||
pargs = 0;
|
||||
}
|
||||
|
||||
nextnick:
|
||||
/* p points to the next nick */
|
||||
s = p;
|
||||
|
||||
/* if there was a trailing space and p was pointing to it, then we
|
||||
* need to exit.. this has the side effect of breaking double spaces
|
||||
* in an sjoin.. but that shouldnt happen anyway
|
||||
*/
|
||||
if(s && (*s == '\0'))
|
||||
s = p = NULL;
|
||||
|
||||
/* if p was NULL due to no spaces, s wont exist due to the above, so
|
||||
* we cant check it for spaces.. if there are no spaces, then when
|
||||
* we next get here, s will be NULL
|
||||
*/
|
||||
if(s && ((p = strchr(s, ' ')) != NULL))
|
||||
{
|
||||
*p++ = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
*mbuf = '\0';
|
||||
if(pargs)
|
||||
{
|
||||
sendto_channel_local(ALL_MEMBERS, chptr,
|
||||
":%s MODE %s %s %s %s %s %s",
|
||||
fakesource_p->name, chptr->chname, modebuf,
|
||||
para[0], CheckEmpty(para[1]),
|
||||
CheckEmpty(para[2]), CheckEmpty(para[3]));
|
||||
}
|
||||
|
||||
if(!joins && !(chptr->mode.mode & MODE_PERMANENT) && isnew)
|
||||
{
|
||||
destroy_channel(chptr);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Keep the colon if we're sending an SJOIN without nicks -- jilles */
|
||||
if (joins)
|
||||
{
|
||||
*(ptr_nick - 1) = '\0';
|
||||
*(ptr_uid - 1) = '\0';
|
||||
}
|
||||
|
||||
sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid);
|
||||
sendto_server(client_p->from, NULL, NOCAPS, CAP_TS6, "%s", buf_nick);
|
||||
|
||||
/* if the source does TS6 we have to remove our bans. Its now safe
|
||||
* to issue -b's to the non-ts6 servers, as the sjoin we've just
|
||||
* sent will kill any ops they have.
|
||||
*/
|
||||
if(!keep_our_modes && source_p->id[0] != '\0')
|
||||
{
|
||||
if(rb_dlink_list_length(&chptr->banlist) > 0)
|
||||
remove_ban_list(chptr, fakesource_p, &chptr->banlist, 'b', NOCAPS, ALL_MEMBERS);
|
||||
|
||||
if(rb_dlink_list_length(&chptr->exceptlist) > 0)
|
||||
remove_ban_list(chptr, fakesource_p, &chptr->exceptlist,
|
||||
'e', CAP_EX, ONLY_CHANOPS);
|
||||
|
||||
if(rb_dlink_list_length(&chptr->invexlist) > 0)
|
||||
remove_ban_list(chptr, fakesource_p, &chptr->invexlist,
|
||||
'I', CAP_IE, ONLY_CHANOPS);
|
||||
|
||||
if(rb_dlink_list_length(&chptr->quietlist) > 0)
|
||||
remove_ban_list(chptr, fakesource_p, &chptr->quietlist,
|
||||
'q', NOCAPS, ALL_MEMBERS);
|
||||
|
||||
chptr->bants++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* do_join_0
|
||||
*
|
||||
|
|
@ -592,7 +1124,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
|
|||
int i;
|
||||
|
||||
/* ok, first get a list of modes we need to add */
|
||||
for(i = 0; chmode_flags[i].letter; i++)
|
||||
for (i = 0; chmode_flags[i].letter; i++)
|
||||
{
|
||||
if((mode->mode & chmode_flags[i].mode) && !(oldmode->mode & chmode_flags[i].mode))
|
||||
{
|
||||
|
|
@ -606,7 +1138,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
|
|||
}
|
||||
|
||||
/* now the ones we need to remove. */
|
||||
for(i = 0; chmode_flags[i].letter; i++)
|
||||
for (i = 0; chmode_flags[i].letter; i++)
|
||||
{
|
||||
if((oldmode->mode & chmode_flags[i].mode) && !(mode->mode & chmode_flags[i].mode))
|
||||
{
|
||||
|
|
@ -638,6 +1170,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
|
|||
*mbuf++ = 'k';
|
||||
len = rb_sprintf(pbuf, "%s ", oldmode->key);
|
||||
pbuf += len;
|
||||
pargs++;
|
||||
}
|
||||
if(oldmode->join_num && !mode->join_num)
|
||||
{
|
||||
|
|
@ -667,6 +1200,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
|
|||
*mbuf++ = 'l';
|
||||
len = rb_sprintf(pbuf, "%d ", mode->limit);
|
||||
pbuf += len;
|
||||
pargs++;
|
||||
}
|
||||
if(mode->key[0] && strcmp(oldmode->key, mode->key))
|
||||
{
|
||||
|
|
@ -678,6 +1212,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
|
|||
*mbuf++ = 'k';
|
||||
len = rb_sprintf(pbuf, "%s ", mode->key);
|
||||
pbuf += len;
|
||||
pargs++;
|
||||
}
|
||||
if(mode->join_num && (oldmode->join_num != mode->join_num || oldmode->join_time != mode->join_time))
|
||||
{
|
||||
|
|
@ -689,6 +1224,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
|
|||
*mbuf++ = 'j';
|
||||
len = rb_sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time);
|
||||
pbuf += len;
|
||||
pargs++;
|
||||
}
|
||||
if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) && ConfigChannel.use_forward)
|
||||
{
|
||||
|
|
@ -700,6 +1236,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
|
|||
*mbuf++ = 'f';
|
||||
len = rb_sprintf(pbuf, "%s ", mode->forward);
|
||||
pbuf += len;
|
||||
pargs++;
|
||||
}
|
||||
*mbuf = '\0';
|
||||
}
|
||||
|
|
@ -801,3 +1338,71 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
|
|||
|
||||
}
|
||||
}
|
||||
|
||||
/* remove_ban_list()
|
||||
*
|
||||
* inputs - channel, source, list to remove, char of mode, caps needed
|
||||
* outputs -
|
||||
* side effects - given list is removed, with modes issued to local clients
|
||||
* and non-TS6 servers.
|
||||
*/
|
||||
static void
|
||||
remove_ban_list(struct Channel *chptr, struct Client *source_p,
|
||||
rb_dlink_list * list, char c, int cap, int mems)
|
||||
{
|
||||
static char lmodebuf[BUFSIZE];
|
||||
static char lparabuf[BUFSIZE];
|
||||
struct Ban *banptr;
|
||||
rb_dlink_node *ptr;
|
||||
rb_dlink_node *next_ptr;
|
||||
char *pbuf;
|
||||
int count = 0;
|
||||
int cur_len, mlen, plen;
|
||||
|
||||
pbuf = lparabuf;
|
||||
|
||||
cur_len = mlen = rb_sprintf(lmodebuf, ":%s MODE %s -", source_p->name, chptr->chname);
|
||||
mbuf = lmodebuf + mlen;
|
||||
|
||||
RB_DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
|
||||
{
|
||||
banptr = ptr->data;
|
||||
|
||||
/* trailing space, and the mode letter itself */
|
||||
plen = strlen(banptr->banstr) + 2;
|
||||
|
||||
if(count >= MAXMODEPARAMS || (cur_len + plen) > BUFSIZE - 4)
|
||||
{
|
||||
/* remove trailing space */
|
||||
*mbuf = '\0';
|
||||
*(pbuf - 1) = '\0';
|
||||
|
||||
sendto_channel_local(mems, chptr, "%s %s", lmodebuf, lparabuf);
|
||||
/* Tricky tricky. If we changed source_p to &me
|
||||
* in ms_sjoin(), this still won't send stuff
|
||||
* where it should not be sent, because the
|
||||
* real source_p does TS6 -- jilles */
|
||||
sendto_server(source_p, chptr, cap, CAP_TS6, "%s %s", lmodebuf, lparabuf);
|
||||
|
||||
cur_len = mlen;
|
||||
mbuf = lmodebuf + mlen;
|
||||
pbuf = lparabuf;
|
||||
count = 0;
|
||||
}
|
||||
|
||||
*mbuf++ = c;
|
||||
cur_len += plen;
|
||||
pbuf += rb_sprintf(pbuf, "%s ", banptr->banstr);
|
||||
count++;
|
||||
|
||||
free_ban(banptr);
|
||||
}
|
||||
|
||||
*mbuf = '\0';
|
||||
*(pbuf - 1) = '\0';
|
||||
sendto_channel_local(mems, chptr, "%s %s", lmodebuf, lparabuf);
|
||||
sendto_server(source_p, chptr, cap, CAP_TS6, "%s %s", lmodebuf, lparabuf);
|
||||
|
||||
list->head = list->tail = NULL;
|
||||
list->length = 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue