Merge pull request #495 from SaberUK/master+fix-libcpp

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket1.cpp

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 673b05c556f8b25298230a3411546d7b3a18cbe1..9d0002b66bc96c2ee3da00fcd988876d59f114b5 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -21,17 +21,13 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.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
@@ -49,6 +45,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())
        {
@@ -78,6 +75,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));
@@ -134,7 +132,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 +153,9 @@ 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());
+       std::string servername = Current->GetName();
+       ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"SquitServer for %s from %s",
+               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 ;)
@@ -183,10 +182,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 +216,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
                }
        }
        else
-               ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Squit from unknown server");
+               ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Squit from unknown server");
 }
 
 /** This function is called when we receive data from a remote
@@ -241,3 +244,8 @@ void TreeSocket::OnDataReady()
                SendError("RecvQ overrun (line too long)");
        Utils->Creator->loopCall = false;
 }
+
+bool TreeSocket::Introduced()
+{
+       return (capab == NULL);
+}