* | 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
/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
-
std::string TreeSocket::MyModules(int filter)
{
- std::vector<std::string> modlist = this->ServerInstance->Modules->GetAllModuleNames(filter);
+ std::vector<std::string> modlist = ServerInstance->Modules->GetAllModuleNames(filter);
+
+ if (filter == VF_COMMON && proto_version != ProtocolVersion)
+ CompatAddModules(modlist);
+
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(',');
+ capabilities.append(modlist[i]);
+ Module* m = ServerInstance->Modules->Find(modlist[i]);
+ if (m && proto_version >= 1202)
+ {
+ Version v = m->GetVersion();
+ if (!v.link_data.empty())
+ {
+ capabilities.push_back('=');
+ capabilities.append(v.link_data);
+ }
+ }
}
return capabilities;
}
-void TreeSocket::SendCapabilities()
+void TreeSocket::SendCapabilities(int phase)
{
- if (sentcapab)
+ if (capab_phase >= phase)
+ return;
+
+ if (capab_phase < 1 && phase >= 1)
+ WriteLine("CAPAB START " + ConvToStr(ProtocolVersion));
+
+ capab_phase = phase;
+ if (phase < 2)
return;
- sentcapab = true;
irc::commasepstream modulelist(MyModules(VF_COMMON));
irc::commasepstream optmodulelist(MyModules(VF_OPTCOMMON));
- this->WriteLine("CAPAB START");
-
/* Send module names, split at 509 length */
std::string item;
std::string line = "CAPAB MODULES ";
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)+
ModuleList.clear();
OptModuleList.clear();
CapKeys.clear();
+ if (params.size() > 1)
+ proto_version = atoi(params[1].c_str());
+ SendCapabilities(2);
}
else if (params[0] == "END")
{
{
reason = "Optional Module list in CAPAB is not alphabetically ordered, cannot compare lists.";
}
- else
+ 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
+ {
+ 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("PROTOCOL") == this->CapKeys.end())
}
else
{
- int otherProto = atoi(CapKeys.find("PROTOCOL")->second.c_str());
- if (otherProto < MinCompatProtocol)
+ proto_version = atoi(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->CapKeys.find("PREFIX") != this->CapKeys.end() && this->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))
+ if(this->CapKeys.find("CHANMODES") != this->CapKeys.end() && this->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(this->CapKeys.find("USERMODES") != this->CapKeys.end() && this->CapKeys.find("USERMODES")->second != this->ServerInstance->Modes->GiveModeList(MASK_USER))
+ if(this->CapKeys.find("USERMODES") != this->CapKeys.end() && this->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.";
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(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+" "+OutboundPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
}
}
projects / user / henk / code / inspircd.git / blobdiff