X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket1.cpp;h=1c72f3ad78a5c6a8380e4b84faa6e30394658aa5;hb=8710724b5518ae9858309e548514f76e620a8459;hp=673b05c556f8b25298230a3411546d7b3a18cbe1;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 673b05c55..1c72f3ad7 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -21,17 +21,14 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.h"
+#include "iohook.h"
 
 #include "main.h"
-#include "../spanningtree.h"
+#include "modules/spanningtree.h"
 #include "utils.h"
 #include "treeserver.h"
 #include "link.h"
 #include "treesocket.h"
-#include "resolvers.h"
 
 /** Because most of the I/O gubbins are encapsulated within
  * BufferedSocket, we just call the superclass constructor for
@@ -39,17 +36,13 @@
  * to it.
  */
 TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* myac, const std::string& ipaddr)
-	: Utils(Util)
+	: Utils(Util), linkID(assign(link->Name)), LinkState(CONNECTING), MyRoot(NULL), proto_version(0), ConnectionFailureShown(false)
+	, age(ServerInstance->Time())
 {
-	age = ServerInstance->Time();
-	linkID = assign(link->Name);
 	capab = new CapabData;
 	capab->link = link;
 	capab->ac = myac;
 	capab->capab_phase = 0;
-	MyRoot = NULL;
-	proto_version = 0;
-	LinkState = CONNECTING;
 	if (!link->Hook.empty())
 	{
 		ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, link->Hook);
@@ -58,7 +51,7 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* mya
 			SetError("Could not find hook '" + link->Hook + "' for connection to " + linkID);
 			return;
 		}
-		AddIOHook(prov->creator);
+		AddIOHook(static_cast<IOHook*>(prov));
 	}
 	DoConnect(ipaddr, link->Port, link->Timeout, link->Bind);
 	Utils->timeoutlist[this] = std::pair<std::string, int>(linkID, link->Timeout);
@@ -70,17 +63,13 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, Link* link, Autoconnect* mya
  * connection. This constructor is used for this purpose.
  */
 TreeSocket::TreeSocket(SpanningTreeUtilities* Util, int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
-	: BufferedSocket(newfd), Utils(Util)
+	: BufferedSocket(newfd), Utils(Util), linkID("inbound from " + client->addr()), LinkState(WAIT_AUTH_1), MyRoot(NULL), proto_version(0)
+	, ConnectionFailureShown(false), age(ServerInstance->Time())
 {
 	capab = new CapabData;
 	capab->capab_phase = 0;
-	MyRoot = NULL;
-	age = ServerInstance->Time();
-	LinkState = WAIT_AUTH_1;
-	proto_version = 0;
-	linkID = "inbound from " + client->addr();
 
-	FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
+	FOREACH_MOD(OnHookIO, (this, via));
 	if (GetIOHook())
 		GetIOHook()->OnStreamSocketAccept(this, client, server);
 	SendCapabilities(1);
@@ -112,8 +101,7 @@ CullResult TreeSocket::cull()
 
 TreeSocket::~TreeSocket()
 {
-	if (capab)
-		delete capab;
+	delete capab;
 }
 
 /** When an outbound connection finishes connecting, we receive
@@ -134,7 +122,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;
 }
@@ -155,8 +143,7 @@ void TreeSocket::SendError(const std::string &errormessage)
  */
 void TreeSocket::SquitServer(std::string &from, TreeServer* Current, int& num_lost_servers, int& num_lost_users)
 {
-	ServerInstance->Logs->Log("m_spanningtree",DEBUG,"SquitServer for %s from %s",
-		Current->GetName().c_str(), from.c_str());
+	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "SquitServer for %s from %s", Current->GetName().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 ;)
@@ -183,10 +170,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->GetName());
+		}
+
 		if (Current->GetParent() == Utils->TreeRoot)
 		{
 			ServerInstance->SNO->WriteGlobalSno('l', "Server \002"+Current->GetName()+"\002 split: "+reason);
@@ -213,7 +204,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 		}
 	}
 	else
-		ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Squit from unknown server");
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Squit from unknown server");
 }
 
 /** This function is called when we receive data from a remote
@@ -241,3 +232,8 @@ void TreeSocket::OnDataReady()
 		SendError("RecvQ overrun (line too long)");
 	Utils->Creator->loopCall = false;
 }
+
+bool TreeSocket::Introduced()
+{
+	return (capab == NULL);
+}