* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#include "commands/cmd_stats.h"
#include "socket.h"
#include "xline.h"
-#include "transport.h"
-
-#include "m_spanningtree/cachetimer.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 "m_spanningtree/protocolinterface.h"
+#include "../transport.h"
+
+#include "cachetimer.h"
+#include "resolvers.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "rconnect.h"
+#include "rsquit.h"
+#include "protocolinterface.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 */
{
ServerInstance->Modules->UseInterface("BufferedSocketHook");
Utils = new SpanningTreeUtilities(ServerInstance, this);
- command_rconnect = new cmd_rconnect(ServerInstance, this, Utils);
+ command_rconnect = new CommandRConnect(ServerInstance, this, Utils);
ServerInstance->AddCommand(command_rconnect);
- command_rsquit = new cmd_rsquit(ServerInstance, this, Utils);
+ command_rsquit = new CommandRSQuit(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_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
+ I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin,
+ I_OnChangeLocalUserHost, I_OnChangeName, I_OnUserPart, I_OnUnloadModule, I_OnUserQuit,
+ I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, I_OnPreRehash, I_OnOper,
+ I_OnAddLine, I_OnDelLine, I_OnMode, I_OnLoadModule, I_OnStats, I_OnEvent, I_OnSetAway,
+ I_OnPostCommand, I_OnUserConnect
};
- ServerInstance->Modules->Attach(eventlist, this, 27);
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
delete ServerInstance->PI;
ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance);
+ 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)
{
TreeServer *s = i->second;
+ // Fix for bug #792, do not ping servers that are not connected yet!
+ // Remote servers have Socket == NULL and local connected servers have
+ // Socket->LinkState == CONNECTED
+ if (s->GetSocket() && s->GetSocket()->GetLinkState() != CONNECTED)
+ continue;
+
// Now do PING checks on all servers
TreeServer *mts = Utils->BestRouteTo(s->GetID());
if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name)))
{
- RemoteMessage(NULL, "CONNECT: Not connecting to myself.");
+ this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself.");
return;
}
QueryType start_type = DNS_QUERY_A;
-#ifdef IPV6
start_type = DNS_QUERY_AAAA;
if (strchr(x->IPAddr.c_str(),':'))
{
ipvalid = false;
}
else
-#endif
{
in_addr n;
if (inet_aton(x->IPAddr.c_str(),&n) < 1)
}
else
{
- RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno));
+ 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);
}
catch (ModuleException& e)
{
- RemoteMessage(NULL, "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
+ this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason());
Utils->DoFailOver(x);
}
}
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++)
{
TreeSocket* s = i->first;
ServerInstance->SNO->WriteToSnoMask('l',"CONNECT: Error connecting \002%s\002 (timeout of %d seconds)",p.first.c_str(),p.second);
ServerInstance->SE->DelFd(s);
s->Close();
+ Link* MyLink = Utils->FindLink(p.first);
+ if (MyLink)
+ failovers.push_back(MyLink);
}
- }
+ }
+ /* 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)
return 1;
}
-/* 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;
-
char text[MAXBUF];
va_list argsPtr;
vsnprintf(text, MAXBUF, format, argsPtr);
va_end(argsPtr);
- if (!user)
- {
- /* No user, target it generically at everyone */
- ServerInstance->SNO->WriteToSnoMask('l', "%s", text);
- }
+ if (IS_LOCAL(user))
+ user->WriteServ("NOTICE %s :%s", user->nick.c_str(), text);
else
- {
- if (IS_LOCAL(user))
- user->WriteServ("NOTICE %s :%s", user->nick.c_str(), text);
- else
- ServerInstance->PI->SendUserNotice(user, text);
- }
-
- SendingRemoteMessage = false;
+ ServerInstance->PI->SendUserNotice(user, text);
}
int ModuleSpanningTree::HandleConnect(const std::vector<std::string>& parameters, User* user)
{
if (IS_LOCAL(source))
{
- std::deque<std::string> params;
+ parameterlist params;
params.push_back(dest->uuid);
params.push_back(channel->name);
params.push_back(ConvToStr(expiry));
void ModuleSpanningTree::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic)
{
- std::deque<std::string> params;
+ parameterlist params;
params.push_back(chan->name);
params.push_back(":"+topic);
Utils->DoOneToMany(user->uuid,"TOPIC",params);
{
if (IS_LOCAL(user))
{
- std::deque<std::string> params;
+ parameterlist params;
params.push_back(":"+text);
Utils->DoOneToMany(user->uuid,"WALLOPS",params);
}
User* d = (User*)dest;
if ((d->GetFd() < 0) && (IS_LOCAL(user)))
{
- std::deque<std::string> params;
- params.clear();
+ parameterlist params;
params.push_back(d->uuid);
params.push_back(":"+text);
Utils->DoOneToOne(user->uuid,"NOTICE",params,d->server);
if (IS_LOCAL(user))
{
char* target = (char*)dest;
- std::deque<std::string> par;
+ parameterlist par;
par.push_back(target);
par.push_back(":"+text);
Utils->DoOneToMany(user->uuid,"NOTICE",par);
User* d = (User*)dest;
if ((d->GetFd() < 0) && (IS_LOCAL(user)))
{
- std::deque<std::string> params;
- params.clear();
+ parameterlist params;
params.push_back(d->uuid);
params.push_back(":"+text);
Utils->DoOneToOne(user->uuid,"PRIVMSG",params,d->server);
if (IS_LOCAL(user))
{
char* target = (char*)dest;
- std::deque<std::string> par;
+ parameterlist par;
par.push_back(target);
par.push_back(":"+text);
Utils->DoOneToMany(user->uuid,"PRIVMSG",par);
DoConnectTimeout(curtime);
}
-void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
+void ModuleSpanningTree::OnUserConnect(User* 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);
+
+ Utils->TreeRoot->SetUserCount(1); // increment by 1
+}
+
+void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created)
{
// Only do this for local users
if (IS_LOCAL(user))
{
- std::deque<std::string> params;
+ 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.
}
}
-void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost)
+int ModuleSpanningTree::OnChangeLocalUserHost(User* user, const std::string &newhost)
{
- // only occurs for local clients
if (user->registered != REG_ALL)
- return;
- std::deque<std::string> params;
+ return 0;
+
+ 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)
return;
- std::deque<std::string> params;
+
+ parameterlist params;
params.push_back(gecos);
Utils->DoOneToMany(user->uuid,"FNAME",params);
}
{
if (IS_LOCAL(user))
{
- std::deque<std::string> params;
+ parameterlist params;
params.push_back(channel->name);
if (!partmessage.empty())
params.push_back(":"+partmessage);
{
if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
{
- std::deque<std::string> params;
+ parameterlist params;
if (oper_message != reason)
{
{
if (IS_LOCAL(user))
{
- std::deque<std::string> params;
+ parameterlist params;
params.push_back(user->nick);
/** IMPORTANT: We don't update the TS if the oldnick is just a case change of the newnick!
void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
{
- if ((source) && (IS_LOCAL(source)))
+ parameterlist params;
+ params.push_back(chan->name);
+ params.push_back(user->uuid);
+ params.push_back(":"+reason);
+ if (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);
}
- else if (!source)
+ else if (IS_FAKE(source) && source != Utils->ServerUser)
{
- std::deque<std::string> params;
- params.push_back(chan->name);
- params.push_back(user->uuid);
- params.push_back(":"+reason);
Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params);
}
}
void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason)
{
- if (!IS_LOCAL(source)) return; // Only start routing if we're origin.
- std::deque<std::string> params;
+ if (!IS_LOCAL(source))
+ return; // Only start routing if we're origin.
+
+ parameterlist params;
params.push_back(":"+reason);
Utils->DoOneToMany(dest->uuid,"OPERQUIT",params);
params.clear();
Utils->DoOneToMany(source->uuid,"KILL",params);
}
-void ModuleSpanningTree::OnRehash(User* user, const std::string ¶meter)
+void ModuleSpanningTree::OnPreRehash(User* user, const std::string ¶meter)
{
ServerInstance->Logs->Log("remoterehash", DEBUG, "called with param %s", parameter.c_str());
// Send out to other servers
if (!parameter.empty() && parameter[0] != '-')
{
- ServerInstance->Logs->Log("remoterehash", DEBUG, "sending out lol");
- std::deque<std::string> params;
+ parameterlist params;
params.push_back(parameter);
Utils->DoOneToAllButSender(user ? user->uuid : ServerInstance->Config->GetSID(), "REHASH", params, user ? user->server : ServerInstance->Config->ServerName);
}
+}
+void ModuleSpanningTree::OnRehash(User* user)
+{
// Re-read config stuff
Utils->ReadConfiguration(true);
}
+void ModuleSpanningTree::OnLoadModule(Module* mod, const std::string &name)
+{
+ this->RedoConfig(mod, name);
+}
+
+void ModuleSpanningTree::OnUnloadModule(Module* mod, const std::string &name)
+{
+ this->RedoConfig(mod, name);
+}
+
+void ModuleSpanningTree::RedoConfig(Module* mod, const std::string &name)
+{
+ /* 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.
+ */
+ modulelist* ml = ServerInstance->Modules->FindInterface("BufferedSocketHook");
+ bool IsBufferSocketModule = false;
+
+ /* Did we find any modules? */
+ if (ml && std::find(ml->begin(), ml->end(), mod) != ml->end())
+ IsBufferSocketModule = true;
+
+ if (name == "m_sha256.so" || IsBufferSocketModule)
+ {
+ Utils->ReadConfiguration(true);
+ }
+}
+
// note: the protocol does not allow direct umode +o except
// via NICK with 8 params. sending OPERTYPE infers +o modechange
// locally.
{
if (IS_LOCAL(user))
{
- std::deque<std::string> params;
+ parameterlist params;
params.push_back(opertype);
Utils->DoOneToMany(user->uuid,"OPERTYPE",params);
}
void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
{
- if (!x->IsBurstable())
+ if (!x->IsBurstable() || loopCall)
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;
+ parameterlist params;
params.push_back(data);
if (!user)
char data[MAXBUF];
snprintf(data,MAXBUF,"%s %s", x->type.c_str(), x->Displayable());
- std::deque<std::string> params;
+ parameterlist params;
params.push_back(data);
if (!user)
}
}
-void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const std::string &text)
+void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const parameterlist &text, const std::vector<TranslateType> &translate)
{
if ((IS_LOCAL(user)) && (user->registered == REG_ALL))
{
- std::deque<std::string> params;
+ parameterlist params;
std::string command;
std::string output_text;
- ServerInstance->Parser->TranslateUIDs(TR_SPACENICKLIST, text, output_text);
+ ServerInstance->Parser->TranslateUIDs(translate, text, output_text);
if (target_type == TYPE_USER)
{
{
if (awaymsg.empty())
{
- std::deque<std::string> params;
+ parameterlist params;
params.clear();
Utils->DoOneToMany(user->uuid,"AWAY",params);
}
else
{
- std::deque<std::string> params;
+ parameterlist params;
params.push_back(":" + awaymsg);
Utils->DoOneToMany(user->uuid,"AWAY",params);
}
return 0;
}
-void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline)
+void ModuleSpanningTree::ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const parameterlist &modeline, const std::vector<TranslateType> &translate)
{
TreeSocket* s = (TreeSocket*)opaque;
std::string output_text;
- ServerInstance->Parser->TranslateUIDs(TR_SPACENICKLIST, modeline, output_text);
+ ServerInstance->Parser->TranslateUIDs(translate, modeline, output_text);
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);
+ s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" MODE "+u->uuid+" "+output_text);
}
- else
+ else if (target_type == TYPE_CHANNEL)
{
Channel* c = (Channel*)target;
s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" FMODE "+c->name+" "+ConvToStr(c->age)+" "+output_text);
}
}
-void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int 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);
- }
+}
+
+std::string ModuleSpanningTree::ProtoTranslate(Extensible* item)
+{
+ User* u = dynamic_cast<User*>(item);
+ Channel* c = dynamic_cast<Channel*>(item);
+ if (u)
+ return u->uuid;
+ if (c)
+ return c->name;
+ return "*";
}
void ModuleSpanningTree::OnEvent(Event* event)
/* This will also free the listeners */
delete Utils;
+ delete command_rconnect;
+ delete command_rsquit;
+
ServerInstance->Timers->DelTimer(RefreshTimer);
ServerInstance->Modules->DoneWithInterface("BufferedSocketHook");
*/
void ModuleSpanningTree::Prioritize()
{
- ServerInstance->Modules->SetPriority(this, PRIO_LAST);
+ ServerInstance->Modules->SetPriority(this, PRIORITY_LAST);
}
MODULE_INIT(ModuleSpanningTree)