More work on server redesign. Network mode still broken.

2007-08-20 15:30:22 +00:00
parent 7a1c1188b8
commit 9d63df9218
16 changed files with 1143 additions and 666 deletions
@@ -50,6 +50,7 @@ public:
 	void Init(const std::string &pwd);

 	void AddConnection(boost::shared_ptr<ConnectData> data);
+	void CloseSessionDelayed(SessionWrapper session);

 	u_int32_t GetNextUniquePlayerId();
 	ServerCallback &GetCallback();
@@ -77,11 +78,8 @@ protected:
 	void CleanupSessionMap();

 	void SessionError(SessionWrapper session, int errorCode);
-	void CloseSessionDelayed(SessionWrapper session);
 	void SendError(SOCKET s, int errorCode);

-	bool IsPlayerConnected(const std::string &playerName) const;
-
 	SenderThread &GetSender();
 	ReceiverHelper &GetReceiver();

@@ -98,6 +96,7 @@ private:
 	SessionManager m_sessionManager;

 	CloseSessionList m_closeSessionList;
+	mutable boost::mutex m_closeSessionListMutex;

 	std::auto_ptr<ReceiverHelper> m_receiver;
 	std::auto_ptr<SenderThread> m_sender;