X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/890423fbf9ca219c3168bacb6fc1b3c4001441fe..63eb8567cb6b6b8b504b20ef6360d0cc79c18afb:/modules/core/m_join.c

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index a178853e..b45728e3 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -40,6 +40,9 @@
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
+#include "chmode.h"
+#include "ratelimit.h"
+#include "s_assert.h"
 
 static int m_join(struct Client *, struct Client *, int, const char **);
 static int ms_join(struct Client *, struct Client *, int, const char **);
@@ -55,7 +58,7 @@ struct Message join_msgtab = {
 
 struct Message sjoin_msgtab = {
 	"SJOIN", 0, 0, 0, MFLG_SLOW,
-	{mg_unreg, mg_ignore, mg_ignore, {ms_sjoin, 0}, mg_ignore, mg_ignore}
+	{mg_unreg, mg_ignore, mg_ignore, {ms_sjoin, 4}, mg_ignore, mg_ignore}
 };
 
 mapi_clist_av1 join_clist[] = { &join_msgtab, &sjoin_msgtab, NULL };
@@ -70,12 +73,13 @@ DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3
 
 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 send_join_error(struct Client *source_p, int numeric, 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);
+			    rb_dlink_list * list, char c, int mems);
 
 static char modebuf[MODEBUFLEN];
 static char parabuf[MODEBUFLEN];
@@ -88,17 +92,26 @@ static int pargs;
  */
 static struct Channel *
 check_forward(struct Client *source_p, struct Channel *chptr,
-		char *key)
+	     char *key, int *err)
 {
 	int depth = 0, i;
+	const char *next = NULL;
 
-	/* User is +Q */
-	if (IsNoForward(source_p))
+	/* The caller (m_join) is only interested in the reason
+	 * for the original channel.
+	 */
+	if ((*err = can_join(source_p, chptr, key, &next)) == 0)
+		return chptr;
+
+	/* User is +Q, or forwarding disabled */
+	if (IsNoForward(source_p) || !ConfigChannel.use_forward)
 		return NULL;
 
 	while (depth < 16)
 	{
-		chptr = find_channel(chptr->mode.forward);
+		if (next == NULL)
+			return NULL;
+		chptr = find_channel(next);
 		/* Can only forward to existing channels */
 		if (chptr == NULL)
 			return NULL;
@@ -111,11 +124,9 @@ check_forward(struct Client *source_p, struct Channel *chptr,
 		/* Don't forward to +Q channel */
 		if (chptr->mode.mode & MODE_DISFORWARD)
 			return NULL;
-		i = can_join(source_p, chptr, key);
+		i = can_join(source_p, chptr, key, &next);
 		if (i == 0)
 			return chptr;
-		if (i != ERR_INVITEONLYCHAN && i != ERR_NEEDREGGEDNICK && i != ERR_THROTTLE && i != ERR_CHANNELISFULL)
-			return NULL;
 		depth++;
 	}
 
@@ -124,7 +135,6 @@ check_forward(struct Client *source_p, struct Channel *chptr,
 
 /*
  * m_join
- *      parv[0] = sender prefix
  *      parv[1] = channel
  *      parv[2] = channel password (key)
  */
@@ -132,15 +142,15 @@ static int
 m_join(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	static char jbuf[BUFSIZE];
-	struct Channel *chptr = NULL;
+	struct Channel *chptr = NULL, *chptr2 = NULL;
 	struct ConfItem *aconf;
 	char *name;
 	char *key = NULL;
+	const char *modes;
 	int i, flags = 0;
 	char *p = NULL, *p2 = NULL;
 	char *chanlist;
 	char *mykey;
-	int successful_join_count = 0;	/* Number of channels successfully joined */
 
 	jbuf[0] = '\0';
 
@@ -166,7 +176,8 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		}
 
 		/* check it begins with # or &, and local chans are disabled */
-		else if(!IsChannelName(name))
+		else if(!IsChannelName(name) ||
+			( ConfigChannel.disable_local_channels && name[0] == '&'))
 		{
 			sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 					   form_str(ERR_NOSUCHCHANNEL), name);
@@ -247,8 +258,10 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 			if(moduledata.approved != 0)
 			{
-				sendto_one(source_p, form_str(moduledata.approved),
-					   me.name, source_p->name, name);
+				if(moduledata.approved != ERR_CUSTOM)
+					send_join_error(source_p,
+							moduledata.approved,
+							name);
 				continue;
 			}
 
@@ -271,14 +284,9 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		{
 			sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS),
 				   me.name, source_p->name, name);
-			if(successful_join_count)
-				source_p->localClient->last_join_time = rb_current_time();
-			return 0;
+			continue;
 		}
 
-		if(flags == 0)	/* if channel doesn't exist, don't penalize */
-			successful_join_count++;
-
 		if(chptr == NULL)	/* If I already have a chptr, no point doing this */
 		{
 			chptr = get_or_create_channel(source_p, name, NULL);
@@ -287,28 +295,29 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			{
 				sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
 					   me.name, source_p->name, name);
-				if(successful_join_count > 0)
-					successful_join_count--;
 				continue;
 			}
 		}
 
