]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree/main.cpp
Pass an interface to the OnSync hooks
[user/henk/code/inspircd.git] / src / modules / m_spanningtree / main.cpp
index 84771901e210947eb2220061a21f835ee1277148..b3cc78118037d35ca730b8d35ad81cad653e9aee 100644 (file)
@@ -1,65 +1,71 @@
-/*       +------------------------------------+
- *       | 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) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2009 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   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/>.
  */
 
-/* $ModDesc: Provides a spanning tree server link protocol */
 
 #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 "iohook.h"
 
-#include "m_spanningtree/timesynctimer.h"
-#include "m_spanningtree/resolvers.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/rconnect.h"
-#include "m_spanningtree/rsquit.h"
+#include "resolvers.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "commands.h"
+#include "protocolinterface.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h 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/rconnect.h m_spanningtree/rsquit.h */
+ModuleSpanningTree::ModuleSpanningTree()
+       : rconnect(this), rsquit(this), map(this)
+       , commands(NULL), DNS(this, "DNS")
+{
+}
 
-ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
-       : Module(Me), max_local(0), max_global(0)
+SpanningTreeCommands::SpanningTreeCommands(ModuleSpanningTree* module)
+       : svsjoin(module), svspart(module), svsnick(module), metadata(module),
+       uid(module), opertype(module), fjoin(module), ijoin(module), resync(module),
+       fmode(module), ftopic(module), fhost(module), fident(module), fname(module),
+       away(module), addline(module), delline(module), encap(module), idle(module),
+       nick(module), ping(module), pong(module), push(module), save(module),
+       server(module), squit(module), snonotice(module), version(module),
+       burst(module), endburst(module)
 {
-       ServerInstance->Modules->UseInterface("BufferedSocketHook");
-       Utils = new SpanningTreeUtilities(ServerInstance, this);
-       command_rconnect = new cmd_rconnect(ServerInstance, this, Utils);
-       ServerInstance->AddCommand(command_rconnect);
-       command_rsquit = new cmd_rsquit(ServerInstance, this, Utils);
-       ServerInstance->AddCommand(command_rsquit);
-       RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils);
-       ServerInstance->Timers->AddTimer(RefreshTimer);
+}
 
-       Implementation eventlist[] =
-       {
-               I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostLocalTopicChange,
-               I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer,
-               I_OnUserJoin, I_OnChangeHost, I_OnChangeName, I_OnUserPart, I_OnPostConnect,
-               I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash,
-               I_OnOper, I_OnAddLine, I_OnDelLine, I_ProtoSendMode, I_OnMode,
-               I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnPostCommand
-       };
-       ServerInstance->Modules->Attach(eventlist, this, 29);
+void ModuleSpanningTree::init()
+{
+       ServerInstance->SNO->EnableSnomask('l', "LINK");
 
-       for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
-       {
-               this->OnPostConnect((*i));
-       }
+       Utils = new SpanningTreeUtilities(this);
+       Utils->TreeRoot = new TreeServer;
+       commands = new SpanningTreeCommands(this);
+
+       delete ServerInstance->PI;
+       ServerInstance->PI = new SpanningTreeProtocolInterface;
+       loopCall = false;
+
+       // update our local user count
+       Utils->TreeRoot->UserCount = ServerInstance->Users->local_users.size();
 }
 
 void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
@@ -69,96 +75,40 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
        {
                Parent = Current->GetParent()->GetName();
        }
-       for (unsigned int q = 0; q < Current->ChildCount(); q++)
+
+       const TreeServer::ChildServers& children = Current->GetChildren();
+       for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i)
        {
-               if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName().c_str()))))
+               TreeServer* server = *i;
+               if ((server->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(server->GetName()))))
                {
-                       if (*user->oper)
+                       if (user->IsOper())
                        {
-                                ShowLinks(Current->GetChild(q),user,hops+1);
+                                ShowLinks(server, user, hops+1);
                        }
                }
                else
                {
-                       ShowLinks(Current->GetChild(q),user,hops+1);
+                       ShowLinks(server, user, hops+1);
                }
        }
        /* Don't display the line if its a uline, hide ulines is on, and the user isnt an oper */
-       if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName().c_str())) && (!IS_OPER(user)))
+       if ((Utils->HideULines) && (ServerInstance->ULine(Current->GetName())) && (!user->IsOper()))
                return;
        /* Or if the server is hidden and they're not an oper */
-       else if ((Current->Hidden) && (!IS_OPER(user)))
+       else if ((Current->Hidden) && (!user->IsOper()))
                return;
 
