X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.h;h=46c21b4e954aef8e12f7f1f4f932b982f55046dc;hb=c0aba5b728b0a921d95ec120aa638dab1520b42f;hp=7fb2c67012d79e67e81945650c964225653feac7;hpb=c8f92d97c2cd92a07bbb76b96a67cd089c7e3407;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 7fb2c6701..46c21b4e9 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -24,9 +24,11 @@
 #pragma once
 
 #include "inspircd.h"
+#include "event.h"
 #include "modules/dns.h"
 #include "servercommand.h"
 #include "commands.h"
+#include "protocolinterface.h"
 
 /** If you make a change which breaks the protocol, increment this.
  * If you  completely change the protocol, completely change the number.
@@ -42,7 +44,6 @@ const long MinCompatProtocol = 1202;
 
 /** Forward declarations
  */
-class SpanningTreeCommands;
 class SpanningTreeUtilities;
 class CacheRefreshTimer;
 class TreeServer;
@@ -61,12 +62,20 @@ class ModuleSpanningTree : public Module
 
 	/** Server to server only commands, not registered in the core
 	 */
-	SpanningTreeCommands* commands;
+	SpanningTreeCommands commands;
 
 	/** Next membership id assigned when a local user joins a channel
 	 */
 	Membership::Id currmembid;
 
+	/** The specialized ProtocolInterface that is assigned to ServerInstance->PI on load
+	 */
+	SpanningTreeProtocolInterface protocolinterface;
+
+	/** Event provider for our events
+	 */
+	Events::ModuleEventProvider eventprov;
+
  public:
 	dynamic_reference<DNS::Manager> DNS;
 
@@ -77,10 +86,6 @@ class ModuleSpanningTree : public Module
 	 */
 	bool loopCall;
 
-	/** True if users are quitting due to a netsplit
-	 */
-	bool SplitInProgress;
-
 	/** Constructor
 	 */
 	ModuleSpanningTree();
@@ -102,10 +107,6 @@ class ModuleSpanningTree : public Module
 	 */
 	ModResult HandleRemoteWhois(const std::vector<std::string>& parameters, User* user);
 
-	/** Ping all local servers
-	 */
-	void DoPingChecks(time_t curtime);
-
 	/** Connect a server locally
 	 */
 	void ConnectServer(Link* x, Autoconnect* y = NULL);
@@ -130,14 +131,12 @@ class ModuleSpanningTree : public Module
 	 */
 	ModResult HandleConnect(const std::vector<std::string>& parameters, User* user);
 
-	/** Attempt to send a message to a user
-	 */
-	void RemoteMessage(User* user, const char* format, ...) CUSTOM_PRINTF(3, 4);
-
 	/** Display a time as a human readable string
 	 */
 	static std::string TimeToStr(time_t secs);
 
+	const Events::ModuleEventProvider& GetEventProvider() const { return eventprov; }
+
 	/**
 	 ** *** MODULE EVENTS ***
 	 **/
@@ -145,7 +144,8 @@ class ModuleSpanningTree : public Module
 	ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE;
 	void OnPostCommand(Command*, const std::vector<std::string>& parameters, LocalUser* user, CmdResult result, const std::string& original_line) CXX11_OVERRIDE;
 	void OnUserConnect(LocalUser* source) CXX11_OVERRIDE;
-	void OnUserInvite(User* source,User* dest,Channel* channel, time_t) CXX11_OVERRIDE;
+	void OnUserInvite(User* source, User* dest, Channel* channel, time_t timeout, unsigned int notifyrank, CUList& notifyexcepts) CXX11_OVERRIDE;
+	ModResult OnPreTopicChange(User* user, Channel* chan, const std::string& topic) CXX11_OVERRIDE;
 	void OnPostTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE;
 	void OnUserMessage(User* user, void* dest, int target_type, const std::string& text, char status, const CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE;
 	void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE;
@@ -160,15 +160,14 @@ class ModuleSpanningTree : public Module
 	void OnPreRehash(User* user, const std::string &parameter) CXX11_OVERRIDE;
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE;
 	void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE;
-	void OnLine(User* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason);
 	void OnAddLine(User *u, XLine *x) CXX11_OVERRIDE;
 	void OnDelLine(User *u, XLine *x) CXX11_OVERRIDE;
-	ModResult OnStats(char statschar, User* user, string_list &results) CXX11_OVERRIDE;
+	ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE;
 	ModResult OnSetAway(User* user, const std::string &awaymsg) CXX11_OVERRIDE;
 	void OnLoadModule(Module* mod) CXX11_OVERRIDE;
 	void OnUnloadModule(Module* mod) CXX11_OVERRIDE;
 	ModResult OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE;
-	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE;
+	void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags, const std::string& output_mode) CXX11_OVERRIDE;
 	CullResult cull();
 	~ModuleSpanningTree();
 	Version GetVersion() CXX11_OVERRIDE;