X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.h;h=13bab4cff365e44857e6982d8bc04489f83428d0;hb=565544fac966b14e046bb3042ab485f79bcf7c9e;hp=8a13c78140eefdbc9370673cb54e97d28aa11ef4;hpb=2f753f7864bf847af26f7a1aedc727927c163738;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 8a13c7814..13bab4cff 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -24,15 +24,17 @@
 #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.
  *
  * IMPORTANT: If you make changes, document your changes here, without fail:
- * http://wiki.inspircd.org/List_of_protocol_changes_between_versions
+ * https://wiki.inspircd.org/List_of_protocol_changes_between_versions
  *
  * Failure to document your protocol changes will result in a painfully
  * painful death by pain. You have been warned.
@@ -42,7 +44,6 @@ const long MinCompatProtocol = 1202;
 
 /** Forward declarations
  */
-class SpanningTreeCommands;
 class SpanningTreeUtilities;
 class CacheRefreshTimer;
 class TreeServer;
@@ -61,7 +62,19 @@ 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;
@@ -94,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);
@@ -122,23 +131,21 @@ 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 ***
 	 **/
 
 	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 OnGetServerDescription(const std::string &servername,std::string &description) 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;
@@ -153,19 +160,16 @@ 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 ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const std::vector<std::string> &modeline, const std::vector<TranslateType> &translate);
-	void ProtoSendMetaData(void* opaque, Extensible* target, const std::string &extname, const std::string &extdata);
 	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;
-	CullResult cull();
+	void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags, const std::string& output_mode) CXX11_OVERRIDE;
+	CullResult cull() CXX11_OVERRIDE;
 	~ModuleSpanningTree();
 	Version GetVersion() CXX11_OVERRIDE;
-	void Prioritize();
+	void Prioritize() CXX11_OVERRIDE;
 };