Only assign NewServices once the duplicate check is done.

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

diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 9a9d4733d0e8c139c4e3fe5045928714d995b6c2..0763694938810f289c1298592deb8d738c41bbfb 100644 (file)
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -1,11 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007, 2009-2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -29,9 +34,11 @@
 #include "modules/ssl.h"
 #include "modules/stats.h"
 #include "modules/ctctags.h"
+#include "modules/server.h"
 #include "servercommand.h"
 #include "commands.h"
 #include "protocolinterface.h"
+#include "tags.h"
 
 /** An enumeration of all known protocol versions.
  *
@@ -93,18 +100,29 @@ class ModuleSpanningTree
         */
        SpanningTreeProtocolInterface protocolinterface;
 
-       /** Event provider for our events
-        */
-       Events::ModuleEventProvider eventprov;
+       /** Event provider for our broadcast events. */
+       Events::ModuleEventProvider broadcasteventprov;
+
+       /** Event provider for our link events. */
+       Events::ModuleEventProvider linkeventprov;
+
+       /** Event provider for our message events. */
+       Events::ModuleEventProvider messageeventprov;
+
+       /** Event provider for our sync events. */
+       Events::ModuleEventProvider synceventprov;
 
        /** API for accessing user SSL certificates. */
        UserCertificateAPI sslapi;
 
+       /** Tag for marking services pseudoclients. */
+       ServiceTag servicetag;
+
  public:
        dynamic_reference<DNS::Manager> DNS;
 
        /** Event provider for message tags. */
-       Events::ModuleEventProvider tagevprov;
+       ClientProtocol::MessageTagEvent tagevprov;
 
        ServerCommandManager CmdManager;
 
@@ -150,7 +168,7 @@ class ModuleSpanningTree
         */
        void DoConnectTimeout(time_t curtime);
 
-       /** Handle remote VERSON
+       /** Handle remote VERSION
         */
        ModResult HandleVersion(const CommandBase::Params& parameters, User* user);
 
@@ -158,7 +176,17 @@ class ModuleSpanningTree
         */
        ModResult HandleConnect(const CommandBase::Params& parameters, User* user);
 
-       const Events::ModuleEventProvider& GetEventProvider() const { return eventprov; }
+       /** Retrieves the event provider for broadcast events. */
+       const Events::ModuleEventProvider& GetBroadcastEventProvider() const { return broadcasteventprov; }
+
+       /** Retrieves the event provider for link events. */
+       const Events::ModuleEventProvider& GetLinkEventProvider() const { return linkeventprov; }
+
+       /** Retrieves the event provider for message events. */
+       const Events::ModuleEventProvider& GetMessageEventProvider() const { return messageeventprov; }
+
+       /** Retrieves the event provider for sync events. */
+       const Events::ModuleEventProvider& GetSyncEventProvider() const { return synceventprov; }
 
        /**
         ** *** MODULE EVENTS ***
@@ -193,6 +221,7 @@ class ModuleSpanningTree
        void OnUnloadModule(Module* mod) CXX11_OVERRIDE;
        ModResult OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE;
        void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) CXX11_OVERRIDE;
+       void OnShutdown(const std::string& reason) CXX11_OVERRIDE;
        CullResult cull() CXX11_OVERRIDE;
        ~ModuleSpanningTree();
        Version GetVersion() CXX11_OVERRIDE;