]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree/treesocket2.cpp
Merge insp20
[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket2.cpp
index 6f66598d949fdf5a7554762ead3785e74260c2b4..fdd28a73425b0fd32709b2b5230ada19b45b4555 100644 (file)
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007-2008, 2012 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-#include "socketengine.h"
-
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
-
-/* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/handshaketimer.h */
-
-void TreeSocket::WriteLine(std::string line)
-{
-       Instance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str());
-       line.append("\r\n");
-       this->Write(line);
-}
 
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "treesocket.h"
+#include "resolvers.h"
 
 /* Handle ERROR command */
-bool TreeSocket::Error(std::deque<std::string> &params)
+void TreeSocket::Error(parameterlist &params)
 {
-       if (params.size() < 1)
-               return false;
-       this->Instance->SNO->WriteToSnoMask('l',"ERROR from %s: %s",(!InboundServerName.empty() ? InboundServerName.c_str() : myhost.c_str()),params[0].c_str());
-       /* we will return false to cause the socket to close. */
-       return false;
+       std::string msg = params.size() ? params[0] : "";
+       SetError("received ERROR " + msg);
 }
 
-void TreeSocket::Split(const std::string &line, std::deque<std::string> &n)
+void TreeSocket::Split(const std::string& line, std::string& prefix, std::string& command, parameterlist& params)
 {
-       n.clear();
        irc::tokenstream tokens(line);
+
+       if (!tokens.GetToken(prefix))
+               return;
+
+       if (prefix[0] == ':')
+       {
+               prefix = prefix.substr(1);
+
+               if (prefix.empty())
+               {
+                       this->SendError("BUG (?) Empty prefix received: " + line);
+                       return;
+               }
+               if (!tokens.GetToken(command))
+               {
+                       this->SendError("BUG (?) Empty command received: " + line);
+                       return;
+               }
+       }
+       else
+       {
+               command = prefix;
+               prefix.clear();
+       }
+       if (command.empty())
+               this->SendError("BUG (?) Empty command received: " + line);
+
        std::string param;
        while (tokens.GetToken(param))
        {
-               n.push_back(param);
+               params.push_back(param);
        }
-       return;
 }
 
