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

Fixed some small server issues. Players in the process of establishing a session are now kicked on game start.

Browse Source 
If someone tries to join a game which is already running, a proper error message is shown.
When sending a message to all or all but one players, the players which do not have the session established are now correctly ignored.
This commit is contained in:
lotodore
2007-05-23 08:57:34 +00:00
parent e8cbac12cc
commit e01ea96727
3 changed files with 121 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/serverrecvstate.cpp
+39 -28
View File
@@ -120,6 +120,15 @@ ServerRecvStateInit::Process(ServerRecvThread &server)
return retVal;
}
size_t curNumPlayers = server.GetCurNumberOfPlayers();
// Check the number of players.
if (curNumPlayers >= (size_t)server.GetGameData().numberOfPlayers)
{
server.SessionError(session, ERR_NET_SERVER_FULL);
return retVal;
}
// Check the server password.
if (!server.CheckPassword(joinGameData.password))
{
@@ -127,12 +136,11 @@ ServerRecvStateInit::Process(ServerRecvThread &server)
return retVal;
}
size_t curNumPlayers = server.GetCurNumberOfPlayers();
// Check the number of players.
if (curNumPlayers >= (size_t)server.GetGameData().numberOfPlayers)
// Check whether the player name is correct.
// Paranoia check, this is also done in netpacket.
if (joinGameData.playerName.empty() || joinGameData.playerName.size() > MAX_NAME_SIZE)
{
server.SessionError(session, ERR_NET_SERVER_FULL);
server.SessionError(session, ERR_NET_INVALID_PLAYER_NAME);
return retVal;
}
@@ -177,7 +185,7 @@ ServerRecvStateInit::Process(ServerRecvThread &server)
++player_i;
}
// Send "Player Joined" to other clients.
// Send "Player Joined" to other fully connected clients.
boost::shared_ptr<NetPacket> thisPlayerJoined(new NetPacketPlayerJoined);
NetPacketPlayerJoined::Data thisPlayerJoinedData;
thisPlayerJoinedData.playerId = tmpPlayerData->GetUniqueId();
@@ -185,7 +193,7 @@ ServerRecvStateInit::Process(ServerRecvThread &server)
thisPlayerJoinedData.playerNumber = tmpPlayerData->GetNumber();
thisPlayerJoinedData.ptype = tmpPlayerData->GetType();
static_cast<NetPacketPlayerJoined *>(thisPlayerJoined.get())->SetData(thisPlayerJoinedData);
server.SendToAllButOnePlayers(thisPlayerJoined, session.sessionData->GetSocket());
server.SendToAllPlayers(thisPlayerJoined);
// Set player data for session.
server.SetSessionPlayerData(session.sessionData, tmpPlayerData);
@@ -217,7 +225,8 @@ ServerRecvStateStartGame::~ServerRecvStateStartGame()
void
ServerRecvStateStartGame::HandleNewConnection(ServerRecvThread &server, boost::shared_ptr<ConnectData> connData)
{
// TODO: send error msg
// Do not accept new connections in this state.
server.RejectNewConnection(connData);
}
int
@@ -255,7 +264,8 @@ ServerRecvStateStartHand::~ServerRecvStateStartHand()
void
ServerRecvStateStartHand::HandleNewConnection(ServerRecvThread &server, boost::shared_ptr<ConnectData> connData)
{
// TODO: send error msg
// Do not accept new connections in this state.
server.RejectNewConnection(connData);
}
int
@@ -271,24 +281,20 @@ ServerRecvStateStartHand::Process(ServerRecvThread &server)
// Send cards to all players.
for (int i = 0; i < curGame.getActualQuantityPlayers(); i++)
{
if (playerArray[i]->getNetSessionData().get()) // TODO: this is an assert.
{
int cards[2];
playerArray[i]->getMyCards(cards);
boost::shared_ptr<NetPacket> notifyCards(new NetPacketHandStart);
NetPacketHandStart::Data handStartData;
handStartData.yourCards[0] = static_cast<unsigned>(cards[0]);
handStartData.yourCards[1] = static_cast<unsigned>(cards[1]);
static_cast<NetPacketHandStart *>(notifyCards.get())->SetData(handStartData);
assert(playerArray[i]->getNetSessionData().get()); // TODO throw exception
server.GetSender().Send(playerArray[i]->getNetSessionData()->GetSocket(), notifyCards);
}
int cards[2];
playerArray[i]->getMyCards(cards);
boost::shared_ptr<NetPacket> notifyCards(new NetPacketHandStart);
NetPacketHandStart::Data handStartData;
handStartData.yourCards[0] = static_cast<unsigned>(cards[0]);
handStartData.yourCards[1] = static_cast<unsigned>(cards[1]);
static_cast<NetPacketHandStart *>(notifyCards.get())->SetData(handStartData);
server.GetSender().Send(playerArray[i]->getNetSessionData()->GetSocket(), notifyCards);
}
// Start hand.
curGame.startHand();
// Auto small blind / big blind at the beginning of preflop.
// Auto small blind / big blind at the beginning of hand.
for (int i = 0; i < curGame.getActualQuantityPlayers(); i++)
{
if(playerArray[i]->getMyButton() == BUTTON_SMALL_BLIND)
@@ -320,6 +326,9 @@ ServerRecvStateStartHand::Process(ServerRecvThread &server)
}
}
// Start hand.
curGame.startHand();
server.SetState(ServerRecvStateStartRound::Instance());
return MSG_NET_GAME_SERVER_HAND;
@@ -345,7 +354,8 @@ ServerRecvStateStartRound::~ServerRecvStateStartRound()
void
ServerRecvStateStartRound::HandleNewConnection(ServerRecvThread &server, boost::shared_ptr<ConnectData> connData)
{
// TODO: send error msg
// Do not accept new connections in this state.
server.RejectNewConnection(connData);
}
int
@@ -403,7 +413,7 @@ ServerRecvStateStartRound::GameRun(Game &curGame, int state)
curGame.getCurrentHand()->getRiver()->riverRun();
} break;
default: {
// TODO
//
}
}
}
@@ -427,7 +437,7 @@ ServerRecvStateStartRound::GetCurrentPlayer(Game &curGame)
curPlayerNum = curGame.getCurrentHand()->getRiver()->getPlayersTurn();
} break;
default: {
// TODO
//
}
}
assert(curPlayerNum < curGame.getActualQuantityPlayers());
@@ -455,7 +465,8 @@ ServerRecvStateFinal::~ServerRecvStateFinal()
void
ServerRecvStateFinal::HandleNewConnection(ServerRecvThread &server, boost::shared_ptr<ConnectData> connData)
{
// TODO: send error msg
// Do not accept new connections in this state.
server.RejectNewConnection(connData);
}
int
src/net/common/serverrecvthread.cpp
+78 -21
View File
@@ -246,10 +246,16 @@ ServerRecvThread::CleanupSessionMap()
void
ServerRecvThread::InternalStartGame()
{
SetState(SERVER_START_GAME_STATE::Instance());
// Kick all players which are not fully connected.
RemoveNotEstablishedSessions();
// Initialize the game.
GuiInterface &gui = GetGui();
PlayerDataList playerData = GetPlayerDataList();
// EngineFactory erstellen
// Create EngineFactory
boost::shared_ptr<EngineFactory> factory(new LocalEngineFactory(m_playerConfig)); // LocalEngine erstellen
// Set dealer pos.
@@ -274,12 +280,11 @@ ServerRecvThread::InternalStartGame()
}
++player_i;
}
assert(randDealerFound);
assert(randDealerFound); // TODO: Throw exception.
SetStartData(startData);
m_game.reset(new Game(&gui, factory, playerData, GetGameData(), GetStartData(), m_curGameId++));
SetState(SERVER_START_GAME_STATE::Instance());
}
SessionWrapper
@@ -320,6 +325,15 @@ ServerRecvThread::SessionError(SessionWrapper session, int errorCode)
CloseSessionDelayed(session);
}
void
ServerRecvThread::RejectNewConnection(boost::shared_ptr<ConnectData> connData)
{
// Create a generic session with Id 0.
boost::shared_ptr<SessionData> sessionData(new SessionData(connData->ReleaseSocket(), 0));
// Gracefully close this session.
SessionError(SessionWrapper(sessionData, boost::shared_ptr<PlayerData>()), ERR_NET_GAME_ALREADY_RUNNING);
}
void
ServerRecvThread::CloseSessionDelayed(SessionWrapper session)
{
@@ -348,6 +362,39 @@ ServerRecvThread::CloseSessionDelayed(SessionWrapper session)
m_closeSessionList.push_back(closeSessionData);
}
void
ServerRecvThread::RemoveNotEstablishedSessions()
{
SessionList removeList;
SocketSessionMap::iterator session_i = m_sessionMap.begin();
SocketSessionMap::iterator session_end = m_sessionMap.end();
while (session_i != session_end)
{
// Remove all players which are not fully connected.
assert(session_i->second.sessionData.get());
if (session_i->second.sessionData->GetState() != SessionData::Established)
{
// Do not mess with the map within this loop.
// Just store what needs to be removed.
removeList.push_back(session_i->second);
}
++session_i;
}
SessionList::iterator remove_i = removeList.begin();
SessionList::iterator remove_end = removeList.end();
while (remove_i != remove_end)
{
// Inform the players that we are starting without them.
// Gracefully remove them from the server.
SessionError(*remove_i, ERR_NET_GAME_ALREADY_RUNNING);
++remove_i;
}
}
size_t
ServerRecvThread::GetCurNumberOfPlayers() const
{
@@ -364,6 +411,7 @@ ServerRecvThread::IsPlayerConnected(const std::string &playerName) const
PlayerDataList::const_iterator player_i = playerList.begin();
PlayerDataList::const_iterator player_end = playerList.end();
// Check by name - the name is unique.
while (player_i != player_end)
{
if ((*player_i)->GetName() == playerName)
@@ -380,19 +428,19 @@ ServerRecvThread::IsPlayerConnected(const std::string &playerName) const
void
ServerRecvThread::SetSessionPlayerData(boost::shared_ptr<SessionData> sessionData, boost::shared_ptr<PlayerData> playerData)
{
if (playerData.get() && !playerData->GetName().empty())
assert(playerData.get());
assert(!playerData->GetName().empty());
assert(sessionData.get());
boost::mutex::scoped_lock lock(m_sessionMapMutex);
SocketSessionMap::iterator pos = m_sessionMap.find(sessionData->GetSocket());
if (pos != m_sessionMap.end())
{
assert(sessionData.get());
boost::mutex::scoped_lock lock(m_sessionMapMutex);
pos->second.playerData = playerData;
SocketSessionMap::iterator pos = m_sessionMap.find(sessionData->GetSocket());
if (pos != m_sessionMap.end())
{
pos->second.playerData = playerData;
// Signal joining player to GUI.
GetCallback().SignalNetServerPlayerJoined(playerData->GetName());
}
// Signal joining player to GUI.
GetCallback().SignalNetServerPlayerJoined(playerData->GetName());
}
}
@@ -407,9 +455,14 @@ ServerRecvThread::GetPlayerDataList() const
while (session_i != session_end)
{
boost::shared_ptr<PlayerData> tmpPlayer(session_i->second.playerData);
if (tmpPlayer.get() && !tmpPlayer->GetName().empty())
// Get all players which are fully connected.
if (session_i->second.sessionData->GetState() == SessionData::Established)
{
boost::shared_ptr<PlayerData> tmpPlayer(session_i->second.playerData);
assert(tmpPlayer.get());
assert(!tmpPlayer->GetName().empty());
playerList.push_back(tmpPlayer);
}
++session_i;
}
// Sort the list by player number.
@@ -460,8 +513,11 @@ ServerRecvThread::SendToAllPlayers(boost::shared_ptr<NetPacket> packet)
while (i != end)
{
// Send each client a copy of the packet.
GetSender().Send(i->first, boost::shared_ptr<NetPacket>(packet->Clone()));
assert(i->second.sessionData.get());
// Send each fully connected client a copy of the packet.
if (i->second.sessionData->GetState() == SessionData::Established)
GetSender().Send(i->first, boost::shared_ptr<NetPacket>(packet->Clone()));
++i;
}
}
@@ -477,9 +533,10 @@ ServerRecvThread::SendToAllButOnePlayers(boost::shared_ptr<NetPacket> packet, SO
while (i != end)
{
// Send each client but one a copy of the packet.
if (i->first != except)
GetSender().Send(i->first, boost::shared_ptr<NetPacket>(packet->Clone()));
// Send each fully connected client but one a copy of the packet.
if (i->second.sessionData->GetState() == SessionData::Established)
if (i->first != except)
GetSender().Send(i->first, boost::shared_ptr<NetPacket>(packet->Clone()));
++i;
}
}