X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.h;h=54524c720659a661f8c8553300e60f6beaf02d47;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=98294b9fda7babbd67c7f4fec51ef462123f7d23;hpb=4e599dd4fbfe5abc0d60a05008344e35e6bc870d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index 98294b9fd..54524c720 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -21,17 +21,18 @@ * If you completely change the protocol, completely change the number. * * IMPORTANT: If you make changes, document your changes here, without fail: - * http://www.inspircd.org/wiki/List_of_protocol_changes_between_versions + * http://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. */ -const long ProtocolVersion = 1200; +const long ProtocolVersion = 1201; +const long MinCompatProtocol = 1201; /** Forward declarations */ -class cmd_rconnect; -class cmd_rsquit; +class CommandRConnect; +class CommandRSQuit; class SpanningTreeUtilities; class CacheRefreshTimer; class TreeServer; @@ -41,16 +42,20 @@ class Link; */ class ModuleSpanningTree : public Module { - int line; - int NumServers; unsigned int max_local; unsigned int max_global; - cmd_rconnect* command_rconnect; - cmd_rsquit* command_rsquit; + CommandRConnect* command_rconnect; + CommandRSQuit* command_rsquit; SpanningTreeUtilities* Utils; + void RedoConfig(Module* mod, const std::string &name); + public: CacheRefreshTimer *RefreshTimer; + /** Set to true if inside a spanningtree call, to prevent sending + * xlines and other things back to their source + */ + bool loopCall; /** Constructor */ @@ -78,7 +83,7 @@ class ModuleSpanningTree : public Module /** Show MAP output to a user (recursive) */ - void ShowMap(TreeServer* Current, User* user, int depth, char matrix[128][128], float &totusers, float &totservers); + void ShowMap(TreeServer* Current, User* user, int depth, int &line, char* names, int &maxnamew, char* stats); /** Handle remote MOTD */ @@ -124,6 +129,10 @@ class ModuleSpanningTree : public Module */ void AutoConnectServers(time_t curtime); + /** Check if any connecting servers should timeout + */ + void DoConnectTimeout(time_t curtime); + /** Handle remote VERSON */ int HandleVersion(const std::vector& parameters, User* user); @@ -151,31 +160,36 @@ class ModuleSpanningTree : public Module virtual int OnPreCommand(std::string &command, std::vector& parameters, User *user, bool validated, const std::string &original_line); virtual void OnPostCommand(const std::string &command, const std::vector& parameters, User *user, CmdResult result, const std::string &original_line); virtual void OnGetServerDescription(const std::string &servername,std::string &description); + virtual void OnUserConnect(User* source); virtual void OnUserInvite(User* source,User* dest,Channel* channel, time_t); virtual void OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic); virtual void OnWallops(User* user, const std::string &text); virtual void OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list); virtual void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list); virtual void OnBackgroundTimer(time_t curtime); - virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent); - virtual void OnChangeHost(User* user, const std::string &newhost); + virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created); + virtual int OnChangeLocalUserHost(User* user, const std::string &newhost); virtual void OnChangeName(User* user, const std::string &gecos); virtual void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent); virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message); virtual void OnUserPostNick(User* user, const std::string &oldnick); virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent); virtual void OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason); - virtual void OnRehash(User* user, const std::string ¶meter); + virtual void OnPreRehash(User* user, const std::string ¶meter); + virtual void OnRehash(User* user); virtual void OnOper(User* user, const std::string &opertype); void OnLine(User* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason); virtual void OnAddLine(User *u, XLine *x); virtual void OnDelLine(User *u, XLine *x); - virtual void OnMode(User* user, void* dest, int target_type, const std::string &text); + virtual void OnMode(User* user, void* dest, int target_type, const std::vector &text, const std::vector &translate); virtual int OnStats(char statschar, User* user, string_list &results); virtual int OnSetAway(User* user, const std::string &awaymsg); - virtual void ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline); - virtual void ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata); + virtual void ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const std::vector &modeline, const std::vector &translate); + virtual void ProtoSendMetaData(void* opaque, Extensible* target, const std::string &extname, const std::string &extdata); + virtual std::string ProtoTranslate(Extensible* item); virtual void OnEvent(Event* event); + virtual void OnLoadModule(Module* mod,const std::string &name); + virtual void OnUnloadModule(Module* mod,const std::string &name); virtual ~ModuleSpanningTree(); virtual Version GetVersion(); void Prioritize();