X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=874f78750e50279e221fb7d52b7447ab7c271444;hb=517a26252a091eaee0149458a86fc43731bce618;hp=1d053112db127ba8c30efda0e625d82f089c391c;hpb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 1d053112d..874f78750 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #ifndef __TREESERVER_H__
 #define __TREESERVER_H__
 
@@ -24,31 +37,42 @@ class TreeServer : public classbase
 	irc::string ServerName;			/* Server's name */
 	std::string ServerDesc;			/* Server's description */
 	std::string VersionString;		/* Version string or empty string */
-	int UserCount;				/* Not used in this version */
-	int OperCount;				/* Not used in this version */
+	unsigned int ServerUserCount;		/* How many users are on this server? [note: doesn't care about +i] */
+	unsigned int ServerOperCount;		/* How many opers are on this server? */
 	TreeSocket* Socket;			/* For directly connected servers this points at the socket object */
 	time_t NextPing;			/* After this time, the server should be PINGed*/
 	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
+	 * @throws CoreException on duplicate ID
+	 */
+	void SetID(const std::string &id);
 
  public:
 
+	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);
+	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);
+	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.
 	 */
-	TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, TreeServer* Above, TreeSocket* Sock);
+	TreeServer(SpanningTreeUtilities* Util, InspIRCd* Instance, std::string Name, std::string Desc, const std::string &id, TreeServer* Above, TreeSocket* Sock, bool Hide);
 
 	int QuitUsers(const std::string &reason);
 
@@ -90,13 +114,21 @@ class TreeServer : public classbase
 	 */
 	time_t NextPingTime();
 
-	/** Time of last ping used to calculate this->rtt below
+	/** Last ping time in microseconds, used to calculate round trip time
 	 */
-	time_t LastPing;
+	unsigned long LastPingMsec;
 
 	/** Round trip time of last ping
 	 */
-	time_t rtt;
+	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;
 
 	/** True if the server answered their last ping
 	 */
@@ -106,21 +138,21 @@ class TreeServer : public classbase
 	 */
 	void SetPingFlag();
 
-	/** Get the number of users on this server for MAP
+	/** Get the number of users on this server.
 	 */
-	int GetUserCount();
+	unsigned int GetUserCount();
 
-	/** Increment the user counter
+	/** Increment or decrement the user count by diff.
 	 */
-	void AddUserCount();
+	void SetUserCount(int diff);
 
-	/** Decrement the user counter
+	/** Gets the numbers of opers on this server.
 	 */
-	void DelUserCount();
+	unsigned int GetOperCount();
 
-	/** Get the oper count for this server
+	/** Increment or decrement the oper count by diff.
 	 */
-	int GetOperCount();
+	void SetOperCount(int diff);
 
 	/** Get the TreeSocket pointer for local servers.
 	 * For remote servers, this returns NULL.
@@ -158,6 +190,18 @@ class TreeServer : public classbase
 	 */
 	bool Tidy();
 
+	/** Get server ID
+	 */
+	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();
+
 	/** Destructor
 	 */
 	~TreeServer();