From 8f36c96f6a9be73e320d2e1f8695b934a9e2a0bb Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Fri, 3 Feb 2017 13:53:03 +0900 Subject: [PATCH] intermediate 2 --- lib/asn/asn1c/Makefile.am | 8 +- ...ap-Bearers-SubjectToStatusTransfer-List.c} | 38 ++++---- ...ap-Bearers-SubjectToStatusTransfer-List.h} | 14 +-- ...gList.c => S1ap-E-RABDataForwardingList.c} | 88 +++++++++---------- lib/asn/asn1c/S1ap-E-RABDataForwardingList.h | 43 +++++++++ .../S1ap-E-RABSubjecttoDataForwardingList.h | 43 --------- ...-ENB-StatusTransfer-TransparentContainer.c | 2 +- ...-ENB-StatusTransfer-TransparentContainer.h | 4 +- lib/asn/asn1c/S1ap-ProtocolIE-ID.h | 2 +- lib/asn/s1ap_common.h | 23 +++-- lib/asn/s1ap_decoder.c | 50 +++++------ lib/asn/s1ap_encoder.c | 24 ++--- lib/asn/s1ap_ies_defs.h | 36 ++++---- lib/asn/s1ap_xer_print.c | 10 +-- lib/asn/support/36413-a90.asn | 16 ++-- lib/asn/support/S1AP-PDU.asn | 16 ++-- 16 files changed, 212 insertions(+), 205 deletions(-) rename lib/asn/asn1c/{S1ap-Bearers-SubjectToStatusTransferList.c => S1ap-Bearers-SubjectToStatusTransfer-List.c} (54%) rename lib/asn/asn1c/{S1ap-Bearers-SubjectToStatusTransferList.h => S1ap-Bearers-SubjectToStatusTransfer-List.h} (67%) rename lib/asn/asn1c/{S1ap-E-RABSubjecttoDataForwardingList.c => S1ap-E-RABDataForwardingList.c} (55%) create mode 100644 lib/asn/asn1c/S1ap-E-RABDataForwardingList.h delete mode 100644 lib/asn/asn1c/S1ap-E-RABSubjecttoDataForwardingList.h diff --git a/lib/asn/asn1c/Makefile.am b/lib/asn/asn1c/Makefile.am index 9e5a8a079..59ed008da 100644 --- a/lib/asn/asn1c/Makefile.am +++ b/lib/asn/asn1c/Makefile.am @@ -8,7 +8,7 @@ ASN_MODULE_NODIST_SOURCES= \ ProtocolError-IE-ContainerList.c \ S1ap-HandoverRequired.c \ S1ap-HandoverCommand.c \ - S1ap-E-RABSubjecttoDataForwardingList.c \ + S1ap-E-RABDataForwardingList.c \ S1ap-E-RABDataForwardingItem.c \ S1ap-HandoverPreparationFailure.c \ S1ap-HandoverRequest.c \ @@ -113,7 +113,7 @@ ASN_MODULE_NODIST_SOURCES= \ S1ap-UplinkNonUEAssociatedLPPaTransport.c \ S1ap-AreaScopeOfMDT.c \ S1ap-AllocationAndRetentionPriority.c \ - S1ap-Bearers-SubjectToStatusTransferList.c \ + S1ap-Bearers-SubjectToStatusTransfer-List.c \ S1ap-Bearers-SubjectToStatusTransfer-Item.c \ S1ap-BitRate.c \ S1ap-BPLMNs.c \ @@ -380,7 +380,7 @@ ASN_MODULE_SOURCES= \ ProtocolError-IE-ContainerList.h \ S1ap-HandoverRequired.h \ S1ap-HandoverCommand.h \ - S1ap-E-RABSubjecttoDataForwardingList.h \ + S1ap-E-RABDataForwardingList.h \ S1ap-E-RABDataForwardingItem.h \ S1ap-HandoverPreparationFailure.h \ S1ap-HandoverRequest.h \ @@ -485,7 +485,7 @@ ASN_MODULE_SOURCES= \ S1ap-UplinkNonUEAssociatedLPPaTransport.h \ S1ap-AreaScopeOfMDT.h \ S1ap-AllocationAndRetentionPriority.h \ - S1ap-Bearers-SubjectToStatusTransferList.h \ + S1ap-Bearers-SubjectToStatusTransfer-List.h \ S1ap-Bearers-SubjectToStatusTransfer-Item.h \ S1ap-BitRate.h \ S1ap-BPLMNs.h \ diff --git a/lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransferList.c b/lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransfer-List.c similarity index 54% rename from lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransferList.c rename to lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransfer-List.c index 1a5130267..89a337125 100644 --- a/lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransferList.c +++ b/lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransfer-List.c @@ -5,14 +5,14 @@ * `asn1c -fcompound-names` */ -#include "S1ap-Bearers-SubjectToStatusTransferList.h" +#include "S1ap-Bearers-SubjectToStatusTransfer-List.h" -static asn_per_constraints_t asn_PER_type_S1ap_Bearers_SubjectToStatusTransferList_constr_1 GCC_NOTUSED = { +static asn_per_constraints_t asn_PER_type_S1ap_Bearers_SubjectToStatusTransfer_List_constr_1 GCC_NOTUSED = { { APC_UNCONSTRAINED, -1, -1, 0, 0 }, { APC_CONSTRAINED, 8, 8, 1l, 256l } /* (SIZE(1..256)) */, 0, 0 /* No PER value map */ }; -static asn_TYPE_member_t asn_MBR_S1ap_Bearers_SubjectToStatusTransferList_1[] = { +static asn_TYPE_member_t asn_MBR_S1ap_Bearers_SubjectToStatusTransfer_List_1[] = { { ATF_POINTER, 0, 0, (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, @@ -23,17 +23,17 @@ static asn_TYPE_member_t asn_MBR_S1ap_Bearers_SubjectToStatusTransferList_1[] = "" }, }; -static const ber_tlv_tag_t asn_DEF_S1ap_Bearers_SubjectToStatusTransferList_tags_1[] = { +static const ber_tlv_tag_t asn_DEF_S1ap_Bearers_SubjectToStatusTransfer_List_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; -static asn_SET_OF_specifics_t asn_SPC_S1ap_Bearers_SubjectToStatusTransferList_specs_1 = { - sizeof(struct S1ap_Bearers_SubjectToStatusTransferList), - offsetof(struct S1ap_Bearers_SubjectToStatusTransferList, _asn_ctx), +static asn_SET_OF_specifics_t asn_SPC_S1ap_Bearers_SubjectToStatusTransfer_List_specs_1 = { + sizeof(struct S1ap_Bearers_SubjectToStatusTransfer_List), + offsetof(struct S1ap_Bearers_SubjectToStatusTransfer_List, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; -asn_TYPE_descriptor_t asn_DEF_S1ap_Bearers_SubjectToStatusTransferList = { - "S1ap-Bearers-SubjectToStatusTransferList", - "S1ap-Bearers-SubjectToStatusTransferList", +asn_TYPE_descriptor_t asn_DEF_S1ap_Bearers_SubjectToStatusTransfer_List = { + "S1ap-Bearers-SubjectToStatusTransfer-List", + "S1ap-Bearers-SubjectToStatusTransfer-List", SEQUENCE_OF_free, SEQUENCE_OF_print, SEQUENCE_OF_constraint, @@ -46,15 +46,15 @@ asn_TYPE_descriptor_t asn_DEF_S1ap_Bearers_SubjectToStatusTransferList = { SEQUENCE_OF_decode_aper, SEQUENCE_OF_encode_aper, 0, /* Use generic outmost tag fetcher */ - asn_DEF_S1ap_Bearers_SubjectToStatusTransferList_tags_1, - sizeof(asn_DEF_S1ap_Bearers_SubjectToStatusTransferList_tags_1) - /sizeof(asn_DEF_S1ap_Bearers_SubjectToStatusTransferList_tags_1[0]), /* 1 */ - asn_DEF_S1ap_Bearers_SubjectToStatusTransferList_tags_1, /* Same as above */ - sizeof(asn_DEF_S1ap_Bearers_SubjectToStatusTransferList_tags_1) - /sizeof(asn_DEF_S1ap_Bearers_SubjectToStatusTransferList_tags_1[0]), /* 1 */ - &asn_PER_type_S1ap_Bearers_SubjectToStatusTransferList_constr_1, - asn_MBR_S1ap_Bearers_SubjectToStatusTransferList_1, + asn_DEF_S1ap_Bearers_SubjectToStatusTransfer_List_tags_1, + sizeof(asn_DEF_S1ap_Bearers_SubjectToStatusTransfer_List_tags_1) + /sizeof(asn_DEF_S1ap_Bearers_SubjectToStatusTransfer_List_tags_1[0]), /* 1 */ + asn_DEF_S1ap_Bearers_SubjectToStatusTransfer_List_tags_1, /* Same as above */ + sizeof(asn_DEF_S1ap_Bearers_SubjectToStatusTransfer_List_tags_1) + /sizeof(asn_DEF_S1ap_Bearers_SubjectToStatusTransfer_List_tags_1[0]), /* 1 */ + &asn_PER_type_S1ap_Bearers_SubjectToStatusTransfer_List_constr_1, + asn_MBR_S1ap_Bearers_SubjectToStatusTransfer_List_1, 1, /* Single element */ - &asn_SPC_S1ap_Bearers_SubjectToStatusTransferList_specs_1 /* Additional specs */ + &asn_SPC_S1ap_Bearers_SubjectToStatusTransfer_List_specs_1 /* Additional specs */ }; diff --git a/lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransferList.h b/lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransfer-List.h similarity index 67% rename from lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransferList.h rename to lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransfer-List.h index 5a910a6b5..6b78ab9b8 100644 --- a/lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransferList.h +++ b/lib/asn/asn1c/S1ap-Bearers-SubjectToStatusTransfer-List.h @@ -5,8 +5,8 @@ * `asn1c -fcompound-names` */ -#ifndef _S1ap_Bearers_SubjectToStatusTransferList_H_ -#define _S1ap_Bearers_SubjectToStatusTransferList_H_ +#ifndef _S1ap_Bearers_SubjectToStatusTransfer_List_H_ +#define _S1ap_Bearers_SubjectToStatusTransfer_List_H_ #include @@ -22,16 +22,16 @@ extern "C" { /* Forward declarations */ struct S1ap_IE; -/* S1ap-Bearers-SubjectToStatusTransferList */ -typedef struct S1ap_Bearers_SubjectToStatusTransferList { +/* S1ap-Bearers-SubjectToStatusTransfer-List */ +typedef struct S1ap_Bearers_SubjectToStatusTransfer_List { A_SEQUENCE_OF(struct S1ap_IE) list; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; -} S1ap_Bearers_SubjectToStatusTransferList_t; +} S1ap_Bearers_SubjectToStatusTransfer_List_t; /* Implementation */ -extern asn_TYPE_descriptor_t asn_DEF_S1ap_Bearers_SubjectToStatusTransferList; +extern asn_TYPE_descriptor_t asn_DEF_S1ap_Bearers_SubjectToStatusTransfer_List; #ifdef __cplusplus } @@ -40,5 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_S1ap_Bearers_SubjectToStatusTransferList; /* Referred external types */ #include "S1ap-IE.h" -#endif /* _S1ap_Bearers_SubjectToStatusTransferList_H_ */ +#endif /* _S1ap_Bearers_SubjectToStatusTransfer_List_H_ */ #include diff --git a/lib/asn/asn1c/S1ap-E-RABSubjecttoDataForwardingList.c b/lib/asn/asn1c/S1ap-E-RABDataForwardingList.c similarity index 55% rename from lib/asn/asn1c/S1ap-E-RABSubjecttoDataForwardingList.c rename to lib/asn/asn1c/S1ap-E-RABDataForwardingList.c index 8f7a17665..c390f23da 100644 --- a/lib/asn/asn1c/S1ap-E-RABSubjecttoDataForwardingList.c +++ b/lib/asn/asn1c/S1ap-E-RABDataForwardingList.c @@ -5,10 +5,10 @@ * `asn1c -fcompound-names` */ -#include "S1ap-E-RABSubjecttoDataForwardingList.h" +#include "S1ap-E-RABDataForwardingList.h" int -S1ap_E_RABSubjecttoDataForwardingList_constraint(asn_TYPE_descriptor_t *td, const void *sptr, +S1ap_E_RABDataForwardingList_constraint(asn_TYPE_descriptor_t *td, const void *sptr, asn_app_constraint_failed_f *ctfailcb, void *app_key) { size_t size; @@ -38,7 +38,7 @@ S1ap_E_RABSubjecttoDataForwardingList_constraint(asn_TYPE_descriptor_t *td, cons * so here we adjust the DEF accordingly. */ static void -S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { +S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) { td->free_struct = asn_DEF_ProtocolIE_ContainerList_5937P0.free_struct; td->print_struct = asn_DEF_ProtocolIE_ContainerList_5937P0.print_struct; td->check_constraints = asn_DEF_ProtocolIE_ContainerList_5937P0.check_constraints; @@ -58,103 +58,103 @@ S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(asn_TYPE_descrip } void -S1ap_E_RABSubjecttoDataForwardingList_free(asn_TYPE_descriptor_t *td, +S1ap_E_RABDataForwardingList_free(asn_TYPE_descriptor_t *td, void *struct_ptr, int contents_only) { - S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(td); + S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(td); td->free_struct(td, struct_ptr, contents_only); } int -S1ap_E_RABSubjecttoDataForwardingList_print(asn_TYPE_descriptor_t *td, const void *struct_ptr, +S1ap_E_RABDataForwardingList_print(asn_TYPE_descriptor_t *td, const void *struct_ptr, int ilevel, asn_app_consume_bytes_f *cb, void *app_key) { - S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(td); + S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(td); return td->print_struct(td, struct_ptr, ilevel, cb, app_key); } asn_dec_rval_t -S1ap_E_RABSubjecttoDataForwardingList_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, +S1ap_E_RABDataForwardingList_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) { - S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(td); + S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(td); return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode); } asn_enc_rval_t -S1ap_E_RABSubjecttoDataForwardingList_encode_der(asn_TYPE_descriptor_t *td, +S1ap_E_RABDataForwardingList_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) { - S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(td); + S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(td); return td->der_encoder(td, structure, tag_mode, tag, cb, app_key); } asn_dec_rval_t -S1ap_E_RABSubjecttoDataForwardingList_decode_xer(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, +S1ap_E_RABDataForwardingList_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) { - S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(td); + S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(td); return td->xer_decoder(opt_codec_ctx, td, structure, opt_mname, bufptr, size); } asn_enc_rval_t -S1ap_E_RABSubjecttoDataForwardingList_encode_xer(asn_TYPE_descriptor_t *td, void *structure, +S1ap_E_RABDataForwardingList_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) { - S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(td); + S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(td); return td->xer_encoder(td, structure, ilevel, flags, cb, app_key); } asn_dec_rval_t -S1ap_E_RABSubjecttoDataForwardingList_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, +S1ap_E_RABDataForwardingList_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, asn_per_constraints_t *constraints, void **structure, asn_per_data_t *per_data) { - S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(td); + S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(td); return td->uper_decoder(opt_codec_ctx, td, constraints, structure, per_data); } asn_enc_rval_t -S1ap_E_RABSubjecttoDataForwardingList_encode_uper(asn_TYPE_descriptor_t *td, +S1ap_E_RABDataForwardingList_encode_uper(asn_TYPE_descriptor_t *td, asn_per_constraints_t *constraints, void *structure, asn_per_outp_t *per_out) { - S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(td); + S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(td); return td->uper_encoder(td, constraints, structure, per_out); } asn_enc_rval_t -S1ap_E_RABSubjecttoDataForwardingList_encode_aper(asn_TYPE_descriptor_t *td, +S1ap_E_RABDataForwardingList_encode_aper(asn_TYPE_descriptor_t *td, asn_per_constraints_t *constraints, void *structure, asn_per_outp_t *per_out) { - S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(td); + S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(td); return td->aper_encoder(td, constraints, structure, per_out); } asn_dec_rval_t -S1ap_E_RABSubjecttoDataForwardingList_decode_aper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, +S1ap_E_RABDataForwardingList_decode_aper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, asn_per_constraints_t *constraints, void **structure, asn_per_data_t *per_data) { - S1ap_E_RABSubjecttoDataForwardingList_1_inherit_TYPE_descriptor(td); + S1ap_E_RABDataForwardingList_1_inherit_TYPE_descriptor(td); return td->aper_decoder(opt_codec_ctx, td, constraints, structure, per_data); } -static const ber_tlv_tag_t asn_DEF_S1ap_E_RABSubjecttoDataForwardingList_tags_1[] = { +static const ber_tlv_tag_t asn_DEF_S1ap_E_RABDataForwardingList_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; -asn_TYPE_descriptor_t asn_DEF_S1ap_E_RABSubjecttoDataForwardingList = { - "S1ap-E-RABSubjecttoDataForwardingList", - "S1ap-E-RABSubjecttoDataForwardingList", - S1ap_E_RABSubjecttoDataForwardingList_free, - S1ap_E_RABSubjecttoDataForwardingList_print, - S1ap_E_RABSubjecttoDataForwardingList_constraint, - S1ap_E_RABSubjecttoDataForwardingList_decode_ber, - S1ap_E_RABSubjecttoDataForwardingList_encode_der, - S1ap_E_RABSubjecttoDataForwardingList_decode_xer, - S1ap_E_RABSubjecttoDataForwardingList_encode_xer, - S1ap_E_RABSubjecttoDataForwardingList_decode_uper, - S1ap_E_RABSubjecttoDataForwardingList_encode_uper, - S1ap_E_RABSubjecttoDataForwardingList_decode_aper, - S1ap_E_RABSubjecttoDataForwardingList_encode_aper, +asn_TYPE_descriptor_t asn_DEF_S1ap_E_RABDataForwardingList = { + "S1ap-E-RABDataForwardingList", + "S1ap-E-RABDataForwardingList", + S1ap_E_RABDataForwardingList_free, + S1ap_E_RABDataForwardingList_print, + S1ap_E_RABDataForwardingList_constraint, + S1ap_E_RABDataForwardingList_decode_ber, + S1ap_E_RABDataForwardingList_encode_der, + S1ap_E_RABDataForwardingList_decode_xer, + S1ap_E_RABDataForwardingList_encode_xer, + S1ap_E_RABDataForwardingList_decode_uper, + S1ap_E_RABDataForwardingList_encode_uper, + S1ap_E_RABDataForwardingList_decode_aper, + S1ap_E_RABDataForwardingList_encode_aper, 0, /* Use generic outmost tag fetcher */ - asn_DEF_S1ap_E_RABSubjecttoDataForwardingList_tags_1, - sizeof(asn_DEF_S1ap_E_RABSubjecttoDataForwardingList_tags_1) - /sizeof(asn_DEF_S1ap_E_RABSubjecttoDataForwardingList_tags_1[0]), /* 1 */ - asn_DEF_S1ap_E_RABSubjecttoDataForwardingList_tags_1, /* Same as above */ - sizeof(asn_DEF_S1ap_E_RABSubjecttoDataForwardingList_tags_1) - /sizeof(asn_DEF_S1ap_E_RABSubjecttoDataForwardingList_tags_1[0]), /* 1 */ + asn_DEF_S1ap_E_RABDataForwardingList_tags_1, + sizeof(asn_DEF_S1ap_E_RABDataForwardingList_tags_1) + /sizeof(asn_DEF_S1ap_E_RABDataForwardingList_tags_1[0]), /* 1 */ + asn_DEF_S1ap_E_RABDataForwardingList_tags_1, /* Same as above */ + sizeof(asn_DEF_S1ap_E_RABDataForwardingList_tags_1) + /sizeof(asn_DEF_S1ap_E_RABDataForwardingList_tags_1[0]), /* 1 */ 0, /* No PER visible constraints */ 0, 0, /* Defined elsewhere */ 0 /* No specifics */ diff --git a/lib/asn/asn1c/S1ap-E-RABDataForwardingList.h b/lib/asn/asn1c/S1ap-E-RABDataForwardingList.h new file mode 100644 index 000000000..f41812257 --- /dev/null +++ b/lib/asn/asn1c/S1ap-E-RABDataForwardingList.h @@ -0,0 +1,43 @@ +/* + * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) + * From ASN.1 module "S1AP-PDU-Contents" + * found in "../support/S1AP-PDU.asn" + * `asn1c -fcompound-names` + */ + +#ifndef _S1ap_E_RABDataForwardingList_H_ +#define _S1ap_E_RABDataForwardingList_H_ + + +#include + +/* Including external dependencies */ +#include "ProtocolIE-ContainerList.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* S1ap-E-RABDataForwardingList */ +typedef ProtocolIE_ContainerList_5937P0_t S1ap_E_RABDataForwardingList_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_S1ap_E_RABDataForwardingList; +asn_struct_free_f S1ap_E_RABDataForwardingList_free; +asn_struct_print_f S1ap_E_RABDataForwardingList_print; +asn_constr_check_f S1ap_E_RABDataForwardingList_constraint; +ber_type_decoder_f S1ap_E_RABDataForwardingList_decode_ber; +der_type_encoder_f S1ap_E_RABDataForwardingList_encode_der; +xer_type_decoder_f S1ap_E_RABDataForwardingList_decode_xer; +xer_type_encoder_f S1ap_E_RABDataForwardingList_encode_xer; +per_type_decoder_f S1ap_E_RABDataForwardingList_decode_uper; +per_type_encoder_f S1ap_E_RABDataForwardingList_encode_uper; +per_type_decoder_f S1ap_E_RABDataForwardingList_decode_aper; +per_type_encoder_f S1ap_E_RABDataForwardingList_encode_aper; + +#ifdef __cplusplus +} +#endif + +#endif /* _S1ap_E_RABDataForwardingList_H_ */ +#include diff --git a/lib/asn/asn1c/S1ap-E-RABSubjecttoDataForwardingList.h b/lib/asn/asn1c/S1ap-E-RABSubjecttoDataForwardingList.h deleted file mode 100644 index df7d6201d..000000000 --- a/lib/asn/asn1c/S1ap-E-RABSubjecttoDataForwardingList.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) - * From ASN.1 module "S1AP-PDU-Contents" - * found in "../support/S1AP-PDU.asn" - * `asn1c -fcompound-names` - */ - -#ifndef _S1ap_E_RABSubjecttoDataForwardingList_H_ -#define _S1ap_E_RABSubjecttoDataForwardingList_H_ - - -#include - -/* Including external dependencies */ -#include "ProtocolIE-ContainerList.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* S1ap-E-RABSubjecttoDataForwardingList */ -typedef ProtocolIE_ContainerList_5937P0_t S1ap_E_RABSubjecttoDataForwardingList_t; - -/* Implementation */ -extern asn_TYPE_descriptor_t asn_DEF_S1ap_E_RABSubjecttoDataForwardingList; -asn_struct_free_f S1ap_E_RABSubjecttoDataForwardingList_free; -asn_struct_print_f S1ap_E_RABSubjecttoDataForwardingList_print; -asn_constr_check_f S1ap_E_RABSubjecttoDataForwardingList_constraint; -ber_type_decoder_f S1ap_E_RABSubjecttoDataForwardingList_decode_ber; -der_type_encoder_f S1ap_E_RABSubjecttoDataForwardingList_encode_der; -xer_type_decoder_f S1ap_E_RABSubjecttoDataForwardingList_decode_xer; -xer_type_encoder_f S1ap_E_RABSubjecttoDataForwardingList_encode_xer; -per_type_decoder_f S1ap_E_RABSubjecttoDataForwardingList_decode_uper; -per_type_encoder_f S1ap_E_RABSubjecttoDataForwardingList_encode_uper; -per_type_decoder_f S1ap_E_RABSubjecttoDataForwardingList_decode_aper; -per_type_encoder_f S1ap_E_RABSubjecttoDataForwardingList_encode_aper; - -#ifdef __cplusplus -} -#endif - -#endif /* _S1ap_E_RABSubjecttoDataForwardingList_H_ */ -#include diff --git a/lib/asn/asn1c/S1ap-ENB-StatusTransfer-TransparentContainer.c b/lib/asn/asn1c/S1ap-ENB-StatusTransfer-TransparentContainer.c index eec06096c..e32c064bd 100644 --- a/lib/asn/asn1c/S1ap-ENB-StatusTransfer-TransparentContainer.c +++ b/lib/asn/asn1c/S1ap-ENB-StatusTransfer-TransparentContainer.c @@ -11,7 +11,7 @@ static asn_TYPE_member_t asn_MBR_S1ap_ENB_StatusTransfer_TransparentContainer_1[ { ATF_NOFLAGS, 0, offsetof(struct S1ap_ENB_StatusTransfer_TransparentContainer, bearers_SubjectToStatusTransferList), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ - &asn_DEF_S1ap_Bearers_SubjectToStatusTransferList, + &asn_DEF_S1ap_Bearers_SubjectToStatusTransfer_List, 0, /* Defer constraints checking to the member type */ 0, /* No PER visible constraints */ 0, diff --git a/lib/asn/asn1c/S1ap-ENB-StatusTransfer-TransparentContainer.h b/lib/asn/asn1c/S1ap-ENB-StatusTransfer-TransparentContainer.h index a929f2886..ad01abbf8 100644 --- a/lib/asn/asn1c/S1ap-ENB-StatusTransfer-TransparentContainer.h +++ b/lib/asn/asn1c/S1ap-ENB-StatusTransfer-TransparentContainer.h @@ -12,7 +12,7 @@ #include /* Including external dependencies */ -#include "S1ap-Bearers-SubjectToStatusTransferList.h" +#include "S1ap-Bearers-SubjectToStatusTransfer-List.h" #include #ifdef __cplusplus @@ -24,7 +24,7 @@ struct ProtocolExtensionContainer; /* S1ap-ENB-StatusTransfer-TransparentContainer */ typedef struct S1ap_ENB_StatusTransfer_TransparentContainer { - S1ap_Bearers_SubjectToStatusTransferList_t bearers_SubjectToStatusTransferList; + S1ap_Bearers_SubjectToStatusTransfer_List_t bearers_SubjectToStatusTransferList; struct ProtocolExtensionContainer *iE_Extensions /* OPTIONAL */; /* * This type is extensible, diff --git a/lib/asn/asn1c/S1ap-ProtocolIE-ID.h b/lib/asn/asn1c/S1ap-ProtocolIE-ID.h index 9f2e8ff96..10851e8d6 100644 --- a/lib/asn/asn1c/S1ap-ProtocolIE-ID.h +++ b/lib/asn/asn1c/S1ap-ProtocolIE-ID.h @@ -26,7 +26,7 @@ typedef enum S1ap_ProtocolIE_ID { S1ap_ProtocolIE_ID_id_SourceID = 3, S1ap_ProtocolIE_ID_id_TargetID = 4, S1ap_ProtocolIE_ID_id_eNB_UE_S1AP_ID = 8, - S1ap_ProtocolIE_ID_id_E_RABSubjecttoDataForwardingList = 12, + S1ap_ProtocolIE_ID_id_E_RABDataForwardingList = 12, S1ap_ProtocolIE_ID_id_E_RABtoReleaseListHOCmd = 13, S1ap_ProtocolIE_ID_id_E_RABDataForwardingItem = 14, S1ap_ProtocolIE_ID_id_E_RABReleaseItemBearerRelComp = 15, diff --git a/lib/asn/s1ap_common.h b/lib/asn/s1ap_common.h index c034013e6..242074f9d 100644 --- a/lib/asn/s1ap_common.h +++ b/lib/asn/s1ap_common.h @@ -48,7 +48,7 @@ inline void ASN_DEBUG(const char *fmt, ...); #include "S1ap-ProtocolIE-ID.h" #include "S1ap-TriggeringMessage.h" #include "S1ap-AllocationAndRetentionPriority.h" -#include "S1ap-Bearers-SubjectToStatusTransferList.h" +#include "S1ap-Bearers-SubjectToStatusTransfer-List.h" #include "S1ap-Bearers-SubjectToStatusTransfer-Item.h" #include "S1ap-BitRate.h" #include "S1ap-BPLMNs.h" @@ -310,7 +310,7 @@ inline void ASN_DEBUG(const char *fmt, ...); #include "S1ap-E-RABToBeSwitchedULItem.h" #include "S1ap-E-RABToBeSetupListBearerSUReq.h" #include "S1ap-E-RABToBeSetupItemBearerSUReq.h" -#include "S1ap-E-RABSubjecttoDataForwardingList.h" +#include "S1ap-E-RABDataForwardingList.h" #include "S1ap-E-RABDataForwardingItem.h" #include "S1ap-E-RABToBeSetupListHOReq.h" #include "S1ap-E-RABToBeSetupItemHOReq.h" @@ -386,10 +386,23 @@ extern int asn_debug; extern int asn1_xer_print; # include "mme_default_values.h" +#if 0 +# include "common_types.h" +#endif //Forward declaration struct s1ap_message_s; +/** \brief Function callback prototype. + **/ +#if 0 +typedef int (*s1ap_message_decoded_callback)( + const sctp_assoc_id_t assoc_id, + const sctp_stream_id_t stream, + struct s1ap_message_s *message_p +); +#endif + /** \brief Encode a successfull outcome message \param buffer pointer to buffer in which data will be encoded \param length pointer to the length of buffer @@ -402,7 +415,7 @@ struct s1ap_message_s; ssize_t s1ap_generate_successfull_outcome( uint8_t **buffer, uint32_t *length, - S1ap_ProcedureCode_t procedureCode, + e_S1ap_ProcedureCode procedureCode, S1ap_Criticality_t criticality, asn_TYPE_descriptor_t *td, void *sptr); @@ -419,7 +432,7 @@ ssize_t s1ap_generate_successfull_outcome( ssize_t s1ap_generate_initiating_message( uint8_t **buffer, uint32_t *length, - S1ap_ProcedureCode_t procedureCode, + e_S1ap_ProcedureCode procedureCode, S1ap_Criticality_t criticality, asn_TYPE_descriptor_t *td, void *sptr); @@ -436,7 +449,7 @@ ssize_t s1ap_generate_initiating_message( ssize_t s1ap_generate_unsuccessfull_outcome( uint8_t **buffer, uint32_t *length, - S1ap_ProcedureCode_t procedureCode, + e_S1ap_ProcedureCode procedureCode, S1ap_Criticality_t criticality, asn_TYPE_descriptor_t *td, void *sptr); diff --git a/lib/asn/s1ap_decoder.c b/lib/asn/s1ap_decoder.c index 326f26aba..5929f517b 100644 --- a/lib/asn/s1ap_decoder.c +++ b/lib/asn/s1ap_decoder.c @@ -30,7 +30,7 @@ /******************************************************************************* * This file had been created by asn1tostruct.py script v1.0.2 * Please do not modify this file but regenerate it via script. - * Created on: 2017-02-03 11:00:55.366759 by acetcom + * Created on: 2017-02-03 13:33:42.653359 by acetcom * from ['S1AP-PDU.asn'] ******************************************************************************/ #include "s1ap_common.h" @@ -4597,23 +4597,23 @@ int s1ap_decode_s1ap_handovercommandies( memcpy(&s1ap_HandoverCommandIEs->handoverType, s1apHandoverType_p, sizeof(S1ap_HandoverType_t)); } break; /* Optional field */ - case S1ap_ProtocolIE_ID_id_E_RABSubjecttoDataForwardingList: + case S1ap_ProtocolIE_ID_id_E_RABDataForwardingList: { - S1ap_E_RABSubjecttoDataForwardingList_t *s1apERABSubjecttoDataForwardingList_p = NULL; - s1ap_HandoverCommandIEs->presenceMask |= S1AP_HANDOVERCOMMANDIES_E_RABSUBJECTTODATAFORWARDINGLIST_PRESENT; - tempDecoded = ANY_to_type_aper(&ie_p->value, &asn_DEF_S1ap_E_RABSubjecttoDataForwardingList, (void**)&s1apERABSubjecttoDataForwardingList_p); - if (tempDecoded < 0 || s1apERABSubjecttoDataForwardingList_p == NULL) { - OAILOG_ERROR (LOG_S1AP, "Decoding of IE e_RABSubjecttoDataForwardingList failed\n"); - if (s1apERABSubjecttoDataForwardingList_p) - ASN_STRUCT_FREE(asn_DEF_S1ap_E_RABSubjecttoDataForwardingList, s1apERABSubjecttoDataForwardingList_p); + S1ap_E_RABDataForwardingList_t *s1apERABDataForwardingList_p = NULL; + s1ap_HandoverCommandIEs->presenceMask |= S1AP_HANDOVERCOMMANDIES_E_RABDATAFORWARDINGLIST_PRESENT; + tempDecoded = ANY_to_type_aper(&ie_p->value, &asn_DEF_S1ap_E_RABDataForwardingList, (void**)&s1apERABDataForwardingList_p); + if (tempDecoded < 0 || s1apERABDataForwardingList_p == NULL) { + OAILOG_ERROR (LOG_S1AP, "Decoding of IE e_RABDataForwardingList failed\n"); + if (s1apERABDataForwardingList_p) + ASN_STRUCT_FREE(asn_DEF_S1ap_E_RABDataForwardingList, s1apERABDataForwardingList_p); return -1; } decoded += tempDecoded; if (asn1_xer_print) - xer_fprint(stdout, &asn_DEF_S1ap_E_RABSubjecttoDataForwardingList, s1apERABSubjecttoDataForwardingList_p); - if (s1ap_decode_s1ap_e_rabsubjecttodataforwardinglist(&s1ap_HandoverCommandIEs->e_RABSubjecttoDataForwardingList, s1apERABSubjecttoDataForwardingList_p) < 0) { - OAILOG_ERROR (LOG_S1AP, "Decoding of encapsulated IE s1apERABSubjecttoDataForwardingList failed\n"); - ASN_STRUCT_FREE(asn_DEF_S1ap_E_RABSubjecttoDataForwardingList, s1apERABSubjecttoDataForwardingList_p); + xer_fprint(stdout, &asn_DEF_S1ap_E_RABDataForwardingList, s1apERABDataForwardingList_p); + if (s1ap_decode_s1ap_e_rabdataforwardinglist(&s1ap_HandoverCommandIEs->e_RABDataForwardingList, s1apERABDataForwardingList_p) < 0) { + OAILOG_ERROR (LOG_S1AP, "Decoding of encapsulated IE s1apERABDataForwardingList failed\n"); + ASN_STRUCT_FREE(asn_DEF_S1ap_E_RABDataForwardingList, s1apERABDataForwardingList_p); } } break; /* Optional field */ @@ -5876,23 +5876,23 @@ int s1ap_decode_s1ap_downlinks1cdma2000tunnelingies( memcpy(&s1ap_DownlinkS1cdma2000tunnelingIEs->eNB_UE_S1AP_ID, s1apENBUES1APID_p, sizeof(S1ap_ENB_UE_S1AP_ID_t)); } break; /* Optional field */ - case S1ap_ProtocolIE_ID_id_E_RABSubjecttoDataForwardingList: + case S1ap_ProtocolIE_ID_id_E_RABDataForwardingList: { - S1ap_E_RABSubjecttoDataForwardingList_t *s1apERABSubjecttoDataForwardingList_p = NULL; - s1ap_DownlinkS1cdma2000tunnelingIEs->presenceMask |= S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_E_RABSUBJECTTODATAFORWARDINGLIST_PRESENT; - tempDecoded = ANY_to_type_aper(&ie_p->value, &asn_DEF_S1ap_E_RABSubjecttoDataForwardingList, (void**)&s1apERABSubjecttoDataForwardingList_p); - if (tempDecoded < 0 || s1apERABSubjecttoDataForwardingList_p == NULL) { - OAILOG_ERROR (LOG_S1AP, "Decoding of IE e_RABSubjecttoDataForwardingList failed\n"); - if (s1apERABSubjecttoDataForwardingList_p) - ASN_STRUCT_FREE(asn_DEF_S1ap_E_RABSubjecttoDataForwardingList, s1apERABSubjecttoDataForwardingList_p); + S1ap_E_RABDataForwardingList_t *s1apERABDataForwardingList_p = NULL; + s1ap_DownlinkS1cdma2000tunnelingIEs->presenceMask |= S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_E_RABDATAFORWARDINGLIST_PRESENT; + tempDecoded = ANY_to_type_aper(&ie_p->value, &asn_DEF_S1ap_E_RABDataForwardingList, (void**)&s1apERABDataForwardingList_p); + if (tempDecoded < 0 || s1apERABDataForwardingList_p == NULL) { + OAILOG_ERROR (LOG_S1AP, "Decoding of IE e_RABDataForwardingList failed\n"); + if (s1apERABDataForwardingList_p) + ASN_STRUCT_FREE(asn_DEF_S1ap_E_RABDataForwardingList, s1apERABDataForwardingList_p); return -1; } decoded += tempDecoded; if (asn1_xer_print) - xer_fprint(stdout, &asn_DEF_S1ap_E_RABSubjecttoDataForwardingList, s1apERABSubjecttoDataForwardingList_p); - if (s1ap_decode_s1ap_e_rabsubjecttodataforwardinglist(&s1ap_DownlinkS1cdma2000tunnelingIEs->e_RABSubjecttoDataForwardingList, s1apERABSubjecttoDataForwardingList_p) < 0) { - OAILOG_ERROR (LOG_S1AP, "Decoding of encapsulated IE s1apERABSubjecttoDataForwardingList failed\n"); - ASN_STRUCT_FREE(asn_DEF_S1ap_E_RABSubjecttoDataForwardingList, s1apERABSubjecttoDataForwardingList_p); + xer_fprint(stdout, &asn_DEF_S1ap_E_RABDataForwardingList, s1apERABDataForwardingList_p); + if (s1ap_decode_s1ap_e_rabdataforwardinglist(&s1ap_DownlinkS1cdma2000tunnelingIEs->e_RABDataForwardingList, s1apERABDataForwardingList_p) < 0) { + OAILOG_ERROR (LOG_S1AP, "Decoding of encapsulated IE s1apERABDataForwardingList failed\n"); + ASN_STRUCT_FREE(asn_DEF_S1ap_E_RABDataForwardingList, s1apERABDataForwardingList_p); } } break; /* Optional field */ diff --git a/lib/asn/s1ap_encoder.c b/lib/asn/s1ap_encoder.c index cf48a1151..157b46c0c 100644 --- a/lib/asn/s1ap_encoder.c +++ b/lib/asn/s1ap_encoder.c @@ -30,7 +30,7 @@ /******************************************************************************* * This file had been created by asn1tostruct.py script v1.0.2 * Please do not modify this file but regenerate it via script. - * Created on: 2017-02-03 11:00:55.391999 by acetcom + * Created on: 2017-02-03 13:33:42.683855 by acetcom * from ['S1AP-PDU.asn'] ******************************************************************************/ #include "s1ap_common.h" @@ -2532,11 +2532,11 @@ int s1ap_encode_s1ap_handovercommandies( ASN_SEQUENCE_ADD(&s1ap_HandoverCommand->s1ap_HandoverCommand_ies.list, ie); /* Optional field */ - if (s1ap_HandoverCommandIEs->presenceMask & S1AP_HANDOVERCOMMANDIES_E_RABSUBJECTTODATAFORWARDINGLIST_PRESENT) { - if ((ie = s1ap_new_ie(S1ap_ProtocolIE_ID_id_E_RABSubjecttoDataForwardingList, + if (s1ap_HandoverCommandIEs->presenceMask & S1AP_HANDOVERCOMMANDIES_E_RABDATAFORWARDINGLIST_PRESENT) { + if ((ie = s1ap_new_ie(S1ap_ProtocolIE_ID_id_E_RABDataForwardingList, S1ap_Criticality_ignore, - &asn_DEF_S1ap_E_RABSubjecttoDataForwardingList, - &s1ap_HandoverCommandIEs->e_RABSubjecttoDataForwardingList)) == NULL) { + &asn_DEF_S1ap_E_RABDataForwardingList, + &s1ap_HandoverCommandIEs->e_RABDataForwardingList)) == NULL) { return -1; } ASN_SEQUENCE_ADD(&s1ap_HandoverCommand->s1ap_HandoverCommand_ies.list, ie); @@ -3230,11 +3230,11 @@ int s1ap_encode_s1ap_downlinks1cdma2000tunnelingies( ASN_SEQUENCE_ADD(&s1ap_DownlinkS1cdma2000tunneling->s1ap_DownlinkS1cdma2000tunneling_ies.list, ie); /* Optional field */ - if (s1ap_DownlinkS1cdma2000tunnelingIEs->presenceMask & S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_E_RABSUBJECTTODATAFORWARDINGLIST_PRESENT) { - if ((ie = s1ap_new_ie(S1ap_ProtocolIE_ID_id_E_RABSubjecttoDataForwardingList, + if (s1ap_DownlinkS1cdma2000tunnelingIEs->presenceMask & S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_E_RABDATAFORWARDINGLIST_PRESENT) { + if ((ie = s1ap_new_ie(S1ap_ProtocolIE_ID_id_E_RABDataForwardingList, S1ap_Criticality_ignore, - &asn_DEF_S1ap_E_RABSubjecttoDataForwardingList, - &s1ap_DownlinkS1cdma2000tunnelingIEs->e_RABSubjecttoDataForwardingList)) == NULL) { + &asn_DEF_S1ap_E_RABDataForwardingList, + &s1ap_DownlinkS1cdma2000tunnelingIEs->e_RABDataForwardingList)) == NULL) { return -1; } ASN_SEQUENCE_ADD(&s1ap_DownlinkS1cdma2000tunneling->s1ap_DownlinkS1cdma2000tunneling_ies.list, ie); @@ -4270,15 +4270,15 @@ int s1ap_encode_s1ap_e_rabadmittedlist( return 0; } -int s1ap_encode_s1ap_e_rabsubjecttodataforwardinglist( +int s1ap_encode_s1ap_e_rabdataforwardinglist( S1ap_E_RABDataForwardingList_t *s1ap_E_RABDataForwardingList, - S1ap_E_RABSubjecttoDataForwardingListIEs_t *s1ap_E_RABSubjecttoDataForwardingListIEs) { + S1ap_E_RABDataForwardingListIEs_t *s1ap_E_RABDataForwardingListIEs) { int i; S1ap_IE_t *ie; assert(s1ap_E_RABDataForwardingList != NULL); - assert(s1ap_E_RABSubjecttoDataForwardingListIEs != NULL); + assert(s1ap_E_RABDataForwardingListIEs != NULL); for (i = 0; i < s1ap_E_RABDataForwardingListIEs->s1ap_E_RABDataForwardingItem.count; i++) { if ((ie = s1ap_new_ie(S1ap_ProtocolIE_ID_id_E_RABDataForwardingItem, diff --git a/lib/asn/s1ap_ies_defs.h b/lib/asn/s1ap_ies_defs.h index 0cd555e93..f43882315 100644 --- a/lib/asn/s1ap_ies_defs.h +++ b/lib/asn/s1ap_ies_defs.h @@ -30,7 +30,7 @@ /******************************************************************************* * This file had been created by asn1tostruct.py script v1.0.2 * Please do not modify this file but regenerate it via script. - * Created on: 2017-02-03 11:00:55.351913 by acetcom + * Created on: 2017-02-03 13:33:42.632772 by acetcom * from ['S1AP-PDU.asn'] ******************************************************************************/ #include "s1ap_common.h" @@ -53,9 +53,9 @@ typedef struct S1ap_E_RABAdmittedListIEs_s { A_SEQUENCE_OF(struct S1ap_E_RABAdmittedItem_s) s1ap_E_RABAdmittedItem; } S1ap_E_RABAdmittedListIEs_t; -typedef struct S1ap_E_RABSubjecttoDataForwardingListIEs_s { +typedef struct S1ap_E_RABDataForwardingListIEs_s { A_SEQUENCE_OF(struct S1ap_E_RABDataForwardingItem_s) s1ap_E_RABDataForwardingItem; -} S1ap_E_RABSubjecttoDataForwardingListIEs_t; +} S1ap_E_RABDataForwardingListIEs_t; typedef struct S1ap_E_RABToBeSwitchedDLListIEs_s { A_SEQUENCE_OF(struct S1ap_E_RABToBeSwitchedDLItem_s) s1ap_E_RABToBeSwitchedDLItem; @@ -571,7 +571,7 @@ typedef struct S1ap_InitialContextSetupFailureIEs_s { S1ap_CriticalityDiagnostics_t criticalityDiagnostics; ///< Optional field } S1ap_InitialContextSetupFailureIEs_t; -#define S1AP_HANDOVERCOMMANDIES_E_RABSUBJECTTODATAFORWARDINGLIST_PRESENT (1 << 0) +#define S1AP_HANDOVERCOMMANDIES_E_RABDATAFORWARDINGLIST_PRESENT (1 << 0) #define S1AP_HANDOVERCOMMANDIES_E_RABTORELEASELISTHOCMD_PRESENT (1 << 1) #define S1AP_HANDOVERCOMMANDIES_TARGET_TOSOURCE_TRANSPARENTCONTAINER_SECONDARY_PRESENT (1 << 2) #define S1AP_HANDOVERCOMMANDIES_CRITICALITYDIAGNOSTICS_PRESENT (1 << 3) @@ -581,7 +581,7 @@ typedef struct S1ap_HandoverCommandIEs_s { S1ap_MME_UE_S1AP_ID_t mme_ue_s1ap_id; S1ap_ENB_UE_S1AP_ID_t eNB_UE_S1AP_ID; S1ap_HandoverType_t handoverType; - S1ap_E_RABSubjecttoDataForwardingListIEs_t e_RABSubjecttoDataForwardingList; ///< Optional field + S1ap_E_RABDataForwardingListIEs_t e_RABDataForwardingList; ///< Optional field S1ap_E_RABList_t e_RABtoReleaseListHOCmd; ///< Optional field S1ap_Target_ToSource_TransparentContainer_t target_ToSource_TransparentContainer; S1ap_Target_ToSource_TransparentContainer_t target_ToSource_TransparentContainer_Secondary; ///< Optional field @@ -717,17 +717,17 @@ typedef struct S1ap_InitialContextSetupResponseIEs_s { S1ap_CriticalityDiagnostics_t criticalityDiagnostics; ///< Optional field } S1ap_InitialContextSetupResponseIEs_t; -#define S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_E_RABSUBJECTTODATAFORWARDINGLIST_PRESENT (1 << 0) -#define S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_CDMA2000HOSTATUS_PRESENT (1 << 1) +#define S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_E_RABDATAFORWARDINGLIST_PRESENT (1 << 0) +#define S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_CDMA2000HOSTATUS_PRESENT (1 << 1) typedef struct S1ap_DownlinkS1cdma2000tunnelingIEs_s { - uint16_t presenceMask; - S1ap_MME_UE_S1AP_ID_t mme_ue_s1ap_id; - S1ap_ENB_UE_S1AP_ID_t eNB_UE_S1AP_ID; - S1ap_E_RABSubjecttoDataForwardingListIEs_t e_RABSubjecttoDataForwardingList; ///< Optional field - S1ap_Cdma2000HOStatus_t cdma2000HOStatus; ///< Optional field - S1ap_Cdma2000RATType_t cdma2000RATType; - S1ap_Cdma2000PDU_t cdma2000PDU; + uint16_t presenceMask; + S1ap_MME_UE_S1AP_ID_t mme_ue_s1ap_id; + S1ap_ENB_UE_S1AP_ID_t eNB_UE_S1AP_ID; + S1ap_E_RABDataForwardingListIEs_t e_RABDataForwardingList; ///< Optional field + S1ap_Cdma2000HOStatus_t cdma2000HOStatus; ///< Optional field + S1ap_Cdma2000RATType_t cdma2000RATType; + S1ap_Cdma2000PDU_t cdma2000PDU; } S1ap_DownlinkS1cdma2000tunnelingIEs_t; #define S1AP_OVERLOADSTOPIES_GUMMEILIST_PRESENT (1 << 0) @@ -1567,7 +1567,7 @@ int s1ap_decode_s1ap_bearers_subjecttostatustransfer_itemies( * \param s1ap_Bearers_SubjectToStatusTransfer_ItemIEs Pointer to the IES structure. **/ int s1ap_encode_s1ap_bearers_subjecttostatustransfer_itemies( - S1ap_Bearers_SubjectToStatusTransferList_t *s1ap_Bearers_SubjectToStatusTransfer_List, + S1ap_Bearers_SubjectToStatusTransfer_List_t *s1ap_Bearers_SubjectToStatusTransfer_List, S1ap_Bearers_SubjectToStatusTransfer_ItemIEs_t *s1ap_Bearers_SubjectToStatusTransfer_ItemIEs); /** \brief Decode function for S1ap-E-RABItemIEs ies. @@ -2406,21 +2406,17 @@ int s1ap_decode_s1ap_e_rabadmittedlist( * \param s1ap_E_RABDataForwardingList Pointer to the ASN1 structure. * \param s1ap_E_RABDataForwardingItemIEs Pointer to the IES structure. **/ -/* int s1ap_encode_s1ap_e_rabdataforwardinglist( S1ap_E_RABDataForwardingList_t *s1ap_E_RABDataForwardingList, S1ap_E_RABDataForwardingListIEs_t *s1ap_E_RABDataForwardingListIEs); -*/ /** \brief Decode function for S1ap-E-RABDataForwardingItemIEs ies. * \param any_p Pointer to the ANY value to decode. * \param callback Callback function called when any_p is successfully decoded. **/ -/* int s1ap_decode_s1ap_e_rabdataforwardinglist( S1ap_E_RABDataForwardingListIEs_t *s1ap_E_RABDataForwardingListIEs, S1ap_E_RABDataForwardingList_t *s1ap_E_RABDataForwardingList); -*/ /** \brief Encode function for S1ap-E-RABToBeSwitchedDLItemIEs ies. * \param s1ap_E_RABToBeSwitchedDLList Pointer to the ASN1 structure. @@ -2629,12 +2625,10 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobesetuplistbearersureq( * \param s1ap_E_RABDataForwardingItemIEs Pointer to the IES structure. * \param file File descriptor to write output. **/ -/* asn_enc_rval_t s1ap_xer_print_s1ap_e_rabdataforwardinglist( asn_app_consume_bytes_f *cb, void *app_key, S1ap_E_RABDataForwardingListIEs_t *s1ap_E_RABDataForwardingListIEs); -*/ /** \brief Display S1ap_LocationReportingFailureIndication message using XER encoding. * \param message_p Pointer to root message. diff --git a/lib/asn/s1ap_xer_print.c b/lib/asn/s1ap_xer_print.c index 821a22499..375841fc3 100644 --- a/lib/asn/s1ap_xer_print.c +++ b/lib/asn/s1ap_xer_print.c @@ -30,7 +30,7 @@ /******************************************************************************* * This file had been created by asn1tostruct.py script v1.0.2 * Please do not modify this file but regenerate it via script. - * Created on: 2017-02-03 11:00:55.408484 by acetcom + * Created on: 2017-02-03 13:33:42.703530 by acetcom * from ['S1AP-PDU.asn'] ******************************************************************************/ #include @@ -1376,8 +1376,8 @@ asn_enc_rval_t s1ap_xer_print_s1ap_handovercommand( xer_encode_local(&asn_DEF_S1ap_ENB_UE_S1AP_ID, &s1ap_HandoverCommandIEs->eNB_UE_S1AP_ID, cb, app_key, 2); xer_encode_local(&asn_DEF_S1ap_HandoverType, &s1ap_HandoverCommandIEs->handoverType, cb, app_key, 2); /* Optional field */ - if (s1ap_HandoverCommandIEs->presenceMask & S1AP_HANDOVERCOMMANDIES_E_RABSUBJECTTODATAFORWARDINGLIST_PRESENT) - s1ap_xer_print_s1ap_e_rabsubjecttodataforwardinglist(cb, app_key, &s1ap_HandoverCommandIEs->e_RABSubjecttoDataForwardingList); + if (s1ap_HandoverCommandIEs->presenceMask & S1AP_HANDOVERCOMMANDIES_E_RABDATAFORWARDINGLIST_PRESENT) + s1ap_xer_print_s1ap_e_rabdataforwardinglist(cb, app_key, &s1ap_HandoverCommandIEs->e_RABDataForwardingList); /* Optional field */ if (s1ap_HandoverCommandIEs->presenceMask & S1AP_HANDOVERCOMMANDIES_E_RABTORELEASELISTHOCMD_PRESENT) xer_encode_local(&asn_DEF_S1ap_E_RABList, &s1ap_HandoverCommandIEs->e_RABtoReleaseListHOCmd, cb, app_key, 2); @@ -1752,8 +1752,8 @@ asn_enc_rval_t s1ap_xer_print_s1ap_downlinks1cdma2000tunneling( xer_encode_local(&asn_DEF_S1ap_MME_UE_S1AP_ID, &s1ap_DownlinkS1cdma2000tunnelingIEs->mme_ue_s1ap_id, cb, app_key, 2); xer_encode_local(&asn_DEF_S1ap_ENB_UE_S1AP_ID, &s1ap_DownlinkS1cdma2000tunnelingIEs->eNB_UE_S1AP_ID, cb, app_key, 2); /* Optional field */ - if (s1ap_DownlinkS1cdma2000tunnelingIEs->presenceMask & S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_E_RABSUBJECTTODATAFORWARDINGLIST_PRESENT) - s1ap_xer_print_s1ap_e_rabsubjecttodataforwardinglist(cb, app_key, &s1ap_DownlinkS1cdma2000tunnelingIEs->e_RABSubjecttoDataForwardingList); + if (s1ap_DownlinkS1cdma2000tunnelingIEs->presenceMask & S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_E_RABDATAFORWARDINGLIST_PRESENT) + s1ap_xer_print_s1ap_e_rabdataforwardinglist(cb, app_key, &s1ap_DownlinkS1cdma2000tunnelingIEs->e_RABDataForwardingList); /* Optional field */ if (s1ap_DownlinkS1cdma2000tunnelingIEs->presenceMask & S1AP_DOWNLINKS1CDMA2000TUNNELINGIES_CDMA2000HOSTATUS_PRESENT) xer_encode_local(&asn_DEF_S1ap_Cdma2000HOStatus, &s1ap_DownlinkS1cdma2000tunnelingIEs->cdma2000HOStatus, cb, app_key, 2); diff --git a/lib/asn/support/36413-a90.asn b/lib/asn/support/36413-a90.asn index a43110cae..65ef1014a 100644 --- a/lib/asn/support/36413-a90.asn +++ b/lib/asn/support/36413-a90.asn @@ -891,7 +891,7 @@ FROM S1AP-Containers id-E-RABSetupItemCtxtSURes, id-E-RABSetupListBearerSURes, id-E-RABSetupListCtxtSURes, - id-E-RABSubjecttoDataForwardingList, + id-E-RABDataForwardingList, id-E-RABToBeModifiedItemBearerModReq, id-E-RABToBeModifiedListBearerModReq, id-E-RABToBeReleasedList, @@ -1054,7 +1054,7 @@ HandoverCommandIEs S1AP-PROTOCOL-IES ::= { { ID id-HandoverType CRITICALITY reject TYPE HandoverType PRESENCE mandatory } | { ID id-NASSecurityParametersfromE-UTRAN CRITICALITY reject TYPE NASSecurityParametersfromE-UTRAN PRESENCE conditional -- This IE shall be present if HandoverType IE is set to value "LTEtoUTRAN" or "LTEtoGERAN" -- }| - { ID id-E-RABSubjecttoDataForwardingList CRITICALITY ignore TYPE E-RABSubjecttoDataForwardingList PRESENCE optional } | + { ID id-E-RABDataForwardingList CRITICALITY ignore TYPE E-RABDataForwardingList PRESENCE optional } | { ID id-E-RABtoReleaseListHOCmd CRITICALITY ignore TYPE E-RABList PRESENCE optional } | { ID id-Target-ToSource-TransparentContainer CRITICALITY reject TYPE Target-ToSource-TransparentContainer PRESENCE mandatory }| { ID id-Target-ToSource-TransparentContainer-Secondary CRITICALITY reject TYPE Target-ToSource-TransparentContainer PRESENCE optional }| @@ -1063,7 +1063,7 @@ HandoverCommandIEs S1AP-PROTOCOL-IES ::= { } -E-RABSubjecttoDataForwardingList ::= E-RAB-IE-ContainerList { {E-RABDataForwardingItemIEs} } +E-RABDataForwardingList ::= E-RAB-IE-ContainerList { {E-RABDataForwardingItemIEs} } E-RABDataForwardingItemIEs S1AP-PROTOCOL-IES ::= { @@ -2639,7 +2639,7 @@ DownlinkS1cdma2000tunneling ::= SEQUENCE { DownlinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE MME-UE-S1AP-ID PRESENCE mandatory } | { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE ENB-UE-S1AP-ID PRESENCE mandatory } | - { ID id-E-RABSubjecttoDataForwardingList CRITICALITY ignore TYPE E-RABSubjecttoDataForwardingList PRESENCE optional } | + { ID id-E-RABDataForwardingList CRITICALITY ignore TYPE E-RABDataForwardingList PRESENCE optional } | { ID id-cdma2000HOStatus CRITICALITY ignore TYPE Cdma2000HOStatus PRESENCE optional } | { ID id-cdma2000RATType CRITICALITY reject TYPE Cdma2000RATType PRESENCE mandatory } | { ID id-cdma2000PDU CRITICALITY reject TYPE Cdma2000PDU PRESENCE mandatory }, @@ -3438,7 +3438,7 @@ AllocationAndRetentionPriority-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { -- B -Bearers-SubjectToStatusTransferList ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToStatusTransfer-ItemIEs } } +Bearers-SubjectToStatusTransfer-List ::= SEQUENCE (SIZE(1.. maxNrOfE-RABs)) OF ProtocolIE-SingleContainer { { Bearers-SubjectToStatusTransfer-ItemIEs } } Bearers-SubjectToStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= { @@ -3974,7 +3974,7 @@ GUMMEIList::= SEQUENCE (SIZE (1.. maxnoofMMECs)) OF GUMMEI ENB-StatusTransfer-TransparentContainer ::= SEQUENCE { - bearers-SubjectToStatusTransferList Bearers-SubjectToStatusTransferList, + bearers-SubjectToStatusTransferList Bearers-SubjectToStatusTransfer-List, iE-Extensions ProtocolExtensionContainer { {ENB-StatusTransfer-TransparentContainer-ExtIEs} } OPTIONAL, ... } @@ -5297,7 +5297,7 @@ ProtocolIE-ID ::= INTEGER { id-SourceID(3), id-TargetID(4), id-eNB-UE-S1AP-ID(8), - id-E-RABSubjecttoDataForwardingList(12), + id-E-RABDataForwardingList(12), id-E-RABtoReleaseListHOCmd(13), id-E-RABDataForwardingItem(14), id-E-RABReleaseItemBearerRelComp(15), @@ -5603,7 +5603,7 @@ id-Cause id-SourceID ProtocolIE-ID ::= 3 id-TargetID ProtocolIE-ID ::= 4 id-eNB-UE-S1AP-ID ProtocolIE-ID ::= 8 -id-E-RABSubjecttoDataForwardingList ProtocolIE-ID ::= 12 +id-E-RABDataForwardingList ProtocolIE-ID ::= 12 id-E-RABtoReleaseListHOCmd ProtocolIE-ID ::= 13 id-E-RABDataForwardingItem ProtocolIE-ID ::= 14 id-E-RABReleaseItemBearerRelComp ProtocolIE-ID ::= 15 diff --git a/lib/asn/support/S1AP-PDU.asn b/lib/asn/support/S1AP-PDU.asn index a6716e536..f35d4d7b9 100644 --- a/lib/asn/support/S1AP-PDU.asn +++ b/lib/asn/support/S1AP-PDU.asn @@ -891,7 +891,7 @@ FROM S1AP-Containers id-E-RABSetupItemCtxtSURes, id-E-RABSetupListBearerSURes, id-E-RABSetupListCtxtSURes, - id-E-RABSubjecttoDataForwardingList, + id-E-RABDataForwardingList, id-E-RABToBeModifiedItemBearerModReq, id-E-RABToBeModifiedListBearerModReq, id-E-RABToBeReleasedList, @@ -1054,7 +1054,7 @@ S1ap-HandoverCommandIEs S1AP-PROTOCOL-IES ::= { { ID id-HandoverType CRITICALITY reject TYPE S1ap-HandoverType PRESENCE mandatory } | { ID id-NASSecurityParametersfromE-UTRAN CRITICALITY reject TYPE S1ap-NASSecurityParametersfromE-UTRAN PRESENCE conditional -- This IE shall be present if S1ap-HandoverType IE is set to value "LTEtoUTRAN" or "LTEtoGERAN" -- }| - { ID id-E-RABSubjecttoDataForwardingList CRITICALITY ignore TYPE S1ap-E-RABSubjecttoDataForwardingList PRESENCE optional } | + { ID id-E-RABDataForwardingList CRITICALITY ignore TYPE S1ap-E-RABDataForwardingList PRESENCE optional } | { ID id-E-RABtoReleaseListHOCmd CRITICALITY ignore TYPE S1ap-E-RABList PRESENCE optional } | { ID id-Target-ToSource-TransparentContainer CRITICALITY reject TYPE S1ap-Target-ToSource-TransparentContainer PRESENCE mandatory }| { ID id-Target-ToSource-TransparentContainer-Secondary CRITICALITY reject TYPE S1ap-Target-ToSource-TransparentContainer PRESENCE optional }| @@ -1063,7 +1063,7 @@ S1ap-HandoverCommandIEs S1AP-PROTOCOL-IES ::= { } -S1ap-E-RABSubjecttoDataForwardingList ::= E-RAB-IE-ContainerList { {S1ap-E-RABDataForwardingItemIEs} } +S1ap-E-RABDataForwardingList ::= E-RAB-IE-ContainerList { {S1ap-E-RABDataForwardingItemIEs} } S1ap-E-RABDataForwardingItemIEs S1AP-PROTOCOL-IES ::= { @@ -2639,7 +2639,7 @@ S1ap-DownlinkS1cdma2000tunneling ::= SEQUENCE { S1ap-DownlinkS1cdma2000tunnelingIEs S1AP-PROTOCOL-IES ::= { { ID id-MME-UE-S1AP-ID CRITICALITY reject TYPE S1ap-MME-UE-S1AP-ID PRESENCE mandatory } | { ID id-eNB-UE-S1AP-ID CRITICALITY reject TYPE S1ap-ENB-UE-S1AP-ID PRESENCE mandatory } | - { ID id-E-RABSubjecttoDataForwardingList CRITICALITY ignore TYPE S1ap-E-RABSubjecttoDataForwardingList PRESENCE optional } | + { ID id-E-RABDataForwardingList CRITICALITY ignore TYPE S1ap-E-RABDataForwardingList PRESENCE optional } | { ID id-cdma2000HOStatus CRITICALITY ignore TYPE S1ap-Cdma2000HOStatus PRESENCE optional } | { ID id-cdma2000RATType CRITICALITY reject TYPE S1ap-Cdma2000RATType PRESENCE mandatory } | { ID id-cdma2000PDU CRITICALITY reject TYPE S1ap-Cdma2000PDU PRESENCE mandatory }, @@ -3438,7 +3438,7 @@ S1ap-AllocationAndRetentionPriority-ExtIEs S1AP-PROTOCOL-EXTENSION ::= { -- B -S1ap-Bearers-SubjectToStatusTransferList ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE +S1ap-Bearers-SubjectToStatusTransfer-List ::= SEQUENCE (SIZE(1.. s1ap-maxNrOfE-RABs)) OF S1ap-IE S1ap-Bearers-SubjectToStatusTransfer-ItemIEs S1AP-PROTOCOL-IES ::= { @@ -3974,7 +3974,7 @@ S1ap-GUMMEIList::= SEQUENCE (SIZE (1.. s1ap-maxnoofMMECs)) OF S1ap-GUMMEI S1ap-ENB-StatusTransfer-TransparentContainer ::= SEQUENCE { - bearers-SubjectToStatusTransferList S1ap-Bearers-SubjectToStatusTransferList, + bearers-SubjectToStatusTransferList S1ap-Bearers-SubjectToStatusTransfer-List, iE-Extensions ProtocolExtensionContainer { {S1ap-ENB-StatusTransfer-TransparentContainer-ExtIEs} } OPTIONAL, ... } @@ -5297,7 +5297,7 @@ S1ap-ProtocolIE-ID ::= INTEGER { id-SourceID(3), id-TargetID(4), id-eNB-UE-S1AP-ID(8), - id-E-RABSubjecttoDataForwardingList(12), + id-E-RABDataForwardingList(12), id-E-RABtoReleaseListHOCmd(13), id-E-RABDataForwardingItem(14), id-E-RABReleaseItemBearerRelComp(15), @@ -5603,7 +5603,7 @@ id-Cause id-SourceID S1ap-ProtocolIE-ID ::= 3 id-TargetID S1ap-ProtocolIE-ID ::= 4 id-eNB-UE-S1AP-ID S1ap-ProtocolIE-ID ::= 8 -id-E-RABSubjecttoDataForwardingList S1ap-ProtocolIE-ID ::= 12 +id-E-RABDataForwardingList S1ap-ProtocolIE-ID ::= 12 id-E-RABtoReleaseListHOCmd S1ap-ProtocolIE-ID ::= 13 id-E-RABDataForwardingItem S1ap-ProtocolIE-ID ::= 14 id-E-RABReleaseItemBearerRelComp S1ap-ProtocolIE-ID ::= 15