Commit 55992165 authored by Yann Garcia's avatar Yann Garcia
Browse files

Rebuild version R17 (conflict on MBS_DistributionSetupResponseTransfer); Add R19 ASN.1 files

parent adc6dd5c
Loading
Loading
Loading
Loading
+36 −34
Original line number Diff line number Diff line
@@ -13003,23 +13003,24 @@ module LibNGAP_Templates {
                    iE_Extensions                   := p_iE_Extensions
                } // End of template m_mBS_DistributionSetupRequestTransfer
                template (omit) MBS_DistributionSetupResponseTransfer m_mBS_DistributionSetupResponseTransfer(
                                                                                                            in template (value) MBS_SessionID p_mBS_SessionID,
                                                                                                            in template (value) MBS_QoSFlowsToBeSetupList p_mBS_QoSFlowsToBeSetupList,
                                                                                                            in template (value) MBSSessionStatus p_mBSSessionStatus,
                                                                                                            in template (omit) MBS_AreaSessionID p_mBS_AreaSessionID := omit,
                                                                                                            in template (omit) MBS_SessionTNLInfo5GCItem p_sharedNGU_MulticastTNLInformation := omit,
                                                                                                            in template (omit) NGAP_IEs.MBS_ServiceArea p_mBS_ServiceArea := omit,
                                                                                                            in template (omit) MBS_DistributionSetupResponseTransfer.iE_Extensions p_iE_Extensions := omit
                                                                                                            ) := {
                    mBS_SessionID                     := p_mBS_SessionID,
                    mBS_AreaSessionID                 := p_mBS_AreaSessionID,
                    sharedNGU_MulticastTNLInformation := p_sharedNGU_MulticastTNLInformation,
                    mBS_QoSFlowsToBeSetupList         := p_mBS_QoSFlowsToBeSetupList,
                    mBSSessionStatus                  := p_mBSSessionStatus,
                    mBS_ServiceArea                   := p_mBS_ServiceArea,
                    iE_Extensions                     := p_iE_Extensions
                } // End of template m_mBS_DistributionSetupResponseTransfer
