X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=e8db09cdf1946e433bf3bba02161c55e46788e01;hb=b31f343eacdf248aebd6869f2190a3464fd5d555;hp=52841426165a030fc4d85756de4bd502309137bc;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 528414261..e8db09cdf 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.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.
@@ -44,7 +44,6 @@ class TreeServer : public classbase
 	bool LastPingWasGood;			/* True if the server responded to the last PING with a PONG */
 	SpanningTreeUtilities* Utils;		/* Utility class */
 	std::string sid;			/* Server ID */
-	bool DupError;				/* True if the server ID is duplicated (!) */
 
 	/** Set server ID
 	 * @param id Server ID
@@ -53,21 +52,17 @@ class TreeServer : public classbase
 	void SetID(const std::string &id);
 
  public:
+	time_t age;
 
 	bool Warned;				/* True if we've warned opers about high latency on this server */
 	bool bursting;				/* whether or not this server is bursting */
-	
-	/** We don't use this constructor. Its a dummy, and won't cause any insertion
-	 * of the TreeServer into the hash_map. See below for the two we DO use.
-	 */
-	TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, const std::string &id);
 
 	/** We use this constructor only to create the 'root' item, Utils->TreeRoot, which
 	 * represents our own server. Therefore, it has no route, no parent, and
 	 * no socket associated with it. Its version string is our own local version.
 	 */
 	TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id);
-	
+
 	/** When we create a new server, we call this constructor to initialize it.
 	 * This constructor initializes the server's Route and Parent, and sets up
 	 * its ping counters so that it will be pinged one minute from now.
@@ -121,7 +116,7 @@ class TreeServer : public classbase
 	/** Round trip time of last ping
 	 */
 	unsigned long rtt;
-	
+
 	/** When we recieved BURST from this server, used to calculate total burst time at ENDBURST.
 	 */
 	unsigned long StartBurst;
@@ -194,13 +189,11 @@ class TreeServer : public classbase
 	 */
 	std::string& GetID();
 
-	/** True on duplicate server ID (server not usable)
-	 */
-	bool DuplicateID();
-
 	/** Marks a server as having finished bursting and performs appropriate actions.
 	 */
 	void FinishBurst();
+	/** Recursive call for child servers */
+	void FinishBurstInternal();
 
 	/** Destructor
 	 */