"m_sapart.so",
"m_saquit.so",
"m_setident.so",
+ "m_swhois.so",
};
+static std::string wide_newline("\r\n");
+
void TreeSocket::CompatAddModules(std::vector<std::string>& modlist)
{
if (proto_version < 1202)
{
+ for(std::vector<std::string>::iterator i = modlist.begin(); i != modlist.end(); ++i)
+ {
+ if (*i == "m_halfop.so")
+ {
+ modlist.erase(i);
+ break;
+ }
+ }
// you MUST have chgident loaded in order to be able to translate FIDENT
modlist.push_back("m_chgident.so");
for(int i=0; i * sizeof(char*) < sizeof(forge_common_1201); i++)
if (ServerInstance->Modules->Find(forge_common_1201[i]))
modlist.push_back(forge_common_1201[i]);
}
+ // module was merged
+ if (ServerInstance->Modules->Find("m_operchans.so"))
+ modlist.push_back("m_operinvex.so");
}
}
}
if (proto_version != ProtocolVersion)
{
- std::string::size_type a = line.find(' ') + 1;
- std::string::size_type b = line.find(' ', a);
- std::string command = line.substr(a, b-a);
+ std::string::size_type a = line.find(' ');
+ std::string::size_type b = line.find(' ', a + 1);
+ std::string command = line.substr(a + 1, b-a-1);
// now try to find a translation entry
// TODO a more efficient lookup method will be needed later
if (proto_version < 1202 && command == "FIDENT")
{
ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Rewriting FIDENT for 1201-protocol server");
- line = ":" + ServerInstance->Config->GetSID() + " CHGIDENT " + line.substr(1,a-2) + line.substr(b);
+ line = ":" + ServerInstance->Config->GetSID() + " CHGIDENT " + line.substr(1,a-1) + line.substr(b);
+ }
+ else if (proto_version < 1202 && command == "SAVE")
+ {
+ ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Rewriting SAVE for 1201-protocol server");
+ std::string::size_type c = line.find(' ', b + 1);
+ std::string uid = line.substr(b, c - b);
+ line = ":" + ServerInstance->Config->GetSID() + " SVSNICK" + uid + line.substr(b);
+ }
+ else if (proto_version < 1202 && command == "AWAY")
+ {
+ if (b != std::string::npos)
+ {
+ ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Stripping AWAY timestamp for 1201-protocol server");
+ std::string::size_type c = line.find(' ', b + 1);
+ line.erase(b,c-b);
+ }
+ }
+ else if (proto_version < 1202 && command == "ENCAP")
+ {
+ // :src ENCAP target command [args...]
+ // A B C D
+ // Therefore B and C cannot be npos in a valid command
+ if (b == std::string::npos)
+ return;
+ std::string::size_type c = line.find(' ', b + 1);
+ if (c == std::string::npos)
+ return;
+ std::string::size_type d = line.find(' ', c + 1);
+ std::string subcmd = line.substr(c, d - c);
+ Command* thiscmd = ServerInstance->Parser->GetHandler(subcmd);
+ if (thiscmd)
+ {
+ Version ver = thiscmd->creator->GetVersion();
+ if (ver.Flags & VF_OPTCOMMON)
+ {
+ ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Removing ENCAP on '%s' for 1201-protocol server",
+ subcmd.c_str());
+ line.erase(a, c-a);
+ }
+ }
}
}
}
ServerInstance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str());
- line.append("\r\n");
- this->Write(line);
+ this->WriteData(line);
+ this->WriteData(wide_newline);
}
-
-
-