Convert the spanningtree events to use the new cross-module event system

[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 6eb9dd3c6c4b672ca0a2839b1a4db3dde012e344..6ebce07f95cf3a2c38a83f23816acd2f66d7920b 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -38,8 +38,9 @@ TreeServer::TreeServer()
        , VersionString(ServerInstance->GetVersionString())
        , fullversion(ServerInstance->GetVersionString(true))
        , Socket(NULL), sid(ServerInstance->Config->GetSID()), behind_bursting(0), isdead(false)
+       , pingtimer(this)
        , ServerUser(ServerInstance->FakeClient)
-       , age(ServerInstance->Time()), Warned(false), UserCount(ServerInstance->Users.GetLocalUsers().size())
+       , age(ServerInstance->Time()), UserCount(ServerInstance->Users.GetLocalUsers().size())
        , OperCount(0), rtt(0), StartBurst(0), Hidden(false)
 {
        AddHashEntry();
@@ -52,13 +53,14 @@ TreeServer::TreeServer()
 TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const std::string& id, TreeServer* Above, TreeSocket* Sock, bool Hide)
        : Server(Name, Desc)
        , Parent(Above), Socket(Sock), sid(id), behind_bursting(Parent->behind_bursting), isdead(false)
+       , pingtimer(this)
        , ServerUser(new FakeUser(id, this))
-       , age(ServerInstance->Time()), Warned(false), UserCount(0), OperCount(0), rtt(0), StartBurst(0), Hidden(Hide)
+       , age(ServerInstance->Time()), UserCount(0), OperCount(0), rtt(0), StartBurst(0), Hidden(Hide)
 {
        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "New server %s behind_bursting %u", GetName().c_str(), behind_bursting);
        CheckULine();
-       SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
-       SetPingFlag();
+
+       ServerInstance->Timers.AddTimer(&pingtimer);
 
        /* find the 'route' for this server (e.g. the one directly connected
         * to the local server, which we can use to reach it)
@@ -112,7 +114,7 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
         */
 
        this->AddHashEntry();
-       Parent->AddChild(this);
+       Parent->Children.push_back(this);
 }
 
 void TreeServer::BeginBurst(unsigned long startms)
@@ -135,11 +137,6 @@ void TreeServer::FinishBurstInternal()
                behind_bursting--;
        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "FinishBurstInternal() %s behind_bursting %u", GetName().c_str(), behind_bursting);
 
-       if (!IsBehindBursting())
-       {
-               SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
-               SetPingFlag();
-       }
        for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i)
        {
                TreeServer* child = *i;
@@ -154,7 +151,7 @@ void TreeServer::FinishBurst()
        unsigned long bursttime = ts - this->StartBurst;
        ServerInstance->SNO->WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \2%s\2 (burst time: %lu %s)",
                GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs"));
-       AddServerEvent(Utils->Creator, GetName());
+       FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), SpanningTreeEventListener, OnServerLink, (GetName()));
 
        StartBurst = 0;
        FinishBurstInternal();
@@ -162,8 +159,8 @@ void TreeServer::FinishBurst()
 
 void TreeServer::SQuitChild(TreeServer* server, const std::string& reason)
 {
-       DelServerEvent(Utils->Creator, server->GetName());
-       DelChild(server);
+       FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), SpanningTreeEventListener, OnServerSplit, (server->GetName()));
+       stdalgo::erase(Children, server);
 
        if (IsRoot())
        {
@@ -261,37 +258,6 @@ void TreeServer::AddHashEntry()
        Utils->sidlist[sid] = this;
 }
 
-void TreeServer::SetNextPingTime(time_t t)
-{
-       this->NextPing = t;
-       LastPingWasGood = false;
-}
-
-time_t TreeServer::NextPingTime()
-{
-       return NextPing;
-}
-
-bool TreeServer::AnsweredLastPing()
-{
-       return LastPingWasGood;
-}
-
-void TreeServer::SetPingFlag()
-{
-       LastPingWasGood = true;
-}
-
-void TreeServer::AddChild(TreeServer* Child)
-{
-       Children.push_back(Child);
-}
-
-bool TreeServer::DelChild(TreeServer* Child)
-{
-       return stdalgo::erase(Children, Child);
-}
-
 CullResult TreeServer::cull()
 {
        // Recursively cull all servers that are under us in the tree