X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=ea11a917e90a36f10f1fae3f38a5fc88c8d4dec7;hb=7a58d288d0fd005795a8ac6908fc91bf350174d6;hp=256a3d069baae8ee6d7fba78ccfbcda543ccd768;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 256a3d069..ea11a917e 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -76,19 +76,40 @@ std::string TreeSocket::MyModules(int filter) capabilities.append(v.link_data); } } + + // 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"; + } + return capabilities; } -static std::string BuildModeList(ModeType type) +std::string TreeSocket::BuildModeList(ModeType mtype) { std::vector modes; - const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes.GetModes(type); + const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes.GetModes(mtype); for (ModeParser::ModeHandlerMap::const_iterator i = mhs.begin(); i != mhs.end(); ++i) { const ModeHandler* const mh = i->second; - std::string mdesc = mh->name; - mdesc.push_back('='); const PrefixMode* const pm = mh->IsPrefixMode(); + std::string mdesc; + if (proto_version != 1202) + { + if (pm) + mdesc.append("prefix:").append(ConvToStr(pm->GetPrefixRank())).push_back(':'); + else if (mh->IsListMode()) + mdesc.append("list:"); + else if (mh->NeedsParam(true)) + mdesc.append(mh->NeedsParam(false) ? "param:" : "param-set:"); + else + mdesc.append("simple:"); + } + mdesc.append(mh->name); + mdesc.push_back('='); if (pm) { if (pm->GetPrefix()) @@ -166,8 +187,11 @@ void TreeSocket::SendCapabilities(int phase) // 2.0 needs these keys. if (proto_version == 1202) { - extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion)); - extra.append(" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxReal)); + extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion)) + .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()); } this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */ @@ -182,9 +206,6 @@ void TreeSocket::SendCapabilities(int phase) " MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+ " MAXHOST="+ConvToStr(ServerInstance->Config->Limits.MaxHost)+ extra+ - " PREFIX="+ServerInstance->Modes->BuildPrefixes()+ - " CHANMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)+ - " USERMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_USER)+ " CASEMAPPING="+ServerInstance->Config->CaseMapping+ // XXX: Advertise the presence or absence of m_globops in CAPAB CAPABILITIES. // Services want to know about it, and since m_globops was not marked as VF_(OPT)COMMON @@ -237,7 +258,7 @@ bool TreeSocket::Capab(const CommandBase::Params& params) capab->OptModuleList.clear(); capab->CapKeys.clear(); if (params.size() > 1) - proto_version = ConvToInt(params[1]); + proto_version = ConvToNum(params[1]); if (proto_version < MinCompatProtocol) { @@ -275,6 +296,7 @@ bool TreeSocket::Capab(const CommandBase::Params& params) return false; } } + if (this->capab->OptModuleList != this->MyModules(VF_OPTCOMMON) && this->capab->OptModuleList.length()) { std::string diffIneed, diffUneed; @@ -290,7 +312,7 @@ bool TreeSocket::Capab(const CommandBase::Params& params) } else { - reason = "Optional modules incorrectly matched on these servers, and options::allowmismatch not set."; + reason = "Optional modules incorrectly matched on these servers and is not enabled."; if (diffIneed.length()) reason += " Not loaded here:" + diffIneed; if (diffUneed.length()) @@ -301,9 +323,6 @@ bool TreeSocket::Capab(const CommandBase::Params& params) } } - if(this->capab->CapKeys.find("PREFIX") != this->capab->CapKeys.end() && this->capab->CapKeys.find("PREFIX")->second != ServerInstance->Modes->BuildPrefixes()) - reason = "One or more of the prefixes on the remote server are invalid on this server."; - if (!capab->ChanModes.empty()) { if (capab->ChanModes != BuildModeList(MODETYPE_CHANNEL)) @@ -320,10 +339,25 @@ bool TreeSocket::Capab(const CommandBase::Params& params) } } } - else if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end()) + else if (proto_version == 1202) + { + if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end()) + { + if (this->capab->CapKeys.find("CHANMODES")->second != ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)) + reason = "One or more of the channel modes on the remote server are invalid on this server."; + } + + else if (this->capab->CapKeys.find("PREFIX") != this->capab->CapKeys.end()) + { + if (this->capab->CapKeys.find("PREFIX")->second != ServerInstance->Modes->BuildPrefixes()) + reason = "One or more of the prefixes on the remote server are invalid on this server."; + } + } + + if (!reason.empty()) { - if (this->capab->CapKeys.find("CHANMODES")->second != ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)) - reason = "One or more of the channel modes on the remote server are invalid on this server."; + this->SendError("CAPAB negotiation failed: " + reason); + return false; } if (!capab->UserModes.empty()) @@ -342,28 +376,29 @@ bool TreeSocket::Capab(const CommandBase::Params& params) } } } - else if (this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end()) + else if (proto_version == 1202 && 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."; } - else + + if (!reason.empty()) { - // We default to rfc1459 here because if this key is not sent then - // the remote server is running the 2.0 protocol which uses rfc1459 - // by default. - std::string casemapping = "rfc1459"; - std::map::iterator citer = this->capab->CapKeys.find("CASEMAPPING"); - if (citer != this->capab->CapKeys.end()) - casemapping = citer->second; + this->SendError("CAPAB negotiation failed: " + reason); + return false; + } + if (this->capab->CapKeys.find("CASEMAPPING") != this->capab->CapKeys.end()) + { + const std::string casemapping = this->capab->CapKeys.find("CASEMAPPING")->second; if (casemapping != ServerInstance->Config->CaseMapping) { reason = "The casemapping of the remote server differs to that of the local server." " Local casemapping: " + ServerInstance->Config->CaseMapping + " Remote casemapping: " + casemapping; + this->SendError("CAPAB negotiation failed: " + reason); + return false; } - } /* Challenge response, store their challenge for our password */ @@ -387,12 +422,6 @@ bool TreeSocket::Capab(const CommandBase::Params& params) this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); } } - - if (reason.length()) - { - this->SendError("CAPAB negotiation failed: "+reason); - return false; - } } else if ((params[0] == "MODULES") && (params.size() == 2)) {