-       user->WriteNumeric(364, "%s %s %s :%d %s",      user->nick,Current->GetName().c_str(),
-                       (Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName : Parent.c_str(),
-                       (Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops,
+       user->WriteNumeric(364, "%s %s %s :%d %s",      user->nick.c_str(), Current->GetName().c_str(),
+                       (Utils->FlatLinks && (!user->IsOper())) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
+                       (Utils->FlatLinks && (!user->IsOper())) ? 0 : hops,
                        Current->GetDesc().c_str());
 }
 
-int ModuleSpanningTree::CountLocalServs()
-{
-       return Utils->TreeRoot->ChildCount();
-}
-
-int ModuleSpanningTree::CountServs()
-{
-       return Utils->serverlist.size();
-}
-
-void ModuleSpanningTree::HandleLinks(const char* const* parameters, int pcnt, User* user)
+void ModuleSpanningTree::HandleLinks(const std::vector<std::string>& parameters, User* user)
 {
        ShowLinks(Utils->TreeRoot,user,0);
-       user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick);
-       return;
-}
-
-void ModuleSpanningTree::HandleLusers(const char* const* parameters, int pcnt, User* user)
-{
-       unsigned int n_users = ServerInstance->Users->UserCount();
-
-       /* Only update these when someone wants to see them, more efficient */
-       if ((unsigned int)ServerInstance->Users->LocalUserCount() > max_local)
-               max_local = ServerInstance->Users->LocalUserCount();
-       if (n_users > max_global)
-               max_global = n_users;
-
-       unsigned int ulined_count = 0;
-       unsigned int ulined_local_count = 0;
-
-       /* If ulined are hidden and we're not an oper, count the number of ulined servers hidden,
-        * locally and globally (locally means directly connected to us)
-        */
-       if ((Utils->HideULines) && (!*user->oper))
-       {
-               for (server_hash::iterator q = Utils->serverlist.begin(); q != Utils->serverlist.end(); q++)
-               {
-                       if (ServerInstance->ULine(q->second->GetName().c_str()))
-                       {
-                               ulined_count++;
-                               if (q->second->GetParent() == Utils->TreeRoot)
-                                       ulined_local_count++;
-                       }
-               }
-       }
-       user->WriteNumeric(251, "%s :There are %d users and %d invisible on %d servers",user->nick,
-                       n_users-ServerInstance->Users->ModeCount('i'),
-                       ServerInstance->Users->ModeCount('i'),
-                       ulined_count ? this->CountServs() - ulined_count : this->CountServs());
-
-       if (ServerInstance->Users->OperCount())
-               user->WriteNumeric(252, "%s %d :operator(s) online",user->nick,ServerInstance->Users->OperCount());
-
-       if (ServerInstance->Users->UnregisteredUserCount())
-               user->WriteNumeric(253, "%s %d :unknown connections",user->nick,ServerInstance->Users->UnregisteredUserCount());
-       
-       if (ServerInstance->ChannelCount())
-               user->WriteNumeric(254, "%s %ld :channels formed",user->nick,ServerInstance->ChannelCount());
-       
-       user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick,ServerInstance->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs());
-       user->WriteNumeric(265, "%s :Current Local Users: %d  Max: %d",user->nick,ServerInstance->Users->LocalUserCount(),max_local);
-       user->WriteNumeric(266, "%s :Current Global Users: %d  Max: %d",user->nick,n_users,max_global);
-       return;
+       user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick.c_str());
 }
 
 std::string ModuleSpanningTree::TimeToStr(time_t secs)
@@ -169,72 +119,124 @@ std::string ModuleSpanningTree::TimeToStr(time_t secs)
        secs = secs % 60;
        mins_up = mins_up % 60;
        hours_up = hours_up % 24;
-       return ((days_up ? (ConvToStr(days_up) + "d") : std::string(""))
-                       + (hours_up ? (ConvToStr(hours_up) + "h") : std::string(""))
-                       + (mins_up ? (ConvToStr(mins_up) + "m") : std::string(""))
+       return ((days_up ? (ConvToStr(days_up) + "d") : "")
+                       + (hours_up ? (ConvToStr(hours_up) + "h") : "")
+                       + (mins_up ? (ConvToStr(mins_up) + "m") : "")
                        + ConvToStr(secs) + "s");
 }
 
 void ModuleSpanningTree::DoPingChecks(time_t curtime)
 {
-       for (unsigned int j = 0; j < Utils->TreeRoot->ChildCount(); j++)
+       /*
+        * Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data.
+        * This prevents lost REMOTECONNECT notices
+        */
+       long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
+
+restart:
+       for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
        {
-               TreeServer* serv = Utils->TreeRoot->GetChild(j);
-               TreeSocket* sock = serv->GetSocket();
-               if (sock)
+               TreeServer *s = i->second;
+
+               // Skip myself
+               if (s->IsRoot())
+                       continue;
+
+               if (s->GetSocket()->GetLinkState() == DYING)
                {
-                       if (curtime >= serv->NextPingTime())
+                       s->GetSocket()->Close();
+                       goto restart;
+               }
+
+               // Do not ping servers that are not fully connected yet!
+               // Servers which are connected to us have IsLocal() == true and if they're fully connected
+               // then Socket->LinkState == CONNECTED. Servers that are linked to another server are always fully connected.
+               if (s->IsLocal() && s->GetSocket()->GetLinkState() != CONNECTED)
+                       continue;
+
+               // Now do PING checks on all servers
+               // Only ping if this server needs one
+               if (curtime >= s->NextPingTime())
+               {
+                       // And if they answered the last
+                       if (s->AnsweredLastPing())
                        {
-                               if (serv->AnsweredLastPing())
-                               {
-                                       sock->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" PING "+serv->GetID());
-                                       serv->SetNextPingTime(curtime + Utils->PingFreq);
-                                       timeval t;
-                                       gettimeofday(&t, NULL);
-                                       long ts = (t.tv_sec * 1000) + (t.tv_usec / 1000);
-                                       serv->LastPingMsec = ts;
-                                       serv->Warned = false;
-                               }
-                               else
+                               // They did, send a ping to them
+                               s->SetNextPingTime(curtime + Utils->PingFreq);
+                               s->GetSocket()->WriteLine(":" + ServerInstance->Config->GetSID() + " PING " + s->GetID());
+                               s->LastPingMsec = ts;
+                       }
+                       else
+                       {
+                               // They didn't answer the last ping, if they are locally connected, get rid of them.
+                               if (s->IsLocal())
                                {
-                                       /* they didnt answer, boot them */
+                                       TreeSocket* sock = s->GetSocket();
                                        sock->SendError("Ping timeout");
-                                       sock->Squit(serv,"Ping timeout");
-                                       ServerInstance->SE->DelFd(sock);
                                        sock->Close();
-                                       return;
+                                       goto restart;
                                }
                        }
-                       else if ((Utils->PingWarnTime) && (!serv->Warned) && (curtime >= serv->NextPingTime() - (Utils->PingFreq - Utils->PingWarnTime)) && (!serv->AnsweredLastPing()))
-                       {
-                               /* The server hasnt responded, send a warning to opers */
-                               ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", serv->GetName().c_str(), Utils->PingWarnTime);
-                               serv->Warned = true;
-                       }
+               }
+
+               // If warn on ping enabled and not warned and the difference is sufficient and they didn't answer the last ping...
+               if ((Utils->PingWarnTime) && (!s->Warned) && (curtime >= s->NextPingTime() - (Utils->PingFreq - Utils->PingWarnTime)) && (!s->AnsweredLastPing()))
+               {
+                       /* The server hasnt responded, send a warning to opers */
+                       ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not responded to PING for %d seconds, high latency.", s->GetName().c_str(), Utils->PingWarnTime);
+                       s->Warned = true;
                }
        }
+}
 
