X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=079b6535e8051617212ffc278f156f792fe51afe;hb=7e46119759b7099c38f543bd38d0186b9806542f;hp=45bb8bb41951028fda6fd77d15f5fa9e1df004cf;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 45bb8bb41..079b6535e 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -30,7 +30,6 @@
  */
 class TreeServer : public classbase
 {
-	InspIRCd* ServerInstance;		/* Creator */
 	TreeServer* Parent;			/* Parent entry */
 	TreeServer* Route;			/* Route entry */
 	std::vector<TreeServer*> Children;	/* List of child objects */
@@ -44,7 +43,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,25 +51,23 @@ class TreeServer : public classbase
 	void SetID(const std::string &id);
 
  public:
+	FakeUser* const ServerUser;		/* User representing this server */
+	time_t age;
 
 	bool Warned;				/* True if we've warned opers about high latency on this server */
-
-	/** 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);
+	bool bursting;				/* whether or not this server is bursting */
 
 	/** 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);
-	
+	TreeServer(SpanningTreeUtilities* Util, 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.
 	 */
-	TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id, TreeServer* Above, TreeSocket* Sock, bool Hide);
+	TreeServer(SpanningTreeUtilities* Util, std::string Name, std::string Desc, const std::string &id, TreeServer* Above, TreeSocket* Sock, bool Hide);
 
 	int QuitUsers(const std::string &reason);
 
@@ -113,11 +109,7 @@ class TreeServer : public classbase
 	 */
 	time_t NextPingTime();
 
-	/** Time of last ping used to calculate this->rtt below
-	 */
-	time_t LastPing;
-
-	/** Last ping time in microseconds, used to calculate round trip time
+	/** Last ping time in milliseconds, used to calculate round trip time
 	 */
 	unsigned long LastPingMsec;
 
@@ -125,6 +117,10 @@ class TreeServer : public classbase
 	 */
 	unsigned long rtt;
 
+	/** When we recieved BURST from this server, used to calculate total burst time at ENDBURST.
+	 */
+	unsigned long StartBurst;
+
 	/** True if this server is hidden
 	 */
 	bool Hidden;
@@ -193,14 +189,16 @@ class TreeServer : public classbase
 	 */
 	std::string& GetID();
 
-	/** True on duplicate server ID (server not usable)
+	/** Marks a server as having finished bursting and performs appropriate actions.
 	 */
-	bool DuplicateID();
+	void FinishBurst();
+	/** Recursive call for child servers */
+	void FinishBurstInternal();
 
+	CullResult cull();
 	/** Destructor
 	 */
 	~TreeServer();
-
 };
 
 #endif