* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
#include "inspircd.h"
#include "xline.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/main.h"
+#include "treesocket.h"
+#include "treeserver.h"
+#include "utils.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<std::string> modlist = ServerInstance->Modules->GetAllModuleNames(filter);
+ if (filter == VF_COMMON && proto_version != ProtocolVersion)
+ CompatAddModules(modlist);
-std::string TreeSocket::MyCapabilities()
-{
- std::vector<std::string> modlist = this->ServerInstance->Modules->GetAllModuleNames(VF_COMMON);
std::string capabilities;
sort(modlist.begin(),modlist.end());
for (unsigned int i = 0; i < modlist.size(); i++)
{
if (i)
- capabilities = capabilities + ",";
- capabilities = capabilities + modlist[i];
+ capabilities.push_back(proto_version > 1201 ? ' ' : ',');
+ capabilities.append(modlist[i]);
+ Module* m = ServerInstance->Modules->Find(modlist[i]);
+ if (m && proto_version > 1201)
+ {
+ Version v = m->GetVersion();
+ if (!v.link_data.empty())
+ {
+ capabilities.push_back('=');
+ capabilities.append(v.link_data);
+ }
+ }
}
return capabilities;
}
-void TreeSocket::SendCapabilities()
+static std::string BuildModeList(ModeType type)
{
- if (sentcapab)
+ std::vector<std::string> modes;
+ for(char c='A'; c <= 'z'; c++)
+ {
+ ModeHandler* mh = ServerInstance->Modes->FindMode(c, type)
+ if (mh)
+ {
+ std::string mdesc = mh->name;
+ mdesc.push_back('=');
+ if (mh->GetPrefix())
+ mdesc.push_back(mh->GetPrefix());
+ if (mh->GetModeChar())
+ mdesc.push_back(mh->GetModeChar());
+ modes.push_back(mdesc);
+ }
+ }
+ sort(modes.begin(), modes.end());
+ irc::stringjoiner line(" ", modes, 0, modes.size() - 1);
+ return line.GetJoined();
+}
+
+void TreeSocket::SendCapabilities(int phase)
+{
+ if (capab->capab_phase >= phase)
return;
- sentcapab = true;
- irc::commasepstream modulelist(MyCapabilities());
- this->WriteLine("CAPAB START");
+ if (capab->capab_phase < 1 && phase >= 1)
+ WriteLine("CAPAB START " + ConvToStr(ProtocolVersion));
+
+ capab->capab_phase = phase;
+ if (phase < 2)
+ return;
+ 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 :";
+ while (optmodulelist.GetToken(item))
+ {
+ if (line.length() + item.length() + 1 > 509)
+ {
+ this->WriteLine(line);
+ line = "CAPAB MODSUPPORT :";
+ }
+
+ if (line != "CAPAB MODSUPPORT :")
+ line.push_back(sep);
+
+ line.append(item);
+ }
+ if (line != "CAPAB MODSUPPORT :")
+ this->WriteLine(line);
+
+ WriteLine("CAPAB CHANMODES :" + BuildModeList(MODETYPE_CHANNEL));
+ WriteLine("CAPAB USERMODES :" + BuildModeList(MODETYPE_USER));
+
int ip6 = 0;
- int ip6support = 0;
#ifdef IPV6
ip6 = 1;
-#endif
-#ifdef SUPPORT_IP6LINKS
- ip6support = 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();
}
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)+
" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+
" MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+
" IP6NATIVE="+ConvToStr(ip6)+
- " IP6SUPPORT="+ConvToStr(ip6support)+
+ " IP6SUPPORT=1"+
" PROTOCOL="+ConvToStr(ProtocolVersion)+extra+
" PREFIX="+ServerInstance->Modes->BuildPrefixes()+
" CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+
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<std::string> 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))
+ {
+ values.insert(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<std::string>::iterator i = values.begin(); i != values.end(); ++i)
+ {
+ mleft.push_back(sep);
+ mleft.append(*i);
+ }
}
-bool TreeSocket::Capab(const std::deque<std::string> ¶ms)
+bool TreeSocket::Capab(const parameterlist ¶ms)
{
if (params.size() < 1)
{
}
if (params[0] == "START")
{
- this->ModuleList.clear();
- this->CapKeys.clear();
+ capab->ModuleList.clear();
+ capab->OptModuleList.clear();
+ capab->CapKeys.clear();
+ if (params.size() > 1)
+ proto_version = atoi(params[1].c_str());
+ SendCapabilities(2);
}
else if (params[0] == "END")
{
std::string reason;
- int ip6support = 0;
-#ifdef SUPPORT_IP6LINKS
- ip6support = 1;
-#endif
- /* Compare ModuleList and check CapKeys...
- * Maybe this could be tidier? -- Brain
- */
- if ((this->ModuleList != this->MyCapabilities()) && (this->ModuleList.length()))
+ /* Compare ModuleList and check CapKeys */
+ if ((this->capab->ModuleList != this->MyModules(VF_COMMON)) && (this->capab->ModuleList.length()))
{
- std::string diffIneed = ListDifference(this->ModuleList, this->MyCapabilities());
- std::string diffUneed = ListDifference(this->MyCapabilities(), 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), 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;
+ }
+ }
+ 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 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;
+ }
}
- this->SendError("CAPAB negotiation failed: "+reason);
- return false;
}
- if (((this->CapKeys.find("IP6SUPPORT") == this->CapKeys.end()) && (ip6support)) || ((this->CapKeys.find("IP6SUPPORT") != this->CapKeys.end()) && (this->CapKeys.find("IP6SUPPORT")->second != ConvToStr(ip6support))))
- reason = "We don't both support linking to IPV6 servers";
- if (((this->CapKeys.find("IP6NATIVE") != this->CapKeys.end()) && (this->CapKeys.find("IP6NATIVE")->second == "1")) && (!ip6support))
- reason = "The remote server is IPV6 native, and we don't support linking to IPV6 servers";
- if (this->CapKeys.find("PROTOCOL") == this->CapKeys.end())
+
+ if (this->capab->CapKeys.find("PROTOCOL") == this->capab->CapKeys.end())
{
reason = "Protocol version not specified";
}
else
{
- int otherProto = atoi(CapKeys.find("PROTOCOL")->second.c_str());
- if (otherProto < MinCompatProtocol)
+ proto_version = atoi(capab->CapKeys.find("PROTOCOL")->second.c_str());
+ if (proto_version < MinCompatProtocol)
{
- reason = "Server is using protocol version " + ConvToStr(otherProto) +
+ 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)" : ")");
}
}
- if(this->CapKeys.find("PREFIX") != this->CapKeys.end() && this->CapKeys.find("PREFIX")->second != this->ServerInstance->Modes->BuildPrefixes())
+ 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(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 (!capab->ChanModes.empty())
+ {
+ if (capab->ChanModes != BuildModeList(MODETYPE_CHANNEL))
+ {
+ 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())
+ {
+ if (this->capab->CapKeys.find("CHANMODES")->second != ServerInstance->Modes->GiveModeList(MASK_CHANNEL))
+ reason = "One or more of the channel modes on the remote server are invalid on this server.";
+ }
+ if (!capab->UserModes.empty())
+ {
+ if (capab->UserModes != BuildModeList(MODETYPE_USER))
+ {
+ 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())
+ {
+ if (this->capab->CapKeys.find("USERMODES")->second != ServerInstance->Modes->GiveModeList(MASK_USER))
+ reason = "One or more of the user modes on the remote server are invalid on this server.";
+ }
/* Challenge response, store their challenge for our password */
- std::map<std::string,std::string>::iterator n = this->CapKeys.find("CHALLENGE");
- if (Utils->ChallengeResponse && (n != this->CapKeys.end()) && (ServerInstance->Modules->Find("m_sha256.so")))
+ std::map<std::string,std::string>::iterator n = this->capab->CapKeys.find("CHALLENGE");
+ if (Utils->ChallengeResponse && (n != this->capab->CapKeys.end()) && (ServerInstance->Modules->Find("m_sha256.so")))
{
/* 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(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+this->MakePass(capab->OutboundPass, this->GetTheirChallenge())+" 0 "+
+ ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
}
}
else
/* They didnt specify a challenge or we don't have m_sha256.so, 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(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+capab->OutboundPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
}
}
}
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(proto_version > 1201 ? ' ' : ',');
+ capab->ModuleList.append(params[1]);
}
}
-
+ else if ((params[0] == "MODSUPPORT") && (params.size() == 2))
+ {
+ if (!capab->OptModuleList.length())
+ {
+ capab->OptModuleList = params[1];
+ }
+ else
+ {
+ 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]);
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;
+ capab->CapKeys[var] = value;
}
}
}
projects / user / henk / code / inspircd.git / blobdiff