X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=b7e9ee9d9bdd865d4de2a09ec54346acbf84dea9;hb=1e96bca9b075aebec490e6892ef2da2a3048ba12;hp=88b43d1820b54d55d5da71ee2f3d19b805ced0af;hpb=001e9c1372a1c6fc2877f9d6607cf662f09228df;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 88b43d182..b7e9ee9d9 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include "treesocket.h"
+#include "pingtimer.h"
 
 /** Each server in the tree is represented by one class of
  * type TreeServer. A locally connected TreeServer can
@@ -49,8 +50,6 @@ class TreeServer : public Server
 	std::string fullversion;
 
 	TreeSocket* Socket;			/* Socket used to communicate with this server */
-	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 */
 	std::string sid;			/* Server ID */
 
 	/** Counter counting how many servers are bursting in front of this server, including
@@ -60,6 +59,14 @@ class TreeServer : public Server
 	 */
 	unsigned int behind_bursting;
 
+	/** True if this server has been lost in a split and is awaiting destruction
+	 */
+	bool isdead;
+
+	/** Timer handling PINGing the server and killing it on timeout
+	 */
+	PingTimer pingtimer;
+
 	/** This method is used to add this TreeServer to the
 	 * hash maps. It is only called by the constructors.
 	 */
@@ -67,7 +74,7 @@ class TreeServer : public Server
 
 	/** Used by SQuit logic to recursively remove servers
 	 */
-	void SQuitInternal(const std::string& reason, int& num_lost_servers, int& num_lost_users);
+	void SQuitInternal(unsigned int& num_lost_servers);
 
 	/** Remove the reference to this server from the hash maps
 	 */
@@ -78,8 +85,6 @@ class TreeServer : public Server
 	FakeUser* const ServerUser;		/* User representing this server */
 	const time_t age;
 
-	bool Warned;				/* True if we've warned opers about high latency on this server */
-
 	unsigned int UserCount;			/* How many users are on this server? [note: doesn't care about +i] */
 	unsigned int OperCount;			/* How many opers are on this server? */
 
@@ -109,13 +114,13 @@ class TreeServer : public Server
 		GetParent()->SQuitChild(this, reason);
 	}
 
-	int QuitUsers(const std::string &reason);
+	static unsigned int QuitUsers(const std::string& reason);
 
 	/** Get route.
 	 * The 'route' is defined as the locally-
 	 * connected server which can be used to reach this server.
 	 */
-	TreeServer* GetRoute();
+	TreeServer* GetRoute() const { return Route; }
 
 	/** Returns true if this server is the tree root (i.e.: us)
 	 */
@@ -125,60 +130,45 @@ class TreeServer : public Server
 	 */
 	bool IsLocal() const { return (this->Route == this); }
 
+	/** Returns true if the server is awaiting destruction
+	 * @return True if the server is waiting to be culled and deleted, false otherwise
+	 */
+	bool IsDead() const { return isdead; }
+
 	/** Get server version string
 	 */
-	const std::string& GetVersion();
+	const std::string& GetVersion() const { return VersionString; }
 
 	/** Get the full version string of this server
 	 * @return The full version string of this server, including patch version and other info
 	 */
 	const std::string& GetFullVersion() const { return fullversion; }
 
-	/** Set time we are next due to ping this server
-	 */
-	void SetNextPingTime(time_t t);
-
-	/** Get the time we are next due to ping this server
-	 */
-	time_t NextPingTime();
-
-	/** Last ping time in milliseconds, used to calculate round trip time
-	 */
-	unsigned long LastPingMsec;
-
 	/** 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;
+	uint64_t StartBurst;
 
 	/** True if this server is hidden
 	 */
 	bool Hidden;
 
-	/** True if the server answered their last ping
-	 */
-	bool AnsweredLastPing();
-
-	/** Set the server as responding to its last ping
-	 */
-	void SetPingFlag();
-
 	/** Get the TreeSocket pointer for local servers.
 	 * For remote servers, this returns NULL.
 	 */
-	TreeSocket* GetSocket();
+	TreeSocket* GetSocket() const { return Socket; }
 
 	/** Get the parent server.
 	 * For the root node, this returns NULL.
 	 */
-	TreeServer* GetParent();
+	TreeServer* GetParent() const { return Parent; }
 
 	/** Set the server version string
 	 */
-	void SetVersion(const std::string &Version);
+	void SetVersion(const std::string& verstr) { VersionString = verstr; }
 
 	/** Set the full version string
 	 * @param verstr The version string to set
@@ -195,23 +185,9 @@ class TreeServer : public Server
 	 */
 	const ChildServers& GetChildren() const { return Children; }
 
-	/** Add a child server
-	 */
-	void AddChild(TreeServer* Child);
-
-	/** Delete a child server, return false if it didn't exist.
-	 */
-	bool DelChild(TreeServer* Child);
-
-	/** Removes child nodes of this node, and of that node, etc etc.
-	 * This is used during netsplits to automatically tidy up the
-	 * server tree. It is slow, we don't use it for much else.
-	 */
-	void Tidy();
-
 	/** Get server ID
 	 */
-	const std::string& GetID();
+	const std::string& GetID() const { return sid; }
 
 	/** Marks a server as having finished bursting and performs appropriate actions.
 	 */
@@ -237,7 +213,11 @@ class TreeServer : public Server
 	/** Set the bursting state of the server
 	 * @param startms Time the server started bursting, if 0 or omitted, use current time
 	 */
-	void BeginBurst(unsigned long startms = 0);
+	void BeginBurst(uint64_t startms = 0);
+
+	/** Register a PONG from the server
+	 */
+	void OnPong() { pingtimer.OnPong(); }
 
 	CullResult cull();