-       /*
-        * Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data.
-        * This prevents lost REMOTECONNECT notices
-        * XXX this should probably not do this until server has been bursting for, say, 60 seconds or something
-        */
-       for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
+void ModuleSpanningTree::ConnectServer(Autoconnect* a, bool on_timer)
+{
+       if (!a)
+               return;
+       for(unsigned int j=0; j < a->servers.size(); j++)
+       {
+               if (Utils->FindServer(a->servers[j]))
+               {
+                       // found something in this block. Should the server fail,
+                       // we want to start at the start of the list, not in the
+                       // middle where we left off
+                       a->position = -1;
+                       return;
+               }
+       }
+       if (on_timer && a->position >= 0)
+               return;
+       if (!on_timer && a->position < 0)
+               return;
+
+       a->position++;
+       while (a->position < (int)a->servers.size())
        {
-               if (i->second->bursting)
+               Link* x = Utils->FindLink(a->servers[a->position]);
+               if (x)
                {
-                       ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not finished burst, forcing end of burst.", i->second->GetName().c_str());
-                       i->second->FinishBurst();
+                       ServerInstance->SNO->WriteToSnoMask('l', "AUTOCONNECT: Auto-connecting server \002%s\002", x->Name.c_str());
+                       ConnectServer(x, a);
+                       return;
                }
+               a->position++;
        }
+       // Autoconnect chain has been fully iterated; start at the beginning on the
+       // next AutoConnectServers run
+       a->position = -1;
 }
 
-void ModuleSpanningTree::ConnectServer(Link* x)
+void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
 {
        bool ipvalid = true;
-       QueryType start_type = DNS_QUERY_A;
-#ifdef IPV6
-       start_type = DNS_QUERY_AAAA;
+
+       if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name)))
+       {
+               ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself.");
+               return;
+       }
+
+       DNS::QueryType start_type = DNS::QUERY_AAAA;
        if (strchr(x->IPAddr.c_str(),':'))
        {
                in6_addr n;
@@ -242,7 +244,6 @@ void ModuleSpanningTree::ConnectServer(Link* x)
                        ipvalid = false;
        }
        else
-#endif
        {
                in_addr n;
                if (inet_aton(x->IPAddr.c_str(),&n) < 1)
@@ -253,159 +254,142 @@ void ModuleSpanningTree::ConnectServer(Link* x)
        if (ipvalid)
        {
                /* Gave a hook, but it wasnt one we know */
-               if ((!x->Hook.empty()) && (Utils->hooks.find(x->Hook.c_str()) == Utils->hooks.end()))
-                       return;
-               TreeSocket* newsocket = new TreeSocket(Utils, ServerInstance, x->IPAddr,x->Port,false,x->Timeout ? x->Timeout : 10,x->Name.c_str(), x->Bind, x->Hook.empty() ? NULL : Utils->hooks[x->Hook.c_str()]);
+               TreeSocket* newsocket = new TreeSocket(x, y, x->IPAddr);
                if (newsocket->GetFd() > -1)
                {
                        /* Handled automatically on success */
                }
                else
                {
-                       RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
-                       if (ServerInstance->SocketCull.find(newsocket) == ServerInstance->SocketCull.end())
-                               ServerInstance->SocketCull[newsocket] = newsocket;
-                       Utils->DoFailOver(x);
+                       ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",
+                               x->Name.c_str(), newsocket->getError().c_str());
+                       ServerInstance->GlobalCulls.AddItem(newsocket);
                }
        }
+       else if (!DNS)
+       {
+               ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: Hostname given and m_dns.so is not loaded, unable to resolve.", x->Name.c_str());
+       }
        else
        {
+               ServernameResolver* snr = new ServernameResolver(*DNS, x->IPAddr, x, start_type, y);
                try
                {
-                       bool cached;
-                       ServernameResolver* snr = new ServernameResolver((Module*)this, Utils, ServerInstance,x->IPAddr, *x, cached, start_type);
-                       ServerInstance->AddResolver(snr, cached);
+                       DNS->Process(snr);
                }
-               catch (ModuleException& e)
+               catch (DNS::Exception& e)
                {
-                       RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
-                       Utils->DoFailOver(x);
+                       delete snr;
+                       ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
+                       ConnectServer(y, false);
                }
        }
 }
 
 void ModuleSpanningTree::AutoConnectServers(time_t curtime)
 {
-       for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
+       for (std::vector<reference<Autoconnect> >::iterator i = Utils->AutoconnectBlocks.begin(); i < Utils->AutoconnectBlocks.end(); ++i)
        {
-               if ((x->AutoConnect) && (curtime >= x->NextConnectTime))
+               Autoconnect* x = *i;
+               if (curtime >= x->NextConnectTime)
                {
-                       x->NextConnectTime = curtime + x->AutoConnect;
-                       TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str());
-                       if (x->FailOver.length())
-                       {
-                               TreeServer* CheckFailOver = Utils->FindServer(x->FailOver.c_str());
-                               if (CheckFailOver)
-                               {
-                                       /* The failover for this server is currently a member of the network.
-                                        * The failover probably succeeded, where the main link did not.
-                                        * Don't try the main link until the failover is gone again.
-                                        */
-                                       continue;
-                               }
-                       }
-                       if (!CheckDupe)
-                       {
-                               // an autoconnected server is not connected. Check if its time to connect it
-                               ServerInstance->SNO->WriteToSnoMask('l',"AUTOCONNECT: Auto-connecting server \002%s\002 (%lu seconds until next attempt)",x->Name.c_str(),x->AutoConnect);
-                               this->ConnectServer(&(*x));
-                       }
+                       x->NextConnectTime = curtime + x->Period;
+                       ConnectServer(x, true);
+               }
+       }
+}
+
+void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
+{
+       std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = Utils->timeoutlist.begin();
+       while (i != Utils->timeoutlist.end())
+       {
+               TreeSocket* s = i->first;
+               std::pair<std::string, int> p = i->second;
+               std::map<TreeSocket*, std::pair<std::string, int> >::iterator me = i;
+               i++;
+               if (s->GetLinkState() == DYING)
+               {
+                       Utils->timeoutlist.erase(me);
+                       s->Close();
+               }
+               else if (curtime > s->age + p.second)
+               {
+                       ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002 (timeout of %d seconds)",p.first.c_str(),p.second);
+                       Utils->timeoutlist.erase(me);
+                       s->Close();
                }
        }
 }
 
