X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fserver.cpp;h=bc97c097b2d8c2ae9b3a0f780c5d4cd14816196f;hb=da28fe0b8c0bec9ab111044b1004f24cbf2d742e;hp=6fda446ea16fab29cf1348eb77cc36ce1e11e4f6;hpb=7e843c22e16c81054bad18073d24fe1a07026431;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index 6fda446ea..bc97c097b 100644
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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"
@@ -45,10 +52,10 @@ bool TreeSocket::RemoteServer(const std::string &prefix, parameterlist &params)
 
 	if (!ParentOfThis)
 	{
-		this->SendError("Protocol error - Introduced remote server from unknown server "+ParentOfThis->GetName());
+		this->SendError("Protocol error - Introduced remote server from unknown server "+prefix);
 		return false;
 	}
-	if (!ServerInstance->IsSID(sid))
+	if (!InspIRCd::IsSID(sid))
 	{
 		this->SendError("Invalid format server ID: "+sid+"!");
 		return false;
@@ -98,11 +105,7 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
 	std::string password = params[1];
 	std::string sid = params[3];
 	std::string description = params[4];
-	int hops = atoi(params[2].c_str());
-
-	this->InboundServerName = sname;
-	this->InboundDescription = description;
-	this->InboundSID = sid;
+	int hops = ConvToInt(params[2]);
 
 	this->SendCapabilities(2);
 
@@ -157,18 +160,18 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
 		this->LinkState = CONNECTED;
 
 		Utils->timeoutlist.erase(this);
+		linkID = sname;
 
-		TreeServer *Node = new TreeServer(Utils, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
+		MyRoot = new TreeServer(Utils, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
+		Utils->TreeRoot->AddChild(MyRoot);
+		this->DoBurst(MyRoot);
 
-		Utils->TreeRoot->AddChild(Node);
 		params[4] = ":" + params[4];
 
-
 		/* IMPORTANT: Take password/hmac hash OUT of here before we broadcast the introduction! */
 		params[1] = "*";
 		Utils->DoOneToAllButSender(ServerInstance->Config->GetSID(),"SERVER",params,sname);
 
-		this->DoBurst(Node);
 		return true;
 	}
 
@@ -194,11 +197,7 @@ bool TreeSocket::Inbound_Server(parameterlist &params)
 	std::string password = params[1];
 	std::string sid = params[3];
 	std::string description = params[4];
-	int hops = atoi(params[2].c_str());
-
-	this->InboundServerName = sname;
-	this->InboundDescription = description;
-	this->InboundSID = sid;
+	int hops = ConvToInt(params[2]);
 
 	this->SendCapabilities(2);
 
@@ -231,13 +230,14 @@ bool TreeSocket::Inbound_Server(parameterlist &params)
 		TreeServer* CheckDupe = Utils->FindServer(sname);
 		if (CheckDupe)
 		{
-			this->SendError("Server "+sname+" already exists on server "+CheckDupe->GetParent()->GetName()+"!");
-			ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+CheckDupe->GetParent()->GetName());
+			std::string pname = CheckDupe->GetParent() ? CheckDupe->GetParent()->GetName() : "<ourself>";
+			SendError("Server "+sname+" already exists on server "+pname+"!");
+			ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+pname);
 			return false;
 		}
 
 		/* Check for fully initialized instances of the server by id */
-		ServerInstance->Logs->Log("m_spanningtree",DEBUG,"Looking for dupe SID %s", sid.c_str());
+		ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"Looking for dupe SID %s", sid.c_str());
 		CheckDupe = Utils->FindServerID(sid);
 
 		if (CheckDupe)
@@ -248,14 +248,17 @@ bool TreeSocket::Inbound_Server(parameterlist &params)
 			return false;
 		}
 
-
-		ServerInstance->SNO->WriteToSnoMask('l',"Verified incoming server connection from \002"+sname+"\002["+(x->HiddenFromStats ? "<hidden>" : this->IP)+"] ("+description+")");
+		ServerInstance->SNO->WriteToSnoMask('l',"Verified incoming server connection " + linkID + " ("+description+")");
+		linkID = sname;
 
 		// this is good. Send our details: Our server name and description and hopcount of 0,
 		// along with the sendpass from this block.
 		this->SendCapabilities(2);
-		this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+this->MakePass(x->SendPass, this->GetTheirChallenge())+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
+		this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+this->MakePass(x->SendPass, this->GetTheirChallenge())+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
 		// move to the next state, we are now waiting for THEM.
+		MyRoot = new TreeServer(Utils, sname, description, sid, Utils->TreeRoot, this, x->Hidden);
+		Utils->TreeRoot->AddChild(MyRoot);
+
 		this->LinkState = WAIT_AUTH_2;
 		return true;
 	}