X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=aa4ab5e0354d6aaf3aa54613924354cb1bf2b0f8;hb=192fa7d3138ccb5929dc9af8de3395d6ea25619c;hp=d0ddc989e076e4a144f64971a6f5fa301a882b79;hpb=60f3d89d5907049a2627d134b652c675b052602b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index d0ddc989e..aa4ab5e03 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -14,17 +14,17 @@ #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::vector modlist = this->Instance->Modules->GetAllModuleNames(VF_COMMON); + std::vector modlist = this->ServerInstance->Modules->GetAllModuleNames(VF_COMMON); std::string capabilities; sort(modlist.begin(),modlist.end()); for (unsigned int i = 0; i < modlist.size(); i++) @@ -74,13 +74,30 @@ void TreeSocket::SendCapabilities() #endif std::string extra; /* Do we have sha256 available? If so, we send a challenge */ - if (Utils->ChallengeResponse && (Instance->Modules->Find("m_sha256.so"))) + if (Utils->ChallengeResponse && (ServerInstance->Modules->Find("m_sha256.so"))) { this->SetOurChallenge(RandString(20)); extra = " CHALLENGE=" + this->GetOurChallenge(); } - this->WriteLine("CAPAB CAPABILITIES :NICKMAX="+ConvToStr(NICKMAX)+" HALFOP="+ConvToStr(this->Instance->Config->AllowHalfop)+" CHANMAX="+ConvToStr(CHANMAX)+" MAXMODES="+ConvToStr(MAXMODES)+" IDENTMAX="+ConvToStr(IDENTMAX)+" MAXQUIT="+ConvToStr(MAXQUIT)+" MAXTOPIC="+ConvToStr(MAXTOPIC)+" MAXKICK="+ConvToStr(MAXKICK)+" MAXGECOS="+ConvToStr(MAXGECOS)+" MAXAWAY="+ConvToStr(MAXAWAY)+" IP6NATIVE="+ConvToStr(ip6)+" IP6SUPPORT="+ConvToStr(ip6support)+" PROTOCOL="+ConvToStr(ProtocolVersion)+extra+" PREFIX="+Instance->Modes->BuildPrefixes()+" CHANMODES="+Instance->Modes->ChanModes()+" SVSPART=1"); + 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)+ + " MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+ + " IP6NATIVE="+ConvToStr(ip6)+ + " IP6SUPPORT="+ConvToStr(ip6support)+ + " PROTOCOL="+ConvToStr(ProtocolVersion)+extra+ + " PREFIX="+ServerInstance->Modes->BuildPrefixes()+ + " CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+ + " USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)+ + " SVSPART=1"); this->WriteLine("CAPAB END"); } @@ -140,76 +157,73 @@ bool TreeSocket::Capab(const std::deque ¶ms) */ if ((this->ModuleList != this->MyCapabilities()) && (this->ModuleList.length())) { - std::string diff = ListDifference(this->ModuleList, this->MyCapabilities()); - if (!diff.length()) + std::string diffIneed = ListDifference(this->ModuleList, this->MyCapabilities()); + std::string diffUneed = ListDifference(this->MyCapabilities(), 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 = "this 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; } - 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; + this->SendError("CAPAB negotiation failed: "+reason); + return false; } - - cap_validation valid_capab[] = { - {"Maximum nickname lengths differ or remote nickname length not specified", "NICKMAX", NICKMAX}, - {"Maximum ident lengths differ or remote ident length not specified", "IDENTMAX", IDENTMAX}, - {"Maximum channel lengths differ or remote channel length not specified", "CHANMAX", CHANMAX}, - {"Maximum modes per line differ or remote modes per line not specified", "MAXMODES", MAXMODES}, - {"Maximum quit lengths differ or remote quit length not specified", "MAXQUIT", MAXQUIT}, - {"Maximum topic lengths differ or remote topic length not specified", "MAXTOPIC", MAXTOPIC}, - {"Maximum kick lengths differ or remote kick length not specified", "MAXKICK", MAXKICK}, - {"Maximum GECOS (fullname) lengths differ or remote GECOS length not specified", "MAXGECOS", MAXGECOS}, - {"Maximum awaymessage lengths differ or remote awaymessage length not specified", "MAXAWAY", MAXAWAY}, - {"", "", 0} - }; - 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->Instance->Modes->BuildPrefixes()) + 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("HALFOP") == this->CapKeys.end()) && (Instance->Config->AllowHalfop)) || ((this->CapKeys.find("HALFOP") != this->CapKeys.end()) && (this->CapKeys.find("HALFOP")->second != ConvToStr(Instance->Config->AllowHalfop)))) - reason = "We don't both have halfop support enabled/disabled identically"; + 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."; + - for (int x = 0; valid_capab[x].size; ++x) - { - if (((this->CapKeys.find(valid_capab[x].key) == this->CapKeys.end()) || ((this->CapKeys.find(valid_capab[x].key) != this->CapKeys.end()) && - (this->CapKeys.find(valid_capab[x].key)->second != ConvToStr(valid_capab[x].size))))) - reason = valid_capab[x].reason; - } - /* Challenge response, store their challenge for our password */ std::map::iterator n = this->CapKeys.find("CHALLENGE"); - if (Utils->ChallengeResponse && (n != this->CapKeys.end()) && (Instance->Modules->Find("m_sha256.so"))) + if (Utils->ChallengeResponse && (n != this->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->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+this->MakePass(OutboundPass, this->GetTheirChallenge())+" 0 "+ - Instance->Config->GetSID()+" :"+this->Instance->Config->ServerDesc); + this->SendCapabilities(); + this->WriteLine(std::string("SERVER ")+this->ServerInstance->Config->ServerName+" "+this->MakePass(OutboundPass, this->GetTheirChallenge())+" 0 "+ + ServerInstance->Config->GetSID()+" :"+this->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->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+OutboundPass+" 0 "+Instance->Config->GetSID()+" :"+this->Instance->Config->ServerDesc); + { + this->SendCapabilities(); + this->WriteLine(std::string("SERVER ")+this->ServerInstance->Config->ServerName+" "+OutboundPass+" 0 "+ServerInstance->Config->GetSID()+" :"+this->ServerInstance->Config->ServerDesc); + } } if (reason.length())