X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.h;h=c81eb2d0bc023a9a97411c671b769ea78ee376c4;hb=3a3ff949670c61a4a8856e1391222e156eb1cd17;hp=22357aed434ef6a25aec211bebe3b22ef415e7e5;hpb=623ba6ae49f8e1e0958f921fa178af8a95797c1c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 22357aed4..c81eb2d0b 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -24,8 +24,11 @@
 #pragma once
 
 #include "inspircd.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.
  *
@@ -51,13 +54,28 @@ class Autoconnect;
  */
 class ModuleSpanningTree : public Module
 {
+	/** Client to server commands, registered in the core
+	 */
+	CommandRConnect rconnect;
+	CommandRSQuit rsquit;
+	CommandMap map;
+
+	/** Server to server only commands, not registered in the core
+	 */
 	SpanningTreeCommands* commands;
-	void LocalMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list, const char* message_type);
+
+	/** 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;
 
  public:
 	dynamic_reference<DNS::Manager> DNS;
 
-	SpanningTreeUtilities* Utils;
+	ServerCommandManager CmdManager;
 
 	/** Set to true if inside a spanningtree call, to prevent sending
 	 * xlines and other things back to their source
@@ -73,22 +91,10 @@ class ModuleSpanningTree : public Module
 	 */
 	void ShowLinks(TreeServer* Current, User* user, int hops);
 
-	/** Counts local and remote servers
-	 */
-	int CountServs();
-
 	/** Handle LINKS command
 	 */
 	void HandleLinks(const std::vector<std::string>& parameters, User* user);
 
-	/** Show MAP output to a user (recursive)
-	 */
-	void ShowMap(TreeServer* Current, User* user, int depth, int &line, char* names, int &maxnamew, char* stats);
-
-	/** Handle MAP command
-	 */
-	bool HandleMap(const std::vector<std::string>& parameters, User* user);
-
 	/** Handle SQUIT
 	 */
 	ModResult HandleSquit(const std::vector<std::string>& parameters, User* user);
@@ -129,13 +135,9 @@ class ModuleSpanningTree : public Module
 	 */
 	void RemoteMessage(User* user, const char* format, ...) CUSTOM_PRINTF(3, 4);
 
-	/** Returns oper-specific MAP information
-	 */
-	const std::string MapOperInfo(TreeServer* Current);
-
 	/** Display a time as a human readable string
 	 */
-	std::string TimeToStr(time_t secs);
+	static std::string TimeToStr(time_t secs);
 
 	/**
 	 ** *** MODULE EVENTS ***
@@ -143,7 +145,6 @@ 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 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 OnPostTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE;
@@ -158,19 +159,16 @@ class ModuleSpanningTree : public Module
 	void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE;
 	void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE;
 	void OnPreRehash(User* user, const std::string &parameter) CXX11_OVERRIDE;
-	void OnRehash(User* user) 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;
-	void OnMode(User* user, void* dest, int target_type, const std::vector<std::string> &text, const std::vector<TranslateType> &translate) CXX11_OVERRIDE;
 	ModResult OnStats(char statschar, User* user, string_list &results) 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 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;