X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=fe2cfe9b62f98a8e5a074d5acaa47d4de2d5ea25;hb=fb3964d5c007900061e86e392ceb786bd47260c0;hp=23523107af5308b4e4ea617920964c3b89019da9;hpb=7e843c22e16c81054bad18073d24fe1a07026431;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 23523107a..fe2cfe9b6 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -46,10 +46,10 @@ ModuleSpanningTree::ModuleSpanningTree() { I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostTopicChange, I_OnWallops, I_OnUserNotice, I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin, - I_OnChangeLocalUserHost, I_OnChangeName, I_OnChangeIdent, I_OnUserPart, I_OnUnloadModule, + 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_OnMode, I_OnLoadModule, I_OnStats, - I_OnSetAway, I_OnPostCommand, I_OnUserConnect + I_OnSetAway, I_OnPostCommand, I_OnUserConnect, I_OnAcceptConnection }; ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); @@ -243,25 +243,41 @@ void ModuleSpanningTree::DoPingChecks(time_t curtime) } } -void ModuleSpanningTree::ConnectServer(Autoconnect* y) +void ModuleSpanningTree::ConnectServer(Autoconnect* a, bool on_timer) { - if (!y) + if (!a) return; - y->position++; - while (y->position < (int)y->servers.size()) + for(unsigned int j=0; j < a->servers.size(); j++) { - Link* x = Utils->FindLink(y->servers[y->position]); + 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, y); + ConnectServer(x, a); return; } - y->position++; + a->position++; } // Autoconnect chain has been fully iterated; start at the beginning on the // next AutoConnectServers run - y->position = -1; + a->position = -1; } void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y) @@ -301,9 +317,9 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y) } else { - ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(),strerror(errno)); + ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.", + x->Name.c_str(), newsocket->getError().c_str()); ServerInstance->GlobalCulls.AddItem(newsocket); - ConnectServer(y); } } else @@ -317,7 +333,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y) catch (ModuleException& e) { ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason()); - ConnectServer(y); + ConnectServer(y, false); } } } @@ -330,28 +346,13 @@ void ModuleSpanningTree::AutoConnectServers(time_t curtime) if (curtime >= x->NextConnectTime) { x->NextConnectTime = curtime + x->Period; - for(unsigned int j=0; j < x->servers.size(); j++) - { - if (Utils->FindServer(x->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 - x->position = -1; - goto dupe_found; // next autoconnect block - } - } - // only start a new chain if we aren't running - if (x->position == -1) - ConnectServer(x); + ConnectServer(x, true); } -dupe_found:; } } void ModuleSpanningTree::DoConnectTimeout(time_t curtime) { - std::vector failovers; std::map >::iterator i = Utils->timeoutlist.begin(); while (i != Utils->timeoutlist.end()) { @@ -362,18 +363,11 @@ void ModuleSpanningTree::DoConnectTimeout(time_t curtime) 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); - if (s->myautoconnect) - failovers.push_back(s->myautoconnect); Utils->timeoutlist.erase(me); s->Close(); ServerInstance->GlobalCulls.AddItem(s); } } - for(unsigned int j=0; j < failovers.size(); j++) - { - if (failovers[j]->position >= 0) - ConnectServer(failovers[j]); - } } ModResult ModuleSpanningTree::HandleVersion(const std::vector& parameters, User* user) @@ -496,7 +490,7 @@ void ModuleSpanningTree::OnUserNotice(User* user, void* dest, int target_type, c 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); @@ -549,7 +543,7 @@ void ModuleSpanningTree::OnUserMessage(User* user, void* dest, int target_type, // 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); @@ -598,7 +592,7 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime) DoConnectTimeout(curtime); } -void ModuleSpanningTree::OnUserConnect(User* user) +void ModuleSpanningTree::OnUserConnect(LocalUser* user) { if (user->quitting) return; @@ -616,6 +610,14 @@ void ModuleSpanningTree::OnUserConnect(User* user) 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 } @@ -636,21 +638,19 @@ void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created, C } } -ModResult ModuleSpanningTree::OnChangeLocalUserHost(User* user, const std::string &newhost) +void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost) { - if (user->registered != REG_ALL) - return MOD_RES_PASSTHRU; + if (user->registered != REG_ALL || !IS_LOCAL(user)) + return; parameterlist params; params.push_back(newhost); Utils->DoOneToMany(user->uuid,"FHOST",params); - return MOD_RES_PASSTHRU; } 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; @@ -739,7 +739,7 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s { Utils->DoOneToMany(source->uuid,"KICK",params); } - else if (IS_SERVER(source) && source != Utils->ServerUser) + else if (source == ServerInstance->FakeClient) { Utils->DoOneToMany(ServerInstance->Config->GetSID(),"KICK",params); } @@ -750,7 +750,7 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin if (!IS_LOCAL(source)) return; // Only start routing if we're origin. - User::OperQuit.set(dest, operreason); + ServerInstance->OperQuit.set(dest, operreason); parameterlist params; params.push_back(":"+operreason); Utils->DoOneToMany(dest->uuid,"OPERQUIT",params); @@ -776,20 +776,20 @@ void ModuleSpanningTree::OnPreRehash(User* user, const std::string ¶meter) 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. @@ -801,9 +801,9 @@ void ModuleSpanningTree::RedoConfig(Module* mod, const std::string &name) 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(); } } @@ -951,7 +951,7 @@ void ModuleSpanningTree::ProtoSendMetaData(void* opaque, Extensible* target, con s->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" METADATA * "+extname+" :"+extdata); } -bool ModuleSpanningTree::cull() +CullResult ModuleSpanningTree::cull() { Utils->cull(); ServerInstance->Timers->DelTimer(RefreshTimer);