#include "link.h"
#include "main.h"
+struct CompatMod
+{
+ const char* name;
+ ModuleFlags listflag;
+};
+
+static CompatMod compatmods[] =
+{
+ { "m_watch.so", VF_OPTCOMMON }
+};
+
std::string TreeSocket::MyModules(int filter)
{
const ModuleManager::ModuleMap& modlist = ServerInstance->Modules->GetModules();
std::string capabilities;
for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i)
{
- // 2.2 advertises its settings for the benefit of services
+ 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")
continue;
+ bool do_compat_include = false;
+ if (proto_version < 1205)
+ {
+ for (size_t j = 0; j < sizeof(compatmods)/sizeof(compatmods[0]); j++)
+ {
+ if ((compatmods[j].listflag & filter) && (mod->ModuleSourceFile == compatmods[j].name))
+ {
+ do_compat_include = true;
+ break;
+ }
+ }
+ }
+
Version v = i->second->GetVersion();
- if (!(v.Flags & filter))
+ if ((!do_compat_include) && (!(v.Flags & filter)))
continue;
if (i != modlist.begin())
static std::string BuildModeList(ModeType type)
{
std::vector<std::string> modes;
- for(char c='A'; c <= 'z'; c++)
+ const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes.GetModes(type);
+ for (ModeParser::ModeHandlerMap::const_iterator i = mhs.begin(); i != mhs.end(); ++i)
{
- ModeHandler* mh = ServerInstance->Modes->FindMode(c, type);
- if (mh)
+ const ModeHandler* const mh = i->second;
+ std::string mdesc = mh->name;
+ mdesc.push_back('=');
+ const PrefixMode* const pm = mh->IsPrefixMode();
+ if (pm)
{
- std::string mdesc = mh->name;
- mdesc.push_back('=');
- PrefixMode* pm = mh->IsPrefixMode();
- if (pm)
- {
- if (pm->GetPrefix())
- mdesc.push_back(pm->GetPrefix());
- }
- mdesc.push_back(mh->GetModeChar());
- modes.push_back(mdesc);
+ if (pm->GetPrefix())
+ mdesc.push_back(pm->GetPrefix());
}
+ mdesc.push_back(mh->GetModeChar());
+ modes.push_back(mdesc);
}
std::sort(modes.begin(), modes.end());
- return irc::stringjoiner(modes);
+ return stdalgo::string::join(modes);
}
void TreeSocket::SendCapabilities(int phase)
extra = " CHALLENGE=" + this->GetOurChallenge();
}
- // 2.0 needs this key
+ // 2.0 needs these keys.
if (proto_version == 1202)
+ {
extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion));
+ extra.append(" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxReal));
+ }
this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */
":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+
" MAXQUIT="+ConvToStr(ServerInstance->Config->Limits.MaxQuit)+
" MAXTOPIC="+ConvToStr(ServerInstance->Config->Limits.MaxTopic)+
" MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+
- " MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+
+ " MAXREAL="+ConvToStr(ServerInstance->Config->Limits.MaxReal)+
" 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
// in 2.0, we advertise it here to not break linking to previous versions.
}
}
-bool TreeSocket::Capab(const parameterlist ¶ms)
+bool TreeSocket::Capab(const CommandBase::Params& params)
{
if (params.size() < 1)
{
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
+ {
+ // 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;
+
+ 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;
+ }
+
+ }
/* Challenge response, store their challenge for our password */
std::map<std::string,std::string>::iterator n = this->capab->CapKeys.find("CHALLENGE");
}
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))
{