X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=1a0203ba09384b9ba989de4818141cb5ba760be7;hb=bdc70892c647f0d7672aba413100730819a4b217;hp=4465de15e4ea439563a86e0f4b3eae6eed2b4aab;hpb=50ea7f41b2e4aca9ef9be31c056f862a7d90609a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 4465de15e..1a0203ba0 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
@@ -64,6 +63,10 @@ class TreeServer : public Server
 	 */
 	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.
 	 */
@@ -82,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? */
 
@@ -143,18 +144,6 @@ class TreeServer : public Server
 	 */
 	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;
@@ -167,14 +156,6 @@ class TreeServer : public Server
 	 */
 	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.
 	 */
@@ -234,6 +215,10 @@ class TreeServer : public Server
 	 */
 	void BeginBurst(unsigned long startms = 0);
 
+	/** Register a PONG from the server
+	 */
+	void OnPong() { pingtimer.OnPong(); }
+
 	CullResult cull();
 
 	/** Destructor, deletes ServerUser unless IsRoot()