/* $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 "xline.h"
-#include "../transport.h"
#include "cachetimer.h"
#include "resolvers.h"
/* $ModDep: m_spanningtree/cachetimer.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 m_spanningtree/protocolinterface.h */
-ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
- : Module(Me), max_local(0), max_global(0)
+ModuleSpanningTree::ModuleSpanningTree()
+ : max_local(0), max_global(0)
{
ServerInstance->Modules->UseInterface("BufferedSocketHook");
- Utils = new SpanningTreeUtilities(ServerInstance, this);
- command_rconnect = new CommandRConnect(ServerInstance, this, Utils);
+ Utils = new SpanningTreeUtilities(this);
+ command_rconnect = new CommandRConnect(this, Utils);
ServerInstance->AddCommand(command_rconnect);
- command_rsquit = new CommandRSQuit(ServerInstance, this, Utils);
+ command_rsquit = new CommandRSQuit(this, Utils);
ServerInstance->AddCommand(command_rsquit);
- RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils);
+ RefreshTimer = new CacheRefreshTimer(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_OnChangeLocalUserHost, I_OnChangeName, I_OnUserPart, I_OnUnloadModule,
+ I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostTopicChange,
+ I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin,
+ I_OnChangeHost, I_OnChangeName, I_OnChangeIdent, I_OnUserPart, I_OnUnloadModule,
I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, I_OnPreRehash,
- I_OnOper, I_OnAddLine, I_OnDelLine, I_ProtoSendMode, I_OnMode, I_OnLoadModule,
- I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnPostCommand
+ I_OnOper, I_OnAddLine, I_OnDelLine, I_OnMode, I_OnLoadModule, I_OnStats,
+ I_OnSetAway, I_OnPostCommand, I_OnUserConnect, I_OnAcceptConnection
};
- ServerInstance->Modules->Attach(eventlist, this, 30);
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
delete ServerInstance->PI;
- ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance);
+ ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils);
loopCall = false;
- for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
- {
- ServerInstance->PI->Introduce(*i);
- }
+ // update our local user count
+ Utils->TreeRoot->SetUserCount(ServerInstance->Users->local_users.size());
}
void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
return;
user->WriteNumeric(364, "%s %s %s :%d %s", user->nick.c_str(),Current->GetName().c_str(),
- (Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName : Parent.c_str(),
+ (Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName.c_str() : Parent.c_str(),
(Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops,
Current->GetDesc().c_str());
}
}
}
-void ModuleSpanningTree::ConnectServer(Link* x)
+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())
+ {
+ Link* x = Utils->FindLink(a->servers[a->position]);
+ if (x)
+ {
+ 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, Autoconnect* y)
{
bool ipvalid = true;
if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name)))
{
- this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself.");
+ ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself.");
return;
}
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, 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(Utils, x->IPAddr, x->Port, x->Timeout ? x->Timeout : 10,
+ x->Name.c_str(), x->Bind, y, x->Hook);
if (newsocket->GetFd() > -1)
{
/* Handled automatically on success */
}
else
{
- this->ServerInstance->SNO->WriteToSnoMask('l', "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
try
{
bool cached;
- ServernameResolver* snr = new ServernameResolver((Module*)this, Utils, ServerInstance,x->IPAddr, *x, cached, start_type);
+ ServernameResolver* snr = new ServernameResolver(Utils, x->IPAddr, x, cached, start_type, y);
ServerInstance->AddResolver(snr, cached);
}
catch (ModuleException& e)
{
- this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
- Utils->DoFailOver(x);
+ 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::vector<Link*> failovers;
- for (std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = Utils->timeoutlist.begin(); i != Utils->timeoutlist.end(); i++)
+ 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 (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);
- ServerInstance->SE->DelFd(s);
+ Utils->timeoutlist.erase(me);
s->Close();
- Link* MyLink = Utils->FindLink(p.first);
- if (MyLink)
- failovers.push_back(MyLink);
+ ServerInstance->GlobalCulls.AddItem(s);
}
}
- /* Trigger failover for each timed out socket */
- for (std::vector<Link*>::const_iterator n = failovers.begin(); n != failovers.end(); ++n)
- {
- Utils->DoFailOver(*n);
- }
}
-int ModuleSpanningTree::HandleVersion(const std::vector<std::string>& parameters, 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]);
{
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 message to a remote user.
ServerInstance->PI->SendUserNotice(user, text);
}
-int ModuleSpanningTree::HandleConnect(const std::vector<std::string>& parameters, 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++)
{
+ 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 1;
+ 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;
+ return MOD_RES_DENY;
}
}
}
RemoteMessage(user, "*** CONNECT: No server matching \002%s\002 could be found in the config file.",parameters[0].c_str());
- return 1;
+ return MOD_RES_DENY;
}
void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,std::string &description)
}
}
-void ModuleSpanningTree::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic)
+void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std::string &topic)
{
+ // Drop remote events on the floor.
+ if (!IS_LOCAL(user))
+ return;
+
parameterlist params;
params.push_back(chan->name);
params.push_back(":"+topic);
if (target_type == TYPE_USER)
{
User* d = (User*)dest;
- if ((d->GetFd() < 0) && (IS_LOCAL(user)))
+ if (!IS_LOCAL(d) && IS_LOCAL(user))
{
parameterlist params;
params.push_back(d->uuid);
// 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)))
+ if (!IS_LOCAL(d) && (IS_LOCAL(user)))
{
parameterlist params;
params.push_back(d->uuid);
DoConnectTimeout(curtime);
}
-void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created)
+void ModuleSpanningTree::OnUserConnect(LocalUser* user)
+{
+ if (user->quitting)
+ return;
+
+ parameterlist 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(user->GetIPString());
+ params.push_back(ConvToStr(user->signon));
+ params.push_back("+"+std::string(user->FormatModes(true)));
+ params.push_back(":"+std::string(user->fullname));
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params);
+
+ 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->SetUserCount(1); // increment by 1
+}
+
+void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
{
// Only do this for local users
- if (IS_LOCAL(user))
+ if (IS_LOCAL(memb->user))
{
parameterlist 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->ChanModes(true));
- params.push_back(ServerInstance->Modes->ModeString(user, channel, false)+","+std::string(user->uuid));
+ params.push_back(memb->chan->name);
+ params.push_back(ConvToStr(memb->chan->age));
+ params.push_back(std::string("+") + memb->chan->ChanModes(true));
+ params.push_back(memb->modes+","+std::string(memb->user->uuid));
Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FJOIN",params);
}
}
-int ModuleSpanningTree::OnChangeLocalUserHost(User* user, const std::string &newhost)
+void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost)
{
- if (user->registered != REG_ALL)
- return 0;
+ if (user->registered != REG_ALL || !IS_LOCAL(user))
+ return;
parameterlist params;
params.push_back(newhost);
Utils->DoOneToMany(user->uuid,"FHOST",params);
- return 0;
}
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;
parameterlist params;
Utils->DoOneToMany(user->uuid,"FNAME",params);
}
-void ModuleSpanningTree::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent)
+void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident)
{
- if (IS_LOCAL(user))
+ // only occurs for local clients
+ if (user->registered != REG_ALL)
+ return;
+
+ parameterlist params;
+ params.push_back(ident);
+ Utils->DoOneToMany(user->uuid,"FIDENT",params);
+}
+
+void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts)
+{
+ if (IS_LOCAL(memb->user))
{
parameterlist params;
- params.push_back(channel->name);
+ params.push_back(memb->chan->name);
if (!partmessage.empty())
params.push_back(":"+partmessage);
- Utils->DoOneToMany(user->uuid,"PART",params);
+ Utils->DoOneToMany(memb->user->uuid,"PART",params);
}
}
params.push_back(ConvToStr(user->age));
Utils->DoOneToMany(user->uuid,"NICK",params);
}
+ else if (!loopCall && user->nick == user->uuid)
+ {
+ parameterlist params;
+ params.push_back(user->uuid);
+ params.push_back(ConvToStr(user->age));
+ Utils->DoOneToMany(ServerInstance->Config->GetSID(),"SAVE",params);
+ }
}
-void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
+void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
{
parameterlist params;
- params.push_back(chan->name);
- params.push_back(user->uuid);
+ params.push_back(memb->chan->name);
+ params.push_back(memb->user->uuid);
params.push_back(":"+reason);
if (IS_LOCAL(source))
{
Utils->DoOneToMany(source->uuid,"KICK",params);
}
- else if (IS_FAKE(source) && source != Utils->ServerUser)
+ else if (source == ServerInstance->FakeClient)
{
Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params);
}
if (!IS_LOCAL(source))
return; // Only start routing if we're origin.
+ ServerInstance->OperQuit.set(dest, operreason);
parameterlist params;
- params.push_back(":"+reason);
+ params.push_back(":"+operreason);
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);
}
void ModuleSpanningTree::OnRehash(User* user)
{
// Re-read config stuff
- Utils->ReadConfiguration(true);
+ Utils->ReadConfiguration();
}
-void ModuleSpanningTree::OnLoadModule(Module* mod, const std::string &name)
+void ModuleSpanningTree::OnLoadModule(Module* mod)
{
- this->RedoConfig(mod, name);
+ this->RedoConfig(mod);
}
-void ModuleSpanningTree::OnUnloadModule(Module* mod, const std::string &name)
+void ModuleSpanningTree::OnUnloadModule(Module* mod)
{
- this->RedoConfig(mod, name);
+ this->RedoConfig(mod);
}
-void ModuleSpanningTree::RedoConfig(Module* mod, const std::string &name)
+void ModuleSpanningTree::RedoConfig(Module* mod)
{
/* If m_sha256.so is loaded (we use this for HMAC) or any module implementing a BufferedSocket interface is loaded,
* then we need to re-read our config again taking this into account.
if (ml && std::find(ml->begin(), ml->end(), mod) != ml->end())
IsBufferSocketModule = true;
- if (name == "m_sha256.so" || IsBufferSocketModule)
+ if (mod->ModuleSourceFile == "m_sha256.so" || IsBufferSocketModule)
{
- Utils->ReadConfiguration(true);
+ Utils->ReadConfiguration();
}
}
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);
+ ServerInstance->Config->ServerName.c_str(), (unsigned long)x->set_time, (unsigned long)x->duration, x->reason.c_str());
parameterlist params;
params.push_back(data);
}
}
-int ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
+ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
{
if (IS_LOCAL(user))
{
if (awaymsg.empty())
{
parameterlist params;
- params.clear();
Utils->DoOneToMany(user->uuid,"AWAY",params);
}
else
{
parameterlist params;
+ params.push_back(ConvToStr(user->awaytime));
params.push_back(":" + awaymsg);
Utils->DoOneToMany(user->uuid,"AWAY",params);
}
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const parameterlist &modeline, const std::vector<TranslateType> &translate)
}
}
-void ModuleSpanningTree::ProtoSendMetaData(void* opaque, TargetTypeFlags target_type, void* target, const std::string &extname, const std::string &extdata)
+void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, const std::string &extname, const std::string &extdata)
{
- 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)
- {
+ TreeSocket* s = static_cast<TreeSocket*>(opaque);
+ User* u = dynamic_cast<User*>(target);
+ Channel* c = dynamic_cast<Channel*>(target);
+ if (u)
+ s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+u->uuid+" "+extname+" :"+extdata);
+ else if (c)
+ s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA "+c->name+" "+extname+" :"+extdata);
+ else if (!target)
s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata);
- }
}
-void ModuleSpanningTree::OnEvent(Event* event)
+CullResult ModuleSpanningTree::cull()
{
- if ((event->GetEventID() == "send_encap") || (event->GetEventID() == "send_metadata") || (event->GetEventID() == "send_topic") || (event->GetEventID() == "send_mode") || (event->GetEventID() == "send_mode_explicit") || (event->GetEventID() == "send_opers")
- || (event->GetEventID() == "send_modeset") || (event->GetEventID() == "send_snoset") || (event->GetEventID() == "send_push"))
- {
- ServerInstance->Logs->Log("m_spanningtree", DEBUG, "WARNING: Deprecated use of old 1.1 style m_spanningtree event ignored, type '"+event->GetEventID()+"'!");
- }
+ Utils->cull();
+ ServerInstance->Timers->DelTimer(RefreshTimer);
+ ServerInstance->Modules->DoneWithInterface("BufferedSocketHook");
+ return this->Module::cull();
}
ModuleSpanningTree::~ModuleSpanningTree()
{
delete ServerInstance->PI;
- ServerInstance->PI = new ProtocolInterface(ServerInstance);
+ ServerInstance->PI = new ProtocolInterface;
/* This will also free the listeners */
delete Utils;
delete command_rconnect;
delete command_rsquit;
-
- ServerInstance->Timers->DelTimer(RefreshTimer);
-
- ServerInstance->Modules->DoneWithInterface("BufferedSocketHook");
}
Version ModuleSpanningTree::GetVersion()
{
- return Version("$Id$", 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
projects / user / henk / code / inspircd.git / blobdiff