diff --git a/src/third_party/asn1/AllInShowCardsMessage.c b/src/third_party/asn1/AllInShowCardsMessage.c index ebd4f750..8202149c 100644 --- a/src/third_party/asn1/AllInShowCardsMessage.c +++ b/src/third_party/asn1/AllInShowCardsMessage.c @@ -103,8 +103,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 396 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 } /* playersAllIn at 398 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 399 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 } /* playersAllIn at 401 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AllInShowCardsMessage_specs_1 = { sizeof(struct AllInShowCardsMessage), diff --git a/src/third_party/asn1/AskKickDeniedMessage.c b/src/third_party/asn1/AskKickDeniedMessage.c index 12e7da5b..dddb2281 100644 --- a/src/third_party/asn1/AskKickDeniedMessage.c +++ b/src/third_party/asn1/AskKickDeniedMessage.c @@ -156,8 +156,8 @@ 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, 0 }, /* playerId at 442 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* kickDeniedReason at 444 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* playerId at 447 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* kickDeniedReason at 449 */ }; 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 4f56f23e..400c7c34 100644 --- a/src/third_party/asn1/AskKickPlayerMessage.c +++ b/src/third_party/asn1/AskKickPlayerMessage.c @@ -24,7 +24,7 @@ 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, 0 } /* playerId at 439 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* playerId at 444 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AskKickPlayerMessage_specs_1 = { sizeof(struct AskKickPlayerMessage), diff --git a/src/third_party/asn1/ChatMessage.c b/src/third_party/asn1/ChatMessage.c index ac5a1379..da421be5 100644 --- a/src/third_party/asn1/ChatMessage.c +++ b/src/third_party/asn1/ChatMessage.c @@ -42,9 +42,9 @@ 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 | (2 << 2)), 0, 0, 1 }, /* playerId at 520 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* gameId at 521 */ - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 2, 0, 0 } /* chatText at 522 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* playerId at 525 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* gameId at 526 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 2, 0, 0 } /* chatText at 527 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatMessage_specs_1 = { sizeof(struct ChatMessage), diff --git a/src/third_party/asn1/ChatRequestMessage.c b/src/third_party/asn1/ChatRequestMessage.c index 096e177f..9cfd3822 100644 --- a/src/third_party/asn1/ChatRequestMessage.c +++ b/src/third_party/asn1/ChatRequestMessage.c @@ -33,8 +33,8 @@ 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 | (2 << 2)), 0, 0, 0 }, /* gameId at 515 */ - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 } /* chatText at 516 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 520 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 } /* chatText at 521 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatRequestMessage_specs_1 = { sizeof(struct ChatRequestMessage), diff --git a/src/third_party/asn1/DealFlopCardsMessage.c b/src/third_party/asn1/DealFlopCardsMessage.c index 36423480..22dc9112 100644 --- a/src/third_party/asn1/DealFlopCardsMessage.c +++ b/src/third_party/asn1/DealFlopCardsMessage.c @@ -8,76 +8,6 @@ #include "DealFlopCardsMessage.h" -static int -memb_flopCards_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_constraint_failed_f *ctfailcb, void *app_key) { - size_t size; - - if(!sptr) { - _ASN_CTFAIL(app_key, td, sptr, - "%s: value not given (%s:%d)", - td->name, __FILE__, __LINE__); - return -1; - } - - /* Determine the number of elements */ - size = _A_CSEQUENCE_FROM_VOID(sptr)->count; - - if((size == 3)) { - /* Perform validation of the inner elements */ - return td->check_constraints(td, sptr, ctfailcb, app_key); - } 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_flopCards_3[] = { - { ATF_POINTER, 0, 0, - (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), - 0, - &asn_DEF_Card, - 0, /* Defer constraints checking to the member type */ - 0, /* PER is not compiled, use -gen-PER */ - 0, - "" - }, -}; -static ber_tlv_tag_t asn_DEF_flopCards_tags_3[] = { - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) -}; -static asn_SET_OF_specifics_t asn_SPC_flopCards_specs_3 = { - sizeof(struct flopCards), - offsetof(struct flopCards, _asn_ctx), - 0, /* XER encoding is XMLDelimitedItemList */ -}; -static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_flopCards_3 = { - "flopCards", - "flopCards", - SEQUENCE_OF_free, - SEQUENCE_OF_print, - SEQUENCE_OF_constraint, - SEQUENCE_OF_decode_ber, - SEQUENCE_OF_encode_der, - SEQUENCE_OF_decode_xer, - SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ - 0, /* Use generic outmost tag fetcher */ - asn_DEF_flopCards_tags_3, - sizeof(asn_DEF_flopCards_tags_3) - /sizeof(asn_DEF_flopCards_tags_3[0]), /* 1 */ - asn_DEF_flopCards_tags_3, /* Same as above */ - sizeof(asn_DEF_flopCards_tags_3) - /sizeof(asn_DEF_flopCards_tags_3[0]), /* 1 */ - 0, /* No PER visible constraints */ - asn_MBR_flopCards_3, - 1, /* Single element */ - &asn_SPC_flopCards_specs_3 /* Additional specs */ -}; - static asn_TYPE_member_t asn_MBR_DealFlopCardsMessage_1[] = { { ATF_NOFLAGS, 0, offsetof(struct DealFlopCardsMessage, gameId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), @@ -88,14 +18,32 @@ static asn_TYPE_member_t asn_MBR_DealFlopCardsMessage_1[] = { 0, "gameId" }, - { ATF_NOFLAGS, 0, offsetof(struct DealFlopCardsMessage, flopCards), - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), + { ATF_NOFLAGS, 0, offsetof(struct DealFlopCardsMessage, flopCard1), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, - &asn_DEF_flopCards_3, - memb_flopCards_constraint_1, + &asn_DEF_Card, + 0, /* Defer constraints checking to the member type */ 0, /* PER is not compiled, use -gen-PER */ 0, - "flopCards" + "flopCard1" + }, + { ATF_NOFLAGS, 0, offsetof(struct DealFlopCardsMessage, flopCard2), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), + 0, + &asn_DEF_Card, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "flopCard2" + }, + { ATF_NOFLAGS, 0, offsetof(struct DealFlopCardsMessage, flopCard3), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), + 0, + &asn_DEF_Card, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "flopCard3" }, }; static ber_tlv_tag_t asn_DEF_DealFlopCardsMessage_tags_1[] = { @@ -103,17 +51,19 @@ 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, 0 }, /* gameId at 381 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 } /* flopCards at 383 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 3 }, /* gameId at 382 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 2 }, /* flopCard1 at 383 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 1 }, /* flopCard2 at 384 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 0 } /* flopCard3 at 386 */ }; static asn_SEQUENCE_specifics_t asn_SPC_DealFlopCardsMessage_specs_1 = { sizeof(struct DealFlopCardsMessage), offsetof(struct DealFlopCardsMessage, _asn_ctx), asn_MAP_DealFlopCardsMessage_tag2el_1, - 2, /* Count of tags in the map */ + 4, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ - 1, /* Start extensions */ - 3 /* Stop extensions */ + 3, /* Start extensions */ + 5 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_DealFlopCardsMessage = { "DealFlopCardsMessage", @@ -135,7 +85,7 @@ asn_TYPE_descriptor_t asn_DEF_DealFlopCardsMessage = { /sizeof(asn_DEF_DealFlopCardsMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_DealFlopCardsMessage_1, - 2, /* Elements count */ + 4, /* Elements count */ &asn_SPC_DealFlopCardsMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/DealFlopCardsMessage.h b/src/third_party/asn1/DealFlopCardsMessage.h index c06ed8a5..c38ceb46 100644 --- a/src/third_party/asn1/DealFlopCardsMessage.h +++ b/src/third_party/asn1/DealFlopCardsMessage.h @@ -13,8 +13,6 @@ /* Including external dependencies */ #include "NonZeroId.h" #include "Card.h" -#include -#include #include #ifdef __cplusplus @@ -24,12 +22,9 @@ extern "C" { /* DealFlopCardsMessage */ typedef struct DealFlopCardsMessage { NonZeroId_t gameId; - struct flopCards { - A_SEQUENCE_OF(Card_t) list; - - /* Context for parsing across buffer boundaries */ - asn_struct_ctx_t _asn_ctx; - } flopCards; + Card_t flopCard1; + Card_t flopCard2; + Card_t flopCard3; /* * This type is extensible, * possible extensions are below. diff --git a/src/third_party/asn1/DealRiverCardMessage.c b/src/third_party/asn1/DealRiverCardMessage.c index cf9012ef..3ac6a231 100644 --- a/src/third_party/asn1/DealRiverCardMessage.c +++ b/src/third_party/asn1/DealRiverCardMessage.c @@ -33,8 +33,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 391 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* riverCard at 393 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 394 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* riverCard at 396 */ }; 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 34586a81..69ddaeda 100644 --- a/src/third_party/asn1/DealTurnCardMessage.c +++ b/src/third_party/asn1/DealTurnCardMessage.c @@ -33,8 +33,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 386 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* turnCard at 388 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 389 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* turnCard at 391 */ }; 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 2219b1a3..0c943ee6 100644 --- a/src/third_party/asn1/DialogMessage.c +++ b/src/third_party/asn1/DialogMessage.c @@ -24,7 +24,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 526 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 } /* notificationText at 531 */ }; static asn_SEQUENCE_specifics_t asn_SPC_DialogMessage_specs_1 = { sizeof(struct DialogMessage), diff --git a/src/third_party/asn1/EndKickPetitionMessage.c b/src/third_party/asn1/EndKickPetitionMessage.c index 119b0c51..5f2ec0cc 100644 --- a/src/third_party/asn1/EndKickPetitionMessage.c +++ b/src/third_party/asn1/EndKickPetitionMessage.c @@ -231,11 +231,11 @@ 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)), 3, 0, 0 }, /* resultPlayerKicked at 494 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* petitionId at 491 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* numVotesAgainstKicking at 492 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 }, /* numVotesInFavourOfKicking at 493 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 4, 0, 0 } /* petitionEndReason at 496 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 3, 0, 0 }, /* resultPlayerKicked at 499 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* petitionId at 496 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* numVotesAgainstKicking at 497 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 }, /* numVotesInFavourOfKicking at 498 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 4, 0, 0 } /* petitionEndReason at 501 */ }; 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 223fae63..e8cb7a49 100644 --- a/src/third_party/asn1/EndOfGameMessage.c +++ b/src/third_party/asn1/EndOfGameMessage.c @@ -33,8 +33,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 433 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* winnerPlayerId at 435 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 438 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* winnerPlayerId at 440 */ }; 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 c7239e13..4a3d65fc 100644 --- a/src/third_party/asn1/EndOfHandHideCards.c +++ b/src/third_party/asn1/EndOfHandHideCards.c @@ -91,9 +91,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 427 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* moneyWon at 428 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 } /* playerMoney at 429 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* playerId at 432 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* moneyWon at 433 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 } /* playerMoney at 434 */ }; 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 ae02177e..34bbb1b7 100644 --- a/src/third_party/asn1/EndOfHandMessage.c +++ b/src/third_party/asn1/EndOfHandMessage.c @@ -29,8 +29,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 408 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* endOfHandHideCards at 410 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* endOfHandShowCards at 412 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* endOfHandHideCards at 414 */ }; static asn_CHOICE_specifics_t asn_SPC_endOfHandType_specs_3 = { sizeof(struct endOfHandType), @@ -90,9 +90,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 406 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* endOfHandShowCards at 408 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* endOfHandHideCards at 410 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 410 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* endOfHandShowCards at 412 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* endOfHandHideCards at 414 */ }; 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 884a11e4..f7bda321 100644 --- a/src/third_party/asn1/EndOfHandShowCards.c +++ b/src/third_party/asn1/EndOfHandShowCards.c @@ -93,7 +93,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 415 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* playerResults at 419 */ }; 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 5437c540..78966c09 100644 --- a/src/third_party/asn1/ErrorMessage.c +++ b/src/third_party/asn1/ErrorMessage.c @@ -165,7 +165,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 542 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* errorReason at 547 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ErrorMessage_specs_1 = { sizeof(struct ErrorMessage), diff --git a/src/third_party/asn1/HandStartMessage.c b/src/third_party/asn1/HandStartMessage.c index 320b3857..18c447ab 100644 --- a/src/third_party/asn1/HandStartMessage.c +++ b/src/third_party/asn1/HandStartMessage.c @@ -8,32 +8,6 @@ #include "HandStartMessage.h" -static int -memb_yourCards_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_constraint_failed_f *ctfailcb, void *app_key) { - size_t size; - - if(!sptr) { - _ASN_CTFAIL(app_key, td, sptr, - "%s: value not given (%s:%d)", - td->name, __FILE__, __LINE__); - return -1; - } - - /* Determine the number of elements */ - size = _A_CSEQUENCE_FROM_VOID(sptr)->count; - - if((size == 2)) { - /* Perform validation of the inner elements */ - return td->check_constraints(td, sptr, ctfailcb, app_key); - } else { - _ASN_CTFAIL(app_key, td, sptr, - "%s: constraint failed (%s:%d)", - td->name, __FILE__, __LINE__); - return -1; - } -} - static int memb_smallBlind_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { @@ -59,50 +33,6 @@ memb_smallBlind_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, } } -static asn_TYPE_member_t asn_MBR_yourCards_3[] = { - { ATF_POINTER, 0, 0, - (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), - 0, - &asn_DEF_Card, - 0, /* Defer constraints checking to the member type */ - 0, /* PER is not compiled, use -gen-PER */ - 0, - "" - }, -}; -static ber_tlv_tag_t asn_DEF_yourCards_tags_3[] = { - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) -}; -static asn_SET_OF_specifics_t asn_SPC_yourCards_specs_3 = { - sizeof(struct yourCards), - offsetof(struct yourCards, _asn_ctx), - 0, /* XER encoding is XMLDelimitedItemList */ -}; -static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_yourCards_3 = { - "yourCards", - "yourCards", - SEQUENCE_OF_free, - SEQUENCE_OF_print, - SEQUENCE_OF_constraint, - SEQUENCE_OF_decode_ber, - SEQUENCE_OF_encode_der, - SEQUENCE_OF_decode_xer, - SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ - 0, /* Use generic outmost tag fetcher */ - asn_DEF_yourCards_tags_3, - sizeof(asn_DEF_yourCards_tags_3) - /sizeof(asn_DEF_yourCards_tags_3[0]), /* 1 */ - asn_DEF_yourCards_tags_3, /* Same as above */ - sizeof(asn_DEF_yourCards_tags_3) - /sizeof(asn_DEF_yourCards_tags_3[0]), /* 1 */ - 0, /* No PER visible constraints */ - asn_MBR_yourCards_3, - 1, /* Single element */ - &asn_SPC_yourCards_specs_3 /* Additional specs */ -}; - static asn_TYPE_member_t asn_MBR_HandStartMessage_1[] = { { ATF_NOFLAGS, 0, offsetof(struct HandStartMessage, gameId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), @@ -113,14 +43,23 @@ static asn_TYPE_member_t asn_MBR_HandStartMessage_1[] = { 0, "gameId" }, - { ATF_NOFLAGS, 0, offsetof(struct HandStartMessage, yourCards), - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), + { ATF_NOFLAGS, 0, offsetof(struct HandStartMessage, yourCard1), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, - &asn_DEF_yourCards_3, - memb_yourCards_constraint_1, + &asn_DEF_Card, + 0, /* Defer constraints checking to the member type */ 0, /* PER is not compiled, use -gen-PER */ 0, - "yourCards" + "yourCard1" + }, + { ATF_NOFLAGS, 0, offsetof(struct HandStartMessage, yourCard2), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), + 0, + &asn_DEF_Card, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "yourCard2" }, { ATF_NOFLAGS, 0, offsetof(struct HandStartMessage, smallBlind), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), @@ -137,18 +76,19 @@ 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 339 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -1, 0 }, /* smallBlind at 341 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 } /* yourCards at 340 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 3 }, /* gameId at 339 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 2 }, /* yourCard1 at 340 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 1 }, /* yourCard2 at 341 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 0 } /* smallBlind at 342 */ }; static asn_SEQUENCE_specifics_t asn_SPC_HandStartMessage_specs_1 = { sizeof(struct HandStartMessage), offsetof(struct HandStartMessage, _asn_ctx), asn_MAP_HandStartMessage_tag2el_1, - 3, /* 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 */ + 3, /* Start extensions */ + 5 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_HandStartMessage = { "HandStartMessage", @@ -170,7 +110,7 @@ asn_TYPE_descriptor_t asn_DEF_HandStartMessage = { /sizeof(asn_DEF_HandStartMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_HandStartMessage_1, - 3, /* Elements count */ + 4, /* Elements count */ &asn_SPC_HandStartMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/HandStartMessage.h b/src/third_party/asn1/HandStartMessage.h index d8e1d435..92019949 100644 --- a/src/third_party/asn1/HandStartMessage.h +++ b/src/third_party/asn1/HandStartMessage.h @@ -12,10 +12,8 @@ /* Including external dependencies */ #include "NonZeroId.h" -#include #include "Card.h" -#include -#include +#include #include #ifdef __cplusplus @@ -25,12 +23,8 @@ extern "C" { /* HandStartMessage */ typedef struct HandStartMessage { NonZeroId_t gameId; - struct yourCards { - A_SEQUENCE_OF(Card_t) list; - - /* Context for parsing across buffer boundaries */ - asn_struct_ctx_t _asn_ctx; - } yourCards; + Card_t yourCard1; + Card_t yourCard2; long smallBlind; /* * This type is extensible, diff --git a/src/third_party/asn1/KickPetitionUpdateMessage.c b/src/third_party/asn1/KickPetitionUpdateMessage.c index fd815da9..8e09a0ba 100644 --- a/src/third_party/asn1/KickPetitionUpdateMessage.c +++ b/src/third_party/asn1/KickPetitionUpdateMessage.c @@ -126,10 +126,10 @@ 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, 3 }, /* petitionId at 484 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 2 }, /* numVotesAgainstKicking at 485 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 1 }, /* numVotesInFavourOfKicking at 486 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 0 } /* numVotesNeededToKick at 487 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 3 }, /* petitionId at 489 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 2 }, /* numVotesAgainstKicking at 490 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 1 }, /* numVotesInFavourOfKicking at 491 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 0 } /* numVotesNeededToKick at 492 */ }; static asn_SEQUENCE_specifics_t asn_SPC_KickPetitionUpdateMessage_specs_1 = { sizeof(struct KickPetitionUpdateMessage), diff --git a/src/third_party/asn1/MyActionRequestMessage.c b/src/third_party/asn1/MyActionRequestMessage.c index 8c474004..482f7bd1 100644 --- a/src/third_party/asn1/MyActionRequestMessage.c +++ b/src/third_party/asn1/MyActionRequestMessage.c @@ -76,10 +76,10 @@ 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, 1 }, /* gameId at 351 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -1, 0 }, /* myRelativeBet at 354 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 1 }, /* gameState at 352 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, -1, 0 } /* myAction at 353 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 352 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -1, 0 }, /* myRelativeBet at 355 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 1 }, /* gameState at 353 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, -1, 0 } /* myAction at 354 */ }; static asn_SEQUENCE_specifics_t asn_SPC_MyActionRequestMessage_specs_1 = { sizeof(struct MyActionRequestMessage), diff --git a/src/third_party/asn1/PlayerAllIn.c b/src/third_party/asn1/PlayerAllIn.c index 88067a7c..a4709075 100644 --- a/src/third_party/asn1/PlayerAllIn.c +++ b/src/third_party/asn1/PlayerAllIn.c @@ -8,76 +8,6 @@ #include "PlayerAllIn.h" -static int -memb_allInCards_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_constraint_failed_f *ctfailcb, void *app_key) { - size_t size; - - if(!sptr) { - _ASN_CTFAIL(app_key, td, sptr, - "%s: value not given (%s:%d)", - td->name, __FILE__, __LINE__); - return -1; - } - - /* Determine the number of elements */ - size = _A_CSEQUENCE_FROM_VOID(sptr)->count; - - if((size == 2)) { - /* Perform validation of the inner elements */ - return td->check_constraints(td, sptr, ctfailcb, app_key); - } 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_allInCards_3[] = { - { ATF_POINTER, 0, 0, - (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), - 0, - &asn_DEF_Card, - 0, /* Defer constraints checking to the member type */ - 0, /* PER is not compiled, use -gen-PER */ - 0, - "" - }, -}; -static ber_tlv_tag_t asn_DEF_allInCards_tags_3[] = { - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) -}; -static asn_SET_OF_specifics_t asn_SPC_allInCards_specs_3 = { - sizeof(struct allInCards), - offsetof(struct allInCards, _asn_ctx), - 0, /* XER encoding is XMLDelimitedItemList */ -}; -static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_allInCards_3 = { - "allInCards", - "allInCards", - SEQUENCE_OF_free, - SEQUENCE_OF_print, - SEQUENCE_OF_constraint, - SEQUENCE_OF_decode_ber, - SEQUENCE_OF_encode_der, - SEQUENCE_OF_decode_xer, - SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ - 0, /* Use generic outmost tag fetcher */ - asn_DEF_allInCards_tags_3, - sizeof(asn_DEF_allInCards_tags_3) - /sizeof(asn_DEF_allInCards_tags_3[0]), /* 1 */ - asn_DEF_allInCards_tags_3, /* Same as above */ - sizeof(asn_DEF_allInCards_tags_3) - /sizeof(asn_DEF_allInCards_tags_3[0]), /* 1 */ - 0, /* No PER visible constraints */ - asn_MBR_allInCards_3, - 1, /* Single element */ - &asn_SPC_allInCards_specs_3 /* Additional specs */ -}; - static asn_TYPE_member_t asn_MBR_PlayerAllIn_1[] = { { ATF_NOFLAGS, 0, offsetof(struct PlayerAllIn, playerId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), @@ -88,31 +18,41 @@ static asn_TYPE_member_t asn_MBR_PlayerAllIn_1[] = { 0, "playerId" }, - { ATF_NOFLAGS, 0, offsetof(struct PlayerAllIn, allInCards), - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), + { ATF_NOFLAGS, 0, offsetof(struct PlayerAllIn, allInCard1), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, - &asn_DEF_allInCards_3, - memb_allInCards_constraint_1, + &asn_DEF_Card, + 0, /* Defer constraints checking to the member type */ 0, /* PER is not compiled, use -gen-PER */ 0, - "allInCards" + "allInCard1" + }, + { ATF_NOFLAGS, 0, offsetof(struct PlayerAllIn, allInCard2), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), + 0, + &asn_DEF_Card, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "allInCard2" }, }; 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, 0 }, /* playerId at 401 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 } /* allInCards at 403 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* playerId at 404 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* allInCard1 at 405 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 } /* allInCard2 at 407 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayerAllIn_specs_1 = { sizeof(struct PlayerAllIn), offsetof(struct PlayerAllIn, _asn_ctx), asn_MAP_PlayerAllIn_tag2el_1, - 2, /* Count of tags in the map */ + 3, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ - 1, /* Start extensions */ - 3 /* Stop extensions */ + 2, /* Start extensions */ + 4 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_PlayerAllIn = { "PlayerAllIn", @@ -134,7 +74,7 @@ asn_TYPE_descriptor_t asn_DEF_PlayerAllIn = { /sizeof(asn_DEF_PlayerAllIn_tags_1[0]), /* 1 */ 0, /* No PER visible constraints */ asn_MBR_PlayerAllIn_1, - 2, /* Elements count */ + 3, /* Elements count */ &asn_SPC_PlayerAllIn_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/PlayerAllIn.h b/src/third_party/asn1/PlayerAllIn.h index 5144388d..9d50cba9 100644 --- a/src/third_party/asn1/PlayerAllIn.h +++ b/src/third_party/asn1/PlayerAllIn.h @@ -13,8 +13,6 @@ /* Including external dependencies */ #include "NonZeroId.h" #include "Card.h" -#include -#include #include #ifdef __cplusplus @@ -24,12 +22,8 @@ extern "C" { /* PlayerAllIn */ typedef struct PlayerAllIn { NonZeroId_t playerId; - struct allInCards { - A_SEQUENCE_OF(Card_t) list; - - /* Context for parsing across buffer boundaries */ - asn_struct_ctx_t _asn_ctx; - } allInCards; + Card_t allInCard1; + Card_t allInCard2; /* * This type is extensible, * possible extensions are below. diff --git a/src/third_party/asn1/PlayerResult.c b/src/third_party/asn1/PlayerResult.c index 5e313a88..a0d1ed2a 100644 --- a/src/third_party/asn1/PlayerResult.c +++ b/src/third_party/asn1/PlayerResult.c @@ -8,32 +8,6 @@ #include "PlayerResult.h" -static int -memb_resultCards_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, - asn_app_constraint_failed_f *ctfailcb, void *app_key) { - size_t size; - - if(!sptr) { - _ASN_CTFAIL(app_key, td, sptr, - "%s: value not given (%s:%d)", - td->name, __FILE__, __LINE__); - return -1; - } - - /* Determine the number of elements */ - size = _A_CSEQUENCE_FROM_VOID(sptr)->count; - - if((size == 2)) { - /* Perform validation of the inner elements */ - return td->check_constraints(td, sptr, ctfailcb, app_key); - } else { - _ASN_CTFAIL(app_key, td, sptr, - "%s: constraint failed (%s:%d)", - td->name, __FILE__, __LINE__); - return -1; - } -} - static int memb_bestHandPosition_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { @@ -110,50 +84,6 @@ memb_playerMoney_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, } } -static asn_TYPE_member_t asn_MBR_resultCards_3[] = { - { ATF_POINTER, 0, 0, - (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), - 0, - &asn_DEF_Card, - 0, /* Defer constraints checking to the member type */ - 0, /* PER is not compiled, use -gen-PER */ - 0, - "" - }, -}; -static ber_tlv_tag_t asn_DEF_resultCards_tags_3[] = { - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) -}; -static asn_SET_OF_specifics_t asn_SPC_resultCards_specs_3 = { - sizeof(struct resultCards), - offsetof(struct resultCards, _asn_ctx), - 0, /* XER encoding is XMLDelimitedItemList */ -}; -static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_resultCards_3 = { - "resultCards", - "resultCards", - SEQUENCE_OF_free, - SEQUENCE_OF_print, - SEQUENCE_OF_constraint, - SEQUENCE_OF_decode_ber, - SEQUENCE_OF_encode_der, - SEQUENCE_OF_decode_xer, - SEQUENCE_OF_encode_xer, - 0, 0, /* No PER support, use "-gen-PER" to enable */ - 0, /* Use generic outmost tag fetcher */ - asn_DEF_resultCards_tags_3, - sizeof(asn_DEF_resultCards_tags_3) - /sizeof(asn_DEF_resultCards_tags_3[0]), /* 1 */ - asn_DEF_resultCards_tags_3, /* Same as above */ - sizeof(asn_DEF_resultCards_tags_3) - /sizeof(asn_DEF_resultCards_tags_3[0]), /* 1 */ - 0, /* No PER visible constraints */ - asn_MBR_resultCards_3, - 1, /* Single element */ - &asn_SPC_resultCards_specs_3 /* Additional specs */ -}; - static asn_TYPE_member_t asn_MBR_bestHandPosition_5[] = { { ATF_POINTER, 0, 0, (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), @@ -208,14 +138,23 @@ static asn_TYPE_member_t asn_MBR_PlayerResult_1[] = { 0, "playerId" }, - { ATF_NOFLAGS, 0, offsetof(struct PlayerResult, resultCards), - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), + { ATF_NOFLAGS, 0, offsetof(struct PlayerResult, resultCard1), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, - &asn_DEF_resultCards_3, - memb_resultCards_constraint_1, + &asn_DEF_Card, + 0, /* Defer constraints checking to the member type */ 0, /* PER is not compiled, use -gen-PER */ 0, - "resultCards" + "resultCard1" + }, + { ATF_NOFLAGS, 0, offsetof(struct PlayerResult, resultCard2), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), + 0, + &asn_DEF_Card, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "resultCard2" }, { ATF_NOFLAGS, 0, offsetof(struct PlayerResult, bestHandPosition), (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), @@ -258,21 +197,22 @@ 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, 3 }, /* playerId at 418 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -1, 2 }, /* cardsValue at 421 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -2, 1 }, /* moneyWon at 422 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -3, 0 }, /* playerMoney at 423 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 1 }, /* resultCards at 419 */ - { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 2, -1, 0 } /* bestHandPosition at 420 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 5 }, /* playerId at 422 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 4 }, /* resultCard1 at 423 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 3 }, /* resultCard2 at 424 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -3, 2 }, /* cardsValue at 426 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -4, 1 }, /* moneyWon at 427 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 6, -5, 0 }, /* playerMoney at 428 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 3, 0, 0 } /* bestHandPosition at 425 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayerResult_specs_1 = { sizeof(struct PlayerResult), offsetof(struct PlayerResult, _asn_ctx), asn_MAP_PlayerResult_tag2el_1, - 6, /* Count of tags in the map */ + 7, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ - 5, /* Start extensions */ - 7 /* Stop extensions */ + 6, /* Start extensions */ + 8 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_PlayerResult = { "PlayerResult", @@ -294,7 +234,7 @@ asn_TYPE_descriptor_t asn_DEF_PlayerResult = { /sizeof(asn_DEF_PlayerResult_tags_1[0]), /* 1 */ 0, /* No PER visible constraints */ asn_MBR_PlayerResult_1, - 6, /* Elements count */ + 7, /* Elements count */ &asn_SPC_PlayerResult_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/PlayerResult.h b/src/third_party/asn1/PlayerResult.h index 6665854b..d2b229ab 100644 --- a/src/third_party/asn1/PlayerResult.h +++ b/src/third_party/asn1/PlayerResult.h @@ -12,8 +12,8 @@ /* Including external dependencies */ #include "NonZeroId.h" -#include #include "Card.h" +#include #include #include #include @@ -25,12 +25,8 @@ extern "C" { /* PlayerResult */ typedef struct PlayerResult { NonZeroId_t playerId; - struct resultCards { - A_SEQUENCE_OF(Card_t) list; - - /* Context for parsing across buffer boundaries */ - asn_struct_ctx_t _asn_ctx; - } resultCards; + Card_t resultCard1; + Card_t resultCard2; struct bestHandPosition { A_SEQUENCE_OF(long) list; diff --git a/src/third_party/asn1/PlayersActionDoneMessage.c b/src/third_party/asn1/PlayersActionDoneMessage.c index f7626d60..bdc9d098 100644 --- a/src/third_party/asn1/PlayersActionDoneMessage.c +++ b/src/third_party/asn1/PlayersActionDoneMessage.c @@ -187,14 +187,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 370 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 4 }, /* playerId at 371 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -2, 3 }, /* totalPlayerBet at 374 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -3, 2 }, /* playerMoney at 375 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 6, -4, 1 }, /* highestSet at 376 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 7, -5, 0 }, /* minimumRaise at 377 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 1 }, /* gameState at 372 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 3, -1, 0 } /* playerAction at 373 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 5 }, /* gameId at 371 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 4 }, /* playerId at 372 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -2, 3 }, /* totalPlayerBet at 375 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -3, 2 }, /* playerMoney at 376 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 6, -4, 1 }, /* highestSet at 377 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 7, -5, 0 }, /* minimumRaise at 378 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 1 }, /* gameState at 373 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 3, -1, 0 } /* playerAction at 374 */ }; 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 4e025031..c614cc22 100644 --- a/src/third_party/asn1/PlayersTurnMessage.c +++ b/src/third_party/asn1/PlayersTurnMessage.c @@ -42,9 +42,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 345 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* playerId at 346 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 } /* gameState at 348 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 346 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* playerId at 347 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 } /* gameState at 349 */ }; static asn_SEQUENCE_specifics_t asn_SPC_PlayersTurnMessage_specs_1 = { sizeof(struct PlayersTurnMessage), diff --git a/src/third_party/asn1/StartKickPetitionMessage.c b/src/third_party/asn1/StartKickPetitionMessage.c index de01c97c..f5597e94 100644 --- a/src/third_party/asn1/StartKickPetitionMessage.c +++ b/src/third_party/asn1/StartKickPetitionMessage.c @@ -110,11 +110,11 @@ 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, 4 }, /* petitionId at 453 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 3 }, /* proposingPlayerId at 454 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 2 }, /* kickPlayerId at 455 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 1 }, /* kickTimeoutSec at 456 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -4, 0 } /* numVotesNeededToKick at 457 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 4 }, /* petitionId at 458 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 3 }, /* proposingPlayerId at 459 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 2 }, /* kickPlayerId at 460 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 1 }, /* kickTimeoutSec at 461 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -4, 0 } /* numVotesNeededToKick at 462 */ }; 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 fbbacb92..500aa367 100644 --- a/src/third_party/asn1/StatisticsData.c +++ b/src/third_party/asn1/StatisticsData.c @@ -147,8 +147,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 512 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* statisticsType at 509 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* statisticsValue at 517 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* statisticsType at 514 */ }; 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 591347a5..b441fd18 100644 --- a/src/third_party/asn1/StatisticsMessage.c +++ b/src/third_party/asn1/StatisticsMessage.c @@ -94,7 +94,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 505 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* statisticsData at 510 */ }; static asn_SEQUENCE_specifics_t asn_SPC_StatisticsMessage_specs_1 = { sizeof(struct StatisticsMessage), diff --git a/src/third_party/asn1/TimeoutWarningMessage.c b/src/third_party/asn1/TimeoutWarningMessage.c index d5f34160..b4e03934 100644 --- a/src/third_party/asn1/TimeoutWarningMessage.c +++ b/src/third_party/asn1/TimeoutWarningMessage.c @@ -150,8 +150,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 535 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* timeoutReason at 531 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* remainingSeconds at 540 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* timeoutReason at 536 */ }; static asn_SEQUENCE_specifics_t asn_SPC_TimeoutWarningMessage_specs_1 = { sizeof(struct TimeoutWarningMessage), diff --git a/src/third_party/asn1/VoteKickDenied.c b/src/third_party/asn1/VoteKickDenied.c index 21c9424a..575e9aca 100644 --- a/src/third_party/asn1/VoteKickDenied.c +++ b/src/third_party/asn1/VoteKickDenied.c @@ -140,7 +140,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 478 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* voteKickDeniedReason at 483 */ }; 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 6952ab0b..0cefa989 100644 --- a/src/third_party/asn1/VoteKickReplyMessage.c +++ b/src/third_party/asn1/VoteKickReplyMessage.c @@ -29,8 +29,8 @@ static asn_TYPE_member_t asn_MBR_voteKickReplyType_3[] = { }, }; static asn_TYPE_tag2member_t asn_MAP_voteKickReplyType_tag2el_3[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* voteKickAck at 468 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* voteKickDenied at 470 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* voteKickAck at 473 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* voteKickDenied at 475 */ }; static asn_CHOICE_specifics_t asn_SPC_voteKickReplyType_specs_3 = { sizeof(struct voteKickReplyType), @@ -90,9 +90,9 @@ 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, 0 }, /* petitionId at 466 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* voteKickAck at 468 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* voteKickDenied at 470 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* petitionId at 471 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* voteKickAck at 473 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* voteKickDenied at 475 */ }; 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 c19b858f..b46eade5 100644 --- a/src/third_party/asn1/VoteKickRequestMessage.c +++ b/src/third_party/asn1/VoteKickRequestMessage.c @@ -33,8 +33,8 @@ 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)), 1, 0, 0 }, /* voteKick at 462 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* petitionId at 461 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* voteKick at 467 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* petitionId at 466 */ }; 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 95d64fe1..63798ada 100644 --- a/src/third_party/asn1/YourActionRejectedMessage.c +++ b/src/third_party/asn1/YourActionRejectedMessage.c @@ -204,11 +204,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 358 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -1, 0 }, /* yourRelativeBet at 361 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 2 }, /* gameState at 359 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, -1, 1 }, /* yourAction at 360 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 4, -2, 0 } /* rejectionReason at 363 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 359 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -1, 0 }, /* yourRelativeBet at 362 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 2 }, /* gameState at 360 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, -1, 1 }, /* yourAction at 361 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 4, -2, 0 } /* rejectionReason at 364 */ }; static asn_SEQUENCE_specifics_t asn_SPC_YourActionRejectedMessage_specs_1 = { sizeof(struct YourActionRejectedMessage),