X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=7b64358980d6bb41e49dbadeee5b437ea327fd5b;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=7ebee4bda6eba72adea98de74118ecc924ecb391;hpb=57e51adaf1b1e30b06bebf5fe8fb13e937e96c5e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 7ebee4bda..7b6435898 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -1,26 +1,33 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2008 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 "xline.h" #include "treesocket.h" #include "treeserver.h" #include "utils.h" +#include "link.h" #include "main.h" -/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */ - std::string TreeSocket::MyModules(int filter) { std::vector modlist = ServerInstance->Modules->GetAllModuleNames(filter); @@ -30,13 +37,13 @@ std::string TreeSocket::MyModules(int filter) std::string capabilities; sort(modlist.begin(),modlist.end()); - for (unsigned int i = 0; i < modlist.size(); i++) + for (std::vector::const_iterator i = modlist.begin(); i != modlist.end(); ++i) { - if (i) - capabilities.push_back(','); - capabilities.append(modlist[i]); - Module* m = ServerInstance->Modules->Find(modlist[i]); - if (m && proto_version >= 1202) + if (i != modlist.begin()) + capabilities.push_back(proto_version > 1201 ? ' ' : ','); + capabilities.append(*i); + Module* m = ServerInstance->Modules->Find(*i); + if (m && proto_version > 1201) { Version v = m->GetVersion(); if (!v.link_data.empty()) @@ -51,22 +58,24 @@ std::string TreeSocket::MyModules(int filter) static std::string BuildModeList(ModeType type) { - std::string line; + std::vector modes; for(char c='A'; c <= 'z'; c++) { ModeHandler* mh = ServerInstance->Modes->FindMode(c, type); if (mh) { - if (!line.empty()) - line.push_back(','); - line.append(mh->name); - line.push_back('='); + std::string mdesc = mh->name; + mdesc.push_back('='); if (mh->GetPrefix()) - line.push_back(mh->GetPrefix()); - line.push_back(c); + mdesc.push_back(mh->GetPrefix()); + if (mh->GetModeChar()) + mdesc.push_back(mh->GetModeChar()); + modes.push_back(mdesc); } } - return line; + sort(modes.begin(), modes.end()); + irc::stringjoiner line(" ", modes, 0, modes.size() - 1); + return line.GetJoined(); } void TreeSocket::SendCapabilities(int phase) @@ -81,63 +90,57 @@ void TreeSocket::SendCapabilities(int phase) if (phase < 2) return; - irc::commasepstream modulelist(MyModules(VF_COMMON)); - irc::commasepstream optmodulelist(MyModules(VF_OPTCOMMON)); + char sep = proto_version > 1201 ? ' ' : ','; + irc::sepstream modulelist(MyModules(VF_COMMON), sep); + irc::sepstream optmodulelist(MyModules(VF_OPTCOMMON), sep); /* Send module names, split at 509 length */ std::string item; - std::string line = "CAPAB MODULES "; + std::string line = "CAPAB MODULES :"; while (modulelist.GetToken(item)) { if (line.length() + item.length() + 1 > 509) { this->WriteLine(line); - line = "CAPAB MODULES "; + line = "CAPAB MODULES :"; } - if (line != "CAPAB MODULES ") - line.append(","); + if (line != "CAPAB MODULES :") + line.push_back(sep); line.append(item); } - if (line != "CAPAB MODULES ") + if (line != "CAPAB MODULES :") this->WriteLine(line); - line = "CAPAB MODSUPPORT "; + line = "CAPAB MODSUPPORT :"; while (optmodulelist.GetToken(item)) { if (line.length() + item.length() + 1 > 509) { this->WriteLine(line); - line = "CAPAB MODSUPPORT "; + line = "CAPAB MODSUPPORT :"; } - if (line != "CAPAB MODSUPPORT ") - line.append(","); + if (line != "CAPAB MODSUPPORT :") + line.push_back(sep); line.append(item); } - if (line != "CAPAB MODSUPPORT ") - this->WriteLine(line); - - line = "CAPAB CHANMODES " + BuildModeList(MODETYPE_CHANNEL); - if (line != "CAPAB CHANMODES ") + if (line != "CAPAB MODSUPPORT :") this->WriteLine(line); - line = "CAPAB USERMODES " + BuildModeList(MODETYPE_USER); - if (line != "CAPAB USERMODES ") - this->WriteLine(line); + WriteLine("CAPAB CHANMODES :" + BuildModeList(MODETYPE_CHANNEL)); + WriteLine("CAPAB USERMODES :" + BuildModeList(MODETYPE_USER)); - int ip6 = 0; -#ifdef IPV6 - ip6 = 1; -#endif std::string extra; /* Do we have sha256 available? If so, we send a challenge */ if (Utils->ChallengeResponse && (ServerInstance->Modules->Find("m_sha256.so"))) { - this->SetOurChallenge(RandString(20)); + SetOurChallenge(ServerInstance->GenRandomStr(20)); extra = " CHALLENGE=" + this->GetOurChallenge(); } + if (proto_version < 1202) + extra += ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL) ? " HALFOP=1" : " HALFOP=0"; this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */ ":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+ @@ -149,46 +152,47 @@ void TreeSocket::SendCapabilities(int phase) " MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+ " MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+ " MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+ - " IP6NATIVE="+ConvToStr(ip6)+ " IP6SUPPORT=1"+ " PROTOCOL="+ConvToStr(ProtocolVersion)+extra+ " PREFIX="+ServerInstance->Modes->BuildPrefixes()+ " CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+ " USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)+ + // 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 + // in 2.0, we advertise it here to not break linking to previous versions. + // Protocol version 1201 (1.2) does not have this issue because we advertise m_globops + // to 1201 protocol servers irrespectively of its module flags. + (ServerInstance->Modules->Find("m_globops.so") != NULL ? " GLOBOPS=1" : " GLOBOPS=0")+ " SVSPART=1"); this->WriteLine("CAPAB END"); } -/* Check a comma seperated list for an item */ -bool TreeSocket::HasItem(const std::string &list, const std::string &item) -{ - irc::commasepstream seplist(list); - std::string item2; - - while (seplist.GetToken(item2)) - { - if (item2 == item) - return true; - } - return false; -} - /* Isolate and return the elements that are different between two comma seperated lists */ -std::string TreeSocket::ListDifference(const std::string &one, const std::string &two) +void TreeSocket::ListDifference(const std::string &one, const std::string &two, char sep, + std::string& mleft, std::string& mright) { - irc::commasepstream list_one(one); + std::set values; + irc::sepstream sepleft(one, sep); + irc::sepstream sepright(two, sep); std::string item; - std::string result; - while (list_one.GetToken(item)) + while (sepleft.GetToken(item)) { - if (!HasItem(two, item)) + values.insert(item); + } + while (sepright.GetToken(item)) + { + if (!values.erase(item)) { - result.append(" "); - result.append(item); + mright.push_back(sep); + mright.append(item); } } - return result; + for(std::set::iterator i = values.begin(); i != values.end(); ++i) + { + mleft.push_back(sep); + mleft.append(*i); + } } bool TreeSocket::Capab(const parameterlist ¶ms) @@ -213,47 +217,42 @@ bool TreeSocket::Capab(const parameterlist ¶ms) /* Compare ModuleList and check CapKeys */ if ((this->capab->ModuleList != this->MyModules(VF_COMMON)) && (this->capab->ModuleList.length())) { - std::string diffIneed = ListDifference(this->capab->ModuleList, this->MyModules(VF_COMMON)); - std::string diffUneed = ListDifference(this->MyModules(VF_COMMON), this->capab->ModuleList); - if (diffIneed.length() == 0 && diffUneed.length() == 0) - { - reason = "Module list in CAPAB is not alphabetically ordered, cannot compare lists."; - } - else + std::string diffIneed, diffUneed; + ListDifference(this->capab->ModuleList, this->MyModules(VF_COMMON), proto_version > 1201 ? ' ' : ',', diffIneed, diffUneed); + if (diffIneed.length() || diffUneed.length()) { reason = "Modules incorrectly matched on these servers."; if (diffIneed.length()) reason += " Not loaded here:" + diffIneed; if (diffUneed.length()) reason += " Not loaded there:" + diffUneed; + this->SendError("CAPAB negotiation failed: "+reason); + return false; } - this->SendError("CAPAB negotiation failed: "+reason); - return false; } if (this->capab->OptModuleList != this->MyModules(VF_OPTCOMMON) && this->capab->OptModuleList.length()) { - std::string diffIneed = ListDifference(this->capab->OptModuleList, this->MyModules(VF_OPTCOMMON)); - std::string diffUneed = ListDifference(this->MyModules(VF_OPTCOMMON), this->capab->OptModuleList); - if (diffIneed.length() == 0 && diffUneed.length() == 0) - { - reason = "Optional Module list in CAPAB is not alphabetically ordered, cannot compare lists."; - } - else if (Utils->AllowOptCommon) - { - ServerInstance->SNO->WriteToSnoMask('l', - "Optional module lists do not match, some commands may not work globally.%s%s%s%s", - diffIneed.length() ? " Not loaded here:" : "", diffIneed.c_str(), - diffUneed.length() ? " Not loaded there:" : "", diffUneed.c_str()); - } - else + std::string diffIneed, diffUneed; + ListDifference(this->capab->OptModuleList, this->MyModules(VF_OPTCOMMON), ' ', diffIneed, diffUneed); + if (diffIneed.length() || diffUneed.length()) { - reason = "Optional modules incorrectly matched on these servers, and options::allowmismatch not set."; - if (diffIneed.length()) - reason += " Not loaded here:" + diffIneed; - if (diffUneed.length()) - reason += " Not loaded there:" + diffUneed; - this->SendError("CAPAB negotiation failed: "+reason); - return false; + if (Utils->AllowOptCommon) + { + ServerInstance->SNO->WriteToSnoMask('l', + "Optional module lists do not match, some commands may not work globally.%s%s%s%s", + diffIneed.length() ? " Not loaded here:" : "", diffIneed.c_str(), + diffUneed.length() ? " Not loaded there:" : "", diffUneed.c_str()); + } + else + { + reason = "Optional modules incorrectly matched on these servers, and options::allowmismatch not set."; + if (diffIneed.length()) + reason += " Not loaded here:" + diffIneed; + if (diffUneed.length()) + reason += " Not loaded there:" + diffUneed; + this->SendError("CAPAB negotiation failed: "+reason); + return false; + } } } @@ -279,13 +278,16 @@ bool TreeSocket::Capab(const parameterlist ¶ms) { if (capab->ChanModes != BuildModeList(MODETYPE_CHANNEL)) { - std::string diffIneed = ListDifference(capab->ChanModes, BuildModeList(MODETYPE_CHANNEL)); - std::string diffUneed = ListDifference(BuildModeList(MODETYPE_CHANNEL), capab->ChanModes); - reason = "Channel modes not matched on these servers."; - if (diffIneed.length()) - reason += " Not loaded here:" + diffIneed; - if (diffUneed.length()) - reason += " Not loaded there:" + diffUneed; + std::string diffIneed, diffUneed; + ListDifference(capab->ChanModes, BuildModeList(MODETYPE_CHANNEL), ' ', diffIneed, diffUneed); + if (diffIneed.length() || diffUneed.length()) + { + reason = "Channel modes not matched on these servers."; + if (diffIneed.length()) + reason += " Not loaded here:" + diffIneed; + if (diffUneed.length()) + reason += " Not loaded there:" + diffUneed; + } } } else if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end()) @@ -298,13 +300,16 @@ bool TreeSocket::Capab(const parameterlist ¶ms) { if (capab->UserModes != BuildModeList(MODETYPE_USER)) { - std::string diffIneed = ListDifference(capab->UserModes, BuildModeList(MODETYPE_USER)); - std::string diffUneed = ListDifference(BuildModeList(MODETYPE_USER), capab->UserModes); - reason = "User modes not matched on these servers."; - if (diffIneed.length()) - reason += " Not loaded here:" + diffIneed; - if (diffUneed.length()) - reason += " Not loaded there:" + diffUneed; + std::string diffIneed, diffUneed; + ListDifference(capab->UserModes, BuildModeList(MODETYPE_USER), ' ', diffIneed, diffUneed); + if (diffIneed.length() || diffUneed.length()) + { + reason = "User modes not matched on these servers."; + if (diffIneed.length()) + reason += " Not loaded here:" + diffIneed; + if (diffUneed.length()) + reason += " Not loaded there:" + diffUneed; + } } } else if (this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end()) @@ -322,8 +327,7 @@ bool TreeSocket::Capab(const parameterlist ¶ms) if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING)) { this->SendCapabilities(2); - this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+this->MakePass(capab->OutboundPass, this->GetTheirChallenge())+" 0 "+ - ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); + this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+this->MakePass(capab->link->SendPass, capab->theirchallenge)+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); } } else @@ -332,7 +336,7 @@ bool TreeSocket::Capab(const parameterlist ¶ms) if (this->LinkState == CONNECTING) { this->SendCapabilities(2); - this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+capab->OutboundPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); + this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); } } @@ -344,26 +348,26 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } else if ((params[0] == "MODULES") && (params.size() == 2)) { - if (!this->capab->ModuleList.length()) + if (!capab->ModuleList.length()) { - this->capab->ModuleList.append(params[1]); + capab->ModuleList = params[1]; } else { - this->capab->ModuleList.append(","); - this->capab->ModuleList.append(params[1]); + capab->ModuleList.push_back(proto_version > 1201 ? ' ' : ','); + capab->ModuleList.append(params[1]); } } else if ((params[0] == "MODSUPPORT") && (params.size() == 2)) { - if (!this->capab->OptModuleList.length()) + if (!capab->OptModuleList.length()) { - this->capab->OptModuleList.append(params[1]); + capab->OptModuleList = params[1]; } else { - this->capab->OptModuleList.append(","); - this->capab->OptModuleList.append(params[1]); + capab->OptModuleList.push_back(' '); + capab->OptModuleList.append(params[1]); } } else if ((params[0] == "CHANMODES") && (params.size() == 2)) @@ -378,11 +382,10 @@ bool TreeSocket::Capab(const parameterlist ¶ms) { irc::tokenstream capabs(params[1]); std::string item; - bool more = true; - while ((more = capabs.GetToken(item))) + while (capabs.GetToken(item)) { /* Process each key/value pair */ - std::string::size_type equals = item.rfind('='); + std::string::size_type equals = item.find('='); if (equals != std::string::npos) { std::string var = item.substr(0, equals);