* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
- * $Id: m_join.c 3131 2007-01-21 15:36:31Z jilles $
+ * $Id: m_join.c 3494 2007-05-27 13:07:27Z jilles $
*/
#include "stdinc.h"
-#include "tools.h"
#include "channel.h"
#include "client.h"
#include "common.h"
#include "hash.h"
-#include "irc_string.h"
+#include "match.h"
#include "ircd.h"
#include "numeric.h"
#include "send.h"
#include "msg.h"
#include "parse.h"
#include "modules.h"
-#include "sprintf_irc.h"
#include "packet.h"
+#include "chmode.h"
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;
{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, 4}, 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 },
{ NULL, NULL },
};
-DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3131 $");
+DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3494 $");
static void do_join_0(struct Client *client_p, struct Client *source_p);
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 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
/*
* m_join
- * parv[0] = sender prefix
* parv[1] = channel
* parv[2] = channel password (key)
*/
struct ConfItem *aconf;
char *name;
char *key = NULL;
+ const char *modes;
int i, flags = 0;
char *p = NULL, *p2 = NULL;
char *chanlist;
* this code has a side effect of losing keys, but..
*/
chanlist = LOCAL_COPY(parv[1]);
- for(name = strtoken(&p, chanlist, ","); name; name = strtoken(&p, NULL, ","))
+ for(name = rb_strtok_r(chanlist, ",", &p); name; name = rb_strtok_r(NULL, ",", &p))
{
/* check the length and name of channel is ok */
if(!check_channel_name_loc(source_p, name) || (strlen(name) > LOC_CHANNELLEN))
}
/* join 0 parts all channels */
- if(*name == '0' && !atoi(name))
+ if(*name == '0' && (name[1] == ',' || name[1] == '\0') && name == chanlist)
{
(void) strcpy(jbuf, "0");
continue;
sendto_realops_snomask(SNO_SPY, L_NETWIDE,
"User %s (%s@%s) is attempting to join locally juped channel %s (%s)",
source_p->name, source_p->username,
- source_p->host, name, aconf->passwd);
+ source_p->orighost, name, aconf->passwd);
/* dont update tracking for jupe exempt users, these
* are likely to be spamtrap leaves
*/
if(*jbuf)
(void) strcat(jbuf, ",");
- (void) strlcat(jbuf, name, sizeof(jbuf));
+ (void) rb_strlcat(jbuf, name, sizeof(jbuf));
}
if(parc > 2)
{
mykey = LOCAL_COPY(parv[2]);
- key = strtoken(&p2, mykey, ",");
+ key = rb_strtok_r(mykey, ",", &p2);
}
- for(name = strtoken(&p, jbuf, ","); name;
- key = (key) ? strtoken(&p2, NULL, ",") : NULL, name = strtoken(&p, NULL, ","))
+ for(name = rb_strtok_r(jbuf, ",", &p); name;
+ key = (key) ? rb_strtok_r(NULL, ",", &p2) : NULL, name = rb_strtok_r(NULL, ",", &p))
{
hook_data_channel_activity hook_info;
call_hook(h_can_create_channel, &moduledata);
- if(moduledata.approved != 0 && !IsOper(source_p))
+ if(moduledata.approved != 0)
{
sendto_one(source_p, form_str(moduledata.approved),
me.name, source_p->name, name);
flags = CHFL_CHANOP;
}
- if((dlink_list_length(&source_p->user->channel) >=
+ if((rb_dlink_list_length(&source_p->user->channel) >=
(unsigned long) ConfigChannel.max_chans_per_user) &&
(!IsOper(source_p) ||
- (dlink_list_length(&source_p->user->channel) >=
+ (rb_dlink_list_length(&source_p->user->channel) >=
(unsigned long) ConfigChannel.max_chans_per_user * 3)))
{
sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS),
me.name, source_p->name, name);
if(successful_join_count)
- source_p->localClient->last_join_time = CurrentTime;
+ source_p->localClient->last_join_time = rb_current_time();
return 0;
}
if ((i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_INVITEONLYCHAN && i != ERR_CHANNELISFULL) ||
(!ConfigChannel.use_forward || (chptr = check_forward(source_p, chptr, key)) == NULL))
{
- sendto_one(source_p, form_str(i), me.name, source_p->name, name);
+ /* might be wrong, but is there any other better location for such?
+ * see extensions/chm_operonly.c for other comments on this
+ * -- dwr
+ */
+ if(i != ERR_CUSTOM)
+ sendto_one(source_p, form_str(i), me.name, source_p->name, name);
+
if(successful_join_count > 0)
successful_join_count--;
continue;
}
+
sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname);
}
/* add the user to the channel */
add_user_to_channel(chptr, source_p, flags);
if (chptr->mode.join_num &&
- CurrentTime - chptr->join_delta >= chptr->mode.join_time)
+ rb_current_time() - chptr->join_delta >= chptr->mode.join_time)
{
chptr->join_count = 0;
- chptr->join_delta = CurrentTime;
+ chptr->join_delta = rb_current_time();
}
chptr->join_count++;
/* its a new channel, set +nt and burst. */
if(flags & CHFL_CHANOP)
{
- chptr->channelts = CurrentTime;
+ chptr->channelts = rb_current_time();
chptr->mode.mode |= MODE_TOPICLIMIT;
chptr->mode.mode |= MODE_NOPRIVMSGS;
+ modes = channel_modes(chptr, &me);
- sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s +nt",
- me.name, chptr->chname);
+ sendto_channel_local(ONLY_CHANOPS, chptr, ":%s MODE %s %s",
+ me.name, chptr->chname, modes);
- if(*chptr->chname == '#')
- {
- sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
- ":%s SJOIN %ld %s +nt :@%s",
- me.id, (long) chptr->channelts,
- chptr->chname, source_p->id);
- sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
- ":%s SJOIN %ld %s +nt :@%s",
- me.name, (long) chptr->channelts,
- chptr->chname, source_p->name);
- }
+ sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
+ ":%s SJOIN %ld %s %s :@%s",
+ me.id, (long) chptr->channelts,
+ chptr->chname, modes, source_p->id);
}
else
{
- const char *modes = channel_modes(chptr, &me);
-
sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
- ":%s JOIN %ld %s %s",
+ ":%s JOIN %ld %s +",
use_id(source_p), (long) chptr->channelts,
- chptr->chname, modes);
-
- sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
- ":%s SJOIN %ld %s %s :%s",
- me.name, (long) chptr->channelts,
- chptr->chname, modes, source_p->name);
+ chptr->chname);
}
del_invite(chptr, source_p);
channel_member_names(chptr, source_p, 1);
if(successful_join_count)
- source_p->localClient->last_join_time = CurrentTime;
+ source_p->localClient->last_join_time = rb_current_time();
hook_info.client = source_p;
hook_info.chptr = chptr;
/*
* ms_join
- *
- * inputs -
- * output - none
- * side effects - handles remote JOIN's sent by servers. In TSora
- * remote clients are joined using SJOIN, hence a
- * JOIN sent by a server on behalf of a client is an error.
- * here, the initial code is in to take an extra parameter
- * and use it for the TimeStamp on a new channel.
+ * parv[1] = channel TS
+ * parv[2] = channel
+ * parv[3] = "+", formerly channel modes but now unused
+ * alternatively, a single "0" parameter parts all channels
*/
static int
ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
struct Channel *chptr;
- static struct Mode mode, *oldmode;
- const char *s;
- const char *modes;
+ static struct Mode mode;
time_t oldts;
time_t newts;
int isnew;
- int args = 0;
int keep_our_modes = YES;
int keep_new_modes = YES;
- dlink_node *ptr, *next_ptr;
+ rb_dlink_node *ptr, *next_ptr;
/* special case for join 0 */
if((parv[1][0] == '0') && (parv[1][1] == '\0') && parc == 2)
mode.key[0] = mode.forward[0] = '\0';
mode.mode = mode.limit = mode.join_num = mode.join_time = 0;
+ if((chptr = get_or_create_channel(source_p, parv[2], &isnew)) == NULL)
+ return 0;
+
+ newts = atol(parv[1]);
+ oldts = chptr->channelts;
+
+#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
+ /* making a channel TS0 */
+ 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)
+ {
+ keep_our_modes = NO;
+ chptr->channelts = newts;
+ }
+ else
+ keep_new_modes = NO;
+
+ /* Lost the TS, other side wins, so remove modes on this side */
+ if(!keep_our_modes)
+ {
+ set_final_mode(&mode, &chptr->mode);
+ chptr->mode = mode;
+ remove_our_modes(chptr, source_p);
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
+ {
+ del_invite(chptr, ptr->data);
+ }
+ /* If setting -j, clear join throttle state -- jilles */
+ chptr->join_count = chptr->join_delta = 0;
+ 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",
+ source_p->servptr->name,
+ chptr->chname, modebuf, parabuf);
+ *modebuf = *parabuf = '\0';
+ }
+
+ if(!IsMember(source_p, chptr))
+ {
+ add_user_to_channel(chptr, source_p, CHFL_PEON);
+ if (chptr->mode.join_num &&
+ rb_current_time() - chptr->join_delta >= chptr->mode.join_time)
+ {
+ chptr->join_count = 0;
+ chptr->join_delta = rb_current_time();
+ }
+ chptr->join_count++;
+ sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
+ source_p->name, source_p->username,
+ source_p->host, chptr->chname);
+ }
+
+ sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
+ ":%s JOIN %ld %s +",
+ source_p->id, (long) chptr->channelts, chptr->chname);
+ return 0;
+}
+
+static int
+ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+{
+ 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_uid;
+ int len_nick;
+ int len_uid;
+ int len;
+ int joins = 0;
+ const char *s;
+ 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)
+ 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':
+ rb_strlcpy(mode.forward, parv[4 + args], sizeof(mode.forward));
+ args++;
if(parc < 5 + args)
return 0;
- strlcpy(mode.forward, parv[4 + args], sizeof(mode.forward));
- args++;
break;
case 'j':
- /* sent a +j without an arg. */
+ sscanf(parv[4 + args], "%d:%d", &joinc, ×lice);
+ args++;
+ mode.join_num = joinc;
+ mode.join_time = timeslice;
if(parc < 5 + args)
return 0;
- sscanf(parv[4 + args], "%d:%d", &mode.join_num, &mode.join_time);
- args++;
break;
case 'k':
- /* sent a +k without a key, eek. */
+ rb_strlcpy(mode.key, parv[4 + args], sizeof(mode.key));
+ args++;
if(parc < 5 + args)
return 0;
- strlcpy(mode.key, parv[4 + args], sizeof(mode.key));
- args++;
break;
case 'l':
- /* sent a +l without a limit. */
- if(parc < 5 + args)
- return 0;
mode.limit = atoi(parv[4 + args]);
args++;
+ if(parc < 5 + args)
+ return 0;
break;
+ default:
+ if(chmode_flags[(int) *s] != 0)
+ {
+ mode.mode |= chmode_flags[(int) *s];
+ }
}
}
+ 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;
+ return 0; /* channel name too long? */
+
- newts = atol(parv[1]);
oldts = chptr->channelts;
oldmode = &chptr->mode;
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
- /* making a channel TS0 */
if(!isnew && !newts && oldts)
{
sendto_channel_local(ALL_MEMBERS, chptr,
- ":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to 0",
+ ":%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",
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);
+
+ 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);
+ 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! */
+
+ oldmode = &chptr->mode;
+ }
+ }
keep_our_modes = NO;
chptr->channelts = newts;
}
/* Lost the TS, other side wins, so remove modes on this side */
if(!keep_our_modes)
{
- remove_our_modes(chptr, source_p);
- DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
+ remove_our_modes(chptr, fakesource_p);
+ RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
{
del_invite(chptr, ptr->data);
}
+
+ if(rb_dlink_list_length(&chptr->banlist) > 0)
+ remove_ban_list(chptr, fakesource_p, &chptr->banlist, 'b', ALL_MEMBERS);
+ if(rb_dlink_list_length(&chptr->exceptlist) > 0)
+ remove_ban_list(chptr, fakesource_p, &chptr->exceptlist,
+ 'e', ONLY_CHANOPS);
+ if(rb_dlink_list_length(&chptr->invexlist) > 0)
+ remove_ban_list(chptr, fakesource_p, &chptr->invexlist,
+ 'I', ONLY_CHANOPS);
+ if(rb_dlink_list_length(&chptr->quietlist) > 0)
+ remove_ban_list(chptr, fakesource_p, &chptr->quietlist,
+ 'q', ALL_MEMBERS);
+ chptr->bants++;
+
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",
- source_p->user->server, chptr->chname, modebuf, parabuf);
+ fakesource_p->name, chptr->chname, modebuf, parabuf);
*modebuf = *parabuf = '\0';
- if(!IsMember(source_p, chptr))
+ if(parv[3][0] != '0' && keep_new_modes)
+ modes = channel_modes(chptr, source_p);
+ else
+ modes = empty_modes;
+
+ 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)
{
- add_user_to_channel(chptr, source_p, CHFL_PEON);
- if (chptr->mode.join_num &&
- CurrentTime - chptr->join_delta >= chptr->mode.join_time)
+ *p++ = '\0';
+ }
+
+ *mbuf++ = '+';
+
+ while (s)
+ {
+ fl = 0;
+
+ for (i = 0; i < 2; i++)
{
- chptr->join_count = 0;
- chptr->join_delta = CurrentTime;
+ 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_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_uid++ = '@';
+ len_nick++;
+ len_uid++;
+ }
+ if(fl & CHFL_VOICE)
+ {
+ *ptr_uid++ = '+';
+ len_nick++;
+ len_uid++;
+ }
+ }
+
+ /* copy the nick to the two buffers */
+ 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';
}
- chptr->join_count++;
- sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
- source_p->name, source_p->username,
- source_p->host, chptr->chname);
}
- modes = channel_modes(chptr, client_p);
- sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
- ":%s JOIN %ld %s %s",
- source_p->id, (long) chptr->channelts, chptr->chname, modes);
- sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
- ":%s SJOIN %ld %s %s :%s",
- source_p->user->server, (long) chptr->channelts,
- chptr->chname, modes, source_p->name);
+ *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_uid - 1) = '\0';
+ }
+
+ sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid);
+
return 0;
}
{
struct membership *msptr;
struct Channel *chptr = NULL;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
/* Finish the flood grace period... */
if(MyClient(source_p) && !IsFloodDone(source_p))
flood_endgrace(source_p);
-
- sendto_server(client_p, NULL, NOCAPS, NOCAPS, ":%s JOIN 0", source_p->name);
+ sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p));
if(source_p->user->channel.head && MyConnect(source_p) &&
!IsOper(source_p) && !IsExemptSpambot(source_p))
return 1;
}
-struct mode_letter
-{
- int mode;
- char letter;
-};
-
-static struct mode_letter flags[] = {
- {MODE_NOPRIVMSGS, 'n'},
- {MODE_TOPICLIMIT, 't'},
- {MODE_SECRET, 's'},
- {MODE_MODERATED, 'm'},
- {MODE_INVITEONLY, 'i'},
- {MODE_PRIVATE, 'p'},
- {MODE_REGONLY, 'r'},
- {MODE_EXLIMIT, 'L'},
- {MODE_PERMANENT, 'P'},
- {MODE_NOCOLOR, 'c'},
- {MODE_FREEINVITE, 'g'},
- {MODE_OPMODERATE, 'z'},
- {MODE_FREETARGET, 'F'},
- {MODE_DISFORWARD, 'Q'},
- {0, 0}
-};
-
static void
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; flags[i].letter; i++)
+ for (i = 0; i < 256; i++)
{
- if((mode->mode & flags[i].mode) && !(oldmode->mode & flags[i].mode))
+ if((mode->mode & chmode_flags[i]) && !(oldmode->mode & chmode_flags[i]))
{
if(dir != MODE_ADD)
{
*mbuf++ = '+';
dir = MODE_ADD;
}
- *mbuf++ = flags[i].letter;
+ *mbuf++ = i;
}
}
/* now the ones we need to remove. */
- for(i = 0; flags[i].letter; i++)
+ for (i = 0; i < 256; i++)
{
- if((oldmode->mode & flags[i].mode) && !(mode->mode & flags[i].mode))
+ if((oldmode->mode & chmode_flags[i]) && !(mode->mode & chmode_flags[i]))
{
if(dir != MODE_DEL)
{
*mbuf++ = '-';
dir = MODE_DEL;
}
- *mbuf++ = flags[i].letter;
+ *mbuf++ = i;
}
}
dir = MODE_DEL;
}
*mbuf++ = 'k';
- len = ircsprintf(pbuf, "%s ", oldmode->key);
+ len = rb_sprintf(pbuf, "%s ", oldmode->key);
pbuf += len;
}
if(oldmode->join_num && !mode->join_num)
dir = MODE_ADD;
}
*mbuf++ = 'l';
- len = ircsprintf(pbuf, "%d ", mode->limit);
+ len = rb_sprintf(pbuf, "%d ", mode->limit);
pbuf += len;
}
if(mode->key[0] && strcmp(oldmode->key, mode->key))
dir = MODE_ADD;
}
*mbuf++ = 'k';
- len = ircsprintf(pbuf, "%s ", mode->key);
+ len = rb_sprintf(pbuf, "%s ", mode->key);
pbuf += len;
}
if(mode->join_num && (oldmode->join_num != mode->join_num || oldmode->join_time != mode->join_time))
dir = MODE_ADD;
}
*mbuf++ = 'j';
- len = ircsprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time);
+ len = rb_sprintf(pbuf, "%d:%d ", mode->join_num, mode->join_time);
pbuf += len;
}
if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) && ConfigChannel.use_forward)
dir = MODE_ADD;
}
*mbuf++ = 'f';
- len = ircsprintf(pbuf, "%s ", mode->forward);
+ len = rb_sprintf(pbuf, "%s ", mode->forward);
pbuf += len;
}
*mbuf = '\0';
remove_our_modes(struct Channel *chptr, struct Client *source_p)
{
struct membership *msptr;
- dlink_node *ptr;
+ rb_dlink_node *ptr;
char lmodebuf[MODEBUFLEN];
char *lpara[MAXMODEPARAMS];
int count = 0;
for(i = 0; i < MAXMODEPARAMS; i++)
lpara[i] = NULL;
- DLINK_FOREACH(ptr, chptr->members.head)
+ RB_DLINK_FOREACH(ptr, chptr->members.head)
{
msptr = ptr->data;
*mbuf = '\0';
sendto_channel_local(ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
- me.name, chptr->chname,
+ source_p->name, chptr->chname,
lmodebuf, lpara[0], lpara[1],
lpara[2], lpara[3]);
*mbuf = '\0';
sendto_channel_local(ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
- me.name, chptr->chname, lmodebuf,
+ source_p->name, chptr->chname, lmodebuf,
lpara[0], lpara[1], lpara[2], lpara[3]);
mbuf = lmodebuf;
*mbuf++ = '-';
*mbuf = '\0';
sendto_channel_local(ALL_MEMBERS, chptr,
":%s MODE %s %s %s %s %s %s",
- me.name, chptr->chname, lmodebuf,
+ source_p->name, chptr->chname, lmodebuf,
EmptyString(lpara[0]) ? "" : lpara[0],
EmptyString(lpara[1]) ? "" : lpara[1],
EmptyString(lpara[2]) ? "" : lpara[2],
}
}
+
+/* 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
+ */
+static void
+remove_ban_list(struct Channel *chptr, struct Client *source_p,
+ rb_dlink_list * list, char c, 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);
+
+ 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);
+
+ list->head = list->tail = NULL;
+ list->length = 0;
+}
projects / irc / rqf / shadowircd.git / blobdiff