diff --git a/lib/asn/src/s1ap_decoder.c b/lib/asn/src/s1ap_decoder.c index 09c7c58dd..fe436a1be 100644 --- a/lib/asn/src/s1ap_decoder.c +++ b/lib/asn/src/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 23:55:11.238675 by acetcom + * Created on: 2017-02-04 00:30:23.802677 by acetcom * from ['S1AP-PDU.asn'] ******************************************************************************/ #define TRACE_MODULE s1ap_decoder diff --git a/lib/asn/src/s1ap_encoder.c b/lib/asn/src/s1ap_encoder.c index b1efadda1..7ab921afb 100644 --- a/lib/asn/src/s1ap_encoder.c +++ b/lib/asn/src/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 23:55:11.261929 by acetcom + * Created on: 2017-02-04 00:30:23.828207 by acetcom * from ['S1AP-PDU.asn'] ******************************************************************************/ #include "s1ap_common.h" diff --git a/lib/asn/src/s1ap_ies_defs.h b/lib/asn/src/s1ap_ies_defs.h index b665d0604..a1477233d 100644 --- a/lib/asn/src/s1ap_ies_defs.h +++ b/lib/asn/src/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 23:55:11.223878 by acetcom + * Created on: 2017-02-04 00:30:23.783422 by acetcom * from ['S1AP-PDU.asn'] ******************************************************************************/ #include "s1ap_common.h" @@ -2534,11 +2534,11 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabreleaseresponse( void *app_key, s1ap_message *message_p); -/** \brief Display S1ap_UplinkNonUEAssociatedLPPaTransport_ message using XER encoding. +/** \brief Display S1ap_UplinkNonUEAssociatedLPPaTransport message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_uplinknonueassociatedlppatransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_uplinknonueassociatedlppatransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); @@ -2597,11 +2597,11 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobemodifiedlistbearermodreq( void *app_key, S1ap_E_RABToBeModifiedListBearerModReq_IEs_t *s1ap_E_RABToBeModifiedListBearerModReqIEs); -/** \brief Display S1ap_UEContextReleaseRequest_ message using XER encoding. +/** \brief Display S1ap_UEContextReleaseRequest message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleaserequest_( +asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleaserequest( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); @@ -2615,11 +2615,11 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabadmittedlist( void *app_key, S1ap_E_RABAdmittedList_IEs_t *s1ap_E_RABAdmittedListIEs); -/** \brief Display S1ap_InitialUEMessage_ message using XER encoding. +/** \brief Display S1ap_InitialUEMessage message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_initialuemessage_( +asn_enc_rval_t s1ap_xer_print_s1ap_initialuemessage( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); @@ -2696,11 +2696,11 @@ asn_enc_rval_t s1ap_xer_print_s1ap_locationreport( void *app_key, s1ap_message *message_p); -/** \brief Display S1ap_UplinkNASTransport_ message using XER encoding. +/** \brief Display S1ap_UplinkNASTransport message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_uplinknastransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_uplinknastransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); @@ -2993,11 +2993,11 @@ asn_enc_rval_t s1ap_xer_print_s1ap_overloadstart( void *app_key, s1ap_message *message_p); -/** \brief Display S1ap_DownlinkNonUEAssociatedLPPaTransport_ message using XER encoding. +/** \brief Display S1ap_DownlinkNonUEAssociatedLPPaTransport message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_downlinknonueassociatedlppatransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_downlinknonueassociatedlppatransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); @@ -3011,11 +3011,11 @@ asn_enc_rval_t s1ap_xer_print_s1ap_handoverrequestacknowledge( void *app_key, s1ap_message *message_p); -/** \brief Display S1ap_DownlinkUEAssociatedLPPaTransport_ message using XER encoding. +/** \brief Display S1ap_DownlinkUEAssociatedLPPaTransport message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_downlinkueassociatedlppatransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_downlinkueassociatedlppatransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); @@ -3191,11 +3191,11 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabsetupresponse( void *app_key, s1ap_message *message_p); -/** \brief Display S1ap_UEContextReleaseCommand_ message using XER encoding. +/** \brief Display S1ap_UEContextReleaseCommand message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleasecommand_( +asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleasecommand( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); @@ -3209,11 +3209,11 @@ asn_enc_rval_t s1ap_xer_print_s1ap_pathswitchrequest( void *app_key, s1ap_message *message_p); -/** \brief Display S1ap_DownlinkNASTransport_ message using XER encoding. +/** \brief Display S1ap_DownlinkNASTransport message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_downlinknastransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_downlinknastransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); @@ -3236,11 +3236,11 @@ asn_enc_rval_t s1ap_xer_print_s1ap_s1setuprequest( void *app_key, s1ap_message *message_p); -/** \brief Display S1ap_NASNonDeliveryIndication_ message using XER encoding. +/** \brief Display S1ap_NASNonDeliveryIndication message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_nasnondeliveryindication_( +asn_enc_rval_t s1ap_xer_print_s1ap_nasnondeliveryindication( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); @@ -3281,20 +3281,20 @@ asn_enc_rval_t s1ap_xer_print_s1ap_resetacknowledge( void *app_key, s1ap_message *message_p); -/** \brief Display S1ap_UEContextReleaseComplete_ message using XER encoding. +/** \brief Display S1ap_UEContextReleaseComplete message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleasecomplete_( +asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleasecomplete( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); -/** \brief Display S1ap_UplinkUEAssociatedLPPaTransport_ message using XER encoding. +/** \brief Display S1ap_UplinkUEAssociatedLPPaTransport message using XER encoding. * \param message_p Pointer to root message. * \param file File descriptor to write output. **/ -asn_enc_rval_t s1ap_xer_print_s1ap_uplinkueassociatedlppatransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_uplinkueassociatedlppatransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p); diff --git a/lib/asn/src/s1ap_mme_decoder.c b/lib/asn/src/s1ap_mme_decoder.c index ba7cddeee..cc62de713 100644 --- a/lib/asn/src/s1ap_mme_decoder.c +++ b/lib/asn/src/s1ap_mme_decoder.c @@ -71,7 +71,7 @@ s1ap_mme_decode_initiating ( switch (initiating_p->procedureCode) { case S1ap_ProcedureCode_id_uplinkNASTransport: { ret = s1ap_decode_s1ap_uplinknastransport_ies (&message->msg.s1ap_UplinkNASTransport_IEs, &initiating_p->value); - s1ap_xer_print_s1ap_uplinknastransport_ (s1ap_xer__print2sp, message_string, message); + s1ap_xer_print_s1ap_uplinknastransport (s1ap_xer__print2sp, message_string, message); #if 0 message_id = S1AP_UPLINK_NAS_LOG; #endif @@ -89,7 +89,7 @@ s1ap_mme_decode_initiating ( case S1ap_ProcedureCode_id_initialUEMessage: { ret = s1ap_decode_s1ap_initialuemessage_ies (&message->msg.s1ap_InitialUEMessage_IEs, &initiating_p->value); - s1ap_xer_print_s1ap_initialuemessage_ (s1ap_xer__print2sp, message_string, message); + s1ap_xer_print_s1ap_initialuemessage (s1ap_xer__print2sp, message_string, message); #if 0 message_id = S1AP_INITIAL_UE_MESSAGE_LOG; #endif @@ -98,7 +98,7 @@ s1ap_mme_decode_initiating ( case S1ap_ProcedureCode_id_UEContextReleaseRequest: { ret = s1ap_decode_s1ap_uecontextreleaserequest_ies (&message->msg.s1ap_UEContextReleaseRequest_IEs, &initiating_p->value); - s1ap_xer_print_s1ap_uecontextreleaserequest_ (s1ap_xer__print2sp, message_string, message); + s1ap_xer_print_s1ap_uecontextreleaserequest (s1ap_xer__print2sp, message_string, message); #if 0 message_id = S1AP_UE_CONTEXT_RELEASE_REQ_LOG; #endif @@ -116,7 +116,7 @@ s1ap_mme_decode_initiating ( case S1ap_ProcedureCode_id_NASNonDeliveryIndication: { ret = s1ap_decode_s1ap_nasnondeliveryindication_ies (&message->msg.s1ap_NASNonDeliveryIndication_IEs, &initiating_p->value); - s1ap_xer_print_s1ap_nasnondeliveryindication_ (s1ap_xer__print2sp, message_string, message); + s1ap_xer_print_s1ap_nasnondeliveryindication (s1ap_xer__print2sp, message_string, message); #if 0 message_id = S1AP_NAS_NON_DELIVERY_IND_LOG; #endif @@ -174,7 +174,7 @@ s1ap_mme_decode_successfull_outcome ( case S1ap_ProcedureCode_id_UEContextRelease: { ret = s1ap_decode_s1ap_uecontextreleasecomplete_ies (&message->msg.s1ap_UEContextReleaseComplete_IEs, &successfullOutcome_p->value); - s1ap_xer_print_s1ap_uecontextreleasecomplete_ (s1ap_xer__print2sp, message_string, message); + s1ap_xer_print_s1ap_uecontextreleasecomplete (s1ap_xer__print2sp, message_string, message); #if 0 message_id = S1AP_UE_CONTEXT_RELEASE_LOG; #endif diff --git a/lib/asn/src/s1ap_xer_print.c b/lib/asn/src/s1ap_xer_print.c index 7cb490789..5ee464177 100644 --- a/lib/asn/src/s1ap_xer_print.c +++ b/lib/asn/src/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 23:55:11.281621 by acetcom + * Created on: 2017-02-04 00:30:23.845656 by acetcom * from ['S1AP-PDU.asn'] ******************************************************************************/ #include @@ -187,7 +187,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabreleaseresponse( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_uplinknonueassociatedlppatransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_uplinknonueassociatedlppatransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) @@ -325,7 +325,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabtobemodifiedlistbearermodreq( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleaserequest_( +asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleaserequest( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) @@ -362,7 +362,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabadmittedlist( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_initialuemessage_( +asn_enc_rval_t s1ap_xer_print_s1ap_initialuemessage( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) @@ -617,7 +617,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_locationreport( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_uplinknastransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_uplinknastransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) @@ -1444,7 +1444,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_overloadstart( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_downlinknonueassociatedlppatransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_downlinknonueassociatedlppatransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) @@ -1495,7 +1495,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_handoverrequestacknowledge( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_downlinkueassociatedlppatransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_downlinkueassociatedlppatransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) @@ -1927,7 +1927,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_e_rabsetupresponse( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleasecommand_( +asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleasecommand( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) @@ -1980,7 +1980,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_pathswitchrequest( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_downlinknastransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_downlinknastransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) @@ -2055,7 +2055,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_s1setuprequest( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_nasnondeliveryindication_( +asn_enc_rval_t s1ap_xer_print_s1ap_nasnondeliveryindication( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) @@ -2172,7 +2172,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_resetacknowledge( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleasecomplete_( +asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleasecomplete( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) @@ -2195,7 +2195,7 @@ asn_enc_rval_t s1ap_xer_print_s1ap_uecontextreleasecomplete_( ASN__ENCODED_OK(er); } -asn_enc_rval_t s1ap_xer_print_s1ap_uplinkueassociatedlppatransport_( +asn_enc_rval_t s1ap_xer_print_s1ap_uplinkueassociatedlppatransport( asn_app_consume_bytes_f *cb, void *app_key, s1ap_message *message_p) diff --git a/lib/asn/support/asn1tostruct.py b/lib/asn/support/asn1tostruct.py index bc73c9baa..4bffa6a57 100644 --- a/lib/asn/support/asn1tostruct.py +++ b/lib/asn/support/asn1tostruct.py @@ -321,7 +321,7 @@ for key in iesDefs: f.write(" %s_t *%s);\n\n" % (asn1cStruct, lowerFirstCamelWord(asn1cStruct))) for key in iesDefs: - asn1cStruct = re.sub('-', '_', re.sub('IEs', '', key)) + asn1cStruct = re.sub('-', '_', re.sub('IEs', '', re.sub('-IEs', '', key))) asn1cStruct = re.sub('Item', 'List', asn1cStruct) firstlower = re.sub('Item', 'List', re.sub('enb', 'eNB', lowerFirstCamelWord(asn1cStruct))) @@ -673,9 +673,9 @@ for (key, value) in iesDefs.items(): ietypeunderscore = re.sub('-', '_', ie[2]) if key in ieofielist.values(): - f.write("asn_enc_rval_t %s_xer_print_%s(\n" % (fileprefix, re.sub('ies', '', re.sub('item', 'list', re.sub('-', '_', key).lower())))) + f.write("asn_enc_rval_t %s_xer_print_%s(\n" % (fileprefix, re.sub('ies', '', re.sub('_ies', '', re.sub('item', 'list', re.sub('-', '_', key).lower()))))) else: - f.write("asn_enc_rval_t %s_xer_print_%s(\n" % (fileprefix, re.sub('ies', '', re.sub('-', '_', key).lower()))) + f.write("asn_enc_rval_t %s_xer_print_%s(\n" % (fileprefix, re.sub('ies', '', re.sub('_ies', '', re.sub('-', '_', key).lower())))) #f.write(" FILE *file,\n") f.write(" asn_app_consume_bytes_f *cb,\n") f.write(" void *app_key,\n")