// FIXME FSCOM Confilct R16/R17 on field p_sharedNGU_MulticastTNLInformation: MBS_SessionTNLInfo5GCItem/SharedNGU-MulticastTNLInformation
                // template (omit) MBS_DistributionSetupResponseTransfer m_mBS_DistributionSetupResponseTransfer(
                //                                                                                               in template (value) MBS_SessionID p_mBS_SessionID,
                //                                                                                               in template (value) MBS_QoSFlowsToBeSetupList p_mBS_QoSFlowsToBeSetupList,
                //                                                                                               in template (value) MBSSessionStatus p_mBSSessionStatus,
                //                                                                                               in template (omit) MBS_AreaSessionID p_mBS_AreaSessionID := omit,
                //                                                                                               in template (omit) MBS_SessionTNLInfo5GCItem p_sharedNGU_MulticastTNLInformation := omit,
                //                                                                                               in template (omit) NGAP_IEs.MBS_ServiceArea p_mBS_ServiceArea := omit,
                //                                                                                               in template (omit) MBS_DistributionSetupResponseTransfer.iE_Extensions p_iE_Extensions := omit
                //                                                                                               ) := {
                //     mBS_SessionID                     := p_mBS_SessionID,
                //     mBS_AreaSessionID                 := p_mBS_AreaSessionID,
                //     sharedNGU_MulticastTNLInformation := p_sharedNGU_MulticastTNLInformation,
                //     mBS_QoSFlowsToBeSetupList         := p_mBS_QoSFlowsToBeSetupList,
                //     mBSSessionStatus                  := p_mBSSessionStatus,
                //     mBS_ServiceArea                   := p_mBS_ServiceArea,
                //     iE_Extensions                     := p_iE_Extensions
                // } // End of template m_mBS_DistributionSetupResponseTransfer
                template (omit) MBS_DistributionSetupUnsuccessfulTransfer m_mBS_DistributionSetupUnsuccessfulTransfer(
                                                                                                                    in template (value) MBS_SessionID p_mBS_SessionID,
@@ -20466,23 +20467,24 @@ module LibNGAP_Templates {
                    iE_Extensions                   := p_iE_Extensions
                } // End of template mw_mBS_DistributionSetupRequestTransfer
                template (present) MBS_DistributionSetupResponseTransfer mw_mBS_DistributionSetupResponseTransfer(
                                                                                                                template (present) MBS_SessionID p_mBS_SessionID := ?,
                                                                                                                template (present) MBS_QoSFlowsToBeSetupList p_mBS_QoSFlowsToBeSetupList := ?,
                                                                                                                template (present) MBSSessionStatus p_mBSSessionStatus := ?,
                                                                                                                template MBS_AreaSessionID p_mBS_AreaSessionID := *,
                                                                                                                template MBS_SessionTNLInfo5GCItem p_sharedNGU_MulticastTNLInformation := *,
                                                                                                                template NGAP_IEs.MBS_ServiceArea p_mBS_ServiceArea := *,
                                                                                                                template MBS_DistributionSetupResponseTransfer.iE_Extensions p_iE_Extensions := *
                                                                                                                ) := {
                    mBS_SessionID                     := p_mBS_SessionID,
                    mBS_AreaSessionID                 := p_mBS_AreaSessionID,
                    sharedNGU_MulticastTNLInformation := p_sharedNGU_MulticastTNLInformation,
                    mBS_QoSFlowsToBeSetupList         := p_mBS_QoSFlowsToBeSetupList,
                    mBSSessionStatus                  := p_mBSSessionStatus,
                    mBS_ServiceArea                   := p_mBS_ServiceArea,
                    iE_Extensions                     := p_iE_Extensions
                } // End of template mw_mBS_DistributionSetupResponseTransfer
// FIXME FSCOM Confilct R16/R17 on field p_sharedNGU_MulticastTNLInformation: MBS_SessionTNLInfo5GCItem/SharedNGU-MulticastTNLInformation
                // template (present) MBS_DistributionSetupResponseTransfer mw_mBS_DistributionSetupResponseTransfer(
                //                                                                                                 template (present) MBS_SessionID p_mBS_SessionID := ?,
                //                                                                                                 template (present) MBS_QoSFlowsToBeSetupList p_mBS_QoSFlowsToBeSetupList := ?,
                //                                                                                                 template (present) MBSSessionStatus p_mBSSessionStatus := ?,
                //                                                                                                 template MBS_AreaSessionID p_mBS_AreaSessionID := *,
                //                                                                                                 template MBS_SessionTNLInfo5GCItem p_sharedNGU_MulticastTNLInformation := *,
                //                                                                                                 template NGAP_IEs.MBS_ServiceArea p_mBS_ServiceArea := *,
                //                                                                                                 template MBS_DistributionSetupResponseTransfer.iE_Extensions p_iE_Extensions := *
                //                                                                                                 ) := {
                //     mBS_SessionID                     := p_mBS_SessionID,
                //     mBS_AreaSessionID                 := p_mBS_AreaSessionID,
                //     sharedNGU_MulticastTNLInformation := p_sharedNGU_MulticastTNLInformation,
                //     mBS_QoSFlowsToBeSetupList         := p_mBS_QoSFlowsToBeSetupList,
                //     mBSSessionStatus                  := p_mBSSessionStatus,
                //     mBS_ServiceArea                   := p_mBS_ServiceArea,
                //     iE_Extensions                     := p_iE_Extensions
                // } // End of template mw_mBS_DistributionSetupResponseTransfer
                template (present) MBS_DistributionSetupUnsuccessfulTransfer mw_mBS_DistributionSetupUnsuccessfulTransfer(
                                                                                                                        template (present) MBS_SessionID p_mBS_SessionID := ?,
+123 −0
Original line number Diff line number Diff line
/**
*    @author   ETSI / TTF T033, T048
*    @version  $URL$
*              $Id$
*    @desc    This module provides external function declarations.
*    @copyright   ETSI Copyright Notification
*                 No part may be reproduced except as authorized by written permission.
*                 The copyright and the foregoing restriction extend to reproduction in all media.
*                 All rights reserved.
*    @see      ETSI TS 
*/
module LibNGAP_EncdecDeclarations {

    import from LibNGAP_TypesAndValues all;
    import from NGAP_PDU_Descriptions language "ASN.1:2002" all;
    import from NGAP_IEs language "ASN.1:2002" all;

    external function fx_enc_NGAP_PDU (NGAP_PDU p) return bitstring
       with {extension "prototype(convert) encode(PER:ALIGNED)"}    
    external function fx_dec_NGAP_PDU (inout bitstring pdu, out NGAP_PDU p) return integer
       with {extension "prototype(sliding) decode(PER:ALIGNED)"}

    //TODO: if no additional type in TypesAndvalues remove
    //external function fx_enc_ProtocolIE (ProtocolIE p) return bitstring
    //    with {extension "prototype(convert) encode(LibNGAP_codec)"}    
    //external function fx_dec_ProtocolIE (inout bitstring pdu, out ProtocolIE p) return integer
    //    with {extension "prototype(sliding) decode(LibNGAP_codec)"}

    /*external function fx_enc_NGAP_IEs (NGAP_IEs p) return bitstring
        with {extension "prototype(convert) encode(LibNGAP_codec)"}    
    external function fx_dec_NGAP_IEs (inout bitstring pdu, out NGAP_IEs p) return integer
        with {extension "prototype(sliding) decode(LibNGAP_codec)"}*/

    external function fx_enc_PDUSessionResourceSetupResponseTransfer(NGAP_IEs.PDUSessionResourceSetupResponseTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}

    external function fx_dec_PDUSessionResourceSetupResponseTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceSetupResponseTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}

    external function fx_enc_PDUSessionResourceSetupRequestTransfer(NGAP_IEs.PDUSessionResourceSetupRequestTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}

    external function fx_dec_PDUSessionResourceSetupRequestTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceSetupRequestTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}

    external function fx_dec_PDUSessionResourceSetupUnsuccessfulTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceSetupUnsuccessfulTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}

    external function fx_enc_PDUSessionResourceSetupUnsuccessfulTransfer(NGAP_IEs.PDUSessionResourceSetupUnsuccessfulTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}


    external function fx_dec_PDUSessionResourceReleaseCommandTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceReleaseCommandTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}
        //with {extension "prototype(sliding) decode(LibNGAP_codec)"}

    external function fx_enc_PDUSessionResourceReleaseCommandTransfer(NGAP_IEs.PDUSessionResourceReleaseCommandTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}    


    external function fx_dec_PDUSessionResourceReleaseResponseTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceReleaseResponseTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}
        //with {extension "prototype(sliding) decode(LibNGAP_codec)"}

    external function fx_enc_PDUSessionResourceReleaseResponseTransfer(NGAP_IEs.PDUSessionResourceReleaseResponseTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"} 


    external function fx_dec_PDUSessionResourceModifyConfirmTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceModifyConfirmTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}
        //with {extension "prototype(sliding) decode(LibNGAP_codec)"}

    external function fx_enc_PDUSessionResourceModifyConfirmTransfer(NGAP_IEs.PDUSessionResourceModifyConfirmTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}


    external function fx_dec_PDUSessionResourceModifyIndicationTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceModifyIndicationTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}
        //with {extension "prototype(sliding) decode(LibNGAP_codec)"}

    external function fx_enc_PDUSessionResourceModifyIndicationTransfer(NGAP_IEs.PDUSessionResourceModifyIndicationTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}

    
    external function fx_dec_PDUSessionResourceModifyIndicationUnsuccessfulTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceModifyIndicationUnsuccessfulTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}
        //with {extension "prototype(sliding) decode(LibNGAP_codec)"}

    external function fx_enc_PDUSessionResourceModifyIndicationUnsuccessfulTransfer(NGAP_IEs.PDUSessionResourceModifyIndicationUnsuccessfulTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}


    external function fx_dec_PDUSessionResourceModifyResponseTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceModifyResponseTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}
        //with {extension "prototype(sliding) decode(LibNGAP_codec)"}

    external function fx_enc_PDUSessionResourceModifyResponseTransfer(NGAP_IEs.PDUSessionResourceModifyResponseTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}


    external function fx_dec_PDUSessionResourceModifyUnsuccessfulTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceModifyUnsuccessfulTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}
        //with {extension "prototype(sliding) decode(LibNGAP_codec)"}

    external function fx_enc_PDUSessionResourceModifyUnsuccessfulTransfer(NGAP_IEs.PDUSessionResourceModifyUnsuccessfulTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}


    external function fx_dec_UEContextSuspendRequestTransfer(inout bitstring pdu, out NGAP_IEs.UEContextSuspendRequestTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}
        //with {extension "prototype(sliding) decode(LibNGAP_codec)"}

    external function fx_enc_UEContextSuspendRequestTransfer(NGAP_IEs.UEContextSuspendRequestTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}

    external function fx_dec_PDUSessionResourceModifyRequestTransfer(inout bitstring pdu, out NGAP_IEs.PDUSessionResourceModifyRequestTransfer p) return integer
        with {extension "prototype(sliding) decode(PER:ALIGNED)"}
        //with {extension "prototype(sliding) decode(LibNGAP_codec)"}

    external function fx_enc_PDUSessionResourceModifyRequestTransfer(NGAP_IEs.PDUSessionResourceModifyRequestTransfer p) return bitstring
        with {extension "prototype(convert) encode(PER:ALIGNED)"}

} // End of module LibNGAP_EncdecDeclarations
 No newline at end of file
