-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 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 "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.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 "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 */
+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->UseInterface("InspSocketHook");
- Utils = new SpanningTreeUtilities(Me, this);
- command_rconnect = new cmd_rconnect(ServerInstance, this, Utils);
- ServerInstance->AddCommand(command_rconnect);
- if (Utils->EnableTimeSync)
- {
- SyncTimer = new TimeSyncTimer(ServerInstance, this);
- ServerInstance->Timers->AddTimer(SyncTimer);
- }
- else
- SyncTimer = NULL;
+}
- RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils);
- ServerInstance->Timers->AddTimer(RefreshTimer);
+void ModuleSpanningTree::init()
+{
+ ServerInstance->SNO->EnableSnomask('l', "LINK");
+
+ 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, userrec* user, int hops)
+void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
{
std::string Parent = Utils->TreeRoot->GetName();
if (Current->GetParent())
{
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->WriteServ("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** parameters, int pcnt, userrec* user)
+void ModuleSpanningTree::HandleLinks(const std::vector<std::string>& parameters, User* user)
{
ShowLinks(Utils->TreeRoot,user,0);
- user->WriteServ("365 %s * :End of /LINKS list.",user->nick);
- return;
-}
-
-void ModuleSpanningTree::HandleLusers(const char** parameters, int pcnt, userrec* user)
-{
- unsigned int n_users = ServerInstance->UserCount();
-
- /* Only update these when someone wants to see them, more efficient */
- if ((unsigned int)ServerInstance->LocalUserCount() > max_local)
- max_local = ServerInstance->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->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick,n_users-ServerInstance->InvisibleUserCount(),ServerInstance->InvisibleUserCount(),ulined_count ? this->CountServs() - ulined_count : this->CountServs());
- if (ServerInstance->OperCount())
- user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->OperCount());
- if (ServerInstance->UnregisteredUserCount())
- user->WriteServ("253 %s %d :unknown connections",user->nick,ServerInstance->UnregisteredUserCount());
- if (ServerInstance->ChannelCount())
- user->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->ChannelCount());
- user->WriteServ("255 %s :I have %d clients and %d servers",user->nick,ServerInstance->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs());
- user->WriteServ("265 %s :Current Local Users: %d Max: %d",user->nick,ServerInstance->LocalUserCount(),max_local);
- user->WriteServ("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)
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");
}
-const std::string ModuleSpanningTree::MapOperInfo(TreeServer* Current)
+void ModuleSpanningTree::DoPingChecks(time_t curtime)
{
- time_t secs_up = ServerInstance->Time() - Current->age;
- return (" [Up: " + TimeToStr(secs_up) + " Lag: "+ConvToStr(Current->rtt)+"s]");
-}
+ /*
+ * 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);
-// WARNING: NOT THREAD SAFE - DONT GET ANY SMART IDEAS.
-void ModuleSpanningTree::ShowMap(TreeServer* Current, userrec* user, int depth, char matrix[128][128], float &totusers, float &totservers)
-{
- if (line < 128)
+restart:
+ for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
{
- for (int t = 0; t < depth; t++)
- {
- matrix[line][t] = ' ';
- }
- // For Aligning, we need to work out exactly how deep this thing is, and produce
- // a 'Spacer' String to compensate.
- char spacer[40];
- memset(spacer,' ',40);
- if ((40 - Current->GetName().length() - depth) > 1) {
- spacer[40 - Current->GetName().length() - depth] = '\0';
- }
- else
- {
- spacer[5] = '\0';
- }
- float percent;
- char text[128];
- /* Neat and tidy default values, as we're dealing with a matrix not a simple string */
- memset(text, 0, 128);
-
- if (ServerInstance->clientlist->size() == 0) {
- // If there are no users, WHO THE HELL DID THE /MAP?!?!?!
- percent = 0;
- }
- else
+ TreeServer *s = i->second;
+
+ // Skip myself
+ if (s->IsRoot())
+ continue;
+
+ if (s->GetSocket()->GetLinkState() == DYING)
{
- percent = ((float)Current->GetUserCount() / (float)ServerInstance->clientlist->size()) * 100;
+ s->GetSocket()->Close();
+ goto restart;
}
- const std::string operdata = IS_OPER(user) ? MapOperInfo(Current) : "";
- snprintf(text, 126, "%s %s%5d [%5.2f%%]%s", Current->GetName().c_str(), spacer, Current->GetUserCount(), percent, operdata.c_str());
- totusers += Current->GetUserCount();
- totservers++;
- strlcpy(&matrix[line][depth],text,126);
- line++;
- for (unsigned int q = 0; q < Current->ChildCount(); q++)
+
+ // 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())
{
- if ((Current->GetChild(q)->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(Current->GetChild(q)->GetName().c_str()))))
+ // And if they answered the last
+ if (s->AnsweredLastPing())
{
- if (*user->oper)
- {
- ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!*user->oper)) ? depth : depth+2,matrix,totusers,totservers);
- }
+ // 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
{
- ShowMap(Current->GetChild(q),user,(Utils->FlatLinks && (!*user->oper)) ? depth : depth+2,matrix,totusers,totservers);
+ // They didn't answer the last ping, if they are locally connected, get rid of them.
+ if (s->IsLocal())
+ {
+ TreeSocket* sock = s->GetSocket();
+ sock->SendError("Ping timeout");
+ sock->Close();
+ goto restart;
+ }
}
}
- }
-}
-
-int ModuleSpanningTree::HandleMotd(const char** parameters, int pcnt, userrec* user)
-{
- if (pcnt > 0)
- {
- if (match(ServerInstance->Config->ServerName, parameters[0]))
- return 0;
-
- /* Remote MOTD, the server is within the 1st parameter */
- std::deque<std::string> params;
- params.push_back(parameters[0]);
- /* Send it out remotely, generate no reply yet */
- TreeServer* s = Utils->FindServerMask(parameters[0]);
- if (s)
- Utils->DoOneToOne(user->nick, "MOTD", params, s->GetName());
- else
- user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
- return 1;
- }
- return 0;
-}
-
-int ModuleSpanningTree::HandleAdmin(const char** parameters, int pcnt, userrec* user)
-{
- if (pcnt > 0)
- {
- if (match(ServerInstance->Config->ServerName, parameters[0]))
- return 1;
-
- /* Remote ADMIN, the server is within the 1st parameter */
- std::deque<std::string> params;
- params.push_back(parameters[0]);
- /* Send it out remotely, generate no reply yet */
- TreeServer* s = Utils->FindServerMask(parameters[0]);
- if (s)
- Utils->DoOneToOne(user->nick, "ADMIN", params, s->GetName());
- else
- user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
- return 1;
- }
- return 0;
-}
-int ModuleSpanningTree::HandleModules(const char** parameters, int pcnt, userrec* user)
-{
- if (match(ServerInstance->Config->ServerName, parameters[0]))
- return 1;
-
- std::deque<std::string> params;
- params.push_back(parameters[0]);
- TreeServer* s = Utils->FindServerMask(parameters[0]);
- if (s)
- Utils->DoOneToOne(user->nick, "MODULES", params, s->GetName());
- else
- user->WriteServ( "402 %s %s :No such server", user->nick, parameters[0]);
- return 1;
-}
-
-int ModuleSpanningTree::HandleStats(const char** parameters, int pcnt, userrec* user)
-{
- if (pcnt > 1)
- {
- if (match(ServerInstance->Config->ServerName, parameters[1]))
- return 0;
-
- /* Remote STATS, the server is within the 2nd parameter */
- std::deque<std::string> params;
- params.push_back(parameters[0]);
- params.push_back(parameters[1]);
- /* Send it out remotely, generate no reply yet */
-
- TreeServer* s = Utils->FindServerMask(parameters[1]);
- if (s)
+ // 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()))
{
- params[1] = s->GetName();
- Utils->DoOneToOne(user->nick, "STATS", params, s->GetName());
+ /* 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;
}
- else
- {
- user->WriteServ( "402 %s %s :No such server", user->nick, parameters[1]);
- }
- return 1;
}
- return 0;
}
-// Ok, prepare to be confused.
-// After much mulling over how to approach this, it struck me that
-// the 'usual' way of doing a /MAP isnt the best way. Instead of
-// keeping track of a ton of ascii characters, and line by line
-// under recursion working out where to place them using multiplications
-// and divisons, we instead render the map onto a backplane of characters
-// (a character matrix), then draw the branches as a series of "L" shapes
-// from the nodes. This is not only friendlier on CPU it uses less stack.
-void ModuleSpanningTree::HandleMap(const char** parameters, int pcnt, userrec* user)
+void ModuleSpanningTree::ConnectServer(Autoconnect* a, bool on_timer)
{
- // This array represents a virtual screen which we will
- // "scratch" draw to, as the console device of an irc
- // client does not provide for a proper terminal.
- float totusers = 0;
- float totservers = 0;
- char matrix[128][128];
- for (unsigned int t = 0; t < 128; t++)
- {
- matrix[t][0] = '\0';
- }
- line = 0;
- // The only recursive bit is called here.
- ShowMap(Utils->TreeRoot,user,0,matrix,totusers,totservers);
- // Process each line one by one. The algorithm has a limit of
- // 128 servers (which is far more than a spanning tree should have
- // anyway, so we're ok). This limit can be raised simply by making
- // the character matrix deeper, 128 rows taking 10k of memory.
- for (int l = 1; l < line; l++)
- {
- // scan across the line looking for the start of the
- // servername (the recursive part of the algorithm has placed
- // the servers at indented positions depending on what they
- // are related to)
- int first_nonspace = 0;
- while (matrix[l][first_nonspace] == ' ')
- {
- first_nonspace++;
- }
- first_nonspace--;
- // Draw the `- (corner) section: this may be overwritten by
- // another L shape passing along the same vertical pane, becoming
- // a |- (branch) section instead.
- matrix[l][first_nonspace] = '-';
- matrix[l][first_nonspace-1] = '`';
- int l2 = l - 1;
- // Draw upwards until we hit the parent server, causing possibly
- // other corners (`-) to become branches (|-)
- while ((matrix[l2][first_nonspace-1] == ' ') || (matrix[l2][first_nonspace-1] == '`'))
- {
- matrix[l2][first_nonspace-1] = '|';
- l2--;
- }
- }
- // dump the whole lot to the user. This is the easy bit, honest.
- for (int t = 0; t < line; t++)
- {
- user->WriteServ("006 %s :%s",user->nick,&matrix[t][0]);
- }
- float avg_users = totusers / totservers;
- user->WriteServ("270 %s :%.0f server%s and %.0f user%s, average %.2f users per server",user->nick,totservers,(totservers > 1 ? "s" : ""),totusers,(totusers > 1 ? "s" : ""),avg_users);
- user->WriteServ("007 %s :End of /MAP",user->nick);
- return;
-}
-
-int ModuleSpanningTree::HandleSquit(const char** parameters, int pcnt, userrec* user)
-{
- TreeServer* s = Utils->FindServerMask(parameters[0]);
- if (s)
+ if (!a)
+ return;
+ for(unsigned int j=0; j < a->servers.size(); j++)
{
- if (s == Utils->TreeRoot)
+ if (Utils->FindServer(a->servers[j]))
{
- user->WriteServ("NOTICE %s :*** SQUIT: Foolish mortal, you cannot make a server SQUIT itself! (%s matches local server name)",user->nick,parameters[0]);
- return 1;
- }
- TreeSocket* sock = s->GetSocket();
- if (sock)
- {
- ServerInstance->SNO->WriteToSnoMask('l',"SQUIT: Server \002%s\002 removed from network by %s",parameters[0],user->nick);
- sock->Squit(s,std::string("Server quit by ") + user->GetFullRealHost());
- ServerInstance->SE->DelFd(sock);
- sock->Close();
- delete sock;
- }
- else
- {
- /* route it */
- std::deque<std::string> params;
- params.push_back(parameters[0]);
- params.push_back(std::string(":Server quit by ") + user->GetFullRealHost());
- Utils->DoOneToOne(user->nick, "RSQUIT", params, parameters[0]);
+ // 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;
}
}
- else
- {
- user->WriteServ("NOTICE %s :*** SQUIT: The server \002%s\002 does not exist on the network.",user->nick,parameters[0]);
- }
- return 1;
-}
+ if (on_timer && a->position >= 0)
+ return;
+ if (!on_timer && a->position < 0)
+ return;
-int ModuleSpanningTree::HandleTime(const char** parameters, int pcnt, userrec* user)
-{
- if ((IS_LOCAL(user)) && (pcnt))
+ a->position++;
+ while (a->position < (int)a->servers.size())
{
- TreeServer* found = Utils->FindServerMask(parameters[0]);
- if (found)
- {
- // we dont' override for local server
- if (found == Utils->TreeRoot)
- return 0;
-
- std::deque<std::string> params;
- params.push_back(found->GetName());
- params.push_back(user->nick);
- Utils->DoOneToOne(ServerInstance->Config->ServerName,"TIME",params,found->GetName());
- }
- else
+ Link* x = Utils->FindLink(a->servers[a->position]);
+ if (x)
{
- user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]);
+ ServerInstance->SNO->WriteToSnoMask('l', "AUTOCONNECT: Auto-connecting server \002%s\002", x->Name.c_str());
+ ConnectServer(x, a);
+ return;
}
+ a->position++;
}
- return 1;
+ // Autoconnect chain has been fully iterated; start at the beginning on the
+ // next AutoConnectServers run
+ a->position = -1;
}
-int ModuleSpanningTree::HandleRemoteWhois(const char** parameters, int pcnt, userrec* user)
+void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
{
- if ((IS_LOCAL(user)) && (pcnt > 1))
- {
- userrec* remote = ServerInstance->FindNick(parameters[1]);
- if ((remote) && (remote->GetFd() < 0))
- {
- std::deque<std::string> params;
- params.push_back(parameters[1]);
- Utils->DoOneToOne(user->nick,"IDLE",params,remote->server);
- return 1;
- }
- else if (!remote)
- {
- user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
- user->WriteServ("318 %s %s :End of /WHOIS list.",user->nick, parameters[1]);
- return 1;
- }
- }
- return 0;
-}
+ bool ipvalid = true;
-void ModuleSpanningTree::DoPingChecks(time_t curtime)
-{
- for (unsigned int j = 0; j < Utils->TreeRoot->ChildCount(); j++)
+ if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name)))
{
- TreeServer* serv = Utils->TreeRoot->GetChild(j);
- TreeSocket* sock = serv->GetSocket();
- if (sock)
- {
- if (curtime >= serv->NextPingTime())
- {
- if (serv->AnsweredLastPing())
- {
- sock->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" PING "+serv->GetName());
- serv->SetNextPingTime(curtime + 60);
- serv->LastPing = curtime;
- serv->Warned = false;
- }
- else
- {
- /* they didnt answer, boot them */
- sock->SendError("Ping timeout");
- sock->Squit(serv,"Ping timeout");
- ServerInstance->SE->DelFd(sock);
- sock->Close();
- delete sock;
- return;
- }
- }
- else if ((Utils->PingWarnTime) && (!serv->Warned) && (curtime >= serv->NextPingTime() - (60 - 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;
- }
- }
+ ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself.");
+ return;
}
- /* Cancel remote burst mode on any servers which still have it enabled due to latency/lack of data.
- * This prevents lost REMOTECONNECT notices
- */
- for (server_hash::iterator i = Utils->serverlist.begin(); i != Utils->serverlist.end(); i++)
- Utils->SetRemoteBursting(i->second, false);
-}
-
-void ModuleSpanningTree::ConnectServer(Link* x)
-{
- bool ipvalid = true;
- QueryType start_type = DNS_QUERY_A;
-#ifdef IPV6
- start_type = DNS_QUERY_AAAA;
+ DNS::QueryType start_type = DNS::QUERY_AAAA;
if (strchr(x->IPAddr.c_str(),':'))
{
in6_addr n;
ipvalid = false;
}
else
-#endif
{
in_addr n;
if (inet_aton(x->IPAddr.c_str(),&n) < 1)
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
{
- ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
- delete 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)
{
- ServerInstance->SNO->WriteToSnoMask('l',"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);
}
}
}
-int ModuleSpanningTree::HandleVersion(const char** parameters, int pcnt, userrec* user)
+void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
{
- // we've already checked if pcnt > 0, so this is safe
- TreeServer* found = Utils->FindServerMask(parameters[0]);
- if (found)
+ std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = Utils->timeoutlist.begin();
+ while (i != Utils->timeoutlist.end())
{
- std::string Version = found->GetVersion();
- user->WriteServ("351 %s :%s",user->nick,Version.c_str());
- if (found == Utils->TreeRoot)
+ 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)
{
- ServerInstance->Config->Send005(user);
+ Utils->timeoutlist.erase(me);
+ s->Close();
}
- }
- else
- {
- user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]);
- }
- return 1;
-}
-
-int ModuleSpanningTree::HandleConnect(const char** parameters, int pcnt, userrec* user)
-{
- for (std::vector<Link>::iterator x = Utils->LinkBlocks.begin(); x < Utils->LinkBlocks.end(); x++)
- {
- if (ServerInstance->MatchText(x->Name.c_str(),parameters[0]))
+ else if (curtime > s->age + p.second)
{
- TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str());
- if (!CheckDupe)
- {
- user->WriteServ("NOTICE %s :*** CONNECT: Connecting to server: \002%s\002 (%s:%d)",user->nick,x->Name.c_str(),(x->HiddenFromStats ? "<hidden>" : x->IPAddr.c_str()),x->Port);
- ConnectServer(&(*x));
- return 1;
- }
- else
- {
- user->WriteServ("NOTICE %s :*** CONNECT: Server \002%s\002 already exists on the network and is connected via \002%s\002",user->nick,x->Name.c_str(),CheckDupe->GetParent()->GetName().c_str());
- return 1;
- }
+ 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();
}
}
- user->WriteServ("NOTICE %s :*** CONNECT: No server matching \002%s\002 could be found in the config file.",user->nick,parameters[0]);
- return 1;
-}
-
-void ModuleSpanningTree::BroadcastTimeSync()
-{
- if (Utils->MasterTime)
- {
- std::deque<std::string> params;
- params.push_back(ConvToStr(ServerInstance->Time(false)));
- params.push_back("FORCE");
- Utils->DoOneToMany(Utils->TreeRoot->GetName(), "TIMESET", params);
- }
}
-int ModuleSpanningTree::OnStats(char statschar, userrec* user, string_list &results)
+ModResult ModuleSpanningTree::HandleVersion(const std::vector<std::string>& parameters, User* user)
{
- if ((statschar == 'c') || (statschar == 'n'))
+ // we've already checked if pcnt > 0, so this is safe
+ TreeServer* found = Utils->FindServerMask(parameters[0]);
+ if (found)
{
- for (unsigned int i = 0; i < Utils->LinkBlocks.size(); i++)
+ if (found == Utils->TreeRoot)
{
- results.push_back(std::string(ServerInstance->Config->ServerName)+" 213 "+user->nick+" "+statschar+" *@"+(Utils->LinkBlocks[i].HiddenFromStats ? "<hidden>" : Utils->LinkBlocks[i].IPAddr)+" * "+Utils->LinkBlocks[i].Name.c_str()+" "+ConvToStr(Utils->LinkBlocks[i].Port)+" "+(Utils->LinkBlocks[i].Hook.empty() ? "plaintext" : Utils->LinkBlocks[i].Hook)+" "+(Utils->LinkBlocks[i].AutoConnect ? 'a' : '-')+'s');
- if (statschar == 'c')
- results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+Utils->LinkBlocks[i].Name.c_str());
+ // Pass to default VERSION handler.
+ return MOD_RES_PASSTHRU;
}
- results.push_back(std::string(ServerInstance->Config->ServerName)+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
- ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
- return 1;
+ std::string Version = found->GetVersion();
+ user->WriteNumeric(351, "%s :%s",user->nick.c_str(),Version.c_str());
}
-
- if (statschar == 'p')
+ else
{
- /* show all server ports, after showing client ports. -- w00t */
-
- for (unsigned int i = 0; i < Utils->Bindings.size(); i++)
- {
- std::string ip = Utils->Bindings[i]->IP;
- if (ip.empty())
- ip = "*";
-
- std::string transport("plaintext");
- if (Utils->Bindings[i]->GetHook())
- transport = InspSocketNameRequest(this, Utils->Bindings[i]->GetHook()).Send();
-
- results.push_back(ConvToStr(ServerInstance->Config->ServerName) + " 249 "+user->nick+" :" + ip + ":" + ConvToStr(Utils->Bindings[i]->port)+
- " (server, " + transport + ")");
- }
+ user->WriteNumeric(402, "%s %s :No such server",user->nick.c_str(),parameters[0].c_str());
}
- return 0;
+ return MOD_RES_DENY;
}
-int ModuleSpanningTree::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+/* This method will attempt to get a message to a remote user.
+ */
+void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...)
{
- /* If the command doesnt appear to be valid, we dont want to mess with it. */
- if (!validated)
- return 0;
+ std::string text;
+ VAFORMAT(text, format, format);
- if (command == "CONNECT")
- {
- return this->HandleConnect(parameters,pcnt,user);
- }
- else if (command == "STATS")
- {
- return this->HandleStats(parameters,pcnt,user);
- }
- else if (command == "MOTD")
- {
- return this->HandleMotd(parameters,pcnt,user);
- }
- else if (command == "ADMIN")
- {
- return this->HandleAdmin(parameters,pcnt,user);
- }
- else if (command == "SQUIT")
- {
- return this->HandleSquit(parameters,pcnt,user);
- }
- else if (command == "MAP")
- {
- this->HandleMap(parameters,pcnt,user);
- return 1;
- }
- else if ((command == "TIME") && (pcnt > 0))
- {
- return this->HandleTime(parameters,pcnt,user);
- }
- else if (command == "LUSERS")
- {
- this->HandleLusers(parameters,pcnt,user);
- return 1;
- }
- else if (command == "LINKS")
- {
- this->HandleLinks(parameters,pcnt,user);
- return 1;
- }
- else if (command == "WHOIS")
- {
- if (pcnt > 1)
- {
- // remote whois
- return this->HandleRemoteWhois(parameters,pcnt,user);
- }
- }
- else if ((command == "VERSION") && (pcnt > 0))
- {
- this->HandleVersion(parameters,pcnt,user);
- return 1;
- }
- else if ((command == "MODULES") && (pcnt > 0))
- {
- return this->HandleModules(parameters,pcnt,user);
- }
- return 0;
+ if (IS_LOCAL(user))
+ user->WriteNotice(text);
+ else
+ ServerInstance->PI->SendUserNotice(user, text);
}
-void ModuleSpanningTree::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
+ModResult ModuleSpanningTree::HandleConnect(const std::vector<std::string>& parameters, User* user)
{
- if ((result == CMD_SUCCESS) && (ServerInstance->IsValidModuleCommand(command, pcnt, user)))
+ for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); i++)
{
- // this bit of code cleverly routes all module commands
- // to all remote severs *automatically* so that modules
- // can just handle commands locally, without having
- // to have any special provision in place for remote
- // commands and linking protocols.
- std::deque<std::string> params;
- params.clear();
- for (int j = 0; j < pcnt; j++)
+ Link* x = *i;
+ if (InspIRCd::Match(x->Name.c_str(),parameters[0]))
{
- if (strchr(parameters[j],' '))
+ if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name)))
{
- params.push_back(":" + std::string(parameters[j]));
+ 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 MOD_RES_DENY;
}
else
{
- params.push_back(std::string(parameters[j]));
+ 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;
}
}
- Utils->DoOneToMany(user->nick,command,params);
}
+ 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)
}
}
-void ModuleSpanningTree::OnUserInvite(userrec* source,userrec* dest,chanrec* channel)
+void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, time_t expiry)
{
if (IS_LOCAL(source))
{
- std::deque<std::string> params;
- params.push_back(dest->nick);
+ CmdBuilder params(source, "INVITE");
+ params.push_back(dest->uuid);
params.push_back(channel->name);
- Utils->DoOneToMany(source->nick,"INVITE",params);
+ params.push_back(ConvToStr(expiry));
+ params.Broadcast();
}
}
-void ModuleSpanningTree::OnPostLocalTopicChange(userrec* user, chanrec* 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->nick,"TOPIC",params);
-}
+ // Drop remote events on the floor.
+ if (!IS_LOCAL(user))
+ return;
-void ModuleSpanningTree::OnWallops(userrec* user, const std::string &text)
-{
- if (IS_LOCAL(user))
- {
- std::deque<std::string> params;
- params.push_back(":"+text);
- Utils->DoOneToMany(user->nick,"WALLOPS",params);
- }
+ CommandFTopic::Builder(user, chan).Broadcast();
}
-void ModuleSpanningTree::OnUserNotice(userrec* 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)
- {
- userrec* d = (userrec*)dest;
- if ((d->GetFd() < 0) && (IS_LOCAL(user)))
- {
- std::deque<std::string> params;
- params.clear();
- params.push_back(d->nick);
- params.push_back(":"+text);
- Utils->DoOneToOne(user->nick,"NOTICE",params,d->server);
- }
- }
- else if (target_type == TYPE_CHANNEL)
- {
- if (IS_LOCAL(user))
- {
- chanrec *c = (chanrec*)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->nick)+" 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->nick,"NOTICE",par);
- }
- }
-}
+ if (!IS_LOCAL(user))
+ return;
-void ModuleSpanningTree::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
-{
- ServerInstance->Log(DEBUG,"Message='%s'", text.c_str());
+ 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
- userrec* d = (userrec*)dest;
- if ((d->GetFd() < 0) && (IS_LOCAL(user)))
+ User* d = (User*) dest;
+ if (!IS_LOCAL(d))
{
- std::deque<std::string> params;
- params.clear();
- params.push_back(d->nick);
- params.push_back(":"+text);
- Utils->DoOneToOne(user->nick,"PRIVMSG",params,d->server);
+ CmdBuilder params(user, message_type);
+ params.push_back(d->uuid);
+ params.push_last(text);
+ params.Unicast(d);
}
}
else if (target_type == TYPE_CHANNEL)
{
- if (IS_LOCAL(user))
- {
- chanrec *c = (chanrec*)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->nick)+" 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->nick,"PRIVMSG",par);
- }
+ char* target = (char*) dest;
+ CmdBuilder par(user, message_type);
+ par.push_back(target);
+ par.push_last(text);
+ par.Broadcast();
}
}
{
AutoConnectServers(curtime);
DoPingChecks(curtime);
+ DoConnectTimeout(curtime);
+}
+
+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(userrec* user, chanrec* channel, bool &silent)
+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->nick));
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"FJOIN",params);
- /* First user in, sync the modes for the channel */
- params.pop_back();
- params.push_back(channel->ChanModes(true));
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"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->nick,"JOIN",params);
+ params.push_back(ConvToStr(memb->chan->age));
+ params.push_back(memb->modes);
}
+ params.Broadcast();
}
}
-void ModuleSpanningTree::OnChangeHost(userrec* user, const std::string &newhost)
+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->nick,"FHOST",params);
+
+ CmdBuilder(user, "FHOST").push(newhost).Broadcast();
}
-void ModuleSpanningTree::OnChangeName(userrec* user, const std::string &gecos)
+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->nick,"FNAME",params);
+
+ CmdBuilder(user, "FNAME").push(gecos).Broadcast();
}
-void ModuleSpanningTree::OnUserPart(userrec* user, chanrec* 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 != "")
- params.push_back(":"+partmessage);
- Utils->DoOneToMany(user->nick,"PART",params);
- }
+ if ((user->registered != REG_ALL) || (!IS_LOCAL(user)))
+ return;
+
+ CmdBuilder(user, "FIDENT").push(ident).Broadcast();
}
-void ModuleSpanningTree::OnUserConnect(userrec* user)
+void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts)
{
- char agestr[MAXBUF];
- if (IS_LOCAL(user))
+ if (IS_LOCAL(memb->user))
{
- std::deque<std::string> params;
- snprintf(agestr,MAXBUF,"%lu",(unsigned long)user->age);
- params.push_back(agestr);
- 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(":"+std::string(user->fullname));
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"NICK",params);
- // User is Local, change needs to be reflected!
- TreeServer* SourceServer = Utils->FindServer(user->server);
- if (SourceServer)
- {
- SourceServer->AddUserCount();
- }
+ CmdBuilder params(memb->user, "PART");
+ params.push_back(memb->chan->name);
+ if (!partmessage.empty())
+ params.push_last(partmessage);
+ params.Broadcast();
}
}
-void ModuleSpanningTree::OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
{
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->nick,"OPERQUIT",params);
- }
- params.clear();
- params.push_back(":"+reason);
- Utils->DoOneToMany(user->nick,"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->DelUserCount();
+ SourceServer->UserCount--;
}
}
-void ModuleSpanningTree::OnUserPostNick(userrec* user, const std::string &oldnick)
+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);
- Utils->DoOneToMany(oldnick,"NICK",params);
- }
-}
-void ModuleSpanningTree::OnUserKick(userrec* source, userrec* user, chanrec* 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->nick);
- params.push_back(":"+reason);
- Utils->DoOneToMany(source->nick,"KICK",params);
+ /** IMPORTANT: We don't update the TS if the oldnick is just a case change of the newnick!
+ */
+ if (irc::string(user->nick.c_str()) != assign(oldnick))
+ user->age = ServerInstance->Time();
+
+ params.push_back(ConvToStr(user->age));
+ params.Broadcast();
}
- else if (!source)
+ else if (!loopCall && user->nick == user->uuid)
{
- std::deque<std::string> params;
- params.push_back(chan->name);
- params.push_back(user->nick);
- params.push_back(":"+reason);
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"KICK",params);
+ CmdBuilder params("SAVE");
+ params.push_back(user->uuid);
+ params.push_back(ConvToStr(user->age));
+ params.Broadcast();
}
}
-void ModuleSpanningTree::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason)
+void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
{
- std::deque<std::string> params;
- params.push_back(dest->nick);
- params.push_back(":"+reason);
- Utils->DoOneToMany(source->nick,"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(userrec* user, const std::string ¶meter)
+void ModuleSpanningTree::OnPreRehash(User* user, const std::string ¶meter)
{
- if (parameter != "")
+ 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->ServerName, "REHASH", params);
- // check for self
- if (ServerInstance->MatchText(ServerInstance->Config->ServerName,parameter))
- {
- ServerInstance->WriteOpers("*** 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(false);
- 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(userrec* 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->nick,"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::OnLine(userrec* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason)
+void ModuleSpanningTree::OnLoadModule(Module* mod)
{
- if (!source)
+ std::string data;
+ data.push_back('+');
+ data.append(mod->ModuleSourceFile);
+ Version v = mod->GetVersion();
+ if (!v.link_data.empty())
{
- /* Server-set lines */
- char data[MAXBUF];
- snprintf(data,MAXBUF,"%c %s %s %lu %lu :%s", linetype, host.c_str(), ServerInstance->Config->ServerName, (unsigned long)ServerInstance->Time(false),
- (unsigned long)duration, reason.c_str());
- std::deque<std::string> params;
- params.push_back(data);
- Utils->DoOneToMany(ServerInstance->Config->ServerName, "ADDLINE", params);
- }
- else
- {
- if (IS_LOCAL(source))
- {
- char type[8];
- snprintf(type,8,"%cLINE",linetype);
- std::string stype = type;
- if (adding)
- {
- char sduration[MAXBUF];
- snprintf(sduration,MAXBUF,"%ld",duration);
- std::deque<std::string> params;
- params.push_back(host);
- params.push_back(sduration);
- params.push_back(":"+reason);
- Utils->DoOneToMany(source->nick,stype,params);
- }
- else
- {
- std::deque<std::string> params;
- params.push_back(host);
- Utils->DoOneToMany(source->nick,stype,params);
- }
- }
+ data.push_back('=');
+ data.append(v.link_data);
}
+ ServerInstance->PI->SendMetaData("modules", data);
}
-void ModuleSpanningTree::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask)
+void ModuleSpanningTree::OnUnloadModule(Module* mod)
{
- OnLine(source,hostmask,true,'G',duration,reason);
-}
-
-void ModuleSpanningTree::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask)
-{
- OnLine(source,ipmask,true,'Z',duration,reason);
-}
+ if (!Utils)
+ return;
+ ServerInstance->PI->SendMetaData("modules", "-" + mod->ModuleSourceFile);
-void ModuleSpanningTree::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask)
-{
- OnLine(source,nickmask,true,'Q',duration,reason);
-}
+ // 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)
+ {
+ TreeSocket* sock = (*i)->GetSocket();
+ if (sock && sock->GetIOHook() && sock->GetIOHook()->creator == mod)
+ {
+ sock->SendError("SSL module unloaded");
+ sock->Close();
+ }
+ }
-void ModuleSpanningTree::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask)
-{
- OnLine(source,hostmask,true,'E',duration,reason);
+ for (SpanningTreeUtilities::TimeoutList::const_iterator i = Utils->timeoutlist.begin(); i != Utils->timeoutlist.end(); ++i)
+ {
+ TreeSocket* sock = i->first;
+ if (sock->GetIOHook() && sock->GetIOHook()->creator == mod)
+ sock->Close();
+ }
}
-void ModuleSpanningTree::OnDelGLine(userrec* source, const std::string &hostmask)
+// 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)
{
- OnLine(source,hostmask,false,'G',0,"");
+ if (user->registered != REG_ALL || !IS_LOCAL(user))
+ return;
+ CommandOpertype::Builder(user).Broadcast();
}
-void ModuleSpanningTree::OnDelZLine(userrec* source, const std::string &ipmask)
+void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
{
- OnLine(source,ipmask,false,'Z',0,"");
-}
+ if (!x->IsBurstable() || loopCall || (user && !IS_LOCAL(user)))
+ return;
-void ModuleSpanningTree::OnDelQLine(userrec* source, const std::string &nickmask)
-{
- OnLine(source,nickmask,false,'Q',0,"");
-}
+ if (!user)
+ user = ServerInstance->FakeClient;
-void ModuleSpanningTree::OnDelELine(userrec* source, const std::string &hostmask)
-{
- OnLine(source,hostmask,false,'E',0,"");
+ CommandAddLine::Builder(x, user).Broadcast();
}
-void ModuleSpanningTree::OnMode(userrec* user, void* dest, int target_type, const std::string &text)
+void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
{
- if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
- {
- std::deque<std::string> params;
- std::string command;
+ if (!x->IsBurstable() || loopCall || (user && !IS_LOCAL(user)))
+ return;
- if (target_type == TYPE_USER)
- {
- userrec* u = (userrec*)dest;
- params.push_back(u->nick);
- params.push_back(text);
- command = "MODE";
- }
- else
- {
- chanrec* c = (chanrec*)dest;
- params.push_back(c->name);
- params.push_back(ConvToStr(c->age));
- params.push_back(text);
- command = "FMODE";
- }
- Utils->DoOneToMany(user->nick, command, params);
- }
-}
+ if (!user)
+ user = ServerInstance->FakeClient;
-void ModuleSpanningTree::OnSetAway(userrec* user)
-{
- if (IS_LOCAL(user))
- {
- std::deque<std::string> params;
- params.push_back(":"+std::string(user->awaymsg));
- Utils->DoOneToMany(user->nick,"AWAY",params);
- }
+ CmdBuilder params(user, "DELLINE");
+ params.push_back(x->type);
+ params.push_back(x->Displayable());
+ params.Broadcast();
}
-void ModuleSpanningTree::OnCancelAway(userrec* user)
+ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
{
if (IS_LOCAL(user))
- {
- std::deque<std::string> params;
- params.clear();
- Utils->DoOneToMany(user->nick,"AWAY",params);
- }
-}
+ CommandAway::Builder(user, awaymsg).Broadcast();
-void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline)
-{
- TreeSocket* s = (TreeSocket*)opaque;
- if (target)
- {
- if (target_type == TYPE_USER)
- {
- userrec* u = (userrec*)target;
- s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" FMODE "+u->nick+" "+ConvToStr(u->age)+" "+modeline);
- }
- else
- {
- chanrec* c = (chanrec*)target;
- s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+modeline);
- }
- }
+ return MOD_RES_PASSTHRU;
}
-void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata)
+CullResult ModuleSpanningTree::cull()
{
- TreeSocket* s = (TreeSocket*)opaque;
- if (target)
- {
- if (target_type == TYPE_USER)
- {
- userrec* u = (userrec*)target;
- s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" METADATA "+u->nick+" "+extname+" :"+extdata);
- }
- else if (target_type == TYPE_CHANNEL)
- {
- chanrec* c = (chanrec*)target;
- s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" METADATA "+c->name+" "+extname+" :"+extdata);
- }
- }
- if (target_type == TYPE_OTHER)
- {
- s->WriteLine(std::string(":")+ServerInstance->Config->ServerName+" METADATA * "+extname+" :"+extdata);
- }
-}
-
-void ModuleSpanningTree::OnEvent(Event* event)
-{
- std::deque<std::string>* params = (std::deque<std::string>*)event->GetData();
- if (event->GetEventID() == "send_metadata")
- {
- if (params->size() < 3)
- return;
- (*params)[2] = ":" + (*params)[2];
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"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(true)));
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"FTOPIC",*params);
- }
- else if (event->GetEventID() == "send_mode")
- {
- if (params->size() < 2)
- return;
- // Insert the TS value of the object, either userrec or chanrec
- time_t ourTS = 0;
- userrec* a = ServerInstance->FindNick((*params)[0]);
- if (a)
- {
- ourTS = a->age;
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"MODE",*params);
- return;
- }
- else
- {
- chanrec* a = ServerInstance->FindChan((*params)[0]);
- if (a)
- {
- ourTS = a->age;
- params->insert(params->begin() + 1,ConvToStr(ourTS));
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"FMODE",*params);
- }
- }
- }
- else if (event->GetEventID() == "send_mode_explicit")
- {
- if (params->size() < 2)
- return;
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"MODE",*params);
- }
- else if (event->GetEventID() == "send_opers")
- {
- if (params->size() < 1)
- return;
- (*params)[0] = ":" + (*params)[0];
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"OPERNOTICE",*params);
- }
- else if (event->GetEventID() == "send_modeset")
- {
- if (params->size() < 2)
- return;
- (*params)[1] = ":" + (*params)[1];
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"MODENOTICE",*params);
- }
- else if (event->GetEventID() == "send_snoset")
- {
- if (params->size() < 2)
- return;
- (*params)[1] = ":" + (*params)[1];
- Utils->DoOneToMany(ServerInstance->Config->ServerName,"SNONOTICE",*params);
- }
- else if (event->GetEventID() == "send_push")
- {
- if (params->size() < 2)
- return;
-
- userrec *a = ServerInstance->FindNick((*params)[0]);
-
- if (!a)
- return;
-
- (*params)[1] = ":" + (*params)[1];
- Utils->DoOneToOne(ServerInstance->Config->ServerName, "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;
- if (SyncTimer)
- ServerInstance->Timers->DelTimer(SyncTimer);
-
- ServerInstance->Timers->DelTimer(RefreshTimer);
- ServerInstance->DoneWithInterface("InspSocketHook");
+ delete commands;
}
Version ModuleSpanningTree::GetVersion()
{
- return Version(1,1,0,2,VF_VENDOR,API_VERSION);
-}
-
-void ModuleSpanningTree::Implements(char* List)
-{
- List[I_OnPreCommand] = List[I_OnGetServerDescription] = List[I_OnUserInvite] = List[I_OnPostLocalTopicChange] = 1;
- List[I_OnWallops] = List[I_OnUserNotice] = List[I_OnUserMessage] = List[I_OnBackgroundTimer] = 1;
- List[I_OnUserJoin] = List[I_OnChangeHost] = List[I_OnChangeName] = List[I_OnUserPart] = List[I_OnUserConnect] = 1;
- List[I_OnUserQuit] = List[I_OnUserPostNick] = List[I_OnUserKick] = List[I_OnRemoteKill] = List[I_OnRehash] = 1;
- List[I_OnOper] = List[I_OnAddGLine] = List[I_OnAddZLine] = List[I_OnAddQLine] = List[I_OnAddELine] = 1;
- List[I_OnDelGLine] = List[I_OnDelZLine] = List[I_OnDelQLine] = List[I_OnDelELine] = List[I_ProtoSendMode] = List[I_OnMode] = 1;
- List[I_OnStats] = List[I_ProtoSendMetaData] = List[I_OnEvent] = List[I_OnSetAway] = List[I_OnCancelAway] = List[I_OnPostCommand] = 1;
+ return Version("Allows servers to be linked", VF_VENDOR);
}
/* It is IMPORTANT that m_spanningtree is the last module in the chain
* Therefore, we return PRIORITY_LAST to make sure we end up at the END of
* the module call queue.
*/
-Priority ModuleSpanningTree::Prioritize()
+void ModuleSpanningTree::Prioritize()
{
- return PRIORITY_LAST;
+ ServerInstance->Modules->SetPriority(this, PRIORITY_LAST);
}
-class ModuleSpanningTreeFactory : public ModuleFactory
-{
- public:
- ModuleSpanningTreeFactory()
- {
- }
-
- ~ModuleSpanningTreeFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleSpanningTree(Me);
- }
-
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
- return new ModuleSpanningTreeFactory;
-}
+MODULE_INIT(ModuleSpanningTree)
projects / user / henk / code / inspircd.git / blobdiff