-bool TreeSocket::ProcessLine(std::string &line)
+void TreeSocket::ProcessLine(std::string &line)
 {
-       std::deque<std::string> params;
-       irc::string command;
        std::string prefix;
+       std::string command;
+       parameterlist params;
 
-       line = line.substr(0, line.find_first_of("\r\n"));
-
-       if (line.empty())
-               return true;
+       ServerInstance->Logs->Log("m_spanningtree", LOG_RAWIO, "S[%d] I %s", this->GetFd(), line.c_str());
 
-       Instance->Logs->Log("m_spanningtree",DEBUG, "S[%d] I %s", this->GetFd(), line.c_str());
+       Split(line, prefix, command, params);
 
-       this->Split(line.c_str(),params);
-
-       if (params.empty())
-               return true;
-
-       if ((params[0][0] == ':') && (params.size() > 1))
-       {
-               prefix = params[0].substr(1);
-               params.pop_front();
-
-               if (prefix.empty())
-               {
-                       this->SendError("BUG (?) Empty prefix recieved.");
-                       return false;
-               }
-       }
-
-       command = params[0].c_str();
-       params.pop_front();
+       if (command.empty())
+               return;
 
        switch (this->LinkState)
        {
-               TreeServer* Node;
-
                case WAIT_AUTH_1:
                        /*
                         * State WAIT_AUTH_1:
@@ -117,27 +109,23 @@ bool TreeSocket::ProcessLine(std::string &line)
                        }
                        else if (command == "SERVER")
                        {
-                               return this->Inbound_Server(params);
+                               this->Inbound_Server(params);
                        }
                        else if (command == "ERROR")
                        {
-                               return this->Error(params);
+                               this->Error(params);
                        }
                        else if (command == "USER")
                        {
                                this->SendError("Client connections to this port are prohibited.");
-                               return false;
                        }
                        else if (command == "CAPAB")
                        {
-                               return this->Capab(params);
+                               this->Capab(params);
                        }
                        else
                        {
-                               // XXX ...wtf.
-                               irc::string error = "Invalid command in negotiation phase: " + command;
-                               this->SendError(assign(error));
-                               return false;
+                               this->SendError("Invalid command in negotiation phase: " + command);
                        }
                break;
                case WAIT_AUTH_2:
@@ -154,65 +142,61 @@ bool TreeSocket::ProcessLine(std::string &line)
                                 * Both of these aren't allowable, so block them here. -- w
                                 */
                                this->SendError("You may not re-authenticate or commence netburst without sending BURST.");
-                               return true;
                        }
                        else if (command == "BURST")
                        {
                                if (params.size())
                                {
-                                       time_t them = atoi(params[0].c_str());
-                                       time_t delta = them - Instance->Time();
+                                       time_t them = ConvToInt(params[0]);
+                                       time_t delta = them - ServerInstance->Time();
                                        if ((delta < -600) || (delta > 600))
                                        {
-                                               Instance->SNO->WriteToSnoMask('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs((long)delta));
+                                               ServerInstance->SNO->WriteGlobalSno('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs((long)delta));
                                                SendError("Your clocks are out by "+ConvToStr(abs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
-                                               return false;
+                                               return;
                                        }
                                        else if ((delta < -30) || (delta > 30))
                                        {
-                                               Instance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs((long)delta));
+                                               ServerInstance->SNO->WriteGlobalSno('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs((long)delta));
                                        }
                                }
+
+                               // Check for duplicate server name/sid again, it's possible that a new
+                               // server was introduced while we were waiting for them to send BURST.
+                               // (we do not reserve their server name/sid when they send SERVER, we do it now)
+                               if (!CheckDuplicate(capab->name, capab->sid))
+                                       return;
+
                                this->LinkState = CONNECTED;
-                               Link* lnk = Utils->FindLink(InboundServerName);
+                               Utils->timeoutlist.erase(this);
 
-                               Node = new TreeServer(this->Utils, this->Instance, InboundServerName, InboundDescription, InboundSID, Utils->TreeRoot, this, lnk ? lnk->Hidden : false);
+                               linkID = capab->name;
 
-                               if (Node->DuplicateID())
-                               {
-                                       this->SendError("Server ID "+InboundSID+" already exists on the network!");
-                                       this->Instance->SNO->WriteToSnoMask('l',"Server \2"+InboundServerName+"\2 being introduced from \2" + prefix + "\2 denied, server ID already exists on the network. Closing link.");
-                                       return false;
-                               }
+                               MyRoot = new TreeServer(Utils, capab->name, capab->description, capab->sid, Utils->TreeRoot, this, capab->hidden);
+                               Utils->TreeRoot->AddChild(MyRoot);
+
+                               MyRoot->bursting = true;
+                               this->DoBurst(MyRoot);
 
-                               Utils->TreeRoot->AddChild(Node);
-                               params.clear();
-                               params.push_back(InboundServerName);
-                               params.push_back("*");
-                               params.push_back("1");
-                               params.push_back(InboundSID);
-                               params.push_back(":"+InboundDescription);
-                               Utils->DoOneToAllButSender(Instance->Config->GetSID(),"SERVER",params,InboundServerName);
-                               Node->bursting = true;
-                               this->DoBurst(Node);
+                               parameterlist sparams;
+                               sparams.push_back(MyRoot->GetName());
+                               sparams.push_back("*");
+                               sparams.push_back("0");
+                               sparams.push_back(MyRoot->GetID());
+                               sparams.push_back(":" + MyRoot->GetDesc());
+                               Utils->DoOneToAllButSender(ServerInstance->Config->GetSID(), "SERVER", sparams, MyRoot->GetName());
+                               Utils->DoOneToAllButSender(MyRoot->GetID(), "BURST", params, MyRoot->GetName());
                        }
                        else if (command == "ERROR")
                        {
-                               return this->Error(params);
+                               this->Error(params);
                        }
                        else if (command == "CAPAB")
                        {
-                               return this->Capab(params);
+                               this->Capab(params);
                        }
 
                break;
-               case LISTENER:
-                       /*
-                        * This really shouldn't happen.
-                        */
-                       this->SendError("Internal error -- listening socket accepted its own descriptor!!!");
-                       return false;
-               break;
                case CONNECTING:
                        /*
                         * State CONNECTING:
@@ -223,478 +207,337 @@ bool TreeSocket::ProcessLine(std::string &line)
                        if (command == "SERVER")
                        {
                                // Our credentials have been accepted, send netburst. (this puts US into the CONNECTED state)
-                               return this->Outbound_Reply_Server(params);
+                               this->Outbound_Reply_Server(params);
                        }
                        else if (command == "ERROR")
                        {
-                               return this->Error(params);
+                               this->Error(params);
                        }
                        else if (command == "CAPAB")
                        {
-                               return this->Capab(params);
+                               this->Capab(params);
                        }
                break;
                case CONNECTED:
                        /*
-                       * State CONNECTED:
+                        * State CONNECTED:
                         *  Credentials have been exchanged, we've gotten their 'BURST' (or sent ours).
                         *  Anything from here on should be accepted a little more reasonably.
                         */
-                       if (!prefix.empty())
-                       {
-                               /*
-                                * Check for fake direction here, and drop any instances that are found.
-                                * What is fake direction? Imagine the following server setup:
-                                *    0AA <-> 0AB <-> 0AC
-                                * Fake direction would be 0AC sending a message to 0AB claiming to be from
-                                * 0AA, or something similar. Basically, a message taking a path that *cannot*
-                                * be correct.
-                                *
-                                * When would this be seen?
-                                * Well, hopefully never. It could be caused by race conditions, bugs, or
-                                * "miscreant" servers, though, so let's check anyway. -- w
-                                */
-                               std::string direction = prefix;
-
-                               User *t = this->Instance->FindUUID(prefix);
-                               if (t)
-                               {
-                                       direction = t->server;
-                               }
-
-                               TreeServer* route_back_again = Utils->BestRouteTo(direction);
-                               if ((!route_back_again) || (route_back_again->GetSocket() != this))
-                               {
-                                       if (route_back_again)
-                                               Instance->Logs->Log("m_spanningtree",DEBUG,"Protocol violation: Fake direction in command '%s' from connection '%s'",line.c_str(),this->GetName().c_str());
-                                       return true;
-                               }
-                               /* Fix by brain:
-                                * When there is activity on the socket, reset the ping counter so
-                                * that we're not wasting bandwidth pinging an active server.
-                                */
-                               route_back_again->SetNextPingTime(Instance->Time() + Utils->PingFreq);
-                               route_back_again->SetPingFlag();
-                       }
-                       else
-                       {
-                               /*
-                                * Empty prefix from a server to server link:
-                                *  This is somewhat bad/naughty, so let's set the prefix
-                                *  to be the link that we got it from, so we don't break anything. -- w
-                                */
-                               TreeServer* n = Utils->FindServer(GetName());
-                               if (n)
-                                       prefix = n->GetID();
-                               else
-                                       prefix = GetName();
-                       }
-
-                       /*
-                        * First up, check for any malformed commands (e.g. MODE without a timestamp)
-                        * and rewrite commands where necessary (SVSMODE -> MODE for services). -- w
-                        */
-                       if (command == "SVSMODE") // This isn't in an "else if" so we still force FMODE for changes on channels.
-                               command = "MODE";
+                       this->ProcessConnectedLine(prefix, command, params);
+               break;
+               case DYING:
+               break;
+       }
+}
 
-                       if (command == "MODE")
-                       {
-                               if (params.size() >= 2)
-                               {
-                                       Channel* channel = Instance->FindChan(params[0]);
-                                       if (channel)
-                                       {
-                                               this->SendError("MODE may no longer be used on channels. Please use FMODE, with correct timestamp rules.");
-                                               return false;
-                                       }
-                               }
-                       }
+void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, parameterlist& params)
+{
+       User* who = ServerInstance->FindUUID(prefix);
+       std::string direction;
 
+       if (!who)
+       {
+               TreeServer* ServerSource = Utils->FindServer(prefix);
+               if (prefix.empty())
+                       ServerSource = MyRoot;
 
-                       /*
-                        * Now, check for (and parse) commands as appropriate. -- w
+               if (ServerSource)
+               {
+                       who = ServerSource->ServerUser;
+               }
+               else
+               {
+                       /* It is important that we don't close the link here, unknown prefix can occur
+                        * due to various race conditions such as the KILL message for a user somehow
+                        * crossing the users QUIT further upstream from the server. Thanks jilles!
                         */
 
-                       /* Find the server that this command originated from, used in the handlers below */
-                       TreeServer *ServerSource = Utils->FindServer(prefix);
-
-                       /* Find the link we just got this from so we don't bounce it back incorrectly */
-                       std::string sourceserv = this->myhost;
-                       if (!this->InboundServerName.empty())
+                       if ((prefix.length() == UIDGenerator::UUID_LENGTH) && (isdigit(prefix[0])) &&
+                               ((command == "FMODE") || (command == "MODE") || (command == "KICK") || (command == "TOPIC") || (command == "KILL") || (command == "ADDLINE") || (command == "DELLINE")))
                        {
-                               sourceserv = this->InboundServerName;
-                       }
+                               /* Special case, we cannot drop these commands as they've been committed already on a
+                                * part of the network by the time we receive them, so in this scenario pretend the
+                                * command came from a server to avoid desync.
+                                */
 
-                       /*
-                        * XXX one of these days, this needs to be moved into class Commands.
-                        */
-                       if (command == "UID")
-                       {
-                               return this->ParseUID(prefix, params);
-                       }
-                       else if (command == "FJOIN")
-                       {
-                               return this->ForceJoin(prefix,params);
-                       }
-                       else if ((command == "NOTICE" || command == "PRIVMSG") && (Utils->IsServer(prefix)))
-                       {
-                               return this->ServerMessage(assign(command), prefix, params, sourceserv);
-                       }
-                       else if (command == "STATS")
-                       {
-                               return this->Stats(prefix, params);
-                       }
-                       else if (command == "MOTD")
-                       {
-                               return this->Motd(prefix, params);
-                       }
-                       else if (command == "KILL" && ServerSource)
-                       {
-                               // Kill from a server
-                               return this->RemoteKill(prefix,params);
-                       }
-                       else if (command == "MODULES")
-                       {
-                               return this->Modules(prefix, params);
-                       }
-                       else if (command == "ADMIN")
-                       {
-                               return this->Admin(prefix, params);
-                       }
-                       else if (command == "MAP")
-                       {
-                               User* user = Instance->FindNick(prefix);
-                               if (user)
-                               {
-                                       std::vector<std::string> p(params.begin(), params.end());
-                                       return Utils->Creator->HandleMap(p, user);
-                               }
-                       }
-                       else if (command == "SERVER")
-                       {
-                               return this->RemoteServer(prefix,params);
-                       }
-                       else if (command == "ERROR")
-                       {
-                               return this->Error(params);
-                       }
-                       else if (command == "OPERTYPE")
-                       {
-                               return this->OperType(prefix,params);
-                       }
-                       else if (command == "FMODE")
-                       {
-                               return this->ForceMode(prefix,params);
-                       }
-                       else if (command == "FTOPIC")
-                       {
-                               return this->ForceTopic(prefix,params);
-                       }
-                       else if (command == "METADATA")
-                       {
-                               return this->MetaData(prefix,params);
-                       }
-                       else if (command == "PING")
-                       {
-                               return this->LocalPing(prefix,params);
-                       }
-                       else if (command == "PONG")
-                       {
-                               return this->LocalPong(prefix,params);
-                       }
-                       else if (command == "VERSION")
-                       {
-                               return this->ServerVersion(prefix,params);
-                       }
-                       else if (command == "FHOST")
-                       {
-                               return this->ChangeHost(prefix,params);
-                       }
-                       else if (command == "FNAME")
-                       {
-                               return this->ChangeName(prefix,params);
-                       }
-                       else if (command == "ADDLINE")
-                       {
-                               return this->AddLine(prefix,params);
-                       }
-                       else if (command == "DELLINE")
-                       {
-                               return this->DelLine(prefix,params);
-                       }
-                       else if (command == "SVSNICK")
-                       {
-                               return this->ForceNick(prefix,params);
-                       }
-                       else if (command == "OPERQUIT")
-                       {
-                               return this->OperQuit(prefix,params);
-                       }
-                       else if (command == "IDLE")
-                       {
-                               return this->Whois(prefix,params);
-                       }
-                       else if (command == "PUSH")
-                       {
-                               return this->Push(prefix,params);
+                               who = ServerInstance->FindUUID(prefix.substr(0, 3));
+                               if (!who)
+                                       who = this->MyRoot->ServerUser;
                        }
-                       else if (command == "TIME")
+                       else
                        {
-                               return this->Time(prefix,params);
+                               ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "Command '%s' from unknown prefix '%s'! Dropping entire command.",
+                                       command.c_str(), prefix.c_str());
+                               return;
                        }
-                       else if ((command == "KICK") && (Utils->IsServer(prefix)))
-                       {
-                               if (params.size() == 3)
-                               {
-                                       TreeServer* pf = Utils->FindServer(prefix);
-                                       User* user = this->Instance->FindNick(params[1]);
-                                       Channel* chan = this->Instance->FindChan(params[0]);
-                                       if (pf && user && chan)
-                                       {
-                                               if (!chan->ServerKickUser(user, params[2].c_str(), false, pf->GetName().c_str()))
-                                                       /* Yikes, the channels gone! */
-                                                       delete chan;
-                                       }
-                               }
+               }
+       }
 
-                               return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
-                       }
-                       else if (command == "SVSJOIN")
-                       {
-                               return this->ServiceJoin(prefix,params);
-                       }
-                       else if (command == "SVSPART")
-                       {
-                               return this->ServicePart(prefix,params);
-                       }
-                       else if (command == "SQUIT")
-                       {
-                               if (params.size() == 2)
-                               {
-                                       this->Squit(Utils->FindServer(params[0]),params[1]);
-                               }
-                               return true;
-                       }
-                       else if (command == "MODENOTICE")
-                       {
-                               if (params.size() >= 2)
-                               {
-                                       if (ServerSource)
-                                               Instance->Users->WriteMode(params[0].c_str(), WM_AND, "*** From %s: %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()), params[1].c_str());
-                               }
-                               return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
-                       }
-                       else if (command == "SNONOTICE")
-                       {
-                               if (params.size() >= 2)
-                               {
-                                       Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": "+ params[1]);
-                                       return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
-                               }
+       // Make sure prefix is still good
+       direction = who->server;
+       prefix = who->uuid;
+
+       /*
+        * Check for fake direction here, and drop any instances that are found.
+        * What is fake direction? Imagine the following server setup:
+        *    0AA <-> 0AB <-> 0AC
+        * Fake direction would be 0AC sending a message to 0AB claiming to be from
+        * 0AA, or something similar. Basically, a message taking a path that *cannot*
+        * be correct.
+        *
+        * When would this be seen?
+        * Well, hopefully never. It could be caused by race conditions, bugs, or
+        * "miscreant" servers, though, so let's check anyway. -- w
+        *
+        * We also check here for totally invalid prefixes (prefixes that are neither
+        * a valid SID or a valid UUID, so that invalid UUID or SID never makes it
+        * to the higher level functions. -- B
+        */
+       TreeServer* route_back_again = Utils->BestRouteTo(direction);
+       if ((!route_back_again) || (route_back_again->GetSocket() != this))
+       {
+               if (route_back_again)
+                       ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"Protocol violation: Fake direction '%s' from connection '%s'",
+                               prefix.c_str(),linkID.c_str());
+               return;
+       }
 
-                       }
-                       else if (command == "BURST")
-                       {
-                               // Set prefix server as bursting
-                               if (!ServerSource)
-                               {
-                                       this->Instance->SNO->WriteToSnoMask('l', "WTF: Got BURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
-                                       return false;
-                               }
+       /*
+        * First up, check for any malformed commands (e.g. MODE without a timestamp)
+        * and rewrite commands where necessary (SVSMODE -> MODE for services). -- w
+        */
+       if (command == "SVSMODE") // This isn't in an "else if" so we still force FMODE for changes on channels.
+               command = "MODE";
 
-                               ServerSource->bursting = true;
-                               return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
-                       }
-                       else if (command == "ENDBURST")
-                       {
-                               if (!ServerSource)
-                               {
-                                       this->Instance->SNO->WriteToSnoMask('l', "WTF: Got ENDBURST from a nonexistant server(?): %s", (ServerSource ? ServerSource->GetName().c_str() : prefix.c_str()));
-                                       return false;
-                               }
+       if (proto_version < ProtocolVersion)
+       {
+               if (!PreProcessOldProtocolMessage(who, command, params))
+                       return;
+       }
 
-                               ServerSource->FinishBurst();
-                               return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
-                       }
-                       else if (command == "ENCAP")
-                       {
-                               return this->Encap(prefix, params);
-                       }
-                       else if (command == "MODE")
-                       {
-                               // Server-prefix MODE.
-                               std::vector<std::string> modelist(params.begin(), params.end());
+       // TODO move all this into Commands
+       if (command == "MAP")
+       {
+               Utils->Creator->HandleMap(params, who);
+       }
+       else if (command == "SERVER")
+       {
+               this->RemoteServer(prefix,params);
+       }
+       else if (command == "ERROR")
+       {
+               this->Error(params);
+       }
+       else if (command == "AWAY")
+       {
+               this->Away(prefix,params);
+       }
+       else if (command == "PING")
+       {
+               this->LocalPing(prefix,params);
+       }
+       else if (command == "PONG")
+       {
+               TreeServer *s = Utils->FindServer(prefix);
+               if (s && s->bursting)
+               {
+                       ServerInstance->SNO->WriteGlobalSno('l',"Server \002%s\002 has not finished burst, forcing end of burst (send ENDBURST!)", prefix.c_str());
+                       s->FinishBurst();
+               }
+               this->LocalPong(prefix,params);
+       }
+       else if (command == "VERSION")
+       {
+               this->ServerVersion(prefix,params);
+       }
+       else if (command == "ADDLINE")
+       {
+               this->AddLine(prefix,params);
+       }
+       else if (command == "DELLINE")
+       {
+               this->DelLine(prefix,params);
+       }
+       else if (command == "SAVE")
+       {
+               this->ForceNick(prefix,params);
+       }
+       else if (command == "OPERQUIT")
+       {
+               this->OperQuit(prefix,params);
+       }
+       else if (command == "IDLE")
+       {
+               this->Whois(prefix,params);
+       }
+       else if (command == "PUSH")
+       {
+               this->Push(prefix,params);
+       }
+       else if (command == "SQUIT")
+       {
+               if (params.size() == 2)
+               {
+                       this->Squit(Utils->FindServer(params[0]),params[1]);
+               }
+       }
+       else if (command == "SNONOTICE")
+       {
+               if (params.size() >= 2)
+               {
+                       ServerInstance->SNO->WriteToSnoMask(params[0][0], "From " + who->nick + ": "+ params[1]);
+                       params[1] = ":" + params[1];
+                       Utils->DoOneToAllButSender(prefix, command, params, prefix);
+               }
+       }
+       else if (command == "BURST")
+       {
+               // Set prefix server as bursting
+               TreeServer* ServerSource = Utils->FindServer(prefix);
+               if (!ServerSource)
+               {
+                       ServerInstance->SNO->WriteGlobalSno('l', "WTF: Got BURST from a non-server(?): %s", prefix.c_str());
+                       return;
+               }
 
-                               /* We don't support this for channel mode changes any more! */
-                               if (params.size() >= 1)
-                               {
-                                       if (Instance->FindChan(params[0]))
-                                       {
-                                               this->SendError("Protocol violation by '"+(ServerSource ? ServerSource->GetName().c_str() : prefix)+"'! MODE for channel mode changes is not supported by the InspIRCd 1.2 protocol. You must use FMODE to preserve channel timestamps.");
-                                               return false;
-                                       }
-                               }
+               ServerSource->bursting = true;
+               Utils->DoOneToAllButSender(prefix, command, params, prefix);
+       }
+       else if (command == "ENDBURST")
+       {
+               TreeServer* ServerSource = Utils->FindServer(prefix);
+               if (!ServerSource)
+               {
+                       ServerInstance->SNO->WriteGlobalSno('l', "WTF: Got ENDBURST from a non-server(?): %s", prefix.c_str());
+                       return;
+               }
+
+               ServerSource->FinishBurst();
+               Utils->DoOneToAllButSender(prefix, command, params, prefix);
+       }
+       else if (command == "ENCAP")
+       {
+               this->Encap(who, params);
+       }
+       else if (command == "NICK")
+       {
+               if (params.size() != 2)
+               {
+                       SendError("Protocol violation: Wrong number of parameters for NICK message");
+                       return;
+               }
 
-                               // Insert into the parser
-                               this->Instance->SendMode(modelist, this->Instance->FakeClient);
+               if (IS_SERVER(who))
+               {
+                       SendError("Protocol violation: Server changing nick");
+                       return;
+               }
 
-                               // Pass out to the network
-                               return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
-                       }
-                       else
+               if ((isdigit(params[0][0])) && (params[0] != who->uuid))
+               {
+                       SendError("Protocol violation: User changing nick to an invalid UID - " + params[0]);
+                       return;
+               }
+
+               /* Update timestamp on user when they change nicks */
+               who->age = ConvToInt(params[1]);
+
+               /*
+                * On nick messages, check that the nick doesnt already exist here.
+                * If it does, perform collision logic.
+                */
+               User* x = ServerInstance->FindNickOnly(params[0]);
+               if ((x) && (x != who))
+               {
+                       int collideret = 0;
+                       /* x is local, who is remote */
+                       collideret = this->DoCollision(x, who->age, who->ident, who->GetIPString(), who->uuid);
+                       if (collideret != 1)
                        {
                                /*
-                                * Not a special s2s command. Emulate the user doing it.
-                                * This saves us having a huge ugly command parser again.
+                                * Remote client lost, or both lost, parsing or passing on this
+                                * nickchange would be pointless, as the incoming client's server will
+                                * soon recieve SVSNICK to change its nick to its UID. :) -- w00t
                                 */
-                               User *who = this->Instance->FindUUID(prefix);
-
-                               if (!who)
-                               {
-                                       // this looks ugly because command is an irc::string
-                                       this->SendError("Command (" + std::string(command.c_str()) + ") from unknown prefix (" + prefix + ")! Dropping link.");
-                                       return false;
-                               }
-
-                               if (command == "NICK")
-                               {
-                                       if (params.size() != 2)
-                                       {
-                                               SendError("Protocol violation: NICK message without TS - :"+std::string(who->uuid)+" NICK "+params[0]);
-                                               return false;
-                                       }
-                                       /* Update timestamp on user when they change nicks */
-                                       who->age = atoi(params[1].c_str());
-
-                                       /*
-                                        * On nick messages, check that the nick doesnt already exist here.
-                                        * If it does, perform collision logic.
-                                        */
-                                       User* x = this->Instance->FindNickOnly(params[0]);
-                                       if ((x) && (x != who))
-                                       {
-                                               int collideret = 0;
-                                               /* x is local, who is remote */
-                                               collideret = this->DoCollision(x, who->age, who->ident, who->GetIPString(), who->uuid);
-                                               if (collideret != 1)
-                                               {
-                                                       /*
-                                                        * Remote client lost, or both lost, parsing this nickchange would be
-                                                        * pointless, as the incoming client's server will soon recieve SVSNICK to
-                                                        * change its nick to its UID. :) -- w00t
-                                                        */
-                                                       return true;
-                                               }
-                                       }
-                               }
+                               return;
+                       }
+               }
+               who->ForceNickChange(params[0].c_str());
+               Utils->RouteCommand(route_back_again, command, params, who);
+       }
+       else
+       {
+               Command* cmd = ServerInstance->Parser->GetHandler(command);
 
-                               // its a user
-                               std::vector<std::string> strparams(params.begin(), params.end());
+               if (!cmd)
+               {
+                       irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
+                       ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Unrecognised S2S command :%s %s %s",
+                               who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str());
+                       SendError("Unrecognised command '" + command + "' -- possibly loaded mismatched modules");
+                       return;
+               }
 
-                               switch (this->Instance->CallCommandHandler(command.c_str(), strparams, who))
-                               {
-                                       case CMD_INVALID:
-                                               /*
-                                                * XXX: command is irc::string, hence ugliness
-                                                */
-                                               this->SendError("Unrecognised or malformed command '" + std::string(command.c_str()) + "' -- possibly loaded mismatched modules");
-                                               return false;
-                                               break;
-                                       case CMD_FAILURE:
-                                               /*
-                                                * CMD_LOCALONLY is aliased to CMD_FAILURE, so this won't go out onto the network.
-                                                */
-                                               return true;
-                                               break;
-                                       default:
-                                               /* CMD_SUCCESS falls through here */
-                                               break;
-                               }
+               if (params.size() < cmd->min_params)
+               {
+                       irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
+                       ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Insufficient parameters for S2S command :%s %s %s",
+                               who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str());
+                       SendError("Insufficient parameters for command '" + command + "'");
+                       return;
+               }
 