+14 −0
Original line number Diff line number Diff line
include Makefile.am.libasncodec

bin_PROGRAMS += asn1convert
asn1convert_CFLAGS = $(ASN_MODULE_CFLAGS) 
asn1convert_CPPFLAGS = -I$(top_srcdir)/-DASN_PDU_COLLECTION 
asn1convert_LDADD = libasncodec.la
asn1convert_SOURCES = \
	converter-example.c\
	pdu_collection.c
regen: regenerate-from-asn1-source

regenerate-from-asn1-source:
	asn1c NGAP_CommonDataTypes.asn
+34 −0
Original line number Diff line number Diff line
-- 3GPP TS 38.413 V18.6.0 (2025-06)
-- 9.4.6	Common Definitions
-- **************************************************************
--
-- Common definitions
--
-- **************************************************************

NGAP-CommonDataTypes {
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
ngran-Access (22) modules (3) ngap (1) version1 (1) ngap-CommonDataTypes (3) }

DEFINITIONS AUTOMATIC TAGS ::=

BEGIN

Criticality		::= ENUMERATED { reject, ignore, notify }

Presence		::= ENUMERATED { optional, conditional, mandatory }

PrivateIE-ID	::= CHOICE {
	local				INTEGER (0..65535),
	global				OBJECT IDENTIFIER
}

ProcedureCode		::= INTEGER (0..255)

ProtocolExtensionID	::= INTEGER (0..65535)

ProtocolIE-ID		::= INTEGER (0..65535)

TriggeringMessage	::= ENUMERATED { initiating-message, successful-outcome, unsuccessful-outcome }

END
+694 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading