Merge branch 'insp20' into master.

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

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index b29bea1346f0d9e0c594135c83e3e46f37962d69..ca7959ea7d44dacb8787e9641a00a5ece1ae0767 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -23,7 +23,7 @@
 #include "inspircd.h"
 #include "xline.h"
 #include "main.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 
 #include "utils.h"
 #include "treeserver.h"
@@ -37,6 +37,7 @@ TreeServer::TreeServer()
        , Parent(NULL), Route(NULL)
        , VersionString(ServerInstance->GetVersionString())
        , fullversion(ServerInstance->GetVersionString(true))
+       , rawversion(INSPIRCD_VERSION)
        , Socket(NULL), sid(ServerInstance->Config->GetSID()), behind_bursting(0), isdead(false)
        , pingtimer(this)
        , ServerUser(ServerInstance->FakeClient)
@@ -116,7 +117,7 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
        this->AddHashEntry();
        Parent->Children.push_back(this);
 
-       FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), SpanningTreeEventListener, OnServerLink, (this));
+       FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnServerLink, (this));
 }
 
 void TreeServer::BeginBurst(uint64_t startms)
@@ -206,7 +207,7 @@ void TreeServer::SQuitInternal(unsigned int& num_lost_servers)
        RemoveHash();
 
        if (!Utils->Creator->dying)
-               FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), SpanningTreeEventListener, OnServerSplit, (this));
+               FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnServerSplit, (this));
 }
 
 unsigned int TreeServer::QuitUsers(const std::string& reason)