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

Sending error if guest tries to join non-standard game.

Browse Source
This commit is contained in:
lotodore
2010-03-28 14:53:08 +00:00
parent 02ebb0d2b3
commit 93b45c1371
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+3
View File
@@ -1387,6 +1387,9 @@ ClientStateWaitJoin::InternalHandlePacket(boost::shared_ptr<ClientThread> client
case joinGameFailureReason_invalidPassword : case joinGameFailureReason_invalidPassword :
failureCode = NTF_NET_JOIN_INVALID_PASSWORD; failureCode = NTF_NET_JOIN_INVALID_PASSWORD;
break; break;
case joinGameFailureReason_notAllowedAsGuest :
failureCode = NTF_NET_JOIN_GUEST_FORBIDDEN;
break;
default : default :
failureCode = NTF_NET_INTERNAL; failureCode = NTF_NET_INTERNAL;
break; break;
src/net/common/serverlobbythread.cpp
+22 -3
View File
@@ -1261,6 +1261,14 @@ ServerLobbyThread::HandleNetPacketCreateGame(SessionWrapper session, const std::
// Create a new game. // Create a new game.
GameData tmpData; GameData tmpData;
NetPacket::GetGameData(&newGame.gameInfo, tmpData); NetPacket::GetGameData(&newGame.gameInfo, tmpData);
if (session.playerData->GetRights() == PLAYER_RIGHTS_GUEST
&& tmpData.gameType != GAME_TYPE_NORMAL)
{
SendJoinGameFailed(session.sessionData, NTF_NET_JOIN_GUEST_FORBIDDEN);
}
else
{
boost::shared_ptr<ServerGame> game( boost::shared_ptr<ServerGame> game(
new ServerGame( new ServerGame(
shared_from_this(), shared_from_this(),
@@ -1277,6 +1285,7 @@ ServerLobbyThread::HandleNetPacketCreateGame(SessionWrapper session, const std::
InternalAddGame(game); InternalAddGame(game);
MoveSessionToGame(*game, session); MoveSessionToGame(*game, session);
}
} }
void void
@@ -1287,15 +1296,22 @@ ServerLobbyThread::HandleNetPacketJoinGame(SessionWrapper session, const std::st
if (pos != m_gameMap.end()) if (pos != m_gameMap.end())
{ {
bool joinGame = true;
ServerGame &game = *pos->second; ServerGame &game = *pos->second;
if (game.CheckPassword(password)) const GameData &tmpData = game.GetGameData();
if (session.playerData->GetRights() == PLAYER_RIGHTS_GUEST
&& tmpData.gameType != GAME_TYPE_NORMAL)
{ {
MoveSessionToGame(game, session); SendJoinGameFailed(session.sessionData, NTF_NET_JOIN_GUEST_FORBIDDEN);
joinGame = false;
} }
else else if (!game.CheckPassword(password))
{ {
SendJoinGameFailed(session.sessionData, NTF_NET_JOIN_INVALID_PASSWORD); SendJoinGameFailed(session.sessionData, NTF_NET_JOIN_INVALID_PASSWORD);
joinGame = false;
} }
if (joinGame)
MoveSessionToGame(game, session);
} }
else else
{ {
@@ -1779,6 +1795,9 @@ ServerLobbyThread::SendJoinGameFailed(boost::shared_ptr<SessionData> s, int reas
case NTF_NET_JOIN_INVALID_PASSWORD : case NTF_NET_JOIN_INVALID_PASSWORD :
joinFailed->joinGameFailureReason = joinGameFailureReason_invalidPassword; joinFailed->joinGameFailureReason = joinGameFailureReason_invalidPassword;
break; break;
case NTF_NET_JOIN_GUEST_FORBIDDEN :
joinFailed->joinGameFailureReason = joinGameFailureReason_notAllowedAsGuest;
break;
default : default :
joinFailed->joinGameFailureReason = joinGameFailureReason_invalidGame; joinFailed->joinGameFailureReason = joinGameFailureReason_invalidGame;
break; break;