X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.cpp;h=e10781198dca3f080887f9898dd542ccb910c16b;hb=1d020d132ff6d05ffd865d025cf161d7637f10d8;hp=b3cc78118037d35ca730b8d35ad81cad653e9aee;hpb=cc74fb0be4ce4a5f55719dcf4b1045fe156ded1b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index b3cc78118..e10781198 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -33,11 +33,14 @@ #include "link.h" #include "treesocket.h" #include "commands.h" -#include "protocolinterface.h" ModuleSpanningTree::ModuleSpanningTree() : rconnect(this), rsquit(this), map(this) - , commands(NULL), DNS(this, "DNS") + , commands(NULL) + , currmembid(0) + , DNS(this, "DNS") + , loopCall(false) + , SplitInProgress(false) { } @@ -47,25 +50,48 @@ SpanningTreeCommands::SpanningTreeCommands(ModuleSpanningTree* 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) + server(module), squit(module), snonotice(module), + burst(module), endburst(module), sinfo(module) { } +namespace +{ + void SetLocalUsersServer(Server* newserver) + { + ServerInstance->FakeClient->server = newserver; + const LocalUserList& list = ServerInstance->Users->local_users; + for (LocalUserList::const_iterator i = list.begin(); i != list.end(); ++i) + (*i)->server = newserver; + } + + void ResetMembershipIds() + { + // Set all membership ids to 0 + const LocalUserList& list = ServerInstance->Users->local_users; + for (LocalUserList::iterator i = list.begin(); i != list.end(); ++i) + { + LocalUser* user = *i; + for (UCListIter j = user->chans.begin(); j != user->chans.end(); ++j) + (*j)->id = 0; + } + } +} + void ModuleSpanningTree::init() { ServerInstance->SNO->EnableSnomask('l', "LINK"); + ResetMembershipIds(); + Utils = new SpanningTreeUtilities(this); Utils->TreeRoot = new TreeServer; commands = new SpanningTreeCommands(this); - delete ServerInstance->PI; - ServerInstance->PI = new SpanningTreeProtocolInterface; - loopCall = false; + ServerInstance->PI = &protocolinterface; - // update our local user count - Utils->TreeRoot->UserCount = ServerInstance->Users->local_users.size(); + delete ServerInstance->FakeClient->server; + SetLocalUsersServer(Utils->TreeRoot); } void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) @@ -80,7 +106,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) for (TreeServer::ChildServers::const_iterator i = children.begin(); i != children.end(); ++i) { TreeServer* server = *i; - if ((server->Hidden) || ((Utils->HideULines) && (ServerInstance->ULine(server->GetName())))) + if ((server->Hidden) || ((Utils->HideULines) && (server->IsULine()))) { if (user->IsOper()) { @@ -93,13 +119,13 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) } } /* 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())) && (!user->IsOper())) + if ((Utils->HideULines) && (Current->IsULine()) && (!user->IsOper())) return; /* Or if the server is hidden and they're not an oper */ else if ((Current->Hidden) && (!user->IsOper())) return; - user->WriteNumeric(364, "%s %s %s :%d %s", user->nick.c_str(), Current->GetName().c_str(), + user->WriteNumeric(RPL_LINKS, "%s %s :%d %s", 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()); @@ -108,7 +134,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops) void ModuleSpanningTree::HandleLinks(const std::vector& parameters, User* user) { ShowLinks(Utils->TreeRoot,user,0); - user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick.c_str()); + user->WriteNumeric(RPL_ENDOFLINKS, "* :End of /LINKS list."); } std::string ModuleSpanningTree::TimeToStr(time_t secs) @@ -163,7 +189,7 @@ restart: { // They did, send a ping to them s->SetNextPingTime(curtime + Utils->PingFreq); - s->GetSocket()->WriteLine(":" + ServerInstance->Config->GetSID() + " PING " + s->GetID()); + s->GetSocket()->WriteLine(CmdBuilder("PING").push(s->GetID())); s->LastPingMsec = ts; } else @@ -230,7 +256,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y) { bool ipvalid = true; - if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name))) + if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name), rfc_case_insensitive_map)) { ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Not connecting to myself."); return; @@ -280,7 +306,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y) catch (DNS::Exception& e) { delete snr; - ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason()); + ServerInstance->SNO->WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.",x->Name.c_str(), e.GetReason().c_str()); ConnectServer(y, false); } } @@ -333,12 +359,18 @@ ModResult ModuleSpanningTree::HandleVersion(const std::vector& para // Pass to default VERSION handler. return MOD_RES_PASSTHRU; } - std::string Version = found->GetVersion(); - user->WriteNumeric(351, "%s :%s",user->nick.c_str(),Version.c_str()); + + // If an oper wants to see the version then show the full version string instead of the normal, + // but only if it is non-empty. + // If it's empty it might be that the server is still syncing (full version hasn't arrived yet) + // or the server is a 2.0 server and does not send a full version. + bool showfull = ((user->IsOper()) && (!found->GetFullVersion().empty())); + const std::string& Version = (showfull ? found->GetFullVersion() : found->GetVersion()); + user->WriteNumeric(RPL_VERSION, ":%s", Version.c_str()); } else { - user->WriteNumeric(402, "%s %s :No such server",user->nick.c_str(),parameters[0].c_str()); + user->WriteNumeric(ERR_NOSUCHSERVER, "%s :No such server", parameters[0].c_str()); } return MOD_RES_DENY; } @@ -361,9 +393,9 @@ ModResult ModuleSpanningTree::HandleConnect(const std::vector& para for (std::vector >::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(x->Name.c_str(),parameters[0], rfc_case_insensitive_map)) { - if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name))) + if (InspIRCd::Match(ServerInstance->Config->ServerName, assign(x->Name), rfc_case_insensitive_map)) { RemoteMessage(user, "*** CONNECT: Server \002%s\002 is ME, not connecting.",x->Name.c_str()); return MOD_RES_DENY; @@ -392,15 +424,6 @@ void ModuleSpanningTree::On005Numeric(std::map& tokens tokens["MAP"]; } -void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,std::string &description) -{ - TreeServer* s = Utils->FindServer(servername); - if (s) - { - description = s->GetDesc(); - } -} - void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, time_t expiry) { if (IS_LOCAL(source)) @@ -408,6 +431,7 @@ void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, CmdBuilder params(source, "INVITE"); params.push_back(dest->uuid); params.push_back(channel->name); + params.push_int(channel->age); params.push_back(ConvToStr(expiry)); params.Broadcast(); } @@ -487,19 +511,21 @@ void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created_by if (!IS_LOCAL(memb->user)) return; + // Assign the current membership id to the new Membership and increase it + memb->id = currmembid++; + if (created_by_local) { - 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); + CommandFJoin::Builder params(memb->chan); + params.add(memb); + params.finalize(); params.Broadcast(); } else { CmdBuilder params(memb->user, "IJOIN"); params.push_back(memb->chan->name); + params.push_int(memb->id); if (!memb->modes.empty()) { params.push_back(ConvToStr(memb->chan->age)); @@ -522,7 +548,7 @@ void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos) if (user->registered != REG_ALL || !IS_LOCAL(user)) return; - CmdBuilder(user, "FNAME").push(gecos).Broadcast(); + CmdBuilder(user, "FNAME").push_last(gecos).Broadcast(); } void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident) @@ -547,34 +573,37 @@ void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage, void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { - if ((IS_LOCAL(user)) && (user->registered == REG_ALL)) + if (IS_LOCAL(user)) { if (oper_message != reason) 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) + else { - SourceServer->UserCount--; + // Hide the message if one of the following is true: + // - User is being quit due to a netsplit and quietbursts is on + // - Server is a silent uline + bool hide = (((this->SplitInProgress) && (Utils->quiet_bursts)) || (user->server->IsSilentULine())); + if (!hide) + { + ServerInstance->SNO->WriteToSnoMask('Q', "Client exiting on server %s: %s (%s) [%s]", + user->server->GetName().c_str(), user->GetFullRealHost().c_str(), user->GetIPString().c_str(), oper_message.c_str()); + } } + + // Regardless, We need to modify the user Counts.. + TreeServer::Get(user)->UserCount--; } void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick) { if (IS_LOCAL(user)) { + // The nick TS is updated by the core, we don't do it CmdBuilder params(user, "NICK"); params.push_back(user->nick); - - /** 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(); } @@ -589,12 +618,15 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick) void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) { - if ((!IS_LOCAL(source) || source != ServerInstance->FakeClient)) + if ((!IS_LOCAL(source)) && (source != ServerInstance->FakeClient)) return; CmdBuilder params(source, "KICK"); params.push_back(memb->chan->name); params.push_back(memb->user->uuid); + // If a remote user is being kicked by us then send the membership id in the kick too + if (!IS_LOCAL(memb->user)) + params.push_int(memb->id); params.push_last(reason); params.Broadcast(); } @@ -611,12 +643,22 @@ void ModuleSpanningTree::OnPreRehash(User* user, const std::string ¶meter) { CmdBuilder params((user ? user->uuid : ServerInstance->Config->GetSID()), "REHASH"); params.push_back(parameter); - params.Forward(user ? Utils->BestRouteTo(user->server) : NULL); + params.Forward(user ? TreeServer::Get(user)->GetRoute() : NULL); } } void ModuleSpanningTree::ReadConfig(ConfigStatus& status) { + // Did this rehash change the description of this server? + const std::string& newdesc = ServerInstance->Config->ServerDesc; + if (newdesc != Utils->TreeRoot->GetDesc()) + { + // Broadcast a SINFO desc message to let the network know about the new description. This is the description + // string that is sent in the SERVER message initially and shown for example in WHOIS. + // We don't need to update the field itself in the Server object - the core does that. + CommandSInfo::Builder(Utils->TreeRoot, "desc", newdesc).Broadcast(); + } + // Re-read config stuff try { @@ -631,7 +673,7 @@ void ModuleSpanningTree::ReadConfig(ConfigStatus& status) msg.append(e.GetReason()); ServerInstance->SNO->WriteToSnoMask('l', msg); if (status.srcuser && !IS_LOCAL(status.srcuser)) - ServerInstance->PI->SendSNONotice("L", msg); + ServerInstance->PI->SendSNONotice('L', msg); } } @@ -660,7 +702,7 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod) for (TreeServer::ChildServers::const_iterator i = list.begin(); i != list.end(); ++i) { TreeSocket* sock = (*i)->GetSocket(); - if (sock && sock->GetIOHook() && sock->GetIOHook()->creator == mod) + if (sock->GetIOHook() && sock->GetIOHook()->prov->creator == mod) { sock->SendError("SSL module unloaded"); sock->Close(); @@ -670,7 +712,7 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod) 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) + if (sock->GetIOHook() && sock->GetIOHook()->prov->creator == mod) sock->Close(); } } @@ -727,8 +769,10 @@ CullResult ModuleSpanningTree::cull() ModuleSpanningTree::~ModuleSpanningTree() { - delete ServerInstance->PI; - ServerInstance->PI = new ProtocolInterface; + ServerInstance->PI = &ServerInstance->DefaultProtocolInterface; + + Server* newsrv = new Server(ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc); + SetLocalUsersServer(newsrv); /* This will also free the listeners */ delete Utils;