X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fmain.h;h=bef94a53bbcdca28fa79bf907f0b1336853983cb;hb=d736eba00b274c87662bd73a3acf8288135643d6;hp=06b66a5cf03198d736c7193190b6dbe017debdee;hpb=cdf850dcbbd3153bceaed15ee2d3b42f568c9bf3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index 06b66a5cf..bef94a53b 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -1,21 +1,32 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007-2008 Craig Edwards + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#ifndef __ST_MAIN__ -#define __ST_MAIN__ + +#pragma once #include "inspircd.h" -#include +#include "modules/dns.h" +#include "servercommand.h" +#include "commands.h" /** If you make a change which breaks the protocol, increment this. * If you completely change the protocol, completely change the number. @@ -26,104 +37,78 @@ * 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 MinCompatProtocol = 1201; +const long ProtocolVersion = 1205; +const long MinCompatProtocol = 1202; /** Forward declarations */ -class CommandRConnect; -class CommandRSQuit; +class SpanningTreeCommands; class SpanningTreeUtilities; class CacheRefreshTimer; class TreeServer; class Link; +class Autoconnect; /** This is the main class for the spanningtree module */ class ModuleSpanningTree : public Module { - unsigned int max_local; - unsigned int max_global; - CommandRConnect* command_rconnect; - CommandRSQuit* command_rsquit; - SpanningTreeUtilities* Utils; + /** Client to server commands, registered in the core + */ + CommandRConnect rconnect; + CommandRSQuit rsquit; + CommandMap map; - void RedoConfig(Module* mod, const std::string &name); + /** Server to server only commands, not registered in the core + */ + SpanningTreeCommands* commands; public: - CacheRefreshTimer *RefreshTimer; + dynamic_reference DNS; + + ServerCommandManager CmdManager; + /** Set to true if inside a spanningtree call, to prevent sending * xlines and other things back to their source */ bool loopCall; + /** True if users are quitting due to a netsplit + */ + bool SplitInProgress; + /** Constructor */ - ModuleSpanningTree(InspIRCd* Me); + ModuleSpanningTree(); + void init() CXX11_OVERRIDE; /** Shows /LINKS */ void ShowLinks(TreeServer* Current, User* user, int hops); - /** Counts local servers - */ - int CountLocalServs(); - - /** Counts local and remote servers - */ - int CountServs(); - /** Handle LINKS command */ void HandleLinks(const std::vector& parameters, User* user); - /** Handle LUSERS command - */ - void HandleLusers(const std::vector& 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 remote MOTD - */ - ModResult HandleMotd(const std::vector& parameters, User* user); - - /** Handle remote ADMIN - */ - ModResult HandleAdmin(const std::vector& parameters, User* user); - - /** Handle remote STATS - */ - ModResult HandleStats(const std::vector& parameters, User* user); - - /** Handle MAP command - */ - bool HandleMap(const std::vector& parameters, User* user); - /** Handle SQUIT */ ModResult HandleSquit(const std::vector& parameters, User* user); - /** Handle TIME - */ - ModResult HandleTime(const std::vector& parameters, User* user); - /** Handle remote WHOIS */ ModResult HandleRemoteWhois(const std::vector& parameters, User* user); - /** Handle remote MODULES - */ - ModResult HandleModules(const std::vector& parameters, User* user); - /** Ping all local servers */ void DoPingChecks(time_t curtime); /** Connect a server locally */ - void ConnectServer(Link* x); + void ConnectServer(Link* x, Autoconnect* y = NULL); + + /** Connect the next autoconnect server + */ + void ConnectServer(Autoconnect* y, bool on_timer); /** Check if any servers are due to be autoconnected */ @@ -145,55 +130,44 @@ 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 *** **/ - virtual ModResult 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, bool created); - virtual ModResult OnChangeLocalUserHost(User* user, const std::string &newhost); - virtual void OnChangeName(User* user, const std::string &gecos); - virtual void OnChangeIdent(User* user, const std::string &ident); - 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 OnPreRehash(User* user, const std::string ¶meter); - virtual void OnRehash(User* user); - virtual void OnOper(User* user, const std::string &opertype); + ModResult OnPreCommand(std::string &command, std::vector& parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE; + void OnPostCommand(Command*, const std::vector& 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; + 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; + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE; + void OnChangeHost(User* user, const std::string &newhost) CXX11_OVERRIDE; + void OnChangeName(User* user, const std::string &gecos) CXX11_OVERRIDE; + void OnChangeIdent(User* user, const std::string &ident) CXX11_OVERRIDE; + void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE; + void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) CXX11_OVERRIDE; + 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 ¶meter) 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); - 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 ModResult OnStats(char statschar, User* user, string_list &results); - virtual ModResult 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 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 OnSetAway(User* user, const std::string &awaymsg) CXX11_OVERRIDE; + 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& tokens) CXX11_OVERRIDE; + CullResult cull(); + ~ModuleSpanningTree(); + Version GetVersion() CXX11_OVERRIDE; void Prioritize(); }; - -#endif