* | 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.
class TreeSocket;
class Link;
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<std::string, TreeServer*, nspace::hash_compare<std::string, less<string> > > server_hash;
+#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
+ typedef nspace::hash_map<std::string, TreeServer*, nspace::hash_compare<std::string, std::less<std::string> > > server_hash;
#else
-typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<std::string>, irc::StrHashComp> server_hash;
+ #ifdef HASHCOMP_DEPRECATED
+ typedef nspace::hash_map<std::string, TreeServer*, nspace::insensitive, irc::StrHashComp> server_hash;
+ #else
+ typedef nspace::hash_map<std::string, TreeServer*, nspace::hash<std::string>, irc::StrHashComp> server_hash;
+ #endif
#endif
+/*
+ * Initialises server connections
+ */
+class ServerSocketListener : public ListenSocketBase
+{
+ SpanningTreeUtilities *Utils;
+
+ public:
+ ServerSocketListener(InspIRCd* Instance, SpanningTreeUtilities *u, int port, char* addr) : ListenSocketBase(Instance, port, addr)
+ {
+ this->Utils = u;
+ }
+
+ virtual void OnAcceptReady(int nfd);
+};
+
typedef std::map<TreeServer*,TreeServer*> TreeServerList;
/** A group of modules that implement BufferedSocketHook
/** 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
/** 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<TreeSocket*> Bindings;
+ std::vector<ServerSocketListener *> Bindings;
/* Number of seconds that a server can go without ping
* before opers are warned of high latency.
*/
/** This variable represents the root of the server tree
*/
TreeServer *TreeRoot;
+ /** Represents the server whose command we are processing
+ */
+ FakeUser *ServerUser;
/** IPs allowed to link to us
*/
std::vector<std::string> ValidIPs;
/** Hash of servers currently bursting but not initialized as connected
*/
std::map<irc::string,TreeSocket*> burstingserverlist;
+ /** List of all outgoing sockets and their timeouts
+ */
+ std::map<TreeSocket*, std::pair<std::string, int> > timeoutlist;
/** Holds the data from the <link> tags in the conf
*/
std::vector<Link> 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.
- */
- bool MasterTime;
-
/** List of module pointers which can provide I/O abstraction
*/
hookmodules hooks;
/** Send a message from this server to one other local or remote
*/
- bool DoOneToOne(const std::string &prefix, const std::string &command, std::deque<std::string> ¶ms, std::string target);
+ bool DoOneToOne(const std::string &prefix, const std::string &command, parameterlist ¶ms, std::string target);
/** Send a message from this server to all but one other, local or remote
*/
- bool DoOneToAllButSender(const std::string &prefix, const std::string &command, std::deque<std::string> ¶ms, std::string omit);
+ bool DoOneToAllButSender(const std::string &prefix, const std::string &command, parameterlist ¶ms, std::string omit);
/** Send a message from this server to all but one other, local or remote
*/
- bool DoOneToAllButSender(const char* prefix, const char* command, std::deque<std::string> ¶ms, std::string omit);
+ bool DoOneToAllButSender(const char* prefix, const char* command, parameterlist ¶ms, std::string omit);
/** Send a message from this server to all others
*/
- bool DoOneToMany(const std::string &prefix, const std::string &command, std::deque<std::string> ¶ms);
+ bool DoOneToMany(const std::string &prefix, const std::string &command, parameterlist ¶ms);
/** Send a message from this server to all others
*/
- bool DoOneToMany(const char* prefix, const char* command, std::deque<std::string> ¶ms);
+ bool DoOneToMany(const char* prefix, const char* command, parameterlist ¶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<std::string> ¶ms);
+ bool DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, parameterlist ¶ms);
/** Read the spanningtree module's tags from the config file
*/