-                               return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
+               if ((!params.empty()) && (params.back().empty()) && (!cmd->allow_empty_last_param))
+               {
+                       // the last param is empty and the command handler doesn't allow that, check if there will be enough params if we drop the last
+                       if (params.size()-1 < cmd->min_params)
+                               return;
+                       params.pop_back();
+               }
 
-                       }
-                       return true;
-                       break; // end of state CONNECTED (phew).
-       }
-       return true;
-}
+               CmdResult res = cmd->Handle(params, who);
 
-std::string TreeSocket::GetName()
-{
-       std::string sourceserv = this->myhost;
-       if (!this->InboundServerName.empty())
-       {
-               sourceserv = this->InboundServerName;
+               if (res == CMD_INVALID)
+               {
+                       irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
+                       ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Error handling S2S command :%s %s %s",
+                               who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str());
+                       SendError("Error handling '" + command + "' -- possibly loaded mismatched modules");
+               }
+               else if (res == CMD_SUCCESS)
+                       Utils->RouteCommand(route_back_again, command, params, who);
        }
-       return sourceserv;
 }
 
 void TreeSocket::OnTimeout()
 {
-       if (this->LinkState == CONNECTING)
-       {
-               Utils->Creator->RemoteMessage(NULL, "CONNECT: Connection to \002%s\002 timed out.", myhost.c_str());
-               Link* MyLink = Utils->FindLink(myhost);
-               if (MyLink)
-                       Utils->DoFailOver(MyLink);
-       }
+       ServerInstance->SNO->WriteGlobalSno('l', "CONNECT: Connection to \002%s\002 timed out.", linkID.c_str());
 }
 