-int ModuleSpanningTree::HandleVersion(const char* const* parameters, int pcnt, User* user)
+ModResult ModuleSpanningTree::HandleVersion(const std::vector<std::string>& parameters, User* user)
 {
        // we've already checked if pcnt > 0, so this is safe
        TreeServer* found = Utils->FindServerMask(parameters[0]);
        if (found)
        {
-               std::string Version = found->GetVersion();
-               user->WriteNumeric(351, "%s :%s",user->nick,Version.c_str());
                if (found == Utils->TreeRoot)
                {
-                       ServerInstance->Config->Send005(user);
+                       // Pass to default VERSION handler.
+                       return MOD_RES_PASSTHRU;
                }
+               std::string Version = found->GetVersion();
+               user->WriteNumeric(351, "%s :%s",user->nick.c_str(),Version.c_str());
        }
        else
        {
-               user->WriteNumeric(402, "%s %s :No such server",user->nick,parameters[0]);
+               user->WriteNumeric(402, "%s %s :No such server",user->nick.c_str(),parameters[0].c_str());
        }
-       return 1;
+       return MOD_RES_DENY;
 }
 
-/* This method will attempt to get a link message out to as many people as is required.
- * If a user is provided, and that user is local, then the user is sent the message using
- * WriteServ (they are the local initiator of that message). If the user is remote, they are
- * sent that message remotely via PUSH.
- * If the user is NULL, then the notice is sent locally via WriteToSnoMask with snomask 'l',
- * and remotely via SNONOTICE with mask 'l'.
+/* This method will attempt to get a message to a remote user.
  */
 void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...)
 {
-       /* This could cause an infinite loop, because DoOneToMany() will, on error,
-        * call TreeSocket::OnError(), which in turn will call this function to
-        * notify everyone of the error. So, drop any messages that are generated
-        * during the sending of another message. -Special */
-       static bool SendingRemoteMessage = false;
-       if (SendingRemoteMessage)
-               return;
-       SendingRemoteMessage = true;
-
-       std::deque<std::string> params;
-       char text[MAXBUF];
-       va_list argsPtr;
-
-       va_start(argsPtr, format);
-       vsnprintf(text, MAXBUF, format, argsPtr);
-       va_end(argsPtr);
+       std::string text;
+       VAFORMAT(text, format, format);
 
-       if (!user)
-       {
-               /* No user, target it generically at everyone */
-               ServerInstance->SNO->WriteToSnoMask('l', "%s", text);
-               params.push_back("l");
-               params.push_back(std::string(":") + text);
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(), "SNONOTICE", params);
-       }
+       if (IS_LOCAL(user))
+               user->WriteNotice(text);
        else
-       {
-               if (IS_LOCAL(user))
-                       user->WriteServ("NOTICE %s :%s", user->nick, text);
-               else
-               {
-                       params.push_back(user->uuid);
-                       params.push_back(std::string("::") + ServerInstance->Config->ServerName + " NOTICE " + user->nick + " :*** From " +
-                                       ServerInstance->Config->ServerName+ ": " + text);
-                       Utils->DoOneToMany(ServerInstance->Config->GetSID(), "PUSH", params);
-               }
-       }
-       
-       SendingRemoteMessage = false;
+               ServerInstance->PI->SendUserNotice(user, text);
 }
-       
-int ModuleSpanningTree::HandleConnect(const char* const* parameters, int pcnt, User* user)
+
+ModResult ModuleSpanningTree::HandleConnect(const std::vector<std::string>& parameters, User* user)
 {
-       for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
+       for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); i++)
        {
-               if (ServerInstance->MatchText(x->Name.c_str(),parameters[0]))
+               Link* x = *i;
+               if (InspIRCd::Match(x->Name.c_str(),parameters[0]))
                {
+                       if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name)))
+                       {
+                               RemoteMessage(user, "*** CONNECT: Server \002%s\002 is ME, not connecting.",x->Name.c_str());
+                               return MOD_RES_DENY;
+                       }
+
                        TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str());
                        if (!CheckDupe)
                        {
                                RemoteMessage(user, "*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",x->Name.c_str(),(x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()),x->Port);
-                               ConnectServer(&(*x));
-                               return 1;
+                               ConnectServer(x);
+                               return MOD_RES_DENY;
                        }
                        else
                        {
-                               RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str());
-                               return 1;
+                               RemoteMessage(user, "*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002", x->Name.c_str(), CheckDupe->GetParent()->GetName().c_str());
+                               return MOD_RES_DENY;
                        }
                }
        }
-       RemoteMessage(user, "*** CONNECT: No server matching \002%s\002 could be found in the config file.",parameters[0]);
-       return 1;
+       RemoteMessage(user, "*** CONNECT: No server matching \002%s\002 could be found in the config file.",parameters[0].c_str());
+       return MOD_RES_DENY;
+}
+
+void ModuleSpanningTree::On005Numeric(std::map<std::string, std::string>& tokens)
+{
+       tokens["MAP"];
 }
 
 void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,std::string &description)
@@ -421,127 +405,51 @@ void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel,
 {
        if (IS_LOCAL(source))
        {
-               std::deque<std::string> params;
+               CmdBuilder params(source, "INVITE");
                params.push_back(dest->uuid);
                params.push_back(channel->name);
                params.push_back(ConvToStr(expiry));
-               Utils->DoOneToMany(source->uuid,"INVITE",params);
+               params.Broadcast();
        }
 }
 
-void ModuleSpanningTree::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic)
+void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std::string &topic)
 {
-       std::deque<std::string> params;
-       params.push_back(chan->name);
-       params.push_back(":"+topic);
-       Utils->DoOneToMany(user->uuid,"TOPIC",params);
-}
+       // Drop remote events on the floor.
+       if (!IS_LOCAL(user))
+               return;
 
