X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fprotocolinterface.cpp;h=efc00334d96faf5f4ec791b665a6160e1696600c;hb=44f42a13de52c8025942ddab42f51feb36821782;hp=850a27c22de970605089162caea1168e6a2bf5fa;hpb=ada434820d2d81d8e4bcf633ebcbfef20606b51c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp index 850a27c22..efc00334d 100644 --- a/src/modules/m_spanningtree/protocolinterface.cpp +++ b/src/modules/m_spanningtree/protocolinterface.cpp @@ -1,9 +1,33 @@ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Craig Edwards + * + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + #include "inspircd.h" -#include "m_spanningtree/main.h" -#include "m_spanningtree/utils.h" -#include "m_spanningtree/treeserver.h" -#include "m_spanningtree/treesocket.h" -#include "m_spanningtree/protocolinterface.h" +#include "main.h" +#include "utils.h" +#include "treeserver.h" +#include "treesocket.h" +#include "protocolinterface.h" + +/* + * For documentation on this class, see include/protocol.h. + */ void SpanningTreeProtocolInterface::GetServerList(ProtoServerList &sl) { @@ -13,35 +37,38 @@ void SpanningTreeProtocolInterface::GetServerList(ProtoServerList &sl) ProtoServer ps; ps.servername = i->second->GetName(); TreeServer* s = i->second->GetParent(); - ps.parentname = s ? s->GetName() : ServerInstance->Config->ServerName; + ps.parentname = s ? s->GetName() : ""; ps.usercount = i->second->GetUserCount(); ps.opercount = i->second->GetOperCount(); + ps.gecos = i->second->GetDesc(); ps.latencyms = i->second->rtt; sl.push_back(ps); } } -void SpanningTreeProtocolInterface::SendEncapsulatedData(parameterlist &encap) +bool SpanningTreeProtocolInterface::SendEncapsulatedData(const parameterlist &encap) { - Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", encap); + if (encap[0].find('*') != std::string::npos) + { + Utils->DoOneToMany(ServerInstance->Config->GetSID(), "ENCAP", encap); + return true; + } + return Utils->DoOneToOne(ServerInstance->Config->GetSID(), "ENCAP", encap, encap[0]); } -void SpanningTreeProtocolInterface::SendMetaData(void* target, int type, const std::string &key, const std::string &data) +void SpanningTreeProtocolInterface::SendMetaData(Extensible* target, const std::string &key, const std::string &data) { parameterlist params; - switch (type) - { - case TYPE_USER: - params.push_back(((User*)target)->uuid); - break; - case TYPE_CHANNEL: - params.push_back(((Channel*)target)->name); - break; - case TYPE_SERVER: - params.push_back("*"); - break; - } + User* u = dynamic_cast(target); + Channel* c = dynamic_cast(target); + if (u) + params.push_back(u->uuid); + else if (c) + params.push_back(c->name); + else + params.push_back("*"); + params.push_back(key); params.push_back(":" + data); @@ -60,28 +87,25 @@ void SpanningTreeProtocolInterface::SendTopic(Channel* channel, std::string &top Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FTOPIC", params); } -void SpanningTreeProtocolInterface::SendMode(const std::string &target, parameterlist &modedata) +void SpanningTreeProtocolInterface::SendMode(const std::string &target, const parameterlist &modedata, const std::vector &translate) { if (modedata.empty()) return; std::string outdata; - - /* Warning: in-place translation is only safe for type TR_NICK */ - for (size_t n = 0; n < modedata.size(); n++) - { - ServerInstance->Parser->TranslateUIDs(TR_NICK, modedata[n], outdata); - modedata[n] = outdata; - } + ServerInstance->Parser->TranslateUIDs(translate, modedata, outdata); std::string uidtarget; ServerInstance->Parser->TranslateUIDs(TR_NICK, target, uidtarget); - modedata.insert(modedata.begin(), uidtarget); + + parameterlist outlist; + outlist.push_back(uidtarget); + outlist.push_back(outdata); User* a = ServerInstance->FindNick(uidtarget); if (a) { - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",modedata); + Utils->DoOneToMany(ServerInstance->Config->GetSID(),"MODE",outlist); return; } else @@ -89,20 +113,12 @@ void SpanningTreeProtocolInterface::SendMode(const std::string &target, paramete Channel* c = ServerInstance->FindChan(target); if (c) { - modedata.insert(modedata.begin() + 1, ConvToStr(c->age)); - Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",modedata); + outlist.insert(outlist.begin() + 1, ConvToStr(c->age)); + Utils->DoOneToMany(ServerInstance->Config->GetSID(),"FMODE",outlist); } } } -void SpanningTreeProtocolInterface::SendModeNotice(const std::string &modes, const std::string &text) -{ - parameterlist p; - p.push_back(modes); - p.push_back(":" + text); - Utils->DoOneToMany(ServerInstance->Config->GetSID(), "MODENOTICE", p); -} - void SpanningTreeProtocolInterface::SendSNONotice(const std::string &snomask, const std::string &text) { parameterlist p; @@ -115,7 +131,7 @@ void SpanningTreeProtocolInterface::PushToClient(User* target, const std::string { parameterlist p; p.push_back(target->uuid); - p.push_back(rawline); + p.push_back(":" + rawline); Utils->DoOneToOne(ServerInstance->Config->GetSID(), "PUSH", p, target->server); } @@ -171,28 +187,3 @@ void SpanningTreeProtocolInterface::SendUserNotice(User* target, const std::stri } } } - -void SpanningTreeProtocolInterface::Introduce(User* user) -{ - if (IS_LOCAL(user)) - { - std::deque 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("+"+std::string(user->FormatModes())); - params.push_back(user->GetIPString()); - params.push_back(ConvToStr(user->signon)); - params.push_back(":"+std::string(user->fullname)); - Utils->DoOneToMany(ServerInstance->Config->GetSID(), "UID", params); - } - - TreeServer* SourceServer = Utils->FindServer(user->server); - if (SourceServer) - { - SourceServer->SetUserCount(1); // increment by 1 - } -}