sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a very nasty bug concerning the sender thread. SOCKETs were assumed to be kind of unique, but Windows tends to return the socket number of a socket which was just closed as new socket number in accept. This led to very strange behavior when the server was flooded with inits, because the sender thread still had entries for this socket number (which were not removed because they should just fail).

Browse Source 
No longer use socket as key in maps, instead, use the session id. Only use the session id in the sender thread, "resolve" it to the socket only in the moment when it is needed. Outstanding requests will be detected to have an invalid session id then.
Also, as side effect, fixed an issue with two callback classes which were named the same and caused unexpected behavior.
This commit is contained in:
lotodore
2007-10-28 12:53:54 +00:00
parent 2fa888062f
commit fa7af40a49
20 changed files with 223 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/serverlobbythread.h
+8 -5
View File
@@ -70,6 +70,8 @@ public:
void RemoveGame(unsigned id);
bool GetSocketForSession(SessionId session, SOCKET &outSocket);
u_int32_t GetNextUniquePlayerId();
u_int32_t GetNextGameId();
ServerCallback &GetCallback();
@@ -82,7 +84,7 @@ protected:
typedef std::deque<SessionWrapper> SessionQueue;
typedef std::list<SessionWrapper> SessionList;
typedef std::list<std::pair<boost::timers::portable::microsec_timer, boost::shared_ptr<SessionData> > > CloseSessionList;
typedef std::map<SOCKET, boost::timers::portable::microsec_timer> InitTimerSessionMap;
typedef std::map<SessionId, boost::timers::portable::microsec_timer> InitTimerSessionMap;
typedef std::map<unsigned, boost::shared_ptr<ServerGameThread> > GameMap;
typedef std::list<unsigned> RemoveGameList;
@@ -121,9 +123,9 @@ protected:
void CleanupSessionMap();
void CloseSessionDelayed(SessionWrapper session);
void SendError(SOCKET s, int errorCode);
void SendJoinGameFailed(SOCKET s, int reason);
void SendGameList(SOCKET s);
void SendError(SessionId s, int errorCode);
void SendJoinGameFailed(SessionId s, int reason);
void SendGameList(SessionId s);
void BroadcastStatisticsUpdate();
SenderThread &GetSender();
@@ -165,7 +167,7 @@ private:
std::auto_ptr<ReceiverHelper> m_receiver;
std::auto_ptr<SenderThread> m_sender;
std::auto_ptr<ServerSenderCallback> m_senderCallback;
boost::shared_ptr<ServerSenderCallback> m_senderCallback;
GuiInterface &m_gui;
AvatarManager &m_avatarManager;
@@ -174,6 +176,7 @@ private:
u_int32_t m_curGameId;
u_int32_t m_curUniquePlayerId;
u_int32_t m_curSessionId;
mutable boost::mutex m_curUniquePlayerIdMutex;
unsigned m_totalPlayersLoggedIn;