diff --git a/docs/pokerth.asn1 b/docs/pokerth.asn1 index 558efd8f..9b37865b 100644 --- a/docs/pokerth.asn1 +++ b/docs/pokerth.asn1 @@ -60,6 +60,7 @@ PokerTHMessage ::= CHOICE { showMyCardsRequestMessage ShowMyCardsRequestMessage, afterHandShowCardsMessage AfterHandShowCardsMessage, endOfGameMessage EndOfGameMessage, + playerIdChangedMessage PlayerIdChangedMessage, askKickPlayerMessage AskKickPlayerMessage, askKickDeniedMessage AskKickDeniedMessage, startKickPetitionMessage StartKickPetitionMessage, @@ -97,6 +98,7 @@ InitMessage ::= [APPLICATION 1] SEQUENCE { requestedVersion Version, buildId INTEGER, myLastSessionId Guid OPTIONAL, + authServerPassword UTF8String (SIZE(1..64)) OPTIONAL, login CHOICE { guestLogin [0] GuestLogin, authenticatedLogin [1] AuthenticatedLogin, @@ -287,13 +289,13 @@ JoinGameRequestMessage ::= [APPLICATION 11] SEQUENCE { } JoinExistingGame ::= SEQUENCE { - gameId NonZeroId - password UTF8String (SIZE(1..64)) OPTIONAL, + gameId NonZeroId, + password UTF8String (SIZE(1..64)) OPTIONAL } JoinNewGame ::= SEQUENCE { - gameInfo NetGameInfo - password UTF8String (SIZE(1..64)) OPTIONAL, + gameInfo NetGameInfo, + password UTF8String (SIZE(1..64)) OPTIONAL } RejoinExistingGame ::= SEQUENCE { @@ -450,6 +452,7 @@ GameStartModeInitial ::= SEQUENCE { } GameStartModeRejoin ::= SEQUENCE { + handNum NonZeroId, rejoinPlayerData SEQUENCE SIZE(2..10) OF RejoinPlayerData } @@ -585,6 +588,11 @@ EndOfGameMessage ::= [APPLICATION 35] SEQUENCE { winnerPlayerId NonZeroId } +PlayerIdChangedMessage ::= [APPLICATION 36] SEQUENCE { + oldPlayerId NonZeroId, + newPlayerId NonZeroId +} + AskKickPlayerMessage ::= [APPLICATION 64] SEQUENCE { gameId NonZeroId, playerId NonZeroId diff --git a/src/gui/qt/startwindow/startwindowimpl.cpp b/src/gui/qt/startwindow/startwindowimpl.cpp index b080d7b0..8a062249 100644 --- a/src/gui/qt/startwindow/startwindowimpl.cpp +++ b/src/gui/qt/startwindow/startwindowimpl.cpp @@ -360,9 +360,9 @@ void startWindowImpl::callInternetGameLoginDialog() if(myInternetGameLoginDialog->result() == QDialog::Accepted) { //send login infos mySession->setLogin( - myConfig->readConfigString("MyName"), - myInternetGameLoginDialog->lineEdit_password->text().toUtf8().constData(), - myInternetGameLoginDialog->checkBox_guest->isChecked()); + myConfig->readConfigString("MyName"), + myInternetGameLoginDialog->lineEdit_password->text().toUtf8().constData(), + myInternetGameLoginDialog->checkBox_guest->isChecked()); } else { myConnectToServerDialog->reject(); mySession->terminateNetworkClient(); @@ -385,10 +385,12 @@ void startWindowImpl::callRejoinPossibleDialog(unsigned gameId) int ret = msgBox.exec(); switch (ret) { - case QMessageBox::Yes:; + case QMessageBox::Yes: + ; mySession->clientRejoinGame(gameId); break; - case QMessageBox::No: showClientDialog(); + case QMessageBox::No: + showClientDialog(); break; } } @@ -497,10 +499,10 @@ void startWindowImpl::callJoinNetworkGameDialog() myStartNetworkGameDialog->clearDialog(); // Maybe use QUrl::toPunycode. mySession->startNetworkClient( - myJoinNetworkGameDialog->lineEdit_ipAddress->text().toUtf8().constData(), - myJoinNetworkGameDialog->spinBox_port->value(), - myJoinNetworkGameDialog->checkBox_ipv6->isChecked(), - myJoinNetworkGameDialog->checkBox_sctp->isChecked()); + myJoinNetworkGameDialog->lineEdit_ipAddress->text().toUtf8().constData(), + myJoinNetworkGameDialog->spinBox_port->value(), + myJoinNetworkGameDialog->checkBox_ipv6->isChecked(), + myJoinNetworkGameDialog->checkBox_sctp->isChecked()); //Dialog mit Statusbalken myConnectToServerDialog->exec(); @@ -931,7 +933,7 @@ void startWindowImpl::networkNotification(int notificationId) case NTF_NET_REMOVED_START_FAILED: { myGameLobbyDialog->stopWaitStartGameMsgBoxTimer(); if(QMessageBox::warning(this, tr("Network Notification"), - tr("Your connection to the server is very slow, the game had to start without you."), + tr("Your connection to the server is very slow, the game had to start without you."), QMessageBox::Close) == QMessageBox::Close) { myGameLobbyDialog->hideWaitStartGameMsgBox(); } diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp index 7e32b730..a164fc23 100644 --- a/src/net/common/clientstate.cpp +++ b/src/net/common/clientstate.cpp @@ -982,8 +982,7 @@ ClientStateWaitEnterLogin::TimerLoop(const boost::system::error_code& ec, boost: InitMessage_t *netInit = &init->GetMsg()->choice.initMessage; netInit->requestedVersion.major = NET_VERSION_MAJOR; netInit->requestedVersion.minor = NET_VERSION_MINOR; - if (!context.GetSessionGuid().empty()) - { + if (!context.GetSessionGuid().empty()) { netInit->myLastSessionId = OCTET_STRING_new_fromBuf( &asn_DEF_OCTET_STRING, @@ -1499,8 +1498,7 @@ ClientStateWaitStart::InternalHandlePacket(boost::shared_ptr clien StartData startData; startData.startDealerPlayerId = netGameStart->startDealerPlayerId; - if (netGameStart->gameStartMode.present == gameStartMode_PR_gameStartModeInitial) - { + if (netGameStart->gameStartMode.present == gameStartMode_PR_gameStartModeInitial) { GameStartModeInitial_t *netStartModeInitial = &netGameStart->gameStartMode.choice.gameStartModeInitial; startData.numberOfPlayers = netStartModeInitial->playerSeats.list.count; client->SetStartData(startData); diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp index 6e859173..88dd00b8 100644 --- a/src/net/common/clientthread.cpp +++ b/src/net/common/clientthread.cpp @@ -221,16 +221,16 @@ ClientThread::SendJoinFirstGame(const std::string &password, bool autoLeave) packet->GetMsg()->present = PokerTHMessage_PR_joinGameRequestMessage; JoinGameRequestMessage_t *netJoinGame = &packet->GetMsg()->choice.joinGameRequestMessage; netJoinGame->autoLeave = autoLeave; - if (!password.empty()) { - netJoinGame->password = OCTET_STRING_new_fromBuf( - &asn_DEF_UTF8String, - password.c_str(), - (int)password.length()); - } netJoinGame->joinGameAction.present = joinGameAction_PR_joinExistingGame; JoinExistingGame_t *joinExisting = &netJoinGame->joinGameAction.choice.joinExistingGame; joinExisting->gameId = 1; + if (!password.empty()) { + joinExisting->password = OCTET_STRING_new_fromBuf( + &asn_DEF_UTF8String, + password.c_str(), + (int)password.length()); + } m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet)); } @@ -243,16 +243,16 @@ ClientThread::SendJoinGame(unsigned gameId, const std::string &password, bool au packet->GetMsg()->present = PokerTHMessage_PR_joinGameRequestMessage; JoinGameRequestMessage_t *netJoinGame = &packet->GetMsg()->choice.joinGameRequestMessage; netJoinGame->autoLeave = autoLeave; - if (!password.empty()) { - netJoinGame->password = OCTET_STRING_new_fromBuf( - &asn_DEF_UTF8String, - password.c_str(), - (int)password.length()); - } netJoinGame->joinGameAction.present = joinGameAction_PR_joinExistingGame; JoinExistingGame_t *joinExisting = &netJoinGame->joinGameAction.choice.joinExistingGame; joinExisting->gameId = gameId; + if (!password.empty()) { + joinExisting->password = OCTET_STRING_new_fromBuf( + &asn_DEF_UTF8String, + password.c_str(), + (int)password.length()); + } m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet)); } @@ -281,12 +281,6 @@ ClientThread::SendCreateGame(const GameData &gameData, const std::string &name, packet->GetMsg()->present = PokerTHMessage_PR_joinGameRequestMessage; JoinGameRequestMessage_t *netJoinGame = &packet->GetMsg()->choice.joinGameRequestMessage; netJoinGame->autoLeave = autoLeave; - if (!password.empty()) { - netJoinGame->password = OCTET_STRING_new_fromBuf( - &asn_DEF_UTF8String, - password.c_str(), - (int)password.length()); - } netJoinGame->joinGameAction.present = joinGameAction_PR_joinNewGame; JoinNewGame_t *joinNew = &netJoinGame->joinGameAction.choice.joinNewGame; @@ -294,6 +288,12 @@ ClientThread::SendCreateGame(const GameData &gameData, const std::string &name, OCTET_STRING_fromBuf(&joinNew->gameInfo.gameName, name.c_str(), (int)name.length()); + if (!password.empty()) { + joinNew->password = OCTET_STRING_new_fromBuf( + &asn_DEF_UTF8String, + password.c_str(), + (int)password.length()); + } m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet)); } @@ -1411,8 +1411,7 @@ ClientThread::ReadSessionGuidFromFile() { string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME); ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary); - if (guidStream.good()) - { + if (guidStream.good()) { std::vector tmpGuid(CLIENT_GUID_SIZE); guidStream.read(&tmpGuid[0], CLIENT_GUID_SIZE); GetContext().SetSessionGuid(string(tmpGuid.begin(), tmpGuid.end())); @@ -1424,8 +1423,7 @@ ClientThread::WriteSessionGuidToFile() const { string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME); ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary); - if (guidStream.good()) - { + if (guidStream.good()) { guidStream.write(GetContext().GetSessionGuid().c_str(), GetContext().GetSessionGuid().size()); } } diff --git a/src/net/common/servergame.cpp b/src/net/common/servergame.cpp index 422fee72..99d3c5ef 100644 --- a/src/net/common/servergame.cpp +++ b/src/net/common/servergame.cpp @@ -568,8 +568,7 @@ boost::shared_ptr ServerGame::GetPlayerInterfaceFromGame(const std::string &playerName) { boost::shared_ptr tmpPlayer; - if (m_game) - { + if (m_game) { tmpPlayer = m_game->getPlayerByName(playerName); } return tmpPlayer; diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp index 545afda7..daf715d8 100644 --- a/src/net/common/servergamestate.cpp +++ b/src/net/common/servergamestate.cpp @@ -1146,8 +1146,7 @@ ServerGameStateHand::StartNewHand(boost::shared_ptr server) if (session) { // Set new player id. boost::shared_ptr rejoinPlayer = curGame.getPlayerByName(session->GetPlayerData()->GetName()); - if (rejoinPlayer) - { + if (rejoinPlayer) { rejoinPlayer->setMyUniqueID(session->GetPlayerData()->GetUniqueId()); rejoinPlayer->setIsConnected(true); boost::shared_ptr packet(new NetPacket(NetPacket::Alloc)); diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index 2a14ded5..8a11a1a6 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -904,7 +904,7 @@ ServerLobbyThread::HandlePacket(boost::shared_ptr session, boost::s else if (packet->GetMsg()->present == PokerTHMessage_PR_avatarRequestMessage) HandleNetPacketRetrieveAvatar(session, packet->GetMsg()->choice.avatarRequestMessage); else if (packet->GetMsg()->present == PokerTHMessage_PR_resetTimeoutMessage) - {} + {} else if (packet->GetMsg()->present == PokerTHMessage_PR_subscriptionRequestMessage) { SubscriptionRequestMessage_t *subscriptionRequest = &packet->GetMsg()->choice.subscriptionRequestMessage; if (subscriptionRequest->subscriptionAction == subscriptionAction_resubscribeGameList) @@ -913,13 +913,10 @@ ServerLobbyThread::HandlePacket(boost::shared_ptr session, boost::s session->ResetWantsLobbyMsg(); } else if (packet->GetMsg()->present == PokerTHMessage_PR_joinGameRequestMessage) { JoinGameRequestMessage_t *joinRequest = &packet->GetMsg()->choice.joinGameRequestMessage; - string password; - if (joinRequest->password) - password = string((char *)joinRequest->password->buf, joinRequest->password->size); if (joinRequest->joinGameAction.present == joinGameAction_PR_joinNewGame) - HandleNetPacketCreateGame(session, password, joinRequest->autoLeave, joinRequest->joinGameAction.choice.joinNewGame); + HandleNetPacketCreateGame(session, joinRequest->autoLeave, joinRequest->joinGameAction.choice.joinNewGame); else if (joinRequest->joinGameAction.present == joinGameAction_PR_joinExistingGame) - HandleNetPacketJoinGame(session, password, joinRequest->autoLeave, joinRequest->joinGameAction.choice.joinExistingGame); + HandleNetPacketJoinGame(session, joinRequest->autoLeave, joinRequest->joinGameAction.choice.joinExistingGame); else if (joinRequest->joinGameAction.present == joinGameAction_PR_rejoinExistingGame) HandleNetPacketRejoinGame(session, joinRequest->autoLeave, joinRequest->joinGameAction.choice.rejoinExistingGame); } else if (packet->GetMsg()->present == PokerTHMessage_PR_chatRequestMessage) @@ -1034,8 +1031,7 @@ 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.myLastSessionId) - { + if (initMessage.myLastSessionId) { tmpPlayerData->SetOldGuid(STL_STRING_FROM_OCTET_STRING(*initMessage.myLastSessionId)); } @@ -1235,10 +1231,14 @@ ServerLobbyThread::HandleNetPacketRetrieveAvatar(boost::shared_ptr } void -ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr session, const std::string &password, bool autoLeave, const JoinNewGame_t &newGame) +ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr session, bool autoLeave, const JoinNewGame_t &newGame) { LOG_VERBOSE("Creating new game, initiated by session #" << session->GetId() << "."); + string password; + if (newGame.password) + password = string((char *)newGame.password->buf, newGame.password->size); + // Create a new game. GameData tmpData; NetPacket::GetGameData(&newGame.gameInfo, tmpData); @@ -1276,8 +1276,12 @@ ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr sess } void -ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr session, const std::string &password, bool autoLeave, const JoinExistingGame_t &joinGame) +ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr session, bool autoLeave, const JoinExistingGame_t &joinGame) { + string password; + if (joinGame.password) + password = string((char *)joinGame.password->buf, joinGame.password->size); + // Join an existing game. GameMap::iterator pos = m_gameMap.find(joinGame.gameId); @@ -1490,8 +1494,7 @@ ServerLobbyThread::EstablishSession(boost::shared_ptr session) u_int32_t rejoinPlayerId = 0; u_int32_t rejoinGameId = GetRejoinGameIdForPlayer(session->GetPlayerData()->GetName(), session->GetPlayerData()->GetOldGuid(), rejoinPlayerId); - if (rejoinGameId != 0) - { + if (rejoinGameId != 0) { // Offer rejoin, and disconnect current player with the same name. InternalRemovePlayer(rejoinPlayerId, ERR_NET_PLAYER_NAME_IN_USE); } @@ -1527,8 +1530,7 @@ ServerLobbyThread::EstablishSession(boost::shared_ptr session) session->GetPlayerData()->GetGuid().c_str(), session->GetPlayerData()->GetGuid().size()); netInitAck->yourPlayerId = session->GetPlayerData()->GetUniqueId(); - if (rejoinGameId != 0) - { + if (rejoinGameId != 0) { netInitAck->rejoinGameId = (NonZeroId_t *)calloc(1, sizeof(NonZeroId_t)); *netInitAck->rejoinGameId = rejoinGameId; } @@ -2194,8 +2196,7 @@ ServerLobbyThread::GetRejoinGameIdForPlayer(const std::string &playerName, const while (i != end) { boost::shared_ptr tmpGame = i->second; boost::shared_ptr tmpPlayer = tmpGame->GetPlayerInterfaceFromGame(playerName); - if (tmpPlayer && tmpPlayer->getMyGuid() == guid) - { + if (tmpPlayer && tmpPlayer->getMyGuid() == guid) { retGameId = tmpGame->GetId(); outPlayerUniqueId = tmpPlayer->getMyUniqueID(); break; diff --git a/src/net/serverlobbythread.h b/src/net/serverlobbythread.h index 69850ffe..468984b0 100644 --- a/src/net/serverlobbythread.h +++ b/src/net/serverlobbythread.h @@ -137,8 +137,8 @@ protected: void HandleNetPacketAvatarEnd(boost::shared_ptr session, unsigned requestId, const AvatarEnd_t &avatarEnd); void HandleNetPacketRetrievePlayerInfo(boost::shared_ptr session, const PlayerInfoRequestMessage_t &playerInfoRequest); void HandleNetPacketRetrieveAvatar(boost::shared_ptr session, const AvatarRequestMessage_t &retrieveAvatar); - void HandleNetPacketCreateGame(boost::shared_ptr session, const std::string &password, bool autoLeave, const JoinNewGame_t &newGame); - void HandleNetPacketJoinGame(boost::shared_ptr session, const std::string &password, bool autoLeave, const JoinExistingGame_t &joinGame); + void HandleNetPacketCreateGame(boost::shared_ptr session, bool autoLeave, const JoinNewGame_t &newGame); + void HandleNetPacketJoinGame(boost::shared_ptr session, bool autoLeave, const JoinExistingGame_t &joinGame); void HandleNetPacketRejoinGame(boost::shared_ptr session, bool autoLeave, const RejoinExistingGame_t &rejoinGame); void HandleNetPacketChatRequest(boost::shared_ptr session, const ChatRequestMessage_t &chatRequest); void HandleNetPacketRejectGameInvitation(boost::shared_ptr session, const RejectGameInvitationMessage_t &reject); diff --git a/src/session.cpp b/src/session.cpp index 7de46e10..fc499c73 100755 --- a/src/session.cpp +++ b/src/session.cpp @@ -113,11 +113,11 @@ void Session::startLocalGame(const GameData &gameData, const StartData &startDat //PlayerData erzeugen // UniqueId = PlayerNumber for local games. boost::shared_ptr playerData(new PlayerData( - i, - i, - i == 0 ? PLAYER_TYPE_HUMAN : PLAYER_TYPE_COMPUTER, - PLAYER_RIGHTS_NORMAL, - i == 0)); + i, + i, + i == 0 ? PLAYER_TYPE_HUMAN : PLAYER_TYPE_COMPUTER, + PLAYER_RIGHTS_NORMAL, + i == 0)); playerData->SetName(myConfig->readConfigString(myName.str())); playerData->SetAvatarFile(myConfig->readConfigString(myAvatar.str())); diff --git a/src/third_party/asn1/AfkWarningMessage.c b/src/third_party/asn1/AfkWarningMessage.c index 22648f6c..0b415fb7 100644 --- a/src/third_party/asn1/AfkWarningMessage.c +++ b/src/third_party/asn1/AfkWarningMessage.c @@ -23,7 +23,7 @@ static ber_tlv_tag_t asn_DEF_AfkWarningMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AfkWarningMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* remainingTimeouts at 742 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* remainingTimeouts at 751 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AfkWarningMessage_specs_1 = { sizeof(struct AfkWarningMessage), diff --git a/src/third_party/asn1/AfterHandShowCardsMessage.c b/src/third_party/asn1/AfterHandShowCardsMessage.c index c9b284ad..97dcaba3 100644 --- a/src/third_party/asn1/AfterHandShowCardsMessage.c +++ b/src/third_party/asn1/AfterHandShowCardsMessage.c @@ -23,7 +23,7 @@ static ber_tlv_tag_t asn_DEF_AfterHandShowCardsMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AfterHandShowCardsMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* playerResult at 580 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* playerResult at 584 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AfterHandShowCardsMessage_specs_1 = { sizeof(struct AfterHandShowCardsMessage), diff --git a/src/third_party/asn1/AllInShowCardsMessage.c b/src/third_party/asn1/AllInShowCardsMessage.c index 8c1272cd..bc54d5b0 100644 --- a/src/third_party/asn1/AllInShowCardsMessage.c +++ b/src/third_party/asn1/AllInShowCardsMessage.c @@ -102,8 +102,8 @@ static ber_tlv_tag_t asn_DEF_AllInShowCardsMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AllInShowCardsMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 537 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 } /* playersAllIn at 539 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 541 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 } /* playersAllIn at 543 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AllInShowCardsMessage_specs_1 = { sizeof(struct AllInShowCardsMessage), diff --git a/src/third_party/asn1/AnnounceMessage.c b/src/third_party/asn1/AnnounceMessage.c index ce06bd2e..6a8326be 100644 --- a/src/third_party/asn1/AnnounceMessage.c +++ b/src/third_party/asn1/AnnounceMessage.c @@ -228,11 +228,11 @@ static ber_tlv_tag_t asn_DEF_AnnounceMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AnnounceMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, 0, 1 }, /* latestBetaRevision at 86 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -1, 0 }, /* numPlayersOnServer at 92 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 3, 0, 0 }, /* serverType at 88 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 1 }, /* protocolVersion at 84 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, -1, 0 } /* latestGameVersion at 85 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, 0, 1 }, /* latestBetaRevision at 87 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -1, 0 }, /* numPlayersOnServer at 93 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 3, 0, 0 }, /* serverType at 89 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 1 }, /* protocolVersion at 85 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, -1, 0 } /* latestGameVersion at 86 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AnnounceMessage_specs_1 = { sizeof(struct AnnounceMessage), diff --git a/src/third_party/asn1/AskKickDeniedMessage.c b/src/third_party/asn1/AskKickDeniedMessage.c index c348586d..a2298b40 100644 --- a/src/third_party/asn1/AskKickDeniedMessage.c +++ b/src/third_party/asn1/AskKickDeniedMessage.c @@ -164,9 +164,9 @@ static ber_tlv_tag_t asn_DEF_AskKickDeniedMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AskKickDeniedMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 593 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* playerId at 594 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 } /* kickDeniedReason at 596 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 602 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* playerId at 603 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 } /* kickDeniedReason at 605 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AskKickDeniedMessage_specs_1 = { sizeof(struct AskKickDeniedMessage), diff --git a/src/third_party/asn1/AskKickPlayerMessage.c b/src/third_party/asn1/AskKickPlayerMessage.c index a8e2db3b..dc38acc2 100644 --- a/src/third_party/asn1/AskKickPlayerMessage.c +++ b/src/third_party/asn1/AskKickPlayerMessage.c @@ -32,8 +32,8 @@ static ber_tlv_tag_t asn_DEF_AskKickPlayerMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AskKickPlayerMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 588 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerId at 590 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 597 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerId at 599 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AskKickPlayerMessage_specs_1 = { sizeof(struct AskKickPlayerMessage), diff --git a/src/third_party/asn1/AuthClientResponse.c b/src/third_party/asn1/AuthClientResponse.c index 5bc4acd2..349ed4b5 100644 --- a/src/third_party/asn1/AuthClientResponse.c +++ b/src/third_party/asn1/AuthClientResponse.c @@ -48,7 +48,7 @@ static ber_tlv_tag_t asn_DEF_AuthClientResponse_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AuthClientResponse_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* clientResponse at 138 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* clientResponse at 140 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AuthClientResponse_specs_1 = { sizeof(struct AuthClientResponse), diff --git a/src/third_party/asn1/AuthMessage.c b/src/third_party/asn1/AuthMessage.c index 4aec9f95..8f0ede8c 100644 --- a/src/third_party/asn1/AuthMessage.c +++ b/src/third_party/asn1/AuthMessage.c @@ -40,9 +40,9 @@ static ber_tlv_tag_t asn_DEF_AuthMessage_tags_1[] = { (ASN_TAG_CLASS_APPLICATION | (2 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AuthMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* authServerChallenge at 128 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* authClientResponse at 129 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* authServerVerification at 131 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* authServerChallenge at 130 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* authClientResponse at 131 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* authServerVerification at 133 */ }; static asn_CHOICE_specifics_t asn_SPC_AuthMessage_specs_1 = { sizeof(struct AuthMessage), diff --git a/src/third_party/asn1/AuthServerChallenge.c b/src/third_party/asn1/AuthServerChallenge.c index 0568ee57..1b97ab83 100644 --- a/src/third_party/asn1/AuthServerChallenge.c +++ b/src/third_party/asn1/AuthServerChallenge.c @@ -48,7 +48,7 @@ static ber_tlv_tag_t asn_DEF_AuthServerChallenge_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AuthServerChallenge_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* serverChallenge at 134 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* serverChallenge at 136 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AuthServerChallenge_specs_1 = { sizeof(struct AuthServerChallenge), diff --git a/src/third_party/asn1/AuthServerVerification.c b/src/third_party/asn1/AuthServerVerification.c index f307ffe9..cf8f37c2 100644 --- a/src/third_party/asn1/AuthServerVerification.c +++ b/src/third_party/asn1/AuthServerVerification.c @@ -48,7 +48,7 @@ static ber_tlv_tag_t asn_DEF_AuthServerVerification_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AuthServerVerification_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* serverVerification at 142 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* serverVerification at 144 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AuthServerVerification_specs_1 = { sizeof(struct AuthServerVerification), diff --git a/src/third_party/asn1/AuthenticatedLogin.c b/src/third_party/asn1/AuthenticatedLogin.c index c3d99244..a8127082 100644 --- a/src/third_party/asn1/AuthenticatedLogin.c +++ b/src/third_party/asn1/AuthenticatedLogin.c @@ -57,8 +57,8 @@ static ber_tlv_tag_t asn_DEF_AuthenticatedLogin_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AuthenticatedLogin_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 1 }, /* clientUserData at 118 */ - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, -1, 0 } /* avatar at 119 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 1 }, /* clientUserData at 120 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, -1, 0 } /* avatar at 121 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AuthenticatedLogin_specs_1 = { sizeof(struct AuthenticatedLogin), diff --git a/src/third_party/asn1/AvatarData.c b/src/third_party/asn1/AvatarData.c index ad97270f..181d5116 100644 --- a/src/third_party/asn1/AvatarData.c +++ b/src/third_party/asn1/AvatarData.c @@ -48,7 +48,7 @@ static ber_tlv_tag_t asn_DEF_AvatarData_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AvatarData_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* avatarBlock at 173 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* avatarBlock at 175 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AvatarData_specs_1 = { sizeof(struct AvatarData), diff --git a/src/third_party/asn1/AvatarHeader.c b/src/third_party/asn1/AvatarHeader.c index 2d832ffa..3499e5d5 100644 --- a/src/third_party/asn1/AvatarHeader.c +++ b/src/third_party/asn1/AvatarHeader.c @@ -56,8 +56,8 @@ static ber_tlv_tag_t asn_DEF_AvatarHeader_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AvatarHeader_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* avatarSize at 169 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* avatarType at 168 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* avatarSize at 171 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* avatarType at 170 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AvatarHeader_specs_1 = { sizeof(struct AvatarHeader), diff --git a/src/third_party/asn1/AvatarReplyMessage.c b/src/third_party/asn1/AvatarReplyMessage.c index 5e8649af..f5d5520f 100644 --- a/src/third_party/asn1/AvatarReplyMessage.c +++ b/src/third_party/asn1/AvatarReplyMessage.c @@ -46,10 +46,10 @@ static asn_TYPE_member_t asn_MBR_avatarResult_3[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_avatarResult_tag2el_3[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* avatarHeader at 160 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* avatarData at 161 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* avatarEnd at 162 */ - { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* unknownAvatar at 164 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* avatarHeader at 162 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* avatarData at 163 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* avatarEnd at 164 */ + { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* unknownAvatar at 166 */ }; static asn_CHOICE_specifics_t asn_SPC_avatarResult_specs_3 = { sizeof(struct avatarResult), @@ -109,11 +109,11 @@ static ber_tlv_tag_t asn_DEF_AvatarReplyMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AvatarReplyMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* requestId at 158 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* avatarHeader at 160 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* avatarData at 161 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* avatarEnd at 162 */ - { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 } /* unknownAvatar at 164 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* requestId at 160 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* avatarHeader at 162 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* avatarData at 163 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* avatarEnd at 164 */ + { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 } /* unknownAvatar at 166 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AvatarReplyMessage_specs_1 = { sizeof(struct AvatarReplyMessage), diff --git a/src/third_party/asn1/AvatarRequestMessage.c b/src/third_party/asn1/AvatarRequestMessage.c index ad891eff..ee1a468b 100644 --- a/src/third_party/asn1/AvatarRequestMessage.c +++ b/src/third_party/asn1/AvatarRequestMessage.c @@ -32,8 +32,8 @@ static ber_tlv_tag_t asn_DEF_AvatarRequestMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_AvatarRequestMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* requestId at 153 */ - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 } /* avatar at 155 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* requestId at 155 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 } /* avatar at 157 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AvatarRequestMessage_specs_1 = { sizeof(struct AvatarRequestMessage), diff --git a/src/third_party/asn1/ChatMessage.c b/src/third_party/asn1/ChatMessage.c index bc07ca0a..06fe28d8 100644 --- a/src/third_party/asn1/ChatMessage.c +++ b/src/third_party/asn1/ChatMessage.c @@ -87,11 +87,11 @@ static asn_TYPE_member_t asn_MBR_chatType_2[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_chatType_tag2el_2[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* chatTypeLobby at 693 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* chatTypeGame at 694 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* chatTypeBot at 695 */ - { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* chatTypeBroadcast at 696 */ - { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 } /* chatTypePrivate at 698 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* chatTypeLobby at 702 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* chatTypeGame at 703 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* chatTypeBot at 704 */ + { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* chatTypeBroadcast at 705 */ + { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 } /* chatTypePrivate at 707 */ }; static asn_CHOICE_specifics_t asn_SPC_chatType_specs_2 = { sizeof(struct chatType), @@ -151,12 +151,12 @@ static ber_tlv_tag_t asn_DEF_ChatMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ChatMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 }, /* chatText at 699 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* chatTypeLobby at 693 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* chatTypeGame at 694 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 0, 0, 0 }, /* chatTypeBot at 695 */ - { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 0, 0, 0 }, /* chatTypeBroadcast at 696 */ - { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 0, 0, 0 } /* chatTypePrivate at 698 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 }, /* chatText at 708 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* chatTypeLobby at 702 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* chatTypeGame at 703 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 0, 0, 0 }, /* chatTypeBot at 704 */ + { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 0, 0, 0 }, /* chatTypeBroadcast at 705 */ + { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 0, 0, 0 } /* chatTypePrivate at 707 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatMessage_specs_1 = { sizeof(struct ChatMessage), diff --git a/src/third_party/asn1/ChatRejectMessage.c b/src/third_party/asn1/ChatRejectMessage.c index 387a90bf..94f1a2bc 100644 --- a/src/third_party/asn1/ChatRejectMessage.c +++ b/src/third_party/asn1/ChatRejectMessage.c @@ -55,7 +55,7 @@ static ber_tlv_tag_t asn_DEF_ChatRejectMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ChatRejectMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 } /* chatText at 722 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 } /* chatText at 731 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatRejectMessage_specs_1 = { sizeof(struct ChatRejectMessage), diff --git a/src/third_party/asn1/ChatRequestMessage.c b/src/third_party/asn1/ChatRequestMessage.c index 172d3777..1d5baa60 100644 --- a/src/third_party/asn1/ChatRequestMessage.c +++ b/src/third_party/asn1/ChatRequestMessage.c @@ -69,9 +69,9 @@ static asn_TYPE_member_t asn_MBR_chatRequestType_2[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_chatRequestType_tag2el_2[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* chatRequestTypeLobby at 673 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* chatRequestTypeGame at 674 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* chatRequestTypePrivate at 676 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* chatRequestTypeLobby at 682 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* chatRequestTypeGame at 683 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* chatRequestTypePrivate at 685 */ }; static asn_CHOICE_specifics_t asn_SPC_chatRequestType_specs_2 = { sizeof(struct chatRequestType), @@ -131,10 +131,10 @@ static ber_tlv_tag_t asn_DEF_ChatRequestMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ChatRequestMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 }, /* chatText at 677 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* chatRequestTypeLobby at 673 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* chatRequestTypeGame at 674 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 0, 0, 0 } /* chatRequestTypePrivate at 676 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 }, /* chatText at 686 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* chatRequestTypeLobby at 682 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* chatRequestTypeGame at 683 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 0, 0, 0 } /* chatRequestTypePrivate at 685 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatRequestMessage_specs_1 = { sizeof(struct ChatRequestMessage), diff --git a/src/third_party/asn1/ChatRequestTypeGame.c b/src/third_party/asn1/ChatRequestTypeGame.c index d95dfd16..70b11718 100644 --- a/src/third_party/asn1/ChatRequestTypeGame.c +++ b/src/third_party/asn1/ChatRequestTypeGame.c @@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_ChatRequestTypeGame_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ChatRequestTypeGame_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 685 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 694 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatRequestTypeGame_specs_1 = { sizeof(struct ChatRequestTypeGame), diff --git a/src/third_party/asn1/ChatRequestTypePrivate.c b/src/third_party/asn1/ChatRequestTypePrivate.c index 98e142fe..7cf497eb 100644 --- a/src/third_party/asn1/ChatRequestTypePrivate.c +++ b/src/third_party/asn1/ChatRequestTypePrivate.c @@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_ChatRequestTypePrivate_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ChatRequestTypePrivate_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* targetPlayerId at 689 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* targetPlayerId at 698 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatRequestTypePrivate_specs_1 = { sizeof(struct ChatRequestTypePrivate), diff --git a/src/third_party/asn1/ChatTypeGame.c b/src/third_party/asn1/ChatTypeGame.c index cde01ba4..2cc3244f 100644 --- a/src/third_party/asn1/ChatTypeGame.c +++ b/src/third_party/asn1/ChatTypeGame.c @@ -31,8 +31,8 @@ static ber_tlv_tag_t asn_DEF_ChatTypeGame_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ChatTypeGame_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 707 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerId at 709 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 716 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerId at 718 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatTypeGame_specs_1 = { sizeof(struct ChatTypeGame), diff --git a/src/third_party/asn1/ChatTypeLobby.c b/src/third_party/asn1/ChatTypeLobby.c index 6e87a43d..9c7101f2 100644 --- a/src/third_party/asn1/ChatTypeLobby.c +++ b/src/third_party/asn1/ChatTypeLobby.c @@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_ChatTypeLobby_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ChatTypeLobby_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 704 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 713 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatTypeLobby_specs_1 = { sizeof(struct ChatTypeLobby), diff --git a/src/third_party/asn1/ChatTypePrivate.c b/src/third_party/asn1/ChatTypePrivate.c index faefddde..a24c1c36 100644 --- a/src/third_party/asn1/ChatTypePrivate.c +++ b/src/third_party/asn1/ChatTypePrivate.c @@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_ChatTypePrivate_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ChatTypePrivate_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 719 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 728 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatTypePrivate_specs_1 = { sizeof(struct ChatTypePrivate), diff --git a/src/third_party/asn1/DealFlopCardsMessage.c b/src/third_party/asn1/DealFlopCardsMessage.c index 773a24af..5f84d567 100644 --- a/src/third_party/asn1/DealFlopCardsMessage.c +++ b/src/third_party/asn1/DealFlopCardsMessage.c @@ -50,10 +50,10 @@ static ber_tlv_tag_t asn_DEF_DealFlopCardsMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_DealFlopCardsMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 3 }, /* gameId at 520 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 2 }, /* flopCard1 at 521 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 1 }, /* flopCard2 at 522 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 0 } /* flopCard3 at 524 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 3 }, /* gameId at 524 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 2 }, /* flopCard1 at 525 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 1 }, /* flopCard2 at 526 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 0 } /* flopCard3 at 528 */ }; static asn_SEQUENCE_specifics_t asn_SPC_DealFlopCardsMessage_specs_1 = { sizeof(struct DealFlopCardsMessage), diff --git a/src/third_party/asn1/DealRiverCardMessage.c b/src/third_party/asn1/DealRiverCardMessage.c index b874cdcb..7b57226f 100644 --- a/src/third_party/asn1/DealRiverCardMessage.c +++ b/src/third_party/asn1/DealRiverCardMessage.c @@ -32,8 +32,8 @@ static ber_tlv_tag_t asn_DEF_DealRiverCardMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_DealRiverCardMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 532 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* riverCard at 534 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 536 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* riverCard at 538 */ }; static asn_SEQUENCE_specifics_t asn_SPC_DealRiverCardMessage_specs_1 = { sizeof(struct DealRiverCardMessage), diff --git a/src/third_party/asn1/DealTurnCardMessage.c b/src/third_party/asn1/DealTurnCardMessage.c index 3f4c2ae1..a186f996 100644 --- a/src/third_party/asn1/DealTurnCardMessage.c +++ b/src/third_party/asn1/DealTurnCardMessage.c @@ -32,8 +32,8 @@ static ber_tlv_tag_t asn_DEF_DealTurnCardMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_DealTurnCardMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 527 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* turnCard at 529 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 531 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* turnCard at 533 */ }; static asn_SEQUENCE_specifics_t asn_SPC_DealTurnCardMessage_specs_1 = { sizeof(struct DealTurnCardMessage), diff --git a/src/third_party/asn1/DialogMessage.c b/src/third_party/asn1/DialogMessage.c index e1aa33eb..5f51835f 100644 --- a/src/third_party/asn1/DialogMessage.c +++ b/src/third_party/asn1/DialogMessage.c @@ -55,7 +55,7 @@ static ber_tlv_tag_t asn_DEF_DialogMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_DialogMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 } /* notificationText at 726 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 } /* notificationText at 735 */ }; static asn_SEQUENCE_specifics_t asn_SPC_DialogMessage_specs_1 = { sizeof(struct DialogMessage), diff --git a/src/third_party/asn1/EncryptedCards.c b/src/third_party/asn1/EncryptedCards.c index 294a0fe2..bfb70ea8 100644 --- a/src/third_party/asn1/EncryptedCards.c +++ b/src/third_party/asn1/EncryptedCards.c @@ -48,7 +48,7 @@ static ber_tlv_tag_t asn_DEF_EncryptedCards_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_EncryptedCards_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* cardData at 470 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 0 } /* cardData at 474 */ }; static asn_SEQUENCE_specifics_t asn_SPC_EncryptedCards_specs_1 = { sizeof(struct EncryptedCards), diff --git a/src/third_party/asn1/EndKickPetitionMessage.c b/src/third_party/asn1/EndKickPetitionMessage.c index b37a6b92..3d5b70bd 100644 --- a/src/third_party/asn1/EndKickPetitionMessage.c +++ b/src/third_party/asn1/EndKickPetitionMessage.c @@ -239,12 +239,12 @@ static ber_tlv_tag_t asn_DEF_EndKickPetitionMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_EndKickPetitionMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 4, 0, 0 }, /* resultPlayerKicked at 651 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 3 }, /* gameId at 647 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 2 }, /* petitionId at 648 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 1 }, /* numVotesAgainstKicking at 649 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 0 }, /* numVotesInFavourOfKicking at 650 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 5, 0, 0 } /* petitionEndReason at 653 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 4, 0, 0 }, /* resultPlayerKicked at 660 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 3 }, /* gameId at 656 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 2 }, /* petitionId at 657 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 1 }, /* numVotesAgainstKicking at 658 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 0 }, /* numVotesInFavourOfKicking at 659 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 5, 0, 0 } /* petitionEndReason at 662 */ }; static asn_SEQUENCE_specifics_t asn_SPC_EndKickPetitionMessage_specs_1 = { sizeof(struct EndKickPetitionMessage), diff --git a/src/third_party/asn1/EndOfGameMessage.c b/src/third_party/asn1/EndOfGameMessage.c index aa9c270a..5b363d39 100644 --- a/src/third_party/asn1/EndOfGameMessage.c +++ b/src/third_party/asn1/EndOfGameMessage.c @@ -32,8 +32,8 @@ static ber_tlv_tag_t asn_DEF_EndOfGameMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_EndOfGameMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 583 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* winnerPlayerId at 585 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 587 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* winnerPlayerId at 589 */ }; static asn_SEQUENCE_specifics_t asn_SPC_EndOfGameMessage_specs_1 = { sizeof(struct EndOfGameMessage), diff --git a/src/third_party/asn1/EndOfHandHideCards.c b/src/third_party/asn1/EndOfHandHideCards.c index 1d9603e8..d777a964 100644 --- a/src/third_party/asn1/EndOfHandHideCards.c +++ b/src/third_party/asn1/EndOfHandHideCards.c @@ -40,9 +40,9 @@ static ber_tlv_tag_t asn_DEF_EndOfHandHideCards_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_EndOfHandHideCards_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* playerId at 570 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* moneyWon at 571 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 } /* playerMoney at 573 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* playerId at 574 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* moneyWon at 575 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 } /* playerMoney at 577 */ }; static asn_SEQUENCE_specifics_t asn_SPC_EndOfHandHideCards_specs_1 = { sizeof(struct EndOfHandHideCards), diff --git a/src/third_party/asn1/EndOfHandMessage.c b/src/third_party/asn1/EndOfHandMessage.c index bb1bdf39..974c2782 100644 --- a/src/third_party/asn1/EndOfHandMessage.c +++ b/src/third_party/asn1/EndOfHandMessage.c @@ -28,8 +28,8 @@ static asn_TYPE_member_t asn_MBR_endOfHandType_3[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_endOfHandType_tag2el_3[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* endOfHandShowCards at 550 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* endOfHandHideCards at 552 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* endOfHandShowCards at 554 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* endOfHandHideCards at 556 */ }; static asn_CHOICE_specifics_t asn_SPC_endOfHandType_specs_3 = { sizeof(struct endOfHandType), @@ -89,9 +89,9 @@ static ber_tlv_tag_t asn_DEF_EndOfHandMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_EndOfHandMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 548 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* endOfHandShowCards at 550 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* endOfHandHideCards at 552 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 552 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* endOfHandShowCards at 554 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* endOfHandHideCards at 556 */ }; static asn_SEQUENCE_specifics_t asn_SPC_EndOfHandMessage_specs_1 = { sizeof(struct EndOfHandMessage), diff --git a/src/third_party/asn1/EndOfHandShowCards.c b/src/third_party/asn1/EndOfHandShowCards.c index 3cc8348c..517415c8 100644 --- a/src/third_party/asn1/EndOfHandShowCards.c +++ b/src/third_party/asn1/EndOfHandShowCards.c @@ -92,7 +92,7 @@ static ber_tlv_tag_t asn_DEF_EndOfHandShowCards_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_EndOfHandShowCards_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* playerResults at 557 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* playerResults at 561 */ }; static asn_SEQUENCE_specifics_t asn_SPC_EndOfHandShowCards_specs_1 = { sizeof(struct EndOfHandShowCards), diff --git a/src/third_party/asn1/ErrorMessage.c b/src/third_party/asn1/ErrorMessage.c index b32c0be2..0afaf8c8 100644 --- a/src/third_party/asn1/ErrorMessage.c +++ b/src/third_party/asn1/ErrorMessage.c @@ -166,7 +166,7 @@ static ber_tlv_tag_t asn_DEF_ErrorMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ErrorMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* errorReason at 760 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* errorReason at 769 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ErrorMessage_specs_1 = { sizeof(struct ErrorMessage), diff --git a/src/third_party/asn1/GameAdminChanged.c b/src/third_party/asn1/GameAdminChanged.c index 74666482..1023aa3b 100644 --- a/src/third_party/asn1/GameAdminChanged.c +++ b/src/third_party/asn1/GameAdminChanged.c @@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_GameAdminChanged_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GameAdminChanged_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* newAdminPlayerId at 384 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* newAdminPlayerId at 387 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GameAdminChanged_specs_1 = { sizeof(struct GameAdminChanged), diff --git a/src/third_party/asn1/GameListAdminChanged.c b/src/third_party/asn1/GameListAdminChanged.c index cddfbccc..41fd770e 100644 --- a/src/third_party/asn1/GameListAdminChanged.c +++ b/src/third_party/asn1/GameListAdminChanged.c @@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_GameListAdminChanged_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GameListAdminChanged_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* newAdminPlayerId at 231 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* newAdminPlayerId at 233 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GameListAdminChanged_specs_1 = { sizeof(struct GameListAdminChanged), diff --git a/src/third_party/asn1/GameListMessage.c b/src/third_party/asn1/GameListMessage.c index f79fbe0e..22a49f4c 100644 --- a/src/third_party/asn1/GameListMessage.c +++ b/src/third_party/asn1/GameListMessage.c @@ -55,11 +55,11 @@ static asn_TYPE_member_t asn_MBR_gameListNotification_3[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_gameListNotification_tag2el_3[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* gameListNew at 201 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* gameListUpdate at 202 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* gameListPlayerJoined at 203 */ - { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* gameListPlayerLeft at 204 */ - { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 } /* gameListAdminChanged at 206 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* gameListNew at 203 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* gameListUpdate at 204 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* gameListPlayerJoined at 205 */ + { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* gameListPlayerLeft at 206 */ + { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 } /* gameListAdminChanged at 208 */ }; static asn_CHOICE_specifics_t asn_SPC_gameListNotification_specs_3 = { sizeof(struct gameListNotification), @@ -119,12 +119,12 @@ static ber_tlv_tag_t asn_DEF_GameListMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GameListMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 199 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* gameListNew at 201 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* gameListUpdate at 202 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* gameListPlayerJoined at 203 */ - { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 }, /* gameListPlayerLeft at 204 */ - { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 1, 0, 0 } /* gameListAdminChanged at 206 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 201 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* gameListNew at 203 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* gameListUpdate at 204 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* gameListPlayerJoined at 205 */ + { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 }, /* gameListPlayerLeft at 206 */ + { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 1, 0, 0 } /* gameListAdminChanged at 208 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GameListMessage_specs_1 = { sizeof(struct GameListMessage), diff --git a/src/third_party/asn1/GameListNew.c b/src/third_party/asn1/GameListNew.c index 2a74b78e..a13820db 100644 --- a/src/third_party/asn1/GameListNew.c +++ b/src/third_party/asn1/GameListNew.c @@ -128,11 +128,11 @@ static ber_tlv_tag_t asn_DEF_GameListNew_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GameListNew_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* isPrivate at 211 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, 0, 0 }, /* adminPlayerId at 213 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 }, /* gameMode at 210 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 2, 0, 1 }, /* playerIds at 212 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 4, -1, 0 } /* gameInfo at 215 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* isPrivate at 213 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, 0, 0 }, /* adminPlayerId at 215 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 }, /* gameMode at 212 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 2, 0, 1 }, /* playerIds at 214 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 4, -1, 0 } /* gameInfo at 217 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GameListNew_specs_1 = { sizeof(struct GameListNew), diff --git a/src/third_party/asn1/GameListPlayerJoined.c b/src/third_party/asn1/GameListPlayerJoined.c index 40461f2a..2a0177d1 100644 --- a/src/third_party/asn1/GameListPlayerJoined.c +++ b/src/third_party/asn1/GameListPlayerJoined.c @@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_GameListPlayerJoined_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GameListPlayerJoined_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 223 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 225 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GameListPlayerJoined_specs_1 = { sizeof(struct GameListPlayerJoined), diff --git a/src/third_party/asn1/GameListPlayerLeft.c b/src/third_party/asn1/GameListPlayerLeft.c index 3fc31822..33c2ec87 100644 --- a/src/third_party/asn1/GameListPlayerLeft.c +++ b/src/third_party/asn1/GameListPlayerLeft.c @@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_GameListPlayerLeft_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GameListPlayerLeft_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 227 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 229 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GameListPlayerLeft_specs_1 = { sizeof(struct GameListPlayerLeft), diff --git a/src/third_party/asn1/GameListUpdate.c b/src/third_party/asn1/GameListUpdate.c index 602f7d0b..ac60ab4e 100644 --- a/src/third_party/asn1/GameListUpdate.c +++ b/src/third_party/asn1/GameListUpdate.c @@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_GameListUpdate_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GameListUpdate_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* gameMode at 219 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* gameMode at 221 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GameListUpdate_specs_1 = { sizeof(struct GameListUpdate), diff --git a/src/third_party/asn1/GamePlayerJoined.c b/src/third_party/asn1/GamePlayerJoined.c index 307c0e87..e2618955 100644 --- a/src/third_party/asn1/GamePlayerJoined.c +++ b/src/third_party/asn1/GamePlayerJoined.c @@ -31,8 +31,8 @@ static ber_tlv_tag_t asn_DEF_GamePlayerJoined_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GamePlayerJoined_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* isGameAdmin at 370 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 369 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* isGameAdmin at 373 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 372 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GamePlayerJoined_specs_1 = { sizeof(struct GamePlayerJoined), diff --git a/src/third_party/asn1/GamePlayerLeft.c b/src/third_party/asn1/GamePlayerLeft.c index ffb0f371..99123af8 100644 --- a/src/third_party/asn1/GamePlayerLeft.c +++ b/src/third_party/asn1/GamePlayerLeft.c @@ -150,8 +150,8 @@ static ber_tlv_tag_t asn_DEF_GamePlayerLeft_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GamePlayerLeft_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* playerId at 374 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* gamePlayerLeftReason at 376 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* playerId at 377 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* gamePlayerLeftReason at 379 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GamePlayerLeft_specs_1 = { sizeof(struct GamePlayerLeft), diff --git a/src/third_party/asn1/GamePlayerMessage.c b/src/third_party/asn1/GamePlayerMessage.c index ba04c343..ed2c4013 100644 --- a/src/third_party/asn1/GamePlayerMessage.c +++ b/src/third_party/asn1/GamePlayerMessage.c @@ -46,10 +46,10 @@ static asn_TYPE_member_t asn_MBR_gamePlayerNotification_3[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_gamePlayerNotification_tag2el_3[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* gamePlayerJoined at 361 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* gamePlayerLeft at 362 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* gameAdminChanged at 363 */ - { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* removedFromGame at 365 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* gamePlayerJoined at 364 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* gamePlayerLeft at 365 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* gameAdminChanged at 366 */ + { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* removedFromGame at 368 */ }; static asn_CHOICE_specifics_t asn_SPC_gamePlayerNotification_specs_3 = { sizeof(struct gamePlayerNotification), @@ -109,11 +109,11 @@ static ber_tlv_tag_t asn_DEF_GamePlayerMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GamePlayerMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 359 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* gamePlayerJoined at 361 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* gamePlayerLeft at 362 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* gameAdminChanged at 363 */ - { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 } /* removedFromGame at 365 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 362 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* gamePlayerJoined at 364 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* gamePlayerLeft at 365 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 1, 0, 0 }, /* gameAdminChanged at 366 */ + { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 } /* removedFromGame at 368 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GamePlayerMessage_specs_1 = { sizeof(struct GamePlayerMessage), diff --git a/src/third_party/asn1/GameStartMessage.c b/src/third_party/asn1/GameStartMessage.c index 0e7d7698..8fe6fde0 100644 --- a/src/third_party/asn1/GameStartMessage.c +++ b/src/third_party/asn1/GameStartMessage.c @@ -28,8 +28,8 @@ static asn_TYPE_member_t asn_MBR_gameStartMode_4[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_gameStartMode_tag2el_4[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* gameStartModeInitial at 459 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* gameStartModeRejoin at 461 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* gameStartModeInitial at 463 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* gameStartModeRejoin at 465 */ }; static asn_CHOICE_specifics_t asn_SPC_gameStartMode_specs_4 = { sizeof(struct gameStartMode), @@ -98,10 +98,10 @@ static ber_tlv_tag_t asn_DEF_GameStartMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GameStartMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 456 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* startDealerPlayerId at 457 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 2, 0, 0 }, /* gameStartModeInitial at 459 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 } /* gameStartModeRejoin at 461 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 460 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* startDealerPlayerId at 461 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 2, 0, 0 }, /* gameStartModeInitial at 463 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 } /* gameStartModeRejoin at 465 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GameStartMessage_specs_1 = { sizeof(struct GameStartMessage), diff --git a/src/third_party/asn1/GameStartModeInitial.c b/src/third_party/asn1/GameStartModeInitial.c index a0a86024..547a0119 100644 --- a/src/third_party/asn1/GameStartModeInitial.c +++ b/src/third_party/asn1/GameStartModeInitial.c @@ -92,7 +92,7 @@ static ber_tlv_tag_t asn_DEF_GameStartModeInitial_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GameStartModeInitial_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* playerSeats at 449 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* playerSeats at 452 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GameStartModeInitial_specs_1 = { sizeof(struct GameStartModeInitial), diff --git a/src/third_party/asn1/GameStartModeRejoin.c b/src/third_party/asn1/GameStartModeRejoin.c index a8cf979d..e30195f8 100644 --- a/src/third_party/asn1/GameStartModeRejoin.c +++ b/src/third_party/asn1/GameStartModeRejoin.c @@ -33,7 +33,7 @@ memb_rejoinPlayerData_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, } } -static asn_TYPE_member_t asn_MBR_rejoinPlayerData_2[] = { +static asn_TYPE_member_t asn_MBR_rejoinPlayerData_3[] = { { ATF_POINTER, 0, 0, (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, @@ -44,16 +44,16 @@ static asn_TYPE_member_t asn_MBR_rejoinPlayerData_2[] = { "" }, }; -static ber_tlv_tag_t asn_DEF_rejoinPlayerData_tags_2[] = { +static ber_tlv_tag_t asn_DEF_rejoinPlayerData_tags_3[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; -static asn_SET_OF_specifics_t asn_SPC_rejoinPlayerData_specs_2 = { +static asn_SET_OF_specifics_t asn_SPC_rejoinPlayerData_specs_3 = { sizeof(struct rejoinPlayerData), offsetof(struct rejoinPlayerData, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_rejoinPlayerData_2 = { +asn_TYPE_descriptor_t asn_DEF_rejoinPlayerData_3 = { "rejoinPlayerData", "rejoinPlayerData", SEQUENCE_OF_free, @@ -65,23 +65,32 @@ asn_TYPE_descriptor_t asn_DEF_rejoinPlayerData_2 = { SEQUENCE_OF_encode_xer, 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ - asn_DEF_rejoinPlayerData_tags_2, - sizeof(asn_DEF_rejoinPlayerData_tags_2) - /sizeof(asn_DEF_rejoinPlayerData_tags_2[0]), /* 1 */ - asn_DEF_rejoinPlayerData_tags_2, /* Same as above */ - sizeof(asn_DEF_rejoinPlayerData_tags_2) - /sizeof(asn_DEF_rejoinPlayerData_tags_2[0]), /* 1 */ + asn_DEF_rejoinPlayerData_tags_3, + sizeof(asn_DEF_rejoinPlayerData_tags_3) + /sizeof(asn_DEF_rejoinPlayerData_tags_3[0]), /* 1 */ + asn_DEF_rejoinPlayerData_tags_3, /* Same as above */ + sizeof(asn_DEF_rejoinPlayerData_tags_3) + /sizeof(asn_DEF_rejoinPlayerData_tags_3[0]), /* 1 */ 0, /* No PER visible constraints */ - asn_MBR_rejoinPlayerData_2, + asn_MBR_rejoinPlayerData_3, 1, /* Single element */ - &asn_SPC_rejoinPlayerData_specs_2 /* Additional specs */ + &asn_SPC_rejoinPlayerData_specs_3 /* Additional specs */ }; static asn_TYPE_member_t asn_MBR_GameStartModeRejoin_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct GameStartModeRejoin, handNum), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), + 0, + &asn_DEF_NonZeroId, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "handNum" + }, { ATF_NOFLAGS, 0, offsetof(struct GameStartModeRejoin, rejoinPlayerData), (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, - &asn_DEF_rejoinPlayerData_2, + &asn_DEF_rejoinPlayerData_3, memb_rejoinPlayerData_constraint_1, 0, /* PER is not compiled, use -gen-PER */ 0, @@ -92,16 +101,17 @@ static ber_tlv_tag_t asn_DEF_GameStartModeRejoin_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GameStartModeRejoin_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* rejoinPlayerData at 453 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* handNum at 455 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 } /* rejoinPlayerData at 457 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GameStartModeRejoin_specs_1 = { sizeof(struct GameStartModeRejoin), offsetof(struct GameStartModeRejoin, _asn_ctx), asn_MAP_GameStartModeRejoin_tag2el_1, - 1, /* Count of tags in the map */ + 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ - 0, /* Start extensions */ - 2 /* Stop extensions */ + 1, /* Start extensions */ + 3 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_GameStartModeRejoin = { "GameStartModeRejoin", @@ -123,7 +133,7 @@ asn_TYPE_descriptor_t asn_DEF_GameStartModeRejoin = { /sizeof(asn_DEF_GameStartModeRejoin_tags_1[0]), /* 1 */ 0, /* No PER visible constraints */ asn_MBR_GameStartModeRejoin_1, - 1, /* Elements count */ + 2, /* Elements count */ &asn_SPC_GameStartModeRejoin_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/GameStartModeRejoin.h b/src/third_party/asn1/GameStartModeRejoin.h index c9eb4cd2..2e3e04b7 100644 --- a/src/third_party/asn1/GameStartModeRejoin.h +++ b/src/third_party/asn1/GameStartModeRejoin.h @@ -12,6 +12,7 @@ #include /* Including external dependencies */ +#include "NonZeroId.h" #include #include #include @@ -25,6 +26,7 @@ extern "C" { /* GameStartModeRejoin */ typedef struct GameStartModeRejoin { + NonZeroId_t handNum; struct rejoinPlayerData { A_SEQUENCE_OF(struct RejoinPlayerData) list; diff --git a/src/third_party/asn1/GuestLogin.c b/src/third_party/asn1/GuestLogin.c index 6c3b8d98..45b09065 100644 --- a/src/third_party/asn1/GuestLogin.c +++ b/src/third_party/asn1/GuestLogin.c @@ -54,7 +54,7 @@ static ber_tlv_tag_t asn_DEF_GuestLogin_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_GuestLogin_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 } /* nickName at 113 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 } /* nickName at 115 */ }; static asn_SEQUENCE_specifics_t asn_SPC_GuestLogin_specs_1 = { sizeof(struct GuestLogin), diff --git a/src/third_party/asn1/HandStartMessage.c b/src/third_party/asn1/HandStartMessage.c index 7761efaa..f9e950c0 100644 --- a/src/third_party/asn1/HandStartMessage.c +++ b/src/third_party/asn1/HandStartMessage.c @@ -53,8 +53,8 @@ static asn_TYPE_member_t asn_MBR_yourCards_3[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_yourCards_tag2el_3[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* plainCards at 476 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* encryptedCards at 478 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* plainCards at 480 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* encryptedCards at 482 */ }; static asn_CHOICE_specifics_t asn_SPC_yourCards_specs_3 = { sizeof(struct yourCards), @@ -123,10 +123,10 @@ static ber_tlv_tag_t asn_DEF_HandStartMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_HandStartMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 474 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -1, 0 }, /* smallBlind at 479 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* plainCards at 476 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* encryptedCards at 478 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 478 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -1, 0 }, /* smallBlind at 483 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* plainCards at 480 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* encryptedCards at 482 */ }; static asn_SEQUENCE_specifics_t asn_SPC_HandStartMessage_specs_1 = { sizeof(struct HandStartMessage), diff --git a/src/third_party/asn1/INTEGER.c b/src/third_party/asn1/INTEGER.c index dce8f422..5bed43e9 100644 --- a/src/third_party/asn1/INTEGER.c +++ b/src/third_party/asn1/INTEGER.c @@ -337,14 +337,14 @@ INTEGER__xer_body_decode(asn_TYPE_descriptor_t *td, void *sptr, const void *chun const char *lstart = (const char *)chunk_buf; const char *lstop = lstart + chunk_size; enum { - ST_SKIPSPACE, - ST_SKIPSPHEX, - ST_WAITDIGITS, - ST_DIGITS, - ST_HEXDIGIT1, - ST_HEXDIGIT2, - ST_HEXCOLON, - ST_EXTRASTUFF + ST_SKIPSPACE, + ST_SKIPSPHEX, + ST_WAITDIGITS, + ST_DIGITS, + ST_HEXDIGIT1, + ST_HEXDIGIT2, + ST_HEXCOLON, + ST_EXTRASTUFF } state = ST_SKIPSPACE; if(chunk_size) diff --git a/src/third_party/asn1/InitAckMessage.c b/src/third_party/asn1/InitAckMessage.c index 3ae7fc1f..1b318a4e 100644 --- a/src/third_party/asn1/InitAckMessage.c +++ b/src/third_party/asn1/InitAckMessage.c @@ -50,10 +50,10 @@ static ber_tlv_tag_t asn_DEF_InitAckMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_InitAckMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 1 }, /* yourPlayerId at 147 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -1, 0 }, /* rejoinGameId at 149 */ - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 1 }, /* yourSessionId at 146 */ - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 2, -1, 0 } /* yourAvatar at 148 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 1 }, /* yourPlayerId at 149 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -1, 0 }, /* rejoinGameId at 151 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, 0, 1 }, /* yourSessionId at 148 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 2, -1, 0 } /* yourAvatar at 150 */ }; static asn_SEQUENCE_specifics_t asn_SPC_InitAckMessage_specs_1 = { sizeof(struct InitAckMessage), diff --git a/src/third_party/asn1/InitMessage.c b/src/third_party/asn1/InitMessage.c index b7c75da9..e0faf3e4 100644 --- a/src/third_party/asn1/InitMessage.c +++ b/src/third_party/asn1/InitMessage.c @@ -7,7 +7,39 @@ #include "InitMessage.h" -static asn_TYPE_member_t asn_MBR_login_5[] = { +static int +memb_authServerPassword_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, + asn_app_constraint_failed_f *ctfailcb, void *app_key) { + const UTF8String_t *st = (const UTF8String_t *)sptr; + size_t size; + + if(!sptr) { + _ASN_CTFAIL(app_key, td, sptr, + "%s: value not given (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + size = UTF8String_length(st); + if((ssize_t)size < 0) { + _ASN_CTFAIL(app_key, td, sptr, + "%s: UTF-8: broken encoding (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + if((size >= 1 && size <= 64)) { + /* Constraint check succeeded */ + return 0; + } else { + _ASN_CTFAIL(app_key, td, sptr, + "%s: constraint failed (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } +} + +static asn_TYPE_member_t asn_MBR_login_6[] = { { ATF_NOFLAGS, 0, offsetof(struct login, choice.guestLogin), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -36,23 +68,23 @@ static asn_TYPE_member_t asn_MBR_login_5[] = { "unauthenticatedLogin" }, }; -static asn_TYPE_tag2member_t asn_MAP_login_tag2el_5[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* guestLogin at 101 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* authenticatedLogin at 102 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* unauthenticatedLogin at 104 */ +static asn_TYPE_tag2member_t asn_MAP_login_tag2el_6[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* guestLogin at 103 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* authenticatedLogin at 104 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* unauthenticatedLogin at 106 */ }; -static asn_CHOICE_specifics_t asn_SPC_login_specs_5 = { +static asn_CHOICE_specifics_t asn_SPC_login_specs_6 = { sizeof(struct login), offsetof(struct login, _asn_ctx), offsetof(struct login, present), sizeof(((struct login *)0)->present), - asn_MAP_login_tag2el_5, + asn_MAP_login_tag2el_6, 3, /* Count of tags in the map */ 0, 3 /* Extensions start */ }; static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_login_5 = { +asn_TYPE_descriptor_t asn_DEF_login_6 = { "login", "login", CHOICE_free, @@ -69,9 +101,9 @@ asn_TYPE_descriptor_t asn_DEF_login_5 = { 0, /* No tags (pointer) */ 0, /* No tags (count) */ 0, /* No PER visible constraints */ - asn_MBR_login_5, + asn_MBR_login_6, 3, /* Elements count */ - &asn_SPC_login_specs_5 /* Additional specs */ + &asn_SPC_login_specs_6 /* Additional specs */ }; static asn_TYPE_member_t asn_MBR_InitMessage_1[] = { @@ -93,7 +125,7 @@ static asn_TYPE_member_t asn_MBR_InitMessage_1[] = { 0, "buildId" }, - { ATF_POINTER, 1, offsetof(struct InitMessage, myLastSessionId), + { ATF_POINTER, 2, offsetof(struct InitMessage, myLastSessionId), (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, &asn_DEF_Guid, @@ -102,10 +134,19 @@ static asn_TYPE_member_t asn_MBR_InitMessage_1[] = { 0, "myLastSessionId" }, + { ATF_POINTER, 1, offsetof(struct InitMessage, authServerPassword), + (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), + 0, + &asn_DEF_UTF8String, + memb_authServerPassword_constraint_1, + 0, /* PER is not compiled, use -gen-PER */ + 0, + "authServerPassword" + }, { ATF_NOFLAGS, 0, offsetof(struct InitMessage, login), -1 /* Ambiguous tag (CHOICE?) */, 0, - &asn_DEF_login_5, + &asn_DEF_login_6, 0, /* Defer constraints checking to the member type */ 0, /* PER is not compiled, use -gen-PER */ 0, @@ -117,21 +158,22 @@ static ber_tlv_tag_t asn_DEF_InitMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_InitMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* buildId at 98 */ - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 2, 0, 0 }, /* myLastSessionId at 99 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 }, /* requestedVersion at 97 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 3, 0, 0 }, /* guestLogin at 101 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 3, 0, 0 }, /* authenticatedLogin at 102 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 3, 0, 0 } /* unauthenticatedLogin at 104 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* buildId at 99 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 2, 0, 0 }, /* myLastSessionId at 100 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 3, 0, 0 }, /* authServerPassword at 101 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 }, /* requestedVersion at 98 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 4, 0, 0 }, /* guestLogin at 103 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 4, 0, 0 }, /* authenticatedLogin at 104 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 4, 0, 0 } /* unauthenticatedLogin at 106 */ }; static asn_SEQUENCE_specifics_t asn_SPC_InitMessage_specs_1 = { sizeof(struct InitMessage), offsetof(struct InitMessage, _asn_ctx), asn_MAP_InitMessage_tag2el_1, - 6, /* Count of tags in the map */ + 7, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ - 3, /* Start extensions */ - 5 /* Stop extensions */ + 4, /* Start extensions */ + 6 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_InitMessage = { "InitMessage", @@ -153,7 +195,7 @@ asn_TYPE_descriptor_t asn_DEF_InitMessage = { /sizeof(asn_DEF_InitMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_InitMessage_1, - 4, /* Elements count */ + 5, /* Elements count */ &asn_SPC_InitMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/InitMessage.h b/src/third_party/asn1/InitMessage.h index cc1f224c..13e508ca 100644 --- a/src/third_party/asn1/InitMessage.h +++ b/src/third_party/asn1/InitMessage.h @@ -15,6 +15,7 @@ #include "Version.h" #include #include "Guid.h" +#include #include "GuestLogin.h" #include "AuthenticatedLogin.h" #include "UnauthenticatedLogin.h" @@ -41,6 +42,7 @@ extern "C" { Version_t requestedVersion; long buildId; Guid_t *myLastSessionId /* OPTIONAL */; + UTF8String_t *authServerPassword /* OPTIONAL */; struct login { login_PR present; union InitMessage__login_u { diff --git a/src/third_party/asn1/InviteNotifyMessage.c b/src/third_party/asn1/InviteNotifyMessage.c index 26e981b8..d837b839 100644 --- a/src/third_party/asn1/InviteNotifyMessage.c +++ b/src/third_party/asn1/InviteNotifyMessage.c @@ -41,9 +41,9 @@ static ber_tlv_tag_t asn_DEF_InviteNotifyMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_InviteNotifyMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* gameId at 412 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* playerIdWho at 413 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 } /* playerIdByWhom at 415 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* gameId at 415 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* playerIdWho at 416 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 } /* playerIdByWhom at 418 */ }; static asn_SEQUENCE_specifics_t asn_SPC_InviteNotifyMessage_specs_1 = { sizeof(struct InviteNotifyMessage), diff --git a/src/third_party/asn1/InvitePlayerToGameMessage.c b/src/third_party/asn1/InvitePlayerToGameMessage.c index 23d2fbdb..f6cf682f 100644 --- a/src/third_party/asn1/InvitePlayerToGameMessage.c +++ b/src/third_party/asn1/InvitePlayerToGameMessage.c @@ -32,8 +32,8 @@ static ber_tlv_tag_t asn_DEF_InvitePlayerToGameMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_InvitePlayerToGameMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 407 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerId at 409 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 410 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerId at 412 */ }; static asn_SEQUENCE_specifics_t asn_SPC_InvitePlayerToGameMessage_specs_1 = { sizeof(struct InvitePlayerToGameMessage), diff --git a/src/third_party/asn1/JoinExistingGame.c b/src/third_party/asn1/JoinExistingGame.c index 13aa5df2..a47779ed 100644 --- a/src/third_party/asn1/JoinExistingGame.c +++ b/src/third_party/asn1/JoinExistingGame.c @@ -7,6 +7,38 @@ #include "JoinExistingGame.h" +static int +memb_password_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, + asn_app_constraint_failed_f *ctfailcb, void *app_key) { + const UTF8String_t *st = (const UTF8String_t *)sptr; + size_t size; + + if(!sptr) { + _ASN_CTFAIL(app_key, td, sptr, + "%s: value not given (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + size = UTF8String_length(st); + if((ssize_t)size < 0) { + _ASN_CTFAIL(app_key, td, sptr, + "%s: UTF-8: broken encoding (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + if((size >= 1 && size <= 64)) { + /* Constraint check succeeded */ + return 0; + } else { + _ASN_CTFAIL(app_key, td, sptr, + "%s: constraint failed (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } +} + static asn_TYPE_member_t asn_MBR_JoinExistingGame_1[] = { { ATF_NOFLAGS, 0, offsetof(struct JoinExistingGame, gameId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), @@ -17,21 +49,31 @@ static asn_TYPE_member_t asn_MBR_JoinExistingGame_1[] = { 0, "gameId" }, + { ATF_POINTER, 1, offsetof(struct JoinExistingGame, password), + (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), + 0, + &asn_DEF_UTF8String, + memb_password_constraint_1, + 0, /* PER is not compiled, use -gen-PER */ + 0, + "password" + }, }; static ber_tlv_tag_t asn_DEF_JoinExistingGame_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_JoinExistingGame_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 292 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 292 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 } /* password at 293 */ }; static asn_SEQUENCE_specifics_t asn_SPC_JoinExistingGame_specs_1 = { sizeof(struct JoinExistingGame), offsetof(struct JoinExistingGame, _asn_ctx), asn_MAP_JoinExistingGame_tag2el_1, - 1, /* Count of tags in the map */ + 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ - 0, /* Start extensions */ - 2 /* Stop extensions */ + 1, /* Start extensions */ + 3 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_JoinExistingGame = { "JoinExistingGame", @@ -53,7 +95,7 @@ asn_TYPE_descriptor_t asn_DEF_JoinExistingGame = { /sizeof(asn_DEF_JoinExistingGame_tags_1[0]), /* 1 */ 0, /* No PER visible constraints */ asn_MBR_JoinExistingGame_1, - 1, /* Elements count */ + 2, /* Elements count */ &asn_SPC_JoinExistingGame_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/JoinExistingGame.h b/src/third_party/asn1/JoinExistingGame.h index cd16ffa4..86ff52ef 100644 --- a/src/third_party/asn1/JoinExistingGame.h +++ b/src/third_party/asn1/JoinExistingGame.h @@ -13,6 +13,7 @@ /* Including external dependencies */ #include "NonZeroId.h" +#include #include #ifdef __cplusplus @@ -22,6 +23,7 @@ extern "C" { /* JoinExistingGame */ typedef struct JoinExistingGame { NonZeroId_t gameId; + UTF8String_t *password /* OPTIONAL */; /* * This type is extensible, * possible extensions are below. diff --git a/src/third_party/asn1/JoinGameAck.c b/src/third_party/asn1/JoinGameAck.c index 3c8f0be7..7fa53fab 100644 --- a/src/third_party/asn1/JoinGameAck.c +++ b/src/third_party/asn1/JoinGameAck.c @@ -31,8 +31,8 @@ static ber_tlv_tag_t asn_DEF_JoinGameAck_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_JoinGameAck_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 0, 0, 0 }, /* areYouGameAdmin at 311 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 } /* gameInfo at 313 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 0, 0, 0 }, /* areYouGameAdmin at 314 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 } /* gameInfo at 316 */ }; static asn_SEQUENCE_specifics_t asn_SPC_JoinGameAck_specs_1 = { sizeof(struct JoinGameAck), diff --git a/src/third_party/asn1/JoinGameFailed.c b/src/third_party/asn1/JoinGameFailed.c index 75c3f799..edec88bc 100644 --- a/src/third_party/asn1/JoinGameFailed.c +++ b/src/third_party/asn1/JoinGameFailed.c @@ -157,7 +157,7 @@ static ber_tlv_tag_t asn_DEF_JoinGameFailed_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_JoinGameFailed_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* joinGameFailureReason at 317 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* joinGameFailureReason at 320 */ }; static asn_SEQUENCE_specifics_t asn_SPC_JoinGameFailed_specs_1 = { sizeof(struct JoinGameFailed), diff --git a/src/third_party/asn1/JoinGameReplyMessage.c b/src/third_party/asn1/JoinGameReplyMessage.c index 671f4ea8..a2fd843c 100644 --- a/src/third_party/asn1/JoinGameReplyMessage.c +++ b/src/third_party/asn1/JoinGameReplyMessage.c @@ -28,8 +28,8 @@ static asn_TYPE_member_t asn_MBR_joinGameResult_3[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_joinGameResult_tag2el_3[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* joinGameAck at 305 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* joinGameFailed at 307 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* joinGameAck at 308 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* joinGameFailed at 310 */ }; static asn_CHOICE_specifics_t asn_SPC_joinGameResult_specs_3 = { sizeof(struct joinGameResult), @@ -89,9 +89,9 @@ static ber_tlv_tag_t asn_DEF_JoinGameReplyMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_JoinGameReplyMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 303 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* joinGameAck at 305 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* joinGameFailed at 307 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 306 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* joinGameAck at 308 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* joinGameFailed at 310 */ }; static asn_SEQUENCE_specifics_t asn_SPC_JoinGameReplyMessage_specs_1 = { sizeof(struct JoinGameReplyMessage), diff --git a/src/third_party/asn1/JoinGameRequestMessage.c b/src/third_party/asn1/JoinGameRequestMessage.c index bb23795e..1641b44e 100644 --- a/src/third_party/asn1/JoinGameRequestMessage.c +++ b/src/third_party/asn1/JoinGameRequestMessage.c @@ -7,38 +7,6 @@ #include "JoinGameRequestMessage.h" -static int -memb_password_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_constraint_failed_f *ctfailcb, void *app_key) { - const UTF8String_t *st = (const UTF8String_t *)sptr; - size_t size; - - if(!sptr) { - _ASN_CTFAIL(app_key, td, sptr, - "%s: value not given (%s:%d)", - td->name, __FILE__, __LINE__); - return -1; - } - - size = UTF8String_length(st); - if((ssize_t)size < 0) { - _ASN_CTFAIL(app_key, td, sptr, - "%s: UTF-8: broken encoding (%s:%d)", - td->name, __FILE__, __LINE__); - return -1; - } - - if((size >= 1 && size <= 64)) { - /* Constraint check succeeded */ - return 0; - } else { - _ASN_CTFAIL(app_key, td, sptr, - "%s: constraint failed (%s:%d)", - td->name, __FILE__, __LINE__); - return -1; - } -} - static asn_TYPE_member_t asn_MBR_joinGameAction_2[] = { { ATF_NOFLAGS, 0, offsetof(struct joinGameAction, choice.joinExistingGame), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), @@ -69,9 +37,9 @@ static asn_TYPE_member_t asn_MBR_joinGameAction_2[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_joinGameAction_tag2el_2[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* joinExistingGame at 282 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* joinNewGame at 283 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* rejoinExistingGame at 285 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* joinExistingGame at 284 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* joinNewGame at 285 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* rejoinExistingGame at 287 */ }; static asn_CHOICE_specifics_t asn_SPC_joinGameAction_specs_2 = { sizeof(struct joinGameAction), @@ -116,15 +84,6 @@ static asn_TYPE_member_t asn_MBR_JoinGameRequestMessage_1[] = { 0, "joinGameAction" }, - { ATF_POINTER, 1, offsetof(struct JoinGameRequestMessage, password), - (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), - 0, - &asn_DEF_UTF8String, - memb_password_constraint_1, - 0, /* PER is not compiled, use -gen-PER */ - 0, - "password" - }, { ATF_NOFLAGS, 0, offsetof(struct JoinGameRequestMessage, autoLeave), (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 0, @@ -140,20 +99,19 @@ static ber_tlv_tag_t asn_DEF_JoinGameRequestMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_JoinGameRequestMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 2, 0, 0 }, /* autoLeave at 287 */ - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 }, /* password at 286 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* joinExistingGame at 282 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* joinNewGame at 283 */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 0, 0, 0 } /* rejoinExistingGame at 285 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* autoLeave at 288 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* joinExistingGame at 284 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* joinNewGame at 285 */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 0, 0, 0 } /* rejoinExistingGame at 287 */ }; static asn_SEQUENCE_specifics_t asn_SPC_JoinGameRequestMessage_specs_1 = { sizeof(struct JoinGameRequestMessage), offsetof(struct JoinGameRequestMessage, _asn_ctx), asn_MAP_JoinGameRequestMessage_tag2el_1, - 5, /* Count of tags in the map */ + 4, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ - 2, /* Start extensions */ - 4 /* Stop extensions */ + 1, /* Start extensions */ + 3 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_JoinGameRequestMessage = { "JoinGameRequestMessage", @@ -175,7 +133,7 @@ asn_TYPE_descriptor_t asn_DEF_JoinGameRequestMessage = { /sizeof(asn_DEF_JoinGameRequestMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_JoinGameRequestMessage_1, - 3, /* Elements count */ + 2, /* Elements count */ &asn_SPC_JoinGameRequestMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/JoinGameRequestMessage.h b/src/third_party/asn1/JoinGameRequestMessage.h index 388a8a2d..c2283c32 100644 --- a/src/third_party/asn1/JoinGameRequestMessage.h +++ b/src/third_party/asn1/JoinGameRequestMessage.h @@ -12,7 +12,6 @@ #include /* Including external dependencies */ -#include #include #include "JoinExistingGame.h" #include "JoinNewGame.h" @@ -52,7 +51,6 @@ extern "C" { /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } joinGameAction; - UTF8String_t *password /* OPTIONAL */; BOOLEAN_t autoLeave; /* * This type is extensible, diff --git a/src/third_party/asn1/JoinNewGame.c b/src/third_party/asn1/JoinNewGame.c index 8fb10fdb..98c01f3c 100644 --- a/src/third_party/asn1/JoinNewGame.c +++ b/src/third_party/asn1/JoinNewGame.c @@ -7,6 +7,38 @@ #include "JoinNewGame.h" +static int +memb_password_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, + asn_app_constraint_failed_f *ctfailcb, void *app_key) { + const UTF8String_t *st = (const UTF8String_t *)sptr; + size_t size; + + if(!sptr) { + _ASN_CTFAIL(app_key, td, sptr, + "%s: value not given (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + size = UTF8String_length(st); + if((ssize_t)size < 0) { + _ASN_CTFAIL(app_key, td, sptr, + "%s: UTF-8: broken encoding (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + if((size >= 1 && size <= 64)) { + /* Constraint check succeeded */ + return 0; + } else { + _ASN_CTFAIL(app_key, td, sptr, + "%s: constraint failed (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } +} + static asn_TYPE_member_t asn_MBR_JoinNewGame_1[] = { { ATF_NOFLAGS, 0, offsetof(struct JoinNewGame, gameInfo), (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), @@ -17,21 +49,31 @@ static asn_TYPE_member_t asn_MBR_JoinNewGame_1[] = { 0, "gameInfo" }, + { ATF_POINTER, 1, offsetof(struct JoinNewGame, password), + (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), + 0, + &asn_DEF_UTF8String, + memb_password_constraint_1, + 0, /* PER is not compiled, use -gen-PER */ + 0, + "password" + }, }; static ber_tlv_tag_t asn_DEF_JoinNewGame_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_JoinNewGame_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* gameInfo at 296 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 }, /* password at 298 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* gameInfo at 297 */ }; static asn_SEQUENCE_specifics_t asn_SPC_JoinNewGame_specs_1 = { sizeof(struct JoinNewGame), offsetof(struct JoinNewGame, _asn_ctx), asn_MAP_JoinNewGame_tag2el_1, - 1, /* Count of tags in the map */ + 2, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ - 0, /* Start extensions */ - 2 /* Stop extensions */ + 1, /* Start extensions */ + 3 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_JoinNewGame = { "JoinNewGame", @@ -53,7 +95,7 @@ asn_TYPE_descriptor_t asn_DEF_JoinNewGame = { /sizeof(asn_DEF_JoinNewGame_tags_1[0]), /* 1 */ 0, /* No PER visible constraints */ asn_MBR_JoinNewGame_1, - 1, /* Elements count */ + 2, /* Elements count */ &asn_SPC_JoinNewGame_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/JoinNewGame.h b/src/third_party/asn1/JoinNewGame.h index 09015753..98dab381 100644 --- a/src/third_party/asn1/JoinNewGame.h +++ b/src/third_party/asn1/JoinNewGame.h @@ -13,6 +13,7 @@ /* Including external dependencies */ #include "NetGameInfo.h" +#include #include #ifdef __cplusplus @@ -22,6 +23,7 @@ extern "C" { /* JoinNewGame */ typedef struct JoinNewGame { NetGameInfo_t gameInfo; + UTF8String_t *password /* OPTIONAL */; /* * This type is extensible, * possible extensions are below. diff --git a/src/third_party/asn1/KickPetitionUpdateMessage.c b/src/third_party/asn1/KickPetitionUpdateMessage.c index dd51e1db..8dce4f62 100644 --- a/src/third_party/asn1/KickPetitionUpdateMessage.c +++ b/src/third_party/asn1/KickPetitionUpdateMessage.c @@ -134,11 +134,11 @@ static ber_tlv_tag_t asn_DEF_KickPetitionUpdateMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_KickPetitionUpdateMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 4 }, /* gameId at 639 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 3 }, /* petitionId at 640 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 2 }, /* numVotesAgainstKicking at 641 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 1 }, /* numVotesInFavourOfKicking at 642 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -4, 0 } /* numVotesNeededToKick at 643 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 4 }, /* gameId at 648 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 3 }, /* petitionId at 649 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 2 }, /* numVotesAgainstKicking at 650 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 1 }, /* numVotesInFavourOfKicking at 651 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -4, 0 } /* numVotesNeededToKick at 652 */ }; static asn_SEQUENCE_specifics_t asn_SPC_KickPetitionUpdateMessage_specs_1 = { sizeof(struct KickPetitionUpdateMessage), diff --git a/src/third_party/asn1/KickPlayerRequestMessage.c b/src/third_party/asn1/KickPlayerRequestMessage.c index edec60f1..5cbf453a 100644 --- a/src/third_party/asn1/KickPlayerRequestMessage.c +++ b/src/third_party/asn1/KickPlayerRequestMessage.c @@ -32,8 +32,8 @@ static ber_tlv_tag_t asn_DEF_KickPlayerRequestMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_KickPlayerRequestMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 398 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerId at 400 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 401 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerId at 403 */ }; static asn_SEQUENCE_specifics_t asn_SPC_KickPlayerRequestMessage_specs_1 = { sizeof(struct KickPlayerRequestMessage), diff --git a/src/third_party/asn1/LeaveGameRequestMessage.c b/src/third_party/asn1/LeaveGameRequestMessage.c index 606f756a..4e504ac3 100644 --- a/src/third_party/asn1/LeaveGameRequestMessage.c +++ b/src/third_party/asn1/LeaveGameRequestMessage.c @@ -23,7 +23,7 @@ static ber_tlv_tag_t asn_DEF_LeaveGameRequestMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_LeaveGameRequestMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 404 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 407 */ }; static asn_SEQUENCE_specifics_t asn_SPC_LeaveGameRequestMessage_specs_1 = { sizeof(struct LeaveGameRequestMessage), diff --git a/src/third_party/asn1/MyActionRequestMessage.c b/src/third_party/asn1/MyActionRequestMessage.c index 331b2da8..1b87bc9f 100644 --- a/src/third_party/asn1/MyActionRequestMessage.c +++ b/src/third_party/asn1/MyActionRequestMessage.c @@ -59,11 +59,11 @@ static ber_tlv_tag_t asn_DEF_MyActionRequestMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_MyActionRequestMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* gameId at 489 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* handNum at 490 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -2, 0 }, /* myRelativeBet at 494 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 1 }, /* gameState at 491 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 3, -1, 0 } /* myAction at 492 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* gameId at 493 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* handNum at 494 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -2, 0 }, /* myRelativeBet at 498 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 1 }, /* gameState at 495 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 3, -1, 0 } /* myAction at 496 */ }; static asn_SEQUENCE_specifics_t asn_SPC_MyActionRequestMessage_specs_1 = { sizeof(struct MyActionRequestMessage), diff --git a/src/third_party/asn1/NetGameInfo.c b/src/third_party/asn1/NetGameInfo.c index 72cae6ed..305cdf8e 100644 --- a/src/third_party/asn1/NetGameInfo.c +++ b/src/third_party/asn1/NetGameInfo.c @@ -455,8 +455,8 @@ static asn_TYPE_member_t asn_MBR_raiseIntervalMode_9[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_raiseIntervalMode_tag2el_9[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* raiseEveryHands at 341 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* raiseEveryMinutes at 342 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* raiseEveryHands at 344 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* raiseEveryMinutes at 345 */ }; static asn_CHOICE_specifics_t asn_SPC_raiseIntervalMode_specs_9 = { sizeof(struct raiseIntervalMode), @@ -695,19 +695,19 @@ static ber_tlv_tag_t asn_DEF_NetGameInfo_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_NetGameInfo_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, 0, 6 }, /* maxNumPlayers at 339 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -1, 5 }, /* proposedGuiSpeed at 349 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 6, -2, 4 }, /* delayBetweenHands at 350 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 7, -3, 3 }, /* playerActionTimeout at 351 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 8, -4, 2 }, /* firstSmallBlind at 352 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 9, -5, 1 }, /* endRaiseSmallBlindValue at 353 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 10, -6, 0 }, /* startMoney at 354 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 1 }, /* netGameType at 334 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 4, -1, 0 }, /* endRaiseMode at 345 */ - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 }, /* gameName at 332 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 11, 0, 0 }, /* manualBlinds at 356 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 3, 0, 0 }, /* raiseEveryHands at 341 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 3, 0, 0 } /* raiseEveryMinutes at 342 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, 0, 6 }, /* maxNumPlayers at 342 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -1, 5 }, /* proposedGuiSpeed at 352 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 6, -2, 4 }, /* delayBetweenHands at 353 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 7, -3, 3 }, /* playerActionTimeout at 354 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 8, -4, 2 }, /* firstSmallBlind at 355 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 9, -5, 1 }, /* endRaiseSmallBlindValue at 356 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 10, -6, 0 }, /* startMoney at 357 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 1 }, /* netGameType at 337 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 4, -1, 0 }, /* endRaiseMode at 348 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 }, /* gameName at 335 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 11, 0, 0 }, /* manualBlinds at 359 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 3, 0, 0 }, /* raiseEveryHands at 344 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 3, 0, 0 } /* raiseEveryMinutes at 345 */ }; static asn_SEQUENCE_specifics_t asn_SPC_NetGameInfo_specs_1 = { sizeof(struct NetGameInfo), diff --git a/src/third_party/asn1/NetGameInfo.h b/src/third_party/asn1/NetGameInfo.h index 9bc25381..492ef1b2 100644 --- a/src/third_party/asn1/NetGameInfo.h +++ b/src/third_party/asn1/NetGameInfo.h @@ -35,16 +35,16 @@ extern "C" { } e_netGameType; typedef enum raiseIntervalMode_PR { - raiseIntervalMode_PR_NOTHING, /* No components present */ - raiseIntervalMode_PR_raiseEveryHands, - raiseIntervalMode_PR_raiseEveryMinutes, - /* Extensions may appear below */ + raiseIntervalMode_PR_NOTHING, /* No components present */ + raiseIntervalMode_PR_raiseEveryHands, + raiseIntervalMode_PR_raiseEveryMinutes, + /* Extensions may appear below */ } raiseIntervalMode_PR; typedef enum endRaiseMode { - endRaiseMode_doubleBlinds = 1, - endRaiseMode_raiseByEndValue = 2, - endRaiseMode_keepLastBlind = 3 + endRaiseMode_doubleBlinds = 1, + endRaiseMode_raiseByEndValue = 2, + endRaiseMode_keepLastBlind = 3 } e_endRaiseMode; /* NetGameInfo */ diff --git a/src/third_party/asn1/OCTET_STRING.c b/src/third_party/asn1/OCTET_STRING.c index 89b0aeba..aef5624b 100644 --- a/src/third_party/asn1/OCTET_STRING.c +++ b/src/third_party/asn1/OCTET_STRING.c @@ -1411,10 +1411,10 @@ OCTET_STRING_decode_uper(asn_codec_ctx_t *opt_codec_ctx, ssize_t consumed_myself = 0; int repeat; enum { - OS__BPC_BIT = 0, - OS__BPC_CHAR = 1, - OS__BPC_U16 = 2, - OS__BPC_U32 = 4 + OS__BPC_BIT = 0, + OS__BPC_CHAR = 1, + OS__BPC_U16 = 2, + OS__BPC_U32 = 4 } bpc; /* Bytes per character */ unsigned int unit_bits; unsigned int canonical_unit_bits; @@ -1589,10 +1589,10 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td, const uint8_t *buf; int ret; enum { - OS__BPC_BIT = 0, - OS__BPC_CHAR = 1, - OS__BPC_U16 = 2, - OS__BPC_U32 = 4 + OS__BPC_BIT = 0, + OS__BPC_CHAR = 1, + OS__BPC_U16 = 2, + OS__BPC_U32 = 4 } bpc; /* Bytes per character */ int ct_extensible; diff --git a/src/third_party/asn1/OCTET_STRING.h b/src/third_party/asn1/OCTET_STRING.h index bdb0640e..11a94e08 100644 --- a/src/third_party/asn1/OCTET_STRING.h +++ b/src/third_party/asn1/OCTET_STRING.h @@ -71,11 +71,11 @@ extern "C" { int ctx_offset; /* Offset of the asn_struct_ctx_t member */ enum asn_OS_Subvariant { - ASN_OSUBV_ANY, /* The open type (ANY) */ - ASN_OSUBV_BIT, /* BIT STRING */ - ASN_OSUBV_STR, /* String types, not {BMP,Universal}String */ - ASN_OSUBV_U16, /* 16-bit character (BMPString) */ - ASN_OSUBV_U32 /* 32-bit character (UniversalString) */ + ASN_OSUBV_ANY, /* The open type (ANY) */ + ASN_OSUBV_BIT, /* BIT STRING */ + ASN_OSUBV_STR, /* String types, not {BMP,Universal}String */ + ASN_OSUBV_U16, /* 16-bit character (BMPString) */ + ASN_OSUBV_U32 /* 32-bit character (UniversalString) */ } subvariant; } asn_OCTET_STRING_specifics_t; diff --git a/src/third_party/asn1/PlainCards.c b/src/third_party/asn1/PlainCards.c index 51ab5c2a..f2ceafa5 100644 --- a/src/third_party/asn1/PlainCards.c +++ b/src/third_party/asn1/PlainCards.c @@ -31,8 +31,8 @@ static ber_tlv_tag_t asn_DEF_PlainCards_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_PlainCards_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* plainCard1 at 465 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* plainCard2 at 467 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* plainCard1 at 469 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* plainCard2 at 471 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlainCards_specs_1 = { sizeof(struct PlainCards), diff --git a/src/third_party/asn1/PlayerAllIn.c b/src/third_party/asn1/PlayerAllIn.c index b9b6879a..f4bce2ae 100644 --- a/src/third_party/asn1/PlayerAllIn.c +++ b/src/third_party/asn1/PlayerAllIn.c @@ -40,9 +40,9 @@ static ber_tlv_tag_t asn_DEF_PlayerAllIn_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_PlayerAllIn_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* playerId at 542 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* allInCard1 at 543 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 } /* allInCard2 at 545 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* playerId at 546 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* allInCard1 at 547 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 } /* allInCard2 at 549 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayerAllIn_specs_1 = { sizeof(struct PlayerAllIn), diff --git a/src/third_party/asn1/PlayerIdChangedMessage.c b/src/third_party/asn1/PlayerIdChangedMessage.c new file mode 100644 index 00000000..adf99d32 --- /dev/null +++ b/src/third_party/asn1/PlayerIdChangedMessage.c @@ -0,0 +1,70 @@ +/* + * Generated by asn1c-0.9.23 (http://lionet.info/asn1c) + * From ASN.1 module "POKERTH-PROTOCOL" + * found in "../../../docs/pokerth.asn1" + * `asn1c -fskeletons-copy` + */ + +#include "PlayerIdChangedMessage.h" + +static asn_TYPE_member_t asn_MBR_PlayerIdChangedMessage_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct PlayerIdChangedMessage, oldPlayerId), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), + 0, + &asn_DEF_NonZeroId, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "oldPlayerId" + }, + { ATF_NOFLAGS, 0, offsetof(struct PlayerIdChangedMessage, newPlayerId), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), + 0, + &asn_DEF_NonZeroId, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "newPlayerId" + }, +}; +static ber_tlv_tag_t asn_DEF_PlayerIdChangedMessage_tags_1[] = { + (ASN_TAG_CLASS_APPLICATION | (36 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static asn_TYPE_tag2member_t asn_MAP_PlayerIdChangedMessage_tag2el_1[] = { + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* oldPlayerId at 592 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* newPlayerId at 594 */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_PlayerIdChangedMessage_specs_1 = { + sizeof(struct PlayerIdChangedMessage), + offsetof(struct PlayerIdChangedMessage, _asn_ctx), + asn_MAP_PlayerIdChangedMessage_tag2el_1, + 2, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* Start extensions */ + 3 /* Stop extensions */ +}; +asn_TYPE_descriptor_t asn_DEF_PlayerIdChangedMessage = { + "PlayerIdChangedMessage", + "PlayerIdChangedMessage", + SEQUENCE_free, + SEQUENCE_print, + SEQUENCE_constraint, + SEQUENCE_decode_ber, + SEQUENCE_encode_der, + SEQUENCE_decode_xer, + SEQUENCE_encode_xer, + 0, 0, /* No PER support, use "-gen-PER" to enable */ + 0, /* Use generic outmost tag fetcher */ + asn_DEF_PlayerIdChangedMessage_tags_1, + sizeof(asn_DEF_PlayerIdChangedMessage_tags_1) + /sizeof(asn_DEF_PlayerIdChangedMessage_tags_1[0]) - 1, /* 1 */ + asn_DEF_PlayerIdChangedMessage_tags_1, /* Same as above */ + sizeof(asn_DEF_PlayerIdChangedMessage_tags_1) + /sizeof(asn_DEF_PlayerIdChangedMessage_tags_1[0]), /* 2 */ + 0, /* No PER visible constraints */ + asn_MBR_PlayerIdChangedMessage_1, + 2, /* Elements count */ + &asn_SPC_PlayerIdChangedMessage_specs_1 /* Additional specs */ +}; + diff --git a/src/third_party/asn1/PlayerIdChangedMessage.h b/src/third_party/asn1/PlayerIdChangedMessage.h new file mode 100644 index 00000000..db337d78 --- /dev/null +++ b/src/third_party/asn1/PlayerIdChangedMessage.h @@ -0,0 +1,43 @@ +/* + * Generated by asn1c-0.9.23 (http://lionet.info/asn1c) + * From ASN.1 module "POKERTH-PROTOCOL" + * found in "../../../docs/pokerth.asn1" + * `asn1c -fskeletons-copy` + */ + +#ifndef _PlayerIdChangedMessage_H_ +#define _PlayerIdChangedMessage_H_ + + +#include + +/* Including external dependencies */ +#include "NonZeroId.h" +#include + +#ifdef __cplusplus +extern "C" { +#endif + + /* PlayerIdChangedMessage */ + typedef struct PlayerIdChangedMessage { + NonZeroId_t oldPlayerId; + NonZeroId_t newPlayerId; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; + } PlayerIdChangedMessage_t; + + /* Implementation */ + extern asn_TYPE_descriptor_t asn_DEF_PlayerIdChangedMessage; + +#ifdef __cplusplus +} +#endif + +#endif /* _PlayerIdChangedMessage_H_ */ +#include diff --git a/src/third_party/asn1/PlayerInfoData.c b/src/third_party/asn1/PlayerInfoData.c index ddd93ccc..51702528 100644 --- a/src/third_party/asn1/PlayerInfoData.c +++ b/src/third_party/asn1/PlayerInfoData.c @@ -95,8 +95,8 @@ static ber_tlv_tag_t asn_DEF_avatarData_tags_6[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_avatarData_tag2el_6[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 }, /* avatar at 265 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* avatarType at 263 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 }, /* avatar at 267 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* avatarType at 265 */ }; static asn_SEQUENCE_specifics_t asn_SPC_avatarData_specs_6 = { sizeof(struct avatarData), @@ -183,11 +183,11 @@ static ber_tlv_tag_t asn_DEF_PlayerInfoData_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_PlayerInfoData_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* isHuman at 259 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 }, /* playerRights at 260 */ - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 1 }, /* playerName at 258 */ - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 3, -1, 0 }, /* countryCode at 261 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 4, 0, 0 } /* avatarData at 263 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* isHuman at 261 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 }, /* playerRights at 262 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 1 }, /* playerName at 260 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 3, -1, 0 }, /* countryCode at 263 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 4, 0, 0 } /* avatarData at 265 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayerInfoData_specs_1 = { sizeof(struct PlayerInfoData), diff --git a/src/third_party/asn1/PlayerInfoReplyMessage.c b/src/third_party/asn1/PlayerInfoReplyMessage.c index 6635f25d..277283a9 100644 --- a/src/third_party/asn1/PlayerInfoReplyMessage.c +++ b/src/third_party/asn1/PlayerInfoReplyMessage.c @@ -28,8 +28,8 @@ static asn_TYPE_member_t asn_MBR_playerInfoResult_3[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_playerInfoResult_tag2el_3[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* playerInfoData at 246 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* unknownPlayerInfo at 248 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* playerInfoData at 248 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* unknownPlayerInfo at 250 */ }; static asn_CHOICE_specifics_t asn_SPC_playerInfoResult_specs_3 = { sizeof(struct playerInfoResult), @@ -89,9 +89,9 @@ static ber_tlv_tag_t asn_DEF_PlayerInfoReplyMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_PlayerInfoReplyMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* playerId at 244 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* playerInfoData at 246 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* unknownPlayerInfo at 248 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* playerId at 246 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* playerInfoData at 248 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* unknownPlayerInfo at 250 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayerInfoReplyMessage_specs_1 = { sizeof(struct PlayerInfoReplyMessage), diff --git a/src/third_party/asn1/PlayerInfoRequestMessage.c b/src/third_party/asn1/PlayerInfoRequestMessage.c index 2500a8d3..1fce6010 100644 --- a/src/third_party/asn1/PlayerInfoRequestMessage.c +++ b/src/third_party/asn1/PlayerInfoRequestMessage.c @@ -23,7 +23,7 @@ static ber_tlv_tag_t asn_DEF_PlayerInfoRequestMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_PlayerInfoRequestMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 241 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 243 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayerInfoRequestMessage_specs_1 = { sizeof(struct PlayerInfoRequestMessage), diff --git a/src/third_party/asn1/PlayerListMessage.c b/src/third_party/asn1/PlayerListMessage.c index afe9ae0a..15736f94 100644 --- a/src/third_party/asn1/PlayerListMessage.c +++ b/src/third_party/asn1/PlayerListMessage.c @@ -149,8 +149,8 @@ static ber_tlv_tag_t asn_DEF_PlayerListMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_PlayerListMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* playerId at 191 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* playerListNotification at 193 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* playerId at 193 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* playerListNotification at 195 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayerListMessage_specs_1 = { sizeof(struct PlayerListMessage), diff --git a/src/third_party/asn1/PlayerResult.c b/src/third_party/asn1/PlayerResult.c index 7800ae51..0b83992d 100644 --- a/src/third_party/asn1/PlayerResult.c +++ b/src/third_party/asn1/PlayerResult.c @@ -146,13 +146,13 @@ static ber_tlv_tag_t asn_DEF_PlayerResult_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_PlayerResult_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 5 }, /* playerId at 560 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 4 }, /* resultCard1 at 561 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 3 }, /* resultCard2 at 562 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -3, 2 }, /* cardsValue at 564 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -4, 1 }, /* moneyWon at 565 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 6, -5, 0 }, /* playerMoney at 567 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 3, 0, 0 } /* bestHandPosition at 563 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 5 }, /* playerId at 564 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 4 }, /* resultCard1 at 565 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 3 }, /* resultCard2 at 566 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -3, 2 }, /* cardsValue at 568 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -4, 1 }, /* moneyWon at 569 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 6, -5, 0 }, /* playerMoney at 571 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 3, 0, 0 } /* bestHandPosition at 567 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayerResult_specs_1 = { sizeof(struct PlayerResult), diff --git a/src/third_party/asn1/PlayersActionDoneMessage.c b/src/third_party/asn1/PlayersActionDoneMessage.c index 19c9f0cb..2b36d763 100644 --- a/src/third_party/asn1/PlayersActionDoneMessage.c +++ b/src/third_party/asn1/PlayersActionDoneMessage.c @@ -86,14 +86,14 @@ static ber_tlv_tag_t asn_DEF_PlayersActionDoneMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_PlayersActionDoneMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 5 }, /* gameId at 509 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 4 }, /* playerId at 510 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -2, 3 }, /* totalPlayerBet at 513 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -3, 2 }, /* playerMoney at 514 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 6, -4, 1 }, /* highestSet at 515 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 7, -5, 0 }, /* minimumRaise at 517 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 1 }, /* gameState at 511 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 3, -1, 0 } /* playerAction at 512 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 5 }, /* gameId at 513 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 4 }, /* playerId at 514 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -2, 3 }, /* totalPlayerBet at 517 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -3, 2 }, /* playerMoney at 518 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 6, -4, 1 }, /* highestSet at 519 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 7, -5, 0 }, /* minimumRaise at 521 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 1 }, /* gameState at 515 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 3, -1, 0 } /* playerAction at 516 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayersActionDoneMessage_specs_1 = { sizeof(struct PlayersActionDoneMessage), diff --git a/src/third_party/asn1/PlayersTurnMessage.c b/src/third_party/asn1/PlayersTurnMessage.c index 98ebf6c2..d24bab15 100644 --- a/src/third_party/asn1/PlayersTurnMessage.c +++ b/src/third_party/asn1/PlayersTurnMessage.c @@ -41,9 +41,9 @@ static ber_tlv_tag_t asn_DEF_PlayersTurnMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_PlayersTurnMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 483 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* playerId at 484 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 } /* gameState at 486 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 487 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* playerId at 488 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 } /* gameState at 490 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayersTurnMessage_specs_1 = { sizeof(struct PlayersTurnMessage), diff --git a/src/third_party/asn1/PokerTHMessage.c b/src/third_party/asn1/PokerTHMessage.c index ed13e28c..b73d127f 100644 --- a/src/third_party/asn1/PokerTHMessage.c +++ b/src/third_party/asn1/PokerTHMessage.c @@ -332,6 +332,15 @@ static asn_TYPE_member_t asn_MBR_PokerTHMessage_1[] = { 0, "endOfGameMessage" }, + { ATF_NOFLAGS, 0, offsetof(struct PokerTHMessage, choice.playerIdChangedMessage), + (ASN_TAG_CLASS_APPLICATION | (36 << 2)), + 0, + &asn_DEF_PlayerIdChangedMessage, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "playerIdChangedMessage" + }, { ATF_NOFLAGS, 0, offsetof(struct PokerTHMessage, choice.askKickPlayerMessage), (ASN_TAG_CLASS_APPLICATION | (64 << 2)), 0, @@ -532,24 +541,25 @@ static asn_TYPE_tag2member_t asn_MAP_PokerTHMessage_tag2el_1[] = { { (ASN_TAG_CLASS_APPLICATION | (33 << 2)), 33, 0, 0 }, /* showMyCardsRequestMessage at 60 */ { (ASN_TAG_CLASS_APPLICATION | (34 << 2)), 34, 0, 0 }, /* afterHandShowCardsMessage at 61 */ { (ASN_TAG_CLASS_APPLICATION | (35 << 2)), 35, 0, 0 }, /* endOfGameMessage at 62 */ - { (ASN_TAG_CLASS_APPLICATION | (64 << 2)), 36, 0, 0 }, /* askKickPlayerMessage at 63 */ - { (ASN_TAG_CLASS_APPLICATION | (65 << 2)), 37, 0, 0 }, /* askKickDeniedMessage at 64 */ - { (ASN_TAG_CLASS_APPLICATION | (66 << 2)), 38, 0, 0 }, /* startKickPetitionMessage at 65 */ - { (ASN_TAG_CLASS_APPLICATION | (67 << 2)), 39, 0, 0 }, /* voteKickRequestMessage at 66 */ - { (ASN_TAG_CLASS_APPLICATION | (68 << 2)), 40, 0, 0 }, /* voteKickReplyMessage at 67 */ - { (ASN_TAG_CLASS_APPLICATION | (69 << 2)), 41, 0, 0 }, /* kickPetitionUpdateMessage at 68 */ - { (ASN_TAG_CLASS_APPLICATION | (70 << 2)), 42, 0, 0 }, /* endKickPetitionMessage at 69 */ - { (ASN_TAG_CLASS_APPLICATION | (128 << 2)), 43, 0, 0 }, /* statisticsMessage at 70 */ - { (ASN_TAG_CLASS_APPLICATION | (129 << 2)), 44, 0, 0 }, /* chatRequestMessage at 71 */ - { (ASN_TAG_CLASS_APPLICATION | (130 << 2)), 45, 0, 0 }, /* chatMessage at 72 */ - { (ASN_TAG_CLASS_APPLICATION | (131 << 2)), 46, 0, 0 }, /* chatRejectMessage at 73 */ - { (ASN_TAG_CLASS_APPLICATION | (132 << 2)), 47, 0, 0 }, /* dialogMessage at 74 */ - { (ASN_TAG_CLASS_APPLICATION | (133 << 2)), 48, 0, 0 }, /* timeoutWarningMessage at 75 */ - { (ASN_TAG_CLASS_APPLICATION | (134 << 2)), 49, 0, 0 }, /* resetTimeoutMessage at 76 */ - { (ASN_TAG_CLASS_APPLICATION | (135 << 2)), 50, 0, 0 }, /* afkWarningMessage at 77 */ - { (ASN_TAG_CLASS_APPLICATION | (136 << 2)), 51, 0, 0 }, /* reportAvatarMessage at 78 */ - { (ASN_TAG_CLASS_APPLICATION | (137 << 2)), 52, 0, 0 }, /* reportAvatarAckMessage at 79 */ - { (ASN_TAG_CLASS_APPLICATION | (255 << 2)), 53, 0, 0 } /* errorMessage at 81 */ + { (ASN_TAG_CLASS_APPLICATION | (36 << 2)), 36, 0, 0 }, /* playerIdChangedMessage at 63 */ + { (ASN_TAG_CLASS_APPLICATION | (64 << 2)), 37, 0, 0 }, /* askKickPlayerMessage at 64 */ + { (ASN_TAG_CLASS_APPLICATION | (65 << 2)), 38, 0, 0 }, /* askKickDeniedMessage at 65 */ + { (ASN_TAG_CLASS_APPLICATION | (66 << 2)), 39, 0, 0 }, /* startKickPetitionMessage at 66 */ + { (ASN_TAG_CLASS_APPLICATION | (67 << 2)), 40, 0, 0 }, /* voteKickRequestMessage at 67 */ + { (ASN_TAG_CLASS_APPLICATION | (68 << 2)), 41, 0, 0 }, /* voteKickReplyMessage at 68 */ + { (ASN_TAG_CLASS_APPLICATION | (69 << 2)), 42, 0, 0 }, /* kickPetitionUpdateMessage at 69 */ + { (ASN_TAG_CLASS_APPLICATION | (70 << 2)), 43, 0, 0 }, /* endKickPetitionMessage at 70 */ + { (ASN_TAG_CLASS_APPLICATION | (128 << 2)), 44, 0, 0 }, /* statisticsMessage at 71 */ + { (ASN_TAG_CLASS_APPLICATION | (129 << 2)), 45, 0, 0 }, /* chatRequestMessage at 72 */ + { (ASN_TAG_CLASS_APPLICATION | (130 << 2)), 46, 0, 0 }, /* chatMessage at 73 */ + { (ASN_TAG_CLASS_APPLICATION | (131 << 2)), 47, 0, 0 }, /* chatRejectMessage at 74 */ + { (ASN_TAG_CLASS_APPLICATION | (132 << 2)), 48, 0, 0 }, /* dialogMessage at 75 */ + { (ASN_TAG_CLASS_APPLICATION | (133 << 2)), 49, 0, 0 }, /* timeoutWarningMessage at 76 */ + { (ASN_TAG_CLASS_APPLICATION | (134 << 2)), 50, 0, 0 }, /* resetTimeoutMessage at 77 */ + { (ASN_TAG_CLASS_APPLICATION | (135 << 2)), 51, 0, 0 }, /* afkWarningMessage at 78 */ + { (ASN_TAG_CLASS_APPLICATION | (136 << 2)), 52, 0, 0 }, /* reportAvatarMessage at 79 */ + { (ASN_TAG_CLASS_APPLICATION | (137 << 2)), 53, 0, 0 }, /* reportAvatarAckMessage at 80 */ + { (ASN_TAG_CLASS_APPLICATION | (255 << 2)), 54, 0, 0 } /* errorMessage at 82 */ }; static asn_CHOICE_specifics_t asn_SPC_PokerTHMessage_specs_1 = { sizeof(struct PokerTHMessage), @@ -557,9 +567,9 @@ static asn_CHOICE_specifics_t asn_SPC_PokerTHMessage_specs_1 = { offsetof(struct PokerTHMessage, present), sizeof(((struct PokerTHMessage *)0)->present), asn_MAP_PokerTHMessage_tag2el_1, - 54, /* Count of tags in the map */ + 55, /* Count of tags in the map */ 0, - 54 /* Extensions start */ + 55 /* Extensions start */ }; asn_TYPE_descriptor_t asn_DEF_PokerTHMessage = { "PokerTHMessage", @@ -579,7 +589,7 @@ asn_TYPE_descriptor_t asn_DEF_PokerTHMessage = { 0, /* No tags (count) */ 0, /* No PER visible constraints */ asn_MBR_PokerTHMessage_1, - 54, /* Elements count */ + 55, /* Elements count */ &asn_SPC_PokerTHMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/PokerTHMessage.h b/src/third_party/asn1/PokerTHMessage.h index f9d42a88..572a9862 100644 --- a/src/third_party/asn1/PokerTHMessage.h +++ b/src/third_party/asn1/PokerTHMessage.h @@ -48,6 +48,7 @@ #include "ShowMyCardsRequestMessage.h" #include "AfterHandShowCardsMessage.h" #include "EndOfGameMessage.h" +#include "PlayerIdChangedMessage.h" #include "AskKickPlayerMessage.h" #include "AskKickDeniedMessage.h" #include "StartKickPetitionMessage.h" @@ -111,6 +112,7 @@ extern "C" { PokerTHMessage_PR_showMyCardsRequestMessage, PokerTHMessage_PR_afterHandShowCardsMessage, PokerTHMessage_PR_endOfGameMessage, + PokerTHMessage_PR_playerIdChangedMessage, PokerTHMessage_PR_askKickPlayerMessage, PokerTHMessage_PR_askKickDeniedMessage, PokerTHMessage_PR_startKickPetitionMessage, @@ -174,6 +176,7 @@ extern "C" { ShowMyCardsRequestMessage_t showMyCardsRequestMessage; AfterHandShowCardsMessage_t afterHandShowCardsMessage; EndOfGameMessage_t endOfGameMessage; + PlayerIdChangedMessage_t playerIdChangedMessage; AskKickPlayerMessage_t askKickPlayerMessage; AskKickDeniedMessage_t askKickDeniedMessage; StartKickPetitionMessage_t startKickPetitionMessage; diff --git a/src/third_party/asn1/RejectGameInvitationMessage.c b/src/third_party/asn1/RejectGameInvitationMessage.c index 0f17edd2..621fa592 100644 --- a/src/third_party/asn1/RejectGameInvitationMessage.c +++ b/src/third_party/asn1/RejectGameInvitationMessage.c @@ -32,8 +32,8 @@ static ber_tlv_tag_t asn_DEF_RejectGameInvitationMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_RejectGameInvitationMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 423 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* myRejectReason at 425 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 426 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* myRejectReason at 428 */ }; static asn_SEQUENCE_specifics_t asn_SPC_RejectGameInvitationMessage_specs_1 = { sizeof(struct RejectGameInvitationMessage), diff --git a/src/third_party/asn1/RejectInvNotifyMessage.c b/src/third_party/asn1/RejectInvNotifyMessage.c index a36d35c8..5b86b404 100644 --- a/src/third_party/asn1/RejectInvNotifyMessage.c +++ b/src/third_party/asn1/RejectInvNotifyMessage.c @@ -41,9 +41,9 @@ static ber_tlv_tag_t asn_DEF_RejectInvNotifyMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_RejectInvNotifyMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 428 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* playerId at 429 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 } /* playerRejectReason at 431 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 431 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* playerId at 432 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 } /* playerRejectReason at 434 */ }; static asn_SEQUENCE_specifics_t asn_SPC_RejectInvNotifyMessage_specs_1 = { sizeof(struct RejectInvNotifyMessage), diff --git a/src/third_party/asn1/RejoinExistingGame.c b/src/third_party/asn1/RejoinExistingGame.c index 1a6916ad..7999f520 100644 --- a/src/third_party/asn1/RejoinExistingGame.c +++ b/src/third_party/asn1/RejoinExistingGame.c @@ -22,7 +22,7 @@ static ber_tlv_tag_t asn_DEF_RejoinExistingGame_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_RejoinExistingGame_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 300 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 303 */ }; static asn_SEQUENCE_specifics_t asn_SPC_RejoinExistingGame_specs_1 = { sizeof(struct RejoinExistingGame), diff --git a/src/third_party/asn1/RejoinPlayerData.c b/src/third_party/asn1/RejoinPlayerData.c index 124b1c5d..6a303f9c 100644 --- a/src/third_party/asn1/RejoinPlayerData.c +++ b/src/third_party/asn1/RejoinPlayerData.c @@ -31,8 +31,8 @@ static ber_tlv_tag_t asn_DEF_RejoinPlayerData_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_RejoinPlayerData_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* playerId at 443 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerMoney at 445 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* playerId at 446 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerMoney at 448 */ }; static asn_SEQUENCE_specifics_t asn_SPC_RejoinPlayerData_specs_1 = { sizeof(struct RejoinPlayerData), diff --git a/src/third_party/asn1/RemovedFromGame.c b/src/third_party/asn1/RemovedFromGame.c index 078f2d4a..0c81cb18 100644 --- a/src/third_party/asn1/RemovedFromGame.c +++ b/src/third_party/asn1/RemovedFromGame.c @@ -147,7 +147,7 @@ static ber_tlv_tag_t asn_DEF_RemovedFromGame_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_RemovedFromGame_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* removedFromGameReason at 388 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* removedFromGameReason at 391 */ }; static asn_SEQUENCE_specifics_t asn_SPC_RemovedFromGame_specs_1 = { sizeof(struct RemovedFromGame), diff --git a/src/third_party/asn1/ReportAvatarAckMessage.c b/src/third_party/asn1/ReportAvatarAckMessage.c index 75b8c2e5..a17a2795 100644 --- a/src/third_party/asn1/ReportAvatarAckMessage.c +++ b/src/third_party/asn1/ReportAvatarAckMessage.c @@ -151,8 +151,8 @@ static ber_tlv_tag_t asn_DEF_ReportAvatarAckMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ReportAvatarAckMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* reportedPlayerId at 750 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* reportResult at 752 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* reportedPlayerId at 759 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* reportResult at 761 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ReportAvatarAckMessage_specs_1 = { sizeof(struct ReportAvatarAckMessage), diff --git a/src/third_party/asn1/ReportAvatarMessage.c b/src/third_party/asn1/ReportAvatarMessage.c index b68eaf66..11313e8c 100644 --- a/src/third_party/asn1/ReportAvatarMessage.c +++ b/src/third_party/asn1/ReportAvatarMessage.c @@ -32,8 +32,8 @@ static ber_tlv_tag_t asn_DEF_ReportAvatarMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_ReportAvatarMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* reportedPlayerId at 745 */ - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 } /* reportedAvatar at 747 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* reportedPlayerId at 754 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 } /* reportedAvatar at 756 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ReportAvatarMessage_specs_1 = { sizeof(struct ReportAvatarMessage), diff --git a/src/third_party/asn1/StartEventAckMessage.c b/src/third_party/asn1/StartEventAckMessage.c index dd95c6fc..ccba7eb7 100644 --- a/src/third_party/asn1/StartEventAckMessage.c +++ b/src/third_party/asn1/StartEventAckMessage.c @@ -23,7 +23,7 @@ static ber_tlv_tag_t asn_DEF_StartEventAckMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_StartEventAckMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 440 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 443 */ }; static asn_SEQUENCE_specifics_t asn_SPC_StartEventAckMessage_specs_1 = { sizeof(struct StartEventAckMessage), diff --git a/src/third_party/asn1/StartEventMessage.c b/src/third_party/asn1/StartEventMessage.c index 212a5664..503a2b94 100644 --- a/src/third_party/asn1/StartEventMessage.c +++ b/src/third_party/asn1/StartEventMessage.c @@ -32,8 +32,8 @@ static ber_tlv_tag_t asn_DEF_StartEventMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_StartEventMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* fillWithComputerPlayers at 435 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 434 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* fillWithComputerPlayers at 438 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* gameId at 437 */ }; static asn_SEQUENCE_specifics_t asn_SPC_StartEventMessage_specs_1 = { sizeof(struct StartEventMessage), diff --git a/src/third_party/asn1/StartKickPetitionMessage.c b/src/third_party/asn1/StartKickPetitionMessage.c index 744cb31f..f383859c 100644 --- a/src/third_party/asn1/StartKickPetitionMessage.c +++ b/src/third_party/asn1/StartKickPetitionMessage.c @@ -118,12 +118,12 @@ static ber_tlv_tag_t asn_DEF_StartKickPetitionMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_StartKickPetitionMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 5 }, /* gameId at 605 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 4 }, /* petitionId at 606 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 3 }, /* proposingPlayerId at 607 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 2 }, /* kickPlayerId at 608 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -4, 1 }, /* kickTimeoutSec at 609 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -5, 0 } /* numVotesNeededToKick at 610 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 5 }, /* gameId at 614 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 4 }, /* petitionId at 615 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 3 }, /* proposingPlayerId at 616 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 2 }, /* kickPlayerId at 617 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -4, 1 }, /* kickTimeoutSec at 618 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -5, 0 } /* numVotesNeededToKick at 619 */ }; static asn_SEQUENCE_specifics_t asn_SPC_StartKickPetitionMessage_specs_1 = { sizeof(struct StartKickPetitionMessage), diff --git a/src/third_party/asn1/StatisticsData.c b/src/third_party/asn1/StatisticsData.c index 8f23535c..8294154a 100644 --- a/src/third_party/asn1/StatisticsData.c +++ b/src/third_party/asn1/StatisticsData.c @@ -146,8 +146,8 @@ static ber_tlv_tag_t asn_DEF_StatisticsData_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_StatisticsData_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* statisticsValue at 669 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* statisticsType at 666 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* statisticsValue at 678 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* statisticsType at 675 */ }; static asn_SEQUENCE_specifics_t asn_SPC_StatisticsData_specs_1 = { sizeof(struct StatisticsData), diff --git a/src/third_party/asn1/StatisticsMessage.c b/src/third_party/asn1/StatisticsMessage.c index 2c86314d..881e1911 100644 --- a/src/third_party/asn1/StatisticsMessage.c +++ b/src/third_party/asn1/StatisticsMessage.c @@ -93,7 +93,7 @@ static ber_tlv_tag_t asn_DEF_StatisticsMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_StatisticsMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* statisticsData at 662 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* statisticsData at 671 */ }; static asn_SEQUENCE_specifics_t asn_SPC_StatisticsMessage_specs_1 = { sizeof(struct StatisticsMessage), diff --git a/src/third_party/asn1/SubscriptionRequestMessage.c b/src/third_party/asn1/SubscriptionRequestMessage.c index b13de146..c7eb7b31 100644 --- a/src/third_party/asn1/SubscriptionRequestMessage.c +++ b/src/third_party/asn1/SubscriptionRequestMessage.c @@ -140,7 +140,7 @@ static ber_tlv_tag_t asn_DEF_SubscriptionRequestMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_SubscriptionRequestMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* subscriptionAction at 275 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* subscriptionAction at 277 */ }; static asn_SEQUENCE_specifics_t asn_SPC_SubscriptionRequestMessage_specs_1 = { sizeof(struct SubscriptionRequestMessage), diff --git a/src/third_party/asn1/TimeoutWarningMessage.c b/src/third_party/asn1/TimeoutWarningMessage.c index 8df901a9..a1120c5b 100644 --- a/src/third_party/asn1/TimeoutWarningMessage.c +++ b/src/third_party/asn1/TimeoutWarningMessage.c @@ -149,8 +149,8 @@ static ber_tlv_tag_t asn_DEF_TimeoutWarningMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_TimeoutWarningMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* remainingSeconds at 735 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* timeoutReason at 731 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* remainingSeconds at 744 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* timeoutReason at 740 */ }; static asn_SEQUENCE_specifics_t asn_SPC_TimeoutWarningMessage_specs_1 = { sizeof(struct TimeoutWarningMessage), diff --git a/src/third_party/asn1/UnauthenticatedLogin.c b/src/third_party/asn1/UnauthenticatedLogin.c index 419ebd4d..6e83214a 100644 --- a/src/third_party/asn1/UnauthenticatedLogin.c +++ b/src/third_party/asn1/UnauthenticatedLogin.c @@ -63,8 +63,8 @@ static ber_tlv_tag_t asn_DEF_UnauthenticatedLogin_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_UnauthenticatedLogin_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 }, /* avatar at 124 */ - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 } /* nickName at 123 */ + { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 }, /* avatar at 126 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 } /* nickName at 125 */ }; static asn_SEQUENCE_specifics_t asn_SPC_UnauthenticatedLogin_specs_1 = { sizeof(struct UnauthenticatedLogin), diff --git a/src/third_party/asn1/Version.c b/src/third_party/asn1/Version.c index 0f7d29f4..11d93945 100644 --- a/src/third_party/asn1/Version.c +++ b/src/third_party/asn1/Version.c @@ -81,8 +81,8 @@ static ber_tlv_tag_t asn_DEF_Version_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_Version_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* major at 108 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* minor at 109 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* major at 110 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* minor at 111 */ }; static asn_SEQUENCE_specifics_t asn_SPC_Version_specs_1 = { sizeof(struct Version), diff --git a/src/third_party/asn1/VoteKickDenied.c b/src/third_party/asn1/VoteKickDenied.c index 609152b6..8f3ac946 100644 --- a/src/third_party/asn1/VoteKickDenied.c +++ b/src/third_party/asn1/VoteKickDenied.c @@ -139,7 +139,7 @@ static ber_tlv_tag_t asn_DEF_VoteKickDenied_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_VoteKickDenied_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* voteKickDeniedReason at 633 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* voteKickDeniedReason at 642 */ }; static asn_SEQUENCE_specifics_t asn_SPC_VoteKickDenied_specs_1 = { sizeof(struct VoteKickDenied), diff --git a/src/third_party/asn1/VoteKickReplyMessage.c b/src/third_party/asn1/VoteKickReplyMessage.c index 85d2c79b..3e979a7a 100644 --- a/src/third_party/asn1/VoteKickReplyMessage.c +++ b/src/third_party/asn1/VoteKickReplyMessage.c @@ -28,8 +28,8 @@ static asn_TYPE_member_t asn_MBR_voteKickReplyType_4[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_voteKickReplyType_tag2el_4[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* voteKickAck at 623 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* voteKickDenied at 625 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* voteKickAck at 632 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* voteKickDenied at 634 */ }; static asn_CHOICE_specifics_t asn_SPC_voteKickReplyType_specs_4 = { sizeof(struct voteKickReplyType), @@ -98,10 +98,10 @@ static ber_tlv_tag_t asn_DEF_VoteKickReplyMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_VoteKickReplyMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 620 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* petitionId at 621 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 2, 0, 0 }, /* voteKickAck at 623 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 } /* voteKickDenied at 625 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 629 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* petitionId at 630 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 2, 0, 0 }, /* voteKickAck at 632 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 } /* voteKickDenied at 634 */ }; static asn_SEQUENCE_specifics_t asn_SPC_VoteKickReplyMessage_specs_1 = { sizeof(struct VoteKickReplyMessage), diff --git a/src/third_party/asn1/VoteKickRequestMessage.c b/src/third_party/asn1/VoteKickRequestMessage.c index b16040c7..1bf3345f 100644 --- a/src/third_party/asn1/VoteKickRequestMessage.c +++ b/src/third_party/asn1/VoteKickRequestMessage.c @@ -41,9 +41,9 @@ static ber_tlv_tag_t asn_DEF_VoteKickRequestMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_VoteKickRequestMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 2, 0, 0 }, /* voteKick at 616 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 614 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* petitionId at 615 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 2, 0, 0 }, /* voteKick at 625 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 623 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* petitionId at 624 */ }; static asn_SEQUENCE_specifics_t asn_SPC_VoteKickRequestMessage_specs_1 = { sizeof(struct VoteKickRequestMessage), diff --git a/src/third_party/asn1/YourActionRejectedMessage.c b/src/third_party/asn1/YourActionRejectedMessage.c index 50a1d5bc..cbe5322f 100644 --- a/src/third_party/asn1/YourActionRejectedMessage.c +++ b/src/third_party/asn1/YourActionRejectedMessage.c @@ -178,11 +178,11 @@ static ber_tlv_tag_t asn_DEF_YourActionRejectedMessage_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_TYPE_tag2member_t asn_MAP_YourActionRejectedMessage_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 497 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -1, 0 }, /* yourRelativeBet at 500 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 2 }, /* gameState at 498 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, -1, 1 }, /* yourAction at 499 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 4, -2, 0 } /* rejectionReason at 502 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 501 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -1, 0 }, /* yourRelativeBet at 504 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 2 }, /* gameState at 502 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, -1, 1 }, /* yourAction at 503 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 4, -2, 0 } /* rejectionReason at 506 */ }; static asn_SEQUENCE_specifics_t asn_SPC_YourActionRejectedMessage_specs_1 = { sizeof(struct YourActionRejectedMessage), diff --git a/src/third_party/asn1/asn_codecs.h b/src/third_party/asn1/asn_codecs.h index fa4fac54..24784f0d 100644 --- a/src/third_party/asn1/asn_codecs.h +++ b/src/third_party/asn1/asn_codecs.h @@ -80,9 +80,9 @@ extern "C" { * (i.e., print the offending remainder of the buffer). */ enum asn_dec_rval_code_e { - RC_OK, /* Decoded successfully */ - RC_WMORE, /* More data expected, call again */ - RC_FAIL /* Failure to decode data */ + RC_OK, /* Decoded successfully */ + RC_WMORE, /* More data expected, call again */ + RC_FAIL /* Failure to decode data */ }; typedef struct asn_dec_rval_s { enum asn_dec_rval_code_e code; /* Result code */ diff --git a/src/third_party/asn1/asn_codecs_prim.h b/src/third_party/asn1/asn_codecs_prim.h index f694ce12..58331aaa 100644 --- a/src/third_party/asn1/asn_codecs_prim.h +++ b/src/third_party/asn1/asn_codecs_prim.h @@ -24,11 +24,11 @@ extern "C" { * A callback specification for the xer_decode_primitive() function below. */ enum xer_pbd_rval { - XPBD_SYSTEM_FAILURE, /* System failure (memory shortage, etc) */ - XPBD_DECODER_LIMIT, /* Hit some decoder limitation or deficiency */ - XPBD_BROKEN_ENCODING, /* Encoding of a primitive body is broken */ - XPBD_NOT_BODY_IGNORE, /* Not a body format, but safe to ignore */ - XPBD_BODY_CONSUMED /* Body is recognized and consumed */ + XPBD_SYSTEM_FAILURE, /* System failure (memory shortage, etc) */ + XPBD_DECODER_LIMIT, /* Hit some decoder limitation or deficiency */ + XPBD_BROKEN_ENCODING, /* Encoding of a primitive body is broken */ + XPBD_NOT_BODY_IGNORE, /* Not a body format, but safe to ignore */ + XPBD_BODY_CONSUMED /* Body is recognized and consumed */ }; typedef enum xer_pbd_rval (xer_primitive_body_decoder_f) (asn_TYPE_descriptor_t *td, void *struct_ptr, diff --git a/src/third_party/asn1/constr_SEQUENCE.c b/src/third_party/asn1/constr_SEQUENCE.c index 510ed8b7..48a42492 100644 --- a/src/third_party/asn1/constr_SEQUENCE.c +++ b/src/third_party/asn1/constr_SEQUENCE.c @@ -619,7 +619,7 @@ SEQUENCE_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, * Bring closer parts of structure description. */ asn_SEQUENCE_specifics_t *specs - = (asn_SEQUENCE_specifics_t *)td->specifics; + = (asn_SEQUENCE_specifics_t *)td->specifics; asn_TYPE_member_t *elements = td->elements; const char *xml_tag = opt_mname ? opt_mname : td->xml_tag; @@ -1256,7 +1256,7 @@ static int SEQUENCE_handle_extensions(asn_TYPE_descriptor_t *td, void *sptr, asn_per_outp_t *po1, asn_per_outp_t *po2) { asn_SEQUENCE_specifics_t *specs - = (asn_SEQUENCE_specifics_t *)td->specifics; + = (asn_SEQUENCE_specifics_t *)td->specifics; int exts_present = 0; int exts_count = 0; int edx; @@ -1308,7 +1308,7 @@ asn_enc_rval_t SEQUENCE_encode_uper(asn_TYPE_descriptor_t *td, asn_per_constraints_t *constraints, void *sptr, asn_per_outp_t *po) { asn_SEQUENCE_specifics_t *specs - = (asn_SEQUENCE_specifics_t *)td->specifics; + = (asn_SEQUENCE_specifics_t *)td->specifics; asn_enc_rval_t er; int n_extensions; int edx; diff --git a/src/third_party/asn1/constr_TYPE.h b/src/third_party/asn1/constr_TYPE.h index daf53c91..597e9c28 100644 --- a/src/third_party/asn1/constr_TYPE.h +++ b/src/third_party/asn1/constr_TYPE.h @@ -133,9 +133,9 @@ extern "C" { * i.e. SEQUENCE, SET, CHOICE, etc. */ enum asn_TYPE_flags_e { - ATF_NOFLAGS, - ATF_POINTER = 0x01, /* Represented by the pointer */ - ATF_OPEN_TYPE = 0x02 /* ANY type, without meaningful tag */ + ATF_NOFLAGS, + ATF_POINTER = 0x01, /* Represented by the pointer */ + ATF_OPEN_TYPE = 0x02 /* ANY type, without meaningful tag */ }; typedef struct asn_TYPE_member_s { enum asn_TYPE_flags_e flags; /* Element's presentation flags */ diff --git a/src/third_party/asn1/converter-sample.c b/src/third_party/asn1/converter-sample.c index efa5b98e..f2fd9abd 100644 --- a/src/third_party/asn1/converter-sample.c +++ b/src/third_party/asn1/converter-sample.c @@ -48,18 +48,18 @@ static int opt_onepdu; /* -1 (decode single PDU) */ /* Input data format selector */ static enum input_format { - INP_BER, /* -iber: BER input */ - INP_XER, /* -ixer: XER input */ - INP_PER /* -iper: Unaligned PER input */ + INP_BER, /* -iber: BER input */ + INP_XER, /* -ixer: XER input */ + INP_PER /* -iper: Unaligned PER input */ } iform; /* -i */ /* Output data format selector */ static enum output_format { - OUT_XER, /* -oxer: XER (XML) output */ - OUT_DER, /* -oder: DER (BER) output */ - OUT_PER, /* -oper: Unaligned PER output */ - OUT_TEXT, /* -otext: semi-structured text */ - OUT_NULL /* -onull: No pretty-printing */ + OUT_XER, /* -oxer: XER (XML) output */ + OUT_DER, /* -oder: DER (BER) output */ + OUT_PER, /* -oper: Unaligned PER output */ + OUT_TEXT, /* -otext: semi-structured text */ + OUT_NULL /* -onull: No pretty-printing */ } oform; /* -o */ #ifdef JUNKTEST /* Enable -J */ diff --git a/src/third_party/asn1/xer_decoder.h b/src/third_party/asn1/xer_decoder.h index a2f6c685..aab71007 100644 --- a/src/third_party/asn1/xer_decoder.h +++ b/src/third_party/asn1/xer_decoder.h @@ -63,9 +63,9 @@ extern "C" { * the return value is greater than 0. */ typedef enum pxer_chunk_type { - PXER_TAG, /* Complete XER tag */ - PXER_TEXT, /* Plain text between XER tags */ - PXER_COMMENT /* A comment, may be part of */ + PXER_TAG, /* Complete XER tag */ + PXER_TEXT, /* Plain text between XER tags */ + PXER_COMMENT /* A comment, may be part of */ } pxer_chunk_type_e; ssize_t xer_next_token(int *stateContext, const void *buffer, size_t size, pxer_chunk_type_e *_ch_type); @@ -74,14 +74,14 @@ extern "C" { * This function checks the buffer against the tag name is expected to occur. */ typedef enum xer_check_tag { - XCT_BROKEN = 0, /* The tag is broken */ - XCT_OPENING = 1, /* This is the tag */ - XCT_CLOSING = 2, /* This is the tag */ - XCT_BOTH = 3, /* This is the tag */ - XCT__UNK__MASK = 4, /* Mask of everything unexpected */ - XCT_UNKNOWN_OP = 5, /* Unexpected tag */ - XCT_UNKNOWN_CL = 6, /* Unexpected tag */ - XCT_UNKNOWN_BO = 7 /* Unexpected tag */ + XCT_BROKEN = 0, /* The tag is broken */ + XCT_OPENING = 1, /* This is the tag */ + XCT_CLOSING = 2, /* This is the tag */ + XCT_BOTH = 3, /* This is the tag */ + XCT__UNK__MASK = 4, /* Mask of everything unexpected */ + XCT_UNKNOWN_OP = 5, /* Unexpected tag */ + XCT_UNKNOWN_CL = 6, /* Unexpected tag */ + XCT_UNKNOWN_BO = 7 /* Unexpected tag */ } xer_check_tag_e; xer_check_tag_e xer_check_tag(const void *buf_ptr, int size, const char *need_tag); diff --git a/src/third_party/asn1/xer_encoder.h b/src/third_party/asn1/xer_encoder.h index ce0d3ad5..ef1cd94b 100644 --- a/src/third_party/asn1/xer_encoder.h +++ b/src/third_party/asn1/xer_encoder.h @@ -15,9 +15,9 @@ extern "C" { /* Flags used by the xer_encode() and (*xer_type_encoder_f), defined below */ enum xer_encoder_flags_e { - /* Mode of encoding */ - XER_F_BASIC = 0x01, /* BASIC-XER (pretty-printing) */ - XER_F_CANONICAL = 0x02 /* Canonical XER (strict rules) */ + /* Mode of encoding */ + XER_F_BASIC = 0x01, /* BASIC-XER (pretty-printing) */ + XER_F_CANONICAL = 0x02 /* Canonical XER (strict rules) */ }; /* diff --git a/src/third_party/asn1/xer_support.c b/src/third_party/asn1/xer_support.c index 26f656e7..e5982110 100644 --- a/src/third_party/asn1/xer_support.c +++ b/src/third_party/asn1/xer_support.c @@ -9,17 +9,17 @@ /* Parser states */ typedef enum { - ST_TEXT, - ST_TAG_START, - ST_TAG_BODY, - ST_TAG_QUOTE_WAIT, - ST_TAG_QUOTED_STRING, - ST_TAG_UNQUOTED_STRING, - ST_COMMENT_WAIT_DASH1, /* ""[0] */ - ST_COMMENT_CLO_RT /* "-->"[1] */ + ST_TEXT, + ST_TAG_START, + ST_TAG_BODY, + ST_TAG_QUOTE_WAIT, + ST_TAG_QUOTED_STRING, + ST_TAG_UNQUOTED_STRING, + ST_COMMENT_WAIT_DASH1, /* ""[0] */ + ST_COMMENT_CLO_RT /* "-->"[1] */ } pstate_e; static pxml_chunk_type_e final_chunk_type[] = {