/*
* InspIRCd -- Internet Relay Chat Daemon
*
+ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2014, 2017-2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2014 Daniel Vassdal <shutter@canternet.org>
+ * Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
* Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
- * Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
*
* 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
Module* const mod = i->second;
// 3.0 advertises its settings for the benefit of services
// 2.0 would bork on this
- if (proto_version < 1205 && i->second->ModuleSourceFile == "m_kicknorejoin.so")
+ if (proto_version < PROTO_INSPIRCD_30 && mod->ModuleSourceFile == "m_kicknorejoin.so")
continue;
bool do_compat_include = false;
- if (proto_version < 1205)
+ if (proto_version < PROTO_INSPIRCD_30)
{
for (size_t j = 0; j < sizeof(compatmods)/sizeof(compatmods[0]); j++)
{
}
}
- Version v = i->second->GetVersion();
+ Version v = mod->GetVersion();
if ((!do_compat_include) && (!(v.Flags & filter)))
continue;
- if (i != modlist.begin())
- capabilities.push_back(' ');
+ capabilities.push_back(' ');
capabilities.append(i->first);
if (!v.link_data.empty())
{
capabilities.append(v.link_data);
}
}
- return capabilities;
+
+ // 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);
}
-static std::string BuildModeList(ModeType type)
+std::string TreeSocket::BuildModeList(ModeType mtype)
{
std::vector<std::string> modes;
- const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes.GetModes(type);
+ const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes.GetModes(mtype);
for (ModeParser::ModeHandlerMap::const_iterator i = mhs.begin(); i != mhs.end(); ++i)
{
const ModeHandler* const mh = i->second;
- std::string mdesc = mh->name;
- mdesc.push_back('=');
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())
return;
if (capab->capab_phase < 1 && phase >= 1)
- WriteLine("CAPAB START " + ConvToStr(ProtocolVersion));
+ WriteLine("CAPAB START " + ConvToStr(PROTO_NEWEST));
capab->capab_phase = phase;
if (phase < 2)
}
// 2.0 needs these keys.
- if (proto_version == 1202)
+ if (proto_version == PROTO_INSPIRCD_20)
{
- extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion));
- extra.append(" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxReal));
+ 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<std::string, std::string> tokens;
+ FOREACH_MOD(On005Numeric, (tokens));
+ std::map<std::string, std::string>::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)+
" CHANMAX="+ConvToStr(ServerInstance->Config->Limits.ChanMax)+
" MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+
" MAXHOST="+ConvToStr(ServerInstance->Config->Limits.MaxHost)+
extra+
- " PREFIX="+ServerInstance->Modes->BuildPrefixes()+
- " CHANMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)+
- " USERMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_USER)+
" 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
this->WriteLine("CAPAB END");
}
-/* Isolate and return the elements that are different between two comma seperated lists */
+/* 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)
{
capab->OptModuleList.clear();
capab->CapKeys.clear();
if (params.size() > 1)
- proto_version = ConvToInt(params[1]);
+ proto_version = ConvToNum<unsigned int>(params[1]);
- if (proto_version < MinCompatProtocol)
+ 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 (version " + ConvToStr(ProtocolVersion)
- + (ProtocolVersion != MinCompatProtocol ? ", links with " + ConvToStr(MinCompatProtocol) + " and above)" : ")"));
+ 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;
}
- // Special case, may be removed in the future
- if (proto_version == 1203 || proto_version == 1204)
+ // 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;
return false;
}
}
+
if (this->capab->OptModuleList != this->MyModules(VF_OPTCOMMON) && this->capab->OptModuleList.length())
{
std::string diffIneed, diffUneed;
}
else
{
- reason = "Optional modules incorrectly matched on these servers, and options::allowmismatch not set.";
+ reason = "Optional modules incorrectly matched on these servers and <options:allowmismatch> is not enabled.";
if (diffIneed.length())
reason += " Not loaded here:" + diffIneed;
if (diffUneed.length())
}
}
- 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 (!capab->ChanModes.empty())
{
if (capab->ChanModes != BuildModeList(MODETYPE_CHANNEL))
}
}
}
- else if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end())
+ else if (proto_version == PROTO_INSPIRCD_20)
+ {
+ if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end())
+ {
+ 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 if (this->capab->CapKeys.find("PREFIX") != this->capab->CapKeys.end())
+ {
+ 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 (!reason.empty())
{
- 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.";
+ this->SendError("CAPAB negotiation failed: " + reason);
+ return false;
}
if (!capab->UserModes.empty())
}
}
}
- else if (this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end())
+ 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.";
}
- else
+
+ if (!reason.empty())
{
- // We default to rfc1459 here because if this key is not sent then
- // the remote server is running the 2.0 protocol which uses rfc1459
- // by default.
- std::string casemapping = "rfc1459";
- std::map<std::string, std::string>::iterator citer = this->capab->CapKeys.find("CASEMAPPING");
- if (citer != this->capab->CapKeys.end())
- casemapping = citer->second;
+ 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 */
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))
{
}
else if ((params[0] == "CAPABILITIES") && (params.size() == 2))
{
- irc::tokenstream capabs(params[1]);
+ irc::spacesepstream capabs(params[1]);
std::string item;
while (capabs.GetToken(item))
{
projects / user / henk / code / inspircd.git / blobdiff