X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket1.cpp;h=c9729cc0f3a6837c96d3d290b1e44c0ad8e9887b;hb=4b8f3dd68f7c3a273c1a892c0de54ea01e48db3e;hp=f1925afad2fb43e5af7725acf74869eed9637fe2;hpb=527c492cf1c86ede062c49d45ebda17c8c6dfc68;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index f1925afad..c9729cc0f 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | 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>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@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 "socket.h"
 #include "xline.h"
@@ -40,6 +49,7 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* mya
 	capab->capab_phase = 0;
 	MyRoot = NULL;
 	proto_version = 0;
+	ConnectionFailureShown = false;
 	LinkState = CONNECTING;
 	if (!link->Hook.empty())
 	{
@@ -69,6 +79,7 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via
 	age = ServerInstance->Time();
 	LinkState = WAIT_AUTH_1;
 	proto_version = 0;
+	ConnectionFailureShown = false;
 	linkID = "inbound from " + client->addr();
 
 	FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
@@ -125,7 +136,7 @@ void TreeSocket::OnConnected()
 
 void TreeSocket::OnError(BufferedSocketError e)
 {
-	ServerInstance->SNO->WriteGlobalSno('l', "Connection to \002%s\002 failed with error: %s",
+	ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' failed with error: %s",
 		linkID.c_str(), getError().c_str());
 	LinkState = DYING;
 }
@@ -146,8 +157,9 @@ void TreeSocket::SendError(const std::string &errormessage)
  */
 void TreeSocket::SquitServer(std::string &from, TreeServer* Current, int& num_lost_servers, int& num_lost_users)
 {
+	std::string servername = Current->GetName();
 	ServerInstance->Logs->Log("m_spanningtree",DEBUG,"SquitServer for %s from %s",
-		Current->GetName().c_str(), from.c_str());
+		servername.c_str(), from.c_str());
 	/* recursively squit the servers attached to 'Current'.
 	 * We're going backwards so we don't remove users
 	 * while we still need them ;)
@@ -174,10 +186,14 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 	{
 		DelServerEvent(Utils->Creator, Current->GetName());
 
-		parameterlist params;
-		params.push_back(Current->GetName());
-		params.push_back(":"+reason);
-		Utils->DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName());
+		if (!Current->GetSocket() || Current->GetSocket()->Introduced())
+		{
+			parameterlist params;
+			params.push_back(Current->GetID());
+			params.push_back(":"+reason);
+			Utils->DoOneToAllButSender(Current->GetParent()->GetID(),"SQUIT",params,Current->GetID());
+		}
+
 		if (Current->GetParent() == Utils->TreeRoot)
 		{
 			ServerInstance->SNO->WriteGlobalSno('l', "Server \002"+Current->GetName()+"\002 split: "+reason);
@@ -185,7 +201,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 		}
 		else
 		{
-			ServerInstance->SNO->WriteGlobalSno('L', "Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason);
+			ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+Current->GetName()+"\002 split from server \002"+Current->GetParent()->GetName()+"\002 with reason: "+reason);
 		}
 		int num_lost_servers = 0;
 		int num_lost_users = 0;
@@ -196,8 +212,9 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 		Current->Tidy();
 		Current->GetParent()->DelChild(Current);
 		Current->cull();
+		const bool ismyroot = (Current == MyRoot);
 		delete Current;
-		if (Current == MyRoot)
+		if (ismyroot)
 		{
 			MyRoot = NULL;
 			Close();
@@ -232,3 +249,8 @@ void TreeSocket::OnDataReady()
 		SendError("RecvQ overrun (line too long)");
 	Utils->Creator->loopCall = false;
 }
+
+bool TreeSocket::Introduced()
+{
+	return (capab == NULL);
+}