Commit 37dec125 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parent 82ee6845

33128/r18/TS33128Payloads.asn

+18 −2
Original line number Diff line number Diff line
@@ -296,7 +296,10 @@ XIRIEvent ::= CHOICE 
    ePSPDNConnectionModification                        [177] EPSPDNConnectionModification,

    ePSPDNConnectionRelease                             [178] EPSPDNConnectionRelease,

    ePSStartOfInterceptionWithEstablishedPDNConnection  [179] EPSStartOfInterceptionWithEstablishedPDNConnection,

    ePSPDNUnsuccessfulProcedure                         [180] EPSPDNUnsuccessfulProcedure

    ePSPDNUnsuccessfulProcedure                         [180] EPSPDNUnsuccessfulProcedure,

    

    -- IMS events, see clause 7.12.4.2, continued from tag 164

    startOfInterceptionWithEstablishedIMSDataChannel    [167] StartOfInterceptionWithEstablishedIMSDataChannel

}



-- ==============
@@ -576,7 +579,10 @@ IRIEvent ::= CHOICE 
    ePSPDNConnectionModification                        [177] EPSPDNConnectionModification,

    ePSPDNConnectionRelease                             [178] EPSPDNConnectionRelease,

    ePSStartOfInterceptionWithEstablishedPDNConnection  [179] EPSStartOfInterceptionWithEstablishedPDNConnection,

    ePSPDNUnsuccessfulProcedure                         [180] EPSPDNUnsuccessfulProcedure

    ePSPDNUnsuccessfulProcedure                         [180] EPSPDNUnsuccessfulProcedure,



    -- IMS events, see clause 7.12.4.2, continued from tag 164

    startOfInterceptionWithEstablishedIMSDataChannel    [181] StartOfInterceptionWithEstablishedIMSDataChannel

}



IRITargetIdentifier ::= SEQUENCE
@@ -4658,6 +4664,16 @@ IMSDataChannelTermination ::= SEQUENCE 
    mediaInstructionData      [5] SBIType OPTIONAL

}



-- See Clause 7.12.4.2.7 for details of this structure

StartOfInterceptionWithEstablishedIMSDataChannel ::= SEQUENCE

{

    targetIdentity            [1] IMPU,

    callingIdentity           [2] IMPU OPTIONAL,

    calledIdentities          [3] SEQUENCE OF IMPU OPTIONAL,

    sessionEventNotification  [4] SBIType OPTIONAL,

    mediaInstructionData      [5] SBIType OPTIONAL

}



-- =========

-- IMS CCPDU

-- =========