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

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index fe262134f..ec0cdb036 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -1,22 +1,29 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 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_allowinvite.so",
+	"m_alltime.so",
 	"m_auditorium.so",
 	"m_banexception.so",
 	"m_blockcaps.so",
@@ -25,14 +32,18 @@ static const char* const forge_common_1201[] = {
 	"m_censor.so",
 	"m_chanfilter.so",
 	"m_chanhistory.so",
+	"m_channelban.so",
 	"m_chanprotect.so",
 	"m_chghost.so",
 	"m_chgname.so",
 	"m_commonchans.so",
+	"m_customtitle.so",
 	"m_deaf.so",
 	"m_delayjoin.so",
 	"m_delaymsg.so",
 	"m_exemptchanops.so",
+	"m_gecosban.so",
+	"m_globops.so",
 	"m_helpop.so",
 	"m_hidechans.so",
 	"m_hideoper.so",
@@ -40,12 +51,16 @@ static const char* const forge_common_1201[] = {
 	"m_inviteexception.so",
 	"m_joinflood.so",
 	"m_kicknorejoin.so",
+	"m_knock.so",
 	"m_messageflood.so",
+	"m_muteban.so",
 	"m_nickflood.so",
+	"m_nicklock.so",
 	"m_noctcp.so",
 	"m_nokicks.so",
 	"m_nonicks.so",
 	"m_nonotice.so",
+	"m_nopartmsg.so",
 	"m_ojoin.so",
 	"m_operprefix.so",
 	"m_permchannels.so",
@@ -60,11 +75,17 @@ static const char* const forge_common_1201[] = {
 	"m_sanick.so",
 	"m_sapart.so",
 	"m_saquit.so",
+	"m_serverban.so",
+	"m_services_account.so",
 	"m_servprotect.so",
 	"m_setident.so",
+	"m_showwhois.so",
+	"m_silence.so",
 	"m_sslmodes.so",
 	"m_stripcolor.so",
 	"m_swhois.so",
+	"m_uninvite.so",
+	"m_watch.so"
 };
 
 static std::string wide_newline("\r\n");
@@ -138,9 +159,21 @@ void TreeSocket::WriteLine(std::string line)
 				if (c == std::string::npos)
 					return;
 				std::string::size_type d = line.find(' ', c + 1);
-				std::string subcmd = line.substr(c, d - c);
+				std::string subcmd = line.substr(c + 1, d - c - 1);
+
+				if (subcmd == "CHGIDENT" && d != std::string::npos)
+				{
+					std::string::size_type e = line.find(' ', d + 1);
+					if (e == std::string::npos)
+						return; // not valid
+					std::string target = line.substr(d + 1, e - d - 1);
+
+					ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Forging acceptance of CHGIDENT from 1201-protocol server");
+					recvq.insert(0, ":" + target + " FIDENT " + line.substr(e) + "\n");
+				}
+
 				Command* thiscmd = ServerInstance->Parser->GetHandler(subcmd);
-				if (thiscmd)
+				if (thiscmd && subcmd != "WHOISNOTICE")
 				{
 					Version ver = thiscmd->creator->GetVersion();
 					if (ver.Flags & VF_OPTCOMMON)
@@ -154,7 +187,7 @@ void TreeSocket::WriteLine(std::string line)
 		}
 	}
 
-	ServerInstance->Logs->Log("m_spanningtree",DEBUG, "S[%d] O %s", this->GetFd(), line.c_str());
+	ServerInstance->Logs->Log("m_spanningtree", RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
 	this->WriteData(line);
 	if (proto_version < 1202)
 		this->WriteData(wide_newline);