-void ModuleSpanningTree::OnWallops(User* user, const std::string &text)
-{
-       if (IS_LOCAL(user))
-       {
-               std::deque<std::string> params;
-               params.push_back(":"+text);
-               Utils->DoOneToMany(user->uuid,"WALLOPS",params);
-       }
+       CommandFTopic::Builder(user, chan).Broadcast();
 }
 
-void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string& text, char status, const CUList& exempt_list, MessageType msgtype)
 {
-       if (target_type == TYPE_USER)
-       {
-               User* d = (User*)dest;
-               if ((d->GetFd() < 0) && (IS_LOCAL(user)))
-               {
-                       std::deque<std::string> params;
-                       params.clear();
-                       params.push_back(d->uuid);
-                       params.push_back(":"+text);
-                       Utils->DoOneToOne(user->uuid,"NOTICE",params,d->server);
-               }
-       }
-       else if (target_type == TYPE_CHANNEL)
-       {
-               if (IS_LOCAL(user))
-               {
-                       Channel *c = (Channel*)dest;
-                       if (c)
-                       {
-                               std::string cname = c->name;
-                               if (status)
-                                       cname = status + cname;
-                               TreeServerList list;
-                               Utils->GetListOfServersForChannel(c,list,status,exempt_list);
-                               for (TreeServerList::iterator i = list.begin(); i != list.end(); i++)
-                               {
-                                       TreeSocket* Sock = i->second->GetSocket();
-                                       if (Sock)
-                                               Sock->WriteLine(":"+std::string(user->uuid)+" NOTICE "+cname+" :"+text);
-                               }
-                       }
-               }
-       }
-       else if (target_type == TYPE_SERVER)
-       {
-               if (IS_LOCAL(user))
-               {
-                       char* target = (char*)dest;
-                       std::deque<std::string> par;
-                       par.push_back(target);
-                       par.push_back(":"+text);
-                       Utils->DoOneToMany(user->uuid,"NOTICE",par);
-               }
-       }
-}
+       if (!IS_LOCAL(user))
+               return;
 
-void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
-{
+       const char* message_type = (msgtype == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
        if (target_type == TYPE_USER)
        {
-               // route private messages which are targetted at clients only to the server
-               // which needs to receive them
-               User* d = (User*)dest;
-               if ((d->GetFd() < 0) && (IS_LOCAL(user)))
+               User* d = (User*) dest;
+               if (!IS_LOCAL(d))
                {
-                       std::deque<std::string> params;
-                       params.clear();
+                       CmdBuilder params(user, message_type);
                        params.push_back(d->uuid);
-                       params.push_back(":"+text);
-                       Utils->DoOneToOne(user->uuid,"PRIVMSG",params,d->server);
+                       params.push_last(text);
+                       params.Unicast(d);
                }
        }
        else if (target_type == TYPE_CHANNEL)
        {
-               if (IS_LOCAL(user))
-               {
-                       Channel *c = (Channel*)dest;
-                       if (c)
-                       {
-                               std::string cname = c->name;
-                               if (status)
-                                       cname = status + cname;
-                               TreeServerList list;
-                               Utils->GetListOfServersForChannel(c,list,status,exempt_list);
-                               for (TreeServerList::iterator i = list.begin(); i != list.end(); i++)
-                               {
-                                       TreeSocket* Sock = i->second->GetSocket();
-                                       if (Sock)
-                                               Sock->WriteLine(":"+std::string(user->uuid)+" PRIVMSG "+cname+" :"+text);
-                               }
-                       }
-               }
+               Utils->SendChannelMessage(user->uuid, (Channel*)dest, text, status, exempt_list, message_type);
        }
        else if (target_type == TYPE_SERVER)
        {
-               if (IS_LOCAL(user))
-               {
-                       char* target = (char*)dest;
-                       std::deque<std::string> par;
-                       par.push_back(target);
-                       par.push_back(":"+text);
-                       Utils->DoOneToMany(user->uuid,"PRIVMSG",par);
-               }
+               char* target = (char*) dest;
+               CmdBuilder par(user, message_type);
+               par.push_back(target);
+               par.push_last(text);
+               par.Broadcast();
        }
 }
 
@@ -549,92 +457,91 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime)
 {
        AutoConnectServers(curtime);
        DoPingChecks(curtime);
+       DoConnectTimeout(curtime);
 }
 
-void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
+void ModuleSpanningTree::OnUserConnect(LocalUser* user)
+{
+       if (user->quitting)
+               return;
+
+       CommandUID::Builder(user).Broadcast();
+
+       if (user->IsOper())
+               CommandOpertype::Builder(user).Broadcast();
+
+       for(Extensible::ExtensibleStore::const_iterator i = user->GetExtList().begin(); i != user->GetExtList().end(); i++)
+       {
+               ExtensionItem* item = i->first;
+               std::string value = item->serialize(FORMAT_NETWORK, user, i->second);
+               if (!value.empty())
+                       ServerInstance->PI->SendMetaData(user, item->name, value);
+       }
+
+       Utils->TreeRoot->UserCount++;
+}
+
+void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created_by_local, CUList& excepts)
 {
        // Only do this for local users
-       if (IS_LOCAL(user))
+       if (!IS_LOCAL(memb->user))
+               return;
+
+       if (created_by_local)
        {
-               if (channel->GetUserCounter() == 1)
-               {
-                       std::deque<std::string> params;
-                       // set up their permissions and the channel TS with FJOIN.
-                       // All users are FJOINed now, because a module may specify
-                       // new joining permissions for the user.
-                       params.push_back(channel->name);
-                       params.push_back(ConvToStr(channel->age));
-                       params.push_back(std::string(channel->GetAllPrefixChars(user))+","+std::string(user->uuid));
-                       Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
-                       /* First user in, sync the modes for the channel */
-                       params.pop_back();
-                       params.push_back(std::string("+") + channel->ChanModes(true));
-                       Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",params);
-               }
-               else
+               CmdBuilder params("FJOIN");
+               params.push_back(memb->chan->name);
+               params.push_back(ConvToStr(memb->chan->age));
+               params.push_raw(" +").push_raw(memb->chan->ChanModes(true));
+               params.push(memb->modes).push_raw(',').push_raw(memb->user->uuid);
+               params.Broadcast();
+       }
+       else
+       {
+               CmdBuilder params(memb->user, "IJOIN");
+               params.push_back(memb->chan->name);
+               if (!memb->modes.empty())
                {
-                       std::deque<std::string> params;
-                       params.push_back(channel->name);
-                       params.push_back(ConvToStr(channel->age));
-                       Utils->DoOneToMany(user->uuid,"JOIN",params);
+                       params.push_back(ConvToStr(memb->chan->age));
+                       params.push_back(memb->modes);
                }
+               params.Broadcast();
        }
 }
 
 void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost)
 {
-       // only occurs for local clients
-       if (user->registered != REG_ALL)
+       if (user->registered != REG_ALL || !IS_LOCAL(user))
                return;
-       std::deque<std::string> params;
-       params.push_back(newhost);
-       Utils->DoOneToMany(user->uuid,"FHOST",params);
+
+       CmdBuilder(user, "FHOST").push(newhost).Broadcast();
 }
 
 void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos)
 {
-       // only occurs for local clients
-       if (user->registered != REG_ALL)
+       if (user->registered != REG_ALL || !IS_LOCAL(user))
                return;
-       std::deque<std::string> params;
-       params.push_back(gecos);
-       Utils->DoOneToMany(user->uuid,"FNAME",params);
+
+       CmdBuilder(user, "FNAME").push(gecos).Broadcast();
 }
 
