From 1f6c3d8ccf1777b681a29701c5af092b3d62214d Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 28 Dec 2014 01:03:06 +0100 Subject: [PATCH] Builds with protocol changes (currently untested). --- pokerth.proto | 324 +- pokerth_lib.pro | 19 +- src/gui/qt/startwindow/startwindowimpl.cpp | 7 +- src/net/asiosendbuffer.h | 12 +- src/net/clientcontext.h | 90 +- src/net/clientstate.h | 2 +- src/net/clientthread.h | 15 +- src/net/common/asioreceivebuffer.cpp | 2 +- src/net/common/clientstate.cpp | 240 +- src/net/common/clientthread.cpp | 75 +- src/net/common/netpacket.cpp | 21 +- src/net/common/netpacketvalidator.cpp | 1281 --- src/net/common/receivebuffer.cpp | 2 +- src/net/common/servergame.cpp | 101 +- src/net/common/servergamestate.cpp | 508 +- src/net/common/serverlobbythread.cpp | 646 +- src/net/common/sessiondata.cpp | 4 +- src/net/common/sessionmanager.cpp | 6 +- .../validation/authmessagevalidator.cpp | 1227 +-- .../validation/gameenginemessagevalidator.cpp | 1204 +-- .../gamemanagementmessagevalidator.cpp | 1287 +-- .../validation/gamemessagevalidator.cpp | 1249 +-- .../validation/lobbymessagevalidator.cpp | 1137 +-- .../validation/pokerthmessagevalidator.cpp | 1242 +-- src/net/common/webreceivebuffer.cpp | 2 +- src/net/netpacket.h | 12 +- src/net/receivebuffer.h | 4 +- src/net/serveraccepthelper.h | 24 +- src/net/servergame.h | 8 +- src/net/servergamestate.h | 30 +- src/net/serverlobbythread.h | 23 +- src/net/servermanager.h | 6 +- src/net/sessiondata.h | 14 +- src/net/socket_msg.h | 27 +- src/net/validation/authmessagevalidator.h | 110 +- .../validation/gameenginemessagevalidator.h | 119 +- .../gamemanagementmessagevalidator.h | 136 +- src/net/validation/gamemessagevalidator.h | 113 +- src/net/validation/lobbymessagevalidator.h | 146 +- src/net/validation/pokerthmessagevalidator.h | 121 +- src/net/validation/validationhelper.h | 39 +- src/third_party/protobuf/pokerth.pb.cc | 2381 ++--- src/third_party/protobuf/pokerth.pb.h | 2532 +++--- tests/src/de/pokerth/protocol/ProtoBuf.java | 7999 +++++++++-------- 44 files changed, 8769 insertions(+), 15778 deletions(-) delete mode 100644 src/net/common/netpacketvalidator.cpp diff --git a/pokerth.proto b/pokerth.proto index 63fa48ba..b2a5e617 100644 --- a/pokerth.proto +++ b/pokerth.proto @@ -161,6 +161,8 @@ message AuthClientRequestMessage { // Authenticated login data is according to SCRAM SHA-1 optional bytes clientUserData = 6; optional bytes myLastSessionId = 7; + // Ignored for guest login. + optional bytes avatarHash = 8; } message AuthServerChallengeMessage { @@ -172,19 +174,14 @@ message AuthClientResponseMessage { } message AuthServerVerificationMessage { + required bytes serverVerification = 1; +} + +message InitDoneMessage { required bytes yourSessionId = 1; required uint32 yourPlayerId = 2; - optional bytes serverVerification = 3; -} - -message InitMessage { - // Ignored for guest login. - optional bytes avatarHash = 1; -} - -message InitAckMessage { - optional bytes yourAvatarHash = 1; - optional uint32 rejoinGameId = 2; + optional bytes yourAvatarHash = 3; + optional uint32 rejoinGameId = 4; } message AvatarRequestMessage { @@ -314,19 +311,22 @@ message CreateGameFailedMessage { } message JoinGameMessage { - optional string password = 1; - optional bool autoLeave = 2 [default = false]; - optional bool spectateOnly = 3 [default = false]; + required uint32 gameId = 1; + optional string password = 2; + optional bool autoLeave = 3 [default = false]; + optional bool spectateOnly = 4 [default = false]; } message RejoinGameMessage { - optional bool autoLeave = 1 [default = false]; + required uint32 gameId = 1; + optional bool autoLeave = 2 [default = false]; } message JoinGameAckMessage { - required bool areYouGameAdmin = 1; - required NetGameInfo gameInfo = 2; - optional bool spectateOnly = 3; + required uint32 gameId = 1; + required bool areYouGameAdmin = 2; + required NetGameInfo gameInfo = 3; + optional bool spectateOnly = 4; } message JoinGameFailedMessage { @@ -334,13 +334,15 @@ message JoinGameFailedMessage { invalidGame = 1; gameIsFull = 2; gameIsRunning = 3; - invalidPassword = 4; - notInvited = 5; - ipAddressBlocked = 6; - rejoinFailed = 7; - noSpectatorsAllowed = 8; + notAllowedAsGuest = 4; + invalidPassword = 5; + notInvited = 6; + ipAddressBlocked = 7; + rejoinFailed = 8; + noSpectatorsAllowed = 9; } - required JoinGameFailureReason joinGameFailureReason = 1; + required uint32 gameId = 1; + required JoinGameFailureReason joinGameFailureReason = 2; } message GamePlayerJoinedMessage { @@ -746,155 +748,157 @@ message AuthMessage { message LobbyMessage { enum LobbyMessageType { - Type_InitMessage = 1; - Type_InitAckMessage = 2; - Type_AvatarRequestMessage = 3; - Type_AvatarHeaderMessage = 4; - Type_AvatarDataMessage = 5; - Type_AvatarEndMessage = 6; - Type_UnknownAvatarMessage = 7; - Type_PlayerListMessage = 8; - Type_GameListNewMessage = 9; - Type_GameListUpdateMessage = 10; - Type_GameListPlayerJoinedMessage = 11; - Type_GameListPlayerLeftMessage = 12; - Type_GameListSpectatorJoinedMessage = 13; - Type_GameListSpectatorLeftMessage = 14; - Type_GameListAdminChangedMessage = 15; - Type_PlayerInfoRequestMessage = 16; - Type_PlayerInfoReplyMessage = 17; - Type_SubscriptionRequestMessage = 18; - Type_SubscriptionReplyMessage = 19; - Type_CreateGameMessage = 20; - Type_CreateGameFailedMessage = 21; - Type_InvitePlayerToGameMessage = 22; - Type_InviteNotifyMessage = 23; - Type_RejectGameInvitationMessage = 24; - Type_RejectInvNotifyMessage = 25; - Type_StatisticsMessage = 26; - Type_ChatRequestMessage = 27; - Type_ChatMessage = 28; - Type_ChatRejectMessage = 29; - Type_DialogMessage = 30; - Type_TimeoutWarningMessage = 31; - Type_ResetTimeoutMessage = 32; - Type_ReportAvatarMessage = 33; - Type_ReportAvatarAckMessage = 34; - Type_ReportGameMessage = 35; - Type_ReportGameAckMessage = 36; - Type_AdminRemoveGameMessage = 37; - Type_AdminRemoveGameAckMessage = 38; - Type_AdminBanPlayerMessage = 39; - Type_AdminBanPlayerAckMessage = 40; + Type_InitDoneMessage = 1; + Type_AvatarRequestMessage = 2; + Type_AvatarHeaderMessage = 3; + Type_AvatarDataMessage = 4; + Type_AvatarEndMessage = 5; + Type_UnknownAvatarMessage = 6; + Type_PlayerListMessage = 7; + Type_GameListNewMessage = 8; + Type_GameListUpdateMessage = 9; + Type_GameListPlayerJoinedMessage = 10; + Type_GameListPlayerLeftMessage = 11; + Type_GameListSpectatorJoinedMessage = 12; + Type_GameListSpectatorLeftMessage = 13; + Type_GameListAdminChangedMessage = 14; + Type_PlayerInfoRequestMessage = 15; + Type_PlayerInfoReplyMessage = 16; + Type_SubscriptionRequestMessage = 17; + Type_SubscriptionReplyMessage = 18; + Type_CreateGameMessage = 19; + Type_CreateGameFailedMessage = 20; + Type_JoinGameMessage = 21; + Type_RejoinGameMessage = 22; + Type_JoinGameAckMessage = 23; + Type_JoinGameFailedMessage = 24; + Type_InviteNotifyMessage = 25; + Type_RejectGameInvitationMessage = 26; + Type_RejectInvNotifyMessage = 27; + Type_StatisticsMessage = 28; + Type_ChatRequestMessage = 29; + Type_ChatMessage = 30; + Type_ChatRejectMessage = 31; + Type_DialogMessage = 32; + Type_TimeoutWarningMessage = 33; + Type_ResetTimeoutMessage = 34; + Type_ReportAvatarMessage = 35; + Type_ReportAvatarAckMessage = 36; + Type_ReportGameMessage = 37; + Type_ReportGameAckMessage = 38; + Type_AdminRemoveGameMessage = 39; + Type_AdminRemoveGameAckMessage = 40; + Type_AdminBanPlayerMessage = 41; + Type_AdminBanPlayerAckMessage = 42; Type_ErrorMessage = 1024; } required LobbyMessageType messageType = 1; - optional InitMessage initMessage = 2; - optional InitAckMessage initAckMessage = 3; - optional AvatarRequestMessage avatarRequestMessage = 4; - optional AvatarHeaderMessage avatarHeaderMessage = 5; - optional AvatarDataMessage avatarDataMessage = 6; - optional AvatarEndMessage avatarEndMessage = 7; - optional UnknownAvatarMessage unknownAvatarMessage = 8; - optional PlayerListMessage playerListMessage = 9; - optional GameListNewMessage gameListNewMessage = 10; - optional GameListUpdateMessage gameListUpdateMessage = 11; - optional GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; - optional GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; - optional GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; - optional GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; - optional GameListAdminChangedMessage gameListAdminChangedMessage = 16; - optional PlayerInfoRequestMessage playerInfoRequestMessage = 17; - optional PlayerInfoReplyMessage playerInfoReplyMessage = 18; - optional SubscriptionRequestMessage subscriptionRequestMessage = 19; - optional SubscriptionReplyMessage subscriptionReplyMessage = 20; - optional CreateGameMessage createGameMessage = 21; - optional CreateGameFailedMessage createGameFailedMessage = 22; - optional InvitePlayerToGameMessage invitePlayerToGameMessage = 23; - optional InviteNotifyMessage inviteNotifyMessage = 24; - optional RejectGameInvitationMessage rejectGameInvitationMessage = 25; - optional RejectInvNotifyMessage rejectInvNotifyMessage = 26; - optional StatisticsMessage statisticsMessage = 27; - optional ChatRequestMessage chatRequestMessage = 28; - optional ChatMessage chatMessage = 29; - optional ChatRejectMessage chatRejectMessage = 30; - optional DialogMessage dialogMessage = 31; - optional TimeoutWarningMessage timeoutWarningMessage = 32; - optional ResetTimeoutMessage resetTimeoutMessage = 33; - optional ReportAvatarMessage reportAvatarMessage = 34; - optional ReportAvatarAckMessage reportAvatarAckMessage = 35; - optional ReportGameMessage reportGameMessage = 36; - optional ReportGameAckMessage reportGameAckMessage = 37; - optional AdminRemoveGameMessage adminRemoveGameMessage = 38; - optional AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; - optional AdminBanPlayerMessage adminBanPlayerMessage = 40; - optional AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + optional InitDoneMessage initDoneMessage = 2; + optional AvatarRequestMessage avatarRequestMessage = 3; + optional AvatarHeaderMessage avatarHeaderMessage = 4; + optional AvatarDataMessage avatarDataMessage = 5; + optional AvatarEndMessage avatarEndMessage = 6; + optional UnknownAvatarMessage unknownAvatarMessage = 7; + optional PlayerListMessage playerListMessage = 8; + optional GameListNewMessage gameListNewMessage = 9; + optional GameListUpdateMessage gameListUpdateMessage = 10; + optional GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; + optional GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; + optional GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; + optional GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; + optional GameListAdminChangedMessage gameListAdminChangedMessage = 15; + optional PlayerInfoRequestMessage playerInfoRequestMessage = 16; + optional PlayerInfoReplyMessage playerInfoReplyMessage = 17; + optional SubscriptionRequestMessage subscriptionRequestMessage = 18; + optional SubscriptionReplyMessage subscriptionReplyMessage = 19; + optional CreateGameMessage createGameMessage = 20; + optional CreateGameFailedMessage createGameFailedMessage = 21; + optional JoinGameMessage joinGameMessage = 22; + optional RejoinGameMessage rejoinGameMessage = 23; + optional JoinGameAckMessage joinGameAckMessage = 24; + optional JoinGameFailedMessage joinGameFailedMessage = 25; + optional InviteNotifyMessage inviteNotifyMessage = 26; + optional RejectGameInvitationMessage rejectGameInvitationMessage = 27; + optional RejectInvNotifyMessage rejectInvNotifyMessage = 28; + optional StatisticsMessage statisticsMessage = 29; + optional ChatRequestMessage chatRequestMessage = 30; + optional ChatMessage chatMessage = 31; + optional ChatRejectMessage chatRejectMessage = 32; + optional DialogMessage dialogMessage = 33; + optional TimeoutWarningMessage timeoutWarningMessage = 34; + optional ResetTimeoutMessage resetTimeoutMessage = 35; + optional ReportAvatarMessage reportAvatarMessage = 36; + optional ReportAvatarAckMessage reportAvatarAckMessage = 37; + optional ReportGameMessage reportGameMessage = 38; + optional ReportGameAckMessage reportGameAckMessage = 39; + optional AdminRemoveGameMessage adminRemoveGameMessage = 40; + optional AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; + optional AdminBanPlayerMessage adminBanPlayerMessage = 42; + optional AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; optional ErrorMessage errorMessage = 1025; } message GameManagementMessage { enum GameManagementMessageType { - Type_JoinGameMessage = 1; - Type_RejoinGameMessage = 2; - Type_JoinGameAckMessage = 3; - Type_JoinGameFailedMessage = 4; - Type_GamePlayerJoinedMessage = 5; - Type_GamePlayerLeftMessage = 6; - Type_GameSpectatorJoinedMessage = 7; - Type_GameSpectatorLeftMessage = 8; - Type_GameAdminChangedMessage = 9; - Type_RemovedFromGameMessage = 10; - Type_KickPlayerRequestMessage = 11; - Type_LeaveGameRequestMessage = 12; - Type_StartEventMessage = 13; - Type_StartEventAckMessage = 14; - Type_GameStartInitialMessage = 15; - Type_GameStartRejoinMessage = 16; - Type_EndOfGameMessage = 17; - Type_PlayerIdChangedMessage = 18; - Type_AskKickPlayerMessage = 19; - Type_AskKickDeniedMessage = 20; - Type_StartKickPetitionMessage = 21; - Type_VoteKickRequestMessage = 22; - Type_VoteKickReplyMessage = 23; - Type_KickPetitionUpdateMessage = 24; - Type_EndKickPetitionMessage = 25; - Type_ChatRequestMessage = 26; - Type_ChatMessage = 27; - Type_ChatRejectMessage = 28; + Type_GamePlayerJoinedMessage = 1; + Type_GamePlayerLeftMessage = 2; + Type_GameSpectatorJoinedMessage = 3; + Type_GameSpectatorLeftMessage = 4; + Type_GameAdminChangedMessage = 5; + Type_RemovedFromGameMessage = 6; + Type_KickPlayerRequestMessage = 7; + Type_LeaveGameRequestMessage = 8; + Type_InvitePlayerToGameMessage = 9; + Type_StartEventMessage = 10; + Type_StartEventAckMessage = 11; + Type_GameStartInitialMessage = 12; + Type_GameStartRejoinMessage = 13; + Type_EndOfGameMessage = 14; + Type_PlayerIdChangedMessage = 15; + Type_AskKickPlayerMessage = 16; + Type_AskKickDeniedMessage = 17; + Type_StartKickPetitionMessage = 18; + Type_VoteKickRequestMessage = 19; + Type_VoteKickReplyMessage = 20; + Type_KickPetitionUpdateMessage = 21; + Type_EndKickPetitionMessage = 22; + Type_ChatRequestMessage = 23; + Type_ChatMessage = 24; + Type_ChatRejectMessage = 25; + Type_TimeoutWarningMessage = 26; + Type_ResetTimeoutMessage = 27; Type_ErrorMessage = 1024; } required GameManagementMessageType messageType = 1; - optional JoinGameMessage joinGameMessage = 2; - optional RejoinGameMessage rejoinGameMessage = 3; - optional JoinGameAckMessage joinGameAckMessage = 4; - optional JoinGameFailedMessage joinGameFailedMessage = 5; - optional GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; - optional GamePlayerLeftMessage gamePlayerLeftMessage = 7; - optional GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; - optional GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; - optional GameAdminChangedMessage gameAdminChangedMessage = 10; - optional RemovedFromGameMessage removedFromGameMessage = 11; - optional KickPlayerRequestMessage kickPlayerRequestMessage = 12; - optional LeaveGameRequestMessage leaveGameRequestMessage = 13; - optional StartEventMessage startEventMessage = 14; - optional StartEventAckMessage startEventAckMessage = 15; - optional GameStartInitialMessage gameStartInitialMessage = 16; - optional GameStartRejoinMessage gameStartRejoinMessage = 17; - optional EndOfGameMessage endOfGameMessage = 18; - optional PlayerIdChangedMessage playerIdChangedMessage = 19; - optional AskKickPlayerMessage askKickPlayerMessage = 20; - optional AskKickDeniedMessage askKickDeniedMessage = 21; - optional StartKickPetitionMessage startKickPetitionMessage = 22; - optional VoteKickRequestMessage voteKickRequestMessage = 23; - optional VoteKickReplyMessage voteKickReplyMessage = 24; - optional KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; - optional EndKickPetitionMessage endKickPetitionMessage = 26; - optional ChatRequestMessage chatRequestMessage = 27; - optional ChatMessage chatMessage = 28; - optional ChatRejectMessage chatRejectMessage = 29; + optional GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; + optional GamePlayerLeftMessage gamePlayerLeftMessage = 3; + optional GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; + optional GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; + optional GameAdminChangedMessage gameAdminChangedMessage = 6; + optional RemovedFromGameMessage removedFromGameMessage = 7; + optional KickPlayerRequestMessage kickPlayerRequestMessage = 8; + optional LeaveGameRequestMessage leaveGameRequestMessage = 9; + optional InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + optional StartEventMessage startEventMessage = 11; + optional StartEventAckMessage startEventAckMessage = 12; + optional GameStartInitialMessage gameStartInitialMessage = 13; + optional GameStartRejoinMessage gameStartRejoinMessage = 14; + optional EndOfGameMessage endOfGameMessage = 15; + optional PlayerIdChangedMessage playerIdChangedMessage = 16; + optional AskKickPlayerMessage askKickPlayerMessage = 17; + optional AskKickDeniedMessage askKickDeniedMessage = 18; + optional StartKickPetitionMessage startKickPetitionMessage = 19; + optional VoteKickRequestMessage voteKickRequestMessage = 20; + optional VoteKickReplyMessage voteKickReplyMessage = 21; + optional KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; + optional EndKickPetitionMessage endKickPetitionMessage = 23; + optional ChatRequestMessage chatRequestMessage = 24; + optional ChatMessage chatMessage = 25; + optional ChatRejectMessage chatRejectMessage = 26; + optional TimeoutWarningMessage timeoutWarningMessage = 27; + optional ResetTimeoutMessage resetTimeoutMessage = 28; optional ErrorMessage errorMessage = 1025; } diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 225a135b..6ab18b9b 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -71,7 +71,6 @@ HEADERS += \ src/net/clientthread.h \ src/net/genericsocket.h \ src/net/netpacket.h \ - src/net/netpacketvalidator.h \ src/net/senderhelper.h \ src/net/sendercallback.h \ src/net/serverexception.h \ @@ -138,7 +137,14 @@ HEADERS += \ src/net/servermanagerfactory.h \ src/net/uploadcallback.h \ src/net/websocket_defs.h \ - src/net/websocketdata.h + src/net/websocketdata.h \ + src/net/validation/lobbymessagevalidator.h \ + src/net/validation/authmessagevalidator.h \ + src/net/validation/gamemessagevalidator.h \ + src/net/validation/gameenginemessagevalidator.h \ + src/net/validation/gamemanagementmessagevalidator.h \ + src/net/validation/pokerthmessagevalidator.h \ + src/net/validation/validationhelper.h SOURCES += \ src/engine/game.cpp \ @@ -183,7 +189,6 @@ SOURCES += \ src/net/common/downloadhelper.cpp \ src/net/common/downloaderthread.cpp \ src/net/common/netpacket.cpp \ - src/net/common/netpacketvalidator.cpp \ src/net/common/senderhelper.cpp \ src/net/common/sendercallback.cpp \ src/net/common/serverexception.cpp \ @@ -218,7 +223,13 @@ SOURCES += \ src/net/common/receivebuffer.cpp \ src/net/common/asioreceivebuffer.cpp \ src/net/common/webreceivebuffer.cpp \ - src/net/common/uploadcallback.cpp + src/net/common/uploadcallback.cpp \ + src/net/common/validation/authmessagevalidator.cpp \ + src/net/common/validation/gamemessagevalidator.cpp \ + src/net/common/validation/lobbymessagevalidator.cpp \ + src/net/common/validation/pokerthmessagevalidator.cpp \ + src/net/common/validation/gameenginemessagevalidator.cpp \ + src/net/common/validation/gamemanagementmessagevalidator.cpp !android:!android_test{ SOURCES += src/engine/local_engine/tools.cpp diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index a5794b40..0ebc9ead 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -1203,7 +1203,7 @@ void startWindowImpl::networkNotification(int notificationId) QMessageBox::Close); } break; - case NTF_NET_JOIN_GAME_NAME_IN_USE: { + case NTF_NET_CREATE_GAME_NAME_IN_USE: { changeContentDialogImpl dialog(this, myConfig, CHANGE_INET_GAME_NAME_IN_USE); dialog.exec(); if(dialog.result() == QDialog::Accepted) { @@ -1211,7 +1211,7 @@ void startWindowImpl::networkNotification(int notificationId) } } break; - case NTF_NET_JOIN_GAME_BAD_NAME: { + case NTF_NET_CREATE_GAME_BAD_NAME: { changeContentDialogImpl dialog(this, myConfig, CHANGE_INET_BAD_GAME_NAME); dialog.exec(); if(dialog.result() == QDialog::Accepted) { @@ -1231,13 +1231,14 @@ void startWindowImpl::networkNotification(int notificationId) QMessageBox::Close); } break; + case NTF_NET_CREATE_GUEST_FORBIDDEN: case NTF_NET_JOIN_GUEST_FORBIDDEN: { MyMessageBox::warning(this, tr("Network Notification"), tr("You cannot join this type of game as guest."), QMessageBox::Close); } break; - case NTF_NET_JOIN_INVALID_SETTINGS: { + case NTF_NET_CREATE_INVALID_SETTINGS: { MyMessageBox::warning(this, tr("Network Notification"), tr("The settings are invalid for this type of game."), QMessageBox::Close); diff --git a/src/net/asiosendbuffer.h b/src/net/asiosendbuffer.h index 10fdec1a..e78644d4 100644 --- a/src/net/asiosendbuffer.h +++ b/src/net/asiosendbuffer.h @@ -47,16 +47,19 @@ public: AsioSendBuffer(); virtual ~AsioSendBuffer(); - inline size_t GetSendBufLeft() const { + inline size_t GetSendBufLeft() const + { int bytesLeft = (int)(sendBufAllocated - sendBufUsed); return bytesLeft < 0 ? (size_t)0 : (size_t)bytesLeft; } - inline size_t GetAllocated() const { + inline size_t GetAllocated() const + { return sendBufAllocated; } - inline bool ReallocSendBuf() { + inline bool ReallocSendBuf() + { bool retVal = false; size_t allocAmount = sendBufAllocated * 2; if (0 == allocAmount) { @@ -73,7 +76,8 @@ public: return retVal; } - inline void AppendToSendBufWithoutCheck(const char *data, size_t size) { + inline void AppendToSendBufWithoutCheck(const char *data, size_t size) + { std::memcpy(sendBuf + sendBufUsed, data, size); sendBufUsed += size; } diff --git a/src/net/clientcontext.h b/src/net/clientcontext.h index 5040093c..7486970b 100644 --- a/src/net/clientcontext.h +++ b/src/net/clientcontext.h @@ -49,96 +49,126 @@ public: void SetSessionData(boost::shared_ptr sessionData); boost::shared_ptr GetResolver() const; void SetResolver(boost::shared_ptr resolver); - bool GetSctp() const { + bool GetSctp() const + { return m_sctp; } - void SetSctp(bool sctp) { + void SetSctp(bool sctp) + { m_sctp = sctp; } - int GetAddrFamily() const { + int GetAddrFamily() const + { return m_addrFamily; } - void SetAddrFamily(int addrFamily) { + void SetAddrFamily(int addrFamily) + { m_addrFamily = addrFamily; } - const std::string &GetServerAddr() const { + const std::string &GetServerAddr() const + { return m_serverAddr; } - void SetServerAddr(const std::string &serverAddr) { + void SetServerAddr(const std::string &serverAddr) + { m_serverAddr = serverAddr; } - const std::string &GetServerPassword() const { + const std::string &GetServerPassword() const + { return m_serverPassword; } - void SetServerPassword(const std::string &serverPassword) { + void SetServerPassword(const std::string &serverPassword) + { m_serverPassword = serverPassword; } - const std::string &GetServerListUrl() const { + const std::string &GetServerListUrl() const + { return m_serverListUrl; } - void SetServerListUrl(const std::string &serverListUrl) { + void SetServerListUrl(const std::string &serverListUrl) + { m_serverListUrl = serverListUrl; } - bool GetUseServerList() const { + bool GetUseServerList() const + { return m_useServerList; } - void SetUseServerList(bool use) { + void SetUseServerList(bool use) + { m_useServerList = use; } - unsigned GetServerPort() const { + unsigned GetServerPort() const + { return m_serverPort; } - void SetServerPort(unsigned serverPort) { + void SetServerPort(unsigned serverPort) + { m_serverPort = serverPort; } - const std::string &GetAvatarServerAddr() const { + const std::string &GetAvatarServerAddr() const + { return m_avatarServerAddr; } - void SetAvatarServerAddr(const std::string &avatarServerAddr) { + void SetAvatarServerAddr(const std::string &avatarServerAddr) + { m_avatarServerAddr = avatarServerAddr; } - const std::string &GetPassword() const { + const std::string &GetPassword() const + { return m_password; } - void SetPassword(const std::string &password) { + void SetPassword(const std::string &password) + { m_password = password; } - const std::string &GetPlayerName() const { + const std::string &GetPlayerName() const + { return m_playerName; } - void SetPlayerName(const std::string &playerName) { + void SetPlayerName(const std::string &playerName) + { m_playerName = playerName; } - PlayerRights GetPlayerRights() const { + PlayerRights GetPlayerRights() const + { return m_playerRights; } - void SetPlayerRights(PlayerRights rights) { + void SetPlayerRights(PlayerRights rights) + { m_playerRights = rights; } - const std::string &GetAvatarFile() const { + const std::string &GetAvatarFile() const + { return m_avatarFile; } - void SetAvatarFile(const std::string &avatarFile) { + void SetAvatarFile(const std::string &avatarFile) + { m_avatarFile = avatarFile; } - const std::string &GetCacheDir() const { + const std::string &GetCacheDir() const + { return m_cacheDir; } - void SetCacheDir(const std::string &cacheDir) { + void SetCacheDir(const std::string &cacheDir) + { m_cacheDir = cacheDir; } - bool GetSubscribeLobbyMsg() const { + bool GetSubscribeLobbyMsg() const + { return m_hasSubscribedLobbyMsg; } - void SetSubscribeLobbyMsg(bool setSubscribe) { + void SetSubscribeLobbyMsg(bool setSubscribe) + { m_hasSubscribedLobbyMsg = setSubscribe; } - const std::string &GetSessionGuid() const { + const std::string &GetSessionGuid() const + { return m_sessionGuid; } - void SetSessionGuid(const std::string &sessionGuid) { + void SetSessionGuid(const std::string &sessionGuid) + { m_sessionGuid = sessionGuid; } diff --git a/src/net/clientstate.h b/src/net/clientstate.h index 25736bdd..9f6564a8 100644 --- a/src/net/clientstate.h +++ b/src/net/clientstate.h @@ -391,7 +391,7 @@ protected: virtual void InternalHandleAnnounceMsg(boost::shared_ptr /*client*/, const AnnounceMessage &/*announceMsg*/) {} virtual void InternalHandleAuthMsg(boost::shared_ptr /*client*/, const AuthMessage &/*authMsg*/) {} virtual void InternalHandleLobbyMsg(boost::shared_ptr client, const LobbyMessage &lobbyMsg); - virtual void InternalHandleGameMsg(boost::shared_ptr client, const GameMessage &gameMsg); + virtual void InternalHandleGameMsg(boost::shared_ptr /*client*/, const GameMessage &/*gameMsg*/) {} }; // State: Wait for start of the game or start info. diff --git a/src/net/clientthread.h b/src/net/clientthread.h index 55ec12a9..aa5d04bd 100644 --- a/src/net/clientthread.h +++ b/src/net/clientthread.h @@ -66,19 +66,24 @@ class PingData public: PingData() : pingTimer(boost::posix_time::time_duration(0, 0, 0), boost::timers::portable::microsec_timer::manual_start) {} - unsigned MinPing() { + unsigned MinPing() + { return *std::min_element(pingValues.begin(), pingValues.end()); } - unsigned MaxPing() { + unsigned MaxPing() + { return *std::max_element(pingValues.begin(), pingValues.end()); } - unsigned AveragePing() { + unsigned AveragePing() + { return pingValues.empty() ? 0 : (std::accumulate(pingValues.begin(), pingValues.end(), 0) / (unsigned)pingValues.size()); } - void StartPing() { + void StartPing() + { pingTimer.start(); } - bool EndPing() { + bool EndPing() + { bool retVal = false; if (pingTimer.is_running()) { pingValues.push_back((unsigned)pingTimer.elapsed().total_milliseconds()); diff --git a/src/net/common/asioreceivebuffer.cpp b/src/net/common/asioreceivebuffer.cpp index c4f85beb..77700b4c 100644 --- a/src/net/common/asioreceivebuffer.cpp +++ b/src/net/common/asioreceivebuffer.cpp @@ -123,7 +123,7 @@ AsioReceiveBuffer::ScanPackets(boost::shared_ptr session) } } if (tmpPacket) { - if (validator.IsValidPacket(*tmpPacket)) { + if (validator.IsValidMessage(*tmpPacket->GetMsg())) { receivedPackets.push_back(tmpPacket); } else { LOG_ERROR("Session " << session->GetId() << " - Invalid packet: " << tmpPacket->GetMsg()->messagetype()); diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp index 3066f301..fe49de6a 100644 --- a/src/net/common/clientstate.cpp +++ b/src/net/common/clientstate.cpp @@ -587,8 +587,7 @@ AbstractClientStateReceiving::HandleLobbyMsg(boost::shared_ptr cli client->SetPlayerInfo( playerId, tmpInfo); - } - else { + } else { client->SetUnknownPlayer(playerId); } } else if (lobbyMsg.messagetype() == LobbyMessage::Type_TimeoutWarningMessage) { @@ -733,8 +732,7 @@ AbstractClientStateReceiving::HandleLobbyMsg(boost::shared_ptr cli break; } client->GetCallback().SignalNetClientMsgBox(msgCode); - } - else if (lobbyMsg.messagetype() == LobbyMessage::Type_ReportGameAckMessage) { + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_ReportGameAckMessage) { const ReportGameAckMessage &netReportAck = lobbyMsg.reportgameackmessage(); unsigned msgCode; switch (netReportAck.reportgameresult()) { @@ -795,7 +793,7 @@ AbstractClientStateReceiving::HandleLobbyMsg(boost::shared_ptr cli } client->UpdateStatData(tmpStats); } - } else if (lobbyMsg.messagetype() == GameManagementMessage::Type_ErrorMessage) { + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_ErrorMessage) { // Server reported an error. const ErrorMessage &netError = lobbyMsg.errormessage(); // Show the error. @@ -808,8 +806,7 @@ AbstractClientStateReceiving::HandleLobbyMsg(boost::shared_ptr cli void AbstractClientStateReceiving::HandleGameMsg(boost::shared_ptr client, const GameMessage &gameMsg) { - if (gameMsg.messagetype() == GameMessage::Type_GameManagementMessage) - { + if (gameMsg.messagetype() == GameMessage::Type_GameManagementMessage) { const GameManagementMessage &managementMsg = gameMsg.gamemanagementmessage(); if (managementMsg.messagetype() == GameManagementMessage::Type_RemovedFromGameMessage) { const RemovedFromGameMessage &netRemoved = managementMsg.removedfromgamemessage(); @@ -845,8 +842,7 @@ AbstractClientStateReceiving::HandleGameMsg(boost::shared_ptr clie } client->GetCallback().SignalNetClientRemovedFromGame(removeReason); client->SetState(ClientStateWaitJoin::Instance()); - } - else if (managementMsg.messagetype() == GameManagementMessage::Type_GamePlayerLeftMessage) { + } else if (managementMsg.messagetype() == GameManagementMessage::Type_GamePlayerLeftMessage) { // A player left the game. const GamePlayerLeftMessage &netLeft = managementMsg.gameplayerleftmessage(); @@ -867,22 +863,19 @@ AbstractClientStateReceiving::HandleGameMsg(boost::shared_ptr clie break; } client->RemovePlayerData(netLeft.playerid(), removeReason); - } - else if (managementMsg.messagetype() == GameManagementMessage::Type_GameAdminChangedMessage) { + } else if (managementMsg.messagetype() == GameManagementMessage::Type_GameAdminChangedMessage) { // New admin for the game. const GameAdminChangedMessage &netChanged = managementMsg.gameadminchangedmessage(); // Set new game admin and signal to GUI. client->SetNewGameAdmin(netChanged.newadminplayerid()); - } - else if (managementMsg.messagetype() == GameManagementMessage::Type_GamePlayerJoinedMessage) { + } else if (managementMsg.messagetype() == GameManagementMessage::Type_GamePlayerJoinedMessage) { // Another player joined the network game. const GamePlayerJoinedMessage &netPlayerJoined = managementMsg.gameplayerjoinedmessage(); boost::shared_ptr playerData = client->CreatePlayerData(netPlayerJoined.playerid(), netPlayerJoined.isgameadmin()); client->AddPlayerData(playerData); - } - else if (managementMsg.messagetype() == GameManagementMessage::Type_GameSpectatorJoinedMessage) { + } else if (managementMsg.messagetype() == GameManagementMessage::Type_GameSpectatorJoinedMessage) { // Another spectator joined the network game. const GameSpectatorJoinedMessage &netSpectatorJoined = managementMsg.gamespectatorjoinedmessage(); // Request player info if needed. @@ -891,8 +884,7 @@ AbstractClientStateReceiving::HandleGameMsg(boost::shared_ptr clie client->RequestPlayerInfo(netSpectatorJoined.playerid()); } client->ModifyGameInfoAddSpectatorDuringGame(netSpectatorJoined.playerid()); - } - else if (managementMsg.messagetype() == GameManagementMessage::Type_GameSpectatorLeftMessage) { + } else if (managementMsg.messagetype() == GameManagementMessage::Type_GameSpectatorLeftMessage) { // A spectator left the network game. const GameSpectatorLeftMessage &netSpectatorLeft = managementMsg.gamespectatorleftmessage(); // Signal to GUI and remove from data list. @@ -937,11 +929,11 @@ AbstractClientStateReceiving::HandleGameMsg(boost::shared_ptr clie } else if (managementMsg.messagetype() == GameManagementMessage::Type_StartKickPetitionMessage) { const StartKickPetitionMessage &netStartPetition = managementMsg.startkickpetitionmessage(); client->StartPetition(netStartPetition.petitionid(), netStartPetition.proposingplayerid(), - netStartPetition.kickplayerid(), netStartPetition.kicktimeoutsec(), netStartPetition.numvotesneededtokick()); + netStartPetition.kickplayerid(), netStartPetition.kicktimeoutsec(), netStartPetition.numvotesneededtokick()); } else if (managementMsg.messagetype() == GameManagementMessage::Type_KickPetitionUpdateMessage) { const KickPetitionUpdateMessage &netPetitionUpdate = managementMsg.kickpetitionupdatemessage(); client->UpdatePetition(netPetitionUpdate.petitionid(), netPetitionUpdate.numvotesagainstkicking(), - netPetitionUpdate.numvotesinfavourofkicking(), netPetitionUpdate.numvotesneededtokick()); + netPetitionUpdate.numvotesinfavourofkicking(), netPetitionUpdate.numvotesneededtokick()); } else if (managementMsg.messagetype() == GameManagementMessage::Type_EndKickPetitionMessage) { const EndKickPetitionMessage &netEndPetition = managementMsg.endkickpetitionmessage(); client->EndPetition(netEndPetition.petitionid()); @@ -993,10 +985,9 @@ ClientStateStartSession::InternalHandleAnnounceMsg(boost::shared_ptrGetCallback().SignalNetClientNotification(NTF_NET_NEW_RELEASE_AVAILABLE); - } - else if (POKERTH_BETA_REVISION && announceMsg.latestbetarevision() != POKERTH_BETA_REVISION) { + } else if (POKERTH_BETA_REVISION && announceMsg.latestbetarevision() != POKERTH_BETA_REVISION) { client->GetCallback().SignalNetClientNotification(NTF_NET_OUTDATED_BETA); } ClientContext &context = client->GetContext(); @@ -1008,7 +999,7 @@ ClientStateStartSession::InternalHandleAnnounceMsg(boost::shared_ptr auth(new NetPacket); auth->GetMsg()->set_messagetype(PokerTHMessage::Type_AuthMessage); AuthMessage *netAuth = auth->GetMsg()->mutable_authmessage(); @@ -1022,6 +1013,14 @@ ClientStateStartSession::InternalHandleAnnounceMsg(boost::shared_ptrset_login(AuthClientRequestMessage::unauthenticatedLogin); authRequest->set_nickname(context.GetPlayerName()); + string avatarFile = client->GetQtToolsInterface().stringFromUtf8(context.GetAvatarFile()); + if (!avatarFile.empty()) { + MD5Buf tmpMD5; + if (client->GetAvatarManager().GetHashForAvatar(avatarFile, tmpMD5)) { + // Send MD5 hash of avatar. + authRequest->set_avatarhash(tmpMD5.GetData(), MD5_DATA_SIZE); + } + } client->GetSender().Send(context.GetSessionData(), auth); client->SetState(ClientStateWaitSession::Instance()); } @@ -1115,6 +1114,14 @@ ClientStateWaitEnterLogin::TimerLoop(const boost::system::error_code& ec, boost: throw ClientException(__FILE__, __LINE__, ERR_NET_INVALID_PASSWORD, 0); string outUserData(tmpSession->AuthGetNextOutMsg()); authRequest->set_clientuserdata(outUserData); + string avatarFile = client->GetQtToolsInterface().stringFromUtf8(context.GetAvatarFile()); + if (!avatarFile.empty()) { + MD5Buf tmpMD5; + if (client->GetAvatarManager().GetHashForAvatar(avatarFile, tmpMD5)) { + // Send MD5 hash of avatar. + authRequest->set_avatarhash(tmpMD5.GetData(), MD5_DATA_SIZE); + } + } client->GetSender().Send(context.GetSessionData(), auth); client->SetState(ClientStateWaitAuthChallenge::Instance()); } @@ -1215,23 +1222,6 @@ ClientStateWaitAuthVerify::InternalHandleAuthMsg(boost::shared_ptr boost::shared_ptr tmpSession = context.GetSessionData(); if (!tmpSession->AuthStep(3, verificationStr.c_str())) throw ClientException(__FILE__, __LINE__, ERR_NET_INVALID_PASSWORD, 0); - client->SetGuiPlayerId(netAuth.yourplayerid()); - context.SetSessionGuid(netAuth.yoursessionid()); - - boost::shared_ptr init(new NetPacket); - init->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); - LobbyMessage *netLobby = init->GetMsg()->mutable_lobbymessage(); - netLobby->set_messagetype(LobbyMessage::Type_InitMessage); - InitMessage *netInit = netLobby->mutable_initmessage(); - string avatarFile = client->GetQtToolsInterface().stringFromUtf8(context.GetAvatarFile()); - if (!avatarFile.empty()) { - MD5Buf tmpMD5; - if (client->GetAvatarManager().GetHashForAvatar(avatarFile, tmpMD5)) { - // Send MD5 hash of avatar. - netInit->set_avatarhash(tmpMD5.GetData(), MD5_DATA_SIZE); - } - } - client->GetSender().Send(context.GetSessionData(), init); client->SetState(ClientStateWaitSession::Instance()); } } @@ -1266,13 +1256,15 @@ ClientStateWaitSession::Exit(boost::shared_ptr /*client*/) void ClientStateWaitSession::InternalHandleLobbyMsg(boost::shared_ptr client, const LobbyMessage &lobbyMsg) { - if (lobbyMsg.messagetype() == LobbyMessage::Type_InitAckMessage) { + if (lobbyMsg.messagetype() == LobbyMessage::Type_InitDoneMessage) { // Everything is fine - we are in the lobby. - const InitAckMessage &netInitAck = lobbyMsg.initackmessage(); + const InitDoneMessage &netInitDone = lobbyMsg.initdonemessage(); + client->SetGuiPlayerId(netInitDone.yourplayerid()); + client->GetContext().SetSessionGuid(netInitDone.yoursessionid()); client->SetSessionEstablished(true); client->GetCallback().SignalNetClientConnect(MSG_SOCK_SESSION_DONE); - if (netInitAck.has_rejoingameid()) - client->GetCallback().SignalNetClientRejoinPossible(netInitAck.rejoingameid()); + if (netInitDone.has_rejoingameid()) + client->GetCallback().SignalNetClientRejoinPossible(netInitDone.rejoingameid()); client->SetState(ClientStateWaitJoin::Instance()); } else if (lobbyMsg.messagetype() == LobbyMessage::Type_AvatarRequestMessage) { // Before letting us join the lobby, the server requests our avatar. @@ -1321,28 +1313,81 @@ ClientStateWaitJoin::Exit(boost::shared_ptr /*client*/) void ClientStateWaitJoin::InternalHandleLobbyMsg(boost::shared_ptr client, const LobbyMessage &lobbyMsg) { + ClientContext &context = client->GetContext(); if (lobbyMsg.messagetype() == LobbyMessage::Type_CreateGameFailedMessage) { // Failed to create a new game. const CreateGameFailedMessage &netCreateFailed = lobbyMsg.creategamefailedmessage(); int failureCode; switch (netCreateFailed.creategamefailurereason()) { - case CreateGameFailedMessage::notAllowedAsGuest: - failureCode = NTF_NET_JOIN_GUEST_FORBIDDEN; - break; - case CreateGameFailedMessage::gameNameInUse: - failureCode = NTF_NET_JOIN_GAME_NAME_IN_USE; - break; - case CreateGameFailedMessage::badGameName: - failureCode = NTF_NET_JOIN_GAME_BAD_NAME; - break; - case CreateGameFailedMessage::invalidSettings: - failureCode = NTF_NET_JOIN_INVALID_SETTINGS; - break; - default: - failureCode = NTF_NET_INTERNAL; - break; + case CreateGameFailedMessage::notAllowedAsGuest: + failureCode = NTF_NET_CREATE_GUEST_FORBIDDEN; + break; + case CreateGameFailedMessage::gameNameInUse: + failureCode = NTF_NET_CREATE_GAME_NAME_IN_USE; + break; + case CreateGameFailedMessage::badGameName: + failureCode = NTF_NET_CREATE_GAME_BAD_NAME; + break; + case CreateGameFailedMessage::invalidSettings: + failureCode = NTF_NET_CREATE_INVALID_SETTINGS; + break; + default: + failureCode = NTF_NET_INTERNAL; + break; } + client->GetCallback().SignalNetClientNotification(failureCode); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_JoinGameAckMessage) { + const JoinGameAckMessage &netJoinAck = lobbyMsg.joingameackmessage(); + // Successfully joined a game. + client->SetGameId(netJoinAck.gameid()); + GameData tmpData; + NetPacket::GetGameData(netJoinAck.gameinfo(), tmpData); + client->SetGameData(tmpData); + client->ModifyGameInfoClearSpectatorsDuringGame(); + + // Player number is 0 on init. Will be set when the game starts. + boost::shared_ptr playerData( + new PlayerData(client->GetGuiPlayerId(), 0, PLAYER_TYPE_HUMAN, + context.GetPlayerRights(), netJoinAck.areyougameadmin())); + playerData->SetName(context.GetPlayerName()); + playerData->SetAvatarFile(context.GetAvatarFile()); + client->AddPlayerData(playerData); + + client->GetCallback().SignalNetClientGameInfo(MSG_NET_GAME_CLIENT_JOIN); + client->SetState(ClientStateWaitGame::Instance()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_JoinGameFailedMessage) { + // Failed to join a game. + const JoinGameFailedMessage &netJoinFailed = lobbyMsg.joingamefailedmessage(); + + int failureCode; + switch (netJoinFailed.joingamefailurereason()) { + case JoinGameFailedMessage::invalidGame: + failureCode = NTF_NET_JOIN_GAME_INVALID; + break; + case JoinGameFailedMessage::gameIsFull: + failureCode = NTF_NET_JOIN_GAME_FULL; + break; + case JoinGameFailedMessage::gameIsRunning: + failureCode = NTF_NET_JOIN_ALREADY_RUNNING; + break; + case JoinGameFailedMessage::invalidPassword: + failureCode = NTF_NET_JOIN_INVALID_PASSWORD; + break; + case JoinGameFailedMessage::notInvited: + failureCode = NTF_NET_JOIN_NOT_INVITED; + break; + case JoinGameFailedMessage::ipAddressBlocked: + failureCode = NTF_NET_JOIN_IP_BLOCKED; + break; + case JoinGameFailedMessage::rejoinFailed: + failureCode = NTF_NET_JOIN_REJOIN_FAILED; + break; + default: + failureCode = NTF_NET_INTERNAL; + break; + } + client->GetCallback().SignalNetClientNotification(failureCode); } else if (lobbyMsg.messagetype() == LobbyMessage::Type_InviteNotifyMessage) { const InviteNotifyMessage &netInvNotify = lobbyMsg.invitenotifymessage(); @@ -1352,69 +1397,6 @@ ClientStateWaitJoin::InternalHandleLobbyMsg(boost::shared_ptr clie } } -void -ClientStateWaitJoin::InternalHandleGameMsg(boost::shared_ptr client, const GameMessage &gameMsg) -{ - ClientContext &context = client->GetContext(); - - if (gameMsg.messagetype() == GameMessage::Type_GameManagementMessage) { - const GameManagementMessage &managementMsg = gameMsg.gamemanagementmessage(); - if (managementMsg.messagetype() == GameManagementMessage::Type_JoinGameAckMessage) { - const JoinGameAckMessage &netJoinAck = managementMsg.joingameackmessage(); - // Successfully joined a game. - client->SetGameId(gameMsg.gameid()); - GameData tmpData; - NetPacket::GetGameData(netJoinAck.gameinfo(), tmpData); - client->SetGameData(tmpData); - client->ModifyGameInfoClearSpectatorsDuringGame(); - - // Player number is 0 on init. Will be set when the game starts. - boost::shared_ptr playerData( - new PlayerData(client->GetGuiPlayerId(), 0, PLAYER_TYPE_HUMAN, - context.GetPlayerRights(), netJoinAck.areyougameadmin())); - playerData->SetName(context.GetPlayerName()); - playerData->SetAvatarFile(context.GetAvatarFile()); - client->AddPlayerData(playerData); - - client->GetCallback().SignalNetClientGameInfo(MSG_NET_GAME_CLIENT_JOIN); - client->SetState(ClientStateWaitGame::Instance()); - } else if (managementMsg.messagetype() == GameManagementMessage::Type_JoinGameFailedMessage) { - // Failed to join a game. - const JoinGameFailedMessage &netJoinFailed = managementMsg.joingamefailedmessage(); - - int failureCode; - switch (netJoinFailed.joingamefailurereason()) { - case JoinGameFailedMessage::invalidGame: - failureCode = NTF_NET_JOIN_GAME_INVALID; - break; - case JoinGameFailedMessage::gameIsFull: - failureCode = NTF_NET_JOIN_GAME_FULL; - break; - case JoinGameFailedMessage::gameIsRunning: - failureCode = NTF_NET_JOIN_ALREADY_RUNNING; - break; - case JoinGameFailedMessage::invalidPassword: - failureCode = NTF_NET_JOIN_INVALID_PASSWORD; - break; - case JoinGameFailedMessage::notInvited: - failureCode = NTF_NET_JOIN_NOT_INVITED; - break; - case JoinGameFailedMessage::ipAddressBlocked: - failureCode = NTF_NET_JOIN_IP_BLOCKED; - break; - case JoinGameFailedMessage::rejoinFailed: - failureCode = NTF_NET_JOIN_REJOIN_FAILED; - break; - default: - failureCode = NTF_NET_INTERNAL; - break; - } - - client->GetCallback().SignalNetClientNotification(failureCode); - } - } -} - //----------------------------------------------------------------------------- ClientStateWaitGame & @@ -1463,8 +1445,7 @@ ClientStateWaitGame::InternalHandleLobbyMsg(boost::shared_ptr clie void ClientStateWaitGame::InternalHandleGameMsg(boost::shared_ptr client, const GameMessage &gameMsg) { - if (gameMsg.messagetype() == GameMessage::Type_GameManagementMessage) - { + if (gameMsg.messagetype() == GameMessage::Type_GameManagementMessage) { const GameManagementMessage &managementMsg = gameMsg.gamemanagementmessage(); if (managementMsg.messagetype() == GameManagementMessage::Type_StartEventMessage) { const StartEventMessage &netStartEvent = managementMsg.starteventmessage(); @@ -1591,7 +1572,7 @@ ClientStateWaitStart::InternalHandleGameMsg(boost::shared_ptr clie if (gameMsg.messagetype() == GameMessage::Type_GameManagementMessage) { const GameManagementMessage &managementMsg = gameMsg.gamemanagementmessage(); if (managementMsg.messagetype() == GameManagementMessage::Type_GameStartInitialMessage - || managementMsg.messagetype() == GameManagementMessage::Type_GameStartRejoinMessage) { + || managementMsg.messagetype() == GameManagementMessage::Type_GameStartRejoinMessage) { PlayerIdList tmpPlayerList; unsigned tmpHandId = 0; @@ -1691,8 +1672,7 @@ ClientStateWaitHand::InternalHandleGameMsg(boost::shared_ptr clien { if (gameMsg.messagetype() == GameMessage::Type_GameManagementMessage) { const GameManagementMessage &managementMsg = gameMsg.gamemanagementmessage(); - if (managementMsg.messagetype() == GameManagementMessage::Type_EndOfGameMessage) - { + if (managementMsg.messagetype() == GameManagementMessage::Type_EndOfGameMessage) { boost::shared_ptr curGame = client->GetGame(); if (curGame) { const EndOfGameMessage &netEndOfGame = managementMsg.endofgamemessage(); @@ -1890,7 +1870,7 @@ ClientStateRunHand::InternalHandleGameMsg(boost::shared_ptr client tmpPlayer->getMyName(), client->GetClientLog()->transformPlayerActionLog(PlayerAction(netActionDone.playeraction())), netActionDone.totalplayerbet() - tmpPlayer->getMySet() - ); + ); if (tmpPlayer->getMyID() == 0) { client->EndPing(); } @@ -1922,7 +1902,7 @@ ClientStateRunHand::InternalHandleGameMsg(boost::shared_ptr client curGame->getCurrentHand()->getSmallBlind() * 2, curGame->getPlayerByUniqueId(curGame->getCurrentHand()->getCurrentBeRo()->getBigBlindPositionId())->getMyID() + 1, curGame->getSeatsList() - ); + ); } // Stop the timeout for the player. @@ -2051,7 +2031,7 @@ ClientStateRunHand::InternalHandleGameMsg(boost::shared_ptr client if (curGame->getCurrentHand()->getCurrentRound() < GAME_STATE_RIVER) { client->GetClientLog()->logHoleCardsHandName( curGame->getActivePlayerList() - ); + ); } } else if (engineMsg.messagetype() == GameEngineMessage::Type_EndOfHandHideCardsMessage) { const EndOfHandHideCardsMessage &hideCards = engineMsg.endofhandhidecardsmessage(); diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp index d04e0bd5..68cba6bc 100644 --- a/src/net/common/clientthread.cpp +++ b/src/net/common/clientthread.cpp @@ -259,13 +259,11 @@ ClientThread::SendJoinFirstGame(const std::string &password, bool autoLeave) // Warning: This function is called in the context of the GUI thread. // Create a network packet to request joining a game. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); - GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); - netGame->set_gameid(1); - netGame->set_messagetype(GameMessage::Type_GameManagementMessage); - GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); - netManage->set_messagetype(GameManagementMessage::Type_JoinGameMessage); - JoinGameMessage *netJoinGame = netManage->mutable_joingamemessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_JoinGameMessage); + JoinGameMessage *netJoinGame = netLobby->mutable_joingamemessage(); + netJoinGame->set_gameid(1); netJoinGame->set_autoleave(autoLeave); if (!password.empty()) { @@ -280,13 +278,11 @@ ClientThread::SendJoinGame(unsigned gameId, const std::string &password, bool au // Warning: This function is called in the context of the GUI thread. // Create a network packet to request joining a game. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); - GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); - netGame->set_gameid(gameId); - netGame->set_messagetype(GameMessage::Type_GameManagementMessage); - GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); - netManage->set_messagetype(GameManagementMessage::Type_JoinGameMessage); - JoinGameMessage *netJoinGame = netManage->mutable_joingamemessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_JoinGameMessage); + JoinGameMessage *netJoinGame = netLobby->mutable_joingamemessage(); + netJoinGame->set_gameid(gameId); netJoinGame->set_autoleave(autoLeave); if (!password.empty()) { @@ -301,13 +297,11 @@ ClientThread::SendRejoinGame(unsigned gameId, bool autoLeave) // Warning: This function is called in the context of the GUI thread. // Create a network packet to request rejoining a running game. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); - GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); - netGame->set_gameid(gameId); - netGame->set_messagetype(GameMessage::Type_GameManagementMessage); - GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); - netManage->set_messagetype(GameManagementMessage::Type_RejoinGameMessage); - RejoinGameMessage *netJoinGame = netManage->mutable_rejoingamemessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_RejoinGameMessage); + RejoinGameMessage *netJoinGame = netLobby->mutable_rejoingamemessage(); + netJoinGame->set_gameid(gameId); netJoinGame->set_autoleave(autoLeave); m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet)); @@ -397,11 +391,13 @@ void ClientThread::SendInvitePlayerToCurrentGame(unsigned playerId) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); - LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); - netLobby->set_messagetype(LobbyMessage::Type_InvitePlayerToGameMessage); - InvitePlayerToGameMessage *netInvite = netLobby->mutable_inviteplayertogamemessage(); - netInvite->set_gameid(GetGameId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(GetGameId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameManagementMessage *netManagement = netGame->mutable_gamemanagementmessage(); + netManagement->set_messagetype(GameManagementMessage::Type_InvitePlayerToGameMessage); + InvitePlayerToGameMessage *netInvite = netManagement->mutable_inviteplayertogamemessage(); netInvite->set_playerid(playerId); m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet)); } @@ -487,20 +483,19 @@ ClientThread::CloseSession(boost::shared_ptr /*session*/) void ClientThread::HandlePacket(boost::shared_ptr /*session*/, boost::shared_ptr packet) { - switch (packet->GetMsg()->messagetype()) - { - case PokerTHMessage::Type_AnnounceMessage : - GetState().HandleAnnounceMsg(shared_from_this(), packet->GetMsg()->announcemessage()); - break; - case PokerTHMessage::Type_AuthMessage : - GetState().HandleAuthMsg(shared_from_this(), packet->GetMsg()->authmessage()); - break; - case PokerTHMessage::Type_GameMessage : - GetState().HandleGameMsg(shared_from_this(), packet->GetMsg()->gamemessage()); - break; - case PokerTHMessage::Type_LobbyMessage : - GetState().HandleLobbyMsg(shared_from_this(), packet->GetMsg()->lobbymessage()); - break; + switch (packet->GetMsg()->messagetype()) { + case PokerTHMessage::Type_AnnounceMessage : + GetState().HandleAnnounceMsg(shared_from_this(), packet->GetMsg()->announcemessage()); + break; + case PokerTHMessage::Type_AuthMessage : + GetState().HandleAuthMsg(shared_from_this(), packet->GetMsg()->authmessage()); + break; + case PokerTHMessage::Type_GameMessage : + GetState().HandleGameMsg(shared_from_this(), packet->GetMsg()->gamemessage()); + break; + case PokerTHMessage::Type_LobbyMessage : + GetState().HandleLobbyMsg(shared_from_this(), packet->GetMsg()->lobbymessage()); + break; } } diff --git a/src/net/common/netpacket.cpp b/src/net/common/netpacket.cpp index de519309..364bd30b 100644 --- a/src/net/common/netpacket.cpp +++ b/src/net/common/netpacket.cpp @@ -72,20 +72,21 @@ bool NetPacket::IsClientActivity() const { bool retVal = false; + bool isAuthMsg = m_msg->messagetype() == PokerTHMessage::Type_AuthMessage; bool isLobbyMsg = m_msg->messagetype() == PokerTHMessage::Type_LobbyMessage; bool isGameManagementMsg = m_msg->messagetype() == PokerTHMessage::Type_GameMessage && m_msg->gamemessage().messagetype() == GameMessage::Type_GameManagementMessage; bool isGameEngineMsg = m_msg->messagetype() == PokerTHMessage::Type_GameMessage && m_msg->gamemessage().messagetype() == GameMessage::Type_GameEngineMessage; if (m_msg && - (isLobbyMsg && m_msg->lobbymessage().messagetype() == LobbyMessage::Type_InitMessage - || isLobbyMsg && m_msg->lobbymessage().messagetype() == LobbyMessage::Type_CreateGameMessage - || isLobbyMsg && m_msg->lobbymessage().messagetype() == LobbyMessage::Type_ResetTimeoutMessage - || isGameManagementMsg && m_msg->gamemessage().gamemanagementmessage().messagetype() == GameManagementMessage::Type_JoinGameMessage - || isGameManagementMsg && m_msg->gamemessage().gamemanagementmessage().messagetype() == GameManagementMessage::Type_RejoinGameMessage - || isGameManagementMsg && m_msg->gamemessage().gamemanagementmessage().messagetype() == GameManagementMessage::Type_KickPlayerRequestMessage - || isGameManagementMsg && m_msg->gamemessage().gamemanagementmessage().messagetype() == GameManagementMessage::Type_LeaveGameRequestMessage - || isGameManagementMsg && m_msg->gamemessage().gamemanagementmessage().messagetype() == GameManagementMessage::Type_StartEventMessage - || isGameManagementMsg && m_msg->gamemessage().gamemanagementmessage().messagetype() == GameManagementMessage::Type_ChatRequestMessage - || isGameEngineMsg && m_msg->gamemessage().gameenginemessage().messagetype() == GameEngineMessage::Type_MyActionRequestMessage)) { + ((isAuthMsg && m_msg->authmessage().messagetype() == AuthMessage::Type_AuthClientRequestMessage) + || (isLobbyMsg && m_msg->lobbymessage().messagetype() == LobbyMessage::Type_CreateGameMessage) + || (isLobbyMsg && m_msg->lobbymessage().messagetype() == LobbyMessage::Type_ResetTimeoutMessage) + || (isLobbyMsg && m_msg->lobbymessage().messagetype() == LobbyMessage::Type_JoinGameMessage) + || (isLobbyMsg && m_msg->lobbymessage().messagetype() == LobbyMessage::Type_RejoinGameMessage) + || (isGameManagementMsg && m_msg->gamemessage().gamemanagementmessage().messagetype() == GameManagementMessage::Type_KickPlayerRequestMessage) + || (isGameManagementMsg && m_msg->gamemessage().gamemanagementmessage().messagetype() == GameManagementMessage::Type_LeaveGameRequestMessage) + || (isGameManagementMsg && m_msg->gamemessage().gamemanagementmessage().messagetype() == GameManagementMessage::Type_StartEventMessage) + || (isGameManagementMsg && m_msg->gamemessage().gamemanagementmessage().messagetype() == GameManagementMessage::Type_ChatRequestMessage) + || (isGameEngineMsg && m_msg->gamemessage().gameenginemessage().messagetype() == GameEngineMessage::Type_MyActionRequestMessage))) { retVal = true; } return retVal; diff --git a/src/net/common/netpacketvalidator.cpp b/src/net/common/netpacketvalidator.cpp deleted file mode 100644 index 5eb51849..00000000 --- a/src/net/common/netpacketvalidator.cpp +++ /dev/null @@ -1,1281 +0,0 @@ -/***************************************************************************** - * PokerTH - The open source texas holdem engine * - * Copyright (C) 2006-2012 Felix Hammer, Florian Thauer, Lothar May * - * * - * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * - * published by the Free Software Foundation, either version 3 of the * - * License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU Affero General Public License for more details. * - * * - * You should have received a copy of the GNU Affero General Public License * - * along with this program. If not, see . * - * * - * * - * Additional permission under GNU AGPL version 3 section 7 * - * * - * If you modify this program, or any covered work, by linking or * - * combining it with the OpenSSL project's OpenSSL library (or a * - * modified version of that library), containing parts covered by the * - * terms of the OpenSSL or SSLeay licenses, the authors of PokerTH * - * (Felix Hammer, Florian Thauer, Lothar May) grant you additional * - * permission to convey the resulting work. * - * Corresponding Source for a non-source form of such a combination * - * shall include the source code for the parts of OpenSSL used as well * - * as that of the covered work. * - *****************************************************************************/ - -#include -#include - -using namespace std; - -#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535) -#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize)) -#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval)) -#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval)) -#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize)) - -static bool -ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval) -{ - bool retVal = true; - for (int i = 0; i < l.size(); i++) { - if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) { - retVal = false; - break; - } - } - return retVal; -} - -NetPacketValidator::NetPacketValidator() -{ - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_InitMessage, ValidateInitMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_InitAckMessage, ValidateInitAckMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_PlayerListMessage, ValidatePlayerListMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameListNewMessage, ValidateGameListNewMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_JoinExistingGameMessage, ValidateJoinExistingGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_JoinNewGameMessage, ValidateJoinNewGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_RejoinExistingGameMessage, ValidateRejoinExistingGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_StartEventMessage, ValidateStartEventMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_HandStartMessage, ValidateHandStartMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_StatisticsMessage, ValidateStatisticsMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ChatMessage, ValidateChatMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_DialogMessage, ValidateDialogMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ReportGameMessage, ValidateReportGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_ErrorMessage, ValidateErrorMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage)); -} - -bool -NetPacketValidator::IsValidPacket(const NetPacket &packet) const -{ - // Default: Invalid packet. - bool retVal = false; - ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype()); - if (pos != m_validationMap.end()) { - // Call validation functor. - retVal = pos->second(packet); - } - return retVal; -} - -bool -NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_announcemessage()) { - const AnnounceMessage &msg = packet.GetMsg()->announcemessage(); - if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion()) - && VALIDATE_IS_UINT16(msg.protocolversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().majorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestbetarevision()) - && VALIDATE_IS_UINT16(msg.numplayersonserver())) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInitMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_initmessage()) { - const InitMessage &msg = packet.GetMsg()->initmessage(); - if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion()) - && VALIDATE_IS_UINT16(msg.requestedversion().minorversion()) - && (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16) - && (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64)) - && (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64)) - && (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256)) - && (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserverchallengemessage()) { - const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage(); - if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authclientresponsemessage()) { - const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage(); - if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserververificationmessage()) { - const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage(); - if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_initackmessage()) { - const InitAckMessage &msg = packet.GetMsg()->initackmessage(); - if (msg.yoursessionid().size() == 16 - && msg.yourplayerid() != 0 - && (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16) - && (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarrequestmessage()) { - const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage(); - if (msg.requestid() != 0 - && msg.avatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarheadermessage()) { - const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage(); - if (msg.requestid() != 0 - && VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatardatamessage()) { - const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage(); - if (msg.requestid() != 0 - && VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarendmessage()) { - const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_unknownavatarmessage()) { - const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerlistmessage()) { - const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage(); - if (msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistnewmessage()) { - const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerids(), 0, 10) - && msg.adminplayerid() != 0 - && ValidateGameInfo(msg.gameinfo())) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistupdatemessage()) { - const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) { - const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerleftmessage()) { - const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistadminchangedmessage()) { - const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforequestmessage()) { - const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage(); - if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforeplymessage()) { - const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage(); - if (msg.playerid() != 0) { - // TODO maybe additional checks. - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_subscriptionrequestmessage()) { - //const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinExistingGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joinexistinggamemessage()) { - const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage(); - if (msg.gameid() != 0 - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinNewGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joinnewgamemessage()) { - const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage(); - if (ValidateGameInfo(msg.gameinfo()) - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejoinExistingGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejoinexistinggamemessage()) { - const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joingameackmessage()) { - const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage(); - if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joingamefailedmessage()) { - const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameplayerjoinedmessage()) { - const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameplayerleftmessage()) { - const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameadminchangedmessage()) { - const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_removedfromgamemessage()) { - const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickplayerrequestmessage()) { - const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_leavegamerequestmessage()) { - const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_inviteplayertogamemessage()) { - const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_invitenotifymessage()) { - const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage(); - if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectgameinvitationmessage()) { - const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectinvnotifymessage()) { - const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventmessage()) { - const StartEventMessage &msg = packet.GetMsg()->starteventmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventackmessage()) { - const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartinitialmessage()) { - const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartrejoinmessage()) { - const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && msg.handnum() != 0 - && VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_handstartmessage()) { - const HandStartMessage &msg = packet.GetMsg()->handstartmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000) - && VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersturnmessage()) { - const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0 ) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_myactionrequestmessage()) { - const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage(); - if (msg.gameid() != 0 - && msg.handnum() != 0 - && VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_youractionrejectedmessage()) { - const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersactiondonemessage()) { - const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealflopcardsmessage()) { - const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.flopcard1(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard2(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealturncardmessage()) { - const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.turncard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealrivercardmessage()) { - const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.rivercard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_allinshowcardsmessage()) { - const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandshowcardsmessage()) { - const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandhidecardsmessage()) { - const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_showmycardsrequestmessage()) { - // const ShowMyCardsRequestMessage &msg = packet.GetMsg()->showmycardsrequestmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_afterhandshowcardsmessage()) { - //const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofgamemessage()) { - const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage(); - if (msg.gameid() != 0 && msg.winnerplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playeridchangedmessage()) { - const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage(); - if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickplayermessage()) { - const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickdeniedmessage()) { - const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_startkickpetitionmessage()) { - const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage(); - if (msg.gameid() != 0 - && msg.petitionid() != 0 - && msg.proposingplayerid() != 0 - && msg.kickplayerid() != 0 - && msg.kicktimeoutsec() > 0 - && msg.numvotesneededtokick() > 0) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickrequestmessage()) { - const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickreplymessage()) { - const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickpetitionupdatemessage()) { - const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endkickpetitionmessage()) { - const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_statisticsmessage()) { - //const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrequestmessage()) { - const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatmessage()) { - const ChatMessage &msg = packet.GetMsg()->chatmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrejectmessage()) { - const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDialogMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dialogmessage()) { - const DialogMessage &msg = packet.GetMsg()->dialogmessage(); - if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_timeoutwarningmessage()) { - //const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_resettimeoutmessage()) { - // const ResetTimeoutMessage &msg = packet.GetMsg()->resettimeoutmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarmessage()) { - const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage(); - if (msg.reportedplayerid() != 0 - && msg.reportedavatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarackmessage()) { - const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage(); - if (msg.reportedplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgamemessage()) { - const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgameackmessage()) { - const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateErrorMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_errormessage()) { - //const ErrorMessage &msg = packet.GetMsg()->errormessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegamemessage()) { - const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegameackmessage()) { - const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayermessage()) { - const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayerackmessage()) { - const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo) -{ - bool retVal = false; - if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64) - && VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10) - && (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000)) - && (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000)) - && (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000)) - && VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11) - && VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20) - && VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60) - && VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000) - && VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000) - && VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30) - && ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) { - - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) { - const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorleftmessage()) { - const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamespectatorjoinedmessage()) { - const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamespectatorleftmessage()) { - const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - diff --git a/src/net/common/receivebuffer.cpp b/src/net/common/receivebuffer.cpp index f52566d6..3893ad28 100644 --- a/src/net/common/receivebuffer.cpp +++ b/src/net/common/receivebuffer.cpp @@ -31,7 +31,7 @@ #include -NetPacketValidator ReceiveBuffer::validator; +PokerTHMessageValidator ReceiveBuffer::validator; ReceiveBuffer::~ReceiveBuffer() { diff --git a/src/net/common/servergame.cpp b/src/net/common/servergame.cpp index 41884d0e..e0608d59 100644 --- a/src/net/common/servergame.cpp +++ b/src/net/common/servergame.cpp @@ -68,11 +68,11 @@ static bool LessThanPlayerHandStartMoney(const boost::shared_ptr lobbyThread, u_int32_t id, const string &name, const string &pwd, const GameData &gameData, unsigned adminPlayerId, unsigned creatorPlayerDBId, GuiInterface &gui, ConfigFile &playerConfig, const ServerMode mode) : m_adminPlayerId(adminPlayerId), m_lobbyThread(lobbyThread), m_gui(gui), - m_gameData(gameData), m_curState(NULL), m_id(id), m_name(name), + m_serverDelayTime(mode), m_gameData(gameData), m_curState(NULL), m_id(id), m_name(name), m_password(pwd), m_creatorPlayerDBId(creatorPlayerDBId), m_playerConfig(playerConfig), m_gameNum(1), m_curPetitionId(1), m_voteKickTimer(lobbyThread->GetIOService()), m_stateTimer1(lobbyThread->GetIOService()), m_stateTimer2(lobbyThread->GetIOService()), - m_isNameReported(false), m_serverDelayTime(mode) + m_isNameReported(false) { LOG_VERBOSE("Game object " << GetId() << " created."); } @@ -171,10 +171,9 @@ ServerGame::MarkPlayerAsKicked(unsigned playerId) } void -ServerGame::HandlePacket(boost::shared_ptr session, boost::shared_ptr packet) +ServerGame::HandleGameMsg(boost::shared_ptr session, const GameMessage &gameMsg) { - if (session && packet) - GetState().ProcessPacket(shared_from_this(), session, packet); + GetState().HandleGameMsg(shared_from_this(), session, gameMsg); } GameState @@ -265,9 +264,13 @@ ServerGame::TimerVoteKick(const boost::system::error_code &ec) } if (abortPetition) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_EndKickPetitionMessage); - EndKickPetitionMessage *netEndPetition = packet->GetMsg()->mutable_endkickpetitionmessage(); - netEndPetition->set_gameid(GetId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_EndKickPetitionMessage); + EndKickPetitionMessage *netEndPetition = netManage->mutable_endkickpetitionmessage(); netEndPetition->set_petitionid(m_voteKickData->petitionId); netEndPetition->set_numvotesagainstkicking(m_voteKickData->numVotesAgainstKicking); netEndPetition->set_numvotesinfavourofkicking(m_voteKickData->numVotesInFavourOfKicking); @@ -509,9 +512,13 @@ ServerGame::InternalAskVoteKick(boost::shared_ptr byWhom, unsigned m_voteKickData->votedPlayerIds.push_back(playerIdByWhom); boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_StartKickPetitionMessage); - StartKickPetitionMessage *netStartPetition = packet->GetMsg()->mutable_startkickpetitionmessage(); - netStartPetition->set_gameid(GetId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_StartKickPetitionMessage); + StartKickPetitionMessage *netStartPetition = netManage->mutable_startkickpetitionmessage(); netStartPetition->set_petitionid(m_voteKickData->petitionId); netStartPetition->set_proposingplayerid(playerIdByWhom); netStartPetition->set_kickplayerid(m_voteKickData->kickPlayerId); @@ -539,9 +546,13 @@ void ServerGame::InternalDenyAskVoteKick(boost::shared_ptr byWhom, unsigned playerIdWho, DenyKickPlayerReason reason) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_AskKickDeniedMessage); - AskKickDeniedMessage *netKickDenied = packet->GetMsg()->mutable_askkickdeniedmessage(); - netKickDenied->set_gameid(GetId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_AskKickDeniedMessage); + AskKickDeniedMessage *netKickDenied = netManage->mutable_askkickdeniedmessage(); netKickDenied->set_playerid(playerIdWho); netKickDenied->set_kickdeniedreason(static_cast(reason)); GetLobbyThread().GetSender().Send(byWhom, packet); @@ -563,9 +574,13 @@ ServerGame::InternalVoteKick(boost::shared_ptr byWhom, unsigned pet m_voteKickData->numVotesAgainstKicking++; // Send update notification. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_KickPetitionUpdateMessage); - KickPetitionUpdateMessage *netKickUpdate = packet->GetMsg()->mutable_kickpetitionupdatemessage(); - netKickUpdate->set_gameid(GetId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_KickPetitionUpdateMessage); + KickPetitionUpdateMessage *netKickUpdate = netManage->mutable_kickpetitionupdatemessage(); netKickUpdate->set_petitionid(m_voteKickData->petitionId); netKickUpdate->set_numvotesagainstkicking(m_voteKickData->numVotesAgainstKicking); netKickUpdate->set_numvotesinfavourofkicking(m_voteKickData->numVotesInFavourOfKicking); @@ -583,9 +598,13 @@ void ServerGame::InternalDenyVoteKick(boost::shared_ptr byWhom, unsigned petitionId, DenyVoteReason reason) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_VoteKickReplyMessage); - VoteKickReplyMessage *netVoteReply = packet->GetMsg()->mutable_votekickreplymessage(); - netVoteReply->set_gameid(GetId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_VoteKickReplyMessage); + VoteKickReplyMessage *netVoteReply = netManage->mutable_votekickreplymessage(); netVoteReply->set_petitionid(petitionId); switch(reason) { case VOTE_DENIED_ALREADY_VOTED : @@ -893,9 +912,13 @@ ServerGame::RemovePlayerData(boost::shared_ptr player, int reason, b GetState().NotifyGameAdminChanged(shared_from_this()); // Send "Game Admin Changed" to clients. boost::shared_ptr adminChanged(new NetPacket); - adminChanged->GetMsg()->set_messagetype(PokerTHMessage::Type_GameAdminChangedMessage); - GameAdminChangedMessage *netGameAdmin = adminChanged->GetMsg()->mutable_gameadminchangedmessage(); - netGameAdmin->set_gameid(GetId()); + adminChanged->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = adminChanged->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_GameAdminChangedMessage); + GameAdminChangedMessage *netGameAdmin = netManage->mutable_gameadminchangedmessage(); netGameAdmin->set_newadminplayerid(newAdmin->GetUniqueId()); // Choose next player as admin. GetSessionManager().SendToAllSessions(GetLobbyThread().GetSender(), adminChanged, SessionData::Game); @@ -907,6 +930,12 @@ ServerGame::RemovePlayerData(boost::shared_ptr player, int reason, b // Send "Player Left" to clients. boost::shared_ptr thisPlayerLeft(new NetPacket); + thisPlayerLeft->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = thisPlayerLeft->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + GamePlayerLeftMessage::GamePlayerLeftReason netReason = GamePlayerLeftMessage::leftError; switch (reason) { case NTF_NET_REMOVED_ON_REQUEST : @@ -918,15 +947,13 @@ ServerGame::RemovePlayerData(boost::shared_ptr player, int reason, b } if (spectateOnly) { - thisPlayerLeft->GetMsg()->set_messagetype(PokerTHMessage::Type_GameSpectatorLeftMessage); - GameSpectatorLeftMessage *netPlayerLeft = thisPlayerLeft->GetMsg()->mutable_gamespectatorleftmessage(); - netPlayerLeft->set_gameid(GetId()); + netManage->set_messagetype(GameManagementMessage::Type_GameSpectatorLeftMessage); + GameSpectatorLeftMessage *netPlayerLeft = netManage->mutable_gamespectatorleftmessage(); netPlayerLeft->set_playerid(player->GetUniqueId()); netPlayerLeft->set_gamespectatorleftreason(netReason); } else { - thisPlayerLeft->GetMsg()->set_messagetype(PokerTHMessage::Type_GamePlayerLeftMessage); - GamePlayerLeftMessage *netPlayerLeft = thisPlayerLeft->GetMsg()->mutable_gameplayerleftmessage(); - netPlayerLeft->set_gameid(GetId()); + netManage->set_messagetype(GameManagementMessage::Type_GamePlayerLeftMessage); + GamePlayerLeftMessage *netPlayerLeft = netManage->mutable_gameplayerleftmessage(); netPlayerLeft->set_playerid(player->GetUniqueId()); netPlayerLeft->set_gameplayerleftreason(netReason); } @@ -1014,22 +1041,6 @@ ServerGame::IsValidPlayer(unsigned playerId) const return retVal; } -void -ServerGame::AddReportedAvatar(unsigned playerId) -{ - m_reportedAvatarList.push_back(playerId); -} - -bool -ServerGame::IsAvatarReported(unsigned playerId) const -{ - bool retVal = false; - PlayerIdList::const_iterator pos = find(m_reportedAvatarList.begin(), m_reportedAvatarList.end(), playerId); - if (pos != m_reportedAvatarList.end()) - retVal = true; - return retVal; -} - SessionManager & ServerGame::GetSessionManager() { diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp index 380ba94a..deeda8b8 100644 --- a/src/net/common/servergamestate.cpp +++ b/src/net/common/servergamestate.cpp @@ -76,10 +76,13 @@ static void SendPlayerAction(ServerGame &server, boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_PlayersActionDoneMessage); - PlayersActionDoneMessage *netActionDone = packet->GetMsg()->mutable_playersactiondonemessage(); - - netActionDone->set_gameid(server.GetId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server.GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_PlayersActionDoneMessage); + PlayersActionDoneMessage *netActionDone = netEngine->mutable_playersactiondonemessage(); netActionDone->set_gamestate(static_cast(server.GetCurRound())); netActionDone->set_highestset(server.GetGame().getCurrentHand()->getCurrentBeRo()->getHighestSet()); netActionDone->set_minimumraise(server.GetGame().getCurrentHand()->getCurrentBeRo()->getMinimumRaise()); @@ -101,9 +104,13 @@ static void SendNewRoundCards(ServerGame &server, Game &curGame, int state) case GAME_STATE_FLOP: { // deal flop cards boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_DealFlopCardsMessage); - DealFlopCardsMessage *netDealFlop = packet->GetMsg()->mutable_dealflopcardsmessage(); - netDealFlop->set_gameid(server.GetId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server.GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_DealFlopCardsMessage); + DealFlopCardsMessage *netDealFlop = netEngine->mutable_dealflopcardsmessage(); netDealFlop->set_flopcard1(cards[0]); netDealFlop->set_flopcard2(cards[1]); netDealFlop->set_flopcard3(cards[2]); @@ -113,9 +120,13 @@ static void SendNewRoundCards(ServerGame &server, Game &curGame, int state) case GAME_STATE_TURN: { // deal turn card boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_DealTurnCardMessage); - DealTurnCardMessage *netDealTurn = packet->GetMsg()->mutable_dealturncardmessage(); - netDealTurn->set_gameid(server.GetId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server.GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_DealTurnCardMessage); + DealTurnCardMessage *netDealTurn = netEngine->mutable_dealturncardmessage(); netDealTurn->set_turncard(cards[3]); server.SendToAllPlayers(packet, SessionData::Game | SessionData::Spectating); } @@ -123,9 +134,13 @@ static void SendNewRoundCards(ServerGame &server, Game &curGame, int state) case GAME_STATE_RIVER: { // deal river card boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_DealRiverCardMessage); - DealRiverCardMessage *netDealRiver = packet->GetMsg()->mutable_dealrivercardmessage(); - netDealRiver->set_gameid(server.GetId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server.GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_DealRiverCardMessage); + DealRiverCardMessage *netDealRiver = netEngine->mutable_dealrivercardmessage(); netDealRiver->set_rivercard(cards[4]); server.SendToAllPlayers(packet, SessionData::Game | SessionData::Spectating); } @@ -216,153 +231,111 @@ AbstractServerGameStateReceiving::~AbstractServerGameStateReceiving() } void -AbstractServerGameStateReceiving::ProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet) +AbstractServerGameStateReceiving::HandleGameMsg(boost::shared_ptr server, boost::shared_ptr session, const GameMessage &gameMsg) { - if (packet->IsClientActivity()) { - session->ResetActivityTimer(); + if (gameMsg.messagetype() == GameMessage::Type_GameManagementMessage) { + HandleGameManagementMsg(server, session, gameMsg.gamemanagementmessage()); + } else if (gameMsg.messagetype() == GameMessage::Type_GameEngineMessage) { + HandleGameEngineMsg(server, session, gameMsg.gameenginemessage()); } - if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_PlayerInfoRequestMessage) { - // Delegate to Lobby. - server->GetLobbyThread().HandleGameRetrievePlayerInfo(session, packet->GetMsg()->playerinforequestmessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AvatarRequestMessage) { - // Delegate to Lobby. - server->GetLobbyThread().HandleGameRetrieveAvatar(session, packet->GetMsg()->avatarrequestmessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_LeaveGameRequestMessage) { +} + +void +AbstractServerGameStateReceiving::HandleGameManagementMsg(boost::shared_ptr server, boost::shared_ptr session, const GameManagementMessage &managementMsg) +{ + if (managementMsg.messagetype() == GameManagementMessage::Type_LeaveGameRequestMessage) { server->MoveSessionToLobby(session, NTF_NET_REMOVED_ON_REQUEST); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_KickPlayerRequestMessage) { + } else if (managementMsg.messagetype() == GameManagementMessage::Type_KickPlayerRequestMessage) { // Only admins are allowed to kick, and only in the lobby. // After leaving the lobby, a vote needs to be initiated to kick. - const KickPlayerRequestMessage &netKickRequest = packet->GetMsg()->kickplayerrequestmessage(); + const KickPlayerRequestMessage &netKickRequest = managementMsg.kickplayerrequestmessage(); if (session->GetPlayerData()->IsGameAdmin() && !server->IsRunning() - && netKickRequest.gameid() == server->GetId() && server->GetGameData().gameType != GAME_TYPE_RANKING) { + && server->GetGameData().gameType != GAME_TYPE_RANKING) { server->KickPlayer(netKickRequest.playerid()); } - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AskKickPlayerMessage) { + } else if (managementMsg.messagetype() == GameManagementMessage::Type_AskKickPlayerMessage) { if (server->GetGameData().gameType != GAME_TYPE_RANKING) { - const AskKickPlayerMessage &netAskKick = packet->GetMsg()->askkickplayermessage(); + const AskKickPlayerMessage &netAskKick = managementMsg.askkickplayermessage(); server->InternalAskVoteKick(session, netAskKick.playerid(), SERVER_VOTE_KICK_TIMEOUT_SEC); } - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_VoteKickRequestMessage) { - const VoteKickRequestMessage &netVoteKick = packet->GetMsg()->votekickrequestmessage(); + } else if (managementMsg.messagetype() == GameManagementMessage::Type_VoteKickRequestMessage) { + const VoteKickRequestMessage &netVoteKick = managementMsg.votekickrequestmessage(); server->InternalVoteKick(session, netVoteKick.petitionid(), netVoteKick.votekick() ? KICK_VOTE_IN_FAVOUR : KICK_VOTE_AGAINST); } // Chat text is always allowed. - else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_ChatRequestMessage) { + else if (managementMsg.messagetype() == GameManagementMessage::Type_ChatRequestMessage) { bool chatSent = false; - const ChatRequestMessage &netChatRequest = packet->GetMsg()->chatrequestmessage(); + const ChatRequestMessage &netChatRequest = managementMsg.chatrequestmessage(); // Only forward if this player is known and not a guest. if (session->GetPlayerData()->GetRights() != PLAYER_RIGHTS_GUEST) { // Forward chat text to all players. // TODO: Some limitation needed. - if (!netChatRequest.has_targetgameid()) { - if (!server->IsRunning()) { - server->GetLobbyThread().HandleChatRequest(session, netChatRequest); - chatSent = true; - } - } else { - boost::shared_ptr tmpPlayer (server->GetPlayerInterfaceFromGame(session->GetPlayerData()->GetUniqueId())); - // If we did not find the player, then the game did not start yet. Allow chat for now. - // Otherwise, check whether the player is muted. - if (!tmpPlayer || !tmpPlayer->isMuted()) { - boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ChatMessage); - ChatMessage *netChat = packet->GetMsg()->mutable_chatmessage(); - netChat->set_gameid(server->GetId()); - netChat->set_playerid(session->GetPlayerData()->GetUniqueId()); - netChat->set_chattype(ChatMessage::chatTypeGame); - netChat->set_chattext(netChatRequest.chattext()); - server->SendToAllPlayers(packet, SessionData::Game | SessionData::Spectating | SessionData::SpectatorWaiting); - chatSent = true; + boost::shared_ptr tmpPlayer (server->GetPlayerInterfaceFromGame(session->GetPlayerData()->GetUniqueId())); + // If we did not find the player, then the game did not start yet. Allow chat for now. + // Otherwise, check whether the player is muted. + if (!tmpPlayer || !tmpPlayer->isMuted()) { + boost::shared_ptr packet(new NetPacket); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_ChatMessage); + ChatMessage *netChat = netManage->mutable_chatmessage(); + netChat->set_playerid(session->GetPlayerData()->GetUniqueId()); + netChat->set_chattype(ChatMessage::chatTypeStandard); + netChat->set_chattext(netChatRequest.chattext()); + server->SendToAllPlayers(packet, SessionData::Game | SessionData::Spectating | SessionData::SpectatorWaiting); + chatSent = true; - // Send the message to the chat cleaner bot for ranking games. - //if (server->GetGameData().gameType == GAME_TYPE_RANKING) - //{ - server->GetLobbyThread().GetChatCleaner().HandleGameChatText( - server->GetId(), - session->GetPlayerData()->GetUniqueId(), - session->GetPlayerData()->GetName(), - netChatRequest.chattext()); - //} - } + // Send the message to the chat cleaner bot for ranking games. + //if (server->GetGameData().gameType == GAME_TYPE_RANKING) + //{ + server->GetLobbyThread().GetChatCleaner().HandleGameChatText( + server->GetId(), + session->GetPlayerData()->GetUniqueId(), + session->GetPlayerData()->GetName(), + netChatRequest.chattext()); + //} } } // Reject chat otherwise. if (!chatSent) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ChatRejectMessage); - ChatRejectMessage *netReject = packet->GetMsg()->mutable_chatrejectmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_ChatRejectMessage); + ChatRejectMessage *netReject = netManage->mutable_chatrejectmessage(); netReject->set_chattext(netChatRequest.chattext()); server->GetLobbyThread().GetSender().Send(session, packet); } - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_SubscriptionRequestMessage) { - const SubscriptionRequestMessage &netSubscription = packet->GetMsg()->subscriptionrequestmessage(); - if (netSubscription.subscriptionaction() == SubscriptionRequestMessage::resubscribeGameList) { - if (!session->WantsLobbyMsg()) - server->GetLobbyThread().ResubscribeLobbyMsg(session); - } else - session->ResetWantsLobbyMsg(); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_ReportAvatarMessage) { - const ReportAvatarMessage &netReport = packet->GetMsg()->reportavatarmessage(); - boost::shared_ptr tmpPlayer = server->GetPlayerDataByUniqueId(netReport.reportedplayerid()); - MD5Buf tmpMD5; - memcpy(tmpMD5.GetData(), netReport.reportedavatarhash().data(), MD5_DATA_SIZE); - if (tmpPlayer && tmpPlayer->GetDBId() && !tmpMD5.IsZero() && tmpPlayer->GetAvatarMD5() == tmpMD5) { - if (!server->IsAvatarReported(tmpPlayer->GetUniqueId())) { - // Temporarily note that this avatar was reported. - // This prevents spamming of the avatar report. - server->AddReportedAvatar(tmpPlayer->GetUniqueId()); - DB_id myDBid = session->GetPlayerData()->GetDBId(); - // Do not use the "game" database object, but the global one. - // The entry should be created even if we are not running a - // ranking game. - - string tmpAvatarType; - tmpAvatarType = AvatarManager::GetAvatarFileExtension(AvatarManager::GetAvatarFileType(tmpPlayer->GetAvatarFile())); - if (!tmpAvatarType.empty()) - tmpAvatarType.erase(0, 1); // Only store extension without the "." - - server->GetLobbyThread().GetDatabase()->AsyncReportAvatar( - session->GetPlayerData()->GetUniqueId(), - tmpPlayer->GetUniqueId(), - tmpPlayer->GetDBId(), - tmpPlayer->GetAvatarMD5().ToString(), - tmpAvatarType, - myDBid != 0 ? &myDBid : NULL - ); - } else { - boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ReportAvatarAckMessage); - ReportAvatarAckMessage *netReportAck = packet->GetMsg()->mutable_reportavatarackmessage(); - netReportAck->set_reportedplayerid(netReport.reportedplayerid()); - netReportAck->set_reportavatarresult(ReportAvatarAckMessage::avatarReportDuplicate); - server->GetLobbyThread().GetSender().Send(session, packet); - } - } else { - boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ReportAvatarAckMessage); - ReportAvatarAckMessage *netReportAck = packet->GetMsg()->mutable_reportavatarackmessage(); - netReportAck->set_reportedplayerid(netReport.reportedplayerid()); - netReportAck->set_reportavatarresult(ReportAvatarAckMessage::avatarReportInvalid); - server->GetLobbyThread().GetSender().Send(session, packet); - } - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_ReportGameMessage) { - // Delegate to Lobby. - server->GetLobbyThread().HandleGameReportGame(session, packet->GetMsg()->reportgamemessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_JoinExistingGameMessage) { - // Ignore join game requests in this state (may be multiple clicks from the lobby). } else { - // Packet processing in subclass. - InternalProcessPacket(server, session, packet); + // Message processing in subclass. + InternalHandleGameManagementMsg(server, session, managementMsg); } } +void +AbstractServerGameStateReceiving::HandleGameEngineMsg(boost::shared_ptr server, boost::shared_ptr session, const GameEngineMessage &engineMsg) +{ + // Message processing in subclass. + InternalHandleGameEngineMsg(server, session, engineMsg); +} + boost::shared_ptr AbstractServerGameStateReceiving::CreateNetPacketPlayerJoined(unsigned gameId, const PlayerData &playerData) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GamePlayerJoinedMessage); - GamePlayerJoinedMessage *netGamePlayer = packet->GetMsg()->mutable_gameplayerjoinedmessage(); - netGamePlayer->set_gameid(gameId); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(gameId); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_GamePlayerJoinedMessage); + GamePlayerJoinedMessage *netGamePlayer = netManage->mutable_gameplayerjoinedmessage(); netGamePlayer->set_playerid(playerData.GetUniqueId()); netGamePlayer->set_isgameadmin(playerData.IsGameAdmin()); return packet; @@ -372,9 +345,13 @@ boost::shared_ptr AbstractServerGameStateReceiving::CreateNetPacketSpectatorJoined(unsigned gameId, const PlayerData &playerData) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameSpectatorJoinedMessage); - GameSpectatorJoinedMessage *netGameSpectator = packet->GetMsg()->mutable_gamespectatorjoinedmessage(); - netGameSpectator->set_gameid(gameId); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(gameId); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_GameSpectatorJoinedMessage); + GameSpectatorJoinedMessage *netGameSpectator = netManage->mutable_gamespectatorjoinedmessage(); netGameSpectator->set_playerid(playerData.GetUniqueId()); return packet; } @@ -383,12 +360,13 @@ boost::shared_ptr AbstractServerGameStateReceiving::CreateNetPacketJoinGameAck(const ServerGame &server, const PlayerData &playerData, bool spectateOnly) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_JoinGameAckMessage); - JoinGameAckMessage *netJoinReply = packet->GetMsg()->mutable_joingameackmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_JoinGameAckMessage); + JoinGameAckMessage *netJoinReply = netLobby->mutable_joingameackmessage(); netJoinReply->set_gameid(server.GetId()); netJoinReply->set_areyougameadmin(playerData.IsGameAdmin()); netJoinReply->set_spectateonly(spectateOnly); - NetGameInfo *gameInfo = netJoinReply->mutable_gameinfo(); NetPacket::SetGameData(server.GetGameData(), *gameInfo); gameInfo->set_gamename(server.GetName()); @@ -401,10 +379,13 @@ AbstractServerGameStateReceiving::CreateNetPacketHandStart(const ServerGame &ser const Game &curGame = server.GetGame(); boost::shared_ptr notifyCards(new NetPacket); - notifyCards->GetMsg()->set_messagetype(PokerTHMessage::Type_HandStartMessage); - HandStartMessage *netHandStart = notifyCards->GetMsg()->mutable_handstartmessage(); - netHandStart->set_gameid(server.GetId()); - + notifyCards->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = notifyCards->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server.GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_HandStartMessage); + HandStartMessage *netHandStart = netEngine->mutable_handstartmessage(); PlayerListIterator player_i = curGame.getSeatsList()->begin(); PlayerListIterator player_end = curGame.getSeatsList()->end(); int playerCounter = 0; @@ -603,8 +584,13 @@ ServerGameStateInit::TimerAdminWarning(const boost::system::error_code &ec, boos if (session) { // Send him a warning. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_TimeoutWarningMessage); - TimeoutWarningMessage *netWarning = packet->GetMsg()->mutable_timeoutwarningmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_TimeoutWarningMessage); + TimeoutWarningMessage *netWarning = netManage->mutable_timeoutwarningmessage(); netWarning->set_timeoutreason(TimeoutWarningMessage::timeoutInactiveGame); netWarning->set_remainingseconds(SERVER_GAME_ADMIN_WARNING_REMAINING_SEC); server->GetLobbyThread().GetSender().Send(session, packet); @@ -653,10 +639,14 @@ ServerGameStateInit::SendStartEvent(ServerGame &server, bool fillWithComputerPla } } boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_StartEventMessage); - StartEventMessage *netStartEvent = packet->GetMsg()->mutable_starteventmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server.GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_StartEventMessage); + StartEventMessage *netStartEvent = netManage->mutable_starteventmessage(); netStartEvent->set_starteventtype(StartEventMessage::startEvent); - netStartEvent->set_gameid(server.GetId()); netStartEvent->set_fillwithcomputerplayers(fillWithComputerPlayers); // Wait for all players to confirm start of game. @@ -668,13 +658,12 @@ ServerGameStateInit::SendStartEvent(ServerGame &server, bool fillWithComputerPla } void -ServerGameStateInit::InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet) +ServerGameStateInit::InternalHandleGameManagementMsg(boost::shared_ptr server, boost::shared_ptr session, const GameManagementMessage &managementMsg) { - if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_StartEventMessage) { - const StartEventMessage &netStartEvent = packet->GetMsg()->starteventmessage(); + if (managementMsg.messagetype() == GameManagementMessage::Type_StartEventMessage) { + const StartEventMessage &netStartEvent = managementMsg.starteventmessage(); // Only admins are allowed to start the game. if (session->GetPlayerData()->IsGameAdmin() - && netStartEvent.gameid() == server->GetId() && netStartEvent.starteventtype() == StartEventMessage::startEvent && (server->GetGameData().gameType != GAME_TYPE_RANKING // ranking games need to be full || server->GetGameData().maxNumberOfPlayers == server->GetCurNumberOfPlayers())) { @@ -682,14 +671,16 @@ ServerGameStateInit::InternalProcessPacket(boost::shared_ptr server, } else { // kick players who try to start but are not allowed to server->MoveSessionToLobby(session, NTF_NET_REMOVED_START_FAILED); } - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_InvitePlayerToGameMessage) { - const InvitePlayerToGameMessage &netInvite = packet->GetMsg()->inviteplayertogamemessage(); + } else if (managementMsg.messagetype() == GameManagementMessage::Type_InvitePlayerToGameMessage) { + const InvitePlayerToGameMessage &netInvite = managementMsg.inviteplayertogamemessage(); // Only invite players which are not already within the group. if (netInvite.gameid() == server->GetId() && !server->IsPlayerConnected(netInvite.playerid())) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_InviteNotifyMessage); - InviteNotifyMessage *netInvNotif = packet->GetMsg()->mutable_invitenotifymessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_InviteNotifyMessage); + InviteNotifyMessage *netInvNotif = netLobby->mutable_invitenotifymessage(); netInvNotif->set_gameid(netInvite.gameid()); netInvNotif->set_playeridbywhom(session->GetPlayerData()->GetUniqueId()); netInvNotif->set_playeridwho(netInvite.playerid()); @@ -702,8 +693,10 @@ ServerGameStateInit::InternalProcessPacket(boost::shared_ptr server, } else { // Player is not in lobby - send reject message. boost::shared_ptr p2(new NetPacket); - p2->GetMsg()->set_messagetype(PokerTHMessage::Type_RejectInvNotifyMessage); - RejectInvNotifyMessage *netRejNotif = p2->GetMsg()->mutable_rejectinvnotifymessage(); + p2->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = p2->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_RejectInvNotifyMessage); + RejectInvNotifyMessage *netRejNotif = netLobby->mutable_rejectinvnotifymessage(); netRejNotif->set_gameid(netInvite.gameid()); netRejNotif->set_playerid(netInvite.playerid()); netRejNotif->set_playerrejectreason(RejectGameInvitationMessage::rejectReasonBusy); @@ -711,19 +704,18 @@ ServerGameStateInit::InternalProcessPacket(boost::shared_ptr server, server->SendToAllPlayers(p2, SessionData::Game); } } - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_ResetTimeoutMessage) { + } else if (managementMsg.messagetype() == GameManagementMessage::Type_ResetTimeoutMessage) { if (session->GetPlayerData()->IsGameAdmin()) { RegisterAdminTimer(server); } - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AdminRemoveGameMessage) { - server->GetLobbyThread().HandleAdminRemoveGame(session, packet->GetMsg()->adminremovegamemessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AdminBanPlayerMessage) { - server->GetLobbyThread().HandleAdminBanPlayer(session, packet->GetMsg()->adminbanplayermessage()); - } else { - server->SessionError(session, ERR_SOCK_INVALID_PACKET); } } +void +ServerGameStateInit::InternalHandleGameEngineMsg(boost::shared_ptr /*server*/, boost::shared_ptr /*session*/, const GameEngineMessage &/*engineMsg*/) +{ +} + //----------------------------------------------------------------------------- ServerGameStateStartGame ServerGameStateStartGame::s_state; @@ -774,9 +766,9 @@ ServerGameStateStartGame::HandleNewSpectator(boost::shared_ptr serve } void -ServerGameStateStartGame::InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet) +ServerGameStateStartGame::InternalHandleGameManagementMsg(boost::shared_ptr server, boost::shared_ptr session, const GameManagementMessage &managementMsg) { - if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_StartEventAckMessage) { + if (managementMsg.messagetype() == GameManagementMessage::Type_StartEventAckMessage) { session->SetReadyFlag(); if (server->GetSessionManager().CountReadySessions() == server->GetSessionManager().GetSessionCountWithState(SessionData::Game)) { // Everyone is ready. @@ -786,6 +778,11 @@ ServerGameStateStartGame::InternalProcessPacket(boost::shared_ptr se } } +void +ServerGameStateStartGame::InternalHandleGameEngineMsg(boost::shared_ptr /*server*/, boost::shared_ptr /*session*/, const GameEngineMessage &/*engineMsg*/) +{ +} + void ServerGameStateStartGame::TimerTimeout(const boost::system::error_code &ec, boost::shared_ptr server) { @@ -811,9 +808,13 @@ ServerGameStateStartGame::DoStart(boost::shared_ptr server) } } else { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameStartInitialMessage); - GameStartInitialMessage *netGameStart = packet->GetMsg()->mutable_gamestartinitialmessage(); - netGameStart->set_gameid(server->GetId()); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_GameStartInitialMessage); + GameStartInitialMessage *netGameStart = netManage->mutable_gamestartinitialmessage(); netGameStart->set_startdealerplayerid(server->GetStartData().startDealerPlayerId); // Send player order to clients. @@ -854,10 +855,14 @@ AbstractServerGameStateRunning::HandleNewPlayer(boost::shared_ptr se // Send start event right away. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_StartEventMessage); - StartEventMessage *netStartEvent = packet->GetMsg()->mutable_starteventmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_StartEventMessage); + StartEventMessage *netStartEvent = netManage->mutable_starteventmessage(); netStartEvent->set_starteventtype(StartEventMessage::rejoinEvent); - netStartEvent->set_gameid(server->GetId()); // Wait for rejoining player to confirm start of game. server->GetLobbyThread().GetSender().Send(session, packet); @@ -879,14 +884,19 @@ AbstractServerGameStateRunning::HandleNewSpectator(boost::shared_ptr } void -AbstractServerGameStateRunning::InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet) +AbstractServerGameStateRunning::InternalHandleGameManagementMsg(boost::shared_ptr server, boost::shared_ptr session, const GameManagementMessage &managementMsg) { - if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_ResetTimeoutMessage) { + if (managementMsg.messagetype() == GameManagementMessage::Type_ResetTimeoutMessage) { // Reactivate session. server->AddReactivatePlayer(session->GetPlayerData()->GetUniqueId()); } } +void +AbstractServerGameStateRunning::InternalHandleGameEngineMsg(boost::shared_ptr /*server*/, boost::shared_ptr /*session*/, const GameEngineMessage &/*engineMsg*/) +{ +} + //----------------------------------------------------------------------------- ServerGameStateHand ServerGameStateHand::s_state; @@ -921,12 +931,6 @@ ServerGameStateHand::Exit(boost::shared_ptr server) server->GetStateTimer1().cancel(); } -void -ServerGameStateHand::InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet) -{ - AbstractServerGameStateRunning::InternalProcessPacket(server, session, packet); -} - void ServerGameStateHand::TimerLoop(const boost::system::error_code &ec, boost::shared_ptr server) { @@ -966,9 +970,13 @@ ServerGameStateHand::EngineLoop(boost::shared_ptr server) && nonFoldPlayers.size() > 1) { // Send cards of all active players to all players (all in). boost::shared_ptr allIn(new NetPacket); - allIn->GetMsg()->set_messagetype(PokerTHMessage::Type_AllInShowCardsMessage); - AllInShowCardsMessage *netAllInShow = allIn->GetMsg()->mutable_allinshowcardsmessage(); - netAllInShow->set_gameid(server->GetId()); + allIn->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = allIn->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_AllInShowCardsMessage); + AllInShowCardsMessage *netAllInShow = netEngine->mutable_allinshowcardsmessage(); PlayerListConstIterator i = nonFoldPlayers.begin(); PlayerListConstIterator end = nonFoldPlayers.end(); @@ -1013,9 +1021,14 @@ ServerGameStateHand::EngineLoop(boost::shared_ptr server) throw ServerException(__FILE__, __LINE__, ERR_NET_PLAYER_NOT_ACTIVE, 0); boost::shared_ptr notification(new NetPacket); - notification->GetMsg()->set_messagetype(PokerTHMessage::Type_PlayersTurnMessage); - PlayersTurnMessage *netPlayersTurn = notification->GetMsg()->mutable_playersturnmessage(); - netPlayersTurn->set_gameid(server->GetId()); + notification->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = notification->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_PlayersTurnMessage); + PlayersTurnMessage *netPlayersTurn = netEngine->mutable_playersturnmessage(); + netPlayersTurn->set_gamestate(static_cast(curGame.getCurrentHand()->getCurrentRound())); netPlayersTurn->set_playerid(curPlayer->getMyUniqueID()); server->SendToAllPlayers(notification, SessionData::Game | SessionData::Spectating); @@ -1055,9 +1068,13 @@ ServerGameStateHand::EngineLoop(boost::shared_ptr server) // End of Hand, but keep cards hidden. boost::shared_ptr player = nonFoldPlayers.front(); boost::shared_ptr endHand(new NetPacket); - endHand->GetMsg()->set_messagetype(PokerTHMessage::Type_EndOfHandHideCardsMessage); - EndOfHandHideCardsMessage *netEndHand = endHand->GetMsg()->mutable_endofhandhidecardsmessage(); - netEndHand->set_gameid(server->GetId()); + endHand->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = endHand->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_EndOfHandHideCardsMessage); + EndOfHandHideCardsMessage *netEndHand = netEngine->mutable_endofhandhidecardsmessage(); netEndHand->set_playerid(player->getMyUniqueID()); netEndHand->set_moneywon(player->getLastMoneyWon()); netEndHand->set_playermoney(player->getMyCash()); @@ -1066,9 +1083,13 @@ ServerGameStateHand::EngineLoop(boost::shared_ptr server) // End of Hand - show cards. const PlayerIdList showList(curGame.getCurrentHand()->getBoard()->getPlayerNeedToShowCards()); boost::shared_ptr endHand(new NetPacket); - endHand->GetMsg()->set_messagetype(PokerTHMessage::Type_EndOfHandShowCardsMessage); - EndOfHandShowCardsMessage *netEndHand = endHand->GetMsg()->mutable_endofhandshowcardsmessage(); - netEndHand->set_gameid(server->GetId()); + endHand->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = endHand->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_EndOfHandShowCardsMessage); + EndOfHandShowCardsMessage *netEndHand = netEngine->mutable_endofhandshowcardsmessage(); PlayerIdList::const_iterator i = showList.begin(); PlayerIdList::const_iterator end = showList.end(); @@ -1163,9 +1184,13 @@ ServerGameStateHand::TimerNextGame(const boost::system::error_code &ec, boost::s { if (!ec && &server->GetState() == this) { boost::shared_ptr endGame(new NetPacket); - endGame->GetMsg()->set_messagetype(PokerTHMessage::Type_EndOfGameMessage); - EndOfGameMessage *netEndGame = endGame->GetMsg()->mutable_endofgamemessage(); - netEndGame->set_gameid(server->GetId()); + endGame->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = endGame->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_EndOfGameMessage); + EndOfGameMessage *netEndGame = netManage->mutable_endofgamemessage(); netEndGame->set_winnerplayerid(winnerPlayerId); server->SendToAllPlayers(endGame, SessionData::Game | SessionData::Spectating); @@ -1241,7 +1266,7 @@ ServerGameStateHand::StartNewHand(boost::shared_ptr server) tmpPlayer->getMyHoleCards(cards); boost::shared_ptr notifyCards = CreateNetPacketHandStart(*server); - HandStartMessage *netHandStart = notifyCards->GetMsg()->mutable_handstartmessage(); + HandStartMessage *netHandStart = notifyCards->GetMsg()->mutable_gamemessage()->mutable_gameenginemessage()->mutable_handstartmessage(); string tmpPassword(tmpSession->AuthGetPassword()); if (tmpPassword.empty()) { // encrypt only if password is present HandStartMessage::PlainCards *plainCards = netHandStart->mutable_plaincards(); @@ -1287,9 +1312,13 @@ ServerGameStateHand::StartNewHand(boost::shared_ptr server) boost::shared_ptr tmpPlayer = *i; if (tmpPlayer->getMyButton() == BUTTON_SMALL_BLIND) { boost::shared_ptr notifySmallBlind(new NetPacket); - notifySmallBlind->GetMsg()->set_messagetype(PokerTHMessage::Type_PlayersActionDoneMessage); - PlayersActionDoneMessage *netSmallBlind = notifySmallBlind->GetMsg()->mutable_playersactiondonemessage(); - netSmallBlind->set_gameid(server->GetId()); + notifySmallBlind->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = notifySmallBlind->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_PlayersActionDoneMessage); + PlayersActionDoneMessage *netSmallBlind = netEngine->mutable_playersactiondonemessage(); netSmallBlind->set_gamestate(netStatePreflopSmallBlind); netSmallBlind->set_playerid(tmpPlayer->getMyUniqueID()); netSmallBlind->set_playeraction(static_cast(tmpPlayer->getMyAction())); @@ -1309,9 +1338,13 @@ ServerGameStateHand::StartNewHand(boost::shared_ptr server) boost::shared_ptr tmpPlayer = *i; if (tmpPlayer->getMyButton() == BUTTON_BIG_BLIND) { boost::shared_ptr notifyBigBlind(new NetPacket); - notifyBigBlind->GetMsg()->set_messagetype(PokerTHMessage::Type_PlayersActionDoneMessage); - PlayersActionDoneMessage *netBigBlind = notifyBigBlind->GetMsg()->mutable_playersactiondonemessage(); - netBigBlind->set_gameid(server->GetId()); + notifyBigBlind->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = notifyBigBlind->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_PlayersActionDoneMessage); + PlayersActionDoneMessage *netBigBlind = netEngine->mutable_playersactiondonemessage(); netBigBlind->set_gamestate(netStatePreflopBigBlind); netBigBlind->set_playerid(tmpPlayer->getMyUniqueID()); netBigBlind->set_playeraction(static_cast(tmpPlayer->getMyAction())); @@ -1346,8 +1379,12 @@ ServerGameStateHand::CheckPlayerTimeouts(boost::shared_ptr server) boost::shared_ptr session = server->GetSessionManager().GetSessionByUniquePlayerId(tmpPlayer->getMyUniqueID()); if (session) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_TimeoutWarningMessage); - TimeoutWarningMessage *netWarning = packet->GetMsg()->mutable_timeoutwarningmessage(); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_TimeoutWarningMessage); + TimeoutWarningMessage *netWarning = netManage->mutable_timeoutwarningmessage(); netWarning->set_timeoutreason(TimeoutWarningMessage::timeoutKickAfterAutofold); netWarning->set_remainingseconds(actionTimeout * SERVER_GAME_FORCED_TIMEOUT_FACTOR - tmpPlayer->getTimeSecSinceLastRemoteAction()); server->GetLobbyThread().GetSender().Send(session, packet); @@ -1418,8 +1455,12 @@ ServerGameStateHand::PerformRejoin(boost::shared_ptr server, boost:: if (rejoinPlayer) { // Notify other clients about id change. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_PlayerIdChangedMessage); - PlayerIdChangedMessage *netIdChanged = packet->GetMsg()->mutable_playeridchangedmessage(); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_PlayerIdChangedMessage); + PlayerIdChangedMessage *netIdChanged = netManage->mutable_playeridchangedmessage(); netIdChanged->set_oldplayerid(rejoinPlayer->getMyUniqueID()); netIdChanged->set_newplayerid(session->GetPlayerData()->GetUniqueId()); server->SendToAllButOnePlayers(packet, session->GetId(), SessionData::Game | SessionData::Spectating | SessionData::SpectatorWaiting); @@ -1445,9 +1486,12 @@ ServerGameStateHand::SendGameData(boost::shared_ptr server, boost::s Game &curGame = server->GetGame(); // Send game start notification to rejoining client. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameStartRejoinMessage); - GameStartRejoinMessage *netGameStart = packet->GetMsg()->mutable_gamestartrejoinmessage(); - netGameStart->set_gameid(server->GetId()); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_GameStartRejoinMessage); + GameStartRejoinMessage *netGameStart = netManage->mutable_gamestartrejoinmessage(); netGameStart->set_startdealerplayerid(curGame.getDealerPosition()); netGameStart->set_handnum(curGame.getCurrentHandID()); PlayerListIterator player_i = curGame.getSeatsList()->begin(); @@ -1507,13 +1551,14 @@ ServerGameStateWaitPlayerAction::Exit(boost::shared_ptr server) server->GetStateTimer1().cancel(); } -void -ServerGameStateWaitPlayerAction::InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet) -{ - AbstractServerGameStateRunning::InternalProcessPacket(server, session, packet); - if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_MyActionRequestMessage) { - MyActionRequestMessage *netMyAction = packet->GetMsg()->mutable_myactionrequestmessage(); +void +ServerGameStateWaitPlayerAction::InternalHandleGameEngineMsg(boost::shared_ptr server, boost::shared_ptr session, const GameEngineMessage &engineMsg) +{ + AbstractServerGameStateRunning::InternalHandleGameEngineMsg(server, session, engineMsg); + + if (engineMsg.messagetype() == GameEngineMessage::Type_MyActionRequestMessage) { + MyActionRequestMessage netMyAction = engineMsg.myactionrequestmessage(); // TODO consider game id. Game &curGame = server->GetGame(); @@ -1523,7 +1568,7 @@ ServerGameStateWaitPlayerAction::InternalProcessPacket(boost::shared_ptrgetCurrentRound() != static_cast(netMyAction->gamestate())) + if (curGame.getCurrentHand()->getCurrentRound() != static_cast(netMyAction.gamestate())) code = ACTION_CODE_INVALID_STATE; // Check whether this is the correct player. @@ -1534,20 +1579,20 @@ ServerGameStateWaitPlayerAction::InternalProcessPacket(boost::shared_ptrmyaction() == netActionCall && netMyAction->myrelativebet() == 0) { + if (netMyAction.myaction() == netActionCall && netMyAction.myrelativebet() == 0) { if (curGame.getCurrentHand()->getCurrentBeRo()->getHighestSet() >= tmpPlayer->getMySet() + tmpPlayer->getMyCash()) - netMyAction->set_myaction(netActionAllIn); + netMyAction.set_myaction(netActionAllIn); else - netMyAction->set_myrelativebet(curGame.getCurrentHand()->getCurrentBeRo()->getHighestSet() - tmpPlayer->getMySet()); + netMyAction.set_myrelativebet(curGame.getCurrentHand()->getCurrentBeRo()->getHighestSet() - tmpPlayer->getMySet()); } - if (netMyAction->myaction() == netActionAllIn && netMyAction->myrelativebet() == 0) - netMyAction->set_myrelativebet(tmpPlayer->getMyCash()); + if (netMyAction.myaction() == netActionAllIn && netMyAction.myrelativebet() == 0) + netMyAction.set_myrelativebet(tmpPlayer->getMyCash()); // Check whether the action is valid. if (code == ACTION_CODE_VALID && (tmpPlayer->checkMyAction( - netMyAction->myaction(), - netMyAction->myrelativebet(), + netMyAction.myaction(), + netMyAction.myrelativebet(), curGame.getCurrentHand()->getCurrentBeRo()->getHighestSet(), curGame.getCurrentHand()->getCurrentBeRo()->getMinimumRaise(), curGame.getCurrentHand()->getSmallBlind()) != 0)) { @@ -1557,17 +1602,21 @@ ServerGameStateWaitPlayerAction::InternalProcessPacket(boost::shared_ptrsetIsSessionActive(true); tmpPlayer->markRemoteAction(); - PerformPlayerAction(*server, tmpPlayer, static_cast(netMyAction->myaction()), netMyAction->myrelativebet()); + PerformPlayerAction(*server, tmpPlayer, static_cast(netMyAction.myaction()), netMyAction.myrelativebet()); server->SetState(ServerGameStateHand::Instance()); } else { // Send reject message. boost::shared_ptr reject(new NetPacket); - reject->GetMsg()->set_messagetype(PokerTHMessage::Type_YourActionRejectedMessage); - YourActionRejectedMessage *netActionRejected = reject->GetMsg()->mutable_youractionrejectedmessage(); - netActionRejected->set_gameid(server->GetId()); - netActionRejected->set_gamestate(netMyAction->gamestate()); - netActionRejected->set_youraction(netMyAction->myaction()); - netActionRejected->set_yourrelativebet(netMyAction->myrelativebet()); + reject->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = reject->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_YourActionRejectedMessage); + YourActionRejectedMessage *netActionRejected = netEngine->mutable_youractionrejectedmessage(); + netActionRejected->set_gamestate(netMyAction.gamestate()); + netActionRejected->set_youraction(netMyAction.myaction()); + netActionRejected->set_yourrelativebet(netMyAction.myrelativebet()); netActionRejected->set_rejectionreason(static_cast(code)); server->GetLobbyThread().GetSender().Send(session, reject); } @@ -1642,16 +1691,21 @@ ServerGameStateWaitNextHand::Exit(boost::shared_ptr server) } void -ServerGameStateWaitNextHand::InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet) +ServerGameStateWaitNextHand::InternalHandleGameEngineMsg(boost::shared_ptr server, boost::shared_ptr session, const GameEngineMessage &engineMsg) { - AbstractServerGameStateRunning::InternalProcessPacket(server, session, packet); + AbstractServerGameStateRunning::InternalHandleGameEngineMsg(server, session, engineMsg); - if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_ShowMyCardsRequestMessage) { + if (engineMsg.messagetype() == GameEngineMessage::Type_ShowMyCardsRequestMessage) { Game &curGame = server->GetGame(); boost::shared_ptr show(new NetPacket); - show->GetMsg()->set_messagetype(PokerTHMessage::Type_AfterHandShowCardsMessage); + show->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = show->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(server->GetId()); + netGame->set_messagetype(GameMessage::Type_GameEngineMessage); + GameEngineMessage *netEngine = netGame->mutable_gameenginemessage(); + netEngine->set_messagetype(GameEngineMessage::Type_AfterHandShowCardsMessage); + AfterHandShowCardsMessage *netShowCards = netEngine->mutable_afterhandshowcardsmessage(); - AfterHandShowCardsMessage *netShowCards = show->GetMsg()->mutable_afterhandshowcardsmessage(); boost::shared_ptr tmpPlayer(curGame.getPlayerByUniqueId(session->GetPlayerData()->GetUniqueId())); if (tmpPlayer) { SetPlayerResult(*netShowCards->mutable_playerresult(), tmpPlayer, curGame.getCurrentHand()->getRoundBeforePostRiver()); diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index 31840135..4cece7f8 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -107,35 +107,43 @@ public: InternalServerCallback(ServerLobbyThread &server) : m_server(server) {} virtual ~InternalServerCallback() {} - virtual void CloseSession(boost::shared_ptr session) { + virtual void CloseSession(boost::shared_ptr session) + { m_server.CloseSession(session); } - virtual void SessionError(boost::shared_ptr session, int errorCode) { + virtual void SessionError(boost::shared_ptr session, int errorCode) + { m_server.SessionError(session, errorCode); } - virtual void SessionTimeoutWarning(boost::shared_ptr session, unsigned remainingSec) { + virtual void SessionTimeoutWarning(boost::shared_ptr session, unsigned remainingSec) + { m_server.SessionTimeoutWarning(session, remainingSec); } - virtual void HandlePacket(boost::shared_ptr session, boost::shared_ptr packet) { + virtual void HandlePacket(boost::shared_ptr session, boost::shared_ptr packet) + { m_server.DispatchPacket(session, packet); } - virtual void SignalChatBotMessage(const string &msg) { + virtual void SignalChatBotMessage(const string &msg) + { m_server.SendChatBotMsg(msg); } - virtual void SignalChatBotMessage(unsigned gameId, const std::string &msg) { + virtual void SignalChatBotMessage(unsigned gameId, const std::string &msg) + { m_server.SendChatBotMsg(gameId, msg); } - virtual void SignalKickPlayer(unsigned playerId) { + virtual void SignalKickPlayer(unsigned playerId) + { m_server.RemovePlayer(playerId, ERR_NET_PLAYER_KICKED); } - virtual void SignalBanPlayer(unsigned playerId) { + virtual void SignalBanPlayer(unsigned playerId) + { string playerName(m_server.GetPlayerNameFromId(playerId)); if (!playerName.empty()) { m_server.GetBanManager().BanPlayerName(playerName, 1); @@ -143,76 +151,94 @@ public: } } - virtual void SignalMutePlayer(unsigned playerId) { + virtual void SignalMutePlayer(unsigned playerId) + { m_server.MutePlayerInGame(playerId); } - virtual void ConnectSuccess() { + virtual void ConnectSuccess() + { LOG_MSG("Successfully connected to database."); } - virtual void ConnectFailed(string error) { + virtual void ConnectFailed(string error) + { LOG_ERROR("DB connect error: " << error); } - virtual void QueryError(string error) { + virtual void QueryError(string error) + { LOG_ERROR("DB query error: " << error); } - virtual void PlayerLoginSuccess(unsigned requestId, boost::shared_ptr dbPlayerData) { + virtual void PlayerLoginSuccess(unsigned requestId, boost::shared_ptr dbPlayerData) + { m_server.UserValid(requestId, *dbPlayerData); } - virtual void PlayerLoginFailed(unsigned requestId) { + virtual void PlayerLoginFailed(unsigned requestId) + { m_server.UserInvalid(requestId); } - virtual void PlayerLoginBlocked(unsigned requestId) { + virtual void PlayerLoginBlocked(unsigned requestId) + { m_server.UserBlocked(requestId); } - virtual void AvatarIsBlacklisted(unsigned requestId) { + virtual void AvatarIsBlacklisted(unsigned requestId) + { m_server.AvatarBlacklisted(requestId); } - virtual void AvatarIsOK(unsigned requestId) { + virtual void AvatarIsOK(unsigned requestId) + { m_server.AvatarOK(requestId); } - virtual void CreateGameSuccess(unsigned /*requestId*/) { + virtual void CreateGameSuccess(unsigned /*requestId*/) + { // Nothing to do. } - virtual void CreateGameFailed(unsigned requestId) { + virtual void CreateGameFailed(unsigned requestId) + { // TODO maybe handle request id. LOG_ERROR("DB create game failed for request " << requestId); } - virtual void ReportAvatarSuccess(unsigned requestId, unsigned replyId) { + virtual void ReportAvatarSuccess(unsigned requestId, unsigned replyId) + { m_server.SendReportAvatarResult(requestId, replyId, true); } - virtual void ReportAvatarFailed(unsigned requestId, unsigned replyId) { + virtual void ReportAvatarFailed(unsigned requestId, unsigned replyId) + { m_server.SendReportAvatarResult(requestId, replyId, false); } - virtual void ReportGameSuccess(unsigned requestId, unsigned replyId) { + virtual void ReportGameSuccess(unsigned requestId, unsigned replyId) + { m_server.SendReportGameResult(requestId, replyId, true); } - virtual void ReportGameFailed(unsigned requestId, unsigned replyId) { + virtual void ReportGameFailed(unsigned requestId, unsigned replyId) + { m_server.SendReportGameResult(requestId, replyId, false); } - virtual void PlayerAdminList(unsigned /*requestId*/, std::list adminList) { + virtual void PlayerAdminList(unsigned /*requestId*/, std::list adminList) + { m_server.GetBanManager().SetAdminPlayerIds(adminList); } - virtual void BlockPlayerSuccess(unsigned requestId, unsigned replyId) { + virtual void BlockPlayerSuccess(unsigned requestId, unsigned replyId) + { m_server.SendAdminBanPlayerResult(requestId, replyId, true); } - virtual void BlockPlayerFailed(unsigned requestId, unsigned replyId) { + virtual void BlockPlayerFailed(unsigned requestId, unsigned replyId) + { m_server.SendAdminBanPlayerResult(requestId, replyId, false); } @@ -334,9 +360,13 @@ ServerLobbyThread::ReAddSession(boost::shared_ptr session, int reas { if (session && session->GetPlayerData()) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_RemovedFromGameMessage); - RemovedFromGameMessage *removed = packet->GetMsg()->mutable_removedfromgamemessage(); - removed->set_gameid(gameId); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(gameId); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManagement = netGame->mutable_gamemanagementmessage(); + netManagement->set_messagetype(GameManagementMessage::Type_RemovedFromGameMessage); + RemovedFromGameMessage *removed = netManagement->mutable_removedfromgamemessage(); switch (reason) { case NTF_NET_REMOVED_GAME_FULL : @@ -446,8 +476,10 @@ ServerLobbyThread::NotifyPlayerJoinedGame(unsigned gameId, unsigned playerId) { // Send notification to players in lobby. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameListPlayerJoinedMessage); - GameListPlayerJoinedMessage *netListMsg = packet->GetMsg()->mutable_gamelistplayerjoinedmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_GameListPlayerJoinedMessage); + GameListPlayerJoinedMessage *netListMsg = netLobby->mutable_gamelistplayerjoinedmessage(); netListMsg->set_gameid(gameId); netListMsg->set_playerid(playerId); @@ -460,8 +492,10 @@ ServerLobbyThread::NotifyPlayerLeftGame(unsigned gameId, unsigned playerId) { // Send notification to players in lobby. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameListPlayerLeftMessage); - GameListPlayerLeftMessage *netListMsg = packet->GetMsg()->mutable_gamelistplayerleftmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_GameListPlayerLeftMessage); + GameListPlayerLeftMessage *netListMsg = netLobby->mutable_gamelistplayerleftmessage(); netListMsg->set_gameid(gameId); netListMsg->set_playerid(playerId); @@ -474,8 +508,10 @@ ServerLobbyThread::NotifySpectatorJoinedGame(unsigned gameId, unsigned playerId) { // Send notification to players in lobby. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameListSpectatorJoinedMessage); - GameListSpectatorJoinedMessage *netListMsg = packet->GetMsg()->mutable_gamelistspectatorjoinedmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_GameListSpectatorJoinedMessage); + GameListSpectatorJoinedMessage *netListMsg = netLobby->mutable_gamelistspectatorjoinedmessage(); netListMsg->set_gameid(gameId); netListMsg->set_playerid(playerId); @@ -488,8 +524,10 @@ ServerLobbyThread::NotifySpectatorLeftGame(unsigned gameId, unsigned playerId) { // Send notification to players in lobby. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameListSpectatorLeftMessage); - GameListSpectatorLeftMessage *netListMsg = packet->GetMsg()->mutable_gamelistspectatorleftmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_GameListSpectatorLeftMessage); + GameListSpectatorLeftMessage *netListMsg = netLobby->mutable_gamelistspectatorleftmessage(); netListMsg->set_gameid(gameId); netListMsg->set_playerid(playerId); @@ -503,8 +541,10 @@ ServerLobbyThread::NotifyGameAdminChanged(unsigned gameId, unsigned newAdminPlay // Send notification to players in lobby. // Send notification to players in lobby. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameListAdminChangedMessage); - GameListAdminChangedMessage *netListMsg = packet->GetMsg()->mutable_gamelistadminchangedmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_GameListAdminChangedMessage); + GameListAdminChangedMessage *netListMsg = netLobby->mutable_gamelistadminchangedmessage(); netListMsg->set_gameid(gameId); netListMsg->set_newadminplayerid(newAdminPlayerId); @@ -528,48 +568,6 @@ ServerLobbyThread::NotifyReopeningGame(unsigned gameId) m_gameSessionManager.SendLobbyMsgToAllSessions(GetSender(), packet, SessionData::Game | SessionData::Spectating | SessionData::SpectatorWaiting); } -void -ServerLobbyThread::HandleGameRetrievePlayerInfo(boost::shared_ptr session, const PlayerInfoRequestMessage &playerInfoRequest) -{ - // Someone within a game requested player info. - HandleNetPacketRetrievePlayerInfo(session, playerInfoRequest); -} - -void -ServerLobbyThread::HandleGameRetrieveAvatar(boost::shared_ptr session, const AvatarRequestMessage &retrieveAvatar) -{ - // Someone within a game requested an avatar. - HandleNetPacketRetrieveAvatar(session, retrieveAvatar); -} - -void -ServerLobbyThread::HandleGameReportGame(boost::shared_ptr session, const ReportGameMessage &reportGame) -{ - // Someone within a game reportet a game name. - HandleNetPacketReportGame(session, reportGame); -} - -void -ServerLobbyThread::HandleChatRequest(boost::shared_ptr session, const ChatRequestMessage &chatRequest) -{ - // Someone within a game sent a lobby message. - HandleNetPacketChatRequest(session, chatRequest); -} - -void -ServerLobbyThread::HandleAdminRemoveGame(boost::shared_ptr session, const AdminRemoveGameMessage &removeGame) -{ - // An admin within a game sent a remove game message. - HandleNetPacketAdminRemoveGame(session, removeGame); -} - -void -ServerLobbyThread::HandleAdminBanPlayer(boost::shared_ptr session, const AdminBanPlayerMessage &banPlayer) -{ - // An admin within a game sent a ban player message. - HandleNetPacketAdminBanPlayer(session, banPlayer); -} - bool ServerLobbyThread::KickPlayerByName(const std::string &playerName) { @@ -647,8 +645,10 @@ void ServerLobbyThread::SendGlobalChat(const string &message) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ChatMessage); - ChatMessage *netChat = packet->GetMsg()->mutable_chatmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ChatMessage); + ChatMessage *netChat = netLobby->mutable_chatmessage(); netChat->set_chattype(ChatMessage::chatTypeBroadcast); netChat->set_chattext(message); @@ -660,8 +660,10 @@ void ServerLobbyThread::SendGlobalMsgBox(const string &message) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_DialogMessage); - DialogMessage *netDialog = packet->GetMsg()->mutable_dialogmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_DialogMessage); + DialogMessage *netDialog = netLobby->mutable_dialogmessage(); netDialog->set_notificationtext(message); m_sessionManager.SendToAllSessions(GetSender(), packet, SessionData::Established); @@ -672,8 +674,10 @@ void ServerLobbyThread::SendChatBotMsg(const std::string &message) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ChatMessage); - ChatMessage *netChat = packet->GetMsg()->mutable_chatmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ChatMessage); + ChatMessage *netChat = netLobby->mutable_chatmessage(); netChat->set_chattype(ChatMessage::chatTypeBot); netChat->set_chattext(message); @@ -690,10 +694,14 @@ void ServerLobbyThread::SendChatBotMsg(unsigned gameId, const std::string &message) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ChatMessage); - ChatMessage *netChat = packet->GetMsg()->mutable_chatmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameMessage); + GameMessage *netGame = packet->GetMsg()->mutable_gamemessage(); + netGame->set_gameid(gameId); + netGame->set_messagetype(GameMessage::Type_GameManagementMessage); + GameManagementMessage *netManage = netGame->mutable_gamemanagementmessage(); + netManage->set_messagetype(GameManagementMessage::Type_ChatMessage); + ChatMessage *netChat = netManage->mutable_chatmessage(); netChat->set_chattype(ChatMessage::chatTypeBot); - netChat->set_gameid(gameId); netChat->set_chattext(message); GameMap::const_iterator pos = m_gameMap.find(gameId); @@ -928,12 +936,15 @@ void ServerLobbyThread::DispatchPacket(boost::shared_ptr session, boost::shared_ptr packet) { if (session) { + if (packet->IsClientActivity()) { + session->ResetActivityTimer(); + } // Retrieve current game, if applicable. boost::shared_ptr game = session->GetGame(); - if (game) { + if (game && packet->GetMsg()->messagetype() == PokerTHMessage::Type_GameMessage) { // We need to catch game-specific exceptions, so that they do not affect the server. try { - game->HandlePacket(session, packet); + game->HandleGameMsg(session, packet->GetMsg()->gamemessage()); } catch (const PokerTHException &e) { LOG_ERROR("Game " << game->GetId() << " - Read handler exception: " << e.what()); game->RemoveAllSessions(); @@ -950,57 +961,84 @@ ServerLobbyThread::HandlePacket(boost::shared_ptr session, boost::s if (packet->IsClientActivity()) session->ResetActivityTimer(); - if (session->GetState() == SessionData::Init) { - if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_InitMessage) { - HandleNetPacketInit(session, packet->GetMsg()->initmessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AuthClientResponseMessage) { - HandleNetPacketAuthClientResponse(session, packet->GetMsg()->authclientresponsemessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AvatarHeaderMessage) { - HandleNetPacketAvatarHeader(session, packet->GetMsg()->avatarheadermessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_UnknownAvatarMessage) { - HandleNetPacketUnknownAvatar(session, packet->GetMsg()->unknownavatarmessage()); - } else { - SessionError(session, ERR_SOCK_INVALID_STATE); - } - } else if (session->GetState() == SessionData::ReceivingAvatar) { - if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AvatarDataMessage) { - HandleNetPacketAvatarFile(session, packet->GetMsg()->avatardatamessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AvatarEndMessage) { - HandleNetPacketAvatarEnd(session, packet->GetMsg()->avatarendmessage()); + if (session->GetState() == SessionData::Auth) { + if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AuthMessage) { + const AuthMessage &authMsg = packet->GetMsg()->authmessage(); + if (authMsg.messagetype() == AuthMessage::Type_AuthClientRequestMessage) { + HandleNetPacketAuthClientRequest(session, authMsg.authclientrequestmessage()); + } else if (authMsg.messagetype() == AuthMessage::Type_AuthClientResponseMessage) { + HandleNetPacketAuthClientResponse(session, authMsg.authclientresponsemessage()); + } else { + SessionError(session, ERR_SOCK_INVALID_STATE); + } } else { SessionError(session, ERR_SOCK_INVALID_STATE); } } else { - if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_PlayerInfoRequestMessage) - HandleNetPacketRetrievePlayerInfo(session, packet->GetMsg()->playerinforequestmessage()); - else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AvatarRequestMessage) - HandleNetPacketRetrieveAvatar(session, packet->GetMsg()->avatarrequestmessage()); - else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_ResetTimeoutMessage) - {} - else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_SubscriptionRequestMessage) { - const SubscriptionRequestMessage &subscriptionRequest = packet->GetMsg()->subscriptionrequestmessage(); - if (subscriptionRequest.subscriptionaction() == SubscriptionRequestMessage::resubscribeGameList) - InternalResubscribeMsg(session); - else - session->ResetWantsLobbyMsg(); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_JoinNewGameMessage) { - HandleNetPacketCreateGame(session, packet->GetMsg()->joinnewgamemessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_JoinExistingGameMessage) { - HandleNetPacketJoinGame(session, packet->GetMsg()->joinexistinggamemessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_RejoinExistingGameMessage) { - HandleNetPacketRejoinGame(session, packet->GetMsg()->rejoinexistinggamemessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_ChatRequestMessage) { - HandleNetPacketChatRequest(session, packet->GetMsg()->chatrequestmessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_RejectGameInvitationMessage) { - HandleNetPacketRejectGameInvitation(session, packet->GetMsg()->rejectgameinvitationmessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_ReportGameMessage) { - HandleNetPacketReportGame(session, packet->GetMsg()->reportgamemessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_LeaveGameRequestMessage) { - // Ignore "leave game" in this state. - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AdminRemoveGameMessage) { - HandleNetPacketAdminRemoveGame(session, packet->GetMsg()->adminremovegamemessage()); - } else if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_AdminBanPlayerMessage) { - HandleNetPacketAdminBanPlayer(session, packet->GetMsg()->adminbanplayermessage()); + if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_LobbyMessage) { + const LobbyMessage &lobbyMsg = packet->GetMsg()->lobbymessage(); + if (session->GetState() == SessionData::Init) { + if (lobbyMsg.messagetype() == LobbyMessage::Type_AvatarHeaderMessage) { + HandleNetPacketAvatarHeader(session, lobbyMsg.avatarheadermessage()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_UnknownAvatarMessage) { + HandleNetPacketUnknownAvatar(session, lobbyMsg.unknownavatarmessage()); + } else { + SessionError(session, ERR_SOCK_INVALID_STATE); + } + } else if (session->GetState() == SessionData::ReceivingAvatar) { + if (packet->GetMsg()->messagetype() == PokerTHMessage::Type_LobbyMessage) { + const LobbyMessage &lobbyMsg = packet->GetMsg()->lobbymessage(); + if (lobbyMsg.messagetype() == LobbyMessage::Type_AvatarDataMessage) { + HandleNetPacketAvatarFile(session, lobbyMsg.avatardatamessage()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_AvatarEndMessage) { + HandleNetPacketAvatarEnd(session, lobbyMsg.avatarendmessage()); + } else { + SessionError(session, ERR_SOCK_INVALID_STATE); + } + } else { + SessionError(session, ERR_SOCK_INVALID_STATE); + } + } else { + if (lobbyMsg.messagetype() == LobbyMessage::Type_PlayerInfoRequestMessage) + HandleNetPacketRetrievePlayerInfo(session, lobbyMsg.playerinforequestmessage()); + else if (lobbyMsg.messagetype() == LobbyMessage::Type_AvatarRequestMessage) + HandleNetPacketRetrieveAvatar(session, lobbyMsg.avatarrequestmessage()); + else if (lobbyMsg.messagetype() == LobbyMessage::Type_ResetTimeoutMessage) { + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_SubscriptionRequestMessage) { + const SubscriptionRequestMessage &subscriptionRequest = lobbyMsg.subscriptionrequestmessage(); + if (subscriptionRequest.subscriptionaction() == SubscriptionRequestMessage::resubscribeGameList) + InternalResubscribeMsg(session); + else + session->ResetWantsLobbyMsg(); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_CreateGameMessage) { + HandleNetPacketCreateGame(session, lobbyMsg.creategamemessage()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_JoinGameMessage) { + HandleNetPacketJoinGame(session, lobbyMsg.joingamemessage()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_RejoinGameMessage) { + HandleNetPacketRejoinGame(session, lobbyMsg.rejoingamemessage()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_ChatRequestMessage) { + HandleNetPacketChatRequest(session, lobbyMsg.chatrequestmessage()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_RejectGameInvitationMessage) { + HandleNetPacketRejectGameInvitation(session, lobbyMsg.rejectgameinvitationmessage()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_ReportGameMessage) { + HandleNetPacketReportGame(session, lobbyMsg.reportgamemessage()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_AdminRemoveGameMessage) { + HandleNetPacketAdminRemoveGame(session, lobbyMsg.adminremovegamemessage()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_AdminBanPlayerMessage) { + HandleNetPacketAdminBanPlayer(session, lobbyMsg.adminbanplayermessage()); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_SubscriptionRequestMessage) { + const SubscriptionRequestMessage &netSubscription = lobbyMsg.subscriptionrequestmessage(); + if (netSubscription.subscriptionaction() == SubscriptionRequestMessage::resubscribeGameList) { + if (!session->WantsLobbyMsg()) + ResubscribeLobbyMsg(session); + } else + session->ResetWantsLobbyMsg(); + } else if (lobbyMsg.messagetype() == LobbyMessage::Type_ReportAvatarMessage) { + HandleNetPacketReportAvatar(session, lobbyMsg.reportavatarmessage()); + } else { + SessionError(session, ERR_SOCK_INVALID_STATE); + } + } } else { SessionError(session, ERR_SOCK_INVALID_STATE); } @@ -1009,9 +1047,9 @@ ServerLobbyThread::HandlePacket(boost::shared_ptr session, boost::s } void -ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr session, const InitMessage &initMessage) +ServerLobbyThread::HandleNetPacketAuthClientRequest(boost::shared_ptr session, const AuthClientRequestMessage &clientRequest) { - LOG_VERBOSE("Received init for session #" << session->GetId() << "."); + LOG_VERBOSE("Received auth client request for session #" << session->GetId() << "."); // Before any other processing, perform some denial of service and // brute force attack prevention by checking whether the user recently sent an @@ -1032,7 +1070,7 @@ ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr session, c } // Check the protocol version. - if (initMessage.requestedversion().majorversion() != NET_VERSION_MAJOR + if (clientRequest.requestedversion().majorversion() != NET_VERSION_MAJOR || session->GetPlayerData()) { // Has this session already sent an init? SessionError(session, ERR_NET_VERSION_NOT_SUPPORTED); return; @@ -1040,8 +1078,8 @@ ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr session, c #ifndef POKERTH_OFFICIAL_SERVER // Check (clear text) server password (skip for official server, they are open to everyone). string serverPassword; - if (initMessage.has_authserverpassword()) { - serverPassword = initMessage.authserverpassword(); + if (clientRequest.has_authserverpassword()) { + serverPassword = clientRequest.authserverpassword(); } if (serverPassword != m_serverConfig.readConfigString("ServerPassword")) { SessionError(session, ERR_NET_INVALID_PASSWORD); @@ -1053,8 +1091,8 @@ ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr session, c MD5Buf avatarMD5; bool noAuth = false; bool validGuest = false; - if (initMessage.login() == InitMessage::guestLogin) { - playerName = initMessage.nickname(); + if (clientRequest.login() == AuthClientRequestMessage::guestLogin) { + playerName = clientRequest.nickname(); // Verify guest player name. if (playerName.length() > sizeof(SERVER_GUEST_PLAYER_NAME - 1) && playerName.substr(0, sizeof(SERVER_GUEST_PLAYER_NAME) - 1) == SERVER_GUEST_PLAYER_NAME) { @@ -1070,20 +1108,20 @@ ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr session, c } } #ifdef POKERTH_OFFICIAL_SERVER - else if (initMessage.login() == InitMessage::authenticatedLogin) { - string inAuthData(initMessage.clientuserdata()); - if (initMessage.has_avatarhash()) { - memcpy(avatarMD5.GetData(), initMessage.avatarhash().data(), MD5_DATA_SIZE); + else if (clientRequest.login() == AuthClientRequestMessage::authenticatedLogin) { + string inAuthData(clientRequest.clientuserdata()); + if (clientRequest.has_avatarhash()) { + memcpy(avatarMD5.GetData(), clientRequest.avatarhash().data(), MD5_DATA_SIZE); } session->CreateServerAuthSession(m_authContext); if (session->AuthStep(1, inAuthData)) playerName = session->AuthGetUser(); } #else - else if (initMessage.login() == InitMessage::unauthenticatedLogin) { - playerName = initMessage.nickname(); - if (initMessage.has_avatarhash()) { - memcpy(avatarMD5.GetData(), initMessage.avatarhash().data(), MD5_DATA_SIZE); + else if (clientRequest.login() == AuthClientRequestMessage::unauthenticatedLogin) { + playerName = clientRequest.nickname(); + if (clientRequest.has_avatarhash()) { + memcpy(avatarMD5.GetData(), clientRequest.avatarhash().data(), MD5_DATA_SIZE); } noAuth = true; } @@ -1120,8 +1158,8 @@ ServerLobbyThread::HandleNetPacketInit(boost::shared_ptr session, c new PlayerData(GetNextUniquePlayerId(), 0, PLAYER_TYPE_HUMAN, validGuest ? PLAYER_RIGHTS_GUEST : PLAYER_RIGHTS_NORMAL, false)); tmpPlayerData->SetName(playerName); tmpPlayerData->SetAvatarMD5(avatarMD5); - if (initMessage.has_mylastsessionid()) { - tmpPlayerData->SetOldGuid(initMessage.mylastsessionid()); + if (clientRequest.has_mylastsessionid()) { + tmpPlayerData->SetOldGuid(clientRequest.mylastsessionid()); } // Set player data for session. @@ -1143,9 +1181,11 @@ ServerLobbyThread::HandleNetPacketAuthClientResponse(boost::shared_ptrAuthGetNextOutMsg()); boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_AuthServerVerificationMessage); - AuthServerVerificationMessage *verification = packet->GetMsg()->mutable_authserververificationmessage(); - verification->set_serververification(outVerification); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_AuthMessage); + AuthMessage *netAuth = packet->GetMsg()->mutable_authmessage(); + netAuth->set_messagetype(AuthMessage::Type_AuthServerVerificationMessage); + AuthServerVerificationMessage *authVerif = netAuth->mutable_authserververificationmessage(); + authVerif->set_serververification(outVerification); GetSender().Send(session, packet); // The last message is only for server verification. // We are done now, the user has logged in. @@ -1255,8 +1295,10 @@ ServerLobbyThread::HandleNetPacketRetrievePlayerInfo(boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_PlayerInfoReplyMessage); - PlayerInfoReplyMessage *netPlayerInfoReply = packet->GetMsg()->mutable_playerinforeplymessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_PlayerInfoReplyMessage); + PlayerInfoReplyMessage *netPlayerInfoReply = netLobby->mutable_playerinforeplymessage(); netPlayerInfoReply->set_playerid(playerId); if (tmpPlayer) { @@ -1301,8 +1343,10 @@ ServerLobbyThread::HandleNetPacketRetrieveAvatar(boost::shared_ptr if (!avatarFound) { // Notify client we didn't find the avatar. boost::shared_ptr unknownAvatar(new NetPacket); - unknownAvatar->GetMsg()->set_messagetype(PokerTHMessage::Type_UnknownAvatarMessage); - UnknownAvatarMessage *netAvatarReply = unknownAvatar->GetMsg()->mutable_unknownavatarmessage(); + unknownAvatar->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = unknownAvatar->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_UnknownAvatarMessage); + UnknownAvatarMessage *netAvatarReply = netLobby->mutable_unknownavatarmessage(); netAvatarReply->set_requestid(retrieveAvatar.requestid()); GetSender().Send(session, unknownAvatar); @@ -1310,7 +1354,7 @@ ServerLobbyThread::HandleNetPacketRetrieveAvatar(boost::shared_ptr } void -ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr session, const JoinNewGameMessage &newGame) +ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr session, const CreateGameMessage &newGame) { LOG_VERBOSE("Creating new game, initiated by session #" << session->GetId() << "."); @@ -1332,16 +1376,16 @@ ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr sess unsigned gameId = GetNextGameId(); if (gameName.empty() || !isprint(gameName[0])) { - SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GAME_BAD_NAME); + SendCreateGameFailed(session, newGame.requestid(), NTF_NET_CREATE_GAME_BAD_NAME); } else if (IsGameNameInUse(gameName)) { - SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GAME_NAME_IN_USE); + SendCreateGameFailed(session, newGame.requestid(), NTF_NET_CREATE_GAME_NAME_IN_USE); } else if (GetBanManager().IsBadGameName(gameName)) { - SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GAME_BAD_NAME); + SendCreateGameFailed(session, newGame.requestid(), NTF_NET_CREATE_GAME_BAD_NAME); } else if (session->GetPlayerData()->GetRights() == PLAYER_RIGHTS_GUEST && tmpData.gameType != GAME_TYPE_NORMAL) { - SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GUEST_FORBIDDEN); + SendCreateGameFailed(session, newGame.requestid(), NTF_NET_CREATE_GUEST_FORBIDDEN); } else if (!ServerGame::CheckSettings(tmpData, password, GetServerMode())) { - SendJoinGameFailed(session, gameId, NTF_NET_JOIN_INVALID_SETTINGS); + SendCreateGameFailed(session, newGame.requestid(), NTF_NET_CREATE_INVALID_SETTINGS); } else { boost::shared_ptr game( new ServerGame( @@ -1366,7 +1410,7 @@ ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr sess } void -ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr session, const JoinExistingGameMessage &joinGame) +ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr session, const JoinGameMessage &joinGame) { string password; if (joinGame.has_password()) @@ -1411,7 +1455,7 @@ ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr sessio } void -ServerLobbyThread::HandleNetPacketRejoinGame(boost::shared_ptr session, const RejoinExistingGameMessage &rejoinGame) +ServerLobbyThread::HandleNetPacketRejoinGame(boost::shared_ptr session, const RejoinGameMessage &rejoinGame) { // Rejoin a running game. GameMap::iterator pos = m_gameMap.find(rejoinGame.gameid()); @@ -1430,13 +1474,15 @@ ServerLobbyThread::HandleNetPacketChatRequest(boost::shared_ptr ses bool chatSent = false; // Guests are not allowed to chat. if (session->GetPlayerData() && session->GetPlayerData()->GetRights() != PLAYER_RIGHTS_GUEST) { - if (!chatRequest.has_targetgameid() && !chatRequest.has_targetplayerid()) { + if (!chatRequest.has_targetplayerid()) { string chatMsg(chatRequest.chattext()); boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ChatMessage); - ChatMessage *netChat = packet->GetMsg()->mutable_chatmessage(); - netChat->set_chattype(ChatMessage::chatTypeLobby); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ChatMessage); + ChatMessage *netChat = netLobby->mutable_chatmessage(); + netChat->set_chattype(ChatMessage::chatTypeStandard); netChat->set_playerid(session->GetPlayerData()->GetUniqueId()); netChat->set_chattext(chatMsg); @@ -1454,7 +1500,7 @@ ServerLobbyThread::HandleNetPacketChatRequest(boost::shared_ptr ses session->GetPlayerData()->GetName(), chatMsg); chatSent = true; - } else if (!chatRequest.has_targetgameid() && chatRequest.has_targetplayerid()) { + } else { boost::shared_ptr targetSession = m_sessionManager.GetSessionByUniquePlayerId(chatRequest.targetplayerid()); if (!targetSession) targetSession = m_gameSessionManager.GetSessionByUniquePlayerId(chatRequest.targetplayerid()); @@ -1464,8 +1510,10 @@ ServerLobbyThread::HandleNetPacketChatRequest(boost::shared_ptr ses boost::shared_ptr tmpGame = targetSession->GetGame(); if (!tmpGame || !tmpGame->IsRunning()) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ChatMessage); - ChatMessage *netChat = packet->GetMsg()->mutable_chatmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ChatMessage); + ChatMessage *netChat = netLobby->mutable_chatmessage(); netChat->set_chattype(ChatMessage::chatTypePrivate); netChat->set_playerid(session->GetPlayerData()->GetUniqueId()); netChat->set_chattext(chatRequest.chattext()); @@ -1479,8 +1527,10 @@ ServerLobbyThread::HandleNetPacketChatRequest(boost::shared_ptr ses // Other chat types are not allowed in the lobby. if (!chatSent) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ChatRejectMessage); - ChatRejectMessage *netReject = packet->GetMsg()->mutable_chatrejectmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ChatRejectMessage); + ChatRejectMessage *netReject = netLobby->mutable_chatrejectmessage(); netReject->set_chattext(chatRequest.chattext()); GetSender().Send(session, packet); } @@ -1501,8 +1551,10 @@ ServerLobbyThread::HandleNetPacketRejectGameInvitation(boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_RejectInvNotifyMessage); - RejectInvNotifyMessage *netReject = packet->GetMsg()->mutable_rejectinvnotifymessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_RejectInvNotifyMessage); + RejectInvNotifyMessage *netReject = netLobby->mutable_rejectinvnotifymessage(); netReject->set_gameid(reject.gameid()); netReject->set_playerid(tmpPlayerId); netReject->set_playerrejectreason(reject.myrejectreason()); @@ -1535,16 +1587,20 @@ ServerLobbyThread::HandleNetPacketReportGame(boost::shared_ptr sess ); } else { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ReportGameAckMessage); - ReportGameAckMessage *netReportAck = packet->GetMsg()->mutable_reportgameackmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ReportGameAckMessage); + ReportGameAckMessage *netReportAck = netLobby->mutable_reportgameackmessage(); netReportAck->set_reportedgameid(report.reportedgameid()); netReportAck->set_reportgameresult(ReportGameAckMessage::gameReportDuplicate); GetSender().Send(session, packet); } } else { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ReportGameAckMessage); - ReportGameAckMessage *netReportAck = packet->GetMsg()->mutable_reportgameackmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ReportGameAckMessage); + ReportGameAckMessage *netReportAck = netLobby->mutable_reportgameackmessage(); netReportAck->set_reportedgameid(report.reportedgameid()); netReportAck->set_reportgameresult(ReportGameAckMessage::gameReportInvalid); GetSender().Send(session, packet); @@ -1558,8 +1614,10 @@ ServerLobbyThread::HandleNetPacketAdminRemoveGame(boost::shared_ptr // Create Ack-Packet. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_AdminRemoveGameAckMessage); - AdminRemoveGameAckMessage *netRemoveAck = packet->GetMsg()->mutable_adminremovegameackmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_AdminRemoveGameAckMessage); + AdminRemoveGameAckMessage *netRemoveAck = netLobby->mutable_adminremovegameackmessage(); netRemoveAck->set_removegameid(removeGame.removegameid()); // Check whether game id is valid and whether the player is an admin. @@ -1578,8 +1636,10 @@ ServerLobbyThread::HandleNetPacketAdminBanPlayer(boost::shared_ptr { // Create Ack-Packet. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_AdminBanPlayerAckMessage); - AdminBanPlayerAckMessage *netBanAck = packet->GetMsg()->mutable_adminbanplayerackmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_AdminBanPlayerAckMessage); + AdminBanPlayerAckMessage *netBanAck = netLobby->mutable_adminbanplayerackmessage(); netBanAck->set_banplayerid(banPlayer.banplayerid()); if (session && session->GetPlayerData() && GetBanManager().IsAdminPlayer(session->GetPlayerData()->GetDBId())) { @@ -1616,6 +1676,82 @@ ServerLobbyThread::HandleNetPacketAdminBanPlayer(boost::shared_ptr GetSender().Send(session, packet); } +void +ServerLobbyThread::HandleNetPacketReportAvatar(boost::shared_ptr session, const ReportAvatarMessage &reportAvatar) +{ + boost::shared_ptr tmpSession = m_sessionManager.GetSessionByUniquePlayerId(reportAvatar.reportedplayerid()); + if (!tmpSession) { + tmpSession = m_gameSessionManager.GetSessionByUniquePlayerId(reportAvatar.reportedplayerid()); + } + boost::shared_ptr tmpPlayer; + if (tmpSession) { + tmpPlayer = tmpSession->GetPlayerData(); + } + MD5Buf tmpMD5; + memcpy(tmpMD5.GetData(), reportAvatar.reportedavatarhash().data(), MD5_DATA_SIZE); + if (tmpPlayer && tmpPlayer->GetDBId() && !tmpMD5.IsZero() && tmpPlayer->GetAvatarMD5() == tmpMD5) { + if (!IsAvatarReported(tmpPlayer->GetUniqueId())) { + // Temporarily note that this avatar was reported. + // This prevents spamming of the avatar report. + AddReportedAvatar(tmpPlayer->GetUniqueId()); + DB_id myDBid = session->GetPlayerData()->GetDBId(); + // Do not use the "game" database object, but the global one. + // The entry should be created even if we are not running a + // ranking game. + + string tmpAvatarType; + tmpAvatarType = AvatarManager::GetAvatarFileExtension(AvatarManager::GetAvatarFileType(tmpPlayer->GetAvatarFile())); + if (!tmpAvatarType.empty()) + tmpAvatarType.erase(0, 1); // Only store extension without the "." + + GetDatabase()->AsyncReportAvatar( + session->GetPlayerData()->GetUniqueId(), + tmpPlayer->GetUniqueId(), + tmpPlayer->GetDBId(), + tmpPlayer->GetAvatarMD5().ToString(), + tmpAvatarType, + myDBid != 0 ? &myDBid : NULL + ); + } else { + boost::shared_ptr packet(new NetPacket); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ReportAvatarAckMessage); + ReportAvatarAckMessage *netReportAck = netLobby->mutable_reportavatarackmessage(); + netReportAck->set_reportedplayerid(reportAvatar.reportedplayerid()); + netReportAck->set_reportavatarresult(ReportAvatarAckMessage::avatarReportDuplicate); + GetSender().Send(session, packet); + } + } else { + boost::shared_ptr packet(new NetPacket); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ReportAvatarAckMessage); + ReportAvatarAckMessage *netReportAck = netLobby->mutable_reportavatarackmessage(); + netReportAck->set_reportedplayerid(reportAvatar.reportedplayerid()); + netReportAck->set_reportavatarresult(ReportAvatarAckMessage::avatarReportInvalid); + GetSender().Send(session, packet); + } +} + +void +ServerLobbyThread::AddReportedAvatar(unsigned playerId) +{ + boost::mutex::scoped_lock lock(m_reportedAvatarListMutex); + m_reportedAvatarList.push_back(playerId); +} + +bool +ServerLobbyThread::IsAvatarReported(unsigned playerId) const +{ + bool retVal = false; + boost::mutex::scoped_lock lock(m_reportedAvatarListMutex); + PlayerIdList::const_iterator pos = find(m_reportedAvatarList.begin(), m_reportedAvatarList.end(), playerId); + if (pos != m_reportedAvatarList.end()) + retVal = true; + return retVal; +} + void ServerLobbyThread::AuthChallenge(boost::shared_ptr session, const string &secret) { @@ -1624,8 +1760,10 @@ ServerLobbyThread::AuthChallenge(boost::shared_ptr session, const s string outChallenge(session->AuthGetNextOutMsg()); boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_AuthServerChallengeMessage); - AuthServerChallengeMessage *challenge = packet->GetMsg()->mutable_authserverchallengemessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_AuthMessage); + AuthMessage *netAuth = packet->GetMsg()->mutable_authmessage(); + netAuth->set_messagetype(AuthMessage::Type_AuthServerChallengeMessage); + AuthServerChallengeMessage *challenge = netAuth->mutable_authserverchallengemessage(); challenge->set_serverchallenge(outChallenge); GetSender().Send(session, packet); } @@ -1725,15 +1863,17 @@ ServerLobbyThread::EstablishSession(boost::shared_ptr session) session->GetPlayerData()->SetGuid(string((char *)&sessionGuid, boost::uuids::uuid::static_size())); // Send ACK to client. - boost::shared_ptr ack(new NetPacket); - ack->GetMsg()->set_messagetype(PokerTHMessage::Type_InitAckMessage); - InitAckMessage *netInitAck = ack->GetMsg()->mutable_initackmessage(); - netInitAck->set_yoursessionid(session->GetPlayerData()->GetGuid()); - netInitAck->set_yourplayerid(session->GetPlayerData()->GetUniqueId()); + boost::shared_ptr done(new NetPacket); + done->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = done->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_InitDoneMessage); + InitDoneMessage *netInitDone = netLobby->mutable_initdonemessage(); + netInitDone->set_yoursessionid(session->GetPlayerData()->GetGuid()); + netInitDone->set_yourplayerid(session->GetPlayerData()->GetUniqueId()); if (rejoinGameId != 0) { - netInitAck->set_rejoingameid(rejoinGameId); + netInitDone->set_rejoingameid(rejoinGameId); } - GetSender().Send(session, ack); + GetSender().Send(session, done); // Send the connected players list to the client. SendPlayerList(session); @@ -1787,8 +1927,10 @@ ServerLobbyThread::SendReportAvatarResult(unsigned byPlayerId, unsigned reported session = m_gameSessionManager.GetSessionByUniquePlayerId(byPlayerId); if (session) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ReportAvatarAckMessage); - ReportAvatarAckMessage *netReportAck = packet->GetMsg()->mutable_reportavatarackmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ReportAvatarAckMessage); + ReportAvatarAckMessage *netReportAck = netLobby->mutable_reportavatarackmessage(); netReportAck->set_reportedplayerid(reportedPlayerId); netReportAck->set_reportavatarresult(success ? ReportAvatarAckMessage::avatarReportAccepted : ReportAvatarAckMessage::avatarReportInvalid); GetSender().Send(session, packet); @@ -1803,8 +1945,10 @@ ServerLobbyThread::SendReportGameResult(unsigned byPlayerId, unsigned reportedGa session = m_gameSessionManager.GetSessionByUniquePlayerId(byPlayerId); if (session) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ReportGameAckMessage); - ReportGameAckMessage *netReportAck = packet->GetMsg()->mutable_reportgameackmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ReportAvatarAckMessage); + ReportGameAckMessage *netReportAck = netLobby->mutable_reportgameackmessage(); netReportAck->set_reportedgameid(reportedGameId); netReportAck->set_reportgameresult(success ? ReportGameAckMessage::gameReportAccepted : ReportGameAckMessage::gameReportInvalid); GetSender().Send(session, packet); @@ -1819,8 +1963,10 @@ ServerLobbyThread::SendAdminBanPlayerResult(unsigned byPlayerId, unsigned report session = m_gameSessionManager.GetSessionByUniquePlayerId(byPlayerId); if (session) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_AdminBanPlayerAckMessage); - AdminBanPlayerAckMessage *netBanAck = packet->GetMsg()->mutable_adminbanplayerackmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_AdminBanPlayerAckMessage); + AdminBanPlayerAckMessage *netBanAck = netLobby->mutable_adminbanplayerackmessage(); netBanAck->set_banplayerid(reportedPlayerId); netBanAck->set_banplayerresult(success ? AdminBanPlayerAckMessage::banPlayerAccepted : AdminBanPlayerAckMessage::banPlayerDBError); GetSender().Send(session, packet); @@ -1840,8 +1986,10 @@ ServerLobbyThread::RequestPlayerAvatar(boost::shared_ptr session) throw ServerException(__FILE__, __LINE__, ERR_NET_INVALID_SESSION, 0); // Ask the client to send its avatar. boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_AvatarRequestMessage); - AvatarRequestMessage *netAvatarRequest = packet->GetMsg()->mutable_avatarrequestmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_AvatarRequestMessage); + AvatarRequestMessage *netAvatarRequest = netLobby->mutable_avatarrequestmessage(); netAvatarRequest->set_requestid(session->GetPlayerData()->GetUniqueId()); netAvatarRequest->set_avatarhash(session->GetPlayerData()->GetAvatarMD5().GetData(), MD5_DATA_SIZE); @@ -2044,8 +2192,10 @@ void ServerLobbyThread::SessionTimeoutWarning(boost::shared_ptr session, unsigned remainingSec) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_TimeoutWarningMessage); - TimeoutWarningMessage *netWarning = packet->GetMsg()->mutable_timeoutwarningmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_TimeoutWarningMessage); + TimeoutWarningMessage *netWarning = netLobby->mutable_timeoutwarningmessage(); netWarning->set_timeoutreason(TimeoutWarningMessage::timeoutNoDataReceived); netWarning->set_remainingseconds(remainingSec); GetSender().Send(session, packet); @@ -2075,18 +2225,49 @@ ServerLobbyThread::SendError(boost::shared_ptr s, int errorCode) { LOG_VERBOSE("Sending error code " << errorCode << " to session #" << s->GetId() << "."); boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_ErrorMessage); - ErrorMessage *netError = packet->GetMsg()->mutable_errormessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_ErrorMessage); + ErrorMessage *netError = netLobby->mutable_errormessage(); netError->set_errorreason(NetPacket::GameErrorToNetError(errorCode)); GetSender().Send(s, packet); } +void +ServerLobbyThread::SendCreateGameFailed(boost::shared_ptr s, unsigned requestId, int reason) +{ + boost::shared_ptr packet(new NetPacket); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_CreateGameFailedMessage); + CreateGameFailedMessage *netCreateFailed = netLobby->mutable_creategamefailedmessage(); + netCreateFailed->set_requestid(requestId); + + switch (reason) { + case NTF_NET_CREATE_GUEST_FORBIDDEN : + netCreateFailed->set_creategamefailurereason(CreateGameFailedMessage::notAllowedAsGuest); + break; + case NTF_NET_CREATE_GAME_NAME_IN_USE : + netCreateFailed->set_creategamefailurereason(CreateGameFailedMessage::gameNameInUse); + break; + case NTF_NET_CREATE_GAME_BAD_NAME : + netCreateFailed->set_creategamefailurereason(CreateGameFailedMessage::badGameName); + break; + default : + netCreateFailed->set_creategamefailurereason(CreateGameFailedMessage::invalidSettings); + break; + } + GetSender().Send(s, packet); +} + void ServerLobbyThread::SendJoinGameFailed(boost::shared_ptr s, unsigned gameId, int reason) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_JoinGameFailedMessage); - JoinGameFailedMessage *netJoinFailed = packet->GetMsg()->mutable_joingamefailedmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_JoinGameFailedMessage); + JoinGameFailedMessage *netJoinFailed = netLobby->mutable_joingamefailedmessage(); netJoinFailed->set_gameid(gameId); switch (reason) { @@ -2105,15 +2286,6 @@ ServerLobbyThread::SendJoinGameFailed(boost::shared_ptr s, unsigned case NTF_NET_JOIN_NOT_INVITED : netJoinFailed->set_joingamefailurereason(JoinGameFailedMessage::notInvited); break; - case NTF_NET_JOIN_GAME_NAME_IN_USE : - netJoinFailed->set_joingamefailurereason(JoinGameFailedMessage::gameNameInUse); - break; - case NTF_NET_JOIN_GAME_BAD_NAME : - netJoinFailed->set_joingamefailurereason(JoinGameFailedMessage::badGameName); - break; - case NTF_NET_JOIN_INVALID_SETTINGS : - netJoinFailed->set_joingamefailurereason(JoinGameFailedMessage::invalidSettings); - break; case NTF_NET_JOIN_IP_BLOCKED : netJoinFailed->set_joingamefailurereason(JoinGameFailedMessage::ipAddressBlocked); break; @@ -2181,8 +2353,10 @@ ServerLobbyThread::BroadcastStatisticsUpdate(const ServerStats &stats) { if (stats.numberOfPlayersOnServer) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_StatisticsMessage); - StatisticsMessage *netStatistics = packet->GetMsg()->mutable_statisticsmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_StatisticsMessage); + StatisticsMessage *netStatistics = netLobby->mutable_statisticsmessage(); StatisticsMessage::StatisticsData *data = netStatistics->add_statisticsdata(); data->set_statisticstype(StatisticsMessage::StatisticsData::statNumberOfPlayers); @@ -2291,8 +2465,10 @@ boost::shared_ptr ServerLobbyThread::CreateNetPacketPlayerListNew(unsigned playerId) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_PlayerListMessage); - PlayerListMessage *netPlayerList = packet->GetMsg()->mutable_playerlistmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_PlayerListMessage); + PlayerListMessage *netPlayerList = netLobby->mutable_playerlistmessage(); netPlayerList->set_playerid(playerId); netPlayerList->set_playerlistnotification(PlayerListMessage::playerListNew); return packet; @@ -2302,8 +2478,10 @@ boost::shared_ptr ServerLobbyThread::CreateNetPacketPlayerListLeft(unsigned playerId) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_PlayerListMessage); - PlayerListMessage *netPlayerList = packet->GetMsg()->mutable_playerlistmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_PlayerListMessage); + PlayerListMessage *netPlayerList = netLobby->mutable_playerlistmessage(); netPlayerList->set_playerid(playerId); netPlayerList->set_playerlistnotification(PlayerListMessage::playerListLeft); return packet; @@ -2313,8 +2491,10 @@ boost::shared_ptr ServerLobbyThread::CreateNetPacketGameListNew(const ServerGame &game) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameListNewMessage); - GameListNewMessage *netGameList = packet->GetMsg()->mutable_gamelistnewmessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_GameListNewMessage); + GameListNewMessage *netGameList = netLobby->mutable_gamelistnewmessage(); netGameList->set_gameid(game.GetId()); netGameList->set_adminplayerid(game.GetAdminPlayerId()); netGameList->set_gamemode(game.IsRunning() ? netGameStarted : netGameCreated); @@ -2345,8 +2525,10 @@ boost::shared_ptr ServerLobbyThread::CreateNetPacketGameListUpdate(unsigned gameId, GameMode mode) { boost::shared_ptr packet(new NetPacket); - packet->GetMsg()->set_messagetype(PokerTHMessage::Type_GameListUpdateMessage); - GameListUpdateMessage *netGameList = packet->GetMsg()->mutable_gamelistupdatemessage(); + packet->GetMsg()->set_messagetype(PokerTHMessage::Type_LobbyMessage); + LobbyMessage *netLobby = packet->GetMsg()->mutable_lobbymessage(); + netLobby->set_messagetype(LobbyMessage::Type_GameListUpdateMessage); + GameListUpdateMessage *netGameList = netLobby->mutable_gamelistupdatemessage(); netGameList->set_gameid(gameId); netGameList->set_gamemode(static_cast(mode)); return packet; diff --git a/src/net/common/sessiondata.cpp b/src/net/common/sessiondata.cpp index f9cd30b9..e0e762ac 100644 --- a/src/net/common/sessiondata.cpp +++ b/src/net/common/sessiondata.cpp @@ -48,7 +48,7 @@ using namespace boost::chrono; #endif SessionData::SessionData(boost::shared_ptr sock, SessionId id, SessionDataCallback &cb, boost::asio::io_service &ioService) - : m_socket(sock), m_id(id), m_state(SessionData::Init), m_readyFlag(false), m_wantsLobbyMsg(true), + : m_socket(sock), m_id(id), m_state(SessionData::Auth), m_readyFlag(false), m_wantsLobbyMsg(true), m_activityTimeoutSec(0), m_activityWarningRemainingSec(0), m_initTimeoutTimer(ioService), m_globalTimeoutTimer(ioService), m_activityTimeoutTimer(ioService), m_callback(cb), m_authSession(NULL), m_curAuthStep(0) { @@ -221,7 +221,7 @@ void SessionData::TimerInitTimeout(const boost::system::error_code &ec) { if (!ec) { - if (GetState() == SessionData::Init) { + if (GetState() == SessionData::Auth || GetState() == SessionData::Init) { m_callback.SessionError(shared_from_this(), ERR_NET_SESSION_TIMED_OUT); } } diff --git a/src/net/common/sessionmanager.cpp b/src/net/common/sessionmanager.cpp index bd8b65eb..9e6fee6a 100644 --- a/src/net/common/sessionmanager.cpp +++ b/src/net/common/sessionmanager.cpp @@ -100,7 +100,8 @@ SessionManager::GetSessionByPlayerName(const string &playerName) const while (session_i != session_end) { // Check all players which are fully connected. - if (session_i->second->GetState() != SessionData::Init) { + SessionData::State curState = session_i->second->GetState(); + if (curState != SessionData::Auth && curState != SessionData::Init) { boost::shared_ptr tmpPlayer(session_i->second->GetPlayerData()); if (!tmpPlayer) throw ServerException(__FILE__, __LINE__, ERR_NET_INVALID_SESSION, 0); @@ -126,7 +127,8 @@ SessionManager::GetSessionByUniquePlayerId(unsigned uniqueId, bool initSessions) while (session_i != session_end) { // Check all players which are fully connected. - if (initSessions || session_i->second->GetState() != SessionData::Init) { + SessionData::State curState = session_i->second->GetState(); + if (initSessions || (curState != SessionData::Auth && curState != SessionData::Init)) { boost::shared_ptr tmpPlayer(session_i->second->GetPlayerData()); if (tmpPlayer && tmpPlayer->GetUniqueId() == uniqueId) { tmpSession = session_i->second; diff --git a/src/net/common/validation/authmessagevalidator.cpp b/src/net/common/validation/authmessagevalidator.cpp index c690a8af..87fdef97 100644 --- a/src/net/common/validation/authmessagevalidator.cpp +++ b/src/net/common/validation/authmessagevalidator.cpp @@ -29,145 +29,46 @@ * as that of the covered work. * *****************************************************************************/ -#include -#include +#include +#include using namespace std; -#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535) -#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize)) -#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval)) -#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval)) -#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize)) -static bool -ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval) +AuthMessageValidator::AuthMessageValidator() { - bool retVal = true; - for (int i = 0; i < l.size(); i++) { - if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) { - retVal = false; - break; - } - } - return retVal; -} - -NetPacketValidator::NetPacketValidator() -{ - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage)); + m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientRequestMessage, ValidateAuthClientRequestMessage)); m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage)); m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage)); m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage)); } bool -NetPacketValidator::IsValidPacket(const NetPacket &packet) const +AuthMessageValidator::IsValidMessage(const AuthMessage &msg) const { // Default: Invalid packet. bool retVal = false; - ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype()); + ValidateFunctorMap::const_iterator pos = m_validationMap.find(msg.messagetype()); if (pos != m_validationMap.end()) { // Call validation functor. - retVal = pos->second(packet); + retVal = pos->second(msg); } return retVal; } bool -NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) +AuthMessageValidator::ValidateAuthClientRequestMessage(const AuthMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_announcemessage()) { - const AnnounceMessage &msg = packet.GetMsg()->announcemessage(); - if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion()) - && VALIDATE_IS_UINT16(msg.protocolversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().majorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestbetarevision()) - && VALIDATE_IS_UINT16(msg.numplayersonserver())) { + if (msg.has_authclientrequestmessage()) { + const AuthClientRequestMessage &request = msg.authclientrequestmessage(); + if (VALIDATE_IS_UINT16(request.requestedversion().majorversion()) + && VALIDATE_IS_UINT16(request.requestedversion().minorversion()) + && (!request.has_mylastsessionid() || request.mylastsessionid().size() == 16) + && (!request.has_authserverpassword() || VALIDATE_STRING_SIZE(request.authserverpassword(), 1, 64)) + && (!request.has_nickname() || VALIDATE_STRING_SIZE(request.nickname(), 1, 64)) + && (!request.has_clientuserdata() || VALIDATE_STRING_SIZE(request.clientuserdata(), 1, 256)) + && (!request.has_avatarhash() || request.avatarhash().size() == 16)) { retVal = true; } @@ -176,1082 +77,12 @@ NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateInitMessage(const NetPacket &packet) +AuthMessageValidator::ValidateAuthServerChallengeMessage(const AuthMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_initmessage()) { - const InitMessage &msg = packet.GetMsg()->initmessage(); - if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion()) - && VALIDATE_IS_UINT16(msg.requestedversion().minorversion()) - && (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16) - && (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64)) - && (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64)) - && (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256)) - && (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserverchallengemessage()) { - const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage(); - if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authclientresponsemessage()) { - const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage(); - if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserververificationmessage()) { - const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage(); - if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_initackmessage()) { - const InitAckMessage &msg = packet.GetMsg()->initackmessage(); - if (msg.yoursessionid().size() == 16 - && msg.yourplayerid() != 0 - && (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16) - && (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarrequestmessage()) { - const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage(); - if (msg.requestid() != 0 - && msg.avatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarheadermessage()) { - const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage(); - if (msg.requestid() != 0 - && VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatardatamessage()) { - const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage(); - if (msg.requestid() != 0 - && VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarendmessage()) { - const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_unknownavatarmessage()) { - const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerlistmessage()) { - const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage(); - if (msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistnewmessage()) { - const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerids(), 0, 10) - && msg.adminplayerid() != 0 - && ValidateGameInfo(msg.gameinfo())) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistupdatemessage()) { - const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) { - const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerleftmessage()) { - const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistadminchangedmessage()) { - const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforequestmessage()) { - const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage(); - if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforeplymessage()) { - const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage(); - if (msg.playerid() != 0) { - // TODO maybe additional checks. - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_subscriptionrequestmessage()) { - //const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joinnewgamemessage()) { - const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage(); - if (ValidateGameInfo(msg.gameinfo()) - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joinexistinggamemessage()) { - const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage(); - if (msg.gameid() != 0 - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejoinexistinggamemessage()) { - const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joingameackmessage()) { - const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage(); - if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joingamefailedmessage()) { - const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameplayerjoinedmessage()) { - const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameplayerleftmessage()) { - const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameadminchangedmessage()) { - const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_removedfromgamemessage()) { - const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickplayerrequestmessage()) { - const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_leavegamerequestmessage()) { - const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_inviteplayertogamemessage()) { - const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_invitenotifymessage()) { - const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage(); - if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectgameinvitationmessage()) { - const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectinvnotifymessage()) { - const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventmessage()) { - const StartEventMessage &msg = packet.GetMsg()->starteventmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventackmessage()) { - const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartinitialmessage()) { - const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartrejoinmessage()) { - const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && msg.handnum() != 0 - && VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_handstartmessage()) { - const HandStartMessage &msg = packet.GetMsg()->handstartmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000) - && VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersturnmessage()) { - const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0 ) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_myactionrequestmessage()) { - const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage(); - if (msg.gameid() != 0 - && msg.handnum() != 0 - && VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_youractionrejectedmessage()) { - const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersactiondonemessage()) { - const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealflopcardsmessage()) { - const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.flopcard1(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard2(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealturncardmessage()) { - const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.turncard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealrivercardmessage()) { - const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.rivercard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_allinshowcardsmessage()) { - const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandshowcardsmessage()) { - const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandhidecardsmessage()) { - const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_showmycardsrequestmessage()) { - // const ShowMyCardsRequestMessage &msg = packet.GetMsg()->showmycardsrequestmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_afterhandshowcardsmessage()) { - //const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofgamemessage()) { - const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage(); - if (msg.gameid() != 0 && msg.winnerplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playeridchangedmessage()) { - const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage(); - if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickplayermessage()) { - const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickdeniedmessage()) { - const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_startkickpetitionmessage()) { - const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage(); - if (msg.gameid() != 0 - && msg.petitionid() != 0 - && msg.proposingplayerid() != 0 - && msg.kickplayerid() != 0 - && msg.kicktimeoutsec() > 0 - && msg.numvotesneededtokick() > 0) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickrequestmessage()) { - const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickreplymessage()) { - const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickpetitionupdatemessage()) { - const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endkickpetitionmessage()) { - const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_statisticsmessage()) { - //const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrequestmessage()) { - const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatmessage()) { - const ChatMessage &msg = packet.GetMsg()->chatmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrejectmessage()) { - const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDialogMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dialogmessage()) { - const DialogMessage &msg = packet.GetMsg()->dialogmessage(); - if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_timeoutwarningmessage()) { - //const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_resettimeoutmessage()) { - // const ResetTimeoutMessage &msg = packet.GetMsg()->resettimeoutmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarmessage()) { - const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage(); - if (msg.reportedplayerid() != 0 - && msg.reportedavatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarackmessage()) { - const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage(); - if (msg.reportedplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgamemessage()) { - const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgameackmessage()) { - const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateErrorMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_errormessage()) { - //const ErrorMessage &msg = packet.GetMsg()->errormessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegamemessage()) { - const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegameackmessage()) { - const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayermessage()) { - const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayerackmessage()) { - const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo) -{ - bool retVal = false; - if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64) - && VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10) - && (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000)) - && (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000)) - && (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000)) - && VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11) - && VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20) - && VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60) - && VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000) - && VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000) - && VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30) - && ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) { - - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) { - const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorleftmessage()) { - const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_authserverchallengemessage()) { + const AuthServerChallengeMessage &challenge = msg.authserverchallengemessage(); + if (VALIDATE_STRING_SIZE(challenge.serverchallenge(), 1, 256)) { retVal = true; } } @@ -1259,12 +90,12 @@ NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet } bool -NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet) +AuthMessageValidator::ValidateAuthClientResponseMessage(const AuthMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gamespectatorjoinedmessage()) { - const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_authclientresponsemessage()) { + const AuthClientResponseMessage &response = msg.authclientresponsemessage(); + if (VALIDATE_STRING_SIZE(response.clientresponse(), 1, 256)) { retVal = true; } } @@ -1272,12 +103,12 @@ NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet) +AuthMessageValidator::ValidateAuthServerVerificationMessage(const AuthMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gamespectatorleftmessage()) { - const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_authserververificationmessage()) { + const AuthServerVerificationMessage &verification = msg.authserververificationmessage(); + if (VALIDATE_STRING_SIZE(verification.serververification(), 1, 256)) { retVal = true; } } diff --git a/src/net/common/validation/gameenginemessagevalidator.cpp b/src/net/common/validation/gameenginemessagevalidator.cpp index c690a8af..a0833bf9 100644 --- a/src/net/common/validation/gameenginemessagevalidator.cpp +++ b/src/net/common/validation/gameenginemessagevalidator.cpp @@ -29,76 +29,14 @@ * as that of the covered work. * *****************************************************************************/ -#include -#include +#include +#include using namespace std; -#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535) -#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize)) -#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval)) -#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval)) -#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize)) -static bool -ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval) +GameEngineMessageValidator::GameEngineMessageValidator() { - bool retVal = true; - for (int i = 0; i < l.size(); i++) { - if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) { - retVal = false; - break; - } - } - return retVal; -} - -NetPacketValidator::NetPacketValidator() -{ - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage)); m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage)); m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage)); m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage)); @@ -112,62 +50,56 @@ NetPacketValidator::NetPacketValidator() m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage)); m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage)); m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage)); } bool -NetPacketValidator::IsValidPacket(const NetPacket &packet) const +GameEngineMessageValidator::IsValidMessage(const GameEngineMessage &msg) const { // Default: Invalid packet. bool retVal = false; - ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype()); + ValidateFunctorMap::const_iterator pos = m_validationMap.find(msg.messagetype()); if (pos != m_validationMap.end()) { // Call validation functor. - retVal = pos->second(packet); + retVal = pos->second(msg); } return retVal; } bool -NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) +GameEngineMessageValidator::ValidateHandStartMessage(const GameEngineMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_announcemessage()) { - const AnnounceMessage &msg = packet.GetMsg()->announcemessage(); - if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion()) - && VALIDATE_IS_UINT16(msg.protocolversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().majorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestbetarevision()) - && VALIDATE_IS_UINT16(msg.numplayersonserver())) { + if (msg.has_handstartmessage()) { + const HandStartMessage &handStart = msg.handstartmessage(); + if (VALIDATE_UINT_RANGE(handStart.smallblind(), 1, 100000000) + && VALIDATE_LIST_SIZE(handStart.seatstates(), 2, 10)) { + retVal = true; + } + } + return retVal; +} + +bool +GameEngineMessageValidator::ValidatePlayersTurnMessage(const GameEngineMessage &msg) +{ + bool retVal = false; + if (msg.has_playersturnmessage()) { + const PlayersTurnMessage &playersTurn = msg.playersturnmessage(); + if (playersTurn.playerid() != 0 ) { + retVal = true; + } + } + return retVal; +} + +bool +GameEngineMessageValidator::ValidateMyActionRequestMessage(const GameEngineMessage &msg) +{ + bool retVal = false; + if (msg.has_myactionrequestmessage()) { + const MyActionRequestMessage &actionRequest = msg.myactionrequestmessage(); + if (actionRequest.handnum() != 0 + && VALIDATE_UINT_UPPER(actionRequest.myrelativebet(), 10000000)) { retVal = true; } @@ -176,281 +108,23 @@ NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateInitMessage(const NetPacket &packet) +GameEngineMessageValidator::ValidateYourActionRejectedMessage(const GameEngineMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_initmessage()) { - const InitMessage &msg = packet.GetMsg()->initmessage(); - if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion()) - && VALIDATE_IS_UINT16(msg.requestedversion().minorversion()) - && (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16) - && (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64)) - && (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64)) - && (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256)) - && (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserverchallengemessage()) { - const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage(); - if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authclientresponsemessage()) { - const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage(); - if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserververificationmessage()) { - const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage(); - if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_initackmessage()) { - const InitAckMessage &msg = packet.GetMsg()->initackmessage(); - if (msg.yoursessionid().size() == 16 - && msg.yourplayerid() != 0 - && (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16) - && (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarrequestmessage()) { - const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage(); - if (msg.requestid() != 0 - && msg.avatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarheadermessage()) { - const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage(); - if (msg.requestid() != 0 - && VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatardatamessage()) { - const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage(); - if (msg.requestid() != 0 - && VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarendmessage()) { - const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_unknownavatarmessage()) { - const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerlistmessage()) { - const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage(); - if (msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistnewmessage()) { - const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerids(), 0, 10) - && msg.adminplayerid() != 0 - && ValidateGameInfo(msg.gameinfo())) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistupdatemessage()) { - const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) { - const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerleftmessage()) { - const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistadminchangedmessage()) { - const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforequestmessage()) { - const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage(); - if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforeplymessage()) { - const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage(); - if (msg.playerid() != 0) { - // TODO maybe additional checks. - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_subscriptionrequestmessage()) { - //const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage(); + if (msg.has_youractionrejectedmessage()) { + //const YourActionRejectedMessage &actionRejected = msg.youractionrejectedmessage(); retVal = true; } return retVal; } bool -NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet) +GameEngineMessageValidator::ValidatePlayersActionDoneMessage(const GameEngineMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_joinnewgamemessage()) { - const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage(); - if (ValidateGameInfo(msg.gameinfo()) - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - + if (msg.has_playersactiondonemessage()) { + const PlayersActionDoneMessage &actionDone = msg.playersactiondonemessage(); + if (actionDone.playerid() != 0) { retVal = true; } } @@ -458,14 +132,14 @@ NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet) +GameEngineMessageValidator::ValidateDealFlopCardsMessage(const GameEngineMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_joinexistinggamemessage()) { - const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage(); - if (msg.gameid() != 0 - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - + if (msg.has_dealflopcardsmessage()) { + const DealFlopCardsMessage &dealFlop = msg.dealflopcardsmessage(); + if (VALIDATE_UINT_UPPER(dealFlop.flopcard1(), 51) + && VALIDATE_UINT_UPPER(dealFlop.flopcard2(), 51) + && VALIDATE_UINT_UPPER(dealFlop.flopcard3(), 51)) { retVal = true; } } @@ -473,12 +147,12 @@ NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet) +GameEngineMessageValidator::ValidateDealTurnCardMessage(const GameEngineMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_rejoinexistinggamemessage()) { - const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage(); - if (msg.gameid() != 0) { + if (msg.has_dealturncardmessage()) { + const DealTurnCardMessage &dealTurn = msg.dealturncardmessage(); + if (VALIDATE_UINT_UPPER(dealTurn.turncard(), 51)) { retVal = true; } } @@ -486,12 +160,12 @@ NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet) +GameEngineMessageValidator::ValidateDealRiverCardMessage(const GameEngineMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_joingameackmessage()) { - const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage(); - if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) { + if (msg.has_dealrivercardmessage()) { + const DealRiverCardMessage &dealRiver = msg.dealrivercardmessage(); + if (VALIDATE_UINT_UPPER(dealRiver.rivercard(), 51)) { retVal = true; } } @@ -499,12 +173,12 @@ NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet) +GameEngineMessageValidator::ValidateAllInShowCardsMessage(const GameEngineMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_joingamefailedmessage()) { - const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage(); - if (msg.gameid() != 0) { + if (msg.has_allinshowcardsmessage()) { + const AllInShowCardsMessage &allInShow = msg.allinshowcardsmessage(); + if (VALIDATE_LIST_SIZE(allInShow.playersallin(), 1, 10)) { retVal = true; } } @@ -512,12 +186,12 @@ NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet) +GameEngineMessageValidator::ValidateEndOfHandShowCardsMessage(const GameEngineMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gameplayerjoinedmessage()) { - const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_endofhandshowcardsmessage()) { + const EndOfHandShowCardsMessage &endHandShow = msg.endofhandshowcardsmessage(); + if (VALIDATE_LIST_SIZE(endHandShow.playerresults(), 1, 10)) { retVal = true; } } @@ -525,12 +199,12 @@ NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet) +GameEngineMessageValidator::ValidateEndOfHandHideCardsMessage(const GameEngineMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gameplayerleftmessage()) { - const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_endofhandhidecardsmessage()) { + const EndOfHandHideCardsMessage &endHandHide = msg.endofhandhidecardsmessage(); + if (endHandHide.playerid() != 0) { retVal = true; } } @@ -538,335 +212,11 @@ NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameadminchangedmessage()) { - const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_removedfromgamemessage()) { - const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickplayerrequestmessage()) { - const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_leavegamerequestmessage()) { - const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_inviteplayertogamemessage()) { - const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_invitenotifymessage()) { - const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage(); - if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectgameinvitationmessage()) { - const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectinvnotifymessage()) { - const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventmessage()) { - const StartEventMessage &msg = packet.GetMsg()->starteventmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventackmessage()) { - const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartinitialmessage()) { - const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartrejoinmessage()) { - const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && msg.handnum() != 0 - && VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_handstartmessage()) { - const HandStartMessage &msg = packet.GetMsg()->handstartmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000) - && VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersturnmessage()) { - const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0 ) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_myactionrequestmessage()) { - const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage(); - if (msg.gameid() != 0 - && msg.handnum() != 0 - && VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_youractionrejectedmessage()) { - const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersactiondonemessage()) { - const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealflopcardsmessage()) { - const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.flopcard1(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard2(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealturncardmessage()) { - const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.turncard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealrivercardmessage()) { - const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.rivercard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_allinshowcardsmessage()) { - const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandshowcardsmessage()) { - const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandhidecardsmessage()) { - const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/) +GameEngineMessageValidator::ValidateShowMyCardsRequestMessage(const GameEngineMessage &/*msg*/) { //bool retVal = false; - //if (packet.GetMsg()->has_showmycardsrequestmessage()) { - // const ShowMyCardsRequestMessage &msg = packet.GetMsg()->showmycardsrequestmessage(); + //if (msg.has_showmycardsrequestmessage()) { + // const ShowMyCardsRequestMessage &showCards = msg.showmycardsrequestmessage(); // retVal = true; //} //return retVal; @@ -874,413 +224,13 @@ NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet* } bool -NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet) +GameEngineMessageValidator::ValidateAfterHandShowCardsMessage(const GameEngineMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_afterhandshowcardsmessage()) { - //const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage(); + if (msg.has_afterhandshowcardsmessage()) { + //const AfterHandShowCardsMessage &afterHandShow = msg.afterhandshowcardsmessage(); retVal = true; } return retVal; } -bool -NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofgamemessage()) { - const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage(); - if (msg.gameid() != 0 && msg.winnerplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playeridchangedmessage()) { - const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage(); - if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickplayermessage()) { - const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickdeniedmessage()) { - const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_startkickpetitionmessage()) { - const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage(); - if (msg.gameid() != 0 - && msg.petitionid() != 0 - && msg.proposingplayerid() != 0 - && msg.kickplayerid() != 0 - && msg.kicktimeoutsec() > 0 - && msg.numvotesneededtokick() > 0) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickrequestmessage()) { - const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickreplymessage()) { - const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickpetitionupdatemessage()) { - const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endkickpetitionmessage()) { - const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_statisticsmessage()) { - //const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrequestmessage()) { - const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatmessage()) { - const ChatMessage &msg = packet.GetMsg()->chatmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrejectmessage()) { - const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDialogMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dialogmessage()) { - const DialogMessage &msg = packet.GetMsg()->dialogmessage(); - if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_timeoutwarningmessage()) { - //const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_resettimeoutmessage()) { - // const ResetTimeoutMessage &msg = packet.GetMsg()->resettimeoutmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarmessage()) { - const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage(); - if (msg.reportedplayerid() != 0 - && msg.reportedavatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarackmessage()) { - const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage(); - if (msg.reportedplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgamemessage()) { - const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgameackmessage()) { - const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateErrorMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_errormessage()) { - //const ErrorMessage &msg = packet.GetMsg()->errormessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegamemessage()) { - const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegameackmessage()) { - const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayermessage()) { - const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayerackmessage()) { - const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo) -{ - bool retVal = false; - if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64) - && VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10) - && (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000)) - && (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000)) - && (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000)) - && VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11) - && VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20) - && VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60) - && VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000) - && VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000) - && VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30) - && ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) { - - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) { - const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorleftmessage()) { - const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamespectatorjoinedmessage()) { - const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamespectatorleftmessage()) { - const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - diff --git a/src/net/common/validation/gamemanagementmessagevalidator.cpp b/src/net/common/validation/gamemanagementmessagevalidator.cpp index c690a8af..4735385a 100644 --- a/src/net/common/validation/gamemanagementmessagevalidator.cpp +++ b/src/net/common/validation/gamemanagementmessagevalidator.cpp @@ -29,89 +29,26 @@ * as that of the covered work. * *****************************************************************************/ -#include -#include +#include +#include using namespace std; -#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535) -#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize)) -#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval)) -#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval)) -#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize)) - -static bool -ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval) +GameManagementMessageValidator::GameManagementMessageValidator() { - bool retVal = true; - for (int i = 0; i < l.size(); i++) { - if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) { - retVal = false; - break; - } - } - return retVal; -} - -NetPacketValidator::NetPacketValidator() -{ - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage)); + m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage)); + m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage)); + m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage)); @@ -121,54 +58,32 @@ NetPacketValidator::NetPacketValidator() m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage)); m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage)); + m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage)); + m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_ChatMessage, ValidateChatMessage)); + m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage)); + m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_ErrorMessage, ValidateErrorMessage)); } bool -NetPacketValidator::IsValidPacket(const NetPacket &packet) const +GameManagementMessageValidator::IsValidMessage(const GameManagementMessage &msg) const { // Default: Invalid packet. bool retVal = false; - ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype()); + ValidateFunctorMap::const_iterator pos = m_validationMap.find(msg.messagetype()); if (pos != m_validationMap.end()) { // Call validation functor. - retVal = pos->second(packet); + retVal = pos->second(msg); } return retVal; } bool -NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateGamePlayerJoinedMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_announcemessage()) { - const AnnounceMessage &msg = packet.GetMsg()->announcemessage(); - if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion()) - && VALIDATE_IS_UINT16(msg.protocolversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().majorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestbetarevision()) - && VALIDATE_IS_UINT16(msg.numplayersonserver())) { - + if (msg.has_gameplayerjoinedmessage()) { + const GamePlayerJoinedMessage &playerJoined = msg.gameplayerjoinedmessage(); + if (playerJoined.playerid() != 0) { retVal = true; } } @@ -176,19 +91,12 @@ NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateInitMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateGamePlayerLeftMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_initmessage()) { - const InitMessage &msg = packet.GetMsg()->initmessage(); - if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion()) - && VALIDATE_IS_UINT16(msg.requestedversion().minorversion()) - && (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16) - && (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64)) - && (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64)) - && (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256)) - && (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) { - + if (msg.has_gameplayerleftmessage()) { + const GamePlayerLeftMessage &playerLeft = msg.gameplayerleftmessage(); + if (playerLeft.playerid() != 0) { retVal = true; } } @@ -196,12 +104,12 @@ NetPacketValidator::ValidateInitMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateGameAdminChangedMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_authserverchallengemessage()) { - const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage(); - if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) { + if (msg.has_gameadminchangedmessage()) { + const GameAdminChangedMessage &adminChanged = msg.gameadminchangedmessage(); + if (adminChanged.newadminplayerid() != 0) { retVal = true; } } @@ -209,248 +117,22 @@ NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateRemovedFromGameMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_authclientresponsemessage()) { - const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage(); - if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserververificationmessage()) { - const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage(); - if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_initackmessage()) { - const InitAckMessage &msg = packet.GetMsg()->initackmessage(); - if (msg.yoursessionid().size() == 16 - && msg.yourplayerid() != 0 - && (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16) - && (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarrequestmessage()) { - const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage(); - if (msg.requestid() != 0 - && msg.avatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarheadermessage()) { - const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage(); - if (msg.requestid() != 0 - && VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatardatamessage()) { - const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage(); - if (msg.requestid() != 0 - && VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarendmessage()) { - const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_unknownavatarmessage()) { - const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerlistmessage()) { - const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage(); - if (msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistnewmessage()) { - const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerids(), 0, 10) - && msg.adminplayerid() != 0 - && ValidateGameInfo(msg.gameinfo())) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistupdatemessage()) { - const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) { - const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerleftmessage()) { - const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistadminchangedmessage()) { - const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforequestmessage()) { - const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage(); - if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforeplymessage()) { - const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage(); - if (msg.playerid() != 0) { - // TODO maybe additional checks. - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_subscriptionrequestmessage()) { - //const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage(); + if (msg.has_removedfromgamemessage()) { retVal = true; } return retVal; } bool -NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateKickPlayerRequestMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_joinnewgamemessage()) { - const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage(); - if (ValidateGameInfo(msg.gameinfo()) - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - + if (msg.has_kickplayerrequestmessage()) { + const KickPlayerRequestMessage &kickRequest = msg.kickplayerrequestmessage(); + if (kickRequest.playerid() != 0) { retVal = true; } } @@ -458,439 +140,22 @@ NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateLeaveGameRequestMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_joinexistinggamemessage()) { - const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage(); - if (msg.gameid() != 0 - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejoinexistinggamemessage()) { - const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joingameackmessage()) { - const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage(); - if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joingamefailedmessage()) { - const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameplayerjoinedmessage()) { - const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameplayerleftmessage()) { - const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameadminchangedmessage()) { - const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_removedfromgamemessage()) { - const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickplayerrequestmessage()) { - const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_leavegamerequestmessage()) { - const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_inviteplayertogamemessage()) { - const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_invitenotifymessage()) { - const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage(); - if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectgameinvitationmessage()) { - const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectinvnotifymessage()) { - const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventmessage()) { - const StartEventMessage &msg = packet.GetMsg()->starteventmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventackmessage()) { - const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartinitialmessage()) { - const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartrejoinmessage()) { - const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && msg.handnum() != 0 - && VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_handstartmessage()) { - const HandStartMessage &msg = packet.GetMsg()->handstartmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000) - && VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersturnmessage()) { - const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0 ) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_myactionrequestmessage()) { - const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage(); - if (msg.gameid() != 0 - && msg.handnum() != 0 - && VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_youractionrejectedmessage()) { - const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersactiondonemessage()) { - const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealflopcardsmessage()) { - const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.flopcard1(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard2(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealturncardmessage()) { - const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.turncard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealrivercardmessage()) { - const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.rivercard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_allinshowcardsmessage()) { - const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandshowcardsmessage()) { - const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandhidecardsmessage()) { - const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_showmycardsrequestmessage()) { - // const ShowMyCardsRequestMessage &msg = packet.GetMsg()->showmycardsrequestmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_afterhandshowcardsmessage()) { - //const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage(); + if (msg.has_leavegamerequestmessage()) { retVal = true; } return retVal; } bool -NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateInvitePlayerToGameMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_endofgamemessage()) { - const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage(); - if (msg.gameid() != 0 && msg.winnerplayerid() != 0) { + if (msg.has_inviteplayertogamemessage()) { + const InvitePlayerToGameMessage &invitePlayer = msg.inviteplayertogamemessage(); + if (invitePlayer.playerid() != 0) { retVal = true; } } @@ -898,209 +163,33 @@ NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateStartEventMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_playeridchangedmessage()) { - const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage(); - if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickplayermessage()) { - const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickdeniedmessage()) { - const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_startkickpetitionmessage()) { - const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage(); - if (msg.gameid() != 0 - && msg.petitionid() != 0 - && msg.proposingplayerid() != 0 - && msg.kickplayerid() != 0 - && msg.kicktimeoutsec() > 0 - && msg.numvotesneededtokick() > 0) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickrequestmessage()) { - const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickreplymessage()) { - const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickpetitionupdatemessage()) { - const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endkickpetitionmessage()) { - const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_statisticsmessage()) { - //const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage(); + if (msg.has_starteventmessage()) { retVal = true; } return retVal; } bool -NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateStartEventAckMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_chatrequestmessage()) { - const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatmessage()) { - const ChatMessage &msg = packet.GetMsg()->chatmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrejectmessage()) { - const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDialogMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dialogmessage()) { - const DialogMessage &msg = packet.GetMsg()->dialogmessage(); - if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_timeoutwarningmessage()) { - //const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage(); + if (msg.has_starteventackmessage()) { retVal = true; } return retVal; } bool -NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_resettimeoutmessage()) { - // const ResetTimeoutMessage &msg = packet.GetMsg()->resettimeoutmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateGameStartInitialMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_reportavatarmessage()) { - const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage(); - if (msg.reportedplayerid() != 0 - && msg.reportedavatarhash().size() == 16) { + if (msg.has_gamestartinitialmessage()) { + const GameStartInitialMessage &startInitial = msg.gamestartinitialmessage(); + if (startInitial.startdealerplayerid() != 0 + && VALIDATE_LIST_SIZE(startInitial.playerseats(), 2, 10)) { retVal = true; } @@ -1109,12 +198,15 @@ NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateGameStartRejoinMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_reportavatarackmessage()) { - const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage(); - if (msg.reportedplayerid() != 0) { + if (msg.has_gamestartrejoinmessage()) { + const GameStartRejoinMessage &startRejoin = msg.gamestartrejoinmessage(); + if (startRejoin.startdealerplayerid() != 0 + && startRejoin.handnum() != 0 + && VALIDATE_LIST_SIZE(startRejoin.rejoinplayerdata(), 2, 10)) { + retVal = true; } } @@ -1122,12 +214,12 @@ NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateEndOfGameMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_reportgamemessage()) { - const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage(); - if (msg.reportedgameid() != 0) { + if (msg.has_endofgamemessage()) { + const EndOfGameMessage &endGame = msg.endofgamemessage(); + if (endGame.winnerplayerid() != 0) { retVal = true; } } @@ -1135,12 +227,12 @@ NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidatePlayerIdChangedMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_reportgameackmessage()) { - const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage(); - if (msg.reportedgameid() != 0) { + if (msg.has_playeridchangedmessage()) { + const PlayerIdChangedMessage &idChanged = msg.playeridchangedmessage(); + if (idChanged.oldplayerid() != 0 && idChanged.newplayerid() != 0) { retVal = true; } } @@ -1148,23 +240,158 @@ NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateErrorMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateAskKickPlayerMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_errormessage()) { - //const ErrorMessage &msg = packet.GetMsg()->errormessage(); + if (msg.has_askkickplayermessage()) { + const AskKickPlayerMessage &askKick = msg.askkickplayermessage(); + if (askKick.playerid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +GameManagementMessageValidator::ValidateAskKickDeniedMessage(const GameManagementMessage &msg) +{ + bool retVal = false; + if (msg.has_askkickdeniedmessage()) { + const AskKickDeniedMessage &kickDenied = msg.askkickdeniedmessage(); + if (kickDenied.playerid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +GameManagementMessageValidator::ValidateStartKickPetitionMessage(const GameManagementMessage &msg) +{ + bool retVal = false; + if (msg.has_startkickpetitionmessage()) { + const StartKickPetitionMessage &kickPetition = msg.startkickpetitionmessage(); + if (kickPetition.petitionid() != 0 + && kickPetition.proposingplayerid() != 0 + && kickPetition.kickplayerid() != 0 + && kickPetition.kicktimeoutsec() > 0 + && kickPetition.numvotesneededtokick() > 0) { + + retVal = true; + } + } + return retVal; +} + +bool +GameManagementMessageValidator::ValidateVoteKickRequestMessage(const GameManagementMessage &msg) +{ + bool retVal = false; + if (msg.has_votekickrequestmessage()) { + const VoteKickRequestMessage &voteKick = msg.votekickrequestmessage(); + if (voteKick.petitionid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +GameManagementMessageValidator::ValidateVoteKickReplyMessage(const GameManagementMessage &msg) +{ + bool retVal = false; + if (msg.has_votekickreplymessage()) { + const VoteKickReplyMessage &kickReply = msg.votekickreplymessage(); + if (kickReply.petitionid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +GameManagementMessageValidator::ValidateKickPetitionUpdateMessage(const GameManagementMessage &msg) +{ + bool retVal = false; + if (msg.has_kickpetitionupdatemessage()) { + const KickPetitionUpdateMessage &kickUpdate = msg.kickpetitionupdatemessage(); + if (kickUpdate.petitionid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +GameManagementMessageValidator::ValidateEndKickPetitionMessage(const GameManagementMessage &msg) +{ + bool retVal = false; + if (msg.has_endkickpetitionmessage()) { + const EndKickPetitionMessage &endPetition = msg.endkickpetitionmessage(); + if (endPetition.petitionid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +GameManagementMessageValidator::ValidateChatRequestMessage(const GameManagementMessage &msg) +{ + bool retVal = false; + if (msg.has_chatrequestmessage()) { + const ChatRequestMessage &chatRequest = msg.chatrequestmessage(); + if (VALIDATE_STRING_SIZE(chatRequest.chattext(), 1, 128)) { + retVal = true; + } + } + return retVal; +} + +bool +GameManagementMessageValidator::ValidateChatMessage(const GameManagementMessage &msg) +{ + bool retVal = false; + if (msg.has_chatmessage()) { + const ChatMessage &chat = msg.chatmessage(); + if (VALIDATE_STRING_SIZE(chat.chattext(), 1, 128)) { + retVal = true; + } + } + return retVal; +} + +bool +GameManagementMessageValidator::ValidateChatRejectMessage(const GameManagementMessage &msg) +{ + bool retVal = false; + if (msg.has_chatrejectmessage()) { + const ChatRejectMessage &chatReject = msg.chatrejectmessage(); + if (VALIDATE_STRING_SIZE(chatReject.chattext(), 1, 128)) { + retVal = true; + } + } + return retVal; +} + +bool +GameManagementMessageValidator::ValidateErrorMessage(const GameManagementMessage &msg) +{ + bool retVal = false; + if (msg.has_errormessage()) { + //const ErrorMessage &msg = msg.errormessage(); retVal = true; } return retVal; } bool -NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateGameSpectatorJoinedMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_adminremovegamemessage()) { - const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage(); - if (msg.removegameid() != 0) { + if (msg.has_gamespectatorjoinedmessage()) { + const GameSpectatorJoinedMessage &spectatorJoined = msg.gamespectatorjoinedmessage(); + if (spectatorJoined.playerid() != 0) { retVal = true; } } @@ -1172,112 +399,12 @@ NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet) +GameManagementMessageValidator::ValidateGameSpectatorLeftMessage(const GameManagementMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_adminremovegameackmessage()) { - const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayermessage()) { - const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayerackmessage()) { - const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo) -{ - bool retVal = false; - if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64) - && VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10) - && (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000)) - && (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000)) - && (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000)) - && VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11) - && VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20) - && VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60) - && VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000) - && VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000) - && VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30) - && ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) { - - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) { - const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorleftmessage()) { - const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamespectatorjoinedmessage()) { - const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamespectatorleftmessage()) { - const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_gamespectatorleftmessage()) { + const GameSpectatorLeftMessage &spectatorLeft = msg.gamespectatorleftmessage(); + if (spectatorLeft.playerid() != 0) { retVal = true; } } diff --git a/src/net/common/validation/gamemessagevalidator.cpp b/src/net/common/validation/gamemessagevalidator.cpp index c690a8af..c242f557 100644 --- a/src/net/common/validation/gamemessagevalidator.cpp +++ b/src/net/common/validation/gamemessagevalidator.cpp @@ -29,1257 +29,54 @@ * as that of the covered work. * *****************************************************************************/ -#include -#include +#include +#include +#include +#include +#include +#include using namespace std; -#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535) -#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize)) -#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval)) -#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval)) -#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize)) - -static bool -ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval) +GameMessageValidator::GameMessageValidator() { - bool retVal = true; - for (int i = 0; i < l.size(); i++) { - if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) { - retVal = false; - break; - } - } - return retVal; -} - -NetPacketValidator::NetPacketValidator() -{ - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage)); + m_validationMap.insert(make_pair(GameMessage_GameMessageType_Type_GameManagementMessage, boost::bind(boost::mem_fn(&GameMessageValidator::ValidateGameManagementMessage), this, _1))); + m_validationMap.insert(make_pair(GameMessage_GameMessageType_Type_GameEngineMessage, boost::bind(boost::mem_fn(&GameMessageValidator::ValidateGameEngineMessage), this, _1))); + m_managementValidator.reset(new GameManagementMessageValidator); + m_engineValidator.reset(new GameEngineMessageValidator); } bool -NetPacketValidator::IsValidPacket(const NetPacket &packet) const +GameMessageValidator::IsValidMessage(const GameMessage &msg) const { // Default: Invalid packet. bool retVal = false; - ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype()); - if (pos != m_validationMap.end()) { - // Call validation functor. - retVal = pos->second(packet); - } - return retVal; -} - -bool -NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_announcemessage()) { - const AnnounceMessage &msg = packet.GetMsg()->announcemessage(); - if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion()) - && VALIDATE_IS_UINT16(msg.protocolversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().majorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestbetarevision()) - && VALIDATE_IS_UINT16(msg.numplayersonserver())) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInitMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_initmessage()) { - const InitMessage &msg = packet.GetMsg()->initmessage(); - if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion()) - && VALIDATE_IS_UINT16(msg.requestedversion().minorversion()) - && (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16) - && (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64)) - && (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64)) - && (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256)) - && (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserverchallengemessage()) { - const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage(); - if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authclientresponsemessage()) { - const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage(); - if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserververificationmessage()) { - const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage(); - if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_initackmessage()) { - const InitAckMessage &msg = packet.GetMsg()->initackmessage(); - if (msg.yoursessionid().size() == 16 - && msg.yourplayerid() != 0 - && (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16) - && (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarrequestmessage()) { - const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage(); - if (msg.requestid() != 0 - && msg.avatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarheadermessage()) { - const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage(); - if (msg.requestid() != 0 - && VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatardatamessage()) { - const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage(); - if (msg.requestid() != 0 - && VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarendmessage()) { - const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_unknownavatarmessage()) { - const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerlistmessage()) { - const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage(); - if (msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistnewmessage()) { - const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerids(), 0, 10) - && msg.adminplayerid() != 0 - && ValidateGameInfo(msg.gameinfo())) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistupdatemessage()) { - const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) { - const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerleftmessage()) { - const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistadminchangedmessage()) { - const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforequestmessage()) { - const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage(); - if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforeplymessage()) { - const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage(); - if (msg.playerid() != 0) { - // TODO maybe additional checks. - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_subscriptionrequestmessage()) { - //const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joinnewgamemessage()) { - const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage(); - if (ValidateGameInfo(msg.gameinfo()) - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joinexistinggamemessage()) { - const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage(); - if (msg.gameid() != 0 - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejoinexistinggamemessage()) { - const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joingameackmessage()) { - const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage(); - if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joingamefailedmessage()) { - const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameplayerjoinedmessage()) { - const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameplayerleftmessage()) { - const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameadminchangedmessage()) { - const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_removedfromgamemessage()) { - const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickplayerrequestmessage()) { - const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_leavegamerequestmessage()) { - const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_inviteplayertogamemessage()) { - const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_invitenotifymessage()) { - const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage(); - if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectgameinvitationmessage()) { - const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectinvnotifymessage()) { - const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventmessage()) { - const StartEventMessage &msg = packet.GetMsg()->starteventmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventackmessage()) { - const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartinitialmessage()) { - const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartrejoinmessage()) { - const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && msg.handnum() != 0 - && VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_handstartmessage()) { - const HandStartMessage &msg = packet.GetMsg()->handstartmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000) - && VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersturnmessage()) { - const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0 ) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_myactionrequestmessage()) { - const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage(); - if (msg.gameid() != 0 - && msg.handnum() != 0 - && VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_youractionrejectedmessage()) { - const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersactiondonemessage()) { - const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealflopcardsmessage()) { - const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.flopcard1(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard2(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealturncardmessage()) { - const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.turncard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealrivercardmessage()) { - const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.rivercard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_allinshowcardsmessage()) { - const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandshowcardsmessage()) { - const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandhidecardsmessage()) { - const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_showmycardsrequestmessage()) { - // const ShowMyCardsRequestMessage &msg = packet.GetMsg()->showmycardsrequestmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_afterhandshowcardsmessage()) { - //const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofgamemessage()) { - const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage(); - if (msg.gameid() != 0 && msg.winnerplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playeridchangedmessage()) { - const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage(); - if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickplayermessage()) { - const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickdeniedmessage()) { - const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_startkickpetitionmessage()) { - const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage(); - if (msg.gameid() != 0 - && msg.petitionid() != 0 - && msg.proposingplayerid() != 0 - && msg.kickplayerid() != 0 - && msg.kicktimeoutsec() > 0 - && msg.numvotesneededtokick() > 0) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickrequestmessage()) { - const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickreplymessage()) { - const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickpetitionupdatemessage()) { - const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endkickpetitionmessage()) { - const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_statisticsmessage()) { - //const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrequestmessage()) { - const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatmessage()) { - const ChatMessage &msg = packet.GetMsg()->chatmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrejectmessage()) { - const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDialogMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dialogmessage()) { - const DialogMessage &msg = packet.GetMsg()->dialogmessage(); - if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_timeoutwarningmessage()) { - //const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_resettimeoutmessage()) { - // const ResetTimeoutMessage &msg = packet.GetMsg()->resettimeoutmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarmessage()) { - const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage(); - if (msg.reportedplayerid() != 0 - && msg.reportedavatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarackmessage()) { - const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage(); - if (msg.reportedplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgamemessage()) { - const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgameackmessage()) { - const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateErrorMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_errormessage()) { - //const ErrorMessage &msg = packet.GetMsg()->errormessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegamemessage()) { - const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegameackmessage()) { - const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayermessage()) { - const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayerackmessage()) { - const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo) -{ - bool retVal = false; - if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64) - && VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10) - && (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000)) - && (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000)) - && (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000)) - && VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11) - && VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20) - && VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60) - && VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000) - && VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000) - && VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30) - && ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) { - - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) { - const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorleftmessage()) { - const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; + if (msg.gameid() != 0) { + ValidateFunctorMap::const_iterator pos = m_validationMap.find(msg.messagetype()); + if (pos != m_validationMap.end()) { + // Call validation functor. + retVal = pos->second(msg); } } return retVal; } bool -NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet) +GameMessageValidator::ValidateGameManagementMessage(const GameMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gamespectatorjoinedmessage()) { - const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } + if (msg.has_gamemanagementmessage()) { + retVal = m_managementValidator->IsValidMessage(msg.gamemanagementmessage()); } return retVal; } bool -NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet) +GameMessageValidator::ValidateGameEngineMessage(const GameMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gamespectatorleftmessage()) { - const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } + if (msg.has_gameenginemessage()) { + retVal = m_engineValidator->IsValidMessage(msg.gameenginemessage()); } return retVal; } diff --git a/src/net/common/validation/lobbymessagevalidator.cpp b/src/net/common/validation/lobbymessagevalidator.cpp index c690a8af..73c4c4cf 100644 --- a/src/net/common/validation/lobbymessagevalidator.cpp +++ b/src/net/common/validation/lobbymessagevalidator.cpp @@ -29,43 +29,14 @@ * as that of the covered work. * *****************************************************************************/ -#include -#include +#include +#include using namespace std; -#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535) -#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize)) -#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval)) -#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval)) -#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize)) - -static bool -ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval) +LobbyMessageValidator::LobbyMessageValidator() { - bool retVal = true; - for (int i = 0; i < l.size(); i++) { - if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) { - retVal = false; - break; - } - } - return retVal; -} - -NetPacketValidator::NetPacketValidator() -{ - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage)); + m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitDoneMessage, ValidateInitDoneMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage)); @@ -81,46 +52,13 @@ NetPacketValidator::NetPacketValidator() m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage)); + m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_JoinGameMessage, ValidateJoinGameMessage)); + m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage)); + m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage)); + m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage)); @@ -139,35 +77,31 @@ NetPacketValidator::NetPacketValidator() m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage)); m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage)); } bool -NetPacketValidator::IsValidPacket(const NetPacket &packet) const +LobbyMessageValidator::IsValidMessage(const LobbyMessage &msg) const { // Default: Invalid packet. bool retVal = false; - ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype()); + ValidateFunctorMap::const_iterator pos = m_validationMap.find(msg.messagetype()); if (pos != m_validationMap.end()) { // Call validation functor. - retVal = pos->second(packet); + retVal = pos->second(msg); } return retVal; } bool -NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateInitDoneMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_announcemessage()) { - const AnnounceMessage &msg = packet.GetMsg()->announcemessage(); - if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion()) - && VALIDATE_IS_UINT16(msg.protocolversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().majorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestbetarevision()) - && VALIDATE_IS_UINT16(msg.numplayersonserver())) { + if (msg.has_initdonemessage()) { + const InitDoneMessage &initDone = msg.initdonemessage(); + if (initDone.yoursessionid().size() == 16 + && initDone.yourplayerid() != 0 + && (!initDone.has_youravatarhash() || initDone.youravatarhash().size() == 16) + && (!initDone.has_rejoingameid() || initDone.rejoingameid() != 0)) { retVal = true; } @@ -176,18 +110,13 @@ NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateInitMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateAvatarRequestMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_initmessage()) { - const InitMessage &msg = packet.GetMsg()->initmessage(); - if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion()) - && VALIDATE_IS_UINT16(msg.requestedversion().minorversion()) - && (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16) - && (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64)) - && (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64)) - && (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256)) - && (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) { + if (msg.has_avatarrequestmessage()) { + const AvatarRequestMessage &avatarRequest = msg.avatarrequestmessage(); + if (avatarRequest.requestid() != 0 + && avatarRequest.avatarhash().size() == 16) { retVal = true; } @@ -196,54 +125,13 @@ NetPacketValidator::ValidateInitMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateAvatarHeaderMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_authserverchallengemessage()) { - const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage(); - if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authclientresponsemessage()) { - const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage(); - if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserververificationmessage()) { - const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage(); - if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_initackmessage()) { - const InitAckMessage &msg = packet.GetMsg()->initackmessage(); - if (msg.yoursessionid().size() == 16 - && msg.yourplayerid() != 0 - && (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16) - && (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) { + if (msg.has_avatarheadermessage()) { + const AvatarHeaderMessage &avatarHeader = msg.avatarheadermessage(); + if (avatarHeader.requestid() != 0 + && VALIDATE_UINT_RANGE(avatarHeader.avatarsize(), 32, 30720)) { retVal = true; } @@ -252,13 +140,13 @@ NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateAvatarDataMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_avatarrequestmessage()) { - const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage(); - if (msg.requestid() != 0 - && msg.avatarhash().size() == 16) { + if (msg.has_avatardatamessage()) { + const AvatarDataMessage &avatarData = msg.avatardatamessage(); + if (avatarData.requestid() != 0 + && VALIDATE_STRING_SIZE(avatarData.avatarblock(), 1, 256)) { retVal = true; } @@ -267,13 +155,54 @@ NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateAvatarEndMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_avatarheadermessage()) { - const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage(); - if (msg.requestid() != 0 - && VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) { + if (msg.has_avatarendmessage()) { + const AvatarEndMessage &avatarEnd = msg.avatarendmessage(); + if (avatarEnd.requestid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +LobbyMessageValidator::ValidateUnknownAvatarMessage(const LobbyMessage &msg) +{ + bool retVal = false; + if (msg.has_unknownavatarmessage()) { + const UnknownAvatarMessage &unknownAvatar = msg.unknownavatarmessage(); + if (unknownAvatar.requestid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +LobbyMessageValidator::ValidatePlayerListMessage(const LobbyMessage &msg) +{ + bool retVal = false; + if (msg.has_playerlistmessage()) { + const PlayerListMessage &player = msg.playerlistmessage(); + if (player.playerid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +LobbyMessageValidator::ValidateGameListNewMessage(const LobbyMessage &msg) +{ + bool retVal = false; + if (msg.has_gamelistnewmessage()) { + const GameListNewMessage &gameNew = msg.gamelistnewmessage(); + if (gameNew.gameid() != 0 + && VALIDATE_LIST_SIZE(gameNew.playerids(), 0, 10) + && gameNew.adminplayerid() != 0 + && ValidateGameInfo(gameNew.gameinfo())) { retVal = true; } @@ -282,14 +211,12 @@ NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateGameListUpdateMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_avatardatamessage()) { - const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage(); - if (msg.requestid() != 0 - && VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) { - + if (msg.has_gamelistupdatemessage()) { + const GameListUpdateMessage &gameUpdate = msg.gamelistupdatemessage(); + if (gameUpdate.gameid() != 0) { retVal = true; } } @@ -297,12 +224,12 @@ NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateGameListPlayerJoinedMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_avatarendmessage()) { - const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage(); - if (msg.requestid() != 0) { + if (msg.has_gamelistplayerjoinedmessage()) { + const GameListPlayerJoinedMessage &playerJoined = msg.gamelistplayerjoinedmessage(); + if (playerJoined.gameid() != 0 && playerJoined.playerid() != 0) { retVal = true; } } @@ -310,12 +237,12 @@ NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateGameListPlayerLeftMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_unknownavatarmessage()) { - const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage(); - if (msg.requestid() != 0) { + if (msg.has_gamelistplayerleftmessage()) { + const GameListPlayerLeftMessage &playerLeft = msg.gamelistplayerleftmessage(); + if (playerLeft.gameid() != 0 && playerLeft.playerid() != 0) { retVal = true; } } @@ -323,12 +250,12 @@ NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateGameListAdminChangedMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_playerlistmessage()) { - const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage(); - if (msg.playerid() != 0) { + if (msg.has_gamelistadminchangedmessage()) { + const GameListAdminChangedMessage &adminChanged = msg.gamelistadminchangedmessage(); + if (adminChanged.gameid() != 0 && adminChanged.newadminplayerid() != 0) { retVal = true; } } @@ -336,16 +263,12 @@ NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet) +LobbyMessageValidator::ValidatePlayerInfoRequestMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gamelistnewmessage()) { - const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerids(), 0, 10) - && msg.adminplayerid() != 0 - && ValidateGameInfo(msg.gameinfo())) { - + if (msg.has_playerinforequestmessage()) { + const PlayerInfoRequestMessage &infoRequest = msg.playerinforequestmessage(); + if (VALIDATE_LIST_SIZE(infoRequest.playerid(), 1, 10)) { retVal = true; } } @@ -353,77 +276,12 @@ NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet) +LobbyMessageValidator::ValidatePlayerInfoReplyMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gamelistupdatemessage()) { - const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) { - const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerleftmessage()) { - const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistadminchangedmessage()) { - const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforequestmessage()) { - const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage(); - if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforeplymessage()) { - const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage(); - if (msg.playerid() != 0) { + if (msg.has_playerinforeplymessage()) { + const PlayerInfoReplyMessage &infoReply = msg.playerinforeplymessage(); + if (infoReply.playerid() != 0) { // TODO maybe additional checks. retVal = true; } @@ -432,24 +290,24 @@ NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateSubscriptionRequestMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_subscriptionrequestmessage()) { - //const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage(); + if (msg.has_subscriptionrequestmessage()) { + //const SubscriptionRequestMessage &subscribe = msg.subscriptionrequestmessage(); retVal = true; } return retVal; } bool -NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateCreateGameMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_joinnewgamemessage()) { - const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage(); - if (ValidateGameInfo(msg.gameinfo()) - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { + if (msg.has_creategamemessage()) { + const CreateGameMessage &createGame = msg.creategamemessage(); + if (ValidateGameInfo(createGame.gameinfo()) + && (!createGame.has_password() || VALIDATE_STRING_SIZE(createGame.password(), 1, 64))) { retVal = true; } @@ -458,13 +316,13 @@ NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateJoinGameMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_joinexistinggamemessage()) { - const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage(); - if (msg.gameid() != 0 - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { + if (msg.has_joingamemessage()) { + const JoinGameMessage &joinGame = msg.joingamemessage(); + if (joinGame.gameid() != 0 + && (!joinGame.has_password() || VALIDATE_STRING_SIZE(joinGame.password(), 1, 64))) { retVal = true; } @@ -473,12 +331,12 @@ NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateRejoinGameMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_rejoinexistinggamemessage()) { - const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage(); - if (msg.gameid() != 0) { + if (msg.has_rejoingamemessage()) { + const RejoinGameMessage &rejoinGame = msg.rejoingamemessage(); + if (rejoinGame.gameid() != 0) { retVal = true; } } @@ -486,12 +344,12 @@ NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateJoinGameAckMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_joingameackmessage()) { - const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage(); - if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) { + if (msg.has_joingameackmessage()) { + const JoinGameAckMessage &joinAck = msg.joingameackmessage(); + if (joinAck.gameid() != 0 && ValidateGameInfo(joinAck.gameinfo())) { retVal = true; } } @@ -499,12 +357,12 @@ NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateJoinGameFailedMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_joingamefailedmessage()) { - const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage(); - if (msg.gameid() != 0) { + if (msg.has_joingamefailedmessage()) { + const JoinGameFailedMessage &joinFailed = msg.joingamefailedmessage(); + if (joinFailed.gameid() != 0) { retVal = true; } } @@ -512,12 +370,12 @@ NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateInviteNotifyMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gameplayerjoinedmessage()) { - const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_invitenotifymessage()) { + const InviteNotifyMessage &inviteNotify = msg.invitenotifymessage(); + if (inviteNotify.gameid() != 0 && inviteNotify.playeridwho() != 0 && inviteNotify.playeridbywhom() != 0) { retVal = true; } } @@ -525,12 +383,12 @@ NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateRejectGameInvitationMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gameplayerleftmessage()) { - const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_rejectgameinvitationmessage()) { + const RejectGameInvitationMessage &rejectInvite = msg.rejectgameinvitationmessage(); + if (rejectInvite.gameid() != 0) { retVal = true; } } @@ -538,12 +396,12 @@ NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateRejectInvNotifyMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gameadminchangedmessage()) { - const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { + if (msg.has_rejectinvnotifymessage()) { + const RejectInvNotifyMessage &rejectNotify = msg.rejectinvnotifymessage(); + if (rejectNotify.gameid() != 0 && rejectNotify.playerid() != 0) { retVal = true; } } @@ -551,12 +409,23 @@ NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateStatisticsMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_removedfromgamemessage()) { - const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage(); - if (msg.gameid() != 0) { + if (msg.has_statisticsmessage()) { + //const StatisticsMessage &stat = msg.statisticsmessage(); + retVal = true; + } + return retVal; +} + +bool +LobbyMessageValidator::ValidateChatRequestMessage(const LobbyMessage &msg) +{ + bool retVal = false; + if (msg.has_chatrequestmessage()) { + const ChatRequestMessage &chatRequest = msg.chatrequestmessage(); + if (VALIDATE_STRING_SIZE(chatRequest.chattext(), 1, 128)) { retVal = true; } } @@ -564,12 +433,12 @@ NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateChatMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_kickplayerrequestmessage()) { - const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_chatmessage()) { + const ChatMessage &chat = msg.chatmessage(); + if (VALIDATE_STRING_SIZE(chat.chattext(), 1, 128)) { retVal = true; } } @@ -577,12 +446,12 @@ NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateChatRejectMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_leavegamerequestmessage()) { - const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage(); - if (msg.gameid() != 0) { + if (msg.has_chatrejectmessage()) { + const ChatRejectMessage &chatReject = msg.chatrejectmessage(); + if (VALIDATE_STRING_SIZE(chatReject.chattext(), 1, 128)) { retVal = true; } } @@ -590,12 +459,12 @@ NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateDialogMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_inviteplayertogamemessage()) { - const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_dialogmessage()) { + const DialogMessage &dialog = msg.dialogmessage(); + if (VALIDATE_STRING_SIZE(dialog.notificationtext(), 1, 128)) { retVal = true; } } @@ -603,270 +472,22 @@ NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateTimeoutWarningMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_invitenotifymessage()) { - const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage(); - if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) { - retVal = true; - } + if (msg.has_timeoutwarningmessage()) { + //const TimeoutWarningMessage &timeoutWarning = msg.timeoutwarningmessage(); + retVal = true; } return retVal; } bool -NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectgameinvitationmessage()) { - const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectinvnotifymessage()) { - const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventmessage()) { - const StartEventMessage &msg = packet.GetMsg()->starteventmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventackmessage()) { - const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartinitialmessage()) { - const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartrejoinmessage()) { - const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && msg.handnum() != 0 - && VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_handstartmessage()) { - const HandStartMessage &msg = packet.GetMsg()->handstartmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000) - && VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersturnmessage()) { - const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0 ) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_myactionrequestmessage()) { - const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage(); - if (msg.gameid() != 0 - && msg.handnum() != 0 - && VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_youractionrejectedmessage()) { - const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersactiondonemessage()) { - const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealflopcardsmessage()) { - const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.flopcard1(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard2(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealturncardmessage()) { - const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.turncard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealrivercardmessage()) { - const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.rivercard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_allinshowcardsmessage()) { - const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandshowcardsmessage()) { - const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandhidecardsmessage()) { - const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/) +LobbyMessageValidator::ValidateResetTimeoutMessage(const LobbyMessage &/*msg*/) { //bool retVal = false; - //if (packet.GetMsg()->has_showmycardsrequestmessage()) { - // const ShowMyCardsRequestMessage &msg = packet.GetMsg()->showmycardsrequestmessage(); + //if (msg.has_resettimeoutmessage()) { + // const ResetTimeoutMessage &resetTimeout = msg.resettimeoutmessage(); // retVal = true; //} //return retVal; @@ -874,23 +495,77 @@ NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet* } bool -NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateReportAvatarMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_afterhandshowcardsmessage()) { - //const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage(); + if (msg.has_reportavatarmessage()) { + const ReportAvatarMessage &reportAvatar = msg.reportavatarmessage(); + if (reportAvatar.reportedplayerid() != 0 + && reportAvatar.reportedavatarhash().size() == 16) { + + retVal = true; + } + } + return retVal; +} + +bool +LobbyMessageValidator::ValidateReportAvatarAckMessage(const LobbyMessage &msg) +{ + bool retVal = false; + if (msg.has_reportavatarackmessage()) { + const ReportAvatarAckMessage &reportAvatarAck = msg.reportavatarackmessage(); + if (reportAvatarAck.reportedplayerid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +LobbyMessageValidator::ValidateReportGameMessage(const LobbyMessage &msg) +{ + bool retVal = false; + if (msg.has_reportgamemessage()) { + const ReportGameMessage &reportGame = msg.reportgamemessage(); + if (reportGame.reportedgameid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +LobbyMessageValidator::ValidateReportGameAckMessage(const LobbyMessage &msg) +{ + bool retVal = false; + if (msg.has_reportgameackmessage()) { + const ReportGameAckMessage &reportGameAck = msg.reportgameackmessage(); + if (reportGameAck.reportedgameid() != 0) { + retVal = true; + } + } + return retVal; +} + +bool +LobbyMessageValidator::ValidateErrorMessage(const LobbyMessage &msg) +{ + bool retVal = false; + if (msg.has_errormessage()) { + //const ErrorMessage &error = msg.errormessage(); retVal = true; } return retVal; } bool -NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateAdminRemoveGameMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_endofgamemessage()) { - const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage(); - if (msg.gameid() != 0 && msg.winnerplayerid() != 0) { + if (msg.has_adminremovegamemessage()) { + const AdminRemoveGameMessage &removeGame = msg.adminremovegamemessage(); + if (removeGame.removegameid() != 0) { retVal = true; } } @@ -898,12 +573,12 @@ NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateAdminRemoveGameAckMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_playeridchangedmessage()) { - const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage(); - if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) { + if (msg.has_adminremovegameackmessage()) { + const AdminRemoveGameAckMessage &removeGameAck = msg.adminremovegameackmessage(); + if (removeGameAck.removegameid() != 0) { retVal = true; } } @@ -911,12 +586,12 @@ NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateAdminBanPlayerMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_askkickplayermessage()) { - const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_adminbanplayermessage()) { + const AdminBanPlayerMessage &banPlayer = msg.adminbanplayermessage(); + if (banPlayer.banplayerid() != 0) { retVal = true; } } @@ -924,12 +599,12 @@ NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateAdminBanPlayerAckMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_askkickdeniedmessage()) { - const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_adminbanplayerackmessage()) { + const AdminBanPlayerAckMessage &banPlayerAck = msg.adminbanplayerackmessage(); + if (banPlayerAck.banplayerid() != 0) { retVal = true; } } @@ -937,281 +612,7 @@ NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_startkickpetitionmessage()) { - const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage(); - if (msg.gameid() != 0 - && msg.petitionid() != 0 - && msg.proposingplayerid() != 0 - && msg.kickplayerid() != 0 - && msg.kicktimeoutsec() > 0 - && msg.numvotesneededtokick() > 0) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickrequestmessage()) { - const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickreplymessage()) { - const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickpetitionupdatemessage()) { - const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endkickpetitionmessage()) { - const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_statisticsmessage()) { - //const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrequestmessage()) { - const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatmessage()) { - const ChatMessage &msg = packet.GetMsg()->chatmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrejectmessage()) { - const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDialogMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dialogmessage()) { - const DialogMessage &msg = packet.GetMsg()->dialogmessage(); - if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_timeoutwarningmessage()) { - //const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_resettimeoutmessage()) { - // const ResetTimeoutMessage &msg = packet.GetMsg()->resettimeoutmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarmessage()) { - const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage(); - if (msg.reportedplayerid() != 0 - && msg.reportedavatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarackmessage()) { - const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage(); - if (msg.reportedplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgamemessage()) { - const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgameackmessage()) { - const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateErrorMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_errormessage()) { - //const ErrorMessage &msg = packet.GetMsg()->errormessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegamemessage()) { - const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegameackmessage()) { - const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayermessage()) { - const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayerackmessage()) { - const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo) +LobbyMessageValidator::ValidateGameInfo(const NetGameInfo &gameInfo) { bool retVal = false; if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64) @@ -1233,12 +634,12 @@ NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo) } bool -NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateGameListSpectatorJoinedMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) { - const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_gamelistspectatorjoinedmessage()) { + const GameListSpectatorJoinedMessage &spectatorJoined = msg.gamelistspectatorjoinedmessage(); + if (spectatorJoined.gameid() != 0 && spectatorJoined.playerid() != 0) { retVal = true; } } @@ -1246,38 +647,12 @@ NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &pack } bool -NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet) +LobbyMessageValidator::ValidateGameListSpectatorLeftMessage(const LobbyMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorleftmessage()) { - const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamespectatorjoinedmessage()) { - const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamespectatorleftmessage()) { - const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { + if (msg.has_gamelistspectatorleftmessage()) { + const GameListSpectatorLeftMessage &spectatorLeft = msg.gamelistspectatorleftmessage(); + if (spectatorLeft.gameid() != 0 && spectatorLeft.playerid() != 0) { retVal = true; } } diff --git a/src/net/common/validation/pokerthmessagevalidator.cpp b/src/net/common/validation/pokerthmessagevalidator.cpp index c690a8af..15f0565c 100644 --- a/src/net/common/validation/pokerthmessagevalidator.cpp +++ b/src/net/common/validation/pokerthmessagevalidator.cpp @@ -29,145 +29,54 @@ * as that of the covered work. * *****************************************************************************/ -#include -#include +#include +#include +#include +#include +#include +#include +#include using namespace std; -#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535) -#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize)) -#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval)) -#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval)) -#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize)) -static bool -ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval) -{ - bool retVal = true; - for (int i = 0; i < l.size(); i++) { - if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) { - retVal = false; - break; - } - } - return retVal; -} - -NetPacketValidator::NetPacketValidator() +PokerTHMessageValidator::PokerTHMessageValidator() { m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AnnounceMessage, ValidateAnnounceMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, ValidateAuthMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, ValidateLobbyMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, ValidateGameMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameManagementMessage, ValidateGameManagementMessage)); - m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameEngineMessage, ValidateGameEngineMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitMessage, ValidateInitMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerChallengeMessage, ValidateAuthServerChallengeMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthClientResponseMessage, ValidateAuthClientResponseMessage)); - m_validationMap.insert(make_pair(AuthMessage_AuthMessageType_Type_AuthServerVerificationMessage, ValidateAuthServerVerificationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InitAckMessage, ValidateInitAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage, ValidateAvatarRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage, ValidateAvatarHeaderMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarDataMessage, ValidateAvatarDataMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AvatarEndMessage, ValidateAvatarEndMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage, ValidateUnknownAvatarMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerListMessage, ValidatePlayerListMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListNewMessage, ValidateGameListNewMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage, ValidateGameListUpdateMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage, ValidateGameListPlayerJoinedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage, ValidateGameListPlayerLeftMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage, ValidateGameListAdminChangedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage, ValidatePlayerInfoRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage, ValidatePlayerInfoReplyMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage, ValidateSubscriptionRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_CreateGameMessage, ValidateCreateGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage, ValidateJoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage, ValidateRejoinGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage, ValidateJoinGameAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage, ValidateJoinGameFailedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage, ValidateGamePlayerJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage, ValidateGamePlayerLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage, ValidateGameAdminChangedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage, ValidateRemovedFromGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage, ValidateKickPlayerRequestMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage, ValidateLeaveGameRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage, ValidateInvitePlayerToGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage, ValidateInviteNotifyMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage, ValidateRejectGameInvitationMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage, ValidateRejectInvNotifyMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventMessage, ValidateStartEventMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage, ValidateStartEventAckMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage, ValidateGameStartInitialMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage, ValidateGameStartRejoinMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_HandStartMessage, ValidateHandStartMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersTurnMessage, ValidatePlayersTurnMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_MyActionRequestMessage, ValidateMyActionRequestMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_YourActionRejectedMessage, ValidateYourActionRejectedMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_PlayersActionDoneMessage, ValidatePlayersActionDoneMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealFlopCardsMessage, ValidateDealFlopCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealTurnCardMessage, ValidateDealTurnCardMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_DealRiverCardMessage, ValidateDealRiverCardMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AllInShowCardsMessage, ValidateAllInShowCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandShowCardsMessage, ValidateEndOfHandShowCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_EndOfHandHideCardsMessage, ValidateEndOfHandHideCardsMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_ShowMyCardsRequestMessage, ValidateShowMyCardsRequestMessage)); - m_validationMap.insert(make_pair(GameEngineMessage_GameEngineMessageType_Type_AfterHandShowCardsMessage, ValidateAfterHandShowCardsMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage, ValidateEndOfGameMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage, ValidatePlayerIdChangedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage, ValidateAskKickPlayerMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage, ValidateAskKickDeniedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage, ValidateStartKickPetitionMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage, ValidateVoteKickRequestMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage, ValidateVoteKickReplyMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage, ValidateKickPetitionUpdateMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage, ValidateEndKickPetitionMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_StatisticsMessage, ValidateStatisticsMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRequestMessage, ValidateChatRequestMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatMessage, ValidateChatMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ChatRejectMessage, ValidateChatRejectMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_DialogMessage, ValidateDialogMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage, ValidateTimeoutWarningMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage, ValidateResetTimeoutMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage, ValidateReportAvatarMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage, ValidateReportAvatarAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameMessage, ValidateReportGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage, ValidateReportGameAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_ErrorMessage, ValidateErrorMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage, ValidateAdminRemoveGameMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage, ValidateAdminRemoveGameAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage, ValidateAdminBanPlayerMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage, ValidateAdminBanPlayerAckMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage, ValidateGameListSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage, ValidateGameListSpectatorLeftMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage, ValidateGameSpectatorJoinedMessage)); - m_validationMap.insert(make_pair(GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage, ValidateGameSpectatorLeftMessage)); + m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_AuthMessage, boost::bind(boost::mem_fn(&PokerTHMessageValidator::ValidateAuthMessage), this, _1))); + m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_LobbyMessage, boost::bind(boost::mem_fn(&PokerTHMessageValidator::ValidateLobbyMessage), this, _1))); + m_validationMap.insert(make_pair(PokerTHMessage_PokerTHMessageType_Type_GameMessage, boost::bind(boost::mem_fn(&PokerTHMessageValidator::ValidateGameMessage), this, _1))); + + m_authValidator.reset(new AuthMessageValidator); + m_lobbyValidator.reset(new LobbyMessageValidator); + m_gameValidator.reset(new GameMessageValidator); } bool -NetPacketValidator::IsValidPacket(const NetPacket &packet) const +PokerTHMessageValidator::IsValidMessage(const PokerTHMessage &msg) const { // Default: Invalid packet. bool retVal = false; - ValidateFunctorMap::const_iterator pos = m_validationMap.find(packet.GetMsg()->messagetype()); + ValidateFunctorMap::const_iterator pos = m_validationMap.find(msg.messagetype()); if (pos != m_validationMap.end()) { // Call validation functor. - retVal = pos->second(packet); + retVal = pos->second(msg); } return retVal; } bool -NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) +PokerTHMessageValidator::ValidateAnnounceMessage(const PokerTHMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_announcemessage()) { - const AnnounceMessage &msg = packet.GetMsg()->announcemessage(); - if (VALIDATE_IS_UINT16(msg.protocolversion().majorversion()) - && VALIDATE_IS_UINT16(msg.protocolversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().majorversion()) - && VALIDATE_IS_UINT16(msg.latestgameversion().minorversion()) - && VALIDATE_IS_UINT16(msg.latestbetarevision()) - && VALIDATE_IS_UINT16(msg.numplayersonserver())) { + if (msg.has_announcemessage()) { + const AnnounceMessage &announce = msg.announcemessage(); + if (VALIDATE_IS_UINT16(announce.protocolversion().majorversion()) + && VALIDATE_IS_UINT16(announce.protocolversion().minorversion()) + && VALIDATE_IS_UINT16(announce.latestgameversion().majorversion()) + && VALIDATE_IS_UINT16(announce.latestgameversion().minorversion()) + && VALIDATE_IS_UINT16(announce.latestbetarevision()) + && VALIDATE_IS_UINT16(announce.numplayersonserver())) { retVal = true; } @@ -176,1110 +85,31 @@ NetPacketValidator::ValidateAnnounceMessage(const NetPacket &packet) } bool -NetPacketValidator::ValidateInitMessage(const NetPacket &packet) +PokerTHMessageValidator::ValidateAuthMessage(const PokerTHMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_initmessage()) { - const InitMessage &msg = packet.GetMsg()->initmessage(); - if (VALIDATE_IS_UINT16(msg.requestedversion().majorversion()) - && VALIDATE_IS_UINT16(msg.requestedversion().minorversion()) - && (!msg.has_mylastsessionid() || msg.mylastsessionid().size() == 16) - && (!msg.has_authserverpassword() || VALIDATE_STRING_SIZE(msg.authserverpassword(), 1, 64)) - && (!msg.has_nickname() || VALIDATE_STRING_SIZE(msg.nickname(), 1, 64)) - && (!msg.has_clientuserdata() || VALIDATE_STRING_SIZE(msg.clientuserdata(), 1, 256)) - && (!msg.has_avatarhash() || msg.avatarhash().size() == 16)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerChallengeMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserverchallengemessage()) { - const AuthServerChallengeMessage &msg = packet.GetMsg()->authserverchallengemessage(); - if (VALIDATE_STRING_SIZE(msg.serverchallenge(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthClientResponseMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authclientresponsemessage()) { - const AuthClientResponseMessage &msg = packet.GetMsg()->authclientresponsemessage(); - if (VALIDATE_STRING_SIZE(msg.clientresponse(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAuthServerVerificationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_authserververificationmessage()) { - const AuthServerVerificationMessage &msg = packet.GetMsg()->authserververificationmessage(); - if (VALIDATE_STRING_SIZE(msg.serververification(), 1, 256)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInitAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_initackmessage()) { - const InitAckMessage &msg = packet.GetMsg()->initackmessage(); - if (msg.yoursessionid().size() == 16 - && msg.yourplayerid() != 0 - && (!msg.has_youravatarhash() || msg.youravatarhash().size() == 16) - && (!msg.has_rejoingameid() || msg.rejoingameid() != 0)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarrequestmessage()) { - const AvatarRequestMessage &msg = packet.GetMsg()->avatarrequestmessage(); - if (msg.requestid() != 0 - && msg.avatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarHeaderMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarheadermessage()) { - const AvatarHeaderMessage &msg = packet.GetMsg()->avatarheadermessage(); - if (msg.requestid() != 0 - && VALIDATE_UINT_RANGE(msg.avatarsize(), 32, 30720)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarDataMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatardatamessage()) { - const AvatarDataMessage &msg = packet.GetMsg()->avatardatamessage(); - if (msg.requestid() != 0 - && VALIDATE_STRING_SIZE(msg.avatarblock(), 1, 256)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAvatarEndMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_avatarendmessage()) { - const AvatarEndMessage &msg = packet.GetMsg()->avatarendmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateUnknownAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_unknownavatarmessage()) { - const UnknownAvatarMessage &msg = packet.GetMsg()->unknownavatarmessage(); - if (msg.requestid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerListMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerlistmessage()) { - const PlayerListMessage &msg = packet.GetMsg()->playerlistmessage(); - if (msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListNewMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistnewmessage()) { - const GameListNewMessage &msg = packet.GetMsg()->gamelistnewmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerids(), 0, 10) - && msg.adminplayerid() != 0 - && ValidateGameInfo(msg.gameinfo())) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistupdatemessage()) { - const GameListUpdateMessage &msg = packet.GetMsg()->gamelistupdatemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerjoinedmessage()) { - const GameListPlayerJoinedMessage &msg = packet.GetMsg()->gamelistplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListPlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistplayerleftmessage()) { - const GameListPlayerLeftMessage &msg = packet.GetMsg()->gamelistplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistadminchangedmessage()) { - const GameListAdminChangedMessage &msg = packet.GetMsg()->gamelistadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforequestmessage()) { - const PlayerInfoRequestMessage &msg = packet.GetMsg()->playerinforequestmessage(); - if (VALIDATE_LIST_SIZE(msg.playerid(), 1, 10)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerInfoReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playerinforeplymessage()) { - const PlayerInfoReplyMessage &msg = packet.GetMsg()->playerinforeplymessage(); - if (msg.playerid() != 0) { - // TODO maybe additional checks. - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateSubscriptionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_subscriptionrequestmessage()) { - //const SubscriptionRequestMessage &msg = packet.GetMsg()->subscriptionrequestmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateCreateGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joinnewgamemessage()) { - const JoinNewGameMessage &msg = packet.GetMsg()->joinnewgamemessage(); - if (ValidateGameInfo(msg.gameinfo()) - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joinexistinggamemessage()) { - const JoinExistingGameMessage &msg = packet.GetMsg()->joinexistinggamemessage(); - if (msg.gameid() != 0 - && (!msg.has_password() || VALIDATE_STRING_SIZE(msg.password(), 1, 64))) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejoinGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejoinexistinggamemessage()) { - const RejoinExistingGameMessage &msg = packet.GetMsg()->rejoinexistinggamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joingameackmessage()) { - const JoinGameAckMessage &msg = packet.GetMsg()->joingameackmessage(); - if (msg.gameid() != 0 && ValidateGameInfo(msg.gameinfo())) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateJoinGameFailedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_joingamefailedmessage()) { - const JoinGameFailedMessage &msg = packet.GetMsg()->joingamefailedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGamePlayerJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameplayerjoinedmessage()) { - const GamePlayerJoinedMessage &msg = packet.GetMsg()->gameplayerjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGamePlayerLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameplayerleftmessage()) { - const GamePlayerLeftMessage &msg = packet.GetMsg()->gameplayerleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameAdminChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gameadminchangedmessage()) { - const GameAdminChangedMessage &msg = packet.GetMsg()->gameadminchangedmessage(); - if (msg.gameid() != 0 && msg.newadminplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRemovedFromGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_removedfromgamemessage()) { - const RemovedFromGameMessage &msg = packet.GetMsg()->removedfromgamemessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPlayerRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickplayerrequestmessage()) { - const KickPlayerRequestMessage &msg = packet.GetMsg()->kickplayerrequestmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateLeaveGameRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_leavegamerequestmessage()) { - const LeaveGameRequestMessage &msg = packet.GetMsg()->leavegamerequestmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInvitePlayerToGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_inviteplayertogamemessage()) { - const InvitePlayerToGameMessage &msg = packet.GetMsg()->inviteplayertogamemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateInviteNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_invitenotifymessage()) { - const InviteNotifyMessage &msg = packet.GetMsg()->invitenotifymessage(); - if (msg.gameid() != 0 && msg.playeridwho() != 0 && msg.playeridbywhom() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectGameInvitationMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectgameinvitationmessage()) { - const RejectGameInvitationMessage &msg = packet.GetMsg()->rejectgameinvitationmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateRejectInvNotifyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_rejectinvnotifymessage()) { - const RejectInvNotifyMessage &msg = packet.GetMsg()->rejectinvnotifymessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventmessage()) { - const StartEventMessage &msg = packet.GetMsg()->starteventmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartEventAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_starteventackmessage()) { - const StartEventAckMessage &msg = packet.GetMsg()->starteventackmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartInitialMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartinitialmessage()) { - const GameStartInitialMessage &msg = packet.GetMsg()->gamestartinitialmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && VALIDATE_LIST_SIZE(msg.playerseats(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameStartRejoinMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamestartrejoinmessage()) { - const GameStartRejoinMessage &msg = packet.GetMsg()->gamestartrejoinmessage(); - if (msg.gameid() != 0 - && msg.startdealerplayerid() != 0 - && msg.handnum() != 0 - && VALIDATE_LIST_SIZE(msg.rejoinplayerdata(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateHandStartMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_handstartmessage()) { - const HandStartMessage &msg = packet.GetMsg()->handstartmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_RANGE(msg.smallblind(), 1, 100000000) - && VALIDATE_LIST_SIZE(msg.seatstates(), 2, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersTurnMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersturnmessage()) { - const PlayersTurnMessage &msg = packet.GetMsg()->playersturnmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0 ) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateMyActionRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_myactionrequestmessage()) { - const MyActionRequestMessage &msg = packet.GetMsg()->myactionrequestmessage(); - if (msg.gameid() != 0 - && msg.handnum() != 0 - && VALIDATE_UINT_UPPER(msg.myrelativebet(), 10000000)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateYourActionRejectedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_youractionrejectedmessage()) { - const YourActionRejectedMessage &msg = packet.GetMsg()->youractionrejectedmessage(); - if (msg.gameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayersActionDoneMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playersactiondonemessage()) { - const PlayersActionDoneMessage &msg = packet.GetMsg()->playersactiondonemessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealFlopCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealflopcardsmessage()) { - const DealFlopCardsMessage &msg = packet.GetMsg()->dealflopcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.flopcard1(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard2(), 51) - && VALIDATE_UINT_UPPER(msg.flopcard3(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealTurnCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealturncardmessage()) { - const DealTurnCardMessage &msg = packet.GetMsg()->dealturncardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.turncard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDealRiverCardMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dealrivercardmessage()) { - const DealRiverCardMessage &msg = packet.GetMsg()->dealrivercardmessage(); - if (msg.gameid() != 0 - && VALIDATE_UINT_UPPER(msg.rivercard(), 51)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAllInShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_allinshowcardsmessage()) { - const AllInShowCardsMessage &msg = packet.GetMsg()->allinshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playersallin(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandshowcardsmessage()) { - const EndOfHandShowCardsMessage &msg = packet.GetMsg()->endofhandshowcardsmessage(); - if (msg.gameid() != 0 - && VALIDATE_LIST_SIZE(msg.playerresults(), 1, 10)) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfHandHideCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofhandhidecardsmessage()) { - const EndOfHandHideCardsMessage &msg = packet.GetMsg()->endofhandhidecardsmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateShowMyCardsRequestMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_showmycardsrequestmessage()) { - // const ShowMyCardsRequestMessage &msg = packet.GetMsg()->showmycardsrequestmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateAfterHandShowCardsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_afterhandshowcardsmessage()) { - //const AfterHandShowCardsMessage &msg = packet.GetMsg()->afterhandshowcardsmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndOfGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endofgamemessage()) { - const EndOfGameMessage &msg = packet.GetMsg()->endofgamemessage(); - if (msg.gameid() != 0 && msg.winnerplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidatePlayerIdChangedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_playeridchangedmessage()) { - const PlayerIdChangedMessage &msg = packet.GetMsg()->playeridchangedmessage(); - if (msg.oldplayerid() != 0 && msg.newplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickplayermessage()) { - const AskKickPlayerMessage &msg = packet.GetMsg()->askkickplayermessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAskKickDeniedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_askkickdeniedmessage()) { - const AskKickDeniedMessage &msg = packet.GetMsg()->askkickdeniedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStartKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_startkickpetitionmessage()) { - const StartKickPetitionMessage &msg = packet.GetMsg()->startkickpetitionmessage(); - if (msg.gameid() != 0 - && msg.petitionid() != 0 - && msg.proposingplayerid() != 0 - && msg.kickplayerid() != 0 - && msg.kicktimeoutsec() > 0 - && msg.numvotesneededtokick() > 0) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickrequestmessage()) { - const VoteKickRequestMessage &msg = packet.GetMsg()->votekickrequestmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateVoteKickReplyMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_votekickreplymessage()) { - const VoteKickReplyMessage &msg = packet.GetMsg()->votekickreplymessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateKickPetitionUpdateMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_kickpetitionupdatemessage()) { - const KickPetitionUpdateMessage &msg = packet.GetMsg()->kickpetitionupdatemessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateEndKickPetitionMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_endkickpetitionmessage()) { - const EndKickPetitionMessage &msg = packet.GetMsg()->endkickpetitionmessage(); - if (msg.gameid() != 0 && msg.petitionid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateStatisticsMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_statisticsmessage()) { - //const StatisticsMessage &msg = packet.GetMsg()->statisticsmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRequestMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrequestmessage()) { - const ChatRequestMessage &msg = packet.GetMsg()->chatrequestmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatmessage()) { - const ChatMessage &msg = packet.GetMsg()->chatmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateChatRejectMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_chatrejectmessage()) { - const ChatRejectMessage &msg = packet.GetMsg()->chatrejectmessage(); - if (VALIDATE_STRING_SIZE(msg.chattext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateDialogMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_dialogmessage()) { - const DialogMessage &msg = packet.GetMsg()->dialogmessage(); - if (VALIDATE_STRING_SIZE(msg.notificationtext(), 1, 128)) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateTimeoutWarningMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_timeoutwarningmessage()) { - //const TimeoutWarningMessage &msg = packet.GetMsg()->timeoutwarningmessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateResetTimeoutMessage(const NetPacket &/*packet*/) -{ - //bool retVal = false; - //if (packet.GetMsg()->has_resettimeoutmessage()) { - // const ResetTimeoutMessage &msg = packet.GetMsg()->resettimeoutmessage(); - // retVal = true; - //} - //return retVal; - return true; // Empty packet, always valid. -} - -bool -NetPacketValidator::ValidateReportAvatarMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarmessage()) { - const ReportAvatarMessage &msg = packet.GetMsg()->reportavatarmessage(); - if (msg.reportedplayerid() != 0 - && msg.reportedavatarhash().size() == 16) { - - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportAvatarAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportavatarackmessage()) { - const ReportAvatarAckMessage &msg = packet.GetMsg()->reportavatarackmessage(); - if (msg.reportedplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgamemessage()) { - const ReportGameMessage &msg = packet.GetMsg()->reportgamemessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateReportGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_reportgameackmessage()) { - const ReportGameAckMessage &msg = packet.GetMsg()->reportgameackmessage(); - if (msg.reportedgameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateErrorMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_errormessage()) { - //const ErrorMessage &msg = packet.GetMsg()->errormessage(); - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegamemessage()) { - const AdminRemoveGameMessage &msg = packet.GetMsg()->adminremovegamemessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminRemoveGameAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminremovegameackmessage()) { - const AdminRemoveGameAckMessage &msg = packet.GetMsg()->adminremovegameackmessage(); - if (msg.removegameid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayermessage()) { - const AdminBanPlayerMessage &msg = packet.GetMsg()->adminbanplayermessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateAdminBanPlayerAckMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_adminbanplayerackmessage()) { - const AdminBanPlayerAckMessage &msg = packet.GetMsg()->adminbanplayerackmessage(); - if (msg.banplayerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameInfo(const NetGameInfo &gameInfo) -{ - bool retVal = false; - if (VALIDATE_STRING_SIZE(gameInfo.gamename(), 1, 64) - && VALIDATE_UINT_RANGE(gameInfo.maxnumplayers(), 2, 10) - && (!gameInfo.has_raiseeveryhands() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryhands(), 1, 1000)) - && (!gameInfo.has_raiseeveryminutes() || VALIDATE_UINT_RANGE(gameInfo.raiseeveryminutes(), 1, 1000)) - && (!gameInfo.has_endraisesmallblindvalue() || VALIDATE_UINT_UPPER(gameInfo.endraisesmallblindvalue(), 1000000)) - && VALIDATE_UINT_RANGE(gameInfo.proposedguispeed(), 1, 11) - && VALIDATE_UINT_RANGE(gameInfo.delaybetweenhands(), 5, 20) - && VALIDATE_UINT_UPPER(gameInfo.playeractiontimeout(), 60) - && VALIDATE_UINT_RANGE(gameInfo.firstsmallblind(), 1, 20000) - && VALIDATE_UINT_RANGE(gameInfo.startmoney(), 1, 1000000) - && VALIDATE_LIST_SIZE(gameInfo.manualblinds(), 0, 30) - && ValidateListIntRange(gameInfo.manualblinds(), 1, 1000000)) { - - retVal = true; - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorJoinedMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorjoinedmessage()) { - const GameListSpectatorJoinedMessage &msg = packet.GetMsg()->gamelistspectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } - } - return retVal; -} - -bool -NetPacketValidator::ValidateGameListSpectatorLeftMessage(const NetPacket &packet) -{ - bool retVal = false; - if (packet.GetMsg()->has_gamelistspectatorleftmessage()) { - const GameListSpectatorLeftMessage &msg = packet.GetMsg()->gamelistspectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } + if (msg.has_authmessage()) { + retVal = m_authValidator->IsValidMessage(msg.authmessage()); } return retVal; } bool -NetPacketValidator::ValidateGameSpectatorJoinedMessage(const NetPacket &packet) +PokerTHMessageValidator::ValidateLobbyMessage(const PokerTHMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gamespectatorjoinedmessage()) { - const GameSpectatorJoinedMessage &msg = packet.GetMsg()->gamespectatorjoinedmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } + if (msg.has_lobbymessage()) { + retVal = m_lobbyValidator->IsValidMessage(msg.lobbymessage()); } return retVal; } bool -NetPacketValidator::ValidateGameSpectatorLeftMessage(const NetPacket &packet) +PokerTHMessageValidator::ValidateGameMessage(const PokerTHMessage &msg) { bool retVal = false; - if (packet.GetMsg()->has_gamespectatorleftmessage()) { - const GameSpectatorLeftMessage &msg = packet.GetMsg()->gamespectatorleftmessage(); - if (msg.gameid() != 0 && msg.playerid() != 0) { - retVal = true; - } + if (msg.has_gamemessage()) { + retVal = m_gameValidator->IsValidMessage(msg.gamemessage()); } return retVal; } diff --git a/src/net/common/webreceivebuffer.cpp b/src/net/common/webreceivebuffer.cpp index 05c7d820..1f2fdabf 100644 --- a/src/net/common/webreceivebuffer.cpp +++ b/src/net/common/webreceivebuffer.cpp @@ -58,7 +58,7 @@ WebReceiveBuffer::HandleMessage(boost::shared_ptr session, const st boost::shared_ptr tmpPacket; try { tmpPacket = NetPacket::Create(msg.c_str(), msg.size()); - if (!validator.IsValidPacket(*tmpPacket)) { + if (!validator.IsValidMessage(*tmpPacket->GetMsg())) { LOG_ERROR("Session " << session->GetId() << " - Invalid packet: " << tmpPacket->GetMsg()->messagetype()); tmpPacket.reset(); } diff --git a/src/net/netpacket.h b/src/net/netpacket.h index 3a3ea994..03831b47 100644 --- a/src/net/netpacket.h +++ b/src/net/netpacket.h @@ -55,6 +55,12 @@ #define MAX_NUM_PLAYER_RESULTS MAX_NUMBER_OF_PLAYERS #define MAX_NUM_PLAYER_CARDS MAX_NUMBER_OF_PLAYERS*/ +#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535) +#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize)) +#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval)) +#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval)) +#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize)) + // This is just a wrapper class for the protocol buffer. class NetPacket { @@ -65,10 +71,12 @@ public: static boost::shared_ptr Create(const char *data, size_t dataSize); - const PokerTHMessage *GetMsg() const { + const PokerTHMessage *GetMsg() const + { return m_msg; } - PokerTHMessage *GetMsg() { + PokerTHMessage *GetMsg() + { return m_msg; } diff --git a/src/net/receivebuffer.h b/src/net/receivebuffer.h index f631600b..22cd4981 100644 --- a/src/net/receivebuffer.h +++ b/src/net/receivebuffer.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include class SessionData; @@ -51,7 +51,7 @@ public: protected: - static NetPacketValidator validator; + static PokerTHMessageValidator validator; }; diff --git a/src/net/serveraccepthelper.h b/src/net/serveraccepthelper.h index 59421f61..19db005b 100644 --- a/src/net/serveraccepthelper.h +++ b/src/net/serveraccepthelper.h @@ -52,16 +52,19 @@ public: typedef typename P::endpoint P_endpoint; ServerAcceptHelper(ServerCallback &serverCallback, boost::shared_ptr ioService) - : m_ioService(ioService), m_serverCallback(serverCallback) { + : m_ioService(ioService), m_serverCallback(serverCallback) + { m_acceptor.reset(new P_acceptor(*m_ioService)); } - virtual ~ServerAcceptHelper() { + virtual ~ServerAcceptHelper() + { } // Set the parameters. virtual void Listen(unsigned serverPort, bool ipv6, const std::string &/*logDir*/, - boost::shared_ptr lobbyThread) { + boost::shared_ptr lobbyThread) + { m_lobbyThread = lobbyThread; try { @@ -77,14 +80,16 @@ public: } } - virtual void Close() { + virtual void Close() + { boost::system::error_code ec; m_acceptor->close(ec); // Ignore any error, because we are terminating. } protected: - void InternalListen(unsigned serverPort, bool ipv6) { + void InternalListen(unsigned serverPort, bool ipv6) + { if (serverPort < 1024) throw ServerException(__FILE__, __LINE__, ERR_SOCK_INVALID_PORT, 0); @@ -114,7 +119,8 @@ protected: } void HandleAccept(boost::shared_ptr acceptedSocket, - const boost::system::error_code &error) { + const boost::system::error_code &error) + { if (!error) { boost::asio::socket_base::non_blocking_io command(true); acceptedSocket->io_control(command); @@ -136,11 +142,13 @@ protected: } } - ServerCallback &GetCallback() { + ServerCallback &GetCallback() + { return m_serverCallback; } - ServerLobbyThread &GetLobbyThread() { + ServerLobbyThread &GetLobbyThread() + { return *m_lobbyThread; } diff --git a/src/net/servergame.h b/src/net/servergame.h index 08ceab35..f4026fd3 100644 --- a/src/net/servergame.h +++ b/src/net/servergame.h @@ -52,6 +52,7 @@ class PlayerInterface; class ConfigFile; struct GameData; class Game; +class GameMessage; class ServerGame : public boost::enable_shared_from_this { @@ -74,7 +75,7 @@ public: void MarkPlayerAsInactive(unsigned playerId); void MarkPlayerAsKicked(unsigned playerId); - void HandlePacket(boost::shared_ptr session, boost::shared_ptr packet); + void HandleGameMsg(boost::shared_ptr session, const GameMessage &gameMsg); ServerCallback &GetCallback(); GameState GetCurRound() const; @@ -171,9 +172,6 @@ protected: void AssignPlayerNumbers(PlayerDataList &playerList); bool IsValidPlayer(unsigned playerId) const; - void AddReportedAvatar(unsigned playerId); - bool IsAvatarReported(unsigned playerId) const; - ServerLobbyThread &GetLobbyThread(); ServerGameState &GetState(); @@ -216,8 +214,6 @@ private: PlayerIdList m_newSpectatorList; mutable boost::mutex m_newSpectatorListMutex; - PlayerIdList m_reportedAvatarList; - RankingMap m_rankingMap; unsigned m_adminPlayerId; diff --git a/src/net/servergamestate.h b/src/net/servergamestate.h index 83058267..b4eae580 100644 --- a/src/net/servergamestate.h +++ b/src/net/servergamestate.h @@ -49,6 +49,9 @@ class Game; class ServerGame; class PlayerInterface; class ServerCallback; +class GameMessage; +class GameManagementMessage; +class GameEngineMessage; class ServerGameState { @@ -66,7 +69,7 @@ public: virtual void HandleNewSpectator(boost::shared_ptr server, boost::shared_ptr session) = 0; // Main processing function of the current state. - virtual void ProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet) = 0; + virtual void HandleGameMsg(boost::shared_ptr server, boost::shared_ptr session, const GameMessage &gameMsg) = 0; }; // Abstract State: Receiving. @@ -76,8 +79,10 @@ public: virtual ~AbstractServerGameStateReceiving(); // Globally handle packets which are allowed in all running states. - // Calls InternalProcess if packet has not been processed. - virtual void ProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet); + // Calls internal handler if packet has not been processed. + virtual void HandleGameMsg(boost::shared_ptr server, boost::shared_ptr session, const GameMessage &gameMsg); + virtual void HandleGameManagementMsg(boost::shared_ptr server, boost::shared_ptr session, const GameManagementMessage &managementMsg); + virtual void HandleGameEngineMsg(boost::shared_ptr server, boost::shared_ptr session, const GameEngineMessage &engineMsg); static boost::shared_ptr CreateNetPacketPlayerJoined(unsigned gameId, const PlayerData &playerData); static boost::shared_ptr CreateNetPacketSpectatorJoined(unsigned gameId, const PlayerData &playerData); @@ -88,7 +93,8 @@ public: protected: - virtual void InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet) = 0; + virtual void InternalHandleGameManagementMsg(boost::shared_ptr server, boost::shared_ptr session, const GameManagementMessage &managementMsg) = 0; + virtual void InternalHandleGameEngineMsg(boost::shared_ptr server, boost::shared_ptr session, const GameEngineMessage &engineMsg) = 0; }; // State: Initialization. @@ -119,7 +125,8 @@ protected: void TimerAdminTimeout(const boost::system::error_code &ec, boost::shared_ptr server); void SendStartEvent(ServerGame &server, bool fillWithComputerPlayers); - virtual void InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet); + virtual void InternalHandleGameManagementMsg(boost::shared_ptr server, boost::shared_ptr session, const GameManagementMessage &managementMsg); + virtual void InternalHandleGameEngineMsg(boost::shared_ptr server, boost::shared_ptr session, const GameEngineMessage &engineMsg); private: static ServerGameStateInit s_state; @@ -143,7 +150,8 @@ public: protected: ServerGameStateStartGame(); - virtual void InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet); + virtual void InternalHandleGameManagementMsg(boost::shared_ptr server, boost::shared_ptr session, const GameManagementMessage &managementMsg); + virtual void InternalHandleGameEngineMsg(boost::shared_ptr server, boost::shared_ptr session, const GameEngineMessage &engineMsg); void TimerTimeout(const boost::system::error_code &ec, boost::shared_ptr server); void DoStart(boost::shared_ptr server); @@ -160,7 +168,8 @@ public: virtual void HandleNewSpectator(boost::shared_ptr server, boost::shared_ptr session); protected: - virtual void InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet); + virtual void InternalHandleGameManagementMsg(boost::shared_ptr server, boost::shared_ptr session, const GameManagementMessage &managementMsg); + virtual void InternalHandleGameEngineMsg(boost::shared_ptr, boost::shared_ptr, const GameEngineMessage &); }; // State: Within hand. @@ -179,7 +188,6 @@ public: protected: ServerGameStateHand(); - virtual void InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet); void TimerLoop(const boost::system::error_code &ec, boost::shared_ptr server); void EngineLoop(boost::shared_ptr server); void TimerShowCards(const boost::system::error_code &ec, boost::shared_ptr server); @@ -218,7 +226,7 @@ public: protected: ServerGameStateWaitPlayerAction(); - virtual void InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet); + virtual void InternalHandleGameEngineMsg(boost::shared_ptr server, boost::shared_ptr session, const GameEngineMessage &engineMsg); void TimerTimeout(const boost::system::error_code &ec, boost::shared_ptr server); private: @@ -241,7 +249,7 @@ public: protected: ServerGameStateWaitNextHand(); - virtual void InternalProcessPacket(boost::shared_ptr server, boost::shared_ptr session, boost::shared_ptr packet); + virtual void InternalHandleGameEngineMsg(boost::shared_ptr server, boost::shared_ptr session, const GameEngineMessage &engineMsg); void TimerTimeout(const boost::system::error_code &ec, boost::shared_ptr server); private: @@ -265,7 +273,7 @@ public: virtual void HandleNewSpectator(boost::shared_ptr /*server*/, boost::shared_ptr /*session*/) {} // Main processing function of the current state. - virtual void ProcessPacket(boost::shared_ptr /*server*/, boost::shared_ptr /*session*/, boost::shared_ptr /*packet*/) {} + virtual void HandleGameMsg(boost::shared_ptr /*server*/, boost::shared_ptr /*session*/, const GameMessage &/*gameMsg*/) {} protected: ServerGameStateFinal() {} diff --git a/src/net/serverlobbythread.h b/src/net/serverlobbythread.h index 7886d398..8ec31779 100644 --- a/src/net/serverlobbythread.h +++ b/src/net/serverlobbythread.h @@ -87,12 +87,6 @@ public: void NotifyReopeningGame(unsigned gameId); void DispatchPacket(boost::shared_ptr session, boost::shared_ptr packet); - void HandleGameRetrievePlayerInfo(boost::shared_ptr session, const PlayerInfoRequestMessage &playerInfoRequest); - void HandleGameRetrieveAvatar(boost::shared_ptr session, const AvatarRequestMessage &retrieveAvatar); - void HandleGameReportGame(boost::shared_ptr session, const ReportGameMessage &reportGame); - void HandleChatRequest(boost::shared_ptr session, const ChatRequestMessage &chatRequest); - void HandleAdminRemoveGame(boost::shared_ptr session, const AdminRemoveGameMessage &removeGame); - void HandleAdminBanPlayer(boost::shared_ptr session, const AdminBanPlayerMessage &banPlayer); bool KickPlayerByName(const std::string &playerName); bool RemoveGameByPlayerName(const std::string &playerName); @@ -150,7 +144,7 @@ protected: void InitChatCleaner(); void HandlePacket(boost::shared_ptr session, boost::shared_ptr packet); - void HandleNetPacketInit(boost::shared_ptr session, const InitMessage &initMessage); + void HandleNetPacketAuthClientRequest(boost::shared_ptr session, const AuthClientRequestMessage &clientRequest); void HandleNetPacketAuthClientResponse(boost::shared_ptr session, const AuthClientResponseMessage &clientResponse); void HandleNetPacketAvatarHeader(boost::shared_ptr session, const AvatarHeaderMessage &avatarHeader); void HandleNetPacketUnknownAvatar(boost::shared_ptr session, const UnknownAvatarMessage &unknownAvatar); @@ -158,14 +152,19 @@ protected: void HandleNetPacketAvatarEnd(boost::shared_ptr session, const AvatarEndMessage &avatarEnd); void HandleNetPacketRetrievePlayerInfo(boost::shared_ptr session, const PlayerInfoRequestMessage &playerInfoRequest); void HandleNetPacketRetrieveAvatar(boost::shared_ptr session, const AvatarRequestMessage &retrieveAvatar); - void HandleNetPacketCreateGame(boost::shared_ptr session, const JoinNewGameMessage &newGame); - void HandleNetPacketJoinGame(boost::shared_ptr session, const JoinExistingGameMessage &joinGame); - void HandleNetPacketRejoinGame(boost::shared_ptr session, const RejoinExistingGameMessage &rejoinGame); + void HandleNetPacketCreateGame(boost::shared_ptr session, const CreateGameMessage &createGame); + void HandleNetPacketJoinGame(boost::shared_ptr session, const JoinGameMessage &joinGame); + void HandleNetPacketRejoinGame(boost::shared_ptr session, const RejoinGameMessage &rejoinGame); void HandleNetPacketChatRequest(boost::shared_ptr session, const ChatRequestMessage &chatRequest); void HandleNetPacketRejectGameInvitation(boost::shared_ptr session, const RejectGameInvitationMessage &reject); void HandleNetPacketReportGame(boost::shared_ptr session, const ReportGameMessage &report); void HandleNetPacketAdminRemoveGame(boost::shared_ptr session, const AdminRemoveGameMessage &removeGame); void HandleNetPacketAdminBanPlayer(boost::shared_ptr session, const AdminBanPlayerMessage &banPlayer); + void HandleNetPacketReportAvatar(boost::shared_ptr session, const ReportAvatarMessage &reportAvatar); + + void AddReportedAvatar(unsigned playerId); + bool IsAvatarReported(unsigned playerId) const; + // TODO would be better to use state pattern here. void AuthChallenge(boost::shared_ptr session, const std::string &secret); void CheckAvatarBlacklist(boost::shared_ptr session); @@ -203,6 +202,7 @@ protected: void CloseSession(boost::shared_ptr session); void SendError(boost::shared_ptr s, int errorCode); + void SendCreateGameFailed(boost::shared_ptr s, unsigned requestId, int reason); void SendJoinGameFailed(boost::shared_ptr s, unsigned gameId, int reason); void SendPlayerList(boost::shared_ptr s); void SendGameList(boost::shared_ptr s); @@ -246,6 +246,9 @@ private: PlayerDataMap m_computerPlayers; mutable boost::mutex m_computerPlayersMutex; + PlayerIdList m_reportedAvatarList; + mutable boost::mutex m_reportedAvatarListMutex; + GameMap m_gameMap; GuiInterface &m_gui; diff --git a/src/net/servermanager.h b/src/net/servermanager.h index 600bc366..1d2355e9 100644 --- a/src/net/servermanager.h +++ b/src/net/servermanager.h @@ -67,10 +67,12 @@ protected: typedef std::list > AcceptHelperList; ServerLobbyThread &GetLobbyThread(); - ConfigFile &GetConfig() { + ConfigFile &GetConfig() + { return m_playerConfig; } - GuiInterface &GetGui() { + GuiInterface &GetGui() + { return m_gui; } boost::shared_ptr m_ioService; diff --git a/src/net/sessiondata.h b/src/net/sessiondata.h index d9b502ac..233b3837 100644 --- a/src/net/sessiondata.h +++ b/src/net/sessiondata.h @@ -60,7 +60,7 @@ class ServerGame; class SessionData : public boost::enable_shared_from_this { public: - enum State { Init = 1, ReceivingAvatar = 2, Established = 4, Game = 8, Spectating = 16, SpectatorWaiting = 32, Closed = 128 }; + enum State { Auth = 1, Init = 2, ReceivingAvatar = 4, Established = 8, Game = 16, Spectating = 32, SpectatorWaiting = 64, Closed = 128 }; SessionData(boost::shared_ptr sock, SessionId id, SessionDataCallback &cb, boost::asio::io_service &ioService); SessionData(boost::shared_ptr webData, SessionId id, SessionDataCallback &cb, boost::asio::io_service &ioService, int filler); @@ -96,19 +96,23 @@ public: const std::string &GetClientAddr() const; void SetClientAddr(const std::string &addr); - ReceiveBuffer &GetReceiveBuffer() { + ReceiveBuffer &GetReceiveBuffer() + { return *m_receiveBuffer; } - SendBuffer &GetSendBuffer() { + SendBuffer &GetSendBuffer() + { return *m_sendBuffer; } - void Close() { + void Close() + { m_callback.CloseSession(shared_from_this()); } void CloseSocketHandle(); void CloseWebSocketHandle(); - void HandlePacket(boost::shared_ptr packet) { + void HandlePacket(boost::shared_ptr packet) + { m_callback.HandlePacket(shared_from_this(), packet); } diff --git a/src/net/socket_msg.h b/src/net/socket_msg.h index 0dcf9e7b..9371144e 100644 --- a/src/net/socket_msg.h +++ b/src/net/socket_msg.h @@ -120,19 +120,22 @@ #define NTF_NET_REMOVED_START_FAILED 207 #define NTF_NET_REMOVED_GAME_CLOSED 208 +// Notifications - create failed +#define NTF_NET_CREATE_GUEST_FORBIDDEN 210 +#define NTF_NET_CREATE_GAME_NAME_IN_USE 211 +#define NTF_NET_CREATE_GAME_BAD_NAME 212 +#define NTF_NET_CREATE_INVALID_SETTINGS 213 + // Notifications - join failed -#define NTF_NET_JOIN_GAME_INVALID 210 -#define NTF_NET_JOIN_GAME_FULL 211 -#define NTF_NET_JOIN_ALREADY_RUNNING 212 -#define NTF_NET_JOIN_INVALID_PASSWORD 213 -#define NTF_NET_JOIN_GUEST_FORBIDDEN 214 -#define NTF_NET_JOIN_NOT_INVITED 215 -#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 -#define NTF_NET_JOIN_REJOIN_FAILED 220 -#define NTF_NET_JOIN_NO_SPECTATORS 221 +#define NTF_NET_JOIN_GAME_INVALID 220 +#define NTF_NET_JOIN_GAME_FULL 221 +#define NTF_NET_JOIN_ALREADY_RUNNING 222 +#define NTF_NET_JOIN_GUEST_FORBIDDEN 223 +#define NTF_NET_JOIN_INVALID_PASSWORD 224 +#define NTF_NET_JOIN_NOT_INVITED 225 +#define NTF_NET_JOIN_IP_BLOCKED 226 +#define NTF_NET_JOIN_REJOIN_FAILED 227 +#define NTF_NET_JOIN_NO_SPECTATORS 228 // Notifications - version #define NTF_NET_NEW_RELEASE_AVAILABLE 231 diff --git a/src/net/validation/authmessagevalidator.h b/src/net/validation/authmessagevalidator.h index 3ae047e2..47b0e542 100644 --- a/src/net/validation/authmessagevalidator.h +++ b/src/net/validation/authmessagevalidator.h @@ -28,114 +28,30 @@ * shall include the source code for the parts of OpenSSL used as well * * as that of the covered work. * *****************************************************************************/ -/* PokerTH network packet validation. */ +/* PokerTH authentication message validation. */ -#ifndef _NETPACKETVALIDATOR_H_ -#define _NETPACKETVALIDATOR_H_ +#ifndef _AUTHMESSAGEVALIDATOR_H_ +#define _AUTHMESSAGEVALIDATOR_H_ #include +#include -class NetPacket; -class NetGameInfo; +class AuthMessage; -class NetPacketValidator +class AuthMessageValidator { public: - NetPacketValidator(); + AuthMessageValidator(); - bool IsValidPacket(const NetPacket &packet) const; + bool IsValidMessage(const AuthMessage &msg) const; protected: - static bool ValidateAnnounceMessage(const NetPacket &packet); - static bool ValidateAuthMessage(const NetPacket &packet); - static bool ValidateLobbyMessage(const NetPacket &packet); - static bool ValidateGameMessage(const NetPacket &packet); - static bool ValidateGameManagementMessage(const NetPacket &packet); - static bool ValidateGameEngineMessage(const NetPacket &packet); - static bool ValidateInitMessage(const NetPacket &packet); - static bool ValidateAuthServerChallengeMessage(const NetPacket &packet); - static bool ValidateAuthClientResponseMessage(const NetPacket &packet); - static bool ValidateAuthServerVerificationMessage(const NetPacket &packet); - static bool ValidateInitAckMessage(const NetPacket &packet); - static bool ValidateAvatarRequestMessage(const NetPacket &packet); - static bool ValidateAvatarHeaderMessage(const NetPacket &packet); - static bool ValidateAvatarDataMessage(const NetPacket &packet); - static bool ValidateAvatarEndMessage(const NetPacket &packet); - static bool ValidateUnknownAvatarMessage(const NetPacket &packet); - static bool ValidatePlayerListMessage(const NetPacket &packet); - static bool ValidateGameListNewMessage(const NetPacket &packet); - static bool ValidateGameListUpdateMessage(const NetPacket &packet); - static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameListAdminChangedMessage(const NetPacket &packet); - static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet); - static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet); - static bool ValidateSubscriptionRequestMessage(const NetPacket &packet); - static bool ValidateCreateGameMessage(const NetPacket &packet); - static bool ValidateJoinGameMessage(const NetPacket &packet); - static bool ValidateRejoinGameMessage(const NetPacket &packet); - static bool ValidateJoinGameAckMessage(const NetPacket &packet); - static bool ValidateJoinGameFailedMessage(const NetPacket &packet); - static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGamePlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameAdminChangedMessage(const NetPacket &packet); - static bool ValidateRemovedFromGameMessage(const NetPacket &packet); - static bool ValidateKickPlayerRequestMessage(const NetPacket &packet); - static bool ValidateLeaveGameRequestMessage(const NetPacket &packet); - static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet); - static bool ValidateInviteNotifyMessage(const NetPacket &packet); - static bool ValidateRejectGameInvitationMessage(const NetPacket &packet); - static bool ValidateRejectInvNotifyMessage(const NetPacket &packet); - static bool ValidateStartEventMessage(const NetPacket &packet); - static bool ValidateStartEventAckMessage(const NetPacket &packet); - static bool ValidateGameStartInitialMessage(const NetPacket &packet); - static bool ValidateGameStartRejoinMessage(const NetPacket &packet); - static bool ValidateHandStartMessage(const NetPacket &packet); - static bool ValidatePlayersTurnMessage(const NetPacket &packet); - static bool ValidateMyActionRequestMessage(const NetPacket &packet); - static bool ValidateYourActionRejectedMessage(const NetPacket &packet); - static bool ValidatePlayersActionDoneMessage(const NetPacket &packet); - static bool ValidateDealFlopCardsMessage(const NetPacket &packet); - static bool ValidateDealTurnCardMessage(const NetPacket &packet); - static bool ValidateDealRiverCardMessage(const NetPacket &packet); - static bool ValidateAllInShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet); - static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet); - static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfGameMessage(const NetPacket &packet); - static bool ValidatePlayerIdChangedMessage(const NetPacket &packet); - static bool ValidateAskKickPlayerMessage(const NetPacket &packet); - static bool ValidateAskKickDeniedMessage(const NetPacket &packet); - static bool ValidateStartKickPetitionMessage(const NetPacket &packet); - static bool ValidateVoteKickRequestMessage(const NetPacket &packet); - static bool ValidateVoteKickReplyMessage(const NetPacket &packet); - static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet); - static bool ValidateEndKickPetitionMessage(const NetPacket &packet); - static bool ValidateStatisticsMessage(const NetPacket &packet); - static bool ValidateChatRequestMessage(const NetPacket &packet); - static bool ValidateChatMessage(const NetPacket &packet); - static bool ValidateChatRejectMessage(const NetPacket &packet); - static bool ValidateDialogMessage(const NetPacket &packet); - static bool ValidateTimeoutWarningMessage(const NetPacket &packet); - static bool ValidateResetTimeoutMessage(const NetPacket &packet); - static bool ValidateReportAvatarMessage(const NetPacket &packet); - static bool ValidateReportAvatarAckMessage(const NetPacket &packet); - static bool ValidateReportGameMessage(const NetPacket &packet); - static bool ValidateReportGameAckMessage(const NetPacket &packet); - static bool ValidateErrorMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet); - static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet); + static bool ValidateAuthClientRequestMessage(const AuthMessage &msg); + static bool ValidateAuthServerChallengeMessage(const AuthMessage &msg); + static bool ValidateAuthClientResponseMessage(const AuthMessage &msg); + static bool ValidateAuthServerVerificationMessage(const AuthMessage &msg); - static bool ValidateGameInfo(const NetGameInfo &gameInfo); - - typedef bool (*ValidateFunctor)(const NetPacket &); + typedef boost::function ValidateFunctor; typedef std::map ValidateFunctorMap; private: diff --git a/src/net/validation/gameenginemessagevalidator.h b/src/net/validation/gameenginemessagevalidator.h index 3ae047e2..a2fd965b 100644 --- a/src/net/validation/gameenginemessagevalidator.h +++ b/src/net/validation/gameenginemessagevalidator.h @@ -28,114 +28,39 @@ * shall include the source code for the parts of OpenSSL used as well * * as that of the covered work. * *****************************************************************************/ -/* PokerTH network packet validation. */ +/* PokerTH game engine message validation. */ -#ifndef _NETPACKETVALIDATOR_H_ -#define _NETPACKETVALIDATOR_H_ +#ifndef _GAMEENGINEMESSAGEVALIDATOR_H_ +#define _GAMEENGINEMESSAGEVALIDATOR_H_ #include +#include -class NetPacket; -class NetGameInfo; +class GameEngineMessage; -class NetPacketValidator +class GameEngineMessageValidator { public: - NetPacketValidator(); + GameEngineMessageValidator(); - bool IsValidPacket(const NetPacket &packet) const; + bool IsValidMessage(const GameEngineMessage &msg) const; protected: - static bool ValidateAnnounceMessage(const NetPacket &packet); - static bool ValidateAuthMessage(const NetPacket &packet); - static bool ValidateLobbyMessage(const NetPacket &packet); - static bool ValidateGameMessage(const NetPacket &packet); - static bool ValidateGameManagementMessage(const NetPacket &packet); - static bool ValidateGameEngineMessage(const NetPacket &packet); - static bool ValidateInitMessage(const NetPacket &packet); - static bool ValidateAuthServerChallengeMessage(const NetPacket &packet); - static bool ValidateAuthClientResponseMessage(const NetPacket &packet); - static bool ValidateAuthServerVerificationMessage(const NetPacket &packet); - static bool ValidateInitAckMessage(const NetPacket &packet); - static bool ValidateAvatarRequestMessage(const NetPacket &packet); - static bool ValidateAvatarHeaderMessage(const NetPacket &packet); - static bool ValidateAvatarDataMessage(const NetPacket &packet); - static bool ValidateAvatarEndMessage(const NetPacket &packet); - static bool ValidateUnknownAvatarMessage(const NetPacket &packet); - static bool ValidatePlayerListMessage(const NetPacket &packet); - static bool ValidateGameListNewMessage(const NetPacket &packet); - static bool ValidateGameListUpdateMessage(const NetPacket &packet); - static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameListAdminChangedMessage(const NetPacket &packet); - static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet); - static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet); - static bool ValidateSubscriptionRequestMessage(const NetPacket &packet); - static bool ValidateCreateGameMessage(const NetPacket &packet); - static bool ValidateJoinGameMessage(const NetPacket &packet); - static bool ValidateRejoinGameMessage(const NetPacket &packet); - static bool ValidateJoinGameAckMessage(const NetPacket &packet); - static bool ValidateJoinGameFailedMessage(const NetPacket &packet); - static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGamePlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameAdminChangedMessage(const NetPacket &packet); - static bool ValidateRemovedFromGameMessage(const NetPacket &packet); - static bool ValidateKickPlayerRequestMessage(const NetPacket &packet); - static bool ValidateLeaveGameRequestMessage(const NetPacket &packet); - static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet); - static bool ValidateInviteNotifyMessage(const NetPacket &packet); - static bool ValidateRejectGameInvitationMessage(const NetPacket &packet); - static bool ValidateRejectInvNotifyMessage(const NetPacket &packet); - static bool ValidateStartEventMessage(const NetPacket &packet); - static bool ValidateStartEventAckMessage(const NetPacket &packet); - static bool ValidateGameStartInitialMessage(const NetPacket &packet); - static bool ValidateGameStartRejoinMessage(const NetPacket &packet); - static bool ValidateHandStartMessage(const NetPacket &packet); - static bool ValidatePlayersTurnMessage(const NetPacket &packet); - static bool ValidateMyActionRequestMessage(const NetPacket &packet); - static bool ValidateYourActionRejectedMessage(const NetPacket &packet); - static bool ValidatePlayersActionDoneMessage(const NetPacket &packet); - static bool ValidateDealFlopCardsMessage(const NetPacket &packet); - static bool ValidateDealTurnCardMessage(const NetPacket &packet); - static bool ValidateDealRiverCardMessage(const NetPacket &packet); - static bool ValidateAllInShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet); - static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet); - static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfGameMessage(const NetPacket &packet); - static bool ValidatePlayerIdChangedMessage(const NetPacket &packet); - static bool ValidateAskKickPlayerMessage(const NetPacket &packet); - static bool ValidateAskKickDeniedMessage(const NetPacket &packet); - static bool ValidateStartKickPetitionMessage(const NetPacket &packet); - static bool ValidateVoteKickRequestMessage(const NetPacket &packet); - static bool ValidateVoteKickReplyMessage(const NetPacket &packet); - static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet); - static bool ValidateEndKickPetitionMessage(const NetPacket &packet); - static bool ValidateStatisticsMessage(const NetPacket &packet); - static bool ValidateChatRequestMessage(const NetPacket &packet); - static bool ValidateChatMessage(const NetPacket &packet); - static bool ValidateChatRejectMessage(const NetPacket &packet); - static bool ValidateDialogMessage(const NetPacket &packet); - static bool ValidateTimeoutWarningMessage(const NetPacket &packet); - static bool ValidateResetTimeoutMessage(const NetPacket &packet); - static bool ValidateReportAvatarMessage(const NetPacket &packet); - static bool ValidateReportAvatarAckMessage(const NetPacket &packet); - static bool ValidateReportGameMessage(const NetPacket &packet); - static bool ValidateReportGameAckMessage(const NetPacket &packet); - static bool ValidateErrorMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet); - static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet); + static bool ValidateHandStartMessage(const GameEngineMessage &msg); + static bool ValidatePlayersTurnMessage(const GameEngineMessage &msg); + static bool ValidateMyActionRequestMessage(const GameEngineMessage &msg); + static bool ValidateYourActionRejectedMessage(const GameEngineMessage &msg); + static bool ValidatePlayersActionDoneMessage(const GameEngineMessage &msg); + static bool ValidateDealFlopCardsMessage(const GameEngineMessage &msg); + static bool ValidateDealTurnCardMessage(const GameEngineMessage &msg); + static bool ValidateDealRiverCardMessage(const GameEngineMessage &msg); + static bool ValidateAllInShowCardsMessage(const GameEngineMessage &msg); + static bool ValidateEndOfHandShowCardsMessage(const GameEngineMessage &msg); + static bool ValidateEndOfHandHideCardsMessage(const GameEngineMessage &msg); + static bool ValidateShowMyCardsRequestMessage(const GameEngineMessage &msg); + static bool ValidateAfterHandShowCardsMessage(const GameEngineMessage &msg); - static bool ValidateGameInfo(const NetGameInfo &gameInfo); - - typedef bool (*ValidateFunctor)(const NetPacket &); + typedef boost::function ValidateFunctor; typedef std::map ValidateFunctorMap; private: diff --git a/src/net/validation/gamemanagementmessagevalidator.h b/src/net/validation/gamemanagementmessagevalidator.h index 3ae047e2..edf06419 100644 --- a/src/net/validation/gamemanagementmessagevalidator.h +++ b/src/net/validation/gamemanagementmessagevalidator.h @@ -28,114 +28,56 @@ * shall include the source code for the parts of OpenSSL used as well * * as that of the covered work. * *****************************************************************************/ -/* PokerTH network packet validation. */ +/* PokerTH game management message validation. */ -#ifndef _NETPACKETVALIDATOR_H_ -#define _NETPACKETVALIDATOR_H_ +#ifndef _GAMEMANAGEMENTMESSAGEVALIDATOR_H_ +#define _GAMEMANAGEMENTMESSAGEVALIDATOR_H_ #include +#include -class NetPacket; -class NetGameInfo; +class GameManagementMessage; -class NetPacketValidator +class GameManagementMessageValidator { public: - NetPacketValidator(); + GameManagementMessageValidator(); - bool IsValidPacket(const NetPacket &packet) const; + bool IsValidMessage(const GameManagementMessage &msg) const; protected: - static bool ValidateAnnounceMessage(const NetPacket &packet); - static bool ValidateAuthMessage(const NetPacket &packet); - static bool ValidateLobbyMessage(const NetPacket &packet); - static bool ValidateGameMessage(const NetPacket &packet); - static bool ValidateGameManagementMessage(const NetPacket &packet); - static bool ValidateGameEngineMessage(const NetPacket &packet); - static bool ValidateInitMessage(const NetPacket &packet); - static bool ValidateAuthServerChallengeMessage(const NetPacket &packet); - static bool ValidateAuthClientResponseMessage(const NetPacket &packet); - static bool ValidateAuthServerVerificationMessage(const NetPacket &packet); - static bool ValidateInitAckMessage(const NetPacket &packet); - static bool ValidateAvatarRequestMessage(const NetPacket &packet); - static bool ValidateAvatarHeaderMessage(const NetPacket &packet); - static bool ValidateAvatarDataMessage(const NetPacket &packet); - static bool ValidateAvatarEndMessage(const NetPacket &packet); - static bool ValidateUnknownAvatarMessage(const NetPacket &packet); - static bool ValidatePlayerListMessage(const NetPacket &packet); - static bool ValidateGameListNewMessage(const NetPacket &packet); - static bool ValidateGameListUpdateMessage(const NetPacket &packet); - static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameListAdminChangedMessage(const NetPacket &packet); - static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet); - static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet); - static bool ValidateSubscriptionRequestMessage(const NetPacket &packet); - static bool ValidateCreateGameMessage(const NetPacket &packet); - static bool ValidateJoinGameMessage(const NetPacket &packet); - static bool ValidateRejoinGameMessage(const NetPacket &packet); - static bool ValidateJoinGameAckMessage(const NetPacket &packet); - static bool ValidateJoinGameFailedMessage(const NetPacket &packet); - static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGamePlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameAdminChangedMessage(const NetPacket &packet); - static bool ValidateRemovedFromGameMessage(const NetPacket &packet); - static bool ValidateKickPlayerRequestMessage(const NetPacket &packet); - static bool ValidateLeaveGameRequestMessage(const NetPacket &packet); - static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet); - static bool ValidateInviteNotifyMessage(const NetPacket &packet); - static bool ValidateRejectGameInvitationMessage(const NetPacket &packet); - static bool ValidateRejectInvNotifyMessage(const NetPacket &packet); - static bool ValidateStartEventMessage(const NetPacket &packet); - static bool ValidateStartEventAckMessage(const NetPacket &packet); - static bool ValidateGameStartInitialMessage(const NetPacket &packet); - static bool ValidateGameStartRejoinMessage(const NetPacket &packet); - static bool ValidateHandStartMessage(const NetPacket &packet); - static bool ValidatePlayersTurnMessage(const NetPacket &packet); - static bool ValidateMyActionRequestMessage(const NetPacket &packet); - static bool ValidateYourActionRejectedMessage(const NetPacket &packet); - static bool ValidatePlayersActionDoneMessage(const NetPacket &packet); - static bool ValidateDealFlopCardsMessage(const NetPacket &packet); - static bool ValidateDealTurnCardMessage(const NetPacket &packet); - static bool ValidateDealRiverCardMessage(const NetPacket &packet); - static bool ValidateAllInShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet); - static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet); - static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfGameMessage(const NetPacket &packet); - static bool ValidatePlayerIdChangedMessage(const NetPacket &packet); - static bool ValidateAskKickPlayerMessage(const NetPacket &packet); - static bool ValidateAskKickDeniedMessage(const NetPacket &packet); - static bool ValidateStartKickPetitionMessage(const NetPacket &packet); - static bool ValidateVoteKickRequestMessage(const NetPacket &packet); - static bool ValidateVoteKickReplyMessage(const NetPacket &packet); - static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet); - static bool ValidateEndKickPetitionMessage(const NetPacket &packet); - static bool ValidateStatisticsMessage(const NetPacket &packet); - static bool ValidateChatRequestMessage(const NetPacket &packet); - static bool ValidateChatMessage(const NetPacket &packet); - static bool ValidateChatRejectMessage(const NetPacket &packet); - static bool ValidateDialogMessage(const NetPacket &packet); - static bool ValidateTimeoutWarningMessage(const NetPacket &packet); - static bool ValidateResetTimeoutMessage(const NetPacket &packet); - static bool ValidateReportAvatarMessage(const NetPacket &packet); - static bool ValidateReportAvatarAckMessage(const NetPacket &packet); - static bool ValidateReportGameMessage(const NetPacket &packet); - static bool ValidateReportGameAckMessage(const NetPacket &packet); - static bool ValidateErrorMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet); - static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet); + static bool ValidateJoinGameMessage(const GameManagementMessage &msg); + static bool ValidateRejoinGameMessage(const GameManagementMessage &msg); + static bool ValidateJoinGameAckMessage(const GameManagementMessage &msg); + static bool ValidateJoinGameFailedMessage(const GameManagementMessage &msg); + static bool ValidateGamePlayerJoinedMessage(const GameManagementMessage &msg); + static bool ValidateGamePlayerLeftMessage(const GameManagementMessage &msg); + static bool ValidateGameSpectatorJoinedMessage(const GameManagementMessage &msg); + static bool ValidateGameSpectatorLeftMessage(const GameManagementMessage &msg); + static bool ValidateGameAdminChangedMessage(const GameManagementMessage &msg); + static bool ValidateRemovedFromGameMessage(const GameManagementMessage &msg); + static bool ValidateKickPlayerRequestMessage(const GameManagementMessage &msg); + static bool ValidateLeaveGameRequestMessage(const GameManagementMessage &msg); + static bool ValidateInvitePlayerToGameMessage(const GameManagementMessage &msg); + static bool ValidateStartEventMessage(const GameManagementMessage &msg); + static bool ValidateStartEventAckMessage(const GameManagementMessage &msg); + static bool ValidateGameStartInitialMessage(const GameManagementMessage &msg); + static bool ValidateGameStartRejoinMessage(const GameManagementMessage &msg); + static bool ValidateEndOfGameMessage(const GameManagementMessage &msg); + static bool ValidatePlayerIdChangedMessage(const GameManagementMessage &msg); + static bool ValidateAskKickPlayerMessage(const GameManagementMessage &msg); + static bool ValidateAskKickDeniedMessage(const GameManagementMessage &msg); + static bool ValidateStartKickPetitionMessage(const GameManagementMessage &msg); + static bool ValidateVoteKickRequestMessage(const GameManagementMessage &msg); + static bool ValidateVoteKickReplyMessage(const GameManagementMessage &msg); + static bool ValidateKickPetitionUpdateMessage(const GameManagementMessage &msg); + static bool ValidateEndKickPetitionMessage(const GameManagementMessage &msg); + static bool ValidateChatRequestMessage(const GameManagementMessage &msg); + static bool ValidateChatMessage(const GameManagementMessage &msg); + static bool ValidateChatRejectMessage(const GameManagementMessage &msg); + static bool ValidateErrorMessage(const GameManagementMessage &msg); - static bool ValidateGameInfo(const NetGameInfo &gameInfo); - - typedef bool (*ValidateFunctor)(const NetPacket &); + typedef boost::function ValidateFunctor; typedef std::map ValidateFunctorMap; private: diff --git a/src/net/validation/gamemessagevalidator.h b/src/net/validation/gamemessagevalidator.h index 3ae047e2..af85927f 100644 --- a/src/net/validation/gamemessagevalidator.h +++ b/src/net/validation/gamemessagevalidator.h @@ -28,118 +28,37 @@ * shall include the source code for the parts of OpenSSL used as well * * as that of the covered work. * *****************************************************************************/ -/* PokerTH network packet validation. */ +/* PokerTH game message validation. */ -#ifndef _NETPACKETVALIDATOR_H_ -#define _NETPACKETVALIDATOR_H_ +#ifndef _GAMEMESSAGEVALIDATOR_H_ +#define _GAMEMESSAGEVALIDATOR_H_ #include +#include +#include -class NetPacket; -class NetGameInfo; +class GameMessage; +class GameManagementMessageValidator; +class GameEngineMessageValidator; -class NetPacketValidator +class GameMessageValidator { public: - NetPacketValidator(); + GameMessageValidator(); - bool IsValidPacket(const NetPacket &packet) const; + bool IsValidMessage(const GameMessage &msg) const; protected: - static bool ValidateAnnounceMessage(const NetPacket &packet); - static bool ValidateAuthMessage(const NetPacket &packet); - static bool ValidateLobbyMessage(const NetPacket &packet); - static bool ValidateGameMessage(const NetPacket &packet); - static bool ValidateGameManagementMessage(const NetPacket &packet); - static bool ValidateGameEngineMessage(const NetPacket &packet); - static bool ValidateInitMessage(const NetPacket &packet); - static bool ValidateAuthServerChallengeMessage(const NetPacket &packet); - static bool ValidateAuthClientResponseMessage(const NetPacket &packet); - static bool ValidateAuthServerVerificationMessage(const NetPacket &packet); - static bool ValidateInitAckMessage(const NetPacket &packet); - static bool ValidateAvatarRequestMessage(const NetPacket &packet); - static bool ValidateAvatarHeaderMessage(const NetPacket &packet); - static bool ValidateAvatarDataMessage(const NetPacket &packet); - static bool ValidateAvatarEndMessage(const NetPacket &packet); - static bool ValidateUnknownAvatarMessage(const NetPacket &packet); - static bool ValidatePlayerListMessage(const NetPacket &packet); - static bool ValidateGameListNewMessage(const NetPacket &packet); - static bool ValidateGameListUpdateMessage(const NetPacket &packet); - static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameListAdminChangedMessage(const NetPacket &packet); - static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet); - static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet); - static bool ValidateSubscriptionRequestMessage(const NetPacket &packet); - static bool ValidateCreateGameMessage(const NetPacket &packet); - static bool ValidateJoinGameMessage(const NetPacket &packet); - static bool ValidateRejoinGameMessage(const NetPacket &packet); - static bool ValidateJoinGameAckMessage(const NetPacket &packet); - static bool ValidateJoinGameFailedMessage(const NetPacket &packet); - static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGamePlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameAdminChangedMessage(const NetPacket &packet); - static bool ValidateRemovedFromGameMessage(const NetPacket &packet); - static bool ValidateKickPlayerRequestMessage(const NetPacket &packet); - static bool ValidateLeaveGameRequestMessage(const NetPacket &packet); - static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet); - static bool ValidateInviteNotifyMessage(const NetPacket &packet); - static bool ValidateRejectGameInvitationMessage(const NetPacket &packet); - static bool ValidateRejectInvNotifyMessage(const NetPacket &packet); - static bool ValidateStartEventMessage(const NetPacket &packet); - static bool ValidateStartEventAckMessage(const NetPacket &packet); - static bool ValidateGameStartInitialMessage(const NetPacket &packet); - static bool ValidateGameStartRejoinMessage(const NetPacket &packet); - static bool ValidateHandStartMessage(const NetPacket &packet); - static bool ValidatePlayersTurnMessage(const NetPacket &packet); - static bool ValidateMyActionRequestMessage(const NetPacket &packet); - static bool ValidateYourActionRejectedMessage(const NetPacket &packet); - static bool ValidatePlayersActionDoneMessage(const NetPacket &packet); - static bool ValidateDealFlopCardsMessage(const NetPacket &packet); - static bool ValidateDealTurnCardMessage(const NetPacket &packet); - static bool ValidateDealRiverCardMessage(const NetPacket &packet); - static bool ValidateAllInShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet); - static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet); - static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfGameMessage(const NetPacket &packet); - static bool ValidatePlayerIdChangedMessage(const NetPacket &packet); - static bool ValidateAskKickPlayerMessage(const NetPacket &packet); - static bool ValidateAskKickDeniedMessage(const NetPacket &packet); - static bool ValidateStartKickPetitionMessage(const NetPacket &packet); - static bool ValidateVoteKickRequestMessage(const NetPacket &packet); - static bool ValidateVoteKickReplyMessage(const NetPacket &packet); - static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet); - static bool ValidateEndKickPetitionMessage(const NetPacket &packet); - static bool ValidateStatisticsMessage(const NetPacket &packet); - static bool ValidateChatRequestMessage(const NetPacket &packet); - static bool ValidateChatMessage(const NetPacket &packet); - static bool ValidateChatRejectMessage(const NetPacket &packet); - static bool ValidateDialogMessage(const NetPacket &packet); - static bool ValidateTimeoutWarningMessage(const NetPacket &packet); - static bool ValidateResetTimeoutMessage(const NetPacket &packet); - static bool ValidateReportAvatarMessage(const NetPacket &packet); - static bool ValidateReportAvatarAckMessage(const NetPacket &packet); - static bool ValidateReportGameMessage(const NetPacket &packet); - static bool ValidateReportGameAckMessage(const NetPacket &packet); - static bool ValidateErrorMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet); - static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet); + bool ValidateGameManagementMessage(const GameMessage &msg); + bool ValidateGameEngineMessage(const GameMessage &msg); - static bool ValidateGameInfo(const NetGameInfo &gameInfo); - - typedef bool (*ValidateFunctor)(const NetPacket &); + typedef boost::function ValidateFunctor; typedef std::map ValidateFunctorMap; private: ValidateFunctorMap m_validationMap; + boost::shared_ptr m_managementValidator; + boost::shared_ptr m_engineValidator; }; #endif diff --git a/src/net/validation/lobbymessagevalidator.h b/src/net/validation/lobbymessagevalidator.h index 3ae047e2..fbb78064 100644 --- a/src/net/validation/lobbymessagevalidator.h +++ b/src/net/validation/lobbymessagevalidator.h @@ -28,114 +28,72 @@ * shall include the source code for the parts of OpenSSL used as well * * as that of the covered work. * *****************************************************************************/ -/* PokerTH network packet validation. */ +/* PokerTH lobby message validation. */ -#ifndef _NETPACKETVALIDATOR_H_ -#define _NETPACKETVALIDATOR_H_ +#ifndef _LOBBYMESSAGEVALIDATOR_H_ +#define _LOBBYMESSAGEVALIDATOR_H_ #include +#include -class NetPacket; +class LobbyMessage; class NetGameInfo; -class NetPacketValidator +class LobbyMessageValidator { public: - NetPacketValidator(); + LobbyMessageValidator(); - bool IsValidPacket(const NetPacket &packet) const; + bool IsValidMessage(const LobbyMessage &msg) const; protected: - static bool ValidateAnnounceMessage(const NetPacket &packet); - static bool ValidateAuthMessage(const NetPacket &packet); - static bool ValidateLobbyMessage(const NetPacket &packet); - static bool ValidateGameMessage(const NetPacket &packet); - static bool ValidateGameManagementMessage(const NetPacket &packet); - static bool ValidateGameEngineMessage(const NetPacket &packet); - static bool ValidateInitMessage(const NetPacket &packet); - static bool ValidateAuthServerChallengeMessage(const NetPacket &packet); - static bool ValidateAuthClientResponseMessage(const NetPacket &packet); - static bool ValidateAuthServerVerificationMessage(const NetPacket &packet); - static bool ValidateInitAckMessage(const NetPacket &packet); - static bool ValidateAvatarRequestMessage(const NetPacket &packet); - static bool ValidateAvatarHeaderMessage(const NetPacket &packet); - static bool ValidateAvatarDataMessage(const NetPacket &packet); - static bool ValidateAvatarEndMessage(const NetPacket &packet); - static bool ValidateUnknownAvatarMessage(const NetPacket &packet); - static bool ValidatePlayerListMessage(const NetPacket &packet); - static bool ValidateGameListNewMessage(const NetPacket &packet); - static bool ValidateGameListUpdateMessage(const NetPacket &packet); - static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameListAdminChangedMessage(const NetPacket &packet); - static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet); - static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet); - static bool ValidateSubscriptionRequestMessage(const NetPacket &packet); - static bool ValidateCreateGameMessage(const NetPacket &packet); - static bool ValidateJoinGameMessage(const NetPacket &packet); - static bool ValidateRejoinGameMessage(const NetPacket &packet); - static bool ValidateJoinGameAckMessage(const NetPacket &packet); - static bool ValidateJoinGameFailedMessage(const NetPacket &packet); - static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGamePlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameAdminChangedMessage(const NetPacket &packet); - static bool ValidateRemovedFromGameMessage(const NetPacket &packet); - static bool ValidateKickPlayerRequestMessage(const NetPacket &packet); - static bool ValidateLeaveGameRequestMessage(const NetPacket &packet); - static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet); - static bool ValidateInviteNotifyMessage(const NetPacket &packet); - static bool ValidateRejectGameInvitationMessage(const NetPacket &packet); - static bool ValidateRejectInvNotifyMessage(const NetPacket &packet); - static bool ValidateStartEventMessage(const NetPacket &packet); - static bool ValidateStartEventAckMessage(const NetPacket &packet); - static bool ValidateGameStartInitialMessage(const NetPacket &packet); - static bool ValidateGameStartRejoinMessage(const NetPacket &packet); - static bool ValidateHandStartMessage(const NetPacket &packet); - static bool ValidatePlayersTurnMessage(const NetPacket &packet); - static bool ValidateMyActionRequestMessage(const NetPacket &packet); - static bool ValidateYourActionRejectedMessage(const NetPacket &packet); - static bool ValidatePlayersActionDoneMessage(const NetPacket &packet); - static bool ValidateDealFlopCardsMessage(const NetPacket &packet); - static bool ValidateDealTurnCardMessage(const NetPacket &packet); - static bool ValidateDealRiverCardMessage(const NetPacket &packet); - static bool ValidateAllInShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet); - static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet); - static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfGameMessage(const NetPacket &packet); - static bool ValidatePlayerIdChangedMessage(const NetPacket &packet); - static bool ValidateAskKickPlayerMessage(const NetPacket &packet); - static bool ValidateAskKickDeniedMessage(const NetPacket &packet); - static bool ValidateStartKickPetitionMessage(const NetPacket &packet); - static bool ValidateVoteKickRequestMessage(const NetPacket &packet); - static bool ValidateVoteKickReplyMessage(const NetPacket &packet); - static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet); - static bool ValidateEndKickPetitionMessage(const NetPacket &packet); - static bool ValidateStatisticsMessage(const NetPacket &packet); - static bool ValidateChatRequestMessage(const NetPacket &packet); - static bool ValidateChatMessage(const NetPacket &packet); - static bool ValidateChatRejectMessage(const NetPacket &packet); - static bool ValidateDialogMessage(const NetPacket &packet); - static bool ValidateTimeoutWarningMessage(const NetPacket &packet); - static bool ValidateResetTimeoutMessage(const NetPacket &packet); - static bool ValidateReportAvatarMessage(const NetPacket &packet); - static bool ValidateReportAvatarAckMessage(const NetPacket &packet); - static bool ValidateReportGameMessage(const NetPacket &packet); - static bool ValidateReportGameAckMessage(const NetPacket &packet); - static bool ValidateErrorMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet); - static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet); + static bool ValidateInitDoneMessage(const LobbyMessage &msg); + static bool ValidateAvatarRequestMessage(const LobbyMessage &msg); + static bool ValidateAvatarHeaderMessage(const LobbyMessage &msg); + static bool ValidateAvatarDataMessage(const LobbyMessage &msg); + static bool ValidateAvatarEndMessage(const LobbyMessage &msg); + static bool ValidateUnknownAvatarMessage(const LobbyMessage &msg); + static bool ValidatePlayerListMessage(const LobbyMessage &msg); + static bool ValidateGameListNewMessage(const LobbyMessage &msg); + static bool ValidateGameListUpdateMessage(const LobbyMessage &msg); + static bool ValidateGameListPlayerJoinedMessage(const LobbyMessage &msg); + static bool ValidateGameListPlayerLeftMessage(const LobbyMessage &msg); + static bool ValidateGameListSpectatorJoinedMessage(const LobbyMessage &msg); + static bool ValidateGameListSpectatorLeftMessage(const LobbyMessage &msg); + static bool ValidateGameListAdminChangedMessage(const LobbyMessage &msg); + static bool ValidatePlayerInfoRequestMessage(const LobbyMessage &msg); + static bool ValidatePlayerInfoReplyMessage(const LobbyMessage &msg); + static bool ValidateSubscriptionRequestMessage(const LobbyMessage &msg); + static bool ValidateSubscriptionReplyMessage(const LobbyMessage &msg); + static bool ValidateCreateGameMessage(const LobbyMessage &msg); + static bool ValidateCreateGameFailedMessage(const LobbyMessage &msg); + static bool ValidateJoinGameMessage(const LobbyMessage &msg); + static bool ValidateRejoinGameMessage(const LobbyMessage &msg); + static bool ValidateJoinGameAckMessage(const LobbyMessage &msg); + static bool ValidateJoinGameFailedMessage(const LobbyMessage &msg); + static bool ValidateInviteNotifyMessage(const LobbyMessage &msg); + static bool ValidateRejectGameInvitationMessage(const LobbyMessage &msg); + static bool ValidateRejectInvNotifyMessage(const LobbyMessage &msg); + static bool ValidateStatisticsMessage(const LobbyMessage &msg); + static bool ValidateChatRequestMessage(const LobbyMessage &msg); + static bool ValidateChatMessage(const LobbyMessage &msg); + static bool ValidateChatRejectMessage(const LobbyMessage &msg); + static bool ValidateDialogMessage(const LobbyMessage &msg); + static bool ValidateTimeoutWarningMessage(const LobbyMessage &msg); + static bool ValidateResetTimeoutMessage(const LobbyMessage &msg); + static bool ValidateReportAvatarMessage(const LobbyMessage &msg); + static bool ValidateReportAvatarAckMessage(const LobbyMessage &msg); + static bool ValidateReportGameMessage(const LobbyMessage &msg); + static bool ValidateReportGameAckMessage(const LobbyMessage &msg); + static bool ValidateAdminRemoveGameMessage(const LobbyMessage &msg); + static bool ValidateAdminRemoveGameAckMessage(const LobbyMessage &msg); + static bool ValidateAdminBanPlayerMessage(const LobbyMessage &msg); + static bool ValidateAdminBanPlayerAckMessage(const LobbyMessage &msg); + static bool ValidateErrorMessage(const LobbyMessage &msg); static bool ValidateGameInfo(const NetGameInfo &gameInfo); - typedef bool (*ValidateFunctor)(const NetPacket &); + typedef boost::function ValidateFunctor; typedef std::map ValidateFunctorMap; private: diff --git a/src/net/validation/pokerthmessagevalidator.h b/src/net/validation/pokerthmessagevalidator.h index 3ae047e2..085a969e 100644 --- a/src/net/validation/pokerthmessagevalidator.h +++ b/src/net/validation/pokerthmessagevalidator.h @@ -30,116 +30,45 @@ *****************************************************************************/ /* PokerTH network packet validation. */ -#ifndef _NETPACKETVALIDATOR_H_ -#define _NETPACKETVALIDATOR_H_ +#ifndef _POKERTHMESSAGEVALIDATOR_H_ +#define _POKERTHMESSAGEVALIDATOR_H_ #include +#include +#include -class NetPacket; -class NetGameInfo; +class PokerTHMessage; +class AuthMessageValidator; +class LobbyMessageValidator; +class GameMessageValidator; -class NetPacketValidator +#define VALIDATE_IS_UINT16(__val) ((__val) <= 65535) +#define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize)) +#define VALIDATE_UINT_RANGE(__val, __minval, __maxval) ((__val) >= (__minval) && (__val) <= (__maxval)) +#define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval)) +#define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize)) + +class PokerTHMessageValidator { public: - NetPacketValidator(); + PokerTHMessageValidator(); - bool IsValidPacket(const NetPacket &packet) const; + bool IsValidMessage(const PokerTHMessage &msg) const; protected: - static bool ValidateAnnounceMessage(const NetPacket &packet); - static bool ValidateAuthMessage(const NetPacket &packet); - static bool ValidateLobbyMessage(const NetPacket &packet); - static bool ValidateGameMessage(const NetPacket &packet); - static bool ValidateGameManagementMessage(const NetPacket &packet); - static bool ValidateGameEngineMessage(const NetPacket &packet); - static bool ValidateInitMessage(const NetPacket &packet); - static bool ValidateAuthServerChallengeMessage(const NetPacket &packet); - static bool ValidateAuthClientResponseMessage(const NetPacket &packet); - static bool ValidateAuthServerVerificationMessage(const NetPacket &packet); - static bool ValidateInitAckMessage(const NetPacket &packet); - static bool ValidateAvatarRequestMessage(const NetPacket &packet); - static bool ValidateAvatarHeaderMessage(const NetPacket &packet); - static bool ValidateAvatarDataMessage(const NetPacket &packet); - static bool ValidateAvatarEndMessage(const NetPacket &packet); - static bool ValidateUnknownAvatarMessage(const NetPacket &packet); - static bool ValidatePlayerListMessage(const NetPacket &packet); - static bool ValidateGameListNewMessage(const NetPacket &packet); - static bool ValidateGameListUpdateMessage(const NetPacket &packet); - static bool ValidateGameListPlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGameListPlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameListAdminChangedMessage(const NetPacket &packet); - static bool ValidatePlayerInfoRequestMessage(const NetPacket &packet); - static bool ValidatePlayerInfoReplyMessage(const NetPacket &packet); - static bool ValidateSubscriptionRequestMessage(const NetPacket &packet); - static bool ValidateCreateGameMessage(const NetPacket &packet); - static bool ValidateJoinGameMessage(const NetPacket &packet); - static bool ValidateRejoinGameMessage(const NetPacket &packet); - static bool ValidateJoinGameAckMessage(const NetPacket &packet); - static bool ValidateJoinGameFailedMessage(const NetPacket &packet); - static bool ValidateGamePlayerJoinedMessage(const NetPacket &packet); - static bool ValidateGamePlayerLeftMessage(const NetPacket &packet); - static bool ValidateGameAdminChangedMessage(const NetPacket &packet); - static bool ValidateRemovedFromGameMessage(const NetPacket &packet); - static bool ValidateKickPlayerRequestMessage(const NetPacket &packet); - static bool ValidateLeaveGameRequestMessage(const NetPacket &packet); - static bool ValidateInvitePlayerToGameMessage(const NetPacket &packet); - static bool ValidateInviteNotifyMessage(const NetPacket &packet); - static bool ValidateRejectGameInvitationMessage(const NetPacket &packet); - static bool ValidateRejectInvNotifyMessage(const NetPacket &packet); - static bool ValidateStartEventMessage(const NetPacket &packet); - static bool ValidateStartEventAckMessage(const NetPacket &packet); - static bool ValidateGameStartInitialMessage(const NetPacket &packet); - static bool ValidateGameStartRejoinMessage(const NetPacket &packet); - static bool ValidateHandStartMessage(const NetPacket &packet); - static bool ValidatePlayersTurnMessage(const NetPacket &packet); - static bool ValidateMyActionRequestMessage(const NetPacket &packet); - static bool ValidateYourActionRejectedMessage(const NetPacket &packet); - static bool ValidatePlayersActionDoneMessage(const NetPacket &packet); - static bool ValidateDealFlopCardsMessage(const NetPacket &packet); - static bool ValidateDealTurnCardMessage(const NetPacket &packet); - static bool ValidateDealRiverCardMessage(const NetPacket &packet); - static bool ValidateAllInShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfHandHideCardsMessage(const NetPacket &packet); - static bool ValidateShowMyCardsRequestMessage(const NetPacket &packet); - static bool ValidateAfterHandShowCardsMessage(const NetPacket &packet); - static bool ValidateEndOfGameMessage(const NetPacket &packet); - static bool ValidatePlayerIdChangedMessage(const NetPacket &packet); - static bool ValidateAskKickPlayerMessage(const NetPacket &packet); - static bool ValidateAskKickDeniedMessage(const NetPacket &packet); - static bool ValidateStartKickPetitionMessage(const NetPacket &packet); - static bool ValidateVoteKickRequestMessage(const NetPacket &packet); - static bool ValidateVoteKickReplyMessage(const NetPacket &packet); - static bool ValidateKickPetitionUpdateMessage(const NetPacket &packet); - static bool ValidateEndKickPetitionMessage(const NetPacket &packet); - static bool ValidateStatisticsMessage(const NetPacket &packet); - static bool ValidateChatRequestMessage(const NetPacket &packet); - static bool ValidateChatMessage(const NetPacket &packet); - static bool ValidateChatRejectMessage(const NetPacket &packet); - static bool ValidateDialogMessage(const NetPacket &packet); - static bool ValidateTimeoutWarningMessage(const NetPacket &packet); - static bool ValidateResetTimeoutMessage(const NetPacket &packet); - static bool ValidateReportAvatarMessage(const NetPacket &packet); - static bool ValidateReportAvatarAckMessage(const NetPacket &packet); - static bool ValidateReportGameMessage(const NetPacket &packet); - static bool ValidateReportGameAckMessage(const NetPacket &packet); - static bool ValidateErrorMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameMessage(const NetPacket &packet); - static bool ValidateAdminRemoveGameAckMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerMessage(const NetPacket &packet); - static bool ValidateAdminBanPlayerAckMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameListSpectatorLeftMessage(const NetPacket &packet); - static bool ValidateGameSpectatorJoinedMessage(const NetPacket &packet); - static bool ValidateGameSpectatorLeftMessage(const NetPacket &packet); + static bool ValidateAnnounceMessage(const PokerTHMessage &msg); + bool ValidateAuthMessage(const PokerTHMessage &msg); + bool ValidateLobbyMessage(const PokerTHMessage &msg); + bool ValidateGameMessage(const PokerTHMessage &msg); - static bool ValidateGameInfo(const NetGameInfo &gameInfo); - - typedef bool (*ValidateFunctor)(const NetPacket &); + typedef boost::function ValidateFunctor; typedef std::map ValidateFunctorMap; private: ValidateFunctorMap m_validationMap; + boost::shared_ptr m_authValidator; + boost::shared_ptr m_lobbyValidator; + boost::shared_ptr m_gameValidator; }; #endif diff --git a/src/net/validation/validationhelper.h b/src/net/validation/validationhelper.h index 5df20252..472f6931 100644 --- a/src/net/validation/validationhelper.h +++ b/src/net/validation/validationhelper.h @@ -28,14 +28,12 @@ * shall include the source code for the parts of OpenSSL used as well * * as that of the covered work. * *****************************************************************************/ -/* PokerTH network packet validation. */ +/* PokerTH network packet validation helpers. */ -#ifndef _POKERTHMESSAGEVALIDATOR_H_ -#define _POKERTHMESSAGEVALIDATOR_H_ +#ifndef _VALIDATIONHELPER_H_ +#define _VALIDATIONHELPER_H_ -#include - -class PokerTHMessage; +#include #define VALIDATE_IS_UINT16(__val) ((__val) <= 65535) #define VALIDATE_STRING_SIZE(__str, __minsize, __maxsize) ((__str).size() >= (__minsize) && (__str).size() <= (__maxsize)) @@ -43,25 +41,18 @@ class PokerTHMessage; #define VALIDATE_UINT_UPPER(__val, __maxval) ((__val) <= (__maxval)) #define VALIDATE_LIST_SIZE(__l, __minsize, __maxsize) ((__l).size() >= (__minsize) && (__l).size() <= (__maxsize)) -class PokerTHMessageValidator +inline bool +ValidateListIntRange(const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > &l, ::google::protobuf::uint32 minval, ::google::protobuf::uint32 maxval) { -public: - PokerTHMessageValidator(); - - bool IsValidMessage(const PokerTHMessage &msg) const; - -protected: - static bool ValidateAnnounceMessage(const PokerTHMessage &msg); - static bool ValidateAuthMessage(const PokerTHMessage &msg); - static bool ValidateLobbyMessage(const PokerTHMessage &msg); - static bool ValidateGameMessage(const PokerTHMessage &msg); - - typedef bool (*ValidateFunctor)(const PokerTHMessage &msg); - typedef std::map ValidateFunctorMap; -private: - - ValidateFunctorMap m_validationMap; -}; + bool retVal = true; + for (int i = 0; i < l.size(); i++) { + if (!VALIDATE_UINT_RANGE(l.Get(i), minval, maxval)) { + retVal = false; + break; + } + } + return retVal; +} #endif diff --git a/src/third_party/protobuf/pokerth.pb.cc b/src/third_party/protobuf/pokerth.pb.cc index 12ef6e2c..8f66d0d5 100644 --- a/src/third_party/protobuf/pokerth.pb.cc +++ b/src/third_party/protobuf/pokerth.pb.cc @@ -21,8 +21,7 @@ void protobuf_ShutdownFile_pokerth_2eproto() { delete AuthServerChallengeMessage::default_instance_; delete AuthClientResponseMessage::default_instance_; delete AuthServerVerificationMessage::default_instance_; - delete InitMessage::default_instance_; - delete InitAckMessage::default_instance_; + delete InitDoneMessage::default_instance_; delete AvatarRequestMessage::default_instance_; delete AvatarHeaderMessage::default_instance_; delete AvatarDataMessage::default_instance_; @@ -134,8 +133,7 @@ void protobuf_AddDesc_pokerth_2eproto() { AuthServerChallengeMessage::default_instance_ = new AuthServerChallengeMessage(); AuthClientResponseMessage::default_instance_ = new AuthClientResponseMessage(); AuthServerVerificationMessage::default_instance_ = new AuthServerVerificationMessage(); - InitMessage::default_instance_ = new InitMessage(); - InitAckMessage::default_instance_ = new InitAckMessage(); + InitDoneMessage::default_instance_ = new InitDoneMessage(); AvatarRequestMessage::default_instance_ = new AvatarRequestMessage(); AvatarHeaderMessage::default_instance_ = new AvatarHeaderMessage(); AvatarDataMessage::default_instance_ = new AvatarDataMessage(); @@ -233,8 +231,7 @@ void protobuf_AddDesc_pokerth_2eproto() { AuthServerChallengeMessage::default_instance_->InitAsDefaultInstance(); AuthClientResponseMessage::default_instance_->InitAsDefaultInstance(); AuthServerVerificationMessage::default_instance_->InitAsDefaultInstance(); - InitMessage::default_instance_->InitAsDefaultInstance(); - InitAckMessage::default_instance_->InitAsDefaultInstance(); + InitDoneMessage::default_instance_->InitAsDefaultInstance(); AvatarRequestMessage::default_instance_->InitAsDefaultInstance(); AvatarHeaderMessage::default_instance_->InitAsDefaultInstance(); AvatarDataMessage::default_instance_->InitAsDefaultInstance(); @@ -2145,6 +2142,7 @@ const int AuthClientRequestMessage::kAuthServerPasswordFieldNumber; const int AuthClientRequestMessage::kNickNameFieldNumber; const int AuthClientRequestMessage::kClientUserDataFieldNumber; const int AuthClientRequestMessage::kMyLastSessionIdFieldNumber; +const int AuthClientRequestMessage::kAvatarHashFieldNumber; #endif // !_MSC_VER AuthClientRequestMessage::AuthClientRequestMessage() @@ -2176,6 +2174,7 @@ void AuthClientRequestMessage::SharedCtor() { nickname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); clientuserdata_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); mylastsessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); + avatarhash_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -2196,6 +2195,9 @@ void AuthClientRequestMessage::SharedDtor() { if (mylastsessionid_ != &::google::protobuf::internal::kEmptyString) { delete mylastsessionid_; } + if (avatarhash_ != &::google::protobuf::internal::kEmptyString) { + delete avatarhash_; + } #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER if (this != &default_instance()) { #else @@ -2252,6 +2254,11 @@ void AuthClientRequestMessage::Clear() { mylastsessionid_->clear(); } } + if (has_avatarhash()) { + if (avatarhash_ != &::google::protobuf::internal::kEmptyString) { + avatarhash_->clear(); + } + } } ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -2362,6 +2369,20 @@ bool AuthClientRequestMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } + if (input->ExpectTag(66)) goto parse_avatarHash; + break; + } + + // optional bytes avatarHash = 8; + case 8: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + parse_avatarHash: + DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + input, this->mutable_avatarhash())); + } else { + goto handle_uninterpreted; + } if (input->ExpectAtEnd()) return true; break; } @@ -2424,6 +2445,12 @@ void AuthClientRequestMessage::SerializeWithCachedSizes( 7, this->mylastsessionid(), output); } + // optional bytes avatarHash = 8; + if (has_avatarhash()) { + ::google::protobuf::internal::WireFormatLite::WriteBytes( + 8, this->avatarhash(), output); + } + } int AuthClientRequestMessage::ByteSize() const { @@ -2478,6 +2505,13 @@ int AuthClientRequestMessage::ByteSize() const { this->mylastsessionid()); } + // optional bytes avatarHash = 8; + if (has_avatarhash()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::BytesSize( + this->avatarhash()); + } + } GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); _cached_size_ = total_size; @@ -2514,6 +2548,9 @@ void AuthClientRequestMessage::MergeFrom(const AuthClientRequestMessage& from) { if (from.has_mylastsessionid()) { set_mylastsessionid(from.mylastsessionid()); } + if (from.has_avatarhash()) { + set_avatarhash(from.avatarhash()); + } } } @@ -2541,6 +2578,7 @@ void AuthClientRequestMessage::Swap(AuthClientRequestMessage* other) { std::swap(nickname_, other->nickname_); std::swap(clientuserdata_, other->clientuserdata_); std::swap(mylastsessionid_, other->mylastsessionid_); + std::swap(avatarhash_, other->avatarhash_); std::swap(_has_bits_[0], other->_has_bits_[0]); std::swap(_cached_size_, other->_cached_size_); } @@ -2902,8 +2940,6 @@ void AuthClientResponseMessage::Swap(AuthClientResponseMessage* other) { // =================================================================== #ifndef _MSC_VER -const int AuthServerVerificationMessage::kYourSessionIdFieldNumber; -const int AuthServerVerificationMessage::kYourPlayerIdFieldNumber; const int AuthServerVerificationMessage::kServerVerificationFieldNumber; #endif // !_MSC_VER @@ -2923,8 +2959,6 @@ AuthServerVerificationMessage::AuthServerVerificationMessage(const AuthServerVer void AuthServerVerificationMessage::SharedCtor() { _cached_size_ = 0; - yoursessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); - yourplayerid_ = 0u; serververification_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -2934,9 +2968,6 @@ AuthServerVerificationMessage::~AuthServerVerificationMessage() { } void AuthServerVerificationMessage::SharedDtor() { - if (yoursessionid_ != &::google::protobuf::internal::kEmptyString) { - delete yoursessionid_; - } if (serververification_ != &::google::protobuf::internal::kEmptyString) { delete serververification_; } @@ -2970,12 +3001,6 @@ AuthServerVerificationMessage* AuthServerVerificationMessage::New() const { void AuthServerVerificationMessage::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (has_yoursessionid()) { - if (yoursessionid_ != &::google::protobuf::internal::kEmptyString) { - yoursessionid_->clear(); - } - } - yourplayerid_ = 0u; if (has_serververification()) { if (serververification_ != &::google::protobuf::internal::kEmptyString) { serververification_->clear(); @@ -2987,6 +3012,196 @@ void AuthServerVerificationMessage::Clear() { bool AuthServerVerificationMessage::MergePartialFromCodedStream( ::google::protobuf::io::CodedInputStream* input) { +#define DO_(EXPRESSION) if (!(EXPRESSION)) return false + ::google::protobuf::uint32 tag; + while ((tag = input->ReadTag()) != 0) { + switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { + // required bytes serverVerification = 1; + case 1: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( + input, this->mutable_serververification())); + } else { + goto handle_uninterpreted; + } + if (input->ExpectAtEnd()) return true; + break; + } + + default: { + handle_uninterpreted: + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { + return true; + } + DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); + break; + } + } + } + return true; +#undef DO_ +} + +void AuthServerVerificationMessage::SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const { + // required bytes serverVerification = 1; + if (has_serververification()) { + ::google::protobuf::internal::WireFormatLite::WriteBytes( + 1, this->serververification(), output); + } + +} + +int AuthServerVerificationMessage::ByteSize() const { + int total_size = 0; + + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + // required bytes serverVerification = 1; + if (has_serververification()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::BytesSize( + this->serververification()); + } + + } + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = total_size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); + return total_size; +} + +void AuthServerVerificationMessage::CheckTypeAndMergeFrom( + const ::google::protobuf::MessageLite& from) { + MergeFrom(*::google::protobuf::down_cast(&from)); +} + +void AuthServerVerificationMessage::MergeFrom(const AuthServerVerificationMessage& from) { + GOOGLE_CHECK_NE(&from, this); + if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_serververification()) { + set_serververification(from.serververification()); + } + } +} + +void AuthServerVerificationMessage::CopyFrom(const AuthServerVerificationMessage& from) { + if (&from == this) return; + Clear(); + MergeFrom(from); +} + +bool AuthServerVerificationMessage::IsInitialized() const { + if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; + + return true; +} + +void AuthServerVerificationMessage::Swap(AuthServerVerificationMessage* other) { + if (other != this) { + std::swap(serververification_, other->serververification_); + std::swap(_has_bits_[0], other->_has_bits_[0]); + std::swap(_cached_size_, other->_cached_size_); + } +} + +::std::string AuthServerVerificationMessage::GetTypeName() const { + return "AuthServerVerificationMessage"; +} + + +// =================================================================== + +#ifndef _MSC_VER +const int InitDoneMessage::kYourSessionIdFieldNumber; +const int InitDoneMessage::kYourPlayerIdFieldNumber; +const int InitDoneMessage::kYourAvatarHashFieldNumber; +const int InitDoneMessage::kRejoinGameIdFieldNumber; +#endif // !_MSC_VER + +InitDoneMessage::InitDoneMessage() + : ::google::protobuf::MessageLite() { + SharedCtor(); +} + +void InitDoneMessage::InitAsDefaultInstance() { +} + +InitDoneMessage::InitDoneMessage(const InitDoneMessage& from) + : ::google::protobuf::MessageLite() { + SharedCtor(); + MergeFrom(from); +} + +void InitDoneMessage::SharedCtor() { + _cached_size_ = 0; + yoursessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); + yourplayerid_ = 0u; + youravatarhash_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); + rejoingameid_ = 0u; + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +InitDoneMessage::~InitDoneMessage() { + SharedDtor(); +} + +void InitDoneMessage::SharedDtor() { + if (yoursessionid_ != &::google::protobuf::internal::kEmptyString) { + delete yoursessionid_; + } + if (youravatarhash_ != &::google::protobuf::internal::kEmptyString) { + delete youravatarhash_; + } + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + if (this != &default_instance()) { + #else + if (this != default_instance_) { + #endif + } +} + +void InitDoneMessage::SetCachedSize(int size) const { + GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); + _cached_size_ = size; + GOOGLE_SAFE_CONCURRENT_WRITES_END(); +} +const InitDoneMessage& InitDoneMessage::default_instance() { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + protobuf_AddDesc_pokerth_2eproto(); +#else + if (default_instance_ == NULL) protobuf_AddDesc_pokerth_2eproto(); +#endif + return *default_instance_; +} + +InitDoneMessage* InitDoneMessage::default_instance_ = NULL; + +InitDoneMessage* InitDoneMessage::New() const { + return new InitDoneMessage; +} + +void InitDoneMessage::Clear() { + if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (has_yoursessionid()) { + if (yoursessionid_ != &::google::protobuf::internal::kEmptyString) { + yoursessionid_->clear(); + } + } + yourplayerid_ = 0u; + if (has_youravatarhash()) { + if (youravatarhash_ != &::google::protobuf::internal::kEmptyString) { + youravatarhash_->clear(); + } + } + rejoingameid_ = 0u; + } + ::memset(_has_bits_, 0, sizeof(_has_bits_)); +} + +bool InitDoneMessage::MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input) { #define DO_(EXPRESSION) if (!(EXPRESSION)) return false ::google::protobuf::uint32 tag; while ((tag = input->ReadTag()) != 0) { @@ -3016,409 +3231,26 @@ bool AuthServerVerificationMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(26)) goto parse_serverVerification; + if (input->ExpectTag(26)) goto parse_yourAvatarHash; break; } - // optional bytes serverVerification = 3; + // optional bytes yourAvatarHash = 3; case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_serverVerification: - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( - input, this->mutable_serververification())); - } else { - goto handle_uninterpreted; - } - if (input->ExpectAtEnd()) return true; - break; - } - - default: { - handle_uninterpreted: - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - return true; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } - } - } - return true; -#undef DO_ -} - -void AuthServerVerificationMessage::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // required bytes yourSessionId = 1; - if (has_yoursessionid()) { - ::google::protobuf::internal::WireFormatLite::WriteBytes( - 1, this->yoursessionid(), output); - } - - // required uint32 yourPlayerId = 2; - if (has_yourplayerid()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->yourplayerid(), output); - } - - // optional bytes serverVerification = 3; - if (has_serververification()) { - ::google::protobuf::internal::WireFormatLite::WriteBytes( - 3, this->serververification(), output); - } - -} - -int AuthServerVerificationMessage::ByteSize() const { - int total_size = 0; - - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required bytes yourSessionId = 1; - if (has_yoursessionid()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( - this->yoursessionid()); - } - - // required uint32 yourPlayerId = 2; - if (has_yourplayerid()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::UInt32Size( - this->yourplayerid()); - } - - // optional bytes serverVerification = 3; - if (has_serververification()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( - this->serververification()); - } - - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void AuthServerVerificationMessage::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); -} - -void AuthServerVerificationMessage::MergeFrom(const AuthServerVerificationMessage& from) { - GOOGLE_CHECK_NE(&from, this); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_yoursessionid()) { - set_yoursessionid(from.yoursessionid()); - } - if (from.has_yourplayerid()) { - set_yourplayerid(from.yourplayerid()); - } - if (from.has_serververification()) { - set_serververification(from.serververification()); - } - } -} - -void AuthServerVerificationMessage::CopyFrom(const AuthServerVerificationMessage& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool AuthServerVerificationMessage::IsInitialized() const { - if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; - - return true; -} - -void AuthServerVerificationMessage::Swap(AuthServerVerificationMessage* other) { - if (other != this) { - std::swap(yoursessionid_, other->yoursessionid_); - std::swap(yourplayerid_, other->yourplayerid_); - std::swap(serververification_, other->serververification_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - std::swap(_cached_size_, other->_cached_size_); - } -} - -::std::string AuthServerVerificationMessage::GetTypeName() const { - return "AuthServerVerificationMessage"; -} - - -// =================================================================== - -#ifndef _MSC_VER -const int InitMessage::kAvatarHashFieldNumber; -#endif // !_MSC_VER - -InitMessage::InitMessage() - : ::google::protobuf::MessageLite() { - SharedCtor(); -} - -void InitMessage::InitAsDefaultInstance() { -} - -InitMessage::InitMessage(const InitMessage& from) - : ::google::protobuf::MessageLite() { - SharedCtor(); - MergeFrom(from); -} - -void InitMessage::SharedCtor() { - _cached_size_ = 0; - avatarhash_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -InitMessage::~InitMessage() { - SharedDtor(); -} - -void InitMessage::SharedDtor() { - if (avatarhash_ != &::google::protobuf::internal::kEmptyString) { - delete avatarhash_; - } - #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - if (this != &default_instance()) { - #else - if (this != default_instance_) { - #endif - } -} - -void InitMessage::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const InitMessage& InitMessage::default_instance() { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - protobuf_AddDesc_pokerth_2eproto(); -#else - if (default_instance_ == NULL) protobuf_AddDesc_pokerth_2eproto(); -#endif - return *default_instance_; -} - -InitMessage* InitMessage::default_instance_ = NULL; - -InitMessage* InitMessage::New() const { - return new InitMessage; -} - -void InitMessage::Clear() { - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (has_avatarhash()) { - if (avatarhash_ != &::google::protobuf::internal::kEmptyString) { - avatarhash_->clear(); - } - } - } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -bool InitMessage::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!(EXPRESSION)) return false - ::google::protobuf::uint32 tag; - while ((tag = input->ReadTag()) != 0) { - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional bytes avatarHash = 1; - case 1: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( - input, this->mutable_avatarhash())); - } else { - goto handle_uninterpreted; - } - if (input->ExpectAtEnd()) return true; - break; - } - - default: { - handle_uninterpreted: - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) { - return true; - } - DO_(::google::protobuf::internal::WireFormatLite::SkipField(input, tag)); - break; - } - } - } - return true; -#undef DO_ -} - -void InitMessage::SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const { - // optional bytes avatarHash = 1; - if (has_avatarhash()) { - ::google::protobuf::internal::WireFormatLite::WriteBytes( - 1, this->avatarhash(), output); - } - -} - -int InitMessage::ByteSize() const { - int total_size = 0; - - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional bytes avatarHash = 1; - if (has_avatarhash()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::BytesSize( - this->avatarhash()); - } - - } - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = total_size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); - return total_size; -} - -void InitMessage::CheckTypeAndMergeFrom( - const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); -} - -void InitMessage::MergeFrom(const InitMessage& from) { - GOOGLE_CHECK_NE(&from, this); - if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (from.has_avatarhash()) { - set_avatarhash(from.avatarhash()); - } - } -} - -void InitMessage::CopyFrom(const InitMessage& from) { - if (&from == this) return; - Clear(); - MergeFrom(from); -} - -bool InitMessage::IsInitialized() const { - - return true; -} - -void InitMessage::Swap(InitMessage* other) { - if (other != this) { - std::swap(avatarhash_, other->avatarhash_); - std::swap(_has_bits_[0], other->_has_bits_[0]); - std::swap(_cached_size_, other->_cached_size_); - } -} - -::std::string InitMessage::GetTypeName() const { - return "InitMessage"; -} - - -// =================================================================== - -#ifndef _MSC_VER -const int InitAckMessage::kYourAvatarHashFieldNumber; -const int InitAckMessage::kRejoinGameIdFieldNumber; -#endif // !_MSC_VER - -InitAckMessage::InitAckMessage() - : ::google::protobuf::MessageLite() { - SharedCtor(); -} - -void InitAckMessage::InitAsDefaultInstance() { -} - -InitAckMessage::InitAckMessage(const InitAckMessage& from) - : ::google::protobuf::MessageLite() { - SharedCtor(); - MergeFrom(from); -} - -void InitAckMessage::SharedCtor() { - _cached_size_ = 0; - youravatarhash_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); - rejoingameid_ = 0u; - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -InitAckMessage::~InitAckMessage() { - SharedDtor(); -} - -void InitAckMessage::SharedDtor() { - if (youravatarhash_ != &::google::protobuf::internal::kEmptyString) { - delete youravatarhash_; - } - #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - if (this != &default_instance()) { - #else - if (this != default_instance_) { - #endif - } -} - -void InitAckMessage::SetCachedSize(int size) const { - GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN(); - _cached_size_ = size; - GOOGLE_SAFE_CONCURRENT_WRITES_END(); -} -const InitAckMessage& InitAckMessage::default_instance() { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - protobuf_AddDesc_pokerth_2eproto(); -#else - if (default_instance_ == NULL) protobuf_AddDesc_pokerth_2eproto(); -#endif - return *default_instance_; -} - -InitAckMessage* InitAckMessage::default_instance_ = NULL; - -InitAckMessage* InitAckMessage::New() const { - return new InitAckMessage; -} - -void InitAckMessage::Clear() { - if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - if (has_youravatarhash()) { - if (youravatarhash_ != &::google::protobuf::internal::kEmptyString) { - youravatarhash_->clear(); - } - } - rejoingameid_ = 0u; - } - ::memset(_has_bits_, 0, sizeof(_has_bits_)); -} - -bool InitAckMessage::MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input) { -#define DO_(EXPRESSION) if (!(EXPRESSION)) return false - ::google::protobuf::uint32 tag; - while ((tag = input->ReadTag()) != 0) { - switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional bytes yourAvatarHash = 1; - case 1: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + parse_yourAvatarHash: DO_(::google::protobuf::internal::WireFormatLite::ReadBytes( input, this->mutable_youravatarhash())); } else { goto handle_uninterpreted; } - if (input->ExpectTag(16)) goto parse_rejoinGameId; + if (input->ExpectTag(32)) goto parse_rejoinGameId; break; } - // optional uint32 rejoinGameId = 2; - case 2: { + // optional uint32 rejoinGameId = 4; + case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { parse_rejoinGameId: @@ -3448,33 +3280,58 @@ bool InitAckMessage::MergePartialFromCodedStream( #undef DO_ } -void InitAckMessage::SerializeWithCachedSizes( +void InitDoneMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // optional bytes yourAvatarHash = 1; - if (has_youravatarhash()) { + // required bytes yourSessionId = 1; + if (has_yoursessionid()) { ::google::protobuf::internal::WireFormatLite::WriteBytes( - 1, this->youravatarhash(), output); + 1, this->yoursessionid(), output); } - // optional uint32 rejoinGameId = 2; + // required uint32 yourPlayerId = 2; + if (has_yourplayerid()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->yourplayerid(), output); + } + + // optional bytes yourAvatarHash = 3; + if (has_youravatarhash()) { + ::google::protobuf::internal::WireFormatLite::WriteBytes( + 3, this->youravatarhash(), output); + } + + // optional uint32 rejoinGameId = 4; if (has_rejoingameid()) { - ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->rejoingameid(), output); + ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->rejoingameid(), output); } } -int InitAckMessage::ByteSize() const { +int InitDoneMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional bytes yourAvatarHash = 1; + // required bytes yourSessionId = 1; + if (has_yoursessionid()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::BytesSize( + this->yoursessionid()); + } + + // required uint32 yourPlayerId = 2; + if (has_yourplayerid()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->yourplayerid()); + } + + // optional bytes yourAvatarHash = 3; if (has_youravatarhash()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize( this->youravatarhash()); } - // optional uint32 rejoinGameId = 2; + // optional uint32 rejoinGameId = 4; if (has_rejoingameid()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::UInt32Size( @@ -3488,14 +3345,20 @@ int InitAckMessage::ByteSize() const { return total_size; } -void InitAckMessage::CheckTypeAndMergeFrom( +void InitDoneMessage::CheckTypeAndMergeFrom( const ::google::protobuf::MessageLite& from) { - MergeFrom(*::google::protobuf::down_cast(&from)); + MergeFrom(*::google::protobuf::down_cast(&from)); } -void InitAckMessage::MergeFrom(const InitAckMessage& from) { +void InitDoneMessage::MergeFrom(const InitDoneMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_yoursessionid()) { + set_yoursessionid(from.yoursessionid()); + } + if (from.has_yourplayerid()) { + set_yourplayerid(from.yourplayerid()); + } if (from.has_youravatarhash()) { set_youravatarhash(from.youravatarhash()); } @@ -3505,19 +3368,22 @@ void InitAckMessage::MergeFrom(const InitAckMessage& from) { } } -void InitAckMessage::CopyFrom(const InitAckMessage& from) { +void InitDoneMessage::CopyFrom(const InitDoneMessage& from) { if (&from == this) return; Clear(); MergeFrom(from); } -bool InitAckMessage::IsInitialized() const { +bool InitDoneMessage::IsInitialized() const { + if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; return true; } -void InitAckMessage::Swap(InitAckMessage* other) { +void InitDoneMessage::Swap(InitDoneMessage* other) { if (other != this) { + std::swap(yoursessionid_, other->yoursessionid_); + std::swap(yourplayerid_, other->yourplayerid_); std::swap(youravatarhash_, other->youravatarhash_); std::swap(rejoingameid_, other->rejoingameid_); std::swap(_has_bits_[0], other->_has_bits_[0]); @@ -3525,8 +3391,8 @@ void InitAckMessage::Swap(InitAckMessage* other) { } } -::std::string InitAckMessage::GetTypeName() const { - return "InitAckMessage"; +::std::string InitDoneMessage::GetTypeName() const { + return "InitDoneMessage"; } @@ -8271,6 +8137,7 @@ void CreateGameFailedMessage::Swap(CreateGameFailedMessage* other) { // =================================================================== #ifndef _MSC_VER +const int JoinGameMessage::kGameIdFieldNumber; const int JoinGameMessage::kPasswordFieldNumber; const int JoinGameMessage::kAutoLeaveFieldNumber; const int JoinGameMessage::kSpectateOnlyFieldNumber; @@ -8292,6 +8159,7 @@ JoinGameMessage::JoinGameMessage(const JoinGameMessage& from) void JoinGameMessage::SharedCtor() { _cached_size_ = 0; + gameid_ = 0u; password_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); autoleave_ = false; spectateonly_ = false; @@ -8336,6 +8204,7 @@ JoinGameMessage* JoinGameMessage::New() const { void JoinGameMessage::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + gameid_ = 0u; if (has_password()) { if (password_ != &::google::protobuf::internal::kEmptyString) { password_->clear(); @@ -8353,21 +8222,37 @@ bool JoinGameMessage::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; while ((tag = input->ReadTag()) != 0) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional string password = 1; + // required uint32 gameId = 1; case 1: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, &gameid_))); + set_has_gameid(); + } else { + goto handle_uninterpreted; + } + if (input->ExpectTag(18)) goto parse_password; + break; + } + + // optional string password = 2; + case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + parse_password: DO_(::google::protobuf::internal::WireFormatLite::ReadString( input, this->mutable_password())); } else { goto handle_uninterpreted; } - if (input->ExpectTag(16)) goto parse_autoLeave; + if (input->ExpectTag(24)) goto parse_autoLeave; break; } - // optional bool autoLeave = 2 [default = false]; - case 2: { + // optional bool autoLeave = 3 [default = false]; + case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { parse_autoLeave: @@ -8378,12 +8263,12 @@ bool JoinGameMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(24)) goto parse_spectateOnly; + if (input->ExpectTag(32)) goto parse_spectateOnly; break; } - // optional bool spectateOnly = 3 [default = false]; - case 3: { + // optional bool spectateOnly = 4 [default = false]; + case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { parse_spectateOnly: @@ -8415,20 +8300,25 @@ bool JoinGameMessage::MergePartialFromCodedStream( void JoinGameMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // optional string password = 1; + // required uint32 gameId = 1; + if (has_gameid()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->gameid(), output); + } + + // optional string password = 2; if (has_password()) { ::google::protobuf::internal::WireFormatLite::WriteString( - 1, this->password(), output); + 2, this->password(), output); } - // optional bool autoLeave = 2 [default = false]; + // optional bool autoLeave = 3 [default = false]; if (has_autoleave()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->autoleave(), output); + ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->autoleave(), output); } - // optional bool spectateOnly = 3 [default = false]; + // optional bool spectateOnly = 4 [default = false]; if (has_spectateonly()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->spectateonly(), output); + ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->spectateonly(), output); } } @@ -8437,19 +8327,26 @@ int JoinGameMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional string password = 1; + // required uint32 gameId = 1; + if (has_gameid()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->gameid()); + } + + // optional string password = 2; if (has_password()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize( this->password()); } - // optional bool autoLeave = 2 [default = false]; + // optional bool autoLeave = 3 [default = false]; if (has_autoleave()) { total_size += 1 + 1; } - // optional bool spectateOnly = 3 [default = false]; + // optional bool spectateOnly = 4 [default = false]; if (has_spectateonly()) { total_size += 1 + 1; } @@ -8469,6 +8366,9 @@ void JoinGameMessage::CheckTypeAndMergeFrom( void JoinGameMessage::MergeFrom(const JoinGameMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_gameid()) { + set_gameid(from.gameid()); + } if (from.has_password()) { set_password(from.password()); } @@ -8488,12 +8388,14 @@ void JoinGameMessage::CopyFrom(const JoinGameMessage& from) { } bool JoinGameMessage::IsInitialized() const { + if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; return true; } void JoinGameMessage::Swap(JoinGameMessage* other) { if (other != this) { + std::swap(gameid_, other->gameid_); std::swap(password_, other->password_); std::swap(autoleave_, other->autoleave_); std::swap(spectateonly_, other->spectateonly_); @@ -8510,6 +8412,7 @@ void JoinGameMessage::Swap(JoinGameMessage* other) { // =================================================================== #ifndef _MSC_VER +const int RejoinGameMessage::kGameIdFieldNumber; const int RejoinGameMessage::kAutoLeaveFieldNumber; #endif // !_MSC_VER @@ -8529,6 +8432,7 @@ RejoinGameMessage::RejoinGameMessage(const RejoinGameMessage& from) void RejoinGameMessage::SharedCtor() { _cached_size_ = 0; + gameid_ = 0u; autoleave_ = false; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -8568,6 +8472,7 @@ RejoinGameMessage* RejoinGameMessage::New() const { void RejoinGameMessage::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + gameid_ = 0u; autoleave_ = false; } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -8579,10 +8484,26 @@ bool RejoinGameMessage::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; while ((tag = input->ReadTag()) != 0) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // optional bool autoLeave = 1 [default = false]; + // required uint32 gameId = 1; case 1: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, &gameid_))); + set_has_gameid(); + } else { + goto handle_uninterpreted; + } + if (input->ExpectTag(16)) goto parse_autoLeave; + break; + } + + // optional bool autoLeave = 2 [default = false]; + case 2: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + parse_autoLeave: DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &autoleave_))); @@ -8611,9 +8532,14 @@ bool RejoinGameMessage::MergePartialFromCodedStream( void RejoinGameMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // optional bool autoLeave = 1 [default = false]; + // required uint32 gameId = 1; + if (has_gameid()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->gameid(), output); + } + + // optional bool autoLeave = 2 [default = false]; if (has_autoleave()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->autoleave(), output); + ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->autoleave(), output); } } @@ -8622,7 +8548,14 @@ int RejoinGameMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // optional bool autoLeave = 1 [default = false]; + // required uint32 gameId = 1; + if (has_gameid()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->gameid()); + } + + // optional bool autoLeave = 2 [default = false]; if (has_autoleave()) { total_size += 1 + 1; } @@ -8642,6 +8575,9 @@ void RejoinGameMessage::CheckTypeAndMergeFrom( void RejoinGameMessage::MergeFrom(const RejoinGameMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_gameid()) { + set_gameid(from.gameid()); + } if (from.has_autoleave()) { set_autoleave(from.autoleave()); } @@ -8655,12 +8591,14 @@ void RejoinGameMessage::CopyFrom(const RejoinGameMessage& from) { } bool RejoinGameMessage::IsInitialized() const { + if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; return true; } void RejoinGameMessage::Swap(RejoinGameMessage* other) { if (other != this) { + std::swap(gameid_, other->gameid_); std::swap(autoleave_, other->autoleave_); std::swap(_has_bits_[0], other->_has_bits_[0]); std::swap(_cached_size_, other->_cached_size_); @@ -8675,6 +8613,7 @@ void RejoinGameMessage::Swap(RejoinGameMessage* other) { // =================================================================== #ifndef _MSC_VER +const int JoinGameAckMessage::kGameIdFieldNumber; const int JoinGameAckMessage::kAreYouGameAdminFieldNumber; const int JoinGameAckMessage::kGameInfoFieldNumber; const int JoinGameAckMessage::kSpectateOnlyFieldNumber; @@ -8702,6 +8641,7 @@ JoinGameAckMessage::JoinGameAckMessage(const JoinGameAckMessage& from) void JoinGameAckMessage::SharedCtor() { _cached_size_ = 0; + gameid_ = 0u; areyougameadmin_ = false; gameinfo_ = NULL; spectateonly_ = false; @@ -8744,6 +8684,7 @@ JoinGameAckMessage* JoinGameAckMessage::New() const { void JoinGameAckMessage::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + gameid_ = 0u; areyougameadmin_ = false; if (has_gameinfo()) { if (gameinfo_ != NULL) gameinfo_->::NetGameInfo::Clear(); @@ -8759,10 +8700,26 @@ bool JoinGameAckMessage::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; while ((tag = input->ReadTag()) != 0) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required bool areYouGameAdmin = 1; + // required uint32 gameId = 1; case 1: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, &gameid_))); + set_has_gameid(); + } else { + goto handle_uninterpreted; + } + if (input->ExpectTag(16)) goto parse_areYouGameAdmin; + break; + } + + // required bool areYouGameAdmin = 2; + case 2: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + parse_areYouGameAdmin: DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>( input, &areyougameadmin_))); @@ -8770,12 +8727,12 @@ bool JoinGameAckMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(18)) goto parse_gameInfo; + if (input->ExpectTag(26)) goto parse_gameInfo; break; } - // required .NetGameInfo gameInfo = 2; - case 2: { + // required .NetGameInfo gameInfo = 3; + case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameInfo: @@ -8784,12 +8741,12 @@ bool JoinGameAckMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(24)) goto parse_spectateOnly; + if (input->ExpectTag(32)) goto parse_spectateOnly; break; } - // optional bool spectateOnly = 3; - case 3: { + // optional bool spectateOnly = 4; + case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { parse_spectateOnly: @@ -8821,20 +8778,25 @@ bool JoinGameAckMessage::MergePartialFromCodedStream( void JoinGameAckMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // required bool areYouGameAdmin = 1; - if (has_areyougameadmin()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->areyougameadmin(), output); + // required uint32 gameId = 1; + if (has_gameid()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->gameid(), output); } - // required .NetGameInfo gameInfo = 2; + // required bool areYouGameAdmin = 2; + if (has_areyougameadmin()) { + ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->areyougameadmin(), output); + } + + // required .NetGameInfo gameInfo = 3; if (has_gameinfo()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, this->gameinfo(), output); + 3, this->gameinfo(), output); } - // optional bool spectateOnly = 3; + // optional bool spectateOnly = 4; if (has_spectateonly()) { - ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->spectateonly(), output); + ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->spectateonly(), output); } } @@ -8843,19 +8805,26 @@ int JoinGameAckMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required bool areYouGameAdmin = 1; + // required uint32 gameId = 1; + if (has_gameid()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->gameid()); + } + + // required bool areYouGameAdmin = 2; if (has_areyougameadmin()) { total_size += 1 + 1; } - // required .NetGameInfo gameInfo = 2; + // required .NetGameInfo gameInfo = 3; if (has_gameinfo()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gameinfo()); } - // optional bool spectateOnly = 3; + // optional bool spectateOnly = 4; if (has_spectateonly()) { total_size += 1 + 1; } @@ -8875,6 +8844,9 @@ void JoinGameAckMessage::CheckTypeAndMergeFrom( void JoinGameAckMessage::MergeFrom(const JoinGameAckMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_gameid()) { + set_gameid(from.gameid()); + } if (from.has_areyougameadmin()) { set_areyougameadmin(from.areyougameadmin()); } @@ -8894,7 +8866,7 @@ void JoinGameAckMessage::CopyFrom(const JoinGameAckMessage& from) { } bool JoinGameAckMessage::IsInitialized() const { - if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; + if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false; if (has_gameinfo()) { if (!this->gameinfo().IsInitialized()) return false; @@ -8904,6 +8876,7 @@ bool JoinGameAckMessage::IsInitialized() const { void JoinGameAckMessage::Swap(JoinGameAckMessage* other) { if (other != this) { + std::swap(gameid_, other->gameid_); std::swap(areyougameadmin_, other->areyougameadmin_); std::swap(gameinfo_, other->gameinfo_); std::swap(spectateonly_, other->spectateonly_); @@ -8929,6 +8902,7 @@ bool JoinGameFailedMessage_JoinGameFailureReason_IsValid(int value) { case 6: case 7: case 8: + case 9: return true; default: return false; @@ -8939,6 +8913,7 @@ bool JoinGameFailedMessage_JoinGameFailureReason_IsValid(int value) { const JoinGameFailedMessage_JoinGameFailureReason JoinGameFailedMessage::invalidGame; const JoinGameFailedMessage_JoinGameFailureReason JoinGameFailedMessage::gameIsFull; const JoinGameFailedMessage_JoinGameFailureReason JoinGameFailedMessage::gameIsRunning; +const JoinGameFailedMessage_JoinGameFailureReason JoinGameFailedMessage::notAllowedAsGuest; const JoinGameFailedMessage_JoinGameFailureReason JoinGameFailedMessage::invalidPassword; const JoinGameFailedMessage_JoinGameFailureReason JoinGameFailedMessage::notInvited; const JoinGameFailedMessage_JoinGameFailureReason JoinGameFailedMessage::ipAddressBlocked; @@ -8949,6 +8924,7 @@ const JoinGameFailedMessage_JoinGameFailureReason JoinGameFailedMessage::JoinGam const int JoinGameFailedMessage::JoinGameFailureReason_ARRAYSIZE; #endif // _MSC_VER #ifndef _MSC_VER +const int JoinGameFailedMessage::kGameIdFieldNumber; const int JoinGameFailedMessage::kJoinGameFailureReasonFieldNumber; #endif // !_MSC_VER @@ -8968,6 +8944,7 @@ JoinGameFailedMessage::JoinGameFailedMessage(const JoinGameFailedMessage& from) void JoinGameFailedMessage::SharedCtor() { _cached_size_ = 0; + gameid_ = 0u; joingamefailurereason_ = 1; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -9007,6 +8984,7 @@ JoinGameFailedMessage* JoinGameFailedMessage::New() const { void JoinGameFailedMessage::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { + gameid_ = 0u; joingamefailurereason_ = 1; } ::memset(_has_bits_, 0, sizeof(_has_bits_)); @@ -9018,10 +8996,26 @@ bool JoinGameFailedMessage::MergePartialFromCodedStream( ::google::protobuf::uint32 tag; while ((tag = input->ReadTag()) != 0) { switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) { - // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + // required uint32 gameId = 1; case 1: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>( + input, &gameid_))); + set_has_gameid(); + } else { + goto handle_uninterpreted; + } + if (input->ExpectTag(16)) goto parse_joinGameFailureReason; + break; + } + + // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; + case 2: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + parse_joinGameFailureReason: int value; DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( @@ -9053,10 +9047,15 @@ bool JoinGameFailedMessage::MergePartialFromCodedStream( void JoinGameFailedMessage::SerializeWithCachedSizes( ::google::protobuf::io::CodedOutputStream* output) const { - // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + // required uint32 gameId = 1; + if (has_gameid()) { + ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->gameid(), output); + } + + // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; if (has_joingamefailurereason()) { ::google::protobuf::internal::WireFormatLite::WriteEnum( - 1, this->joingamefailurereason(), output); + 2, this->joingamefailurereason(), output); } } @@ -9065,7 +9064,14 @@ int JoinGameFailedMessage::ByteSize() const { int total_size = 0; if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { - // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + // required uint32 gameId = 1; + if (has_gameid()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::UInt32Size( + this->gameid()); + } + + // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; if (has_joingamefailurereason()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::EnumSize(this->joingamefailurereason()); @@ -9086,6 +9092,9 @@ void JoinGameFailedMessage::CheckTypeAndMergeFrom( void JoinGameFailedMessage::MergeFrom(const JoinGameFailedMessage& from) { GOOGLE_CHECK_NE(&from, this); if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) { + if (from.has_gameid()) { + set_gameid(from.gameid()); + } if (from.has_joingamefailurereason()) { set_joingamefailurereason(from.joingamefailurereason()); } @@ -9099,13 +9108,14 @@ void JoinGameFailedMessage::CopyFrom(const JoinGameFailedMessage& from) { } bool JoinGameFailedMessage::IsInitialized() const { - if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; + if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false; return true; } void JoinGameFailedMessage::Swap(JoinGameFailedMessage* other) { if (other != this) { + std::swap(gameid_, other->gameid_); std::swap(joingamefailurereason_, other->joingamefailurereason_); std::swap(_has_bits_[0], other->_has_bits_[0]); std::swap(_cached_size_, other->_cached_size_); @@ -21822,6 +21832,8 @@ bool LobbyMessage_LobbyMessageType_IsValid(int value) { case 38: case 39: case 40: + case 41: + case 42: case 1024: return true; default: @@ -21830,8 +21842,7 @@ bool LobbyMessage_LobbyMessageType_IsValid(int value) { } #ifndef _MSC_VER -const LobbyMessage_LobbyMessageType LobbyMessage::Type_InitMessage; -const LobbyMessage_LobbyMessageType LobbyMessage::Type_InitAckMessage; +const LobbyMessage_LobbyMessageType LobbyMessage::Type_InitDoneMessage; const LobbyMessage_LobbyMessageType LobbyMessage::Type_AvatarRequestMessage; const LobbyMessage_LobbyMessageType LobbyMessage::Type_AvatarHeaderMessage; const LobbyMessage_LobbyMessageType LobbyMessage::Type_AvatarDataMessage; @@ -21851,7 +21862,10 @@ const LobbyMessage_LobbyMessageType LobbyMessage::Type_SubscriptionRequestMessag const LobbyMessage_LobbyMessageType LobbyMessage::Type_SubscriptionReplyMessage; const LobbyMessage_LobbyMessageType LobbyMessage::Type_CreateGameMessage; const LobbyMessage_LobbyMessageType LobbyMessage::Type_CreateGameFailedMessage; -const LobbyMessage_LobbyMessageType LobbyMessage::Type_InvitePlayerToGameMessage; +const LobbyMessage_LobbyMessageType LobbyMessage::Type_JoinGameMessage; +const LobbyMessage_LobbyMessageType LobbyMessage::Type_RejoinGameMessage; +const LobbyMessage_LobbyMessageType LobbyMessage::Type_JoinGameAckMessage; +const LobbyMessage_LobbyMessageType LobbyMessage::Type_JoinGameFailedMessage; const LobbyMessage_LobbyMessageType LobbyMessage::Type_InviteNotifyMessage; const LobbyMessage_LobbyMessageType LobbyMessage::Type_RejectGameInvitationMessage; const LobbyMessage_LobbyMessageType LobbyMessage::Type_RejectInvNotifyMessage; @@ -21877,8 +21891,7 @@ const int LobbyMessage::LobbyMessageType_ARRAYSIZE; #endif // _MSC_VER #ifndef _MSC_VER const int LobbyMessage::kMessageTypeFieldNumber; -const int LobbyMessage::kInitMessageFieldNumber; -const int LobbyMessage::kInitAckMessageFieldNumber; +const int LobbyMessage::kInitDoneMessageFieldNumber; const int LobbyMessage::kAvatarRequestMessageFieldNumber; const int LobbyMessage::kAvatarHeaderMessageFieldNumber; const int LobbyMessage::kAvatarDataMessageFieldNumber; @@ -21898,7 +21911,10 @@ const int LobbyMessage::kSubscriptionRequestMessageFieldNumber; const int LobbyMessage::kSubscriptionReplyMessageFieldNumber; const int LobbyMessage::kCreateGameMessageFieldNumber; const int LobbyMessage::kCreateGameFailedMessageFieldNumber; -const int LobbyMessage::kInvitePlayerToGameMessageFieldNumber; +const int LobbyMessage::kJoinGameMessageFieldNumber; +const int LobbyMessage::kRejoinGameMessageFieldNumber; +const int LobbyMessage::kJoinGameAckMessageFieldNumber; +const int LobbyMessage::kJoinGameFailedMessageFieldNumber; const int LobbyMessage::kInviteNotifyMessageFieldNumber; const int LobbyMessage::kRejectGameInvitationMessageFieldNumber; const int LobbyMessage::kRejectInvNotifyMessageFieldNumber; @@ -21927,16 +21943,10 @@ LobbyMessage::LobbyMessage() void LobbyMessage::InitAsDefaultInstance() { #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - initmessage_ = const_cast< ::InitMessage*>( - ::InitMessage::internal_default_instance()); + initdonemessage_ = const_cast< ::InitDoneMessage*>( + ::InitDoneMessage::internal_default_instance()); #else - initmessage_ = const_cast< ::InitMessage*>(&::InitMessage::default_instance()); -#endif -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - initackmessage_ = const_cast< ::InitAckMessage*>( - ::InitAckMessage::internal_default_instance()); -#else - initackmessage_ = const_cast< ::InitAckMessage*>(&::InitAckMessage::default_instance()); + initdonemessage_ = const_cast< ::InitDoneMessage*>(&::InitDoneMessage::default_instance()); #endif #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER avatarrequestmessage_ = const_cast< ::AvatarRequestMessage*>( @@ -22053,10 +22063,28 @@ void LobbyMessage::InitAsDefaultInstance() { creategamefailedmessage_ = const_cast< ::CreateGameFailedMessage*>(&::CreateGameFailedMessage::default_instance()); #endif #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - inviteplayertogamemessage_ = const_cast< ::InvitePlayerToGameMessage*>( - ::InvitePlayerToGameMessage::internal_default_instance()); + joingamemessage_ = const_cast< ::JoinGameMessage*>( + ::JoinGameMessage::internal_default_instance()); #else - inviteplayertogamemessage_ = const_cast< ::InvitePlayerToGameMessage*>(&::InvitePlayerToGameMessage::default_instance()); + joingamemessage_ = const_cast< ::JoinGameMessage*>(&::JoinGameMessage::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + rejoingamemessage_ = const_cast< ::RejoinGameMessage*>( + ::RejoinGameMessage::internal_default_instance()); +#else + rejoingamemessage_ = const_cast< ::RejoinGameMessage*>(&::RejoinGameMessage::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + joingameackmessage_ = const_cast< ::JoinGameAckMessage*>( + ::JoinGameAckMessage::internal_default_instance()); +#else + joingameackmessage_ = const_cast< ::JoinGameAckMessage*>(&::JoinGameAckMessage::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + joingamefailedmessage_ = const_cast< ::JoinGameFailedMessage*>( + ::JoinGameFailedMessage::internal_default_instance()); +#else + joingamefailedmessage_ = const_cast< ::JoinGameFailedMessage*>(&::JoinGameFailedMessage::default_instance()); #endif #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER invitenotifymessage_ = const_cast< ::InviteNotifyMessage*>( @@ -22183,8 +22211,7 @@ LobbyMessage::LobbyMessage(const LobbyMessage& from) void LobbyMessage::SharedCtor() { _cached_size_ = 0; messagetype_ = 1; - initmessage_ = NULL; - initackmessage_ = NULL; + initdonemessage_ = NULL; avatarrequestmessage_ = NULL; avatarheadermessage_ = NULL; avatardatamessage_ = NULL; @@ -22204,7 +22231,10 @@ void LobbyMessage::SharedCtor() { subscriptionreplymessage_ = NULL; creategamemessage_ = NULL; creategamefailedmessage_ = NULL; - inviteplayertogamemessage_ = NULL; + joingamemessage_ = NULL; + rejoingamemessage_ = NULL; + joingameackmessage_ = NULL; + joingamefailedmessage_ = NULL; invitenotifymessage_ = NULL; rejectgameinvitationmessage_ = NULL; rejectinvnotifymessage_ = NULL; @@ -22237,8 +22267,7 @@ void LobbyMessage::SharedDtor() { #else if (this != default_instance_) { #endif - delete initmessage_; - delete initackmessage_; + delete initdonemessage_; delete avatarrequestmessage_; delete avatarheadermessage_; delete avatardatamessage_; @@ -22258,7 +22287,10 @@ void LobbyMessage::SharedDtor() { delete subscriptionreplymessage_; delete creategamemessage_; delete creategamefailedmessage_; - delete inviteplayertogamemessage_; + delete joingamemessage_; + delete rejoingamemessage_; + delete joingameackmessage_; + delete joingamefailedmessage_; delete invitenotifymessage_; delete rejectgameinvitationmessage_; delete rejectinvnotifymessage_; @@ -22304,11 +22336,8 @@ LobbyMessage* LobbyMessage::New() const { void LobbyMessage::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { messagetype_ = 1; - if (has_initmessage()) { - if (initmessage_ != NULL) initmessage_->::InitMessage::Clear(); - } - if (has_initackmessage()) { - if (initackmessage_ != NULL) initackmessage_->::InitAckMessage::Clear(); + if (has_initdonemessage()) { + if (initdonemessage_ != NULL) initdonemessage_->::InitDoneMessage::Clear(); } if (has_avatarrequestmessage()) { if (avatarrequestmessage_ != NULL) avatarrequestmessage_->::AvatarRequestMessage::Clear(); @@ -22325,11 +22354,11 @@ void LobbyMessage::Clear() { if (has_unknownavatarmessage()) { if (unknownavatarmessage_ != NULL) unknownavatarmessage_->::UnknownAvatarMessage::Clear(); } - } - if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (has_playerlistmessage()) { if (playerlistmessage_ != NULL) playerlistmessage_->::PlayerListMessage::Clear(); } + } + if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (has_gamelistnewmessage()) { if (gamelistnewmessage_ != NULL) gamelistnewmessage_->::GameListNewMessage::Clear(); } @@ -22351,11 +22380,11 @@ void LobbyMessage::Clear() { if (has_gamelistadminchangedmessage()) { if (gamelistadminchangedmessage_ != NULL) gamelistadminchangedmessage_->::GameListAdminChangedMessage::Clear(); } - } - if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) { if (has_playerinforequestmessage()) { if (playerinforequestmessage_ != NULL) playerinforequestmessage_->::PlayerInfoRequestMessage::Clear(); } + } + if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) { if (has_playerinforeplymessage()) { if (playerinforeplymessage_ != NULL) playerinforeplymessage_->::PlayerInfoReplyMessage::Clear(); } @@ -22371,14 +22400,23 @@ void LobbyMessage::Clear() { if (has_creategamefailedmessage()) { if (creategamefailedmessage_ != NULL) creategamefailedmessage_->::CreateGameFailedMessage::Clear(); } - if (has_inviteplayertogamemessage()) { - if (inviteplayertogamemessage_ != NULL) inviteplayertogamemessage_->::InvitePlayerToGameMessage::Clear(); + if (has_joingamemessage()) { + if (joingamemessage_ != NULL) joingamemessage_->::JoinGameMessage::Clear(); + } + if (has_rejoingamemessage()) { + if (rejoingamemessage_ != NULL) rejoingamemessage_->::RejoinGameMessage::Clear(); + } + if (has_joingameackmessage()) { + if (joingameackmessage_ != NULL) joingameackmessage_->::JoinGameAckMessage::Clear(); + } + } + if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) { + if (has_joingamefailedmessage()) { + if (joingamefailedmessage_ != NULL) joingamefailedmessage_->::JoinGameFailedMessage::Clear(); } if (has_invitenotifymessage()) { if (invitenotifymessage_ != NULL) invitenotifymessage_->::InviteNotifyMessage::Clear(); } - } - if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) { if (has_rejectgameinvitationmessage()) { if (rejectgameinvitationmessage_ != NULL) rejectgameinvitationmessage_->::RejectGameInvitationMessage::Clear(); } @@ -22397,14 +22435,14 @@ void LobbyMessage::Clear() { if (has_chatrejectmessage()) { if (chatrejectmessage_ != NULL) chatrejectmessage_->::ChatRejectMessage::Clear(); } + } + if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) { if (has_dialogmessage()) { if (dialogmessage_ != NULL) dialogmessage_->::DialogMessage::Clear(); } if (has_timeoutwarningmessage()) { if (timeoutwarningmessage_ != NULL) timeoutwarningmessage_->::TimeoutWarningMessage::Clear(); } - } - if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) { if (has_resettimeoutmessage()) { if (resettimeoutmessage_ != NULL) resettimeoutmessage_->::ResetTimeoutMessage::Clear(); } @@ -22423,14 +22461,14 @@ void LobbyMessage::Clear() { if (has_adminremovegamemessage()) { if (adminremovegamemessage_ != NULL) adminremovegamemessage_->::AdminRemoveGameMessage::Clear(); } + } + if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) { if (has_adminremovegameackmessage()) { if (adminremovegameackmessage_ != NULL) adminremovegameackmessage_->::AdminRemoveGameAckMessage::Clear(); } if (has_adminbanplayermessage()) { if (adminbanplayermessage_ != NULL) adminbanplayermessage_->::AdminBanPlayerMessage::Clear(); } - } - if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) { if (has_adminbanplayerackmessage()) { if (adminbanplayerackmessage_ != NULL) adminbanplayerackmessage_->::AdminBanPlayerAckMessage::Clear(); } @@ -22461,40 +22499,26 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(18)) goto parse_initMessage; + if (input->ExpectTag(18)) goto parse_initDoneMessage; break; } - // optional .InitMessage initMessage = 2; + // optional .InitDoneMessage initDoneMessage = 2; case 2: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_initMessage: + parse_initDoneMessage: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_initmessage())); + input, mutable_initdonemessage())); } else { goto handle_uninterpreted; } - if (input->ExpectTag(26)) goto parse_initAckMessage; + if (input->ExpectTag(26)) goto parse_avatarRequestMessage; break; } - // optional .InitAckMessage initAckMessage = 3; + // optional .AvatarRequestMessage avatarRequestMessage = 3; case 3: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_initAckMessage: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_initackmessage())); - } else { - goto handle_uninterpreted; - } - if (input->ExpectTag(34)) goto parse_avatarRequestMessage; - break; - } - - // optional .AvatarRequestMessage avatarRequestMessage = 4; - case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_avatarRequestMessage: @@ -22503,12 +22527,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(42)) goto parse_avatarHeaderMessage; + if (input->ExpectTag(34)) goto parse_avatarHeaderMessage; break; } - // optional .AvatarHeaderMessage avatarHeaderMessage = 5; - case 5: { + // optional .AvatarHeaderMessage avatarHeaderMessage = 4; + case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_avatarHeaderMessage: @@ -22517,12 +22541,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(50)) goto parse_avatarDataMessage; + if (input->ExpectTag(42)) goto parse_avatarDataMessage; break; } - // optional .AvatarDataMessage avatarDataMessage = 6; - case 6: { + // optional .AvatarDataMessage avatarDataMessage = 5; + case 5: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_avatarDataMessage: @@ -22531,12 +22555,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(58)) goto parse_avatarEndMessage; + if (input->ExpectTag(50)) goto parse_avatarEndMessage; break; } - // optional .AvatarEndMessage avatarEndMessage = 7; - case 7: { + // optional .AvatarEndMessage avatarEndMessage = 6; + case 6: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_avatarEndMessage: @@ -22545,12 +22569,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(66)) goto parse_unknownAvatarMessage; + if (input->ExpectTag(58)) goto parse_unknownAvatarMessage; break; } - // optional .UnknownAvatarMessage unknownAvatarMessage = 8; - case 8: { + // optional .UnknownAvatarMessage unknownAvatarMessage = 7; + case 7: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_unknownAvatarMessage: @@ -22559,12 +22583,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(74)) goto parse_playerListMessage; + if (input->ExpectTag(66)) goto parse_playerListMessage; break; } - // optional .PlayerListMessage playerListMessage = 9; - case 9: { + // optional .PlayerListMessage playerListMessage = 8; + case 8: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_playerListMessage: @@ -22573,12 +22597,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(82)) goto parse_gameListNewMessage; + if (input->ExpectTag(74)) goto parse_gameListNewMessage; break; } - // optional .GameListNewMessage gameListNewMessage = 10; - case 10: { + // optional .GameListNewMessage gameListNewMessage = 9; + case 9: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameListNewMessage: @@ -22587,12 +22611,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(90)) goto parse_gameListUpdateMessage; + if (input->ExpectTag(82)) goto parse_gameListUpdateMessage; break; } - // optional .GameListUpdateMessage gameListUpdateMessage = 11; - case 11: { + // optional .GameListUpdateMessage gameListUpdateMessage = 10; + case 10: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameListUpdateMessage: @@ -22601,12 +22625,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(98)) goto parse_gameListPlayerJoinedMessage; + if (input->ExpectTag(90)) goto parse_gameListPlayerJoinedMessage; break; } - // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; - case 12: { + // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; + case 11: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameListPlayerJoinedMessage: @@ -22615,12 +22639,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(106)) goto parse_gameListPlayerLeftMessage; + if (input->ExpectTag(98)) goto parse_gameListPlayerLeftMessage; break; } - // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; - case 13: { + // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; + case 12: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameListPlayerLeftMessage: @@ -22629,12 +22653,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(114)) goto parse_gameListSpectatorJoinedMessage; + if (input->ExpectTag(106)) goto parse_gameListSpectatorJoinedMessage; break; } - // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; - case 14: { + // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; + case 13: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameListSpectatorJoinedMessage: @@ -22643,12 +22667,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(122)) goto parse_gameListSpectatorLeftMessage; + if (input->ExpectTag(114)) goto parse_gameListSpectatorLeftMessage; break; } - // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; - case 15: { + // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; + case 14: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameListSpectatorLeftMessage: @@ -22657,12 +22681,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(130)) goto parse_gameListAdminChangedMessage; + if (input->ExpectTag(122)) goto parse_gameListAdminChangedMessage; break; } - // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; - case 16: { + // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; + case 15: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameListAdminChangedMessage: @@ -22671,12 +22695,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(138)) goto parse_playerInfoRequestMessage; + if (input->ExpectTag(130)) goto parse_playerInfoRequestMessage; break; } - // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; - case 17: { + // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; + case 16: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_playerInfoRequestMessage: @@ -22685,12 +22709,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(146)) goto parse_playerInfoReplyMessage; + if (input->ExpectTag(138)) goto parse_playerInfoReplyMessage; break; } - // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; - case 18: { + // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; + case 17: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_playerInfoReplyMessage: @@ -22699,12 +22723,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(154)) goto parse_subscriptionRequestMessage; + if (input->ExpectTag(146)) goto parse_subscriptionRequestMessage; break; } - // optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; - case 19: { + // optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; + case 18: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_subscriptionRequestMessage: @@ -22713,12 +22737,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(162)) goto parse_subscriptionReplyMessage; + if (input->ExpectTag(154)) goto parse_subscriptionReplyMessage; break; } - // optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; - case 20: { + // optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; + case 19: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_subscriptionReplyMessage: @@ -22727,12 +22751,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(170)) goto parse_createGameMessage; + if (input->ExpectTag(162)) goto parse_createGameMessage; break; } - // optional .CreateGameMessage createGameMessage = 21; - case 21: { + // optional .CreateGameMessage createGameMessage = 20; + case 20: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_createGameMessage: @@ -22741,12 +22765,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(178)) goto parse_createGameFailedMessage; + if (input->ExpectTag(170)) goto parse_createGameFailedMessage; break; } - // optional .CreateGameFailedMessage createGameFailedMessage = 22; - case 22: { + // optional .CreateGameFailedMessage createGameFailedMessage = 21; + case 21: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_createGameFailedMessage: @@ -22755,26 +22779,68 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(186)) goto parse_invitePlayerToGameMessage; + if (input->ExpectTag(178)) goto parse_joinGameMessage; break; } - // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; - case 23: { + // optional .JoinGameMessage joinGameMessage = 22; + case 22: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_invitePlayerToGameMessage: + parse_joinGameMessage: DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_inviteplayertogamemessage())); + input, mutable_joingamemessage())); } else { goto handle_uninterpreted; } - if (input->ExpectTag(194)) goto parse_inviteNotifyMessage; + if (input->ExpectTag(186)) goto parse_rejoinGameMessage; break; } - // optional .InviteNotifyMessage inviteNotifyMessage = 24; + // optional .RejoinGameMessage rejoinGameMessage = 23; + case 23: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + parse_rejoinGameMessage: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_rejoingamemessage())); + } else { + goto handle_uninterpreted; + } + if (input->ExpectTag(194)) goto parse_joinGameAckMessage; + break; + } + + // optional .JoinGameAckMessage joinGameAckMessage = 24; case 24: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + parse_joinGameAckMessage: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_joingameackmessage())); + } else { + goto handle_uninterpreted; + } + if (input->ExpectTag(202)) goto parse_joinGameFailedMessage; + break; + } + + // optional .JoinGameFailedMessage joinGameFailedMessage = 25; + case 25: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + parse_joinGameFailedMessage: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_joingamefailedmessage())); + } else { + goto handle_uninterpreted; + } + if (input->ExpectTag(210)) goto parse_inviteNotifyMessage; + break; + } + + // optional .InviteNotifyMessage inviteNotifyMessage = 26; + case 26: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_inviteNotifyMessage: @@ -22783,12 +22849,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(202)) goto parse_rejectGameInvitationMessage; + if (input->ExpectTag(218)) goto parse_rejectGameInvitationMessage; break; } - // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; - case 25: { + // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; + case 27: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_rejectGameInvitationMessage: @@ -22797,12 +22863,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(210)) goto parse_rejectInvNotifyMessage; + if (input->ExpectTag(226)) goto parse_rejectInvNotifyMessage; break; } - // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; - case 26: { + // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; + case 28: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_rejectInvNotifyMessage: @@ -22811,12 +22877,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(218)) goto parse_statisticsMessage; + if (input->ExpectTag(234)) goto parse_statisticsMessage; break; } - // optional .StatisticsMessage statisticsMessage = 27; - case 27: { + // optional .StatisticsMessage statisticsMessage = 29; + case 29: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_statisticsMessage: @@ -22825,12 +22891,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(226)) goto parse_chatRequestMessage; + if (input->ExpectTag(242)) goto parse_chatRequestMessage; break; } - // optional .ChatRequestMessage chatRequestMessage = 28; - case 28: { + // optional .ChatRequestMessage chatRequestMessage = 30; + case 30: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_chatRequestMessage: @@ -22839,12 +22905,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(234)) goto parse_chatMessage; + if (input->ExpectTag(250)) goto parse_chatMessage; break; } - // optional .ChatMessage chatMessage = 29; - case 29: { + // optional .ChatMessage chatMessage = 31; + case 31: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_chatMessage: @@ -22853,12 +22919,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(242)) goto parse_chatRejectMessage; + if (input->ExpectTag(258)) goto parse_chatRejectMessage; break; } - // optional .ChatRejectMessage chatRejectMessage = 30; - case 30: { + // optional .ChatRejectMessage chatRejectMessage = 32; + case 32: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_chatRejectMessage: @@ -22867,12 +22933,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(250)) goto parse_dialogMessage; + if (input->ExpectTag(266)) goto parse_dialogMessage; break; } - // optional .DialogMessage dialogMessage = 31; - case 31: { + // optional .DialogMessage dialogMessage = 33; + case 33: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_dialogMessage: @@ -22881,12 +22947,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(258)) goto parse_timeoutWarningMessage; + if (input->ExpectTag(274)) goto parse_timeoutWarningMessage; break; } - // optional .TimeoutWarningMessage timeoutWarningMessage = 32; - case 32: { + // optional .TimeoutWarningMessage timeoutWarningMessage = 34; + case 34: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_timeoutWarningMessage: @@ -22895,12 +22961,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(266)) goto parse_resetTimeoutMessage; + if (input->ExpectTag(282)) goto parse_resetTimeoutMessage; break; } - // optional .ResetTimeoutMessage resetTimeoutMessage = 33; - case 33: { + // optional .ResetTimeoutMessage resetTimeoutMessage = 35; + case 35: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_resetTimeoutMessage: @@ -22909,12 +22975,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(274)) goto parse_reportAvatarMessage; + if (input->ExpectTag(290)) goto parse_reportAvatarMessage; break; } - // optional .ReportAvatarMessage reportAvatarMessage = 34; - case 34: { + // optional .ReportAvatarMessage reportAvatarMessage = 36; + case 36: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_reportAvatarMessage: @@ -22923,12 +22989,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(282)) goto parse_reportAvatarAckMessage; + if (input->ExpectTag(298)) goto parse_reportAvatarAckMessage; break; } - // optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; - case 35: { + // optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; + case 37: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_reportAvatarAckMessage: @@ -22937,12 +23003,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(290)) goto parse_reportGameMessage; + if (input->ExpectTag(306)) goto parse_reportGameMessage; break; } - // optional .ReportGameMessage reportGameMessage = 36; - case 36: { + // optional .ReportGameMessage reportGameMessage = 38; + case 38: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_reportGameMessage: @@ -22951,12 +23017,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(298)) goto parse_reportGameAckMessage; + if (input->ExpectTag(314)) goto parse_reportGameAckMessage; break; } - // optional .ReportGameAckMessage reportGameAckMessage = 37; - case 37: { + // optional .ReportGameAckMessage reportGameAckMessage = 39; + case 39: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_reportGameAckMessage: @@ -22965,12 +23031,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(306)) goto parse_adminRemoveGameMessage; + if (input->ExpectTag(322)) goto parse_adminRemoveGameMessage; break; } - // optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; - case 38: { + // optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; + case 40: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_adminRemoveGameMessage: @@ -22979,12 +23045,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(314)) goto parse_adminRemoveGameAckMessage; + if (input->ExpectTag(330)) goto parse_adminRemoveGameAckMessage; break; } - // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; - case 39: { + // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; + case 41: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_adminRemoveGameAckMessage: @@ -22993,12 +23059,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(322)) goto parse_adminBanPlayerMessage; + if (input->ExpectTag(338)) goto parse_adminBanPlayerMessage; break; } - // optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; - case 40: { + // optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; + case 42: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_adminBanPlayerMessage: @@ -23007,12 +23073,12 @@ bool LobbyMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(330)) goto parse_adminBanPlayerAckMessage; + if (input->ExpectTag(346)) goto parse_adminBanPlayerAckMessage; break; } - // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; - case 41: { + // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; + case 43: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_adminBanPlayerAckMessage: @@ -23062,244 +23128,256 @@ void LobbyMessage::SerializeWithCachedSizes( 1, this->messagetype(), output); } - // optional .InitMessage initMessage = 2; - if (has_initmessage()) { + // optional .InitDoneMessage initDoneMessage = 2; + if (has_initdonemessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, this->initmessage(), output); + 2, this->initdonemessage(), output); } - // optional .InitAckMessage initAckMessage = 3; - if (has_initackmessage()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 3, this->initackmessage(), output); - } - - // optional .AvatarRequestMessage avatarRequestMessage = 4; + // optional .AvatarRequestMessage avatarRequestMessage = 3; if (has_avatarrequestmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 4, this->avatarrequestmessage(), output); + 3, this->avatarrequestmessage(), output); } - // optional .AvatarHeaderMessage avatarHeaderMessage = 5; + // optional .AvatarHeaderMessage avatarHeaderMessage = 4; if (has_avatarheadermessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 5, this->avatarheadermessage(), output); + 4, this->avatarheadermessage(), output); } - // optional .AvatarDataMessage avatarDataMessage = 6; + // optional .AvatarDataMessage avatarDataMessage = 5; if (has_avatardatamessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 6, this->avatardatamessage(), output); + 5, this->avatardatamessage(), output); } - // optional .AvatarEndMessage avatarEndMessage = 7; + // optional .AvatarEndMessage avatarEndMessage = 6; if (has_avatarendmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 7, this->avatarendmessage(), output); + 6, this->avatarendmessage(), output); } - // optional .UnknownAvatarMessage unknownAvatarMessage = 8; + // optional .UnknownAvatarMessage unknownAvatarMessage = 7; if (has_unknownavatarmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 8, this->unknownavatarmessage(), output); + 7, this->unknownavatarmessage(), output); } - // optional .PlayerListMessage playerListMessage = 9; + // optional .PlayerListMessage playerListMessage = 8; if (has_playerlistmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 9, this->playerlistmessage(), output); + 8, this->playerlistmessage(), output); } - // optional .GameListNewMessage gameListNewMessage = 10; + // optional .GameListNewMessage gameListNewMessage = 9; if (has_gamelistnewmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 10, this->gamelistnewmessage(), output); + 9, this->gamelistnewmessage(), output); } - // optional .GameListUpdateMessage gameListUpdateMessage = 11; + // optional .GameListUpdateMessage gameListUpdateMessage = 10; if (has_gamelistupdatemessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 11, this->gamelistupdatemessage(), output); + 10, this->gamelistupdatemessage(), output); } - // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; if (has_gamelistplayerjoinedmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 12, this->gamelistplayerjoinedmessage(), output); + 11, this->gamelistplayerjoinedmessage(), output); } - // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; if (has_gamelistplayerleftmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 13, this->gamelistplayerleftmessage(), output); + 12, this->gamelistplayerleftmessage(), output); } - // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; if (has_gamelistspectatorjoinedmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 14, this->gamelistspectatorjoinedmessage(), output); + 13, this->gamelistspectatorjoinedmessage(), output); } - // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; if (has_gamelistspectatorleftmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 15, this->gamelistspectatorleftmessage(), output); + 14, this->gamelistspectatorleftmessage(), output); } - // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; if (has_gamelistadminchangedmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 16, this->gamelistadminchangedmessage(), output); + 15, this->gamelistadminchangedmessage(), output); } - // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; if (has_playerinforequestmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 17, this->playerinforequestmessage(), output); + 16, this->playerinforequestmessage(), output); } - // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; if (has_playerinforeplymessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 18, this->playerinforeplymessage(), output); + 17, this->playerinforeplymessage(), output); } - // optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + // optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; if (has_subscriptionrequestmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 19, this->subscriptionrequestmessage(), output); + 18, this->subscriptionrequestmessage(), output); } - // optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + // optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; if (has_subscriptionreplymessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 20, this->subscriptionreplymessage(), output); + 19, this->subscriptionreplymessage(), output); } - // optional .CreateGameMessage createGameMessage = 21; + // optional .CreateGameMessage createGameMessage = 20; if (has_creategamemessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 21, this->creategamemessage(), output); + 20, this->creategamemessage(), output); } - // optional .CreateGameFailedMessage createGameFailedMessage = 22; + // optional .CreateGameFailedMessage createGameFailedMessage = 21; if (has_creategamefailedmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 22, this->creategamefailedmessage(), output); + 21, this->creategamefailedmessage(), output); } - // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; - if (has_inviteplayertogamemessage()) { + // optional .JoinGameMessage joinGameMessage = 22; + if (has_joingamemessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 23, this->inviteplayertogamemessage(), output); + 22, this->joingamemessage(), output); } - // optional .InviteNotifyMessage inviteNotifyMessage = 24; + // optional .RejoinGameMessage rejoinGameMessage = 23; + if (has_rejoingamemessage()) { + ::google::protobuf::internal::WireFormatLite::WriteMessage( + 23, this->rejoingamemessage(), output); + } + + // optional .JoinGameAckMessage joinGameAckMessage = 24; + if (has_joingameackmessage()) { + ::google::protobuf::internal::WireFormatLite::WriteMessage( + 24, this->joingameackmessage(), output); + } + + // optional .JoinGameFailedMessage joinGameFailedMessage = 25; + if (has_joingamefailedmessage()) { + ::google::protobuf::internal::WireFormatLite::WriteMessage( + 25, this->joingamefailedmessage(), output); + } + + // optional .InviteNotifyMessage inviteNotifyMessage = 26; if (has_invitenotifymessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 24, this->invitenotifymessage(), output); + 26, this->invitenotifymessage(), output); } - // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; if (has_rejectgameinvitationmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 25, this->rejectgameinvitationmessage(), output); + 27, this->rejectgameinvitationmessage(), output); } - // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; if (has_rejectinvnotifymessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 26, this->rejectinvnotifymessage(), output); + 28, this->rejectinvnotifymessage(), output); } - // optional .StatisticsMessage statisticsMessage = 27; + // optional .StatisticsMessage statisticsMessage = 29; if (has_statisticsmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 27, this->statisticsmessage(), output); + 29, this->statisticsmessage(), output); } - // optional .ChatRequestMessage chatRequestMessage = 28; + // optional .ChatRequestMessage chatRequestMessage = 30; if (has_chatrequestmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 28, this->chatrequestmessage(), output); + 30, this->chatrequestmessage(), output); } - // optional .ChatMessage chatMessage = 29; + // optional .ChatMessage chatMessage = 31; if (has_chatmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 29, this->chatmessage(), output); + 31, this->chatmessage(), output); } - // optional .ChatRejectMessage chatRejectMessage = 30; + // optional .ChatRejectMessage chatRejectMessage = 32; if (has_chatrejectmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 30, this->chatrejectmessage(), output); + 32, this->chatrejectmessage(), output); } - // optional .DialogMessage dialogMessage = 31; + // optional .DialogMessage dialogMessage = 33; if (has_dialogmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 31, this->dialogmessage(), output); + 33, this->dialogmessage(), output); } - // optional .TimeoutWarningMessage timeoutWarningMessage = 32; + // optional .TimeoutWarningMessage timeoutWarningMessage = 34; if (has_timeoutwarningmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 32, this->timeoutwarningmessage(), output); + 34, this->timeoutwarningmessage(), output); } - // optional .ResetTimeoutMessage resetTimeoutMessage = 33; + // optional .ResetTimeoutMessage resetTimeoutMessage = 35; if (has_resettimeoutmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 33, this->resettimeoutmessage(), output); + 35, this->resettimeoutmessage(), output); } - // optional .ReportAvatarMessage reportAvatarMessage = 34; + // optional .ReportAvatarMessage reportAvatarMessage = 36; if (has_reportavatarmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 34, this->reportavatarmessage(), output); + 36, this->reportavatarmessage(), output); } - // optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + // optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; if (has_reportavatarackmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 35, this->reportavatarackmessage(), output); + 37, this->reportavatarackmessage(), output); } - // optional .ReportGameMessage reportGameMessage = 36; + // optional .ReportGameMessage reportGameMessage = 38; if (has_reportgamemessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 36, this->reportgamemessage(), output); + 38, this->reportgamemessage(), output); } - // optional .ReportGameAckMessage reportGameAckMessage = 37; + // optional .ReportGameAckMessage reportGameAckMessage = 39; if (has_reportgameackmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 37, this->reportgameackmessage(), output); + 39, this->reportgameackmessage(), output); } - // optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + // optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; if (has_adminremovegamemessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 38, this->adminremovegamemessage(), output); + 40, this->adminremovegamemessage(), output); } - // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; if (has_adminremovegameackmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 39, this->adminremovegameackmessage(), output); + 41, this->adminremovegameackmessage(), output); } - // optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + // optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; if (has_adminbanplayermessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 40, this->adminbanplayermessage(), output); + 42, this->adminbanplayermessage(), output); } - // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; if (has_adminbanplayerackmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 41, this->adminbanplayerackmessage(), output); + 43, this->adminbanplayerackmessage(), output); } // optional .ErrorMessage errorMessage = 1025; @@ -23320,290 +23398,304 @@ int LobbyMessage::ByteSize() const { ::google::protobuf::internal::WireFormatLite::EnumSize(this->messagetype()); } - // optional .InitMessage initMessage = 2; - if (has_initmessage()) { + // optional .InitDoneMessage initDoneMessage = 2; + if (has_initdonemessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->initmessage()); + this->initdonemessage()); } - // optional .InitAckMessage initAckMessage = 3; - if (has_initackmessage()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->initackmessage()); - } - - // optional .AvatarRequestMessage avatarRequestMessage = 4; + // optional .AvatarRequestMessage avatarRequestMessage = 3; if (has_avatarrequestmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->avatarrequestmessage()); } - // optional .AvatarHeaderMessage avatarHeaderMessage = 5; + // optional .AvatarHeaderMessage avatarHeaderMessage = 4; if (has_avatarheadermessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->avatarheadermessage()); } - // optional .AvatarDataMessage avatarDataMessage = 6; + // optional .AvatarDataMessage avatarDataMessage = 5; if (has_avatardatamessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->avatardatamessage()); } - // optional .AvatarEndMessage avatarEndMessage = 7; + // optional .AvatarEndMessage avatarEndMessage = 6; if (has_avatarendmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->avatarendmessage()); } - // optional .UnknownAvatarMessage unknownAvatarMessage = 8; + // optional .UnknownAvatarMessage unknownAvatarMessage = 7; if (has_unknownavatarmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->unknownavatarmessage()); } - } - if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) { - // optional .PlayerListMessage playerListMessage = 9; + // optional .PlayerListMessage playerListMessage = 8; if (has_playerlistmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->playerlistmessage()); } - // optional .GameListNewMessage gameListNewMessage = 10; + } + if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) { + // optional .GameListNewMessage gameListNewMessage = 9; if (has_gamelistnewmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamelistnewmessage()); } - // optional .GameListUpdateMessage gameListUpdateMessage = 11; + // optional .GameListUpdateMessage gameListUpdateMessage = 10; if (has_gamelistupdatemessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamelistupdatemessage()); } - // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; if (has_gamelistplayerjoinedmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamelistplayerjoinedmessage()); } - // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; if (has_gamelistplayerleftmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamelistplayerleftmessage()); } - // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; if (has_gamelistspectatorjoinedmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamelistspectatorjoinedmessage()); } - // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; if (has_gamelistspectatorleftmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamelistspectatorleftmessage()); } - // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; if (has_gamelistadminchangedmessage()) { - total_size += 2 + + total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamelistadminchangedmessage()); } - } - if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) { - // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; if (has_playerinforequestmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->playerinforequestmessage()); } - // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + } + if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) { + // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; if (has_playerinforeplymessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->playerinforeplymessage()); } - // optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + // optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; if (has_subscriptionrequestmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->subscriptionrequestmessage()); } - // optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + // optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; if (has_subscriptionreplymessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->subscriptionreplymessage()); } - // optional .CreateGameMessage createGameMessage = 21; + // optional .CreateGameMessage createGameMessage = 20; if (has_creategamemessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->creategamemessage()); } - // optional .CreateGameFailedMessage createGameFailedMessage = 22; + // optional .CreateGameFailedMessage createGameFailedMessage = 21; if (has_creategamefailedmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->creategamefailedmessage()); } - // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; - if (has_inviteplayertogamemessage()) { + // optional .JoinGameMessage joinGameMessage = 22; + if (has_joingamemessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->inviteplayertogamemessage()); + this->joingamemessage()); } - // optional .InviteNotifyMessage inviteNotifyMessage = 24; + // optional .RejoinGameMessage rejoinGameMessage = 23; + if (has_rejoingamemessage()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->rejoingamemessage()); + } + + // optional .JoinGameAckMessage joinGameAckMessage = 24; + if (has_joingameackmessage()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->joingameackmessage()); + } + + } + if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) { + // optional .JoinGameFailedMessage joinGameFailedMessage = 25; + if (has_joingamefailedmessage()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->joingamefailedmessage()); + } + + // optional .InviteNotifyMessage inviteNotifyMessage = 26; if (has_invitenotifymessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->invitenotifymessage()); } - } - if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) { - // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; if (has_rejectgameinvitationmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->rejectgameinvitationmessage()); } - // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; if (has_rejectinvnotifymessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->rejectinvnotifymessage()); } - // optional .StatisticsMessage statisticsMessage = 27; + // optional .StatisticsMessage statisticsMessage = 29; if (has_statisticsmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->statisticsmessage()); } - // optional .ChatRequestMessage chatRequestMessage = 28; + // optional .ChatRequestMessage chatRequestMessage = 30; if (has_chatrequestmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->chatrequestmessage()); } - // optional .ChatMessage chatMessage = 29; + // optional .ChatMessage chatMessage = 31; if (has_chatmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->chatmessage()); } - // optional .ChatRejectMessage chatRejectMessage = 30; + // optional .ChatRejectMessage chatRejectMessage = 32; if (has_chatrejectmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->chatrejectmessage()); } - // optional .DialogMessage dialogMessage = 31; + } + if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) { + // optional .DialogMessage dialogMessage = 33; if (has_dialogmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->dialogmessage()); } - // optional .TimeoutWarningMessage timeoutWarningMessage = 32; + // optional .TimeoutWarningMessage timeoutWarningMessage = 34; if (has_timeoutwarningmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->timeoutwarningmessage()); } - } - if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) { - // optional .ResetTimeoutMessage resetTimeoutMessage = 33; + // optional .ResetTimeoutMessage resetTimeoutMessage = 35; if (has_resettimeoutmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->resettimeoutmessage()); } - // optional .ReportAvatarMessage reportAvatarMessage = 34; + // optional .ReportAvatarMessage reportAvatarMessage = 36; if (has_reportavatarmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->reportavatarmessage()); } - // optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + // optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; if (has_reportavatarackmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->reportavatarackmessage()); } - // optional .ReportGameMessage reportGameMessage = 36; + // optional .ReportGameMessage reportGameMessage = 38; if (has_reportgamemessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->reportgamemessage()); } - // optional .ReportGameAckMessage reportGameAckMessage = 37; + // optional .ReportGameAckMessage reportGameAckMessage = 39; if (has_reportgameackmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->reportgameackmessage()); } - // optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + // optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; if (has_adminremovegamemessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->adminremovegamemessage()); } - // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + } + if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) { + // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; if (has_adminremovegameackmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->adminremovegameackmessage()); } - // optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + // optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; if (has_adminbanplayermessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->adminbanplayermessage()); } - } - if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) { - // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; if (has_adminbanplayerackmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( @@ -23635,11 +23727,8 @@ void LobbyMessage::MergeFrom(const LobbyMessage& from) { if (from.has_messagetype()) { set_messagetype(from.messagetype()); } - if (from.has_initmessage()) { - mutable_initmessage()->::InitMessage::MergeFrom(from.initmessage()); - } - if (from.has_initackmessage()) { - mutable_initackmessage()->::InitAckMessage::MergeFrom(from.initackmessage()); + if (from.has_initdonemessage()) { + mutable_initdonemessage()->::InitDoneMessage::MergeFrom(from.initdonemessage()); } if (from.has_avatarrequestmessage()) { mutable_avatarrequestmessage()->::AvatarRequestMessage::MergeFrom(from.avatarrequestmessage()); @@ -23656,11 +23745,11 @@ void LobbyMessage::MergeFrom(const LobbyMessage& from) { if (from.has_unknownavatarmessage()) { mutable_unknownavatarmessage()->::UnknownAvatarMessage::MergeFrom(from.unknownavatarmessage()); } - } - if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (from.has_playerlistmessage()) { mutable_playerlistmessage()->::PlayerListMessage::MergeFrom(from.playerlistmessage()); } + } + if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (from.has_gamelistnewmessage()) { mutable_gamelistnewmessage()->::GameListNewMessage::MergeFrom(from.gamelistnewmessage()); } @@ -23682,11 +23771,11 @@ void LobbyMessage::MergeFrom(const LobbyMessage& from) { if (from.has_gamelistadminchangedmessage()) { mutable_gamelistadminchangedmessage()->::GameListAdminChangedMessage::MergeFrom(from.gamelistadminchangedmessage()); } - } - if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) { if (from.has_playerinforequestmessage()) { mutable_playerinforequestmessage()->::PlayerInfoRequestMessage::MergeFrom(from.playerinforequestmessage()); } + } + if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) { if (from.has_playerinforeplymessage()) { mutable_playerinforeplymessage()->::PlayerInfoReplyMessage::MergeFrom(from.playerinforeplymessage()); } @@ -23702,14 +23791,23 @@ void LobbyMessage::MergeFrom(const LobbyMessage& from) { if (from.has_creategamefailedmessage()) { mutable_creategamefailedmessage()->::CreateGameFailedMessage::MergeFrom(from.creategamefailedmessage()); } - if (from.has_inviteplayertogamemessage()) { - mutable_inviteplayertogamemessage()->::InvitePlayerToGameMessage::MergeFrom(from.inviteplayertogamemessage()); + if (from.has_joingamemessage()) { + mutable_joingamemessage()->::JoinGameMessage::MergeFrom(from.joingamemessage()); + } + if (from.has_rejoingamemessage()) { + mutable_rejoingamemessage()->::RejoinGameMessage::MergeFrom(from.rejoingamemessage()); + } + if (from.has_joingameackmessage()) { + mutable_joingameackmessage()->::JoinGameAckMessage::MergeFrom(from.joingameackmessage()); + } + } + if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) { + if (from.has_joingamefailedmessage()) { + mutable_joingamefailedmessage()->::JoinGameFailedMessage::MergeFrom(from.joingamefailedmessage()); } if (from.has_invitenotifymessage()) { mutable_invitenotifymessage()->::InviteNotifyMessage::MergeFrom(from.invitenotifymessage()); } - } - if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) { if (from.has_rejectgameinvitationmessage()) { mutable_rejectgameinvitationmessage()->::RejectGameInvitationMessage::MergeFrom(from.rejectgameinvitationmessage()); } @@ -23728,14 +23826,14 @@ void LobbyMessage::MergeFrom(const LobbyMessage& from) { if (from.has_chatrejectmessage()) { mutable_chatrejectmessage()->::ChatRejectMessage::MergeFrom(from.chatrejectmessage()); } + } + if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) { if (from.has_dialogmessage()) { mutable_dialogmessage()->::DialogMessage::MergeFrom(from.dialogmessage()); } if (from.has_timeoutwarningmessage()) { mutable_timeoutwarningmessage()->::TimeoutWarningMessage::MergeFrom(from.timeoutwarningmessage()); } - } - if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) { if (from.has_resettimeoutmessage()) { mutable_resettimeoutmessage()->::ResetTimeoutMessage::MergeFrom(from.resettimeoutmessage()); } @@ -23754,14 +23852,14 @@ void LobbyMessage::MergeFrom(const LobbyMessage& from) { if (from.has_adminremovegamemessage()) { mutable_adminremovegamemessage()->::AdminRemoveGameMessage::MergeFrom(from.adminremovegamemessage()); } + } + if (from._has_bits_[40 / 32] & (0xffu << (40 % 32))) { if (from.has_adminremovegameackmessage()) { mutable_adminremovegameackmessage()->::AdminRemoveGameAckMessage::MergeFrom(from.adminremovegameackmessage()); } if (from.has_adminbanplayermessage()) { mutable_adminbanplayermessage()->::AdminBanPlayerMessage::MergeFrom(from.adminbanplayermessage()); } - } - if (from._has_bits_[40 / 32] & (0xffu << (40 % 32))) { if (from.has_adminbanplayerackmessage()) { mutable_adminbanplayerackmessage()->::AdminBanPlayerAckMessage::MergeFrom(from.adminbanplayerackmessage()); } @@ -23780,6 +23878,9 @@ void LobbyMessage::CopyFrom(const LobbyMessage& from) { bool LobbyMessage::IsInitialized() const { if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; + if (has_initdonemessage()) { + if (!this->initdonemessage().IsInitialized()) return false; + } if (has_avatarrequestmessage()) { if (!this->avatarrequestmessage().IsInitialized()) return false; } @@ -23834,8 +23935,17 @@ bool LobbyMessage::IsInitialized() const { if (has_creategamefailedmessage()) { if (!this->creategamefailedmessage().IsInitialized()) return false; } - if (has_inviteplayertogamemessage()) { - if (!this->inviteplayertogamemessage().IsInitialized()) return false; + if (has_joingamemessage()) { + if (!this->joingamemessage().IsInitialized()) return false; + } + if (has_rejoingamemessage()) { + if (!this->rejoingamemessage().IsInitialized()) return false; + } + if (has_joingameackmessage()) { + if (!this->joingameackmessage().IsInitialized()) return false; + } + if (has_joingamefailedmessage()) { + if (!this->joingamefailedmessage().IsInitialized()) return false; } if (has_invitenotifymessage()) { if (!this->invitenotifymessage().IsInitialized()) return false; @@ -23897,8 +24007,7 @@ bool LobbyMessage::IsInitialized() const { void LobbyMessage::Swap(LobbyMessage* other) { if (other != this) { std::swap(messagetype_, other->messagetype_); - std::swap(initmessage_, other->initmessage_); - std::swap(initackmessage_, other->initackmessage_); + std::swap(initdonemessage_, other->initdonemessage_); std::swap(avatarrequestmessage_, other->avatarrequestmessage_); std::swap(avatarheadermessage_, other->avatarheadermessage_); std::swap(avatardatamessage_, other->avatardatamessage_); @@ -23918,7 +24027,10 @@ void LobbyMessage::Swap(LobbyMessage* other) { std::swap(subscriptionreplymessage_, other->subscriptionreplymessage_); std::swap(creategamemessage_, other->creategamemessage_); std::swap(creategamefailedmessage_, other->creategamefailedmessage_); - std::swap(inviteplayertogamemessage_, other->inviteplayertogamemessage_); + std::swap(joingamemessage_, other->joingamemessage_); + std::swap(rejoingamemessage_, other->rejoingamemessage_); + std::swap(joingameackmessage_, other->joingameackmessage_); + std::swap(joingamefailedmessage_, other->joingamefailedmessage_); std::swap(invitenotifymessage_, other->invitenotifymessage_); std::swap(rejectgameinvitationmessage_, other->rejectgameinvitationmessage_); std::swap(rejectinvnotifymessage_, other->rejectinvnotifymessage_); @@ -23980,7 +24092,6 @@ bool GameManagementMessage_GameManagementMessageType_IsValid(int value) { case 25: case 26: case 27: - case 28: case 1024: return true; default: @@ -23989,10 +24100,6 @@ bool GameManagementMessage_GameManagementMessageType_IsValid(int value) { } #ifndef _MSC_VER -const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_JoinGameMessage; -const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_RejoinGameMessage; -const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_JoinGameAckMessage; -const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_JoinGameFailedMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_GamePlayerJoinedMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_GamePlayerLeftMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_GameSpectatorJoinedMessage; @@ -24001,6 +24108,7 @@ const GameManagementMessage_GameManagementMessageType GameManagementMessage::Typ const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_RemovedFromGameMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_KickPlayerRequestMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_LeaveGameRequestMessage; +const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_InvitePlayerToGameMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_StartEventMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_StartEventAckMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_GameStartInitialMessage; @@ -24017,6 +24125,8 @@ const GameManagementMessage_GameManagementMessageType GameManagementMessage::Typ const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_ChatRequestMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_ChatMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_ChatRejectMessage; +const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_TimeoutWarningMessage; +const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_ResetTimeoutMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::Type_ErrorMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage::GameManagementMessageType_MIN; const GameManagementMessage_GameManagementMessageType GameManagementMessage::GameManagementMessageType_MAX; @@ -24024,10 +24134,6 @@ const int GameManagementMessage::GameManagementMessageType_ARRAYSIZE; #endif // _MSC_VER #ifndef _MSC_VER const int GameManagementMessage::kMessageTypeFieldNumber; -const int GameManagementMessage::kJoinGameMessageFieldNumber; -const int GameManagementMessage::kRejoinGameMessageFieldNumber; -const int GameManagementMessage::kJoinGameAckMessageFieldNumber; -const int GameManagementMessage::kJoinGameFailedMessageFieldNumber; const int GameManagementMessage::kGamePlayerJoinedMessageFieldNumber; const int GameManagementMessage::kGamePlayerLeftMessageFieldNumber; const int GameManagementMessage::kGameSpectatorJoinedMessageFieldNumber; @@ -24036,6 +24142,7 @@ const int GameManagementMessage::kGameAdminChangedMessageFieldNumber; const int GameManagementMessage::kRemovedFromGameMessageFieldNumber; const int GameManagementMessage::kKickPlayerRequestMessageFieldNumber; const int GameManagementMessage::kLeaveGameRequestMessageFieldNumber; +const int GameManagementMessage::kInvitePlayerToGameMessageFieldNumber; const int GameManagementMessage::kStartEventMessageFieldNumber; const int GameManagementMessage::kStartEventAckMessageFieldNumber; const int GameManagementMessage::kGameStartInitialMessageFieldNumber; @@ -24052,6 +24159,8 @@ const int GameManagementMessage::kEndKickPetitionMessageFieldNumber; const int GameManagementMessage::kChatRequestMessageFieldNumber; const int GameManagementMessage::kChatMessageFieldNumber; const int GameManagementMessage::kChatRejectMessageFieldNumber; +const int GameManagementMessage::kTimeoutWarningMessageFieldNumber; +const int GameManagementMessage::kResetTimeoutMessageFieldNumber; const int GameManagementMessage::kErrorMessageFieldNumber; #endif // !_MSC_VER @@ -24061,30 +24170,6 @@ GameManagementMessage::GameManagementMessage() } void GameManagementMessage::InitAsDefaultInstance() { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - joingamemessage_ = const_cast< ::JoinGameMessage*>( - ::JoinGameMessage::internal_default_instance()); -#else - joingamemessage_ = const_cast< ::JoinGameMessage*>(&::JoinGameMessage::default_instance()); -#endif -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - rejoingamemessage_ = const_cast< ::RejoinGameMessage*>( - ::RejoinGameMessage::internal_default_instance()); -#else - rejoingamemessage_ = const_cast< ::RejoinGameMessage*>(&::RejoinGameMessage::default_instance()); -#endif -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - joingameackmessage_ = const_cast< ::JoinGameAckMessage*>( - ::JoinGameAckMessage::internal_default_instance()); -#else - joingameackmessage_ = const_cast< ::JoinGameAckMessage*>(&::JoinGameAckMessage::default_instance()); -#endif -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - joingamefailedmessage_ = const_cast< ::JoinGameFailedMessage*>( - ::JoinGameFailedMessage::internal_default_instance()); -#else - joingamefailedmessage_ = const_cast< ::JoinGameFailedMessage*>(&::JoinGameFailedMessage::default_instance()); -#endif #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER gameplayerjoinedmessage_ = const_cast< ::GamePlayerJoinedMessage*>( ::GamePlayerJoinedMessage::internal_default_instance()); @@ -24133,6 +24218,12 @@ void GameManagementMessage::InitAsDefaultInstance() { #else leavegamerequestmessage_ = const_cast< ::LeaveGameRequestMessage*>(&::LeaveGameRequestMessage::default_instance()); #endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + inviteplayertogamemessage_ = const_cast< ::InvitePlayerToGameMessage*>( + ::InvitePlayerToGameMessage::internal_default_instance()); +#else + inviteplayertogamemessage_ = const_cast< ::InvitePlayerToGameMessage*>(&::InvitePlayerToGameMessage::default_instance()); +#endif #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER starteventmessage_ = const_cast< ::StartEventMessage*>( ::StartEventMessage::internal_default_instance()); @@ -24229,6 +24320,18 @@ void GameManagementMessage::InitAsDefaultInstance() { #else chatrejectmessage_ = const_cast< ::ChatRejectMessage*>(&::ChatRejectMessage::default_instance()); #endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + timeoutwarningmessage_ = const_cast< ::TimeoutWarningMessage*>( + ::TimeoutWarningMessage::internal_default_instance()); +#else + timeoutwarningmessage_ = const_cast< ::TimeoutWarningMessage*>(&::TimeoutWarningMessage::default_instance()); +#endif +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + resettimeoutmessage_ = const_cast< ::ResetTimeoutMessage*>( + ::ResetTimeoutMessage::internal_default_instance()); +#else + resettimeoutmessage_ = const_cast< ::ResetTimeoutMessage*>(&::ResetTimeoutMessage::default_instance()); +#endif #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER errormessage_ = const_cast< ::ErrorMessage*>( ::ErrorMessage::internal_default_instance()); @@ -24246,10 +24349,6 @@ GameManagementMessage::GameManagementMessage(const GameManagementMessage& from) void GameManagementMessage::SharedCtor() { _cached_size_ = 0; messagetype_ = 1; - joingamemessage_ = NULL; - rejoingamemessage_ = NULL; - joingameackmessage_ = NULL; - joingamefailedmessage_ = NULL; gameplayerjoinedmessage_ = NULL; gameplayerleftmessage_ = NULL; gamespectatorjoinedmessage_ = NULL; @@ -24258,6 +24357,7 @@ void GameManagementMessage::SharedCtor() { removedfromgamemessage_ = NULL; kickplayerrequestmessage_ = NULL; leavegamerequestmessage_ = NULL; + inviteplayertogamemessage_ = NULL; starteventmessage_ = NULL; starteventackmessage_ = NULL; gamestartinitialmessage_ = NULL; @@ -24274,6 +24374,8 @@ void GameManagementMessage::SharedCtor() { chatrequestmessage_ = NULL; chatmessage_ = NULL; chatrejectmessage_ = NULL; + timeoutwarningmessage_ = NULL; + resettimeoutmessage_ = NULL; errormessage_ = NULL; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -24288,10 +24390,6 @@ void GameManagementMessage::SharedDtor() { #else if (this != default_instance_) { #endif - delete joingamemessage_; - delete rejoingamemessage_; - delete joingameackmessage_; - delete joingamefailedmessage_; delete gameplayerjoinedmessage_; delete gameplayerleftmessage_; delete gamespectatorjoinedmessage_; @@ -24300,6 +24398,7 @@ void GameManagementMessage::SharedDtor() { delete removedfromgamemessage_; delete kickplayerrequestmessage_; delete leavegamerequestmessage_; + delete inviteplayertogamemessage_; delete starteventmessage_; delete starteventackmessage_; delete gamestartinitialmessage_; @@ -24316,6 +24415,8 @@ void GameManagementMessage::SharedDtor() { delete chatrequestmessage_; delete chatmessage_; delete chatrejectmessage_; + delete timeoutwarningmessage_; + delete resettimeoutmessage_; delete errormessage_; } } @@ -24343,18 +24444,6 @@ GameManagementMessage* GameManagementMessage::New() const { void GameManagementMessage::Clear() { if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) { messagetype_ = 1; - if (has_joingamemessage()) { - if (joingamemessage_ != NULL) joingamemessage_->::JoinGameMessage::Clear(); - } - if (has_rejoingamemessage()) { - if (rejoingamemessage_ != NULL) rejoingamemessage_->::RejoinGameMessage::Clear(); - } - if (has_joingameackmessage()) { - if (joingameackmessage_ != NULL) joingameackmessage_->::JoinGameAckMessage::Clear(); - } - if (has_joingamefailedmessage()) { - if (joingamefailedmessage_ != NULL) joingamefailedmessage_->::JoinGameFailedMessage::Clear(); - } if (has_gameplayerjoinedmessage()) { if (gameplayerjoinedmessage_ != NULL) gameplayerjoinedmessage_->::GamePlayerJoinedMessage::Clear(); } @@ -24364,8 +24453,6 @@ void GameManagementMessage::Clear() { if (has_gamespectatorjoinedmessage()) { if (gamespectatorjoinedmessage_ != NULL) gamespectatorjoinedmessage_->::GameSpectatorJoinedMessage::Clear(); } - } - if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (has_gamespectatorleftmessage()) { if (gamespectatorleftmessage_ != NULL) gamespectatorleftmessage_->::GameSpectatorLeftMessage::Clear(); } @@ -24378,9 +24465,14 @@ void GameManagementMessage::Clear() { if (has_kickplayerrequestmessage()) { if (kickplayerrequestmessage_ != NULL) kickplayerrequestmessage_->::KickPlayerRequestMessage::Clear(); } + } + if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (has_leavegamerequestmessage()) { if (leavegamerequestmessage_ != NULL) leavegamerequestmessage_->::LeaveGameRequestMessage::Clear(); } + if (has_inviteplayertogamemessage()) { + if (inviteplayertogamemessage_ != NULL) inviteplayertogamemessage_->::InvitePlayerToGameMessage::Clear(); + } if (has_starteventmessage()) { if (starteventmessage_ != NULL) starteventmessage_->::StartEventMessage::Clear(); } @@ -24390,8 +24482,6 @@ void GameManagementMessage::Clear() { if (has_gamestartinitialmessage()) { if (gamestartinitialmessage_ != NULL) gamestartinitialmessage_->::GameStartInitialMessage::Clear(); } - } - if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) { if (has_gamestartrejoinmessage()) { if (gamestartrejoinmessage_ != NULL) gamestartrejoinmessage_->::GameStartRejoinMessage::Clear(); } @@ -24401,6 +24491,8 @@ void GameManagementMessage::Clear() { if (has_playeridchangedmessage()) { if (playeridchangedmessage_ != NULL) playeridchangedmessage_->::PlayerIdChangedMessage::Clear(); } + } + if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) { if (has_askkickplayermessage()) { if (askkickplayermessage_ != NULL) askkickplayermessage_->::AskKickPlayerMessage::Clear(); } @@ -24416,8 +24508,6 @@ void GameManagementMessage::Clear() { if (has_votekickreplymessage()) { if (votekickreplymessage_ != NULL) votekickreplymessage_->::VoteKickReplyMessage::Clear(); } - } - if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) { if (has_kickpetitionupdatemessage()) { if (kickpetitionupdatemessage_ != NULL) kickpetitionupdatemessage_->::KickPetitionUpdateMessage::Clear(); } @@ -24427,12 +24517,20 @@ void GameManagementMessage::Clear() { if (has_chatrequestmessage()) { if (chatrequestmessage_ != NULL) chatrequestmessage_->::ChatRequestMessage::Clear(); } + } + if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) { if (has_chatmessage()) { if (chatmessage_ != NULL) chatmessage_->::ChatMessage::Clear(); } if (has_chatrejectmessage()) { if (chatrejectmessage_ != NULL) chatrejectmessage_->::ChatRejectMessage::Clear(); } + if (has_timeoutwarningmessage()) { + if (timeoutwarningmessage_ != NULL) timeoutwarningmessage_->::TimeoutWarningMessage::Clear(); + } + if (has_resettimeoutmessage()) { + if (resettimeoutmessage_ != NULL) resettimeoutmessage_->::ResetTimeoutMessage::Clear(); + } if (has_errormessage()) { if (errormessage_ != NULL) errormessage_->::ErrorMessage::Clear(); } @@ -24460,68 +24558,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(18)) goto parse_joinGameMessage; + if (input->ExpectTag(18)) goto parse_gamePlayerJoinedMessage; break; } - // optional .JoinGameMessage joinGameMessage = 2; + // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; case 2: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_joinGameMessage: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_joingamemessage())); - } else { - goto handle_uninterpreted; - } - if (input->ExpectTag(26)) goto parse_rejoinGameMessage; - break; - } - - // optional .RejoinGameMessage rejoinGameMessage = 3; - case 3: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_rejoinGameMessage: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_rejoingamemessage())); - } else { - goto handle_uninterpreted; - } - if (input->ExpectTag(34)) goto parse_joinGameAckMessage; - break; - } - - // optional .JoinGameAckMessage joinGameAckMessage = 4; - case 4: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_joinGameAckMessage: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_joingameackmessage())); - } else { - goto handle_uninterpreted; - } - if (input->ExpectTag(42)) goto parse_joinGameFailedMessage; - break; - } - - // optional .JoinGameFailedMessage joinGameFailedMessage = 5; - case 5: { - if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == - ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { - parse_joinGameFailedMessage: - DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( - input, mutable_joingamefailedmessage())); - } else { - goto handle_uninterpreted; - } - if (input->ExpectTag(50)) goto parse_gamePlayerJoinedMessage; - break; - } - - // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; - case 6: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gamePlayerJoinedMessage: @@ -24530,12 +24572,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(58)) goto parse_gamePlayerLeftMessage; + if (input->ExpectTag(26)) goto parse_gamePlayerLeftMessage; break; } - // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; - case 7: { + // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; + case 3: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gamePlayerLeftMessage: @@ -24544,12 +24586,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(66)) goto parse_gameSpectatorJoinedMessage; + if (input->ExpectTag(34)) goto parse_gameSpectatorJoinedMessage; break; } - // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; - case 8: { + // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; + case 4: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameSpectatorJoinedMessage: @@ -24558,12 +24600,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(74)) goto parse_gameSpectatorLeftMessage; + if (input->ExpectTag(42)) goto parse_gameSpectatorLeftMessage; break; } - // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; - case 9: { + // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; + case 5: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameSpectatorLeftMessage: @@ -24572,12 +24614,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(82)) goto parse_gameAdminChangedMessage; + if (input->ExpectTag(50)) goto parse_gameAdminChangedMessage; break; } - // optional .GameAdminChangedMessage gameAdminChangedMessage = 10; - case 10: { + // optional .GameAdminChangedMessage gameAdminChangedMessage = 6; + case 6: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameAdminChangedMessage: @@ -24586,12 +24628,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(90)) goto parse_removedFromGameMessage; + if (input->ExpectTag(58)) goto parse_removedFromGameMessage; break; } - // optional .RemovedFromGameMessage removedFromGameMessage = 11; - case 11: { + // optional .RemovedFromGameMessage removedFromGameMessage = 7; + case 7: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_removedFromGameMessage: @@ -24600,12 +24642,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(98)) goto parse_kickPlayerRequestMessage; + if (input->ExpectTag(66)) goto parse_kickPlayerRequestMessage; break; } - // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; - case 12: { + // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; + case 8: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_kickPlayerRequestMessage: @@ -24614,12 +24656,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(106)) goto parse_leaveGameRequestMessage; + if (input->ExpectTag(74)) goto parse_leaveGameRequestMessage; break; } - // optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; - case 13: { + // optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; + case 9: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_leaveGameRequestMessage: @@ -24628,12 +24670,26 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(114)) goto parse_startEventMessage; + if (input->ExpectTag(82)) goto parse_invitePlayerToGameMessage; break; } - // optional .StartEventMessage startEventMessage = 14; - case 14: { + // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + case 10: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + parse_invitePlayerToGameMessage: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_inviteplayertogamemessage())); + } else { + goto handle_uninterpreted; + } + if (input->ExpectTag(90)) goto parse_startEventMessage; + break; + } + + // optional .StartEventMessage startEventMessage = 11; + case 11: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_startEventMessage: @@ -24642,12 +24698,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(122)) goto parse_startEventAckMessage; + if (input->ExpectTag(98)) goto parse_startEventAckMessage; break; } - // optional .StartEventAckMessage startEventAckMessage = 15; - case 15: { + // optional .StartEventAckMessage startEventAckMessage = 12; + case 12: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_startEventAckMessage: @@ -24656,12 +24712,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(130)) goto parse_gameStartInitialMessage; + if (input->ExpectTag(106)) goto parse_gameStartInitialMessage; break; } - // optional .GameStartInitialMessage gameStartInitialMessage = 16; - case 16: { + // optional .GameStartInitialMessage gameStartInitialMessage = 13; + case 13: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameStartInitialMessage: @@ -24670,12 +24726,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(138)) goto parse_gameStartRejoinMessage; + if (input->ExpectTag(114)) goto parse_gameStartRejoinMessage; break; } - // optional .GameStartRejoinMessage gameStartRejoinMessage = 17; - case 17: { + // optional .GameStartRejoinMessage gameStartRejoinMessage = 14; + case 14: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_gameStartRejoinMessage: @@ -24684,12 +24740,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(146)) goto parse_endOfGameMessage; + if (input->ExpectTag(122)) goto parse_endOfGameMessage; break; } - // optional .EndOfGameMessage endOfGameMessage = 18; - case 18: { + // optional .EndOfGameMessage endOfGameMessage = 15; + case 15: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_endOfGameMessage: @@ -24698,12 +24754,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(154)) goto parse_playerIdChangedMessage; + if (input->ExpectTag(130)) goto parse_playerIdChangedMessage; break; } - // optional .PlayerIdChangedMessage playerIdChangedMessage = 19; - case 19: { + // optional .PlayerIdChangedMessage playerIdChangedMessage = 16; + case 16: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_playerIdChangedMessage: @@ -24712,12 +24768,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(162)) goto parse_askKickPlayerMessage; + if (input->ExpectTag(138)) goto parse_askKickPlayerMessage; break; } - // optional .AskKickPlayerMessage askKickPlayerMessage = 20; - case 20: { + // optional .AskKickPlayerMessage askKickPlayerMessage = 17; + case 17: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_askKickPlayerMessage: @@ -24726,12 +24782,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(170)) goto parse_askKickDeniedMessage; + if (input->ExpectTag(146)) goto parse_askKickDeniedMessage; break; } - // optional .AskKickDeniedMessage askKickDeniedMessage = 21; - case 21: { + // optional .AskKickDeniedMessage askKickDeniedMessage = 18; + case 18: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_askKickDeniedMessage: @@ -24740,12 +24796,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(178)) goto parse_startKickPetitionMessage; + if (input->ExpectTag(154)) goto parse_startKickPetitionMessage; break; } - // optional .StartKickPetitionMessage startKickPetitionMessage = 22; - case 22: { + // optional .StartKickPetitionMessage startKickPetitionMessage = 19; + case 19: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_startKickPetitionMessage: @@ -24754,12 +24810,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(186)) goto parse_voteKickRequestMessage; + if (input->ExpectTag(162)) goto parse_voteKickRequestMessage; break; } - // optional .VoteKickRequestMessage voteKickRequestMessage = 23; - case 23: { + // optional .VoteKickRequestMessage voteKickRequestMessage = 20; + case 20: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_voteKickRequestMessage: @@ -24768,12 +24824,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(194)) goto parse_voteKickReplyMessage; + if (input->ExpectTag(170)) goto parse_voteKickReplyMessage; break; } - // optional .VoteKickReplyMessage voteKickReplyMessage = 24; - case 24: { + // optional .VoteKickReplyMessage voteKickReplyMessage = 21; + case 21: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_voteKickReplyMessage: @@ -24782,12 +24838,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(202)) goto parse_kickPetitionUpdateMessage; + if (input->ExpectTag(178)) goto parse_kickPetitionUpdateMessage; break; } - // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; - case 25: { + // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; + case 22: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_kickPetitionUpdateMessage: @@ -24796,12 +24852,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(210)) goto parse_endKickPetitionMessage; + if (input->ExpectTag(186)) goto parse_endKickPetitionMessage; break; } - // optional .EndKickPetitionMessage endKickPetitionMessage = 26; - case 26: { + // optional .EndKickPetitionMessage endKickPetitionMessage = 23; + case 23: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_endKickPetitionMessage: @@ -24810,12 +24866,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(218)) goto parse_chatRequestMessage; + if (input->ExpectTag(194)) goto parse_chatRequestMessage; break; } - // optional .ChatRequestMessage chatRequestMessage = 27; - case 27: { + // optional .ChatRequestMessage chatRequestMessage = 24; + case 24: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_chatRequestMessage: @@ -24824,12 +24880,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(226)) goto parse_chatMessage; + if (input->ExpectTag(202)) goto parse_chatMessage; break; } - // optional .ChatMessage chatMessage = 28; - case 28: { + // optional .ChatMessage chatMessage = 25; + case 25: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_chatMessage: @@ -24838,12 +24894,12 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } - if (input->ExpectTag(234)) goto parse_chatRejectMessage; + if (input->ExpectTag(210)) goto parse_chatRejectMessage; break; } - // optional .ChatRejectMessage chatRejectMessage = 29; - case 29: { + // optional .ChatRejectMessage chatRejectMessage = 26; + case 26: { if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { parse_chatRejectMessage: @@ -24852,6 +24908,34 @@ bool GameManagementMessage::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } + if (input->ExpectTag(218)) goto parse_timeoutWarningMessage; + break; + } + + // optional .TimeoutWarningMessage timeoutWarningMessage = 27; + case 27: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + parse_timeoutWarningMessage: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_timeoutwarningmessage())); + } else { + goto handle_uninterpreted; + } + if (input->ExpectTag(226)) goto parse_resetTimeoutMessage; + break; + } + + // optional .ResetTimeoutMessage resetTimeoutMessage = 28; + case 28: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) { + parse_resetTimeoutMessage: + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, mutable_resettimeoutmessage())); + } else { + goto handle_uninterpreted; + } if (input->ExpectTag(8202)) goto parse_errorMessage; break; } @@ -24893,172 +24977,166 @@ void GameManagementMessage::SerializeWithCachedSizes( 1, this->messagetype(), output); } - // optional .JoinGameMessage joinGameMessage = 2; - if (has_joingamemessage()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 2, this->joingamemessage(), output); - } - - // optional .RejoinGameMessage rejoinGameMessage = 3; - if (has_rejoingamemessage()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 3, this->rejoingamemessage(), output); - } - - // optional .JoinGameAckMessage joinGameAckMessage = 4; - if (has_joingameackmessage()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 4, this->joingameackmessage(), output); - } - - // optional .JoinGameFailedMessage joinGameFailedMessage = 5; - if (has_joingamefailedmessage()) { - ::google::protobuf::internal::WireFormatLite::WriteMessage( - 5, this->joingamefailedmessage(), output); - } - - // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; if (has_gameplayerjoinedmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 6, this->gameplayerjoinedmessage(), output); + 2, this->gameplayerjoinedmessage(), output); } - // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; if (has_gameplayerleftmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 7, this->gameplayerleftmessage(), output); + 3, this->gameplayerleftmessage(), output); } - // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; if (has_gamespectatorjoinedmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 8, this->gamespectatorjoinedmessage(), output); + 4, this->gamespectatorjoinedmessage(), output); } - // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; if (has_gamespectatorleftmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 9, this->gamespectatorleftmessage(), output); + 5, this->gamespectatorleftmessage(), output); } - // optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + // optional .GameAdminChangedMessage gameAdminChangedMessage = 6; if (has_gameadminchangedmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 10, this->gameadminchangedmessage(), output); + 6, this->gameadminchangedmessage(), output); } - // optional .RemovedFromGameMessage removedFromGameMessage = 11; + // optional .RemovedFromGameMessage removedFromGameMessage = 7; if (has_removedfromgamemessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 11, this->removedfromgamemessage(), output); + 7, this->removedfromgamemessage(), output); } - // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; if (has_kickplayerrequestmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 12, this->kickplayerrequestmessage(), output); + 8, this->kickplayerrequestmessage(), output); } - // optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + // optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; if (has_leavegamerequestmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 13, this->leavegamerequestmessage(), output); + 9, this->leavegamerequestmessage(), output); } - // optional .StartEventMessage startEventMessage = 14; + // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + if (has_inviteplayertogamemessage()) { + ::google::protobuf::internal::WireFormatLite::WriteMessage( + 10, this->inviteplayertogamemessage(), output); + } + + // optional .StartEventMessage startEventMessage = 11; if (has_starteventmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 14, this->starteventmessage(), output); + 11, this->starteventmessage(), output); } - // optional .StartEventAckMessage startEventAckMessage = 15; + // optional .StartEventAckMessage startEventAckMessage = 12; if (has_starteventackmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 15, this->starteventackmessage(), output); + 12, this->starteventackmessage(), output); } - // optional .GameStartInitialMessage gameStartInitialMessage = 16; + // optional .GameStartInitialMessage gameStartInitialMessage = 13; if (has_gamestartinitialmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 16, this->gamestartinitialmessage(), output); + 13, this->gamestartinitialmessage(), output); } - // optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + // optional .GameStartRejoinMessage gameStartRejoinMessage = 14; if (has_gamestartrejoinmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 17, this->gamestartrejoinmessage(), output); + 14, this->gamestartrejoinmessage(), output); } - // optional .EndOfGameMessage endOfGameMessage = 18; + // optional .EndOfGameMessage endOfGameMessage = 15; if (has_endofgamemessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 18, this->endofgamemessage(), output); + 15, this->endofgamemessage(), output); } - // optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + // optional .PlayerIdChangedMessage playerIdChangedMessage = 16; if (has_playeridchangedmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 19, this->playeridchangedmessage(), output); + 16, this->playeridchangedmessage(), output); } - // optional .AskKickPlayerMessage askKickPlayerMessage = 20; + // optional .AskKickPlayerMessage askKickPlayerMessage = 17; if (has_askkickplayermessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 20, this->askkickplayermessage(), output); + 17, this->askkickplayermessage(), output); } - // optional .AskKickDeniedMessage askKickDeniedMessage = 21; + // optional .AskKickDeniedMessage askKickDeniedMessage = 18; if (has_askkickdeniedmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 21, this->askkickdeniedmessage(), output); + 18, this->askkickdeniedmessage(), output); } - // optional .StartKickPetitionMessage startKickPetitionMessage = 22; + // optional .StartKickPetitionMessage startKickPetitionMessage = 19; if (has_startkickpetitionmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 22, this->startkickpetitionmessage(), output); + 19, this->startkickpetitionmessage(), output); } - // optional .VoteKickRequestMessage voteKickRequestMessage = 23; + // optional .VoteKickRequestMessage voteKickRequestMessage = 20; if (has_votekickrequestmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 23, this->votekickrequestmessage(), output); + 20, this->votekickrequestmessage(), output); } - // optional .VoteKickReplyMessage voteKickReplyMessage = 24; + // optional .VoteKickReplyMessage voteKickReplyMessage = 21; if (has_votekickreplymessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 24, this->votekickreplymessage(), output); + 21, this->votekickreplymessage(), output); } - // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; if (has_kickpetitionupdatemessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 25, this->kickpetitionupdatemessage(), output); + 22, this->kickpetitionupdatemessage(), output); } - // optional .EndKickPetitionMessage endKickPetitionMessage = 26; + // optional .EndKickPetitionMessage endKickPetitionMessage = 23; if (has_endkickpetitionmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 26, this->endkickpetitionmessage(), output); + 23, this->endkickpetitionmessage(), output); } - // optional .ChatRequestMessage chatRequestMessage = 27; + // optional .ChatRequestMessage chatRequestMessage = 24; if (has_chatrequestmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 27, this->chatrequestmessage(), output); + 24, this->chatrequestmessage(), output); } - // optional .ChatMessage chatMessage = 28; + // optional .ChatMessage chatMessage = 25; if (has_chatmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 28, this->chatmessage(), output); + 25, this->chatmessage(), output); } - // optional .ChatRejectMessage chatRejectMessage = 29; + // optional .ChatRejectMessage chatRejectMessage = 26; if (has_chatrejectmessage()) { ::google::protobuf::internal::WireFormatLite::WriteMessage( - 29, this->chatrejectmessage(), output); + 26, this->chatrejectmessage(), output); + } + + // optional .TimeoutWarningMessage timeoutWarningMessage = 27; + if (has_timeoutwarningmessage()) { + ::google::protobuf::internal::WireFormatLite::WriteMessage( + 27, this->timeoutwarningmessage(), output); + } + + // optional .ResetTimeoutMessage resetTimeoutMessage = 28; + if (has_resettimeoutmessage()) { + ::google::protobuf::internal::WireFormatLite::WriteMessage( + 28, this->resettimeoutmessage(), output); } // optional .ErrorMessage errorMessage = 1025; @@ -25079,208 +25157,201 @@ int GameManagementMessage::ByteSize() const { ::google::protobuf::internal::WireFormatLite::EnumSize(this->messagetype()); } - // optional .JoinGameMessage joinGameMessage = 2; - if (has_joingamemessage()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->joingamemessage()); - } - - // optional .RejoinGameMessage rejoinGameMessage = 3; - if (has_rejoingamemessage()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->rejoingamemessage()); - } - - // optional .JoinGameAckMessage joinGameAckMessage = 4; - if (has_joingameackmessage()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->joingameackmessage()); - } - - // optional .JoinGameFailedMessage joinGameFailedMessage = 5; - if (has_joingamefailedmessage()) { - total_size += 1 + - ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( - this->joingamefailedmessage()); - } - - // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; if (has_gameplayerjoinedmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gameplayerjoinedmessage()); } - // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; if (has_gameplayerleftmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gameplayerleftmessage()); } - // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; if (has_gamespectatorjoinedmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamespectatorjoinedmessage()); } - } - if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) { - // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; if (has_gamespectatorleftmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamespectatorleftmessage()); } - // optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + // optional .GameAdminChangedMessage gameAdminChangedMessage = 6; if (has_gameadminchangedmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gameadminchangedmessage()); } - // optional .RemovedFromGameMessage removedFromGameMessage = 11; + // optional .RemovedFromGameMessage removedFromGameMessage = 7; if (has_removedfromgamemessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->removedfromgamemessage()); } - // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; if (has_kickplayerrequestmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->kickplayerrequestmessage()); } - // optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + } + if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) { + // optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; if (has_leavegamerequestmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->leavegamerequestmessage()); } - // optional .StartEventMessage startEventMessage = 14; + // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + if (has_inviteplayertogamemessage()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->inviteplayertogamemessage()); + } + + // optional .StartEventMessage startEventMessage = 11; if (has_starteventmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->starteventmessage()); } - // optional .StartEventAckMessage startEventAckMessage = 15; + // optional .StartEventAckMessage startEventAckMessage = 12; if (has_starteventackmessage()) { total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->starteventackmessage()); } - // optional .GameStartInitialMessage gameStartInitialMessage = 16; + // optional .GameStartInitialMessage gameStartInitialMessage = 13; if (has_gamestartinitialmessage()) { - total_size += 2 + + total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamestartinitialmessage()); } - } - if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) { - // optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + // optional .GameStartRejoinMessage gameStartRejoinMessage = 14; if (has_gamestartrejoinmessage()) { - total_size += 2 + + total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->gamestartrejoinmessage()); } - // optional .EndOfGameMessage endOfGameMessage = 18; + // optional .EndOfGameMessage endOfGameMessage = 15; if (has_endofgamemessage()) { - total_size += 2 + + total_size += 1 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->endofgamemessage()); } - // optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + // optional .PlayerIdChangedMessage playerIdChangedMessage = 16; if (has_playeridchangedmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->playeridchangedmessage()); } - // optional .AskKickPlayerMessage askKickPlayerMessage = 20; + } + if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) { + // optional .AskKickPlayerMessage askKickPlayerMessage = 17; if (has_askkickplayermessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->askkickplayermessage()); } - // optional .AskKickDeniedMessage askKickDeniedMessage = 21; + // optional .AskKickDeniedMessage askKickDeniedMessage = 18; if (has_askkickdeniedmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->askkickdeniedmessage()); } - // optional .StartKickPetitionMessage startKickPetitionMessage = 22; + // optional .StartKickPetitionMessage startKickPetitionMessage = 19; if (has_startkickpetitionmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->startkickpetitionmessage()); } - // optional .VoteKickRequestMessage voteKickRequestMessage = 23; + // optional .VoteKickRequestMessage voteKickRequestMessage = 20; if (has_votekickrequestmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->votekickrequestmessage()); } - // optional .VoteKickReplyMessage voteKickReplyMessage = 24; + // optional .VoteKickReplyMessage voteKickReplyMessage = 21; if (has_votekickreplymessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->votekickreplymessage()); } - } - if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) { - // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; if (has_kickpetitionupdatemessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->kickpetitionupdatemessage()); } - // optional .EndKickPetitionMessage endKickPetitionMessage = 26; + // optional .EndKickPetitionMessage endKickPetitionMessage = 23; if (has_endkickpetitionmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->endkickpetitionmessage()); } - // optional .ChatRequestMessage chatRequestMessage = 27; + // optional .ChatRequestMessage chatRequestMessage = 24; if (has_chatrequestmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->chatrequestmessage()); } - // optional .ChatMessage chatMessage = 28; + } + if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) { + // optional .ChatMessage chatMessage = 25; if (has_chatmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->chatmessage()); } - // optional .ChatRejectMessage chatRejectMessage = 29; + // optional .ChatRejectMessage chatRejectMessage = 26; if (has_chatrejectmessage()) { total_size += 2 + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( this->chatrejectmessage()); } + // optional .TimeoutWarningMessage timeoutWarningMessage = 27; + if (has_timeoutwarningmessage()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->timeoutwarningmessage()); + } + + // optional .ResetTimeoutMessage resetTimeoutMessage = 28; + if (has_resettimeoutmessage()) { + total_size += 2 + + ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual( + this->resettimeoutmessage()); + } + // optional .ErrorMessage errorMessage = 1025; if (has_errormessage()) { total_size += 2 + @@ -25306,18 +25377,6 @@ void GameManagementMessage::MergeFrom(const GameManagementMessage& from) { if (from.has_messagetype()) { set_messagetype(from.messagetype()); } - if (from.has_joingamemessage()) { - mutable_joingamemessage()->::JoinGameMessage::MergeFrom(from.joingamemessage()); - } - if (from.has_rejoingamemessage()) { - mutable_rejoingamemessage()->::RejoinGameMessage::MergeFrom(from.rejoingamemessage()); - } - if (from.has_joingameackmessage()) { - mutable_joingameackmessage()->::JoinGameAckMessage::MergeFrom(from.joingameackmessage()); - } - if (from.has_joingamefailedmessage()) { - mutable_joingamefailedmessage()->::JoinGameFailedMessage::MergeFrom(from.joingamefailedmessage()); - } if (from.has_gameplayerjoinedmessage()) { mutable_gameplayerjoinedmessage()->::GamePlayerJoinedMessage::MergeFrom(from.gameplayerjoinedmessage()); } @@ -25327,8 +25386,6 @@ void GameManagementMessage::MergeFrom(const GameManagementMessage& from) { if (from.has_gamespectatorjoinedmessage()) { mutable_gamespectatorjoinedmessage()->::GameSpectatorJoinedMessage::MergeFrom(from.gamespectatorjoinedmessage()); } - } - if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (from.has_gamespectatorleftmessage()) { mutable_gamespectatorleftmessage()->::GameSpectatorLeftMessage::MergeFrom(from.gamespectatorleftmessage()); } @@ -25341,9 +25398,14 @@ void GameManagementMessage::MergeFrom(const GameManagementMessage& from) { if (from.has_kickplayerrequestmessage()) { mutable_kickplayerrequestmessage()->::KickPlayerRequestMessage::MergeFrom(from.kickplayerrequestmessage()); } + } + if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) { if (from.has_leavegamerequestmessage()) { mutable_leavegamerequestmessage()->::LeaveGameRequestMessage::MergeFrom(from.leavegamerequestmessage()); } + if (from.has_inviteplayertogamemessage()) { + mutable_inviteplayertogamemessage()->::InvitePlayerToGameMessage::MergeFrom(from.inviteplayertogamemessage()); + } if (from.has_starteventmessage()) { mutable_starteventmessage()->::StartEventMessage::MergeFrom(from.starteventmessage()); } @@ -25353,8 +25415,6 @@ void GameManagementMessage::MergeFrom(const GameManagementMessage& from) { if (from.has_gamestartinitialmessage()) { mutable_gamestartinitialmessage()->::GameStartInitialMessage::MergeFrom(from.gamestartinitialmessage()); } - } - if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) { if (from.has_gamestartrejoinmessage()) { mutable_gamestartrejoinmessage()->::GameStartRejoinMessage::MergeFrom(from.gamestartrejoinmessage()); } @@ -25364,6 +25424,8 @@ void GameManagementMessage::MergeFrom(const GameManagementMessage& from) { if (from.has_playeridchangedmessage()) { mutable_playeridchangedmessage()->::PlayerIdChangedMessage::MergeFrom(from.playeridchangedmessage()); } + } + if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) { if (from.has_askkickplayermessage()) { mutable_askkickplayermessage()->::AskKickPlayerMessage::MergeFrom(from.askkickplayermessage()); } @@ -25379,8 +25441,6 @@ void GameManagementMessage::MergeFrom(const GameManagementMessage& from) { if (from.has_votekickreplymessage()) { mutable_votekickreplymessage()->::VoteKickReplyMessage::MergeFrom(from.votekickreplymessage()); } - } - if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) { if (from.has_kickpetitionupdatemessage()) { mutable_kickpetitionupdatemessage()->::KickPetitionUpdateMessage::MergeFrom(from.kickpetitionupdatemessage()); } @@ -25390,12 +25450,20 @@ void GameManagementMessage::MergeFrom(const GameManagementMessage& from) { if (from.has_chatrequestmessage()) { mutable_chatrequestmessage()->::ChatRequestMessage::MergeFrom(from.chatrequestmessage()); } + } + if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) { if (from.has_chatmessage()) { mutable_chatmessage()->::ChatMessage::MergeFrom(from.chatmessage()); } if (from.has_chatrejectmessage()) { mutable_chatrejectmessage()->::ChatRejectMessage::MergeFrom(from.chatrejectmessage()); } + if (from.has_timeoutwarningmessage()) { + mutable_timeoutwarningmessage()->::TimeoutWarningMessage::MergeFrom(from.timeoutwarningmessage()); + } + if (from.has_resettimeoutmessage()) { + mutable_resettimeoutmessage()->::ResetTimeoutMessage::MergeFrom(from.resettimeoutmessage()); + } if (from.has_errormessage()) { mutable_errormessage()->::ErrorMessage::MergeFrom(from.errormessage()); } @@ -25411,12 +25479,6 @@ void GameManagementMessage::CopyFrom(const GameManagementMessage& from) { bool GameManagementMessage::IsInitialized() const { if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false; - if (has_joingameackmessage()) { - if (!this->joingameackmessage().IsInitialized()) return false; - } - if (has_joingamefailedmessage()) { - if (!this->joingamefailedmessage().IsInitialized()) return false; - } if (has_gameplayerjoinedmessage()) { if (!this->gameplayerjoinedmessage().IsInitialized()) return false; } @@ -25438,6 +25500,9 @@ bool GameManagementMessage::IsInitialized() const { if (has_kickplayerrequestmessage()) { if (!this->kickplayerrequestmessage().IsInitialized()) return false; } + if (has_inviteplayertogamemessage()) { + if (!this->inviteplayertogamemessage().IsInitialized()) return false; + } if (has_starteventmessage()) { if (!this->starteventmessage().IsInitialized()) return false; } @@ -25483,6 +25548,9 @@ bool GameManagementMessage::IsInitialized() const { if (has_chatrejectmessage()) { if (!this->chatrejectmessage().IsInitialized()) return false; } + if (has_timeoutwarningmessage()) { + if (!this->timeoutwarningmessage().IsInitialized()) return false; + } if (has_errormessage()) { if (!this->errormessage().IsInitialized()) return false; } @@ -25492,10 +25560,6 @@ bool GameManagementMessage::IsInitialized() const { void GameManagementMessage::Swap(GameManagementMessage* other) { if (other != this) { std::swap(messagetype_, other->messagetype_); - std::swap(joingamemessage_, other->joingamemessage_); - std::swap(rejoingamemessage_, other->rejoingamemessage_); - std::swap(joingameackmessage_, other->joingameackmessage_); - std::swap(joingamefailedmessage_, other->joingamefailedmessage_); std::swap(gameplayerjoinedmessage_, other->gameplayerjoinedmessage_); std::swap(gameplayerleftmessage_, other->gameplayerleftmessage_); std::swap(gamespectatorjoinedmessage_, other->gamespectatorjoinedmessage_); @@ -25504,6 +25568,7 @@ void GameManagementMessage::Swap(GameManagementMessage* other) { std::swap(removedfromgamemessage_, other->removedfromgamemessage_); std::swap(kickplayerrequestmessage_, other->kickplayerrequestmessage_); std::swap(leavegamerequestmessage_, other->leavegamerequestmessage_); + std::swap(inviteplayertogamemessage_, other->inviteplayertogamemessage_); std::swap(starteventmessage_, other->starteventmessage_); std::swap(starteventackmessage_, other->starteventackmessage_); std::swap(gamestartinitialmessage_, other->gamestartinitialmessage_); @@ -25520,6 +25585,8 @@ void GameManagementMessage::Swap(GameManagementMessage* other) { std::swap(chatrequestmessage_, other->chatrequestmessage_); std::swap(chatmessage_, other->chatmessage_); std::swap(chatrejectmessage_, other->chatrejectmessage_); + std::swap(timeoutwarningmessage_, other->timeoutwarningmessage_); + std::swap(resettimeoutmessage_, other->resettimeoutmessage_); std::swap(errormessage_, other->errormessage_); std::swap(_has_bits_[0], other->_has_bits_[0]); std::swap(_cached_size_, other->_cached_size_); diff --git a/src/third_party/protobuf/pokerth.pb.h b/src/third_party/protobuf/pokerth.pb.h index 70e126c9..0a0184a9 100644 --- a/src/third_party/protobuf/pokerth.pb.h +++ b/src/third_party/protobuf/pokerth.pb.h @@ -38,8 +38,7 @@ class AuthClientRequestMessage; class AuthServerChallengeMessage; class AuthClientResponseMessage; class AuthServerVerificationMessage; -class InitMessage; -class InitAckMessage; +class InitDoneMessage; class AvatarRequestMessage; class AvatarHeaderMessage; class AvatarDataMessage; @@ -213,11 +212,12 @@ enum JoinGameFailedMessage_JoinGameFailureReason { JoinGameFailedMessage_JoinGameFailureReason_invalidGame = 1, JoinGameFailedMessage_JoinGameFailureReason_gameIsFull = 2, JoinGameFailedMessage_JoinGameFailureReason_gameIsRunning = 3, - JoinGameFailedMessage_JoinGameFailureReason_invalidPassword = 4, - JoinGameFailedMessage_JoinGameFailureReason_notInvited = 5, - JoinGameFailedMessage_JoinGameFailureReason_ipAddressBlocked = 6, - JoinGameFailedMessage_JoinGameFailureReason_rejoinFailed = 7, - JoinGameFailedMessage_JoinGameFailureReason_noSpectatorsAllowed = 8 + JoinGameFailedMessage_JoinGameFailureReason_notAllowedAsGuest = 4, + JoinGameFailedMessage_JoinGameFailureReason_invalidPassword = 5, + JoinGameFailedMessage_JoinGameFailureReason_notInvited = 6, + JoinGameFailedMessage_JoinGameFailureReason_ipAddressBlocked = 7, + JoinGameFailedMessage_JoinGameFailureReason_rejoinFailed = 8, + JoinGameFailedMessage_JoinGameFailureReason_noSpectatorsAllowed = 9 }; bool JoinGameFailedMessage_JoinGameFailureReason_IsValid(int value); const JoinGameFailedMessage_JoinGameFailureReason JoinGameFailedMessage_JoinGameFailureReason_JoinGameFailureReason_MIN = JoinGameFailedMessage_JoinGameFailureReason_invalidGame; @@ -414,86 +414,87 @@ const AuthMessage_AuthMessageType AuthMessage_AuthMessageType_AuthMessageType_MA const int AuthMessage_AuthMessageType_AuthMessageType_ARRAYSIZE = AuthMessage_AuthMessageType_AuthMessageType_MAX + 1; enum LobbyMessage_LobbyMessageType { - LobbyMessage_LobbyMessageType_Type_InitMessage = 1, - LobbyMessage_LobbyMessageType_Type_InitAckMessage = 2, - LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage = 3, - LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage = 4, - LobbyMessage_LobbyMessageType_Type_AvatarDataMessage = 5, - LobbyMessage_LobbyMessageType_Type_AvatarEndMessage = 6, - LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage = 7, - LobbyMessage_LobbyMessageType_Type_PlayerListMessage = 8, - LobbyMessage_LobbyMessageType_Type_GameListNewMessage = 9, - LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage = 10, - LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage = 11, - LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage = 12, - LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage = 13, - LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage = 14, - LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage = 15, - LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage = 16, - LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage = 17, - LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage = 18, - LobbyMessage_LobbyMessageType_Type_SubscriptionReplyMessage = 19, - LobbyMessage_LobbyMessageType_Type_CreateGameMessage = 20, - LobbyMessage_LobbyMessageType_Type_CreateGameFailedMessage = 21, - LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage = 22, - LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage = 23, - LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage = 24, - LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage = 25, - LobbyMessage_LobbyMessageType_Type_StatisticsMessage = 26, - LobbyMessage_LobbyMessageType_Type_ChatRequestMessage = 27, - LobbyMessage_LobbyMessageType_Type_ChatMessage = 28, - LobbyMessage_LobbyMessageType_Type_ChatRejectMessage = 29, - LobbyMessage_LobbyMessageType_Type_DialogMessage = 30, - LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage = 31, - LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage = 32, - LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage = 33, - LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage = 34, - LobbyMessage_LobbyMessageType_Type_ReportGameMessage = 35, - LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage = 36, - LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage = 37, - LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage = 38, - LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage = 39, - LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage = 40, + LobbyMessage_LobbyMessageType_Type_InitDoneMessage = 1, + LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage = 2, + LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage = 3, + LobbyMessage_LobbyMessageType_Type_AvatarDataMessage = 4, + LobbyMessage_LobbyMessageType_Type_AvatarEndMessage = 5, + LobbyMessage_LobbyMessageType_Type_UnknownAvatarMessage = 6, + LobbyMessage_LobbyMessageType_Type_PlayerListMessage = 7, + LobbyMessage_LobbyMessageType_Type_GameListNewMessage = 8, + LobbyMessage_LobbyMessageType_Type_GameListUpdateMessage = 9, + LobbyMessage_LobbyMessageType_Type_GameListPlayerJoinedMessage = 10, + LobbyMessage_LobbyMessageType_Type_GameListPlayerLeftMessage = 11, + LobbyMessage_LobbyMessageType_Type_GameListSpectatorJoinedMessage = 12, + LobbyMessage_LobbyMessageType_Type_GameListSpectatorLeftMessage = 13, + LobbyMessage_LobbyMessageType_Type_GameListAdminChangedMessage = 14, + LobbyMessage_LobbyMessageType_Type_PlayerInfoRequestMessage = 15, + LobbyMessage_LobbyMessageType_Type_PlayerInfoReplyMessage = 16, + LobbyMessage_LobbyMessageType_Type_SubscriptionRequestMessage = 17, + LobbyMessage_LobbyMessageType_Type_SubscriptionReplyMessage = 18, + LobbyMessage_LobbyMessageType_Type_CreateGameMessage = 19, + LobbyMessage_LobbyMessageType_Type_CreateGameFailedMessage = 20, + LobbyMessage_LobbyMessageType_Type_JoinGameMessage = 21, + LobbyMessage_LobbyMessageType_Type_RejoinGameMessage = 22, + LobbyMessage_LobbyMessageType_Type_JoinGameAckMessage = 23, + LobbyMessage_LobbyMessageType_Type_JoinGameFailedMessage = 24, + LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage = 25, + LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage = 26, + LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage = 27, + LobbyMessage_LobbyMessageType_Type_StatisticsMessage = 28, + LobbyMessage_LobbyMessageType_Type_ChatRequestMessage = 29, + LobbyMessage_LobbyMessageType_Type_ChatMessage = 30, + LobbyMessage_LobbyMessageType_Type_ChatRejectMessage = 31, + LobbyMessage_LobbyMessageType_Type_DialogMessage = 32, + LobbyMessage_LobbyMessageType_Type_TimeoutWarningMessage = 33, + LobbyMessage_LobbyMessageType_Type_ResetTimeoutMessage = 34, + LobbyMessage_LobbyMessageType_Type_ReportAvatarMessage = 35, + LobbyMessage_LobbyMessageType_Type_ReportAvatarAckMessage = 36, + LobbyMessage_LobbyMessageType_Type_ReportGameMessage = 37, + LobbyMessage_LobbyMessageType_Type_ReportGameAckMessage = 38, + LobbyMessage_LobbyMessageType_Type_AdminRemoveGameMessage = 39, + LobbyMessage_LobbyMessageType_Type_AdminRemoveGameAckMessage = 40, + LobbyMessage_LobbyMessageType_Type_AdminBanPlayerMessage = 41, + LobbyMessage_LobbyMessageType_Type_AdminBanPlayerAckMessage = 42, LobbyMessage_LobbyMessageType_Type_ErrorMessage = 1024 }; bool LobbyMessage_LobbyMessageType_IsValid(int value); -const LobbyMessage_LobbyMessageType LobbyMessage_LobbyMessageType_LobbyMessageType_MIN = LobbyMessage_LobbyMessageType_Type_InitMessage; +const LobbyMessage_LobbyMessageType LobbyMessage_LobbyMessageType_LobbyMessageType_MIN = LobbyMessage_LobbyMessageType_Type_InitDoneMessage; const LobbyMessage_LobbyMessageType LobbyMessage_LobbyMessageType_LobbyMessageType_MAX = LobbyMessage_LobbyMessageType_Type_ErrorMessage; const int LobbyMessage_LobbyMessageType_LobbyMessageType_ARRAYSIZE = LobbyMessage_LobbyMessageType_LobbyMessageType_MAX + 1; enum GameManagementMessage_GameManagementMessageType { - GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage = 1, - GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage = 2, - GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage = 3, - GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage = 4, - GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage = 5, - GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage = 6, - GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage = 7, - GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage = 8, - GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage = 9, - GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage = 10, - GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage = 11, - GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage = 12, - GameManagementMessage_GameManagementMessageType_Type_StartEventMessage = 13, - GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage = 14, - GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage = 15, - GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage = 16, - GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage = 17, - GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage = 18, - GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage = 19, - GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage = 20, - GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage = 21, - GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage = 22, - GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage = 23, - GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage = 24, - GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage = 25, - GameManagementMessage_GameManagementMessageType_Type_ChatRequestMessage = 26, - GameManagementMessage_GameManagementMessageType_Type_ChatMessage = 27, - GameManagementMessage_GameManagementMessageType_Type_ChatRejectMessage = 28, + GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage = 1, + GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage = 2, + GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage = 3, + GameManagementMessage_GameManagementMessageType_Type_GameSpectatorLeftMessage = 4, + GameManagementMessage_GameManagementMessageType_Type_GameAdminChangedMessage = 5, + GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage = 6, + GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage = 7, + GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage = 8, + GameManagementMessage_GameManagementMessageType_Type_InvitePlayerToGameMessage = 9, + GameManagementMessage_GameManagementMessageType_Type_StartEventMessage = 10, + GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage = 11, + GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage = 12, + GameManagementMessage_GameManagementMessageType_Type_GameStartRejoinMessage = 13, + GameManagementMessage_GameManagementMessageType_Type_EndOfGameMessage = 14, + GameManagementMessage_GameManagementMessageType_Type_PlayerIdChangedMessage = 15, + GameManagementMessage_GameManagementMessageType_Type_AskKickPlayerMessage = 16, + GameManagementMessage_GameManagementMessageType_Type_AskKickDeniedMessage = 17, + GameManagementMessage_GameManagementMessageType_Type_StartKickPetitionMessage = 18, + GameManagementMessage_GameManagementMessageType_Type_VoteKickRequestMessage = 19, + GameManagementMessage_GameManagementMessageType_Type_VoteKickReplyMessage = 20, + GameManagementMessage_GameManagementMessageType_Type_KickPetitionUpdateMessage = 21, + GameManagementMessage_GameManagementMessageType_Type_EndKickPetitionMessage = 22, + GameManagementMessage_GameManagementMessageType_Type_ChatRequestMessage = 23, + GameManagementMessage_GameManagementMessageType_Type_ChatMessage = 24, + GameManagementMessage_GameManagementMessageType_Type_ChatRejectMessage = 25, + GameManagementMessage_GameManagementMessageType_Type_TimeoutWarningMessage = 26, + GameManagementMessage_GameManagementMessageType_Type_ResetTimeoutMessage = 27, GameManagementMessage_GameManagementMessageType_Type_ErrorMessage = 1024 }; bool GameManagementMessage_GameManagementMessageType_IsValid(int value); -const GameManagementMessage_GameManagementMessageType GameManagementMessage_GameManagementMessageType_GameManagementMessageType_MIN = GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage; +const GameManagementMessage_GameManagementMessageType GameManagementMessage_GameManagementMessageType_GameManagementMessageType_MIN = GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage; const GameManagementMessage_GameManagementMessageType GameManagementMessage_GameManagementMessageType_GameManagementMessageType_MAX = GameManagementMessage_GameManagementMessageType_Type_ErrorMessage; const int GameManagementMessage_GameManagementMessageType_GameManagementMessageType_ARRAYSIZE = GameManagementMessage_GameManagementMessageType_GameManagementMessageType_MAX + 1; @@ -1401,6 +1402,18 @@ class AuthClientRequestMessage : public ::google::protobuf::MessageLite { inline ::std::string* release_mylastsessionid(); inline void set_allocated_mylastsessionid(::std::string* mylastsessionid); + // optional bytes avatarHash = 8; + inline bool has_avatarhash() const; + inline void clear_avatarhash(); + static const int kAvatarHashFieldNumber = 8; + inline const ::std::string& avatarhash() const; + inline void set_avatarhash(const ::std::string& value); + inline void set_avatarhash(const char* value); + inline void set_avatarhash(const void* value, size_t size); + inline ::std::string* mutable_avatarhash(); + inline ::std::string* release_avatarhash(); + inline void set_allocated_avatarhash(::std::string* avatarhash); + // @@protoc_insertion_point(class_scope:AuthClientRequestMessage) private: inline void set_has_requestedversion(); @@ -1417,6 +1430,8 @@ class AuthClientRequestMessage : public ::google::protobuf::MessageLite { inline void clear_has_clientuserdata(); inline void set_has_mylastsessionid(); inline void clear_has_mylastsessionid(); + inline void set_has_avatarhash(); + inline void clear_has_avatarhash(); ::AnnounceMessage_Version* requestedversion_; ::google::protobuf::uint32 buildid_; @@ -1425,9 +1440,10 @@ class AuthClientRequestMessage : public ::google::protobuf::MessageLite { ::std::string* nickname_; ::std::string* clientuserdata_; ::std::string* mylastsessionid_; + ::std::string* avatarhash_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(8 + 31) / 32]; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_pokerth_2eproto_impl(); @@ -1671,6 +1687,94 @@ class AuthServerVerificationMessage : public ::google::protobuf::MessageLite { // accessors ------------------------------------------------------- + // required bytes serverVerification = 1; + inline bool has_serververification() const; + inline void clear_serververification(); + static const int kServerVerificationFieldNumber = 1; + inline const ::std::string& serververification() const; + inline void set_serververification(const ::std::string& value); + inline void set_serververification(const char* value); + inline void set_serververification(const void* value, size_t size); + inline ::std::string* mutable_serververification(); + inline ::std::string* release_serververification(); + inline void set_allocated_serververification(::std::string* serververification); + + // @@protoc_insertion_point(class_scope:AuthServerVerificationMessage) + private: + inline void set_has_serververification(); + inline void clear_has_serververification(); + + ::std::string* serververification_; + + mutable int _cached_size_; + ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32]; + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + friend void protobuf_AddDesc_pokerth_2eproto_impl(); + #else + friend void protobuf_AddDesc_pokerth_2eproto(); + #endif + friend void protobuf_AssignDesc_pokerth_2eproto(); + friend void protobuf_ShutdownFile_pokerth_2eproto(); + + void InitAsDefaultInstance(); + static AuthServerVerificationMessage* default_instance_; +}; +// ------------------------------------------------------------------- + +class InitDoneMessage : public ::google::protobuf::MessageLite { + public: + InitDoneMessage(); + virtual ~InitDoneMessage(); + + InitDoneMessage(const InitDoneMessage& from); + + inline InitDoneMessage& operator=(const InitDoneMessage& from) { + CopyFrom(from); + return *this; + } + + static const InitDoneMessage& default_instance(); + + #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + // Returns the internal default instance pointer. This function can + // return NULL thus should not be used by the user. This is intended + // for Protobuf internal code. Please use default_instance() declared + // above instead. + static inline const InitDoneMessage* internal_default_instance() { + return default_instance_; + } + #endif + + void Swap(InitDoneMessage* other); + + // implements Message ---------------------------------------------- + + InitDoneMessage* New() const; + void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); + void CopyFrom(const InitDoneMessage& from); + void MergeFrom(const InitDoneMessage& from); + void Clear(); + bool IsInitialized() const; + + int ByteSize() const; + bool MergePartialFromCodedStream( + ::google::protobuf::io::CodedInputStream* input); + void SerializeWithCachedSizes( + ::google::protobuf::io::CodedOutputStream* output) const; + int GetCachedSize() const { return _cached_size_; } + private: + void SharedCtor(); + void SharedDtor(); + void SetCachedSize(int size) const; + public: + + ::std::string GetTypeName() const; + + // nested types ---------------------------------------------------- + + // accessors ------------------------------------------------------- + // required bytes yourSessionId = 1; inline bool has_yoursessionid() const; inline void clear_yoursessionid(); @@ -1690,192 +1794,10 @@ class AuthServerVerificationMessage : public ::google::protobuf::MessageLite { inline ::google::protobuf::uint32 yourplayerid() const; inline void set_yourplayerid(::google::protobuf::uint32 value); - // optional bytes serverVerification = 3; - inline bool has_serververification() const; - inline void clear_serververification(); - static const int kServerVerificationFieldNumber = 3; - inline const ::std::string& serververification() const; - inline void set_serververification(const ::std::string& value); - inline void set_serververification(const char* value); - inline void set_serververification(const void* value, size_t size); - inline ::std::string* mutable_serververification(); - inline ::std::string* release_serververification(); - inline void set_allocated_serververification(::std::string* serververification); - - // @@protoc_insertion_point(class_scope:AuthServerVerificationMessage) - private: - inline void set_has_yoursessionid(); - inline void clear_has_yoursessionid(); - inline void set_has_yourplayerid(); - inline void clear_has_yourplayerid(); - inline void set_has_serververification(); - inline void clear_has_serververification(); - - ::std::string* yoursessionid_; - ::std::string* serververification_; - ::google::protobuf::uint32 yourplayerid_; - - mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32]; - - #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - friend void protobuf_AddDesc_pokerth_2eproto_impl(); - #else - friend void protobuf_AddDesc_pokerth_2eproto(); - #endif - friend void protobuf_AssignDesc_pokerth_2eproto(); - friend void protobuf_ShutdownFile_pokerth_2eproto(); - - void InitAsDefaultInstance(); - static AuthServerVerificationMessage* default_instance_; -}; -// ------------------------------------------------------------------- - -class InitMessage : public ::google::protobuf::MessageLite { - public: - InitMessage(); - virtual ~InitMessage(); - - InitMessage(const InitMessage& from); - - inline InitMessage& operator=(const InitMessage& from) { - CopyFrom(from); - return *this; - } - - static const InitMessage& default_instance(); - - #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - // Returns the internal default instance pointer. This function can - // return NULL thus should not be used by the user. This is intended - // for Protobuf internal code. Please use default_instance() declared - // above instead. - static inline const InitMessage* internal_default_instance() { - return default_instance_; - } - #endif - - void Swap(InitMessage* other); - - // implements Message ---------------------------------------------- - - InitMessage* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); - void CopyFrom(const InitMessage& from); - void MergeFrom(const InitMessage& from); - void Clear(); - bool IsInitialized() const; - - int ByteSize() const; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input); - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const; - int GetCachedSize() const { return _cached_size_; } - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const; - public: - - ::std::string GetTypeName() const; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // optional bytes avatarHash = 1; - inline bool has_avatarhash() const; - inline void clear_avatarhash(); - static const int kAvatarHashFieldNumber = 1; - inline const ::std::string& avatarhash() const; - inline void set_avatarhash(const ::std::string& value); - inline void set_avatarhash(const char* value); - inline void set_avatarhash(const void* value, size_t size); - inline ::std::string* mutable_avatarhash(); - inline ::std::string* release_avatarhash(); - inline void set_allocated_avatarhash(::std::string* avatarhash); - - // @@protoc_insertion_point(class_scope:InitMessage) - private: - inline void set_has_avatarhash(); - inline void clear_has_avatarhash(); - - ::std::string* avatarhash_; - - mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32]; - - #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - friend void protobuf_AddDesc_pokerth_2eproto_impl(); - #else - friend void protobuf_AddDesc_pokerth_2eproto(); - #endif - friend void protobuf_AssignDesc_pokerth_2eproto(); - friend void protobuf_ShutdownFile_pokerth_2eproto(); - - void InitAsDefaultInstance(); - static InitMessage* default_instance_; -}; -// ------------------------------------------------------------------- - -class InitAckMessage : public ::google::protobuf::MessageLite { - public: - InitAckMessage(); - virtual ~InitAckMessage(); - - InitAckMessage(const InitAckMessage& from); - - inline InitAckMessage& operator=(const InitAckMessage& from) { - CopyFrom(from); - return *this; - } - - static const InitAckMessage& default_instance(); - - #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - // Returns the internal default instance pointer. This function can - // return NULL thus should not be used by the user. This is intended - // for Protobuf internal code. Please use default_instance() declared - // above instead. - static inline const InitAckMessage* internal_default_instance() { - return default_instance_; - } - #endif - - void Swap(InitAckMessage* other); - - // implements Message ---------------------------------------------- - - InitAckMessage* New() const; - void CheckTypeAndMergeFrom(const ::google::protobuf::MessageLite& from); - void CopyFrom(const InitAckMessage& from); - void MergeFrom(const InitAckMessage& from); - void Clear(); - bool IsInitialized() const; - - int ByteSize() const; - bool MergePartialFromCodedStream( - ::google::protobuf::io::CodedInputStream* input); - void SerializeWithCachedSizes( - ::google::protobuf::io::CodedOutputStream* output) const; - int GetCachedSize() const { return _cached_size_; } - private: - void SharedCtor(); - void SharedDtor(); - void SetCachedSize(int size) const; - public: - - ::std::string GetTypeName() const; - - // nested types ---------------------------------------------------- - - // accessors ------------------------------------------------------- - - // optional bytes yourAvatarHash = 1; + // optional bytes yourAvatarHash = 3; inline bool has_youravatarhash() const; inline void clear_youravatarhash(); - static const int kYourAvatarHashFieldNumber = 1; + static const int kYourAvatarHashFieldNumber = 3; inline const ::std::string& youravatarhash() const; inline void set_youravatarhash(const ::std::string& value); inline void set_youravatarhash(const char* value); @@ -1884,25 +1806,31 @@ class InitAckMessage : public ::google::protobuf::MessageLite { inline ::std::string* release_youravatarhash(); inline void set_allocated_youravatarhash(::std::string* youravatarhash); - // optional uint32 rejoinGameId = 2; + // optional uint32 rejoinGameId = 4; inline bool has_rejoingameid() const; inline void clear_rejoingameid(); - static const int kRejoinGameIdFieldNumber = 2; + static const int kRejoinGameIdFieldNumber = 4; inline ::google::protobuf::uint32 rejoingameid() const; inline void set_rejoingameid(::google::protobuf::uint32 value); - // @@protoc_insertion_point(class_scope:InitAckMessage) + // @@protoc_insertion_point(class_scope:InitDoneMessage) private: + inline void set_has_yoursessionid(); + inline void clear_has_yoursessionid(); + inline void set_has_yourplayerid(); + inline void clear_has_yourplayerid(); inline void set_has_youravatarhash(); inline void clear_has_youravatarhash(); inline void set_has_rejoingameid(); inline void clear_has_rejoingameid(); + ::std::string* yoursessionid_; ::std::string* youravatarhash_; + ::google::protobuf::uint32 yourplayerid_; ::google::protobuf::uint32 rejoingameid_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32]; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_pokerth_2eproto_impl(); @@ -1913,7 +1841,7 @@ class InitAckMessage : public ::google::protobuf::MessageLite { friend void protobuf_ShutdownFile_pokerth_2eproto(); void InitAsDefaultInstance(); - static InitAckMessage* default_instance_; + static InitDoneMessage* default_instance_; }; // ------------------------------------------------------------------- @@ -4098,10 +4026,17 @@ class JoinGameMessage : public ::google::protobuf::MessageLite { // accessors ------------------------------------------------------- - // optional string password = 1; + // required uint32 gameId = 1; + inline bool has_gameid() const; + inline void clear_gameid(); + static const int kGameIdFieldNumber = 1; + inline ::google::protobuf::uint32 gameid() const; + inline void set_gameid(::google::protobuf::uint32 value); + + // optional string password = 2; inline bool has_password() const; inline void clear_password(); - static const int kPasswordFieldNumber = 1; + static const int kPasswordFieldNumber = 2; inline const ::std::string& password() const; inline void set_password(const ::std::string& value); inline void set_password(const char* value); @@ -4110,22 +4045,24 @@ class JoinGameMessage : public ::google::protobuf::MessageLite { inline ::std::string* release_password(); inline void set_allocated_password(::std::string* password); - // optional bool autoLeave = 2 [default = false]; + // optional bool autoLeave = 3 [default = false]; inline bool has_autoleave() const; inline void clear_autoleave(); - static const int kAutoLeaveFieldNumber = 2; + static const int kAutoLeaveFieldNumber = 3; inline bool autoleave() const; inline void set_autoleave(bool value); - // optional bool spectateOnly = 3 [default = false]; + // optional bool spectateOnly = 4 [default = false]; inline bool has_spectateonly() const; inline void clear_spectateonly(); - static const int kSpectateOnlyFieldNumber = 3; + static const int kSpectateOnlyFieldNumber = 4; inline bool spectateonly() const; inline void set_spectateonly(bool value); // @@protoc_insertion_point(class_scope:JoinGameMessage) private: + inline void set_has_gameid(); + inline void clear_has_gameid(); inline void set_has_password(); inline void clear_has_password(); inline void set_has_autoleave(); @@ -4134,11 +4071,12 @@ class JoinGameMessage : public ::google::protobuf::MessageLite { inline void clear_has_spectateonly(); ::std::string* password_; + ::google::protobuf::uint32 gameid_; bool autoleave_; bool spectateonly_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32]; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_pokerth_2eproto_impl(); @@ -4206,22 +4144,32 @@ class RejoinGameMessage : public ::google::protobuf::MessageLite { // accessors ------------------------------------------------------- - // optional bool autoLeave = 1 [default = false]; + // required uint32 gameId = 1; + inline bool has_gameid() const; + inline void clear_gameid(); + static const int kGameIdFieldNumber = 1; + inline ::google::protobuf::uint32 gameid() const; + inline void set_gameid(::google::protobuf::uint32 value); + + // optional bool autoLeave = 2 [default = false]; inline bool has_autoleave() const; inline void clear_autoleave(); - static const int kAutoLeaveFieldNumber = 1; + static const int kAutoLeaveFieldNumber = 2; inline bool autoleave() const; inline void set_autoleave(bool value); // @@protoc_insertion_point(class_scope:RejoinGameMessage) private: + inline void set_has_gameid(); + inline void clear_has_gameid(); inline void set_has_autoleave(); inline void clear_has_autoleave(); + ::google::protobuf::uint32 gameid_; bool autoleave_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32]; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_pokerth_2eproto_impl(); @@ -4289,31 +4237,40 @@ class JoinGameAckMessage : public ::google::protobuf::MessageLite { // accessors ------------------------------------------------------- - // required bool areYouGameAdmin = 1; + // required uint32 gameId = 1; + inline bool has_gameid() const; + inline void clear_gameid(); + static const int kGameIdFieldNumber = 1; + inline ::google::protobuf::uint32 gameid() const; + inline void set_gameid(::google::protobuf::uint32 value); + + // required bool areYouGameAdmin = 2; inline bool has_areyougameadmin() const; inline void clear_areyougameadmin(); - static const int kAreYouGameAdminFieldNumber = 1; + static const int kAreYouGameAdminFieldNumber = 2; inline bool areyougameadmin() const; inline void set_areyougameadmin(bool value); - // required .NetGameInfo gameInfo = 2; + // required .NetGameInfo gameInfo = 3; inline bool has_gameinfo() const; inline void clear_gameinfo(); - static const int kGameInfoFieldNumber = 2; + static const int kGameInfoFieldNumber = 3; inline const ::NetGameInfo& gameinfo() const; inline ::NetGameInfo* mutable_gameinfo(); inline ::NetGameInfo* release_gameinfo(); inline void set_allocated_gameinfo(::NetGameInfo* gameinfo); - // optional bool spectateOnly = 3; + // optional bool spectateOnly = 4; inline bool has_spectateonly() const; inline void clear_spectateonly(); - static const int kSpectateOnlyFieldNumber = 3; + static const int kSpectateOnlyFieldNumber = 4; inline bool spectateonly() const; inline void set_spectateonly(bool value); // @@protoc_insertion_point(class_scope:JoinGameAckMessage) private: + inline void set_has_gameid(); + inline void clear_has_gameid(); inline void set_has_areyougameadmin(); inline void clear_has_areyougameadmin(); inline void set_has_gameinfo(); @@ -4321,12 +4278,13 @@ class JoinGameAckMessage : public ::google::protobuf::MessageLite { inline void set_has_spectateonly(); inline void clear_has_spectateonly(); - ::NetGameInfo* gameinfo_; + ::google::protobuf::uint32 gameid_; bool areyougameadmin_; bool spectateonly_; + ::NetGameInfo* gameinfo_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32]; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_pokerth_2eproto_impl(); @@ -4396,6 +4354,7 @@ class JoinGameFailedMessage : public ::google::protobuf::MessageLite { static const JoinGameFailureReason invalidGame = JoinGameFailedMessage_JoinGameFailureReason_invalidGame; static const JoinGameFailureReason gameIsFull = JoinGameFailedMessage_JoinGameFailureReason_gameIsFull; static const JoinGameFailureReason gameIsRunning = JoinGameFailedMessage_JoinGameFailureReason_gameIsRunning; + static const JoinGameFailureReason notAllowedAsGuest = JoinGameFailedMessage_JoinGameFailureReason_notAllowedAsGuest; static const JoinGameFailureReason invalidPassword = JoinGameFailedMessage_JoinGameFailureReason_invalidPassword; static const JoinGameFailureReason notInvited = JoinGameFailedMessage_JoinGameFailureReason_notInvited; static const JoinGameFailureReason ipAddressBlocked = JoinGameFailedMessage_JoinGameFailureReason_ipAddressBlocked; @@ -4413,22 +4372,32 @@ class JoinGameFailedMessage : public ::google::protobuf::MessageLite { // accessors ------------------------------------------------------- - // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + // required uint32 gameId = 1; + inline bool has_gameid() const; + inline void clear_gameid(); + static const int kGameIdFieldNumber = 1; + inline ::google::protobuf::uint32 gameid() const; + inline void set_gameid(::google::protobuf::uint32 value); + + // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; inline bool has_joingamefailurereason() const; inline void clear_joingamefailurereason(); - static const int kJoinGameFailureReasonFieldNumber = 1; + static const int kJoinGameFailureReasonFieldNumber = 2; inline ::JoinGameFailedMessage_JoinGameFailureReason joingamefailurereason() const; inline void set_joingamefailurereason(::JoinGameFailedMessage_JoinGameFailureReason value); // @@protoc_insertion_point(class_scope:JoinGameFailedMessage) private: + inline void set_has_gameid(); + inline void clear_has_gameid(); inline void set_has_joingamefailurereason(); inline void clear_has_joingamefailurereason(); + ::google::protobuf::uint32 gameid_; int joingamefailurereason_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32]; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_pokerth_2eproto_impl(); @@ -10358,8 +10327,7 @@ class LobbyMessage : public ::google::protobuf::MessageLite { // nested types ---------------------------------------------------- typedef LobbyMessage_LobbyMessageType LobbyMessageType; - static const LobbyMessageType Type_InitMessage = LobbyMessage_LobbyMessageType_Type_InitMessage; - static const LobbyMessageType Type_InitAckMessage = LobbyMessage_LobbyMessageType_Type_InitAckMessage; + static const LobbyMessageType Type_InitDoneMessage = LobbyMessage_LobbyMessageType_Type_InitDoneMessage; static const LobbyMessageType Type_AvatarRequestMessage = LobbyMessage_LobbyMessageType_Type_AvatarRequestMessage; static const LobbyMessageType Type_AvatarHeaderMessage = LobbyMessage_LobbyMessageType_Type_AvatarHeaderMessage; static const LobbyMessageType Type_AvatarDataMessage = LobbyMessage_LobbyMessageType_Type_AvatarDataMessage; @@ -10379,7 +10347,10 @@ class LobbyMessage : public ::google::protobuf::MessageLite { static const LobbyMessageType Type_SubscriptionReplyMessage = LobbyMessage_LobbyMessageType_Type_SubscriptionReplyMessage; static const LobbyMessageType Type_CreateGameMessage = LobbyMessage_LobbyMessageType_Type_CreateGameMessage; static const LobbyMessageType Type_CreateGameFailedMessage = LobbyMessage_LobbyMessageType_Type_CreateGameFailedMessage; - static const LobbyMessageType Type_InvitePlayerToGameMessage = LobbyMessage_LobbyMessageType_Type_InvitePlayerToGameMessage; + static const LobbyMessageType Type_JoinGameMessage = LobbyMessage_LobbyMessageType_Type_JoinGameMessage; + static const LobbyMessageType Type_RejoinGameMessage = LobbyMessage_LobbyMessageType_Type_RejoinGameMessage; + static const LobbyMessageType Type_JoinGameAckMessage = LobbyMessage_LobbyMessageType_Type_JoinGameAckMessage; + static const LobbyMessageType Type_JoinGameFailedMessage = LobbyMessage_LobbyMessageType_Type_JoinGameFailedMessage; static const LobbyMessageType Type_InviteNotifyMessage = LobbyMessage_LobbyMessageType_Type_InviteNotifyMessage; static const LobbyMessageType Type_RejectGameInvitationMessage = LobbyMessage_LobbyMessageType_Type_RejectGameInvitationMessage; static const LobbyMessageType Type_RejectInvNotifyMessage = LobbyMessage_LobbyMessageType_Type_RejectInvNotifyMessage; @@ -10418,361 +10389,379 @@ class LobbyMessage : public ::google::protobuf::MessageLite { inline ::LobbyMessage_LobbyMessageType messagetype() const; inline void set_messagetype(::LobbyMessage_LobbyMessageType value); - // optional .InitMessage initMessage = 2; - inline bool has_initmessage() const; - inline void clear_initmessage(); - static const int kInitMessageFieldNumber = 2; - inline const ::InitMessage& initmessage() const; - inline ::InitMessage* mutable_initmessage(); - inline ::InitMessage* release_initmessage(); - inline void set_allocated_initmessage(::InitMessage* initmessage); + // optional .InitDoneMessage initDoneMessage = 2; + inline bool has_initdonemessage() const; + inline void clear_initdonemessage(); + static const int kInitDoneMessageFieldNumber = 2; + inline const ::InitDoneMessage& initdonemessage() const; + inline ::InitDoneMessage* mutable_initdonemessage(); + inline ::InitDoneMessage* release_initdonemessage(); + inline void set_allocated_initdonemessage(::InitDoneMessage* initdonemessage); - // optional .InitAckMessage initAckMessage = 3; - inline bool has_initackmessage() const; - inline void clear_initackmessage(); - static const int kInitAckMessageFieldNumber = 3; - inline const ::InitAckMessage& initackmessage() const; - inline ::InitAckMessage* mutable_initackmessage(); - inline ::InitAckMessage* release_initackmessage(); - inline void set_allocated_initackmessage(::InitAckMessage* initackmessage); - - // optional .AvatarRequestMessage avatarRequestMessage = 4; + // optional .AvatarRequestMessage avatarRequestMessage = 3; inline bool has_avatarrequestmessage() const; inline void clear_avatarrequestmessage(); - static const int kAvatarRequestMessageFieldNumber = 4; + static const int kAvatarRequestMessageFieldNumber = 3; inline const ::AvatarRequestMessage& avatarrequestmessage() const; inline ::AvatarRequestMessage* mutable_avatarrequestmessage(); inline ::AvatarRequestMessage* release_avatarrequestmessage(); inline void set_allocated_avatarrequestmessage(::AvatarRequestMessage* avatarrequestmessage); - // optional .AvatarHeaderMessage avatarHeaderMessage = 5; + // optional .AvatarHeaderMessage avatarHeaderMessage = 4; inline bool has_avatarheadermessage() const; inline void clear_avatarheadermessage(); - static const int kAvatarHeaderMessageFieldNumber = 5; + static const int kAvatarHeaderMessageFieldNumber = 4; inline const ::AvatarHeaderMessage& avatarheadermessage() const; inline ::AvatarHeaderMessage* mutable_avatarheadermessage(); inline ::AvatarHeaderMessage* release_avatarheadermessage(); inline void set_allocated_avatarheadermessage(::AvatarHeaderMessage* avatarheadermessage); - // optional .AvatarDataMessage avatarDataMessage = 6; + // optional .AvatarDataMessage avatarDataMessage = 5; inline bool has_avatardatamessage() const; inline void clear_avatardatamessage(); - static const int kAvatarDataMessageFieldNumber = 6; + static const int kAvatarDataMessageFieldNumber = 5; inline const ::AvatarDataMessage& avatardatamessage() const; inline ::AvatarDataMessage* mutable_avatardatamessage(); inline ::AvatarDataMessage* release_avatardatamessage(); inline void set_allocated_avatardatamessage(::AvatarDataMessage* avatardatamessage); - // optional .AvatarEndMessage avatarEndMessage = 7; + // optional .AvatarEndMessage avatarEndMessage = 6; inline bool has_avatarendmessage() const; inline void clear_avatarendmessage(); - static const int kAvatarEndMessageFieldNumber = 7; + static const int kAvatarEndMessageFieldNumber = 6; inline const ::AvatarEndMessage& avatarendmessage() const; inline ::AvatarEndMessage* mutable_avatarendmessage(); inline ::AvatarEndMessage* release_avatarendmessage(); inline void set_allocated_avatarendmessage(::AvatarEndMessage* avatarendmessage); - // optional .UnknownAvatarMessage unknownAvatarMessage = 8; + // optional .UnknownAvatarMessage unknownAvatarMessage = 7; inline bool has_unknownavatarmessage() const; inline void clear_unknownavatarmessage(); - static const int kUnknownAvatarMessageFieldNumber = 8; + static const int kUnknownAvatarMessageFieldNumber = 7; inline const ::UnknownAvatarMessage& unknownavatarmessage() const; inline ::UnknownAvatarMessage* mutable_unknownavatarmessage(); inline ::UnknownAvatarMessage* release_unknownavatarmessage(); inline void set_allocated_unknownavatarmessage(::UnknownAvatarMessage* unknownavatarmessage); - // optional .PlayerListMessage playerListMessage = 9; + // optional .PlayerListMessage playerListMessage = 8; inline bool has_playerlistmessage() const; inline void clear_playerlistmessage(); - static const int kPlayerListMessageFieldNumber = 9; + static const int kPlayerListMessageFieldNumber = 8; inline const ::PlayerListMessage& playerlistmessage() const; inline ::PlayerListMessage* mutable_playerlistmessage(); inline ::PlayerListMessage* release_playerlistmessage(); inline void set_allocated_playerlistmessage(::PlayerListMessage* playerlistmessage); - // optional .GameListNewMessage gameListNewMessage = 10; + // optional .GameListNewMessage gameListNewMessage = 9; inline bool has_gamelistnewmessage() const; inline void clear_gamelistnewmessage(); - static const int kGameListNewMessageFieldNumber = 10; + static const int kGameListNewMessageFieldNumber = 9; inline const ::GameListNewMessage& gamelistnewmessage() const; inline ::GameListNewMessage* mutable_gamelistnewmessage(); inline ::GameListNewMessage* release_gamelistnewmessage(); inline void set_allocated_gamelistnewmessage(::GameListNewMessage* gamelistnewmessage); - // optional .GameListUpdateMessage gameListUpdateMessage = 11; + // optional .GameListUpdateMessage gameListUpdateMessage = 10; inline bool has_gamelistupdatemessage() const; inline void clear_gamelistupdatemessage(); - static const int kGameListUpdateMessageFieldNumber = 11; + static const int kGameListUpdateMessageFieldNumber = 10; inline const ::GameListUpdateMessage& gamelistupdatemessage() const; inline ::GameListUpdateMessage* mutable_gamelistupdatemessage(); inline ::GameListUpdateMessage* release_gamelistupdatemessage(); inline void set_allocated_gamelistupdatemessage(::GameListUpdateMessage* gamelistupdatemessage); - // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; inline bool has_gamelistplayerjoinedmessage() const; inline void clear_gamelistplayerjoinedmessage(); - static const int kGameListPlayerJoinedMessageFieldNumber = 12; + static const int kGameListPlayerJoinedMessageFieldNumber = 11; inline const ::GameListPlayerJoinedMessage& gamelistplayerjoinedmessage() const; inline ::GameListPlayerJoinedMessage* mutable_gamelistplayerjoinedmessage(); inline ::GameListPlayerJoinedMessage* release_gamelistplayerjoinedmessage(); inline void set_allocated_gamelistplayerjoinedmessage(::GameListPlayerJoinedMessage* gamelistplayerjoinedmessage); - // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; inline bool has_gamelistplayerleftmessage() const; inline void clear_gamelistplayerleftmessage(); - static const int kGameListPlayerLeftMessageFieldNumber = 13; + static const int kGameListPlayerLeftMessageFieldNumber = 12; inline const ::GameListPlayerLeftMessage& gamelistplayerleftmessage() const; inline ::GameListPlayerLeftMessage* mutable_gamelistplayerleftmessage(); inline ::GameListPlayerLeftMessage* release_gamelistplayerleftmessage(); inline void set_allocated_gamelistplayerleftmessage(::GameListPlayerLeftMessage* gamelistplayerleftmessage); - // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; inline bool has_gamelistspectatorjoinedmessage() const; inline void clear_gamelistspectatorjoinedmessage(); - static const int kGameListSpectatorJoinedMessageFieldNumber = 14; + static const int kGameListSpectatorJoinedMessageFieldNumber = 13; inline const ::GameListSpectatorJoinedMessage& gamelistspectatorjoinedmessage() const; inline ::GameListSpectatorJoinedMessage* mutable_gamelistspectatorjoinedmessage(); inline ::GameListSpectatorJoinedMessage* release_gamelistspectatorjoinedmessage(); inline void set_allocated_gamelistspectatorjoinedmessage(::GameListSpectatorJoinedMessage* gamelistspectatorjoinedmessage); - // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; inline bool has_gamelistspectatorleftmessage() const; inline void clear_gamelistspectatorleftmessage(); - static const int kGameListSpectatorLeftMessageFieldNumber = 15; + static const int kGameListSpectatorLeftMessageFieldNumber = 14; inline const ::GameListSpectatorLeftMessage& gamelistspectatorleftmessage() const; inline ::GameListSpectatorLeftMessage* mutable_gamelistspectatorleftmessage(); inline ::GameListSpectatorLeftMessage* release_gamelistspectatorleftmessage(); inline void set_allocated_gamelistspectatorleftmessage(::GameListSpectatorLeftMessage* gamelistspectatorleftmessage); - // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; inline bool has_gamelistadminchangedmessage() const; inline void clear_gamelistadminchangedmessage(); - static const int kGameListAdminChangedMessageFieldNumber = 16; + static const int kGameListAdminChangedMessageFieldNumber = 15; inline const ::GameListAdminChangedMessage& gamelistadminchangedmessage() const; inline ::GameListAdminChangedMessage* mutable_gamelistadminchangedmessage(); inline ::GameListAdminChangedMessage* release_gamelistadminchangedmessage(); inline void set_allocated_gamelistadminchangedmessage(::GameListAdminChangedMessage* gamelistadminchangedmessage); - // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; inline bool has_playerinforequestmessage() const; inline void clear_playerinforequestmessage(); - static const int kPlayerInfoRequestMessageFieldNumber = 17; + static const int kPlayerInfoRequestMessageFieldNumber = 16; inline const ::PlayerInfoRequestMessage& playerinforequestmessage() const; inline ::PlayerInfoRequestMessage* mutable_playerinforequestmessage(); inline ::PlayerInfoRequestMessage* release_playerinforequestmessage(); inline void set_allocated_playerinforequestmessage(::PlayerInfoRequestMessage* playerinforequestmessage); - // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; inline bool has_playerinforeplymessage() const; inline void clear_playerinforeplymessage(); - static const int kPlayerInfoReplyMessageFieldNumber = 18; + static const int kPlayerInfoReplyMessageFieldNumber = 17; inline const ::PlayerInfoReplyMessage& playerinforeplymessage() const; inline ::PlayerInfoReplyMessage* mutable_playerinforeplymessage(); inline ::PlayerInfoReplyMessage* release_playerinforeplymessage(); inline void set_allocated_playerinforeplymessage(::PlayerInfoReplyMessage* playerinforeplymessage); - // optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + // optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; inline bool has_subscriptionrequestmessage() const; inline void clear_subscriptionrequestmessage(); - static const int kSubscriptionRequestMessageFieldNumber = 19; + static const int kSubscriptionRequestMessageFieldNumber = 18; inline const ::SubscriptionRequestMessage& subscriptionrequestmessage() const; inline ::SubscriptionRequestMessage* mutable_subscriptionrequestmessage(); inline ::SubscriptionRequestMessage* release_subscriptionrequestmessage(); inline void set_allocated_subscriptionrequestmessage(::SubscriptionRequestMessage* subscriptionrequestmessage); - // optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + // optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; inline bool has_subscriptionreplymessage() const; inline void clear_subscriptionreplymessage(); - static const int kSubscriptionReplyMessageFieldNumber = 20; + static const int kSubscriptionReplyMessageFieldNumber = 19; inline const ::SubscriptionReplyMessage& subscriptionreplymessage() const; inline ::SubscriptionReplyMessage* mutable_subscriptionreplymessage(); inline ::SubscriptionReplyMessage* release_subscriptionreplymessage(); inline void set_allocated_subscriptionreplymessage(::SubscriptionReplyMessage* subscriptionreplymessage); - // optional .CreateGameMessage createGameMessage = 21; + // optional .CreateGameMessage createGameMessage = 20; inline bool has_creategamemessage() const; inline void clear_creategamemessage(); - static const int kCreateGameMessageFieldNumber = 21; + static const int kCreateGameMessageFieldNumber = 20; inline const ::CreateGameMessage& creategamemessage() const; inline ::CreateGameMessage* mutable_creategamemessage(); inline ::CreateGameMessage* release_creategamemessage(); inline void set_allocated_creategamemessage(::CreateGameMessage* creategamemessage); - // optional .CreateGameFailedMessage createGameFailedMessage = 22; + // optional .CreateGameFailedMessage createGameFailedMessage = 21; inline bool has_creategamefailedmessage() const; inline void clear_creategamefailedmessage(); - static const int kCreateGameFailedMessageFieldNumber = 22; + static const int kCreateGameFailedMessageFieldNumber = 21; inline const ::CreateGameFailedMessage& creategamefailedmessage() const; inline ::CreateGameFailedMessage* mutable_creategamefailedmessage(); inline ::CreateGameFailedMessage* release_creategamefailedmessage(); inline void set_allocated_creategamefailedmessage(::CreateGameFailedMessage* creategamefailedmessage); - // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; - inline bool has_inviteplayertogamemessage() const; - inline void clear_inviteplayertogamemessage(); - static const int kInvitePlayerToGameMessageFieldNumber = 23; - inline const ::InvitePlayerToGameMessage& inviteplayertogamemessage() const; - inline ::InvitePlayerToGameMessage* mutable_inviteplayertogamemessage(); - inline ::InvitePlayerToGameMessage* release_inviteplayertogamemessage(); - inline void set_allocated_inviteplayertogamemessage(::InvitePlayerToGameMessage* inviteplayertogamemessage); + // optional .JoinGameMessage joinGameMessage = 22; + inline bool has_joingamemessage() const; + inline void clear_joingamemessage(); + static const int kJoinGameMessageFieldNumber = 22; + inline const ::JoinGameMessage& joingamemessage() const; + inline ::JoinGameMessage* mutable_joingamemessage(); + inline ::JoinGameMessage* release_joingamemessage(); + inline void set_allocated_joingamemessage(::JoinGameMessage* joingamemessage); - // optional .InviteNotifyMessage inviteNotifyMessage = 24; + // optional .RejoinGameMessage rejoinGameMessage = 23; + inline bool has_rejoingamemessage() const; + inline void clear_rejoingamemessage(); + static const int kRejoinGameMessageFieldNumber = 23; + inline const ::RejoinGameMessage& rejoingamemessage() const; + inline ::RejoinGameMessage* mutable_rejoingamemessage(); + inline ::RejoinGameMessage* release_rejoingamemessage(); + inline void set_allocated_rejoingamemessage(::RejoinGameMessage* rejoingamemessage); + + // optional .JoinGameAckMessage joinGameAckMessage = 24; + inline bool has_joingameackmessage() const; + inline void clear_joingameackmessage(); + static const int kJoinGameAckMessageFieldNumber = 24; + inline const ::JoinGameAckMessage& joingameackmessage() const; + inline ::JoinGameAckMessage* mutable_joingameackmessage(); + inline ::JoinGameAckMessage* release_joingameackmessage(); + inline void set_allocated_joingameackmessage(::JoinGameAckMessage* joingameackmessage); + + // optional .JoinGameFailedMessage joinGameFailedMessage = 25; + inline bool has_joingamefailedmessage() const; + inline void clear_joingamefailedmessage(); + static const int kJoinGameFailedMessageFieldNumber = 25; + inline const ::JoinGameFailedMessage& joingamefailedmessage() const; + inline ::JoinGameFailedMessage* mutable_joingamefailedmessage(); + inline ::JoinGameFailedMessage* release_joingamefailedmessage(); + inline void set_allocated_joingamefailedmessage(::JoinGameFailedMessage* joingamefailedmessage); + + // optional .InviteNotifyMessage inviteNotifyMessage = 26; inline bool has_invitenotifymessage() const; inline void clear_invitenotifymessage(); - static const int kInviteNotifyMessageFieldNumber = 24; + static const int kInviteNotifyMessageFieldNumber = 26; inline const ::InviteNotifyMessage& invitenotifymessage() const; inline ::InviteNotifyMessage* mutable_invitenotifymessage(); inline ::InviteNotifyMessage* release_invitenotifymessage(); inline void set_allocated_invitenotifymessage(::InviteNotifyMessage* invitenotifymessage); - // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; inline bool has_rejectgameinvitationmessage() const; inline void clear_rejectgameinvitationmessage(); - static const int kRejectGameInvitationMessageFieldNumber = 25; + static const int kRejectGameInvitationMessageFieldNumber = 27; inline const ::RejectGameInvitationMessage& rejectgameinvitationmessage() const; inline ::RejectGameInvitationMessage* mutable_rejectgameinvitationmessage(); inline ::RejectGameInvitationMessage* release_rejectgameinvitationmessage(); inline void set_allocated_rejectgameinvitationmessage(::RejectGameInvitationMessage* rejectgameinvitationmessage); - // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; inline bool has_rejectinvnotifymessage() const; inline void clear_rejectinvnotifymessage(); - static const int kRejectInvNotifyMessageFieldNumber = 26; + static const int kRejectInvNotifyMessageFieldNumber = 28; inline const ::RejectInvNotifyMessage& rejectinvnotifymessage() const; inline ::RejectInvNotifyMessage* mutable_rejectinvnotifymessage(); inline ::RejectInvNotifyMessage* release_rejectinvnotifymessage(); inline void set_allocated_rejectinvnotifymessage(::RejectInvNotifyMessage* rejectinvnotifymessage); - // optional .StatisticsMessage statisticsMessage = 27; + // optional .StatisticsMessage statisticsMessage = 29; inline bool has_statisticsmessage() const; inline void clear_statisticsmessage(); - static const int kStatisticsMessageFieldNumber = 27; + static const int kStatisticsMessageFieldNumber = 29; inline const ::StatisticsMessage& statisticsmessage() const; inline ::StatisticsMessage* mutable_statisticsmessage(); inline ::StatisticsMessage* release_statisticsmessage(); inline void set_allocated_statisticsmessage(::StatisticsMessage* statisticsmessage); - // optional .ChatRequestMessage chatRequestMessage = 28; + // optional .ChatRequestMessage chatRequestMessage = 30; inline bool has_chatrequestmessage() const; inline void clear_chatrequestmessage(); - static const int kChatRequestMessageFieldNumber = 28; + static const int kChatRequestMessageFieldNumber = 30; inline const ::ChatRequestMessage& chatrequestmessage() const; inline ::ChatRequestMessage* mutable_chatrequestmessage(); inline ::ChatRequestMessage* release_chatrequestmessage(); inline void set_allocated_chatrequestmessage(::ChatRequestMessage* chatrequestmessage); - // optional .ChatMessage chatMessage = 29; + // optional .ChatMessage chatMessage = 31; inline bool has_chatmessage() const; inline void clear_chatmessage(); - static const int kChatMessageFieldNumber = 29; + static const int kChatMessageFieldNumber = 31; inline const ::ChatMessage& chatmessage() const; inline ::ChatMessage* mutable_chatmessage(); inline ::ChatMessage* release_chatmessage(); inline void set_allocated_chatmessage(::ChatMessage* chatmessage); - // optional .ChatRejectMessage chatRejectMessage = 30; + // optional .ChatRejectMessage chatRejectMessage = 32; inline bool has_chatrejectmessage() const; inline void clear_chatrejectmessage(); - static const int kChatRejectMessageFieldNumber = 30; + static const int kChatRejectMessageFieldNumber = 32; inline const ::ChatRejectMessage& chatrejectmessage() const; inline ::ChatRejectMessage* mutable_chatrejectmessage(); inline ::ChatRejectMessage* release_chatrejectmessage(); inline void set_allocated_chatrejectmessage(::ChatRejectMessage* chatrejectmessage); - // optional .DialogMessage dialogMessage = 31; + // optional .DialogMessage dialogMessage = 33; inline bool has_dialogmessage() const; inline void clear_dialogmessage(); - static const int kDialogMessageFieldNumber = 31; + static const int kDialogMessageFieldNumber = 33; inline const ::DialogMessage& dialogmessage() const; inline ::DialogMessage* mutable_dialogmessage(); inline ::DialogMessage* release_dialogmessage(); inline void set_allocated_dialogmessage(::DialogMessage* dialogmessage); - // optional .TimeoutWarningMessage timeoutWarningMessage = 32; + // optional .TimeoutWarningMessage timeoutWarningMessage = 34; inline bool has_timeoutwarningmessage() const; inline void clear_timeoutwarningmessage(); - static const int kTimeoutWarningMessageFieldNumber = 32; + static const int kTimeoutWarningMessageFieldNumber = 34; inline const ::TimeoutWarningMessage& timeoutwarningmessage() const; inline ::TimeoutWarningMessage* mutable_timeoutwarningmessage(); inline ::TimeoutWarningMessage* release_timeoutwarningmessage(); inline void set_allocated_timeoutwarningmessage(::TimeoutWarningMessage* timeoutwarningmessage); - // optional .ResetTimeoutMessage resetTimeoutMessage = 33; + // optional .ResetTimeoutMessage resetTimeoutMessage = 35; inline bool has_resettimeoutmessage() const; inline void clear_resettimeoutmessage(); - static const int kResetTimeoutMessageFieldNumber = 33; + static const int kResetTimeoutMessageFieldNumber = 35; inline const ::ResetTimeoutMessage& resettimeoutmessage() const; inline ::ResetTimeoutMessage* mutable_resettimeoutmessage(); inline ::ResetTimeoutMessage* release_resettimeoutmessage(); inline void set_allocated_resettimeoutmessage(::ResetTimeoutMessage* resettimeoutmessage); - // optional .ReportAvatarMessage reportAvatarMessage = 34; + // optional .ReportAvatarMessage reportAvatarMessage = 36; inline bool has_reportavatarmessage() const; inline void clear_reportavatarmessage(); - static const int kReportAvatarMessageFieldNumber = 34; + static const int kReportAvatarMessageFieldNumber = 36; inline const ::ReportAvatarMessage& reportavatarmessage() const; inline ::ReportAvatarMessage* mutable_reportavatarmessage(); inline ::ReportAvatarMessage* release_reportavatarmessage(); inline void set_allocated_reportavatarmessage(::ReportAvatarMessage* reportavatarmessage); - // optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + // optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; inline bool has_reportavatarackmessage() const; inline void clear_reportavatarackmessage(); - static const int kReportAvatarAckMessageFieldNumber = 35; + static const int kReportAvatarAckMessageFieldNumber = 37; inline const ::ReportAvatarAckMessage& reportavatarackmessage() const; inline ::ReportAvatarAckMessage* mutable_reportavatarackmessage(); inline ::ReportAvatarAckMessage* release_reportavatarackmessage(); inline void set_allocated_reportavatarackmessage(::ReportAvatarAckMessage* reportavatarackmessage); - // optional .ReportGameMessage reportGameMessage = 36; + // optional .ReportGameMessage reportGameMessage = 38; inline bool has_reportgamemessage() const; inline void clear_reportgamemessage(); - static const int kReportGameMessageFieldNumber = 36; + static const int kReportGameMessageFieldNumber = 38; inline const ::ReportGameMessage& reportgamemessage() const; inline ::ReportGameMessage* mutable_reportgamemessage(); inline ::ReportGameMessage* release_reportgamemessage(); inline void set_allocated_reportgamemessage(::ReportGameMessage* reportgamemessage); - // optional .ReportGameAckMessage reportGameAckMessage = 37; + // optional .ReportGameAckMessage reportGameAckMessage = 39; inline bool has_reportgameackmessage() const; inline void clear_reportgameackmessage(); - static const int kReportGameAckMessageFieldNumber = 37; + static const int kReportGameAckMessageFieldNumber = 39; inline const ::ReportGameAckMessage& reportgameackmessage() const; inline ::ReportGameAckMessage* mutable_reportgameackmessage(); inline ::ReportGameAckMessage* release_reportgameackmessage(); inline void set_allocated_reportgameackmessage(::ReportGameAckMessage* reportgameackmessage); - // optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + // optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; inline bool has_adminremovegamemessage() const; inline void clear_adminremovegamemessage(); - static const int kAdminRemoveGameMessageFieldNumber = 38; + static const int kAdminRemoveGameMessageFieldNumber = 40; inline const ::AdminRemoveGameMessage& adminremovegamemessage() const; inline ::AdminRemoveGameMessage* mutable_adminremovegamemessage(); inline ::AdminRemoveGameMessage* release_adminremovegamemessage(); inline void set_allocated_adminremovegamemessage(::AdminRemoveGameMessage* adminremovegamemessage); - // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; inline bool has_adminremovegameackmessage() const; inline void clear_adminremovegameackmessage(); - static const int kAdminRemoveGameAckMessageFieldNumber = 39; + static const int kAdminRemoveGameAckMessageFieldNumber = 41; inline const ::AdminRemoveGameAckMessage& adminremovegameackmessage() const; inline ::AdminRemoveGameAckMessage* mutable_adminremovegameackmessage(); inline ::AdminRemoveGameAckMessage* release_adminremovegameackmessage(); inline void set_allocated_adminremovegameackmessage(::AdminRemoveGameAckMessage* adminremovegameackmessage); - // optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + // optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; inline bool has_adminbanplayermessage() const; inline void clear_adminbanplayermessage(); - static const int kAdminBanPlayerMessageFieldNumber = 40; + static const int kAdminBanPlayerMessageFieldNumber = 42; inline const ::AdminBanPlayerMessage& adminbanplayermessage() const; inline ::AdminBanPlayerMessage* mutable_adminbanplayermessage(); inline ::AdminBanPlayerMessage* release_adminbanplayermessage(); inline void set_allocated_adminbanplayermessage(::AdminBanPlayerMessage* adminbanplayermessage); - // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; inline bool has_adminbanplayerackmessage() const; inline void clear_adminbanplayerackmessage(); - static const int kAdminBanPlayerAckMessageFieldNumber = 41; + static const int kAdminBanPlayerAckMessageFieldNumber = 43; inline const ::AdminBanPlayerAckMessage& adminbanplayerackmessage() const; inline ::AdminBanPlayerAckMessage* mutable_adminbanplayerackmessage(); inline ::AdminBanPlayerAckMessage* release_adminbanplayerackmessage(); @@ -10791,10 +10780,8 @@ class LobbyMessage : public ::google::protobuf::MessageLite { private: inline void set_has_messagetype(); inline void clear_has_messagetype(); - inline void set_has_initmessage(); - inline void clear_has_initmessage(); - inline void set_has_initackmessage(); - inline void clear_has_initackmessage(); + inline void set_has_initdonemessage(); + inline void clear_has_initdonemessage(); inline void set_has_avatarrequestmessage(); inline void clear_has_avatarrequestmessage(); inline void set_has_avatarheadermessage(); @@ -10833,8 +10820,14 @@ class LobbyMessage : public ::google::protobuf::MessageLite { inline void clear_has_creategamemessage(); inline void set_has_creategamefailedmessage(); inline void clear_has_creategamefailedmessage(); - inline void set_has_inviteplayertogamemessage(); - inline void clear_has_inviteplayertogamemessage(); + inline void set_has_joingamemessage(); + inline void clear_has_joingamemessage(); + inline void set_has_rejoingamemessage(); + inline void clear_has_rejoingamemessage(); + inline void set_has_joingameackmessage(); + inline void clear_has_joingameackmessage(); + inline void set_has_joingamefailedmessage(); + inline void clear_has_joingamefailedmessage(); inline void set_has_invitenotifymessage(); inline void clear_has_invitenotifymessage(); inline void set_has_rejectgameinvitationmessage(); @@ -10874,8 +10867,7 @@ class LobbyMessage : public ::google::protobuf::MessageLite { inline void set_has_errormessage(); inline void clear_has_errormessage(); - ::InitMessage* initmessage_; - ::InitAckMessage* initackmessage_; + ::InitDoneMessage* initdonemessage_; ::AvatarRequestMessage* avatarrequestmessage_; ::AvatarHeaderMessage* avatarheadermessage_; ::AvatarDataMessage* avatardatamessage_; @@ -10895,7 +10887,10 @@ class LobbyMessage : public ::google::protobuf::MessageLite { ::SubscriptionReplyMessage* subscriptionreplymessage_; ::CreateGameMessage* creategamemessage_; ::CreateGameFailedMessage* creategamefailedmessage_; - ::InvitePlayerToGameMessage* inviteplayertogamemessage_; + ::JoinGameMessage* joingamemessage_; + ::RejoinGameMessage* rejoingamemessage_; + ::JoinGameAckMessage* joingameackmessage_; + ::JoinGameFailedMessage* joingamefailedmessage_; ::InviteNotifyMessage* invitenotifymessage_; ::RejectGameInvitationMessage* rejectgameinvitationmessage_; ::RejectInvNotifyMessage* rejectinvnotifymessage_; @@ -10918,7 +10913,7 @@ class LobbyMessage : public ::google::protobuf::MessageLite { int messagetype_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(42 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(44 + 31) / 32]; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_pokerth_2eproto_impl(); @@ -10985,10 +10980,6 @@ class GameManagementMessage : public ::google::protobuf::MessageLite { // nested types ---------------------------------------------------- typedef GameManagementMessage_GameManagementMessageType GameManagementMessageType; - static const GameManagementMessageType Type_JoinGameMessage = GameManagementMessage_GameManagementMessageType_Type_JoinGameMessage; - static const GameManagementMessageType Type_RejoinGameMessage = GameManagementMessage_GameManagementMessageType_Type_RejoinGameMessage; - static const GameManagementMessageType Type_JoinGameAckMessage = GameManagementMessage_GameManagementMessageType_Type_JoinGameAckMessage; - static const GameManagementMessageType Type_JoinGameFailedMessage = GameManagementMessage_GameManagementMessageType_Type_JoinGameFailedMessage; static const GameManagementMessageType Type_GamePlayerJoinedMessage = GameManagementMessage_GameManagementMessageType_Type_GamePlayerJoinedMessage; static const GameManagementMessageType Type_GamePlayerLeftMessage = GameManagementMessage_GameManagementMessageType_Type_GamePlayerLeftMessage; static const GameManagementMessageType Type_GameSpectatorJoinedMessage = GameManagementMessage_GameManagementMessageType_Type_GameSpectatorJoinedMessage; @@ -10997,6 +10988,7 @@ class GameManagementMessage : public ::google::protobuf::MessageLite { static const GameManagementMessageType Type_RemovedFromGameMessage = GameManagementMessage_GameManagementMessageType_Type_RemovedFromGameMessage; static const GameManagementMessageType Type_KickPlayerRequestMessage = GameManagementMessage_GameManagementMessageType_Type_KickPlayerRequestMessage; static const GameManagementMessageType Type_LeaveGameRequestMessage = GameManagementMessage_GameManagementMessageType_Type_LeaveGameRequestMessage; + static const GameManagementMessageType Type_InvitePlayerToGameMessage = GameManagementMessage_GameManagementMessageType_Type_InvitePlayerToGameMessage; static const GameManagementMessageType Type_StartEventMessage = GameManagementMessage_GameManagementMessageType_Type_StartEventMessage; static const GameManagementMessageType Type_StartEventAckMessage = GameManagementMessage_GameManagementMessageType_Type_StartEventAckMessage; static const GameManagementMessageType Type_GameStartInitialMessage = GameManagementMessage_GameManagementMessageType_Type_GameStartInitialMessage; @@ -11013,6 +11005,8 @@ class GameManagementMessage : public ::google::protobuf::MessageLite { static const GameManagementMessageType Type_ChatRequestMessage = GameManagementMessage_GameManagementMessageType_Type_ChatRequestMessage; static const GameManagementMessageType Type_ChatMessage = GameManagementMessage_GameManagementMessageType_Type_ChatMessage; static const GameManagementMessageType Type_ChatRejectMessage = GameManagementMessage_GameManagementMessageType_Type_ChatRejectMessage; + static const GameManagementMessageType Type_TimeoutWarningMessage = GameManagementMessage_GameManagementMessageType_Type_TimeoutWarningMessage; + static const GameManagementMessageType Type_ResetTimeoutMessage = GameManagementMessage_GameManagementMessageType_Type_ResetTimeoutMessage; static const GameManagementMessageType Type_ErrorMessage = GameManagementMessage_GameManagementMessageType_Type_ErrorMessage; static inline bool GameManagementMessageType_IsValid(int value) { return GameManagementMessage_GameManagementMessageType_IsValid(value); @@ -11033,258 +11027,249 @@ class GameManagementMessage : public ::google::protobuf::MessageLite { inline ::GameManagementMessage_GameManagementMessageType messagetype() const; inline void set_messagetype(::GameManagementMessage_GameManagementMessageType value); - // optional .JoinGameMessage joinGameMessage = 2; - inline bool has_joingamemessage() const; - inline void clear_joingamemessage(); - static const int kJoinGameMessageFieldNumber = 2; - inline const ::JoinGameMessage& joingamemessage() const; - inline ::JoinGameMessage* mutable_joingamemessage(); - inline ::JoinGameMessage* release_joingamemessage(); - inline void set_allocated_joingamemessage(::JoinGameMessage* joingamemessage); - - // optional .RejoinGameMessage rejoinGameMessage = 3; - inline bool has_rejoingamemessage() const; - inline void clear_rejoingamemessage(); - static const int kRejoinGameMessageFieldNumber = 3; - inline const ::RejoinGameMessage& rejoingamemessage() const; - inline ::RejoinGameMessage* mutable_rejoingamemessage(); - inline ::RejoinGameMessage* release_rejoingamemessage(); - inline void set_allocated_rejoingamemessage(::RejoinGameMessage* rejoingamemessage); - - // optional .JoinGameAckMessage joinGameAckMessage = 4; - inline bool has_joingameackmessage() const; - inline void clear_joingameackmessage(); - static const int kJoinGameAckMessageFieldNumber = 4; - inline const ::JoinGameAckMessage& joingameackmessage() const; - inline ::JoinGameAckMessage* mutable_joingameackmessage(); - inline ::JoinGameAckMessage* release_joingameackmessage(); - inline void set_allocated_joingameackmessage(::JoinGameAckMessage* joingameackmessage); - - // optional .JoinGameFailedMessage joinGameFailedMessage = 5; - inline bool has_joingamefailedmessage() const; - inline void clear_joingamefailedmessage(); - static const int kJoinGameFailedMessageFieldNumber = 5; - inline const ::JoinGameFailedMessage& joingamefailedmessage() const; - inline ::JoinGameFailedMessage* mutable_joingamefailedmessage(); - inline ::JoinGameFailedMessage* release_joingamefailedmessage(); - inline void set_allocated_joingamefailedmessage(::JoinGameFailedMessage* joingamefailedmessage); - - // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; inline bool has_gameplayerjoinedmessage() const; inline void clear_gameplayerjoinedmessage(); - static const int kGamePlayerJoinedMessageFieldNumber = 6; + static const int kGamePlayerJoinedMessageFieldNumber = 2; inline const ::GamePlayerJoinedMessage& gameplayerjoinedmessage() const; inline ::GamePlayerJoinedMessage* mutable_gameplayerjoinedmessage(); inline ::GamePlayerJoinedMessage* release_gameplayerjoinedmessage(); inline void set_allocated_gameplayerjoinedmessage(::GamePlayerJoinedMessage* gameplayerjoinedmessage); - // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; inline bool has_gameplayerleftmessage() const; inline void clear_gameplayerleftmessage(); - static const int kGamePlayerLeftMessageFieldNumber = 7; + static const int kGamePlayerLeftMessageFieldNumber = 3; inline const ::GamePlayerLeftMessage& gameplayerleftmessage() const; inline ::GamePlayerLeftMessage* mutable_gameplayerleftmessage(); inline ::GamePlayerLeftMessage* release_gameplayerleftmessage(); inline void set_allocated_gameplayerleftmessage(::GamePlayerLeftMessage* gameplayerleftmessage); - // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; inline bool has_gamespectatorjoinedmessage() const; inline void clear_gamespectatorjoinedmessage(); - static const int kGameSpectatorJoinedMessageFieldNumber = 8; + static const int kGameSpectatorJoinedMessageFieldNumber = 4; inline const ::GameSpectatorJoinedMessage& gamespectatorjoinedmessage() const; inline ::GameSpectatorJoinedMessage* mutable_gamespectatorjoinedmessage(); inline ::GameSpectatorJoinedMessage* release_gamespectatorjoinedmessage(); inline void set_allocated_gamespectatorjoinedmessage(::GameSpectatorJoinedMessage* gamespectatorjoinedmessage); - // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; inline bool has_gamespectatorleftmessage() const; inline void clear_gamespectatorleftmessage(); - static const int kGameSpectatorLeftMessageFieldNumber = 9; + static const int kGameSpectatorLeftMessageFieldNumber = 5; inline const ::GameSpectatorLeftMessage& gamespectatorleftmessage() const; inline ::GameSpectatorLeftMessage* mutable_gamespectatorleftmessage(); inline ::GameSpectatorLeftMessage* release_gamespectatorleftmessage(); inline void set_allocated_gamespectatorleftmessage(::GameSpectatorLeftMessage* gamespectatorleftmessage); - // optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + // optional .GameAdminChangedMessage gameAdminChangedMessage = 6; inline bool has_gameadminchangedmessage() const; inline void clear_gameadminchangedmessage(); - static const int kGameAdminChangedMessageFieldNumber = 10; + static const int kGameAdminChangedMessageFieldNumber = 6; inline const ::GameAdminChangedMessage& gameadminchangedmessage() const; inline ::GameAdminChangedMessage* mutable_gameadminchangedmessage(); inline ::GameAdminChangedMessage* release_gameadminchangedmessage(); inline void set_allocated_gameadminchangedmessage(::GameAdminChangedMessage* gameadminchangedmessage); - // optional .RemovedFromGameMessage removedFromGameMessage = 11; + // optional .RemovedFromGameMessage removedFromGameMessage = 7; inline bool has_removedfromgamemessage() const; inline void clear_removedfromgamemessage(); - static const int kRemovedFromGameMessageFieldNumber = 11; + static const int kRemovedFromGameMessageFieldNumber = 7; inline const ::RemovedFromGameMessage& removedfromgamemessage() const; inline ::RemovedFromGameMessage* mutable_removedfromgamemessage(); inline ::RemovedFromGameMessage* release_removedfromgamemessage(); inline void set_allocated_removedfromgamemessage(::RemovedFromGameMessage* removedfromgamemessage); - // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; inline bool has_kickplayerrequestmessage() const; inline void clear_kickplayerrequestmessage(); - static const int kKickPlayerRequestMessageFieldNumber = 12; + static const int kKickPlayerRequestMessageFieldNumber = 8; inline const ::KickPlayerRequestMessage& kickplayerrequestmessage() const; inline ::KickPlayerRequestMessage* mutable_kickplayerrequestmessage(); inline ::KickPlayerRequestMessage* release_kickplayerrequestmessage(); inline void set_allocated_kickplayerrequestmessage(::KickPlayerRequestMessage* kickplayerrequestmessage); - // optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + // optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; inline bool has_leavegamerequestmessage() const; inline void clear_leavegamerequestmessage(); - static const int kLeaveGameRequestMessageFieldNumber = 13; + static const int kLeaveGameRequestMessageFieldNumber = 9; inline const ::LeaveGameRequestMessage& leavegamerequestmessage() const; inline ::LeaveGameRequestMessage* mutable_leavegamerequestmessage(); inline ::LeaveGameRequestMessage* release_leavegamerequestmessage(); inline void set_allocated_leavegamerequestmessage(::LeaveGameRequestMessage* leavegamerequestmessage); - // optional .StartEventMessage startEventMessage = 14; + // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + inline bool has_inviteplayertogamemessage() const; + inline void clear_inviteplayertogamemessage(); + static const int kInvitePlayerToGameMessageFieldNumber = 10; + inline const ::InvitePlayerToGameMessage& inviteplayertogamemessage() const; + inline ::InvitePlayerToGameMessage* mutable_inviteplayertogamemessage(); + inline ::InvitePlayerToGameMessage* release_inviteplayertogamemessage(); + inline void set_allocated_inviteplayertogamemessage(::InvitePlayerToGameMessage* inviteplayertogamemessage); + + // optional .StartEventMessage startEventMessage = 11; inline bool has_starteventmessage() const; inline void clear_starteventmessage(); - static const int kStartEventMessageFieldNumber = 14; + static const int kStartEventMessageFieldNumber = 11; inline const ::StartEventMessage& starteventmessage() const; inline ::StartEventMessage* mutable_starteventmessage(); inline ::StartEventMessage* release_starteventmessage(); inline void set_allocated_starteventmessage(::StartEventMessage* starteventmessage); - // optional .StartEventAckMessage startEventAckMessage = 15; + // optional .StartEventAckMessage startEventAckMessage = 12; inline bool has_starteventackmessage() const; inline void clear_starteventackmessage(); - static const int kStartEventAckMessageFieldNumber = 15; + static const int kStartEventAckMessageFieldNumber = 12; inline const ::StartEventAckMessage& starteventackmessage() const; inline ::StartEventAckMessage* mutable_starteventackmessage(); inline ::StartEventAckMessage* release_starteventackmessage(); inline void set_allocated_starteventackmessage(::StartEventAckMessage* starteventackmessage); - // optional .GameStartInitialMessage gameStartInitialMessage = 16; + // optional .GameStartInitialMessage gameStartInitialMessage = 13; inline bool has_gamestartinitialmessage() const; inline void clear_gamestartinitialmessage(); - static const int kGameStartInitialMessageFieldNumber = 16; + static const int kGameStartInitialMessageFieldNumber = 13; inline const ::GameStartInitialMessage& gamestartinitialmessage() const; inline ::GameStartInitialMessage* mutable_gamestartinitialmessage(); inline ::GameStartInitialMessage* release_gamestartinitialmessage(); inline void set_allocated_gamestartinitialmessage(::GameStartInitialMessage* gamestartinitialmessage); - // optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + // optional .GameStartRejoinMessage gameStartRejoinMessage = 14; inline bool has_gamestartrejoinmessage() const; inline void clear_gamestartrejoinmessage(); - static const int kGameStartRejoinMessageFieldNumber = 17; + static const int kGameStartRejoinMessageFieldNumber = 14; inline const ::GameStartRejoinMessage& gamestartrejoinmessage() const; inline ::GameStartRejoinMessage* mutable_gamestartrejoinmessage(); inline ::GameStartRejoinMessage* release_gamestartrejoinmessage(); inline void set_allocated_gamestartrejoinmessage(::GameStartRejoinMessage* gamestartrejoinmessage); - // optional .EndOfGameMessage endOfGameMessage = 18; + // optional .EndOfGameMessage endOfGameMessage = 15; inline bool has_endofgamemessage() const; inline void clear_endofgamemessage(); - static const int kEndOfGameMessageFieldNumber = 18; + static const int kEndOfGameMessageFieldNumber = 15; inline const ::EndOfGameMessage& endofgamemessage() const; inline ::EndOfGameMessage* mutable_endofgamemessage(); inline ::EndOfGameMessage* release_endofgamemessage(); inline void set_allocated_endofgamemessage(::EndOfGameMessage* endofgamemessage); - // optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + // optional .PlayerIdChangedMessage playerIdChangedMessage = 16; inline bool has_playeridchangedmessage() const; inline void clear_playeridchangedmessage(); - static const int kPlayerIdChangedMessageFieldNumber = 19; + static const int kPlayerIdChangedMessageFieldNumber = 16; inline const ::PlayerIdChangedMessage& playeridchangedmessage() const; inline ::PlayerIdChangedMessage* mutable_playeridchangedmessage(); inline ::PlayerIdChangedMessage* release_playeridchangedmessage(); inline void set_allocated_playeridchangedmessage(::PlayerIdChangedMessage* playeridchangedmessage); - // optional .AskKickPlayerMessage askKickPlayerMessage = 20; + // optional .AskKickPlayerMessage askKickPlayerMessage = 17; inline bool has_askkickplayermessage() const; inline void clear_askkickplayermessage(); - static const int kAskKickPlayerMessageFieldNumber = 20; + static const int kAskKickPlayerMessageFieldNumber = 17; inline const ::AskKickPlayerMessage& askkickplayermessage() const; inline ::AskKickPlayerMessage* mutable_askkickplayermessage(); inline ::AskKickPlayerMessage* release_askkickplayermessage(); inline void set_allocated_askkickplayermessage(::AskKickPlayerMessage* askkickplayermessage); - // optional .AskKickDeniedMessage askKickDeniedMessage = 21; + // optional .AskKickDeniedMessage askKickDeniedMessage = 18; inline bool has_askkickdeniedmessage() const; inline void clear_askkickdeniedmessage(); - static const int kAskKickDeniedMessageFieldNumber = 21; + static const int kAskKickDeniedMessageFieldNumber = 18; inline const ::AskKickDeniedMessage& askkickdeniedmessage() const; inline ::AskKickDeniedMessage* mutable_askkickdeniedmessage(); inline ::AskKickDeniedMessage* release_askkickdeniedmessage(); inline void set_allocated_askkickdeniedmessage(::AskKickDeniedMessage* askkickdeniedmessage); - // optional .StartKickPetitionMessage startKickPetitionMessage = 22; + // optional .StartKickPetitionMessage startKickPetitionMessage = 19; inline bool has_startkickpetitionmessage() const; inline void clear_startkickpetitionmessage(); - static const int kStartKickPetitionMessageFieldNumber = 22; + static const int kStartKickPetitionMessageFieldNumber = 19; inline const ::StartKickPetitionMessage& startkickpetitionmessage() const; inline ::StartKickPetitionMessage* mutable_startkickpetitionmessage(); inline ::StartKickPetitionMessage* release_startkickpetitionmessage(); inline void set_allocated_startkickpetitionmessage(::StartKickPetitionMessage* startkickpetitionmessage); - // optional .VoteKickRequestMessage voteKickRequestMessage = 23; + // optional .VoteKickRequestMessage voteKickRequestMessage = 20; inline bool has_votekickrequestmessage() const; inline void clear_votekickrequestmessage(); - static const int kVoteKickRequestMessageFieldNumber = 23; + static const int kVoteKickRequestMessageFieldNumber = 20; inline const ::VoteKickRequestMessage& votekickrequestmessage() const; inline ::VoteKickRequestMessage* mutable_votekickrequestmessage(); inline ::VoteKickRequestMessage* release_votekickrequestmessage(); inline void set_allocated_votekickrequestmessage(::VoteKickRequestMessage* votekickrequestmessage); - // optional .VoteKickReplyMessage voteKickReplyMessage = 24; + // optional .VoteKickReplyMessage voteKickReplyMessage = 21; inline bool has_votekickreplymessage() const; inline void clear_votekickreplymessage(); - static const int kVoteKickReplyMessageFieldNumber = 24; + static const int kVoteKickReplyMessageFieldNumber = 21; inline const ::VoteKickReplyMessage& votekickreplymessage() const; inline ::VoteKickReplyMessage* mutable_votekickreplymessage(); inline ::VoteKickReplyMessage* release_votekickreplymessage(); inline void set_allocated_votekickreplymessage(::VoteKickReplyMessage* votekickreplymessage); - // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; inline bool has_kickpetitionupdatemessage() const; inline void clear_kickpetitionupdatemessage(); - static const int kKickPetitionUpdateMessageFieldNumber = 25; + static const int kKickPetitionUpdateMessageFieldNumber = 22; inline const ::KickPetitionUpdateMessage& kickpetitionupdatemessage() const; inline ::KickPetitionUpdateMessage* mutable_kickpetitionupdatemessage(); inline ::KickPetitionUpdateMessage* release_kickpetitionupdatemessage(); inline void set_allocated_kickpetitionupdatemessage(::KickPetitionUpdateMessage* kickpetitionupdatemessage); - // optional .EndKickPetitionMessage endKickPetitionMessage = 26; + // optional .EndKickPetitionMessage endKickPetitionMessage = 23; inline bool has_endkickpetitionmessage() const; inline void clear_endkickpetitionmessage(); - static const int kEndKickPetitionMessageFieldNumber = 26; + static const int kEndKickPetitionMessageFieldNumber = 23; inline const ::EndKickPetitionMessage& endkickpetitionmessage() const; inline ::EndKickPetitionMessage* mutable_endkickpetitionmessage(); inline ::EndKickPetitionMessage* release_endkickpetitionmessage(); inline void set_allocated_endkickpetitionmessage(::EndKickPetitionMessage* endkickpetitionmessage); - // optional .ChatRequestMessage chatRequestMessage = 27; + // optional .ChatRequestMessage chatRequestMessage = 24; inline bool has_chatrequestmessage() const; inline void clear_chatrequestmessage(); - static const int kChatRequestMessageFieldNumber = 27; + static const int kChatRequestMessageFieldNumber = 24; inline const ::ChatRequestMessage& chatrequestmessage() const; inline ::ChatRequestMessage* mutable_chatrequestmessage(); inline ::ChatRequestMessage* release_chatrequestmessage(); inline void set_allocated_chatrequestmessage(::ChatRequestMessage* chatrequestmessage); - // optional .ChatMessage chatMessage = 28; + // optional .ChatMessage chatMessage = 25; inline bool has_chatmessage() const; inline void clear_chatmessage(); - static const int kChatMessageFieldNumber = 28; + static const int kChatMessageFieldNumber = 25; inline const ::ChatMessage& chatmessage() const; inline ::ChatMessage* mutable_chatmessage(); inline ::ChatMessage* release_chatmessage(); inline void set_allocated_chatmessage(::ChatMessage* chatmessage); - // optional .ChatRejectMessage chatRejectMessage = 29; + // optional .ChatRejectMessage chatRejectMessage = 26; inline bool has_chatrejectmessage() const; inline void clear_chatrejectmessage(); - static const int kChatRejectMessageFieldNumber = 29; + static const int kChatRejectMessageFieldNumber = 26; inline const ::ChatRejectMessage& chatrejectmessage() const; inline ::ChatRejectMessage* mutable_chatrejectmessage(); inline ::ChatRejectMessage* release_chatrejectmessage(); inline void set_allocated_chatrejectmessage(::ChatRejectMessage* chatrejectmessage); + // optional .TimeoutWarningMessage timeoutWarningMessage = 27; + inline bool has_timeoutwarningmessage() const; + inline void clear_timeoutwarningmessage(); + static const int kTimeoutWarningMessageFieldNumber = 27; + inline const ::TimeoutWarningMessage& timeoutwarningmessage() const; + inline ::TimeoutWarningMessage* mutable_timeoutwarningmessage(); + inline ::TimeoutWarningMessage* release_timeoutwarningmessage(); + inline void set_allocated_timeoutwarningmessage(::TimeoutWarningMessage* timeoutwarningmessage); + + // optional .ResetTimeoutMessage resetTimeoutMessage = 28; + inline bool has_resettimeoutmessage() const; + inline void clear_resettimeoutmessage(); + static const int kResetTimeoutMessageFieldNumber = 28; + inline const ::ResetTimeoutMessage& resettimeoutmessage() const; + inline ::ResetTimeoutMessage* mutable_resettimeoutmessage(); + inline ::ResetTimeoutMessage* release_resettimeoutmessage(); + inline void set_allocated_resettimeoutmessage(::ResetTimeoutMessage* resettimeoutmessage); + // optional .ErrorMessage errorMessage = 1025; inline bool has_errormessage() const; inline void clear_errormessage(); @@ -11298,14 +11283,6 @@ class GameManagementMessage : public ::google::protobuf::MessageLite { private: inline void set_has_messagetype(); inline void clear_has_messagetype(); - inline void set_has_joingamemessage(); - inline void clear_has_joingamemessage(); - inline void set_has_rejoingamemessage(); - inline void clear_has_rejoingamemessage(); - inline void set_has_joingameackmessage(); - inline void clear_has_joingameackmessage(); - inline void set_has_joingamefailedmessage(); - inline void clear_has_joingamefailedmessage(); inline void set_has_gameplayerjoinedmessage(); inline void clear_has_gameplayerjoinedmessage(); inline void set_has_gameplayerleftmessage(); @@ -11322,6 +11299,8 @@ class GameManagementMessage : public ::google::protobuf::MessageLite { inline void clear_has_kickplayerrequestmessage(); inline void set_has_leavegamerequestmessage(); inline void clear_has_leavegamerequestmessage(); + inline void set_has_inviteplayertogamemessage(); + inline void clear_has_inviteplayertogamemessage(); inline void set_has_starteventmessage(); inline void clear_has_starteventmessage(); inline void set_has_starteventackmessage(); @@ -11354,13 +11333,13 @@ class GameManagementMessage : public ::google::protobuf::MessageLite { inline void clear_has_chatmessage(); inline void set_has_chatrejectmessage(); inline void clear_has_chatrejectmessage(); + inline void set_has_timeoutwarningmessage(); + inline void clear_has_timeoutwarningmessage(); + inline void set_has_resettimeoutmessage(); + inline void clear_has_resettimeoutmessage(); inline void set_has_errormessage(); inline void clear_has_errormessage(); - ::JoinGameMessage* joingamemessage_; - ::RejoinGameMessage* rejoingamemessage_; - ::JoinGameAckMessage* joingameackmessage_; - ::JoinGameFailedMessage* joingamefailedmessage_; ::GamePlayerJoinedMessage* gameplayerjoinedmessage_; ::GamePlayerLeftMessage* gameplayerleftmessage_; ::GameSpectatorJoinedMessage* gamespectatorjoinedmessage_; @@ -11369,6 +11348,7 @@ class GameManagementMessage : public ::google::protobuf::MessageLite { ::RemovedFromGameMessage* removedfromgamemessage_; ::KickPlayerRequestMessage* kickplayerrequestmessage_; ::LeaveGameRequestMessage* leavegamerequestmessage_; + ::InvitePlayerToGameMessage* inviteplayertogamemessage_; ::StartEventMessage* starteventmessage_; ::StartEventAckMessage* starteventackmessage_; ::GameStartInitialMessage* gamestartinitialmessage_; @@ -11385,11 +11365,13 @@ class GameManagementMessage : public ::google::protobuf::MessageLite { ::ChatRequestMessage* chatrequestmessage_; ::ChatMessage* chatmessage_; ::ChatRejectMessage* chatrejectmessage_; + ::TimeoutWarningMessage* timeoutwarningmessage_; + ::ResetTimeoutMessage* resettimeoutmessage_; ::ErrorMessage* errormessage_; int messagetype_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(30 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(29 + 31) / 32]; #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER friend void protobuf_AddDesc_pokerth_2eproto_impl(); @@ -13067,6 +13049,76 @@ inline void AuthClientRequestMessage::set_allocated_mylastsessionid(::std::strin } } +// optional bytes avatarHash = 8; +inline bool AuthClientRequestMessage::has_avatarhash() const { + return (_has_bits_[0] & 0x00000080u) != 0; +} +inline void AuthClientRequestMessage::set_has_avatarhash() { + _has_bits_[0] |= 0x00000080u; +} +inline void AuthClientRequestMessage::clear_has_avatarhash() { + _has_bits_[0] &= ~0x00000080u; +} +inline void AuthClientRequestMessage::clear_avatarhash() { + if (avatarhash_ != &::google::protobuf::internal::kEmptyString) { + avatarhash_->clear(); + } + clear_has_avatarhash(); +} +inline const ::std::string& AuthClientRequestMessage::avatarhash() const { + return *avatarhash_; +} +inline void AuthClientRequestMessage::set_avatarhash(const ::std::string& value) { + set_has_avatarhash(); + if (avatarhash_ == &::google::protobuf::internal::kEmptyString) { + avatarhash_ = new ::std::string; + } + avatarhash_->assign(value); +} +inline void AuthClientRequestMessage::set_avatarhash(const char* value) { + set_has_avatarhash(); + if (avatarhash_ == &::google::protobuf::internal::kEmptyString) { + avatarhash_ = new ::std::string; + } + avatarhash_->assign(value); +} +inline void AuthClientRequestMessage::set_avatarhash(const void* value, size_t size) { + set_has_avatarhash(); + if (avatarhash_ == &::google::protobuf::internal::kEmptyString) { + avatarhash_ = new ::std::string; + } + avatarhash_->assign(reinterpret_cast(value), size); +} +inline ::std::string* AuthClientRequestMessage::mutable_avatarhash() { + set_has_avatarhash(); + if (avatarhash_ == &::google::protobuf::internal::kEmptyString) { + avatarhash_ = new ::std::string; + } + return avatarhash_; +} +inline ::std::string* AuthClientRequestMessage::release_avatarhash() { + clear_has_avatarhash(); + if (avatarhash_ == &::google::protobuf::internal::kEmptyString) { + return NULL; + } else { + ::std::string* temp = avatarhash_; + avatarhash_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); + return temp; + } +} +inline void AuthClientRequestMessage::set_allocated_avatarhash(::std::string* avatarhash) { + if (avatarhash_ != &::google::protobuf::internal::kEmptyString) { + delete avatarhash_; + } + if (avatarhash) { + set_has_avatarhash(); + avatarhash_ = avatarhash; + } else { + clear_has_avatarhash(); + avatarhash_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); + } +} + // ------------------------------------------------------------------- // AuthServerChallengeMessage @@ -13219,107 +13271,15 @@ inline void AuthClientResponseMessage::set_allocated_clientresponse(::std::strin // AuthServerVerificationMessage -// required bytes yourSessionId = 1; -inline bool AuthServerVerificationMessage::has_yoursessionid() const { +// required bytes serverVerification = 1; +inline bool AuthServerVerificationMessage::has_serververification() const { return (_has_bits_[0] & 0x00000001u) != 0; } -inline void AuthServerVerificationMessage::set_has_yoursessionid() { +inline void AuthServerVerificationMessage::set_has_serververification() { _has_bits_[0] |= 0x00000001u; } -inline void AuthServerVerificationMessage::clear_has_yoursessionid() { - _has_bits_[0] &= ~0x00000001u; -} -inline void AuthServerVerificationMessage::clear_yoursessionid() { - if (yoursessionid_ != &::google::protobuf::internal::kEmptyString) { - yoursessionid_->clear(); - } - clear_has_yoursessionid(); -} -inline const ::std::string& AuthServerVerificationMessage::yoursessionid() const { - return *yoursessionid_; -} -inline void AuthServerVerificationMessage::set_yoursessionid(const ::std::string& value) { - set_has_yoursessionid(); - if (yoursessionid_ == &::google::protobuf::internal::kEmptyString) { - yoursessionid_ = new ::std::string; - } - yoursessionid_->assign(value); -} -inline void AuthServerVerificationMessage::set_yoursessionid(const char* value) { - set_has_yoursessionid(); - if (yoursessionid_ == &::google::protobuf::internal::kEmptyString) { - yoursessionid_ = new ::std::string; - } - yoursessionid_->assign(value); -} -inline void AuthServerVerificationMessage::set_yoursessionid(const void* value, size_t size) { - set_has_yoursessionid(); - if (yoursessionid_ == &::google::protobuf::internal::kEmptyString) { - yoursessionid_ = new ::std::string; - } - yoursessionid_->assign(reinterpret_cast(value), size); -} -inline ::std::string* AuthServerVerificationMessage::mutable_yoursessionid() { - set_has_yoursessionid(); - if (yoursessionid_ == &::google::protobuf::internal::kEmptyString) { - yoursessionid_ = new ::std::string; - } - return yoursessionid_; -} -inline ::std::string* AuthServerVerificationMessage::release_yoursessionid() { - clear_has_yoursessionid(); - if (yoursessionid_ == &::google::protobuf::internal::kEmptyString) { - return NULL; - } else { - ::std::string* temp = yoursessionid_; - yoursessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); - return temp; - } -} -inline void AuthServerVerificationMessage::set_allocated_yoursessionid(::std::string* yoursessionid) { - if (yoursessionid_ != &::google::protobuf::internal::kEmptyString) { - delete yoursessionid_; - } - if (yoursessionid) { - set_has_yoursessionid(); - yoursessionid_ = yoursessionid; - } else { - clear_has_yoursessionid(); - yoursessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); - } -} - -// required uint32 yourPlayerId = 2; -inline bool AuthServerVerificationMessage::has_yourplayerid() const { - return (_has_bits_[0] & 0x00000002u) != 0; -} -inline void AuthServerVerificationMessage::set_has_yourplayerid() { - _has_bits_[0] |= 0x00000002u; -} -inline void AuthServerVerificationMessage::clear_has_yourplayerid() { - _has_bits_[0] &= ~0x00000002u; -} -inline void AuthServerVerificationMessage::clear_yourplayerid() { - yourplayerid_ = 0u; - clear_has_yourplayerid(); -} -inline ::google::protobuf::uint32 AuthServerVerificationMessage::yourplayerid() const { - return yourplayerid_; -} -inline void AuthServerVerificationMessage::set_yourplayerid(::google::protobuf::uint32 value) { - set_has_yourplayerid(); - yourplayerid_ = value; -} - -// optional bytes serverVerification = 3; -inline bool AuthServerVerificationMessage::has_serververification() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -inline void AuthServerVerificationMessage::set_has_serververification() { - _has_bits_[0] |= 0x00000004u; -} inline void AuthServerVerificationMessage::clear_has_serververification() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000001u; } inline void AuthServerVerificationMessage::clear_serververification() { if (serververification_ != &::google::protobuf::internal::kEmptyString) { @@ -13383,130 +13343,148 @@ inline void AuthServerVerificationMessage::set_allocated_serververification(::st // ------------------------------------------------------------------- -// InitMessage +// InitDoneMessage -// optional bytes avatarHash = 1; -inline bool InitMessage::has_avatarhash() const { +// required bytes yourSessionId = 1; +inline bool InitDoneMessage::has_yoursessionid() const { return (_has_bits_[0] & 0x00000001u) != 0; } -inline void InitMessage::set_has_avatarhash() { +inline void InitDoneMessage::set_has_yoursessionid() { _has_bits_[0] |= 0x00000001u; } -inline void InitMessage::clear_has_avatarhash() { +inline void InitDoneMessage::clear_has_yoursessionid() { _has_bits_[0] &= ~0x00000001u; } -inline void InitMessage::clear_avatarhash() { - if (avatarhash_ != &::google::protobuf::internal::kEmptyString) { - avatarhash_->clear(); +inline void InitDoneMessage::clear_yoursessionid() { + if (yoursessionid_ != &::google::protobuf::internal::kEmptyString) { + yoursessionid_->clear(); } - clear_has_avatarhash(); + clear_has_yoursessionid(); } -inline const ::std::string& InitMessage::avatarhash() const { - return *avatarhash_; +inline const ::std::string& InitDoneMessage::yoursessionid() const { + return *yoursessionid_; } -inline void InitMessage::set_avatarhash(const ::std::string& value) { - set_has_avatarhash(); - if (avatarhash_ == &::google::protobuf::internal::kEmptyString) { - avatarhash_ = new ::std::string; +inline void InitDoneMessage::set_yoursessionid(const ::std::string& value) { + set_has_yoursessionid(); + if (yoursessionid_ == &::google::protobuf::internal::kEmptyString) { + yoursessionid_ = new ::std::string; } - avatarhash_->assign(value); + yoursessionid_->assign(value); } -inline void InitMessage::set_avatarhash(const char* value) { - set_has_avatarhash(); - if (avatarhash_ == &::google::protobuf::internal::kEmptyString) { - avatarhash_ = new ::std::string; +inline void InitDoneMessage::set_yoursessionid(const char* value) { + set_has_yoursessionid(); + if (yoursessionid_ == &::google::protobuf::internal::kEmptyString) { + yoursessionid_ = new ::std::string; } - avatarhash_->assign(value); + yoursessionid_->assign(value); } -inline void InitMessage::set_avatarhash(const void* value, size_t size) { - set_has_avatarhash(); - if (avatarhash_ == &::google::protobuf::internal::kEmptyString) { - avatarhash_ = new ::std::string; +inline void InitDoneMessage::set_yoursessionid(const void* value, size_t size) { + set_has_yoursessionid(); + if (yoursessionid_ == &::google::protobuf::internal::kEmptyString) { + yoursessionid_ = new ::std::string; } - avatarhash_->assign(reinterpret_cast(value), size); + yoursessionid_->assign(reinterpret_cast(value), size); } -inline ::std::string* InitMessage::mutable_avatarhash() { - set_has_avatarhash(); - if (avatarhash_ == &::google::protobuf::internal::kEmptyString) { - avatarhash_ = new ::std::string; +inline ::std::string* InitDoneMessage::mutable_yoursessionid() { + set_has_yoursessionid(); + if (yoursessionid_ == &::google::protobuf::internal::kEmptyString) { + yoursessionid_ = new ::std::string; } - return avatarhash_; + return yoursessionid_; } -inline ::std::string* InitMessage::release_avatarhash() { - clear_has_avatarhash(); - if (avatarhash_ == &::google::protobuf::internal::kEmptyString) { +inline ::std::string* InitDoneMessage::release_yoursessionid() { + clear_has_yoursessionid(); + if (yoursessionid_ == &::google::protobuf::internal::kEmptyString) { return NULL; } else { - ::std::string* temp = avatarhash_; - avatarhash_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); + ::std::string* temp = yoursessionid_; + yoursessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); return temp; } } -inline void InitMessage::set_allocated_avatarhash(::std::string* avatarhash) { - if (avatarhash_ != &::google::protobuf::internal::kEmptyString) { - delete avatarhash_; +inline void InitDoneMessage::set_allocated_yoursessionid(::std::string* yoursessionid) { + if (yoursessionid_ != &::google::protobuf::internal::kEmptyString) { + delete yoursessionid_; } - if (avatarhash) { - set_has_avatarhash(); - avatarhash_ = avatarhash; + if (yoursessionid) { + set_has_yoursessionid(); + yoursessionid_ = yoursessionid; } else { - clear_has_avatarhash(); - avatarhash_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); + clear_has_yoursessionid(); + yoursessionid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); } } -// ------------------------------------------------------------------- +// required uint32 yourPlayerId = 2; +inline bool InitDoneMessage::has_yourplayerid() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void InitDoneMessage::set_has_yourplayerid() { + _has_bits_[0] |= 0x00000002u; +} +inline void InitDoneMessage::clear_has_yourplayerid() { + _has_bits_[0] &= ~0x00000002u; +} +inline void InitDoneMessage::clear_yourplayerid() { + yourplayerid_ = 0u; + clear_has_yourplayerid(); +} +inline ::google::protobuf::uint32 InitDoneMessage::yourplayerid() const { + return yourplayerid_; +} +inline void InitDoneMessage::set_yourplayerid(::google::protobuf::uint32 value) { + set_has_yourplayerid(); + yourplayerid_ = value; +} -// InitAckMessage - -// optional bytes yourAvatarHash = 1; -inline bool InitAckMessage::has_youravatarhash() const { - return (_has_bits_[0] & 0x00000001u) != 0; +// optional bytes yourAvatarHash = 3; +inline bool InitDoneMessage::has_youravatarhash() const { + return (_has_bits_[0] & 0x00000004u) != 0; } -inline void InitAckMessage::set_has_youravatarhash() { - _has_bits_[0] |= 0x00000001u; +inline void InitDoneMessage::set_has_youravatarhash() { + _has_bits_[0] |= 0x00000004u; } -inline void InitAckMessage::clear_has_youravatarhash() { - _has_bits_[0] &= ~0x00000001u; +inline void InitDoneMessage::clear_has_youravatarhash() { + _has_bits_[0] &= ~0x00000004u; } -inline void InitAckMessage::clear_youravatarhash() { +inline void InitDoneMessage::clear_youravatarhash() { if (youravatarhash_ != &::google::protobuf::internal::kEmptyString) { youravatarhash_->clear(); } clear_has_youravatarhash(); } -inline const ::std::string& InitAckMessage::youravatarhash() const { +inline const ::std::string& InitDoneMessage::youravatarhash() const { return *youravatarhash_; } -inline void InitAckMessage::set_youravatarhash(const ::std::string& value) { +inline void InitDoneMessage::set_youravatarhash(const ::std::string& value) { set_has_youravatarhash(); if (youravatarhash_ == &::google::protobuf::internal::kEmptyString) { youravatarhash_ = new ::std::string; } youravatarhash_->assign(value); } -inline void InitAckMessage::set_youravatarhash(const char* value) { +inline void InitDoneMessage::set_youravatarhash(const char* value) { set_has_youravatarhash(); if (youravatarhash_ == &::google::protobuf::internal::kEmptyString) { youravatarhash_ = new ::std::string; } youravatarhash_->assign(value); } -inline void InitAckMessage::set_youravatarhash(const void* value, size_t size) { +inline void InitDoneMessage::set_youravatarhash(const void* value, size_t size) { set_has_youravatarhash(); if (youravatarhash_ == &::google::protobuf::internal::kEmptyString) { youravatarhash_ = new ::std::string; } youravatarhash_->assign(reinterpret_cast(value), size); } -inline ::std::string* InitAckMessage::mutable_youravatarhash() { +inline ::std::string* InitDoneMessage::mutable_youravatarhash() { set_has_youravatarhash(); if (youravatarhash_ == &::google::protobuf::internal::kEmptyString) { youravatarhash_ = new ::std::string; } return youravatarhash_; } -inline ::std::string* InitAckMessage::release_youravatarhash() { +inline ::std::string* InitDoneMessage::release_youravatarhash() { clear_has_youravatarhash(); if (youravatarhash_ == &::google::protobuf::internal::kEmptyString) { return NULL; @@ -13516,7 +13494,7 @@ inline ::std::string* InitAckMessage::release_youravatarhash() { return temp; } } -inline void InitAckMessage::set_allocated_youravatarhash(::std::string* youravatarhash) { +inline void InitDoneMessage::set_allocated_youravatarhash(::std::string* youravatarhash) { if (youravatarhash_ != &::google::protobuf::internal::kEmptyString) { delete youravatarhash_; } @@ -13529,24 +13507,24 @@ inline void InitAckMessage::set_allocated_youravatarhash(::std::string* youravat } } -// optional uint32 rejoinGameId = 2; -inline bool InitAckMessage::has_rejoingameid() const { - return (_has_bits_[0] & 0x00000002u) != 0; +// optional uint32 rejoinGameId = 4; +inline bool InitDoneMessage::has_rejoingameid() const { + return (_has_bits_[0] & 0x00000008u) != 0; } -inline void InitAckMessage::set_has_rejoingameid() { - _has_bits_[0] |= 0x00000002u; +inline void InitDoneMessage::set_has_rejoingameid() { + _has_bits_[0] |= 0x00000008u; } -inline void InitAckMessage::clear_has_rejoingameid() { - _has_bits_[0] &= ~0x00000002u; +inline void InitDoneMessage::clear_has_rejoingameid() { + _has_bits_[0] &= ~0x00000008u; } -inline void InitAckMessage::clear_rejoingameid() { +inline void InitDoneMessage::clear_rejoingameid() { rejoingameid_ = 0u; clear_has_rejoingameid(); } -inline ::google::protobuf::uint32 InitAckMessage::rejoingameid() const { +inline ::google::protobuf::uint32 InitDoneMessage::rejoingameid() const { return rejoingameid_; } -inline void InitAckMessage::set_rejoingameid(::google::protobuf::uint32 value) { +inline void InitDoneMessage::set_rejoingameid(::google::protobuf::uint32 value) { set_has_rejoingameid(); rejoingameid_ = value; } @@ -15124,16 +15102,38 @@ inline void CreateGameFailedMessage::set_creategamefailurereason(::CreateGameFai // JoinGameMessage -// optional string password = 1; -inline bool JoinGameMessage::has_password() const { +// required uint32 gameId = 1; +inline bool JoinGameMessage::has_gameid() const { return (_has_bits_[0] & 0x00000001u) != 0; } -inline void JoinGameMessage::set_has_password() { +inline void JoinGameMessage::set_has_gameid() { _has_bits_[0] |= 0x00000001u; } -inline void JoinGameMessage::clear_has_password() { +inline void JoinGameMessage::clear_has_gameid() { _has_bits_[0] &= ~0x00000001u; } +inline void JoinGameMessage::clear_gameid() { + gameid_ = 0u; + clear_has_gameid(); +} +inline ::google::protobuf::uint32 JoinGameMessage::gameid() const { + return gameid_; +} +inline void JoinGameMessage::set_gameid(::google::protobuf::uint32 value) { + set_has_gameid(); + gameid_ = value; +} + +// optional string password = 2; +inline bool JoinGameMessage::has_password() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void JoinGameMessage::set_has_password() { + _has_bits_[0] |= 0x00000002u; +} +inline void JoinGameMessage::clear_has_password() { + _has_bits_[0] &= ~0x00000002u; +} inline void JoinGameMessage::clear_password() { if (password_ != &::google::protobuf::internal::kEmptyString) { password_->clear(); @@ -15194,15 +15194,15 @@ inline void JoinGameMessage::set_allocated_password(::std::string* password) { } } -// optional bool autoLeave = 2 [default = false]; +// optional bool autoLeave = 3 [default = false]; inline bool JoinGameMessage::has_autoleave() const { - return (_has_bits_[0] & 0x00000002u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void JoinGameMessage::set_has_autoleave() { - _has_bits_[0] |= 0x00000002u; + _has_bits_[0] |= 0x00000004u; } inline void JoinGameMessage::clear_has_autoleave() { - _has_bits_[0] &= ~0x00000002u; + _has_bits_[0] &= ~0x00000004u; } inline void JoinGameMessage::clear_autoleave() { autoleave_ = false; @@ -15216,15 +15216,15 @@ inline void JoinGameMessage::set_autoleave(bool value) { autoleave_ = value; } -// optional bool spectateOnly = 3 [default = false]; +// optional bool spectateOnly = 4 [default = false]; inline bool JoinGameMessage::has_spectateonly() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } inline void JoinGameMessage::set_has_spectateonly() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000008u; } inline void JoinGameMessage::clear_has_spectateonly() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000008u; } inline void JoinGameMessage::clear_spectateonly() { spectateonly_ = false; @@ -15242,16 +15242,38 @@ inline void JoinGameMessage::set_spectateonly(bool value) { // RejoinGameMessage -// optional bool autoLeave = 1 [default = false]; -inline bool RejoinGameMessage::has_autoleave() const { +// required uint32 gameId = 1; +inline bool RejoinGameMessage::has_gameid() const { return (_has_bits_[0] & 0x00000001u) != 0; } -inline void RejoinGameMessage::set_has_autoleave() { +inline void RejoinGameMessage::set_has_gameid() { _has_bits_[0] |= 0x00000001u; } -inline void RejoinGameMessage::clear_has_autoleave() { +inline void RejoinGameMessage::clear_has_gameid() { _has_bits_[0] &= ~0x00000001u; } +inline void RejoinGameMessage::clear_gameid() { + gameid_ = 0u; + clear_has_gameid(); +} +inline ::google::protobuf::uint32 RejoinGameMessage::gameid() const { + return gameid_; +} +inline void RejoinGameMessage::set_gameid(::google::protobuf::uint32 value) { + set_has_gameid(); + gameid_ = value; +} + +// optional bool autoLeave = 2 [default = false]; +inline bool RejoinGameMessage::has_autoleave() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void RejoinGameMessage::set_has_autoleave() { + _has_bits_[0] |= 0x00000002u; +} +inline void RejoinGameMessage::clear_has_autoleave() { + _has_bits_[0] &= ~0x00000002u; +} inline void RejoinGameMessage::clear_autoleave() { autoleave_ = false; clear_has_autoleave(); @@ -15268,16 +15290,38 @@ inline void RejoinGameMessage::set_autoleave(bool value) { // JoinGameAckMessage -// required bool areYouGameAdmin = 1; -inline bool JoinGameAckMessage::has_areyougameadmin() const { +// required uint32 gameId = 1; +inline bool JoinGameAckMessage::has_gameid() const { return (_has_bits_[0] & 0x00000001u) != 0; } -inline void JoinGameAckMessage::set_has_areyougameadmin() { +inline void JoinGameAckMessage::set_has_gameid() { _has_bits_[0] |= 0x00000001u; } -inline void JoinGameAckMessage::clear_has_areyougameadmin() { +inline void JoinGameAckMessage::clear_has_gameid() { _has_bits_[0] &= ~0x00000001u; } +inline void JoinGameAckMessage::clear_gameid() { + gameid_ = 0u; + clear_has_gameid(); +} +inline ::google::protobuf::uint32 JoinGameAckMessage::gameid() const { + return gameid_; +} +inline void JoinGameAckMessage::set_gameid(::google::protobuf::uint32 value) { + set_has_gameid(); + gameid_ = value; +} + +// required bool areYouGameAdmin = 2; +inline bool JoinGameAckMessage::has_areyougameadmin() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void JoinGameAckMessage::set_has_areyougameadmin() { + _has_bits_[0] |= 0x00000002u; +} +inline void JoinGameAckMessage::clear_has_areyougameadmin() { + _has_bits_[0] &= ~0x00000002u; +} inline void JoinGameAckMessage::clear_areyougameadmin() { areyougameadmin_ = false; clear_has_areyougameadmin(); @@ -15290,15 +15334,15 @@ inline void JoinGameAckMessage::set_areyougameadmin(bool value) { areyougameadmin_ = value; } -// required .NetGameInfo gameInfo = 2; +// required .NetGameInfo gameInfo = 3; inline bool JoinGameAckMessage::has_gameinfo() const { - return (_has_bits_[0] & 0x00000002u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void JoinGameAckMessage::set_has_gameinfo() { - _has_bits_[0] |= 0x00000002u; + _has_bits_[0] |= 0x00000004u; } inline void JoinGameAckMessage::clear_has_gameinfo() { - _has_bits_[0] &= ~0x00000002u; + _has_bits_[0] &= ~0x00000004u; } inline void JoinGameAckMessage::clear_gameinfo() { if (gameinfo_ != NULL) gameinfo_->::NetGameInfo::Clear(); @@ -15332,15 +15376,15 @@ inline void JoinGameAckMessage::set_allocated_gameinfo(::NetGameInfo* gameinfo) } } -// optional bool spectateOnly = 3; +// optional bool spectateOnly = 4; inline bool JoinGameAckMessage::has_spectateonly() const { - return (_has_bits_[0] & 0x00000004u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } inline void JoinGameAckMessage::set_has_spectateonly() { - _has_bits_[0] |= 0x00000004u; + _has_bits_[0] |= 0x00000008u; } inline void JoinGameAckMessage::clear_has_spectateonly() { - _has_bits_[0] &= ~0x00000004u; + _has_bits_[0] &= ~0x00000008u; } inline void JoinGameAckMessage::clear_spectateonly() { spectateonly_ = false; @@ -15358,16 +15402,38 @@ inline void JoinGameAckMessage::set_spectateonly(bool value) { // JoinGameFailedMessage -// required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; -inline bool JoinGameFailedMessage::has_joingamefailurereason() const { +// required uint32 gameId = 1; +inline bool JoinGameFailedMessage::has_gameid() const { return (_has_bits_[0] & 0x00000001u) != 0; } -inline void JoinGameFailedMessage::set_has_joingamefailurereason() { +inline void JoinGameFailedMessage::set_has_gameid() { _has_bits_[0] |= 0x00000001u; } -inline void JoinGameFailedMessage::clear_has_joingamefailurereason() { +inline void JoinGameFailedMessage::clear_has_gameid() { _has_bits_[0] &= ~0x00000001u; } +inline void JoinGameFailedMessage::clear_gameid() { + gameid_ = 0u; + clear_has_gameid(); +} +inline ::google::protobuf::uint32 JoinGameFailedMessage::gameid() const { + return gameid_; +} +inline void JoinGameFailedMessage::set_gameid(::google::protobuf::uint32 value) { + set_has_gameid(); + gameid_ = value; +} + +// required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; +inline bool JoinGameFailedMessage::has_joingamefailurereason() const { + return (_has_bits_[0] & 0x00000002u) != 0; +} +inline void JoinGameFailedMessage::set_has_joingamefailurereason() { + _has_bits_[0] |= 0x00000002u; +} +inline void JoinGameFailedMessage::clear_has_joingamefailurereason() { + _has_bits_[0] &= ~0x00000002u; +} inline void JoinGameFailedMessage::clear_joingamefailurereason() { joingamefailurereason_ = 1; clear_has_joingamefailurereason(); @@ -18824,99 +18890,57 @@ inline void LobbyMessage::set_messagetype(::LobbyMessage_LobbyMessageType value) messagetype_ = value; } -// optional .InitMessage initMessage = 2; -inline bool LobbyMessage::has_initmessage() const { +// optional .InitDoneMessage initDoneMessage = 2; +inline bool LobbyMessage::has_initdonemessage() const { return (_has_bits_[0] & 0x00000002u) != 0; } -inline void LobbyMessage::set_has_initmessage() { +inline void LobbyMessage::set_has_initdonemessage() { _has_bits_[0] |= 0x00000002u; } -inline void LobbyMessage::clear_has_initmessage() { +inline void LobbyMessage::clear_has_initdonemessage() { _has_bits_[0] &= ~0x00000002u; } -inline void LobbyMessage::clear_initmessage() { - if (initmessage_ != NULL) initmessage_->::InitMessage::Clear(); - clear_has_initmessage(); +inline void LobbyMessage::clear_initdonemessage() { + if (initdonemessage_ != NULL) initdonemessage_->::InitDoneMessage::Clear(); + clear_has_initdonemessage(); } -inline const ::InitMessage& LobbyMessage::initmessage() const { +inline const ::InitDoneMessage& LobbyMessage::initdonemessage() const { #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - return initmessage_ != NULL ? *initmessage_ : *default_instance().initmessage_; + return initdonemessage_ != NULL ? *initdonemessage_ : *default_instance().initdonemessage_; #else - return initmessage_ != NULL ? *initmessage_ : *default_instance_->initmessage_; + return initdonemessage_ != NULL ? *initdonemessage_ : *default_instance_->initdonemessage_; #endif } -inline ::InitMessage* LobbyMessage::mutable_initmessage() { - set_has_initmessage(); - if (initmessage_ == NULL) initmessage_ = new ::InitMessage; - return initmessage_; +inline ::InitDoneMessage* LobbyMessage::mutable_initdonemessage() { + set_has_initdonemessage(); + if (initdonemessage_ == NULL) initdonemessage_ = new ::InitDoneMessage; + return initdonemessage_; } -inline ::InitMessage* LobbyMessage::release_initmessage() { - clear_has_initmessage(); - ::InitMessage* temp = initmessage_; - initmessage_ = NULL; +inline ::InitDoneMessage* LobbyMessage::release_initdonemessage() { + clear_has_initdonemessage(); + ::InitDoneMessage* temp = initdonemessage_; + initdonemessage_ = NULL; return temp; } -inline void LobbyMessage::set_allocated_initmessage(::InitMessage* initmessage) { - delete initmessage_; - initmessage_ = initmessage; - if (initmessage) { - set_has_initmessage(); +inline void LobbyMessage::set_allocated_initdonemessage(::InitDoneMessage* initdonemessage) { + delete initdonemessage_; + initdonemessage_ = initdonemessage; + if (initdonemessage) { + set_has_initdonemessage(); } else { - clear_has_initmessage(); + clear_has_initdonemessage(); } } -// optional .InitAckMessage initAckMessage = 3; -inline bool LobbyMessage::has_initackmessage() const { +// optional .AvatarRequestMessage avatarRequestMessage = 3; +inline bool LobbyMessage::has_avatarrequestmessage() const { return (_has_bits_[0] & 0x00000004u) != 0; } -inline void LobbyMessage::set_has_initackmessage() { +inline void LobbyMessage::set_has_avatarrequestmessage() { _has_bits_[0] |= 0x00000004u; } -inline void LobbyMessage::clear_has_initackmessage() { - _has_bits_[0] &= ~0x00000004u; -} -inline void LobbyMessage::clear_initackmessage() { - if (initackmessage_ != NULL) initackmessage_->::InitAckMessage::Clear(); - clear_has_initackmessage(); -} -inline const ::InitAckMessage& LobbyMessage::initackmessage() const { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - return initackmessage_ != NULL ? *initackmessage_ : *default_instance().initackmessage_; -#else - return initackmessage_ != NULL ? *initackmessage_ : *default_instance_->initackmessage_; -#endif -} -inline ::InitAckMessage* LobbyMessage::mutable_initackmessage() { - set_has_initackmessage(); - if (initackmessage_ == NULL) initackmessage_ = new ::InitAckMessage; - return initackmessage_; -} -inline ::InitAckMessage* LobbyMessage::release_initackmessage() { - clear_has_initackmessage(); - ::InitAckMessage* temp = initackmessage_; - initackmessage_ = NULL; - return temp; -} -inline void LobbyMessage::set_allocated_initackmessage(::InitAckMessage* initackmessage) { - delete initackmessage_; - initackmessage_ = initackmessage; - if (initackmessage) { - set_has_initackmessage(); - } else { - clear_has_initackmessage(); - } -} - -// optional .AvatarRequestMessage avatarRequestMessage = 4; -inline bool LobbyMessage::has_avatarrequestmessage() const { - return (_has_bits_[0] & 0x00000008u) != 0; -} -inline void LobbyMessage::set_has_avatarrequestmessage() { - _has_bits_[0] |= 0x00000008u; -} inline void LobbyMessage::clear_has_avatarrequestmessage() { - _has_bits_[0] &= ~0x00000008u; + _has_bits_[0] &= ~0x00000004u; } inline void LobbyMessage::clear_avatarrequestmessage() { if (avatarrequestmessage_ != NULL) avatarrequestmessage_->::AvatarRequestMessage::Clear(); @@ -18950,15 +18974,15 @@ inline void LobbyMessage::set_allocated_avatarrequestmessage(::AvatarRequestMess } } -// optional .AvatarHeaderMessage avatarHeaderMessage = 5; +// optional .AvatarHeaderMessage avatarHeaderMessage = 4; inline bool LobbyMessage::has_avatarheadermessage() const { - return (_has_bits_[0] & 0x00000010u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } inline void LobbyMessage::set_has_avatarheadermessage() { - _has_bits_[0] |= 0x00000010u; + _has_bits_[0] |= 0x00000008u; } inline void LobbyMessage::clear_has_avatarheadermessage() { - _has_bits_[0] &= ~0x00000010u; + _has_bits_[0] &= ~0x00000008u; } inline void LobbyMessage::clear_avatarheadermessage() { if (avatarheadermessage_ != NULL) avatarheadermessage_->::AvatarHeaderMessage::Clear(); @@ -18992,15 +19016,15 @@ inline void LobbyMessage::set_allocated_avatarheadermessage(::AvatarHeaderMessag } } -// optional .AvatarDataMessage avatarDataMessage = 6; +// optional .AvatarDataMessage avatarDataMessage = 5; inline bool LobbyMessage::has_avatardatamessage() const { - return (_has_bits_[0] & 0x00000020u) != 0; + return (_has_bits_[0] & 0x00000010u) != 0; } inline void LobbyMessage::set_has_avatardatamessage() { - _has_bits_[0] |= 0x00000020u; + _has_bits_[0] |= 0x00000010u; } inline void LobbyMessage::clear_has_avatardatamessage() { - _has_bits_[0] &= ~0x00000020u; + _has_bits_[0] &= ~0x00000010u; } inline void LobbyMessage::clear_avatardatamessage() { if (avatardatamessage_ != NULL) avatardatamessage_->::AvatarDataMessage::Clear(); @@ -19034,15 +19058,15 @@ inline void LobbyMessage::set_allocated_avatardatamessage(::AvatarDataMessage* a } } -// optional .AvatarEndMessage avatarEndMessage = 7; +// optional .AvatarEndMessage avatarEndMessage = 6; inline bool LobbyMessage::has_avatarendmessage() const { - return (_has_bits_[0] & 0x00000040u) != 0; + return (_has_bits_[0] & 0x00000020u) != 0; } inline void LobbyMessage::set_has_avatarendmessage() { - _has_bits_[0] |= 0x00000040u; + _has_bits_[0] |= 0x00000020u; } inline void LobbyMessage::clear_has_avatarendmessage() { - _has_bits_[0] &= ~0x00000040u; + _has_bits_[0] &= ~0x00000020u; } inline void LobbyMessage::clear_avatarendmessage() { if (avatarendmessage_ != NULL) avatarendmessage_->::AvatarEndMessage::Clear(); @@ -19076,15 +19100,15 @@ inline void LobbyMessage::set_allocated_avatarendmessage(::AvatarEndMessage* ava } } -// optional .UnknownAvatarMessage unknownAvatarMessage = 8; +// optional .UnknownAvatarMessage unknownAvatarMessage = 7; inline bool LobbyMessage::has_unknownavatarmessage() const { - return (_has_bits_[0] & 0x00000080u) != 0; + return (_has_bits_[0] & 0x00000040u) != 0; } inline void LobbyMessage::set_has_unknownavatarmessage() { - _has_bits_[0] |= 0x00000080u; + _has_bits_[0] |= 0x00000040u; } inline void LobbyMessage::clear_has_unknownavatarmessage() { - _has_bits_[0] &= ~0x00000080u; + _has_bits_[0] &= ~0x00000040u; } inline void LobbyMessage::clear_unknownavatarmessage() { if (unknownavatarmessage_ != NULL) unknownavatarmessage_->::UnknownAvatarMessage::Clear(); @@ -19118,15 +19142,15 @@ inline void LobbyMessage::set_allocated_unknownavatarmessage(::UnknownAvatarMess } } -// optional .PlayerListMessage playerListMessage = 9; +// optional .PlayerListMessage playerListMessage = 8; inline bool LobbyMessage::has_playerlistmessage() const { - return (_has_bits_[0] & 0x00000100u) != 0; + return (_has_bits_[0] & 0x00000080u) != 0; } inline void LobbyMessage::set_has_playerlistmessage() { - _has_bits_[0] |= 0x00000100u; + _has_bits_[0] |= 0x00000080u; } inline void LobbyMessage::clear_has_playerlistmessage() { - _has_bits_[0] &= ~0x00000100u; + _has_bits_[0] &= ~0x00000080u; } inline void LobbyMessage::clear_playerlistmessage() { if (playerlistmessage_ != NULL) playerlistmessage_->::PlayerListMessage::Clear(); @@ -19160,15 +19184,15 @@ inline void LobbyMessage::set_allocated_playerlistmessage(::PlayerListMessage* p } } -// optional .GameListNewMessage gameListNewMessage = 10; +// optional .GameListNewMessage gameListNewMessage = 9; inline bool LobbyMessage::has_gamelistnewmessage() const { - return (_has_bits_[0] & 0x00000200u) != 0; + return (_has_bits_[0] & 0x00000100u) != 0; } inline void LobbyMessage::set_has_gamelistnewmessage() { - _has_bits_[0] |= 0x00000200u; + _has_bits_[0] |= 0x00000100u; } inline void LobbyMessage::clear_has_gamelistnewmessage() { - _has_bits_[0] &= ~0x00000200u; + _has_bits_[0] &= ~0x00000100u; } inline void LobbyMessage::clear_gamelistnewmessage() { if (gamelistnewmessage_ != NULL) gamelistnewmessage_->::GameListNewMessage::Clear(); @@ -19202,15 +19226,15 @@ inline void LobbyMessage::set_allocated_gamelistnewmessage(::GameListNewMessage* } } -// optional .GameListUpdateMessage gameListUpdateMessage = 11; +// optional .GameListUpdateMessage gameListUpdateMessage = 10; inline bool LobbyMessage::has_gamelistupdatemessage() const { - return (_has_bits_[0] & 0x00000400u) != 0; + return (_has_bits_[0] & 0x00000200u) != 0; } inline void LobbyMessage::set_has_gamelistupdatemessage() { - _has_bits_[0] |= 0x00000400u; + _has_bits_[0] |= 0x00000200u; } inline void LobbyMessage::clear_has_gamelistupdatemessage() { - _has_bits_[0] &= ~0x00000400u; + _has_bits_[0] &= ~0x00000200u; } inline void LobbyMessage::clear_gamelistupdatemessage() { if (gamelistupdatemessage_ != NULL) gamelistupdatemessage_->::GameListUpdateMessage::Clear(); @@ -19244,15 +19268,15 @@ inline void LobbyMessage::set_allocated_gamelistupdatemessage(::GameListUpdateMe } } -// optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; +// optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; inline bool LobbyMessage::has_gamelistplayerjoinedmessage() const { - return (_has_bits_[0] & 0x00000800u) != 0; + return (_has_bits_[0] & 0x00000400u) != 0; } inline void LobbyMessage::set_has_gamelistplayerjoinedmessage() { - _has_bits_[0] |= 0x00000800u; + _has_bits_[0] |= 0x00000400u; } inline void LobbyMessage::clear_has_gamelistplayerjoinedmessage() { - _has_bits_[0] &= ~0x00000800u; + _has_bits_[0] &= ~0x00000400u; } inline void LobbyMessage::clear_gamelistplayerjoinedmessage() { if (gamelistplayerjoinedmessage_ != NULL) gamelistplayerjoinedmessage_->::GameListPlayerJoinedMessage::Clear(); @@ -19286,15 +19310,15 @@ inline void LobbyMessage::set_allocated_gamelistplayerjoinedmessage(::GameListPl } } -// optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; +// optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; inline bool LobbyMessage::has_gamelistplayerleftmessage() const { - return (_has_bits_[0] & 0x00001000u) != 0; + return (_has_bits_[0] & 0x00000800u) != 0; } inline void LobbyMessage::set_has_gamelistplayerleftmessage() { - _has_bits_[0] |= 0x00001000u; + _has_bits_[0] |= 0x00000800u; } inline void LobbyMessage::clear_has_gamelistplayerleftmessage() { - _has_bits_[0] &= ~0x00001000u; + _has_bits_[0] &= ~0x00000800u; } inline void LobbyMessage::clear_gamelistplayerleftmessage() { if (gamelistplayerleftmessage_ != NULL) gamelistplayerleftmessage_->::GameListPlayerLeftMessage::Clear(); @@ -19328,15 +19352,15 @@ inline void LobbyMessage::set_allocated_gamelistplayerleftmessage(::GameListPlay } } -// optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; +// optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; inline bool LobbyMessage::has_gamelistspectatorjoinedmessage() const { - return (_has_bits_[0] & 0x00002000u) != 0; + return (_has_bits_[0] & 0x00001000u) != 0; } inline void LobbyMessage::set_has_gamelistspectatorjoinedmessage() { - _has_bits_[0] |= 0x00002000u; + _has_bits_[0] |= 0x00001000u; } inline void LobbyMessage::clear_has_gamelistspectatorjoinedmessage() { - _has_bits_[0] &= ~0x00002000u; + _has_bits_[0] &= ~0x00001000u; } inline void LobbyMessage::clear_gamelistspectatorjoinedmessage() { if (gamelistspectatorjoinedmessage_ != NULL) gamelistspectatorjoinedmessage_->::GameListSpectatorJoinedMessage::Clear(); @@ -19370,15 +19394,15 @@ inline void LobbyMessage::set_allocated_gamelistspectatorjoinedmessage(::GameLis } } -// optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; +// optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; inline bool LobbyMessage::has_gamelistspectatorleftmessage() const { - return (_has_bits_[0] & 0x00004000u) != 0; + return (_has_bits_[0] & 0x00002000u) != 0; } inline void LobbyMessage::set_has_gamelistspectatorleftmessage() { - _has_bits_[0] |= 0x00004000u; + _has_bits_[0] |= 0x00002000u; } inline void LobbyMessage::clear_has_gamelistspectatorleftmessage() { - _has_bits_[0] &= ~0x00004000u; + _has_bits_[0] &= ~0x00002000u; } inline void LobbyMessage::clear_gamelistspectatorleftmessage() { if (gamelistspectatorleftmessage_ != NULL) gamelistspectatorleftmessage_->::GameListSpectatorLeftMessage::Clear(); @@ -19412,15 +19436,15 @@ inline void LobbyMessage::set_allocated_gamelistspectatorleftmessage(::GameListS } } -// optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; +// optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; inline bool LobbyMessage::has_gamelistadminchangedmessage() const { - return (_has_bits_[0] & 0x00008000u) != 0; + return (_has_bits_[0] & 0x00004000u) != 0; } inline void LobbyMessage::set_has_gamelistadminchangedmessage() { - _has_bits_[0] |= 0x00008000u; + _has_bits_[0] |= 0x00004000u; } inline void LobbyMessage::clear_has_gamelistadminchangedmessage() { - _has_bits_[0] &= ~0x00008000u; + _has_bits_[0] &= ~0x00004000u; } inline void LobbyMessage::clear_gamelistadminchangedmessage() { if (gamelistadminchangedmessage_ != NULL) gamelistadminchangedmessage_->::GameListAdminChangedMessage::Clear(); @@ -19454,15 +19478,15 @@ inline void LobbyMessage::set_allocated_gamelistadminchangedmessage(::GameListAd } } -// optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; +// optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; inline bool LobbyMessage::has_playerinforequestmessage() const { - return (_has_bits_[0] & 0x00010000u) != 0; + return (_has_bits_[0] & 0x00008000u) != 0; } inline void LobbyMessage::set_has_playerinforequestmessage() { - _has_bits_[0] |= 0x00010000u; + _has_bits_[0] |= 0x00008000u; } inline void LobbyMessage::clear_has_playerinforequestmessage() { - _has_bits_[0] &= ~0x00010000u; + _has_bits_[0] &= ~0x00008000u; } inline void LobbyMessage::clear_playerinforequestmessage() { if (playerinforequestmessage_ != NULL) playerinforequestmessage_->::PlayerInfoRequestMessage::Clear(); @@ -19496,15 +19520,15 @@ inline void LobbyMessage::set_allocated_playerinforequestmessage(::PlayerInfoReq } } -// optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; +// optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; inline bool LobbyMessage::has_playerinforeplymessage() const { - return (_has_bits_[0] & 0x00020000u) != 0; + return (_has_bits_[0] & 0x00010000u) != 0; } inline void LobbyMessage::set_has_playerinforeplymessage() { - _has_bits_[0] |= 0x00020000u; + _has_bits_[0] |= 0x00010000u; } inline void LobbyMessage::clear_has_playerinforeplymessage() { - _has_bits_[0] &= ~0x00020000u; + _has_bits_[0] &= ~0x00010000u; } inline void LobbyMessage::clear_playerinforeplymessage() { if (playerinforeplymessage_ != NULL) playerinforeplymessage_->::PlayerInfoReplyMessage::Clear(); @@ -19538,15 +19562,15 @@ inline void LobbyMessage::set_allocated_playerinforeplymessage(::PlayerInfoReply } } -// optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; +// optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; inline bool LobbyMessage::has_subscriptionrequestmessage() const { - return (_has_bits_[0] & 0x00040000u) != 0; + return (_has_bits_[0] & 0x00020000u) != 0; } inline void LobbyMessage::set_has_subscriptionrequestmessage() { - _has_bits_[0] |= 0x00040000u; + _has_bits_[0] |= 0x00020000u; } inline void LobbyMessage::clear_has_subscriptionrequestmessage() { - _has_bits_[0] &= ~0x00040000u; + _has_bits_[0] &= ~0x00020000u; } inline void LobbyMessage::clear_subscriptionrequestmessage() { if (subscriptionrequestmessage_ != NULL) subscriptionrequestmessage_->::SubscriptionRequestMessage::Clear(); @@ -19580,15 +19604,15 @@ inline void LobbyMessage::set_allocated_subscriptionrequestmessage(::Subscriptio } } -// optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; +// optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; inline bool LobbyMessage::has_subscriptionreplymessage() const { - return (_has_bits_[0] & 0x00080000u) != 0; + return (_has_bits_[0] & 0x00040000u) != 0; } inline void LobbyMessage::set_has_subscriptionreplymessage() { - _has_bits_[0] |= 0x00080000u; + _has_bits_[0] |= 0x00040000u; } inline void LobbyMessage::clear_has_subscriptionreplymessage() { - _has_bits_[0] &= ~0x00080000u; + _has_bits_[0] &= ~0x00040000u; } inline void LobbyMessage::clear_subscriptionreplymessage() { if (subscriptionreplymessage_ != NULL) subscriptionreplymessage_->::SubscriptionReplyMessage::Clear(); @@ -19622,15 +19646,15 @@ inline void LobbyMessage::set_allocated_subscriptionreplymessage(::SubscriptionR } } -// optional .CreateGameMessage createGameMessage = 21; +// optional .CreateGameMessage createGameMessage = 20; inline bool LobbyMessage::has_creategamemessage() const { - return (_has_bits_[0] & 0x00100000u) != 0; + return (_has_bits_[0] & 0x00080000u) != 0; } inline void LobbyMessage::set_has_creategamemessage() { - _has_bits_[0] |= 0x00100000u; + _has_bits_[0] |= 0x00080000u; } inline void LobbyMessage::clear_has_creategamemessage() { - _has_bits_[0] &= ~0x00100000u; + _has_bits_[0] &= ~0x00080000u; } inline void LobbyMessage::clear_creategamemessage() { if (creategamemessage_ != NULL) creategamemessage_->::CreateGameMessage::Clear(); @@ -19664,15 +19688,15 @@ inline void LobbyMessage::set_allocated_creategamemessage(::CreateGameMessage* c } } -// optional .CreateGameFailedMessage createGameFailedMessage = 22; +// optional .CreateGameFailedMessage createGameFailedMessage = 21; inline bool LobbyMessage::has_creategamefailedmessage() const { - return (_has_bits_[0] & 0x00200000u) != 0; + return (_has_bits_[0] & 0x00100000u) != 0; } inline void LobbyMessage::set_has_creategamefailedmessage() { - _has_bits_[0] |= 0x00200000u; + _has_bits_[0] |= 0x00100000u; } inline void LobbyMessage::clear_has_creategamefailedmessage() { - _has_bits_[0] &= ~0x00200000u; + _has_bits_[0] &= ~0x00100000u; } inline void LobbyMessage::clear_creategamefailedmessage() { if (creategamefailedmessage_ != NULL) creategamefailedmessage_->::CreateGameFailedMessage::Clear(); @@ -19706,58 +19730,184 @@ inline void LobbyMessage::set_allocated_creategamefailedmessage(::CreateGameFail } } -// optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; -inline bool LobbyMessage::has_inviteplayertogamemessage() const { - return (_has_bits_[0] & 0x00400000u) != 0; +// optional .JoinGameMessage joinGameMessage = 22; +inline bool LobbyMessage::has_joingamemessage() const { + return (_has_bits_[0] & 0x00200000u) != 0; } -inline void LobbyMessage::set_has_inviteplayertogamemessage() { - _has_bits_[0] |= 0x00400000u; +inline void LobbyMessage::set_has_joingamemessage() { + _has_bits_[0] |= 0x00200000u; } -inline void LobbyMessage::clear_has_inviteplayertogamemessage() { - _has_bits_[0] &= ~0x00400000u; +inline void LobbyMessage::clear_has_joingamemessage() { + _has_bits_[0] &= ~0x00200000u; } -inline void LobbyMessage::clear_inviteplayertogamemessage() { - if (inviteplayertogamemessage_ != NULL) inviteplayertogamemessage_->::InvitePlayerToGameMessage::Clear(); - clear_has_inviteplayertogamemessage(); +inline void LobbyMessage::clear_joingamemessage() { + if (joingamemessage_ != NULL) joingamemessage_->::JoinGameMessage::Clear(); + clear_has_joingamemessage(); } -inline const ::InvitePlayerToGameMessage& LobbyMessage::inviteplayertogamemessage() const { +inline const ::JoinGameMessage& LobbyMessage::joingamemessage() const { #ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - return inviteplayertogamemessage_ != NULL ? *inviteplayertogamemessage_ : *default_instance().inviteplayertogamemessage_; + return joingamemessage_ != NULL ? *joingamemessage_ : *default_instance().joingamemessage_; #else - return inviteplayertogamemessage_ != NULL ? *inviteplayertogamemessage_ : *default_instance_->inviteplayertogamemessage_; + return joingamemessage_ != NULL ? *joingamemessage_ : *default_instance_->joingamemessage_; #endif } -inline ::InvitePlayerToGameMessage* LobbyMessage::mutable_inviteplayertogamemessage() { - set_has_inviteplayertogamemessage(); - if (inviteplayertogamemessage_ == NULL) inviteplayertogamemessage_ = new ::InvitePlayerToGameMessage; - return inviteplayertogamemessage_; +inline ::JoinGameMessage* LobbyMessage::mutable_joingamemessage() { + set_has_joingamemessage(); + if (joingamemessage_ == NULL) joingamemessage_ = new ::JoinGameMessage; + return joingamemessage_; } -inline ::InvitePlayerToGameMessage* LobbyMessage::release_inviteplayertogamemessage() { - clear_has_inviteplayertogamemessage(); - ::InvitePlayerToGameMessage* temp = inviteplayertogamemessage_; - inviteplayertogamemessage_ = NULL; +inline ::JoinGameMessage* LobbyMessage::release_joingamemessage() { + clear_has_joingamemessage(); + ::JoinGameMessage* temp = joingamemessage_; + joingamemessage_ = NULL; return temp; } -inline void LobbyMessage::set_allocated_inviteplayertogamemessage(::InvitePlayerToGameMessage* inviteplayertogamemessage) { - delete inviteplayertogamemessage_; - inviteplayertogamemessage_ = inviteplayertogamemessage; - if (inviteplayertogamemessage) { - set_has_inviteplayertogamemessage(); +inline void LobbyMessage::set_allocated_joingamemessage(::JoinGameMessage* joingamemessage) { + delete joingamemessage_; + joingamemessage_ = joingamemessage; + if (joingamemessage) { + set_has_joingamemessage(); } else { - clear_has_inviteplayertogamemessage(); + clear_has_joingamemessage(); } } -// optional .InviteNotifyMessage inviteNotifyMessage = 24; -inline bool LobbyMessage::has_invitenotifymessage() const { +// optional .RejoinGameMessage rejoinGameMessage = 23; +inline bool LobbyMessage::has_rejoingamemessage() const { + return (_has_bits_[0] & 0x00400000u) != 0; +} +inline void LobbyMessage::set_has_rejoingamemessage() { + _has_bits_[0] |= 0x00400000u; +} +inline void LobbyMessage::clear_has_rejoingamemessage() { + _has_bits_[0] &= ~0x00400000u; +} +inline void LobbyMessage::clear_rejoingamemessage() { + if (rejoingamemessage_ != NULL) rejoingamemessage_->::RejoinGameMessage::Clear(); + clear_has_rejoingamemessage(); +} +inline const ::RejoinGameMessage& LobbyMessage::rejoingamemessage() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return rejoingamemessage_ != NULL ? *rejoingamemessage_ : *default_instance().rejoingamemessage_; +#else + return rejoingamemessage_ != NULL ? *rejoingamemessage_ : *default_instance_->rejoingamemessage_; +#endif +} +inline ::RejoinGameMessage* LobbyMessage::mutable_rejoingamemessage() { + set_has_rejoingamemessage(); + if (rejoingamemessage_ == NULL) rejoingamemessage_ = new ::RejoinGameMessage; + return rejoingamemessage_; +} +inline ::RejoinGameMessage* LobbyMessage::release_rejoingamemessage() { + clear_has_rejoingamemessage(); + ::RejoinGameMessage* temp = rejoingamemessage_; + rejoingamemessage_ = NULL; + return temp; +} +inline void LobbyMessage::set_allocated_rejoingamemessage(::RejoinGameMessage* rejoingamemessage) { + delete rejoingamemessage_; + rejoingamemessage_ = rejoingamemessage; + if (rejoingamemessage) { + set_has_rejoingamemessage(); + } else { + clear_has_rejoingamemessage(); + } +} + +// optional .JoinGameAckMessage joinGameAckMessage = 24; +inline bool LobbyMessage::has_joingameackmessage() const { return (_has_bits_[0] & 0x00800000u) != 0; } -inline void LobbyMessage::set_has_invitenotifymessage() { +inline void LobbyMessage::set_has_joingameackmessage() { _has_bits_[0] |= 0x00800000u; } -inline void LobbyMessage::clear_has_invitenotifymessage() { +inline void LobbyMessage::clear_has_joingameackmessage() { _has_bits_[0] &= ~0x00800000u; } +inline void LobbyMessage::clear_joingameackmessage() { + if (joingameackmessage_ != NULL) joingameackmessage_->::JoinGameAckMessage::Clear(); + clear_has_joingameackmessage(); +} +inline const ::JoinGameAckMessage& LobbyMessage::joingameackmessage() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return joingameackmessage_ != NULL ? *joingameackmessage_ : *default_instance().joingameackmessage_; +#else + return joingameackmessage_ != NULL ? *joingameackmessage_ : *default_instance_->joingameackmessage_; +#endif +} +inline ::JoinGameAckMessage* LobbyMessage::mutable_joingameackmessage() { + set_has_joingameackmessage(); + if (joingameackmessage_ == NULL) joingameackmessage_ = new ::JoinGameAckMessage; + return joingameackmessage_; +} +inline ::JoinGameAckMessage* LobbyMessage::release_joingameackmessage() { + clear_has_joingameackmessage(); + ::JoinGameAckMessage* temp = joingameackmessage_; + joingameackmessage_ = NULL; + return temp; +} +inline void LobbyMessage::set_allocated_joingameackmessage(::JoinGameAckMessage* joingameackmessage) { + delete joingameackmessage_; + joingameackmessage_ = joingameackmessage; + if (joingameackmessage) { + set_has_joingameackmessage(); + } else { + clear_has_joingameackmessage(); + } +} + +// optional .JoinGameFailedMessage joinGameFailedMessage = 25; +inline bool LobbyMessage::has_joingamefailedmessage() const { + return (_has_bits_[0] & 0x01000000u) != 0; +} +inline void LobbyMessage::set_has_joingamefailedmessage() { + _has_bits_[0] |= 0x01000000u; +} +inline void LobbyMessage::clear_has_joingamefailedmessage() { + _has_bits_[0] &= ~0x01000000u; +} +inline void LobbyMessage::clear_joingamefailedmessage() { + if (joingamefailedmessage_ != NULL) joingamefailedmessage_->::JoinGameFailedMessage::Clear(); + clear_has_joingamefailedmessage(); +} +inline const ::JoinGameFailedMessage& LobbyMessage::joingamefailedmessage() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return joingamefailedmessage_ != NULL ? *joingamefailedmessage_ : *default_instance().joingamefailedmessage_; +#else + return joingamefailedmessage_ != NULL ? *joingamefailedmessage_ : *default_instance_->joingamefailedmessage_; +#endif +} +inline ::JoinGameFailedMessage* LobbyMessage::mutable_joingamefailedmessage() { + set_has_joingamefailedmessage(); + if (joingamefailedmessage_ == NULL) joingamefailedmessage_ = new ::JoinGameFailedMessage; + return joingamefailedmessage_; +} +inline ::JoinGameFailedMessage* LobbyMessage::release_joingamefailedmessage() { + clear_has_joingamefailedmessage(); + ::JoinGameFailedMessage* temp = joingamefailedmessage_; + joingamefailedmessage_ = NULL; + return temp; +} +inline void LobbyMessage::set_allocated_joingamefailedmessage(::JoinGameFailedMessage* joingamefailedmessage) { + delete joingamefailedmessage_; + joingamefailedmessage_ = joingamefailedmessage; + if (joingamefailedmessage) { + set_has_joingamefailedmessage(); + } else { + clear_has_joingamefailedmessage(); + } +} + +// optional .InviteNotifyMessage inviteNotifyMessage = 26; +inline bool LobbyMessage::has_invitenotifymessage() const { + return (_has_bits_[0] & 0x02000000u) != 0; +} +inline void LobbyMessage::set_has_invitenotifymessage() { + _has_bits_[0] |= 0x02000000u; +} +inline void LobbyMessage::clear_has_invitenotifymessage() { + _has_bits_[0] &= ~0x02000000u; +} inline void LobbyMessage::clear_invitenotifymessage() { if (invitenotifymessage_ != NULL) invitenotifymessage_->::InviteNotifyMessage::Clear(); clear_has_invitenotifymessage(); @@ -19790,15 +19940,15 @@ inline void LobbyMessage::set_allocated_invitenotifymessage(::InviteNotifyMessag } } -// optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; +// optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; inline bool LobbyMessage::has_rejectgameinvitationmessage() const { - return (_has_bits_[0] & 0x01000000u) != 0; + return (_has_bits_[0] & 0x04000000u) != 0; } inline void LobbyMessage::set_has_rejectgameinvitationmessage() { - _has_bits_[0] |= 0x01000000u; + _has_bits_[0] |= 0x04000000u; } inline void LobbyMessage::clear_has_rejectgameinvitationmessage() { - _has_bits_[0] &= ~0x01000000u; + _has_bits_[0] &= ~0x04000000u; } inline void LobbyMessage::clear_rejectgameinvitationmessage() { if (rejectgameinvitationmessage_ != NULL) rejectgameinvitationmessage_->::RejectGameInvitationMessage::Clear(); @@ -19832,15 +19982,15 @@ inline void LobbyMessage::set_allocated_rejectgameinvitationmessage(::RejectGame } } -// optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; +// optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; inline bool LobbyMessage::has_rejectinvnotifymessage() const { - return (_has_bits_[0] & 0x02000000u) != 0; + return (_has_bits_[0] & 0x08000000u) != 0; } inline void LobbyMessage::set_has_rejectinvnotifymessage() { - _has_bits_[0] |= 0x02000000u; + _has_bits_[0] |= 0x08000000u; } inline void LobbyMessage::clear_has_rejectinvnotifymessage() { - _has_bits_[0] &= ~0x02000000u; + _has_bits_[0] &= ~0x08000000u; } inline void LobbyMessage::clear_rejectinvnotifymessage() { if (rejectinvnotifymessage_ != NULL) rejectinvnotifymessage_->::RejectInvNotifyMessage::Clear(); @@ -19874,15 +20024,15 @@ inline void LobbyMessage::set_allocated_rejectinvnotifymessage(::RejectInvNotify } } -// optional .StatisticsMessage statisticsMessage = 27; +// optional .StatisticsMessage statisticsMessage = 29; inline bool LobbyMessage::has_statisticsmessage() const { - return (_has_bits_[0] & 0x04000000u) != 0; + return (_has_bits_[0] & 0x10000000u) != 0; } inline void LobbyMessage::set_has_statisticsmessage() { - _has_bits_[0] |= 0x04000000u; + _has_bits_[0] |= 0x10000000u; } inline void LobbyMessage::clear_has_statisticsmessage() { - _has_bits_[0] &= ~0x04000000u; + _has_bits_[0] &= ~0x10000000u; } inline void LobbyMessage::clear_statisticsmessage() { if (statisticsmessage_ != NULL) statisticsmessage_->::StatisticsMessage::Clear(); @@ -19916,15 +20066,15 @@ inline void LobbyMessage::set_allocated_statisticsmessage(::StatisticsMessage* s } } -// optional .ChatRequestMessage chatRequestMessage = 28; +// optional .ChatRequestMessage chatRequestMessage = 30; inline bool LobbyMessage::has_chatrequestmessage() const { - return (_has_bits_[0] & 0x08000000u) != 0; + return (_has_bits_[0] & 0x20000000u) != 0; } inline void LobbyMessage::set_has_chatrequestmessage() { - _has_bits_[0] |= 0x08000000u; + _has_bits_[0] |= 0x20000000u; } inline void LobbyMessage::clear_has_chatrequestmessage() { - _has_bits_[0] &= ~0x08000000u; + _has_bits_[0] &= ~0x20000000u; } inline void LobbyMessage::clear_chatrequestmessage() { if (chatrequestmessage_ != NULL) chatrequestmessage_->::ChatRequestMessage::Clear(); @@ -19958,15 +20108,15 @@ inline void LobbyMessage::set_allocated_chatrequestmessage(::ChatRequestMessage* } } -// optional .ChatMessage chatMessage = 29; +// optional .ChatMessage chatMessage = 31; inline bool LobbyMessage::has_chatmessage() const { - return (_has_bits_[0] & 0x10000000u) != 0; + return (_has_bits_[0] & 0x40000000u) != 0; } inline void LobbyMessage::set_has_chatmessage() { - _has_bits_[0] |= 0x10000000u; + _has_bits_[0] |= 0x40000000u; } inline void LobbyMessage::clear_has_chatmessage() { - _has_bits_[0] &= ~0x10000000u; + _has_bits_[0] &= ~0x40000000u; } inline void LobbyMessage::clear_chatmessage() { if (chatmessage_ != NULL) chatmessage_->::ChatMessage::Clear(); @@ -20000,15 +20150,15 @@ inline void LobbyMessage::set_allocated_chatmessage(::ChatMessage* chatmessage) } } -// optional .ChatRejectMessage chatRejectMessage = 30; +// optional .ChatRejectMessage chatRejectMessage = 32; inline bool LobbyMessage::has_chatrejectmessage() const { - return (_has_bits_[0] & 0x20000000u) != 0; + return (_has_bits_[0] & 0x80000000u) != 0; } inline void LobbyMessage::set_has_chatrejectmessage() { - _has_bits_[0] |= 0x20000000u; + _has_bits_[0] |= 0x80000000u; } inline void LobbyMessage::clear_has_chatrejectmessage() { - _has_bits_[0] &= ~0x20000000u; + _has_bits_[0] &= ~0x80000000u; } inline void LobbyMessage::clear_chatrejectmessage() { if (chatrejectmessage_ != NULL) chatrejectmessage_->::ChatRejectMessage::Clear(); @@ -20042,15 +20192,15 @@ inline void LobbyMessage::set_allocated_chatrejectmessage(::ChatRejectMessage* c } } -// optional .DialogMessage dialogMessage = 31; +// optional .DialogMessage dialogMessage = 33; inline bool LobbyMessage::has_dialogmessage() const { - return (_has_bits_[0] & 0x40000000u) != 0; + return (_has_bits_[1] & 0x00000001u) != 0; } inline void LobbyMessage::set_has_dialogmessage() { - _has_bits_[0] |= 0x40000000u; + _has_bits_[1] |= 0x00000001u; } inline void LobbyMessage::clear_has_dialogmessage() { - _has_bits_[0] &= ~0x40000000u; + _has_bits_[1] &= ~0x00000001u; } inline void LobbyMessage::clear_dialogmessage() { if (dialogmessage_ != NULL) dialogmessage_->::DialogMessage::Clear(); @@ -20084,15 +20234,15 @@ inline void LobbyMessage::set_allocated_dialogmessage(::DialogMessage* dialogmes } } -// optional .TimeoutWarningMessage timeoutWarningMessage = 32; +// optional .TimeoutWarningMessage timeoutWarningMessage = 34; inline bool LobbyMessage::has_timeoutwarningmessage() const { - return (_has_bits_[0] & 0x80000000u) != 0; + return (_has_bits_[1] & 0x00000002u) != 0; } inline void LobbyMessage::set_has_timeoutwarningmessage() { - _has_bits_[0] |= 0x80000000u; + _has_bits_[1] |= 0x00000002u; } inline void LobbyMessage::clear_has_timeoutwarningmessage() { - _has_bits_[0] &= ~0x80000000u; + _has_bits_[1] &= ~0x00000002u; } inline void LobbyMessage::clear_timeoutwarningmessage() { if (timeoutwarningmessage_ != NULL) timeoutwarningmessage_->::TimeoutWarningMessage::Clear(); @@ -20126,15 +20276,15 @@ inline void LobbyMessage::set_allocated_timeoutwarningmessage(::TimeoutWarningMe } } -// optional .ResetTimeoutMessage resetTimeoutMessage = 33; +// optional .ResetTimeoutMessage resetTimeoutMessage = 35; inline bool LobbyMessage::has_resettimeoutmessage() const { - return (_has_bits_[1] & 0x00000001u) != 0; + return (_has_bits_[1] & 0x00000004u) != 0; } inline void LobbyMessage::set_has_resettimeoutmessage() { - _has_bits_[1] |= 0x00000001u; + _has_bits_[1] |= 0x00000004u; } inline void LobbyMessage::clear_has_resettimeoutmessage() { - _has_bits_[1] &= ~0x00000001u; + _has_bits_[1] &= ~0x00000004u; } inline void LobbyMessage::clear_resettimeoutmessage() { if (resettimeoutmessage_ != NULL) resettimeoutmessage_->::ResetTimeoutMessage::Clear(); @@ -20168,15 +20318,15 @@ inline void LobbyMessage::set_allocated_resettimeoutmessage(::ResetTimeoutMessag } } -// optional .ReportAvatarMessage reportAvatarMessage = 34; +// optional .ReportAvatarMessage reportAvatarMessage = 36; inline bool LobbyMessage::has_reportavatarmessage() const { - return (_has_bits_[1] & 0x00000002u) != 0; + return (_has_bits_[1] & 0x00000008u) != 0; } inline void LobbyMessage::set_has_reportavatarmessage() { - _has_bits_[1] |= 0x00000002u; + _has_bits_[1] |= 0x00000008u; } inline void LobbyMessage::clear_has_reportavatarmessage() { - _has_bits_[1] &= ~0x00000002u; + _has_bits_[1] &= ~0x00000008u; } inline void LobbyMessage::clear_reportavatarmessage() { if (reportavatarmessage_ != NULL) reportavatarmessage_->::ReportAvatarMessage::Clear(); @@ -20210,15 +20360,15 @@ inline void LobbyMessage::set_allocated_reportavatarmessage(::ReportAvatarMessag } } -// optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; +// optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; inline bool LobbyMessage::has_reportavatarackmessage() const { - return (_has_bits_[1] & 0x00000004u) != 0; + return (_has_bits_[1] & 0x00000010u) != 0; } inline void LobbyMessage::set_has_reportavatarackmessage() { - _has_bits_[1] |= 0x00000004u; + _has_bits_[1] |= 0x00000010u; } inline void LobbyMessage::clear_has_reportavatarackmessage() { - _has_bits_[1] &= ~0x00000004u; + _has_bits_[1] &= ~0x00000010u; } inline void LobbyMessage::clear_reportavatarackmessage() { if (reportavatarackmessage_ != NULL) reportavatarackmessage_->::ReportAvatarAckMessage::Clear(); @@ -20252,15 +20402,15 @@ inline void LobbyMessage::set_allocated_reportavatarackmessage(::ReportAvatarAck } } -// optional .ReportGameMessage reportGameMessage = 36; +// optional .ReportGameMessage reportGameMessage = 38; inline bool LobbyMessage::has_reportgamemessage() const { - return (_has_bits_[1] & 0x00000008u) != 0; + return (_has_bits_[1] & 0x00000020u) != 0; } inline void LobbyMessage::set_has_reportgamemessage() { - _has_bits_[1] |= 0x00000008u; + _has_bits_[1] |= 0x00000020u; } inline void LobbyMessage::clear_has_reportgamemessage() { - _has_bits_[1] &= ~0x00000008u; + _has_bits_[1] &= ~0x00000020u; } inline void LobbyMessage::clear_reportgamemessage() { if (reportgamemessage_ != NULL) reportgamemessage_->::ReportGameMessage::Clear(); @@ -20294,15 +20444,15 @@ inline void LobbyMessage::set_allocated_reportgamemessage(::ReportGameMessage* r } } -// optional .ReportGameAckMessage reportGameAckMessage = 37; +// optional .ReportGameAckMessage reportGameAckMessage = 39; inline bool LobbyMessage::has_reportgameackmessage() const { - return (_has_bits_[1] & 0x00000010u) != 0; + return (_has_bits_[1] & 0x00000040u) != 0; } inline void LobbyMessage::set_has_reportgameackmessage() { - _has_bits_[1] |= 0x00000010u; + _has_bits_[1] |= 0x00000040u; } inline void LobbyMessage::clear_has_reportgameackmessage() { - _has_bits_[1] &= ~0x00000010u; + _has_bits_[1] &= ~0x00000040u; } inline void LobbyMessage::clear_reportgameackmessage() { if (reportgameackmessage_ != NULL) reportgameackmessage_->::ReportGameAckMessage::Clear(); @@ -20336,15 +20486,15 @@ inline void LobbyMessage::set_allocated_reportgameackmessage(::ReportGameAckMess } } -// optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; +// optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; inline bool LobbyMessage::has_adminremovegamemessage() const { - return (_has_bits_[1] & 0x00000020u) != 0; + return (_has_bits_[1] & 0x00000080u) != 0; } inline void LobbyMessage::set_has_adminremovegamemessage() { - _has_bits_[1] |= 0x00000020u; + _has_bits_[1] |= 0x00000080u; } inline void LobbyMessage::clear_has_adminremovegamemessage() { - _has_bits_[1] &= ~0x00000020u; + _has_bits_[1] &= ~0x00000080u; } inline void LobbyMessage::clear_adminremovegamemessage() { if (adminremovegamemessage_ != NULL) adminremovegamemessage_->::AdminRemoveGameMessage::Clear(); @@ -20378,15 +20528,15 @@ inline void LobbyMessage::set_allocated_adminremovegamemessage(::AdminRemoveGame } } -// optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; +// optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; inline bool LobbyMessage::has_adminremovegameackmessage() const { - return (_has_bits_[1] & 0x00000040u) != 0; + return (_has_bits_[1] & 0x00000100u) != 0; } inline void LobbyMessage::set_has_adminremovegameackmessage() { - _has_bits_[1] |= 0x00000040u; + _has_bits_[1] |= 0x00000100u; } inline void LobbyMessage::clear_has_adminremovegameackmessage() { - _has_bits_[1] &= ~0x00000040u; + _has_bits_[1] &= ~0x00000100u; } inline void LobbyMessage::clear_adminremovegameackmessage() { if (adminremovegameackmessage_ != NULL) adminremovegameackmessage_->::AdminRemoveGameAckMessage::Clear(); @@ -20420,15 +20570,15 @@ inline void LobbyMessage::set_allocated_adminremovegameackmessage(::AdminRemoveG } } -// optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; +// optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; inline bool LobbyMessage::has_adminbanplayermessage() const { - return (_has_bits_[1] & 0x00000080u) != 0; + return (_has_bits_[1] & 0x00000200u) != 0; } inline void LobbyMessage::set_has_adminbanplayermessage() { - _has_bits_[1] |= 0x00000080u; + _has_bits_[1] |= 0x00000200u; } inline void LobbyMessage::clear_has_adminbanplayermessage() { - _has_bits_[1] &= ~0x00000080u; + _has_bits_[1] &= ~0x00000200u; } inline void LobbyMessage::clear_adminbanplayermessage() { if (adminbanplayermessage_ != NULL) adminbanplayermessage_->::AdminBanPlayerMessage::Clear(); @@ -20462,15 +20612,15 @@ inline void LobbyMessage::set_allocated_adminbanplayermessage(::AdminBanPlayerMe } } -// optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; +// optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; inline bool LobbyMessage::has_adminbanplayerackmessage() const { - return (_has_bits_[1] & 0x00000100u) != 0; + return (_has_bits_[1] & 0x00000400u) != 0; } inline void LobbyMessage::set_has_adminbanplayerackmessage() { - _has_bits_[1] |= 0x00000100u; + _has_bits_[1] |= 0x00000400u; } inline void LobbyMessage::clear_has_adminbanplayerackmessage() { - _has_bits_[1] &= ~0x00000100u; + _has_bits_[1] &= ~0x00000400u; } inline void LobbyMessage::clear_adminbanplayerackmessage() { if (adminbanplayerackmessage_ != NULL) adminbanplayerackmessage_->::AdminBanPlayerAckMessage::Clear(); @@ -20506,13 +20656,13 @@ inline void LobbyMessage::set_allocated_adminbanplayerackmessage(::AdminBanPlaye // optional .ErrorMessage errorMessage = 1025; inline bool LobbyMessage::has_errormessage() const { - return (_has_bits_[1] & 0x00000200u) != 0; + return (_has_bits_[1] & 0x00000800u) != 0; } inline void LobbyMessage::set_has_errormessage() { - _has_bits_[1] |= 0x00000200u; + _has_bits_[1] |= 0x00000800u; } inline void LobbyMessage::clear_has_errormessage() { - _has_bits_[1] &= ~0x00000200u; + _has_bits_[1] &= ~0x00000800u; } inline void LobbyMessage::clear_errormessage() { if (errormessage_ != NULL) errormessage_->::ErrorMessage::Clear(); @@ -20573,183 +20723,15 @@ inline void GameManagementMessage::set_messagetype(::GameManagementMessage_GameM messagetype_ = value; } -// optional .JoinGameMessage joinGameMessage = 2; -inline bool GameManagementMessage::has_joingamemessage() const { +// optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; +inline bool GameManagementMessage::has_gameplayerjoinedmessage() const { return (_has_bits_[0] & 0x00000002u) != 0; } -inline void GameManagementMessage::set_has_joingamemessage() { +inline void GameManagementMessage::set_has_gameplayerjoinedmessage() { _has_bits_[0] |= 0x00000002u; } -inline void GameManagementMessage::clear_has_joingamemessage() { - _has_bits_[0] &= ~0x00000002u; -} -inline void GameManagementMessage::clear_joingamemessage() { - if (joingamemessage_ != NULL) joingamemessage_->::JoinGameMessage::Clear(); - clear_has_joingamemessage(); -} -inline const ::JoinGameMessage& GameManagementMessage::joingamemessage() const { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - return joingamemessage_ != NULL ? *joingamemessage_ : *default_instance().joingamemessage_; -#else - return joingamemessage_ != NULL ? *joingamemessage_ : *default_instance_->joingamemessage_; -#endif -} -inline ::JoinGameMessage* GameManagementMessage::mutable_joingamemessage() { - set_has_joingamemessage(); - if (joingamemessage_ == NULL) joingamemessage_ = new ::JoinGameMessage; - return joingamemessage_; -} -inline ::JoinGameMessage* GameManagementMessage::release_joingamemessage() { - clear_has_joingamemessage(); - ::JoinGameMessage* temp = joingamemessage_; - joingamemessage_ = NULL; - return temp; -} -inline void GameManagementMessage::set_allocated_joingamemessage(::JoinGameMessage* joingamemessage) { - delete joingamemessage_; - joingamemessage_ = joingamemessage; - if (joingamemessage) { - set_has_joingamemessage(); - } else { - clear_has_joingamemessage(); - } -} - -// optional .RejoinGameMessage rejoinGameMessage = 3; -inline bool GameManagementMessage::has_rejoingamemessage() const { - return (_has_bits_[0] & 0x00000004u) != 0; -} -inline void GameManagementMessage::set_has_rejoingamemessage() { - _has_bits_[0] |= 0x00000004u; -} -inline void GameManagementMessage::clear_has_rejoingamemessage() { - _has_bits_[0] &= ~0x00000004u; -} -inline void GameManagementMessage::clear_rejoingamemessage() { - if (rejoingamemessage_ != NULL) rejoingamemessage_->::RejoinGameMessage::Clear(); - clear_has_rejoingamemessage(); -} -inline const ::RejoinGameMessage& GameManagementMessage::rejoingamemessage() const { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - return rejoingamemessage_ != NULL ? *rejoingamemessage_ : *default_instance().rejoingamemessage_; -#else - return rejoingamemessage_ != NULL ? *rejoingamemessage_ : *default_instance_->rejoingamemessage_; -#endif -} -inline ::RejoinGameMessage* GameManagementMessage::mutable_rejoingamemessage() { - set_has_rejoingamemessage(); - if (rejoingamemessage_ == NULL) rejoingamemessage_ = new ::RejoinGameMessage; - return rejoingamemessage_; -} -inline ::RejoinGameMessage* GameManagementMessage::release_rejoingamemessage() { - clear_has_rejoingamemessage(); - ::RejoinGameMessage* temp = rejoingamemessage_; - rejoingamemessage_ = NULL; - return temp; -} -inline void GameManagementMessage::set_allocated_rejoingamemessage(::RejoinGameMessage* rejoingamemessage) { - delete rejoingamemessage_; - rejoingamemessage_ = rejoingamemessage; - if (rejoingamemessage) { - set_has_rejoingamemessage(); - } else { - clear_has_rejoingamemessage(); - } -} - -// optional .JoinGameAckMessage joinGameAckMessage = 4; -inline bool GameManagementMessage::has_joingameackmessage() const { - return (_has_bits_[0] & 0x00000008u) != 0; -} -inline void GameManagementMessage::set_has_joingameackmessage() { - _has_bits_[0] |= 0x00000008u; -} -inline void GameManagementMessage::clear_has_joingameackmessage() { - _has_bits_[0] &= ~0x00000008u; -} -inline void GameManagementMessage::clear_joingameackmessage() { - if (joingameackmessage_ != NULL) joingameackmessage_->::JoinGameAckMessage::Clear(); - clear_has_joingameackmessage(); -} -inline const ::JoinGameAckMessage& GameManagementMessage::joingameackmessage() const { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - return joingameackmessage_ != NULL ? *joingameackmessage_ : *default_instance().joingameackmessage_; -#else - return joingameackmessage_ != NULL ? *joingameackmessage_ : *default_instance_->joingameackmessage_; -#endif -} -inline ::JoinGameAckMessage* GameManagementMessage::mutable_joingameackmessage() { - set_has_joingameackmessage(); - if (joingameackmessage_ == NULL) joingameackmessage_ = new ::JoinGameAckMessage; - return joingameackmessage_; -} -inline ::JoinGameAckMessage* GameManagementMessage::release_joingameackmessage() { - clear_has_joingameackmessage(); - ::JoinGameAckMessage* temp = joingameackmessage_; - joingameackmessage_ = NULL; - return temp; -} -inline void GameManagementMessage::set_allocated_joingameackmessage(::JoinGameAckMessage* joingameackmessage) { - delete joingameackmessage_; - joingameackmessage_ = joingameackmessage; - if (joingameackmessage) { - set_has_joingameackmessage(); - } else { - clear_has_joingameackmessage(); - } -} - -// optional .JoinGameFailedMessage joinGameFailedMessage = 5; -inline bool GameManagementMessage::has_joingamefailedmessage() const { - return (_has_bits_[0] & 0x00000010u) != 0; -} -inline void GameManagementMessage::set_has_joingamefailedmessage() { - _has_bits_[0] |= 0x00000010u; -} -inline void GameManagementMessage::clear_has_joingamefailedmessage() { - _has_bits_[0] &= ~0x00000010u; -} -inline void GameManagementMessage::clear_joingamefailedmessage() { - if (joingamefailedmessage_ != NULL) joingamefailedmessage_->::JoinGameFailedMessage::Clear(); - clear_has_joingamefailedmessage(); -} -inline const ::JoinGameFailedMessage& GameManagementMessage::joingamefailedmessage() const { -#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER - return joingamefailedmessage_ != NULL ? *joingamefailedmessage_ : *default_instance().joingamefailedmessage_; -#else - return joingamefailedmessage_ != NULL ? *joingamefailedmessage_ : *default_instance_->joingamefailedmessage_; -#endif -} -inline ::JoinGameFailedMessage* GameManagementMessage::mutable_joingamefailedmessage() { - set_has_joingamefailedmessage(); - if (joingamefailedmessage_ == NULL) joingamefailedmessage_ = new ::JoinGameFailedMessage; - return joingamefailedmessage_; -} -inline ::JoinGameFailedMessage* GameManagementMessage::release_joingamefailedmessage() { - clear_has_joingamefailedmessage(); - ::JoinGameFailedMessage* temp = joingamefailedmessage_; - joingamefailedmessage_ = NULL; - return temp; -} -inline void GameManagementMessage::set_allocated_joingamefailedmessage(::JoinGameFailedMessage* joingamefailedmessage) { - delete joingamefailedmessage_; - joingamefailedmessage_ = joingamefailedmessage; - if (joingamefailedmessage) { - set_has_joingamefailedmessage(); - } else { - clear_has_joingamefailedmessage(); - } -} - -// optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; -inline bool GameManagementMessage::has_gameplayerjoinedmessage() const { - return (_has_bits_[0] & 0x00000020u) != 0; -} -inline void GameManagementMessage::set_has_gameplayerjoinedmessage() { - _has_bits_[0] |= 0x00000020u; -} inline void GameManagementMessage::clear_has_gameplayerjoinedmessage() { - _has_bits_[0] &= ~0x00000020u; + _has_bits_[0] &= ~0x00000002u; } inline void GameManagementMessage::clear_gameplayerjoinedmessage() { if (gameplayerjoinedmessage_ != NULL) gameplayerjoinedmessage_->::GamePlayerJoinedMessage::Clear(); @@ -20783,15 +20765,15 @@ inline void GameManagementMessage::set_allocated_gameplayerjoinedmessage(::GameP } } -// optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; +// optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; inline bool GameManagementMessage::has_gameplayerleftmessage() const { - return (_has_bits_[0] & 0x00000040u) != 0; + return (_has_bits_[0] & 0x00000004u) != 0; } inline void GameManagementMessage::set_has_gameplayerleftmessage() { - _has_bits_[0] |= 0x00000040u; + _has_bits_[0] |= 0x00000004u; } inline void GameManagementMessage::clear_has_gameplayerleftmessage() { - _has_bits_[0] &= ~0x00000040u; + _has_bits_[0] &= ~0x00000004u; } inline void GameManagementMessage::clear_gameplayerleftmessage() { if (gameplayerleftmessage_ != NULL) gameplayerleftmessage_->::GamePlayerLeftMessage::Clear(); @@ -20825,15 +20807,15 @@ inline void GameManagementMessage::set_allocated_gameplayerleftmessage(::GamePla } } -// optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; +// optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; inline bool GameManagementMessage::has_gamespectatorjoinedmessage() const { - return (_has_bits_[0] & 0x00000080u) != 0; + return (_has_bits_[0] & 0x00000008u) != 0; } inline void GameManagementMessage::set_has_gamespectatorjoinedmessage() { - _has_bits_[0] |= 0x00000080u; + _has_bits_[0] |= 0x00000008u; } inline void GameManagementMessage::clear_has_gamespectatorjoinedmessage() { - _has_bits_[0] &= ~0x00000080u; + _has_bits_[0] &= ~0x00000008u; } inline void GameManagementMessage::clear_gamespectatorjoinedmessage() { if (gamespectatorjoinedmessage_ != NULL) gamespectatorjoinedmessage_->::GameSpectatorJoinedMessage::Clear(); @@ -20867,15 +20849,15 @@ inline void GameManagementMessage::set_allocated_gamespectatorjoinedmessage(::Ga } } -// optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; +// optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; inline bool GameManagementMessage::has_gamespectatorleftmessage() const { - return (_has_bits_[0] & 0x00000100u) != 0; + return (_has_bits_[0] & 0x00000010u) != 0; } inline void GameManagementMessage::set_has_gamespectatorleftmessage() { - _has_bits_[0] |= 0x00000100u; + _has_bits_[0] |= 0x00000010u; } inline void GameManagementMessage::clear_has_gamespectatorleftmessage() { - _has_bits_[0] &= ~0x00000100u; + _has_bits_[0] &= ~0x00000010u; } inline void GameManagementMessage::clear_gamespectatorleftmessage() { if (gamespectatorleftmessage_ != NULL) gamespectatorleftmessage_->::GameSpectatorLeftMessage::Clear(); @@ -20909,15 +20891,15 @@ inline void GameManagementMessage::set_allocated_gamespectatorleftmessage(::Game } } -// optional .GameAdminChangedMessage gameAdminChangedMessage = 10; +// optional .GameAdminChangedMessage gameAdminChangedMessage = 6; inline bool GameManagementMessage::has_gameadminchangedmessage() const { - return (_has_bits_[0] & 0x00000200u) != 0; + return (_has_bits_[0] & 0x00000020u) != 0; } inline void GameManagementMessage::set_has_gameadminchangedmessage() { - _has_bits_[0] |= 0x00000200u; + _has_bits_[0] |= 0x00000020u; } inline void GameManagementMessage::clear_has_gameadminchangedmessage() { - _has_bits_[0] &= ~0x00000200u; + _has_bits_[0] &= ~0x00000020u; } inline void GameManagementMessage::clear_gameadminchangedmessage() { if (gameadminchangedmessage_ != NULL) gameadminchangedmessage_->::GameAdminChangedMessage::Clear(); @@ -20951,15 +20933,15 @@ inline void GameManagementMessage::set_allocated_gameadminchangedmessage(::GameA } } -// optional .RemovedFromGameMessage removedFromGameMessage = 11; +// optional .RemovedFromGameMessage removedFromGameMessage = 7; inline bool GameManagementMessage::has_removedfromgamemessage() const { - return (_has_bits_[0] & 0x00000400u) != 0; + return (_has_bits_[0] & 0x00000040u) != 0; } inline void GameManagementMessage::set_has_removedfromgamemessage() { - _has_bits_[0] |= 0x00000400u; + _has_bits_[0] |= 0x00000040u; } inline void GameManagementMessage::clear_has_removedfromgamemessage() { - _has_bits_[0] &= ~0x00000400u; + _has_bits_[0] &= ~0x00000040u; } inline void GameManagementMessage::clear_removedfromgamemessage() { if (removedfromgamemessage_ != NULL) removedfromgamemessage_->::RemovedFromGameMessage::Clear(); @@ -20993,15 +20975,15 @@ inline void GameManagementMessage::set_allocated_removedfromgamemessage(::Remove } } -// optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; +// optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; inline bool GameManagementMessage::has_kickplayerrequestmessage() const { - return (_has_bits_[0] & 0x00000800u) != 0; + return (_has_bits_[0] & 0x00000080u) != 0; } inline void GameManagementMessage::set_has_kickplayerrequestmessage() { - _has_bits_[0] |= 0x00000800u; + _has_bits_[0] |= 0x00000080u; } inline void GameManagementMessage::clear_has_kickplayerrequestmessage() { - _has_bits_[0] &= ~0x00000800u; + _has_bits_[0] &= ~0x00000080u; } inline void GameManagementMessage::clear_kickplayerrequestmessage() { if (kickplayerrequestmessage_ != NULL) kickplayerrequestmessage_->::KickPlayerRequestMessage::Clear(); @@ -21035,15 +21017,15 @@ inline void GameManagementMessage::set_allocated_kickplayerrequestmessage(::Kick } } -// optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; +// optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; inline bool GameManagementMessage::has_leavegamerequestmessage() const { - return (_has_bits_[0] & 0x00001000u) != 0; + return (_has_bits_[0] & 0x00000100u) != 0; } inline void GameManagementMessage::set_has_leavegamerequestmessage() { - _has_bits_[0] |= 0x00001000u; + _has_bits_[0] |= 0x00000100u; } inline void GameManagementMessage::clear_has_leavegamerequestmessage() { - _has_bits_[0] &= ~0x00001000u; + _has_bits_[0] &= ~0x00000100u; } inline void GameManagementMessage::clear_leavegamerequestmessage() { if (leavegamerequestmessage_ != NULL) leavegamerequestmessage_->::LeaveGameRequestMessage::Clear(); @@ -21077,15 +21059,57 @@ inline void GameManagementMessage::set_allocated_leavegamerequestmessage(::Leave } } -// optional .StartEventMessage startEventMessage = 14; +// optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; +inline bool GameManagementMessage::has_inviteplayertogamemessage() const { + return (_has_bits_[0] & 0x00000200u) != 0; +} +inline void GameManagementMessage::set_has_inviteplayertogamemessage() { + _has_bits_[0] |= 0x00000200u; +} +inline void GameManagementMessage::clear_has_inviteplayertogamemessage() { + _has_bits_[0] &= ~0x00000200u; +} +inline void GameManagementMessage::clear_inviteplayertogamemessage() { + if (inviteplayertogamemessage_ != NULL) inviteplayertogamemessage_->::InvitePlayerToGameMessage::Clear(); + clear_has_inviteplayertogamemessage(); +} +inline const ::InvitePlayerToGameMessage& GameManagementMessage::inviteplayertogamemessage() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return inviteplayertogamemessage_ != NULL ? *inviteplayertogamemessage_ : *default_instance().inviteplayertogamemessage_; +#else + return inviteplayertogamemessage_ != NULL ? *inviteplayertogamemessage_ : *default_instance_->inviteplayertogamemessage_; +#endif +} +inline ::InvitePlayerToGameMessage* GameManagementMessage::mutable_inviteplayertogamemessage() { + set_has_inviteplayertogamemessage(); + if (inviteplayertogamemessage_ == NULL) inviteplayertogamemessage_ = new ::InvitePlayerToGameMessage; + return inviteplayertogamemessage_; +} +inline ::InvitePlayerToGameMessage* GameManagementMessage::release_inviteplayertogamemessage() { + clear_has_inviteplayertogamemessage(); + ::InvitePlayerToGameMessage* temp = inviteplayertogamemessage_; + inviteplayertogamemessage_ = NULL; + return temp; +} +inline void GameManagementMessage::set_allocated_inviteplayertogamemessage(::InvitePlayerToGameMessage* inviteplayertogamemessage) { + delete inviteplayertogamemessage_; + inviteplayertogamemessage_ = inviteplayertogamemessage; + if (inviteplayertogamemessage) { + set_has_inviteplayertogamemessage(); + } else { + clear_has_inviteplayertogamemessage(); + } +} + +// optional .StartEventMessage startEventMessage = 11; inline bool GameManagementMessage::has_starteventmessage() const { - return (_has_bits_[0] & 0x00002000u) != 0; + return (_has_bits_[0] & 0x00000400u) != 0; } inline void GameManagementMessage::set_has_starteventmessage() { - _has_bits_[0] |= 0x00002000u; + _has_bits_[0] |= 0x00000400u; } inline void GameManagementMessage::clear_has_starteventmessage() { - _has_bits_[0] &= ~0x00002000u; + _has_bits_[0] &= ~0x00000400u; } inline void GameManagementMessage::clear_starteventmessage() { if (starteventmessage_ != NULL) starteventmessage_->::StartEventMessage::Clear(); @@ -21119,15 +21143,15 @@ inline void GameManagementMessage::set_allocated_starteventmessage(::StartEventM } } -// optional .StartEventAckMessage startEventAckMessage = 15; +// optional .StartEventAckMessage startEventAckMessage = 12; inline bool GameManagementMessage::has_starteventackmessage() const { - return (_has_bits_[0] & 0x00004000u) != 0; + return (_has_bits_[0] & 0x00000800u) != 0; } inline void GameManagementMessage::set_has_starteventackmessage() { - _has_bits_[0] |= 0x00004000u; + _has_bits_[0] |= 0x00000800u; } inline void GameManagementMessage::clear_has_starteventackmessage() { - _has_bits_[0] &= ~0x00004000u; + _has_bits_[0] &= ~0x00000800u; } inline void GameManagementMessage::clear_starteventackmessage() { if (starteventackmessage_ != NULL) starteventackmessage_->::StartEventAckMessage::Clear(); @@ -21161,15 +21185,15 @@ inline void GameManagementMessage::set_allocated_starteventackmessage(::StartEve } } -// optional .GameStartInitialMessage gameStartInitialMessage = 16; +// optional .GameStartInitialMessage gameStartInitialMessage = 13; inline bool GameManagementMessage::has_gamestartinitialmessage() const { - return (_has_bits_[0] & 0x00008000u) != 0; + return (_has_bits_[0] & 0x00001000u) != 0; } inline void GameManagementMessage::set_has_gamestartinitialmessage() { - _has_bits_[0] |= 0x00008000u; + _has_bits_[0] |= 0x00001000u; } inline void GameManagementMessage::clear_has_gamestartinitialmessage() { - _has_bits_[0] &= ~0x00008000u; + _has_bits_[0] &= ~0x00001000u; } inline void GameManagementMessage::clear_gamestartinitialmessage() { if (gamestartinitialmessage_ != NULL) gamestartinitialmessage_->::GameStartInitialMessage::Clear(); @@ -21203,15 +21227,15 @@ inline void GameManagementMessage::set_allocated_gamestartinitialmessage(::GameS } } -// optional .GameStartRejoinMessage gameStartRejoinMessage = 17; +// optional .GameStartRejoinMessage gameStartRejoinMessage = 14; inline bool GameManagementMessage::has_gamestartrejoinmessage() const { - return (_has_bits_[0] & 0x00010000u) != 0; + return (_has_bits_[0] & 0x00002000u) != 0; } inline void GameManagementMessage::set_has_gamestartrejoinmessage() { - _has_bits_[0] |= 0x00010000u; + _has_bits_[0] |= 0x00002000u; } inline void GameManagementMessage::clear_has_gamestartrejoinmessage() { - _has_bits_[0] &= ~0x00010000u; + _has_bits_[0] &= ~0x00002000u; } inline void GameManagementMessage::clear_gamestartrejoinmessage() { if (gamestartrejoinmessage_ != NULL) gamestartrejoinmessage_->::GameStartRejoinMessage::Clear(); @@ -21245,15 +21269,15 @@ inline void GameManagementMessage::set_allocated_gamestartrejoinmessage(::GameSt } } -// optional .EndOfGameMessage endOfGameMessage = 18; +// optional .EndOfGameMessage endOfGameMessage = 15; inline bool GameManagementMessage::has_endofgamemessage() const { - return (_has_bits_[0] & 0x00020000u) != 0; + return (_has_bits_[0] & 0x00004000u) != 0; } inline void GameManagementMessage::set_has_endofgamemessage() { - _has_bits_[0] |= 0x00020000u; + _has_bits_[0] |= 0x00004000u; } inline void GameManagementMessage::clear_has_endofgamemessage() { - _has_bits_[0] &= ~0x00020000u; + _has_bits_[0] &= ~0x00004000u; } inline void GameManagementMessage::clear_endofgamemessage() { if (endofgamemessage_ != NULL) endofgamemessage_->::EndOfGameMessage::Clear(); @@ -21287,15 +21311,15 @@ inline void GameManagementMessage::set_allocated_endofgamemessage(::EndOfGameMes } } -// optional .PlayerIdChangedMessage playerIdChangedMessage = 19; +// optional .PlayerIdChangedMessage playerIdChangedMessage = 16; inline bool GameManagementMessage::has_playeridchangedmessage() const { - return (_has_bits_[0] & 0x00040000u) != 0; + return (_has_bits_[0] & 0x00008000u) != 0; } inline void GameManagementMessage::set_has_playeridchangedmessage() { - _has_bits_[0] |= 0x00040000u; + _has_bits_[0] |= 0x00008000u; } inline void GameManagementMessage::clear_has_playeridchangedmessage() { - _has_bits_[0] &= ~0x00040000u; + _has_bits_[0] &= ~0x00008000u; } inline void GameManagementMessage::clear_playeridchangedmessage() { if (playeridchangedmessage_ != NULL) playeridchangedmessage_->::PlayerIdChangedMessage::Clear(); @@ -21329,15 +21353,15 @@ inline void GameManagementMessage::set_allocated_playeridchangedmessage(::Player } } -// optional .AskKickPlayerMessage askKickPlayerMessage = 20; +// optional .AskKickPlayerMessage askKickPlayerMessage = 17; inline bool GameManagementMessage::has_askkickplayermessage() const { - return (_has_bits_[0] & 0x00080000u) != 0; + return (_has_bits_[0] & 0x00010000u) != 0; } inline void GameManagementMessage::set_has_askkickplayermessage() { - _has_bits_[0] |= 0x00080000u; + _has_bits_[0] |= 0x00010000u; } inline void GameManagementMessage::clear_has_askkickplayermessage() { - _has_bits_[0] &= ~0x00080000u; + _has_bits_[0] &= ~0x00010000u; } inline void GameManagementMessage::clear_askkickplayermessage() { if (askkickplayermessage_ != NULL) askkickplayermessage_->::AskKickPlayerMessage::Clear(); @@ -21371,15 +21395,15 @@ inline void GameManagementMessage::set_allocated_askkickplayermessage(::AskKickP } } -// optional .AskKickDeniedMessage askKickDeniedMessage = 21; +// optional .AskKickDeniedMessage askKickDeniedMessage = 18; inline bool GameManagementMessage::has_askkickdeniedmessage() const { - return (_has_bits_[0] & 0x00100000u) != 0; + return (_has_bits_[0] & 0x00020000u) != 0; } inline void GameManagementMessage::set_has_askkickdeniedmessage() { - _has_bits_[0] |= 0x00100000u; + _has_bits_[0] |= 0x00020000u; } inline void GameManagementMessage::clear_has_askkickdeniedmessage() { - _has_bits_[0] &= ~0x00100000u; + _has_bits_[0] &= ~0x00020000u; } inline void GameManagementMessage::clear_askkickdeniedmessage() { if (askkickdeniedmessage_ != NULL) askkickdeniedmessage_->::AskKickDeniedMessage::Clear(); @@ -21413,15 +21437,15 @@ inline void GameManagementMessage::set_allocated_askkickdeniedmessage(::AskKickD } } -// optional .StartKickPetitionMessage startKickPetitionMessage = 22; +// optional .StartKickPetitionMessage startKickPetitionMessage = 19; inline bool GameManagementMessage::has_startkickpetitionmessage() const { - return (_has_bits_[0] & 0x00200000u) != 0; + return (_has_bits_[0] & 0x00040000u) != 0; } inline void GameManagementMessage::set_has_startkickpetitionmessage() { - _has_bits_[0] |= 0x00200000u; + _has_bits_[0] |= 0x00040000u; } inline void GameManagementMessage::clear_has_startkickpetitionmessage() { - _has_bits_[0] &= ~0x00200000u; + _has_bits_[0] &= ~0x00040000u; } inline void GameManagementMessage::clear_startkickpetitionmessage() { if (startkickpetitionmessage_ != NULL) startkickpetitionmessage_->::StartKickPetitionMessage::Clear(); @@ -21455,15 +21479,15 @@ inline void GameManagementMessage::set_allocated_startkickpetitionmessage(::Star } } -// optional .VoteKickRequestMessage voteKickRequestMessage = 23; +// optional .VoteKickRequestMessage voteKickRequestMessage = 20; inline bool GameManagementMessage::has_votekickrequestmessage() const { - return (_has_bits_[0] & 0x00400000u) != 0; + return (_has_bits_[0] & 0x00080000u) != 0; } inline void GameManagementMessage::set_has_votekickrequestmessage() { - _has_bits_[0] |= 0x00400000u; + _has_bits_[0] |= 0x00080000u; } inline void GameManagementMessage::clear_has_votekickrequestmessage() { - _has_bits_[0] &= ~0x00400000u; + _has_bits_[0] &= ~0x00080000u; } inline void GameManagementMessage::clear_votekickrequestmessage() { if (votekickrequestmessage_ != NULL) votekickrequestmessage_->::VoteKickRequestMessage::Clear(); @@ -21497,15 +21521,15 @@ inline void GameManagementMessage::set_allocated_votekickrequestmessage(::VoteKi } } -// optional .VoteKickReplyMessage voteKickReplyMessage = 24; +// optional .VoteKickReplyMessage voteKickReplyMessage = 21; inline bool GameManagementMessage::has_votekickreplymessage() const { - return (_has_bits_[0] & 0x00800000u) != 0; + return (_has_bits_[0] & 0x00100000u) != 0; } inline void GameManagementMessage::set_has_votekickreplymessage() { - _has_bits_[0] |= 0x00800000u; + _has_bits_[0] |= 0x00100000u; } inline void GameManagementMessage::clear_has_votekickreplymessage() { - _has_bits_[0] &= ~0x00800000u; + _has_bits_[0] &= ~0x00100000u; } inline void GameManagementMessage::clear_votekickreplymessage() { if (votekickreplymessage_ != NULL) votekickreplymessage_->::VoteKickReplyMessage::Clear(); @@ -21539,15 +21563,15 @@ inline void GameManagementMessage::set_allocated_votekickreplymessage(::VoteKick } } -// optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; +// optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; inline bool GameManagementMessage::has_kickpetitionupdatemessage() const { - return (_has_bits_[0] & 0x01000000u) != 0; + return (_has_bits_[0] & 0x00200000u) != 0; } inline void GameManagementMessage::set_has_kickpetitionupdatemessage() { - _has_bits_[0] |= 0x01000000u; + _has_bits_[0] |= 0x00200000u; } inline void GameManagementMessage::clear_has_kickpetitionupdatemessage() { - _has_bits_[0] &= ~0x01000000u; + _has_bits_[0] &= ~0x00200000u; } inline void GameManagementMessage::clear_kickpetitionupdatemessage() { if (kickpetitionupdatemessage_ != NULL) kickpetitionupdatemessage_->::KickPetitionUpdateMessage::Clear(); @@ -21581,15 +21605,15 @@ inline void GameManagementMessage::set_allocated_kickpetitionupdatemessage(::Kic } } -// optional .EndKickPetitionMessage endKickPetitionMessage = 26; +// optional .EndKickPetitionMessage endKickPetitionMessage = 23; inline bool GameManagementMessage::has_endkickpetitionmessage() const { - return (_has_bits_[0] & 0x02000000u) != 0; + return (_has_bits_[0] & 0x00400000u) != 0; } inline void GameManagementMessage::set_has_endkickpetitionmessage() { - _has_bits_[0] |= 0x02000000u; + _has_bits_[0] |= 0x00400000u; } inline void GameManagementMessage::clear_has_endkickpetitionmessage() { - _has_bits_[0] &= ~0x02000000u; + _has_bits_[0] &= ~0x00400000u; } inline void GameManagementMessage::clear_endkickpetitionmessage() { if (endkickpetitionmessage_ != NULL) endkickpetitionmessage_->::EndKickPetitionMessage::Clear(); @@ -21623,15 +21647,15 @@ inline void GameManagementMessage::set_allocated_endkickpetitionmessage(::EndKic } } -// optional .ChatRequestMessage chatRequestMessage = 27; +// optional .ChatRequestMessage chatRequestMessage = 24; inline bool GameManagementMessage::has_chatrequestmessage() const { - return (_has_bits_[0] & 0x04000000u) != 0; + return (_has_bits_[0] & 0x00800000u) != 0; } inline void GameManagementMessage::set_has_chatrequestmessage() { - _has_bits_[0] |= 0x04000000u; + _has_bits_[0] |= 0x00800000u; } inline void GameManagementMessage::clear_has_chatrequestmessage() { - _has_bits_[0] &= ~0x04000000u; + _has_bits_[0] &= ~0x00800000u; } inline void GameManagementMessage::clear_chatrequestmessage() { if (chatrequestmessage_ != NULL) chatrequestmessage_->::ChatRequestMessage::Clear(); @@ -21665,15 +21689,15 @@ inline void GameManagementMessage::set_allocated_chatrequestmessage(::ChatReques } } -// optional .ChatMessage chatMessage = 28; +// optional .ChatMessage chatMessage = 25; inline bool GameManagementMessage::has_chatmessage() const { - return (_has_bits_[0] & 0x08000000u) != 0; + return (_has_bits_[0] & 0x01000000u) != 0; } inline void GameManagementMessage::set_has_chatmessage() { - _has_bits_[0] |= 0x08000000u; + _has_bits_[0] |= 0x01000000u; } inline void GameManagementMessage::clear_has_chatmessage() { - _has_bits_[0] &= ~0x08000000u; + _has_bits_[0] &= ~0x01000000u; } inline void GameManagementMessage::clear_chatmessage() { if (chatmessage_ != NULL) chatmessage_->::ChatMessage::Clear(); @@ -21707,15 +21731,15 @@ inline void GameManagementMessage::set_allocated_chatmessage(::ChatMessage* chat } } -// optional .ChatRejectMessage chatRejectMessage = 29; +// optional .ChatRejectMessage chatRejectMessage = 26; inline bool GameManagementMessage::has_chatrejectmessage() const { - return (_has_bits_[0] & 0x10000000u) != 0; + return (_has_bits_[0] & 0x02000000u) != 0; } inline void GameManagementMessage::set_has_chatrejectmessage() { - _has_bits_[0] |= 0x10000000u; + _has_bits_[0] |= 0x02000000u; } inline void GameManagementMessage::clear_has_chatrejectmessage() { - _has_bits_[0] &= ~0x10000000u; + _has_bits_[0] &= ~0x02000000u; } inline void GameManagementMessage::clear_chatrejectmessage() { if (chatrejectmessage_ != NULL) chatrejectmessage_->::ChatRejectMessage::Clear(); @@ -21749,15 +21773,99 @@ inline void GameManagementMessage::set_allocated_chatrejectmessage(::ChatRejectM } } +// optional .TimeoutWarningMessage timeoutWarningMessage = 27; +inline bool GameManagementMessage::has_timeoutwarningmessage() const { + return (_has_bits_[0] & 0x04000000u) != 0; +} +inline void GameManagementMessage::set_has_timeoutwarningmessage() { + _has_bits_[0] |= 0x04000000u; +} +inline void GameManagementMessage::clear_has_timeoutwarningmessage() { + _has_bits_[0] &= ~0x04000000u; +} +inline void GameManagementMessage::clear_timeoutwarningmessage() { + if (timeoutwarningmessage_ != NULL) timeoutwarningmessage_->::TimeoutWarningMessage::Clear(); + clear_has_timeoutwarningmessage(); +} +inline const ::TimeoutWarningMessage& GameManagementMessage::timeoutwarningmessage() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return timeoutwarningmessage_ != NULL ? *timeoutwarningmessage_ : *default_instance().timeoutwarningmessage_; +#else + return timeoutwarningmessage_ != NULL ? *timeoutwarningmessage_ : *default_instance_->timeoutwarningmessage_; +#endif +} +inline ::TimeoutWarningMessage* GameManagementMessage::mutable_timeoutwarningmessage() { + set_has_timeoutwarningmessage(); + if (timeoutwarningmessage_ == NULL) timeoutwarningmessage_ = new ::TimeoutWarningMessage; + return timeoutwarningmessage_; +} +inline ::TimeoutWarningMessage* GameManagementMessage::release_timeoutwarningmessage() { + clear_has_timeoutwarningmessage(); + ::TimeoutWarningMessage* temp = timeoutwarningmessage_; + timeoutwarningmessage_ = NULL; + return temp; +} +inline void GameManagementMessage::set_allocated_timeoutwarningmessage(::TimeoutWarningMessage* timeoutwarningmessage) { + delete timeoutwarningmessage_; + timeoutwarningmessage_ = timeoutwarningmessage; + if (timeoutwarningmessage) { + set_has_timeoutwarningmessage(); + } else { + clear_has_timeoutwarningmessage(); + } +} + +// optional .ResetTimeoutMessage resetTimeoutMessage = 28; +inline bool GameManagementMessage::has_resettimeoutmessage() const { + return (_has_bits_[0] & 0x08000000u) != 0; +} +inline void GameManagementMessage::set_has_resettimeoutmessage() { + _has_bits_[0] |= 0x08000000u; +} +inline void GameManagementMessage::clear_has_resettimeoutmessage() { + _has_bits_[0] &= ~0x08000000u; +} +inline void GameManagementMessage::clear_resettimeoutmessage() { + if (resettimeoutmessage_ != NULL) resettimeoutmessage_->::ResetTimeoutMessage::Clear(); + clear_has_resettimeoutmessage(); +} +inline const ::ResetTimeoutMessage& GameManagementMessage::resettimeoutmessage() const { +#ifdef GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER + return resettimeoutmessage_ != NULL ? *resettimeoutmessage_ : *default_instance().resettimeoutmessage_; +#else + return resettimeoutmessage_ != NULL ? *resettimeoutmessage_ : *default_instance_->resettimeoutmessage_; +#endif +} +inline ::ResetTimeoutMessage* GameManagementMessage::mutable_resettimeoutmessage() { + set_has_resettimeoutmessage(); + if (resettimeoutmessage_ == NULL) resettimeoutmessage_ = new ::ResetTimeoutMessage; + return resettimeoutmessage_; +} +inline ::ResetTimeoutMessage* GameManagementMessage::release_resettimeoutmessage() { + clear_has_resettimeoutmessage(); + ::ResetTimeoutMessage* temp = resettimeoutmessage_; + resettimeoutmessage_ = NULL; + return temp; +} +inline void GameManagementMessage::set_allocated_resettimeoutmessage(::ResetTimeoutMessage* resettimeoutmessage) { + delete resettimeoutmessage_; + resettimeoutmessage_ = resettimeoutmessage; + if (resettimeoutmessage) { + set_has_resettimeoutmessage(); + } else { + clear_has_resettimeoutmessage(); + } +} + // optional .ErrorMessage errorMessage = 1025; inline bool GameManagementMessage::has_errormessage() const { - return (_has_bits_[0] & 0x20000000u) != 0; + return (_has_bits_[0] & 0x10000000u) != 0; } inline void GameManagementMessage::set_has_errormessage() { - _has_bits_[0] |= 0x20000000u; + _has_bits_[0] |= 0x10000000u; } inline void GameManagementMessage::clear_has_errormessage() { - _has_bits_[0] &= ~0x20000000u; + _has_bits_[0] &= ~0x10000000u; } inline void GameManagementMessage::clear_errormessage() { if (errormessage_ != NULL) errormessage_->::ErrorMessage::Clear(); diff --git a/tests/src/de/pokerth/protocol/ProtoBuf.java b/tests/src/de/pokerth/protocol/ProtoBuf.java index 279bab61..dc0ee124 100644 --- a/tests/src/de/pokerth/protocol/ProtoBuf.java +++ b/tests/src/de/pokerth/protocol/ProtoBuf.java @@ -4791,6 +4791,24 @@ public final class ProtoBuf { * optional bytes myLastSessionId = 7; */ com.google.protobuf.ByteString getMyLastSessionId(); + + // optional bytes avatarHash = 8; + /** + * optional bytes avatarHash = 8; + * + * 
+     * Ignored for guest login.
+     *
+ */ + boolean hasAvatarHash(); + /** + * optional bytes avatarHash = 8; + * + * 
+     * Ignored for guest login.
+     *
+ */ + com.google.protobuf.ByteString getAvatarHash(); } /** * Protobuf type {@code AuthClientRequestMessage} @@ -4882,6 +4900,11 @@ public final class ProtoBuf { myLastSessionId_ = input.readBytes(); break; } + case 66: { + bitField0_ |= 0x00000080; + avatarHash_ = input.readBytes(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -5168,6 +5191,30 @@ public final class ProtoBuf { return myLastSessionId_; } + // optional bytes avatarHash = 8; + public static final int AVATARHASH_FIELD_NUMBER = 8; + private com.google.protobuf.ByteString avatarHash_; + /** + * optional bytes avatarHash = 8; + * + * 
+     * Ignored for guest login.
+     *
+ */ + public boolean hasAvatarHash() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + * optional bytes avatarHash = 8; + * + * 
+     * Ignored for guest login.
+     *
+ */ + public com.google.protobuf.ByteString getAvatarHash() { + return avatarHash_; + } + private void initFields() { requestedVersion_ = de.pokerth.protocol.ProtoBuf.AnnounceMessage.Version.getDefaultInstance(); buildId_ = 0; @@ -5176,6 +5223,7 @@ public final class ProtoBuf { nickName_ = ""; clientUserData_ = com.google.protobuf.ByteString.EMPTY; myLastSessionId_ = com.google.protobuf.ByteString.EMPTY; + avatarHash_ = com.google.protobuf.ByteString.EMPTY; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -5226,6 +5274,9 @@ public final class ProtoBuf { if (((bitField0_ & 0x00000040) == 0x00000040)) { output.writeBytes(7, myLastSessionId_); } + if (((bitField0_ & 0x00000080) == 0x00000080)) { + output.writeBytes(8, avatarHash_); + } } private int memoizedSerializedSize = -1; @@ -5262,6 +5313,10 @@ public final class ProtoBuf { size += com.google.protobuf.CodedOutputStream .computeBytesSize(7, myLastSessionId_); } + if (((bitField0_ & 0x00000080) == 0x00000080)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(8, avatarHash_); + } memoizedSerializedSize = size; return size; } @@ -5367,6 +5422,8 @@ public final class ProtoBuf { bitField0_ = (bitField0_ & ~0x00000020); myLastSessionId_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000040); + avatarHash_ = com.google.protobuf.ByteString.EMPTY; + bitField0_ = (bitField0_ & ~0x00000080); return this; } @@ -5418,6 +5475,10 @@ public final class ProtoBuf { to_bitField0_ |= 0x00000040; } result.myLastSessionId_ = myLastSessionId_; + if (((from_bitField0_ & 0x00000080) == 0x00000080)) { + to_bitField0_ |= 0x00000080; + } + result.avatarHash_ = avatarHash_; result.bitField0_ = to_bitField0_; return result; } @@ -5449,6 +5510,9 @@ public final class ProtoBuf { if (other.hasMyLastSessionId()) { setMyLastSessionId(other.getMyLastSessionId()); } + if (other.hasAvatarHash()) { + setAvatarHash(other.getAvatarHash()); + } return this; } @@ -5897,6 +5961,58 @@ public final class ProtoBuf { return this; } + // optional bytes avatarHash = 8; + private com.google.protobuf.ByteString avatarHash_ = com.google.protobuf.ByteString.EMPTY; + /** + * optional bytes avatarHash = 8; + * + * 
+       * Ignored for guest login.
+       *
+ */ + public boolean hasAvatarHash() { + return ((bitField0_ & 0x00000080) == 0x00000080); + } + /** + * optional bytes avatarHash = 8; + * + * 
+       * Ignored for guest login.
+       *
+ */ + public com.google.protobuf.ByteString getAvatarHash() { + return avatarHash_; + } + /** + * optional bytes avatarHash = 8; + * + * 
+       * Ignored for guest login.
+       *
+ */ + public Builder setAvatarHash(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000080; + avatarHash_ = value; + + return this; + } + /** + * optional bytes avatarHash = 8; + * + * 
+       * Ignored for guest login.
+       *
+ */ + public Builder clearAvatarHash() { + bitField0_ = (bitField0_ & ~0x00000080); + avatarHash_ = getDefaultInstance().getAvatarHash(); + + return this; + } + // @@protoc_insertion_point(builder_scope:AuthClientRequestMessage) } @@ -6599,33 +6715,13 @@ public final class ProtoBuf { public interface AuthServerVerificationMessageOrBuilder extends com.google.protobuf.MessageLiteOrBuilder { - // required bytes yourSessionId = 1; + // required bytes serverVerification = 1; /** - * required bytes yourSessionId = 1; - */ - boolean hasYourSessionId(); - /** - * required bytes yourSessionId = 1; - */ - com.google.protobuf.ByteString getYourSessionId(); - - // required uint32 yourPlayerId = 2; - /** - * required uint32 yourPlayerId = 2; - */ - boolean hasYourPlayerId(); - /** - * required uint32 yourPlayerId = 2; - */ - int getYourPlayerId(); - - // optional bytes serverVerification = 3; - /** - * optional bytes serverVerification = 3; + * required bytes serverVerification = 1; */ boolean hasServerVerification(); /** - * optional bytes serverVerification = 3; + * required bytes serverVerification = 1; */ com.google.protobuf.ByteString getServerVerification(); } @@ -6674,16 +6770,6 @@ public final class ProtoBuf { } case 10: { bitField0_ |= 0x00000001; - yourSessionId_ = input.readBytes(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - yourPlayerId_ = input.readUInt32(); - break; - } - case 26: { - bitField0_ |= 0x00000004; serverVerification_ = input.readBytes(); break; } @@ -6714,57 +6800,23 @@ public final class ProtoBuf { } private int bitField0_; - // required bytes yourSessionId = 1; - public static final int YOURSESSIONID_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString yourSessionId_; + // required bytes serverVerification = 1; + public static final int SERVERVERIFICATION_FIELD_NUMBER = 1; + private com.google.protobuf.ByteString serverVerification_; /** - * required bytes yourSessionId = 1; + * required bytes serverVerification = 1; */ - public boolean hasYourSessionId() { + public boolean hasServerVerification() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required bytes yourSessionId = 1; - */ - public com.google.protobuf.ByteString getYourSessionId() { - return yourSessionId_; - } - - // required uint32 yourPlayerId = 2; - public static final int YOURPLAYERID_FIELD_NUMBER = 2; - private int yourPlayerId_; - /** - * required uint32 yourPlayerId = 2; - */ - public boolean hasYourPlayerId() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required uint32 yourPlayerId = 2; - */ - public int getYourPlayerId() { - return yourPlayerId_; - } - - // optional bytes serverVerification = 3; - public static final int SERVERVERIFICATION_FIELD_NUMBER = 3; - private com.google.protobuf.ByteString serverVerification_; - /** - * optional bytes serverVerification = 3; - */ - public boolean hasServerVerification() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional bytes serverVerification = 3; + * required bytes serverVerification = 1; */ public com.google.protobuf.ByteString getServerVerification() { return serverVerification_; } private void initFields() { - yourSessionId_ = com.google.protobuf.ByteString.EMPTY; - yourPlayerId_ = 0; serverVerification_ = com.google.protobuf.ByteString.EMPTY; } private byte memoizedIsInitialized = -1; @@ -6772,11 +6824,7 @@ public final class ProtoBuf { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - if (!hasYourSessionId()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasYourPlayerId()) { + if (!hasServerVerification()) { memoizedIsInitialized = 0; return false; } @@ -6788,13 +6836,7 @@ public final class ProtoBuf { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, yourSessionId_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeUInt32(2, yourPlayerId_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBytes(3, serverVerification_); + output.writeBytes(1, serverVerification_); } } @@ -6806,15 +6848,7 @@ public final class ProtoBuf { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, yourSessionId_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, yourPlayerId_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(3, serverVerification_); + .computeBytesSize(1, serverVerification_); } memoizedSerializedSize = size; return size; @@ -6907,12 +6941,8 @@ public final class ProtoBuf { public Builder clear() { super.clear(); - yourSessionId_ = com.google.protobuf.ByteString.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); - yourPlayerId_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); serverVerification_ = com.google.protobuf.ByteString.EMPTY; - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -6939,6 +6969,477 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } + result.serverVerification_ = serverVerification_; + result.bitField0_ = to_bitField0_; + return result; + } + + public Builder mergeFrom(de.pokerth.protocol.ProtoBuf.AuthServerVerificationMessage other) { + if (other == de.pokerth.protocol.ProtoBuf.AuthServerVerificationMessage.getDefaultInstance()) return this; + if (other.hasServerVerification()) { + setServerVerification(other.getServerVerification()); + } + return this; + } + + public final boolean isInitialized() { + if (!hasServerVerification()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + de.pokerth.protocol.ProtoBuf.AuthServerVerificationMessage parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (de.pokerth.protocol.ProtoBuf.AuthServerVerificationMessage) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // required bytes serverVerification = 1; + private com.google.protobuf.ByteString serverVerification_ = com.google.protobuf.ByteString.EMPTY; + /** + * required bytes serverVerification = 1; + */ + public boolean hasServerVerification() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required bytes serverVerification = 1; + */ + public com.google.protobuf.ByteString getServerVerification() { + return serverVerification_; + } + /** + * required bytes serverVerification = 1; + */ + public Builder setServerVerification(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + serverVerification_ = value; + + return this; + } + /** + * required bytes serverVerification = 1; + */ + public Builder clearServerVerification() { + bitField0_ = (bitField0_ & ~0x00000001); + serverVerification_ = getDefaultInstance().getServerVerification(); + + return this; + } + + // @@protoc_insertion_point(builder_scope:AuthServerVerificationMessage) + } + + static { + defaultInstance = new AuthServerVerificationMessage(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:AuthServerVerificationMessage) + } + + public interface InitDoneMessageOrBuilder + extends com.google.protobuf.MessageLiteOrBuilder { + + // required bytes yourSessionId = 1; + /** + * required bytes yourSessionId = 1; + */ + boolean hasYourSessionId(); + /** + * required bytes yourSessionId = 1; + */ + com.google.protobuf.ByteString getYourSessionId(); + + // required uint32 yourPlayerId = 2; + /** + * required uint32 yourPlayerId = 2; + */ + boolean hasYourPlayerId(); + /** + * required uint32 yourPlayerId = 2; + */ + int getYourPlayerId(); + + // optional bytes yourAvatarHash = 3; + /** + * optional bytes yourAvatarHash = 3; + */ + boolean hasYourAvatarHash(); + /** + * optional bytes yourAvatarHash = 3; + */ + com.google.protobuf.ByteString getYourAvatarHash(); + + // optional uint32 rejoinGameId = 4; + /** + * optional uint32 rejoinGameId = 4; + */ + boolean hasRejoinGameId(); + /** + * optional uint32 rejoinGameId = 4; + */ + int getRejoinGameId(); + } + /** + * Protobuf type {@code InitDoneMessage} + */ + public static final class InitDoneMessage extends + com.google.protobuf.GeneratedMessageLite + implements InitDoneMessageOrBuilder { + // Use InitDoneMessage.newBuilder() to construct. + private InitDoneMessage(com.google.protobuf.GeneratedMessageLite.Builder builder) { + super(builder); + + } + private InitDoneMessage(boolean noInit) {} + + private static final InitDoneMessage defaultInstance; + public static InitDoneMessage getDefaultInstance() { + return defaultInstance; + } + + public InitDoneMessage getDefaultInstanceForType() { + return defaultInstance; + } + + private InitDoneMessage( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + bitField0_ |= 0x00000001; + yourSessionId_ = input.readBytes(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + yourPlayerId_ = input.readUInt32(); + break; + } + case 26: { + bitField0_ |= 0x00000004; + yourAvatarHash_ = input.readBytes(); + break; + } + case 32: { + bitField0_ |= 0x00000008; + rejoinGameId_ = input.readUInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + makeExtensionsImmutable(); + } + } + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public InitDoneMessage parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new InitDoneMessage(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // required bytes yourSessionId = 1; + public static final int YOURSESSIONID_FIELD_NUMBER = 1; + private com.google.protobuf.ByteString yourSessionId_; + /** + * required bytes yourSessionId = 1; + */ + public boolean hasYourSessionId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required bytes yourSessionId = 1; + */ + public com.google.protobuf.ByteString getYourSessionId() { + return yourSessionId_; + } + + // required uint32 yourPlayerId = 2; + public static final int YOURPLAYERID_FIELD_NUMBER = 2; + private int yourPlayerId_; + /** + * required uint32 yourPlayerId = 2; + */ + public boolean hasYourPlayerId() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required uint32 yourPlayerId = 2; + */ + public int getYourPlayerId() { + return yourPlayerId_; + } + + // optional bytes yourAvatarHash = 3; + public static final int YOURAVATARHASH_FIELD_NUMBER = 3; + private com.google.protobuf.ByteString yourAvatarHash_; + /** + * optional bytes yourAvatarHash = 3; + */ + public boolean hasYourAvatarHash() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional bytes yourAvatarHash = 3; + */ + public com.google.protobuf.ByteString getYourAvatarHash() { + return yourAvatarHash_; + } + + // optional uint32 rejoinGameId = 4; + public static final int REJOINGAMEID_FIELD_NUMBER = 4; + private int rejoinGameId_; + /** + * optional uint32 rejoinGameId = 4; + */ + public boolean hasRejoinGameId() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional uint32 rejoinGameId = 4; + */ + public int getRejoinGameId() { + return rejoinGameId_; + } + + private void initFields() { + yourSessionId_ = com.google.protobuf.ByteString.EMPTY; + yourPlayerId_ = 0; + yourAvatarHash_ = com.google.protobuf.ByteString.EMPTY; + rejoinGameId_ = 0; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasYourSessionId()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasYourPlayerId()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeBytes(1, yourSessionId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeUInt32(2, yourPlayerId_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeBytes(3, yourAvatarHash_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeUInt32(4, rejoinGameId_); + } + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, yourSessionId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(2, yourPlayerId_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(3, yourAvatarHash_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(4, rejoinGameId_); + } + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static de.pokerth.protocol.ProtoBuf.InitDoneMessage parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static de.pokerth.protocol.ProtoBuf.InitDoneMessage parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static de.pokerth.protocol.ProtoBuf.InitDoneMessage parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static de.pokerth.protocol.ProtoBuf.InitDoneMessage parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static de.pokerth.protocol.ProtoBuf.InitDoneMessage parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static de.pokerth.protocol.ProtoBuf.InitDoneMessage parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static de.pokerth.protocol.ProtoBuf.InitDoneMessage parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static de.pokerth.protocol.ProtoBuf.InitDoneMessage parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static de.pokerth.protocol.ProtoBuf.InitDoneMessage parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static de.pokerth.protocol.ProtoBuf.InitDoneMessage parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(de.pokerth.protocol.ProtoBuf.InitDoneMessage prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + /** + * Protobuf type {@code InitDoneMessage} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageLite.Builder< + de.pokerth.protocol.ProtoBuf.InitDoneMessage, Builder> + implements de.pokerth.protocol.ProtoBuf.InitDoneMessageOrBuilder { + // Construct using de.pokerth.protocol.ProtoBuf.InitDoneMessage.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private void maybeForceBuilderInitialization() { + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + yourSessionId_ = com.google.protobuf.ByteString.EMPTY; + bitField0_ = (bitField0_ & ~0x00000001); + yourPlayerId_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + yourAvatarHash_ = com.google.protobuf.ByteString.EMPTY; + bitField0_ = (bitField0_ & ~0x00000004); + rejoinGameId_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public de.pokerth.protocol.ProtoBuf.InitDoneMessage getDefaultInstanceForType() { + return de.pokerth.protocol.ProtoBuf.InitDoneMessage.getDefaultInstance(); + } + + public de.pokerth.protocol.ProtoBuf.InitDoneMessage build() { + de.pokerth.protocol.ProtoBuf.InitDoneMessage result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public de.pokerth.protocol.ProtoBuf.InitDoneMessage buildPartial() { + de.pokerth.protocol.ProtoBuf.InitDoneMessage result = new de.pokerth.protocol.ProtoBuf.InitDoneMessage(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } result.yourSessionId_ = yourSessionId_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; @@ -6947,21 +7448,28 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.serverVerification_ = serverVerification_; + result.yourAvatarHash_ = yourAvatarHash_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.rejoinGameId_ = rejoinGameId_; result.bitField0_ = to_bitField0_; return result; } - public Builder mergeFrom(de.pokerth.protocol.ProtoBuf.AuthServerVerificationMessage other) { - if (other == de.pokerth.protocol.ProtoBuf.AuthServerVerificationMessage.getDefaultInstance()) return this; + public Builder mergeFrom(de.pokerth.protocol.ProtoBuf.InitDoneMessage other) { + if (other == de.pokerth.protocol.ProtoBuf.InitDoneMessage.getDefaultInstance()) return this; if (other.hasYourSessionId()) { setYourSessionId(other.getYourSessionId()); } if (other.hasYourPlayerId()) { setYourPlayerId(other.getYourPlayerId()); } - if (other.hasServerVerification()) { - setServerVerification(other.getServerVerification()); + if (other.hasYourAvatarHash()) { + setYourAvatarHash(other.getYourAvatarHash()); + } + if (other.hasRejoinGameId()) { + setRejoinGameId(other.getRejoinGameId()); } return this; } @@ -6982,11 +7490,11 @@ public final class ProtoBuf { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - de.pokerth.protocol.ProtoBuf.AuthServerVerificationMessage parsedMessage = null; + de.pokerth.protocol.ProtoBuf.InitDoneMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (de.pokerth.protocol.ProtoBuf.AuthServerVerificationMessage) e.getUnfinishedMessage(); + parsedMessage = (de.pokerth.protocol.ProtoBuf.InitDoneMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -7066,836 +7574,84 @@ public final class ProtoBuf { return this; } - // optional bytes serverVerification = 3; - private com.google.protobuf.ByteString serverVerification_ = com.google.protobuf.ByteString.EMPTY; + // optional bytes yourAvatarHash = 3; + private com.google.protobuf.ByteString yourAvatarHash_ = com.google.protobuf.ByteString.EMPTY; /** - * optional bytes serverVerification = 3; + * optional bytes yourAvatarHash = 3; */ - public boolean hasServerVerification() { + public boolean hasYourAvatarHash() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional bytes serverVerification = 3; - */ - public com.google.protobuf.ByteString getServerVerification() { - return serverVerification_; - } - /** - * optional bytes serverVerification = 3; - */ - public Builder setServerVerification(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - serverVerification_ = value; - - return this; - } - /** - * optional bytes serverVerification = 3; - */ - public Builder clearServerVerification() { - bitField0_ = (bitField0_ & ~0x00000004); - serverVerification_ = getDefaultInstance().getServerVerification(); - - return this; - } - - // @@protoc_insertion_point(builder_scope:AuthServerVerificationMessage) - } - - static { - defaultInstance = new AuthServerVerificationMessage(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:AuthServerVerificationMessage) - } - - public interface InitMessageOrBuilder - extends com.google.protobuf.MessageLiteOrBuilder { - - // optional bytes avatarHash = 1; - /** - * optional bytes avatarHash = 1; - * - * 
-     * Ignored for guest login.
-     *
- */ - boolean hasAvatarHash(); - /** - * optional bytes avatarHash = 1; - * - * 
-     * Ignored for guest login.
-     *
- */ - com.google.protobuf.ByteString getAvatarHash(); - } - /** - * Protobuf type {@code InitMessage} - */ - public static final class InitMessage extends - com.google.protobuf.GeneratedMessageLite - implements InitMessageOrBuilder { - // Use InitMessage.newBuilder() to construct. - private InitMessage(com.google.protobuf.GeneratedMessageLite.Builder builder) { - super(builder); - - } - private InitMessage(boolean noInit) {} - - private static final InitMessage defaultInstance; - public static InitMessage getDefaultInstance() { - return defaultInstance; - } - - public InitMessage getDefaultInstanceForType() { - return defaultInstance; - } - - private InitMessage( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - avatarHash_ = input.readBytes(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - makeExtensionsImmutable(); - } - } - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public InitMessage parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new InitMessage(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // optional bytes avatarHash = 1; - public static final int AVATARHASH_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString avatarHash_; - /** - * optional bytes avatarHash = 1; - * - * 
-     * Ignored for guest login.
-     *
- */ - public boolean hasAvatarHash() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional bytes avatarHash = 1; - * - * 
-     * Ignored for guest login.
-     *
- */ - public com.google.protobuf.ByteString getAvatarHash() { - return avatarHash_; - } - - private void initFields() { - avatarHash_ = com.google.protobuf.ByteString.EMPTY; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, avatarHash_); - } - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, avatarHash_); - } - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static de.pokerth.protocol.ProtoBuf.InitMessage parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static de.pokerth.protocol.ProtoBuf.InitMessage parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static de.pokerth.protocol.ProtoBuf.InitMessage parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static de.pokerth.protocol.ProtoBuf.InitMessage parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static de.pokerth.protocol.ProtoBuf.InitMessage parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static de.pokerth.protocol.ProtoBuf.InitMessage parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static de.pokerth.protocol.ProtoBuf.InitMessage parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static de.pokerth.protocol.ProtoBuf.InitMessage parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static de.pokerth.protocol.ProtoBuf.InitMessage parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static de.pokerth.protocol.ProtoBuf.InitMessage parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(de.pokerth.protocol.ProtoBuf.InitMessage prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - /** - * Protobuf type {@code InitMessage} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageLite.Builder< - de.pokerth.protocol.ProtoBuf.InitMessage, Builder> - implements de.pokerth.protocol.ProtoBuf.InitMessageOrBuilder { - // Construct using de.pokerth.protocol.ProtoBuf.InitMessage.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - avatarHash_ = com.google.protobuf.ByteString.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public de.pokerth.protocol.ProtoBuf.InitMessage getDefaultInstanceForType() { - return de.pokerth.protocol.ProtoBuf.InitMessage.getDefaultInstance(); - } - - public de.pokerth.protocol.ProtoBuf.InitMessage build() { - de.pokerth.protocol.ProtoBuf.InitMessage result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public de.pokerth.protocol.ProtoBuf.InitMessage buildPartial() { - de.pokerth.protocol.ProtoBuf.InitMessage result = new de.pokerth.protocol.ProtoBuf.InitMessage(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.avatarHash_ = avatarHash_; - result.bitField0_ = to_bitField0_; - return result; - } - - public Builder mergeFrom(de.pokerth.protocol.ProtoBuf.InitMessage other) { - if (other == de.pokerth.protocol.ProtoBuf.InitMessage.getDefaultInstance()) return this; - if (other.hasAvatarHash()) { - setAvatarHash(other.getAvatarHash()); - } - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - de.pokerth.protocol.ProtoBuf.InitMessage parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (de.pokerth.protocol.ProtoBuf.InitMessage) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional bytes avatarHash = 1; - private com.google.protobuf.ByteString avatarHash_ = com.google.protobuf.ByteString.EMPTY; - /** - * optional bytes avatarHash = 1; - * - * 
-       * Ignored for guest login.
-       *
- */ - public boolean hasAvatarHash() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional bytes avatarHash = 1; - * - * 
-       * Ignored for guest login.
-       *
- */ - public com.google.protobuf.ByteString getAvatarHash() { - return avatarHash_; - } - /** - * optional bytes avatarHash = 1; - * - * 
-       * Ignored for guest login.
-       *
- */ - public Builder setAvatarHash(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - avatarHash_ = value; - - return this; - } - /** - * optional bytes avatarHash = 1; - * - * 
-       * Ignored for guest login.
-       *
- */ - public Builder clearAvatarHash() { - bitField0_ = (bitField0_ & ~0x00000001); - avatarHash_ = getDefaultInstance().getAvatarHash(); - - return this; - } - - // @@protoc_insertion_point(builder_scope:InitMessage) - } - - static { - defaultInstance = new InitMessage(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:InitMessage) - } - - public interface InitAckMessageOrBuilder - extends com.google.protobuf.MessageLiteOrBuilder { - - // optional bytes yourAvatarHash = 1; - /** - * optional bytes yourAvatarHash = 1; - */ - boolean hasYourAvatarHash(); - /** - * optional bytes yourAvatarHash = 1; - */ - com.google.protobuf.ByteString getYourAvatarHash(); - - // optional uint32 rejoinGameId = 2; - /** - * optional uint32 rejoinGameId = 2; - */ - boolean hasRejoinGameId(); - /** - * optional uint32 rejoinGameId = 2; - */ - int getRejoinGameId(); - } - /** - * Protobuf type {@code InitAckMessage} - */ - public static final class InitAckMessage extends - com.google.protobuf.GeneratedMessageLite - implements InitAckMessageOrBuilder { - // Use InitAckMessage.newBuilder() to construct. - private InitAckMessage(com.google.protobuf.GeneratedMessageLite.Builder builder) { - super(builder); - - } - private InitAckMessage(boolean noInit) {} - - private static final InitAckMessage defaultInstance; - public static InitAckMessage getDefaultInstance() { - return defaultInstance; - } - - public InitAckMessage getDefaultInstanceForType() { - return defaultInstance; - } - - private InitAckMessage( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - yourAvatarHash_ = input.readBytes(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - rejoinGameId_ = input.readUInt32(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - makeExtensionsImmutable(); - } - } - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public InitAckMessage parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new InitAckMessage(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // optional bytes yourAvatarHash = 1; - public static final int YOURAVATARHASH_FIELD_NUMBER = 1; - private com.google.protobuf.ByteString yourAvatarHash_; - /** - * optional bytes yourAvatarHash = 1; - */ - public boolean hasYourAvatarHash() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional bytes yourAvatarHash = 1; - */ - public com.google.protobuf.ByteString getYourAvatarHash() { - return yourAvatarHash_; - } - - // optional uint32 rejoinGameId = 2; - public static final int REJOINGAMEID_FIELD_NUMBER = 2; - private int rejoinGameId_; - /** - * optional uint32 rejoinGameId = 2; - */ - public boolean hasRejoinGameId() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional uint32 rejoinGameId = 2; - */ - public int getRejoinGameId() { - return rejoinGameId_; - } - - private void initFields() { - yourAvatarHash_ = com.google.protobuf.ByteString.EMPTY; - rejoinGameId_ = 0; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, yourAvatarHash_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeUInt32(2, rejoinGameId_); - } - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, yourAvatarHash_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, rejoinGameId_); - } - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static de.pokerth.protocol.ProtoBuf.InitAckMessage parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static de.pokerth.protocol.ProtoBuf.InitAckMessage parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static de.pokerth.protocol.ProtoBuf.InitAckMessage parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static de.pokerth.protocol.ProtoBuf.InitAckMessage parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static de.pokerth.protocol.ProtoBuf.InitAckMessage parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static de.pokerth.protocol.ProtoBuf.InitAckMessage parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static de.pokerth.protocol.ProtoBuf.InitAckMessage parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static de.pokerth.protocol.ProtoBuf.InitAckMessage parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static de.pokerth.protocol.ProtoBuf.InitAckMessage parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static de.pokerth.protocol.ProtoBuf.InitAckMessage parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(de.pokerth.protocol.ProtoBuf.InitAckMessage prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - /** - * Protobuf type {@code InitAckMessage} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageLite.Builder< - de.pokerth.protocol.ProtoBuf.InitAckMessage, Builder> - implements de.pokerth.protocol.ProtoBuf.InitAckMessageOrBuilder { - // Construct using de.pokerth.protocol.ProtoBuf.InitAckMessage.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - yourAvatarHash_ = com.google.protobuf.ByteString.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); - rejoinGameId_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public de.pokerth.protocol.ProtoBuf.InitAckMessage getDefaultInstanceForType() { - return de.pokerth.protocol.ProtoBuf.InitAckMessage.getDefaultInstance(); - } - - public de.pokerth.protocol.ProtoBuf.InitAckMessage build() { - de.pokerth.protocol.ProtoBuf.InitAckMessage result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public de.pokerth.protocol.ProtoBuf.InitAckMessage buildPartial() { - de.pokerth.protocol.ProtoBuf.InitAckMessage result = new de.pokerth.protocol.ProtoBuf.InitAckMessage(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.yourAvatarHash_ = yourAvatarHash_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.rejoinGameId_ = rejoinGameId_; - result.bitField0_ = to_bitField0_; - return result; - } - - public Builder mergeFrom(de.pokerth.protocol.ProtoBuf.InitAckMessage other) { - if (other == de.pokerth.protocol.ProtoBuf.InitAckMessage.getDefaultInstance()) return this; - if (other.hasYourAvatarHash()) { - setYourAvatarHash(other.getYourAvatarHash()); - } - if (other.hasRejoinGameId()) { - setRejoinGameId(other.getRejoinGameId()); - } - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - de.pokerth.protocol.ProtoBuf.InitAckMessage parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (de.pokerth.protocol.ProtoBuf.InitAckMessage) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional bytes yourAvatarHash = 1; - private com.google.protobuf.ByteString yourAvatarHash_ = com.google.protobuf.ByteString.EMPTY; - /** - * optional bytes yourAvatarHash = 1; - */ - public boolean hasYourAvatarHash() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional bytes yourAvatarHash = 1; + * optional bytes yourAvatarHash = 3; */ public com.google.protobuf.ByteString getYourAvatarHash() { return yourAvatarHash_; } /** - * optional bytes yourAvatarHash = 1; + * optional bytes yourAvatarHash = 3; */ public Builder setYourAvatarHash(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000004; yourAvatarHash_ = value; return this; } /** - * optional bytes yourAvatarHash = 1; + * optional bytes yourAvatarHash = 3; */ public Builder clearYourAvatarHash() { - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000004); yourAvatarHash_ = getDefaultInstance().getYourAvatarHash(); return this; } - // optional uint32 rejoinGameId = 2; + // optional uint32 rejoinGameId = 4; private int rejoinGameId_ ; /** - * optional uint32 rejoinGameId = 2; + * optional uint32 rejoinGameId = 4; */ public boolean hasRejoinGameId() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional uint32 rejoinGameId = 2; + * optional uint32 rejoinGameId = 4; */ public int getRejoinGameId() { return rejoinGameId_; } /** - * optional uint32 rejoinGameId = 2; + * optional uint32 rejoinGameId = 4; */ public Builder setRejoinGameId(int value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000008; rejoinGameId_ = value; return this; } /** - * optional uint32 rejoinGameId = 2; + * optional uint32 rejoinGameId = 4; */ public Builder clearRejoinGameId() { - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000008); rejoinGameId_ = 0; return this; } - // @@protoc_insertion_point(builder_scope:InitAckMessage) + // @@protoc_insertion_point(builder_scope:InitDoneMessage) } static { - defaultInstance = new InitAckMessage(true); + defaultInstance = new InitDoneMessage(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:InitAckMessage) + // @@protoc_insertion_point(class_scope:InitDoneMessage) } public interface AvatarRequestMessageOrBuilder @@ -18502,38 +18258,48 @@ public final class ProtoBuf { public interface JoinGameMessageOrBuilder extends com.google.protobuf.MessageLiteOrBuilder { - // optional string password = 1; + // required uint32 gameId = 1; /** - * optional string password = 1; + * required uint32 gameId = 1; + */ + boolean hasGameId(); + /** + * required uint32 gameId = 1; + */ + int getGameId(); + + // optional string password = 2; + /** + * optional string password = 2; */ boolean hasPassword(); /** - * optional string password = 1; + * optional string password = 2; */ java.lang.String getPassword(); /** - * optional string password = 1; + * optional string password = 2; */ com.google.protobuf.ByteString getPasswordBytes(); - // optional bool autoLeave = 2 [default = false]; + // optional bool autoLeave = 3 [default = false]; /** - * optional bool autoLeave = 2 [default = false]; + * optional bool autoLeave = 3 [default = false]; */ boolean hasAutoLeave(); /** - * optional bool autoLeave = 2 [default = false]; + * optional bool autoLeave = 3 [default = false]; */ boolean getAutoLeave(); - // optional bool spectateOnly = 3 [default = false]; + // optional bool spectateOnly = 4 [default = false]; /** - * optional bool spectateOnly = 3 [default = false]; + * optional bool spectateOnly = 4 [default = false]; */ boolean hasSpectateOnly(); /** - * optional bool spectateOnly = 3 [default = false]; + * optional bool spectateOnly = 4 [default = false]; */ boolean getSpectateOnly(); } @@ -18580,18 +18346,23 @@ public final class ProtoBuf { } break; } - case 10: { + case 8: { bitField0_ |= 0x00000001; - password_ = input.readBytes(); + gameId_ = input.readUInt32(); break; } - case 16: { + case 18: { bitField0_ |= 0x00000002; - autoLeave_ = input.readBool(); + password_ = input.readBytes(); break; } case 24: { bitField0_ |= 0x00000004; + autoLeave_ = input.readBool(); + break; + } + case 32: { + bitField0_ |= 0x00000008; spectateOnly_ = input.readBool(); break; } @@ -18622,17 +18393,33 @@ public final class ProtoBuf { } private int bitField0_; - // optional string password = 1; - public static final int PASSWORD_FIELD_NUMBER = 1; - private java.lang.Object password_; + // required uint32 gameId = 1; + public static final int GAMEID_FIELD_NUMBER = 1; + private int gameId_; /** - * optional string password = 1; + * required uint32 gameId = 1; */ - public boolean hasPassword() { + public boolean hasGameId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string password = 1; + * required uint32 gameId = 1; + */ + public int getGameId() { + return gameId_; + } + + // optional string password = 2; + public static final int PASSWORD_FIELD_NUMBER = 2; + private java.lang.Object password_; + /** + * optional string password = 2; + */ + public boolean hasPassword() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string password = 2; */ public java.lang.String getPassword() { java.lang.Object ref = password_; @@ -18649,7 +18436,7 @@ public final class ProtoBuf { } } /** - * optional string password = 1; + * optional string password = 2; */ public com.google.protobuf.ByteString getPasswordBytes() { @@ -18665,39 +18452,40 @@ public final class ProtoBuf { } } - // optional bool autoLeave = 2 [default = false]; - public static final int AUTOLEAVE_FIELD_NUMBER = 2; + // optional bool autoLeave = 3 [default = false]; + public static final int AUTOLEAVE_FIELD_NUMBER = 3; private boolean autoLeave_; /** - * optional bool autoLeave = 2 [default = false]; + * optional bool autoLeave = 3 [default = false]; */ public boolean hasAutoLeave() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional bool autoLeave = 2 [default = false]; + * optional bool autoLeave = 3 [default = false]; */ public boolean getAutoLeave() { return autoLeave_; } - // optional bool spectateOnly = 3 [default = false]; - public static final int SPECTATEONLY_FIELD_NUMBER = 3; + // optional bool spectateOnly = 4 [default = false]; + public static final int SPECTATEONLY_FIELD_NUMBER = 4; private boolean spectateOnly_; /** - * optional bool spectateOnly = 3 [default = false]; + * optional bool spectateOnly = 4 [default = false]; */ public boolean hasSpectateOnly() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional bool spectateOnly = 3 [default = false]; + * optional bool spectateOnly = 4 [default = false]; */ public boolean getSpectateOnly() { return spectateOnly_; } private void initFields() { + gameId_ = 0; password_ = ""; autoLeave_ = false; spectateOnly_ = false; @@ -18707,6 +18495,10 @@ public final class ProtoBuf { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; + if (!hasGameId()) { + memoizedIsInitialized = 0; + return false; + } memoizedIsInitialized = 1; return true; } @@ -18715,13 +18507,16 @@ public final class ProtoBuf { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getPasswordBytes()); + output.writeUInt32(1, gameId_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBool(2, autoLeave_); + output.writeBytes(2, getPasswordBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBool(3, spectateOnly_); + output.writeBool(3, autoLeave_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeBool(4, spectateOnly_); } } @@ -18733,15 +18528,19 @@ public final class ProtoBuf { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getPasswordBytes()); + .computeUInt32Size(1, gameId_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(2, autoLeave_); + .computeBytesSize(2, getPasswordBytes()); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, spectateOnly_); + .computeBoolSize(3, autoLeave_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(4, spectateOnly_); } memoizedSerializedSize = size; return size; @@ -18834,12 +18633,14 @@ public final class ProtoBuf { public Builder clear() { super.clear(); - password_ = ""; + gameId_ = 0; bitField0_ = (bitField0_ & ~0x00000001); - autoLeave_ = false; + password_ = ""; bitField0_ = (bitField0_ & ~0x00000002); - spectateOnly_ = false; + autoLeave_ = false; bitField0_ = (bitField0_ & ~0x00000004); + spectateOnly_ = false; + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -18866,14 +18667,18 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.password_ = password_; + result.gameId_ = gameId_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.autoLeave_ = autoLeave_; + result.password_ = password_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } + result.autoLeave_ = autoLeave_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } result.spectateOnly_ = spectateOnly_; result.bitField0_ = to_bitField0_; return result; @@ -18881,8 +18686,11 @@ public final class ProtoBuf { public Builder mergeFrom(de.pokerth.protocol.ProtoBuf.JoinGameMessage other) { if (other == de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance()) return this; + if (other.hasGameId()) { + setGameId(other.getGameId()); + } if (other.hasPassword()) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; password_ = other.password_; } @@ -18896,6 +18704,10 @@ public final class ProtoBuf { } public final boolean isInitialized() { + if (!hasGameId()) { + + return false; + } return true; } @@ -18918,16 +18730,49 @@ public final class ProtoBuf { } private int bitField0_; - // optional string password = 1; - private java.lang.Object password_ = ""; + // required uint32 gameId = 1; + private int gameId_ ; /** - * optional string password = 1; + * required uint32 gameId = 1; */ - public boolean hasPassword() { + public boolean hasGameId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string password = 1; + * required uint32 gameId = 1; + */ + public int getGameId() { + return gameId_; + } + /** + * required uint32 gameId = 1; + */ + public Builder setGameId(int value) { + bitField0_ |= 0x00000001; + gameId_ = value; + + return this; + } + /** + * required uint32 gameId = 1; + */ + public Builder clearGameId() { + bitField0_ = (bitField0_ & ~0x00000001); + gameId_ = 0; + + return this; + } + + // optional string password = 2; + private java.lang.Object password_ = ""; + /** + * optional string password = 2; + */ + public boolean hasPassword() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string password = 2; */ public java.lang.String getPassword() { java.lang.Object ref = password_; @@ -18941,7 +18786,7 @@ public final class ProtoBuf { } } /** - * optional string password = 1; + * optional string password = 2; */ public com.google.protobuf.ByteString getPasswordBytes() { @@ -18957,102 +18802,102 @@ public final class ProtoBuf { } } /** - * optional string password = 1; + * optional string password = 2; */ public Builder setPassword( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; password_ = value; return this; } /** - * optional string password = 1; + * optional string password = 2; */ public Builder clearPassword() { - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); password_ = getDefaultInstance().getPassword(); return this; } /** - * optional string password = 1; + * optional string password = 2; */ public Builder setPasswordBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; password_ = value; return this; } - // optional bool autoLeave = 2 [default = false]; + // optional bool autoLeave = 3 [default = false]; private boolean autoLeave_ ; /** - * optional bool autoLeave = 2 [default = false]; + * optional bool autoLeave = 3 [default = false]; */ public boolean hasAutoLeave() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional bool autoLeave = 2 [default = false]; + * optional bool autoLeave = 3 [default = false]; */ public boolean getAutoLeave() { return autoLeave_; } /** - * optional bool autoLeave = 2 [default = false]; + * optional bool autoLeave = 3 [default = false]; */ public Builder setAutoLeave(boolean value) { - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; autoLeave_ = value; return this; } /** - * optional bool autoLeave = 2 [default = false]; + * optional bool autoLeave = 3 [default = false]; */ public Builder clearAutoLeave() { - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); autoLeave_ = false; return this; } - // optional bool spectateOnly = 3 [default = false]; + // optional bool spectateOnly = 4 [default = false]; private boolean spectateOnly_ ; /** - * optional bool spectateOnly = 3 [default = false]; + * optional bool spectateOnly = 4 [default = false]; */ public boolean hasSpectateOnly() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional bool spectateOnly = 3 [default = false]; + * optional bool spectateOnly = 4 [default = false]; */ public boolean getSpectateOnly() { return spectateOnly_; } /** - * optional bool spectateOnly = 3 [default = false]; + * optional bool spectateOnly = 4 [default = false]; */ public Builder setSpectateOnly(boolean value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; spectateOnly_ = value; return this; } /** - * optional bool spectateOnly = 3 [default = false]; + * optional bool spectateOnly = 4 [default = false]; */ public Builder clearSpectateOnly() { - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000008); spectateOnly_ = false; return this; @@ -19072,13 +18917,23 @@ public final class ProtoBuf { public interface RejoinGameMessageOrBuilder extends com.google.protobuf.MessageLiteOrBuilder { - // optional bool autoLeave = 1 [default = false]; + // required uint32 gameId = 1; /** - * optional bool autoLeave = 1 [default = false]; + * required uint32 gameId = 1; + */ + boolean hasGameId(); + /** + * required uint32 gameId = 1; + */ + int getGameId(); + + // optional bool autoLeave = 2 [default = false]; + /** + * optional bool autoLeave = 2 [default = false]; */ boolean hasAutoLeave(); /** - * optional bool autoLeave = 1 [default = false]; + * optional bool autoLeave = 2 [default = false]; */ boolean getAutoLeave(); } @@ -19127,6 +18982,11 @@ public final class ProtoBuf { } case 8: { bitField0_ |= 0x00000001; + gameId_ = input.readUInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; autoLeave_ = input.readBool(); break; } @@ -19157,23 +19017,40 @@ public final class ProtoBuf { } private int bitField0_; - // optional bool autoLeave = 1 [default = false]; - public static final int AUTOLEAVE_FIELD_NUMBER = 1; - private boolean autoLeave_; + // required uint32 gameId = 1; + public static final int GAMEID_FIELD_NUMBER = 1; + private int gameId_; /** - * optional bool autoLeave = 1 [default = false]; + * required uint32 gameId = 1; */ - public boolean hasAutoLeave() { + public boolean hasGameId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional bool autoLeave = 1 [default = false]; + * required uint32 gameId = 1; + */ + public int getGameId() { + return gameId_; + } + + // optional bool autoLeave = 2 [default = false]; + public static final int AUTOLEAVE_FIELD_NUMBER = 2; + private boolean autoLeave_; + /** + * optional bool autoLeave = 2 [default = false]; + */ + public boolean hasAutoLeave() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional bool autoLeave = 2 [default = false]; */ public boolean getAutoLeave() { return autoLeave_; } private void initFields() { + gameId_ = 0; autoLeave_ = false; } private byte memoizedIsInitialized = -1; @@ -19181,6 +19058,10 @@ public final class ProtoBuf { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; + if (!hasGameId()) { + memoizedIsInitialized = 0; + return false; + } memoizedIsInitialized = 1; return true; } @@ -19189,7 +19070,10 @@ public final class ProtoBuf { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBool(1, autoLeave_); + output.writeUInt32(1, gameId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeBool(2, autoLeave_); } } @@ -19201,7 +19085,11 @@ public final class ProtoBuf { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1, autoLeave_); + .computeUInt32Size(1, gameId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(2, autoLeave_); } memoizedSerializedSize = size; return size; @@ -19294,8 +19182,10 @@ public final class ProtoBuf { public Builder clear() { super.clear(); - autoLeave_ = false; + gameId_ = 0; bitField0_ = (bitField0_ & ~0x00000001); + autoLeave_ = false; + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -19322,6 +19212,10 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } + result.gameId_ = gameId_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } result.autoLeave_ = autoLeave_; result.bitField0_ = to_bitField0_; return result; @@ -19329,6 +19223,9 @@ public final class ProtoBuf { public Builder mergeFrom(de.pokerth.protocol.ProtoBuf.RejoinGameMessage other) { if (other == de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance()) return this; + if (other.hasGameId()) { + setGameId(other.getGameId()); + } if (other.hasAutoLeave()) { setAutoLeave(other.getAutoLeave()); } @@ -19336,6 +19233,10 @@ public final class ProtoBuf { } public final boolean isInitialized() { + if (!hasGameId()) { + + return false; + } return true; } @@ -19358,34 +19259,67 @@ public final class ProtoBuf { } private int bitField0_; - // optional bool autoLeave = 1 [default = false]; - private boolean autoLeave_ ; + // required uint32 gameId = 1; + private int gameId_ ; /** - * optional bool autoLeave = 1 [default = false]; + * required uint32 gameId = 1; */ - public boolean hasAutoLeave() { + public boolean hasGameId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional bool autoLeave = 1 [default = false]; + * required uint32 gameId = 1; + */ + public int getGameId() { + return gameId_; + } + /** + * required uint32 gameId = 1; + */ + public Builder setGameId(int value) { + bitField0_ |= 0x00000001; + gameId_ = value; + + return this; + } + /** + * required uint32 gameId = 1; + */ + public Builder clearGameId() { + bitField0_ = (bitField0_ & ~0x00000001); + gameId_ = 0; + + return this; + } + + // optional bool autoLeave = 2 [default = false]; + private boolean autoLeave_ ; + /** + * optional bool autoLeave = 2 [default = false]; + */ + public boolean hasAutoLeave() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional bool autoLeave = 2 [default = false]; */ public boolean getAutoLeave() { return autoLeave_; } /** - * optional bool autoLeave = 1 [default = false]; + * optional bool autoLeave = 2 [default = false]; */ public Builder setAutoLeave(boolean value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; autoLeave_ = value; return this; } /** - * optional bool autoLeave = 1 [default = false]; + * optional bool autoLeave = 2 [default = false]; */ public Builder clearAutoLeave() { - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); autoLeave_ = false; return this; @@ -19405,33 +19339,43 @@ public final class ProtoBuf { public interface JoinGameAckMessageOrBuilder extends com.google.protobuf.MessageLiteOrBuilder { - // required bool areYouGameAdmin = 1; + // required uint32 gameId = 1; /** - * required bool areYouGameAdmin = 1; + * required uint32 gameId = 1; + */ + boolean hasGameId(); + /** + * required uint32 gameId = 1; + */ + int getGameId(); + + // required bool areYouGameAdmin = 2; + /** + * required bool areYouGameAdmin = 2; */ boolean hasAreYouGameAdmin(); /** - * required bool areYouGameAdmin = 1; + * required bool areYouGameAdmin = 2; */ boolean getAreYouGameAdmin(); - // required .NetGameInfo gameInfo = 2; + // required .NetGameInfo gameInfo = 3; /** - * required .NetGameInfo gameInfo = 2; + * required .NetGameInfo gameInfo = 3; */ boolean hasGameInfo(); /** - * required .NetGameInfo gameInfo = 2; + * required .NetGameInfo gameInfo = 3; */ de.pokerth.protocol.ProtoBuf.NetGameInfo getGameInfo(); - // optional bool spectateOnly = 3; + // optional bool spectateOnly = 4; /** - * optional bool spectateOnly = 3; + * optional bool spectateOnly = 4; */ boolean hasSpectateOnly(); /** - * optional bool spectateOnly = 3; + * optional bool spectateOnly = 4; */ boolean getSpectateOnly(); } @@ -19480,12 +19424,17 @@ public final class ProtoBuf { } case 8: { bitField0_ |= 0x00000001; + gameId_ = input.readUInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; areYouGameAdmin_ = input.readBool(); break; } - case 18: { + case 26: { de.pokerth.protocol.ProtoBuf.NetGameInfo.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = gameInfo_.toBuilder(); } gameInfo_ = input.readMessage(de.pokerth.protocol.ProtoBuf.NetGameInfo.PARSER, extensionRegistry); @@ -19493,11 +19442,11 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameInfo_); gameInfo_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; break; } - case 24: { - bitField0_ |= 0x00000004; + case 32: { + bitField0_ |= 0x00000008; spectateOnly_ = input.readBool(); break; } @@ -19528,55 +19477,72 @@ public final class ProtoBuf { } private int bitField0_; - // required bool areYouGameAdmin = 1; - public static final int AREYOUGAMEADMIN_FIELD_NUMBER = 1; - private boolean areYouGameAdmin_; + // required uint32 gameId = 1; + public static final int GAMEID_FIELD_NUMBER = 1; + private int gameId_; /** - * required bool areYouGameAdmin = 1; + * required uint32 gameId = 1; */ - public boolean hasAreYouGameAdmin() { + public boolean hasGameId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required bool areYouGameAdmin = 1; + * required uint32 gameId = 1; + */ + public int getGameId() { + return gameId_; + } + + // required bool areYouGameAdmin = 2; + public static final int AREYOUGAMEADMIN_FIELD_NUMBER = 2; + private boolean areYouGameAdmin_; + /** + * required bool areYouGameAdmin = 2; + */ + public boolean hasAreYouGameAdmin() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required bool areYouGameAdmin = 2; */ public boolean getAreYouGameAdmin() { return areYouGameAdmin_; } - // required .NetGameInfo gameInfo = 2; - public static final int GAMEINFO_FIELD_NUMBER = 2; + // required .NetGameInfo gameInfo = 3; + public static final int GAMEINFO_FIELD_NUMBER = 3; private de.pokerth.protocol.ProtoBuf.NetGameInfo gameInfo_; /** - * required .NetGameInfo gameInfo = 2; + * required .NetGameInfo gameInfo = 3; */ public boolean hasGameInfo() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required .NetGameInfo gameInfo = 2; + * required .NetGameInfo gameInfo = 3; */ public de.pokerth.protocol.ProtoBuf.NetGameInfo getGameInfo() { return gameInfo_; } - // optional bool spectateOnly = 3; - public static final int SPECTATEONLY_FIELD_NUMBER = 3; + // optional bool spectateOnly = 4; + public static final int SPECTATEONLY_FIELD_NUMBER = 4; private boolean spectateOnly_; /** - * optional bool spectateOnly = 3; + * optional bool spectateOnly = 4; */ public boolean hasSpectateOnly() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional bool spectateOnly = 3; + * optional bool spectateOnly = 4; */ public boolean getSpectateOnly() { return spectateOnly_; } private void initFields() { + gameId_ = 0; areYouGameAdmin_ = false; gameInfo_ = de.pokerth.protocol.ProtoBuf.NetGameInfo.getDefaultInstance(); spectateOnly_ = false; @@ -19586,6 +19552,10 @@ public final class ProtoBuf { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; + if (!hasGameId()) { + memoizedIsInitialized = 0; + return false; + } if (!hasAreYouGameAdmin()) { memoizedIsInitialized = 0; return false; @@ -19606,13 +19576,16 @@ public final class ProtoBuf { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBool(1, areYouGameAdmin_); + output.writeUInt32(1, gameId_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, gameInfo_); + output.writeBool(2, areYouGameAdmin_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBool(3, spectateOnly_); + output.writeMessage(3, gameInfo_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeBool(4, spectateOnly_); } } @@ -19624,15 +19597,19 @@ public final class ProtoBuf { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(1, areYouGameAdmin_); + .computeUInt32Size(1, gameId_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, gameInfo_); + .computeBoolSize(2, areYouGameAdmin_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, spectateOnly_); + .computeMessageSize(3, gameInfo_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(4, spectateOnly_); } memoizedSerializedSize = size; return size; @@ -19725,12 +19702,14 @@ public final class ProtoBuf { public Builder clear() { super.clear(); - areYouGameAdmin_ = false; + gameId_ = 0; bitField0_ = (bitField0_ & ~0x00000001); - gameInfo_ = de.pokerth.protocol.ProtoBuf.NetGameInfo.getDefaultInstance(); + areYouGameAdmin_ = false; bitField0_ = (bitField0_ & ~0x00000002); - spectateOnly_ = false; + gameInfo_ = de.pokerth.protocol.ProtoBuf.NetGameInfo.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); + spectateOnly_ = false; + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -19757,14 +19736,18 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.areYouGameAdmin_ = areYouGameAdmin_; + result.gameId_ = gameId_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.gameInfo_ = gameInfo_; + result.areYouGameAdmin_ = areYouGameAdmin_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } + result.gameInfo_ = gameInfo_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } result.spectateOnly_ = spectateOnly_; result.bitField0_ = to_bitField0_; return result; @@ -19772,6 +19755,9 @@ public final class ProtoBuf { public Builder mergeFrom(de.pokerth.protocol.ProtoBuf.JoinGameAckMessage other) { if (other == de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance()) return this; + if (other.hasGameId()) { + setGameId(other.getGameId()); + } if (other.hasAreYouGameAdmin()) { setAreYouGameAdmin(other.getAreYouGameAdmin()); } @@ -19785,6 +19771,10 @@ public final class ProtoBuf { } public final boolean isInitialized() { + if (!hasGameId()) { + + return false; + } if (!hasAreYouGameAdmin()) { return false; @@ -19819,55 +19809,88 @@ public final class ProtoBuf { } private int bitField0_; - // required bool areYouGameAdmin = 1; - private boolean areYouGameAdmin_ ; + // required uint32 gameId = 1; + private int gameId_ ; /** - * required bool areYouGameAdmin = 1; + * required uint32 gameId = 1; */ - public boolean hasAreYouGameAdmin() { + public boolean hasGameId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required bool areYouGameAdmin = 1; + * required uint32 gameId = 1; + */ + public int getGameId() { + return gameId_; + } + /** + * required uint32 gameId = 1; + */ + public Builder setGameId(int value) { + bitField0_ |= 0x00000001; + gameId_ = value; + + return this; + } + /** + * required uint32 gameId = 1; + */ + public Builder clearGameId() { + bitField0_ = (bitField0_ & ~0x00000001); + gameId_ = 0; + + return this; + } + + // required bool areYouGameAdmin = 2; + private boolean areYouGameAdmin_ ; + /** + * required bool areYouGameAdmin = 2; + */ + public boolean hasAreYouGameAdmin() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required bool areYouGameAdmin = 2; */ public boolean getAreYouGameAdmin() { return areYouGameAdmin_; } /** - * required bool areYouGameAdmin = 1; + * required bool areYouGameAdmin = 2; */ public Builder setAreYouGameAdmin(boolean value) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; areYouGameAdmin_ = value; return this; } /** - * required bool areYouGameAdmin = 1; + * required bool areYouGameAdmin = 2; */ public Builder clearAreYouGameAdmin() { - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); areYouGameAdmin_ = false; return this; } - // required .NetGameInfo gameInfo = 2; + // required .NetGameInfo gameInfo = 3; private de.pokerth.protocol.ProtoBuf.NetGameInfo gameInfo_ = de.pokerth.protocol.ProtoBuf.NetGameInfo.getDefaultInstance(); /** - * required .NetGameInfo gameInfo = 2; + * required .NetGameInfo gameInfo = 3; */ public boolean hasGameInfo() { - return ((bitField0_ & 0x00000002) == 0x00000002); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required .NetGameInfo gameInfo = 2; + * required .NetGameInfo gameInfo = 3; */ public de.pokerth.protocol.ProtoBuf.NetGameInfo getGameInfo() { return gameInfo_; } /** - * required .NetGameInfo gameInfo = 2; + * required .NetGameInfo gameInfo = 3; */ public Builder setGameInfo(de.pokerth.protocol.ProtoBuf.NetGameInfo value) { if (value == null) { @@ -19875,24 +19898,24 @@ public final class ProtoBuf { } gameInfo_ = value; - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * required .NetGameInfo gameInfo = 2; + * required .NetGameInfo gameInfo = 3; */ public Builder setGameInfo( de.pokerth.protocol.ProtoBuf.NetGameInfo.Builder builderForValue) { gameInfo_ = builderForValue.build(); - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * required .NetGameInfo gameInfo = 2; + * required .NetGameInfo gameInfo = 3; */ public Builder mergeGameInfo(de.pokerth.protocol.ProtoBuf.NetGameInfo value) { - if (((bitField0_ & 0x00000002) == 0x00000002) && + if (((bitField0_ & 0x00000004) == 0x00000004) && gameInfo_ != de.pokerth.protocol.ProtoBuf.NetGameInfo.getDefaultInstance()) { gameInfo_ = de.pokerth.protocol.ProtoBuf.NetGameInfo.newBuilder(gameInfo_).mergeFrom(value).buildPartial(); @@ -19900,47 +19923,47 @@ public final class ProtoBuf { gameInfo_ = value; } - bitField0_ |= 0x00000002; + bitField0_ |= 0x00000004; return this; } /** - * required .NetGameInfo gameInfo = 2; + * required .NetGameInfo gameInfo = 3; */ public Builder clearGameInfo() { gameInfo_ = de.pokerth.protocol.ProtoBuf.NetGameInfo.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000002); + bitField0_ = (bitField0_ & ~0x00000004); return this; } - // optional bool spectateOnly = 3; + // optional bool spectateOnly = 4; private boolean spectateOnly_ ; /** - * optional bool spectateOnly = 3; + * optional bool spectateOnly = 4; */ public boolean hasSpectateOnly() { - return ((bitField0_ & 0x00000004) == 0x00000004); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional bool spectateOnly = 3; + * optional bool spectateOnly = 4; */ public boolean getSpectateOnly() { return spectateOnly_; } /** - * optional bool spectateOnly = 3; + * optional bool spectateOnly = 4; */ public Builder setSpectateOnly(boolean value) { - bitField0_ |= 0x00000004; + bitField0_ |= 0x00000008; spectateOnly_ = value; return this; } /** - * optional bool spectateOnly = 3; + * optional bool spectateOnly = 4; */ public Builder clearSpectateOnly() { - bitField0_ = (bitField0_ & ~0x00000004); + bitField0_ = (bitField0_ & ~0x00000008); spectateOnly_ = false; return this; @@ -19960,13 +19983,23 @@ public final class ProtoBuf { public interface JoinGameFailedMessageOrBuilder extends com.google.protobuf.MessageLiteOrBuilder { - // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + // required uint32 gameId = 1; /** - * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + * required uint32 gameId = 1; + */ + boolean hasGameId(); + /** + * required uint32 gameId = 1; + */ + int getGameId(); + + // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; + /** + * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; */ boolean hasJoinGameFailureReason(); /** - * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; */ de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason getJoinGameFailureReason(); } @@ -20014,10 +20047,15 @@ public final class ProtoBuf { break; } case 8: { + bitField0_ |= 0x00000001; + gameId_ = input.readUInt32(); + break; + } + case 16: { int rawValue = input.readEnum(); de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason value = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason.valueOf(rawValue); if (value != null) { - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; joinGameFailureReason_ = value; } break; @@ -20066,25 +20104,29 @@ public final class ProtoBuf { */ gameIsRunning(2, 3), /** - * invalidPassword = 4; + * notAllowedAsGuest = 4; */ - invalidPassword(3, 4), + notAllowedAsGuest(3, 4), /** - * notInvited = 5; + * invalidPassword = 5; */ - notInvited(4, 5), + invalidPassword(4, 5), /** - * ipAddressBlocked = 6; + * notInvited = 6; */ - ipAddressBlocked(5, 6), + notInvited(5, 6), /** - * rejoinFailed = 7; + * ipAddressBlocked = 7; */ - rejoinFailed(6, 7), + ipAddressBlocked(6, 7), /** - * noSpectatorsAllowed = 8; + * rejoinFailed = 8; */ - noSpectatorsAllowed(7, 8), + rejoinFailed(7, 8), + /** + * noSpectatorsAllowed = 9; + */ + noSpectatorsAllowed(8, 9), ; /** @@ -20100,25 +20142,29 @@ public final class ProtoBuf { */ public static final int gameIsRunning_VALUE = 3; /** - * invalidPassword = 4; + * notAllowedAsGuest = 4; */ - public static final int invalidPassword_VALUE = 4; + public static final int notAllowedAsGuest_VALUE = 4; /** - * notInvited = 5; + * invalidPassword = 5; */ - public static final int notInvited_VALUE = 5; + public static final int invalidPassword_VALUE = 5; /** - * ipAddressBlocked = 6; + * notInvited = 6; */ - public static final int ipAddressBlocked_VALUE = 6; + public static final int notInvited_VALUE = 6; /** - * rejoinFailed = 7; + * ipAddressBlocked = 7; */ - public static final int rejoinFailed_VALUE = 7; + public static final int ipAddressBlocked_VALUE = 7; /** - * noSpectatorsAllowed = 8; + * rejoinFailed = 8; */ - public static final int noSpectatorsAllowed_VALUE = 8; + public static final int rejoinFailed_VALUE = 8; + /** + * noSpectatorsAllowed = 9; + */ + public static final int noSpectatorsAllowed_VALUE = 9; public final int getNumber() { return value; } @@ -20128,11 +20174,12 @@ public final class ProtoBuf { case 1: return invalidGame; case 2: return gameIsFull; case 3: return gameIsRunning; - case 4: return invalidPassword; - case 5: return notInvited; - case 6: return ipAddressBlocked; - case 7: return rejoinFailed; - case 8: return noSpectatorsAllowed; + case 4: return notAllowedAsGuest; + case 5: return invalidPassword; + case 6: return notInvited; + case 7: return ipAddressBlocked; + case 8: return rejoinFailed; + case 9: return noSpectatorsAllowed; default: return null; } } @@ -20159,23 +20206,40 @@ public final class ProtoBuf { } private int bitField0_; - // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; - public static final int JOINGAMEFAILUREREASON_FIELD_NUMBER = 1; - private de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason_; + // required uint32 gameId = 1; + public static final int GAMEID_FIELD_NUMBER = 1; + private int gameId_; /** - * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + * required uint32 gameId = 1; */ - public boolean hasJoinGameFailureReason() { + public boolean hasGameId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + * required uint32 gameId = 1; + */ + public int getGameId() { + return gameId_; + } + + // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; + public static final int JOINGAMEFAILUREREASON_FIELD_NUMBER = 2; + private de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason_; + /** + * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; + */ + public boolean hasJoinGameFailureReason() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; */ public de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason getJoinGameFailureReason() { return joinGameFailureReason_; } private void initFields() { + gameId_ = 0; joinGameFailureReason_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason.invalidGame; } private byte memoizedIsInitialized = -1; @@ -20183,6 +20247,10 @@ public final class ProtoBuf { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; + if (!hasGameId()) { + memoizedIsInitialized = 0; + return false; + } if (!hasJoinGameFailureReason()) { memoizedIsInitialized = 0; return false; @@ -20195,7 +20263,10 @@ public final class ProtoBuf { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeEnum(1, joinGameFailureReason_.getNumber()); + output.writeUInt32(1, gameId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeEnum(2, joinGameFailureReason_.getNumber()); } } @@ -20207,7 +20278,11 @@ public final class ProtoBuf { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeEnumSize(1, joinGameFailureReason_.getNumber()); + .computeUInt32Size(1, gameId_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(2, joinGameFailureReason_.getNumber()); } memoizedSerializedSize = size; return size; @@ -20300,8 +20375,10 @@ public final class ProtoBuf { public Builder clear() { super.clear(); - joinGameFailureReason_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason.invalidGame; + gameId_ = 0; bitField0_ = (bitField0_ & ~0x00000001); + joinGameFailureReason_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason.invalidGame; + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -20328,6 +20405,10 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } + result.gameId_ = gameId_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } result.joinGameFailureReason_ = joinGameFailureReason_; result.bitField0_ = to_bitField0_; return result; @@ -20335,6 +20416,9 @@ public final class ProtoBuf { public Builder mergeFrom(de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage other) { if (other == de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance()) return this; + if (other.hasGameId()) { + setGameId(other.getGameId()); + } if (other.hasJoinGameFailureReason()) { setJoinGameFailureReason(other.getJoinGameFailureReason()); } @@ -20342,6 +20426,10 @@ public final class ProtoBuf { } public final boolean isInitialized() { + if (!hasGameId()) { + + return false; + } if (!hasJoinGameFailureReason()) { return false; @@ -20368,37 +20456,70 @@ public final class ProtoBuf { } private int bitField0_; - // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; - private de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason.invalidGame; + // required uint32 gameId = 1; + private int gameId_ ; /** - * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + * required uint32 gameId = 1; */ - public boolean hasJoinGameFailureReason() { + public boolean hasGameId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + * required uint32 gameId = 1; + */ + public int getGameId() { + return gameId_; + } + /** + * required uint32 gameId = 1; + */ + public Builder setGameId(int value) { + bitField0_ |= 0x00000001; + gameId_ = value; + + return this; + } + /** + * required uint32 gameId = 1; + */ + public Builder clearGameId() { + bitField0_ = (bitField0_ & ~0x00000001); + gameId_ = 0; + + return this; + } + + // required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; + private de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason.invalidGame; + /** + * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; + */ + public boolean hasJoinGameFailureReason() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; */ public de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason getJoinGameFailureReason() { return joinGameFailureReason_; } /** - * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; */ public Builder setJoinGameFailureReason(de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000001; + bitField0_ |= 0x00000002; joinGameFailureReason_ = value; return this; } /** - * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 1; + * required .JoinGameFailedMessage.JoinGameFailureReason joinGameFailureReason = 2; */ public Builder clearJoinGameFailureReason() { - bitField0_ = (bitField0_ & ~0x00000001); + bitField0_ = (bitField0_ & ~0x00000002); joinGameFailureReason_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.JoinGameFailureReason.invalidGame; return this; @@ -48925,403 +49046,423 @@ public final class ProtoBuf { */ de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType getMessageType(); - // optional .InitMessage initMessage = 2; + // optional .InitDoneMessage initDoneMessage = 2; /** - * optional .InitMessage initMessage = 2; + * optional .InitDoneMessage initDoneMessage = 2; */ - boolean hasInitMessage(); + boolean hasInitDoneMessage(); /** - * optional .InitMessage initMessage = 2; + * optional .InitDoneMessage initDoneMessage = 2; */ - de.pokerth.protocol.ProtoBuf.InitMessage getInitMessage(); + de.pokerth.protocol.ProtoBuf.InitDoneMessage getInitDoneMessage(); - // optional .InitAckMessage initAckMessage = 3; + // optional .AvatarRequestMessage avatarRequestMessage = 3; /** - * optional .InitAckMessage initAckMessage = 3; - */ - boolean hasInitAckMessage(); - /** - * optional .InitAckMessage initAckMessage = 3; - */ - de.pokerth.protocol.ProtoBuf.InitAckMessage getInitAckMessage(); - - // optional .AvatarRequestMessage avatarRequestMessage = 4; - /** - * optional .AvatarRequestMessage avatarRequestMessage = 4; + * optional .AvatarRequestMessage avatarRequestMessage = 3; */ boolean hasAvatarRequestMessage(); /** - * optional .AvatarRequestMessage avatarRequestMessage = 4; + * optional .AvatarRequestMessage avatarRequestMessage = 3; */ de.pokerth.protocol.ProtoBuf.AvatarRequestMessage getAvatarRequestMessage(); - // optional .AvatarHeaderMessage avatarHeaderMessage = 5; + // optional .AvatarHeaderMessage avatarHeaderMessage = 4; /** - * optional .AvatarHeaderMessage avatarHeaderMessage = 5; + * optional .AvatarHeaderMessage avatarHeaderMessage = 4; */ boolean hasAvatarHeaderMessage(); /** - * optional .AvatarHeaderMessage avatarHeaderMessage = 5; + * optional .AvatarHeaderMessage avatarHeaderMessage = 4; */ de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage getAvatarHeaderMessage(); - // optional .AvatarDataMessage avatarDataMessage = 6; + // optional .AvatarDataMessage avatarDataMessage = 5; /** - * optional .AvatarDataMessage avatarDataMessage = 6; + * optional .AvatarDataMessage avatarDataMessage = 5; */ boolean hasAvatarDataMessage(); /** - * optional .AvatarDataMessage avatarDataMessage = 6; + * optional .AvatarDataMessage avatarDataMessage = 5; */ de.pokerth.protocol.ProtoBuf.AvatarDataMessage getAvatarDataMessage(); - // optional .AvatarEndMessage avatarEndMessage = 7; + // optional .AvatarEndMessage avatarEndMessage = 6; /** - * optional .AvatarEndMessage avatarEndMessage = 7; + * optional .AvatarEndMessage avatarEndMessage = 6; */ boolean hasAvatarEndMessage(); /** - * optional .AvatarEndMessage avatarEndMessage = 7; + * optional .AvatarEndMessage avatarEndMessage = 6; */ de.pokerth.protocol.ProtoBuf.AvatarEndMessage getAvatarEndMessage(); - // optional .UnknownAvatarMessage unknownAvatarMessage = 8; + // optional .UnknownAvatarMessage unknownAvatarMessage = 7; /** - * optional .UnknownAvatarMessage unknownAvatarMessage = 8; + * optional .UnknownAvatarMessage unknownAvatarMessage = 7; */ boolean hasUnknownAvatarMessage(); /** - * optional .UnknownAvatarMessage unknownAvatarMessage = 8; + * optional .UnknownAvatarMessage unknownAvatarMessage = 7; */ de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage getUnknownAvatarMessage(); - // optional .PlayerListMessage playerListMessage = 9; + // optional .PlayerListMessage playerListMessage = 8; /** - * optional .PlayerListMessage playerListMessage = 9; + * optional .PlayerListMessage playerListMessage = 8; */ boolean hasPlayerListMessage(); /** - * optional .PlayerListMessage playerListMessage = 9; + * optional .PlayerListMessage playerListMessage = 8; */ de.pokerth.protocol.ProtoBuf.PlayerListMessage getPlayerListMessage(); - // optional .GameListNewMessage gameListNewMessage = 10; + // optional .GameListNewMessage gameListNewMessage = 9; /** - * optional .GameListNewMessage gameListNewMessage = 10; + * optional .GameListNewMessage gameListNewMessage = 9; */ boolean hasGameListNewMessage(); /** - * optional .GameListNewMessage gameListNewMessage = 10; + * optional .GameListNewMessage gameListNewMessage = 9; */ de.pokerth.protocol.ProtoBuf.GameListNewMessage getGameListNewMessage(); - // optional .GameListUpdateMessage gameListUpdateMessage = 11; + // optional .GameListUpdateMessage gameListUpdateMessage = 10; /** - * optional .GameListUpdateMessage gameListUpdateMessage = 11; + * optional .GameListUpdateMessage gameListUpdateMessage = 10; */ boolean hasGameListUpdateMessage(); /** - * optional .GameListUpdateMessage gameListUpdateMessage = 11; + * optional .GameListUpdateMessage gameListUpdateMessage = 10; */ de.pokerth.protocol.ProtoBuf.GameListUpdateMessage getGameListUpdateMessage(); - // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; /** - * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; */ boolean hasGameListPlayerJoinedMessage(); /** - * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; */ de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage getGameListPlayerJoinedMessage(); - // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; /** - * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; */ boolean hasGameListPlayerLeftMessage(); /** - * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; */ de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage getGameListPlayerLeftMessage(); - // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; /** - * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; */ boolean hasGameListSpectatorJoinedMessage(); /** - * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; */ de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage getGameListSpectatorJoinedMessage(); - // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; /** - * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; */ boolean hasGameListSpectatorLeftMessage(); /** - * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; */ de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage getGameListSpectatorLeftMessage(); - // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; /** - * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; */ boolean hasGameListAdminChangedMessage(); /** - * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; */ de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage getGameListAdminChangedMessage(); - // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; /** - * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; */ boolean hasPlayerInfoRequestMessage(); /** - * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; */ de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage getPlayerInfoRequestMessage(); - // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; /** - * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; */ boolean hasPlayerInfoReplyMessage(); /** - * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; */ de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage getPlayerInfoReplyMessage(); - // optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + // optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; /** - * optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + * optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; */ boolean hasSubscriptionRequestMessage(); /** - * optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + * optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; */ de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage getSubscriptionRequestMessage(); - // optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + // optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; /** - * optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + * optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; */ boolean hasSubscriptionReplyMessage(); /** - * optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + * optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; */ de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage getSubscriptionReplyMessage(); - // optional .CreateGameMessage createGameMessage = 21; + // optional .CreateGameMessage createGameMessage = 20; /** - * optional .CreateGameMessage createGameMessage = 21; + * optional .CreateGameMessage createGameMessage = 20; */ boolean hasCreateGameMessage(); /** - * optional .CreateGameMessage createGameMessage = 21; + * optional .CreateGameMessage createGameMessage = 20; */ de.pokerth.protocol.ProtoBuf.CreateGameMessage getCreateGameMessage(); - // optional .CreateGameFailedMessage createGameFailedMessage = 22; + // optional .CreateGameFailedMessage createGameFailedMessage = 21; /** - * optional .CreateGameFailedMessage createGameFailedMessage = 22; + * optional .CreateGameFailedMessage createGameFailedMessage = 21; */ boolean hasCreateGameFailedMessage(); /** - * optional .CreateGameFailedMessage createGameFailedMessage = 22; + * optional .CreateGameFailedMessage createGameFailedMessage = 21; */ de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage getCreateGameFailedMessage(); - // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + // optional .JoinGameMessage joinGameMessage = 22; /** - * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + * optional .JoinGameMessage joinGameMessage = 22; */ - boolean hasInvitePlayerToGameMessage(); + boolean hasJoinGameMessage(); /** - * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + * optional .JoinGameMessage joinGameMessage = 22; */ - de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage getInvitePlayerToGameMessage(); + de.pokerth.protocol.ProtoBuf.JoinGameMessage getJoinGameMessage(); - // optional .InviteNotifyMessage inviteNotifyMessage = 24; + // optional .RejoinGameMessage rejoinGameMessage = 23; /** - * optional .InviteNotifyMessage inviteNotifyMessage = 24; + * optional .RejoinGameMessage rejoinGameMessage = 23; + */ + boolean hasRejoinGameMessage(); + /** + * optional .RejoinGameMessage rejoinGameMessage = 23; + */ + de.pokerth.protocol.ProtoBuf.RejoinGameMessage getRejoinGameMessage(); + + // optional .JoinGameAckMessage joinGameAckMessage = 24; + /** + * optional .JoinGameAckMessage joinGameAckMessage = 24; + */ + boolean hasJoinGameAckMessage(); + /** + * optional .JoinGameAckMessage joinGameAckMessage = 24; + */ + de.pokerth.protocol.ProtoBuf.JoinGameAckMessage getJoinGameAckMessage(); + + // optional .JoinGameFailedMessage joinGameFailedMessage = 25; + /** + * optional .JoinGameFailedMessage joinGameFailedMessage = 25; + */ + boolean hasJoinGameFailedMessage(); + /** + * optional .JoinGameFailedMessage joinGameFailedMessage = 25; + */ + de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage getJoinGameFailedMessage(); + + // optional .InviteNotifyMessage inviteNotifyMessage = 26; + /** + * optional .InviteNotifyMessage inviteNotifyMessage = 26; */ boolean hasInviteNotifyMessage(); /** - * optional .InviteNotifyMessage inviteNotifyMessage = 24; + * optional .InviteNotifyMessage inviteNotifyMessage = 26; */ de.pokerth.protocol.ProtoBuf.InviteNotifyMessage getInviteNotifyMessage(); - // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; /** - * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; */ boolean hasRejectGameInvitationMessage(); /** - * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; */ de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage getRejectGameInvitationMessage(); - // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; /** - * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; */ boolean hasRejectInvNotifyMessage(); /** - * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; */ de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage getRejectInvNotifyMessage(); - // optional .StatisticsMessage statisticsMessage = 27; + // optional .StatisticsMessage statisticsMessage = 29; /** - * optional .StatisticsMessage statisticsMessage = 27; + * optional .StatisticsMessage statisticsMessage = 29; */ boolean hasStatisticsMessage(); /** - * optional .StatisticsMessage statisticsMessage = 27; + * optional .StatisticsMessage statisticsMessage = 29; */ de.pokerth.protocol.ProtoBuf.StatisticsMessage getStatisticsMessage(); - // optional .ChatRequestMessage chatRequestMessage = 28; + // optional .ChatRequestMessage chatRequestMessage = 30; /** - * optional .ChatRequestMessage chatRequestMessage = 28; + * optional .ChatRequestMessage chatRequestMessage = 30; */ boolean hasChatRequestMessage(); /** - * optional .ChatRequestMessage chatRequestMessage = 28; + * optional .ChatRequestMessage chatRequestMessage = 30; */ de.pokerth.protocol.ProtoBuf.ChatRequestMessage getChatRequestMessage(); - // optional .ChatMessage chatMessage = 29; + // optional .ChatMessage chatMessage = 31; /** - * optional .ChatMessage chatMessage = 29; + * optional .ChatMessage chatMessage = 31; */ boolean hasChatMessage(); /** - * optional .ChatMessage chatMessage = 29; + * optional .ChatMessage chatMessage = 31; */ de.pokerth.protocol.ProtoBuf.ChatMessage getChatMessage(); - // optional .ChatRejectMessage chatRejectMessage = 30; + // optional .ChatRejectMessage chatRejectMessage = 32; /** - * optional .ChatRejectMessage chatRejectMessage = 30; + * optional .ChatRejectMessage chatRejectMessage = 32; */ boolean hasChatRejectMessage(); /** - * optional .ChatRejectMessage chatRejectMessage = 30; + * optional .ChatRejectMessage chatRejectMessage = 32; */ de.pokerth.protocol.ProtoBuf.ChatRejectMessage getChatRejectMessage(); - // optional .DialogMessage dialogMessage = 31; + // optional .DialogMessage dialogMessage = 33; /** - * optional .DialogMessage dialogMessage = 31; + * optional .DialogMessage dialogMessage = 33; */ boolean hasDialogMessage(); /** - * optional .DialogMessage dialogMessage = 31; + * optional .DialogMessage dialogMessage = 33; */ de.pokerth.protocol.ProtoBuf.DialogMessage getDialogMessage(); - // optional .TimeoutWarningMessage timeoutWarningMessage = 32; + // optional .TimeoutWarningMessage timeoutWarningMessage = 34; /** - * optional .TimeoutWarningMessage timeoutWarningMessage = 32; + * optional .TimeoutWarningMessage timeoutWarningMessage = 34; */ boolean hasTimeoutWarningMessage(); /** - * optional .TimeoutWarningMessage timeoutWarningMessage = 32; + * optional .TimeoutWarningMessage timeoutWarningMessage = 34; */ de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage getTimeoutWarningMessage(); - // optional .ResetTimeoutMessage resetTimeoutMessage = 33; + // optional .ResetTimeoutMessage resetTimeoutMessage = 35; /** - * optional .ResetTimeoutMessage resetTimeoutMessage = 33; + * optional .ResetTimeoutMessage resetTimeoutMessage = 35; */ boolean hasResetTimeoutMessage(); /** - * optional .ResetTimeoutMessage resetTimeoutMessage = 33; + * optional .ResetTimeoutMessage resetTimeoutMessage = 35; */ de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage getResetTimeoutMessage(); - // optional .ReportAvatarMessage reportAvatarMessage = 34; + // optional .ReportAvatarMessage reportAvatarMessage = 36; /** - * optional .ReportAvatarMessage reportAvatarMessage = 34; + * optional .ReportAvatarMessage reportAvatarMessage = 36; */ boolean hasReportAvatarMessage(); /** - * optional .ReportAvatarMessage reportAvatarMessage = 34; + * optional .ReportAvatarMessage reportAvatarMessage = 36; */ de.pokerth.protocol.ProtoBuf.ReportAvatarMessage getReportAvatarMessage(); - // optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + // optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; /** - * optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + * optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; */ boolean hasReportAvatarAckMessage(); /** - * optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + * optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; */ de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage getReportAvatarAckMessage(); - // optional .ReportGameMessage reportGameMessage = 36; + // optional .ReportGameMessage reportGameMessage = 38; /** - * optional .ReportGameMessage reportGameMessage = 36; + * optional .ReportGameMessage reportGameMessage = 38; */ boolean hasReportGameMessage(); /** - * optional .ReportGameMessage reportGameMessage = 36; + * optional .ReportGameMessage reportGameMessage = 38; */ de.pokerth.protocol.ProtoBuf.ReportGameMessage getReportGameMessage(); - // optional .ReportGameAckMessage reportGameAckMessage = 37; + // optional .ReportGameAckMessage reportGameAckMessage = 39; /** - * optional .ReportGameAckMessage reportGameAckMessage = 37; + * optional .ReportGameAckMessage reportGameAckMessage = 39; */ boolean hasReportGameAckMessage(); /** - * optional .ReportGameAckMessage reportGameAckMessage = 37; + * optional .ReportGameAckMessage reportGameAckMessage = 39; */ de.pokerth.protocol.ProtoBuf.ReportGameAckMessage getReportGameAckMessage(); - // optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + // optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; /** - * optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + * optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; */ boolean hasAdminRemoveGameMessage(); /** - * optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + * optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; */ de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage getAdminRemoveGameMessage(); - // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; /** - * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; */ boolean hasAdminRemoveGameAckMessage(); /** - * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; */ de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage getAdminRemoveGameAckMessage(); - // optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + // optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; /** - * optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + * optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; */ boolean hasAdminBanPlayerMessage(); /** - * optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + * optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; */ de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage getAdminBanPlayerMessage(); - // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; /** - * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; */ boolean hasAdminBanPlayerAckMessage(); /** - * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; */ de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage getAdminBanPlayerAckMessage(); @@ -49389,34 +49530,21 @@ public final class ProtoBuf { break; } case 18: { - de.pokerth.protocol.ProtoBuf.InitMessage.Builder subBuilder = null; + de.pokerth.protocol.ProtoBuf.InitDoneMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = initMessage_.toBuilder(); + subBuilder = initDoneMessage_.toBuilder(); } - initMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.InitMessage.PARSER, extensionRegistry); + initDoneMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.InitDoneMessage.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(initMessage_); - initMessage_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(initDoneMessage_); + initDoneMessage_ = subBuilder.buildPartial(); } bitField0_ |= 0x00000002; break; } case 26: { - de.pokerth.protocol.ProtoBuf.InitAckMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = initAckMessage_.toBuilder(); - } - initAckMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.InitAckMessage.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(initAckMessage_); - initAckMessage_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - case 34: { de.pokerth.protocol.ProtoBuf.AvatarRequestMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = avatarRequestMessage_.toBuilder(); } avatarRequestMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.AvatarRequestMessage.PARSER, extensionRegistry); @@ -49424,12 +49552,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(avatarRequestMessage_); avatarRequestMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; break; } - case 42: { + case 34: { de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = avatarHeaderMessage_.toBuilder(); } avatarHeaderMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage.PARSER, extensionRegistry); @@ -49437,12 +49565,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(avatarHeaderMessage_); avatarHeaderMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; break; } - case 50: { + case 42: { de.pokerth.protocol.ProtoBuf.AvatarDataMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = avatarDataMessage_.toBuilder(); } avatarDataMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.AvatarDataMessage.PARSER, extensionRegistry); @@ -49450,12 +49578,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(avatarDataMessage_); avatarDataMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; break; } - case 58: { + case 50: { de.pokerth.protocol.ProtoBuf.AvatarEndMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = avatarEndMessage_.toBuilder(); } avatarEndMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.AvatarEndMessage.PARSER, extensionRegistry); @@ -49463,12 +49591,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(avatarEndMessage_); avatarEndMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; break; } - case 66: { + case 58: { de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { subBuilder = unknownAvatarMessage_.toBuilder(); } unknownAvatarMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage.PARSER, extensionRegistry); @@ -49476,12 +49604,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(unknownAvatarMessage_); unknownAvatarMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; break; } - case 74: { + case 66: { de.pokerth.protocol.ProtoBuf.PlayerListMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = playerListMessage_.toBuilder(); } playerListMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.PlayerListMessage.PARSER, extensionRegistry); @@ -49489,12 +49617,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(playerListMessage_); playerListMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; break; } - case 82: { + case 74: { de.pokerth.protocol.ProtoBuf.GameListNewMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000200) == 0x00000200)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { subBuilder = gameListNewMessage_.toBuilder(); } gameListNewMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameListNewMessage.PARSER, extensionRegistry); @@ -49502,12 +49630,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameListNewMessage_); gameListNewMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; break; } - case 90: { + case 82: { de.pokerth.protocol.ProtoBuf.GameListUpdateMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000400) == 0x00000400)) { + if (((bitField0_ & 0x00000200) == 0x00000200)) { subBuilder = gameListUpdateMessage_.toBuilder(); } gameListUpdateMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameListUpdateMessage.PARSER, extensionRegistry); @@ -49515,12 +49643,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameListUpdateMessage_); gameListUpdateMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; break; } - case 98: { + case 90: { de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000800) == 0x00000800)) { + if (((bitField0_ & 0x00000400) == 0x00000400)) { subBuilder = gameListPlayerJoinedMessage_.toBuilder(); } gameListPlayerJoinedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage.PARSER, extensionRegistry); @@ -49528,12 +49656,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameListPlayerJoinedMessage_); gameListPlayerJoinedMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; break; } - case 106: { + case 98: { de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00001000) == 0x00001000)) { + if (((bitField0_ & 0x00000800) == 0x00000800)) { subBuilder = gameListPlayerLeftMessage_.toBuilder(); } gameListPlayerLeftMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage.PARSER, extensionRegistry); @@ -49541,12 +49669,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameListPlayerLeftMessage_); gameListPlayerLeftMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; break; } - case 114: { + case 106: { de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00002000) == 0x00002000)) { + if (((bitField0_ & 0x00001000) == 0x00001000)) { subBuilder = gameListSpectatorJoinedMessage_.toBuilder(); } gameListSpectatorJoinedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage.PARSER, extensionRegistry); @@ -49554,12 +49682,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameListSpectatorJoinedMessage_); gameListSpectatorJoinedMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00002000; + bitField0_ |= 0x00001000; break; } - case 122: { + case 114: { de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00004000) == 0x00004000)) { + if (((bitField0_ & 0x00002000) == 0x00002000)) { subBuilder = gameListSpectatorLeftMessage_.toBuilder(); } gameListSpectatorLeftMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage.PARSER, extensionRegistry); @@ -49567,12 +49695,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameListSpectatorLeftMessage_); gameListSpectatorLeftMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00004000; + bitField0_ |= 0x00002000; break; } - case 130: { + case 122: { de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00008000) == 0x00008000)) { + if (((bitField0_ & 0x00004000) == 0x00004000)) { subBuilder = gameListAdminChangedMessage_.toBuilder(); } gameListAdminChangedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage.PARSER, extensionRegistry); @@ -49580,12 +49708,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameListAdminChangedMessage_); gameListAdminChangedMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00008000; + bitField0_ |= 0x00004000; break; } - case 138: { + case 130: { de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00010000) == 0x00010000)) { + if (((bitField0_ & 0x00008000) == 0x00008000)) { subBuilder = playerInfoRequestMessage_.toBuilder(); } playerInfoRequestMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage.PARSER, extensionRegistry); @@ -49593,12 +49721,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(playerInfoRequestMessage_); playerInfoRequestMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00010000; + bitField0_ |= 0x00008000; break; } - case 146: { + case 138: { de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00020000) == 0x00020000)) { + if (((bitField0_ & 0x00010000) == 0x00010000)) { subBuilder = playerInfoReplyMessage_.toBuilder(); } playerInfoReplyMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage.PARSER, extensionRegistry); @@ -49606,12 +49734,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(playerInfoReplyMessage_); playerInfoReplyMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00020000; + bitField0_ |= 0x00010000; break; } - case 154: { + case 146: { de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00040000) == 0x00040000)) { + if (((bitField0_ & 0x00020000) == 0x00020000)) { subBuilder = subscriptionRequestMessage_.toBuilder(); } subscriptionRequestMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage.PARSER, extensionRegistry); @@ -49619,12 +49747,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(subscriptionRequestMessage_); subscriptionRequestMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00040000; + bitField0_ |= 0x00020000; break; } - case 162: { + case 154: { de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00080000) == 0x00080000)) { + if (((bitField0_ & 0x00040000) == 0x00040000)) { subBuilder = subscriptionReplyMessage_.toBuilder(); } subscriptionReplyMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage.PARSER, extensionRegistry); @@ -49632,12 +49760,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(subscriptionReplyMessage_); subscriptionReplyMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00080000; + bitField0_ |= 0x00040000; break; } - case 170: { + case 162: { de.pokerth.protocol.ProtoBuf.CreateGameMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00100000) == 0x00100000)) { + if (((bitField0_ & 0x00080000) == 0x00080000)) { subBuilder = createGameMessage_.toBuilder(); } createGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.CreateGameMessage.PARSER, extensionRegistry); @@ -49645,12 +49773,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(createGameMessage_); createGameMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00100000; + bitField0_ |= 0x00080000; break; } - case 178: { + case 170: { de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00200000) == 0x00200000)) { + if (((bitField0_ & 0x00100000) == 0x00100000)) { subBuilder = createGameFailedMessage_.toBuilder(); } createGameFailedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage.PARSER, extensionRegistry); @@ -49658,25 +49786,64 @@ public final class ProtoBuf { subBuilder.mergeFrom(createGameFailedMessage_); createGameFailedMessage_ = subBuilder.buildPartial(); } + bitField0_ |= 0x00100000; + break; + } + case 178: { + de.pokerth.protocol.ProtoBuf.JoinGameMessage.Builder subBuilder = null; + if (((bitField0_ & 0x00200000) == 0x00200000)) { + subBuilder = joinGameMessage_.toBuilder(); + } + joinGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.JoinGameMessage.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(joinGameMessage_); + joinGameMessage_ = subBuilder.buildPartial(); + } bitField0_ |= 0x00200000; break; } case 186: { - de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.Builder subBuilder = null; + de.pokerth.protocol.ProtoBuf.RejoinGameMessage.Builder subBuilder = null; if (((bitField0_ & 0x00400000) == 0x00400000)) { - subBuilder = invitePlayerToGameMessage_.toBuilder(); + subBuilder = rejoinGameMessage_.toBuilder(); } - invitePlayerToGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.PARSER, extensionRegistry); + rejoinGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.RejoinGameMessage.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom(invitePlayerToGameMessage_); - invitePlayerToGameMessage_ = subBuilder.buildPartial(); + subBuilder.mergeFrom(rejoinGameMessage_); + rejoinGameMessage_ = subBuilder.buildPartial(); } bitField0_ |= 0x00400000; break; } case 194: { - de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.Builder subBuilder = null; + de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.Builder subBuilder = null; if (((bitField0_ & 0x00800000) == 0x00800000)) { + subBuilder = joinGameAckMessage_.toBuilder(); + } + joinGameAckMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(joinGameAckMessage_); + joinGameAckMessage_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00800000; + break; + } + case 202: { + de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.Builder subBuilder = null; + if (((bitField0_ & 0x01000000) == 0x01000000)) { + subBuilder = joinGameFailedMessage_.toBuilder(); + } + joinGameFailedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(joinGameFailedMessage_); + joinGameFailedMessage_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x01000000; + break; + } + case 210: { + de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.Builder subBuilder = null; + if (((bitField0_ & 0x02000000) == 0x02000000)) { subBuilder = inviteNotifyMessage_.toBuilder(); } inviteNotifyMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.PARSER, extensionRegistry); @@ -49684,12 +49851,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(inviteNotifyMessage_); inviteNotifyMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00800000; + bitField0_ |= 0x02000000; break; } - case 202: { + case 218: { de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage.Builder subBuilder = null; - if (((bitField0_ & 0x01000000) == 0x01000000)) { + if (((bitField0_ & 0x04000000) == 0x04000000)) { subBuilder = rejectGameInvitationMessage_.toBuilder(); } rejectGameInvitationMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage.PARSER, extensionRegistry); @@ -49697,12 +49864,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(rejectGameInvitationMessage_); rejectGameInvitationMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x01000000; + bitField0_ |= 0x04000000; break; } - case 210: { + case 226: { de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage.Builder subBuilder = null; - if (((bitField0_ & 0x02000000) == 0x02000000)) { + if (((bitField0_ & 0x08000000) == 0x08000000)) { subBuilder = rejectInvNotifyMessage_.toBuilder(); } rejectInvNotifyMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage.PARSER, extensionRegistry); @@ -49710,12 +49877,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(rejectInvNotifyMessage_); rejectInvNotifyMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x02000000; + bitField0_ |= 0x08000000; break; } - case 218: { + case 234: { de.pokerth.protocol.ProtoBuf.StatisticsMessage.Builder subBuilder = null; - if (((bitField0_ & 0x04000000) == 0x04000000)) { + if (((bitField0_ & 0x10000000) == 0x10000000)) { subBuilder = statisticsMessage_.toBuilder(); } statisticsMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.StatisticsMessage.PARSER, extensionRegistry); @@ -49723,12 +49890,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(statisticsMessage_); statisticsMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x04000000; + bitField0_ |= 0x10000000; break; } - case 226: { + case 242: { de.pokerth.protocol.ProtoBuf.ChatRequestMessage.Builder subBuilder = null; - if (((bitField0_ & 0x08000000) == 0x08000000)) { + if (((bitField0_ & 0x20000000) == 0x20000000)) { subBuilder = chatRequestMessage_.toBuilder(); } chatRequestMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ChatRequestMessage.PARSER, extensionRegistry); @@ -49736,12 +49903,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(chatRequestMessage_); chatRequestMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x08000000; + bitField0_ |= 0x20000000; break; } - case 234: { + case 250: { de.pokerth.protocol.ProtoBuf.ChatMessage.Builder subBuilder = null; - if (((bitField0_ & 0x10000000) == 0x10000000)) { + if (((bitField0_ & 0x40000000) == 0x40000000)) { subBuilder = chatMessage_.toBuilder(); } chatMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ChatMessage.PARSER, extensionRegistry); @@ -49749,12 +49916,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(chatMessage_); chatMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x10000000; + bitField0_ |= 0x40000000; break; } - case 242: { + case 258: { de.pokerth.protocol.ProtoBuf.ChatRejectMessage.Builder subBuilder = null; - if (((bitField0_ & 0x20000000) == 0x20000000)) { + if (((bitField0_ & 0x80000000) == 0x80000000)) { subBuilder = chatRejectMessage_.toBuilder(); } chatRejectMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ChatRejectMessage.PARSER, extensionRegistry); @@ -49762,12 +49929,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(chatRejectMessage_); chatRejectMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x20000000; + bitField0_ |= 0x80000000; break; } - case 250: { + case 266: { de.pokerth.protocol.ProtoBuf.DialogMessage.Builder subBuilder = null; - if (((bitField0_ & 0x40000000) == 0x40000000)) { + if (((bitField1_ & 0x00000001) == 0x00000001)) { subBuilder = dialogMessage_.toBuilder(); } dialogMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.DialogMessage.PARSER, extensionRegistry); @@ -49775,12 +49942,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(dialogMessage_); dialogMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x40000000; + bitField1_ |= 0x00000001; break; } - case 258: { + case 274: { de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.Builder subBuilder = null; - if (((bitField0_ & 0x80000000) == 0x80000000)) { + if (((bitField1_ & 0x00000002) == 0x00000002)) { subBuilder = timeoutWarningMessage_.toBuilder(); } timeoutWarningMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.PARSER, extensionRegistry); @@ -49788,12 +49955,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(timeoutWarningMessage_); timeoutWarningMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000002; break; } - case 266: { + case 282: { de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.Builder subBuilder = null; - if (((bitField1_ & 0x00000001) == 0x00000001)) { + if (((bitField1_ & 0x00000004) == 0x00000004)) { subBuilder = resetTimeoutMessage_.toBuilder(); } resetTimeoutMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.PARSER, extensionRegistry); @@ -49801,12 +49968,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(resetTimeoutMessage_); resetTimeoutMessage_ = subBuilder.buildPartial(); } - bitField1_ |= 0x00000001; + bitField1_ |= 0x00000004; break; } - case 274: { + case 290: { de.pokerth.protocol.ProtoBuf.ReportAvatarMessage.Builder subBuilder = null; - if (((bitField1_ & 0x00000002) == 0x00000002)) { + if (((bitField1_ & 0x00000008) == 0x00000008)) { subBuilder = reportAvatarMessage_.toBuilder(); } reportAvatarMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ReportAvatarMessage.PARSER, extensionRegistry); @@ -49814,12 +49981,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(reportAvatarMessage_); reportAvatarMessage_ = subBuilder.buildPartial(); } - bitField1_ |= 0x00000002; + bitField1_ |= 0x00000008; break; } - case 282: { + case 298: { de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage.Builder subBuilder = null; - if (((bitField1_ & 0x00000004) == 0x00000004)) { + if (((bitField1_ & 0x00000010) == 0x00000010)) { subBuilder = reportAvatarAckMessage_.toBuilder(); } reportAvatarAckMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage.PARSER, extensionRegistry); @@ -49827,12 +49994,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(reportAvatarAckMessage_); reportAvatarAckMessage_ = subBuilder.buildPartial(); } - bitField1_ |= 0x00000004; + bitField1_ |= 0x00000010; break; } - case 290: { + case 306: { de.pokerth.protocol.ProtoBuf.ReportGameMessage.Builder subBuilder = null; - if (((bitField1_ & 0x00000008) == 0x00000008)) { + if (((bitField1_ & 0x00000020) == 0x00000020)) { subBuilder = reportGameMessage_.toBuilder(); } reportGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ReportGameMessage.PARSER, extensionRegistry); @@ -49840,12 +50007,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(reportGameMessage_); reportGameMessage_ = subBuilder.buildPartial(); } - bitField1_ |= 0x00000008; + bitField1_ |= 0x00000020; break; } - case 298: { + case 314: { de.pokerth.protocol.ProtoBuf.ReportGameAckMessage.Builder subBuilder = null; - if (((bitField1_ & 0x00000010) == 0x00000010)) { + if (((bitField1_ & 0x00000040) == 0x00000040)) { subBuilder = reportGameAckMessage_.toBuilder(); } reportGameAckMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ReportGameAckMessage.PARSER, extensionRegistry); @@ -49853,12 +50020,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(reportGameAckMessage_); reportGameAckMessage_ = subBuilder.buildPartial(); } - bitField1_ |= 0x00000010; + bitField1_ |= 0x00000040; break; } - case 306: { + case 322: { de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage.Builder subBuilder = null; - if (((bitField1_ & 0x00000020) == 0x00000020)) { + if (((bitField1_ & 0x00000080) == 0x00000080)) { subBuilder = adminRemoveGameMessage_.toBuilder(); } adminRemoveGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage.PARSER, extensionRegistry); @@ -49866,12 +50033,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(adminRemoveGameMessage_); adminRemoveGameMessage_ = subBuilder.buildPartial(); } - bitField1_ |= 0x00000020; + bitField1_ |= 0x00000080; break; } - case 314: { + case 330: { de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage.Builder subBuilder = null; - if (((bitField1_ & 0x00000040) == 0x00000040)) { + if (((bitField1_ & 0x00000100) == 0x00000100)) { subBuilder = adminRemoveGameAckMessage_.toBuilder(); } adminRemoveGameAckMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage.PARSER, extensionRegistry); @@ -49879,12 +50046,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(adminRemoveGameAckMessage_); adminRemoveGameAckMessage_ = subBuilder.buildPartial(); } - bitField1_ |= 0x00000040; + bitField1_ |= 0x00000100; break; } - case 322: { + case 338: { de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage.Builder subBuilder = null; - if (((bitField1_ & 0x00000080) == 0x00000080)) { + if (((bitField1_ & 0x00000200) == 0x00000200)) { subBuilder = adminBanPlayerMessage_.toBuilder(); } adminBanPlayerMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage.PARSER, extensionRegistry); @@ -49892,12 +50059,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(adminBanPlayerMessage_); adminBanPlayerMessage_ = subBuilder.buildPartial(); } - bitField1_ |= 0x00000080; + bitField1_ |= 0x00000200; break; } - case 330: { + case 346: { de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage.Builder subBuilder = null; - if (((bitField1_ & 0x00000100) == 0x00000100)) { + if (((bitField1_ & 0x00000400) == 0x00000400)) { subBuilder = adminBanPlayerAckMessage_.toBuilder(); } adminBanPlayerAckMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage.PARSER, extensionRegistry); @@ -49905,12 +50072,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(adminBanPlayerAckMessage_); adminBanPlayerAckMessage_ = subBuilder.buildPartial(); } - bitField1_ |= 0x00000100; + bitField1_ |= 0x00000400; break; } case 8202: { de.pokerth.protocol.ProtoBuf.ErrorMessage.Builder subBuilder = null; - if (((bitField1_ & 0x00000200) == 0x00000200)) { + if (((bitField1_ & 0x00000800) == 0x00000800)) { subBuilder = errorMessage_.toBuilder(); } errorMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ErrorMessage.PARSER, extensionRegistry); @@ -49918,7 +50085,7 @@ public final class ProtoBuf { subBuilder.mergeFrom(errorMessage_); errorMessage_ = subBuilder.buildPartial(); } - bitField1_ |= 0x00000200; + bitField1_ |= 0x00000800; break; } } @@ -49953,331 +50120,347 @@ public final class ProtoBuf { public enum LobbyMessageType implements com.google.protobuf.Internal.EnumLite { /** - * Type_InitMessage = 1; + * Type_InitDoneMessage = 1; */ - Type_InitMessage(0, 1), + Type_InitDoneMessage(0, 1), /** - * Type_InitAckMessage = 2; + * Type_AvatarRequestMessage = 2; */ - Type_InitAckMessage(1, 2), + Type_AvatarRequestMessage(1, 2), /** - * Type_AvatarRequestMessage = 3; + * Type_AvatarHeaderMessage = 3; */ - Type_AvatarRequestMessage(2, 3), + Type_AvatarHeaderMessage(2, 3), /** - * Type_AvatarHeaderMessage = 4; + * Type_AvatarDataMessage = 4; */ - Type_AvatarHeaderMessage(3, 4), + Type_AvatarDataMessage(3, 4), /** - * Type_AvatarDataMessage = 5; + * Type_AvatarEndMessage = 5; */ - Type_AvatarDataMessage(4, 5), + Type_AvatarEndMessage(4, 5), /** - * Type_AvatarEndMessage = 6; + * Type_UnknownAvatarMessage = 6; */ - Type_AvatarEndMessage(5, 6), + Type_UnknownAvatarMessage(5, 6), /** - * Type_UnknownAvatarMessage = 7; + * Type_PlayerListMessage = 7; */ - Type_UnknownAvatarMessage(6, 7), + Type_PlayerListMessage(6, 7), /** - * Type_PlayerListMessage = 8; + * Type_GameListNewMessage = 8; */ - Type_PlayerListMessage(7, 8), + Type_GameListNewMessage(7, 8), /** - * Type_GameListNewMessage = 9; + * Type_GameListUpdateMessage = 9; */ - Type_GameListNewMessage(8, 9), + Type_GameListUpdateMessage(8, 9), /** - * Type_GameListUpdateMessage = 10; + * Type_GameListPlayerJoinedMessage = 10; */ - Type_GameListUpdateMessage(9, 10), + Type_GameListPlayerJoinedMessage(9, 10), /** - * Type_GameListPlayerJoinedMessage = 11; + * Type_GameListPlayerLeftMessage = 11; */ - Type_GameListPlayerJoinedMessage(10, 11), + Type_GameListPlayerLeftMessage(10, 11), /** - * Type_GameListPlayerLeftMessage = 12; + * Type_GameListSpectatorJoinedMessage = 12; */ - Type_GameListPlayerLeftMessage(11, 12), + Type_GameListSpectatorJoinedMessage(11, 12), /** - * Type_GameListSpectatorJoinedMessage = 13; + * Type_GameListSpectatorLeftMessage = 13; */ - Type_GameListSpectatorJoinedMessage(12, 13), + Type_GameListSpectatorLeftMessage(12, 13), /** - * Type_GameListSpectatorLeftMessage = 14; + * Type_GameListAdminChangedMessage = 14; */ - Type_GameListSpectatorLeftMessage(13, 14), + Type_GameListAdminChangedMessage(13, 14), /** - * Type_GameListAdminChangedMessage = 15; + * Type_PlayerInfoRequestMessage = 15; */ - Type_GameListAdminChangedMessage(14, 15), + Type_PlayerInfoRequestMessage(14, 15), /** - * Type_PlayerInfoRequestMessage = 16; + * Type_PlayerInfoReplyMessage = 16; */ - Type_PlayerInfoRequestMessage(15, 16), + Type_PlayerInfoReplyMessage(15, 16), /** - * Type_PlayerInfoReplyMessage = 17; + * Type_SubscriptionRequestMessage = 17; */ - Type_PlayerInfoReplyMessage(16, 17), + Type_SubscriptionRequestMessage(16, 17), /** - * Type_SubscriptionRequestMessage = 18; + * Type_SubscriptionReplyMessage = 18; */ - Type_SubscriptionRequestMessage(17, 18), + Type_SubscriptionReplyMessage(17, 18), /** - * Type_SubscriptionReplyMessage = 19; + * Type_CreateGameMessage = 19; */ - Type_SubscriptionReplyMessage(18, 19), + Type_CreateGameMessage(18, 19), /** - * Type_CreateGameMessage = 20; + * Type_CreateGameFailedMessage = 20; */ - Type_CreateGameMessage(19, 20), + Type_CreateGameFailedMessage(19, 20), /** - * Type_CreateGameFailedMessage = 21; + * Type_JoinGameMessage = 21; */ - Type_CreateGameFailedMessage(20, 21), + Type_JoinGameMessage(20, 21), /** - * Type_InvitePlayerToGameMessage = 22; + * Type_RejoinGameMessage = 22; */ - Type_InvitePlayerToGameMessage(21, 22), + Type_RejoinGameMessage(21, 22), /** - * Type_InviteNotifyMessage = 23; + * Type_JoinGameAckMessage = 23; */ - Type_InviteNotifyMessage(22, 23), + Type_JoinGameAckMessage(22, 23), /** - * Type_RejectGameInvitationMessage = 24; + * Type_JoinGameFailedMessage = 24; */ - Type_RejectGameInvitationMessage(23, 24), + Type_JoinGameFailedMessage(23, 24), /** - * Type_RejectInvNotifyMessage = 25; + * Type_InviteNotifyMessage = 25; */ - Type_RejectInvNotifyMessage(24, 25), + Type_InviteNotifyMessage(24, 25), /** - * Type_StatisticsMessage = 26; + * Type_RejectGameInvitationMessage = 26; */ - Type_StatisticsMessage(25, 26), + Type_RejectGameInvitationMessage(25, 26), /** - * Type_ChatRequestMessage = 27; + * Type_RejectInvNotifyMessage = 27; */ - Type_ChatRequestMessage(26, 27), + Type_RejectInvNotifyMessage(26, 27), /** - * Type_ChatMessage = 28; + * Type_StatisticsMessage = 28; */ - Type_ChatMessage(27, 28), + Type_StatisticsMessage(27, 28), /** - * Type_ChatRejectMessage = 29; + * Type_ChatRequestMessage = 29; */ - Type_ChatRejectMessage(28, 29), + Type_ChatRequestMessage(28, 29), /** - * Type_DialogMessage = 30; + * Type_ChatMessage = 30; */ - Type_DialogMessage(29, 30), + Type_ChatMessage(29, 30), /** - * Type_TimeoutWarningMessage = 31; + * Type_ChatRejectMessage = 31; */ - Type_TimeoutWarningMessage(30, 31), + Type_ChatRejectMessage(30, 31), /** - * Type_ResetTimeoutMessage = 32; + * Type_DialogMessage = 32; */ - Type_ResetTimeoutMessage(31, 32), + Type_DialogMessage(31, 32), /** - * Type_ReportAvatarMessage = 33; + * Type_TimeoutWarningMessage = 33; */ - Type_ReportAvatarMessage(32, 33), + Type_TimeoutWarningMessage(32, 33), /** - * Type_ReportAvatarAckMessage = 34; + * Type_ResetTimeoutMessage = 34; */ - Type_ReportAvatarAckMessage(33, 34), + Type_ResetTimeoutMessage(33, 34), /** - * Type_ReportGameMessage = 35; + * Type_ReportAvatarMessage = 35; */ - Type_ReportGameMessage(34, 35), + Type_ReportAvatarMessage(34, 35), /** - * Type_ReportGameAckMessage = 36; + * Type_ReportAvatarAckMessage = 36; */ - Type_ReportGameAckMessage(35, 36), + Type_ReportAvatarAckMessage(35, 36), /** - * Type_AdminRemoveGameMessage = 37; + * Type_ReportGameMessage = 37; */ - Type_AdminRemoveGameMessage(36, 37), + Type_ReportGameMessage(36, 37), /** - * Type_AdminRemoveGameAckMessage = 38; + * Type_ReportGameAckMessage = 38; */ - Type_AdminRemoveGameAckMessage(37, 38), + Type_ReportGameAckMessage(37, 38), /** - * Type_AdminBanPlayerMessage = 39; + * Type_AdminRemoveGameMessage = 39; */ - Type_AdminBanPlayerMessage(38, 39), + Type_AdminRemoveGameMessage(38, 39), /** - * Type_AdminBanPlayerAckMessage = 40; + * Type_AdminRemoveGameAckMessage = 40; */ - Type_AdminBanPlayerAckMessage(39, 40), + Type_AdminRemoveGameAckMessage(39, 40), + /** + * Type_AdminBanPlayerMessage = 41; + */ + Type_AdminBanPlayerMessage(40, 41), + /** + * Type_AdminBanPlayerAckMessage = 42; + */ + Type_AdminBanPlayerAckMessage(41, 42), /** * Type_ErrorMessage = 1024; */ - Type_ErrorMessage(40, 1024), + Type_ErrorMessage(42, 1024), ; /** - * Type_InitMessage = 1; + * Type_InitDoneMessage = 1; */ - public static final int Type_InitMessage_VALUE = 1; + public static final int Type_InitDoneMessage_VALUE = 1; /** - * Type_InitAckMessage = 2; + * Type_AvatarRequestMessage = 2; */ - public static final int Type_InitAckMessage_VALUE = 2; + public static final int Type_AvatarRequestMessage_VALUE = 2; /** - * Type_AvatarRequestMessage = 3; + * Type_AvatarHeaderMessage = 3; */ - public static final int Type_AvatarRequestMessage_VALUE = 3; + public static final int Type_AvatarHeaderMessage_VALUE = 3; /** - * Type_AvatarHeaderMessage = 4; + * Type_AvatarDataMessage = 4; */ - public static final int Type_AvatarHeaderMessage_VALUE = 4; + public static final int Type_AvatarDataMessage_VALUE = 4; /** - * Type_AvatarDataMessage = 5; + * Type_AvatarEndMessage = 5; */ - public static final int Type_AvatarDataMessage_VALUE = 5; + public static final int Type_AvatarEndMessage_VALUE = 5; /** - * Type_AvatarEndMessage = 6; + * Type_UnknownAvatarMessage = 6; */ - public static final int Type_AvatarEndMessage_VALUE = 6; + public static final int Type_UnknownAvatarMessage_VALUE = 6; /** - * Type_UnknownAvatarMessage = 7; + * Type_PlayerListMessage = 7; */ - public static final int Type_UnknownAvatarMessage_VALUE = 7; + public static final int Type_PlayerListMessage_VALUE = 7; /** - * Type_PlayerListMessage = 8; + * Type_GameListNewMessage = 8; */ - public static final int Type_PlayerListMessage_VALUE = 8; + public static final int Type_GameListNewMessage_VALUE = 8; /** - * Type_GameListNewMessage = 9; + * Type_GameListUpdateMessage = 9; */ - public static final int Type_GameListNewMessage_VALUE = 9; + public static final int Type_GameListUpdateMessage_VALUE = 9; /** - * Type_GameListUpdateMessage = 10; + * Type_GameListPlayerJoinedMessage = 10; */ - public static final int Type_GameListUpdateMessage_VALUE = 10; + public static final int Type_GameListPlayerJoinedMessage_VALUE = 10; /** - * Type_GameListPlayerJoinedMessage = 11; + * Type_GameListPlayerLeftMessage = 11; */ - public static final int Type_GameListPlayerJoinedMessage_VALUE = 11; + public static final int Type_GameListPlayerLeftMessage_VALUE = 11; /** - * Type_GameListPlayerLeftMessage = 12; + * Type_GameListSpectatorJoinedMessage = 12; */ - public static final int Type_GameListPlayerLeftMessage_VALUE = 12; + public static final int Type_GameListSpectatorJoinedMessage_VALUE = 12; /** - * Type_GameListSpectatorJoinedMessage = 13; + * Type_GameListSpectatorLeftMessage = 13; */ - public static final int Type_GameListSpectatorJoinedMessage_VALUE = 13; + public static final int Type_GameListSpectatorLeftMessage_VALUE = 13; /** - * Type_GameListSpectatorLeftMessage = 14; + * Type_GameListAdminChangedMessage = 14; */ - public static final int Type_GameListSpectatorLeftMessage_VALUE = 14; + public static final int Type_GameListAdminChangedMessage_VALUE = 14; /** - * Type_GameListAdminChangedMessage = 15; + * Type_PlayerInfoRequestMessage = 15; */ - public static final int Type_GameListAdminChangedMessage_VALUE = 15; + public static final int Type_PlayerInfoRequestMessage_VALUE = 15; /** - * Type_PlayerInfoRequestMessage = 16; + * Type_PlayerInfoReplyMessage = 16; */ - public static final int Type_PlayerInfoRequestMessage_VALUE = 16; + public static final int Type_PlayerInfoReplyMessage_VALUE = 16; /** - * Type_PlayerInfoReplyMessage = 17; + * Type_SubscriptionRequestMessage = 17; */ - public static final int Type_PlayerInfoReplyMessage_VALUE = 17; + public static final int Type_SubscriptionRequestMessage_VALUE = 17; /** - * Type_SubscriptionRequestMessage = 18; + * Type_SubscriptionReplyMessage = 18; */ - public static final int Type_SubscriptionRequestMessage_VALUE = 18; + public static final int Type_SubscriptionReplyMessage_VALUE = 18; /** - * Type_SubscriptionReplyMessage = 19; + * Type_CreateGameMessage = 19; */ - public static final int Type_SubscriptionReplyMessage_VALUE = 19; + public static final int Type_CreateGameMessage_VALUE = 19; /** - * Type_CreateGameMessage = 20; + * Type_CreateGameFailedMessage = 20; */ - public static final int Type_CreateGameMessage_VALUE = 20; + public static final int Type_CreateGameFailedMessage_VALUE = 20; /** - * Type_CreateGameFailedMessage = 21; + * Type_JoinGameMessage = 21; */ - public static final int Type_CreateGameFailedMessage_VALUE = 21; + public static final int Type_JoinGameMessage_VALUE = 21; /** - * Type_InvitePlayerToGameMessage = 22; + * Type_RejoinGameMessage = 22; */ - public static final int Type_InvitePlayerToGameMessage_VALUE = 22; + public static final int Type_RejoinGameMessage_VALUE = 22; /** - * Type_InviteNotifyMessage = 23; + * Type_JoinGameAckMessage = 23; */ - public static final int Type_InviteNotifyMessage_VALUE = 23; + public static final int Type_JoinGameAckMessage_VALUE = 23; /** - * Type_RejectGameInvitationMessage = 24; + * Type_JoinGameFailedMessage = 24; */ - public static final int Type_RejectGameInvitationMessage_VALUE = 24; + public static final int Type_JoinGameFailedMessage_VALUE = 24; /** - * Type_RejectInvNotifyMessage = 25; + * Type_InviteNotifyMessage = 25; */ - public static final int Type_RejectInvNotifyMessage_VALUE = 25; + public static final int Type_InviteNotifyMessage_VALUE = 25; /** - * Type_StatisticsMessage = 26; + * Type_RejectGameInvitationMessage = 26; */ - public static final int Type_StatisticsMessage_VALUE = 26; + public static final int Type_RejectGameInvitationMessage_VALUE = 26; /** - * Type_ChatRequestMessage = 27; + * Type_RejectInvNotifyMessage = 27; */ - public static final int Type_ChatRequestMessage_VALUE = 27; + public static final int Type_RejectInvNotifyMessage_VALUE = 27; /** - * Type_ChatMessage = 28; + * Type_StatisticsMessage = 28; */ - public static final int Type_ChatMessage_VALUE = 28; + public static final int Type_StatisticsMessage_VALUE = 28; /** - * Type_ChatRejectMessage = 29; + * Type_ChatRequestMessage = 29; */ - public static final int Type_ChatRejectMessage_VALUE = 29; + public static final int Type_ChatRequestMessage_VALUE = 29; /** - * Type_DialogMessage = 30; + * Type_ChatMessage = 30; */ - public static final int Type_DialogMessage_VALUE = 30; + public static final int Type_ChatMessage_VALUE = 30; /** - * Type_TimeoutWarningMessage = 31; + * Type_ChatRejectMessage = 31; */ - public static final int Type_TimeoutWarningMessage_VALUE = 31; + public static final int Type_ChatRejectMessage_VALUE = 31; /** - * Type_ResetTimeoutMessage = 32; + * Type_DialogMessage = 32; */ - public static final int Type_ResetTimeoutMessage_VALUE = 32; + public static final int Type_DialogMessage_VALUE = 32; /** - * Type_ReportAvatarMessage = 33; + * Type_TimeoutWarningMessage = 33; */ - public static final int Type_ReportAvatarMessage_VALUE = 33; + public static final int Type_TimeoutWarningMessage_VALUE = 33; /** - * Type_ReportAvatarAckMessage = 34; + * Type_ResetTimeoutMessage = 34; */ - public static final int Type_ReportAvatarAckMessage_VALUE = 34; + public static final int Type_ResetTimeoutMessage_VALUE = 34; /** - * Type_ReportGameMessage = 35; + * Type_ReportAvatarMessage = 35; */ - public static final int Type_ReportGameMessage_VALUE = 35; + public static final int Type_ReportAvatarMessage_VALUE = 35; /** - * Type_ReportGameAckMessage = 36; + * Type_ReportAvatarAckMessage = 36; */ - public static final int Type_ReportGameAckMessage_VALUE = 36; + public static final int Type_ReportAvatarAckMessage_VALUE = 36; /** - * Type_AdminRemoveGameMessage = 37; + * Type_ReportGameMessage = 37; */ - public static final int Type_AdminRemoveGameMessage_VALUE = 37; + public static final int Type_ReportGameMessage_VALUE = 37; /** - * Type_AdminRemoveGameAckMessage = 38; + * Type_ReportGameAckMessage = 38; */ - public static final int Type_AdminRemoveGameAckMessage_VALUE = 38; + public static final int Type_ReportGameAckMessage_VALUE = 38; /** - * Type_AdminBanPlayerMessage = 39; + * Type_AdminRemoveGameMessage = 39; */ - public static final int Type_AdminBanPlayerMessage_VALUE = 39; + public static final int Type_AdminRemoveGameMessage_VALUE = 39; /** - * Type_AdminBanPlayerAckMessage = 40; + * Type_AdminRemoveGameAckMessage = 40; */ - public static final int Type_AdminBanPlayerAckMessage_VALUE = 40; + public static final int Type_AdminRemoveGameAckMessage_VALUE = 40; + /** + * Type_AdminBanPlayerMessage = 41; + */ + public static final int Type_AdminBanPlayerMessage_VALUE = 41; + /** + * Type_AdminBanPlayerAckMessage = 42; + */ + public static final int Type_AdminBanPlayerAckMessage_VALUE = 42; /** * Type_ErrorMessage = 1024; */ @@ -50288,46 +50471,48 @@ public final class ProtoBuf { public static LobbyMessageType valueOf(int value) { switch (value) { - case 1: return Type_InitMessage; - case 2: return Type_InitAckMessage; - case 3: return Type_AvatarRequestMessage; - case 4: return Type_AvatarHeaderMessage; - case 5: return Type_AvatarDataMessage; - case 6: return Type_AvatarEndMessage; - case 7: return Type_UnknownAvatarMessage; - case 8: return Type_PlayerListMessage; - case 9: return Type_GameListNewMessage; - case 10: return Type_GameListUpdateMessage; - case 11: return Type_GameListPlayerJoinedMessage; - case 12: return Type_GameListPlayerLeftMessage; - case 13: return Type_GameListSpectatorJoinedMessage; - case 14: return Type_GameListSpectatorLeftMessage; - case 15: return Type_GameListAdminChangedMessage; - case 16: return Type_PlayerInfoRequestMessage; - case 17: return Type_PlayerInfoReplyMessage; - case 18: return Type_SubscriptionRequestMessage; - case 19: return Type_SubscriptionReplyMessage; - case 20: return Type_CreateGameMessage; - case 21: return Type_CreateGameFailedMessage; - case 22: return Type_InvitePlayerToGameMessage; - case 23: return Type_InviteNotifyMessage; - case 24: return Type_RejectGameInvitationMessage; - case 25: return Type_RejectInvNotifyMessage; - case 26: return Type_StatisticsMessage; - case 27: return Type_ChatRequestMessage; - case 28: return Type_ChatMessage; - case 29: return Type_ChatRejectMessage; - case 30: return Type_DialogMessage; - case 31: return Type_TimeoutWarningMessage; - case 32: return Type_ResetTimeoutMessage; - case 33: return Type_ReportAvatarMessage; - case 34: return Type_ReportAvatarAckMessage; - case 35: return Type_ReportGameMessage; - case 36: return Type_ReportGameAckMessage; - case 37: return Type_AdminRemoveGameMessage; - case 38: return Type_AdminRemoveGameAckMessage; - case 39: return Type_AdminBanPlayerMessage; - case 40: return Type_AdminBanPlayerAckMessage; + case 1: return Type_InitDoneMessage; + case 2: return Type_AvatarRequestMessage; + case 3: return Type_AvatarHeaderMessage; + case 4: return Type_AvatarDataMessage; + case 5: return Type_AvatarEndMessage; + case 6: return Type_UnknownAvatarMessage; + case 7: return Type_PlayerListMessage; + case 8: return Type_GameListNewMessage; + case 9: return Type_GameListUpdateMessage; + case 10: return Type_GameListPlayerJoinedMessage; + case 11: return Type_GameListPlayerLeftMessage; + case 12: return Type_GameListSpectatorJoinedMessage; + case 13: return Type_GameListSpectatorLeftMessage; + case 14: return Type_GameListAdminChangedMessage; + case 15: return Type_PlayerInfoRequestMessage; + case 16: return Type_PlayerInfoReplyMessage; + case 17: return Type_SubscriptionRequestMessage; + case 18: return Type_SubscriptionReplyMessage; + case 19: return Type_CreateGameMessage; + case 20: return Type_CreateGameFailedMessage; + case 21: return Type_JoinGameMessage; + case 22: return Type_RejoinGameMessage; + case 23: return Type_JoinGameAckMessage; + case 24: return Type_JoinGameFailedMessage; + case 25: return Type_InviteNotifyMessage; + case 26: return Type_RejectGameInvitationMessage; + case 27: return Type_RejectInvNotifyMessage; + case 28: return Type_StatisticsMessage; + case 29: return Type_ChatRequestMessage; + case 30: return Type_ChatMessage; + case 31: return Type_ChatRejectMessage; + case 32: return Type_DialogMessage; + case 33: return Type_TimeoutWarningMessage; + case 34: return Type_ResetTimeoutMessage; + case 35: return Type_ReportAvatarMessage; + case 36: return Type_ReportAvatarAckMessage; + case 37: return Type_ReportGameMessage; + case 38: return Type_ReportGameAckMessage; + case 39: return Type_AdminRemoveGameMessage; + case 40: return Type_AdminRemoveGameAckMessage; + case 41: return Type_AdminBanPlayerMessage; + case 42: return Type_AdminBanPlayerAckMessage; case 1024: return Type_ErrorMessage; default: return null; } @@ -50372,641 +50557,673 @@ public final class ProtoBuf { return messageType_; } - // optional .InitMessage initMessage = 2; - public static final int INITMESSAGE_FIELD_NUMBER = 2; - private de.pokerth.protocol.ProtoBuf.InitMessage initMessage_; + // optional .InitDoneMessage initDoneMessage = 2; + public static final int INITDONEMESSAGE_FIELD_NUMBER = 2; + private de.pokerth.protocol.ProtoBuf.InitDoneMessage initDoneMessage_; /** - * optional .InitMessage initMessage = 2; + * optional .InitDoneMessage initDoneMessage = 2; */ - public boolean hasInitMessage() { + public boolean hasInitDoneMessage() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional .InitMessage initMessage = 2; + * optional .InitDoneMessage initDoneMessage = 2; */ - public de.pokerth.protocol.ProtoBuf.InitMessage getInitMessage() { - return initMessage_; + public de.pokerth.protocol.ProtoBuf.InitDoneMessage getInitDoneMessage() { + return initDoneMessage_; } - // optional .InitAckMessage initAckMessage = 3; - public static final int INITACKMESSAGE_FIELD_NUMBER = 3; - private de.pokerth.protocol.ProtoBuf.InitAckMessage initAckMessage_; + // optional .AvatarRequestMessage avatarRequestMessage = 3; + public static final int AVATARREQUESTMESSAGE_FIELD_NUMBER = 3; + private de.pokerth.protocol.ProtoBuf.AvatarRequestMessage avatarRequestMessage_; /** - * optional .InitAckMessage initAckMessage = 3; + * optional .AvatarRequestMessage avatarRequestMessage = 3; */ - public boolean hasInitAckMessage() { + public boolean hasAvatarRequestMessage() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .InitAckMessage initAckMessage = 3; - */ - public de.pokerth.protocol.ProtoBuf.InitAckMessage getInitAckMessage() { - return initAckMessage_; - } - - // optional .AvatarRequestMessage avatarRequestMessage = 4; - public static final int AVATARREQUESTMESSAGE_FIELD_NUMBER = 4; - private de.pokerth.protocol.ProtoBuf.AvatarRequestMessage avatarRequestMessage_; - /** - * optional .AvatarRequestMessage avatarRequestMessage = 4; - */ - public boolean hasAvatarRequestMessage() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .AvatarRequestMessage avatarRequestMessage = 4; + * optional .AvatarRequestMessage avatarRequestMessage = 3; */ public de.pokerth.protocol.ProtoBuf.AvatarRequestMessage getAvatarRequestMessage() { return avatarRequestMessage_; } - // optional .AvatarHeaderMessage avatarHeaderMessage = 5; - public static final int AVATARHEADERMESSAGE_FIELD_NUMBER = 5; + // optional .AvatarHeaderMessage avatarHeaderMessage = 4; + public static final int AVATARHEADERMESSAGE_FIELD_NUMBER = 4; private de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage avatarHeaderMessage_; /** - * optional .AvatarHeaderMessage avatarHeaderMessage = 5; + * optional .AvatarHeaderMessage avatarHeaderMessage = 4; */ public boolean hasAvatarHeaderMessage() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .AvatarHeaderMessage avatarHeaderMessage = 5; + * optional .AvatarHeaderMessage avatarHeaderMessage = 4; */ public de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage getAvatarHeaderMessage() { return avatarHeaderMessage_; } - // optional .AvatarDataMessage avatarDataMessage = 6; - public static final int AVATARDATAMESSAGE_FIELD_NUMBER = 6; + // optional .AvatarDataMessage avatarDataMessage = 5; + public static final int AVATARDATAMESSAGE_FIELD_NUMBER = 5; private de.pokerth.protocol.ProtoBuf.AvatarDataMessage avatarDataMessage_; /** - * optional .AvatarDataMessage avatarDataMessage = 6; + * optional .AvatarDataMessage avatarDataMessage = 5; */ public boolean hasAvatarDataMessage() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional .AvatarDataMessage avatarDataMessage = 6; + * optional .AvatarDataMessage avatarDataMessage = 5; */ public de.pokerth.protocol.ProtoBuf.AvatarDataMessage getAvatarDataMessage() { return avatarDataMessage_; } - // optional .AvatarEndMessage avatarEndMessage = 7; - public static final int AVATARENDMESSAGE_FIELD_NUMBER = 7; + // optional .AvatarEndMessage avatarEndMessage = 6; + public static final int AVATARENDMESSAGE_FIELD_NUMBER = 6; private de.pokerth.protocol.ProtoBuf.AvatarEndMessage avatarEndMessage_; /** - * optional .AvatarEndMessage avatarEndMessage = 7; + * optional .AvatarEndMessage avatarEndMessage = 6; */ public boolean hasAvatarEndMessage() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * optional .AvatarEndMessage avatarEndMessage = 7; + * optional .AvatarEndMessage avatarEndMessage = 6; */ public de.pokerth.protocol.ProtoBuf.AvatarEndMessage getAvatarEndMessage() { return avatarEndMessage_; } - // optional .UnknownAvatarMessage unknownAvatarMessage = 8; - public static final int UNKNOWNAVATARMESSAGE_FIELD_NUMBER = 8; + // optional .UnknownAvatarMessage unknownAvatarMessage = 7; + public static final int UNKNOWNAVATARMESSAGE_FIELD_NUMBER = 7; private de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage unknownAvatarMessage_; /** - * optional .UnknownAvatarMessage unknownAvatarMessage = 8; + * optional .UnknownAvatarMessage unknownAvatarMessage = 7; */ public boolean hasUnknownAvatarMessage() { - return ((bitField0_ & 0x00000080) == 0x00000080); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional .UnknownAvatarMessage unknownAvatarMessage = 8; + * optional .UnknownAvatarMessage unknownAvatarMessage = 7; */ public de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage getUnknownAvatarMessage() { return unknownAvatarMessage_; } - // optional .PlayerListMessage playerListMessage = 9; - public static final int PLAYERLISTMESSAGE_FIELD_NUMBER = 9; + // optional .PlayerListMessage playerListMessage = 8; + public static final int PLAYERLISTMESSAGE_FIELD_NUMBER = 8; private de.pokerth.protocol.ProtoBuf.PlayerListMessage playerListMessage_; /** - * optional .PlayerListMessage playerListMessage = 9; + * optional .PlayerListMessage playerListMessage = 8; */ public boolean hasPlayerListMessage() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** - * optional .PlayerListMessage playerListMessage = 9; + * optional .PlayerListMessage playerListMessage = 8; */ public de.pokerth.protocol.ProtoBuf.PlayerListMessage getPlayerListMessage() { return playerListMessage_; } - // optional .GameListNewMessage gameListNewMessage = 10; - public static final int GAMELISTNEWMESSAGE_FIELD_NUMBER = 10; + // optional .GameListNewMessage gameListNewMessage = 9; + public static final int GAMELISTNEWMESSAGE_FIELD_NUMBER = 9; private de.pokerth.protocol.ProtoBuf.GameListNewMessage gameListNewMessage_; /** - * optional .GameListNewMessage gameListNewMessage = 10; + * optional .GameListNewMessage gameListNewMessage = 9; */ public boolean hasGameListNewMessage() { - return ((bitField0_ & 0x00000200) == 0x00000200); + return ((bitField0_ & 0x00000100) == 0x00000100); } /** - * optional .GameListNewMessage gameListNewMessage = 10; + * optional .GameListNewMessage gameListNewMessage = 9; */ public de.pokerth.protocol.ProtoBuf.GameListNewMessage getGameListNewMessage() { return gameListNewMessage_; } - // optional .GameListUpdateMessage gameListUpdateMessage = 11; - public static final int GAMELISTUPDATEMESSAGE_FIELD_NUMBER = 11; + // optional .GameListUpdateMessage gameListUpdateMessage = 10; + public static final int GAMELISTUPDATEMESSAGE_FIELD_NUMBER = 10; private de.pokerth.protocol.ProtoBuf.GameListUpdateMessage gameListUpdateMessage_; /** - * optional .GameListUpdateMessage gameListUpdateMessage = 11; + * optional .GameListUpdateMessage gameListUpdateMessage = 10; */ public boolean hasGameListUpdateMessage() { - return ((bitField0_ & 0x00000400) == 0x00000400); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** - * optional .GameListUpdateMessage gameListUpdateMessage = 11; + * optional .GameListUpdateMessage gameListUpdateMessage = 10; */ public de.pokerth.protocol.ProtoBuf.GameListUpdateMessage getGameListUpdateMessage() { return gameListUpdateMessage_; } - // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; - public static final int GAMELISTPLAYERJOINEDMESSAGE_FIELD_NUMBER = 12; + // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; + public static final int GAMELISTPLAYERJOINEDMESSAGE_FIELD_NUMBER = 11; private de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage gameListPlayerJoinedMessage_; /** - * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; */ public boolean hasGameListPlayerJoinedMessage() { - return ((bitField0_ & 0x00000800) == 0x00000800); + return ((bitField0_ & 0x00000400) == 0x00000400); } /** - * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; */ public de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage getGameListPlayerJoinedMessage() { return gameListPlayerJoinedMessage_; } - // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; - public static final int GAMELISTPLAYERLEFTMESSAGE_FIELD_NUMBER = 13; + // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; + public static final int GAMELISTPLAYERLEFTMESSAGE_FIELD_NUMBER = 12; private de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage gameListPlayerLeftMessage_; /** - * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; */ public boolean hasGameListPlayerLeftMessage() { - return ((bitField0_ & 0x00001000) == 0x00001000); + return ((bitField0_ & 0x00000800) == 0x00000800); } /** - * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; */ public de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage getGameListPlayerLeftMessage() { return gameListPlayerLeftMessage_; } - // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; - public static final int GAMELISTSPECTATORJOINEDMESSAGE_FIELD_NUMBER = 14; + // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; + public static final int GAMELISTSPECTATORJOINEDMESSAGE_FIELD_NUMBER = 13; private de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage_; /** - * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; */ public boolean hasGameListSpectatorJoinedMessage() { - return ((bitField0_ & 0x00002000) == 0x00002000); + return ((bitField0_ & 0x00001000) == 0x00001000); } /** - * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; */ public de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage getGameListSpectatorJoinedMessage() { return gameListSpectatorJoinedMessage_; } - // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; - public static final int GAMELISTSPECTATORLEFTMESSAGE_FIELD_NUMBER = 15; + // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; + public static final int GAMELISTSPECTATORLEFTMESSAGE_FIELD_NUMBER = 14; private de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage gameListSpectatorLeftMessage_; /** - * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; */ public boolean hasGameListSpectatorLeftMessage() { - return ((bitField0_ & 0x00004000) == 0x00004000); + return ((bitField0_ & 0x00002000) == 0x00002000); } /** - * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; */ public de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage getGameListSpectatorLeftMessage() { return gameListSpectatorLeftMessage_; } - // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; - public static final int GAMELISTADMINCHANGEDMESSAGE_FIELD_NUMBER = 16; + // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; + public static final int GAMELISTADMINCHANGEDMESSAGE_FIELD_NUMBER = 15; private de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage gameListAdminChangedMessage_; /** - * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; */ public boolean hasGameListAdminChangedMessage() { - return ((bitField0_ & 0x00008000) == 0x00008000); + return ((bitField0_ & 0x00004000) == 0x00004000); } /** - * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; */ public de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage getGameListAdminChangedMessage() { return gameListAdminChangedMessage_; } - // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; - public static final int PLAYERINFOREQUESTMESSAGE_FIELD_NUMBER = 17; + // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; + public static final int PLAYERINFOREQUESTMESSAGE_FIELD_NUMBER = 16; private de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage playerInfoRequestMessage_; /** - * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; */ public boolean hasPlayerInfoRequestMessage() { - return ((bitField0_ & 0x00010000) == 0x00010000); + return ((bitField0_ & 0x00008000) == 0x00008000); } /** - * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; */ public de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage getPlayerInfoRequestMessage() { return playerInfoRequestMessage_; } - // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; - public static final int PLAYERINFOREPLYMESSAGE_FIELD_NUMBER = 18; + // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; + public static final int PLAYERINFOREPLYMESSAGE_FIELD_NUMBER = 17; private de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage playerInfoReplyMessage_; /** - * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; */ public boolean hasPlayerInfoReplyMessage() { - return ((bitField0_ & 0x00020000) == 0x00020000); + return ((bitField0_ & 0x00010000) == 0x00010000); } /** - * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; */ public de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage getPlayerInfoReplyMessage() { return playerInfoReplyMessage_; } - // optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; - public static final int SUBSCRIPTIONREQUESTMESSAGE_FIELD_NUMBER = 19; + // optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; + public static final int SUBSCRIPTIONREQUESTMESSAGE_FIELD_NUMBER = 18; private de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage subscriptionRequestMessage_; /** - * optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + * optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; */ public boolean hasSubscriptionRequestMessage() { - return ((bitField0_ & 0x00040000) == 0x00040000); + return ((bitField0_ & 0x00020000) == 0x00020000); } /** - * optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + * optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; */ public de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage getSubscriptionRequestMessage() { return subscriptionRequestMessage_; } - // optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; - public static final int SUBSCRIPTIONREPLYMESSAGE_FIELD_NUMBER = 20; + // optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; + public static final int SUBSCRIPTIONREPLYMESSAGE_FIELD_NUMBER = 19; private de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage subscriptionReplyMessage_; /** - * optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + * optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; */ public boolean hasSubscriptionReplyMessage() { - return ((bitField0_ & 0x00080000) == 0x00080000); + return ((bitField0_ & 0x00040000) == 0x00040000); } /** - * optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + * optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; */ public de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage getSubscriptionReplyMessage() { return subscriptionReplyMessage_; } - // optional .CreateGameMessage createGameMessage = 21; - public static final int CREATEGAMEMESSAGE_FIELD_NUMBER = 21; + // optional .CreateGameMessage createGameMessage = 20; + public static final int CREATEGAMEMESSAGE_FIELD_NUMBER = 20; private de.pokerth.protocol.ProtoBuf.CreateGameMessage createGameMessage_; /** - * optional .CreateGameMessage createGameMessage = 21; + * optional .CreateGameMessage createGameMessage = 20; */ public boolean hasCreateGameMessage() { - return ((bitField0_ & 0x00100000) == 0x00100000); + return ((bitField0_ & 0x00080000) == 0x00080000); } /** - * optional .CreateGameMessage createGameMessage = 21; + * optional .CreateGameMessage createGameMessage = 20; */ public de.pokerth.protocol.ProtoBuf.CreateGameMessage getCreateGameMessage() { return createGameMessage_; } - // optional .CreateGameFailedMessage createGameFailedMessage = 22; - public static final int CREATEGAMEFAILEDMESSAGE_FIELD_NUMBER = 22; + // optional .CreateGameFailedMessage createGameFailedMessage = 21; + public static final int CREATEGAMEFAILEDMESSAGE_FIELD_NUMBER = 21; private de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage createGameFailedMessage_; /** - * optional .CreateGameFailedMessage createGameFailedMessage = 22; + * optional .CreateGameFailedMessage createGameFailedMessage = 21; */ public boolean hasCreateGameFailedMessage() { - return ((bitField0_ & 0x00200000) == 0x00200000); + return ((bitField0_ & 0x00100000) == 0x00100000); } /** - * optional .CreateGameFailedMessage createGameFailedMessage = 22; + * optional .CreateGameFailedMessage createGameFailedMessage = 21; */ public de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage getCreateGameFailedMessage() { return createGameFailedMessage_; } - // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; - public static final int INVITEPLAYERTOGAMEMESSAGE_FIELD_NUMBER = 23; - private de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage invitePlayerToGameMessage_; + // optional .JoinGameMessage joinGameMessage = 22; + public static final int JOINGAMEMESSAGE_FIELD_NUMBER = 22; + private de.pokerth.protocol.ProtoBuf.JoinGameMessage joinGameMessage_; /** - * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + * optional .JoinGameMessage joinGameMessage = 22; */ - public boolean hasInvitePlayerToGameMessage() { + public boolean hasJoinGameMessage() { + return ((bitField0_ & 0x00200000) == 0x00200000); + } + /** + * optional .JoinGameMessage joinGameMessage = 22; + */ + public de.pokerth.protocol.ProtoBuf.JoinGameMessage getJoinGameMessage() { + return joinGameMessage_; + } + + // optional .RejoinGameMessage rejoinGameMessage = 23; + public static final int REJOINGAMEMESSAGE_FIELD_NUMBER = 23; + private de.pokerth.protocol.ProtoBuf.RejoinGameMessage rejoinGameMessage_; + /** + * optional .RejoinGameMessage rejoinGameMessage = 23; + */ + public boolean hasRejoinGameMessage() { return ((bitField0_ & 0x00400000) == 0x00400000); } /** - * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + * optional .RejoinGameMessage rejoinGameMessage = 23; */ - public de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage getInvitePlayerToGameMessage() { - return invitePlayerToGameMessage_; + public de.pokerth.protocol.ProtoBuf.RejoinGameMessage getRejoinGameMessage() { + return rejoinGameMessage_; } - // optional .InviteNotifyMessage inviteNotifyMessage = 24; - public static final int INVITENOTIFYMESSAGE_FIELD_NUMBER = 24; - private de.pokerth.protocol.ProtoBuf.InviteNotifyMessage inviteNotifyMessage_; + // optional .JoinGameAckMessage joinGameAckMessage = 24; + public static final int JOINGAMEACKMESSAGE_FIELD_NUMBER = 24; + private de.pokerth.protocol.ProtoBuf.JoinGameAckMessage joinGameAckMessage_; /** - * optional .InviteNotifyMessage inviteNotifyMessage = 24; + * optional .JoinGameAckMessage joinGameAckMessage = 24; */ - public boolean hasInviteNotifyMessage() { + public boolean hasJoinGameAckMessage() { return ((bitField0_ & 0x00800000) == 0x00800000); } /** - * optional .InviteNotifyMessage inviteNotifyMessage = 24; + * optional .JoinGameAckMessage joinGameAckMessage = 24; + */ + public de.pokerth.protocol.ProtoBuf.JoinGameAckMessage getJoinGameAckMessage() { + return joinGameAckMessage_; + } + + // optional .JoinGameFailedMessage joinGameFailedMessage = 25; + public static final int JOINGAMEFAILEDMESSAGE_FIELD_NUMBER = 25; + private de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage joinGameFailedMessage_; + /** + * optional .JoinGameFailedMessage joinGameFailedMessage = 25; + */ + public boolean hasJoinGameFailedMessage() { + return ((bitField0_ & 0x01000000) == 0x01000000); + } + /** + * optional .JoinGameFailedMessage joinGameFailedMessage = 25; + */ + public de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage getJoinGameFailedMessage() { + return joinGameFailedMessage_; + } + + // optional .InviteNotifyMessage inviteNotifyMessage = 26; + public static final int INVITENOTIFYMESSAGE_FIELD_NUMBER = 26; + private de.pokerth.protocol.ProtoBuf.InviteNotifyMessage inviteNotifyMessage_; + /** + * optional .InviteNotifyMessage inviteNotifyMessage = 26; + */ + public boolean hasInviteNotifyMessage() { + return ((bitField0_ & 0x02000000) == 0x02000000); + } + /** + * optional .InviteNotifyMessage inviteNotifyMessage = 26; */ public de.pokerth.protocol.ProtoBuf.InviteNotifyMessage getInviteNotifyMessage() { return inviteNotifyMessage_; } - // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; - public static final int REJECTGAMEINVITATIONMESSAGE_FIELD_NUMBER = 25; + // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; + public static final int REJECTGAMEINVITATIONMESSAGE_FIELD_NUMBER = 27; private de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage rejectGameInvitationMessage_; /** - * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; */ public boolean hasRejectGameInvitationMessage() { - return ((bitField0_ & 0x01000000) == 0x01000000); + return ((bitField0_ & 0x04000000) == 0x04000000); } /** - * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; */ public de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage getRejectGameInvitationMessage() { return rejectGameInvitationMessage_; } - // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; - public static final int REJECTINVNOTIFYMESSAGE_FIELD_NUMBER = 26; + // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; + public static final int REJECTINVNOTIFYMESSAGE_FIELD_NUMBER = 28; private de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage rejectInvNotifyMessage_; /** - * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; */ public boolean hasRejectInvNotifyMessage() { - return ((bitField0_ & 0x02000000) == 0x02000000); + return ((bitField0_ & 0x08000000) == 0x08000000); } /** - * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; */ public de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage getRejectInvNotifyMessage() { return rejectInvNotifyMessage_; } - // optional .StatisticsMessage statisticsMessage = 27; - public static final int STATISTICSMESSAGE_FIELD_NUMBER = 27; + // optional .StatisticsMessage statisticsMessage = 29; + public static final int STATISTICSMESSAGE_FIELD_NUMBER = 29; private de.pokerth.protocol.ProtoBuf.StatisticsMessage statisticsMessage_; /** - * optional .StatisticsMessage statisticsMessage = 27; + * optional .StatisticsMessage statisticsMessage = 29; */ public boolean hasStatisticsMessage() { - return ((bitField0_ & 0x04000000) == 0x04000000); + return ((bitField0_ & 0x10000000) == 0x10000000); } /** - * optional .StatisticsMessage statisticsMessage = 27; + * optional .StatisticsMessage statisticsMessage = 29; */ public de.pokerth.protocol.ProtoBuf.StatisticsMessage getStatisticsMessage() { return statisticsMessage_; } - // optional .ChatRequestMessage chatRequestMessage = 28; - public static final int CHATREQUESTMESSAGE_FIELD_NUMBER = 28; + // optional .ChatRequestMessage chatRequestMessage = 30; + public static final int CHATREQUESTMESSAGE_FIELD_NUMBER = 30; private de.pokerth.protocol.ProtoBuf.ChatRequestMessage chatRequestMessage_; /** - * optional .ChatRequestMessage chatRequestMessage = 28; + * optional .ChatRequestMessage chatRequestMessage = 30; */ public boolean hasChatRequestMessage() { - return ((bitField0_ & 0x08000000) == 0x08000000); + return ((bitField0_ & 0x20000000) == 0x20000000); } /** - * optional .ChatRequestMessage chatRequestMessage = 28; + * optional .ChatRequestMessage chatRequestMessage = 30; */ public de.pokerth.protocol.ProtoBuf.ChatRequestMessage getChatRequestMessage() { return chatRequestMessage_; } - // optional .ChatMessage chatMessage = 29; - public static final int CHATMESSAGE_FIELD_NUMBER = 29; + // optional .ChatMessage chatMessage = 31; + public static final int CHATMESSAGE_FIELD_NUMBER = 31; private de.pokerth.protocol.ProtoBuf.ChatMessage chatMessage_; /** - * optional .ChatMessage chatMessage = 29; + * optional .ChatMessage chatMessage = 31; */ public boolean hasChatMessage() { - return ((bitField0_ & 0x10000000) == 0x10000000); + return ((bitField0_ & 0x40000000) == 0x40000000); } /** - * optional .ChatMessage chatMessage = 29; + * optional .ChatMessage chatMessage = 31; */ public de.pokerth.protocol.ProtoBuf.ChatMessage getChatMessage() { return chatMessage_; } - // optional .ChatRejectMessage chatRejectMessage = 30; - public static final int CHATREJECTMESSAGE_FIELD_NUMBER = 30; + // optional .ChatRejectMessage chatRejectMessage = 32; + public static final int CHATREJECTMESSAGE_FIELD_NUMBER = 32; private de.pokerth.protocol.ProtoBuf.ChatRejectMessage chatRejectMessage_; /** - * optional .ChatRejectMessage chatRejectMessage = 30; + * optional .ChatRejectMessage chatRejectMessage = 32; */ public boolean hasChatRejectMessage() { - return ((bitField0_ & 0x20000000) == 0x20000000); + return ((bitField0_ & 0x80000000) == 0x80000000); } /** - * optional .ChatRejectMessage chatRejectMessage = 30; + * optional .ChatRejectMessage chatRejectMessage = 32; */ public de.pokerth.protocol.ProtoBuf.ChatRejectMessage getChatRejectMessage() { return chatRejectMessage_; } - // optional .DialogMessage dialogMessage = 31; - public static final int DIALOGMESSAGE_FIELD_NUMBER = 31; + // optional .DialogMessage dialogMessage = 33; + public static final int DIALOGMESSAGE_FIELD_NUMBER = 33; private de.pokerth.protocol.ProtoBuf.DialogMessage dialogMessage_; /** - * optional .DialogMessage dialogMessage = 31; + * optional .DialogMessage dialogMessage = 33; */ public boolean hasDialogMessage() { - return ((bitField0_ & 0x40000000) == 0x40000000); + return ((bitField1_ & 0x00000001) == 0x00000001); } /** - * optional .DialogMessage dialogMessage = 31; + * optional .DialogMessage dialogMessage = 33; */ public de.pokerth.protocol.ProtoBuf.DialogMessage getDialogMessage() { return dialogMessage_; } - // optional .TimeoutWarningMessage timeoutWarningMessage = 32; - public static final int TIMEOUTWARNINGMESSAGE_FIELD_NUMBER = 32; + // optional .TimeoutWarningMessage timeoutWarningMessage = 34; + public static final int TIMEOUTWARNINGMESSAGE_FIELD_NUMBER = 34; private de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage timeoutWarningMessage_; /** - * optional .TimeoutWarningMessage timeoutWarningMessage = 32; + * optional .TimeoutWarningMessage timeoutWarningMessage = 34; */ public boolean hasTimeoutWarningMessage() { - return ((bitField0_ & 0x80000000) == 0x80000000); + return ((bitField1_ & 0x00000002) == 0x00000002); } /** - * optional .TimeoutWarningMessage timeoutWarningMessage = 32; + * optional .TimeoutWarningMessage timeoutWarningMessage = 34; */ public de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage getTimeoutWarningMessage() { return timeoutWarningMessage_; } - // optional .ResetTimeoutMessage resetTimeoutMessage = 33; - public static final int RESETTIMEOUTMESSAGE_FIELD_NUMBER = 33; + // optional .ResetTimeoutMessage resetTimeoutMessage = 35; + public static final int RESETTIMEOUTMESSAGE_FIELD_NUMBER = 35; private de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage resetTimeoutMessage_; /** - * optional .ResetTimeoutMessage resetTimeoutMessage = 33; + * optional .ResetTimeoutMessage resetTimeoutMessage = 35; */ public boolean hasResetTimeoutMessage() { - return ((bitField1_ & 0x00000001) == 0x00000001); + return ((bitField1_ & 0x00000004) == 0x00000004); } /** - * optional .ResetTimeoutMessage resetTimeoutMessage = 33; + * optional .ResetTimeoutMessage resetTimeoutMessage = 35; */ public de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage getResetTimeoutMessage() { return resetTimeoutMessage_; } - // optional .ReportAvatarMessage reportAvatarMessage = 34; - public static final int REPORTAVATARMESSAGE_FIELD_NUMBER = 34; + // optional .ReportAvatarMessage reportAvatarMessage = 36; + public static final int REPORTAVATARMESSAGE_FIELD_NUMBER = 36; private de.pokerth.protocol.ProtoBuf.ReportAvatarMessage reportAvatarMessage_; /** - * optional .ReportAvatarMessage reportAvatarMessage = 34; + * optional .ReportAvatarMessage reportAvatarMessage = 36; */ public boolean hasReportAvatarMessage() { - return ((bitField1_ & 0x00000002) == 0x00000002); + return ((bitField1_ & 0x00000008) == 0x00000008); } /** - * optional .ReportAvatarMessage reportAvatarMessage = 34; + * optional .ReportAvatarMessage reportAvatarMessage = 36; */ public de.pokerth.protocol.ProtoBuf.ReportAvatarMessage getReportAvatarMessage() { return reportAvatarMessage_; } - // optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; - public static final int REPORTAVATARACKMESSAGE_FIELD_NUMBER = 35; + // optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; + public static final int REPORTAVATARACKMESSAGE_FIELD_NUMBER = 37; private de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage reportAvatarAckMessage_; /** - * optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + * optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; */ public boolean hasReportAvatarAckMessage() { - return ((bitField1_ & 0x00000004) == 0x00000004); + return ((bitField1_ & 0x00000010) == 0x00000010); } /** - * optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + * optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; */ public de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage getReportAvatarAckMessage() { return reportAvatarAckMessage_; } - // optional .ReportGameMessage reportGameMessage = 36; - public static final int REPORTGAMEMESSAGE_FIELD_NUMBER = 36; + // optional .ReportGameMessage reportGameMessage = 38; + public static final int REPORTGAMEMESSAGE_FIELD_NUMBER = 38; private de.pokerth.protocol.ProtoBuf.ReportGameMessage reportGameMessage_; /** - * optional .ReportGameMessage reportGameMessage = 36; + * optional .ReportGameMessage reportGameMessage = 38; */ public boolean hasReportGameMessage() { - return ((bitField1_ & 0x00000008) == 0x00000008); + return ((bitField1_ & 0x00000020) == 0x00000020); } /** - * optional .ReportGameMessage reportGameMessage = 36; + * optional .ReportGameMessage reportGameMessage = 38; */ public de.pokerth.protocol.ProtoBuf.ReportGameMessage getReportGameMessage() { return reportGameMessage_; } - // optional .ReportGameAckMessage reportGameAckMessage = 37; - public static final int REPORTGAMEACKMESSAGE_FIELD_NUMBER = 37; + // optional .ReportGameAckMessage reportGameAckMessage = 39; + public static final int REPORTGAMEACKMESSAGE_FIELD_NUMBER = 39; private de.pokerth.protocol.ProtoBuf.ReportGameAckMessage reportGameAckMessage_; /** - * optional .ReportGameAckMessage reportGameAckMessage = 37; + * optional .ReportGameAckMessage reportGameAckMessage = 39; */ public boolean hasReportGameAckMessage() { - return ((bitField1_ & 0x00000010) == 0x00000010); + return ((bitField1_ & 0x00000040) == 0x00000040); } /** - * optional .ReportGameAckMessage reportGameAckMessage = 37; + * optional .ReportGameAckMessage reportGameAckMessage = 39; */ public de.pokerth.protocol.ProtoBuf.ReportGameAckMessage getReportGameAckMessage() { return reportGameAckMessage_; } - // optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; - public static final int ADMINREMOVEGAMEMESSAGE_FIELD_NUMBER = 38; + // optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; + public static final int ADMINREMOVEGAMEMESSAGE_FIELD_NUMBER = 40; private de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage adminRemoveGameMessage_; /** - * optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + * optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; */ public boolean hasAdminRemoveGameMessage() { - return ((bitField1_ & 0x00000020) == 0x00000020); + return ((bitField1_ & 0x00000080) == 0x00000080); } /** - * optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + * optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; */ public de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage getAdminRemoveGameMessage() { return adminRemoveGameMessage_; } - // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; - public static final int ADMINREMOVEGAMEACKMESSAGE_FIELD_NUMBER = 39; + // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; + public static final int ADMINREMOVEGAMEACKMESSAGE_FIELD_NUMBER = 41; private de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage adminRemoveGameAckMessage_; /** - * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; */ public boolean hasAdminRemoveGameAckMessage() { - return ((bitField1_ & 0x00000040) == 0x00000040); + return ((bitField1_ & 0x00000100) == 0x00000100); } /** - * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; */ public de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage getAdminRemoveGameAckMessage() { return adminRemoveGameAckMessage_; } - // optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; - public static final int ADMINBANPLAYERMESSAGE_FIELD_NUMBER = 40; + // optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; + public static final int ADMINBANPLAYERMESSAGE_FIELD_NUMBER = 42; private de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage adminBanPlayerMessage_; /** - * optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + * optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; */ public boolean hasAdminBanPlayerMessage() { - return ((bitField1_ & 0x00000080) == 0x00000080); + return ((bitField1_ & 0x00000200) == 0x00000200); } /** - * optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + * optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; */ public de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage getAdminBanPlayerMessage() { return adminBanPlayerMessage_; } - // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; - public static final int ADMINBANPLAYERACKMESSAGE_FIELD_NUMBER = 41; + // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; + public static final int ADMINBANPLAYERACKMESSAGE_FIELD_NUMBER = 43; private de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage adminBanPlayerAckMessage_; /** - * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; */ public boolean hasAdminBanPlayerAckMessage() { - return ((bitField1_ & 0x00000100) == 0x00000100); + return ((bitField1_ & 0x00000400) == 0x00000400); } /** - * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; */ public de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage getAdminBanPlayerAckMessage() { return adminBanPlayerAckMessage_; @@ -51019,7 +51236,7 @@ public final class ProtoBuf { * optional .ErrorMessage errorMessage = 1025; */ public boolean hasErrorMessage() { - return ((bitField1_ & 0x00000200) == 0x00000200); + return ((bitField1_ & 0x00000800) == 0x00000800); } /** * optional .ErrorMessage errorMessage = 1025; @@ -51029,9 +51246,8 @@ public final class ProtoBuf { } private void initFields() { - messageType_ = de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType.Type_InitMessage; - initMessage_ = de.pokerth.protocol.ProtoBuf.InitMessage.getDefaultInstance(); - initAckMessage_ = de.pokerth.protocol.ProtoBuf.InitAckMessage.getDefaultInstance(); + messageType_ = de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType.Type_InitDoneMessage; + initDoneMessage_ = de.pokerth.protocol.ProtoBuf.InitDoneMessage.getDefaultInstance(); avatarRequestMessage_ = de.pokerth.protocol.ProtoBuf.AvatarRequestMessage.getDefaultInstance(); avatarHeaderMessage_ = de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage.getDefaultInstance(); avatarDataMessage_ = de.pokerth.protocol.ProtoBuf.AvatarDataMessage.getDefaultInstance(); @@ -51051,7 +51267,10 @@ public final class ProtoBuf { subscriptionReplyMessage_ = de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage.getDefaultInstance(); createGameMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameMessage.getDefaultInstance(); createGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage.getDefaultInstance(); - invitePlayerToGameMessage_ = de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.getDefaultInstance(); + joinGameMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance(); + rejoinGameMessage_ = de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance(); + joinGameAckMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance(); + joinGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance(); inviteNotifyMessage_ = de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.getDefaultInstance(); rejectGameInvitationMessage_ = de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage.getDefaultInstance(); rejectInvNotifyMessage_ = de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage.getDefaultInstance(); @@ -51081,6 +51300,12 @@ public final class ProtoBuf { memoizedIsInitialized = 0; return false; } + if (hasInitDoneMessage()) { + if (!getInitDoneMessage().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } if (hasAvatarRequestMessage()) { if (!getAvatarRequestMessage().isInitialized()) { memoizedIsInitialized = 0; @@ -51189,8 +51414,26 @@ public final class ProtoBuf { return false; } } - if (hasInvitePlayerToGameMessage()) { - if (!getInvitePlayerToGameMessage().isInitialized()) { + if (hasJoinGameMessage()) { + if (!getJoinGameMessage().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasRejoinGameMessage()) { + if (!getRejoinGameMessage().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasJoinGameAckMessage()) { + if (!getJoinGameAckMessage().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasJoinGameFailedMessage()) { + if (!getJoinGameFailedMessage().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -51314,126 +51557,132 @@ public final class ProtoBuf { output.writeEnum(1, messageType_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, initMessage_); + output.writeMessage(2, initDoneMessage_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeMessage(3, initAckMessage_); + output.writeMessage(3, avatarRequestMessage_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeMessage(4, avatarRequestMessage_); + output.writeMessage(4, avatarHeaderMessage_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeMessage(5, avatarHeaderMessage_); + output.writeMessage(5, avatarDataMessage_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { - output.writeMessage(6, avatarDataMessage_); + output.writeMessage(6, avatarEndMessage_); } if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeMessage(7, avatarEndMessage_); + output.writeMessage(7, unknownAvatarMessage_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { - output.writeMessage(8, unknownAvatarMessage_); + output.writeMessage(8, playerListMessage_); } if (((bitField0_ & 0x00000100) == 0x00000100)) { - output.writeMessage(9, playerListMessage_); + output.writeMessage(9, gameListNewMessage_); } if (((bitField0_ & 0x00000200) == 0x00000200)) { - output.writeMessage(10, gameListNewMessage_); + output.writeMessage(10, gameListUpdateMessage_); } if (((bitField0_ & 0x00000400) == 0x00000400)) { - output.writeMessage(11, gameListUpdateMessage_); + output.writeMessage(11, gameListPlayerJoinedMessage_); } if (((bitField0_ & 0x00000800) == 0x00000800)) { - output.writeMessage(12, gameListPlayerJoinedMessage_); + output.writeMessage(12, gameListPlayerLeftMessage_); } if (((bitField0_ & 0x00001000) == 0x00001000)) { - output.writeMessage(13, gameListPlayerLeftMessage_); + output.writeMessage(13, gameListSpectatorJoinedMessage_); } if (((bitField0_ & 0x00002000) == 0x00002000)) { - output.writeMessage(14, gameListSpectatorJoinedMessage_); + output.writeMessage(14, gameListSpectatorLeftMessage_); } if (((bitField0_ & 0x00004000) == 0x00004000)) { - output.writeMessage(15, gameListSpectatorLeftMessage_); + output.writeMessage(15, gameListAdminChangedMessage_); } if (((bitField0_ & 0x00008000) == 0x00008000)) { - output.writeMessage(16, gameListAdminChangedMessage_); + output.writeMessage(16, playerInfoRequestMessage_); } if (((bitField0_ & 0x00010000) == 0x00010000)) { - output.writeMessage(17, playerInfoRequestMessage_); + output.writeMessage(17, playerInfoReplyMessage_); } if (((bitField0_ & 0x00020000) == 0x00020000)) { - output.writeMessage(18, playerInfoReplyMessage_); + output.writeMessage(18, subscriptionRequestMessage_); } if (((bitField0_ & 0x00040000) == 0x00040000)) { - output.writeMessage(19, subscriptionRequestMessage_); + output.writeMessage(19, subscriptionReplyMessage_); } if (((bitField0_ & 0x00080000) == 0x00080000)) { - output.writeMessage(20, subscriptionReplyMessage_); + output.writeMessage(20, createGameMessage_); } if (((bitField0_ & 0x00100000) == 0x00100000)) { - output.writeMessage(21, createGameMessage_); + output.writeMessage(21, createGameFailedMessage_); } if (((bitField0_ & 0x00200000) == 0x00200000)) { - output.writeMessage(22, createGameFailedMessage_); + output.writeMessage(22, joinGameMessage_); } if (((bitField0_ & 0x00400000) == 0x00400000)) { - output.writeMessage(23, invitePlayerToGameMessage_); + output.writeMessage(23, rejoinGameMessage_); } if (((bitField0_ & 0x00800000) == 0x00800000)) { - output.writeMessage(24, inviteNotifyMessage_); + output.writeMessage(24, joinGameAckMessage_); } if (((bitField0_ & 0x01000000) == 0x01000000)) { - output.writeMessage(25, rejectGameInvitationMessage_); + output.writeMessage(25, joinGameFailedMessage_); } if (((bitField0_ & 0x02000000) == 0x02000000)) { - output.writeMessage(26, rejectInvNotifyMessage_); + output.writeMessage(26, inviteNotifyMessage_); } if (((bitField0_ & 0x04000000) == 0x04000000)) { - output.writeMessage(27, statisticsMessage_); + output.writeMessage(27, rejectGameInvitationMessage_); } if (((bitField0_ & 0x08000000) == 0x08000000)) { - output.writeMessage(28, chatRequestMessage_); + output.writeMessage(28, rejectInvNotifyMessage_); } if (((bitField0_ & 0x10000000) == 0x10000000)) { - output.writeMessage(29, chatMessage_); + output.writeMessage(29, statisticsMessage_); } if (((bitField0_ & 0x20000000) == 0x20000000)) { - output.writeMessage(30, chatRejectMessage_); + output.writeMessage(30, chatRequestMessage_); } if (((bitField0_ & 0x40000000) == 0x40000000)) { - output.writeMessage(31, dialogMessage_); + output.writeMessage(31, chatMessage_); } if (((bitField0_ & 0x80000000) == 0x80000000)) { - output.writeMessage(32, timeoutWarningMessage_); + output.writeMessage(32, chatRejectMessage_); } if (((bitField1_ & 0x00000001) == 0x00000001)) { - output.writeMessage(33, resetTimeoutMessage_); + output.writeMessage(33, dialogMessage_); } if (((bitField1_ & 0x00000002) == 0x00000002)) { - output.writeMessage(34, reportAvatarMessage_); + output.writeMessage(34, timeoutWarningMessage_); } if (((bitField1_ & 0x00000004) == 0x00000004)) { - output.writeMessage(35, reportAvatarAckMessage_); + output.writeMessage(35, resetTimeoutMessage_); } if (((bitField1_ & 0x00000008) == 0x00000008)) { - output.writeMessage(36, reportGameMessage_); + output.writeMessage(36, reportAvatarMessage_); } if (((bitField1_ & 0x00000010) == 0x00000010)) { - output.writeMessage(37, reportGameAckMessage_); + output.writeMessage(37, reportAvatarAckMessage_); } if (((bitField1_ & 0x00000020) == 0x00000020)) { - output.writeMessage(38, adminRemoveGameMessage_); + output.writeMessage(38, reportGameMessage_); } if (((bitField1_ & 0x00000040) == 0x00000040)) { - output.writeMessage(39, adminRemoveGameAckMessage_); + output.writeMessage(39, reportGameAckMessage_); } if (((bitField1_ & 0x00000080) == 0x00000080)) { - output.writeMessage(40, adminBanPlayerMessage_); + output.writeMessage(40, adminRemoveGameMessage_); } if (((bitField1_ & 0x00000100) == 0x00000100)) { - output.writeMessage(41, adminBanPlayerAckMessage_); + output.writeMessage(41, adminRemoveGameAckMessage_); } if (((bitField1_ & 0x00000200) == 0x00000200)) { + output.writeMessage(42, adminBanPlayerMessage_); + } + if (((bitField1_ & 0x00000400) == 0x00000400)) { + output.writeMessage(43, adminBanPlayerAckMessage_); + } + if (((bitField1_ & 0x00000800) == 0x00000800)) { output.writeMessage(1025, errorMessage_); } } @@ -51450,165 +51699,173 @@ public final class ProtoBuf { } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, initMessage_); + .computeMessageSize(2, initDoneMessage_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, initAckMessage_); + .computeMessageSize(3, avatarRequestMessage_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, avatarRequestMessage_); + .computeMessageSize(4, avatarHeaderMessage_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, avatarHeaderMessage_); + .computeMessageSize(5, avatarDataMessage_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, avatarDataMessage_); + .computeMessageSize(6, avatarEndMessage_); } if (((bitField0_ & 0x00000040) == 0x00000040)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, avatarEndMessage_); + .computeMessageSize(7, unknownAvatarMessage_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, unknownAvatarMessage_); + .computeMessageSize(8, playerListMessage_); } if (((bitField0_ & 0x00000100) == 0x00000100)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, playerListMessage_); + .computeMessageSize(9, gameListNewMessage_); } if (((bitField0_ & 0x00000200) == 0x00000200)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, gameListNewMessage_); + .computeMessageSize(10, gameListUpdateMessage_); } if (((bitField0_ & 0x00000400) == 0x00000400)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, gameListUpdateMessage_); + .computeMessageSize(11, gameListPlayerJoinedMessage_); } if (((bitField0_ & 0x00000800) == 0x00000800)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, gameListPlayerJoinedMessage_); + .computeMessageSize(12, gameListPlayerLeftMessage_); } if (((bitField0_ & 0x00001000) == 0x00001000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, gameListPlayerLeftMessage_); + .computeMessageSize(13, gameListSpectatorJoinedMessage_); } if (((bitField0_ & 0x00002000) == 0x00002000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, gameListSpectatorJoinedMessage_); + .computeMessageSize(14, gameListSpectatorLeftMessage_); } if (((bitField0_ & 0x00004000) == 0x00004000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, gameListSpectatorLeftMessage_); + .computeMessageSize(15, gameListAdminChangedMessage_); } if (((bitField0_ & 0x00008000) == 0x00008000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(16, gameListAdminChangedMessage_); + .computeMessageSize(16, playerInfoRequestMessage_); } if (((bitField0_ & 0x00010000) == 0x00010000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(17, playerInfoRequestMessage_); + .computeMessageSize(17, playerInfoReplyMessage_); } if (((bitField0_ & 0x00020000) == 0x00020000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(18, playerInfoReplyMessage_); + .computeMessageSize(18, subscriptionRequestMessage_); } if (((bitField0_ & 0x00040000) == 0x00040000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(19, subscriptionRequestMessage_); + .computeMessageSize(19, subscriptionReplyMessage_); } if (((bitField0_ & 0x00080000) == 0x00080000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(20, subscriptionReplyMessage_); + .computeMessageSize(20, createGameMessage_); } if (((bitField0_ & 0x00100000) == 0x00100000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(21, createGameMessage_); + .computeMessageSize(21, createGameFailedMessage_); } if (((bitField0_ & 0x00200000) == 0x00200000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(22, createGameFailedMessage_); + .computeMessageSize(22, joinGameMessage_); } if (((bitField0_ & 0x00400000) == 0x00400000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(23, invitePlayerToGameMessage_); + .computeMessageSize(23, rejoinGameMessage_); } if (((bitField0_ & 0x00800000) == 0x00800000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(24, inviteNotifyMessage_); + .computeMessageSize(24, joinGameAckMessage_); } if (((bitField0_ & 0x01000000) == 0x01000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(25, rejectGameInvitationMessage_); + .computeMessageSize(25, joinGameFailedMessage_); } if (((bitField0_ & 0x02000000) == 0x02000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(26, rejectInvNotifyMessage_); + .computeMessageSize(26, inviteNotifyMessage_); } if (((bitField0_ & 0x04000000) == 0x04000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(27, statisticsMessage_); + .computeMessageSize(27, rejectGameInvitationMessage_); } if (((bitField0_ & 0x08000000) == 0x08000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(28, chatRequestMessage_); + .computeMessageSize(28, rejectInvNotifyMessage_); } if (((bitField0_ & 0x10000000) == 0x10000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(29, chatMessage_); + .computeMessageSize(29, statisticsMessage_); } if (((bitField0_ & 0x20000000) == 0x20000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(30, chatRejectMessage_); + .computeMessageSize(30, chatRequestMessage_); } if (((bitField0_ & 0x40000000) == 0x40000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(31, dialogMessage_); + .computeMessageSize(31, chatMessage_); } if (((bitField0_ & 0x80000000) == 0x80000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(32, timeoutWarningMessage_); + .computeMessageSize(32, chatRejectMessage_); } if (((bitField1_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(33, resetTimeoutMessage_); + .computeMessageSize(33, dialogMessage_); } if (((bitField1_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(34, reportAvatarMessage_); + .computeMessageSize(34, timeoutWarningMessage_); } if (((bitField1_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(35, reportAvatarAckMessage_); + .computeMessageSize(35, resetTimeoutMessage_); } if (((bitField1_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(36, reportGameMessage_); + .computeMessageSize(36, reportAvatarMessage_); } if (((bitField1_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(37, reportGameAckMessage_); + .computeMessageSize(37, reportAvatarAckMessage_); } if (((bitField1_ & 0x00000020) == 0x00000020)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(38, adminRemoveGameMessage_); + .computeMessageSize(38, reportGameMessage_); } if (((bitField1_ & 0x00000040) == 0x00000040)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(39, adminRemoveGameAckMessage_); + .computeMessageSize(39, reportGameAckMessage_); } if (((bitField1_ & 0x00000080) == 0x00000080)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(40, adminBanPlayerMessage_); + .computeMessageSize(40, adminRemoveGameMessage_); } if (((bitField1_ & 0x00000100) == 0x00000100)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(41, adminBanPlayerAckMessage_); + .computeMessageSize(41, adminRemoveGameAckMessage_); } if (((bitField1_ & 0x00000200) == 0x00000200)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(42, adminBanPlayerMessage_); + } + if (((bitField1_ & 0x00000400) == 0x00000400)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(43, adminBanPlayerAckMessage_); + } + if (((bitField1_ & 0x00000800) == 0x00000800)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1025, errorMessage_); } @@ -51703,90 +51960,94 @@ public final class ProtoBuf { public Builder clear() { super.clear(); - messageType_ = de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType.Type_InitMessage; + messageType_ = de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType.Type_InitDoneMessage; bitField0_ = (bitField0_ & ~0x00000001); - initMessage_ = de.pokerth.protocol.ProtoBuf.InitMessage.getDefaultInstance(); + initDoneMessage_ = de.pokerth.protocol.ProtoBuf.InitDoneMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); - initAckMessage_ = de.pokerth.protocol.ProtoBuf.InitAckMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000004); avatarRequestMessage_ = de.pokerth.protocol.ProtoBuf.AvatarRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000004); avatarHeaderMessage_ = de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000008); avatarDataMessage_ = de.pokerth.protocol.ProtoBuf.AvatarDataMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000010); avatarEndMessage_ = de.pokerth.protocol.ProtoBuf.AvatarEndMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000020); unknownAvatarMessage_ = de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000040); playerListMessage_ = de.pokerth.protocol.ProtoBuf.PlayerListMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000080); gameListNewMessage_ = de.pokerth.protocol.ProtoBuf.GameListNewMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000100); gameListUpdateMessage_ = de.pokerth.protocol.ProtoBuf.GameListUpdateMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000400); + bitField0_ = (bitField0_ & ~0x00000200); gameListPlayerJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000800); + bitField0_ = (bitField0_ & ~0x00000400); gameListPlayerLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00000800); gameListSpectatorJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00001000); gameListSpectatorLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00004000); + bitField0_ = (bitField0_ & ~0x00002000); gameListAdminChangedMessage_ = de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00008000); + bitField0_ = (bitField0_ & ~0x00004000); playerInfoRequestMessage_ = de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00008000); playerInfoReplyMessage_ = de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00020000); + bitField0_ = (bitField0_ & ~0x00010000); subscriptionRequestMessage_ = de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00040000); + bitField0_ = (bitField0_ & ~0x00020000); subscriptionReplyMessage_ = de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00080000); + bitField0_ = (bitField0_ & ~0x00040000); createGameMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00100000); + bitField0_ = (bitField0_ & ~0x00080000); createGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00100000); + joinGameMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00200000); - invitePlayerToGameMessage_ = de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.getDefaultInstance(); + rejoinGameMessage_ = de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00400000); - inviteNotifyMessage_ = de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.getDefaultInstance(); + joinGameAckMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00800000); - rejectGameInvitationMessage_ = de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage.getDefaultInstance(); + joinGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x01000000); - rejectInvNotifyMessage_ = de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage.getDefaultInstance(); + inviteNotifyMessage_ = de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x02000000); - statisticsMessage_ = de.pokerth.protocol.ProtoBuf.StatisticsMessage.getDefaultInstance(); + rejectGameInvitationMessage_ = de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x04000000); - chatRequestMessage_ = de.pokerth.protocol.ProtoBuf.ChatRequestMessage.getDefaultInstance(); + rejectInvNotifyMessage_ = de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x08000000); - chatMessage_ = de.pokerth.protocol.ProtoBuf.ChatMessage.getDefaultInstance(); + statisticsMessage_ = de.pokerth.protocol.ProtoBuf.StatisticsMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x10000000); - chatRejectMessage_ = de.pokerth.protocol.ProtoBuf.ChatRejectMessage.getDefaultInstance(); + chatRequestMessage_ = de.pokerth.protocol.ProtoBuf.ChatRequestMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x20000000); - dialogMessage_ = de.pokerth.protocol.ProtoBuf.DialogMessage.getDefaultInstance(); + chatMessage_ = de.pokerth.protocol.ProtoBuf.ChatMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x40000000); - timeoutWarningMessage_ = de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.getDefaultInstance(); + chatRejectMessage_ = de.pokerth.protocol.ProtoBuf.ChatRejectMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x80000000); - resetTimeoutMessage_ = de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.getDefaultInstance(); + dialogMessage_ = de.pokerth.protocol.ProtoBuf.DialogMessage.getDefaultInstance(); bitField1_ = (bitField1_ & ~0x00000001); - reportAvatarMessage_ = de.pokerth.protocol.ProtoBuf.ReportAvatarMessage.getDefaultInstance(); + timeoutWarningMessage_ = de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.getDefaultInstance(); bitField1_ = (bitField1_ & ~0x00000002); - reportAvatarAckMessage_ = de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage.getDefaultInstance(); + resetTimeoutMessage_ = de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.getDefaultInstance(); bitField1_ = (bitField1_ & ~0x00000004); - reportGameMessage_ = de.pokerth.protocol.ProtoBuf.ReportGameMessage.getDefaultInstance(); + reportAvatarMessage_ = de.pokerth.protocol.ProtoBuf.ReportAvatarMessage.getDefaultInstance(); bitField1_ = (bitField1_ & ~0x00000008); - reportGameAckMessage_ = de.pokerth.protocol.ProtoBuf.ReportGameAckMessage.getDefaultInstance(); + reportAvatarAckMessage_ = de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage.getDefaultInstance(); bitField1_ = (bitField1_ & ~0x00000010); - adminRemoveGameMessage_ = de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage.getDefaultInstance(); + reportGameMessage_ = de.pokerth.protocol.ProtoBuf.ReportGameMessage.getDefaultInstance(); bitField1_ = (bitField1_ & ~0x00000020); - adminRemoveGameAckMessage_ = de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage.getDefaultInstance(); + reportGameAckMessage_ = de.pokerth.protocol.ProtoBuf.ReportGameAckMessage.getDefaultInstance(); bitField1_ = (bitField1_ & ~0x00000040); - adminBanPlayerMessage_ = de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage.getDefaultInstance(); + adminRemoveGameMessage_ = de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage.getDefaultInstance(); bitField1_ = (bitField1_ & ~0x00000080); - adminBanPlayerAckMessage_ = de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage.getDefaultInstance(); + adminRemoveGameAckMessage_ = de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage.getDefaultInstance(); bitField1_ = (bitField1_ & ~0x00000100); - errorMessage_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.getDefaultInstance(); + adminBanPlayerMessage_ = de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage.getDefaultInstance(); bitField1_ = (bitField1_ & ~0x00000200); + adminBanPlayerAckMessage_ = de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage.getDefaultInstance(); + bitField1_ = (bitField1_ & ~0x00000400); + errorMessage_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.getDefaultInstance(); + bitField1_ = (bitField1_ & ~0x00000800); return this; } @@ -51819,166 +52080,174 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.initMessage_ = initMessage_; + result.initDoneMessage_ = initDoneMessage_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.initAckMessage_ = initAckMessage_; + result.avatarRequestMessage_ = avatarRequestMessage_; if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000008; } - result.avatarRequestMessage_ = avatarRequestMessage_; + result.avatarHeaderMessage_ = avatarHeaderMessage_; if (((from_bitField0_ & 0x00000010) == 0x00000010)) { to_bitField0_ |= 0x00000010; } - result.avatarHeaderMessage_ = avatarHeaderMessage_; + result.avatarDataMessage_ = avatarDataMessage_; if (((from_bitField0_ & 0x00000020) == 0x00000020)) { to_bitField0_ |= 0x00000020; } - result.avatarDataMessage_ = avatarDataMessage_; + result.avatarEndMessage_ = avatarEndMessage_; if (((from_bitField0_ & 0x00000040) == 0x00000040)) { to_bitField0_ |= 0x00000040; } - result.avatarEndMessage_ = avatarEndMessage_; + result.unknownAvatarMessage_ = unknownAvatarMessage_; if (((from_bitField0_ & 0x00000080) == 0x00000080)) { to_bitField0_ |= 0x00000080; } - result.unknownAvatarMessage_ = unknownAvatarMessage_; + result.playerListMessage_ = playerListMessage_; if (((from_bitField0_ & 0x00000100) == 0x00000100)) { to_bitField0_ |= 0x00000100; } - result.playerListMessage_ = playerListMessage_; + result.gameListNewMessage_ = gameListNewMessage_; if (((from_bitField0_ & 0x00000200) == 0x00000200)) { to_bitField0_ |= 0x00000200; } - result.gameListNewMessage_ = gameListNewMessage_; + result.gameListUpdateMessage_ = gameListUpdateMessage_; if (((from_bitField0_ & 0x00000400) == 0x00000400)) { to_bitField0_ |= 0x00000400; } - result.gameListUpdateMessage_ = gameListUpdateMessage_; + result.gameListPlayerJoinedMessage_ = gameListPlayerJoinedMessage_; if (((from_bitField0_ & 0x00000800) == 0x00000800)) { to_bitField0_ |= 0x00000800; } - result.gameListPlayerJoinedMessage_ = gameListPlayerJoinedMessage_; + result.gameListPlayerLeftMessage_ = gameListPlayerLeftMessage_; if (((from_bitField0_ & 0x00001000) == 0x00001000)) { to_bitField0_ |= 0x00001000; } - result.gameListPlayerLeftMessage_ = gameListPlayerLeftMessage_; + result.gameListSpectatorJoinedMessage_ = gameListSpectatorJoinedMessage_; if (((from_bitField0_ & 0x00002000) == 0x00002000)) { to_bitField0_ |= 0x00002000; } - result.gameListSpectatorJoinedMessage_ = gameListSpectatorJoinedMessage_; + result.gameListSpectatorLeftMessage_ = gameListSpectatorLeftMessage_; if (((from_bitField0_ & 0x00004000) == 0x00004000)) { to_bitField0_ |= 0x00004000; } - result.gameListSpectatorLeftMessage_ = gameListSpectatorLeftMessage_; + result.gameListAdminChangedMessage_ = gameListAdminChangedMessage_; if (((from_bitField0_ & 0x00008000) == 0x00008000)) { to_bitField0_ |= 0x00008000; } - result.gameListAdminChangedMessage_ = gameListAdminChangedMessage_; + result.playerInfoRequestMessage_ = playerInfoRequestMessage_; if (((from_bitField0_ & 0x00010000) == 0x00010000)) { to_bitField0_ |= 0x00010000; } - result.playerInfoRequestMessage_ = playerInfoRequestMessage_; + result.playerInfoReplyMessage_ = playerInfoReplyMessage_; if (((from_bitField0_ & 0x00020000) == 0x00020000)) { to_bitField0_ |= 0x00020000; } - result.playerInfoReplyMessage_ = playerInfoReplyMessage_; + result.subscriptionRequestMessage_ = subscriptionRequestMessage_; if (((from_bitField0_ & 0x00040000) == 0x00040000)) { to_bitField0_ |= 0x00040000; } - result.subscriptionRequestMessage_ = subscriptionRequestMessage_; + result.subscriptionReplyMessage_ = subscriptionReplyMessage_; if (((from_bitField0_ & 0x00080000) == 0x00080000)) { to_bitField0_ |= 0x00080000; } - result.subscriptionReplyMessage_ = subscriptionReplyMessage_; + result.createGameMessage_ = createGameMessage_; if (((from_bitField0_ & 0x00100000) == 0x00100000)) { to_bitField0_ |= 0x00100000; } - result.createGameMessage_ = createGameMessage_; + result.createGameFailedMessage_ = createGameFailedMessage_; if (((from_bitField0_ & 0x00200000) == 0x00200000)) { to_bitField0_ |= 0x00200000; } - result.createGameFailedMessage_ = createGameFailedMessage_; + result.joinGameMessage_ = joinGameMessage_; if (((from_bitField0_ & 0x00400000) == 0x00400000)) { to_bitField0_ |= 0x00400000; } - result.invitePlayerToGameMessage_ = invitePlayerToGameMessage_; + result.rejoinGameMessage_ = rejoinGameMessage_; if (((from_bitField0_ & 0x00800000) == 0x00800000)) { to_bitField0_ |= 0x00800000; } - result.inviteNotifyMessage_ = inviteNotifyMessage_; + result.joinGameAckMessage_ = joinGameAckMessage_; if (((from_bitField0_ & 0x01000000) == 0x01000000)) { to_bitField0_ |= 0x01000000; } - result.rejectGameInvitationMessage_ = rejectGameInvitationMessage_; + result.joinGameFailedMessage_ = joinGameFailedMessage_; if (((from_bitField0_ & 0x02000000) == 0x02000000)) { to_bitField0_ |= 0x02000000; } - result.rejectInvNotifyMessage_ = rejectInvNotifyMessage_; + result.inviteNotifyMessage_ = inviteNotifyMessage_; if (((from_bitField0_ & 0x04000000) == 0x04000000)) { to_bitField0_ |= 0x04000000; } - result.statisticsMessage_ = statisticsMessage_; + result.rejectGameInvitationMessage_ = rejectGameInvitationMessage_; if (((from_bitField0_ & 0x08000000) == 0x08000000)) { to_bitField0_ |= 0x08000000; } - result.chatRequestMessage_ = chatRequestMessage_; + result.rejectInvNotifyMessage_ = rejectInvNotifyMessage_; if (((from_bitField0_ & 0x10000000) == 0x10000000)) { to_bitField0_ |= 0x10000000; } - result.chatMessage_ = chatMessage_; + result.statisticsMessage_ = statisticsMessage_; if (((from_bitField0_ & 0x20000000) == 0x20000000)) { to_bitField0_ |= 0x20000000; } - result.chatRejectMessage_ = chatRejectMessage_; + result.chatRequestMessage_ = chatRequestMessage_; if (((from_bitField0_ & 0x40000000) == 0x40000000)) { to_bitField0_ |= 0x40000000; } - result.dialogMessage_ = dialogMessage_; + result.chatMessage_ = chatMessage_; if (((from_bitField0_ & 0x80000000) == 0x80000000)) { to_bitField0_ |= 0x80000000; } - result.timeoutWarningMessage_ = timeoutWarningMessage_; + result.chatRejectMessage_ = chatRejectMessage_; if (((from_bitField1_ & 0x00000001) == 0x00000001)) { to_bitField1_ |= 0x00000001; } - result.resetTimeoutMessage_ = resetTimeoutMessage_; + result.dialogMessage_ = dialogMessage_; if (((from_bitField1_ & 0x00000002) == 0x00000002)) { to_bitField1_ |= 0x00000002; } - result.reportAvatarMessage_ = reportAvatarMessage_; + result.timeoutWarningMessage_ = timeoutWarningMessage_; if (((from_bitField1_ & 0x00000004) == 0x00000004)) { to_bitField1_ |= 0x00000004; } - result.reportAvatarAckMessage_ = reportAvatarAckMessage_; + result.resetTimeoutMessage_ = resetTimeoutMessage_; if (((from_bitField1_ & 0x00000008) == 0x00000008)) { to_bitField1_ |= 0x00000008; } - result.reportGameMessage_ = reportGameMessage_; + result.reportAvatarMessage_ = reportAvatarMessage_; if (((from_bitField1_ & 0x00000010) == 0x00000010)) { to_bitField1_ |= 0x00000010; } - result.reportGameAckMessage_ = reportGameAckMessage_; + result.reportAvatarAckMessage_ = reportAvatarAckMessage_; if (((from_bitField1_ & 0x00000020) == 0x00000020)) { to_bitField1_ |= 0x00000020; } - result.adminRemoveGameMessage_ = adminRemoveGameMessage_; + result.reportGameMessage_ = reportGameMessage_; if (((from_bitField1_ & 0x00000040) == 0x00000040)) { to_bitField1_ |= 0x00000040; } - result.adminRemoveGameAckMessage_ = adminRemoveGameAckMessage_; + result.reportGameAckMessage_ = reportGameAckMessage_; if (((from_bitField1_ & 0x00000080) == 0x00000080)) { to_bitField1_ |= 0x00000080; } - result.adminBanPlayerMessage_ = adminBanPlayerMessage_; + result.adminRemoveGameMessage_ = adminRemoveGameMessage_; if (((from_bitField1_ & 0x00000100) == 0x00000100)) { to_bitField1_ |= 0x00000100; } - result.adminBanPlayerAckMessage_ = adminBanPlayerAckMessage_; + result.adminRemoveGameAckMessage_ = adminRemoveGameAckMessage_; if (((from_bitField1_ & 0x00000200) == 0x00000200)) { to_bitField1_ |= 0x00000200; } + result.adminBanPlayerMessage_ = adminBanPlayerMessage_; + if (((from_bitField1_ & 0x00000400) == 0x00000400)) { + to_bitField1_ |= 0x00000400; + } + result.adminBanPlayerAckMessage_ = adminBanPlayerAckMessage_; + if (((from_bitField1_ & 0x00000800) == 0x00000800)) { + to_bitField1_ |= 0x00000800; + } result.errorMessage_ = errorMessage_; result.bitField0_ = to_bitField0_; result.bitField1_ = to_bitField1_; @@ -51990,11 +52259,8 @@ public final class ProtoBuf { if (other.hasMessageType()) { setMessageType(other.getMessageType()); } - if (other.hasInitMessage()) { - mergeInitMessage(other.getInitMessage()); - } - if (other.hasInitAckMessage()) { - mergeInitAckMessage(other.getInitAckMessage()); + if (other.hasInitDoneMessage()) { + mergeInitDoneMessage(other.getInitDoneMessage()); } if (other.hasAvatarRequestMessage()) { mergeAvatarRequestMessage(other.getAvatarRequestMessage()); @@ -52053,8 +52319,17 @@ public final class ProtoBuf { if (other.hasCreateGameFailedMessage()) { mergeCreateGameFailedMessage(other.getCreateGameFailedMessage()); } - if (other.hasInvitePlayerToGameMessage()) { - mergeInvitePlayerToGameMessage(other.getInvitePlayerToGameMessage()); + if (other.hasJoinGameMessage()) { + mergeJoinGameMessage(other.getJoinGameMessage()); + } + if (other.hasRejoinGameMessage()) { + mergeRejoinGameMessage(other.getRejoinGameMessage()); + } + if (other.hasJoinGameAckMessage()) { + mergeJoinGameAckMessage(other.getJoinGameAckMessage()); + } + if (other.hasJoinGameFailedMessage()) { + mergeJoinGameFailedMessage(other.getJoinGameFailedMessage()); } if (other.hasInviteNotifyMessage()) { mergeInviteNotifyMessage(other.getInviteNotifyMessage()); @@ -52121,6 +52396,12 @@ public final class ProtoBuf { return false; } + if (hasInitDoneMessage()) { + if (!getInitDoneMessage().isInitialized()) { + + return false; + } + } if (hasAvatarRequestMessage()) { if (!getAvatarRequestMessage().isInitialized()) { @@ -52229,8 +52510,26 @@ public final class ProtoBuf { return false; } } - if (hasInvitePlayerToGameMessage()) { - if (!getInvitePlayerToGameMessage().isInitialized()) { + if (hasJoinGameMessage()) { + if (!getJoinGameMessage().isInitialized()) { + + return false; + } + } + if (hasRejoinGameMessage()) { + if (!getRejoinGameMessage().isInitialized()) { + + return false; + } + } + if (hasJoinGameAckMessage()) { + if (!getJoinGameAckMessage().isInitialized()) { + + return false; + } + } + if (hasJoinGameFailedMessage()) { + if (!getJoinGameFailedMessage().isInitialized()) { return false; } @@ -52367,7 +52666,7 @@ public final class ProtoBuf { private int bitField1_; // required .LobbyMessage.LobbyMessageType messageType = 1; - private de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType messageType_ = de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType.Type_InitMessage; + private de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType messageType_ = de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType.Type_InitDoneMessage; /** * required .LobbyMessage.LobbyMessageType messageType = 1; */ @@ -52397,149 +52696,88 @@ public final class ProtoBuf { */ public Builder clearMessageType() { bitField0_ = (bitField0_ & ~0x00000001); - messageType_ = de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType.Type_InitMessage; + messageType_ = de.pokerth.protocol.ProtoBuf.LobbyMessage.LobbyMessageType.Type_InitDoneMessage; return this; } - // optional .InitMessage initMessage = 2; - private de.pokerth.protocol.ProtoBuf.InitMessage initMessage_ = de.pokerth.protocol.ProtoBuf.InitMessage.getDefaultInstance(); + // optional .InitDoneMessage initDoneMessage = 2; + private de.pokerth.protocol.ProtoBuf.InitDoneMessage initDoneMessage_ = de.pokerth.protocol.ProtoBuf.InitDoneMessage.getDefaultInstance(); /** - * optional .InitMessage initMessage = 2; + * optional .InitDoneMessage initDoneMessage = 2; */ - public boolean hasInitMessage() { + public boolean hasInitDoneMessage() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional .InitMessage initMessage = 2; + * optional .InitDoneMessage initDoneMessage = 2; */ - public de.pokerth.protocol.ProtoBuf.InitMessage getInitMessage() { - return initMessage_; + public de.pokerth.protocol.ProtoBuf.InitDoneMessage getInitDoneMessage() { + return initDoneMessage_; } /** - * optional .InitMessage initMessage = 2; + * optional .InitDoneMessage initDoneMessage = 2; */ - public Builder setInitMessage(de.pokerth.protocol.ProtoBuf.InitMessage value) { + public Builder setInitDoneMessage(de.pokerth.protocol.ProtoBuf.InitDoneMessage value) { if (value == null) { throw new NullPointerException(); } - initMessage_ = value; + initDoneMessage_ = value; bitField0_ |= 0x00000002; return this; } /** - * optional .InitMessage initMessage = 2; + * optional .InitDoneMessage initDoneMessage = 2; */ - public Builder setInitMessage( - de.pokerth.protocol.ProtoBuf.InitMessage.Builder builderForValue) { - initMessage_ = builderForValue.build(); + public Builder setInitDoneMessage( + de.pokerth.protocol.ProtoBuf.InitDoneMessage.Builder builderForValue) { + initDoneMessage_ = builderForValue.build(); bitField0_ |= 0x00000002; return this; } /** - * optional .InitMessage initMessage = 2; + * optional .InitDoneMessage initDoneMessage = 2; */ - public Builder mergeInitMessage(de.pokerth.protocol.ProtoBuf.InitMessage value) { + public Builder mergeInitDoneMessage(de.pokerth.protocol.ProtoBuf.InitDoneMessage value) { if (((bitField0_ & 0x00000002) == 0x00000002) && - initMessage_ != de.pokerth.protocol.ProtoBuf.InitMessage.getDefaultInstance()) { - initMessage_ = - de.pokerth.protocol.ProtoBuf.InitMessage.newBuilder(initMessage_).mergeFrom(value).buildPartial(); + initDoneMessage_ != de.pokerth.protocol.ProtoBuf.InitDoneMessage.getDefaultInstance()) { + initDoneMessage_ = + de.pokerth.protocol.ProtoBuf.InitDoneMessage.newBuilder(initDoneMessage_).mergeFrom(value).buildPartial(); } else { - initMessage_ = value; + initDoneMessage_ = value; } bitField0_ |= 0x00000002; return this; } /** - * optional .InitMessage initMessage = 2; + * optional .InitDoneMessage initDoneMessage = 2; */ - public Builder clearInitMessage() { - initMessage_ = de.pokerth.protocol.ProtoBuf.InitMessage.getDefaultInstance(); + public Builder clearInitDoneMessage() { + initDoneMessage_ = de.pokerth.protocol.ProtoBuf.InitDoneMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); return this; } - // optional .InitAckMessage initAckMessage = 3; - private de.pokerth.protocol.ProtoBuf.InitAckMessage initAckMessage_ = de.pokerth.protocol.ProtoBuf.InitAckMessage.getDefaultInstance(); + // optional .AvatarRequestMessage avatarRequestMessage = 3; + private de.pokerth.protocol.ProtoBuf.AvatarRequestMessage avatarRequestMessage_ = de.pokerth.protocol.ProtoBuf.AvatarRequestMessage.getDefaultInstance(); /** - * optional .InitAckMessage initAckMessage = 3; + * optional .AvatarRequestMessage avatarRequestMessage = 3; */ - public boolean hasInitAckMessage() { + public boolean hasAvatarRequestMessage() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .InitAckMessage initAckMessage = 3; - */ - public de.pokerth.protocol.ProtoBuf.InitAckMessage getInitAckMessage() { - return initAckMessage_; - } - /** - * optional .InitAckMessage initAckMessage = 3; - */ - public Builder setInitAckMessage(de.pokerth.protocol.ProtoBuf.InitAckMessage value) { - if (value == null) { - throw new NullPointerException(); - } - initAckMessage_ = value; - - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .InitAckMessage initAckMessage = 3; - */ - public Builder setInitAckMessage( - de.pokerth.protocol.ProtoBuf.InitAckMessage.Builder builderForValue) { - initAckMessage_ = builderForValue.build(); - - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .InitAckMessage initAckMessage = 3; - */ - public Builder mergeInitAckMessage(de.pokerth.protocol.ProtoBuf.InitAckMessage value) { - if (((bitField0_ & 0x00000004) == 0x00000004) && - initAckMessage_ != de.pokerth.protocol.ProtoBuf.InitAckMessage.getDefaultInstance()) { - initAckMessage_ = - de.pokerth.protocol.ProtoBuf.InitAckMessage.newBuilder(initAckMessage_).mergeFrom(value).buildPartial(); - } else { - initAckMessage_ = value; - } - - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .InitAckMessage initAckMessage = 3; - */ - public Builder clearInitAckMessage() { - initAckMessage_ = de.pokerth.protocol.ProtoBuf.InitAckMessage.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - - // optional .AvatarRequestMessage avatarRequestMessage = 4; - private de.pokerth.protocol.ProtoBuf.AvatarRequestMessage avatarRequestMessage_ = de.pokerth.protocol.ProtoBuf.AvatarRequestMessage.getDefaultInstance(); - /** - * optional .AvatarRequestMessage avatarRequestMessage = 4; - */ - public boolean hasAvatarRequestMessage() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .AvatarRequestMessage avatarRequestMessage = 4; + * optional .AvatarRequestMessage avatarRequestMessage = 3; */ public de.pokerth.protocol.ProtoBuf.AvatarRequestMessage getAvatarRequestMessage() { return avatarRequestMessage_; } /** - * optional .AvatarRequestMessage avatarRequestMessage = 4; + * optional .AvatarRequestMessage avatarRequestMessage = 3; */ public Builder setAvatarRequestMessage(de.pokerth.protocol.ProtoBuf.AvatarRequestMessage value) { if (value == null) { @@ -52547,24 +52785,24 @@ public final class ProtoBuf { } avatarRequestMessage_ = value; - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return this; } /** - * optional .AvatarRequestMessage avatarRequestMessage = 4; + * optional .AvatarRequestMessage avatarRequestMessage = 3; */ public Builder setAvatarRequestMessage( de.pokerth.protocol.ProtoBuf.AvatarRequestMessage.Builder builderForValue) { avatarRequestMessage_ = builderForValue.build(); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return this; } /** - * optional .AvatarRequestMessage avatarRequestMessage = 4; + * optional .AvatarRequestMessage avatarRequestMessage = 3; */ public Builder mergeAvatarRequestMessage(de.pokerth.protocol.ProtoBuf.AvatarRequestMessage value) { - if (((bitField0_ & 0x00000008) == 0x00000008) && + if (((bitField0_ & 0x00000004) == 0x00000004) && avatarRequestMessage_ != de.pokerth.protocol.ProtoBuf.AvatarRequestMessage.getDefaultInstance()) { avatarRequestMessage_ = de.pokerth.protocol.ProtoBuf.AvatarRequestMessage.newBuilder(avatarRequestMessage_).mergeFrom(value).buildPartial(); @@ -52572,35 +52810,35 @@ public final class ProtoBuf { avatarRequestMessage_ = value; } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000004; return this; } /** - * optional .AvatarRequestMessage avatarRequestMessage = 4; + * optional .AvatarRequestMessage avatarRequestMessage = 3; */ public Builder clearAvatarRequestMessage() { avatarRequestMessage_ = de.pokerth.protocol.ProtoBuf.AvatarRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000004); return this; } - // optional .AvatarHeaderMessage avatarHeaderMessage = 5; + // optional .AvatarHeaderMessage avatarHeaderMessage = 4; private de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage avatarHeaderMessage_ = de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage.getDefaultInstance(); /** - * optional .AvatarHeaderMessage avatarHeaderMessage = 5; + * optional .AvatarHeaderMessage avatarHeaderMessage = 4; */ public boolean hasAvatarHeaderMessage() { - return ((bitField0_ & 0x00000010) == 0x00000010); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .AvatarHeaderMessage avatarHeaderMessage = 5; + * optional .AvatarHeaderMessage avatarHeaderMessage = 4; */ public de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage getAvatarHeaderMessage() { return avatarHeaderMessage_; } /** - * optional .AvatarHeaderMessage avatarHeaderMessage = 5; + * optional .AvatarHeaderMessage avatarHeaderMessage = 4; */ public Builder setAvatarHeaderMessage(de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage value) { if (value == null) { @@ -52608,24 +52846,24 @@ public final class ProtoBuf { } avatarHeaderMessage_ = value; - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return this; } /** - * optional .AvatarHeaderMessage avatarHeaderMessage = 5; + * optional .AvatarHeaderMessage avatarHeaderMessage = 4; */ public Builder setAvatarHeaderMessage( de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage.Builder builderForValue) { avatarHeaderMessage_ = builderForValue.build(); - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return this; } /** - * optional .AvatarHeaderMessage avatarHeaderMessage = 5; + * optional .AvatarHeaderMessage avatarHeaderMessage = 4; */ public Builder mergeAvatarHeaderMessage(de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage value) { - if (((bitField0_ & 0x00000010) == 0x00000010) && + if (((bitField0_ & 0x00000008) == 0x00000008) && avatarHeaderMessage_ != de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage.getDefaultInstance()) { avatarHeaderMessage_ = de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage.newBuilder(avatarHeaderMessage_).mergeFrom(value).buildPartial(); @@ -52633,35 +52871,35 @@ public final class ProtoBuf { avatarHeaderMessage_ = value; } - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000008; return this; } /** - * optional .AvatarHeaderMessage avatarHeaderMessage = 5; + * optional .AvatarHeaderMessage avatarHeaderMessage = 4; */ public Builder clearAvatarHeaderMessage() { avatarHeaderMessage_ = de.pokerth.protocol.ProtoBuf.AvatarHeaderMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000008); return this; } - // optional .AvatarDataMessage avatarDataMessage = 6; + // optional .AvatarDataMessage avatarDataMessage = 5; private de.pokerth.protocol.ProtoBuf.AvatarDataMessage avatarDataMessage_ = de.pokerth.protocol.ProtoBuf.AvatarDataMessage.getDefaultInstance(); /** - * optional .AvatarDataMessage avatarDataMessage = 6; + * optional .AvatarDataMessage avatarDataMessage = 5; */ public boolean hasAvatarDataMessage() { - return ((bitField0_ & 0x00000020) == 0x00000020); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional .AvatarDataMessage avatarDataMessage = 6; + * optional .AvatarDataMessage avatarDataMessage = 5; */ public de.pokerth.protocol.ProtoBuf.AvatarDataMessage getAvatarDataMessage() { return avatarDataMessage_; } /** - * optional .AvatarDataMessage avatarDataMessage = 6; + * optional .AvatarDataMessage avatarDataMessage = 5; */ public Builder setAvatarDataMessage(de.pokerth.protocol.ProtoBuf.AvatarDataMessage value) { if (value == null) { @@ -52669,24 +52907,24 @@ public final class ProtoBuf { } avatarDataMessage_ = value; - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return this; } /** - * optional .AvatarDataMessage avatarDataMessage = 6; + * optional .AvatarDataMessage avatarDataMessage = 5; */ public Builder setAvatarDataMessage( de.pokerth.protocol.ProtoBuf.AvatarDataMessage.Builder builderForValue) { avatarDataMessage_ = builderForValue.build(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return this; } /** - * optional .AvatarDataMessage avatarDataMessage = 6; + * optional .AvatarDataMessage avatarDataMessage = 5; */ public Builder mergeAvatarDataMessage(de.pokerth.protocol.ProtoBuf.AvatarDataMessage value) { - if (((bitField0_ & 0x00000020) == 0x00000020) && + if (((bitField0_ & 0x00000010) == 0x00000010) && avatarDataMessage_ != de.pokerth.protocol.ProtoBuf.AvatarDataMessage.getDefaultInstance()) { avatarDataMessage_ = de.pokerth.protocol.ProtoBuf.AvatarDataMessage.newBuilder(avatarDataMessage_).mergeFrom(value).buildPartial(); @@ -52694,35 +52932,35 @@ public final class ProtoBuf { avatarDataMessage_ = value; } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000010; return this; } /** - * optional .AvatarDataMessage avatarDataMessage = 6; + * optional .AvatarDataMessage avatarDataMessage = 5; */ public Builder clearAvatarDataMessage() { avatarDataMessage_ = de.pokerth.protocol.ProtoBuf.AvatarDataMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000010); return this; } - // optional .AvatarEndMessage avatarEndMessage = 7; + // optional .AvatarEndMessage avatarEndMessage = 6; private de.pokerth.protocol.ProtoBuf.AvatarEndMessage avatarEndMessage_ = de.pokerth.protocol.ProtoBuf.AvatarEndMessage.getDefaultInstance(); /** - * optional .AvatarEndMessage avatarEndMessage = 7; + * optional .AvatarEndMessage avatarEndMessage = 6; */ public boolean hasAvatarEndMessage() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * optional .AvatarEndMessage avatarEndMessage = 7; + * optional .AvatarEndMessage avatarEndMessage = 6; */ public de.pokerth.protocol.ProtoBuf.AvatarEndMessage getAvatarEndMessage() { return avatarEndMessage_; } /** - * optional .AvatarEndMessage avatarEndMessage = 7; + * optional .AvatarEndMessage avatarEndMessage = 6; */ public Builder setAvatarEndMessage(de.pokerth.protocol.ProtoBuf.AvatarEndMessage value) { if (value == null) { @@ -52730,24 +52968,24 @@ public final class ProtoBuf { } avatarEndMessage_ = value; - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return this; } /** - * optional .AvatarEndMessage avatarEndMessage = 7; + * optional .AvatarEndMessage avatarEndMessage = 6; */ public Builder setAvatarEndMessage( de.pokerth.protocol.ProtoBuf.AvatarEndMessage.Builder builderForValue) { avatarEndMessage_ = builderForValue.build(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return this; } /** - * optional .AvatarEndMessage avatarEndMessage = 7; + * optional .AvatarEndMessage avatarEndMessage = 6; */ public Builder mergeAvatarEndMessage(de.pokerth.protocol.ProtoBuf.AvatarEndMessage value) { - if (((bitField0_ & 0x00000040) == 0x00000040) && + if (((bitField0_ & 0x00000020) == 0x00000020) && avatarEndMessage_ != de.pokerth.protocol.ProtoBuf.AvatarEndMessage.getDefaultInstance()) { avatarEndMessage_ = de.pokerth.protocol.ProtoBuf.AvatarEndMessage.newBuilder(avatarEndMessage_).mergeFrom(value).buildPartial(); @@ -52755,35 +52993,35 @@ public final class ProtoBuf { avatarEndMessage_ = value; } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000020; return this; } /** - * optional .AvatarEndMessage avatarEndMessage = 7; + * optional .AvatarEndMessage avatarEndMessage = 6; */ public Builder clearAvatarEndMessage() { avatarEndMessage_ = de.pokerth.protocol.ProtoBuf.AvatarEndMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000020); return this; } - // optional .UnknownAvatarMessage unknownAvatarMessage = 8; + // optional .UnknownAvatarMessage unknownAvatarMessage = 7; private de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage unknownAvatarMessage_ = de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage.getDefaultInstance(); /** - * optional .UnknownAvatarMessage unknownAvatarMessage = 8; + * optional .UnknownAvatarMessage unknownAvatarMessage = 7; */ public boolean hasUnknownAvatarMessage() { - return ((bitField0_ & 0x00000080) == 0x00000080); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional .UnknownAvatarMessage unknownAvatarMessage = 8; + * optional .UnknownAvatarMessage unknownAvatarMessage = 7; */ public de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage getUnknownAvatarMessage() { return unknownAvatarMessage_; } /** - * optional .UnknownAvatarMessage unknownAvatarMessage = 8; + * optional .UnknownAvatarMessage unknownAvatarMessage = 7; */ public Builder setUnknownAvatarMessage(de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage value) { if (value == null) { @@ -52791,24 +53029,24 @@ public final class ProtoBuf { } unknownAvatarMessage_ = value; - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return this; } /** - * optional .UnknownAvatarMessage unknownAvatarMessage = 8; + * optional .UnknownAvatarMessage unknownAvatarMessage = 7; */ public Builder setUnknownAvatarMessage( de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage.Builder builderForValue) { unknownAvatarMessage_ = builderForValue.build(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return this; } /** - * optional .UnknownAvatarMessage unknownAvatarMessage = 8; + * optional .UnknownAvatarMessage unknownAvatarMessage = 7; */ public Builder mergeUnknownAvatarMessage(de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage value) { - if (((bitField0_ & 0x00000080) == 0x00000080) && + if (((bitField0_ & 0x00000040) == 0x00000040) && unknownAvatarMessage_ != de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage.getDefaultInstance()) { unknownAvatarMessage_ = de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage.newBuilder(unknownAvatarMessage_).mergeFrom(value).buildPartial(); @@ -52816,35 +53054,35 @@ public final class ProtoBuf { unknownAvatarMessage_ = value; } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000040; return this; } /** - * optional .UnknownAvatarMessage unknownAvatarMessage = 8; + * optional .UnknownAvatarMessage unknownAvatarMessage = 7; */ public Builder clearUnknownAvatarMessage() { unknownAvatarMessage_ = de.pokerth.protocol.ProtoBuf.UnknownAvatarMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000040); return this; } - // optional .PlayerListMessage playerListMessage = 9; + // optional .PlayerListMessage playerListMessage = 8; private de.pokerth.protocol.ProtoBuf.PlayerListMessage playerListMessage_ = de.pokerth.protocol.ProtoBuf.PlayerListMessage.getDefaultInstance(); /** - * optional .PlayerListMessage playerListMessage = 9; + * optional .PlayerListMessage playerListMessage = 8; */ public boolean hasPlayerListMessage() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** - * optional .PlayerListMessage playerListMessage = 9; + * optional .PlayerListMessage playerListMessage = 8; */ public de.pokerth.protocol.ProtoBuf.PlayerListMessage getPlayerListMessage() { return playerListMessage_; } /** - * optional .PlayerListMessage playerListMessage = 9; + * optional .PlayerListMessage playerListMessage = 8; */ public Builder setPlayerListMessage(de.pokerth.protocol.ProtoBuf.PlayerListMessage value) { if (value == null) { @@ -52852,24 +53090,24 @@ public final class ProtoBuf { } playerListMessage_ = value; - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; return this; } /** - * optional .PlayerListMessage playerListMessage = 9; + * optional .PlayerListMessage playerListMessage = 8; */ public Builder setPlayerListMessage( de.pokerth.protocol.ProtoBuf.PlayerListMessage.Builder builderForValue) { playerListMessage_ = builderForValue.build(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; return this; } /** - * optional .PlayerListMessage playerListMessage = 9; + * optional .PlayerListMessage playerListMessage = 8; */ public Builder mergePlayerListMessage(de.pokerth.protocol.ProtoBuf.PlayerListMessage value) { - if (((bitField0_ & 0x00000100) == 0x00000100) && + if (((bitField0_ & 0x00000080) == 0x00000080) && playerListMessage_ != de.pokerth.protocol.ProtoBuf.PlayerListMessage.getDefaultInstance()) { playerListMessage_ = de.pokerth.protocol.ProtoBuf.PlayerListMessage.newBuilder(playerListMessage_).mergeFrom(value).buildPartial(); @@ -52877,35 +53115,35 @@ public final class ProtoBuf { playerListMessage_ = value; } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000080; return this; } /** - * optional .PlayerListMessage playerListMessage = 9; + * optional .PlayerListMessage playerListMessage = 8; */ public Builder clearPlayerListMessage() { playerListMessage_ = de.pokerth.protocol.ProtoBuf.PlayerListMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000080); return this; } - // optional .GameListNewMessage gameListNewMessage = 10; + // optional .GameListNewMessage gameListNewMessage = 9; private de.pokerth.protocol.ProtoBuf.GameListNewMessage gameListNewMessage_ = de.pokerth.protocol.ProtoBuf.GameListNewMessage.getDefaultInstance(); /** - * optional .GameListNewMessage gameListNewMessage = 10; + * optional .GameListNewMessage gameListNewMessage = 9; */ public boolean hasGameListNewMessage() { - return ((bitField0_ & 0x00000200) == 0x00000200); + return ((bitField0_ & 0x00000100) == 0x00000100); } /** - * optional .GameListNewMessage gameListNewMessage = 10; + * optional .GameListNewMessage gameListNewMessage = 9; */ public de.pokerth.protocol.ProtoBuf.GameListNewMessage getGameListNewMessage() { return gameListNewMessage_; } /** - * optional .GameListNewMessage gameListNewMessage = 10; + * optional .GameListNewMessage gameListNewMessage = 9; */ public Builder setGameListNewMessage(de.pokerth.protocol.ProtoBuf.GameListNewMessage value) { if (value == null) { @@ -52913,24 +53151,24 @@ public final class ProtoBuf { } gameListNewMessage_ = value; - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; return this; } /** - * optional .GameListNewMessage gameListNewMessage = 10; + * optional .GameListNewMessage gameListNewMessage = 9; */ public Builder setGameListNewMessage( de.pokerth.protocol.ProtoBuf.GameListNewMessage.Builder builderForValue) { gameListNewMessage_ = builderForValue.build(); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; return this; } /** - * optional .GameListNewMessage gameListNewMessage = 10; + * optional .GameListNewMessage gameListNewMessage = 9; */ public Builder mergeGameListNewMessage(de.pokerth.protocol.ProtoBuf.GameListNewMessage value) { - if (((bitField0_ & 0x00000200) == 0x00000200) && + if (((bitField0_ & 0x00000100) == 0x00000100) && gameListNewMessage_ != de.pokerth.protocol.ProtoBuf.GameListNewMessage.getDefaultInstance()) { gameListNewMessage_ = de.pokerth.protocol.ProtoBuf.GameListNewMessage.newBuilder(gameListNewMessage_).mergeFrom(value).buildPartial(); @@ -52938,35 +53176,35 @@ public final class ProtoBuf { gameListNewMessage_ = value; } - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000100; return this; } /** - * optional .GameListNewMessage gameListNewMessage = 10; + * optional .GameListNewMessage gameListNewMessage = 9; */ public Builder clearGameListNewMessage() { gameListNewMessage_ = de.pokerth.protocol.ProtoBuf.GameListNewMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000100); return this; } - // optional .GameListUpdateMessage gameListUpdateMessage = 11; + // optional .GameListUpdateMessage gameListUpdateMessage = 10; private de.pokerth.protocol.ProtoBuf.GameListUpdateMessage gameListUpdateMessage_ = de.pokerth.protocol.ProtoBuf.GameListUpdateMessage.getDefaultInstance(); /** - * optional .GameListUpdateMessage gameListUpdateMessage = 11; + * optional .GameListUpdateMessage gameListUpdateMessage = 10; */ public boolean hasGameListUpdateMessage() { - return ((bitField0_ & 0x00000400) == 0x00000400); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** - * optional .GameListUpdateMessage gameListUpdateMessage = 11; + * optional .GameListUpdateMessage gameListUpdateMessage = 10; */ public de.pokerth.protocol.ProtoBuf.GameListUpdateMessage getGameListUpdateMessage() { return gameListUpdateMessage_; } /** - * optional .GameListUpdateMessage gameListUpdateMessage = 11; + * optional .GameListUpdateMessage gameListUpdateMessage = 10; */ public Builder setGameListUpdateMessage(de.pokerth.protocol.ProtoBuf.GameListUpdateMessage value) { if (value == null) { @@ -52974,24 +53212,24 @@ public final class ProtoBuf { } gameListUpdateMessage_ = value; - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; return this; } /** - * optional .GameListUpdateMessage gameListUpdateMessage = 11; + * optional .GameListUpdateMessage gameListUpdateMessage = 10; */ public Builder setGameListUpdateMessage( de.pokerth.protocol.ProtoBuf.GameListUpdateMessage.Builder builderForValue) { gameListUpdateMessage_ = builderForValue.build(); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; return this; } /** - * optional .GameListUpdateMessage gameListUpdateMessage = 11; + * optional .GameListUpdateMessage gameListUpdateMessage = 10; */ public Builder mergeGameListUpdateMessage(de.pokerth.protocol.ProtoBuf.GameListUpdateMessage value) { - if (((bitField0_ & 0x00000400) == 0x00000400) && + if (((bitField0_ & 0x00000200) == 0x00000200) && gameListUpdateMessage_ != de.pokerth.protocol.ProtoBuf.GameListUpdateMessage.getDefaultInstance()) { gameListUpdateMessage_ = de.pokerth.protocol.ProtoBuf.GameListUpdateMessage.newBuilder(gameListUpdateMessage_).mergeFrom(value).buildPartial(); @@ -52999,35 +53237,35 @@ public final class ProtoBuf { gameListUpdateMessage_ = value; } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000200; return this; } /** - * optional .GameListUpdateMessage gameListUpdateMessage = 11; + * optional .GameListUpdateMessage gameListUpdateMessage = 10; */ public Builder clearGameListUpdateMessage() { gameListUpdateMessage_ = de.pokerth.protocol.ProtoBuf.GameListUpdateMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000400); + bitField0_ = (bitField0_ & ~0x00000200); return this; } - // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + // optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; private de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage gameListPlayerJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage.getDefaultInstance(); /** - * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; */ public boolean hasGameListPlayerJoinedMessage() { - return ((bitField0_ & 0x00000800) == 0x00000800); + return ((bitField0_ & 0x00000400) == 0x00000400); } /** - * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; */ public de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage getGameListPlayerJoinedMessage() { return gameListPlayerJoinedMessage_; } /** - * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; */ public Builder setGameListPlayerJoinedMessage(de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage value) { if (value == null) { @@ -53035,24 +53273,24 @@ public final class ProtoBuf { } gameListPlayerJoinedMessage_ = value; - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; return this; } /** - * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; */ public Builder setGameListPlayerJoinedMessage( de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage.Builder builderForValue) { gameListPlayerJoinedMessage_ = builderForValue.build(); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; return this; } /** - * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; */ public Builder mergeGameListPlayerJoinedMessage(de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage value) { - if (((bitField0_ & 0x00000800) == 0x00000800) && + if (((bitField0_ & 0x00000400) == 0x00000400) && gameListPlayerJoinedMessage_ != de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage.getDefaultInstance()) { gameListPlayerJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage.newBuilder(gameListPlayerJoinedMessage_).mergeFrom(value).buildPartial(); @@ -53060,35 +53298,35 @@ public final class ProtoBuf { gameListPlayerJoinedMessage_ = value; } - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000400; return this; } /** - * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 12; + * optional .GameListPlayerJoinedMessage gameListPlayerJoinedMessage = 11; */ public Builder clearGameListPlayerJoinedMessage() { gameListPlayerJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameListPlayerJoinedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000800); + bitField0_ = (bitField0_ & ~0x00000400); return this; } - // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + // optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; private de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage gameListPlayerLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage.getDefaultInstance(); /** - * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; */ public boolean hasGameListPlayerLeftMessage() { - return ((bitField0_ & 0x00001000) == 0x00001000); + return ((bitField0_ & 0x00000800) == 0x00000800); } /** - * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; */ public de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage getGameListPlayerLeftMessage() { return gameListPlayerLeftMessage_; } /** - * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; */ public Builder setGameListPlayerLeftMessage(de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage value) { if (value == null) { @@ -53096,24 +53334,24 @@ public final class ProtoBuf { } gameListPlayerLeftMessage_ = value; - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; return this; } /** - * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; */ public Builder setGameListPlayerLeftMessage( de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage.Builder builderForValue) { gameListPlayerLeftMessage_ = builderForValue.build(); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; return this; } /** - * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; */ public Builder mergeGameListPlayerLeftMessage(de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage value) { - if (((bitField0_ & 0x00001000) == 0x00001000) && + if (((bitField0_ & 0x00000800) == 0x00000800) && gameListPlayerLeftMessage_ != de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage.getDefaultInstance()) { gameListPlayerLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage.newBuilder(gameListPlayerLeftMessage_).mergeFrom(value).buildPartial(); @@ -53121,35 +53359,35 @@ public final class ProtoBuf { gameListPlayerLeftMessage_ = value; } - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000800; return this; } /** - * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 13; + * optional .GameListPlayerLeftMessage gameListPlayerLeftMessage = 12; */ public Builder clearGameListPlayerLeftMessage() { gameListPlayerLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameListPlayerLeftMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00000800); return this; } - // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + // optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; private de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage.getDefaultInstance(); /** - * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; */ public boolean hasGameListSpectatorJoinedMessage() { - return ((bitField0_ & 0x00002000) == 0x00002000); + return ((bitField0_ & 0x00001000) == 0x00001000); } /** - * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; */ public de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage getGameListSpectatorJoinedMessage() { return gameListSpectatorJoinedMessage_; } /** - * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; */ public Builder setGameListSpectatorJoinedMessage(de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage value) { if (value == null) { @@ -53157,24 +53395,24 @@ public final class ProtoBuf { } gameListSpectatorJoinedMessage_ = value; - bitField0_ |= 0x00002000; + bitField0_ |= 0x00001000; return this; } /** - * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; */ public Builder setGameListSpectatorJoinedMessage( de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage.Builder builderForValue) { gameListSpectatorJoinedMessage_ = builderForValue.build(); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00001000; return this; } /** - * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; */ public Builder mergeGameListSpectatorJoinedMessage(de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage value) { - if (((bitField0_ & 0x00002000) == 0x00002000) && + if (((bitField0_ & 0x00001000) == 0x00001000) && gameListSpectatorJoinedMessage_ != de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage.getDefaultInstance()) { gameListSpectatorJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage.newBuilder(gameListSpectatorJoinedMessage_).mergeFrom(value).buildPartial(); @@ -53182,35 +53420,35 @@ public final class ProtoBuf { gameListSpectatorJoinedMessage_ = value; } - bitField0_ |= 0x00002000; + bitField0_ |= 0x00001000; return this; } /** - * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 14; + * optional .GameListSpectatorJoinedMessage gameListSpectatorJoinedMessage = 13; */ public Builder clearGameListSpectatorJoinedMessage() { gameListSpectatorJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameListSpectatorJoinedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00001000); return this; } - // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + // optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; private de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage gameListSpectatorLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage.getDefaultInstance(); /** - * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; */ public boolean hasGameListSpectatorLeftMessage() { - return ((bitField0_ & 0x00004000) == 0x00004000); + return ((bitField0_ & 0x00002000) == 0x00002000); } /** - * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; */ public de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage getGameListSpectatorLeftMessage() { return gameListSpectatorLeftMessage_; } /** - * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; */ public Builder setGameListSpectatorLeftMessage(de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage value) { if (value == null) { @@ -53218,24 +53456,24 @@ public final class ProtoBuf { } gameListSpectatorLeftMessage_ = value; - bitField0_ |= 0x00004000; + bitField0_ |= 0x00002000; return this; } /** - * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; */ public Builder setGameListSpectatorLeftMessage( de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage.Builder builderForValue) { gameListSpectatorLeftMessage_ = builderForValue.build(); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00002000; return this; } /** - * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; */ public Builder mergeGameListSpectatorLeftMessage(de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage value) { - if (((bitField0_ & 0x00004000) == 0x00004000) && + if (((bitField0_ & 0x00002000) == 0x00002000) && gameListSpectatorLeftMessage_ != de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage.getDefaultInstance()) { gameListSpectatorLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage.newBuilder(gameListSpectatorLeftMessage_).mergeFrom(value).buildPartial(); @@ -53243,35 +53481,35 @@ public final class ProtoBuf { gameListSpectatorLeftMessage_ = value; } - bitField0_ |= 0x00004000; + bitField0_ |= 0x00002000; return this; } /** - * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 15; + * optional .GameListSpectatorLeftMessage gameListSpectatorLeftMessage = 14; */ public Builder clearGameListSpectatorLeftMessage() { gameListSpectatorLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameListSpectatorLeftMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00004000); + bitField0_ = (bitField0_ & ~0x00002000); return this; } - // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + // optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; private de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage gameListAdminChangedMessage_ = de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage.getDefaultInstance(); /** - * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; */ public boolean hasGameListAdminChangedMessage() { - return ((bitField0_ & 0x00008000) == 0x00008000); + return ((bitField0_ & 0x00004000) == 0x00004000); } /** - * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; */ public de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage getGameListAdminChangedMessage() { return gameListAdminChangedMessage_; } /** - * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; */ public Builder setGameListAdminChangedMessage(de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage value) { if (value == null) { @@ -53279,24 +53517,24 @@ public final class ProtoBuf { } gameListAdminChangedMessage_ = value; - bitField0_ |= 0x00008000; + bitField0_ |= 0x00004000; return this; } /** - * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; */ public Builder setGameListAdminChangedMessage( de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage.Builder builderForValue) { gameListAdminChangedMessage_ = builderForValue.build(); - bitField0_ |= 0x00008000; + bitField0_ |= 0x00004000; return this; } /** - * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; */ public Builder mergeGameListAdminChangedMessage(de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage value) { - if (((bitField0_ & 0x00008000) == 0x00008000) && + if (((bitField0_ & 0x00004000) == 0x00004000) && gameListAdminChangedMessage_ != de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage.getDefaultInstance()) { gameListAdminChangedMessage_ = de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage.newBuilder(gameListAdminChangedMessage_).mergeFrom(value).buildPartial(); @@ -53304,35 +53542,35 @@ public final class ProtoBuf { gameListAdminChangedMessage_ = value; } - bitField0_ |= 0x00008000; + bitField0_ |= 0x00004000; return this; } /** - * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 16; + * optional .GameListAdminChangedMessage gameListAdminChangedMessage = 15; */ public Builder clearGameListAdminChangedMessage() { gameListAdminChangedMessage_ = de.pokerth.protocol.ProtoBuf.GameListAdminChangedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00008000); + bitField0_ = (bitField0_ & ~0x00004000); return this; } - // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + // optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; private de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage playerInfoRequestMessage_ = de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage.getDefaultInstance(); /** - * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; */ public boolean hasPlayerInfoRequestMessage() { - return ((bitField0_ & 0x00010000) == 0x00010000); + return ((bitField0_ & 0x00008000) == 0x00008000); } /** - * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; */ public de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage getPlayerInfoRequestMessage() { return playerInfoRequestMessage_; } /** - * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; */ public Builder setPlayerInfoRequestMessage(de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage value) { if (value == null) { @@ -53340,24 +53578,24 @@ public final class ProtoBuf { } playerInfoRequestMessage_ = value; - bitField0_ |= 0x00010000; + bitField0_ |= 0x00008000; return this; } /** - * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; */ public Builder setPlayerInfoRequestMessage( de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage.Builder builderForValue) { playerInfoRequestMessage_ = builderForValue.build(); - bitField0_ |= 0x00010000; + bitField0_ |= 0x00008000; return this; } /** - * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; */ public Builder mergePlayerInfoRequestMessage(de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage value) { - if (((bitField0_ & 0x00010000) == 0x00010000) && + if (((bitField0_ & 0x00008000) == 0x00008000) && playerInfoRequestMessage_ != de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage.getDefaultInstance()) { playerInfoRequestMessage_ = de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage.newBuilder(playerInfoRequestMessage_).mergeFrom(value).buildPartial(); @@ -53365,35 +53603,35 @@ public final class ProtoBuf { playerInfoRequestMessage_ = value; } - bitField0_ |= 0x00010000; + bitField0_ |= 0x00008000; return this; } /** - * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 17; + * optional .PlayerInfoRequestMessage playerInfoRequestMessage = 16; */ public Builder clearPlayerInfoRequestMessage() { playerInfoRequestMessage_ = de.pokerth.protocol.ProtoBuf.PlayerInfoRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00008000); return this; } - // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + // optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; private de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage playerInfoReplyMessage_ = de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage.getDefaultInstance(); /** - * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; */ public boolean hasPlayerInfoReplyMessage() { - return ((bitField0_ & 0x00020000) == 0x00020000); + return ((bitField0_ & 0x00010000) == 0x00010000); } /** - * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; */ public de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage getPlayerInfoReplyMessage() { return playerInfoReplyMessage_; } /** - * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; */ public Builder setPlayerInfoReplyMessage(de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage value) { if (value == null) { @@ -53401,24 +53639,24 @@ public final class ProtoBuf { } playerInfoReplyMessage_ = value; - bitField0_ |= 0x00020000; + bitField0_ |= 0x00010000; return this; } /** - * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; */ public Builder setPlayerInfoReplyMessage( de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage.Builder builderForValue) { playerInfoReplyMessage_ = builderForValue.build(); - bitField0_ |= 0x00020000; + bitField0_ |= 0x00010000; return this; } /** - * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; */ public Builder mergePlayerInfoReplyMessage(de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage value) { - if (((bitField0_ & 0x00020000) == 0x00020000) && + if (((bitField0_ & 0x00010000) == 0x00010000) && playerInfoReplyMessage_ != de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage.getDefaultInstance()) { playerInfoReplyMessage_ = de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage.newBuilder(playerInfoReplyMessage_).mergeFrom(value).buildPartial(); @@ -53426,35 +53664,35 @@ public final class ProtoBuf { playerInfoReplyMessage_ = value; } - bitField0_ |= 0x00020000; + bitField0_ |= 0x00010000; return this; } /** - * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 18; + * optional .PlayerInfoReplyMessage playerInfoReplyMessage = 17; */ public Builder clearPlayerInfoReplyMessage() { playerInfoReplyMessage_ = de.pokerth.protocol.ProtoBuf.PlayerInfoReplyMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00020000); + bitField0_ = (bitField0_ & ~0x00010000); return this; } - // optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + // optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; private de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage subscriptionRequestMessage_ = de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage.getDefaultInstance(); /** - * optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + * optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; */ public boolean hasSubscriptionRequestMessage() { - return ((bitField0_ & 0x00040000) == 0x00040000); + return ((bitField0_ & 0x00020000) == 0x00020000); } /** - * optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + * optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; */ public de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage getSubscriptionRequestMessage() { return subscriptionRequestMessage_; } /** - * optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + * optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; */ public Builder setSubscriptionRequestMessage(de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage value) { if (value == null) { @@ -53462,24 +53700,24 @@ public final class ProtoBuf { } subscriptionRequestMessage_ = value; - bitField0_ |= 0x00040000; + bitField0_ |= 0x00020000; return this; } /** - * optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + * optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; */ public Builder setSubscriptionRequestMessage( de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage.Builder builderForValue) { subscriptionRequestMessage_ = builderForValue.build(); - bitField0_ |= 0x00040000; + bitField0_ |= 0x00020000; return this; } /** - * optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + * optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; */ public Builder mergeSubscriptionRequestMessage(de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage value) { - if (((bitField0_ & 0x00040000) == 0x00040000) && + if (((bitField0_ & 0x00020000) == 0x00020000) && subscriptionRequestMessage_ != de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage.getDefaultInstance()) { subscriptionRequestMessage_ = de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage.newBuilder(subscriptionRequestMessage_).mergeFrom(value).buildPartial(); @@ -53487,35 +53725,35 @@ public final class ProtoBuf { subscriptionRequestMessage_ = value; } - bitField0_ |= 0x00040000; + bitField0_ |= 0x00020000; return this; } /** - * optional .SubscriptionRequestMessage subscriptionRequestMessage = 19; + * optional .SubscriptionRequestMessage subscriptionRequestMessage = 18; */ public Builder clearSubscriptionRequestMessage() { subscriptionRequestMessage_ = de.pokerth.protocol.ProtoBuf.SubscriptionRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00040000); + bitField0_ = (bitField0_ & ~0x00020000); return this; } - // optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + // optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; private de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage subscriptionReplyMessage_ = de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage.getDefaultInstance(); /** - * optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + * optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; */ public boolean hasSubscriptionReplyMessage() { - return ((bitField0_ & 0x00080000) == 0x00080000); + return ((bitField0_ & 0x00040000) == 0x00040000); } /** - * optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + * optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; */ public de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage getSubscriptionReplyMessage() { return subscriptionReplyMessage_; } /** - * optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + * optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; */ public Builder setSubscriptionReplyMessage(de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage value) { if (value == null) { @@ -53523,24 +53761,24 @@ public final class ProtoBuf { } subscriptionReplyMessage_ = value; - bitField0_ |= 0x00080000; + bitField0_ |= 0x00040000; return this; } /** - * optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + * optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; */ public Builder setSubscriptionReplyMessage( de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage.Builder builderForValue) { subscriptionReplyMessage_ = builderForValue.build(); - bitField0_ |= 0x00080000; + bitField0_ |= 0x00040000; return this; } /** - * optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + * optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; */ public Builder mergeSubscriptionReplyMessage(de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage value) { - if (((bitField0_ & 0x00080000) == 0x00080000) && + if (((bitField0_ & 0x00040000) == 0x00040000) && subscriptionReplyMessage_ != de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage.getDefaultInstance()) { subscriptionReplyMessage_ = de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage.newBuilder(subscriptionReplyMessage_).mergeFrom(value).buildPartial(); @@ -53548,35 +53786,35 @@ public final class ProtoBuf { subscriptionReplyMessage_ = value; } - bitField0_ |= 0x00080000; + bitField0_ |= 0x00040000; return this; } /** - * optional .SubscriptionReplyMessage subscriptionReplyMessage = 20; + * optional .SubscriptionReplyMessage subscriptionReplyMessage = 19; */ public Builder clearSubscriptionReplyMessage() { subscriptionReplyMessage_ = de.pokerth.protocol.ProtoBuf.SubscriptionReplyMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00080000); + bitField0_ = (bitField0_ & ~0x00040000); return this; } - // optional .CreateGameMessage createGameMessage = 21; + // optional .CreateGameMessage createGameMessage = 20; private de.pokerth.protocol.ProtoBuf.CreateGameMessage createGameMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameMessage.getDefaultInstance(); /** - * optional .CreateGameMessage createGameMessage = 21; + * optional .CreateGameMessage createGameMessage = 20; */ public boolean hasCreateGameMessage() { - return ((bitField0_ & 0x00100000) == 0x00100000); + return ((bitField0_ & 0x00080000) == 0x00080000); } /** - * optional .CreateGameMessage createGameMessage = 21; + * optional .CreateGameMessage createGameMessage = 20; */ public de.pokerth.protocol.ProtoBuf.CreateGameMessage getCreateGameMessage() { return createGameMessage_; } /** - * optional .CreateGameMessage createGameMessage = 21; + * optional .CreateGameMessage createGameMessage = 20; */ public Builder setCreateGameMessage(de.pokerth.protocol.ProtoBuf.CreateGameMessage value) { if (value == null) { @@ -53584,24 +53822,24 @@ public final class ProtoBuf { } createGameMessage_ = value; - bitField0_ |= 0x00100000; + bitField0_ |= 0x00080000; return this; } /** - * optional .CreateGameMessage createGameMessage = 21; + * optional .CreateGameMessage createGameMessage = 20; */ public Builder setCreateGameMessage( de.pokerth.protocol.ProtoBuf.CreateGameMessage.Builder builderForValue) { createGameMessage_ = builderForValue.build(); - bitField0_ |= 0x00100000; + bitField0_ |= 0x00080000; return this; } /** - * optional .CreateGameMessage createGameMessage = 21; + * optional .CreateGameMessage createGameMessage = 20; */ public Builder mergeCreateGameMessage(de.pokerth.protocol.ProtoBuf.CreateGameMessage value) { - if (((bitField0_ & 0x00100000) == 0x00100000) && + if (((bitField0_ & 0x00080000) == 0x00080000) && createGameMessage_ != de.pokerth.protocol.ProtoBuf.CreateGameMessage.getDefaultInstance()) { createGameMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameMessage.newBuilder(createGameMessage_).mergeFrom(value).buildPartial(); @@ -53609,35 +53847,35 @@ public final class ProtoBuf { createGameMessage_ = value; } - bitField0_ |= 0x00100000; + bitField0_ |= 0x00080000; return this; } /** - * optional .CreateGameMessage createGameMessage = 21; + * optional .CreateGameMessage createGameMessage = 20; */ public Builder clearCreateGameMessage() { createGameMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00100000); + bitField0_ = (bitField0_ & ~0x00080000); return this; } - // optional .CreateGameFailedMessage createGameFailedMessage = 22; + // optional .CreateGameFailedMessage createGameFailedMessage = 21; private de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage createGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage.getDefaultInstance(); /** - * optional .CreateGameFailedMessage createGameFailedMessage = 22; + * optional .CreateGameFailedMessage createGameFailedMessage = 21; */ public boolean hasCreateGameFailedMessage() { - return ((bitField0_ & 0x00200000) == 0x00200000); + return ((bitField0_ & 0x00100000) == 0x00100000); } /** - * optional .CreateGameFailedMessage createGameFailedMessage = 22; + * optional .CreateGameFailedMessage createGameFailedMessage = 21; */ public de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage getCreateGameFailedMessage() { return createGameFailedMessage_; } /** - * optional .CreateGameFailedMessage createGameFailedMessage = 22; + * optional .CreateGameFailedMessage createGameFailedMessage = 21; */ public Builder setCreateGameFailedMessage(de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage value) { if (value == null) { @@ -53645,24 +53883,24 @@ public final class ProtoBuf { } createGameFailedMessage_ = value; - bitField0_ |= 0x00200000; + bitField0_ |= 0x00100000; return this; } /** - * optional .CreateGameFailedMessage createGameFailedMessage = 22; + * optional .CreateGameFailedMessage createGameFailedMessage = 21; */ public Builder setCreateGameFailedMessage( de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage.Builder builderForValue) { createGameFailedMessage_ = builderForValue.build(); - bitField0_ |= 0x00200000; + bitField0_ |= 0x00100000; return this; } /** - * optional .CreateGameFailedMessage createGameFailedMessage = 22; + * optional .CreateGameFailedMessage createGameFailedMessage = 21; */ public Builder mergeCreateGameFailedMessage(de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage value) { - if (((bitField0_ & 0x00200000) == 0x00200000) && + if (((bitField0_ & 0x00100000) == 0x00100000) && createGameFailedMessage_ != de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage.getDefaultInstance()) { createGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage.newBuilder(createGameFailedMessage_).mergeFrom(value).buildPartial(); @@ -53670,96 +53908,279 @@ public final class ProtoBuf { createGameFailedMessage_ = value; } + bitField0_ |= 0x00100000; + return this; + } + /** + * optional .CreateGameFailedMessage createGameFailedMessage = 21; + */ + public Builder clearCreateGameFailedMessage() { + createGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x00100000); + return this; + } + + // optional .JoinGameMessage joinGameMessage = 22; + private de.pokerth.protocol.ProtoBuf.JoinGameMessage joinGameMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance(); + /** + * optional .JoinGameMessage joinGameMessage = 22; + */ + public boolean hasJoinGameMessage() { + return ((bitField0_ & 0x00200000) == 0x00200000); + } + /** + * optional .JoinGameMessage joinGameMessage = 22; + */ + public de.pokerth.protocol.ProtoBuf.JoinGameMessage getJoinGameMessage() { + return joinGameMessage_; + } + /** + * optional .JoinGameMessage joinGameMessage = 22; + */ + public Builder setJoinGameMessage(de.pokerth.protocol.ProtoBuf.JoinGameMessage value) { + if (value == null) { + throw new NullPointerException(); + } + joinGameMessage_ = value; + bitField0_ |= 0x00200000; return this; } /** - * optional .CreateGameFailedMessage createGameFailedMessage = 22; + * optional .JoinGameMessage joinGameMessage = 22; */ - public Builder clearCreateGameFailedMessage() { - createGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.CreateGameFailedMessage.getDefaultInstance(); + public Builder setJoinGameMessage( + de.pokerth.protocol.ProtoBuf.JoinGameMessage.Builder builderForValue) { + joinGameMessage_ = builderForValue.build(); + + bitField0_ |= 0x00200000; + return this; + } + /** + * optional .JoinGameMessage joinGameMessage = 22; + */ + public Builder mergeJoinGameMessage(de.pokerth.protocol.ProtoBuf.JoinGameMessage value) { + if (((bitField0_ & 0x00200000) == 0x00200000) && + joinGameMessage_ != de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance()) { + joinGameMessage_ = + de.pokerth.protocol.ProtoBuf.JoinGameMessage.newBuilder(joinGameMessage_).mergeFrom(value).buildPartial(); + } else { + joinGameMessage_ = value; + } + + bitField0_ |= 0x00200000; + return this; + } + /** + * optional .JoinGameMessage joinGameMessage = 22; + */ + public Builder clearJoinGameMessage() { + joinGameMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00200000); return this; } - // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; - private de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage invitePlayerToGameMessage_ = de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.getDefaultInstance(); + // optional .RejoinGameMessage rejoinGameMessage = 23; + private de.pokerth.protocol.ProtoBuf.RejoinGameMessage rejoinGameMessage_ = de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance(); /** - * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + * optional .RejoinGameMessage rejoinGameMessage = 23; */ - public boolean hasInvitePlayerToGameMessage() { + public boolean hasRejoinGameMessage() { return ((bitField0_ & 0x00400000) == 0x00400000); } /** - * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + * optional .RejoinGameMessage rejoinGameMessage = 23; */ - public de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage getInvitePlayerToGameMessage() { - return invitePlayerToGameMessage_; + public de.pokerth.protocol.ProtoBuf.RejoinGameMessage getRejoinGameMessage() { + return rejoinGameMessage_; } /** - * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + * optional .RejoinGameMessage rejoinGameMessage = 23; */ - public Builder setInvitePlayerToGameMessage(de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage value) { + public Builder setRejoinGameMessage(de.pokerth.protocol.ProtoBuf.RejoinGameMessage value) { if (value == null) { throw new NullPointerException(); } - invitePlayerToGameMessage_ = value; + rejoinGameMessage_ = value; bitField0_ |= 0x00400000; return this; } /** - * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + * optional .RejoinGameMessage rejoinGameMessage = 23; */ - public Builder setInvitePlayerToGameMessage( - de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.Builder builderForValue) { - invitePlayerToGameMessage_ = builderForValue.build(); + public Builder setRejoinGameMessage( + de.pokerth.protocol.ProtoBuf.RejoinGameMessage.Builder builderForValue) { + rejoinGameMessage_ = builderForValue.build(); bitField0_ |= 0x00400000; return this; } /** - * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + * optional .RejoinGameMessage rejoinGameMessage = 23; */ - public Builder mergeInvitePlayerToGameMessage(de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage value) { + public Builder mergeRejoinGameMessage(de.pokerth.protocol.ProtoBuf.RejoinGameMessage value) { if (((bitField0_ & 0x00400000) == 0x00400000) && - invitePlayerToGameMessage_ != de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.getDefaultInstance()) { - invitePlayerToGameMessage_ = - de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.newBuilder(invitePlayerToGameMessage_).mergeFrom(value).buildPartial(); + rejoinGameMessage_ != de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance()) { + rejoinGameMessage_ = + de.pokerth.protocol.ProtoBuf.RejoinGameMessage.newBuilder(rejoinGameMessage_).mergeFrom(value).buildPartial(); } else { - invitePlayerToGameMessage_ = value; + rejoinGameMessage_ = value; } bitField0_ |= 0x00400000; return this; } /** - * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 23; + * optional .RejoinGameMessage rejoinGameMessage = 23; */ - public Builder clearInvitePlayerToGameMessage() { - invitePlayerToGameMessage_ = de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.getDefaultInstance(); + public Builder clearRejoinGameMessage() { + rejoinGameMessage_ = de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00400000); return this; } - // optional .InviteNotifyMessage inviteNotifyMessage = 24; - private de.pokerth.protocol.ProtoBuf.InviteNotifyMessage inviteNotifyMessage_ = de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.getDefaultInstance(); + // optional .JoinGameAckMessage joinGameAckMessage = 24; + private de.pokerth.protocol.ProtoBuf.JoinGameAckMessage joinGameAckMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance(); /** - * optional .InviteNotifyMessage inviteNotifyMessage = 24; + * optional .JoinGameAckMessage joinGameAckMessage = 24; */ - public boolean hasInviteNotifyMessage() { + public boolean hasJoinGameAckMessage() { return ((bitField0_ & 0x00800000) == 0x00800000); } /** - * optional .InviteNotifyMessage inviteNotifyMessage = 24; + * optional .JoinGameAckMessage joinGameAckMessage = 24; + */ + public de.pokerth.protocol.ProtoBuf.JoinGameAckMessage getJoinGameAckMessage() { + return joinGameAckMessage_; + } + /** + * optional .JoinGameAckMessage joinGameAckMessage = 24; + */ + public Builder setJoinGameAckMessage(de.pokerth.protocol.ProtoBuf.JoinGameAckMessage value) { + if (value == null) { + throw new NullPointerException(); + } + joinGameAckMessage_ = value; + + bitField0_ |= 0x00800000; + return this; + } + /** + * optional .JoinGameAckMessage joinGameAckMessage = 24; + */ + public Builder setJoinGameAckMessage( + de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.Builder builderForValue) { + joinGameAckMessage_ = builderForValue.build(); + + bitField0_ |= 0x00800000; + return this; + } + /** + * optional .JoinGameAckMessage joinGameAckMessage = 24; + */ + public Builder mergeJoinGameAckMessage(de.pokerth.protocol.ProtoBuf.JoinGameAckMessage value) { + if (((bitField0_ & 0x00800000) == 0x00800000) && + joinGameAckMessage_ != de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance()) { + joinGameAckMessage_ = + de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.newBuilder(joinGameAckMessage_).mergeFrom(value).buildPartial(); + } else { + joinGameAckMessage_ = value; + } + + bitField0_ |= 0x00800000; + return this; + } + /** + * optional .JoinGameAckMessage joinGameAckMessage = 24; + */ + public Builder clearJoinGameAckMessage() { + joinGameAckMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x00800000); + return this; + } + + // optional .JoinGameFailedMessage joinGameFailedMessage = 25; + private de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage joinGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance(); + /** + * optional .JoinGameFailedMessage joinGameFailedMessage = 25; + */ + public boolean hasJoinGameFailedMessage() { + return ((bitField0_ & 0x01000000) == 0x01000000); + } + /** + * optional .JoinGameFailedMessage joinGameFailedMessage = 25; + */ + public de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage getJoinGameFailedMessage() { + return joinGameFailedMessage_; + } + /** + * optional .JoinGameFailedMessage joinGameFailedMessage = 25; + */ + public Builder setJoinGameFailedMessage(de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage value) { + if (value == null) { + throw new NullPointerException(); + } + joinGameFailedMessage_ = value; + + bitField0_ |= 0x01000000; + return this; + } + /** + * optional .JoinGameFailedMessage joinGameFailedMessage = 25; + */ + public Builder setJoinGameFailedMessage( + de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.Builder builderForValue) { + joinGameFailedMessage_ = builderForValue.build(); + + bitField0_ |= 0x01000000; + return this; + } + /** + * optional .JoinGameFailedMessage joinGameFailedMessage = 25; + */ + public Builder mergeJoinGameFailedMessage(de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage value) { + if (((bitField0_ & 0x01000000) == 0x01000000) && + joinGameFailedMessage_ != de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance()) { + joinGameFailedMessage_ = + de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.newBuilder(joinGameFailedMessage_).mergeFrom(value).buildPartial(); + } else { + joinGameFailedMessage_ = value; + } + + bitField0_ |= 0x01000000; + return this; + } + /** + * optional .JoinGameFailedMessage joinGameFailedMessage = 25; + */ + public Builder clearJoinGameFailedMessage() { + joinGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x01000000); + return this; + } + + // optional .InviteNotifyMessage inviteNotifyMessage = 26; + private de.pokerth.protocol.ProtoBuf.InviteNotifyMessage inviteNotifyMessage_ = de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.getDefaultInstance(); + /** + * optional .InviteNotifyMessage inviteNotifyMessage = 26; + */ + public boolean hasInviteNotifyMessage() { + return ((bitField0_ & 0x02000000) == 0x02000000); + } + /** + * optional .InviteNotifyMessage inviteNotifyMessage = 26; */ public de.pokerth.protocol.ProtoBuf.InviteNotifyMessage getInviteNotifyMessage() { return inviteNotifyMessage_; } /** - * optional .InviteNotifyMessage inviteNotifyMessage = 24; + * optional .InviteNotifyMessage inviteNotifyMessage = 26; */ public Builder setInviteNotifyMessage(de.pokerth.protocol.ProtoBuf.InviteNotifyMessage value) { if (value == null) { @@ -53767,24 +54188,24 @@ public final class ProtoBuf { } inviteNotifyMessage_ = value; - bitField0_ |= 0x00800000; + bitField0_ |= 0x02000000; return this; } /** - * optional .InviteNotifyMessage inviteNotifyMessage = 24; + * optional .InviteNotifyMessage inviteNotifyMessage = 26; */ public Builder setInviteNotifyMessage( de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.Builder builderForValue) { inviteNotifyMessage_ = builderForValue.build(); - bitField0_ |= 0x00800000; + bitField0_ |= 0x02000000; return this; } /** - * optional .InviteNotifyMessage inviteNotifyMessage = 24; + * optional .InviteNotifyMessage inviteNotifyMessage = 26; */ public Builder mergeInviteNotifyMessage(de.pokerth.protocol.ProtoBuf.InviteNotifyMessage value) { - if (((bitField0_ & 0x00800000) == 0x00800000) && + if (((bitField0_ & 0x02000000) == 0x02000000) && inviteNotifyMessage_ != de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.getDefaultInstance()) { inviteNotifyMessage_ = de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.newBuilder(inviteNotifyMessage_).mergeFrom(value).buildPartial(); @@ -53792,35 +54213,35 @@ public final class ProtoBuf { inviteNotifyMessage_ = value; } - bitField0_ |= 0x00800000; + bitField0_ |= 0x02000000; return this; } /** - * optional .InviteNotifyMessage inviteNotifyMessage = 24; + * optional .InviteNotifyMessage inviteNotifyMessage = 26; */ public Builder clearInviteNotifyMessage() { inviteNotifyMessage_ = de.pokerth.protocol.ProtoBuf.InviteNotifyMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00800000); + bitField0_ = (bitField0_ & ~0x02000000); return this; } - // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + // optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; private de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage rejectGameInvitationMessage_ = de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage.getDefaultInstance(); /** - * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; */ public boolean hasRejectGameInvitationMessage() { - return ((bitField0_ & 0x01000000) == 0x01000000); + return ((bitField0_ & 0x04000000) == 0x04000000); } /** - * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; */ public de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage getRejectGameInvitationMessage() { return rejectGameInvitationMessage_; } /** - * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; */ public Builder setRejectGameInvitationMessage(de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage value) { if (value == null) { @@ -53828,24 +54249,24 @@ public final class ProtoBuf { } rejectGameInvitationMessage_ = value; - bitField0_ |= 0x01000000; + bitField0_ |= 0x04000000; return this; } /** - * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; */ public Builder setRejectGameInvitationMessage( de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage.Builder builderForValue) { rejectGameInvitationMessage_ = builderForValue.build(); - bitField0_ |= 0x01000000; + bitField0_ |= 0x04000000; return this; } /** - * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; */ public Builder mergeRejectGameInvitationMessage(de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage value) { - if (((bitField0_ & 0x01000000) == 0x01000000) && + if (((bitField0_ & 0x04000000) == 0x04000000) && rejectGameInvitationMessage_ != de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage.getDefaultInstance()) { rejectGameInvitationMessage_ = de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage.newBuilder(rejectGameInvitationMessage_).mergeFrom(value).buildPartial(); @@ -53853,35 +54274,35 @@ public final class ProtoBuf { rejectGameInvitationMessage_ = value; } - bitField0_ |= 0x01000000; + bitField0_ |= 0x04000000; return this; } /** - * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 25; + * optional .RejectGameInvitationMessage rejectGameInvitationMessage = 27; */ public Builder clearRejectGameInvitationMessage() { rejectGameInvitationMessage_ = de.pokerth.protocol.ProtoBuf.RejectGameInvitationMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x01000000); + bitField0_ = (bitField0_ & ~0x04000000); return this; } - // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + // optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; private de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage rejectInvNotifyMessage_ = de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage.getDefaultInstance(); /** - * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; */ public boolean hasRejectInvNotifyMessage() { - return ((bitField0_ & 0x02000000) == 0x02000000); + return ((bitField0_ & 0x08000000) == 0x08000000); } /** - * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; */ public de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage getRejectInvNotifyMessage() { return rejectInvNotifyMessage_; } /** - * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; */ public Builder setRejectInvNotifyMessage(de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage value) { if (value == null) { @@ -53889,24 +54310,24 @@ public final class ProtoBuf { } rejectInvNotifyMessage_ = value; - bitField0_ |= 0x02000000; + bitField0_ |= 0x08000000; return this; } /** - * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; */ public Builder setRejectInvNotifyMessage( de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage.Builder builderForValue) { rejectInvNotifyMessage_ = builderForValue.build(); - bitField0_ |= 0x02000000; + bitField0_ |= 0x08000000; return this; } /** - * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; */ public Builder mergeRejectInvNotifyMessage(de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage value) { - if (((bitField0_ & 0x02000000) == 0x02000000) && + if (((bitField0_ & 0x08000000) == 0x08000000) && rejectInvNotifyMessage_ != de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage.getDefaultInstance()) { rejectInvNotifyMessage_ = de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage.newBuilder(rejectInvNotifyMessage_).mergeFrom(value).buildPartial(); @@ -53914,35 +54335,35 @@ public final class ProtoBuf { rejectInvNotifyMessage_ = value; } - bitField0_ |= 0x02000000; + bitField0_ |= 0x08000000; return this; } /** - * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 26; + * optional .RejectInvNotifyMessage rejectInvNotifyMessage = 28; */ public Builder clearRejectInvNotifyMessage() { rejectInvNotifyMessage_ = de.pokerth.protocol.ProtoBuf.RejectInvNotifyMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x02000000); + bitField0_ = (bitField0_ & ~0x08000000); return this; } - // optional .StatisticsMessage statisticsMessage = 27; + // optional .StatisticsMessage statisticsMessage = 29; private de.pokerth.protocol.ProtoBuf.StatisticsMessage statisticsMessage_ = de.pokerth.protocol.ProtoBuf.StatisticsMessage.getDefaultInstance(); /** - * optional .StatisticsMessage statisticsMessage = 27; + * optional .StatisticsMessage statisticsMessage = 29; */ public boolean hasStatisticsMessage() { - return ((bitField0_ & 0x04000000) == 0x04000000); + return ((bitField0_ & 0x10000000) == 0x10000000); } /** - * optional .StatisticsMessage statisticsMessage = 27; + * optional .StatisticsMessage statisticsMessage = 29; */ public de.pokerth.protocol.ProtoBuf.StatisticsMessage getStatisticsMessage() { return statisticsMessage_; } /** - * optional .StatisticsMessage statisticsMessage = 27; + * optional .StatisticsMessage statisticsMessage = 29; */ public Builder setStatisticsMessage(de.pokerth.protocol.ProtoBuf.StatisticsMessage value) { if (value == null) { @@ -53950,24 +54371,24 @@ public final class ProtoBuf { } statisticsMessage_ = value; - bitField0_ |= 0x04000000; + bitField0_ |= 0x10000000; return this; } /** - * optional .StatisticsMessage statisticsMessage = 27; + * optional .StatisticsMessage statisticsMessage = 29; */ public Builder setStatisticsMessage( de.pokerth.protocol.ProtoBuf.StatisticsMessage.Builder builderForValue) { statisticsMessage_ = builderForValue.build(); - bitField0_ |= 0x04000000; + bitField0_ |= 0x10000000; return this; } /** - * optional .StatisticsMessage statisticsMessage = 27; + * optional .StatisticsMessage statisticsMessage = 29; */ public Builder mergeStatisticsMessage(de.pokerth.protocol.ProtoBuf.StatisticsMessage value) { - if (((bitField0_ & 0x04000000) == 0x04000000) && + if (((bitField0_ & 0x10000000) == 0x10000000) && statisticsMessage_ != de.pokerth.protocol.ProtoBuf.StatisticsMessage.getDefaultInstance()) { statisticsMessage_ = de.pokerth.protocol.ProtoBuf.StatisticsMessage.newBuilder(statisticsMessage_).mergeFrom(value).buildPartial(); @@ -53975,35 +54396,35 @@ public final class ProtoBuf { statisticsMessage_ = value; } - bitField0_ |= 0x04000000; + bitField0_ |= 0x10000000; return this; } /** - * optional .StatisticsMessage statisticsMessage = 27; + * optional .StatisticsMessage statisticsMessage = 29; */ public Builder clearStatisticsMessage() { statisticsMessage_ = de.pokerth.protocol.ProtoBuf.StatisticsMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x04000000); + bitField0_ = (bitField0_ & ~0x10000000); return this; } - // optional .ChatRequestMessage chatRequestMessage = 28; + // optional .ChatRequestMessage chatRequestMessage = 30; private de.pokerth.protocol.ProtoBuf.ChatRequestMessage chatRequestMessage_ = de.pokerth.protocol.ProtoBuf.ChatRequestMessage.getDefaultInstance(); /** - * optional .ChatRequestMessage chatRequestMessage = 28; + * optional .ChatRequestMessage chatRequestMessage = 30; */ public boolean hasChatRequestMessage() { - return ((bitField0_ & 0x08000000) == 0x08000000); + return ((bitField0_ & 0x20000000) == 0x20000000); } /** - * optional .ChatRequestMessage chatRequestMessage = 28; + * optional .ChatRequestMessage chatRequestMessage = 30; */ public de.pokerth.protocol.ProtoBuf.ChatRequestMessage getChatRequestMessage() { return chatRequestMessage_; } /** - * optional .ChatRequestMessage chatRequestMessage = 28; + * optional .ChatRequestMessage chatRequestMessage = 30; */ public Builder setChatRequestMessage(de.pokerth.protocol.ProtoBuf.ChatRequestMessage value) { if (value == null) { @@ -54011,24 +54432,24 @@ public final class ProtoBuf { } chatRequestMessage_ = value; - bitField0_ |= 0x08000000; + bitField0_ |= 0x20000000; return this; } /** - * optional .ChatRequestMessage chatRequestMessage = 28; + * optional .ChatRequestMessage chatRequestMessage = 30; */ public Builder setChatRequestMessage( de.pokerth.protocol.ProtoBuf.ChatRequestMessage.Builder builderForValue) { chatRequestMessage_ = builderForValue.build(); - bitField0_ |= 0x08000000; + bitField0_ |= 0x20000000; return this; } /** - * optional .ChatRequestMessage chatRequestMessage = 28; + * optional .ChatRequestMessage chatRequestMessage = 30; */ public Builder mergeChatRequestMessage(de.pokerth.protocol.ProtoBuf.ChatRequestMessage value) { - if (((bitField0_ & 0x08000000) == 0x08000000) && + if (((bitField0_ & 0x20000000) == 0x20000000) && chatRequestMessage_ != de.pokerth.protocol.ProtoBuf.ChatRequestMessage.getDefaultInstance()) { chatRequestMessage_ = de.pokerth.protocol.ProtoBuf.ChatRequestMessage.newBuilder(chatRequestMessage_).mergeFrom(value).buildPartial(); @@ -54036,35 +54457,35 @@ public final class ProtoBuf { chatRequestMessage_ = value; } - bitField0_ |= 0x08000000; + bitField0_ |= 0x20000000; return this; } /** - * optional .ChatRequestMessage chatRequestMessage = 28; + * optional .ChatRequestMessage chatRequestMessage = 30; */ public Builder clearChatRequestMessage() { chatRequestMessage_ = de.pokerth.protocol.ProtoBuf.ChatRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x08000000); + bitField0_ = (bitField0_ & ~0x20000000); return this; } - // optional .ChatMessage chatMessage = 29; + // optional .ChatMessage chatMessage = 31; private de.pokerth.protocol.ProtoBuf.ChatMessage chatMessage_ = de.pokerth.protocol.ProtoBuf.ChatMessage.getDefaultInstance(); /** - * optional .ChatMessage chatMessage = 29; + * optional .ChatMessage chatMessage = 31; */ public boolean hasChatMessage() { - return ((bitField0_ & 0x10000000) == 0x10000000); + return ((bitField0_ & 0x40000000) == 0x40000000); } /** - * optional .ChatMessage chatMessage = 29; + * optional .ChatMessage chatMessage = 31; */ public de.pokerth.protocol.ProtoBuf.ChatMessage getChatMessage() { return chatMessage_; } /** - * optional .ChatMessage chatMessage = 29; + * optional .ChatMessage chatMessage = 31; */ public Builder setChatMessage(de.pokerth.protocol.ProtoBuf.ChatMessage value) { if (value == null) { @@ -54072,24 +54493,24 @@ public final class ProtoBuf { } chatMessage_ = value; - bitField0_ |= 0x10000000; + bitField0_ |= 0x40000000; return this; } /** - * optional .ChatMessage chatMessage = 29; + * optional .ChatMessage chatMessage = 31; */ public Builder setChatMessage( de.pokerth.protocol.ProtoBuf.ChatMessage.Builder builderForValue) { chatMessage_ = builderForValue.build(); - bitField0_ |= 0x10000000; + bitField0_ |= 0x40000000; return this; } /** - * optional .ChatMessage chatMessage = 29; + * optional .ChatMessage chatMessage = 31; */ public Builder mergeChatMessage(de.pokerth.protocol.ProtoBuf.ChatMessage value) { - if (((bitField0_ & 0x10000000) == 0x10000000) && + if (((bitField0_ & 0x40000000) == 0x40000000) && chatMessage_ != de.pokerth.protocol.ProtoBuf.ChatMessage.getDefaultInstance()) { chatMessage_ = de.pokerth.protocol.ProtoBuf.ChatMessage.newBuilder(chatMessage_).mergeFrom(value).buildPartial(); @@ -54097,35 +54518,35 @@ public final class ProtoBuf { chatMessage_ = value; } - bitField0_ |= 0x10000000; + bitField0_ |= 0x40000000; return this; } /** - * optional .ChatMessage chatMessage = 29; + * optional .ChatMessage chatMessage = 31; */ public Builder clearChatMessage() { chatMessage_ = de.pokerth.protocol.ProtoBuf.ChatMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x10000000); + bitField0_ = (bitField0_ & ~0x40000000); return this; } - // optional .ChatRejectMessage chatRejectMessage = 30; + // optional .ChatRejectMessage chatRejectMessage = 32; private de.pokerth.protocol.ProtoBuf.ChatRejectMessage chatRejectMessage_ = de.pokerth.protocol.ProtoBuf.ChatRejectMessage.getDefaultInstance(); /** - * optional .ChatRejectMessage chatRejectMessage = 30; + * optional .ChatRejectMessage chatRejectMessage = 32; */ public boolean hasChatRejectMessage() { - return ((bitField0_ & 0x20000000) == 0x20000000); + return ((bitField0_ & 0x80000000) == 0x80000000); } /** - * optional .ChatRejectMessage chatRejectMessage = 30; + * optional .ChatRejectMessage chatRejectMessage = 32; */ public de.pokerth.protocol.ProtoBuf.ChatRejectMessage getChatRejectMessage() { return chatRejectMessage_; } /** - * optional .ChatRejectMessage chatRejectMessage = 30; + * optional .ChatRejectMessage chatRejectMessage = 32; */ public Builder setChatRejectMessage(de.pokerth.protocol.ProtoBuf.ChatRejectMessage value) { if (value == null) { @@ -54133,24 +54554,24 @@ public final class ProtoBuf { } chatRejectMessage_ = value; - bitField0_ |= 0x20000000; + bitField0_ |= 0x80000000; return this; } /** - * optional .ChatRejectMessage chatRejectMessage = 30; + * optional .ChatRejectMessage chatRejectMessage = 32; */ public Builder setChatRejectMessage( de.pokerth.protocol.ProtoBuf.ChatRejectMessage.Builder builderForValue) { chatRejectMessage_ = builderForValue.build(); - bitField0_ |= 0x20000000; + bitField0_ |= 0x80000000; return this; } /** - * optional .ChatRejectMessage chatRejectMessage = 30; + * optional .ChatRejectMessage chatRejectMessage = 32; */ public Builder mergeChatRejectMessage(de.pokerth.protocol.ProtoBuf.ChatRejectMessage value) { - if (((bitField0_ & 0x20000000) == 0x20000000) && + if (((bitField0_ & 0x80000000) == 0x80000000) && chatRejectMessage_ != de.pokerth.protocol.ProtoBuf.ChatRejectMessage.getDefaultInstance()) { chatRejectMessage_ = de.pokerth.protocol.ProtoBuf.ChatRejectMessage.newBuilder(chatRejectMessage_).mergeFrom(value).buildPartial(); @@ -54158,35 +54579,35 @@ public final class ProtoBuf { chatRejectMessage_ = value; } - bitField0_ |= 0x20000000; + bitField0_ |= 0x80000000; return this; } /** - * optional .ChatRejectMessage chatRejectMessage = 30; + * optional .ChatRejectMessage chatRejectMessage = 32; */ public Builder clearChatRejectMessage() { chatRejectMessage_ = de.pokerth.protocol.ProtoBuf.ChatRejectMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x20000000); + bitField0_ = (bitField0_ & ~0x80000000); return this; } - // optional .DialogMessage dialogMessage = 31; + // optional .DialogMessage dialogMessage = 33; private de.pokerth.protocol.ProtoBuf.DialogMessage dialogMessage_ = de.pokerth.protocol.ProtoBuf.DialogMessage.getDefaultInstance(); /** - * optional .DialogMessage dialogMessage = 31; + * optional .DialogMessage dialogMessage = 33; */ public boolean hasDialogMessage() { - return ((bitField0_ & 0x40000000) == 0x40000000); + return ((bitField1_ & 0x00000001) == 0x00000001); } /** - * optional .DialogMessage dialogMessage = 31; + * optional .DialogMessage dialogMessage = 33; */ public de.pokerth.protocol.ProtoBuf.DialogMessage getDialogMessage() { return dialogMessage_; } /** - * optional .DialogMessage dialogMessage = 31; + * optional .DialogMessage dialogMessage = 33; */ public Builder setDialogMessage(de.pokerth.protocol.ProtoBuf.DialogMessage value) { if (value == null) { @@ -54194,24 +54615,24 @@ public final class ProtoBuf { } dialogMessage_ = value; - bitField0_ |= 0x40000000; + bitField1_ |= 0x00000001; return this; } /** - * optional .DialogMessage dialogMessage = 31; + * optional .DialogMessage dialogMessage = 33; */ public Builder setDialogMessage( de.pokerth.protocol.ProtoBuf.DialogMessage.Builder builderForValue) { dialogMessage_ = builderForValue.build(); - bitField0_ |= 0x40000000; + bitField1_ |= 0x00000001; return this; } /** - * optional .DialogMessage dialogMessage = 31; + * optional .DialogMessage dialogMessage = 33; */ public Builder mergeDialogMessage(de.pokerth.protocol.ProtoBuf.DialogMessage value) { - if (((bitField0_ & 0x40000000) == 0x40000000) && + if (((bitField1_ & 0x00000001) == 0x00000001) && dialogMessage_ != de.pokerth.protocol.ProtoBuf.DialogMessage.getDefaultInstance()) { dialogMessage_ = de.pokerth.protocol.ProtoBuf.DialogMessage.newBuilder(dialogMessage_).mergeFrom(value).buildPartial(); @@ -54219,35 +54640,35 @@ public final class ProtoBuf { dialogMessage_ = value; } - bitField0_ |= 0x40000000; + bitField1_ |= 0x00000001; return this; } /** - * optional .DialogMessage dialogMessage = 31; + * optional .DialogMessage dialogMessage = 33; */ public Builder clearDialogMessage() { dialogMessage_ = de.pokerth.protocol.ProtoBuf.DialogMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x40000000); + bitField1_ = (bitField1_ & ~0x00000001); return this; } - // optional .TimeoutWarningMessage timeoutWarningMessage = 32; + // optional .TimeoutWarningMessage timeoutWarningMessage = 34; private de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage timeoutWarningMessage_ = de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.getDefaultInstance(); /** - * optional .TimeoutWarningMessage timeoutWarningMessage = 32; + * optional .TimeoutWarningMessage timeoutWarningMessage = 34; */ public boolean hasTimeoutWarningMessage() { - return ((bitField0_ & 0x80000000) == 0x80000000); + return ((bitField1_ & 0x00000002) == 0x00000002); } /** - * optional .TimeoutWarningMessage timeoutWarningMessage = 32; + * optional .TimeoutWarningMessage timeoutWarningMessage = 34; */ public de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage getTimeoutWarningMessage() { return timeoutWarningMessage_; } /** - * optional .TimeoutWarningMessage timeoutWarningMessage = 32; + * optional .TimeoutWarningMessage timeoutWarningMessage = 34; */ public Builder setTimeoutWarningMessage(de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage value) { if (value == null) { @@ -54255,24 +54676,24 @@ public final class ProtoBuf { } timeoutWarningMessage_ = value; - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000002; return this; } /** - * optional .TimeoutWarningMessage timeoutWarningMessage = 32; + * optional .TimeoutWarningMessage timeoutWarningMessage = 34; */ public Builder setTimeoutWarningMessage( de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.Builder builderForValue) { timeoutWarningMessage_ = builderForValue.build(); - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000002; return this; } /** - * optional .TimeoutWarningMessage timeoutWarningMessage = 32; + * optional .TimeoutWarningMessage timeoutWarningMessage = 34; */ public Builder mergeTimeoutWarningMessage(de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage value) { - if (((bitField0_ & 0x80000000) == 0x80000000) && + if (((bitField1_ & 0x00000002) == 0x00000002) && timeoutWarningMessage_ != de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.getDefaultInstance()) { timeoutWarningMessage_ = de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.newBuilder(timeoutWarningMessage_).mergeFrom(value).buildPartial(); @@ -54280,35 +54701,35 @@ public final class ProtoBuf { timeoutWarningMessage_ = value; } - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000002; return this; } /** - * optional .TimeoutWarningMessage timeoutWarningMessage = 32; + * optional .TimeoutWarningMessage timeoutWarningMessage = 34; */ public Builder clearTimeoutWarningMessage() { timeoutWarningMessage_ = de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x80000000); + bitField1_ = (bitField1_ & ~0x00000002); return this; } - // optional .ResetTimeoutMessage resetTimeoutMessage = 33; + // optional .ResetTimeoutMessage resetTimeoutMessage = 35; private de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage resetTimeoutMessage_ = de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.getDefaultInstance(); /** - * optional .ResetTimeoutMessage resetTimeoutMessage = 33; + * optional .ResetTimeoutMessage resetTimeoutMessage = 35; */ public boolean hasResetTimeoutMessage() { - return ((bitField1_ & 0x00000001) == 0x00000001); + return ((bitField1_ & 0x00000004) == 0x00000004); } /** - * optional .ResetTimeoutMessage resetTimeoutMessage = 33; + * optional .ResetTimeoutMessage resetTimeoutMessage = 35; */ public de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage getResetTimeoutMessage() { return resetTimeoutMessage_; } /** - * optional .ResetTimeoutMessage resetTimeoutMessage = 33; + * optional .ResetTimeoutMessage resetTimeoutMessage = 35; */ public Builder setResetTimeoutMessage(de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage value) { if (value == null) { @@ -54316,24 +54737,24 @@ public final class ProtoBuf { } resetTimeoutMessage_ = value; - bitField1_ |= 0x00000001; + bitField1_ |= 0x00000004; return this; } /** - * optional .ResetTimeoutMessage resetTimeoutMessage = 33; + * optional .ResetTimeoutMessage resetTimeoutMessage = 35; */ public Builder setResetTimeoutMessage( de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.Builder builderForValue) { resetTimeoutMessage_ = builderForValue.build(); - bitField1_ |= 0x00000001; + bitField1_ |= 0x00000004; return this; } /** - * optional .ResetTimeoutMessage resetTimeoutMessage = 33; + * optional .ResetTimeoutMessage resetTimeoutMessage = 35; */ public Builder mergeResetTimeoutMessage(de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage value) { - if (((bitField1_ & 0x00000001) == 0x00000001) && + if (((bitField1_ & 0x00000004) == 0x00000004) && resetTimeoutMessage_ != de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.getDefaultInstance()) { resetTimeoutMessage_ = de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.newBuilder(resetTimeoutMessage_).mergeFrom(value).buildPartial(); @@ -54341,35 +54762,35 @@ public final class ProtoBuf { resetTimeoutMessage_ = value; } - bitField1_ |= 0x00000001; + bitField1_ |= 0x00000004; return this; } /** - * optional .ResetTimeoutMessage resetTimeoutMessage = 33; + * optional .ResetTimeoutMessage resetTimeoutMessage = 35; */ public Builder clearResetTimeoutMessage() { resetTimeoutMessage_ = de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.getDefaultInstance(); - bitField1_ = (bitField1_ & ~0x00000001); + bitField1_ = (bitField1_ & ~0x00000004); return this; } - // optional .ReportAvatarMessage reportAvatarMessage = 34; + // optional .ReportAvatarMessage reportAvatarMessage = 36; private de.pokerth.protocol.ProtoBuf.ReportAvatarMessage reportAvatarMessage_ = de.pokerth.protocol.ProtoBuf.ReportAvatarMessage.getDefaultInstance(); /** - * optional .ReportAvatarMessage reportAvatarMessage = 34; + * optional .ReportAvatarMessage reportAvatarMessage = 36; */ public boolean hasReportAvatarMessage() { - return ((bitField1_ & 0x00000002) == 0x00000002); + return ((bitField1_ & 0x00000008) == 0x00000008); } /** - * optional .ReportAvatarMessage reportAvatarMessage = 34; + * optional .ReportAvatarMessage reportAvatarMessage = 36; */ public de.pokerth.protocol.ProtoBuf.ReportAvatarMessage getReportAvatarMessage() { return reportAvatarMessage_; } /** - * optional .ReportAvatarMessage reportAvatarMessage = 34; + * optional .ReportAvatarMessage reportAvatarMessage = 36; */ public Builder setReportAvatarMessage(de.pokerth.protocol.ProtoBuf.ReportAvatarMessage value) { if (value == null) { @@ -54377,24 +54798,24 @@ public final class ProtoBuf { } reportAvatarMessage_ = value; - bitField1_ |= 0x00000002; + bitField1_ |= 0x00000008; return this; } /** - * optional .ReportAvatarMessage reportAvatarMessage = 34; + * optional .ReportAvatarMessage reportAvatarMessage = 36; */ public Builder setReportAvatarMessage( de.pokerth.protocol.ProtoBuf.ReportAvatarMessage.Builder builderForValue) { reportAvatarMessage_ = builderForValue.build(); - bitField1_ |= 0x00000002; + bitField1_ |= 0x00000008; return this; } /** - * optional .ReportAvatarMessage reportAvatarMessage = 34; + * optional .ReportAvatarMessage reportAvatarMessage = 36; */ public Builder mergeReportAvatarMessage(de.pokerth.protocol.ProtoBuf.ReportAvatarMessage value) { - if (((bitField1_ & 0x00000002) == 0x00000002) && + if (((bitField1_ & 0x00000008) == 0x00000008) && reportAvatarMessage_ != de.pokerth.protocol.ProtoBuf.ReportAvatarMessage.getDefaultInstance()) { reportAvatarMessage_ = de.pokerth.protocol.ProtoBuf.ReportAvatarMessage.newBuilder(reportAvatarMessage_).mergeFrom(value).buildPartial(); @@ -54402,35 +54823,35 @@ public final class ProtoBuf { reportAvatarMessage_ = value; } - bitField1_ |= 0x00000002; + bitField1_ |= 0x00000008; return this; } /** - * optional .ReportAvatarMessage reportAvatarMessage = 34; + * optional .ReportAvatarMessage reportAvatarMessage = 36; */ public Builder clearReportAvatarMessage() { reportAvatarMessage_ = de.pokerth.protocol.ProtoBuf.ReportAvatarMessage.getDefaultInstance(); - bitField1_ = (bitField1_ & ~0x00000002); + bitField1_ = (bitField1_ & ~0x00000008); return this; } - // optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + // optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; private de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage reportAvatarAckMessage_ = de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage.getDefaultInstance(); /** - * optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + * optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; */ public boolean hasReportAvatarAckMessage() { - return ((bitField1_ & 0x00000004) == 0x00000004); + return ((bitField1_ & 0x00000010) == 0x00000010); } /** - * optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + * optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; */ public de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage getReportAvatarAckMessage() { return reportAvatarAckMessage_; } /** - * optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + * optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; */ public Builder setReportAvatarAckMessage(de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage value) { if (value == null) { @@ -54438,24 +54859,24 @@ public final class ProtoBuf { } reportAvatarAckMessage_ = value; - bitField1_ |= 0x00000004; + bitField1_ |= 0x00000010; return this; } /** - * optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + * optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; */ public Builder setReportAvatarAckMessage( de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage.Builder builderForValue) { reportAvatarAckMessage_ = builderForValue.build(); - bitField1_ |= 0x00000004; + bitField1_ |= 0x00000010; return this; } /** - * optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + * optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; */ public Builder mergeReportAvatarAckMessage(de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage value) { - if (((bitField1_ & 0x00000004) == 0x00000004) && + if (((bitField1_ & 0x00000010) == 0x00000010) && reportAvatarAckMessage_ != de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage.getDefaultInstance()) { reportAvatarAckMessage_ = de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage.newBuilder(reportAvatarAckMessage_).mergeFrom(value).buildPartial(); @@ -54463,35 +54884,35 @@ public final class ProtoBuf { reportAvatarAckMessage_ = value; } - bitField1_ |= 0x00000004; + bitField1_ |= 0x00000010; return this; } /** - * optional .ReportAvatarAckMessage reportAvatarAckMessage = 35; + * optional .ReportAvatarAckMessage reportAvatarAckMessage = 37; */ public Builder clearReportAvatarAckMessage() { reportAvatarAckMessage_ = de.pokerth.protocol.ProtoBuf.ReportAvatarAckMessage.getDefaultInstance(); - bitField1_ = (bitField1_ & ~0x00000004); + bitField1_ = (bitField1_ & ~0x00000010); return this; } - // optional .ReportGameMessage reportGameMessage = 36; + // optional .ReportGameMessage reportGameMessage = 38; private de.pokerth.protocol.ProtoBuf.ReportGameMessage reportGameMessage_ = de.pokerth.protocol.ProtoBuf.ReportGameMessage.getDefaultInstance(); /** - * optional .ReportGameMessage reportGameMessage = 36; + * optional .ReportGameMessage reportGameMessage = 38; */ public boolean hasReportGameMessage() { - return ((bitField1_ & 0x00000008) == 0x00000008); + return ((bitField1_ & 0x00000020) == 0x00000020); } /** - * optional .ReportGameMessage reportGameMessage = 36; + * optional .ReportGameMessage reportGameMessage = 38; */ public de.pokerth.protocol.ProtoBuf.ReportGameMessage getReportGameMessage() { return reportGameMessage_; } /** - * optional .ReportGameMessage reportGameMessage = 36; + * optional .ReportGameMessage reportGameMessage = 38; */ public Builder setReportGameMessage(de.pokerth.protocol.ProtoBuf.ReportGameMessage value) { if (value == null) { @@ -54499,24 +54920,24 @@ public final class ProtoBuf { } reportGameMessage_ = value; - bitField1_ |= 0x00000008; + bitField1_ |= 0x00000020; return this; } /** - * optional .ReportGameMessage reportGameMessage = 36; + * optional .ReportGameMessage reportGameMessage = 38; */ public Builder setReportGameMessage( de.pokerth.protocol.ProtoBuf.ReportGameMessage.Builder builderForValue) { reportGameMessage_ = builderForValue.build(); - bitField1_ |= 0x00000008; + bitField1_ |= 0x00000020; return this; } /** - * optional .ReportGameMessage reportGameMessage = 36; + * optional .ReportGameMessage reportGameMessage = 38; */ public Builder mergeReportGameMessage(de.pokerth.protocol.ProtoBuf.ReportGameMessage value) { - if (((bitField1_ & 0x00000008) == 0x00000008) && + if (((bitField1_ & 0x00000020) == 0x00000020) && reportGameMessage_ != de.pokerth.protocol.ProtoBuf.ReportGameMessage.getDefaultInstance()) { reportGameMessage_ = de.pokerth.protocol.ProtoBuf.ReportGameMessage.newBuilder(reportGameMessage_).mergeFrom(value).buildPartial(); @@ -54524,35 +54945,35 @@ public final class ProtoBuf { reportGameMessage_ = value; } - bitField1_ |= 0x00000008; + bitField1_ |= 0x00000020; return this; } /** - * optional .ReportGameMessage reportGameMessage = 36; + * optional .ReportGameMessage reportGameMessage = 38; */ public Builder clearReportGameMessage() { reportGameMessage_ = de.pokerth.protocol.ProtoBuf.ReportGameMessage.getDefaultInstance(); - bitField1_ = (bitField1_ & ~0x00000008); + bitField1_ = (bitField1_ & ~0x00000020); return this; } - // optional .ReportGameAckMessage reportGameAckMessage = 37; + // optional .ReportGameAckMessage reportGameAckMessage = 39; private de.pokerth.protocol.ProtoBuf.ReportGameAckMessage reportGameAckMessage_ = de.pokerth.protocol.ProtoBuf.ReportGameAckMessage.getDefaultInstance(); /** - * optional .ReportGameAckMessage reportGameAckMessage = 37; + * optional .ReportGameAckMessage reportGameAckMessage = 39; */ public boolean hasReportGameAckMessage() { - return ((bitField1_ & 0x00000010) == 0x00000010); + return ((bitField1_ & 0x00000040) == 0x00000040); } /** - * optional .ReportGameAckMessage reportGameAckMessage = 37; + * optional .ReportGameAckMessage reportGameAckMessage = 39; */ public de.pokerth.protocol.ProtoBuf.ReportGameAckMessage getReportGameAckMessage() { return reportGameAckMessage_; } /** - * optional .ReportGameAckMessage reportGameAckMessage = 37; + * optional .ReportGameAckMessage reportGameAckMessage = 39; */ public Builder setReportGameAckMessage(de.pokerth.protocol.ProtoBuf.ReportGameAckMessage value) { if (value == null) { @@ -54560,24 +54981,24 @@ public final class ProtoBuf { } reportGameAckMessage_ = value; - bitField1_ |= 0x00000010; + bitField1_ |= 0x00000040; return this; } /** - * optional .ReportGameAckMessage reportGameAckMessage = 37; + * optional .ReportGameAckMessage reportGameAckMessage = 39; */ public Builder setReportGameAckMessage( de.pokerth.protocol.ProtoBuf.ReportGameAckMessage.Builder builderForValue) { reportGameAckMessage_ = builderForValue.build(); - bitField1_ |= 0x00000010; + bitField1_ |= 0x00000040; return this; } /** - * optional .ReportGameAckMessage reportGameAckMessage = 37; + * optional .ReportGameAckMessage reportGameAckMessage = 39; */ public Builder mergeReportGameAckMessage(de.pokerth.protocol.ProtoBuf.ReportGameAckMessage value) { - if (((bitField1_ & 0x00000010) == 0x00000010) && + if (((bitField1_ & 0x00000040) == 0x00000040) && reportGameAckMessage_ != de.pokerth.protocol.ProtoBuf.ReportGameAckMessage.getDefaultInstance()) { reportGameAckMessage_ = de.pokerth.protocol.ProtoBuf.ReportGameAckMessage.newBuilder(reportGameAckMessage_).mergeFrom(value).buildPartial(); @@ -54585,35 +55006,35 @@ public final class ProtoBuf { reportGameAckMessage_ = value; } - bitField1_ |= 0x00000010; + bitField1_ |= 0x00000040; return this; } /** - * optional .ReportGameAckMessage reportGameAckMessage = 37; + * optional .ReportGameAckMessage reportGameAckMessage = 39; */ public Builder clearReportGameAckMessage() { reportGameAckMessage_ = de.pokerth.protocol.ProtoBuf.ReportGameAckMessage.getDefaultInstance(); - bitField1_ = (bitField1_ & ~0x00000010); + bitField1_ = (bitField1_ & ~0x00000040); return this; } - // optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + // optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; private de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage adminRemoveGameMessage_ = de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage.getDefaultInstance(); /** - * optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + * optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; */ public boolean hasAdminRemoveGameMessage() { - return ((bitField1_ & 0x00000020) == 0x00000020); + return ((bitField1_ & 0x00000080) == 0x00000080); } /** - * optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + * optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; */ public de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage getAdminRemoveGameMessage() { return adminRemoveGameMessage_; } /** - * optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + * optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; */ public Builder setAdminRemoveGameMessage(de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage value) { if (value == null) { @@ -54621,24 +55042,24 @@ public final class ProtoBuf { } adminRemoveGameMessage_ = value; - bitField1_ |= 0x00000020; + bitField1_ |= 0x00000080; return this; } /** - * optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + * optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; */ public Builder setAdminRemoveGameMessage( de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage.Builder builderForValue) { adminRemoveGameMessage_ = builderForValue.build(); - bitField1_ |= 0x00000020; + bitField1_ |= 0x00000080; return this; } /** - * optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + * optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; */ public Builder mergeAdminRemoveGameMessage(de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage value) { - if (((bitField1_ & 0x00000020) == 0x00000020) && + if (((bitField1_ & 0x00000080) == 0x00000080) && adminRemoveGameMessage_ != de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage.getDefaultInstance()) { adminRemoveGameMessage_ = de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage.newBuilder(adminRemoveGameMessage_).mergeFrom(value).buildPartial(); @@ -54646,35 +55067,35 @@ public final class ProtoBuf { adminRemoveGameMessage_ = value; } - bitField1_ |= 0x00000020; + bitField1_ |= 0x00000080; return this; } /** - * optional .AdminRemoveGameMessage adminRemoveGameMessage = 38; + * optional .AdminRemoveGameMessage adminRemoveGameMessage = 40; */ public Builder clearAdminRemoveGameMessage() { adminRemoveGameMessage_ = de.pokerth.protocol.ProtoBuf.AdminRemoveGameMessage.getDefaultInstance(); - bitField1_ = (bitField1_ & ~0x00000020); + bitField1_ = (bitField1_ & ~0x00000080); return this; } - // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + // optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; private de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage adminRemoveGameAckMessage_ = de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage.getDefaultInstance(); /** - * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; */ public boolean hasAdminRemoveGameAckMessage() { - return ((bitField1_ & 0x00000040) == 0x00000040); + return ((bitField1_ & 0x00000100) == 0x00000100); } /** - * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; */ public de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage getAdminRemoveGameAckMessage() { return adminRemoveGameAckMessage_; } /** - * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; */ public Builder setAdminRemoveGameAckMessage(de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage value) { if (value == null) { @@ -54682,24 +55103,24 @@ public final class ProtoBuf { } adminRemoveGameAckMessage_ = value; - bitField1_ |= 0x00000040; + bitField1_ |= 0x00000100; return this; } /** - * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; */ public Builder setAdminRemoveGameAckMessage( de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage.Builder builderForValue) { adminRemoveGameAckMessage_ = builderForValue.build(); - bitField1_ |= 0x00000040; + bitField1_ |= 0x00000100; return this; } /** - * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; */ public Builder mergeAdminRemoveGameAckMessage(de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage value) { - if (((bitField1_ & 0x00000040) == 0x00000040) && + if (((bitField1_ & 0x00000100) == 0x00000100) && adminRemoveGameAckMessage_ != de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage.getDefaultInstance()) { adminRemoveGameAckMessage_ = de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage.newBuilder(adminRemoveGameAckMessage_).mergeFrom(value).buildPartial(); @@ -54707,35 +55128,35 @@ public final class ProtoBuf { adminRemoveGameAckMessage_ = value; } - bitField1_ |= 0x00000040; + bitField1_ |= 0x00000100; return this; } /** - * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 39; + * optional .AdminRemoveGameAckMessage adminRemoveGameAckMessage = 41; */ public Builder clearAdminRemoveGameAckMessage() { adminRemoveGameAckMessage_ = de.pokerth.protocol.ProtoBuf.AdminRemoveGameAckMessage.getDefaultInstance(); - bitField1_ = (bitField1_ & ~0x00000040); + bitField1_ = (bitField1_ & ~0x00000100); return this; } - // optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + // optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; private de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage adminBanPlayerMessage_ = de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage.getDefaultInstance(); /** - * optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + * optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; */ public boolean hasAdminBanPlayerMessage() { - return ((bitField1_ & 0x00000080) == 0x00000080); + return ((bitField1_ & 0x00000200) == 0x00000200); } /** - * optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + * optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; */ public de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage getAdminBanPlayerMessage() { return adminBanPlayerMessage_; } /** - * optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + * optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; */ public Builder setAdminBanPlayerMessage(de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage value) { if (value == null) { @@ -54743,24 +55164,24 @@ public final class ProtoBuf { } adminBanPlayerMessage_ = value; - bitField1_ |= 0x00000080; + bitField1_ |= 0x00000200; return this; } /** - * optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + * optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; */ public Builder setAdminBanPlayerMessage( de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage.Builder builderForValue) { adminBanPlayerMessage_ = builderForValue.build(); - bitField1_ |= 0x00000080; + bitField1_ |= 0x00000200; return this; } /** - * optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + * optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; */ public Builder mergeAdminBanPlayerMessage(de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage value) { - if (((bitField1_ & 0x00000080) == 0x00000080) && + if (((bitField1_ & 0x00000200) == 0x00000200) && adminBanPlayerMessage_ != de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage.getDefaultInstance()) { adminBanPlayerMessage_ = de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage.newBuilder(adminBanPlayerMessage_).mergeFrom(value).buildPartial(); @@ -54768,35 +55189,35 @@ public final class ProtoBuf { adminBanPlayerMessage_ = value; } - bitField1_ |= 0x00000080; + bitField1_ |= 0x00000200; return this; } /** - * optional .AdminBanPlayerMessage adminBanPlayerMessage = 40; + * optional .AdminBanPlayerMessage adminBanPlayerMessage = 42; */ public Builder clearAdminBanPlayerMessage() { adminBanPlayerMessage_ = de.pokerth.protocol.ProtoBuf.AdminBanPlayerMessage.getDefaultInstance(); - bitField1_ = (bitField1_ & ~0x00000080); + bitField1_ = (bitField1_ & ~0x00000200); return this; } - // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + // optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; private de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage adminBanPlayerAckMessage_ = de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage.getDefaultInstance(); /** - * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; */ public boolean hasAdminBanPlayerAckMessage() { - return ((bitField1_ & 0x00000100) == 0x00000100); + return ((bitField1_ & 0x00000400) == 0x00000400); } /** - * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; */ public de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage getAdminBanPlayerAckMessage() { return adminBanPlayerAckMessage_; } /** - * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; */ public Builder setAdminBanPlayerAckMessage(de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage value) { if (value == null) { @@ -54804,24 +55225,24 @@ public final class ProtoBuf { } adminBanPlayerAckMessage_ = value; - bitField1_ |= 0x00000100; + bitField1_ |= 0x00000400; return this; } /** - * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; */ public Builder setAdminBanPlayerAckMessage( de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage.Builder builderForValue) { adminBanPlayerAckMessage_ = builderForValue.build(); - bitField1_ |= 0x00000100; + bitField1_ |= 0x00000400; return this; } /** - * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; */ public Builder mergeAdminBanPlayerAckMessage(de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage value) { - if (((bitField1_ & 0x00000100) == 0x00000100) && + if (((bitField1_ & 0x00000400) == 0x00000400) && adminBanPlayerAckMessage_ != de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage.getDefaultInstance()) { adminBanPlayerAckMessage_ = de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage.newBuilder(adminBanPlayerAckMessage_).mergeFrom(value).buildPartial(); @@ -54829,16 +55250,16 @@ public final class ProtoBuf { adminBanPlayerAckMessage_ = value; } - bitField1_ |= 0x00000100; + bitField1_ |= 0x00000400; return this; } /** - * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 41; + * optional .AdminBanPlayerAckMessage adminBanPlayerAckMessage = 43; */ public Builder clearAdminBanPlayerAckMessage() { adminBanPlayerAckMessage_ = de.pokerth.protocol.ProtoBuf.AdminBanPlayerAckMessage.getDefaultInstance(); - bitField1_ = (bitField1_ & ~0x00000100); + bitField1_ = (bitField1_ & ~0x00000400); return this; } @@ -54848,7 +55269,7 @@ public final class ProtoBuf { * optional .ErrorMessage errorMessage = 1025; */ public boolean hasErrorMessage() { - return ((bitField1_ & 0x00000200) == 0x00000200); + return ((bitField1_ & 0x00000800) == 0x00000800); } /** * optional .ErrorMessage errorMessage = 1025; @@ -54865,7 +55286,7 @@ public final class ProtoBuf { } errorMessage_ = value; - bitField1_ |= 0x00000200; + bitField1_ |= 0x00000800; return this; } /** @@ -54875,14 +55296,14 @@ public final class ProtoBuf { de.pokerth.protocol.ProtoBuf.ErrorMessage.Builder builderForValue) { errorMessage_ = builderForValue.build(); - bitField1_ |= 0x00000200; + bitField1_ |= 0x00000800; return this; } /** * optional .ErrorMessage errorMessage = 1025; */ public Builder mergeErrorMessage(de.pokerth.protocol.ProtoBuf.ErrorMessage value) { - if (((bitField1_ & 0x00000200) == 0x00000200) && + if (((bitField1_ & 0x00000800) == 0x00000800) && errorMessage_ != de.pokerth.protocol.ProtoBuf.ErrorMessage.getDefaultInstance()) { errorMessage_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.newBuilder(errorMessage_).mergeFrom(value).buildPartial(); @@ -54890,7 +55311,7 @@ public final class ProtoBuf { errorMessage_ = value; } - bitField1_ |= 0x00000200; + bitField1_ |= 0x00000800; return this; } /** @@ -54899,7 +55320,7 @@ public final class ProtoBuf { public Builder clearErrorMessage() { errorMessage_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.getDefaultInstance(); - bitField1_ = (bitField1_ & ~0x00000200); + bitField1_ = (bitField1_ & ~0x00000800); return this; } @@ -54927,286 +55348,276 @@ public final class ProtoBuf { */ de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType getMessageType(); - // optional .JoinGameMessage joinGameMessage = 2; + // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; /** - * optional .JoinGameMessage joinGameMessage = 2; - */ - boolean hasJoinGameMessage(); - /** - * optional .JoinGameMessage joinGameMessage = 2; - */ - de.pokerth.protocol.ProtoBuf.JoinGameMessage getJoinGameMessage(); - - // optional .RejoinGameMessage rejoinGameMessage = 3; - /** - * optional .RejoinGameMessage rejoinGameMessage = 3; - */ - boolean hasRejoinGameMessage(); - /** - * optional .RejoinGameMessage rejoinGameMessage = 3; - */ - de.pokerth.protocol.ProtoBuf.RejoinGameMessage getRejoinGameMessage(); - - // optional .JoinGameAckMessage joinGameAckMessage = 4; - /** - * optional .JoinGameAckMessage joinGameAckMessage = 4; - */ - boolean hasJoinGameAckMessage(); - /** - * optional .JoinGameAckMessage joinGameAckMessage = 4; - */ - de.pokerth.protocol.ProtoBuf.JoinGameAckMessage getJoinGameAckMessage(); - - // optional .JoinGameFailedMessage joinGameFailedMessage = 5; - /** - * optional .JoinGameFailedMessage joinGameFailedMessage = 5; - */ - boolean hasJoinGameFailedMessage(); - /** - * optional .JoinGameFailedMessage joinGameFailedMessage = 5; - */ - de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage getJoinGameFailedMessage(); - - // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; - /** - * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; */ boolean hasGamePlayerJoinedMessage(); /** - * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; */ de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage getGamePlayerJoinedMessage(); - // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; /** - * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; */ boolean hasGamePlayerLeftMessage(); /** - * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; */ de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage getGamePlayerLeftMessage(); - // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; /** - * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; */ boolean hasGameSpectatorJoinedMessage(); /** - * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; */ de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage getGameSpectatorJoinedMessage(); - // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; /** - * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; */ boolean hasGameSpectatorLeftMessage(); /** - * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; */ de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage getGameSpectatorLeftMessage(); - // optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + // optional .GameAdminChangedMessage gameAdminChangedMessage = 6; /** - * optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + * optional .GameAdminChangedMessage gameAdminChangedMessage = 6; */ boolean hasGameAdminChangedMessage(); /** - * optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + * optional .GameAdminChangedMessage gameAdminChangedMessage = 6; */ de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage getGameAdminChangedMessage(); - // optional .RemovedFromGameMessage removedFromGameMessage = 11; + // optional .RemovedFromGameMessage removedFromGameMessage = 7; /** - * optional .RemovedFromGameMessage removedFromGameMessage = 11; + * optional .RemovedFromGameMessage removedFromGameMessage = 7; */ boolean hasRemovedFromGameMessage(); /** - * optional .RemovedFromGameMessage removedFromGameMessage = 11; + * optional .RemovedFromGameMessage removedFromGameMessage = 7; */ de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage getRemovedFromGameMessage(); - // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; /** - * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; */ boolean hasKickPlayerRequestMessage(); /** - * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; */ de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage getKickPlayerRequestMessage(); - // optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + // optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; /** - * optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + * optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; */ boolean hasLeaveGameRequestMessage(); /** - * optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + * optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; */ de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage getLeaveGameRequestMessage(); - // optional .StartEventMessage startEventMessage = 14; + // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; /** - * optional .StartEventMessage startEventMessage = 14; + * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + */ + boolean hasInvitePlayerToGameMessage(); + /** + * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + */ + de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage getInvitePlayerToGameMessage(); + + // optional .StartEventMessage startEventMessage = 11; + /** + * optional .StartEventMessage startEventMessage = 11; */ boolean hasStartEventMessage(); /** - * optional .StartEventMessage startEventMessage = 14; + * optional .StartEventMessage startEventMessage = 11; */ de.pokerth.protocol.ProtoBuf.StartEventMessage getStartEventMessage(); - // optional .StartEventAckMessage startEventAckMessage = 15; + // optional .StartEventAckMessage startEventAckMessage = 12; /** - * optional .StartEventAckMessage startEventAckMessage = 15; + * optional .StartEventAckMessage startEventAckMessage = 12; */ boolean hasStartEventAckMessage(); /** - * optional .StartEventAckMessage startEventAckMessage = 15; + * optional .StartEventAckMessage startEventAckMessage = 12; */ de.pokerth.protocol.ProtoBuf.StartEventAckMessage getStartEventAckMessage(); - // optional .GameStartInitialMessage gameStartInitialMessage = 16; + // optional .GameStartInitialMessage gameStartInitialMessage = 13; /** - * optional .GameStartInitialMessage gameStartInitialMessage = 16; + * optional .GameStartInitialMessage gameStartInitialMessage = 13; */ boolean hasGameStartInitialMessage(); /** - * optional .GameStartInitialMessage gameStartInitialMessage = 16; + * optional .GameStartInitialMessage gameStartInitialMessage = 13; */ de.pokerth.protocol.ProtoBuf.GameStartInitialMessage getGameStartInitialMessage(); - // optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + // optional .GameStartRejoinMessage gameStartRejoinMessage = 14; /** - * optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + * optional .GameStartRejoinMessage gameStartRejoinMessage = 14; */ boolean hasGameStartRejoinMessage(); /** - * optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + * optional .GameStartRejoinMessage gameStartRejoinMessage = 14; */ de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage getGameStartRejoinMessage(); - // optional .EndOfGameMessage endOfGameMessage = 18; + // optional .EndOfGameMessage endOfGameMessage = 15; /** - * optional .EndOfGameMessage endOfGameMessage = 18; + * optional .EndOfGameMessage endOfGameMessage = 15; */ boolean hasEndOfGameMessage(); /** - * optional .EndOfGameMessage endOfGameMessage = 18; + * optional .EndOfGameMessage endOfGameMessage = 15; */ de.pokerth.protocol.ProtoBuf.EndOfGameMessage getEndOfGameMessage(); - // optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + // optional .PlayerIdChangedMessage playerIdChangedMessage = 16; /** - * optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + * optional .PlayerIdChangedMessage playerIdChangedMessage = 16; */ boolean hasPlayerIdChangedMessage(); /** - * optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + * optional .PlayerIdChangedMessage playerIdChangedMessage = 16; */ de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage getPlayerIdChangedMessage(); - // optional .AskKickPlayerMessage askKickPlayerMessage = 20; + // optional .AskKickPlayerMessage askKickPlayerMessage = 17; /** - * optional .AskKickPlayerMessage askKickPlayerMessage = 20; + * optional .AskKickPlayerMessage askKickPlayerMessage = 17; */ boolean hasAskKickPlayerMessage(); /** - * optional .AskKickPlayerMessage askKickPlayerMessage = 20; + * optional .AskKickPlayerMessage askKickPlayerMessage = 17; */ de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage getAskKickPlayerMessage(); - // optional .AskKickDeniedMessage askKickDeniedMessage = 21; + // optional .AskKickDeniedMessage askKickDeniedMessage = 18; /** - * optional .AskKickDeniedMessage askKickDeniedMessage = 21; + * optional .AskKickDeniedMessage askKickDeniedMessage = 18; */ boolean hasAskKickDeniedMessage(); /** - * optional .AskKickDeniedMessage askKickDeniedMessage = 21; + * optional .AskKickDeniedMessage askKickDeniedMessage = 18; */ de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage getAskKickDeniedMessage(); - // optional .StartKickPetitionMessage startKickPetitionMessage = 22; + // optional .StartKickPetitionMessage startKickPetitionMessage = 19; /** - * optional .StartKickPetitionMessage startKickPetitionMessage = 22; + * optional .StartKickPetitionMessage startKickPetitionMessage = 19; */ boolean hasStartKickPetitionMessage(); /** - * optional .StartKickPetitionMessage startKickPetitionMessage = 22; + * optional .StartKickPetitionMessage startKickPetitionMessage = 19; */ de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage getStartKickPetitionMessage(); - // optional .VoteKickRequestMessage voteKickRequestMessage = 23; + // optional .VoteKickRequestMessage voteKickRequestMessage = 20; /** - * optional .VoteKickRequestMessage voteKickRequestMessage = 23; + * optional .VoteKickRequestMessage voteKickRequestMessage = 20; */ boolean hasVoteKickRequestMessage(); /** - * optional .VoteKickRequestMessage voteKickRequestMessage = 23; + * optional .VoteKickRequestMessage voteKickRequestMessage = 20; */ de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage getVoteKickRequestMessage(); - // optional .VoteKickReplyMessage voteKickReplyMessage = 24; + // optional .VoteKickReplyMessage voteKickReplyMessage = 21; /** - * optional .VoteKickReplyMessage voteKickReplyMessage = 24; + * optional .VoteKickReplyMessage voteKickReplyMessage = 21; */ boolean hasVoteKickReplyMessage(); /** - * optional .VoteKickReplyMessage voteKickReplyMessage = 24; + * optional .VoteKickReplyMessage voteKickReplyMessage = 21; */ de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage getVoteKickReplyMessage(); - // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; /** - * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; */ boolean hasKickPetitionUpdateMessage(); /** - * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; */ de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage getKickPetitionUpdateMessage(); - // optional .EndKickPetitionMessage endKickPetitionMessage = 26; + // optional .EndKickPetitionMessage endKickPetitionMessage = 23; /** - * optional .EndKickPetitionMessage endKickPetitionMessage = 26; + * optional .EndKickPetitionMessage endKickPetitionMessage = 23; */ boolean hasEndKickPetitionMessage(); /** - * optional .EndKickPetitionMessage endKickPetitionMessage = 26; + * optional .EndKickPetitionMessage endKickPetitionMessage = 23; */ de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage getEndKickPetitionMessage(); - // optional .ChatRequestMessage chatRequestMessage = 27; + // optional .ChatRequestMessage chatRequestMessage = 24; /** - * optional .ChatRequestMessage chatRequestMessage = 27; + * optional .ChatRequestMessage chatRequestMessage = 24; */ boolean hasChatRequestMessage(); /** - * optional .ChatRequestMessage chatRequestMessage = 27; + * optional .ChatRequestMessage chatRequestMessage = 24; */ de.pokerth.protocol.ProtoBuf.ChatRequestMessage getChatRequestMessage(); - // optional .ChatMessage chatMessage = 28; + // optional .ChatMessage chatMessage = 25; /** - * optional .ChatMessage chatMessage = 28; + * optional .ChatMessage chatMessage = 25; */ boolean hasChatMessage(); /** - * optional .ChatMessage chatMessage = 28; + * optional .ChatMessage chatMessage = 25; */ de.pokerth.protocol.ProtoBuf.ChatMessage getChatMessage(); - // optional .ChatRejectMessage chatRejectMessage = 29; + // optional .ChatRejectMessage chatRejectMessage = 26; /** - * optional .ChatRejectMessage chatRejectMessage = 29; + * optional .ChatRejectMessage chatRejectMessage = 26; */ boolean hasChatRejectMessage(); /** - * optional .ChatRejectMessage chatRejectMessage = 29; + * optional .ChatRejectMessage chatRejectMessage = 26; */ de.pokerth.protocol.ProtoBuf.ChatRejectMessage getChatRejectMessage(); + // optional .TimeoutWarningMessage timeoutWarningMessage = 27; + /** + * optional .TimeoutWarningMessage timeoutWarningMessage = 27; + */ + boolean hasTimeoutWarningMessage(); + /** + * optional .TimeoutWarningMessage timeoutWarningMessage = 27; + */ + de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage getTimeoutWarningMessage(); + + // optional .ResetTimeoutMessage resetTimeoutMessage = 28; + /** + * optional .ResetTimeoutMessage resetTimeoutMessage = 28; + */ + boolean hasResetTimeoutMessage(); + /** + * optional .ResetTimeoutMessage resetTimeoutMessage = 28; + */ + de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage getResetTimeoutMessage(); + // optional .ErrorMessage errorMessage = 1025; /** * optional .ErrorMessage errorMessage = 1025; @@ -55270,60 +55681,8 @@ public final class ProtoBuf { break; } case 18: { - de.pokerth.protocol.ProtoBuf.JoinGameMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = joinGameMessage_.toBuilder(); - } - joinGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.JoinGameMessage.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(joinGameMessage_); - joinGameMessage_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - de.pokerth.protocol.ProtoBuf.RejoinGameMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = rejoinGameMessage_.toBuilder(); - } - rejoinGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.RejoinGameMessage.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(rejoinGameMessage_); - rejoinGameMessage_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - case 34: { - de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - subBuilder = joinGameAckMessage_.toBuilder(); - } - joinGameAckMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(joinGameAckMessage_); - joinGameAckMessage_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000008; - break; - } - case 42: { - de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { - subBuilder = joinGameFailedMessage_.toBuilder(); - } - joinGameFailedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(joinGameFailedMessage_); - joinGameFailedMessage_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000010; - break; - } - case 50: { de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = gamePlayerJoinedMessage_.toBuilder(); } gamePlayerJoinedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage.PARSER, extensionRegistry); @@ -55331,12 +55690,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gamePlayerJoinedMessage_); gamePlayerJoinedMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; break; } - case 58: { + case 26: { de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = gamePlayerLeftMessage_.toBuilder(); } gamePlayerLeftMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage.PARSER, extensionRegistry); @@ -55344,12 +55703,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gamePlayerLeftMessage_); gamePlayerLeftMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; break; } - case 66: { + case 34: { de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = gameSpectatorJoinedMessage_.toBuilder(); } gameSpectatorJoinedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage.PARSER, extensionRegistry); @@ -55357,12 +55716,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameSpectatorJoinedMessage_); gameSpectatorJoinedMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000008; break; } - case 74: { + case 42: { de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = gameSpectatorLeftMessage_.toBuilder(); } gameSpectatorLeftMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage.PARSER, extensionRegistry); @@ -55370,12 +55729,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameSpectatorLeftMessage_); gameSpectatorLeftMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000010; break; } - case 82: { + case 50: { de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000200) == 0x00000200)) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { subBuilder = gameAdminChangedMessage_.toBuilder(); } gameAdminChangedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage.PARSER, extensionRegistry); @@ -55383,12 +55742,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameAdminChangedMessage_); gameAdminChangedMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000020; break; } - case 90: { + case 58: { de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000400) == 0x00000400)) { + if (((bitField0_ & 0x00000040) == 0x00000040)) { subBuilder = removedFromGameMessage_.toBuilder(); } removedFromGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage.PARSER, extensionRegistry); @@ -55396,12 +55755,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(removedFromGameMessage_); removedFromGameMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000040; break; } - case 98: { + case 66: { de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000800) == 0x00000800)) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = kickPlayerRequestMessage_.toBuilder(); } kickPlayerRequestMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage.PARSER, extensionRegistry); @@ -55409,12 +55768,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(kickPlayerRequestMessage_); kickPlayerRequestMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000080; break; } - case 106: { + case 74: { de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00001000) == 0x00001000)) { + if (((bitField0_ & 0x00000100) == 0x00000100)) { subBuilder = leaveGameRequestMessage_.toBuilder(); } leaveGameRequestMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage.PARSER, extensionRegistry); @@ -55422,12 +55781,25 @@ public final class ProtoBuf { subBuilder.mergeFrom(leaveGameRequestMessage_); leaveGameRequestMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000100; break; } - case 114: { + case 82: { + de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.Builder subBuilder = null; + if (((bitField0_ & 0x00000200) == 0x00000200)) { + subBuilder = invitePlayerToGameMessage_.toBuilder(); + } + invitePlayerToGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(invitePlayerToGameMessage_); + invitePlayerToGameMessage_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000200; + break; + } + case 90: { de.pokerth.protocol.ProtoBuf.StartEventMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00002000) == 0x00002000)) { + if (((bitField0_ & 0x00000400) == 0x00000400)) { subBuilder = startEventMessage_.toBuilder(); } startEventMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.StartEventMessage.PARSER, extensionRegistry); @@ -55435,12 +55807,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(startEventMessage_); startEventMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000400; break; } - case 122: { + case 98: { de.pokerth.protocol.ProtoBuf.StartEventAckMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00004000) == 0x00004000)) { + if (((bitField0_ & 0x00000800) == 0x00000800)) { subBuilder = startEventAckMessage_.toBuilder(); } startEventAckMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.StartEventAckMessage.PARSER, extensionRegistry); @@ -55448,12 +55820,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(startEventAckMessage_); startEventAckMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00004000; + bitField0_ |= 0x00000800; break; } - case 130: { + case 106: { de.pokerth.protocol.ProtoBuf.GameStartInitialMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00008000) == 0x00008000)) { + if (((bitField0_ & 0x00001000) == 0x00001000)) { subBuilder = gameStartInitialMessage_.toBuilder(); } gameStartInitialMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameStartInitialMessage.PARSER, extensionRegistry); @@ -55461,12 +55833,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameStartInitialMessage_); gameStartInitialMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00008000; + bitField0_ |= 0x00001000; break; } - case 138: { + case 114: { de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00010000) == 0x00010000)) { + if (((bitField0_ & 0x00002000) == 0x00002000)) { subBuilder = gameStartRejoinMessage_.toBuilder(); } gameStartRejoinMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage.PARSER, extensionRegistry); @@ -55474,12 +55846,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(gameStartRejoinMessage_); gameStartRejoinMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00010000; + bitField0_ |= 0x00002000; break; } - case 146: { + case 122: { de.pokerth.protocol.ProtoBuf.EndOfGameMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00020000) == 0x00020000)) { + if (((bitField0_ & 0x00004000) == 0x00004000)) { subBuilder = endOfGameMessage_.toBuilder(); } endOfGameMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.EndOfGameMessage.PARSER, extensionRegistry); @@ -55487,12 +55859,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(endOfGameMessage_); endOfGameMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00020000; + bitField0_ |= 0x00004000; break; } - case 154: { + case 130: { de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00040000) == 0x00040000)) { + if (((bitField0_ & 0x00008000) == 0x00008000)) { subBuilder = playerIdChangedMessage_.toBuilder(); } playerIdChangedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage.PARSER, extensionRegistry); @@ -55500,12 +55872,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(playerIdChangedMessage_); playerIdChangedMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00040000; + bitField0_ |= 0x00008000; break; } - case 162: { + case 138: { de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00080000) == 0x00080000)) { + if (((bitField0_ & 0x00010000) == 0x00010000)) { subBuilder = askKickPlayerMessage_.toBuilder(); } askKickPlayerMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage.PARSER, extensionRegistry); @@ -55513,12 +55885,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(askKickPlayerMessage_); askKickPlayerMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00080000; + bitField0_ |= 0x00010000; break; } - case 170: { + case 146: { de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00100000) == 0x00100000)) { + if (((bitField0_ & 0x00020000) == 0x00020000)) { subBuilder = askKickDeniedMessage_.toBuilder(); } askKickDeniedMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage.PARSER, extensionRegistry); @@ -55526,12 +55898,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(askKickDeniedMessage_); askKickDeniedMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00100000; + bitField0_ |= 0x00020000; break; } - case 178: { + case 154: { de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00200000) == 0x00200000)) { + if (((bitField0_ & 0x00040000) == 0x00040000)) { subBuilder = startKickPetitionMessage_.toBuilder(); } startKickPetitionMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage.PARSER, extensionRegistry); @@ -55539,12 +55911,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(startKickPetitionMessage_); startKickPetitionMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00200000; + bitField0_ |= 0x00040000; break; } - case 186: { + case 162: { de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00400000) == 0x00400000)) { + if (((bitField0_ & 0x00080000) == 0x00080000)) { subBuilder = voteKickRequestMessage_.toBuilder(); } voteKickRequestMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage.PARSER, extensionRegistry); @@ -55552,12 +55924,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(voteKickRequestMessage_); voteKickRequestMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00400000; + bitField0_ |= 0x00080000; break; } - case 194: { + case 170: { de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00800000) == 0x00800000)) { + if (((bitField0_ & 0x00100000) == 0x00100000)) { subBuilder = voteKickReplyMessage_.toBuilder(); } voteKickReplyMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage.PARSER, extensionRegistry); @@ -55565,12 +55937,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(voteKickReplyMessage_); voteKickReplyMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00800000; + bitField0_ |= 0x00100000; break; } - case 202: { + case 178: { de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage.Builder subBuilder = null; - if (((bitField0_ & 0x01000000) == 0x01000000)) { + if (((bitField0_ & 0x00200000) == 0x00200000)) { subBuilder = kickPetitionUpdateMessage_.toBuilder(); } kickPetitionUpdateMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage.PARSER, extensionRegistry); @@ -55578,12 +55950,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(kickPetitionUpdateMessage_); kickPetitionUpdateMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x01000000; + bitField0_ |= 0x00200000; break; } - case 210: { + case 186: { de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage.Builder subBuilder = null; - if (((bitField0_ & 0x02000000) == 0x02000000)) { + if (((bitField0_ & 0x00400000) == 0x00400000)) { subBuilder = endKickPetitionMessage_.toBuilder(); } endKickPetitionMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage.PARSER, extensionRegistry); @@ -55591,12 +55963,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(endKickPetitionMessage_); endKickPetitionMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x02000000; + bitField0_ |= 0x00400000; break; } - case 218: { + case 194: { de.pokerth.protocol.ProtoBuf.ChatRequestMessage.Builder subBuilder = null; - if (((bitField0_ & 0x04000000) == 0x04000000)) { + if (((bitField0_ & 0x00800000) == 0x00800000)) { subBuilder = chatRequestMessage_.toBuilder(); } chatRequestMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ChatRequestMessage.PARSER, extensionRegistry); @@ -55604,12 +55976,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(chatRequestMessage_); chatRequestMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x04000000; + bitField0_ |= 0x00800000; break; } - case 226: { + case 202: { de.pokerth.protocol.ProtoBuf.ChatMessage.Builder subBuilder = null; - if (((bitField0_ & 0x08000000) == 0x08000000)) { + if (((bitField0_ & 0x01000000) == 0x01000000)) { subBuilder = chatMessage_.toBuilder(); } chatMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ChatMessage.PARSER, extensionRegistry); @@ -55617,12 +55989,12 @@ public final class ProtoBuf { subBuilder.mergeFrom(chatMessage_); chatMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x08000000; + bitField0_ |= 0x01000000; break; } - case 234: { + case 210: { de.pokerth.protocol.ProtoBuf.ChatRejectMessage.Builder subBuilder = null; - if (((bitField0_ & 0x10000000) == 0x10000000)) { + if (((bitField0_ & 0x02000000) == 0x02000000)) { subBuilder = chatRejectMessage_.toBuilder(); } chatRejectMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ChatRejectMessage.PARSER, extensionRegistry); @@ -55630,12 +56002,38 @@ public final class ProtoBuf { subBuilder.mergeFrom(chatRejectMessage_); chatRejectMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x10000000; + bitField0_ |= 0x02000000; + break; + } + case 218: { + de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.Builder subBuilder = null; + if (((bitField0_ & 0x04000000) == 0x04000000)) { + subBuilder = timeoutWarningMessage_.toBuilder(); + } + timeoutWarningMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(timeoutWarningMessage_); + timeoutWarningMessage_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x04000000; + break; + } + case 226: { + de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.Builder subBuilder = null; + if (((bitField0_ & 0x08000000) == 0x08000000)) { + subBuilder = resetTimeoutMessage_.toBuilder(); + } + resetTimeoutMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(resetTimeoutMessage_); + resetTimeoutMessage_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x08000000; break; } case 8202: { de.pokerth.protocol.ProtoBuf.ErrorMessage.Builder subBuilder = null; - if (((bitField0_ & 0x20000000) == 0x20000000)) { + if (((bitField0_ & 0x10000000) == 0x10000000)) { subBuilder = errorMessage_.toBuilder(); } errorMessage_ = input.readMessage(de.pokerth.protocol.ProtoBuf.ErrorMessage.PARSER, extensionRegistry); @@ -55643,7 +56041,7 @@ public final class ProtoBuf { subBuilder.mergeFrom(errorMessage_); errorMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x20000000; + bitField0_ |= 0x10000000; break; } } @@ -55678,235 +56076,227 @@ public final class ProtoBuf { public enum GameManagementMessageType implements com.google.protobuf.Internal.EnumLite { /** - * Type_JoinGameMessage = 1; + * Type_GamePlayerJoinedMessage = 1; */ - Type_JoinGameMessage(0, 1), + Type_GamePlayerJoinedMessage(0, 1), /** - * Type_RejoinGameMessage = 2; + * Type_GamePlayerLeftMessage = 2; */ - Type_RejoinGameMessage(1, 2), + Type_GamePlayerLeftMessage(1, 2), /** - * Type_JoinGameAckMessage = 3; + * Type_GameSpectatorJoinedMessage = 3; */ - Type_JoinGameAckMessage(2, 3), + Type_GameSpectatorJoinedMessage(2, 3), /** - * Type_JoinGameFailedMessage = 4; + * Type_GameSpectatorLeftMessage = 4; */ - Type_JoinGameFailedMessage(3, 4), + Type_GameSpectatorLeftMessage(3, 4), /** - * Type_GamePlayerJoinedMessage = 5; + * Type_GameAdminChangedMessage = 5; */ - Type_GamePlayerJoinedMessage(4, 5), + Type_GameAdminChangedMessage(4, 5), /** - * Type_GamePlayerLeftMessage = 6; + * Type_RemovedFromGameMessage = 6; */ - Type_GamePlayerLeftMessage(5, 6), + Type_RemovedFromGameMessage(5, 6), /** - * Type_GameSpectatorJoinedMessage = 7; + * Type_KickPlayerRequestMessage = 7; */ - Type_GameSpectatorJoinedMessage(6, 7), + Type_KickPlayerRequestMessage(6, 7), /** - * Type_GameSpectatorLeftMessage = 8; + * Type_LeaveGameRequestMessage = 8; */ - Type_GameSpectatorLeftMessage(7, 8), + Type_LeaveGameRequestMessage(7, 8), /** - * Type_GameAdminChangedMessage = 9; + * Type_InvitePlayerToGameMessage = 9; */ - Type_GameAdminChangedMessage(8, 9), + Type_InvitePlayerToGameMessage(8, 9), /** - * Type_RemovedFromGameMessage = 10; + * Type_StartEventMessage = 10; */ - Type_RemovedFromGameMessage(9, 10), + Type_StartEventMessage(9, 10), /** - * Type_KickPlayerRequestMessage = 11; + * Type_StartEventAckMessage = 11; */ - Type_KickPlayerRequestMessage(10, 11), + Type_StartEventAckMessage(10, 11), /** - * Type_LeaveGameRequestMessage = 12; + * Type_GameStartInitialMessage = 12; */ - Type_LeaveGameRequestMessage(11, 12), + Type_GameStartInitialMessage(11, 12), /** - * Type_StartEventMessage = 13; + * Type_GameStartRejoinMessage = 13; */ - Type_StartEventMessage(12, 13), + Type_GameStartRejoinMessage(12, 13), /** - * Type_StartEventAckMessage = 14; + * Type_EndOfGameMessage = 14; */ - Type_StartEventAckMessage(13, 14), + Type_EndOfGameMessage(13, 14), /** - * Type_GameStartInitialMessage = 15; + * Type_PlayerIdChangedMessage = 15; */ - Type_GameStartInitialMessage(14, 15), + Type_PlayerIdChangedMessage(14, 15), /** - * Type_GameStartRejoinMessage = 16; + * Type_AskKickPlayerMessage = 16; */ - Type_GameStartRejoinMessage(15, 16), + Type_AskKickPlayerMessage(15, 16), /** - * Type_EndOfGameMessage = 17; + * Type_AskKickDeniedMessage = 17; */ - Type_EndOfGameMessage(16, 17), + Type_AskKickDeniedMessage(16, 17), /** - * Type_PlayerIdChangedMessage = 18; + * Type_StartKickPetitionMessage = 18; */ - Type_PlayerIdChangedMessage(17, 18), + Type_StartKickPetitionMessage(17, 18), /** - * Type_AskKickPlayerMessage = 19; + * Type_VoteKickRequestMessage = 19; */ - Type_AskKickPlayerMessage(18, 19), + Type_VoteKickRequestMessage(18, 19), /** - * Type_AskKickDeniedMessage = 20; + * Type_VoteKickReplyMessage = 20; */ - Type_AskKickDeniedMessage(19, 20), + Type_VoteKickReplyMessage(19, 20), /** - * Type_StartKickPetitionMessage = 21; + * Type_KickPetitionUpdateMessage = 21; */ - Type_StartKickPetitionMessage(20, 21), + Type_KickPetitionUpdateMessage(20, 21), /** - * Type_VoteKickRequestMessage = 22; + * Type_EndKickPetitionMessage = 22; */ - Type_VoteKickRequestMessage(21, 22), + Type_EndKickPetitionMessage(21, 22), /** - * Type_VoteKickReplyMessage = 23; + * Type_ChatRequestMessage = 23; */ - Type_VoteKickReplyMessage(22, 23), + Type_ChatRequestMessage(22, 23), /** - * Type_KickPetitionUpdateMessage = 24; + * Type_ChatMessage = 24; */ - Type_KickPetitionUpdateMessage(23, 24), + Type_ChatMessage(23, 24), /** - * Type_EndKickPetitionMessage = 25; + * Type_ChatRejectMessage = 25; */ - Type_EndKickPetitionMessage(24, 25), + Type_ChatRejectMessage(24, 25), /** - * Type_ChatRequestMessage = 26; + * Type_TimeoutWarningMessage = 26; */ - Type_ChatRequestMessage(25, 26), + Type_TimeoutWarningMessage(25, 26), /** - * Type_ChatMessage = 27; + * Type_ResetTimeoutMessage = 27; */ - Type_ChatMessage(26, 27), - /** - * Type_ChatRejectMessage = 28; - */ - Type_ChatRejectMessage(27, 28), + Type_ResetTimeoutMessage(26, 27), /** * Type_ErrorMessage = 1024; */ - Type_ErrorMessage(28, 1024), + Type_ErrorMessage(27, 1024), ; /** - * Type_JoinGameMessage = 1; + * Type_GamePlayerJoinedMessage = 1; */ - public static final int Type_JoinGameMessage_VALUE = 1; + public static final int Type_GamePlayerJoinedMessage_VALUE = 1; /** - * Type_RejoinGameMessage = 2; + * Type_GamePlayerLeftMessage = 2; */ - public static final int Type_RejoinGameMessage_VALUE = 2; + public static final int Type_GamePlayerLeftMessage_VALUE = 2; /** - * Type_JoinGameAckMessage = 3; + * Type_GameSpectatorJoinedMessage = 3; */ - public static final int Type_JoinGameAckMessage_VALUE = 3; + public static final int Type_GameSpectatorJoinedMessage_VALUE = 3; /** - * Type_JoinGameFailedMessage = 4; + * Type_GameSpectatorLeftMessage = 4; */ - public static final int Type_JoinGameFailedMessage_VALUE = 4; + public static final int Type_GameSpectatorLeftMessage_VALUE = 4; /** - * Type_GamePlayerJoinedMessage = 5; + * Type_GameAdminChangedMessage = 5; */ - public static final int Type_GamePlayerJoinedMessage_VALUE = 5; + public static final int Type_GameAdminChangedMessage_VALUE = 5; /** - * Type_GamePlayerLeftMessage = 6; + * Type_RemovedFromGameMessage = 6; */ - public static final int Type_GamePlayerLeftMessage_VALUE = 6; + public static final int Type_RemovedFromGameMessage_VALUE = 6; /** - * Type_GameSpectatorJoinedMessage = 7; + * Type_KickPlayerRequestMessage = 7; */ - public static final int Type_GameSpectatorJoinedMessage_VALUE = 7; + public static final int Type_KickPlayerRequestMessage_VALUE = 7; /** - * Type_GameSpectatorLeftMessage = 8; + * Type_LeaveGameRequestMessage = 8; */ - public static final int Type_GameSpectatorLeftMessage_VALUE = 8; + public static final int Type_LeaveGameRequestMessage_VALUE = 8; /** - * Type_GameAdminChangedMessage = 9; + * Type_InvitePlayerToGameMessage = 9; */ - public static final int Type_GameAdminChangedMessage_VALUE = 9; + public static final int Type_InvitePlayerToGameMessage_VALUE = 9; /** - * Type_RemovedFromGameMessage = 10; + * Type_StartEventMessage = 10; */ - public static final int Type_RemovedFromGameMessage_VALUE = 10; + public static final int Type_StartEventMessage_VALUE = 10; /** - * Type_KickPlayerRequestMessage = 11; + * Type_StartEventAckMessage = 11; */ - public static final int Type_KickPlayerRequestMessage_VALUE = 11; + public static final int Type_StartEventAckMessage_VALUE = 11; /** - * Type_LeaveGameRequestMessage = 12; + * Type_GameStartInitialMessage = 12; */ - public static final int Type_LeaveGameRequestMessage_VALUE = 12; + public static final int Type_GameStartInitialMessage_VALUE = 12; /** - * Type_StartEventMessage = 13; + * Type_GameStartRejoinMessage = 13; */ - public static final int Type_StartEventMessage_VALUE = 13; + public static final int Type_GameStartRejoinMessage_VALUE = 13; /** - * Type_StartEventAckMessage = 14; + * Type_EndOfGameMessage = 14; */ - public static final int Type_StartEventAckMessage_VALUE = 14; + public static final int Type_EndOfGameMessage_VALUE = 14; /** - * Type_GameStartInitialMessage = 15; + * Type_PlayerIdChangedMessage = 15; */ - public static final int Type_GameStartInitialMessage_VALUE = 15; + public static final int Type_PlayerIdChangedMessage_VALUE = 15; /** - * Type_GameStartRejoinMessage = 16; + * Type_AskKickPlayerMessage = 16; */ - public static final int Type_GameStartRejoinMessage_VALUE = 16; + public static final int Type_AskKickPlayerMessage_VALUE = 16; /** - * Type_EndOfGameMessage = 17; + * Type_AskKickDeniedMessage = 17; */ - public static final int Type_EndOfGameMessage_VALUE = 17; + public static final int Type_AskKickDeniedMessage_VALUE = 17; /** - * Type_PlayerIdChangedMessage = 18; + * Type_StartKickPetitionMessage = 18; */ - public static final int Type_PlayerIdChangedMessage_VALUE = 18; + public static final int Type_StartKickPetitionMessage_VALUE = 18; /** - * Type_AskKickPlayerMessage = 19; + * Type_VoteKickRequestMessage = 19; */ - public static final int Type_AskKickPlayerMessage_VALUE = 19; + public static final int Type_VoteKickRequestMessage_VALUE = 19; /** - * Type_AskKickDeniedMessage = 20; + * Type_VoteKickReplyMessage = 20; */ - public static final int Type_AskKickDeniedMessage_VALUE = 20; + public static final int Type_VoteKickReplyMessage_VALUE = 20; /** - * Type_StartKickPetitionMessage = 21; + * Type_KickPetitionUpdateMessage = 21; */ - public static final int Type_StartKickPetitionMessage_VALUE = 21; + public static final int Type_KickPetitionUpdateMessage_VALUE = 21; /** - * Type_VoteKickRequestMessage = 22; + * Type_EndKickPetitionMessage = 22; */ - public static final int Type_VoteKickRequestMessage_VALUE = 22; + public static final int Type_EndKickPetitionMessage_VALUE = 22; /** - * Type_VoteKickReplyMessage = 23; + * Type_ChatRequestMessage = 23; */ - public static final int Type_VoteKickReplyMessage_VALUE = 23; + public static final int Type_ChatRequestMessage_VALUE = 23; /** - * Type_KickPetitionUpdateMessage = 24; + * Type_ChatMessage = 24; */ - public static final int Type_KickPetitionUpdateMessage_VALUE = 24; + public static final int Type_ChatMessage_VALUE = 24; /** - * Type_EndKickPetitionMessage = 25; + * Type_ChatRejectMessage = 25; */ - public static final int Type_EndKickPetitionMessage_VALUE = 25; + public static final int Type_ChatRejectMessage_VALUE = 25; /** - * Type_ChatRequestMessage = 26; + * Type_TimeoutWarningMessage = 26; */ - public static final int Type_ChatRequestMessage_VALUE = 26; + public static final int Type_TimeoutWarningMessage_VALUE = 26; /** - * Type_ChatMessage = 27; + * Type_ResetTimeoutMessage = 27; */ - public static final int Type_ChatMessage_VALUE = 27; - /** - * Type_ChatRejectMessage = 28; - */ - public static final int Type_ChatRejectMessage_VALUE = 28; + public static final int Type_ResetTimeoutMessage_VALUE = 27; /** * Type_ErrorMessage = 1024; */ @@ -55917,34 +56307,33 @@ public final class ProtoBuf { public static GameManagementMessageType valueOf(int value) { switch (value) { - case 1: return Type_JoinGameMessage; - case 2: return Type_RejoinGameMessage; - case 3: return Type_JoinGameAckMessage; - case 4: return Type_JoinGameFailedMessage; - case 5: return Type_GamePlayerJoinedMessage; - case 6: return Type_GamePlayerLeftMessage; - case 7: return Type_GameSpectatorJoinedMessage; - case 8: return Type_GameSpectatorLeftMessage; - case 9: return Type_GameAdminChangedMessage; - case 10: return Type_RemovedFromGameMessage; - case 11: return Type_KickPlayerRequestMessage; - case 12: return Type_LeaveGameRequestMessage; - case 13: return Type_StartEventMessage; - case 14: return Type_StartEventAckMessage; - case 15: return Type_GameStartInitialMessage; - case 16: return Type_GameStartRejoinMessage; - case 17: return Type_EndOfGameMessage; - case 18: return Type_PlayerIdChangedMessage; - case 19: return Type_AskKickPlayerMessage; - case 20: return Type_AskKickDeniedMessage; - case 21: return Type_StartKickPetitionMessage; - case 22: return Type_VoteKickRequestMessage; - case 23: return Type_VoteKickReplyMessage; - case 24: return Type_KickPetitionUpdateMessage; - case 25: return Type_EndKickPetitionMessage; - case 26: return Type_ChatRequestMessage; - case 27: return Type_ChatMessage; - case 28: return Type_ChatRejectMessage; + case 1: return Type_GamePlayerJoinedMessage; + case 2: return Type_GamePlayerLeftMessage; + case 3: return Type_GameSpectatorJoinedMessage; + case 4: return Type_GameSpectatorLeftMessage; + case 5: return Type_GameAdminChangedMessage; + case 6: return Type_RemovedFromGameMessage; + case 7: return Type_KickPlayerRequestMessage; + case 8: return Type_LeaveGameRequestMessage; + case 9: return Type_InvitePlayerToGameMessage; + case 10: return Type_StartEventMessage; + case 11: return Type_StartEventAckMessage; + case 12: return Type_GameStartInitialMessage; + case 13: return Type_GameStartRejoinMessage; + case 14: return Type_EndOfGameMessage; + case 15: return Type_PlayerIdChangedMessage; + case 16: return Type_AskKickPlayerMessage; + case 17: return Type_AskKickDeniedMessage; + case 18: return Type_StartKickPetitionMessage; + case 19: return Type_VoteKickRequestMessage; + case 20: return Type_VoteKickReplyMessage; + case 21: return Type_KickPetitionUpdateMessage; + case 22: return Type_EndKickPetitionMessage; + case 23: return Type_ChatRequestMessage; + case 24: return Type_ChatMessage; + case 25: return Type_ChatRejectMessage; + case 26: return Type_TimeoutWarningMessage; + case 27: return Type_ResetTimeoutMessage; case 1024: return Type_ErrorMessage; default: return null; } @@ -55988,454 +56377,438 @@ public final class ProtoBuf { return messageType_; } - // optional .JoinGameMessage joinGameMessage = 2; - public static final int JOINGAMEMESSAGE_FIELD_NUMBER = 2; - private de.pokerth.protocol.ProtoBuf.JoinGameMessage joinGameMessage_; + // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; + public static final int GAMEPLAYERJOINEDMESSAGE_FIELD_NUMBER = 2; + private de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage gamePlayerJoinedMessage_; /** - * optional .JoinGameMessage joinGameMessage = 2; + * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; */ - public boolean hasJoinGameMessage() { + public boolean hasGamePlayerJoinedMessage() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional .JoinGameMessage joinGameMessage = 2; - */ - public de.pokerth.protocol.ProtoBuf.JoinGameMessage getJoinGameMessage() { - return joinGameMessage_; - } - - // optional .RejoinGameMessage rejoinGameMessage = 3; - public static final int REJOINGAMEMESSAGE_FIELD_NUMBER = 3; - private de.pokerth.protocol.ProtoBuf.RejoinGameMessage rejoinGameMessage_; - /** - * optional .RejoinGameMessage rejoinGameMessage = 3; - */ - public boolean hasRejoinGameMessage() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional .RejoinGameMessage rejoinGameMessage = 3; - */ - public de.pokerth.protocol.ProtoBuf.RejoinGameMessage getRejoinGameMessage() { - return rejoinGameMessage_; - } - - // optional .JoinGameAckMessage joinGameAckMessage = 4; - public static final int JOINGAMEACKMESSAGE_FIELD_NUMBER = 4; - private de.pokerth.protocol.ProtoBuf.JoinGameAckMessage joinGameAckMessage_; - /** - * optional .JoinGameAckMessage joinGameAckMessage = 4; - */ - public boolean hasJoinGameAckMessage() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .JoinGameAckMessage joinGameAckMessage = 4; - */ - public de.pokerth.protocol.ProtoBuf.JoinGameAckMessage getJoinGameAckMessage() { - return joinGameAckMessage_; - } - - // optional .JoinGameFailedMessage joinGameFailedMessage = 5; - public static final int JOINGAMEFAILEDMESSAGE_FIELD_NUMBER = 5; - private de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage joinGameFailedMessage_; - /** - * optional .JoinGameFailedMessage joinGameFailedMessage = 5; - */ - public boolean hasJoinGameFailedMessage() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * optional .JoinGameFailedMessage joinGameFailedMessage = 5; - */ - public de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage getJoinGameFailedMessage() { - return joinGameFailedMessage_; - } - - // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; - public static final int GAMEPLAYERJOINEDMESSAGE_FIELD_NUMBER = 6; - private de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage gamePlayerJoinedMessage_; - /** - * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; - */ - public boolean hasGamePlayerJoinedMessage() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; */ public de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage getGamePlayerJoinedMessage() { return gamePlayerJoinedMessage_; } - // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; - public static final int GAMEPLAYERLEFTMESSAGE_FIELD_NUMBER = 7; + // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; + public static final int GAMEPLAYERLEFTMESSAGE_FIELD_NUMBER = 3; private de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage gamePlayerLeftMessage_; /** - * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; */ public boolean hasGamePlayerLeftMessage() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; */ public de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage getGamePlayerLeftMessage() { return gamePlayerLeftMessage_; } - // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; - public static final int GAMESPECTATORJOINEDMESSAGE_FIELD_NUMBER = 8; + // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; + public static final int GAMESPECTATORJOINEDMESSAGE_FIELD_NUMBER = 4; private de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage gameSpectatorJoinedMessage_; /** - * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; */ public boolean hasGameSpectatorJoinedMessage() { - return ((bitField0_ & 0x00000080) == 0x00000080); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; */ public de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage getGameSpectatorJoinedMessage() { return gameSpectatorJoinedMessage_; } - // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; - public static final int GAMESPECTATORLEFTMESSAGE_FIELD_NUMBER = 9; + // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; + public static final int GAMESPECTATORLEFTMESSAGE_FIELD_NUMBER = 5; private de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage gameSpectatorLeftMessage_; /** - * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; */ public boolean hasGameSpectatorLeftMessage() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; */ public de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage getGameSpectatorLeftMessage() { return gameSpectatorLeftMessage_; } - // optional .GameAdminChangedMessage gameAdminChangedMessage = 10; - public static final int GAMEADMINCHANGEDMESSAGE_FIELD_NUMBER = 10; + // optional .GameAdminChangedMessage gameAdminChangedMessage = 6; + public static final int GAMEADMINCHANGEDMESSAGE_FIELD_NUMBER = 6; private de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage gameAdminChangedMessage_; /** - * optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + * optional .GameAdminChangedMessage gameAdminChangedMessage = 6; */ public boolean hasGameAdminChangedMessage() { - return ((bitField0_ & 0x00000200) == 0x00000200); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + * optional .GameAdminChangedMessage gameAdminChangedMessage = 6; */ public de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage getGameAdminChangedMessage() { return gameAdminChangedMessage_; } - // optional .RemovedFromGameMessage removedFromGameMessage = 11; - public static final int REMOVEDFROMGAMEMESSAGE_FIELD_NUMBER = 11; + // optional .RemovedFromGameMessage removedFromGameMessage = 7; + public static final int REMOVEDFROMGAMEMESSAGE_FIELD_NUMBER = 7; private de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage removedFromGameMessage_; /** - * optional .RemovedFromGameMessage removedFromGameMessage = 11; + * optional .RemovedFromGameMessage removedFromGameMessage = 7; */ public boolean hasRemovedFromGameMessage() { - return ((bitField0_ & 0x00000400) == 0x00000400); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional .RemovedFromGameMessage removedFromGameMessage = 11; + * optional .RemovedFromGameMessage removedFromGameMessage = 7; */ public de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage getRemovedFromGameMessage() { return removedFromGameMessage_; } - // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; - public static final int KICKPLAYERREQUESTMESSAGE_FIELD_NUMBER = 12; + // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; + public static final int KICKPLAYERREQUESTMESSAGE_FIELD_NUMBER = 8; private de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage kickPlayerRequestMessage_; /** - * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; */ public boolean hasKickPlayerRequestMessage() { - return ((bitField0_ & 0x00000800) == 0x00000800); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** - * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; */ public de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage getKickPlayerRequestMessage() { return kickPlayerRequestMessage_; } - // optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; - public static final int LEAVEGAMEREQUESTMESSAGE_FIELD_NUMBER = 13; + // optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; + public static final int LEAVEGAMEREQUESTMESSAGE_FIELD_NUMBER = 9; private de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage leaveGameRequestMessage_; /** - * optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + * optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; */ public boolean hasLeaveGameRequestMessage() { - return ((bitField0_ & 0x00001000) == 0x00001000); + return ((bitField0_ & 0x00000100) == 0x00000100); } /** - * optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + * optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; */ public de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage getLeaveGameRequestMessage() { return leaveGameRequestMessage_; } - // optional .StartEventMessage startEventMessage = 14; - public static final int STARTEVENTMESSAGE_FIELD_NUMBER = 14; - private de.pokerth.protocol.ProtoBuf.StartEventMessage startEventMessage_; + // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + public static final int INVITEPLAYERTOGAMEMESSAGE_FIELD_NUMBER = 10; + private de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage invitePlayerToGameMessage_; /** - * optional .StartEventMessage startEventMessage = 14; + * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; */ - public boolean hasStartEventMessage() { - return ((bitField0_ & 0x00002000) == 0x00002000); + public boolean hasInvitePlayerToGameMessage() { + return ((bitField0_ & 0x00000200) == 0x00000200); } /** - * optional .StartEventMessage startEventMessage = 14; + * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + */ + public de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage getInvitePlayerToGameMessage() { + return invitePlayerToGameMessage_; + } + + // optional .StartEventMessage startEventMessage = 11; + public static final int STARTEVENTMESSAGE_FIELD_NUMBER = 11; + private de.pokerth.protocol.ProtoBuf.StartEventMessage startEventMessage_; + /** + * optional .StartEventMessage startEventMessage = 11; + */ + public boolean hasStartEventMessage() { + return ((bitField0_ & 0x00000400) == 0x00000400); + } + /** + * optional .StartEventMessage startEventMessage = 11; */ public de.pokerth.protocol.ProtoBuf.StartEventMessage getStartEventMessage() { return startEventMessage_; } - // optional .StartEventAckMessage startEventAckMessage = 15; - public static final int STARTEVENTACKMESSAGE_FIELD_NUMBER = 15; + // optional .StartEventAckMessage startEventAckMessage = 12; + public static final int STARTEVENTACKMESSAGE_FIELD_NUMBER = 12; private de.pokerth.protocol.ProtoBuf.StartEventAckMessage startEventAckMessage_; /** - * optional .StartEventAckMessage startEventAckMessage = 15; + * optional .StartEventAckMessage startEventAckMessage = 12; */ public boolean hasStartEventAckMessage() { - return ((bitField0_ & 0x00004000) == 0x00004000); + return ((bitField0_ & 0x00000800) == 0x00000800); } /** - * optional .StartEventAckMessage startEventAckMessage = 15; + * optional .StartEventAckMessage startEventAckMessage = 12; */ public de.pokerth.protocol.ProtoBuf.StartEventAckMessage getStartEventAckMessage() { return startEventAckMessage_; } - // optional .GameStartInitialMessage gameStartInitialMessage = 16; - public static final int GAMESTARTINITIALMESSAGE_FIELD_NUMBER = 16; + // optional .GameStartInitialMessage gameStartInitialMessage = 13; + public static final int GAMESTARTINITIALMESSAGE_FIELD_NUMBER = 13; private de.pokerth.protocol.ProtoBuf.GameStartInitialMessage gameStartInitialMessage_; /** - * optional .GameStartInitialMessage gameStartInitialMessage = 16; + * optional .GameStartInitialMessage gameStartInitialMessage = 13; */ public boolean hasGameStartInitialMessage() { - return ((bitField0_ & 0x00008000) == 0x00008000); + return ((bitField0_ & 0x00001000) == 0x00001000); } /** - * optional .GameStartInitialMessage gameStartInitialMessage = 16; + * optional .GameStartInitialMessage gameStartInitialMessage = 13; */ public de.pokerth.protocol.ProtoBuf.GameStartInitialMessage getGameStartInitialMessage() { return gameStartInitialMessage_; } - // optional .GameStartRejoinMessage gameStartRejoinMessage = 17; - public static final int GAMESTARTREJOINMESSAGE_FIELD_NUMBER = 17; + // optional .GameStartRejoinMessage gameStartRejoinMessage = 14; + public static final int GAMESTARTREJOINMESSAGE_FIELD_NUMBER = 14; private de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage gameStartRejoinMessage_; /** - * optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + * optional .GameStartRejoinMessage gameStartRejoinMessage = 14; */ public boolean hasGameStartRejoinMessage() { - return ((bitField0_ & 0x00010000) == 0x00010000); + return ((bitField0_ & 0x00002000) == 0x00002000); } /** - * optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + * optional .GameStartRejoinMessage gameStartRejoinMessage = 14; */ public de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage getGameStartRejoinMessage() { return gameStartRejoinMessage_; } - // optional .EndOfGameMessage endOfGameMessage = 18; - public static final int ENDOFGAMEMESSAGE_FIELD_NUMBER = 18; + // optional .EndOfGameMessage endOfGameMessage = 15; + public static final int ENDOFGAMEMESSAGE_FIELD_NUMBER = 15; private de.pokerth.protocol.ProtoBuf.EndOfGameMessage endOfGameMessage_; /** - * optional .EndOfGameMessage endOfGameMessage = 18; + * optional .EndOfGameMessage endOfGameMessage = 15; */ public boolean hasEndOfGameMessage() { - return ((bitField0_ & 0x00020000) == 0x00020000); + return ((bitField0_ & 0x00004000) == 0x00004000); } /** - * optional .EndOfGameMessage endOfGameMessage = 18; + * optional .EndOfGameMessage endOfGameMessage = 15; */ public de.pokerth.protocol.ProtoBuf.EndOfGameMessage getEndOfGameMessage() { return endOfGameMessage_; } - // optional .PlayerIdChangedMessage playerIdChangedMessage = 19; - public static final int PLAYERIDCHANGEDMESSAGE_FIELD_NUMBER = 19; + // optional .PlayerIdChangedMessage playerIdChangedMessage = 16; + public static final int PLAYERIDCHANGEDMESSAGE_FIELD_NUMBER = 16; private de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage playerIdChangedMessage_; /** - * optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + * optional .PlayerIdChangedMessage playerIdChangedMessage = 16; */ public boolean hasPlayerIdChangedMessage() { - return ((bitField0_ & 0x00040000) == 0x00040000); + return ((bitField0_ & 0x00008000) == 0x00008000); } /** - * optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + * optional .PlayerIdChangedMessage playerIdChangedMessage = 16; */ public de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage getPlayerIdChangedMessage() { return playerIdChangedMessage_; } - // optional .AskKickPlayerMessage askKickPlayerMessage = 20; - public static final int ASKKICKPLAYERMESSAGE_FIELD_NUMBER = 20; + // optional .AskKickPlayerMessage askKickPlayerMessage = 17; + public static final int ASKKICKPLAYERMESSAGE_FIELD_NUMBER = 17; private de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage askKickPlayerMessage_; /** - * optional .AskKickPlayerMessage askKickPlayerMessage = 20; + * optional .AskKickPlayerMessage askKickPlayerMessage = 17; */ public boolean hasAskKickPlayerMessage() { - return ((bitField0_ & 0x00080000) == 0x00080000); + return ((bitField0_ & 0x00010000) == 0x00010000); } /** - * optional .AskKickPlayerMessage askKickPlayerMessage = 20; + * optional .AskKickPlayerMessage askKickPlayerMessage = 17; */ public de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage getAskKickPlayerMessage() { return askKickPlayerMessage_; } - // optional .AskKickDeniedMessage askKickDeniedMessage = 21; - public static final int ASKKICKDENIEDMESSAGE_FIELD_NUMBER = 21; + // optional .AskKickDeniedMessage askKickDeniedMessage = 18; + public static final int ASKKICKDENIEDMESSAGE_FIELD_NUMBER = 18; private de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage askKickDeniedMessage_; /** - * optional .AskKickDeniedMessage askKickDeniedMessage = 21; + * optional .AskKickDeniedMessage askKickDeniedMessage = 18; */ public boolean hasAskKickDeniedMessage() { - return ((bitField0_ & 0x00100000) == 0x00100000); + return ((bitField0_ & 0x00020000) == 0x00020000); } /** - * optional .AskKickDeniedMessage askKickDeniedMessage = 21; + * optional .AskKickDeniedMessage askKickDeniedMessage = 18; */ public de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage getAskKickDeniedMessage() { return askKickDeniedMessage_; } - // optional .StartKickPetitionMessage startKickPetitionMessage = 22; - public static final int STARTKICKPETITIONMESSAGE_FIELD_NUMBER = 22; + // optional .StartKickPetitionMessage startKickPetitionMessage = 19; + public static final int STARTKICKPETITIONMESSAGE_FIELD_NUMBER = 19; private de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage startKickPetitionMessage_; /** - * optional .StartKickPetitionMessage startKickPetitionMessage = 22; + * optional .StartKickPetitionMessage startKickPetitionMessage = 19; */ public boolean hasStartKickPetitionMessage() { - return ((bitField0_ & 0x00200000) == 0x00200000); + return ((bitField0_ & 0x00040000) == 0x00040000); } /** - * optional .StartKickPetitionMessage startKickPetitionMessage = 22; + * optional .StartKickPetitionMessage startKickPetitionMessage = 19; */ public de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage getStartKickPetitionMessage() { return startKickPetitionMessage_; } - // optional .VoteKickRequestMessage voteKickRequestMessage = 23; - public static final int VOTEKICKREQUESTMESSAGE_FIELD_NUMBER = 23; + // optional .VoteKickRequestMessage voteKickRequestMessage = 20; + public static final int VOTEKICKREQUESTMESSAGE_FIELD_NUMBER = 20; private de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage voteKickRequestMessage_; /** - * optional .VoteKickRequestMessage voteKickRequestMessage = 23; + * optional .VoteKickRequestMessage voteKickRequestMessage = 20; */ public boolean hasVoteKickRequestMessage() { - return ((bitField0_ & 0x00400000) == 0x00400000); + return ((bitField0_ & 0x00080000) == 0x00080000); } /** - * optional .VoteKickRequestMessage voteKickRequestMessage = 23; + * optional .VoteKickRequestMessage voteKickRequestMessage = 20; */ public de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage getVoteKickRequestMessage() { return voteKickRequestMessage_; } - // optional .VoteKickReplyMessage voteKickReplyMessage = 24; - public static final int VOTEKICKREPLYMESSAGE_FIELD_NUMBER = 24; + // optional .VoteKickReplyMessage voteKickReplyMessage = 21; + public static final int VOTEKICKREPLYMESSAGE_FIELD_NUMBER = 21; private de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage voteKickReplyMessage_; /** - * optional .VoteKickReplyMessage voteKickReplyMessage = 24; + * optional .VoteKickReplyMessage voteKickReplyMessage = 21; */ public boolean hasVoteKickReplyMessage() { - return ((bitField0_ & 0x00800000) == 0x00800000); + return ((bitField0_ & 0x00100000) == 0x00100000); } /** - * optional .VoteKickReplyMessage voteKickReplyMessage = 24; + * optional .VoteKickReplyMessage voteKickReplyMessage = 21; */ public de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage getVoteKickReplyMessage() { return voteKickReplyMessage_; } - // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; - public static final int KICKPETITIONUPDATEMESSAGE_FIELD_NUMBER = 25; + // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; + public static final int KICKPETITIONUPDATEMESSAGE_FIELD_NUMBER = 22; private de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage kickPetitionUpdateMessage_; /** - * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; */ public boolean hasKickPetitionUpdateMessage() { - return ((bitField0_ & 0x01000000) == 0x01000000); + return ((bitField0_ & 0x00200000) == 0x00200000); } /** - * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; */ public de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage getKickPetitionUpdateMessage() { return kickPetitionUpdateMessage_; } - // optional .EndKickPetitionMessage endKickPetitionMessage = 26; - public static final int ENDKICKPETITIONMESSAGE_FIELD_NUMBER = 26; + // optional .EndKickPetitionMessage endKickPetitionMessage = 23; + public static final int ENDKICKPETITIONMESSAGE_FIELD_NUMBER = 23; private de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage endKickPetitionMessage_; /** - * optional .EndKickPetitionMessage endKickPetitionMessage = 26; + * optional .EndKickPetitionMessage endKickPetitionMessage = 23; */ public boolean hasEndKickPetitionMessage() { - return ((bitField0_ & 0x02000000) == 0x02000000); + return ((bitField0_ & 0x00400000) == 0x00400000); } /** - * optional .EndKickPetitionMessage endKickPetitionMessage = 26; + * optional .EndKickPetitionMessage endKickPetitionMessage = 23; */ public de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage getEndKickPetitionMessage() { return endKickPetitionMessage_; } - // optional .ChatRequestMessage chatRequestMessage = 27; - public static final int CHATREQUESTMESSAGE_FIELD_NUMBER = 27; + // optional .ChatRequestMessage chatRequestMessage = 24; + public static final int CHATREQUESTMESSAGE_FIELD_NUMBER = 24; private de.pokerth.protocol.ProtoBuf.ChatRequestMessage chatRequestMessage_; /** - * optional .ChatRequestMessage chatRequestMessage = 27; + * optional .ChatRequestMessage chatRequestMessage = 24; */ public boolean hasChatRequestMessage() { - return ((bitField0_ & 0x04000000) == 0x04000000); + return ((bitField0_ & 0x00800000) == 0x00800000); } /** - * optional .ChatRequestMessage chatRequestMessage = 27; + * optional .ChatRequestMessage chatRequestMessage = 24; */ public de.pokerth.protocol.ProtoBuf.ChatRequestMessage getChatRequestMessage() { return chatRequestMessage_; } - // optional .ChatMessage chatMessage = 28; - public static final int CHATMESSAGE_FIELD_NUMBER = 28; + // optional .ChatMessage chatMessage = 25; + public static final int CHATMESSAGE_FIELD_NUMBER = 25; private de.pokerth.protocol.ProtoBuf.ChatMessage chatMessage_; /** - * optional .ChatMessage chatMessage = 28; + * optional .ChatMessage chatMessage = 25; */ public boolean hasChatMessage() { - return ((bitField0_ & 0x08000000) == 0x08000000); + return ((bitField0_ & 0x01000000) == 0x01000000); } /** - * optional .ChatMessage chatMessage = 28; + * optional .ChatMessage chatMessage = 25; */ public de.pokerth.protocol.ProtoBuf.ChatMessage getChatMessage() { return chatMessage_; } - // optional .ChatRejectMessage chatRejectMessage = 29; - public static final int CHATREJECTMESSAGE_FIELD_NUMBER = 29; + // optional .ChatRejectMessage chatRejectMessage = 26; + public static final int CHATREJECTMESSAGE_FIELD_NUMBER = 26; private de.pokerth.protocol.ProtoBuf.ChatRejectMessage chatRejectMessage_; /** - * optional .ChatRejectMessage chatRejectMessage = 29; + * optional .ChatRejectMessage chatRejectMessage = 26; */ public boolean hasChatRejectMessage() { - return ((bitField0_ & 0x10000000) == 0x10000000); + return ((bitField0_ & 0x02000000) == 0x02000000); } /** - * optional .ChatRejectMessage chatRejectMessage = 29; + * optional .ChatRejectMessage chatRejectMessage = 26; */ public de.pokerth.protocol.ProtoBuf.ChatRejectMessage getChatRejectMessage() { return chatRejectMessage_; } + // optional .TimeoutWarningMessage timeoutWarningMessage = 27; + public static final int TIMEOUTWARNINGMESSAGE_FIELD_NUMBER = 27; + private de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage timeoutWarningMessage_; + /** + * optional .TimeoutWarningMessage timeoutWarningMessage = 27; + */ + public boolean hasTimeoutWarningMessage() { + return ((bitField0_ & 0x04000000) == 0x04000000); + } + /** + * optional .TimeoutWarningMessage timeoutWarningMessage = 27; + */ + public de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage getTimeoutWarningMessage() { + return timeoutWarningMessage_; + } + + // optional .ResetTimeoutMessage resetTimeoutMessage = 28; + public static final int RESETTIMEOUTMESSAGE_FIELD_NUMBER = 28; + private de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage resetTimeoutMessage_; + /** + * optional .ResetTimeoutMessage resetTimeoutMessage = 28; + */ + public boolean hasResetTimeoutMessage() { + return ((bitField0_ & 0x08000000) == 0x08000000); + } + /** + * optional .ResetTimeoutMessage resetTimeoutMessage = 28; + */ + public de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage getResetTimeoutMessage() { + return resetTimeoutMessage_; + } + // optional .ErrorMessage errorMessage = 1025; public static final int ERRORMESSAGE_FIELD_NUMBER = 1025; private de.pokerth.protocol.ProtoBuf.ErrorMessage errorMessage_; @@ -56443,7 +56816,7 @@ public final class ProtoBuf { * optional .ErrorMessage errorMessage = 1025; */ public boolean hasErrorMessage() { - return ((bitField0_ & 0x20000000) == 0x20000000); + return ((bitField0_ & 0x10000000) == 0x10000000); } /** * optional .ErrorMessage errorMessage = 1025; @@ -56453,11 +56826,7 @@ public final class ProtoBuf { } private void initFields() { - messageType_ = de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType.Type_JoinGameMessage; - joinGameMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance(); - rejoinGameMessage_ = de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance(); - joinGameAckMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance(); - joinGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance(); + messageType_ = de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType.Type_GamePlayerJoinedMessage; gamePlayerJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage.getDefaultInstance(); gamePlayerLeftMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage.getDefaultInstance(); gameSpectatorJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage.getDefaultInstance(); @@ -56466,6 +56835,7 @@ public final class ProtoBuf { removedFromGameMessage_ = de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage.getDefaultInstance(); kickPlayerRequestMessage_ = de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage.getDefaultInstance(); leaveGameRequestMessage_ = de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage.getDefaultInstance(); + invitePlayerToGameMessage_ = de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.getDefaultInstance(); startEventMessage_ = de.pokerth.protocol.ProtoBuf.StartEventMessage.getDefaultInstance(); startEventAckMessage_ = de.pokerth.protocol.ProtoBuf.StartEventAckMessage.getDefaultInstance(); gameStartInitialMessage_ = de.pokerth.protocol.ProtoBuf.GameStartInitialMessage.getDefaultInstance(); @@ -56482,6 +56852,8 @@ public final class ProtoBuf { chatRequestMessage_ = de.pokerth.protocol.ProtoBuf.ChatRequestMessage.getDefaultInstance(); chatMessage_ = de.pokerth.protocol.ProtoBuf.ChatMessage.getDefaultInstance(); chatRejectMessage_ = de.pokerth.protocol.ProtoBuf.ChatRejectMessage.getDefaultInstance(); + timeoutWarningMessage_ = de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.getDefaultInstance(); + resetTimeoutMessage_ = de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.getDefaultInstance(); errorMessage_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.getDefaultInstance(); } private byte memoizedIsInitialized = -1; @@ -56493,18 +56865,6 @@ public final class ProtoBuf { memoizedIsInitialized = 0; return false; } - if (hasJoinGameAckMessage()) { - if (!getJoinGameAckMessage().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (hasJoinGameFailedMessage()) { - if (!getJoinGameFailedMessage().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } if (hasGamePlayerJoinedMessage()) { if (!getGamePlayerJoinedMessage().isInitialized()) { memoizedIsInitialized = 0; @@ -56547,6 +56907,12 @@ public final class ProtoBuf { return false; } } + if (hasInvitePlayerToGameMessage()) { + if (!getInvitePlayerToGameMessage().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } if (hasStartEventMessage()) { if (!getStartEventMessage().isInitialized()) { memoizedIsInitialized = 0; @@ -56637,6 +57003,12 @@ public final class ProtoBuf { return false; } } + if (hasTimeoutWarningMessage()) { + if (!getTimeoutWarningMessage().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } if (hasErrorMessage()) { if (!getErrorMessage().isInitialized()) { memoizedIsInitialized = 0; @@ -56654,90 +57026,87 @@ public final class ProtoBuf { output.writeEnum(1, messageType_.getNumber()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, joinGameMessage_); + output.writeMessage(2, gamePlayerJoinedMessage_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeMessage(3, rejoinGameMessage_); + output.writeMessage(3, gamePlayerLeftMessage_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeMessage(4, joinGameAckMessage_); + output.writeMessage(4, gameSpectatorJoinedMessage_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeMessage(5, joinGameFailedMessage_); + output.writeMessage(5, gameSpectatorLeftMessage_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { - output.writeMessage(6, gamePlayerJoinedMessage_); + output.writeMessage(6, gameAdminChangedMessage_); } if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeMessage(7, gamePlayerLeftMessage_); + output.writeMessage(7, removedFromGameMessage_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { - output.writeMessage(8, gameSpectatorJoinedMessage_); + output.writeMessage(8, kickPlayerRequestMessage_); } if (((bitField0_ & 0x00000100) == 0x00000100)) { - output.writeMessage(9, gameSpectatorLeftMessage_); + output.writeMessage(9, leaveGameRequestMessage_); } if (((bitField0_ & 0x00000200) == 0x00000200)) { - output.writeMessage(10, gameAdminChangedMessage_); + output.writeMessage(10, invitePlayerToGameMessage_); } if (((bitField0_ & 0x00000400) == 0x00000400)) { - output.writeMessage(11, removedFromGameMessage_); + output.writeMessage(11, startEventMessage_); } if (((bitField0_ & 0x00000800) == 0x00000800)) { - output.writeMessage(12, kickPlayerRequestMessage_); + output.writeMessage(12, startEventAckMessage_); } if (((bitField0_ & 0x00001000) == 0x00001000)) { - output.writeMessage(13, leaveGameRequestMessage_); + output.writeMessage(13, gameStartInitialMessage_); } if (((bitField0_ & 0x00002000) == 0x00002000)) { - output.writeMessage(14, startEventMessage_); + output.writeMessage(14, gameStartRejoinMessage_); } if (((bitField0_ & 0x00004000) == 0x00004000)) { - output.writeMessage(15, startEventAckMessage_); + output.writeMessage(15, endOfGameMessage_); } if (((bitField0_ & 0x00008000) == 0x00008000)) { - output.writeMessage(16, gameStartInitialMessage_); + output.writeMessage(16, playerIdChangedMessage_); } if (((bitField0_ & 0x00010000) == 0x00010000)) { - output.writeMessage(17, gameStartRejoinMessage_); + output.writeMessage(17, askKickPlayerMessage_); } if (((bitField0_ & 0x00020000) == 0x00020000)) { - output.writeMessage(18, endOfGameMessage_); + output.writeMessage(18, askKickDeniedMessage_); } if (((bitField0_ & 0x00040000) == 0x00040000)) { - output.writeMessage(19, playerIdChangedMessage_); + output.writeMessage(19, startKickPetitionMessage_); } if (((bitField0_ & 0x00080000) == 0x00080000)) { - output.writeMessage(20, askKickPlayerMessage_); + output.writeMessage(20, voteKickRequestMessage_); } if (((bitField0_ & 0x00100000) == 0x00100000)) { - output.writeMessage(21, askKickDeniedMessage_); + output.writeMessage(21, voteKickReplyMessage_); } if (((bitField0_ & 0x00200000) == 0x00200000)) { - output.writeMessage(22, startKickPetitionMessage_); + output.writeMessage(22, kickPetitionUpdateMessage_); } if (((bitField0_ & 0x00400000) == 0x00400000)) { - output.writeMessage(23, voteKickRequestMessage_); + output.writeMessage(23, endKickPetitionMessage_); } if (((bitField0_ & 0x00800000) == 0x00800000)) { - output.writeMessage(24, voteKickReplyMessage_); + output.writeMessage(24, chatRequestMessage_); } if (((bitField0_ & 0x01000000) == 0x01000000)) { - output.writeMessage(25, kickPetitionUpdateMessage_); + output.writeMessage(25, chatMessage_); } if (((bitField0_ & 0x02000000) == 0x02000000)) { - output.writeMessage(26, endKickPetitionMessage_); + output.writeMessage(26, chatRejectMessage_); } if (((bitField0_ & 0x04000000) == 0x04000000)) { - output.writeMessage(27, chatRequestMessage_); + output.writeMessage(27, timeoutWarningMessage_); } if (((bitField0_ & 0x08000000) == 0x08000000)) { - output.writeMessage(28, chatMessage_); + output.writeMessage(28, resetTimeoutMessage_); } if (((bitField0_ & 0x10000000) == 0x10000000)) { - output.writeMessage(29, chatRejectMessage_); - } - if (((bitField0_ & 0x20000000) == 0x20000000)) { output.writeMessage(1025, errorMessage_); } } @@ -56754,117 +57123,113 @@ public final class ProtoBuf { } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, joinGameMessage_); + .computeMessageSize(2, gamePlayerJoinedMessage_); } if (((bitField0_ & 0x00000004) == 0x00000004)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, rejoinGameMessage_); + .computeMessageSize(3, gamePlayerLeftMessage_); } if (((bitField0_ & 0x00000008) == 0x00000008)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, joinGameAckMessage_); + .computeMessageSize(4, gameSpectatorJoinedMessage_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, joinGameFailedMessage_); + .computeMessageSize(5, gameSpectatorLeftMessage_); } if (((bitField0_ & 0x00000020) == 0x00000020)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, gamePlayerJoinedMessage_); + .computeMessageSize(6, gameAdminChangedMessage_); } if (((bitField0_ & 0x00000040) == 0x00000040)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, gamePlayerLeftMessage_); + .computeMessageSize(7, removedFromGameMessage_); } if (((bitField0_ & 0x00000080) == 0x00000080)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, gameSpectatorJoinedMessage_); + .computeMessageSize(8, kickPlayerRequestMessage_); } if (((bitField0_ & 0x00000100) == 0x00000100)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, gameSpectatorLeftMessage_); + .computeMessageSize(9, leaveGameRequestMessage_); } if (((bitField0_ & 0x00000200) == 0x00000200)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, gameAdminChangedMessage_); + .computeMessageSize(10, invitePlayerToGameMessage_); } if (((bitField0_ & 0x00000400) == 0x00000400)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, removedFromGameMessage_); + .computeMessageSize(11, startEventMessage_); } if (((bitField0_ & 0x00000800) == 0x00000800)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(12, kickPlayerRequestMessage_); + .computeMessageSize(12, startEventAckMessage_); } if (((bitField0_ & 0x00001000) == 0x00001000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, leaveGameRequestMessage_); + .computeMessageSize(13, gameStartInitialMessage_); } if (((bitField0_ & 0x00002000) == 0x00002000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(14, startEventMessage_); + .computeMessageSize(14, gameStartRejoinMessage_); } if (((bitField0_ & 0x00004000) == 0x00004000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(15, startEventAckMessage_); + .computeMessageSize(15, endOfGameMessage_); } if (((bitField0_ & 0x00008000) == 0x00008000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(16, gameStartInitialMessage_); + .computeMessageSize(16, playerIdChangedMessage_); } if (((bitField0_ & 0x00010000) == 0x00010000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(17, gameStartRejoinMessage_); + .computeMessageSize(17, askKickPlayerMessage_); } if (((bitField0_ & 0x00020000) == 0x00020000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(18, endOfGameMessage_); + .computeMessageSize(18, askKickDeniedMessage_); } if (((bitField0_ & 0x00040000) == 0x00040000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(19, playerIdChangedMessage_); + .computeMessageSize(19, startKickPetitionMessage_); } if (((bitField0_ & 0x00080000) == 0x00080000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(20, askKickPlayerMessage_); + .computeMessageSize(20, voteKickRequestMessage_); } if (((bitField0_ & 0x00100000) == 0x00100000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(21, askKickDeniedMessage_); + .computeMessageSize(21, voteKickReplyMessage_); } if (((bitField0_ & 0x00200000) == 0x00200000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(22, startKickPetitionMessage_); + .computeMessageSize(22, kickPetitionUpdateMessage_); } if (((bitField0_ & 0x00400000) == 0x00400000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(23, voteKickRequestMessage_); + .computeMessageSize(23, endKickPetitionMessage_); } if (((bitField0_ & 0x00800000) == 0x00800000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(24, voteKickReplyMessage_); + .computeMessageSize(24, chatRequestMessage_); } if (((bitField0_ & 0x01000000) == 0x01000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(25, kickPetitionUpdateMessage_); + .computeMessageSize(25, chatMessage_); } if (((bitField0_ & 0x02000000) == 0x02000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(26, endKickPetitionMessage_); + .computeMessageSize(26, chatRejectMessage_); } if (((bitField0_ & 0x04000000) == 0x04000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(27, chatRequestMessage_); + .computeMessageSize(27, timeoutWarningMessage_); } if (((bitField0_ & 0x08000000) == 0x08000000)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(28, chatMessage_); + .computeMessageSize(28, resetTimeoutMessage_); } if (((bitField0_ & 0x10000000) == 0x10000000)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(29, chatRejectMessage_); - } - if (((bitField0_ & 0x20000000) == 0x20000000)) { size += com.google.protobuf.CodedOutputStream .computeMessageSize(1025, errorMessage_); } @@ -56959,66 +57324,64 @@ public final class ProtoBuf { public Builder clear() { super.clear(); - messageType_ = de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType.Type_JoinGameMessage; + messageType_ = de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType.Type_GamePlayerJoinedMessage; bitField0_ = (bitField0_ & ~0x00000001); - joinGameMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000002); - rejoinGameMessage_ = de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000004); - joinGameAckMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000008); - joinGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000010); gamePlayerJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000002); gamePlayerLeftMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000004); gameSpectatorJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000008); gameSpectatorLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000010); gameAdminChangedMessage_ = de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000020); removedFromGameMessage_ = de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000400); + bitField0_ = (bitField0_ & ~0x00000040); kickPlayerRequestMessage_ = de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000800); + bitField0_ = (bitField0_ & ~0x00000080); leaveGameRequestMessage_ = de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00000100); + invitePlayerToGameMessage_ = de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x00000200); startEventMessage_ = de.pokerth.protocol.ProtoBuf.StartEventMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00000400); startEventAckMessage_ = de.pokerth.protocol.ProtoBuf.StartEventAckMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00004000); + bitField0_ = (bitField0_ & ~0x00000800); gameStartInitialMessage_ = de.pokerth.protocol.ProtoBuf.GameStartInitialMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00008000); + bitField0_ = (bitField0_ & ~0x00001000); gameStartRejoinMessage_ = de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00002000); endOfGameMessage_ = de.pokerth.protocol.ProtoBuf.EndOfGameMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00020000); + bitField0_ = (bitField0_ & ~0x00004000); playerIdChangedMessage_ = de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00040000); + bitField0_ = (bitField0_ & ~0x00008000); askKickPlayerMessage_ = de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00080000); + bitField0_ = (bitField0_ & ~0x00010000); askKickDeniedMessage_ = de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00100000); + bitField0_ = (bitField0_ & ~0x00020000); startKickPetitionMessage_ = de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00200000); + bitField0_ = (bitField0_ & ~0x00040000); voteKickRequestMessage_ = de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00400000); + bitField0_ = (bitField0_ & ~0x00080000); voteKickReplyMessage_ = de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00800000); + bitField0_ = (bitField0_ & ~0x00100000); kickPetitionUpdateMessage_ = de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x01000000); + bitField0_ = (bitField0_ & ~0x00200000); endKickPetitionMessage_ = de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x02000000); + bitField0_ = (bitField0_ & ~0x00400000); chatRequestMessage_ = de.pokerth.protocol.ProtoBuf.ChatRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x04000000); + bitField0_ = (bitField0_ & ~0x00800000); chatMessage_ = de.pokerth.protocol.ProtoBuf.ChatMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x08000000); + bitField0_ = (bitField0_ & ~0x01000000); chatRejectMessage_ = de.pokerth.protocol.ProtoBuf.ChatRejectMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x10000000); + bitField0_ = (bitField0_ & ~0x02000000); + timeoutWarningMessage_ = de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x04000000); + resetTimeoutMessage_ = de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.getDefaultInstance(); + bitField0_ = (bitField0_ & ~0x08000000); errorMessage_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x20000000); + bitField0_ = (bitField0_ & ~0x10000000); return this; } @@ -57049,118 +57412,114 @@ public final class ProtoBuf { if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.joinGameMessage_ = joinGameMessage_; + result.gamePlayerJoinedMessage_ = gamePlayerJoinedMessage_; if (((from_bitField0_ & 0x00000004) == 0x00000004)) { to_bitField0_ |= 0x00000004; } - result.rejoinGameMessage_ = rejoinGameMessage_; + result.gamePlayerLeftMessage_ = gamePlayerLeftMessage_; if (((from_bitField0_ & 0x00000008) == 0x00000008)) { to_bitField0_ |= 0x00000008; } - result.joinGameAckMessage_ = joinGameAckMessage_; + result.gameSpectatorJoinedMessage_ = gameSpectatorJoinedMessage_; if (((from_bitField0_ & 0x00000010) == 0x00000010)) { to_bitField0_ |= 0x00000010; } - result.joinGameFailedMessage_ = joinGameFailedMessage_; + result.gameSpectatorLeftMessage_ = gameSpectatorLeftMessage_; if (((from_bitField0_ & 0x00000020) == 0x00000020)) { to_bitField0_ |= 0x00000020; } - result.gamePlayerJoinedMessage_ = gamePlayerJoinedMessage_; + result.gameAdminChangedMessage_ = gameAdminChangedMessage_; if (((from_bitField0_ & 0x00000040) == 0x00000040)) { to_bitField0_ |= 0x00000040; } - result.gamePlayerLeftMessage_ = gamePlayerLeftMessage_; + result.removedFromGameMessage_ = removedFromGameMessage_; if (((from_bitField0_ & 0x00000080) == 0x00000080)) { to_bitField0_ |= 0x00000080; } - result.gameSpectatorJoinedMessage_ = gameSpectatorJoinedMessage_; + result.kickPlayerRequestMessage_ = kickPlayerRequestMessage_; if (((from_bitField0_ & 0x00000100) == 0x00000100)) { to_bitField0_ |= 0x00000100; } - result.gameSpectatorLeftMessage_ = gameSpectatorLeftMessage_; + result.leaveGameRequestMessage_ = leaveGameRequestMessage_; if (((from_bitField0_ & 0x00000200) == 0x00000200)) { to_bitField0_ |= 0x00000200; } - result.gameAdminChangedMessage_ = gameAdminChangedMessage_; + result.invitePlayerToGameMessage_ = invitePlayerToGameMessage_; if (((from_bitField0_ & 0x00000400) == 0x00000400)) { to_bitField0_ |= 0x00000400; } - result.removedFromGameMessage_ = removedFromGameMessage_; + result.startEventMessage_ = startEventMessage_; if (((from_bitField0_ & 0x00000800) == 0x00000800)) { to_bitField0_ |= 0x00000800; } - result.kickPlayerRequestMessage_ = kickPlayerRequestMessage_; + result.startEventAckMessage_ = startEventAckMessage_; if (((from_bitField0_ & 0x00001000) == 0x00001000)) { to_bitField0_ |= 0x00001000; } - result.leaveGameRequestMessage_ = leaveGameRequestMessage_; + result.gameStartInitialMessage_ = gameStartInitialMessage_; if (((from_bitField0_ & 0x00002000) == 0x00002000)) { to_bitField0_ |= 0x00002000; } - result.startEventMessage_ = startEventMessage_; + result.gameStartRejoinMessage_ = gameStartRejoinMessage_; if (((from_bitField0_ & 0x00004000) == 0x00004000)) { to_bitField0_ |= 0x00004000; } - result.startEventAckMessage_ = startEventAckMessage_; + result.endOfGameMessage_ = endOfGameMessage_; if (((from_bitField0_ & 0x00008000) == 0x00008000)) { to_bitField0_ |= 0x00008000; } - result.gameStartInitialMessage_ = gameStartInitialMessage_; + result.playerIdChangedMessage_ = playerIdChangedMessage_; if (((from_bitField0_ & 0x00010000) == 0x00010000)) { to_bitField0_ |= 0x00010000; } - result.gameStartRejoinMessage_ = gameStartRejoinMessage_; + result.askKickPlayerMessage_ = askKickPlayerMessage_; if (((from_bitField0_ & 0x00020000) == 0x00020000)) { to_bitField0_ |= 0x00020000; } - result.endOfGameMessage_ = endOfGameMessage_; + result.askKickDeniedMessage_ = askKickDeniedMessage_; if (((from_bitField0_ & 0x00040000) == 0x00040000)) { to_bitField0_ |= 0x00040000; } - result.playerIdChangedMessage_ = playerIdChangedMessage_; + result.startKickPetitionMessage_ = startKickPetitionMessage_; if (((from_bitField0_ & 0x00080000) == 0x00080000)) { to_bitField0_ |= 0x00080000; } - result.askKickPlayerMessage_ = askKickPlayerMessage_; + result.voteKickRequestMessage_ = voteKickRequestMessage_; if (((from_bitField0_ & 0x00100000) == 0x00100000)) { to_bitField0_ |= 0x00100000; } - result.askKickDeniedMessage_ = askKickDeniedMessage_; + result.voteKickReplyMessage_ = voteKickReplyMessage_; if (((from_bitField0_ & 0x00200000) == 0x00200000)) { to_bitField0_ |= 0x00200000; } - result.startKickPetitionMessage_ = startKickPetitionMessage_; + result.kickPetitionUpdateMessage_ = kickPetitionUpdateMessage_; if (((from_bitField0_ & 0x00400000) == 0x00400000)) { to_bitField0_ |= 0x00400000; } - result.voteKickRequestMessage_ = voteKickRequestMessage_; + result.endKickPetitionMessage_ = endKickPetitionMessage_; if (((from_bitField0_ & 0x00800000) == 0x00800000)) { to_bitField0_ |= 0x00800000; } - result.voteKickReplyMessage_ = voteKickReplyMessage_; + result.chatRequestMessage_ = chatRequestMessage_; if (((from_bitField0_ & 0x01000000) == 0x01000000)) { to_bitField0_ |= 0x01000000; } - result.kickPetitionUpdateMessage_ = kickPetitionUpdateMessage_; + result.chatMessage_ = chatMessage_; if (((from_bitField0_ & 0x02000000) == 0x02000000)) { to_bitField0_ |= 0x02000000; } - result.endKickPetitionMessage_ = endKickPetitionMessage_; + result.chatRejectMessage_ = chatRejectMessage_; if (((from_bitField0_ & 0x04000000) == 0x04000000)) { to_bitField0_ |= 0x04000000; } - result.chatRequestMessage_ = chatRequestMessage_; + result.timeoutWarningMessage_ = timeoutWarningMessage_; if (((from_bitField0_ & 0x08000000) == 0x08000000)) { to_bitField0_ |= 0x08000000; } - result.chatMessage_ = chatMessage_; + result.resetTimeoutMessage_ = resetTimeoutMessage_; if (((from_bitField0_ & 0x10000000) == 0x10000000)) { to_bitField0_ |= 0x10000000; } - result.chatRejectMessage_ = chatRejectMessage_; - if (((from_bitField0_ & 0x20000000) == 0x20000000)) { - to_bitField0_ |= 0x20000000; - } result.errorMessage_ = errorMessage_; result.bitField0_ = to_bitField0_; return result; @@ -57171,18 +57530,6 @@ public final class ProtoBuf { if (other.hasMessageType()) { setMessageType(other.getMessageType()); } - if (other.hasJoinGameMessage()) { - mergeJoinGameMessage(other.getJoinGameMessage()); - } - if (other.hasRejoinGameMessage()) { - mergeRejoinGameMessage(other.getRejoinGameMessage()); - } - if (other.hasJoinGameAckMessage()) { - mergeJoinGameAckMessage(other.getJoinGameAckMessage()); - } - if (other.hasJoinGameFailedMessage()) { - mergeJoinGameFailedMessage(other.getJoinGameFailedMessage()); - } if (other.hasGamePlayerJoinedMessage()) { mergeGamePlayerJoinedMessage(other.getGamePlayerJoinedMessage()); } @@ -57207,6 +57554,9 @@ public final class ProtoBuf { if (other.hasLeaveGameRequestMessage()) { mergeLeaveGameRequestMessage(other.getLeaveGameRequestMessage()); } + if (other.hasInvitePlayerToGameMessage()) { + mergeInvitePlayerToGameMessage(other.getInvitePlayerToGameMessage()); + } if (other.hasStartEventMessage()) { mergeStartEventMessage(other.getStartEventMessage()); } @@ -57255,6 +57605,12 @@ public final class ProtoBuf { if (other.hasChatRejectMessage()) { mergeChatRejectMessage(other.getChatRejectMessage()); } + if (other.hasTimeoutWarningMessage()) { + mergeTimeoutWarningMessage(other.getTimeoutWarningMessage()); + } + if (other.hasResetTimeoutMessage()) { + mergeResetTimeoutMessage(other.getResetTimeoutMessage()); + } if (other.hasErrorMessage()) { mergeErrorMessage(other.getErrorMessage()); } @@ -57266,18 +57622,6 @@ public final class ProtoBuf { return false; } - if (hasJoinGameAckMessage()) { - if (!getJoinGameAckMessage().isInitialized()) { - - return false; - } - } - if (hasJoinGameFailedMessage()) { - if (!getJoinGameFailedMessage().isInitialized()) { - - return false; - } - } if (hasGamePlayerJoinedMessage()) { if (!getGamePlayerJoinedMessage().isInitialized()) { @@ -57320,6 +57664,12 @@ public final class ProtoBuf { return false; } } + if (hasInvitePlayerToGameMessage()) { + if (!getInvitePlayerToGameMessage().isInitialized()) { + + return false; + } + } if (hasStartEventMessage()) { if (!getStartEventMessage().isInitialized()) { @@ -57410,6 +57760,12 @@ public final class ProtoBuf { return false; } } + if (hasTimeoutWarningMessage()) { + if (!getTimeoutWarningMessage().isInitialized()) { + + return false; + } + } if (hasErrorMessage()) { if (!getErrorMessage().isInitialized()) { @@ -57439,7 +57795,7 @@ public final class ProtoBuf { private int bitField0_; // required .GameManagementMessage.GameManagementMessageType messageType = 1; - private de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType messageType_ = de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType.Type_JoinGameMessage; + private de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType messageType_ = de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType.Type_GamePlayerJoinedMessage; /** * required .GameManagementMessage.GameManagementMessageType messageType = 1; */ @@ -57469,271 +57825,27 @@ public final class ProtoBuf { */ public Builder clearMessageType() { bitField0_ = (bitField0_ & ~0x00000001); - messageType_ = de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType.Type_JoinGameMessage; + messageType_ = de.pokerth.protocol.ProtoBuf.GameManagementMessage.GameManagementMessageType.Type_GamePlayerJoinedMessage; return this; } - // optional .JoinGameMessage joinGameMessage = 2; - private de.pokerth.protocol.ProtoBuf.JoinGameMessage joinGameMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance(); + // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; + private de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage gamePlayerJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage.getDefaultInstance(); /** - * optional .JoinGameMessage joinGameMessage = 2; + * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; */ - public boolean hasJoinGameMessage() { + public boolean hasGamePlayerJoinedMessage() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional .JoinGameMessage joinGameMessage = 2; - */ - public de.pokerth.protocol.ProtoBuf.JoinGameMessage getJoinGameMessage() { - return joinGameMessage_; - } - /** - * optional .JoinGameMessage joinGameMessage = 2; - */ - public Builder setJoinGameMessage(de.pokerth.protocol.ProtoBuf.JoinGameMessage value) { - if (value == null) { - throw new NullPointerException(); - } - joinGameMessage_ = value; - - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .JoinGameMessage joinGameMessage = 2; - */ - public Builder setJoinGameMessage( - de.pokerth.protocol.ProtoBuf.JoinGameMessage.Builder builderForValue) { - joinGameMessage_ = builderForValue.build(); - - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .JoinGameMessage joinGameMessage = 2; - */ - public Builder mergeJoinGameMessage(de.pokerth.protocol.ProtoBuf.JoinGameMessage value) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - joinGameMessage_ != de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance()) { - joinGameMessage_ = - de.pokerth.protocol.ProtoBuf.JoinGameMessage.newBuilder(joinGameMessage_).mergeFrom(value).buildPartial(); - } else { - joinGameMessage_ = value; - } - - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .JoinGameMessage joinGameMessage = 2; - */ - public Builder clearJoinGameMessage() { - joinGameMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameMessage.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - - // optional .RejoinGameMessage rejoinGameMessage = 3; - private de.pokerth.protocol.ProtoBuf.RejoinGameMessage rejoinGameMessage_ = de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance(); - /** - * optional .RejoinGameMessage rejoinGameMessage = 3; - */ - public boolean hasRejoinGameMessage() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional .RejoinGameMessage rejoinGameMessage = 3; - */ - public de.pokerth.protocol.ProtoBuf.RejoinGameMessage getRejoinGameMessage() { - return rejoinGameMessage_; - } - /** - * optional .RejoinGameMessage rejoinGameMessage = 3; - */ - public Builder setRejoinGameMessage(de.pokerth.protocol.ProtoBuf.RejoinGameMessage value) { - if (value == null) { - throw new NullPointerException(); - } - rejoinGameMessage_ = value; - - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .RejoinGameMessage rejoinGameMessage = 3; - */ - public Builder setRejoinGameMessage( - de.pokerth.protocol.ProtoBuf.RejoinGameMessage.Builder builderForValue) { - rejoinGameMessage_ = builderForValue.build(); - - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .RejoinGameMessage rejoinGameMessage = 3; - */ - public Builder mergeRejoinGameMessage(de.pokerth.protocol.ProtoBuf.RejoinGameMessage value) { - if (((bitField0_ & 0x00000004) == 0x00000004) && - rejoinGameMessage_ != de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance()) { - rejoinGameMessage_ = - de.pokerth.protocol.ProtoBuf.RejoinGameMessage.newBuilder(rejoinGameMessage_).mergeFrom(value).buildPartial(); - } else { - rejoinGameMessage_ = value; - } - - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .RejoinGameMessage rejoinGameMessage = 3; - */ - public Builder clearRejoinGameMessage() { - rejoinGameMessage_ = de.pokerth.protocol.ProtoBuf.RejoinGameMessage.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - - // optional .JoinGameAckMessage joinGameAckMessage = 4; - private de.pokerth.protocol.ProtoBuf.JoinGameAckMessage joinGameAckMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance(); - /** - * optional .JoinGameAckMessage joinGameAckMessage = 4; - */ - public boolean hasJoinGameAckMessage() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .JoinGameAckMessage joinGameAckMessage = 4; - */ - public de.pokerth.protocol.ProtoBuf.JoinGameAckMessage getJoinGameAckMessage() { - return joinGameAckMessage_; - } - /** - * optional .JoinGameAckMessage joinGameAckMessage = 4; - */ - public Builder setJoinGameAckMessage(de.pokerth.protocol.ProtoBuf.JoinGameAckMessage value) { - if (value == null) { - throw new NullPointerException(); - } - joinGameAckMessage_ = value; - - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .JoinGameAckMessage joinGameAckMessage = 4; - */ - public Builder setJoinGameAckMessage( - de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.Builder builderForValue) { - joinGameAckMessage_ = builderForValue.build(); - - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .JoinGameAckMessage joinGameAckMessage = 4; - */ - public Builder mergeJoinGameAckMessage(de.pokerth.protocol.ProtoBuf.JoinGameAckMessage value) { - if (((bitField0_ & 0x00000008) == 0x00000008) && - joinGameAckMessage_ != de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance()) { - joinGameAckMessage_ = - de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.newBuilder(joinGameAckMessage_).mergeFrom(value).buildPartial(); - } else { - joinGameAckMessage_ = value; - } - - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .JoinGameAckMessage joinGameAckMessage = 4; - */ - public Builder clearJoinGameAckMessage() { - joinGameAckMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameAckMessage.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } - - // optional .JoinGameFailedMessage joinGameFailedMessage = 5; - private de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage joinGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance(); - /** - * optional .JoinGameFailedMessage joinGameFailedMessage = 5; - */ - public boolean hasJoinGameFailedMessage() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * optional .JoinGameFailedMessage joinGameFailedMessage = 5; - */ - public de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage getJoinGameFailedMessage() { - return joinGameFailedMessage_; - } - /** - * optional .JoinGameFailedMessage joinGameFailedMessage = 5; - */ - public Builder setJoinGameFailedMessage(de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage value) { - if (value == null) { - throw new NullPointerException(); - } - joinGameFailedMessage_ = value; - - bitField0_ |= 0x00000010; - return this; - } - /** - * optional .JoinGameFailedMessage joinGameFailedMessage = 5; - */ - public Builder setJoinGameFailedMessage( - de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.Builder builderForValue) { - joinGameFailedMessage_ = builderForValue.build(); - - bitField0_ |= 0x00000010; - return this; - } - /** - * optional .JoinGameFailedMessage joinGameFailedMessage = 5; - */ - public Builder mergeJoinGameFailedMessage(de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage value) { - if (((bitField0_ & 0x00000010) == 0x00000010) && - joinGameFailedMessage_ != de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance()) { - joinGameFailedMessage_ = - de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.newBuilder(joinGameFailedMessage_).mergeFrom(value).buildPartial(); - } else { - joinGameFailedMessage_ = value; - } - - bitField0_ |= 0x00000010; - return this; - } - /** - * optional .JoinGameFailedMessage joinGameFailedMessage = 5; - */ - public Builder clearJoinGameFailedMessage() { - joinGameFailedMessage_ = de.pokerth.protocol.ProtoBuf.JoinGameFailedMessage.getDefaultInstance(); - - bitField0_ = (bitField0_ & ~0x00000010); - return this; - } - - // optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; - private de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage gamePlayerJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage.getDefaultInstance(); - /** - * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; - */ - public boolean hasGamePlayerJoinedMessage() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; */ public de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage getGamePlayerJoinedMessage() { return gamePlayerJoinedMessage_; } /** - * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; */ public Builder setGamePlayerJoinedMessage(de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage value) { if (value == null) { @@ -57741,24 +57853,24 @@ public final class ProtoBuf { } gamePlayerJoinedMessage_ = value; - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; return this; } /** - * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; */ public Builder setGamePlayerJoinedMessage( de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage.Builder builderForValue) { gamePlayerJoinedMessage_ = builderForValue.build(); - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; return this; } /** - * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; */ public Builder mergeGamePlayerJoinedMessage(de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage value) { - if (((bitField0_ & 0x00000020) == 0x00000020) && + if (((bitField0_ & 0x00000002) == 0x00000002) && gamePlayerJoinedMessage_ != de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage.getDefaultInstance()) { gamePlayerJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage.newBuilder(gamePlayerJoinedMessage_).mergeFrom(value).buildPartial(); @@ -57766,35 +57878,35 @@ public final class ProtoBuf { gamePlayerJoinedMessage_ = value; } - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000002; return this; } /** - * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 6; + * optional .GamePlayerJoinedMessage gamePlayerJoinedMessage = 2; */ public Builder clearGamePlayerJoinedMessage() { gamePlayerJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerJoinedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000002); return this; } - // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + // optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; private de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage gamePlayerLeftMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage.getDefaultInstance(); /** - * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; */ public boolean hasGamePlayerLeftMessage() { - return ((bitField0_ & 0x00000040) == 0x00000040); + return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; */ public de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage getGamePlayerLeftMessage() { return gamePlayerLeftMessage_; } /** - * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; */ public Builder setGamePlayerLeftMessage(de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage value) { if (value == null) { @@ -57802,24 +57914,24 @@ public final class ProtoBuf { } gamePlayerLeftMessage_ = value; - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; return this; } /** - * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; */ public Builder setGamePlayerLeftMessage( de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage.Builder builderForValue) { gamePlayerLeftMessage_ = builderForValue.build(); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; return this; } /** - * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; */ public Builder mergeGamePlayerLeftMessage(de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage value) { - if (((bitField0_ & 0x00000040) == 0x00000040) && + if (((bitField0_ & 0x00000004) == 0x00000004) && gamePlayerLeftMessage_ != de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage.getDefaultInstance()) { gamePlayerLeftMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage.newBuilder(gamePlayerLeftMessage_).mergeFrom(value).buildPartial(); @@ -57827,35 +57939,35 @@ public final class ProtoBuf { gamePlayerLeftMessage_ = value; } - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000004; return this; } /** - * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 7; + * optional .GamePlayerLeftMessage gamePlayerLeftMessage = 3; */ public Builder clearGamePlayerLeftMessage() { gamePlayerLeftMessage_ = de.pokerth.protocol.ProtoBuf.GamePlayerLeftMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000004); return this; } - // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + // optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; private de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage gameSpectatorJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage.getDefaultInstance(); /** - * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; */ public boolean hasGameSpectatorJoinedMessage() { - return ((bitField0_ & 0x00000080) == 0x00000080); + return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; */ public de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage getGameSpectatorJoinedMessage() { return gameSpectatorJoinedMessage_; } /** - * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; */ public Builder setGameSpectatorJoinedMessage(de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage value) { if (value == null) { @@ -57863,24 +57975,24 @@ public final class ProtoBuf { } gameSpectatorJoinedMessage_ = value; - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000008; return this; } /** - * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; */ public Builder setGameSpectatorJoinedMessage( de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage.Builder builderForValue) { gameSpectatorJoinedMessage_ = builderForValue.build(); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000008; return this; } /** - * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; */ public Builder mergeGameSpectatorJoinedMessage(de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage value) { - if (((bitField0_ & 0x00000080) == 0x00000080) && + if (((bitField0_ & 0x00000008) == 0x00000008) && gameSpectatorJoinedMessage_ != de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage.getDefaultInstance()) { gameSpectatorJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage.newBuilder(gameSpectatorJoinedMessage_).mergeFrom(value).buildPartial(); @@ -57888,35 +58000,35 @@ public final class ProtoBuf { gameSpectatorJoinedMessage_ = value; } - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000008; return this; } /** - * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 8; + * optional .GameSpectatorJoinedMessage gameSpectatorJoinedMessage = 4; */ public Builder clearGameSpectatorJoinedMessage() { gameSpectatorJoinedMessage_ = de.pokerth.protocol.ProtoBuf.GameSpectatorJoinedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000008); return this; } - // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + // optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; private de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage gameSpectatorLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage.getDefaultInstance(); /** - * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; */ public boolean hasGameSpectatorLeftMessage() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; */ public de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage getGameSpectatorLeftMessage() { return gameSpectatorLeftMessage_; } /** - * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; */ public Builder setGameSpectatorLeftMessage(de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage value) { if (value == null) { @@ -57924,24 +58036,24 @@ public final class ProtoBuf { } gameSpectatorLeftMessage_ = value; - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000010; return this; } /** - * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; */ public Builder setGameSpectatorLeftMessage( de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage.Builder builderForValue) { gameSpectatorLeftMessage_ = builderForValue.build(); - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000010; return this; } /** - * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; */ public Builder mergeGameSpectatorLeftMessage(de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage value) { - if (((bitField0_ & 0x00000100) == 0x00000100) && + if (((bitField0_ & 0x00000010) == 0x00000010) && gameSpectatorLeftMessage_ != de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage.getDefaultInstance()) { gameSpectatorLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage.newBuilder(gameSpectatorLeftMessage_).mergeFrom(value).buildPartial(); @@ -57949,35 +58061,35 @@ public final class ProtoBuf { gameSpectatorLeftMessage_ = value; } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000010; return this; } /** - * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 9; + * optional .GameSpectatorLeftMessage gameSpectatorLeftMessage = 5; */ public Builder clearGameSpectatorLeftMessage() { gameSpectatorLeftMessage_ = de.pokerth.protocol.ProtoBuf.GameSpectatorLeftMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000010); return this; } - // optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + // optional .GameAdminChangedMessage gameAdminChangedMessage = 6; private de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage gameAdminChangedMessage_ = de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage.getDefaultInstance(); /** - * optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + * optional .GameAdminChangedMessage gameAdminChangedMessage = 6; */ public boolean hasGameAdminChangedMessage() { - return ((bitField0_ & 0x00000200) == 0x00000200); + return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + * optional .GameAdminChangedMessage gameAdminChangedMessage = 6; */ public de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage getGameAdminChangedMessage() { return gameAdminChangedMessage_; } /** - * optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + * optional .GameAdminChangedMessage gameAdminChangedMessage = 6; */ public Builder setGameAdminChangedMessage(de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage value) { if (value == null) { @@ -57985,24 +58097,24 @@ public final class ProtoBuf { } gameAdminChangedMessage_ = value; - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000020; return this; } /** - * optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + * optional .GameAdminChangedMessage gameAdminChangedMessage = 6; */ public Builder setGameAdminChangedMessage( de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage.Builder builderForValue) { gameAdminChangedMessage_ = builderForValue.build(); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000020; return this; } /** - * optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + * optional .GameAdminChangedMessage gameAdminChangedMessage = 6; */ public Builder mergeGameAdminChangedMessage(de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage value) { - if (((bitField0_ & 0x00000200) == 0x00000200) && + if (((bitField0_ & 0x00000020) == 0x00000020) && gameAdminChangedMessage_ != de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage.getDefaultInstance()) { gameAdminChangedMessage_ = de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage.newBuilder(gameAdminChangedMessage_).mergeFrom(value).buildPartial(); @@ -58010,35 +58122,35 @@ public final class ProtoBuf { gameAdminChangedMessage_ = value; } - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000020; return this; } /** - * optional .GameAdminChangedMessage gameAdminChangedMessage = 10; + * optional .GameAdminChangedMessage gameAdminChangedMessage = 6; */ public Builder clearGameAdminChangedMessage() { gameAdminChangedMessage_ = de.pokerth.protocol.ProtoBuf.GameAdminChangedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000020); return this; } - // optional .RemovedFromGameMessage removedFromGameMessage = 11; + // optional .RemovedFromGameMessage removedFromGameMessage = 7; private de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage removedFromGameMessage_ = de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage.getDefaultInstance(); /** - * optional .RemovedFromGameMessage removedFromGameMessage = 11; + * optional .RemovedFromGameMessage removedFromGameMessage = 7; */ public boolean hasRemovedFromGameMessage() { - return ((bitField0_ & 0x00000400) == 0x00000400); + return ((bitField0_ & 0x00000040) == 0x00000040); } /** - * optional .RemovedFromGameMessage removedFromGameMessage = 11; + * optional .RemovedFromGameMessage removedFromGameMessage = 7; */ public de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage getRemovedFromGameMessage() { return removedFromGameMessage_; } /** - * optional .RemovedFromGameMessage removedFromGameMessage = 11; + * optional .RemovedFromGameMessage removedFromGameMessage = 7; */ public Builder setRemovedFromGameMessage(de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage value) { if (value == null) { @@ -58046,24 +58158,24 @@ public final class ProtoBuf { } removedFromGameMessage_ = value; - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000040; return this; } /** - * optional .RemovedFromGameMessage removedFromGameMessage = 11; + * optional .RemovedFromGameMessage removedFromGameMessage = 7; */ public Builder setRemovedFromGameMessage( de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage.Builder builderForValue) { removedFromGameMessage_ = builderForValue.build(); - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000040; return this; } /** - * optional .RemovedFromGameMessage removedFromGameMessage = 11; + * optional .RemovedFromGameMessage removedFromGameMessage = 7; */ public Builder mergeRemovedFromGameMessage(de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage value) { - if (((bitField0_ & 0x00000400) == 0x00000400) && + if (((bitField0_ & 0x00000040) == 0x00000040) && removedFromGameMessage_ != de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage.getDefaultInstance()) { removedFromGameMessage_ = de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage.newBuilder(removedFromGameMessage_).mergeFrom(value).buildPartial(); @@ -58071,35 +58183,35 @@ public final class ProtoBuf { removedFromGameMessage_ = value; } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000040; return this; } /** - * optional .RemovedFromGameMessage removedFromGameMessage = 11; + * optional .RemovedFromGameMessage removedFromGameMessage = 7; */ public Builder clearRemovedFromGameMessage() { removedFromGameMessage_ = de.pokerth.protocol.ProtoBuf.RemovedFromGameMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000400); + bitField0_ = (bitField0_ & ~0x00000040); return this; } - // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + // optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; private de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage kickPlayerRequestMessage_ = de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage.getDefaultInstance(); /** - * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; */ public boolean hasKickPlayerRequestMessage() { - return ((bitField0_ & 0x00000800) == 0x00000800); + return ((bitField0_ & 0x00000080) == 0x00000080); } /** - * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; */ public de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage getKickPlayerRequestMessage() { return kickPlayerRequestMessage_; } /** - * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; */ public Builder setKickPlayerRequestMessage(de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage value) { if (value == null) { @@ -58107,24 +58219,24 @@ public final class ProtoBuf { } kickPlayerRequestMessage_ = value; - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000080; return this; } /** - * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; */ public Builder setKickPlayerRequestMessage( de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage.Builder builderForValue) { kickPlayerRequestMessage_ = builderForValue.build(); - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000080; return this; } /** - * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; */ public Builder mergeKickPlayerRequestMessage(de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage value) { - if (((bitField0_ & 0x00000800) == 0x00000800) && + if (((bitField0_ & 0x00000080) == 0x00000080) && kickPlayerRequestMessage_ != de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage.getDefaultInstance()) { kickPlayerRequestMessage_ = de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage.newBuilder(kickPlayerRequestMessage_).mergeFrom(value).buildPartial(); @@ -58132,35 +58244,35 @@ public final class ProtoBuf { kickPlayerRequestMessage_ = value; } - bitField0_ |= 0x00000800; + bitField0_ |= 0x00000080; return this; } /** - * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 12; + * optional .KickPlayerRequestMessage kickPlayerRequestMessage = 8; */ public Builder clearKickPlayerRequestMessage() { kickPlayerRequestMessage_ = de.pokerth.protocol.ProtoBuf.KickPlayerRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00000800); + bitField0_ = (bitField0_ & ~0x00000080); return this; } - // optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + // optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; private de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage leaveGameRequestMessage_ = de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage.getDefaultInstance(); /** - * optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + * optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; */ public boolean hasLeaveGameRequestMessage() { - return ((bitField0_ & 0x00001000) == 0x00001000); + return ((bitField0_ & 0x00000100) == 0x00000100); } /** - * optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + * optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; */ public de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage getLeaveGameRequestMessage() { return leaveGameRequestMessage_; } /** - * optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + * optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; */ public Builder setLeaveGameRequestMessage(de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage value) { if (value == null) { @@ -58168,24 +58280,24 @@ public final class ProtoBuf { } leaveGameRequestMessage_ = value; - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000100; return this; } /** - * optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + * optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; */ public Builder setLeaveGameRequestMessage( de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage.Builder builderForValue) { leaveGameRequestMessage_ = builderForValue.build(); - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000100; return this; } /** - * optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + * optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; */ public Builder mergeLeaveGameRequestMessage(de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage value) { - if (((bitField0_ & 0x00001000) == 0x00001000) && + if (((bitField0_ & 0x00000100) == 0x00000100) && leaveGameRequestMessage_ != de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage.getDefaultInstance()) { leaveGameRequestMessage_ = de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage.newBuilder(leaveGameRequestMessage_).mergeFrom(value).buildPartial(); @@ -58193,35 +58305,96 @@ public final class ProtoBuf { leaveGameRequestMessage_ = value; } - bitField0_ |= 0x00001000; + bitField0_ |= 0x00000100; return this; } /** - * optional .LeaveGameRequestMessage leaveGameRequestMessage = 13; + * optional .LeaveGameRequestMessage leaveGameRequestMessage = 9; */ public Builder clearLeaveGameRequestMessage() { leaveGameRequestMessage_ = de.pokerth.protocol.ProtoBuf.LeaveGameRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00000100); return this; } - // optional .StartEventMessage startEventMessage = 14; - private de.pokerth.protocol.ProtoBuf.StartEventMessage startEventMessage_ = de.pokerth.protocol.ProtoBuf.StartEventMessage.getDefaultInstance(); + // optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + private de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage invitePlayerToGameMessage_ = de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.getDefaultInstance(); /** - * optional .StartEventMessage startEventMessage = 14; + * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; */ - public boolean hasStartEventMessage() { - return ((bitField0_ & 0x00002000) == 0x00002000); + public boolean hasInvitePlayerToGameMessage() { + return ((bitField0_ & 0x00000200) == 0x00000200); } /** - * optional .StartEventMessage startEventMessage = 14; + * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + */ + public de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage getInvitePlayerToGameMessage() { + return invitePlayerToGameMessage_; + } + /** + * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + */ + public Builder setInvitePlayerToGameMessage(de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage value) { + if (value == null) { + throw new NullPointerException(); + } + invitePlayerToGameMessage_ = value; + + bitField0_ |= 0x00000200; + return this; + } + /** + * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + */ + public Builder setInvitePlayerToGameMessage( + de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.Builder builderForValue) { + invitePlayerToGameMessage_ = builderForValue.build(); + + bitField0_ |= 0x00000200; + return this; + } + /** + * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + */ + public Builder mergeInvitePlayerToGameMessage(de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage value) { + if (((bitField0_ & 0x00000200) == 0x00000200) && + invitePlayerToGameMessage_ != de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.getDefaultInstance()) { + invitePlayerToGameMessage_ = + de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.newBuilder(invitePlayerToGameMessage_).mergeFrom(value).buildPartial(); + } else { + invitePlayerToGameMessage_ = value; + } + + bitField0_ |= 0x00000200; + return this; + } + /** + * optional .InvitePlayerToGameMessage invitePlayerToGameMessage = 10; + */ + public Builder clearInvitePlayerToGameMessage() { + invitePlayerToGameMessage_ = de.pokerth.protocol.ProtoBuf.InvitePlayerToGameMessage.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x00000200); + return this; + } + + // optional .StartEventMessage startEventMessage = 11; + private de.pokerth.protocol.ProtoBuf.StartEventMessage startEventMessage_ = de.pokerth.protocol.ProtoBuf.StartEventMessage.getDefaultInstance(); + /** + * optional .StartEventMessage startEventMessage = 11; + */ + public boolean hasStartEventMessage() { + return ((bitField0_ & 0x00000400) == 0x00000400); + } + /** + * optional .StartEventMessage startEventMessage = 11; */ public de.pokerth.protocol.ProtoBuf.StartEventMessage getStartEventMessage() { return startEventMessage_; } /** - * optional .StartEventMessage startEventMessage = 14; + * optional .StartEventMessage startEventMessage = 11; */ public Builder setStartEventMessage(de.pokerth.protocol.ProtoBuf.StartEventMessage value) { if (value == null) { @@ -58229,24 +58402,24 @@ public final class ProtoBuf { } startEventMessage_ = value; - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000400; return this; } /** - * optional .StartEventMessage startEventMessage = 14; + * optional .StartEventMessage startEventMessage = 11; */ public Builder setStartEventMessage( de.pokerth.protocol.ProtoBuf.StartEventMessage.Builder builderForValue) { startEventMessage_ = builderForValue.build(); - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000400; return this; } /** - * optional .StartEventMessage startEventMessage = 14; + * optional .StartEventMessage startEventMessage = 11; */ public Builder mergeStartEventMessage(de.pokerth.protocol.ProtoBuf.StartEventMessage value) { - if (((bitField0_ & 0x00002000) == 0x00002000) && + if (((bitField0_ & 0x00000400) == 0x00000400) && startEventMessage_ != de.pokerth.protocol.ProtoBuf.StartEventMessage.getDefaultInstance()) { startEventMessage_ = de.pokerth.protocol.ProtoBuf.StartEventMessage.newBuilder(startEventMessage_).mergeFrom(value).buildPartial(); @@ -58254,35 +58427,35 @@ public final class ProtoBuf { startEventMessage_ = value; } - bitField0_ |= 0x00002000; + bitField0_ |= 0x00000400; return this; } /** - * optional .StartEventMessage startEventMessage = 14; + * optional .StartEventMessage startEventMessage = 11; */ public Builder clearStartEventMessage() { startEventMessage_ = de.pokerth.protocol.ProtoBuf.StartEventMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00000400); return this; } - // optional .StartEventAckMessage startEventAckMessage = 15; + // optional .StartEventAckMessage startEventAckMessage = 12; private de.pokerth.protocol.ProtoBuf.StartEventAckMessage startEventAckMessage_ = de.pokerth.protocol.ProtoBuf.StartEventAckMessage.getDefaultInstance(); /** - * optional .StartEventAckMessage startEventAckMessage = 15; + * optional .StartEventAckMessage startEventAckMessage = 12; */ public boolean hasStartEventAckMessage() { - return ((bitField0_ & 0x00004000) == 0x00004000); + return ((bitField0_ & 0x00000800) == 0x00000800); } /** - * optional .StartEventAckMessage startEventAckMessage = 15; + * optional .StartEventAckMessage startEventAckMessage = 12; */ public de.pokerth.protocol.ProtoBuf.StartEventAckMessage getStartEventAckMessage() { return startEventAckMessage_; } /** - * optional .StartEventAckMessage startEventAckMessage = 15; + * optional .StartEventAckMessage startEventAckMessage = 12; */ public Builder setStartEventAckMessage(de.pokerth.protocol.ProtoBuf.StartEventAckMessage value) { if (value == null) { @@ -58290,24 +58463,24 @@ public final class ProtoBuf { } startEventAckMessage_ = value; - bitField0_ |= 0x00004000; + bitField0_ |= 0x00000800; return this; } /** - * optional .StartEventAckMessage startEventAckMessage = 15; + * optional .StartEventAckMessage startEventAckMessage = 12; */ public Builder setStartEventAckMessage( de.pokerth.protocol.ProtoBuf.StartEventAckMessage.Builder builderForValue) { startEventAckMessage_ = builderForValue.build(); - bitField0_ |= 0x00004000; + bitField0_ |= 0x00000800; return this; } /** - * optional .StartEventAckMessage startEventAckMessage = 15; + * optional .StartEventAckMessage startEventAckMessage = 12; */ public Builder mergeStartEventAckMessage(de.pokerth.protocol.ProtoBuf.StartEventAckMessage value) { - if (((bitField0_ & 0x00004000) == 0x00004000) && + if (((bitField0_ & 0x00000800) == 0x00000800) && startEventAckMessage_ != de.pokerth.protocol.ProtoBuf.StartEventAckMessage.getDefaultInstance()) { startEventAckMessage_ = de.pokerth.protocol.ProtoBuf.StartEventAckMessage.newBuilder(startEventAckMessage_).mergeFrom(value).buildPartial(); @@ -58315,35 +58488,35 @@ public final class ProtoBuf { startEventAckMessage_ = value; } - bitField0_ |= 0x00004000; + bitField0_ |= 0x00000800; return this; } /** - * optional .StartEventAckMessage startEventAckMessage = 15; + * optional .StartEventAckMessage startEventAckMessage = 12; */ public Builder clearStartEventAckMessage() { startEventAckMessage_ = de.pokerth.protocol.ProtoBuf.StartEventAckMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00004000); + bitField0_ = (bitField0_ & ~0x00000800); return this; } - // optional .GameStartInitialMessage gameStartInitialMessage = 16; + // optional .GameStartInitialMessage gameStartInitialMessage = 13; private de.pokerth.protocol.ProtoBuf.GameStartInitialMessage gameStartInitialMessage_ = de.pokerth.protocol.ProtoBuf.GameStartInitialMessage.getDefaultInstance(); /** - * optional .GameStartInitialMessage gameStartInitialMessage = 16; + * optional .GameStartInitialMessage gameStartInitialMessage = 13; */ public boolean hasGameStartInitialMessage() { - return ((bitField0_ & 0x00008000) == 0x00008000); + return ((bitField0_ & 0x00001000) == 0x00001000); } /** - * optional .GameStartInitialMessage gameStartInitialMessage = 16; + * optional .GameStartInitialMessage gameStartInitialMessage = 13; */ public de.pokerth.protocol.ProtoBuf.GameStartInitialMessage getGameStartInitialMessage() { return gameStartInitialMessage_; } /** - * optional .GameStartInitialMessage gameStartInitialMessage = 16; + * optional .GameStartInitialMessage gameStartInitialMessage = 13; */ public Builder setGameStartInitialMessage(de.pokerth.protocol.ProtoBuf.GameStartInitialMessage value) { if (value == null) { @@ -58351,24 +58524,24 @@ public final class ProtoBuf { } gameStartInitialMessage_ = value; - bitField0_ |= 0x00008000; + bitField0_ |= 0x00001000; return this; } /** - * optional .GameStartInitialMessage gameStartInitialMessage = 16; + * optional .GameStartInitialMessage gameStartInitialMessage = 13; */ public Builder setGameStartInitialMessage( de.pokerth.protocol.ProtoBuf.GameStartInitialMessage.Builder builderForValue) { gameStartInitialMessage_ = builderForValue.build(); - bitField0_ |= 0x00008000; + bitField0_ |= 0x00001000; return this; } /** - * optional .GameStartInitialMessage gameStartInitialMessage = 16; + * optional .GameStartInitialMessage gameStartInitialMessage = 13; */ public Builder mergeGameStartInitialMessage(de.pokerth.protocol.ProtoBuf.GameStartInitialMessage value) { - if (((bitField0_ & 0x00008000) == 0x00008000) && + if (((bitField0_ & 0x00001000) == 0x00001000) && gameStartInitialMessage_ != de.pokerth.protocol.ProtoBuf.GameStartInitialMessage.getDefaultInstance()) { gameStartInitialMessage_ = de.pokerth.protocol.ProtoBuf.GameStartInitialMessage.newBuilder(gameStartInitialMessage_).mergeFrom(value).buildPartial(); @@ -58376,35 +58549,35 @@ public final class ProtoBuf { gameStartInitialMessage_ = value; } - bitField0_ |= 0x00008000; + bitField0_ |= 0x00001000; return this; } /** - * optional .GameStartInitialMessage gameStartInitialMessage = 16; + * optional .GameStartInitialMessage gameStartInitialMessage = 13; */ public Builder clearGameStartInitialMessage() { gameStartInitialMessage_ = de.pokerth.protocol.ProtoBuf.GameStartInitialMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00008000); + bitField0_ = (bitField0_ & ~0x00001000); return this; } - // optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + // optional .GameStartRejoinMessage gameStartRejoinMessage = 14; private de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage gameStartRejoinMessage_ = de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage.getDefaultInstance(); /** - * optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + * optional .GameStartRejoinMessage gameStartRejoinMessage = 14; */ public boolean hasGameStartRejoinMessage() { - return ((bitField0_ & 0x00010000) == 0x00010000); + return ((bitField0_ & 0x00002000) == 0x00002000); } /** - * optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + * optional .GameStartRejoinMessage gameStartRejoinMessage = 14; */ public de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage getGameStartRejoinMessage() { return gameStartRejoinMessage_; } /** - * optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + * optional .GameStartRejoinMessage gameStartRejoinMessage = 14; */ public Builder setGameStartRejoinMessage(de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage value) { if (value == null) { @@ -58412,24 +58585,24 @@ public final class ProtoBuf { } gameStartRejoinMessage_ = value; - bitField0_ |= 0x00010000; + bitField0_ |= 0x00002000; return this; } /** - * optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + * optional .GameStartRejoinMessage gameStartRejoinMessage = 14; */ public Builder setGameStartRejoinMessage( de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage.Builder builderForValue) { gameStartRejoinMessage_ = builderForValue.build(); - bitField0_ |= 0x00010000; + bitField0_ |= 0x00002000; return this; } /** - * optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + * optional .GameStartRejoinMessage gameStartRejoinMessage = 14; */ public Builder mergeGameStartRejoinMessage(de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage value) { - if (((bitField0_ & 0x00010000) == 0x00010000) && + if (((bitField0_ & 0x00002000) == 0x00002000) && gameStartRejoinMessage_ != de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage.getDefaultInstance()) { gameStartRejoinMessage_ = de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage.newBuilder(gameStartRejoinMessage_).mergeFrom(value).buildPartial(); @@ -58437,35 +58610,35 @@ public final class ProtoBuf { gameStartRejoinMessage_ = value; } - bitField0_ |= 0x00010000; + bitField0_ |= 0x00002000; return this; } /** - * optional .GameStartRejoinMessage gameStartRejoinMessage = 17; + * optional .GameStartRejoinMessage gameStartRejoinMessage = 14; */ public Builder clearGameStartRejoinMessage() { gameStartRejoinMessage_ = de.pokerth.protocol.ProtoBuf.GameStartRejoinMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00002000); return this; } - // optional .EndOfGameMessage endOfGameMessage = 18; + // optional .EndOfGameMessage endOfGameMessage = 15; private de.pokerth.protocol.ProtoBuf.EndOfGameMessage endOfGameMessage_ = de.pokerth.protocol.ProtoBuf.EndOfGameMessage.getDefaultInstance(); /** - * optional .EndOfGameMessage endOfGameMessage = 18; + * optional .EndOfGameMessage endOfGameMessage = 15; */ public boolean hasEndOfGameMessage() { - return ((bitField0_ & 0x00020000) == 0x00020000); + return ((bitField0_ & 0x00004000) == 0x00004000); } /** - * optional .EndOfGameMessage endOfGameMessage = 18; + * optional .EndOfGameMessage endOfGameMessage = 15; */ public de.pokerth.protocol.ProtoBuf.EndOfGameMessage getEndOfGameMessage() { return endOfGameMessage_; } /** - * optional .EndOfGameMessage endOfGameMessage = 18; + * optional .EndOfGameMessage endOfGameMessage = 15; */ public Builder setEndOfGameMessage(de.pokerth.protocol.ProtoBuf.EndOfGameMessage value) { if (value == null) { @@ -58473,24 +58646,24 @@ public final class ProtoBuf { } endOfGameMessage_ = value; - bitField0_ |= 0x00020000; + bitField0_ |= 0x00004000; return this; } /** - * optional .EndOfGameMessage endOfGameMessage = 18; + * optional .EndOfGameMessage endOfGameMessage = 15; */ public Builder setEndOfGameMessage( de.pokerth.protocol.ProtoBuf.EndOfGameMessage.Builder builderForValue) { endOfGameMessage_ = builderForValue.build(); - bitField0_ |= 0x00020000; + bitField0_ |= 0x00004000; return this; } /** - * optional .EndOfGameMessage endOfGameMessage = 18; + * optional .EndOfGameMessage endOfGameMessage = 15; */ public Builder mergeEndOfGameMessage(de.pokerth.protocol.ProtoBuf.EndOfGameMessage value) { - if (((bitField0_ & 0x00020000) == 0x00020000) && + if (((bitField0_ & 0x00004000) == 0x00004000) && endOfGameMessage_ != de.pokerth.protocol.ProtoBuf.EndOfGameMessage.getDefaultInstance()) { endOfGameMessage_ = de.pokerth.protocol.ProtoBuf.EndOfGameMessage.newBuilder(endOfGameMessage_).mergeFrom(value).buildPartial(); @@ -58498,35 +58671,35 @@ public final class ProtoBuf { endOfGameMessage_ = value; } - bitField0_ |= 0x00020000; + bitField0_ |= 0x00004000; return this; } /** - * optional .EndOfGameMessage endOfGameMessage = 18; + * optional .EndOfGameMessage endOfGameMessage = 15; */ public Builder clearEndOfGameMessage() { endOfGameMessage_ = de.pokerth.protocol.ProtoBuf.EndOfGameMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00020000); + bitField0_ = (bitField0_ & ~0x00004000); return this; } - // optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + // optional .PlayerIdChangedMessage playerIdChangedMessage = 16; private de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage playerIdChangedMessage_ = de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage.getDefaultInstance(); /** - * optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + * optional .PlayerIdChangedMessage playerIdChangedMessage = 16; */ public boolean hasPlayerIdChangedMessage() { - return ((bitField0_ & 0x00040000) == 0x00040000); + return ((bitField0_ & 0x00008000) == 0x00008000); } /** - * optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + * optional .PlayerIdChangedMessage playerIdChangedMessage = 16; */ public de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage getPlayerIdChangedMessage() { return playerIdChangedMessage_; } /** - * optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + * optional .PlayerIdChangedMessage playerIdChangedMessage = 16; */ public Builder setPlayerIdChangedMessage(de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage value) { if (value == null) { @@ -58534,24 +58707,24 @@ public final class ProtoBuf { } playerIdChangedMessage_ = value; - bitField0_ |= 0x00040000; + bitField0_ |= 0x00008000; return this; } /** - * optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + * optional .PlayerIdChangedMessage playerIdChangedMessage = 16; */ public Builder setPlayerIdChangedMessage( de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage.Builder builderForValue) { playerIdChangedMessage_ = builderForValue.build(); - bitField0_ |= 0x00040000; + bitField0_ |= 0x00008000; return this; } /** - * optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + * optional .PlayerIdChangedMessage playerIdChangedMessage = 16; */ public Builder mergePlayerIdChangedMessage(de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage value) { - if (((bitField0_ & 0x00040000) == 0x00040000) && + if (((bitField0_ & 0x00008000) == 0x00008000) && playerIdChangedMessage_ != de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage.getDefaultInstance()) { playerIdChangedMessage_ = de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage.newBuilder(playerIdChangedMessage_).mergeFrom(value).buildPartial(); @@ -58559,35 +58732,35 @@ public final class ProtoBuf { playerIdChangedMessage_ = value; } - bitField0_ |= 0x00040000; + bitField0_ |= 0x00008000; return this; } /** - * optional .PlayerIdChangedMessage playerIdChangedMessage = 19; + * optional .PlayerIdChangedMessage playerIdChangedMessage = 16; */ public Builder clearPlayerIdChangedMessage() { playerIdChangedMessage_ = de.pokerth.protocol.ProtoBuf.PlayerIdChangedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00040000); + bitField0_ = (bitField0_ & ~0x00008000); return this; } - // optional .AskKickPlayerMessage askKickPlayerMessage = 20; + // optional .AskKickPlayerMessage askKickPlayerMessage = 17; private de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage askKickPlayerMessage_ = de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage.getDefaultInstance(); /** - * optional .AskKickPlayerMessage askKickPlayerMessage = 20; + * optional .AskKickPlayerMessage askKickPlayerMessage = 17; */ public boolean hasAskKickPlayerMessage() { - return ((bitField0_ & 0x00080000) == 0x00080000); + return ((bitField0_ & 0x00010000) == 0x00010000); } /** - * optional .AskKickPlayerMessage askKickPlayerMessage = 20; + * optional .AskKickPlayerMessage askKickPlayerMessage = 17; */ public de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage getAskKickPlayerMessage() { return askKickPlayerMessage_; } /** - * optional .AskKickPlayerMessage askKickPlayerMessage = 20; + * optional .AskKickPlayerMessage askKickPlayerMessage = 17; */ public Builder setAskKickPlayerMessage(de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage value) { if (value == null) { @@ -58595,24 +58768,24 @@ public final class ProtoBuf { } askKickPlayerMessage_ = value; - bitField0_ |= 0x00080000; + bitField0_ |= 0x00010000; return this; } /** - * optional .AskKickPlayerMessage askKickPlayerMessage = 20; + * optional .AskKickPlayerMessage askKickPlayerMessage = 17; */ public Builder setAskKickPlayerMessage( de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage.Builder builderForValue) { askKickPlayerMessage_ = builderForValue.build(); - bitField0_ |= 0x00080000; + bitField0_ |= 0x00010000; return this; } /** - * optional .AskKickPlayerMessage askKickPlayerMessage = 20; + * optional .AskKickPlayerMessage askKickPlayerMessage = 17; */ public Builder mergeAskKickPlayerMessage(de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage value) { - if (((bitField0_ & 0x00080000) == 0x00080000) && + if (((bitField0_ & 0x00010000) == 0x00010000) && askKickPlayerMessage_ != de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage.getDefaultInstance()) { askKickPlayerMessage_ = de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage.newBuilder(askKickPlayerMessage_).mergeFrom(value).buildPartial(); @@ -58620,35 +58793,35 @@ public final class ProtoBuf { askKickPlayerMessage_ = value; } - bitField0_ |= 0x00080000; + bitField0_ |= 0x00010000; return this; } /** - * optional .AskKickPlayerMessage askKickPlayerMessage = 20; + * optional .AskKickPlayerMessage askKickPlayerMessage = 17; */ public Builder clearAskKickPlayerMessage() { askKickPlayerMessage_ = de.pokerth.protocol.ProtoBuf.AskKickPlayerMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00080000); + bitField0_ = (bitField0_ & ~0x00010000); return this; } - // optional .AskKickDeniedMessage askKickDeniedMessage = 21; + // optional .AskKickDeniedMessage askKickDeniedMessage = 18; private de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage askKickDeniedMessage_ = de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage.getDefaultInstance(); /** - * optional .AskKickDeniedMessage askKickDeniedMessage = 21; + * optional .AskKickDeniedMessage askKickDeniedMessage = 18; */ public boolean hasAskKickDeniedMessage() { - return ((bitField0_ & 0x00100000) == 0x00100000); + return ((bitField0_ & 0x00020000) == 0x00020000); } /** - * optional .AskKickDeniedMessage askKickDeniedMessage = 21; + * optional .AskKickDeniedMessage askKickDeniedMessage = 18; */ public de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage getAskKickDeniedMessage() { return askKickDeniedMessage_; } /** - * optional .AskKickDeniedMessage askKickDeniedMessage = 21; + * optional .AskKickDeniedMessage askKickDeniedMessage = 18; */ public Builder setAskKickDeniedMessage(de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage value) { if (value == null) { @@ -58656,24 +58829,24 @@ public final class ProtoBuf { } askKickDeniedMessage_ = value; - bitField0_ |= 0x00100000; + bitField0_ |= 0x00020000; return this; } /** - * optional .AskKickDeniedMessage askKickDeniedMessage = 21; + * optional .AskKickDeniedMessage askKickDeniedMessage = 18; */ public Builder setAskKickDeniedMessage( de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage.Builder builderForValue) { askKickDeniedMessage_ = builderForValue.build(); - bitField0_ |= 0x00100000; + bitField0_ |= 0x00020000; return this; } /** - * optional .AskKickDeniedMessage askKickDeniedMessage = 21; + * optional .AskKickDeniedMessage askKickDeniedMessage = 18; */ public Builder mergeAskKickDeniedMessage(de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage value) { - if (((bitField0_ & 0x00100000) == 0x00100000) && + if (((bitField0_ & 0x00020000) == 0x00020000) && askKickDeniedMessage_ != de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage.getDefaultInstance()) { askKickDeniedMessage_ = de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage.newBuilder(askKickDeniedMessage_).mergeFrom(value).buildPartial(); @@ -58681,35 +58854,35 @@ public final class ProtoBuf { askKickDeniedMessage_ = value; } - bitField0_ |= 0x00100000; + bitField0_ |= 0x00020000; return this; } /** - * optional .AskKickDeniedMessage askKickDeniedMessage = 21; + * optional .AskKickDeniedMessage askKickDeniedMessage = 18; */ public Builder clearAskKickDeniedMessage() { askKickDeniedMessage_ = de.pokerth.protocol.ProtoBuf.AskKickDeniedMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00100000); + bitField0_ = (bitField0_ & ~0x00020000); return this; } - // optional .StartKickPetitionMessage startKickPetitionMessage = 22; + // optional .StartKickPetitionMessage startKickPetitionMessage = 19; private de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage startKickPetitionMessage_ = de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage.getDefaultInstance(); /** - * optional .StartKickPetitionMessage startKickPetitionMessage = 22; + * optional .StartKickPetitionMessage startKickPetitionMessage = 19; */ public boolean hasStartKickPetitionMessage() { - return ((bitField0_ & 0x00200000) == 0x00200000); + return ((bitField0_ & 0x00040000) == 0x00040000); } /** - * optional .StartKickPetitionMessage startKickPetitionMessage = 22; + * optional .StartKickPetitionMessage startKickPetitionMessage = 19; */ public de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage getStartKickPetitionMessage() { return startKickPetitionMessage_; } /** - * optional .StartKickPetitionMessage startKickPetitionMessage = 22; + * optional .StartKickPetitionMessage startKickPetitionMessage = 19; */ public Builder setStartKickPetitionMessage(de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage value) { if (value == null) { @@ -58717,24 +58890,24 @@ public final class ProtoBuf { } startKickPetitionMessage_ = value; - bitField0_ |= 0x00200000; + bitField0_ |= 0x00040000; return this; } /** - * optional .StartKickPetitionMessage startKickPetitionMessage = 22; + * optional .StartKickPetitionMessage startKickPetitionMessage = 19; */ public Builder setStartKickPetitionMessage( de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage.Builder builderForValue) { startKickPetitionMessage_ = builderForValue.build(); - bitField0_ |= 0x00200000; + bitField0_ |= 0x00040000; return this; } /** - * optional .StartKickPetitionMessage startKickPetitionMessage = 22; + * optional .StartKickPetitionMessage startKickPetitionMessage = 19; */ public Builder mergeStartKickPetitionMessage(de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage value) { - if (((bitField0_ & 0x00200000) == 0x00200000) && + if (((bitField0_ & 0x00040000) == 0x00040000) && startKickPetitionMessage_ != de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage.getDefaultInstance()) { startKickPetitionMessage_ = de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage.newBuilder(startKickPetitionMessage_).mergeFrom(value).buildPartial(); @@ -58742,35 +58915,35 @@ public final class ProtoBuf { startKickPetitionMessage_ = value; } - bitField0_ |= 0x00200000; + bitField0_ |= 0x00040000; return this; } /** - * optional .StartKickPetitionMessage startKickPetitionMessage = 22; + * optional .StartKickPetitionMessage startKickPetitionMessage = 19; */ public Builder clearStartKickPetitionMessage() { startKickPetitionMessage_ = de.pokerth.protocol.ProtoBuf.StartKickPetitionMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00200000); + bitField0_ = (bitField0_ & ~0x00040000); return this; } - // optional .VoteKickRequestMessage voteKickRequestMessage = 23; + // optional .VoteKickRequestMessage voteKickRequestMessage = 20; private de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage voteKickRequestMessage_ = de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage.getDefaultInstance(); /** - * optional .VoteKickRequestMessage voteKickRequestMessage = 23; + * optional .VoteKickRequestMessage voteKickRequestMessage = 20; */ public boolean hasVoteKickRequestMessage() { - return ((bitField0_ & 0x00400000) == 0x00400000); + return ((bitField0_ & 0x00080000) == 0x00080000); } /** - * optional .VoteKickRequestMessage voteKickRequestMessage = 23; + * optional .VoteKickRequestMessage voteKickRequestMessage = 20; */ public de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage getVoteKickRequestMessage() { return voteKickRequestMessage_; } /** - * optional .VoteKickRequestMessage voteKickRequestMessage = 23; + * optional .VoteKickRequestMessage voteKickRequestMessage = 20; */ public Builder setVoteKickRequestMessage(de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage value) { if (value == null) { @@ -58778,24 +58951,24 @@ public final class ProtoBuf { } voteKickRequestMessage_ = value; - bitField0_ |= 0x00400000; + bitField0_ |= 0x00080000; return this; } /** - * optional .VoteKickRequestMessage voteKickRequestMessage = 23; + * optional .VoteKickRequestMessage voteKickRequestMessage = 20; */ public Builder setVoteKickRequestMessage( de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage.Builder builderForValue) { voteKickRequestMessage_ = builderForValue.build(); - bitField0_ |= 0x00400000; + bitField0_ |= 0x00080000; return this; } /** - * optional .VoteKickRequestMessage voteKickRequestMessage = 23; + * optional .VoteKickRequestMessage voteKickRequestMessage = 20; */ public Builder mergeVoteKickRequestMessage(de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage value) { - if (((bitField0_ & 0x00400000) == 0x00400000) && + if (((bitField0_ & 0x00080000) == 0x00080000) && voteKickRequestMessage_ != de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage.getDefaultInstance()) { voteKickRequestMessage_ = de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage.newBuilder(voteKickRequestMessage_).mergeFrom(value).buildPartial(); @@ -58803,35 +58976,35 @@ public final class ProtoBuf { voteKickRequestMessage_ = value; } - bitField0_ |= 0x00400000; + bitField0_ |= 0x00080000; return this; } /** - * optional .VoteKickRequestMessage voteKickRequestMessage = 23; + * optional .VoteKickRequestMessage voteKickRequestMessage = 20; */ public Builder clearVoteKickRequestMessage() { voteKickRequestMessage_ = de.pokerth.protocol.ProtoBuf.VoteKickRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00400000); + bitField0_ = (bitField0_ & ~0x00080000); return this; } - // optional .VoteKickReplyMessage voteKickReplyMessage = 24; + // optional .VoteKickReplyMessage voteKickReplyMessage = 21; private de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage voteKickReplyMessage_ = de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage.getDefaultInstance(); /** - * optional .VoteKickReplyMessage voteKickReplyMessage = 24; + * optional .VoteKickReplyMessage voteKickReplyMessage = 21; */ public boolean hasVoteKickReplyMessage() { - return ((bitField0_ & 0x00800000) == 0x00800000); + return ((bitField0_ & 0x00100000) == 0x00100000); } /** - * optional .VoteKickReplyMessage voteKickReplyMessage = 24; + * optional .VoteKickReplyMessage voteKickReplyMessage = 21; */ public de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage getVoteKickReplyMessage() { return voteKickReplyMessage_; } /** - * optional .VoteKickReplyMessage voteKickReplyMessage = 24; + * optional .VoteKickReplyMessage voteKickReplyMessage = 21; */ public Builder setVoteKickReplyMessage(de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage value) { if (value == null) { @@ -58839,24 +59012,24 @@ public final class ProtoBuf { } voteKickReplyMessage_ = value; - bitField0_ |= 0x00800000; + bitField0_ |= 0x00100000; return this; } /** - * optional .VoteKickReplyMessage voteKickReplyMessage = 24; + * optional .VoteKickReplyMessage voteKickReplyMessage = 21; */ public Builder setVoteKickReplyMessage( de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage.Builder builderForValue) { voteKickReplyMessage_ = builderForValue.build(); - bitField0_ |= 0x00800000; + bitField0_ |= 0x00100000; return this; } /** - * optional .VoteKickReplyMessage voteKickReplyMessage = 24; + * optional .VoteKickReplyMessage voteKickReplyMessage = 21; */ public Builder mergeVoteKickReplyMessage(de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage value) { - if (((bitField0_ & 0x00800000) == 0x00800000) && + if (((bitField0_ & 0x00100000) == 0x00100000) && voteKickReplyMessage_ != de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage.getDefaultInstance()) { voteKickReplyMessage_ = de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage.newBuilder(voteKickReplyMessage_).mergeFrom(value).buildPartial(); @@ -58864,35 +59037,35 @@ public final class ProtoBuf { voteKickReplyMessage_ = value; } - bitField0_ |= 0x00800000; + bitField0_ |= 0x00100000; return this; } /** - * optional .VoteKickReplyMessage voteKickReplyMessage = 24; + * optional .VoteKickReplyMessage voteKickReplyMessage = 21; */ public Builder clearVoteKickReplyMessage() { voteKickReplyMessage_ = de.pokerth.protocol.ProtoBuf.VoteKickReplyMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x00800000); + bitField0_ = (bitField0_ & ~0x00100000); return this; } - // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + // optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; private de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage kickPetitionUpdateMessage_ = de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage.getDefaultInstance(); /** - * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; */ public boolean hasKickPetitionUpdateMessage() { - return ((bitField0_ & 0x01000000) == 0x01000000); + return ((bitField0_ & 0x00200000) == 0x00200000); } /** - * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; */ public de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage getKickPetitionUpdateMessage() { return kickPetitionUpdateMessage_; } /** - * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; */ public Builder setKickPetitionUpdateMessage(de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage value) { if (value == null) { @@ -58900,24 +59073,24 @@ public final class ProtoBuf { } kickPetitionUpdateMessage_ = value; - bitField0_ |= 0x01000000; + bitField0_ |= 0x00200000; return this; } /** - * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; */ public Builder setKickPetitionUpdateMessage( de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage.Builder builderForValue) { kickPetitionUpdateMessage_ = builderForValue.build(); - bitField0_ |= 0x01000000; + bitField0_ |= 0x00200000; return this; } /** - * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; */ public Builder mergeKickPetitionUpdateMessage(de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage value) { - if (((bitField0_ & 0x01000000) == 0x01000000) && + if (((bitField0_ & 0x00200000) == 0x00200000) && kickPetitionUpdateMessage_ != de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage.getDefaultInstance()) { kickPetitionUpdateMessage_ = de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage.newBuilder(kickPetitionUpdateMessage_).mergeFrom(value).buildPartial(); @@ -58925,35 +59098,35 @@ public final class ProtoBuf { kickPetitionUpdateMessage_ = value; } - bitField0_ |= 0x01000000; + bitField0_ |= 0x00200000; return this; } /** - * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 25; + * optional .KickPetitionUpdateMessage kickPetitionUpdateMessage = 22; */ public Builder clearKickPetitionUpdateMessage() { kickPetitionUpdateMessage_ = de.pokerth.protocol.ProtoBuf.KickPetitionUpdateMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x01000000); + bitField0_ = (bitField0_ & ~0x00200000); return this; } - // optional .EndKickPetitionMessage endKickPetitionMessage = 26; + // optional .EndKickPetitionMessage endKickPetitionMessage = 23; private de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage endKickPetitionMessage_ = de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage.getDefaultInstance(); /** - * optional .EndKickPetitionMessage endKickPetitionMessage = 26; + * optional .EndKickPetitionMessage endKickPetitionMessage = 23; */ public boolean hasEndKickPetitionMessage() { - return ((bitField0_ & 0x02000000) == 0x02000000); + return ((bitField0_ & 0x00400000) == 0x00400000); } /** - * optional .EndKickPetitionMessage endKickPetitionMessage = 26; + * optional .EndKickPetitionMessage endKickPetitionMessage = 23; */ public de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage getEndKickPetitionMessage() { return endKickPetitionMessage_; } /** - * optional .EndKickPetitionMessage endKickPetitionMessage = 26; + * optional .EndKickPetitionMessage endKickPetitionMessage = 23; */ public Builder setEndKickPetitionMessage(de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage value) { if (value == null) { @@ -58961,24 +59134,24 @@ public final class ProtoBuf { } endKickPetitionMessage_ = value; - bitField0_ |= 0x02000000; + bitField0_ |= 0x00400000; return this; } /** - * optional .EndKickPetitionMessage endKickPetitionMessage = 26; + * optional .EndKickPetitionMessage endKickPetitionMessage = 23; */ public Builder setEndKickPetitionMessage( de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage.Builder builderForValue) { endKickPetitionMessage_ = builderForValue.build(); - bitField0_ |= 0x02000000; + bitField0_ |= 0x00400000; return this; } /** - * optional .EndKickPetitionMessage endKickPetitionMessage = 26; + * optional .EndKickPetitionMessage endKickPetitionMessage = 23; */ public Builder mergeEndKickPetitionMessage(de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage value) { - if (((bitField0_ & 0x02000000) == 0x02000000) && + if (((bitField0_ & 0x00400000) == 0x00400000) && endKickPetitionMessage_ != de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage.getDefaultInstance()) { endKickPetitionMessage_ = de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage.newBuilder(endKickPetitionMessage_).mergeFrom(value).buildPartial(); @@ -58986,35 +59159,35 @@ public final class ProtoBuf { endKickPetitionMessage_ = value; } - bitField0_ |= 0x02000000; + bitField0_ |= 0x00400000; return this; } /** - * optional .EndKickPetitionMessage endKickPetitionMessage = 26; + * optional .EndKickPetitionMessage endKickPetitionMessage = 23; */ public Builder clearEndKickPetitionMessage() { endKickPetitionMessage_ = de.pokerth.protocol.ProtoBuf.EndKickPetitionMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x02000000); + bitField0_ = (bitField0_ & ~0x00400000); return this; } - // optional .ChatRequestMessage chatRequestMessage = 27; + // optional .ChatRequestMessage chatRequestMessage = 24; private de.pokerth.protocol.ProtoBuf.ChatRequestMessage chatRequestMessage_ = de.pokerth.protocol.ProtoBuf.ChatRequestMessage.getDefaultInstance(); /** - * optional .ChatRequestMessage chatRequestMessage = 27; + * optional .ChatRequestMessage chatRequestMessage = 24; */ public boolean hasChatRequestMessage() { - return ((bitField0_ & 0x04000000) == 0x04000000); + return ((bitField0_ & 0x00800000) == 0x00800000); } /** - * optional .ChatRequestMessage chatRequestMessage = 27; + * optional .ChatRequestMessage chatRequestMessage = 24; */ public de.pokerth.protocol.ProtoBuf.ChatRequestMessage getChatRequestMessage() { return chatRequestMessage_; } /** - * optional .ChatRequestMessage chatRequestMessage = 27; + * optional .ChatRequestMessage chatRequestMessage = 24; */ public Builder setChatRequestMessage(de.pokerth.protocol.ProtoBuf.ChatRequestMessage value) { if (value == null) { @@ -59022,24 +59195,24 @@ public final class ProtoBuf { } chatRequestMessage_ = value; - bitField0_ |= 0x04000000; + bitField0_ |= 0x00800000; return this; } /** - * optional .ChatRequestMessage chatRequestMessage = 27; + * optional .ChatRequestMessage chatRequestMessage = 24; */ public Builder setChatRequestMessage( de.pokerth.protocol.ProtoBuf.ChatRequestMessage.Builder builderForValue) { chatRequestMessage_ = builderForValue.build(); - bitField0_ |= 0x04000000; + bitField0_ |= 0x00800000; return this; } /** - * optional .ChatRequestMessage chatRequestMessage = 27; + * optional .ChatRequestMessage chatRequestMessage = 24; */ public Builder mergeChatRequestMessage(de.pokerth.protocol.ProtoBuf.ChatRequestMessage value) { - if (((bitField0_ & 0x04000000) == 0x04000000) && + if (((bitField0_ & 0x00800000) == 0x00800000) && chatRequestMessage_ != de.pokerth.protocol.ProtoBuf.ChatRequestMessage.getDefaultInstance()) { chatRequestMessage_ = de.pokerth.protocol.ProtoBuf.ChatRequestMessage.newBuilder(chatRequestMessage_).mergeFrom(value).buildPartial(); @@ -59047,35 +59220,35 @@ public final class ProtoBuf { chatRequestMessage_ = value; } - bitField0_ |= 0x04000000; + bitField0_ |= 0x00800000; return this; } /** - * optional .ChatRequestMessage chatRequestMessage = 27; + * optional .ChatRequestMessage chatRequestMessage = 24; */ public Builder clearChatRequestMessage() { chatRequestMessage_ = de.pokerth.protocol.ProtoBuf.ChatRequestMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x04000000); + bitField0_ = (bitField0_ & ~0x00800000); return this; } - // optional .ChatMessage chatMessage = 28; + // optional .ChatMessage chatMessage = 25; private de.pokerth.protocol.ProtoBuf.ChatMessage chatMessage_ = de.pokerth.protocol.ProtoBuf.ChatMessage.getDefaultInstance(); /** - * optional .ChatMessage chatMessage = 28; + * optional .ChatMessage chatMessage = 25; */ public boolean hasChatMessage() { - return ((bitField0_ & 0x08000000) == 0x08000000); + return ((bitField0_ & 0x01000000) == 0x01000000); } /** - * optional .ChatMessage chatMessage = 28; + * optional .ChatMessage chatMessage = 25; */ public de.pokerth.protocol.ProtoBuf.ChatMessage getChatMessage() { return chatMessage_; } /** - * optional .ChatMessage chatMessage = 28; + * optional .ChatMessage chatMessage = 25; */ public Builder setChatMessage(de.pokerth.protocol.ProtoBuf.ChatMessage value) { if (value == null) { @@ -59083,24 +59256,24 @@ public final class ProtoBuf { } chatMessage_ = value; - bitField0_ |= 0x08000000; + bitField0_ |= 0x01000000; return this; } /** - * optional .ChatMessage chatMessage = 28; + * optional .ChatMessage chatMessage = 25; */ public Builder setChatMessage( de.pokerth.protocol.ProtoBuf.ChatMessage.Builder builderForValue) { chatMessage_ = builderForValue.build(); - bitField0_ |= 0x08000000; + bitField0_ |= 0x01000000; return this; } /** - * optional .ChatMessage chatMessage = 28; + * optional .ChatMessage chatMessage = 25; */ public Builder mergeChatMessage(de.pokerth.protocol.ProtoBuf.ChatMessage value) { - if (((bitField0_ & 0x08000000) == 0x08000000) && + if (((bitField0_ & 0x01000000) == 0x01000000) && chatMessage_ != de.pokerth.protocol.ProtoBuf.ChatMessage.getDefaultInstance()) { chatMessage_ = de.pokerth.protocol.ProtoBuf.ChatMessage.newBuilder(chatMessage_).mergeFrom(value).buildPartial(); @@ -59108,35 +59281,35 @@ public final class ProtoBuf { chatMessage_ = value; } - bitField0_ |= 0x08000000; + bitField0_ |= 0x01000000; return this; } /** - * optional .ChatMessage chatMessage = 28; + * optional .ChatMessage chatMessage = 25; */ public Builder clearChatMessage() { chatMessage_ = de.pokerth.protocol.ProtoBuf.ChatMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x08000000); + bitField0_ = (bitField0_ & ~0x01000000); return this; } - // optional .ChatRejectMessage chatRejectMessage = 29; + // optional .ChatRejectMessage chatRejectMessage = 26; private de.pokerth.protocol.ProtoBuf.ChatRejectMessage chatRejectMessage_ = de.pokerth.protocol.ProtoBuf.ChatRejectMessage.getDefaultInstance(); /** - * optional .ChatRejectMessage chatRejectMessage = 29; + * optional .ChatRejectMessage chatRejectMessage = 26; */ public boolean hasChatRejectMessage() { - return ((bitField0_ & 0x10000000) == 0x10000000); + return ((bitField0_ & 0x02000000) == 0x02000000); } /** - * optional .ChatRejectMessage chatRejectMessage = 29; + * optional .ChatRejectMessage chatRejectMessage = 26; */ public de.pokerth.protocol.ProtoBuf.ChatRejectMessage getChatRejectMessage() { return chatRejectMessage_; } /** - * optional .ChatRejectMessage chatRejectMessage = 29; + * optional .ChatRejectMessage chatRejectMessage = 26; */ public Builder setChatRejectMessage(de.pokerth.protocol.ProtoBuf.ChatRejectMessage value) { if (value == null) { @@ -59144,24 +59317,24 @@ public final class ProtoBuf { } chatRejectMessage_ = value; - bitField0_ |= 0x10000000; + bitField0_ |= 0x02000000; return this; } /** - * optional .ChatRejectMessage chatRejectMessage = 29; + * optional .ChatRejectMessage chatRejectMessage = 26; */ public Builder setChatRejectMessage( de.pokerth.protocol.ProtoBuf.ChatRejectMessage.Builder builderForValue) { chatRejectMessage_ = builderForValue.build(); - bitField0_ |= 0x10000000; + bitField0_ |= 0x02000000; return this; } /** - * optional .ChatRejectMessage chatRejectMessage = 29; + * optional .ChatRejectMessage chatRejectMessage = 26; */ public Builder mergeChatRejectMessage(de.pokerth.protocol.ProtoBuf.ChatRejectMessage value) { - if (((bitField0_ & 0x10000000) == 0x10000000) && + if (((bitField0_ & 0x02000000) == 0x02000000) && chatRejectMessage_ != de.pokerth.protocol.ProtoBuf.ChatRejectMessage.getDefaultInstance()) { chatRejectMessage_ = de.pokerth.protocol.ProtoBuf.ChatRejectMessage.newBuilder(chatRejectMessage_).mergeFrom(value).buildPartial(); @@ -59169,16 +59342,138 @@ public final class ProtoBuf { chatRejectMessage_ = value; } - bitField0_ |= 0x10000000; + bitField0_ |= 0x02000000; return this; } /** - * optional .ChatRejectMessage chatRejectMessage = 29; + * optional .ChatRejectMessage chatRejectMessage = 26; */ public Builder clearChatRejectMessage() { chatRejectMessage_ = de.pokerth.protocol.ProtoBuf.ChatRejectMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x10000000); + bitField0_ = (bitField0_ & ~0x02000000); + return this; + } + + // optional .TimeoutWarningMessage timeoutWarningMessage = 27; + private de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage timeoutWarningMessage_ = de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.getDefaultInstance(); + /** + * optional .TimeoutWarningMessage timeoutWarningMessage = 27; + */ + public boolean hasTimeoutWarningMessage() { + return ((bitField0_ & 0x04000000) == 0x04000000); + } + /** + * optional .TimeoutWarningMessage timeoutWarningMessage = 27; + */ + public de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage getTimeoutWarningMessage() { + return timeoutWarningMessage_; + } + /** + * optional .TimeoutWarningMessage timeoutWarningMessage = 27; + */ + public Builder setTimeoutWarningMessage(de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage value) { + if (value == null) { + throw new NullPointerException(); + } + timeoutWarningMessage_ = value; + + bitField0_ |= 0x04000000; + return this; + } + /** + * optional .TimeoutWarningMessage timeoutWarningMessage = 27; + */ + public Builder setTimeoutWarningMessage( + de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.Builder builderForValue) { + timeoutWarningMessage_ = builderForValue.build(); + + bitField0_ |= 0x04000000; + return this; + } + /** + * optional .TimeoutWarningMessage timeoutWarningMessage = 27; + */ + public Builder mergeTimeoutWarningMessage(de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage value) { + if (((bitField0_ & 0x04000000) == 0x04000000) && + timeoutWarningMessage_ != de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.getDefaultInstance()) { + timeoutWarningMessage_ = + de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.newBuilder(timeoutWarningMessage_).mergeFrom(value).buildPartial(); + } else { + timeoutWarningMessage_ = value; + } + + bitField0_ |= 0x04000000; + return this; + } + /** + * optional .TimeoutWarningMessage timeoutWarningMessage = 27; + */ + public Builder clearTimeoutWarningMessage() { + timeoutWarningMessage_ = de.pokerth.protocol.ProtoBuf.TimeoutWarningMessage.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x04000000); + return this; + } + + // optional .ResetTimeoutMessage resetTimeoutMessage = 28; + private de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage resetTimeoutMessage_ = de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.getDefaultInstance(); + /** + * optional .ResetTimeoutMessage resetTimeoutMessage = 28; + */ + public boolean hasResetTimeoutMessage() { + return ((bitField0_ & 0x08000000) == 0x08000000); + } + /** + * optional .ResetTimeoutMessage resetTimeoutMessage = 28; + */ + public de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage getResetTimeoutMessage() { + return resetTimeoutMessage_; + } + /** + * optional .ResetTimeoutMessage resetTimeoutMessage = 28; + */ + public Builder setResetTimeoutMessage(de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage value) { + if (value == null) { + throw new NullPointerException(); + } + resetTimeoutMessage_ = value; + + bitField0_ |= 0x08000000; + return this; + } + /** + * optional .ResetTimeoutMessage resetTimeoutMessage = 28; + */ + public Builder setResetTimeoutMessage( + de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.Builder builderForValue) { + resetTimeoutMessage_ = builderForValue.build(); + + bitField0_ |= 0x08000000; + return this; + } + /** + * optional .ResetTimeoutMessage resetTimeoutMessage = 28; + */ + public Builder mergeResetTimeoutMessage(de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage value) { + if (((bitField0_ & 0x08000000) == 0x08000000) && + resetTimeoutMessage_ != de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.getDefaultInstance()) { + resetTimeoutMessage_ = + de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.newBuilder(resetTimeoutMessage_).mergeFrom(value).buildPartial(); + } else { + resetTimeoutMessage_ = value; + } + + bitField0_ |= 0x08000000; + return this; + } + /** + * optional .ResetTimeoutMessage resetTimeoutMessage = 28; + */ + public Builder clearResetTimeoutMessage() { + resetTimeoutMessage_ = de.pokerth.protocol.ProtoBuf.ResetTimeoutMessage.getDefaultInstance(); + + bitField0_ = (bitField0_ & ~0x08000000); return this; } @@ -59188,7 +59483,7 @@ public final class ProtoBuf { * optional .ErrorMessage errorMessage = 1025; */ public boolean hasErrorMessage() { - return ((bitField0_ & 0x20000000) == 0x20000000); + return ((bitField0_ & 0x10000000) == 0x10000000); } /** * optional .ErrorMessage errorMessage = 1025; @@ -59205,7 +59500,7 @@ public final class ProtoBuf { } errorMessage_ = value; - bitField0_ |= 0x20000000; + bitField0_ |= 0x10000000; return this; } /** @@ -59215,14 +59510,14 @@ public final class ProtoBuf { de.pokerth.protocol.ProtoBuf.ErrorMessage.Builder builderForValue) { errorMessage_ = builderForValue.build(); - bitField0_ |= 0x20000000; + bitField0_ |= 0x10000000; return this; } /** * optional .ErrorMessage errorMessage = 1025; */ public Builder mergeErrorMessage(de.pokerth.protocol.ProtoBuf.ErrorMessage value) { - if (((bitField0_ & 0x20000000) == 0x20000000) && + if (((bitField0_ & 0x10000000) == 0x10000000) && errorMessage_ != de.pokerth.protocol.ProtoBuf.ErrorMessage.getDefaultInstance()) { errorMessage_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.newBuilder(errorMessage_).mergeFrom(value).buildPartial(); @@ -59230,7 +59525,7 @@ public final class ProtoBuf { errorMessage_ = value; } - bitField0_ |= 0x20000000; + bitField0_ |= 0x10000000; return this; } /** @@ -59239,7 +59534,7 @@ public final class ProtoBuf { public Builder clearErrorMessage() { errorMessage_ = de.pokerth.protocol.ProtoBuf.ErrorMessage.getDefaultInstance(); - bitField0_ = (bitField0_ & ~0x20000000); + bitField0_ = (bitField0_ & ~0x10000000); return this; }