X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket.h;h=abda283353def3e2fab90d2ea4cdf04593f80f76;hb=ccd4c11ea1a43d079eaae9708482ef4a9148796c;hp=aebc7e03ba6d263fd33a3b4ab2efffad404cb429;hpb=9826eb515cd5097394a20ef66eba4e73448fbc08;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index aebc7e03b..abda28335 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -78,6 +78,12 @@ struct CapabData
 	int capab_phase;			/* Have sent CAPAB already */
 	bool auth_fingerprint;			/* Did we auth using SSL fingerprint */
 	bool auth_challenge;			/* Did we auth using challenge/response */
+
+	// Data saved from incoming SERVER command, for later use when our credentials have been accepted by the other party
+	std::string description;
+	std::string sid;
+	std::string name;
+	bool hidden;
 };
 
 /** Every SERVER connection inbound or outbound is represented by an object of
@@ -91,10 +97,13 @@ class TreeSocket : public BufferedSocket
 	ServerState LinkState;			/* Link state */
 	CapabData* capab;			/* Link setup data (held until burst is sent) */
 	TreeServer* MyRoot;			/* The server we are talking to */
-	time_t NextPing;			/* Time when we are due to ping this server */
-	bool LastPingWasGood;			/* Responded to last ping we sent? */
 	int proto_version;			/* Remote protocol version */
 	bool ConnectionFailureShown; /* Set to true if a connection failure message was shown */
+
+	/** Checks if the given servername and sid are both free
+	 */
+	bool CheckDuplicate(const std::string& servername, const std::string& sid);
+
  public:
 	time_t age;
 
@@ -216,16 +225,16 @@ class TreeSocket : public BufferedSocket
 	 * If the length of a single line is more than 480-NICKMAX
 	 * in length, it is split over multiple lines.
 	 */
-	void SendFJoins(TreeServer* Current, Channel* c);
+	void SendFJoins(Channel* c);
 
 	/** Send G, Q, Z and E lines */
-	void SendXLines(TreeServer* Current);
+	void SendXLines();
 
 	/** Send channel modes and topics */
-	void SendChannelModes(TreeServer* Current);
+	void SendChannelModes();
 
 	/** send all users and their oper state/modes */
-	void SendUsers(TreeServer* Current);
+	void SendUsers();
 
 	/** This function is called when we want to send a netburst to a local
 	 * server. There is a set order we must do this, because for example