Add modules to the VF_COMMON list in backwards compatability link mode, translate FIDENT as CHGIDENT

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11657 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 42 insertions, 14 deletions

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 345215031..f278913c8 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -15,25 +15,53 @@
 #include "main.h"
 #include "treesocket.h"
 
-void TreeSocket::WriteLine(std::string line)
+static const char* const forge_common_1201[] = {
+	"m_chghost.so",
+	"m_chgname.so",
+	"m_remove.so",
+	"m_sajoin.so",
+	"m_sakick.so",
+	"m_sanick.so",
+	"m_sapart.so",
+	"m_saquit.so",
+	"m_setident.so",
+};
+
+void TreeSocket::CompatAddModules(std::vector<std::string>& modlist)
 {
-	if (line[0] != ':' && LinkState == CONNECTED)
+	if (proto_version < 1202)
 	{
-		ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Sending line without server prefix!");
-		line = ":" + ServerInstance->Config->GetSID() + " " + line;
+		// 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]);
+		}
 	}
-	if (proto_version != ProtocolVersion)
+}
+
+void TreeSocket::WriteLine(std::string line)
+{
+	if (LinkState == CONNECTED)
 	{
-		std::string::size_type a = line.find(' ');
-		std::string::size_type b = line.find(' ', a);
-		std::string command = line.substr(a,b);
-		// now try to find a translation entry
-		// TODO a more efficient lookup method will be needed later
-		if (proto_version < 1202 && command == "FIDENT")
+		if (line[0] != ':')
+		{
+			ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Sending line without server prefix!");
+			line = ":" + ServerInstance->Config->GetSID() + " " + line;
+		}
+		if (proto_version != ProtocolVersion)
 		{
-			// a more aggressive method would be to translate to CHGIDENT
-			ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Dropping FIDENT to 1201-protocol server");
-			return;
+			std::string::size_type a = line.find(' ') + 1;
+			std::string::size_type b = line.find(' ', a);
+			std::string command = line.substr(a, b-a);
+			// 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);
+			}
 		}
 	}