X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.h;h=810b8ec921d04c57e6cbc23cfe19ec4a0ee26818;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=1dd7692c186d93f0b3a1aa965efa468111a4e9d5;hpb=f19e632f3d0ecd4c9fe7e94846ae922b0aa2f1f6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index 1dd7692c1..810b8ec92 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -3,7 +3,7 @@ * +------------------------------------+ * * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -21,12 +21,13 @@ * 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 = 1201; +const long ProtocolVersion = 1202; +const long MinCompatProtocol = 1201; /** Forward declarations */ @@ -36,6 +37,7 @@ class SpanningTreeUtilities; class CacheRefreshTimer; class TreeServer; class Link; +class Autoconnect; /** This is the main class for the spanningtree module */ @@ -51,10 +53,14 @@ class ModuleSpanningTree : public Module 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 */ - ModuleSpanningTree(InspIRCd* Me); + ModuleSpanningTree(); /** Shows /LINKS */ @@ -82,35 +88,35 @@ class ModuleSpanningTree : public Module /** Handle remote MOTD */ - int HandleMotd(const std::vector& parameters, User* user); + ModResult HandleMotd(const std::vector& parameters, User* user); /** Handle remote ADMIN */ - int HandleAdmin(const std::vector& parameters, User* user); + ModResult HandleAdmin(const std::vector& parameters, User* user); /** Handle remote STATS */ - int HandleStats(const std::vector& parameters, User* user); + ModResult HandleStats(const std::vector& parameters, User* user); /** Handle MAP command */ - int HandleMap(const std::vector& parameters, User* user); + bool HandleMap(const std::vector& parameters, User* user); /** Handle SQUIT */ - int HandleSquit(const std::vector& parameters, User* user); + ModResult HandleSquit(const std::vector& parameters, User* user); /** Handle TIME */ - int HandleTime(const std::vector& parameters, User* user); + ModResult HandleTime(const std::vector& parameters, User* user); /** Handle remote WHOIS */ - int HandleRemoteWhois(const std::vector& parameters, User* user); + ModResult HandleRemoteWhois(const std::vector& parameters, User* user); /** Handle remote MODULES */ - int HandleModules(const std::vector& parameters, User* user); + ModResult HandleModules(const std::vector& parameters, User* user); /** Ping all local servers */ @@ -118,7 +124,7 @@ class ModuleSpanningTree : public Module /** Connect a server locally */ - void ConnectServer(Link* x); + void ConnectServer(Link* x, Autoconnect* y); /** Check if any servers are due to be autoconnected */ @@ -130,11 +136,11 @@ class ModuleSpanningTree : public Module /** Handle remote VERSON */ - int HandleVersion(const std::vector& parameters, User* user); + ModResult HandleVersion(const std::vector& parameters, User* user); /** Handle CONNECT */ - int HandleConnect(const std::vector& parameters, User* user); + ModResult HandleConnect(const std::vector& parameters, User* user); /** Attempt to send a message to a user */ @@ -152,38 +158,41 @@ class ModuleSpanningTree : public Module ** *** MODULE EVENTS *** **/ - 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, 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 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 OnOper(User* user, const std::string &opertype); + ModResult OnPreCommand(std::string &command, std::vector& parameters, User *user, bool validated, const std::string &original_line); + void OnPostCommand(const std::string &command, const std::vector& parameters, User *user, CmdResult result, const std::string &original_line); + void OnGetServerDescription(const std::string &servername,std::string &description); + void OnUserConnect(User* source); + void OnUserInvite(User* source,User* dest,Channel* channel, time_t); + void OnPostTopicChange(User* user, Channel* chan, const std::string &topic); + void OnWallops(User* user, const std::string &text); + void OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list); + void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list); + void OnBackgroundTimer(time_t curtime); + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts); + ModResult OnChangeLocalUserHost(User* user, const std::string &newhost); + void OnChangeName(User* user, const std::string &gecos); + void OnChangeIdent(User* user, const std::string &ident); + void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts); + void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message); + void OnUserPostNick(User* user, const std::string &oldnick); + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts); + void OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason); + void OnPreRehash(User* user, const std::string ¶meter); + void OnRehash(User* user); + 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 int OnStats(char statschar, User* user, string_list &results); - virtual int OnSetAway(User* user, const std::string &awaymsg); - virtual void ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const std::string &modeline); - virtual void ProtoSendMetaData(void* opaque, TargetTypeFlags target_type, void* target, const std::string &extname, const std::string &extdata); - 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 OnAddLine(User *u, XLine *x); + void OnDelLine(User *u, XLine *x); + void OnMode(User* user, void* dest, int target_type, const std::vector &text, const std::vector &translate); + ModResult OnStats(char statschar, User* user, string_list &results); + ModResult OnSetAway(User* user, const std::string &awaymsg); + void ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const std::vector &modeline, const std::vector &translate); + void ProtoSendMetaData(void* opaque, Extensible* target, const std::string &extname, const std::string &extdata); + void OnEvent(Event* event); + void OnLoadModule(Module* mod,const std::string &name); + void OnUnloadModule(Module* mod,const std::string &name); + ~ModuleSpanningTree(); + Version GetVersion(); void Prioritize(); };