-		if(!IsOper(source_p) && !IsExemptSpambot(source_p))
-			check_spambot_warning(source_p, name);
-
-		/* can_join checks for +i key, bans etc */
-		if((i = can_join(source_p, chptr, key)))
+		/* If check_forward returns NULL, they couldn't join and there wasn't a usable forward channel. */
+		if(!(chptr2 = check_forward(source_p, chptr, key, &i)))
 		{
-			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);
-				if(successful_join_count > 0)
-					successful_join_count--;
-				continue;
-			}
-			sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr->chname);
+			/* 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)
+				send_join_error(source_p, i, name);
+			continue;
 		}
+		else if(chptr != chptr2)
+			sendto_one_numeric(source_p, ERR_LINKCHANNEL, form_str(ERR_LINKCHANNEL), name, chptr2->chname);
+
+		chptr = chptr2;
+
+		if(flags == 0 &&
+				!IsOper(source_p) && !IsExemptSpambot(source_p))
+			check_spambot_warning(source_p, name);
 
 		/* add the user to the channel */
 		add_user_to_channel(chptr, source_p, flags);
@@ -320,30 +329,28 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		}
 		chptr->join_count++;
 
+		/* credit user for join */
+		credit_client_join(source_p);
+
 		/* we send the user their join here, because we could have to
 		 * send a mode out next.
 		 */
-		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s JOIN :%s",
-				     source_p->name,
-				     source_p->username, source_p->host, chptr->chname);
+		send_channel_join(chptr, source_p);
 
 		/* its a new channel, set +nt and burst. */
 		if(flags & CHFL_CHANOP)
 		{
 			chptr->channelts = rb_current_time();
-			chptr->mode.mode |= MODE_TOPICLIMIT;
-			chptr->mode.mode |= MODE_NOPRIVMSGS;
+			chptr->mode.mode |= ConfigChannel.autochanmodes;
+			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, CAP_TS6, NOCAPS,
+				      ":%s SJOIN %ld %s %s :@%s",
+				      me.id, (long) chptr->channelts,
+				      chptr->chname, modes, source_p->id);
 		}
 		else
 		{
@@ -362,14 +369,12 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 			sendto_one(source_p, form_str(RPL_TOPICWHOTIME),
 				   me.name, source_p->name, chptr->chname,
-				   chptr->topic_info, chptr->topic_time);
+				   chptr->topic_info,
+				   (unsigned long)chptr->topic_time);
 		}
 
 		channel_member_names(chptr, source_p, 1);
 
-		if(successful_join_count)
-			source_p->localClient->last_join_time = rb_current_time();
-
 		hook_info.client = source_p;
 		hook_info.chptr = chptr;
 		hook_info.key = key;
@@ -381,14 +386,10 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 
 /*
  * 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[])
@@ -399,7 +400,6 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 	time_t newts;
 	int isnew;
 	int keep_our_modes = YES;
-	int keep_new_modes = YES;
 	rb_dlink_node *ptr, *next_ptr;
 
 	/* special case for join 0 */
@@ -461,8 +461,6 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 		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)
@@ -489,6 +487,9 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 					     source_p->servptr->name,
 					     chptr->chname, modebuf, parabuf);
 		*modebuf = *parabuf = '\0';
