X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=4286300e5a472c2dc9bd8c51b0871329538aef4b;hb=56b4dc61e49e4218544f51ac9a25ab3ece60a782;hp=5b68ab4f9cf1e4c5899a82d27634680b72604dd9;hpb=e62516014fdbc13a0baf9b869b747300bfdccbc7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 5b68ab4f9..4286300e5 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -1,154 +1,264 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2014, 2017-2019 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 * - * 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 */ +struct CompatMod +{ + const char* name; + ModuleFlags listflag; +}; +static CompatMod compatmods[] = +{ + { "m_watch.so", VF_OPTCOMMON } +}; std::string TreeSocket::MyModules(int filter) { - std::vector modlist = this->ServerInstance->Modules->GetAllModuleNames(filter); + const ModuleManager::ModuleMap& modlist = ServerInstance->Modules->GetModules(); + std::string capabilities; - sort(modlist.begin(),modlist.end()); - for (unsigned int i = 0; i < modlist.size(); i++) + for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i) + { + Module* const mod = i->second; + // 3.0 advertises its settings for the benefit of services + // 2.0 would bork on this + if (proto_version < PROTO_INSPIRCD_30 && mod->ModuleSourceFile == "m_kicknorejoin.so") + continue; + + bool do_compat_include = false; + if (proto_version < PROTO_INSPIRCD_30) + { + for (size_t j = 0; j < sizeof(compatmods)/sizeof(compatmods[0]); j++) + { + if ((compatmods[j].listflag & filter) && (mod->ModuleSourceFile == compatmods[j].name)) + { + do_compat_include = true; + break; + } + } + } + + Version v = mod->GetVersion(); + if ((!do_compat_include) && (!(v.Flags & filter))) + continue; + + capabilities.push_back(' '); + capabilities.append(i->first); + if (!v.link_data.empty()) + { + capabilities.push_back('='); + 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 == PROTO_INSPIRCD_20) + capabilities.append(" m_ascii.so"); + + if (capabilities.empty()) + return capabilities; + + return capabilities.substr(1); +} + +std::string TreeSocket::BuildModeList(ModeType mtype) +{ + std::vector modes; + const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes.GetModes(mtype); + for (ModeParser::ModeHandlerMap::const_iterator i = mhs.begin(); i != mhs.end(); ++i) { - if (i) - capabilities = capabilities + ","; - capabilities = capabilities + modlist[i]; + const ModeHandler* const mh = i->second; + const PrefixMode* const pm = mh->IsPrefixMode(); + std::string mdesc; + if (proto_version >= PROTO_INSPIRCD_30) + { + 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()) + mdesc.push_back(pm->GetPrefix()); + } + mdesc.push_back(mh->GetModeChar()); + modes.push_back(mdesc); } - return capabilities; + std::sort(modes.begin(), modes.end()); + return stdalgo::string::join(modes); } -void TreeSocket::SendCapabilities() +void TreeSocket::SendCapabilities(int phase) { - if (sentcapab) + if (capab->capab_phase >= phase) return; - sentcapab = true; - irc::commasepstream modulelist(MyModules(VF_COMMON)); - irc::commasepstream optmodulelist(MyModules(VF_OPTCOMMON)); - this->WriteLine("CAPAB START"); + if (capab->capab_phase < 1 && phase >= 1) + WriteLine("CAPAB START " + ConvToStr(PROTO_NEWEST)); + capab->capab_phase = phase; + if (phase < 2) + return; + + const char sep = ' '; + 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 ") + if (line != "CAPAB MODSUPPORT :") 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"))) + if (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256")) { - this->SetOurChallenge(RandString(20)); + SetOurChallenge(ServerInstance->GenRandomStr(20)); extra = " CHALLENGE=" + this->GetOurChallenge(); } + // 2.0 needs these keys. + if (proto_version == PROTO_INSPIRCD_20) + { + 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)+ - " HALFOP="+ConvToStr(ServerInstance->Config->AllowHalfop)+ " CHANMAX="+ConvToStr(ServerInstance->Config->Limits.ChanMax)+ " MAXMODES="+ConvToStr(ServerInstance->Config->Limits.MaxModes)+ " IDENTMAX="+ConvToStr(ServerInstance->Config->Limits.IdentMax)+ " MAXQUIT="+ConvToStr(ServerInstance->Config->Limits.MaxQuit)+ " MAXTOPIC="+ConvToStr(ServerInstance->Config->Limits.MaxTopic)+ " MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+ - " MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+ + " MAXREAL="+ConvToStr(ServerInstance->Config->Limits.MaxReal)+ " 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)+ - " SVSPART=1"); + " MAXHOST="+ConvToStr(ServerInstance->Config->Limits.MaxHost)+ + extra+ + " 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 + // 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") + ); this->WriteLine("CAPAB END"); } -/* Check a comma seperated list for an item */ -bool TreeSocket::HasItem(const std::string &list, const std::string &item) +/* 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) { - irc::commasepstream seplist(list); - std::string item2; - - while (seplist.GetToken(item2)) + std::set values; + irc::sepstream sepleft(one, sep); + irc::sepstream sepright(two, sep); + std::string item; + while (sepleft.GetToken(item)) { - if (item2 == item) - return true; + values.insert(item); } - 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) -{ - irc::commasepstream list_one(one); - std::string item; - std::string result; - while (list_one.GetToken(item)) + while (sepright.GetToken(item)) { - if (!HasItem(two, 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) +bool TreeSocket::Capab(const CommandBase::Params& params) { if (params.size() < 1) { @@ -157,155 +267,223 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } if (params[0] == "START") { - ModuleList.clear(); - OptModuleList.clear(); - CapKeys.clear(); + capab->ModuleList.clear(); + capab->OptModuleList.clear(); + capab->CapKeys.clear(); + if (params.size() > 1) + proto_version = ConvToNum(params[1]); + + 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 (protocol versions " + + ConvToStr(PROTO_OLDEST) + " to " + ConvToStr(PROTO_NEWEST) + " are supported)"); + return false; + } + + // 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; + } + + SendCapabilities(2); } else if (params[0] == "END") { std::string reason; /* Compare ModuleList and check CapKeys */ - if ((this->ModuleList != this->MyModules(VF_COMMON)) && (this->ModuleList.length())) + if ((this->capab->ModuleList != this->MyModules(VF_COMMON)) && (this->capab->ModuleList.length())) { - std::string diffIneed = ListDifference(this->ModuleList, this->MyModules(VF_COMMON)); - std::string diffUneed = ListDifference(this->MyModules(VF_COMMON), this->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), ' ', 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; + } + } + + if (this->capab->OptModuleList != this->MyModules(VF_OPTCOMMON) && this->capab->OptModuleList.length()) + { + std::string diffIneed, diffUneed; + ListDifference(this->capab->OptModuleList, this->MyModules(VF_OPTCOMMON), ' ', diffIneed, diffUneed); + if (diffIneed.length() || diffUneed.length()) + { + 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 is not enabled."; + 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->OptModuleList != this->MyModules(VF_OPTCOMMON) && this->OptModuleList.length()) + + if (!capab->ChanModes.empty()) { - std::string diffIneed = ListDifference(this->OptModuleList, this->MyModules(VF_OPTCOMMON)); - std::string diffUneed = ListDifference(this->MyModules(VF_OPTCOMMON), this->OptModuleList); - if (diffIneed.length() == 0 && diffUneed.length() == 0) + if (capab->ChanModes != BuildModeList(MODETYPE_CHANNEL)) { - reason = "Optional Module list in CAPAB is not alphabetically ordered, cannot compare lists."; + 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 (Utils->AllowOptCommon) + } + else if (proto_version == PROTO_INSPIRCD_20) + { + if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end()) { - 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()); + 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 + + else if (this->capab->CapKeys.find("PREFIX") != this->capab->CapKeys.end()) { - 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 (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 (this->CapKeys.find("PROTOCOL") == this->CapKeys.end()) + if (!reason.empty()) { - reason = "Protocol version not specified"; + this->SendError("CAPAB negotiation failed: " + reason); + return false; } - else + + if (!capab->UserModes.empty()) { - proto_version = atoi(CapKeys.find("PROTOCOL")->second.c_str()); - if (proto_version < MinCompatProtocol) + if (capab->UserModes != BuildModeList(MODETYPE_USER)) { - reason = "Server is using protocol version " + ConvToStr(proto_version) + - " which is too old to link with this server (version " + ConvToStr(ProtocolVersion) - + (ProtocolVersion != MinCompatProtocol ? ", links with " + ConvToStr(MinCompatProtocol) + " and above)" : ")"); + 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 (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."; + } - if(this->CapKeys.find("PREFIX") != this->CapKeys.end() && this->CapKeys.find("PREFIX")->second != this->ServerInstance->Modes->BuildPrefixes()) - reason = "One or more of the prefixes on the remote server are invalid on this server."; - - if(this->CapKeys.find("CHANMODES") != this->CapKeys.end() && this->CapKeys.find("CHANMODES")->second != this->ServerInstance->Modes->GiveModeList(MASK_CHANNEL)) - reason = "One or more of the channel modes on the remote server are invalid on this server."; - - if(this->CapKeys.find("USERMODES") != this->CapKeys.end() && this->CapKeys.find("USERMODES")->second != this->ServerInstance->Modes->GiveModeList(MASK_USER)) - reason = "One or more of the user modes on the remote server are invalid on this server."; + if (!reason.empty()) + { + 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 */ - std::map::iterator n = this->CapKeys.find("CHALLENGE"); - if (Utils->ChallengeResponse && (n != this->CapKeys.end()) && (ServerInstance->Modules->Find("m_sha256.so"))) + std::map::iterator n = this->capab->CapKeys.find("CHALLENGE"); + if ((n != this->capab->CapKeys.end()) && (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256"))) { /* Challenge-response is on now */ this->SetTheirChallenge(n->second); if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING)) { - this->SendCapabilities(); - this->WriteLine(std::string("SERVER ")+this->ServerInstance->Config->ServerName+" "+this->MakePass(OutboundPass, this->GetTheirChallenge())+" 0 "+ - ServerInstance->Config->GetSID()+" :"+this->ServerInstance->Config->ServerDesc); + this->SendCapabilities(2); + this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+this->MakePass(capab->link->SendPass, capab->theirchallenge)+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); } } else { - /* They didnt specify a challenge or we don't have m_sha256.so, we use plaintext */ + // They didn't specify a challenge or we don't have sha256, we use plaintext if (this->LinkState == CONNECTING) { - this->SendCapabilities(); - this->WriteLine(std::string("SERVER ")+this->ServerInstance->Config->ServerName+" "+OutboundPass+" 0 "+ServerInstance->Config->GetSID()+" :"+this->ServerInstance->Config->ServerDesc); + this->SendCapabilities(2); + 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)) { - if (!this->ModuleList.length()) + if (!capab->ModuleList.length()) { - this->ModuleList.append(params[1]); + capab->ModuleList = params[1]; } else { - this->ModuleList.append(","); - this->ModuleList.append(params[1]); + capab->ModuleList.push_back(' '); + capab->ModuleList.append(params[1]); } } else if ((params[0] == "MODSUPPORT") && (params.size() == 2)) { - if (!this->OptModuleList.length()) + if (!capab->OptModuleList.length()) { - this->OptModuleList.append(params[1]); + capab->OptModuleList = params[1]; } else { - this->OptModuleList.append(","); - this->OptModuleList.append(params[1]); + capab->OptModuleList.push_back(' '); + capab->OptModuleList.append(params[1]); } } + else if ((params[0] == "CHANMODES") && (params.size() == 2)) + { + capab->ChanModes = params[1]; + } + else if ((params[0] == "USERMODES") && (params.size() == 2)) + { + capab->UserModes = params[1]; + } else if ((params[0] == "CAPABILITIES") && (params.size() == 2)) { - irc::tokenstream capabs(params[1]); + irc::spacesepstream 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); - std::string value = item.substr(equals+1, item.length()); - CapKeys[var] = value; + std::string var(item, 0, equals); + std::string value(item, equals+1); + capab->CapKeys[var] = value; } } } return true; } -