X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=fe262134fe40d1ea86f18e1b477719a260d174d2;hb=f8ccaed31d68661d16eae1a412b337af09de111b;hp=94c797bfd4cc099ba688d454844207c7d3a25e0b;hpb=4f6589e123c0a494287f59e3bc75e34ed6e4f6d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 94c797bfd..fe262134f 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -2,7 +2,7 @@
  *       | 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
@@ -16,18 +16,59 @@
 #include "treesocket.h"
 
 static const char* const forge_common_1201[] = {
+	"m_allowinvite.so",
+	"m_auditorium.so",
+	"m_banexception.so",
+	"m_blockcaps.so",
+	"m_blockcolor.so",
+	"m_botmode.so",
+	"m_censor.so",
+	"m_chanfilter.so",
+	"m_chanhistory.so",
+	"m_chanprotect.so",
 	"m_chghost.so",
 	"m_chgname.so",
+	"m_commonchans.so",
+	"m_deaf.so",
+	"m_delayjoin.so",
+	"m_delaymsg.so",
+	"m_exemptchanops.so",
+	"m_helpop.so",
+	"m_hidechans.so",
+	"m_hideoper.so",
+	"m_invisible.so",
+	"m_inviteexception.so",
+	"m_joinflood.so",
+	"m_kicknorejoin.so",
+	"m_messageflood.so",
+	"m_nickflood.so",
+	"m_noctcp.so",
+	"m_nokicks.so",
+	"m_nonicks.so",
+	"m_nonotice.so",
+	"m_ojoin.so",
+	"m_operprefix.so",
+	"m_permchannels.so",
+	"m_redirect.so",
+	"m_regex_glob.so",
+	"m_regex_pcre.so",
+	"m_regex_posix.so",
+	"m_regex_tre.so",
 	"m_remove.so",
 	"m_sajoin.so",
 	"m_sakick.so",
 	"m_sanick.so",
 	"m_sapart.so",
 	"m_saquit.so",
+	"m_servprotect.so",
 	"m_setident.so",
+	"m_sslmodes.so",
+	"m_stripcolor.so",
+	"m_swhois.so",
 };
 
 static std::string wide_newline("\r\n");
+static std::string newline("\n");
 
 void TreeSocket::CompatAddModules(std::vector<std::string>& modlist)
 {
@@ -40,6 +81,12 @@ void TreeSocket::CompatAddModules(std::vector<std::string>& modlist)
 			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_operchans.so");
+			modlist.push_back("m_operinvex.so");
+		}
 	}
 }
 
@@ -54,38 +101,63 @@ void TreeSocket::WriteLine(std::string line)
 		}
 		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);
+				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());
 	this->WriteData(line);
-	this->WriteData(wide_newline);
+	if (proto_version < 1202)
+		this->WriteData(wide_newline);
+	else
+		this->WriteData(newline);
 }
-
-
-