X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/f4a80ce6a1d2b595fd884f58755ca08fd90871c3..715b28fefd0e9b923fd816ef130ab88f92aba47d:/modules/core/m_join.c

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index ea5372b..911439b 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -25,12 +25,11 @@
  */
 
 #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"
@@ -40,11 +39,11 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "sprintf_irc.h"
 #include "packet.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;
@@ -54,7 +53,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, 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 },
@@ -70,9 +74,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 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
@@ -139,7 +148,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 	 * 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))
@@ -195,17 +204,17 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 		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;
 
@@ -236,7 +245,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 			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);
@@ -254,16 +263,16 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			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;
 		}
 
@@ -304,10 +313,10 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		/* 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++;
 
@@ -321,7 +330,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		/* 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;
 
@@ -334,10 +343,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 					      ":%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);
 			}
 		}
 		else
@@ -346,11 +351,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 				      ":%s JOIN %ld %s +",
 				      use_id(source_p), (long) chptr->channelts,
 				      chptr->chname);
-
-			sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-				      ":%s SJOIN %ld %s + :%s",
-				      me.name, (long) chptr->channelts,
-				      chptr->chname, source_p->name);
 		}
 
 		del_invite(chptr, source_p);
@@ -368,7 +368,7 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *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;
@@ -400,7 +400,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 	int isnew;
 	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)
@@ -470,7 +470,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 		set_final_mode(&mode, &chptr->mode);
 		chptr->mode = mode;
 		remove_our_modes(chptr, source_p);
-		DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
+		RB_DLINK_FOREACH_SAFE(ptr, next_ptr, chptr->invites.head)
 		{
 			del_invite(chptr, ptr->data);
 		}
@@ -495,10 +495,10 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 	{
 		add_user_to_channel(chptr, source_p, CHFL_PEON);
 		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++;
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
@@ -509,11 +509,444 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 	sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 		      ":%s JOIN %ld %s +",
 		      source_p->id, (long) chptr->channelts, chptr->chname);
-	sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-		      ":%s SJOIN %ld %s %s :%s",
-		      source_p->user->server, (long) chptr->channelts,
-		      chptr->chname, keep_new_modes ? "+" : "0",
-		      source_p->name);
+	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)
+	{
+		switch (*(s++))
+		{
+		case 'f':
+			rb_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, &timeslice);
+			args++;
+			mode.join_num = joinc;
+			mode.join_time = timeslice;
+			if(parc < 5 + args)
+				return 0;
+			break;
+		case 'k':
+			rb_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;
+		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;	/* 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);
+
+			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;
+	}
+	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);
+		}
+
+		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",
+				     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;
+
+	/* 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_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';
+		}
+	}
+
+	*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;
 }
 
@@ -532,15 +965,13 @@ do_join_0(struct Client *client_p, struct Client *source_p)
 {
 	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, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p));
-	sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s JOIN 0", source_p->name);
 
 	if(source_p->user->channel.head && MyConnect(source_p) &&
 	   !IsOper(source_p) && !IsExemptSpambot(source_p))
@@ -584,30 +1015,6 @@ check_channel_name_loc(struct Client *source_p, const char *name)
 	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)
 {
@@ -617,30 +1024,30 @@ 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;
 		}
 	}
 
@@ -661,7 +1068,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 			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)
@@ -690,7 +1097,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 			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))
@@ -701,7 +1108,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 			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))
@@ -712,7 +1119,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 			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)
@@ -723,7 +1130,7 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 			dir = MODE_ADD;
 		}
 		*mbuf++ = 'f';
-		len = ircsprintf(pbuf, "%s ", mode->forward);
+		len = rb_sprintf(pbuf, "%s ", mode->forward);
 		pbuf += len;
 	}
 	*mbuf = '\0';
@@ -740,7 +1147,7 @@ static void
 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;
@@ -752,7 +1159,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
 	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;
 
@@ -826,3 +1233,64 @@ 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
+ */
+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;
+}