X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.h;h=54524c720659a661f8c8553300e60f6beaf02d47;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=dab1b24200e0fd423617cc1970da490a33cc50db;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index dab1b2420..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-2007 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,19 +21,19 @@ * 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 TimeSyncTimer; class CacheRefreshTimer; class TreeServer; class Link; @@ -42,20 +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; - public: - /** Timer for clock syncs - */ - TimeSyncTimer *SyncTimer; + 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 */ @@ -75,47 +75,47 @@ class ModuleSpanningTree : public Module /** Handle LINKS command */ - void HandleLinks(const char** parameters, int pcnt, User* user); + void HandleLinks(const std::vector& parameters, User* user); /** Handle LUSERS command */ - void HandleLusers(const char** parameters, int pcnt, User* user); + void HandleLusers(const std::vector& parameters, User* user); /** 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 */ - int HandleMotd(const char** parameters, int pcnt, User* user); + int HandleMotd(const std::vector& parameters, User* user); /** Handle remote ADMIN */ - int HandleAdmin(const char** parameters, int pcnt, User* user); + int HandleAdmin(const std::vector& parameters, User* user); /** Handle remote STATS */ - int HandleStats(const char** parameters, int pcnt, User* user); + int HandleStats(const std::vector& parameters, User* user); /** Handle MAP command */ - void HandleMap(const char** parameters, int pcnt, User* user); + int HandleMap(const std::vector& parameters, User* user); /** Handle SQUIT */ - int HandleSquit(const char** parameters, int pcnt, User* user); + int HandleSquit(const std::vector& parameters, User* user); /** Handle TIME */ - int HandleTime(const char** parameters, int pcnt, User* user); + int HandleTime(const std::vector& parameters, User* user); /** Handle remote WHOIS */ - int HandleRemoteWhois(const char** parameters, int pcnt, User* user); + int HandleRemoteWhois(const std::vector& parameters, User* user); /** Handle remote MODULES */ - int HandleModules(const char** parameters, int pcnt, User* user); + int HandleModules(const std::vector& parameters, User* user); /** Ping all local servers */ @@ -129,21 +129,21 @@ class ModuleSpanningTree : public Module */ void AutoConnectServers(time_t curtime); - /** Handle remote VERSON + /** Check if any connecting servers should timeout */ - int HandleVersion(const char** parameters, int pcnt, User* user); + void DoConnectTimeout(time_t curtime); - /** Handle CONNECT + /** Handle remote VERSON */ - int HandleConnect(const char** parameters, int pcnt, User* user); + int HandleVersion(const std::vector& parameters, User* user); - /** Send out time sync to all servers + /** Handle CONNECT */ - void BroadcastTimeSync(); + int HandleConnect(const std::vector& parameters, User* user); /** Attempt to send a message to a user */ - void RemoteMessage(User* user, const char* format, ...); + void RemoteMessage(User* user, const char* format, ...) CUSTOM_PRINTF(3, 4); /** Returns oper-specific MAP information */ @@ -157,46 +157,42 @@ class ModuleSpanningTree : public Module ** *** MODULE EVENTS *** **/ - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line); - virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line); + 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 OnUserInvite(User* source,User* dest,Channel* channel); + 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 &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, const std::string &partmessage, bool &silent); - virtual void OnUserConnect(User* user); + 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 OnAddGLine(long duration, User* source, const std::string &reason, const std::string &hostmask); - virtual void OnAddZLine(long duration, User* source, const std::string &reason, const std::string &ipmask); - virtual void OnAddQLine(long duration, User* source, const std::string &reason, const std::string &nickmask); - virtual void OnAddELine(long duration, User* source, const std::string &reason, const std::string &hostmask); - virtual void OnDelGLine(User* source, const std::string &hostmask); - virtual void OnDelZLine(User* source, const std::string &ipmask); - virtual void OnDelQLine(User* source, const std::string &nickmask); - virtual void OnDelELine(User* source, const std::string &hostmask); - virtual void OnMode(User* user, void* dest, int target_type, const std::string &text); + 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::vector &text, const std::vector &translate); virtual int OnStats(char statschar, User* user, string_list &results); - virtual void OnSetAway(User* user); - virtual void OnCancelAway(User* user); - 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 int OnSetAway(User* user, const std::string &awaymsg); + 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 Implements(char* List); - Priority Prioritize(); + void Prioritize(); }; #endif