-void TreeSocket::OnClose()
+void TreeSocket::Close()
 {
-       // Test fix for big fuckup
-       if (this->LinkState != CONNECTED)
-               return;
+       if (fd != -1)
+               ServerInstance->GlobalCulls.AddItem(this);
+       this->BufferedSocket::Close();
+       SetError("Remote host closed connection");
 
        // Connection closed.
        // If the connection is fully up (state CONNECTED)
        // then propogate a netsplit to all peers.
-       std::string quitserver = this->myhost;
-       if (!this->InboundServerName.empty())
-       {
-               quitserver = this->InboundServerName;
-       }
-       TreeServer* s = Utils->FindServer(quitserver);
-       if (s)
-       {
-               Squit(s,"Remote host closed the connection");
-       }
-
-       if (!quitserver.empty())
-       {
-               Utils->Creator->RemoteMessage(NULL,"Connection to '\2%s\2' failed.",quitserver.c_str());
-               time_t server_uptime = Instance->Time() - this->age;
-               if (server_uptime)
-                       Utils->Creator->RemoteMessage(NULL,"Connection to '\2%s\2' was established for %s", quitserver.c_str(), Utils->Creator->TimeToStr(server_uptime).c_str());
-       }
-}
-
-int TreeSocket::OnIncomingConnection(int newsock, char* ip)
-{
-       bool found = false;
+       if (MyRoot)
+               Squit(MyRoot,getError());
 
-       found = (std::find(Utils->ValidIPs.begin(), Utils->ValidIPs.end(), ip) != Utils->ValidIPs.end());
-       if (!found)
+       if (!ConnectionFailureShown)
        {
-               for (std::vector<std::string>::iterator i = Utils->ValidIPs.begin(); i != Utils->ValidIPs.end(); i++)
-               {
-                       if (*i == "*" || irc::sockets::MatchCIDR(ip, *i))
-                       {
-                               found = true;
-                               break;
-                       }
-               }
+               ConnectionFailureShown = true;
+               ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' failed.",linkID.c_str());
 
-               if (!found)
+               time_t server_uptime = ServerInstance->Time() - this->age;
+               if (server_uptime)
                {
-                       Utils->Creator->RemoteMessage(NULL,"Server connection from %s denied (no link blocks with that IP address)", ip);
-                       Instance->SE->Close(newsock);
-                       return false;
+                       std::string timestr = Utils->Creator->TimeToStr(server_uptime);
+                       ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' was established for %s", linkID.c_str(), timestr.c_str());
                }
        }
-
-       TreeSocket* s = new TreeSocket(this->Utils, this->Instance, newsock, ip, this->Hook);
-       s = s; /* Whinge whinge whinge, thats all GCC ever does. */
-       return true;
 }