From: Attila Molnar <attilamolnar@hush.com>
Date: Mon, 28 Jul 2014 12:23:02 +0000 (+0200)
Subject: m_spanningtree Remove now needless TreeSocket::ConnectionFailureShown
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=91ba5c22664cae39d53f52af663a154286455e01;p=user%2Fhenk%2Fcode%2Finspircd.git

m_spanningtree Remove now needless TreeSocket::ConnectionFailureShown
---

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index f16808519..274337d3f 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -98,7 +98,6 @@ class TreeSocket : public BufferedSocket
 	time_t NextPing;			/* Time when we are due to ping this server */
 	bool LastPingWasGood;			/* Responded to last ping we sent? */
 	int proto_version;			/* Remote protocol version */
-	bool ConnectionFailureShown; /* Set to true if a connection failure message was shown */
 
 	/** True if we've sent our burst.
 	 * This only changes the behavior of message translation for 1202 protocol servers and it can be
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 97c83bbfb..5deef8394 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -37,7 +37,7 @@
  * to it.
  */
 TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const std::string& ipaddr)
-	: linkID(assign(link->Name)), LinkState(CONNECTING), MyRoot(NULL), proto_version(0), ConnectionFailureShown(false)
+	: linkID(assign(link->Name)), LinkState(CONNECTING), MyRoot(NULL), proto_version(0)
 	, burstsent(false), age(ServerInstance->Time())
 {
 	capab = new CapabData;
@@ -57,7 +57,7 @@ TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const std::string& ipaddr)
 TreeSocket::TreeSocket(int newfd, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 	: BufferedSocket(newfd)
 	, linkID("inbound from " + client->addr()), LinkState(WAIT_AUTH_1), MyRoot(NULL), proto_version(0)
-	, ConnectionFailureShown(false), burstsent(false), age(ServerInstance->Time())
+	, burstsent(false), age(ServerInstance->Time())
 {
 	capab = new CapabData;
 	capab->capab_phase = 0;
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 7e26a325e..574dda09d 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -357,17 +357,13 @@ void TreeSocket::Close()
 	if (MyRoot)
 		Squit(MyRoot,getError());
 
-	if (!ConnectionFailureShown)
-	{
-		ConnectionFailureShown = true;
-		ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' failed.",linkID.c_str());
+	ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' failed.",linkID.c_str());
 
-		time_t server_uptime = ServerInstance->Time() - this->age;
-		if (server_uptime)
-		{
-			std::string timestr = ModuleSpanningTree::TimeToStr(server_uptime);
-			ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' was established for %s", linkID.c_str(), timestr.c_str());
-		}
+	time_t server_uptime = ServerInstance->Time() - this->age;
+	if (server_uptime)
+	{
+		std::string timestr = ModuleSpanningTree::TimeToStr(server_uptime);
+		ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' was established for %s", linkID.c_str(), timestr.c_str());
 	}
 }