Cleaned up some things, made the protocol modules use some basic inheritance to cut back on their code duplication. More work can be done in the future to remove even more of it.

1 files changed, 337 insertions, 810 deletions

diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index e5abfcdde..bd020891d 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -13,7 +13,12 @@
 
 #include "services.h"
 #include "modules.h"
-#include "hashcomp.h"
+
+/* inspircd-ts6.h uses these */
+static bool has_chghostmod = false;
+static bool has_chgidentmod = false;
+static bool has_globopsmod = true; // Not a typo
+#include "inspircd-ts6.h"
 
 IRCDVar myIrcd[] = {
 	{"InspIRCd 2.0",	/* ircd name */
@@ -45,8 +50,6 @@ IRCDVar myIrcd[] = {
 
 static bool has_servicesmod = false;
 static bool has_svsholdmod = false;
-static bool has_chghostmod = false;
-static bool has_chgidentmod = false;
 
 /* Previously introduced user during burst */
 static User *prev_u_intro = NULL;
@@ -71,235 +74,18 @@ bool event_idle(const Anope::string &source, const std::vector<Anope::string> &p
 	return true;
 }
 
-static Anope::string currentpass;
-
-/* PASS */
-void inspircd_cmd_pass(const Anope::string &pass)
-{
-	currentpass = pass;
-}
-
-class InspIRCdProto : public IRCDProto
+class InspIRCdProto : public InspIRCdTS6Proto
 {
-	void SendAkillDel(const XLine *x)
-	{
-		send_cmd(OperServ ? OperServ->GetUID() : Config->Numeric, "GLINE %s", x->Mask.c_str());
-	}
-
-	void SendTopic(BotInfo *whosets, Channel *c)
-	{
-		send_cmd(whosets->GetUID(), "FTOPIC %s %lu %s :%s", c->name.c_str(), static_cast<unsigned long>(c->topic_time + 1), c->topic_setter.c_str(), c->topic.c_str());
-	}
-
-	void SendVhostDel(User *u)
-	{
-		if (u->HasMode(UMODE_CLOAK))
-			inspircd_cmd_chghost(u->nick, u->chost);
-		else
-			inspircd_cmd_chghost(u->nick, u->host);
-
-		if (has_chgidentmod && u->GetIdent() != u->GetVIdent())
-			inspircd_cmd_chgident(u->nick, u->GetIdent());
-	}
-
-	void SendAkill(const XLine *x)
-	{
-		// Calculate the time left before this would expire, capping it at 2 days
-		time_t timeleft = x->Expires - Anope::CurTime;
-		if (timeleft > 172800 || !x->Expires)
-			timeleft = 172800;
-		send_cmd(OperServ ? OperServ->GetUID() : Config->Numeric, "ADDLINE G %s@%s %s %ld %ld :%s", x->GetUser().c_str(), x->GetHost().c_str(), x->By.c_str(), static_cast<long>(Anope::CurTime), static_cast<long>(timeleft), x->Reason.c_str());
-	}
-
-	void SendSVSKillInternal(const BotInfo *source, const User *user, const Anope::string &buf)
-	{
-		send_cmd(source ? source->GetUID() : Config->Numeric, "KILL %s :%s", user->GetUID().c_str(), buf.c_str());
-	}
-
-	void SendSVSMode(const User *u, int ac, const char **av)
-	{
-		this->SendModeInternal(NULL, u, merge_args(ac, av));
-	}
-
-	void SendNumericInternal(const Anope::string &source, int numeric, const Anope::string &dest, const Anope::string &buf)
-	{
-		send_cmd(Config->Numeric, "PUSH %s ::%s %03d %s %s", dest.c_str(), source.c_str(), numeric, dest.c_str(), buf.c_str());
-	}
-
-	void SendModeInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf)
-	{
-		send_cmd(source ? source->GetUID() : Config->Numeric, "FMODE %s %u %s", dest->name.c_str(), static_cast<unsigned>(dest->creation_time), buf.c_str());
-	}
-
-	void SendModeInternal(const BotInfo *bi, const User *u, const Anope::string &buf)
-	{
-		if (buf.empty())
-			return;
-		send_cmd(bi ? bi->GetUID() : Config->Numeric, "MODE %s %s", u->GetUID().c_str(), buf.c_str());
-	}
-
-	void SendClientIntroduction(const User *u, const Anope::string &modes)
-	{
-		send_cmd(Config->Numeric, "UID %s %ld %s %s %s %s 0.0.0.0 %ld %s :%s", u->GetUID().c_str(), static_cast<long>(u->timestamp), u->nick.c_str(), u->host.c_str(), u->host.c_str(), u->GetIdent().c_str(), static_cast<long>(u->my_signon), modes.c_str(), u->realname.c_str());
-	}
-
-	void SendKickInternal(const BotInfo *source, const Channel *chan, const User *user, const Anope::string &buf)
-	{
-		if (!buf.empty())
-			send_cmd(source->GetUID(), "KICK %s %s :%s", chan->name.c_str(), user->GetUID().c_str(), buf.c_str());
-		else
-			send_cmd(source->GetUID(), "KICK %s %s :%s", chan->name.c_str(), user->GetUID().c_str(), user->nick.c_str());
-	}
-
-	void SendNoticeChanopsInternal(const BotInfo *source, const Channel *dest, const Anope::string &buf)
-	{
-		send_cmd(Config->Numeric, "NOTICE @%s :%s", dest->name.c_str(), buf.c_str());
-	}
-
-	/* SERVER services-dev.chatspike.net password 0 :Description here */
-	void SendServer(const Server *server)
-	{
-		send_cmd("", "SERVER %s %s %d %s :%s", server->GetName().c_str(), currentpass.c_str(), server->GetHops(), server->GetSID().c_str(), server->GetDescription().c_str());
-	}
-
-	/* JOIN */
-	void SendJoin(const BotInfo *user, const Anope::string &channel, time_t chantime)
-	{
-		send_cmd(Config->Numeric, "FJOIN %s %ld + :,%s", channel.c_str(), static_cast<long>(chantime), user->GetUID().c_str());
-	}
-
-	void SendJoin(BotInfo *user, const ChannelContainer *cc)
-	{
-		send_cmd(Config->Numeric, "FJOIN %s %ld +%s :%s,%s", cc->chan->name.c_str(), static_cast<long>(cc->chan->creation_time), cc->chan->GetModes(true, true).c_str(), cc->Status->BuildCharPrefixList().c_str(), user->GetUID().c_str());
-	}
-
-	/* UNSQLINE */
-	void SendSQLineDel(const XLine *x)
-	{
-		send_cmd(Config->Numeric, "DELLINE Q %s", x->Mask.c_str());
-	}
-
-	/* SQLINE */
-	void SendSQLine(const XLine *x)
-	{
-		send_cmd(Config->Numeric, "ADDLINE Q %s %s %ld 0 :%s", x->Mask.c_str(), Config->s_OperServ.c_str(), static_cast<long>(Anope::CurTime), x->Reason.c_str());
-	}
-
-	/* SQUIT */
-	void SendSquit(const Anope::string &servname, const Anope::string &message)
-	{
-		send_cmd(Config->Numeric, "SQUIT %s :%s", servname.c_str(), message.c_str());
-	}
-
-	/* Functions that use serval cmd functions */
-
-	void SendVhost(User *u, const Anope::string &vIdent, const Anope::string &vhost)
-	{
-		if (!vIdent.empty())
-			inspircd_cmd_chgident(u->nick, vIdent);
-		if (!vhost.empty())
-			inspircd_cmd_chghost(u->nick, vhost);
-	}
-
 	void SendConnect()
 	{
 		send_cmd("", "CAPAB START 1202");
 		send_cmd("", "CAPAB CAPABILITIES :PROTOCOL=1202");
 		send_cmd("", "CAPAB END");
-		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(Config->Numeric, "BURST");
 		send_cmd(Config->Numeric, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config->ServerName.c_str(), ircd->name, Config->EncModuleList.begin()->c_str(), Anope::Build().c_str());
 	}
-
-	/* CHGIDENT */
-	void inspircd_cmd_chgident(const Anope::string &nick, const Anope::string &vIdent)
-	{
-		if (!has_chgidentmod)
-			ircdproto->SendGlobops(OperServ, "CHGIDENT not loaded!");
-		else
-			send_cmd(HostServ ? HostServ->GetUID() : Config->Numeric, "CHGIDENT %s %s", nick.c_str(), vIdent.c_str());
-	}
-
-	/* SVSHOLD - set */
-	void SendSVSHold(const Anope::string &nick)
-	{
-		send_cmd(NickServ->GetUID(), "SVSHOLD %s %u :Being held for registered user", nick.c_str(), static_cast<unsigned>(Config->NSReleaseTimeout));
-	}
-
-	/* SVSHOLD - release */
-	void SendSVSHoldDel(const Anope::string &nick)
-	{
-		send_cmd(NickServ->GetUID(), "SVSHOLD %s", nick.c_str());
-	}
-
-	/* UNSZLINE */
-	void SendSZLineDel(const XLine *x)
-	{
-		send_cmd(Config->Numeric, "DELLINE Z %s", x->Mask.c_str());
-	}
-
-	/* SZLINE */
-	void SendSZLine(const XLine *x)
-	{
-		send_cmd(Config->Numeric, "ADDLINE Z %s %s %ld 0 :%s", x->Mask.c_str(), x->By.c_str(), static_cast<long>(Anope::CurTime), x->Reason.c_str());
-	}
-
-	void SendSVSJoin(const Anope::string &source, const Anope::string &nick, const Anope::string &chan, const Anope::string &)
-	{
-		User *u = finduser(nick);
-		BotInfo *bi = findbot(source);
-		send_cmd(bi->GetUID(), "SVSJOIN %s %s", u->GetUID().c_str(), chan.c_str());
-	}
-
-	void SendSVSPart(const Anope::string &source, const Anope::string &nick, const Anope::string &chan)
-	{
-		User *u = finduser(nick);
-		BotInfo *bi = findbot(source);
-		send_cmd(bi->GetUID(), "SVSPART %s %s", u->GetUID().c_str(), chan.c_str());
-	}
-
-	void SendSWhois(const Anope::string &, const Anope::string &who, const Anope::string &mask)
-	{
-		User *u = finduser(who);
-
-		send_cmd(Config->Numeric, "METADATA %s swhois :%s", u->GetUID().c_str(), mask.c_str());
-	}
-
-	void SendBOB()
-	{
-		send_cmd(Config->Numeric, "BURST %ld", static_cast<long>(Anope::CurTime));
-	}
-
-	void SendEOB()
-	{
-		send_cmd(Config->Numeric, "ENDBURST");
-	}
-
-	void SendGlobopsInternal(BotInfo *source, const Anope::string &buf)
-	{
-		send_cmd(source ? source->GetUID() : Config->Numeric, "SNONOTICE g :%s", buf.c_str());
-	}
-
-	void SendAccountLogin(const User *u, const NickCore *account)
-	{
-		send_cmd(Config->Numeric, "METADATA %s accountname :%s", u->GetUID().c_str(), account->display.c_str());
-	}
-
-	void SendAccountLogout(const User *u, const NickCore *account)
-	{
-		send_cmd(Config->Numeric, "METADATA %s accountname :", u->GetUID().c_str());
-	}
-
-	bool IsNickValid(const Anope::string &nick)
-	{
-		/* InspIRCd, like TS6, uses UIDs on collision, so... */
-		if (isdigit(nick[0]))
-			return false;
-
-		return true;
-	}
-} ircd_proto;
+};
 
 bool event_ftopic(const Anope::string &source, const std::vector<Anope::string> &params)
 {
@@ -319,45 +105,18 @@ bool event_ftopic(const Anope::string &source, const std::vector<Anope::string>
 	return true;
 }
 
-bool event_mode(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	if (params[0][0] == '#' || params[0][0] == '&')
-		do_cmode(source, params[0], params[2], params[1]);
-	else
-	{
-		/* InspIRCd lets opers change another
-		   users modes, we have to kludge this
-		   as it slightly breaks RFC1459
-		 */
-		User *u = finduser(source);
-		User *u2 = finduser(params[0]);
-
-		// This can happen with server-origin modes.
-		if (!u)
-			u = u2;
-
-		// if it's still null, drop it like fire.
-		// most likely situation was that server introduced a nick which we subsequently akilled
-		if (!u || !u2)
-			return true;
-
-		do_umode(u->nick, u2->nick, params[1]);
-	}
-	return true;
-}
-
 bool event_opertype(const Anope::string &source, const std::vector<Anope::string> &params)
 {
 	/* opertype is equivalent to mode +o because servers
 	   dont do this directly */
 	User *u;
 	u = finduser(source);
-	if (u && !is_oper(u))
+	if (u && !u->HasMode(UMODE_OPER))
 	{
 		std::vector<Anope::string> newparams;
 		newparams.push_back(source);
 		newparams.push_back("+o");
-		return event_mode(source, newparams);
+		return ircdmessage->OnMode(source, newparams);
 	}
 	return true;
 }
@@ -393,128 +152,7 @@ bool event_fmode(const Anope::string &source, const std::vector<Anope::string> &
 		modes += " " + params[n];
 	newparams.push_back(modes);
 
-	return event_mode(source, newparams);
-}
-
-/*
- * [Nov 03 22:31:57.695076 2009] debug: Received: :964 FJOIN #test 1223763723 +BPSnt :,964AAAAAB ,964AAAAAC ,966AAAAAA
- *
- * 0: name
- * 1: channel ts (when it was created, see protocol docs for more info)
- * 2: channel modes + params (NOTE: this may definitely be more than one param!)
- * last: users
- */
-bool event_fjoin(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	Channel *c = findchan(params[0]);
-	time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : 0;
-	bool keep_their_modes = true;
-
-	if (!c)
-	{
-		c = new Channel(params[0], ts);
-		c->SetFlag(CH_SYNCING);
-	}
-	/* Our creation time is newer than what the server gave us */
-	else if (c->creation_time > ts)
-	{
-		c->creation_time = ts;
-		c->Reset();
-
-		/* Reset mlock */
-		check_modes(c);
-	}
-	/* Their TS is newer than ours, our modes > theirs, unset their modes */
-	else if (ts > c->creation_time)
-		keep_their_modes = false;
-
-	/* If we need to keep their modes, and this FJOIN string contains modes */
-	if (keep_their_modes && params.size() >= 3)
-	{
-		Anope::string modes;
-		for (unsigned i = 2; i < params.size() - 1; ++i)
-			modes += " " + params[i];
-		if (!modes.empty())
-			modes.erase(modes.begin());
-		/* Set the modes internally */
-		c->SetModesInternal(NULL, modes);
-	}
-
-	spacesepstream sep(params[params.size() - 1]);
-	Anope::string buf;
-	while (sep.GetToken(buf))
-	{
-		std::list<ChannelMode *> Status;
-
-		/* Loop through prefixes and find modes for them */
-		while (buf[0] != ',')
-		{
-			ChannelMode *cm = ModeManager::FindChannelModeByChar(buf[0]);
-			if (!cm)
-			{
-				Log() << "Recieved unknown mode prefix " << buf[0] << " in FJOIN string";
-				buf.erase(buf.begin());
-				continue;
-			}
-
-			buf.erase(buf.begin());
-			if (keep_their_modes)
-				Status.push_back(cm);
-		}
-		buf.erase(buf.begin());
-
-		User *u = finduser(buf);
-		if (!u)
-		{
-			Log(LOG_DEBUG) << "FJOIN for nonexistant user " << buf << " on " << c->name;
-			continue;
-		}
-
-		EventReturn MOD_RESULT;
-		FOREACH_RESULT(I_OnPreJoinChannel, OnPreJoinChannel(u, c));
-
-		/* Add the user to the channel */
-		c->JoinUser(u);
-
-		/* Update their status internally on the channel
-		 * This will enforce secureops etc on the user
-		 */
-		for (std::list<ChannelMode *>::iterator it = Status.begin(), it_end = Status.end(); it != it_end; ++it)
-			c->SetModeInternal(*it, buf);
-
-		/* Now set whatever modes this user is allowed to have on the channel */
-		chan_set_correct_modes(u, c, 1);
-
-		/* Check to see if modules want the user to join, if they do
-		 * check to see if they are allowed to join (CheckKick will kick/ban them)
-		 * Don't trigger OnJoinChannel event then as the user will be destroyed
-		 */
-		if (MOD_RESULT != EVENT_STOP && c->ci && c->ci->CheckKick(u))
-			continue;
-
-		FOREACH_MOD(I_OnJoinChannel, OnJoinChannel(u, c));
-	}
-
-	/* Channel is done syncing */
-	if (c->HasFlag(CH_SYNCING))
-	{
-		/* Unset the syncing flag */
-		c->UnsetFlag(CH_SYNCING);
-		c->Sync();
-	}
-
-	return true;
-}
-
-/* Events */
-bool event_ping(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	if (params.size() == 1)
-		ircdproto->SendPong("", params[0]);
-	else if (params.size() == 2)
-		ircdproto->SendPong(params[1], params[0]);
-
-	return true;
+	return ircdmessage->OnMode(source, newparams);
 }
 
 bool event_time(const Anope::string &source, const std::vector<Anope::string> &params)
@@ -523,43 +161,6 @@ bool event_time(const Anope::string &source, const std::vector<Anope::string> &p
 		return true;
 
 	send_cmd(Config->Numeric, "TIME %s %s %ld", source.c_str(), params[1].c_str(), static_cast<long>(Anope::CurTime));
-
-	/* We handled it, don't pass it on to the core..
-	 * The core doesn't understand our syntax anyways.. ~ Viper */
-	return MOD_STOP;
-}
-
-bool event_436(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	m_nickcoll(params[0]);
-	return true;
-}
-
-bool event_away(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	m_away(source, !params.empty() ? params[0] : "");
-	return true;
-}
-
-/* Taken from hybrid.c, topic syntax is identical */
-bool event_topic(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	Channel *c = findchan(params[0]);
-
-	if (!c)
-	{
-		Log() << "TOPIC " << (params.size() > 1 ? params[1] : "") << " for nonexistent channel " << params[0];
-		return true;
-	}
-
-	c->ChangeTopicInternal(source, (params.size() > 1 ? params[1] : ""), Anope::CurTime);
-
-	return true;
-}
-
-bool event_squit(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	do_squit(source, params[0]);
 	return true;
 }
 
@@ -570,43 +171,11 @@ bool event_rsquit(const Anope::string &source, const std::vector<Anope::string>
 	if (s && s->HasFlag(SERVER_JUPED))
 		send_cmd(Config->Numeric, "SQUIT %s :%s", s->GetSID().c_str(), params.size() > 1 ? params[1].c_str() : "");
 
-	do_squit(source, params[0]);
+	ircdmessage->OnSQuit(source, params);
 
 	return true;
 }
 
-bool event_quit(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	do_quit(source, params[0]);
-	return true;
-}
-
-bool event_kill(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	User *u = finduser(params[0]);
-	BotInfo *bi = findbot(params[0]);
-	m_kill(u ? u->nick : (bi ? bi->nick : params[0]), params[1]);
-	return true;
-}
-
-bool event_kick(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	do_kick(source, params[0], params[1], params[2]);
-	return true;
-}
-
-bool event_join(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	do_join(source, params[0], (params.size() > 1 ? params[1] : ""));
-	return true;
-}
-
-bool event_motd(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	m_motd(source);
-	return true;
-}
-
 bool event_setname(const Anope::string &source, const std::vector<Anope::string> &params)
 {
 	User *u;
@@ -681,12 +250,6 @@ bool event_sethost(const Anope::string &source, const std::vector<Anope::string>
 	return true;
 }
 
-bool event_nick(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	do_nick(source, params[0], "", "", "", "", 0, "", "", "", "");
-	return true;
-}
-
 /*
  * [Nov 03 22:09:58.176252 2009] debug: Received: :964 UID 964AAAAAC 1225746297 w00t2 localhost testnet.user w00t 127.0.0.1 1225746302 +iosw +ACGJKLNOQcdfgjklnoqtx :Robin Burchell <w00t@inspircd.org>
  * 0: uid
@@ -754,42 +317,6 @@ bool event_chghost(const Anope::string &source, const std::vector<Anope::string>
 	return true;
 }
 
-/*
- * [Nov 04 00:08:46.308435 2009] debug: Received: SERVER irc.inspircd.com pass 0 964 :Testnet Central!
- * 0: name
- * 1: pass
- * 2: hops
- * 3: numeric
- * 4: desc
- */
-bool event_server(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	do_server(source, params[0], Anope::string(params[2]).is_pos_number_only() ? convertTo<unsigned>(params[2]) : 0, params[4], params[3]);
-	return true;
-}
-
-bool event_privmsg(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	if (!finduser(source))
-		return true; // likely a message from a server, which can happen.
-
-	m_privmsg(source, params[0], params[1]);
-	return true;
-}
-
-bool event_part(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	if (!params.empty())
-		do_part(source, params[0], params.size() > 1 ? params[1] : "");
-	return true;
-}
-
-bool event_whois(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	m_whois(source, params[0]);
-	return true;
-}
-
 bool event_metadata(const Anope::string &source, const std::vector<Anope::string> &params)
 {
 	if (params.size() < 3)
@@ -807,351 +334,352 @@ bool event_metadata(const Anope::string &source, const std::vector<Anope::string
 	return true;
 }
 
-bool event_capab(const Anope::string &source, const std::vector<Anope::string> &params)
+bool event_endburst(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (params[0].equals_cs("START"))
-	{
-		if (params.size() < 2 || (Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]): 0) < 1202)
-		{
-			send_cmd("", "ERROR :Protocol mismatch, no or invalid protocol version given in CAPAB START");
-			quitmsg = "Protocol mismatch, no or invalid protocol version given in CAPAB START";
-			quitting = true;
-			return MOD_STOP;
-		}
+	User *u = prev_u_intro;
+	Server *s = Server::Find(source);
 
-		/* reset CAPAB */
-		has_servicesmod = false;
-		has_svsholdmod = false;
-		has_chghostmod = false;
-		has_chgidentmod = false;
-	}
-	else if (params[0].equals_cs("CHANMODES"))
-	{
-		spacesepstream ssep(params[1]);
-		Anope::string capab;
+	if (!s)
+		throw CoreException("Got ENDBURST without a source");
 
-		while (ssep.GetToken(capab))
-		{
-			Anope::string modename = capab.substr(0, capab.find('='));
-			Anope::string modechar = capab.substr(capab.find('=') + 1);
-			ChannelMode *cm = NULL;
-
-			if (modename.equals_cs("admin"))
-				cm = new ChannelModeStatus(CMODE_PROTECT, "CMODE_PROTECT", modechar[1], modechar[0]);
-			else if (modename.equals_cs("allowinvite"))
-				cm = new ChannelMode(CMODE_ALLINVITE, "CMODE_ALLINVITE", modechar[0]);
-			else if (modename.equals_cs("auditorium"))
-				cm = new ChannelMode(CMODE_AUDITORIUM, "CMODE_AUDITORIUM", modechar[0]);
-			else if (modename.equals_cs("autoop"))
-				continue; // XXX Not currently tracked
-			else if (modename.equals_cs("ban"))
-				cm = new ChannelModeBan(modechar[0]);
-			else if (modename.equals_cs("banexception"))
-				cm = new ChannelModeExcept(modechar[0]);
-			else if (modename.equals_cs("blockcaps"))
-				cm = new ChannelMode(CMODE_BLOCKCAPS, "CMODE_BLOCKCAPS", modechar[0]);
-			else if (modename.equals_cs("blockcolor"))
-				cm = new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", modechar[0]);
-			else if (modename.equals_cs("c_registered"))
-				cm = new ChannelModeRegistered(modechar[0]);
-			else if (modename.equals_cs("censor"))
-				cm = new ChannelMode(CMODE_FILTER, "CMODE_FILTER", modechar[0]);
-			else if (modename.equals_cs("delayjoin"))
-				cm = new ChannelMode(CMODE_DELAYEDJOIN, "CMODE_DELAYEDJOIN", modechar[0]);
-			else if (modename.equals_cs("delaymsg"))
-				continue;
-			else if (modename.equals_cs("exemptchanops"))
-				continue; // XXX
-			else if (modename.equals_cs("filter"))
-				continue; // XXX
-			else if (modename.equals_cs("flood"))
-				cm = new ChannelModeFlood(modechar[0], true);
-			else if (modename.equals_cs("founder"))
-				cm = new ChannelModeStatus(CMODE_OWNER, "CMODE_OWNER", modechar[1], modechar[0]);
-			else if (modename.equals_cs("halfop"))
-				cm = new ChannelModeStatus(CMODE_HALFOP, "CMODE_HALFOP", modechar[1], modechar[0]);
-			else if (modename.equals_cs("history"))
-				continue; // XXX
-			else if (modename.equals_cs("invex"))
-				cm = new ChannelModeInvex(modechar[0]);
-			else if (modename.equals_cs("inviteonly"))
-				cm = new ChannelMode(CMODE_INVITE, "CMODE_INVITE", modechar[0]);
-			else if (modename.equals_cs("joinflood"))
-				cm = new ChannelModeParam(CMODE_JOINFLOOD, "CMODE_JOINFLOOD", modechar[0], true);
-			else if (modename.equals_cs("key"))
-				cm = new ChannelModeKey(modechar[0]);
-			else if (modename.equals_cs("kicknorejoin"))
-				cm = new ChannelModeParam(CMODE_NOREJOIN, "CMODE_NOREJOIN", modechar[0], true);
-			else if (modename.equals_cs("limit"))
-				cm = new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", modechar[0], true);
-			else if (modename.equals_cs("moderated"))
-				cm = new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", modechar[0]);
-			else if (modename.equals_cs("namebase"))
-				continue; // XXX
-			else if (modename.equals_cs("nickflood"))
-				cm = new ChannelModeParam(CMODE_NICKFLOOD, "CMODE_NICKFLOOD", modechar[0], true);
-			else if (modename.equals_cs("noctcp"))
-				cm = new ChannelMode(CMODE_NOCTCP, "CMODE_NOCTCP", modechar[0]);
-			else if (modename.equals_cs("noextmsg"))
-				cm = new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", modechar[0]);
-			else if (modename.equals_cs("nokick"))
-				cm = new ChannelMode(CMODE_NOKICK, "CMODE_NOKICK", modechar[0]);
-			else if (modename.equals_cs("noknock"))
-				cm = new ChannelMode(CMODE_NOKNOCK, "CMODE_NOKNOCK", modechar[0]);
-			else if (modename.equals_cs("nonick"))
-				cm = new ChannelMode(CMODE_NONICK, "CMODE_NONICK", modechar[0]);
-			else if (modename.equals_cs("nonotice"))
-				cm = new ChannelMode(CMODE_NONOTICE, "CMODE_NONOTICE", modechar[0]);
-			else if (modename.equals_cs("op"))
-				cm = new ChannelModeStatus(CMODE_OP, "CMODE_OP", modechar[1], modechar[0]);
-			else if (modename.equals_cs("operonly"))
-				cm = new ChannelModeOper(modechar[0]);
-			else if (modename.equals_cs("permanent"))
-				cm = new ChannelMode(CMODE_PERM, "CMODE_PERM", modechar[0]);
-			else if (modename.equals_cs("private"))
-				cm = new ChannelMode(CMODE_PRIVATE, "CMODE_PRIVATE", modechar[0]);
-			else if (modename.equals_cs("redirect"))
-				cm = new ChannelModeParam(CMODE_REDIRECT, "CMODE_REDIRECT", modechar[0], true);
-			else if (modename.equals_cs("reginvite"))
-				cm = new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", modechar[0]);
-			else if (modename.equals_cs("regmoderated"))
-				cm = new ChannelMode(CMODE_REGMODERATED, "CMODE_REGMODERATED", modechar[0]);
-			else if (modename.equals_cs("secret"))
-				cm = new ChannelMode(CMODE_SECRET, "CMODE_SECRET", modechar[0]);
-			else if (modename.equals_cs("sslonly"))
-				cm = new ChannelMode(CMODE_SSL, "CMODE_SSL", modechar[0]);
-			else if (modename.equals_cs("stripcolor"))
-				cm = new ChannelMode(CMODE_STRIPCOLOR, "CMODE_STRIPCOLOR", modechar[0]);
-			else if (modename.equals_cs("topiclock"))
-				cm = new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", modechar[0]);
-			else if (modename.equals_cs("voice"))
-				cm = new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", modechar[1], modechar[0]);
-			/* Unknown status mode, (customprefix) - add it */
-			else if (modechar.length() == 2)
-				cm = new ChannelModeStatus(CMODE_END, "", modechar[1], modechar[0]);
-
-			if (cm)
-				ModeManager::AddChannelMode(cm);
-			else
-				Log() << "Unrecognized mode string in CAPAB CHANMODES: " << capab;
-		}
-	}
-	if (params[0].equals_cs("USERMODES"))
+	/* Check if the previously introduced user was Id'd for the nickgroup of the nick he s currently using.
+	 * If not, validate the user. ~ Viper*/
+	prev_u_intro = NULL;
+	if (u && !u->server->IsSynced())
 	{
-		spacesepstream ssep(params[1]);
-		Anope::string capab;
+		NickAlias *na = findnick(u->nick);
 
-		while (ssep.GetToken(capab))
+		if (!na || na->nc != u->Account())
 		{
-			Anope::string modename = capab.substr(0, capab.find('='));
-			Anope::string modechar = capab.substr(capab.find('=') + 1);
-			UserMode *um = NULL;
-
-			if (modename.equals_cs("bot"))
-				um = new UserMode(UMODE_BOT, "UMODE_BOT", modechar[0]);
-			else if (modename.equals_cs("callerid"))
-				um = new UserMode(UMODE_CALLERID, "UMODE_CALLERID", modechar[0]);
-			else if (modename.equals_cs("cloak"))
-				um = new UserMode(UMODE_CLOAK, "UMODE_CLOAK", modechar[0]);
-			else if (modename.equals_cs("deaf"))
-				um = new UserMode(UMODE_DEAF, "UMODE_DEAF", modechar[0]);
-			else if (modename.equals_cs("deaf_commonchan"))
-				um = new UserMode(UMODE_COMMONCHANS, "UMODE_COMMONCHANS", modechar[0]);
-			else if (modename.equals_cs("helpop"))
-				um = new UserMode(UMODE_HELPOP, "UMODE_HELPOP", modechar[0]);
-			else if (modename.equals_cs("hidechans"))
-				um = new UserMode(UMODE_PRIV, "UMODE_PRIV", modechar[0]);
-			else if (modename.equals_cs("hideoper"))
-				um = new UserMode(UMODE_HIDEOPER, "UMODE_HIDEOPER", modechar[0]);
-			else if (modename.equals_cs("invisible"))
-				um = new UserMode(UMODE_INVIS, "UMODE_INVIS", modechar[0]);
-			else if (modename.equals_cs("invis-oper"))
-				um = new UserMode(UMODE_INVISIBLE_OPER, "UMODE_INVISIBLE_OPER", modechar[0]);
-			else if (modename.equals_cs("oper"))
-				um = new UserMode(UMODE_OPER, "UMODE_OPER", modechar[0]);
-			else if (modename.equals_cs("regdeaf"))
-				um = new UserMode(UMODE_REGPRIV, "UMODE_REGPRIV", modechar[0]);
-			else if (modename.equals_cs("servprotect"))
-				um = new UserMode(UMODE_PROTECTED, "UMODE_PROTECTED", modechar[0]);
-			else if (modename.equals_cs("showwhois"))
-				um = new UserMode(UMODE_WHOIS, "UMODE_WHOIS", modechar[0]);
-			else if (modename.equals_cs("snomask"))
-				continue; // XXX
-			else if (modename.equals_cs("u_censor"))
-				um = new UserMode(UMODE_FILTER, "UMODE_FILTER", modechar[0]);
-			else if (modename.equals_cs("u_registered"))
-				um = new UserMode(UMODE_REGISTERED, "UMODE_REGISTERED", modechar[0]);
-			else if (modename.equals_cs("u_stripcolor"))
-				um = new UserMode(UMODE_STRIPCOLOR, "UMODE_STRIPCOLOR", modechar[0]);
-			else if (modename.equals_cs("wallops"))
-				um = new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", modechar[0]);
-
-			if (um)
-				ModeManager::AddUserMode(um);
-			else
-				Log() << "Unrecognized mode string in CAPAB USERMODES: " << capab;
+			validate_user(u);
+			if (u->HasMode(UMODE_REGISTERED))
+				u->RemoveMode(NickServ, UMODE_REGISTERED);
 		}
+		else
+			/* Set them +r (to negate a possible -r on the stack) */
+			u->SetMode(NickServ, UMODE_REGISTERED);
 	}
-	else if (params[0].equals_cs("MODULES"))
-	{
-		spacesepstream ssep(params[1]);
-		Anope::string module;
 
-		while (ssep.GetToken(module))
-			if (module.equals_cs("m_svshold.so"))
-				has_svsholdmod = true;
-	}
-	else if (params[0].equals_cs("MODSUPPORT"))
-	{
-		spacesepstream ssep(params[1]);
-		Anope::string module;
+	Log(LOG_DEBUG) << "Processed ENDBURST for " << s->GetName();
 
-		while (ssep.GetToken(module))
-		{
-			if (module.equals_cs("m_services_account.so"))
-				has_servicesmod = true;
-			else if (module.equals_cs("m_chghost.so"))
-				has_chghostmod = true;
-			else if (module.equals_cs("m_chgident.so"))
-				has_chgidentmod = true;
-			else if (module.equals_cs("m_servprotect.so"))
-				ircd->pseudoclient_mode = "+Ik";
-		}
-	}
-	else if (params[0].equals_cs("CAPABILITIES"))
+	s->Sync(true);
+	return true;
+}
+
+class Inspircd20IRCdMessage : public InspircdIRCdMessage
+{
+ public:
+	bool OnCapab(const Anope::string &source, const std::vector<Anope::string> &params)
 	{
-		spacesepstream ssep(params[1]);
-		Anope::string capab;
-		while (ssep.GetToken(capab))
+		if (params[0].equals_cs("START"))
 		{
-			if (capab.find("CHANMODES") != Anope::string::npos)
+			if (params.size() < 2 || (Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0) < 1202)
 			{
-				Anope::string modes(capab.begin() + 10, capab.end());
-				commasepstream sep(modes);
-				Anope::string modebuf;
-
-				sep.GetToken(modebuf);
-				for (size_t t = 0, end = modebuf.length(); t < end; ++t)
-				{
-					if (ModeManager::FindChannelModeByChar(modebuf[t]))
-						continue;
-					// XXX list modes needs a bit of a rewrite
-					ModeManager::AddChannelMode(new ChannelModeList(CMODE_END, "", modebuf[t]));
-				}
-
-				sep.GetToken(modebuf);
-				for (size_t t = 0, end = modebuf.length(); t < end; ++t)
-				{
-					if (ModeManager::FindChannelModeByChar(modebuf[t]))
-						continue;
-					ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, "", modebuf[t]));
-				}
-
-				sep.GetToken(modebuf);
-				for (size_t t = 0, end = modebuf.length(); t < end; ++t)
-				{
-					if (ModeManager::FindChannelModeByChar(modebuf[t]))
-						continue;
-					ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, "", modebuf[t], true));
-				}
-
-				sep.GetToken(modebuf);
-				for (size_t t = 0, end = modebuf.length(); t < end; ++t)
-				{
-					if (ModeManager::FindChannelModeByChar(modebuf[t]))
-						continue;
-					ModeManager::AddChannelMode(new ChannelMode(CMODE_END, "", modebuf[t]));
-				}
+				send_cmd("", "ERROR :Protocol mismatch, no or invalid protocol version given in CAPAB START");
+				quitmsg = "Protocol mismatch, no or invalid protocol version given in CAPAB START";
+				quitting = true;
+				return MOD_STOP;
 			}
-			else if (capab.find("USERMODES") != Anope::string::npos)
-			{
-				Anope::string modes(capab.begin() + 10, capab.end());
-				commasepstream sep(modes);
-				Anope::string modebuf;
-
-				sep.GetToken(modebuf);
-				sep.GetToken(modebuf);
 
-				if (sep.GetToken(modebuf))
-					for (size_t t = 0, end = modebuf.length(); t < end; ++t)
-						ModeManager::AddUserMode(new UserModeParam(UMODE_END, "", modebuf[t]));
+			/* reset CAPAB */
+			has_servicesmod = false;
+			has_svsholdmod = false;
+			has_chghostmod = false;
+			has_chgidentmod = false;
+		}
+		else if (params[0].equals_cs("CHANMODES"))
+		{
+			spacesepstream ssep(params[1]);
+			Anope::string capab;
 
-				if (sep.GetToken(modebuf))
-					for (size_t t = 0, end = modebuf.length(); t < end; ++t)
-						ModeManager::AddUserMode(new UserMode(UMODE_END, "", modebuf[t]));
+			while (ssep.GetToken(capab))
+			{
+				Anope::string modename = capab.substr(0, capab.find('='));
+				Anope::string modechar = capab.substr(capab.find('=') + 1);
+				ChannelMode *cm = NULL;
+
+				if (modename.equals_cs("admin"))
+					cm = new ChannelModeStatus(CMODE_PROTECT, "CMODE_PROTECT", modechar[1], modechar[0]);
+				else if (modename.equals_cs("allowinvite"))
+					cm = new ChannelMode(CMODE_ALLINVITE, "CMODE_ALLINVITE", modechar[0]);
+				else if (modename.equals_cs("auditorium"))
+					cm = new ChannelMode(CMODE_AUDITORIUM, "CMODE_AUDITORIUM", modechar[0]);
+				else if (modename.equals_cs("autoop"))
+					continue; // XXX Not currently tracked
+				else if (modename.equals_cs("ban"))
+					cm = new ChannelModeBan(modechar[0]);
+				else if (modename.equals_cs("banexception"))
+					cm = new ChannelModeExcept(modechar[0]);
+				else if (modename.equals_cs("blockcaps"))
+					cm = new ChannelMode(CMODE_BLOCKCAPS, "CMODE_BLOCKCAPS", modechar[0]);
+				else if (modename.equals_cs("blockcolor"))
+					cm = new ChannelMode(CMODE_BLOCKCOLOR, "CMODE_BLOCKCOLOR", modechar[0]);
+				else if (modename.equals_cs("c_registered"))
+					cm = new ChannelModeRegistered(modechar[0]);
+				else if (modename.equals_cs("censor"))
+					cm = new ChannelMode(CMODE_FILTER, "CMODE_FILTER", modechar[0]);
+				else if (modename.equals_cs("delayjoin"))
+					cm = new ChannelMode(CMODE_DELAYEDJOIN, "CMODE_DELAYEDJOIN", modechar[0]);
+				else if (modename.equals_cs("delaymsg"))
+					continue;
+				else if (modename.equals_cs("exemptchanops"))
+					continue; // XXX
+				else if (modename.equals_cs("filter"))
+					continue; // XXX
+				else if (modename.equals_cs("flood"))
+					cm = new ChannelModeFlood(modechar[0], true);
+				else if (modename.equals_cs("founder"))
+					cm = new ChannelModeStatus(CMODE_OWNER, "CMODE_OWNER", modechar[1], modechar[0]);
+				else if (modename.equals_cs("halfop"))
+					cm = new ChannelModeStatus(CMODE_HALFOP, "CMODE_HALFOP", modechar[1], modechar[0]);
+				else if (modename.equals_cs("history"))
+					continue; // XXX
+				else if (modename.equals_cs("invex"))
+					cm = new ChannelModeInvex(modechar[0]);
+				else if (modename.equals_cs("inviteonly"))
+					cm = new ChannelMode(CMODE_INVITE, "CMODE_INVITE", modechar[0]);
+				else if (modename.equals_cs("joinflood"))
+					cm = new ChannelModeParam(CMODE_JOINFLOOD, "CMODE_JOINFLOOD", modechar[0], true);
+				else if (modename.equals_cs("key"))
+					cm = new ChannelModeKey(modechar[0]);
+				else if (modename.equals_cs("kicknorejoin"))
+					cm = new ChannelModeParam(CMODE_NOREJOIN, "CMODE_NOREJOIN", modechar[0], true);
+				else if (modename.equals_cs("limit"))
+					cm = new ChannelModeParam(CMODE_LIMIT, "CMODE_LIMIT", modechar[0], true);
+				else if (modename.equals_cs("moderated"))
+					cm = new ChannelMode(CMODE_MODERATED, "CMODE_MODERATED", modechar[0]);
+				else if (modename.equals_cs("namebase"))
+					continue; // XXX
+				else if (modename.equals_cs("nickflood"))
+					cm = new ChannelModeParam(CMODE_NICKFLOOD, "CMODE_NICKFLOOD", modechar[0], true);
+				else if (modename.equals_cs("noctcp"))
+					cm = new ChannelMode(CMODE_NOCTCP, "CMODE_NOCTCP", modechar[0]);
+				else if (modename.equals_cs("noextmsg"))
+					cm = new ChannelMode(CMODE_NOEXTERNAL, "CMODE_NOEXTERNAL", modechar[0]);
+				else if (modename.equals_cs("nokick"))
+					cm = new ChannelMode(CMODE_NOKICK, "CMODE_NOKICK", modechar[0]);
+				else if (modename.equals_cs("noknock"))
+					cm = new ChannelMode(CMODE_NOKNOCK, "CMODE_NOKNOCK", modechar[0]);
+				else if (modename.equals_cs("nonick"))
+					cm = new ChannelMode(CMODE_NONICK, "CMODE_NONICK", modechar[0]);
+				else if (modename.equals_cs("nonotice"))
+					cm = new ChannelMode(CMODE_NONOTICE, "CMODE_NONOTICE", modechar[0]);
+				else if (modename.equals_cs("op"))
+					cm = new ChannelModeStatus(CMODE_OP, "CMODE_OP", modechar[1], modechar[0]);
+				else if (modename.equals_cs("operonly"))
+					cm = new ChannelModeOper(modechar[0]);
+				else if (modename.equals_cs("permanent"))
+					cm = new ChannelMode(CMODE_PERM, "CMODE_PERM", modechar[0]);
+				else if (modename.equals_cs("private"))
+					cm = new ChannelMode(CMODE_PRIVATE, "CMODE_PRIVATE", modechar[0]);
+				else if (modename.equals_cs("redirect"))
+					cm = new ChannelModeParam(CMODE_REDIRECT, "CMODE_REDIRECT", modechar[0], true);
+				else if (modename.equals_cs("reginvite"))
+					cm = new ChannelMode(CMODE_REGISTEREDONLY, "CMODE_REGISTEREDONLY", modechar[0]);
+				else if (modename.equals_cs("regmoderated"))
+					cm = new ChannelMode(CMODE_REGMODERATED, "CMODE_REGMODERATED", modechar[0]);
+				else if (modename.equals_cs("secret"))
+					cm = new ChannelMode(CMODE_SECRET, "CMODE_SECRET", modechar[0]);
+				else if (modename.equals_cs("sslonly"))
+					cm = new ChannelMode(CMODE_SSL, "CMODE_SSL", modechar[0]);
+				else if (modename.equals_cs("stripcolor"))
+					cm = new ChannelMode(CMODE_STRIPCOLOR, "CMODE_STRIPCOLOR", modechar[0]);
+				else if (modename.equals_cs("topiclock"))
+					cm = new ChannelMode(CMODE_TOPIC, "CMODE_TOPIC", modechar[0]);
+				else if (modename.equals_cs("voice"))
+					cm = new ChannelModeStatus(CMODE_VOICE, "CMODE_VOICE", modechar[1], modechar[0]);
+				/* Unknown status mode, (customprefix) - add it */
+				else if (modechar.length() == 2)
+					cm = new ChannelModeStatus(CMODE_END, "", modechar[1], modechar[0]);
+
+				if (cm)
+					ModeManager::AddChannelMode(cm);
+				else
+					Log() << "Unrecognized mode string in CAPAB CHANMODES: " << capab;
 			}
-			else if (capab.find("MAXMODES=") != Anope::string::npos)
+		}
+		if (params[0].equals_cs("USERMODES"))
+		{
+			spacesepstream ssep(params[1]);
+			Anope::string capab;
+
+			while (ssep.GetToken(capab))
 			{
-				Anope::string maxmodes(capab.begin() + 9, capab.end());
-				ircd->maxmodes = maxmodes.is_pos_number_only() ? convertTo<unsigned>(maxmodes) : 3;
+				Anope::string modename = capab.substr(0, capab.find('='));
+				Anope::string modechar = capab.substr(capab.find('=') + 1);
+				UserMode *um = NULL;
+
+				if (modename.equals_cs("bot"))
+					um = new UserMode(UMODE_BOT, "UMODE_BOT", modechar[0]);
+				else if (modename.equals_cs("callerid"))
+					um = new UserMode(UMODE_CALLERID, "UMODE_CALLERID", modechar[0]);
+				else if (modename.equals_cs("cloak"))
+					um = new UserMode(UMODE_CLOAK, "UMODE_CLOAK", modechar[0]);
+				else if (modename.equals_cs("deaf"))
+					um = new UserMode(UMODE_DEAF, "UMODE_DEAF", modechar[0]);
+				else if (modename.equals_cs("deaf_commonchan"))
+					um = new UserMode(UMODE_COMMONCHANS, "UMODE_COMMONCHANS", modechar[0]);
+				else if (modename.equals_cs("helpop"))
+					um = new UserMode(UMODE_HELPOP, "UMODE_HELPOP", modechar[0]);
+				else if (modename.equals_cs("hidechans"))
+					um = new UserMode(UMODE_PRIV, "UMODE_PRIV", modechar[0]);
+				else if (modename.equals_cs("hideoper"))
+					um = new UserMode(UMODE_HIDEOPER, "UMODE_HIDEOPER", modechar[0]);
+				else if (modename.equals_cs("invisible"))
+					um = new UserMode(UMODE_INVIS, "UMODE_INVIS", modechar[0]);
+				else if (modename.equals_cs("invis-oper"))
+					um = new UserMode(UMODE_INVISIBLE_OPER, "UMODE_INVISIBLE_OPER", modechar[0]);
+				else if (modename.equals_cs("oper"))
+					um = new UserMode(UMODE_OPER, "UMODE_OPER", modechar[0]);
+				else if (modename.equals_cs("regdeaf"))
+					um = new UserMode(UMODE_REGPRIV, "UMODE_REGPRIV", modechar[0]);
+				else if (modename.equals_cs("servprotect"))
+					um = new UserMode(UMODE_PROTECTED, "UMODE_PROTECTED", modechar[0]);
+				else if (modename.equals_cs("showwhois"))
+					um = new UserMode(UMODE_WHOIS, "UMODE_WHOIS", modechar[0]);
+				else if (modename.equals_cs("snomask"))
+					continue; // XXX
+				else if (modename.equals_cs("u_censor"))
+					um = new UserMode(UMODE_FILTER, "UMODE_FILTER", modechar[0]);
+				else if (modename.equals_cs("u_registered"))
+					um = new UserMode(UMODE_REGISTERED, "UMODE_REGISTERED", modechar[0]);
+				else if (modename.equals_cs("u_stripcolor"))
+					um = new UserMode(UMODE_STRIPCOLOR, "UMODE_STRIPCOLOR", modechar[0]);
+				else if (modename.equals_cs("wallops"))
+					um = new UserMode(UMODE_WALLOPS, "UMODE_WALLOPS", modechar[0]);
+
+				if (um)
+					ModeManager::AddUserMode(um);
+				else
+					Log() << "Unrecognized mode string in CAPAB USERMODES: " << capab;
 			}
 		}
-	}
-	else if (params[0].equals_cs("END"))
-	{
-		if (!has_servicesmod)
+		else if (params[0].equals_cs("MODULES"))
 		{
-			send_cmd("", "ERROR :m_services_account.so is not loaded. This is required by Anope");
-			quitmsg = "ERROR: Remote server does not have the m_services_account module loaded, and this is required.";
-			quitting = true;
-			return MOD_STOP;
+			spacesepstream ssep(params[1]);
+			Anope::string module;
+
+			while (ssep.GetToken(module))
+				if (module.equals_cs("m_svshold.so"))
+					has_svsholdmod = true;
 		}
-		if (!ModeManager::FindUserModeByName(UMODE_PRIV))
+		else if (params[0].equals_cs("MODSUPPORT"))
 		{
-			send_cmd("", "ERROR :m_hidechans.so is not loaded. This is required by Anope");
-			quitmsg = "ERROR: Remote server does not have the m_hidechans module loaded, and this is required.";
-			quitting = true;
-			return MOD_STOP;
+			spacesepstream ssep(params[1]);
+			Anope::string module;
+
+			while (ssep.GetToken(module))
+			{
+				if (module.equals_cs("m_services_account.so"))
+					has_servicesmod = true;
+				else if (module.equals_cs("m_chghost.so"))
+					has_chghostmod = true;
+				else if (module.equals_cs("m_chgident.so"))
+					has_chgidentmod = true;
+				else if (module.equals_cs("m_servprotect.so"))
+					ircd->pseudoclient_mode = "+Ik";
+			}
 		}
-		if (!has_svsholdmod)
-			ircdproto->SendGlobops(OperServ, "SVSHOLD missing, Usage disabled until module is loaded.");
-		if (!has_chghostmod)
-			ircdproto->SendGlobops(OperServ, "CHGHOST missing, Usage disabled until module is loaded.");
-		if (!has_chgidentmod)
-			ircdproto->SendGlobops(OperServ, "CHGIDENT missing, Usage disabled until module is loaded.");
-		ircd->svshold = has_svsholdmod;
-	}
+		else if (params[0].equals_cs("CAPABILITIES"))
+		{
+			spacesepstream ssep(params[1]);
+			Anope::string capab;
+			while (ssep.GetToken(capab))
+			{
+				if (capab.find("CHANMODES") != Anope::string::npos)
+				{
+					Anope::string modes(capab.begin() + 10, capab.end());
+					commasepstream sep(modes);
+					Anope::string modebuf;
 
-	CapabParse(params);
+					sep.GetToken(modebuf);
+					for (size_t t = 0, end = modebuf.length(); t < end; ++t)
+					{
+						if (ModeManager::FindChannelModeByChar(modebuf[t]))
+							continue;
+						// XXX list modes needs a bit of a rewrite
+						ModeManager::AddChannelMode(new ChannelModeList(CMODE_END, "", modebuf[t]));
+					}
+
+					sep.GetToken(modebuf);
+					for (size_t t = 0, end = modebuf.length(); t < end; ++t)
+					{
+						if (ModeManager::FindChannelModeByChar(modebuf[t]))
+							continue;
+						ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, "", modebuf[t]));
+					}
 
-	return true;
-}
+					sep.GetToken(modebuf);
+					for (size_t t = 0, end = modebuf.length(); t < end; ++t)
+					{
+						if (ModeManager::FindChannelModeByChar(modebuf[t]))
+							continue;
+						ModeManager::AddChannelMode(new ChannelModeParam(CMODE_END, "", modebuf[t], true));
+					}
 
-bool event_endburst(const Anope::string &source, const std::vector<Anope::string> &params)
-{
-	User *u = prev_u_intro;
-	Server *s = Server::Find(source);
+					sep.GetToken(modebuf);
+					for (size_t t = 0, end = modebuf.length(); t < end; ++t)
+					{
+						if (ModeManager::FindChannelModeByChar(modebuf[t]))
+							continue;
+						ModeManager::AddChannelMode(new ChannelMode(CMODE_END, "", modebuf[t]));
+					}
+				}
+				else if (capab.find("USERMODES") != Anope::string::npos)
+				{
+					Anope::string modes(capab.begin() + 10, capab.end());
+					commasepstream sep(modes);
+					Anope::string modebuf;
 
-	if (!s)
-		throw CoreException("Got ENDBURST without a source");
+					sep.GetToken(modebuf);
+					sep.GetToken(modebuf);
 
-	/* Check if the previously introduced user was Id'd for the nickgroup of the nick he s currently using.
-	 * If not, validate the user. ~ Viper*/
-	prev_u_intro = NULL;
-	if (u && !u->server->IsSynced())
-	{
-		NickAlias *na = findnick(u->nick);
+					if (sep.GetToken(modebuf))
+						for (size_t t = 0, end = modebuf.length(); t < end; ++t)
+							ModeManager::AddUserMode(new UserModeParam(UMODE_END, "", modebuf[t]));
 
-		if (!na || na->nc != u->Account())
+					if (sep.GetToken(modebuf))
+						for (size_t t = 0, end = modebuf.length(); t < end; ++t)
+							ModeManager::AddUserMode(new UserMode(UMODE_END, "", modebuf[t]));
+				}
+				else if (capab.find("MAXMODES=") != Anope::string::npos)
+				{
+					Anope::string maxmodes(capab.begin() + 9, capab.end());
+					ircd->maxmodes = maxmodes.is_pos_number_only() ? convertTo<unsigned>(maxmodes) : 3;
+				}
+			}
+		}
+		else if (params[0].equals_cs("END"))
 		{
-			validate_user(u);
-			if (u->HasMode(UMODE_REGISTERED))
-				u->RemoveMode(NickServ, UMODE_REGISTERED);
+			if (!has_servicesmod)
+			{
+				send_cmd("", "ERROR :m_services_account.so is not loaded. This is required by Anope");
+				quitmsg = "ERROR: Remote server does not have the m_services_account module loaded, and this is required.";
+				quitting = true;
+				return MOD_STOP;
+			}
+			if (!ModeManager::FindUserModeByName(UMODE_PRIV))
+			{
+				send_cmd("", "ERROR :m_hidechans.so is not loaded. This is required by Anope");
+				quitmsg = "ERROR: Remote server does not have the m_hidechans module loaded, and this is required.";
+				quitting = true;
+				return MOD_STOP;
+			}
+			if (!has_svsholdmod)
+				ircdproto->SendGlobops(OperServ, "SVSHOLD missing, Usage disabled until module is loaded.");
+			if (!has_chghostmod)
+				ircdproto->SendGlobops(OperServ, "CHGHOST missing, Usage disabled until module is loaded.");
+			if (!has_chgidentmod)
+				ircdproto->SendGlobops(OperServ, "CHGIDENT missing, Usage disabled until module is loaded.");
+			ircd->svshold = has_svsholdmod;
 		}
