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

Adding new join game failed message if two players with the same ip address want to join a ranking game.

Browse Source
This commit is contained in:
lotodore
2010-11-14 18:26:50 +00:00
parent 61d8c416b0
commit 8e8e173884
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/clientstate.cpp
+3
View File
@@ -1408,6 +1408,9 @@ ClientStateWaitJoin::InternalHandlePacket(boost::shared_ptr<ClientThread> client
case joinGameFailureReason_invalidSettings : case joinGameFailureReason_invalidSettings :
failureCode = NTF_NET_JOIN_INVALID_SETTINGS; failureCode = NTF_NET_JOIN_INVALID_SETTINGS;
break; break;
case joinGameFailureReason_ipAddressBlocked :
failureCode = NTF_NET_JOIN_IP_BLOCKED;
break;
default : default :
failureCode = NTF_NET_INTERNAL; failureCode = NTF_NET_INTERNAL;
break; break;
src/net/common/serverlobbythread.cpp
+4 -1
View File
@@ -1404,7 +1404,7 @@ ServerLobbyThread::HandleNetPacketJoinGame(SessionWrapper session, const std::st
&& session.sessionData->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR && session.sessionData->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR
&& game.IsClientAddressConnected(session.sessionData->GetClientAddr())) && game.IsClientAddressConnected(session.sessionData->GetClientAddr()))
{ {
SendJoinGameFailed(session.sessionData, joinGame.gameId, NTF_NET_JOIN_GAME_FULL); SendJoinGameFailed(session.sessionData, joinGame.gameId, NTF_NET_JOIN_IP_BLOCKED);
} }
else else
{ {
@@ -2009,6 +2009,9 @@ ServerLobbyThread::SendJoinGameFailed(boost::shared_ptr<SessionData> s, unsigned
case NTF_NET_JOIN_INVALID_SETTINGS : case NTF_NET_JOIN_INVALID_SETTINGS :
joinFailed->joinGameFailureReason = joinGameFailureReason_invalidSettings; joinFailed->joinGameFailureReason = joinGameFailureReason_invalidSettings;
break; break;
case NTF_NET_JOIN_IP_BLOCKED :
joinFailed->joinGameFailureReason = joinGameFailureReason_ipAddressBlocked;
break;
default : default :
joinFailed->joinGameFailureReason = joinGameFailureReason_invalidGame; joinFailed->joinGameFailureReason = joinGameFailureReason_invalidGame;
break; break;
src/net/socket_msg.h
+1
View File
@@ -117,6 +117,7 @@
#define NTF_NET_JOIN_GAME_NAME_IN_USE 216 #define NTF_NET_JOIN_GAME_NAME_IN_USE 216
#define NTF_NET_JOIN_GAME_BAD_NAME 217 #define NTF_NET_JOIN_GAME_BAD_NAME 217
#define NTF_NET_JOIN_INVALID_SETTINGS 218 #define NTF_NET_JOIN_INVALID_SETTINGS 218
#define NTF_NET_JOIN_IP_BLOCKED 219
// Notifications - version // Notifications - version
#define NTF_NET_NEW_RELEASE_AVAILABLE 220 #define NTF_NET_NEW_RELEASE_AVAILABLE 220