First test version with network timeout. Only activity timeout and global timeout, no game admin timeout yet. Set to test values (will disconnect rapidly).

Modified method for init timeout (if session cannot be established) - now using one non-modifiable timer for each session, and an additional timer which is reset whenever session data is received.

src/net/serverlobbythread.h

@@ -113,7 +113,6 @@ protected:
 	void RequestPlayerAvatar(SessionWrapper session);
 	void NewConnectionLoop();
 	void NewSessionLoop();
-	void CloseSessionLoop();
 	void RemoveGameLoop();
 	void KickPlayerLoop();
 	void UpdateAvatarClientTimerLoop();
@@ -128,7 +127,7 @@ protected:
 	void HandleNewConnection(boost::shared_ptr<ConnectData> connData);
 	void HandleReAddedSession(SessionWrapper session);
 
-	SOCKET Select();
+	bool CheckSessionTimeouts(SessionWrapper session);
 
 	void CleanupConnectQueue();
 	void CleanupSessionMap();
@@ -166,9 +165,6 @@ private:
 	SessionManager m_sessionManager;
 	SessionManager m_gameSessionManager;
 
-	TimerSessionMap m_initTimerSessionMap;
-	mutable boost::mutex m_initTimerSessionMapMutex;
-
 	TimerClientAddressMap m_timerAvatarClientAddressMap;
 	mutable boost::mutex m_timerAvatarClientAddressMapMutex;