Allow enabling the message-tags cap without client-only tags.

[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 2b143269cb43a701dce616c14b6b40c8bd6131bd..6920fc97b6b5f80eff1b79d96ac8d7bb5ce1ed1e 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -56,8 +60,8 @@ TreeServer::TreeServer()
  * This constructor initializes the server's Route and Parent, and sets up
  * the ping timer for the server.
  */
-TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const std::string& id, TreeServer* Above, TreeSocket* Sock, bool Hide)
-       : Server(id, Name, Desc)
+TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const std::string& Sid, TreeServer* Above, TreeSocket* Sock, bool Hide)
+       : Server(Sid, Name, Desc)
        , Parent(Above)
        , Socket(Sock)
        , behind_bursting(Parent->behind_bursting)
@@ -123,7 +127,7 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
         * be referenced by its server name. The AddHashEntry()
         * call below automatically inserts each TreeServer class
         * into the hash_map as it is created. There is a similar
-        * maintainance call in the destructor to tidy up deleted
+        * maintenance call in the destructor to tidy up deleted
         * servers.
         */
 
@@ -167,12 +171,13 @@ void TreeServer::FinishBurst()
        unsigned long bursttime = ts - this->StartBurst;
        ServerInstance->SNO->WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \002%s\002 (burst time: %lu %s)",
                GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs"));
+       FOREACH_MOD_CUSTOM(Utils->Creator->GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerBurst, (this));
 
        StartBurst = 0;
        FinishBurstInternal();
 }
 
-void TreeServer::SQuitChild(TreeServer* server, const std::string& reason)
+void TreeServer::SQuitChild(TreeServer* server, const std::string& reason, bool error)
 {
        stdalgo::erase(Children, server);
 
@@ -188,7 +193,7 @@ void TreeServer::SQuitChild(TreeServer* server, const std::string& reason)
        }
 
        unsigned int num_lost_servers = 0;
-       server->SQuitInternal(num_lost_servers);
+       server->SQuitInternal(num_lost_servers, error);
 
        const std::string quitreason = GetName() + " " + server->GetName();
        unsigned int num_lost_users = QuitUsers(quitreason);
@@ -204,14 +209,14 @@ void TreeServer::SQuitChild(TreeServer* server, const std::string& reason)
        ServerInstance->GlobalCulls.AddItem(server);
 }
 
-void TreeServer::SQuitInternal(unsigned int& num_lost_servers)
+void TreeServer::SQuitInternal(unsigned int& num_lost_servers, bool error)
 {
        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Server %s lost in split", GetName().c_str());
 
        for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i)
        {
                TreeServer* server = *i;
-               server->SQuitInternal(num_lost_servers);
+               server->SQuitInternal(num_lost_servers, error);
        }
 
        // Mark server as dead
@@ -220,7 +225,7 @@ void TreeServer::SQuitInternal(unsigned int& num_lost_servers)
        RemoveHash();
 
        if (!Utils->Creator->dying)
-               FOREACH_MOD_CUSTOM(Utils->Creator->GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerSplit, (this));
+               FOREACH_MOD_CUSTOM(Utils->Creator->GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerSplit, (this, error));
 }
 
 unsigned int TreeServer::QuitUsers(const std::string& reason)
@@ -250,7 +255,7 @@ void TreeServer::CheckULine()
        {
                ConfigTag* tag = i->second;
                std::string server = tag->getString("server");
-               if (!strcasecmp(server.c_str(), GetName().c_str()))
+               if (irc::equals(server, GetName()))
                {
                        if (this->IsRoot())
                        {