-		else
-			/* Set them +r (to negate a possible -r on the stack) */
-			u->SetMode(NickServ, UMODE_REGISTERED);
-	}
 
-	Log(LOG_DEBUG) << "Processed ENDBURST for " << s->GetName();
-
-	s->Sync(true);
-	return true;
-}
+		IRCdMessage::OnCapab(source, params);
+	}
+};
 
 bool ChannelModeFlood::IsValid(const Anope::string &value) const
 {
-	//char *dp, *end;
 	Anope::string rest;
 	if (!value.empty() && value[0] != ':' && convertTo<int>(value[0] == '*' ? value.substr(1) : value, rest, false) > 0 && rest[0] == ':' && rest.length() > 1 && convertTo<int>(rest.substr(1), rest, false) > 0 && rest.empty())
 		return true;
@@ -1161,37 +689,36 @@ bool ChannelModeFlood::IsValid(const Anope::string &value) const
 
 class ProtoInspIRCd : public Module
 {
-	Message message_endburst, message_436, message_away, message_join, message_kick, message_kill, message_mode, message_motd,
-		message_nick, message_uid, message_capab, message_part, message_ping, message_time, message_privmsg, message_quit,
-		message_server, message_squit, message_rsquit, message_topic, message_whois, message_svsmode, message_fhost,
+	Message message_endburst,
+		message_uid, message_time,
+		message_rsquit, message_svsmode, message_fhost,
 		message_chgident, message_fname, message_sethost, message_setident, message_setname, message_fjoin, message_fmode,
 		message_ftopic, message_opertype, message_idle, message_metadata;
+	
+	InspIRCdProto ircd_proto;
+	Inspircd20IRCdMessage ircd_message;
  public:
 	ProtoInspIRCd(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator),
-		message_endburst("ENDBURST", event_endburst), message_436("436", event_436), message_away("AWAY", event_away),
-		message_join("JOIN", event_join), message_kick("KICK", event_kick), message_kill("KILL", event_kill),
-		message_mode("MODE", event_mode), message_motd("MOTD", event_motd), message_nick("NICK", event_nick),
-		message_uid("UID", event_uid), message_capab("CAPAB", event_capab), message_part("PART", event_part),
-		message_ping("PING", event_ping), message_time("TIME", event_time), message_privmsg("PRIVMSG", event_privmsg),
-		message_quit("QUIT", event_quit), message_server("SERVER", event_server), message_squit("SQUIT", event_squit),
-		message_rsquit("RSQUIT", event_rsquit), message_topic("TOPIC", event_topic), message_whois("WHOIS", event_whois),
-		message_svsmode("SVSMODE", event_mode), message_fhost("FHOST", event_chghost),
+		message_endburst("ENDBURST", event_endburst), message_uid("UID", event_uid),
+		message_time("TIME", event_time), message_rsquit("RSQUIT", event_rsquit),
+		message_svsmode("SVSMODE", OnMode), message_fhost("FHOST", event_chghost),
 		message_chgident("FIDENT", event_chgident), message_fname("FNAME", event_chgname),
 		message_sethost("SETHOST", event_sethost), message_setident("SETIDENT", event_setident),
-		message_setname("SETNAME", event_setname), message_fjoin("FJOIN", event_fjoin), message_fmode("FMODE", event_fmode),
-		message_ftopic("FTOPIC", event_ftopic), message_opertype("OPERTYPE", event_opertype), message_idle("IDLE", event_idle),
+		message_setname("SETNAME", event_setname), message_fjoin("FJOIN", OnSJoin),
+		message_fmode("FMODE", event_fmode), message_ftopic("FTOPIC", event_ftopic),
+		message_opertype("OPERTYPE", event_opertype), message_idle("IDLE", event_idle),
 		message_metadata("METADATA", event_metadata)
 	{
 		this->SetAuthor("Anope");
 		this->SetType(PROTOCOL);
 
-		pmodule_ircd_var(myIrcd);
-
 		CapabType c[] = { CAPAB_NOQUIT, CAPAB_SSJ3, CAPAB_NICK2, CAPAB_VL, CAPAB_TLKEXT };
 		for (unsigned i = 0; i < 5; ++i)
 			Capab.SetFlag(c[i]);
 
-		pmodule_ircd_proto(&ircd_proto);
+		pmodule_ircd_var(myIrcd);
+		pmodule_ircd_proto(&this->ircd_proto);
+		pmodule_ircd_message(&this->ircd_message);
 
 		ModuleManager::Attach(I_OnUserNickChange, this);
 	}