-void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
+void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident)
 {
-       if (IS_LOCAL(user))
-       {
-               std::deque<std::string> params;
-               params.push_back(channel->name);
-               if (!partmessage.empty())
-                       params.push_back(":"+partmessage);
-               Utils->DoOneToMany(user->uuid,"PART",params);
-       }
+       if ((user->registered != REG_ALL) || (!IS_LOCAL(user)))
+               return;
+
+       CmdBuilder(user, "FIDENT").push(ident).Broadcast();
 }
 
-void ModuleSpanningTree::OnPostConnect(User* user)
+void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts)
 {
-       if (IS_LOCAL(user))
-       {
-               std::deque<std::string> params;
-               params.push_back(user->uuid);
-               params.push_back(ConvToStr(user->age));
-               params.push_back(user->nick);
-               params.push_back(user->host);
-               params.push_back(user->dhost);
-               params.push_back(user->ident);
-               params.push_back("+"+std::string(user->FormatModes()));
-               params.push_back(user->GetIPString());
-               params.push_back(ConvToStr(user->signon));
-               params.push_back(":"+std::string(user->fullname));
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
-       }
-
-       TreeServer* SourceServer = Utils->FindServer(user->server);
-       if (SourceServer)
+       if (IS_LOCAL(memb->user))
        {
-               SourceServer->SetUserCount(1); // increment by 1
+               CmdBuilder params(memb->user, "PART");
+               params.push_back(memb->chan->name);
+               if (!partmessage.empty())
+                       params.push_last(partmessage);
+               params.Broadcast();
        }
 }
 
@@ -642,23 +549,17 @@ void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const
 {
        if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
        {
-               std::deque<std::string> params;
-
                if (oper_message != reason)
-               {
-                       params.push_back(":"+oper_message);
-                       Utils->DoOneToMany(user->uuid,"OPERQUIT",params);
-               }
-               params.clear();
-               params.push_back(":"+reason);
-               Utils->DoOneToMany(user->uuid,"QUIT",params);
+                       ServerInstance->PI->SendMetaData(user, "operquit", oper_message);
+
+               CmdBuilder(user, "QUIT").push_last(reason).Broadcast();
        }
 
        // Regardless, We need to modify the user Counts..
        TreeServer* SourceServer = Utils->FindServer(user->server);
        if (SourceServer)
        {
-               SourceServer->SetUserCount(-1); // decrement by 1
+               SourceServer->UserCount--;
        }
 }
 
@@ -666,340 +567,178 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
 {
        if (IS_LOCAL(user))
        {
-               std::deque<std::string> params;
+               CmdBuilder params(user, "NICK");
                params.push_back(user->nick);
 
                /** IMPORTANT: We don't update the TS if the oldnick is just a case change of the newnick!
                 */
-               if (irc::string(user->nick) != assign(oldnick))
+               if (irc::string(user->nick.c_str()) != assign(oldnick))
                        user->age = ServerInstance->Time();
 
                params.push_back(ConvToStr(user->age));
-               Utils->DoOneToMany(user->uuid,"NICK",params);
-       }
-}
-
-void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
-{
-       if ((source) && (IS_LOCAL(source)))
-       {
-               std::deque<std::string> params;
-               params.push_back(chan->name);
-               params.push_back(user->uuid);
-               params.push_back(":"+reason);
-               Utils->DoOneToMany(source->uuid,"KICK",params);
+               params.Broadcast();
        }
-       else if (!source)
+       else if (!loopCall && user->nick == user->uuid)
        {
-               std::deque<std::string> params;
-               params.push_back(chan->name);
+               CmdBuilder params("SAVE");
                params.push_back(user->uuid);
-               params.push_back(":"+reason);
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params);
+               params.push_back(ConvToStr(user->age));
+               params.Broadcast();
        }
 }
 
-void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason)
+void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
 {
-       std::deque<std::string> params;
-       params.push_back(":"+reason);
-       Utils->DoOneToMany(dest->uuid,"OPERQUIT",params);
-       params.clear();
-       params.push_back(dest->uuid);
-       params.push_back(":"+reason);
-       dest->SetOperQuit(operreason);
-       Utils->DoOneToMany(source->uuid,"KILL",params);
+       if ((!IS_LOCAL(source) || source != ServerInstance->FakeClient))
+               return;
+
+       CmdBuilder params(source, "KICK");
+       params.push_back(memb->chan->name);
+       params.push_back(memb->user->uuid);
+       params.push_last(reason);
+       params.Broadcast();
 }
 
