Commit 82ee6845 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parent 740e8ec0

33128/r19/TS33128Payloads.asn

+19 −3
Original line number Diff line number Diff line
@@ -319,7 +319,10 @@ XIRIEvent ::= CHOICE 
    ePSPDNConnectionModification                        [181] EPSPDNConnectionModification,

    ePSPDNConnectionRelease                             [182] EPSPDNConnectionRelease,

    ePSStartOfInterceptionWithEstablishedPDNConnection  [183] EPSStartOfInterceptionWithEstablishedPDNConnection,

    ePSPDNUnsuccessfulProcedure                         [184] EPSPDNUnsuccessfulProcedure

    ePSPDNUnsuccessfulProcedure                         [184] EPSPDNUnsuccessfulProcedure,



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

    startOfInterceptionWithEstablishedIMSDataChannel    [185] StartOfInterceptionWithEstablishedIMSDataChannel

}



-- ==============
@@ -622,7 +625,10 @@ IRIEvent ::= CHOICE 
    ePSPDNConnectionModification                        [181] EPSPDNConnectionModification,

    ePSPDNConnectionRelease                             [182] EPSPDNConnectionRelease,

    ePSStartOfInterceptionWithEstablishedPDNConnection  [183] EPSStartOfInterceptionWithEstablishedPDNConnection,

    ePSPDNUnsuccessfulProcedure                         [184] EPSPDNUnsuccessfulProcedure

    ePSPDNUnsuccessfulProcedure                         [184] EPSPDNUnsuccessfulProcedure,



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

    startOfInterceptionWithEstablishedIMSDataChannel    [185] StartOfInterceptionWithEstablishedIMSDataChannel

}



IRITargetIdentifier ::= SEQUENCE
@@ -4896,7 +4902,7 @@ IMSDataChannelModification ::= SEQUENCE 
    mediaInstructions         [5] SBIType OPTIONAL

}



-- See Clause 7.12.4.2.6 for details of this structure

-- See clause 7.12.4.2.6 for details of this structure

IMSDataChannelTermination ::= SEQUENCE

{

    targetIdentity            [1] IMPU,
@@ -4906,6 +4912,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,

    mediaInstructions         [5] SBIType OPTIONAL

}



-- =========

-- IMS CCPDU

-- =========