Commit 740e8ec0 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parent 1a98729d

33128/r19/TS33128Payloads.asn

+35 −3
Original line number Diff line number Diff line
@@ -312,7 +312,14 @@ XIRIEvent ::= CHOICE 


    -- 5G ProSe Direct Communication events, see clause 7.X.2

    fiveGDDNMFProSeUNIDirectDiscovery                   [178] FiveGDDNMFProSeUNIDirectDiscovery,

    fiveGDDNMFProSeNNIDirectDiscovery                   [179] FiveGDDNMFProSeNNIDirectDiscovery

    fiveGDDNMFProSeNNIDirectDiscovery                   [179] FiveGDDNMFProSeNNIDirectDiscovery,



    -- SGW events, see clause 6.3.3.2

    ePSPDNConnectionEstablishment                       [180] EPSPDNConnectionEstablishment,

    ePSPDNConnectionModification                        [181] EPSPDNConnectionModification,

    ePSPDNConnectionRelease                             [182] EPSPDNConnectionRelease,

    ePSStartOfInterceptionWithEstablishedPDNConnection  [183] EPSStartOfInterceptionWithEstablishedPDNConnection,

    ePSPDNUnsuccessfulProcedure                         [184] EPSPDNUnsuccessfulProcedure

}



-- ==============
@@ -608,7 +615,14 @@ IRIEvent ::= CHOICE 


    -- 5G ProSe Direct Communication events, see clause 7.X.3

    fiveGDDNMFProSeUNIDirectDiscovery                   [178] FiveGDDNMFProSeUNIDirectDiscovery,

    fiveGDDNMFProSeNNIDirectDiscovery                   [179] FiveGDDNMFProSeNNIDirectDiscovery

    fiveGDDNMFProSeNNIDirectDiscovery                   [179] FiveGDDNMFProSeNNIDirectDiscovery,



    -- SGW events, see clause 6.3.3.2

    ePSPDNConnectionEstablishment                       [180] EPSPDNConnectionEstablishment,

    ePSPDNConnectionModification                        [181] EPSPDNConnectionModification,

    ePSPDNConnectionRelease                             [182] EPSPDNConnectionRelease,

    ePSStartOfInterceptionWithEstablishedPDNConnection  [183] EPSStartOfInterceptionWithEstablishedPDNConnection,

    ePSPDNUnsuccessfulProcedure                         [184] EPSPDNUnsuccessfulProcedure

}



IRITargetIdentifier ::= SEQUENCE
@@ -2476,7 +2490,8 @@ SMFUnsuccessfulProcedure ::= SEQUENCE 
    accessType                  [16] AccessType OPTIONAL,

    rATType                     [17] RATType OPTIONAL,

    sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,

    location                    [19] Location OPTIONAL

    location                    [19] Location OPTIONAL,

    ePSPDNUnsuccessfulProcedure [20] EPSPDNUnsuccessfulProcedure OPTIONAL

}



-- See clause 6.2.3.2.8 for details of this structure
@@ -3155,6 +3170,16 @@ EPSStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE 
    bearerContexts                     [17] SEQUENCE OF EPSBearerContext

}



EPSPDNUnsuccessfulProcedure ::= SEQUENCE

{

    failureCause        [1] ESMCause,

    initiator           [2] Initiator,

    ePSSubscriberIDs    [3] EPSSubscriberIDs,

    iMSIUnauthenticated [4] IMSIUnauthenticatedIndication OPTIONAL,

    failedProcedure     [5] EPSPDNFailedProcedure

}





PFDDataForApps ::= SET OF PFDDataForApp



PFDDataForApp ::= SEQUENCE
@@ -3345,6 +3370,13 @@ EPSPDNConnectionRequestType ::= ENUMERATED 


EPSPDNConnectionReleaseScopeIndication ::= BOOLEAN



EPSPDNFailedProcedure ::= CHOICE

{

    ePSPDNConnectionEstablishment [1] EPSPDNConnectionEstablishment,

    ePSPDNConnectionModification  [2] EPSPDNConnectionModification,

    ePSPDNConnectionRelease       [3] EPSPDNConnectionRelease

}



FiveGSInterworkingInfo ::= SEQUENCE

{

    fiveGSInterworkingIndicator  [1] FiveGSInterworkingIndicator,