More work on rejoin: The server now detects when a rejoin is possible and allows the player to login directly, without waiting for a possible existing connection to be terminated. A session GUID is stored in the cache directory on client side for this purpose.

src/net/clientcontext.h

@@ -120,6 +120,14 @@ public:
 		return m_receiveBuffer;
 	}
 
+	const std::string &GetSessionGuid() const {
+		return m_sessionGuid;
+	}
+
+	void SetSessionGuid(const std::string &sessionGuid) {
+		m_sessionGuid = sessionGuid;
+	}
+
 private:
 	boost::shared_ptr<SessionData> m_sessionData;
 	boost::shared_ptr<boost::asio::ip::tcp::resolver> m_resolver;
@@ -137,6 +145,7 @@ private:
 	std::string			m_cacheDir;
 	bool				m_hasSubscribedLobbyMsg;
 	ReceiveBuffer		m_receiveBuffer;
+	std::string			m_sessionGuid;
 };
 
 #endif