* +------------------------------------+
*
* InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#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::MyCapabilities()
+std::string TreeSocket::MyModules(int filter)
{
- std::vector<std::string> modlist = this->ServerInstance->Modules->GetAllModuleNames(VF_COMMON);
+ std::vector<std::string> modlist = this->ServerInstance->Modules->GetAllModuleNames(filter);
std::string capabilities;
sort(modlist.begin(),modlist.end());
for (unsigned int i = 0; i < modlist.size(); i++)
return;
sentcapab = true;
- irc::commasepstream modulelist(MyCapabilities());
+ irc::commasepstream modulelist(MyModules(VF_COMMON));
+ irc::commasepstream optmodulelist(MyModules(VF_OPTCOMMON));
this->WriteLine("CAPAB START");
/* Send module names, split at 509 length */
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.append(",");
+
+ line.append(item);
+ }
+ if (line != "CAPAB MODSUPPORT ")
+ this->WriteLine(line);
+
+
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 */
" 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)+
return result;
}
-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();
+ ModuleList.clear();
+ OptModuleList.clear();
+ CapKeys.clear();
}
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->ModuleList != this->MyModules(VF_COMMON)) && (this->ModuleList.length()))
{
- std::string diff = ListDifference(this->ModuleList, this->MyCapabilities());
- if (!diff.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)
{
- diff = "your server:" + ListDifference(this->MyCapabilities(), this->ModuleList);
+ reason = "Module list in CAPAB is not alphabetically ordered, cannot compare lists.";
}
else
{
- diff = "the remote server:" + diff;
+ 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->OptModuleList != this->MyModules(VF_OPTCOMMON) && this->OptModuleList.length())
+ {
+ 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)
+ {
+ 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());
}
- if (diff.length() == 12)
- reason = "Module list in CAPAB is not alphabetically ordered, cannot compare lists.";
else
- reason = "Modules loaded on these servers are not correctly matched, these modules are not loaded on " + diff;
+ {
+ 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->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()) || ((this->CapKeys.find("PROTOCOL") != this->CapKeys.end()) && (this->CapKeys.find("PROTOCOL")->second != ConvToStr(ProtocolVersion)))))
+ if (this->CapKeys.find("PROTOCOL") == this->CapKeys.end())
{
- if (this->CapKeys.find("PROTOCOL") != this->CapKeys.end())
- reason = "Mismatched protocol versions "+this->CapKeys.find("PROTOCOL")->second+" and "+ConvToStr(ProtocolVersion);
- else
- reason = "Protocol version not specified";
+ reason = "Protocol version not specified";
+ }
+ else
+ {
+ int otherProto = atoi(CapKeys.find("PROTOCOL")->second.c_str());
+ if (otherProto < MinCompatProtocol)
+ {
+ reason = "Server is using protocol version " + ConvToStr(otherProto) +
+ " 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())
reason = "One or more of the user modes on the remote server are invalid on this server.";
- if (((this->CapKeys.find("HALFOP") == this->CapKeys.end()) && (ServerInstance->Config->AllowHalfop)) || ((this->CapKeys.find("HALFOP") != this->CapKeys.end()) && (this->CapKeys.find("HALFOP")->second != ConvToStr(ServerInstance->Config->AllowHalfop))))
- reason = "We don't both have halfop support enabled/disabled identically";
-
-
-
/* 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")))
this->ModuleList.append(params[1]);
}
}
-
+ else if ((params[0] == "MODSUPPORT") && (params.size() == 2))
+ {
+ if (!this->OptModuleList.length())
+ {
+ this->OptModuleList.append(params[1]);
+ }
+ else
+ {
+ this->OptModuleList.append(",");
+ this->OptModuleList.append(params[1]);
+ }
+ }
else if ((params[0] == "CAPABILITIES") && (params.size() == 2))
{
irc::tokenstream capabs(params[1]);
projects / user / henk / code / inspircd.git / blobdiff