-void ModuleSpanningTree::OnRehash(User* user, const std::string &parameter)
+void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
 {
-       if (!parameter.empty())
+       if (loopCall)
+               return; // Don't generate a REHASH here if we're in the middle of processing a message that generated this one
+
+       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnPreRehash called with param %s", parameter.c_str());
+
+       // Send out to other servers
+       if (!parameter.empty() && parameter[0] != '-')
        {
-               std::deque<std::string> params;
+               CmdBuilder params((user ? user->uuid : ServerInstance->Config->GetSID()), "REHASH");
                params.push_back(parameter);
-               Utils->DoOneToMany(user ? user->nick : ServerInstance->Config->GetSID(), "REHASH", params);
-               // check for self
-               if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameter))
-               {
-                       ServerInstance->SNO->WriteToSnoMask('A', "Remote rehash initiated locally by \002%s\002", user ? user->nick : ServerInstance->Config->ServerName);
-                       ServerInstance->RehashServer();
-               }
+               params.Forward(user ? Utils->BestRouteTo(user->server) : NULL);
        }
-       Utils->ReadConfiguration(true);
-       InitializeDisabledCommands(ServerInstance->Config->DisabledCommands, ServerInstance);
 }
 
-// note: the protocol does not allow direct umode +o except
-// via NICK with 8 params. sending OPERTYPE infers +o modechange
-// locally.
-void ModuleSpanningTree::OnOper(User* user, const std::string &opertype)
+void ModuleSpanningTree::ReadConfig(ConfigStatus& status)
 {
-       if (IS_LOCAL(user))
+       // Re-read config stuff
+       try
+       {
+               Utils->ReadConfiguration();
+       }
+       catch (ModuleException& e)
        {
-               std::deque<std::string> params;
-               params.push_back(opertype);
-               Utils->DoOneToMany(user->uuid,"OPERTYPE",params);
+               // Refresh the IP cache anyway, so servers read before the error will be allowed to connect
+               Utils->RefreshIPCache();
+               // Always warn local opers with snomask +l, also warn globally (snomask +L) if the rehash was issued by a remote user
+               std::string msg = "Error in configuration: ";
+               msg.append(e.GetReason());
+               ServerInstance->SNO->WriteToSnoMask('l', msg);
+               if (status.srcuser && !IS_LOCAL(status.srcuser))
+                       ServerInstance->PI->SendSNONotice("L", msg);
        }
 }
 
-void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
+void ModuleSpanningTree::OnLoadModule(Module* mod)
 {
-       if (!x->IsBurstable())
-               return;
-
-       char data[MAXBUF];
-       snprintf(data,MAXBUF,"%s %s %s %lu %lu :%s", x->type.c_str(), x->Displayable(), 
-       ServerInstance->Config->ServerName, (unsigned long)x->set_time, (unsigned long)x->duration, x->reason);
-       std::deque<std::string> params;
-       params.push_back(data);
-
-       if (!user)
+       std::string data;
+       data.push_back('+');
+       data.append(mod->ModuleSourceFile);
+       Version v = mod->GetVersion();
+       if (!v.link_data.empty())
        {
-               /* Server-set lines */
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ADDLINE", params);
-       }
-       else if (IS_LOCAL(user))
-       {
-               /* User-set lines */
-               Utils->DoOneToMany(user->uuid, "ADDLINE", params);
+               data.push_back('=');
+               data.append(v.link_data);
        }
+       ServerInstance->PI->SendMetaData("modules", data);
 }
 
-void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
+void ModuleSpanningTree::OnUnloadModule(Module* mod)
 {
-       if (x->type == "K")
+       if (!Utils)
                return;
+       ServerInstance->PI->SendMetaData("modules", "-" + mod->ModuleSourceFile);
 
-       char data[MAXBUF];
-       snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable());
-       std::deque<std::string> params;
-       params.push_back(data);
-
-       if (!user)
+       // Close all connections which use an IO hook provided by this module
+       const TreeServer::ChildServers& list = Utils->TreeRoot->GetChildren();
+       for (TreeServer::ChildServers::const_iterator i = list.begin(); i != list.end(); ++i)
        {
-               /* Server-unset lines */
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(), "DELLINE", params);
+               TreeSocket* sock = (*i)->GetSocket();
+               if (sock && sock->GetIOHook() && sock->GetIOHook()->creator == mod)
+               {
+                       sock->SendError("SSL module unloaded");
+                       sock->Close();
+               }
        }
-       else if (IS_LOCAL(user))
+
+       for (SpanningTreeUtilities::TimeoutList::const_iterator i = Utils->timeoutlist.begin(); i != Utils->timeoutlist.end(); ++i)
        {
-               /* User-unset lines */
-               Utils->DoOneToMany(user->uuid, "DELLINE", params);
+               TreeSocket* sock = i->first;
+               if (sock->GetIOHook() && sock->GetIOHook()->creator == mod)
+                       sock->Close();
        }
 }
 
-void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const std::string &text)
+// note: the protocol does not allow direct umode +o except
+// via NICK with 8 params. sending OPERTYPE infers +o modechange
+// locally.
+void ModuleSpanningTree::OnOper(User* user, const std::string &opertype)
 {
-       if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
-       {
-               std::deque<std::string> params;
-               std::string command;
-               std::string output_text;
-
-               ServerInstance->Parser->TranslateUIDs(TR_SPACENICKLIST, text, output_text);
-
-               if (target_type == TYPE_USER)
-               {
-                       User* u = (User*)dest;
-                       params.push_back(u->uuid);
-                       params.push_back(output_text);
-                       command = "MODE";
-               }
-               else
-               {
-                       Channel* c = (Channel*)dest;
-                       params.push_back(c->name);
-                       params.push_back(ConvToStr(c->age));
-                       params.push_back(output_text);
-                       command = "FMODE";
-               }
-
-               Utils->DoOneToMany(user->uuid, command, params);
-       }
+       if (user->registered != REG_ALL || !IS_LOCAL(user))
+               return;
+       CommandOpertype::Builder(user).Broadcast();
 }
 
-int ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
+void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
 {
-       if (IS_LOCAL(user))
-       {
-               if (awaymsg.empty())
-               {
-                       std::deque<std::string> params;
-                       params.clear();
-                       Utils->DoOneToMany(user->uuid,"AWAY",params);
-               }
-               else
-               {
-                       std::deque<std::string> params;
-                       params.push_back(":" + awaymsg);
-                       Utils->DoOneToMany(user->uuid,"AWAY",params);
-               }
-       }
+       if (!x->IsBurstable() || loopCall || (user && !IS_LOCAL(user)))
+               return;
+
+       if (!user)
+               user = ServerInstance->FakeClient;
 
-       return 0;
+       CommandAddLine::Builder(x, user).Broadcast();
 }
 
