X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=9894dd413d55524a03ec76734709f35c2a9c0174;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=ea11a917e90a36f10f1fae3f38a5fc88c8d4dec7;hpb=2f35b78fbaadb8d9a6c47ffc198bd97f91af3306;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index ea11a917e..9894dd413 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -1,9 +1,15 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2014, 2017-2020 Sadie Powell + * Copyright (C) 2014 Daniel Vassdal + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012 Robby * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008, 2010 Craig Edwards + * Copyright (C) 2008 Thomas Stagner * Copyright (C) 2008 Robin Burchell - * 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 @@ -47,11 +53,11 @@ std::string TreeSocket::MyModules(int filter) Module* const mod = i->second; // 3.0 advertises its settings for the benefit of services // 2.0 would bork on this - if (proto_version < 1205 && i->second->ModuleSourceFile == "m_kicknorejoin.so") + if (proto_version < PROTO_INSPIRCD_30 && mod->ModuleSourceFile == "m_kicknorejoin.so") continue; bool do_compat_include = false; - if (proto_version < 1205) + if (proto_version < PROTO_INSPIRCD_30) { for (size_t j = 0; j < sizeof(compatmods)/sizeof(compatmods[0]); j++) { @@ -63,12 +69,11 @@ std::string TreeSocket::MyModules(int filter) } } - Version v = i->second->GetVersion(); + Version v = mod->GetVersion(); if ((!do_compat_include) && (!(v.Flags & filter))) continue; - if (i != modlist.begin()) - capabilities.push_back(' '); + capabilities.push_back(' '); capabilities.append(i->first); if (!v.link_data.empty()) { @@ -79,13 +84,13 @@ std::string TreeSocket::MyModules(int filter) // If we are linked in a 2.0 server and have an ascii casemapping // advertise it as m_ascii.so from inspircd-extras - if ((filter & VF_COMMON) && ServerInstance->Config->CaseMapping == "ascii" && proto_version == 1202) - { - if (!capabilities.empty()) - capabilities += "m_ascii.so"; - } + if ((filter & VF_COMMON) && ServerInstance->Config->CaseMapping == "ascii" && proto_version == PROTO_INSPIRCD_20) + capabilities.append(" m_ascii.so"); - return capabilities; + if (capabilities.empty()) + return capabilities; + + return capabilities.substr(1); } std::string TreeSocket::BuildModeList(ModeType mtype) @@ -97,7 +102,7 @@ std::string TreeSocket::BuildModeList(ModeType mtype) const ModeHandler* const mh = i->second; const PrefixMode* const pm = mh->IsPrefixMode(); std::string mdesc; - if (proto_version != 1202) + if (proto_version >= PROTO_INSPIRCD_30) { if (pm) mdesc.append("prefix:").append(ConvToStr(pm->GetPrefixRank())).push_back(':'); @@ -128,7 +133,7 @@ void TreeSocket::SendCapabilities(int phase) return; if (capab->capab_phase < 1 && phase >= 1) - WriteLine("CAPAB START " + ConvToStr(ProtocolVersion)); + WriteLine("CAPAB START " + ConvToStr(PROTO_NEWEST)); capab->capab_phase = phase; if (phase < 2) @@ -185,15 +190,23 @@ void TreeSocket::SendCapabilities(int phase) } // 2.0 needs these keys. - if (proto_version == 1202) + if (proto_version == PROTO_INSPIRCD_20) { - extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion)) + extra.append(" PROTOCOL="+ConvToStr(proto_version)) .append(" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxReal)) .append(" CHANMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)) .append(" USERMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_USER)) .append(" PREFIX="+ ServerInstance->Modes->BuildPrefixes()); } + // HACK: Allow services to know what extbans exist. This will be + // replaced by CAPAB EXTBANS in the next protocol version. + std::map tokens; + FOREACH_MOD(On005Numeric, (tokens)); + std::map::const_iterator eiter = tokens.find("EXTBAN"); + if (eiter != tokens.end()) + extra.append(" EXTBANS=" + eiter->second); + this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */ ":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+ " CHANMAX="+ConvToStr(ServerInstance->Config->Limits.ChanMax)+ @@ -218,7 +231,7 @@ void TreeSocket::SendCapabilities(int phase) this->WriteLine("CAPAB END"); } -/* Isolate and return the elements that are different between two comma seperated lists */ +/* Isolate and return the elements that are different between two comma separated lists */ void TreeSocket::ListDifference(const std::string &one, const std::string &two, char sep, std::string& mleft, std::string& mright) { @@ -260,16 +273,17 @@ bool TreeSocket::Capab(const CommandBase::Params& params) if (params.size() > 1) proto_version = ConvToNum(params[1]); - if (proto_version < MinCompatProtocol) + if (proto_version < PROTO_OLDEST) { - SendError("CAPAB negotiation failed: Server is using protocol version " + (proto_version ? ConvToStr(proto_version) : "1201 or older") - + " which is too old to link with this server (version " + ConvToStr(ProtocolVersion) - + (ProtocolVersion != MinCompatProtocol ? ", links with " + ConvToStr(MinCompatProtocol) + " and above)" : ")")); + SendError("CAPAB negotiation failed: Server is using protocol version " + + (proto_version ? ConvToStr(proto_version) : "1201 or older") + + " which is too old to link with this server (protocol versions " + + ConvToStr(PROTO_OLDEST) + " to " + ConvToStr(PROTO_NEWEST) + " are supported)"); return false; } - // Special case, may be removed in the future - if (proto_version == 1203 || proto_version == 1204) + // We don't support the 2.1 protocol. + if (proto_version == PROTO_INSPIRCD_21_A0 || proto_version == PROTO_INSPIRCD_21_B2) { SendError("CAPAB negotiation failed: InspIRCd 2.1 beta is not supported"); return false; @@ -339,7 +353,7 @@ bool TreeSocket::Capab(const CommandBase::Params& params) } } } - else if (proto_version == 1202) + else if (proto_version == PROTO_INSPIRCD_20) { if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end()) { @@ -376,7 +390,7 @@ bool TreeSocket::Capab(const CommandBase::Params& params) } } } - else if (proto_version == 1202 && this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end()) + else if (proto_version == PROTO_INSPIRCD_20 && this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end()) { if (this->capab->CapKeys.find("USERMODES")->second != ServerInstance->Modes->GiveModeList(MODETYPE_USER)) reason = "One or more of the user modes on the remote server are invalid on this server.";