Change error from 'connection established' to 'connection started'

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

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index fc5d824dec6272cf80f28e47dd41edb6d69566ae..7e7e91382e44cad7cc3e2c6d0e31bf60e65cbf8c 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -728,7 +728,7 @@ class TreeSocket : public InspSocket
                        {
                                if (x->Name == this->myhost)
                                {
-                                       this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] established.");
+                                       this->Instance->SNO->WriteToSnoMask('l',"Connection to \2"+myhost+"\2["+(x->HiddenFromStats ? "<hidden>" : this->GetIP())+"] started.");
                                        this->SendCapabilities();
                                        if (x->EncryptionKey != "")
                                        {
@@ -1553,7 +1553,7 @@ class TreeSocket : public InspSocket
                 * Note that this causes the losing server to send out confirming
                 * FMODE lines.
                 */
-               if ((ourTS > TS) || (this->Instance->ULine(who->server)))
+               if ((ourTS > TS) || (this->Instance->ULine(source.c_str())))
                {
                        Instance->Log(DEBUG,"FJOIN detected, our TS=%lu, their TS=%lu",ourTS,TS);
                        std::deque<std::string> param_list;
@@ -4504,7 +4504,7 @@ class ModuleSpanningTree : public Module
                        params.clear();
                        params.push_back(channel->name);
                        params.push_back(ConvToStr(channel->age));
-                       params.push_back(c->GetAllPrefixChars(i->second)+","+std::string(user->nick));
+                       params.push_back(std::string(channel->GetAllPrefixChars(user))+","+std::string(user->nick));
                        DoOneToMany(ServerInstance->Config->ServerName,"FJOIN",params);
                }
        }