+
+		/* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+		set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
 	}
 
 	if(!IsMember(source_p, chptr))
@@ -501,9 +502,7 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 			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);
+		send_channel_join(chptr, source_p);
 	}
 
 	sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
@@ -529,7 +528,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	int fl;
 	int isnew;
 	int mlen_uid;
-	int len_nick;
 	int len_uid;
 	int len;
 	int joins = 0;
@@ -540,6 +538,9 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	static char empty[] = "";
 	rb_dlink_node *ptr, *next_ptr;
 
+	if(parc < 5)
+		return 0;
+
 	if(!IsChannelName(parv[2]) || !check_channel_name(parv[2]))
 		return 0;
 
@@ -564,48 +565,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		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++;
@@ -632,6 +591,11 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 			if(parc < 5 + args)
 				return 0;
 			break;
+		default:
+			if(chmode_flags[(int) *s] != 0)
+			{
+				mode.mode |= chmode_flags[(int) *s];
+			}
 		}
 	}
 
@@ -677,7 +641,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	if(isnew)
 		chptr->channelts = newts;
-	
+
 	else if(newts == 0 || oldts == 0)
 		chptr->channelts = 0;
 	else if(newts == oldts)
@@ -686,21 +650,20 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	{
 		/* 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).
+		 * If the source has sent EOB, assume this is some
+		 * sort of hack by services. If cmode +i is set,
+		 * services can send kicks if needed; if the key
+		 * differs, services cannot kick in a race-free
+		 * manner so do so here.
 		 * -- jilles */
 		if (ConfigChannel.kick_on_split_riding &&
-				!HasSentEob(source_p) &&
-				((mode.mode & MODE_INVITEONLY) ||
+				((!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)
 			{
@@ -723,14 +686,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 				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;
 			}
 		}
@@ -777,6 +732,20 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		{
 			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,
@@ -784,6 +753,9 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		/* Update capitalization in channel name, this makes the
 		 * capitalization timestamped like modes are -- jilles */
 		strcpy(chptr->chname, parv[2]);
+
+		/* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+		set_channel_mlock(client_p, source_p, chptr, NULL, FALSE);
 	}
 
 	if(*modebuf != '\0')
@@ -797,9 +769,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	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;
@@ -807,7 +776,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	mbuf = modebuf;
 	para[0] = para[1] = para[2] = para[3] = empty;
 	pargs = 0;
-	len_nick = len_uid = 0;
+	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
@@ -859,13 +828,11 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 			if(fl & CHFL_CHANOP)
 			{
 				*ptr_uid++ = '@';
-				len_nick++;
 				len_uid++;
 			}
 			if(fl & CHFL_VOICE)
 			{
 				*ptr_uid++ = '+';
-				len_nick++;
 				len_uid++;
 			}
 		}
@@ -881,9 +848,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		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]);
+			send_channel_join(chptr, target_p);
 			joins++;
 		}
 
@@ -982,30 +947,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid);
 
-	/* 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;
 }
 
@@ -1016,8 +957,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
  * output	- NONE
  * side effects	- Use has decided to join 0. This is legacy
  *		  from the days when channels were numbers not names. *sigh*
- *		  There is a bunch of evilness necessary here due to
- * 		  anti spambot code.
  */
 static void
 do_join_0(struct Client *client_p, struct Client *source_p)
@@ -1032,12 +971,12 @@ do_join_0(struct Client *client_p, struct Client *source_p)
 
 	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))
-		check_spambot_warning(source_p, NULL);
-
 	while((ptr = source_p->user->channel.head))
 	{
+		if(MyConnect(source_p) &&
+		   !IsOper(source_p) && !IsExemptSpambot(source_p))
+			check_spambot_warning(source_p, NULL);
+
 		msptr = ptr->data;
 		chptr = msptr->chptr;
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
@@ -1050,30 +989,73 @@ do_join_0(struct Client *client_p, struct Client *source_p)
 static int
 check_channel_name_loc(struct Client *source_p, const char *name)
 {
+	const char *p;
+
 	s_assert(name != NULL);
 	if(EmptyString(name))
 		return 0;
 
 	if(ConfigFileEntry.disable_fake_channels && !IsOper(source_p))
 	{
-		for(; *name; ++name)
+		for(p = name; *p; ++p)
 		{
-			if(!IsChanChar(*name) || IsFakeChanChar(*name))
+			if(!IsChanChar(*p) || IsFakeChanChar(*p))
 				return 0;
 		}
 	}
 	else
 	{
-		for(; *name; ++name)
+		for(p = name; *p; ++p)
 		{
-			if(!IsChanChar(*name))
+			if(!IsChanChar(*p))
 				return 0;
 		}
 	}
 
+	if(ConfigChannel.only_ascii_channels)
+	{
+		for(p = name; *p; ++p)
+			if(*p < 33 || *p > 126)
+				return 0;
+	}
+
 	return 1;
 }
 
+/* send_join_error()
+ *
+ * input	- client to send to, reason, channel name
+ * output	- none
+ * side effects - error message sent to client
+ */
+static void
+send_join_error(struct Client *source_p, int numeric, const char *name)
+{
+	/* This stuff is necessary because the form_str macro only
+	 * accepts constants.
+	 */
+	switch (numeric)
+	{
+#define NORMAL_NUMERIC(i)						\
+		case i:							\
+			sendto_one(source_p, form_str(i),		\
+					me.name, source_p->name, name);	\
+			break
+
+		NORMAL_NUMERIC(ERR_BANNEDFROMCHAN);
+		NORMAL_NUMERIC(ERR_INVITEONLYCHAN);
+		NORMAL_NUMERIC(ERR_BADCHANNELKEY);
+		NORMAL_NUMERIC(ERR_CHANNELISFULL);
+		NORMAL_NUMERIC(ERR_NEEDREGGEDNICK);
+		NORMAL_NUMERIC(ERR_THROTTLE);
+
+		default:
+			sendto_one_numeric(source_p, numeric,
+					"%s :Cannot join channel", name);
+			break;
+	}
+}
+
 static void
 set_final_mode(struct Mode *mode, struct Mode *oldmode)
 {
@@ -1083,30 +1065,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; chmode_flags[i].letter; i++)
+	for (i = 0; i < 256; i++)
 	{
-		if((mode->mode & chmode_flags[i].mode) && !(oldmode->mode & chmode_flags[i].mode))
+		if((mode->mode & chmode_flags[i]) && !(oldmode->mode & chmode_flags[i]))
 		{
 			if(dir != MODE_ADD)
 			{
 				*mbuf++ = '+';
 				dir = MODE_ADD;
 			}
-			*mbuf++ = chmode_flags[i].letter;
+			*mbuf++ = i;
 		}
 	}
 
 	/* now the ones we need to remove. */
-	for (i = 0; chmode_flags[i].letter; i++)
+	for (i = 0; i < 256; i++)
 	{
-		if((oldmode->mode & chmode_flags[i].mode) && !(mode->mode & chmode_flags[i].mode))
+		if((oldmode->mode & chmode_flags[i]) && !(mode->mode & chmode_flags[i]))
 		{
 			if(dir != MODE_DEL)
 			{
 				*mbuf++ = '-';
 				dir = MODE_DEL;
 			}
-			*mbuf++ = chmode_flags[i].letter;
+			*mbuf++ = i;
 		}
 	}
 
@@ -1181,7 +1163,8 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
 		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)
+	if(mode->forward[0] && strcmp(oldmode->forward, mode->forward) &&
+			ConfigChannel.use_forward)
 	{
 		if(dir != MODE_ADD)
 		{
@@ -1199,8 +1182,8 @@ set_final_mode(struct Mode *mode, struct Mode *oldmode)
  * remove_our_modes
  *
  * inputs	-
- * output	- 
- * side effects	- 
+ * output	-
+ * side effects	-
  */
 static void
 remove_our_modes(struct Channel *chptr, struct Client *source_p)
@@ -1236,7 +1219,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
 					*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]);
 
@@ -1268,7 +1251,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
 			*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++ = '-';
@@ -1284,7 +1267,7 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
 		*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],
