diff --git a/src/third_party/asn1/AskKickDeniedMessage.c b/src/third_party/asn1/AskKickDeniedMessage.c index 9a34fd45..3d5db0ef 100644 --- a/src/third_party/asn1/AskKickDeniedMessage.c +++ b/src/third_party/asn1/AskKickDeniedMessage.c @@ -9,7 +9,7 @@ #include "AskKickDeniedMessage.h" static int -kickDeniedReason_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, +kickDeniedReason_4_constraint(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_NativeEnumerated.check_constraints; @@ -21,7 +21,7 @@ kickDeniedReason_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr, * so here we adjust the DEF accordingly. */ static void -kickDeniedReason_3_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { +kickDeniedReason_4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->free_struct = asn_DEF_NativeEnumerated.free_struct; td->print_struct = asn_DEF_NativeEnumerated.print_struct; td->ber_decoder = asn_DEF_NativeEnumerated.ber_decoder; @@ -38,100 +38,109 @@ kickDeniedReason_3_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { } static void -kickDeniedReason_3_free(asn_TYPE_descriptor_t *td, +kickDeniedReason_4_free(asn_TYPE_descriptor_t *td, void *struct_ptr, int contents_only) { - kickDeniedReason_3_inherit_TYPE_descriptor(td); + kickDeniedReason_4_inherit_TYPE_descriptor(td); td->free_struct(td, struct_ptr, contents_only); } static int -kickDeniedReason_3_print(asn_TYPE_descriptor_t *td, const void *struct_ptr, +kickDeniedReason_4_print(asn_TYPE_descriptor_t *td, const void *struct_ptr, int ilevel, asn_app_consume_bytes_f *cb, void *app_key) { - kickDeniedReason_3_inherit_TYPE_descriptor(td); + kickDeniedReason_4_inherit_TYPE_descriptor(td); return td->print_struct(td, struct_ptr, ilevel, cb, app_key); } static asn_dec_rval_t -kickDeniedReason_3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, +kickDeniedReason_4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, void **structure, const void *bufptr, size_t size, int tag_mode) { - kickDeniedReason_3_inherit_TYPE_descriptor(td); + kickDeniedReason_4_inherit_TYPE_descriptor(td); return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode); } static asn_enc_rval_t -kickDeniedReason_3_encode_der(asn_TYPE_descriptor_t *td, +kickDeniedReason_4_encode_der(asn_TYPE_descriptor_t *td, void *structure, int tag_mode, ber_tlv_tag_t tag, asn_app_consume_bytes_f *cb, void *app_key) { - kickDeniedReason_3_inherit_TYPE_descriptor(td); + kickDeniedReason_4_inherit_TYPE_descriptor(td); return td->der_encoder(td, structure, tag_mode, tag, cb, app_key); } static asn_dec_rval_t -kickDeniedReason_3_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, +kickDeniedReason_4_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, void **structure, const char *opt_mname, const void *bufptr, size_t size) { - kickDeniedReason_3_inherit_TYPE_descriptor(td); + kickDeniedReason_4_inherit_TYPE_descriptor(td); return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size); } static asn_enc_rval_t -kickDeniedReason_3_encode_xer(asn_TYPE_descriptor_t *td, void *structure, +kickDeniedReason_4_encode_xer(asn_TYPE_descriptor_t *td, void *structure, int ilevel, enum xer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { - kickDeniedReason_3_inherit_TYPE_descriptor(td); + kickDeniedReason_4_inherit_TYPE_descriptor(td); return td->xer_encoder(td, structure, ilevel, flags, cb, app_key); } -static asn_INTEGER_enum_map_t asn_MAP_kickDeniedReason_value2enum_3[] = { +static asn_INTEGER_enum_map_t asn_MAP_kickDeniedReason_value2enum_4[] = { { 0, 26, "kickDeniedInvalidGameState" }, { 1, 21, "kickDeniedNotPossible" }, { 2, 23, "kickDeniedTryAgainLater" }, { 3, 27, "kickDeniedAlreadyInProgress" }, { 4, 25, "kickDeniedInvalidPlayerId" } }; -static unsigned int asn_MAP_kickDeniedReason_enum2value_3[] = { +static unsigned int asn_MAP_kickDeniedReason_enum2value_4[] = { 3, /* kickDeniedAlreadyInProgress(3) */ 0, /* kickDeniedInvalidGameState(0) */ 4, /* kickDeniedInvalidPlayerId(4) */ 1, /* kickDeniedNotPossible(1) */ 2 /* kickDeniedTryAgainLater(2) */ }; -static asn_INTEGER_specifics_t asn_SPC_kickDeniedReason_specs_3 = { - asn_MAP_kickDeniedReason_value2enum_3, /* "tag" => N; sorted by tag */ - asn_MAP_kickDeniedReason_enum2value_3, /* N => "tag"; sorted by N */ +static asn_INTEGER_specifics_t asn_SPC_kickDeniedReason_specs_4 = { + asn_MAP_kickDeniedReason_value2enum_4, /* "tag" => N; sorted by tag */ + asn_MAP_kickDeniedReason_enum2value_4, /* N => "tag"; sorted by N */ 5, /* Number of elements in the maps */ 0, /* Enumeration is not extensible */ 1, /* Strict enumeration */ 0, /* Native long size */ 0 }; -static ber_tlv_tag_t asn_DEF_kickDeniedReason_tags_3[] = { +static ber_tlv_tag_t asn_DEF_kickDeniedReason_tags_4[] = { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)) }; static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_kickDeniedReason_3 = { +asn_TYPE_descriptor_t asn_DEF_kickDeniedReason_4 = { "kickDeniedReason", "kickDeniedReason", - kickDeniedReason_3_free, - kickDeniedReason_3_print, - kickDeniedReason_3_constraint, - kickDeniedReason_3_decode_ber, - kickDeniedReason_3_encode_der, - kickDeniedReason_3_decode_xer, - kickDeniedReason_3_encode_xer, + kickDeniedReason_4_free, + kickDeniedReason_4_print, + kickDeniedReason_4_constraint, + kickDeniedReason_4_decode_ber, + kickDeniedReason_4_encode_der, + kickDeniedReason_4_decode_xer, + kickDeniedReason_4_encode_xer, 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ - asn_DEF_kickDeniedReason_tags_3, - sizeof(asn_DEF_kickDeniedReason_tags_3) - /sizeof(asn_DEF_kickDeniedReason_tags_3[0]), /* 1 */ - asn_DEF_kickDeniedReason_tags_3, /* Same as above */ - sizeof(asn_DEF_kickDeniedReason_tags_3) - /sizeof(asn_DEF_kickDeniedReason_tags_3[0]), /* 1 */ + asn_DEF_kickDeniedReason_tags_4, + sizeof(asn_DEF_kickDeniedReason_tags_4) + /sizeof(asn_DEF_kickDeniedReason_tags_4[0]), /* 1 */ + asn_DEF_kickDeniedReason_tags_4, /* Same as above */ + sizeof(asn_DEF_kickDeniedReason_tags_4) + /sizeof(asn_DEF_kickDeniedReason_tags_4[0]), /* 1 */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ - &asn_SPC_kickDeniedReason_specs_3 /* Additional specs */ + &asn_SPC_kickDeniedReason_specs_4 /* Additional specs */ }; static asn_TYPE_member_t asn_MBR_AskKickDeniedMessage_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct AskKickDeniedMessage, gameId), + (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, + "gameId" + }, { ATF_NOFLAGS, 0, offsetof(struct AskKickDeniedMessage, playerId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, @@ -144,7 +153,7 @@ static asn_TYPE_member_t asn_MBR_AskKickDeniedMessage_1[] = { { ATF_NOFLAGS, 0, offsetof(struct AskKickDeniedMessage, kickDeniedReason), (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, - &asn_DEF_kickDeniedReason_3, + &asn_DEF_kickDeniedReason_4, 0, /* Defer constraints checking to the member type */ 0, /* PER is not compiled, use -gen-PER */ 0, @@ -156,17 +165,18 @@ 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 448 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 1, 0, 0 } /* kickDeniedReason at 450 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 449 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* playerId at 450 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 2, 0, 0 } /* kickDeniedReason at 452 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AskKickDeniedMessage_specs_1 = { sizeof(struct AskKickDeniedMessage), offsetof(struct AskKickDeniedMessage, _asn_ctx), asn_MAP_AskKickDeniedMessage_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_AskKickDeniedMessage = { "AskKickDeniedMessage", @@ -188,7 +198,7 @@ asn_TYPE_descriptor_t asn_DEF_AskKickDeniedMessage = { /sizeof(asn_DEF_AskKickDeniedMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_AskKickDeniedMessage_1, - 2, /* Elements count */ + 3, /* Elements count */ &asn_SPC_AskKickDeniedMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/AskKickDeniedMessage.h b/src/third_party/asn1/AskKickDeniedMessage.h index 4be13055..430441f2 100644 --- a/src/third_party/asn1/AskKickDeniedMessage.h +++ b/src/third_party/asn1/AskKickDeniedMessage.h @@ -30,6 +30,7 @@ typedef enum kickDeniedReason { /* AskKickDeniedMessage */ typedef struct AskKickDeniedMessage { + NonZeroId_t gameId; NonZeroId_t playerId; long kickDeniedReason; /* @@ -42,7 +43,7 @@ typedef struct AskKickDeniedMessage { } AskKickDeniedMessage_t; /* Implementation */ -/* extern asn_TYPE_descriptor_t asn_DEF_kickDeniedReason_3; // (Use -fall-defs-global to expose) */ +/* extern asn_TYPE_descriptor_t asn_DEF_kickDeniedReason_4; // (Use -fall-defs-global to expose) */ extern asn_TYPE_descriptor_t asn_DEF_AskKickDeniedMessage; #ifdef __cplusplus diff --git a/src/third_party/asn1/AskKickPlayerMessage.c b/src/third_party/asn1/AskKickPlayerMessage.c index 155a99fa..d641342b 100644 --- a/src/third_party/asn1/AskKickPlayerMessage.c +++ b/src/third_party/asn1/AskKickPlayerMessage.c @@ -9,6 +9,15 @@ #include "AskKickPlayerMessage.h" static asn_TYPE_member_t asn_MBR_AskKickPlayerMessage_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct AskKickPlayerMessage, gameId), + (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, + "gameId" + }, { ATF_NOFLAGS, 0, offsetof(struct AskKickPlayerMessage, playerId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, @@ -24,16 +33,17 @@ 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 445 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 444 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* playerId at 446 */ }; static asn_SEQUENCE_specifics_t asn_SPC_AskKickPlayerMessage_specs_1 = { sizeof(struct AskKickPlayerMessage), offsetof(struct AskKickPlayerMessage, _asn_ctx), asn_MAP_AskKickPlayerMessage_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_AskKickPlayerMessage = { "AskKickPlayerMessage", @@ -55,7 +65,7 @@ asn_TYPE_descriptor_t asn_DEF_AskKickPlayerMessage = { /sizeof(asn_DEF_AskKickPlayerMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_AskKickPlayerMessage_1, - 1, /* Elements count */ + 2, /* Elements count */ &asn_SPC_AskKickPlayerMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/AskKickPlayerMessage.h b/src/third_party/asn1/AskKickPlayerMessage.h index 58045c4f..9ce6e439 100644 --- a/src/third_party/asn1/AskKickPlayerMessage.h +++ b/src/third_party/asn1/AskKickPlayerMessage.h @@ -20,6 +20,7 @@ extern "C" { /* AskKickPlayerMessage */ typedef struct AskKickPlayerMessage { + NonZeroId_t gameId; NonZeroId_t playerId; /* * This type is extensible, diff --git a/src/third_party/asn1/ChatMessage.c b/src/third_party/asn1/ChatMessage.c index 9d8c4eba..5a7de76f 100644 --- a/src/third_party/asn1/ChatMessage.c +++ b/src/third_party/asn1/ChatMessage.c @@ -41,15 +41,6 @@ memb_chatText_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, } static asn_TYPE_member_t asn_MBR_ChatMessage_1[] = { - { ATF_NOFLAGS, 0, offsetof(struct ChatMessage, playerId), - (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), - 0, - &asn_DEF_Id, - 0, /* Defer constraints checking to the member type */ - 0, /* PER is not compiled, use -gen-PER */ - 0, - "playerId" - }, { ATF_NOFLAGS, 0, offsetof(struct ChatMessage, gameId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, @@ -59,6 +50,15 @@ static asn_TYPE_member_t asn_MBR_ChatMessage_1[] = { 0, "gameId" }, + { ATF_NOFLAGS, 0, offsetof(struct ChatMessage, playerId), + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), + 0, + &asn_DEF_Id, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "playerId" + }, { ATF_NOFLAGS, 0, offsetof(struct ChatMessage, chatText), (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, @@ -74,9 +74,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 526 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* gameId at 527 */ - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 2, 0, 0 } /* chatText at 528 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 533 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* playerId at 534 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 2, 0, 0 } /* chatText at 535 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatMessage_specs_1 = { sizeof(struct ChatMessage), diff --git a/src/third_party/asn1/ChatMessage.h b/src/third_party/asn1/ChatMessage.h index 35b98ed9..6f1197b7 100644 --- a/src/third_party/asn1/ChatMessage.h +++ b/src/third_party/asn1/ChatMessage.h @@ -21,8 +21,8 @@ extern "C" { /* ChatMessage */ typedef struct ChatMessage { - Id_t playerId; Id_t gameId; + Id_t playerId; UTF8String_t chatText; /* * This type is extensible, diff --git a/src/third_party/asn1/ChatRequestMessage.c b/src/third_party/asn1/ChatRequestMessage.c index dd9b1577..9cabf1a4 100644 --- a/src/third_party/asn1/ChatRequestMessage.c +++ b/src/third_party/asn1/ChatRequestMessage.c @@ -65,8 +65,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 521 */ - { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 } /* chatText at 522 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* gameId at 528 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 } /* chatText at 529 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ChatRequestMessage_specs_1 = { sizeof(struct ChatRequestMessage), diff --git a/src/third_party/asn1/DialogMessage.c b/src/third_party/asn1/DialogMessage.c index 800ac2ab..00dad3fe 100644 --- a/src/third_party/asn1/DialogMessage.c +++ b/src/third_party/asn1/DialogMessage.c @@ -56,7 +56,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 532 */ + { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 0, 0, 0 } /* notificationText at 539 */ }; 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 64a06004..6b9919bc 100644 --- a/src/third_party/asn1/EndKickPetitionMessage.c +++ b/src/third_party/asn1/EndKickPetitionMessage.c @@ -9,7 +9,7 @@ #include "EndKickPetitionMessage.h" static int -petitionEndReason_6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, +petitionEndReason_7_constraint(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { /* Replace with underlying type checker */ td->check_constraints = asn_DEF_NativeEnumerated.check_constraints; @@ -21,7 +21,7 @@ petitionEndReason_6_constraint(asn_TYPE_descriptor_t *td, const void *sptr, * so here we adjust the DEF accordingly. */ static void -petitionEndReason_6_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { +petitionEndReason_7_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->free_struct = asn_DEF_NativeEnumerated.free_struct; td->print_struct = asn_DEF_NativeEnumerated.print_struct; td->ber_decoder = asn_DEF_NativeEnumerated.ber_decoder; @@ -38,46 +38,46 @@ petitionEndReason_6_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { } static void -petitionEndReason_6_free(asn_TYPE_descriptor_t *td, +petitionEndReason_7_free(asn_TYPE_descriptor_t *td, void *struct_ptr, int contents_only) { - petitionEndReason_6_inherit_TYPE_descriptor(td); + petitionEndReason_7_inherit_TYPE_descriptor(td); td->free_struct(td, struct_ptr, contents_only); } static int -petitionEndReason_6_print(asn_TYPE_descriptor_t *td, const void *struct_ptr, +petitionEndReason_7_print(asn_TYPE_descriptor_t *td, const void *struct_ptr, int ilevel, asn_app_consume_bytes_f *cb, void *app_key) { - petitionEndReason_6_inherit_TYPE_descriptor(td); + petitionEndReason_7_inherit_TYPE_descriptor(td); return td->print_struct(td, struct_ptr, ilevel, cb, app_key); } static asn_dec_rval_t -petitionEndReason_6_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, +petitionEndReason_7_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, void **structure, const void *bufptr, size_t size, int tag_mode) { - petitionEndReason_6_inherit_TYPE_descriptor(td); + petitionEndReason_7_inherit_TYPE_descriptor(td); return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode); } static asn_enc_rval_t -petitionEndReason_6_encode_der(asn_TYPE_descriptor_t *td, +petitionEndReason_7_encode_der(asn_TYPE_descriptor_t *td, void *structure, int tag_mode, ber_tlv_tag_t tag, asn_app_consume_bytes_f *cb, void *app_key) { - petitionEndReason_6_inherit_TYPE_descriptor(td); + petitionEndReason_7_inherit_TYPE_descriptor(td); return td->der_encoder(td, structure, tag_mode, tag, cb, app_key); } static asn_dec_rval_t -petitionEndReason_6_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, +petitionEndReason_7_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, void **structure, const char *opt_mname, const void *bufptr, size_t size) { - petitionEndReason_6_inherit_TYPE_descriptor(td); + petitionEndReason_7_inherit_TYPE_descriptor(td); return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size); } static asn_enc_rval_t -petitionEndReason_6_encode_xer(asn_TYPE_descriptor_t *td, void *structure, +petitionEndReason_7_encode_xer(asn_TYPE_descriptor_t *td, void *structure, int ilevel, enum xer_encoder_flags_e flags, asn_app_consume_bytes_f *cb, void *app_key) { - petitionEndReason_6_inherit_TYPE_descriptor(td); + petitionEndReason_7_inherit_TYPE_descriptor(td); return td->xer_encoder(td, structure, ilevel, flags, cb, app_key); } @@ -131,55 +131,64 @@ memb_numVotesInFavourOfKicking_constraint_1(asn_TYPE_descriptor_t *td, const voi } } -static asn_INTEGER_enum_map_t asn_MAP_petitionEndReason_value2enum_6[] = { +static asn_INTEGER_enum_map_t asn_MAP_petitionEndReason_value2enum_7[] = { { 0, 22, "petitionEndEnoughVotes" }, { 1, 24, "petitionEndTooFewPlayers" }, { 2, 21, "petitionEndPlayerLeft" }, { 3, 18, "petitionEndTimeout" } }; -static unsigned int asn_MAP_petitionEndReason_enum2value_6[] = { +static unsigned int asn_MAP_petitionEndReason_enum2value_7[] = { 0, /* petitionEndEnoughVotes(0) */ 2, /* petitionEndPlayerLeft(2) */ 3, /* petitionEndTimeout(3) */ 1 /* petitionEndTooFewPlayers(1) */ }; -static asn_INTEGER_specifics_t asn_SPC_petitionEndReason_specs_6 = { - asn_MAP_petitionEndReason_value2enum_6, /* "tag" => N; sorted by tag */ - asn_MAP_petitionEndReason_enum2value_6, /* N => "tag"; sorted by N */ +static asn_INTEGER_specifics_t asn_SPC_petitionEndReason_specs_7 = { + asn_MAP_petitionEndReason_value2enum_7, /* "tag" => N; sorted by tag */ + asn_MAP_petitionEndReason_enum2value_7, /* N => "tag"; sorted by N */ 4, /* Number of elements in the maps */ 0, /* Enumeration is not extensible */ 1, /* Strict enumeration */ 0, /* Native long size */ 0 }; -static ber_tlv_tag_t asn_DEF_petitionEndReason_tags_6[] = { +static ber_tlv_tag_t asn_DEF_petitionEndReason_tags_7[] = { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)) }; static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_petitionEndReason_6 = { +asn_TYPE_descriptor_t asn_DEF_petitionEndReason_7 = { "petitionEndReason", "petitionEndReason", - petitionEndReason_6_free, - petitionEndReason_6_print, - petitionEndReason_6_constraint, - petitionEndReason_6_decode_ber, - petitionEndReason_6_encode_der, - petitionEndReason_6_decode_xer, - petitionEndReason_6_encode_xer, + petitionEndReason_7_free, + petitionEndReason_7_print, + petitionEndReason_7_constraint, + petitionEndReason_7_decode_ber, + petitionEndReason_7_encode_der, + petitionEndReason_7_decode_xer, + petitionEndReason_7_encode_xer, 0, 0, /* No PER support, use "-gen-PER" to enable */ 0, /* Use generic outmost tag fetcher */ - asn_DEF_petitionEndReason_tags_6, - sizeof(asn_DEF_petitionEndReason_tags_6) - /sizeof(asn_DEF_petitionEndReason_tags_6[0]), /* 1 */ - asn_DEF_petitionEndReason_tags_6, /* Same as above */ - sizeof(asn_DEF_petitionEndReason_tags_6) - /sizeof(asn_DEF_petitionEndReason_tags_6[0]), /* 1 */ + asn_DEF_petitionEndReason_tags_7, + sizeof(asn_DEF_petitionEndReason_tags_7) + /sizeof(asn_DEF_petitionEndReason_tags_7[0]), /* 1 */ + asn_DEF_petitionEndReason_tags_7, /* Same as above */ + sizeof(asn_DEF_petitionEndReason_tags_7) + /sizeof(asn_DEF_petitionEndReason_tags_7[0]), /* 1 */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ - &asn_SPC_petitionEndReason_specs_6 /* Additional specs */ + &asn_SPC_petitionEndReason_specs_7 /* Additional specs */ }; static asn_TYPE_member_t asn_MBR_EndKickPetitionMessage_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct EndKickPetitionMessage, gameId), + (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, + "gameId" + }, { ATF_NOFLAGS, 0, offsetof(struct EndKickPetitionMessage, petitionId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, @@ -219,7 +228,7 @@ static asn_TYPE_member_t asn_MBR_EndKickPetitionMessage_1[] = { { ATF_NOFLAGS, 0, offsetof(struct EndKickPetitionMessage, petitionEndReason), (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, - &asn_DEF_petitionEndReason_6, + &asn_DEF_petitionEndReason_7, 0, /* Defer constraints checking to the member type */ 0, /* PER is not compiled, use -gen-PER */ 0, @@ -231,20 +240,21 @@ 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 500 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 2 }, /* petitionId at 497 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 1 }, /* numVotesAgainstKicking at 498 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 0 }, /* numVotesInFavourOfKicking at 499 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 4, 0, 0 } /* petitionEndReason at 502 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 4, 0, 0 }, /* resultPlayerKicked at 507 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 3 }, /* gameId at 503 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 2 }, /* petitionId at 504 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 1 }, /* numVotesAgainstKicking at 505 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 0 }, /* numVotesInFavourOfKicking at 506 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 5, 0, 0 } /* petitionEndReason at 509 */ }; static asn_SEQUENCE_specifics_t asn_SPC_EndKickPetitionMessage_specs_1 = { sizeof(struct EndKickPetitionMessage), offsetof(struct EndKickPetitionMessage, _asn_ctx), asn_MAP_EndKickPetitionMessage_tag2el_1, - 5, /* Count of tags in the map */ + 6, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ - 4, /* Start extensions */ - 6 /* Stop extensions */ + 5, /* Start extensions */ + 7 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_EndKickPetitionMessage = { "EndKickPetitionMessage", @@ -266,7 +276,7 @@ asn_TYPE_descriptor_t asn_DEF_EndKickPetitionMessage = { /sizeof(asn_DEF_EndKickPetitionMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_EndKickPetitionMessage_1, - 5, /* Elements count */ + 6, /* Elements count */ &asn_SPC_EndKickPetitionMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/EndKickPetitionMessage.h b/src/third_party/asn1/EndKickPetitionMessage.h index 643da979..6c58ff99 100644 --- a/src/third_party/asn1/EndKickPetitionMessage.h +++ b/src/third_party/asn1/EndKickPetitionMessage.h @@ -31,6 +31,7 @@ typedef enum petitionEndReason { /* EndKickPetitionMessage */ typedef struct EndKickPetitionMessage { + NonZeroId_t gameId; NonZeroId_t petitionId; long numVotesAgainstKicking; long numVotesInFavourOfKicking; @@ -46,7 +47,7 @@ typedef struct EndKickPetitionMessage { } EndKickPetitionMessage_t; /* Implementation */ -/* extern asn_TYPE_descriptor_t asn_DEF_petitionEndReason_6; // (Use -fall-defs-global to expose) */ +/* extern asn_TYPE_descriptor_t asn_DEF_petitionEndReason_7; // (Use -fall-defs-global to expose) */ extern asn_TYPE_descriptor_t asn_DEF_EndKickPetitionMessage; #ifdef __cplusplus diff --git a/src/third_party/asn1/ErrorMessage.c b/src/third_party/asn1/ErrorMessage.c index a883c6d5..26ef1382 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 548 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* errorReason at 555 */ }; static asn_SEQUENCE_specifics_t asn_SPC_ErrorMessage_specs_1 = { sizeof(struct ErrorMessage), diff --git a/src/third_party/asn1/KickPetitionUpdateMessage.c b/src/third_party/asn1/KickPetitionUpdateMessage.c index 27bbf303..f399fe00 100644 --- a/src/third_party/asn1/KickPetitionUpdateMessage.c +++ b/src/third_party/asn1/KickPetitionUpdateMessage.c @@ -84,6 +84,15 @@ memb_numVotesNeededToKick_constraint_1(asn_TYPE_descriptor_t *td, const void *sp } static asn_TYPE_member_t asn_MBR_KickPetitionUpdateMessage_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct KickPetitionUpdateMessage, gameId), + (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, + "gameId" + }, { ATF_NOFLAGS, 0, offsetof(struct KickPetitionUpdateMessage, petitionId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, @@ -126,19 +135,20 @@ 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 490 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 2 }, /* numVotesAgainstKicking at 491 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 1 }, /* numVotesInFavourOfKicking at 492 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 0 } /* numVotesNeededToKick at 493 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 4 }, /* gameId at 495 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 3 }, /* petitionId at 496 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 2 }, /* numVotesAgainstKicking at 497 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 1 }, /* numVotesInFavourOfKicking at 498 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -4, 0 } /* numVotesNeededToKick at 499 */ }; static asn_SEQUENCE_specifics_t asn_SPC_KickPetitionUpdateMessage_specs_1 = { sizeof(struct KickPetitionUpdateMessage), offsetof(struct KickPetitionUpdateMessage, _asn_ctx), asn_MAP_KickPetitionUpdateMessage_tag2el_1, - 4, /* Count of tags in the map */ + 5, /* 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_KickPetitionUpdateMessage = { "KickPetitionUpdateMessage", @@ -160,7 +170,7 @@ asn_TYPE_descriptor_t asn_DEF_KickPetitionUpdateMessage = { /sizeof(asn_DEF_KickPetitionUpdateMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_KickPetitionUpdateMessage_1, - 4, /* Elements count */ + 5, /* Elements count */ &asn_SPC_KickPetitionUpdateMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/KickPetitionUpdateMessage.h b/src/third_party/asn1/KickPetitionUpdateMessage.h index d063d641..15413338 100644 --- a/src/third_party/asn1/KickPetitionUpdateMessage.h +++ b/src/third_party/asn1/KickPetitionUpdateMessage.h @@ -21,6 +21,7 @@ extern "C" { /* KickPetitionUpdateMessage */ typedef struct KickPetitionUpdateMessage { + NonZeroId_t gameId; NonZeroId_t petitionId; long numVotesAgainstKicking; long numVotesInFavourOfKicking; diff --git a/src/third_party/asn1/StartKickPetitionMessage.c b/src/third_party/asn1/StartKickPetitionMessage.c index 8b7d6ecb..26e8415a 100644 --- a/src/third_party/asn1/StartKickPetitionMessage.c +++ b/src/third_party/asn1/StartKickPetitionMessage.c @@ -59,6 +59,15 @@ memb_numVotesNeededToKick_constraint_1(asn_TYPE_descriptor_t *td, const void *sp } static asn_TYPE_member_t asn_MBR_StartKickPetitionMessage_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct StartKickPetitionMessage, gameId), + (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, + "gameId" + }, { ATF_NOFLAGS, 0, offsetof(struct StartKickPetitionMessage, petitionId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, @@ -110,20 +119,21 @@ 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 459 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 3 }, /* proposingPlayerId at 460 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 2 }, /* kickPlayerId at 461 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 1 }, /* kickTimeoutSec at 462 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -4, 0 } /* numVotesNeededToKick at 463 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 5 }, /* gameId at 461 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 4 }, /* petitionId at 462 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, -2, 3 }, /* proposingPlayerId at 463 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 3, -3, 2 }, /* kickPlayerId at 464 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, -4, 1 }, /* kickTimeoutSec at 465 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 5, -5, 0 } /* numVotesNeededToKick at 466 */ }; static asn_SEQUENCE_specifics_t asn_SPC_StartKickPetitionMessage_specs_1 = { sizeof(struct StartKickPetitionMessage), offsetof(struct StartKickPetitionMessage, _asn_ctx), asn_MAP_StartKickPetitionMessage_tag2el_1, - 5, /* Count of tags in the map */ + 6, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ - 4, /* Start extensions */ - 6 /* Stop extensions */ + 5, /* Start extensions */ + 7 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_StartKickPetitionMessage = { "StartKickPetitionMessage", @@ -145,7 +155,7 @@ asn_TYPE_descriptor_t asn_DEF_StartKickPetitionMessage = { /sizeof(asn_DEF_StartKickPetitionMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_StartKickPetitionMessage_1, - 5, /* Elements count */ + 6, /* Elements count */ &asn_SPC_StartKickPetitionMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/StartKickPetitionMessage.h b/src/third_party/asn1/StartKickPetitionMessage.h index 7c1ad64e..42501a7e 100644 --- a/src/third_party/asn1/StartKickPetitionMessage.h +++ b/src/third_party/asn1/StartKickPetitionMessage.h @@ -21,6 +21,7 @@ extern "C" { /* StartKickPetitionMessage */ typedef struct StartKickPetitionMessage { + NonZeroId_t gameId; NonZeroId_t petitionId; NonZeroId_t proposingPlayerId; NonZeroId_t kickPlayerId; diff --git a/src/third_party/asn1/StatisticsData.c b/src/third_party/asn1/StatisticsData.c index 002cb765..bfa6aa43 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 518 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* statisticsType at 515 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* statisticsValue at 525 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* statisticsType at 522 */ }; 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 ca7b6d67..75dfb422 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 511 */ + { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 0 } /* statisticsData at 518 */ }; 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 b53b3573..b1a4e1a6 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 541 */ - { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* timeoutReason at 537 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* remainingSeconds at 548 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* timeoutReason at 544 */ }; 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 3e53d632..5e836cfc 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 484 */ + { (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)), 0, 0, 0 } /* voteKickDeniedReason at 489 */ }; 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 a9ba8bef..41be9baa 100644 --- a/src/third_party/asn1/VoteKickReplyMessage.c +++ b/src/third_party/asn1/VoteKickReplyMessage.c @@ -8,7 +8,7 @@ #include "VoteKickReplyMessage.h" -static asn_TYPE_member_t asn_MBR_voteKickReplyType_3[] = { +static asn_TYPE_member_t asn_MBR_voteKickReplyType_4[] = { { ATF_NOFLAGS, 0, offsetof(struct voteKickReplyType, choice.voteKickAck), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -28,22 +28,22 @@ static asn_TYPE_member_t asn_MBR_voteKickReplyType_3[] = { "voteKickDenied" }, }; -static asn_TYPE_tag2member_t asn_MAP_voteKickReplyType_tag2el_3[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* voteKickAck at 474 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* voteKickDenied at 476 */ +static asn_TYPE_tag2member_t asn_MAP_voteKickReplyType_tag2el_4[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* voteKickAck at 479 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* voteKickDenied at 481 */ }; -static asn_CHOICE_specifics_t asn_SPC_voteKickReplyType_specs_3 = { +static asn_CHOICE_specifics_t asn_SPC_voteKickReplyType_specs_4 = { sizeof(struct voteKickReplyType), offsetof(struct voteKickReplyType, _asn_ctx), offsetof(struct voteKickReplyType, present), sizeof(((struct voteKickReplyType *)0)->present), - asn_MAP_voteKickReplyType_tag2el_3, + asn_MAP_voteKickReplyType_tag2el_4, 2, /* Count of tags in the map */ 0, 2 /* Extensions start */ }; static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_voteKickReplyType_3 = { +asn_TYPE_descriptor_t asn_DEF_voteKickReplyType_4 = { "voteKickReplyType", "voteKickReplyType", CHOICE_free, @@ -60,12 +60,21 @@ asn_TYPE_descriptor_t asn_DEF_voteKickReplyType_3 = { 0, /* No tags (pointer) */ 0, /* No tags (count) */ 0, /* No PER visible constraints */ - asn_MBR_voteKickReplyType_3, + asn_MBR_voteKickReplyType_4, 2, /* Elements count */ - &asn_SPC_voteKickReplyType_specs_3 /* Additional specs */ + &asn_SPC_voteKickReplyType_specs_4 /* Additional specs */ }; static asn_TYPE_member_t asn_MBR_VoteKickReplyMessage_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct VoteKickReplyMessage, gameId), + (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, + "gameId" + }, { ATF_NOFLAGS, 0, offsetof(struct VoteKickReplyMessage, petitionId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, @@ -78,7 +87,7 @@ static asn_TYPE_member_t asn_MBR_VoteKickReplyMessage_1[] = { { ATF_NOFLAGS, 0, offsetof(struct VoteKickReplyMessage, voteKickReplyType), -1 /* Ambiguous tag (CHOICE?) */, 0, - &asn_DEF_voteKickReplyType_3, + &asn_DEF_voteKickReplyType_4, 0, /* Defer constraints checking to the member type */ 0, /* PER is not compiled, use -gen-PER */ 0, @@ -90,18 +99,19 @@ 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 472 */ - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* voteKickAck at 474 */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* voteKickDenied at 476 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 476 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 }, /* petitionId at 477 */ + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 2, 0, 0 }, /* voteKickAck at 479 */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 } /* voteKickDenied at 481 */ }; static asn_SEQUENCE_specifics_t asn_SPC_VoteKickReplyMessage_specs_1 = { sizeof(struct VoteKickReplyMessage), offsetof(struct VoteKickReplyMessage, _asn_ctx), asn_MAP_VoteKickReplyMessage_tag2el_1, - 3, /* 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 */ + 2, /* Start extensions */ + 4 /* Stop extensions */ }; asn_TYPE_descriptor_t asn_DEF_VoteKickReplyMessage = { "VoteKickReplyMessage", @@ -123,7 +133,7 @@ asn_TYPE_descriptor_t asn_DEF_VoteKickReplyMessage = { /sizeof(asn_DEF_VoteKickReplyMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_VoteKickReplyMessage_1, - 2, /* Elements count */ + 3, /* Elements count */ &asn_SPC_VoteKickReplyMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/VoteKickReplyMessage.h b/src/third_party/asn1/VoteKickReplyMessage.h index 87953885..59eb8d8e 100644 --- a/src/third_party/asn1/VoteKickReplyMessage.h +++ b/src/third_party/asn1/VoteKickReplyMessage.h @@ -32,6 +32,7 @@ typedef enum voteKickReplyType_PR { /* VoteKickReplyMessage */ typedef struct VoteKickReplyMessage { + NonZeroId_t gameId; NonZeroId_t petitionId; struct voteKickReplyType { voteKickReplyType_PR present; diff --git a/src/third_party/asn1/VoteKickRequestMessage.c b/src/third_party/asn1/VoteKickRequestMessage.c index b22be5f6..551c1ed6 100644 --- a/src/third_party/asn1/VoteKickRequestMessage.c +++ b/src/third_party/asn1/VoteKickRequestMessage.c @@ -9,6 +9,15 @@ #include "VoteKickRequestMessage.h" static asn_TYPE_member_t asn_MBR_VoteKickRequestMessage_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct VoteKickRequestMessage, gameId), + (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, + "gameId" + }, { ATF_NOFLAGS, 0, offsetof(struct VoteKickRequestMessage, petitionId), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, @@ -33,17 +42,18 @@ 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 468 */ - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 } /* petitionId at 467 */ + { (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 2, 0, 0 }, /* voteKick at 472 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 1 }, /* gameId at 470 */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, -1, 0 } /* petitionId at 471 */ }; static asn_SEQUENCE_specifics_t asn_SPC_VoteKickRequestMessage_specs_1 = { sizeof(struct VoteKickRequestMessage), offsetof(struct VoteKickRequestMessage, _asn_ctx), asn_MAP_VoteKickRequestMessage_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_VoteKickRequestMessage = { "VoteKickRequestMessage", @@ -65,7 +75,7 @@ asn_TYPE_descriptor_t asn_DEF_VoteKickRequestMessage = { /sizeof(asn_DEF_VoteKickRequestMessage_tags_1[0]), /* 2 */ 0, /* No PER visible constraints */ asn_MBR_VoteKickRequestMessage_1, - 2, /* Elements count */ + 3, /* Elements count */ &asn_SPC_VoteKickRequestMessage_specs_1 /* Additional specs */ }; diff --git a/src/third_party/asn1/VoteKickRequestMessage.h b/src/third_party/asn1/VoteKickRequestMessage.h index c7c91eb4..e8ede89d 100644 --- a/src/third_party/asn1/VoteKickRequestMessage.h +++ b/src/third_party/asn1/VoteKickRequestMessage.h @@ -21,6 +21,7 @@ extern "C" { /* VoteKickRequestMessage */ typedef struct VoteKickRequestMessage { + NonZeroId_t gameId; NonZeroId_t petitionId; BOOLEAN_t voteKick; /*