X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=51a9eb025535e215c8df936d50f267e82bc430f5;hb=526f5a4a02882b19056fe755dff1f64b764ff313;hp=bfce805895b2317512bb5a2bf20112adb904c892;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index bfce80589..51a9eb025 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -38,9 +38,9 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me) { 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); @@ -49,12 +49,12 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me) { 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_OnUserJoin, I_OnChangeLocalUserHost, I_OnChangeName, I_OnUserPart, I_OnUnloadModule, I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, - I_OnOper, I_OnAddLine, I_OnDelLine, I_ProtoSendMode, I_OnMode, + I_OnOper, I_OnAddLine, I_OnDelLine, I_ProtoSendMode, I_OnMode, I_OnLoadModule, I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnPostCommand }; - ServerInstance->Modules->Attach(eventlist, this, 27); + ServerInstance->Modules->Attach(eventlist, this, 29); delete ServerInstance->PI; ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance); @@ -192,16 +192,6 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) { TreeServer *s = i->second; - if (s->bursting) - { - unsigned long bursttime = ts - s->StartBurst; - if (bursttime > 60000) // A minute - { - ServerInstance->SNO->WriteToSnoMask('l',"Server \002%s\002 has not finished burst, forcing end of burst.", s->GetName().c_str()); - s->FinishBurst(); - } - } - // Now do PING checks on all servers TreeServer *mts = Utils->BestRouteTo(s->GetID()); @@ -254,6 +244,13 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) void ModuleSpanningTree::ConnectServer(Link* x) { bool ipvalid = true; + + if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name))) + { + this->ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself."); + return; + } + QueryType start_type = DNS_QUERY_A; #ifdef IPV6 start_type = DNS_QUERY_AAAA; @@ -277,14 +274,14 @@ void ModuleSpanningTree::ConnectServer(Link* x) /* 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(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()]); if (newsocket->GetFd() > -1) { /* Handled automatically on success */ } 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); @@ -300,7 +297,7 @@ void ModuleSpanningTree::ConnectServer(Link* 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); } } @@ -336,6 +333,30 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime) } } +void ModuleSpanningTree::DoConnectTimeout(time_t curtime) +{ + std::vector failovers; + for (std::map >::iterator i = Utils->timeoutlist.begin(); i != Utils->timeoutlist.end(); i++) + { + TreeSocket* s = i->first; + std::pair p = i->second; + 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); + s->Close(); + Link* MyLink = Utils->FindLink(p.first); + if (MyLink) + failovers.push_back(MyLink); + } + } + /* Trigger failover for each timed out socket */ + for (std::vector::const_iterator n = failovers.begin(); n != failovers.end(); ++n) + { + Utils->DoFailOver(*n); + } +} + int ModuleSpanningTree::HandleVersion(const std::vector& parameters, User* user) { // we've already checked if pcnt > 0, so this is safe @@ -356,24 +377,10 @@ int ModuleSpanningTree::HandleVersion(const std::vector& parameters 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; @@ -381,20 +388,10 @@ void ModuleSpanningTree::RemoteMessage(User* user, const char* format, ...) 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& parameters, User* user) @@ -403,6 +400,12 @@ int ModuleSpanningTree::HandleConnect(const std::vector& parameters { 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; + } + TreeServer* CheckDupe = Utils->FindServer(x->Name.c_str()); if (!CheckDupe) { @@ -570,6 +573,7 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime) { AutoConnectServers(curtime); DoPingChecks(curtime); + DoConnectTimeout(curtime); } void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) @@ -589,14 +593,12 @@ void ModuleSpanningTree::OnUserJoin(User* user, Channel* channel, bool sync, boo } } -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 params; params.push_back(newhost); Utils->DoOneToMany(user->uuid,"FHOST",params); + return 0; } void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos) @@ -684,6 +686,7 @@ void ModuleSpanningTree::OnUserKick(User* source, User* user, Channel* chan, con 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 params; params.push_back(":"+reason); Utils->DoOneToMany(dest->uuid,"OPERQUIT",params); @@ -711,6 +714,34 @@ void ModuleSpanningTree::OnRehash(User* user, const std::string ¶meter) 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. @@ -769,7 +800,7 @@ void ModuleSpanningTree::OnDelLine(User* user, XLine *x) } } -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 std::string &text, const std::vector &translate) { if ((IS_LOCAL(user)) && (user->registered == REG_ALL)) { @@ -777,7 +808,7 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const s 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) { @@ -820,21 +851,21 @@ int ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg) 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 std::string &modeline, const std::vector &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); @@ -842,7 +873,7 @@ void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* targ } } -void ModuleSpanningTree::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) +void ModuleSpanningTree::ProtoSendMetaData(void* opaque, TargetTypeFlags target_type, void* target, const std::string &extname, const std::string &extdata) { TreeSocket* s = (TreeSocket*)opaque; if (target) @@ -875,10 +906,10 @@ void ModuleSpanningTree::OnEvent(Event* event) ModuleSpanningTree::~ModuleSpanningTree() { - /* This will also free the listeners */ delete ServerInstance->PI; ServerInstance->PI = new ProtocolInterface(ServerInstance); + /* This will also free the listeners */ delete Utils; ServerInstance->Timers->DelTimer(RefreshTimer); @@ -900,7 +931,7 @@ Version ModuleSpanningTree::GetVersion() */ void ModuleSpanningTree::Prioritize() { - ServerInstance->Modules->SetPriority(this, PRIO_LAST); + ServerInstance->Modules->SetPriority(this, PRIORITY_LAST); } MODULE_INIT(ModuleSpanningTree)