-void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline)
+void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
 {
-       TreeSocket* s = (TreeSocket*)opaque;
-       std::string output_text;
+       if (!x->IsBurstable() || loopCall || (user && !IS_LOCAL(user)))
+               return;
 
-       ServerInstance->Parser->TranslateUIDs(TR_SPACENICKLIST, modeline, output_text);
+       if (!user)
+               user = ServerInstance->FakeClient;
 
-       if (target)
-       {
-               if (target_type == TYPE_USER)
-               {
-                       User* u = (User*)target;
-                       s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+u->uuid+" "+ConvToStr(u->age)+" "+output_text);
-               }
-               else
-               {
-                       Channel* c = (Channel*)target;
-                       s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
-               }
-       }
+       CmdBuilder params(user, "DELLINE");
+       params.push_back(x->type);
+       params.push_back(x->Displayable());
+       params.Broadcast();
 }
 
-void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata)
+ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
 {
-       TreeSocket* s = (TreeSocket*)opaque;
-       if (target)
-       {
-               if (target_type == TYPE_USER)
-               {
-                       User* u = (User*)target;
-                       s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
-               }
-               else if (target_type == TYPE_CHANNEL)
-               {
-                       Channel* c = (Channel*)target;
-                       s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
-               }
-       }
-       if (target_type == TYPE_OTHER)
-       {
-               s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
-       }
+       if (IS_LOCAL(user))
+               CommandAway::Builder(user, awaymsg).Broadcast();
+
+       return MOD_RES_PASSTHRU;
 }
 
-void ModuleSpanningTree::OnEvent(Event* event)
+CullResult ModuleSpanningTree::cull()
 {
-       std::deque<std::string>* params = (std::deque<std::string>*)event->GetData();
-       if (event->GetEventID() == "send_encap")
-       {
-               if (params->size() < 2)
-                       return;
-
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", *params);
-       }
-       else if (event->GetEventID() == "send_metadata")
-       {
-               if (params->size() < 3)
-                       return;
-               (*params)[2] = ":" + (*params)[2];
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"METADATA",*params);
-       }
-       else if (event->GetEventID() == "send_topic")
-       {
-               if (params->size() < 2)
-                       return;
-               (*params)[1] = ":" + (*params)[1];
-               params->insert(params->begin() + 1,ServerInstance->Config->ServerName);
-               params->insert(params->begin() + 1,ConvToStr(ServerInstance->Time()));
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC",*params);
-       }
-       else if (event->GetEventID() == "send_mode")
-       {
-               if (params->size() < 2)
-                       return;
-               // Insert the TS value of the object, either User or Channel
-               time_t ourTS = 0;
-               std::string output_text;
-
-               /* Warning: in-place translation is only safe for type TR_NICK */
-               for (size_t n = 0; n < params->size(); n++)
-                       ServerInstance->Parser->TranslateUIDs(TR_NICK, (*params)[n], (*params)[n]);
-
-               User* a = ServerInstance->FindNick((*params)[0]);
-               if (a)
-               {
-                       ourTS = a->age;
-                       Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",*params);
-                       return;
-               }
-               else
-               {
-                       Channel* c = ServerInstance->FindChan((*params)[0]);
-                       if (c)
-                       {
-                               ourTS = c->age;
-                               params->insert(params->begin() + 1,ConvToStr(ourTS));
-                               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",*params);
-                       }
-               }
-       }
-       else if (event->GetEventID() == "send_mode_explicit")
-       {
-               if (params->size() < 2)
-                       return;
-               std::string output_text;
-
-               /* Warning: in-place translation is only safe for type TR_NICK */
-               for (size_t n = 0; n < params->size(); n++)
-                       ServerInstance->Parser->TranslateUIDs(TR_NICK, (*params)[n], (*params)[n]);
-
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",*params);
-       }
-       else if (event->GetEventID() == "send_opers")
-       {
-               if (params->size() < 1)
-                       return;
-               (*params)[0] = ":" + (*params)[0];
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"OPERNOTICE",*params);
-       }
-       else if (event->GetEventID() == "send_modeset")
-       {
-               if (params->size() < 2)
-                       return;
-               (*params)[1] = ":" + (*params)[1];
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODENOTICE",*params);
-       }
-       else if (event->GetEventID() == "send_snoset")
-       {
-               if (params->size() < 2)
-                       return;
-               (*params)[1] = ":" + (*params)[1];
-               Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SNONOTICE",*params);
-       }
-       else if (event->GetEventID() == "send_push")
-       {
-               if (params->size() < 2)
-                       return;
-                       
-               User *a = ServerInstance->FindNick((*params)[0]);
-                       
-               if (!a)
-                       return;
-
-               (*params)[0] = a->uuid;
-               (*params)[1] = ":" + (*params)[1];
-               Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", *params, a->server);
-       }
+       if (Utils)
+               Utils->cull();
+       return this->Module::cull();
 }
 
 ModuleSpanningTree::~ModuleSpanningTree()
 {
+       delete ServerInstance->PI;
+       ServerInstance->PI = new ProtocolInterface;
+
        /* This will also free the listeners */
        delete Utils;
 
-       ServerInstance->Timers->DelTimer(RefreshTimer);
-
-       ServerInstance->Modules->DoneWithInterface("BufferedSocketHook");
+       delete commands;
 }
 
 Version ModuleSpanningTree::GetVersion()
 {
-       return Version(1,2,0,2,VF_VENDOR,API_VERSION);
+       return Version("Allows servers to be linked", VF_VENDOR);
 }
 
 /* It is IMPORTANT that m_spanningtree is the last module in the chain
@@ -1011,7 +750,7 @@ Version ModuleSpanningTree::GetVersion()
  */
 void ModuleSpanningTree::Prioritize()
 {
-       ServerInstance->Modules->SetPriority(this, PRIO_LAST);
+       ServerInstance->Modules->SetPriority(this, PRIORITY_LAST);
 }
 
 MODULE_INIT(ModuleSpanningTree)