From 8e8e1738841966ff9a60622192779b7f9165291b Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 14 Nov 2010 18:26:50 +0000 Subject: [PATCH] Adding new join game failed message if two players with the same ip address want to join a ranking game. --- src/net/common/clientstate.cpp | 3 +++ src/net/common/serverlobbythread.cpp | 5 ++++- src/net/socket_msg.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp index 5130008d..197f4984 100644 --- a/src/net/common/clientstate.cpp +++ b/src/net/common/clientstate.cpp @@ -1408,6 +1408,9 @@ ClientStateWaitJoin::InternalHandlePacket(boost::shared_ptr client case joinGameFailureReason_invalidSettings : failureCode = NTF_NET_JOIN_INVALID_SETTINGS; break; + case joinGameFailureReason_ipAddressBlocked : + failureCode = NTF_NET_JOIN_IP_BLOCKED; + break; default : failureCode = NTF_NET_INTERNAL; break; diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index ad1cf152..09a93fc4 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -1404,7 +1404,7 @@ ServerLobbyThread::HandleNetPacketJoinGame(SessionWrapper session, const std::st && session.sessionData->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR && 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 { @@ -2009,6 +2009,9 @@ ServerLobbyThread::SendJoinGameFailed(boost::shared_ptr s, unsigned case NTF_NET_JOIN_INVALID_SETTINGS : joinFailed->joinGameFailureReason = joinGameFailureReason_invalidSettings; break; + case NTF_NET_JOIN_IP_BLOCKED : + joinFailed->joinGameFailureReason = joinGameFailureReason_ipAddressBlocked; + break; default : joinFailed->joinGameFailureReason = joinGameFailureReason_invalidGame; break; diff --git a/src/net/socket_msg.h b/src/net/socket_msg.h index 6d09b1aa..fd6199c2 100644 --- a/src/net/socket_msg.h +++ b/src/net/socket_msg.h @@ -117,6 +117,7 @@ #define NTF_NET_JOIN_GAME_NAME_IN_USE 216 #define NTF_NET_JOIN_GAME_BAD_NAME 217 #define NTF_NET_JOIN_INVALID_SETTINGS 218 +#define NTF_NET_JOIN_IP_BLOCKED 219 // Notifications - version #define NTF_NET_NEW_RELEASE_AVAILABLE 220