@@ -1298,11 +1281,10 @@ remove_our_modes(struct Channel *chptr, struct Client *source_p)
  * 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)
+		rb_dlink_list * list, char c, int mems)
 {
 	static char lmodebuf[BUFSIZE];
 	static char lparabuf[BUFSIZE];
@@ -1323,7 +1305,8 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 		banptr = ptr->data;
 
 		/* trailing space, and the mode letter itself */
-		plen = strlen(banptr->banstr) + 2;
+		plen = strlen(banptr->banstr) +
+			(banptr->forward ? strlen(banptr->forward) + 1 : 0) + 2;
 
 		if(count >= MAXMODEPARAMS || (cur_len + plen) > BUFSIZE - 4)
 		{
@@ -1332,11 +1315,6 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 			*(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;
@@ -1346,7 +1324,10 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 
 		*mbuf++ = c;
 		cur_len += plen;
-		pbuf += rb_sprintf(pbuf, "%s ", banptr->banstr);
+		if (banptr->forward)
+			pbuf += rb_sprintf(pbuf, "%s$%s ", banptr->banstr, banptr->forward);
+		else
+			pbuf += rb_sprintf(pbuf, "%s ", banptr->banstr);
 		count++;
 
 		free_ban(banptr);
@@ -1355,7 +1336,6 @@ remove_ban_list(struct Channel *chptr, struct Client *source_p,
 	*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;