X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Futils.h;h=5e9555deac3ea6c2dfec6884f0f75d2bf45d7cd7;hb=5a5a061c48af830ca90b699993cac079a9311b08;hp=0dbf06ec9d2d6c31221286590538c2d2ab991afc;hpb=f0683739e2cfaae900a8e3ffac48ad1bc7d75e51;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 0dbf06ec9..5e9555dea 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -21,16 +21,37 @@ class TreeServer;
 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<string, less<string> > > server_hash;
+	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<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(const std::string &ipconnectedto, int nfd, const std::string &incomingip);
+};
+
 typedef std::map<TreeServer*,TreeServer*> TreeServerList;
 
 /** A group of modules that implement BufferedSocketHook
@@ -41,7 +62,7 @@ typedef std::map<irc::string, Module*> hookmodules;
 /** 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
@@ -61,15 +82,14 @@ class SpanningTreeUtilities
 	/** Announce TS changes to channels on merge
 	 */
 	bool AnnounceTSChange;
-	/** Synchronize timestamps between servers
-	 */
-	bool EnableTimeSync;
+
 	/** 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.
 	 */
@@ -89,16 +109,13 @@ class SpanningTreeUtilities
 	/** 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;