X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket.h;h=0dcdc830e105a59df281e65efc82bbe440a7d1b3;hb=27f046550c96714bc78a5e1499431da17c24408a;hp=ae54bc6aab3c5ef0aa8a0fdf9cee8203d480bccb;hpb=0133d660cb643bc09016bcbb20aff08850428b2d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index ae54bc6aa..0dcdc830e 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -22,9 +22,7 @@
 
 #pragma once
 
-#include "socket.h"
 #include "inspircd.h"
-#include "xline.h"
 
 #include "utils.h"
 
@@ -77,6 +75,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
@@ -94,6 +98,11 @@ class TreeSocket : public BufferedSocket
 	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;
 
@@ -154,11 +163,11 @@ class TreeSocket : public BufferedSocket
 	 * to server docs on the inspircd.org site, the other side
 	 * will then send back its own server string.
 	 */
-	virtual void OnConnected();
+	void OnConnected();
 
 	/** Handle socket error event
 	 */
-	virtual void OnError(BufferedSocketError e);
+	void OnError(BufferedSocketError e) CXX11_OVERRIDE;
 
 	/** Sends an error to the remote server, and displays it locally to show
 	 * that it was sent.
@@ -168,13 +177,8 @@ class TreeSocket : public BufferedSocket
 	/** Recursively send the server tree with distances as hops.
 	 * This is used during network burst to inform the other server
 	 * (and any of ITS servers too) of what servers we know about.
-	 * If at any point any of these servers already exist on the other
-	 * end, our connection may be terminated. The hopcounts given
-	 * by this function are relative, this doesn't matter so long as
-	 * they are all >1, as all the remote servers re-calculate them
-	 * to be relative too, with themselves as hop 0.
 	 */
-	void SendServers(TreeServer* Current, TreeServer* s, int hops);
+	void SendServers(TreeServer* Current, TreeServer* s);
 
 	/** Returns module list as a string, filtered by filter
 	 * @param filter a module version bitmask, such as VF_COMMON or VF_OPTCOMMON
@@ -308,12 +312,16 @@ class TreeSocket : public BufferedSocket
 
 	/** Handle socket timeout from connect()
 	 */
-	virtual void OnTimeout();
+	void OnTimeout();
 	/** Handle server quit on close
 	 */
-	virtual void Close();
+	void Close();
 
 	/** Returns true if this server was introduced to the rest of the network
 	 */
 	bool Introduced();
+
+	/** Fixes messages coming from old servers so the new command handlers understand them
+	 */
+	bool PreProcessOldProtocolMessage(User*& who, std::string& cmd, std::vector<std::string>& params);
 };