X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=32bdb3df8b307a38a9a5d5c54b95c851ed9dc009;hb=da28fe0b8c0bec9ab111044b1004f24cbf2d742e;hp=f278913c807cc14be3f3687845b933362e634ad6;hpb=8ca460a0e660f7ac6bae4dfdc88680876fd899f5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index f278913c8..32bdb3df8 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -1,45 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "main.h"
 #include "treesocket.h"
 
-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 (proto_version < 1202)
-	{
-		// 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]);
-		}
-	}
-}
+static std::string newline("\n");
 
 void TreeSocket::WriteLine(std::string line)
 {
@@ -47,28 +29,20 @@ void TreeSocket::WriteLine(std::string line)
 	{
 		if (line[0] != ':')
 		{
-			ServerInstance->Logs->Log("m_spanningtree", DEFAULT, "Sending line without server prefix!");
+			ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Sending line without server prefix!");
 			line = ":" + ServerInstance->Config->GetSID() + " " + 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);
-			}
 		}
 	}
 
-	ServerInstance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str());
-	line.append("\r\n");
-	this->Write(line);
+	ServerInstance->Logs->Log("m_spanningtree", LOG_RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
+	this->WriteData(line);
+	this->WriteData(newline);
 }
-
-
-