X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.h;h=36c161287932e2ecb72ff3116a2eaeccd34774bd;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=3bf1a16e30878afd167c2b6728cdb85308b38be9;hpb=d8fdb4c7b75adf97b319b2107ad3c7a795124865;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h index 3bf1a16e3..36c161287 100644 --- a/src/modules/m_spanningtree/utils.h +++ b/src/modules/m_spanningtree/utils.h @@ -1,18 +1,26 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Craig Edwards * - * 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__UTIL__ -#define __ST__UTIL__ + +#pragma once #include "inspircd.h" @@ -20,33 +28,26 @@ class TreeServer; class TreeSocket; class Link; +class Autoconnect; class ModuleSpanningTree; +class SpanningTreeUtilities; /* This hash_map holds the hash equivalent of the server * tree, used for rapid linear lookups. */ -#ifdef WINDOWS -typedef nspace::hash_map > > server_hash; -#else -typedef nspace::hash_map, irc::StrHashComp> server_hash; -#endif +typedef TR1NS::unordered_map server_hash; -typedef std::map TreeServerList; - -/** A group of modules that implement BufferedSocketHook - * that we can use to hook our server to server connections. - */ -typedef std::map hookmodules; +typedef std::set TreeServerList; /** Contains helper functions and variables for this module, * and keeps them out of the global namespace */ -class SpanningTreeUtilities +class SpanningTreeUtilities : public classbase { - private: - /** Creator server + /** Creates a line in the : [] format */ - InspIRCd* ServerInstance; + std::string ConstructLine(const std::string& prefix, const std::string& command, const parameterlist& params); + public: /** Creator module */ @@ -61,15 +62,15 @@ class SpanningTreeUtilities /** Announce TS changes to channels on merge */ bool AnnounceTSChange; - /** Synchronize timestamps between servers + + /** Allow modules marked as VF_OPTCOMMON to be mismatched when linking */ - bool EnableTimeSync; + bool AllowOptCommon; + /** Make snomasks +CQ quiet during bursts and splits */ bool quiet_bursts; - /** Socket bindings for listening sockets - */ - std::vector Bindings; + /* Number of seconds that a server can go without ping * before opers are warned of high latency. */ @@ -89,23 +90,15 @@ class SpanningTreeUtilities /** Hash of servers currently bursting but not initialized as connected */ std::map burstingserverlist; + /** List of all outgoing sockets and their timeouts + */ + std::map > timeoutlist; /** Holds the data from the tags in the conf */ - std::vector LinkBlocks; - - /** If this is true, this server is the master sync server for time - * synching - e.g. it is the server with its clock correct. It will - * send out the correct time at intervals. + std::vector > LinkBlocks; + /** Holds the data from the tags in the conf */ - bool MasterTime; - - /** List of module pointers which can provide I/O abstraction - */ - hookmodules hooks; - - /** List of module names which can provide I/O abstraction - */ - std::vector hooknames; + std::vector > AutoconnectBlocks; /** True (default) if we are to use challenge-response HMAC * to authenticate passwords. @@ -121,43 +114,33 @@ class SpanningTreeUtilities /** Initialise utility class */ - SpanningTreeUtilities(InspIRCd* Instance, ModuleSpanningTree* Creator); + SpanningTreeUtilities(ModuleSpanningTree* Creator); + + /** Prepare for class destruction + */ + CullResult cull(); /** Destroy class and free listeners etc */ ~SpanningTreeUtilities(); - /** Send a message from this server to one other local or remote - */ - bool DoOneToOne(const std::string &prefix, const std::string &command, std::deque ¶ms, std::string target); + void RouteCommand(TreeServer*, const std::string&, const parameterlist&, User*); - /** Send a message from this server to all but one other, local or remote + /** Send a message from this server to one other local or remote */ - bool DoOneToAllButSender(const std::string &prefix, const std::string &command, std::deque ¶ms, std::string omit); + bool DoOneToOne(const std::string& prefix, const std::string& command, const parameterlist& params, const std::string& target); /** Send a message from this server to all but one other, local or remote */ - bool DoOneToAllButSender(const char* prefix, const char* command, std::deque ¶ms, std::string omit); + bool DoOneToAllButSender(const std::string &prefix, const std::string &command, const parameterlist& params, const std::string& omit); /** Send a message from this server to all others */ - bool DoOneToMany(const std::string &prefix, const std::string &command, std::deque ¶ms); - - /** Send a message from this server to all others - */ - bool DoOneToMany(const char* prefix, const char* command, std::deque ¶ms); - - /** Send a message from this server to all others, without doing any processing on the command (e.g. send it as-is with colons and all) - */ - bool DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, std::deque ¶ms); + bool DoOneToMany(const std::string &prefix, const std::string &command, const parameterlist ¶ms); /** Read the spanningtree module's tags from the config file */ - void ReadConfiguration(bool rebind); - - /** Add a server to the server list for GetListOfServersForChannel - */ - void AddThisServer(TreeServer* server, TreeServerList &list); + void ReadConfiguration(); /** Compile a list of servers which contain members of channel c */ @@ -179,14 +162,6 @@ class SpanningTreeUtilities */ TreeServer* FindServerMask(const std::string &ServerName); - /** Returns true if this is a server name we recognise - */ - bool IsServer(const std::string &ServerName); - - /** Attempt to connect to the failover link of link x - */ - void DoFailOver(Link* x); - /** Find a link tag from a server name */ Link* FindLink(const std::string& name); @@ -194,6 +169,8 @@ class SpanningTreeUtilities /** Refresh the IP cache used for allowing inbound connections */ void RefreshIPCache(); -}; -#endif + /** Sends a PRIVMSG or a NOTICE to a channel obeying an exempt list and an optional prefix + */ + void SendChannelMessage(const std::string& prefix, Channel* target, const std::string &text, char status, const CUList& exempt_list, const char* message_type); +};