Commit 87b62a36 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflicts and updating tag numbers

parent ea06cf3d

33128/r18/TS33128Payloads.asn

+13 −13
Original line number Diff line number Diff line
@@ -225,12 +225,12 @@ XIRIEvent ::= CHOICE 
    hSSStartOfInterceptionWithRegisteredTarget          [134] HSSStartOfInterceptionWithRegisteredTarget,



    --  NEF events, see clause 7.7.6.1

    nEFAFSessionWithQoSProvision                        [4600] NEFAFSessionWithQoSProvision,

    nEFAFSessionWithQoSNotification                     [4601] NEFAFSessionWithQoSNotification,

    nEFAFSessionWithQoSProvision                        [135] NEFAFSessionWithQoSProvision,

    nEFAFSessionWithQoSNotification                     [136] NEFAFSessionWithQoSNotification,



    -- SCEF events, see clause 7.8.6.1

    sCEFASSessionWithQoSProvision                       [4610] SCEFASSessionWithQoSProvision,

    sCEFASSessionWithQoSNotification                    [4611] SCEFASSessionWithQoSNotification

    sCEFASSessionWithQoSProvision                       [137] SCEFASSessionWithQoSProvision,

    sCEFASSessionWithQoSNotification                    [138] SCEFASSessionWithQoSNotification

}



-- ==============
@@ -448,12 +448,12 @@ IRIEvent ::= CHOICE 
    hSSStartOfInterceptionWithRegisteredTarget          [134] HSSStartOfInterceptionWithRegisteredTarget,



    -- NEF events, see clause 7.7.6.2

    nEFAFSessionWithQoSProvision                        [4600] NEFAFSessionWithQoSProvision,

    nEFAFSessionWithQoSNotification                     [4601] NEFAFSessionWithQoSNotification,

    nEFAFSessionWithQoSProvision                        [135] NEFAFSessionWithQoSProvision,

    nEFAFSessionWithQoSNotification                     [136] NEFAFSessionWithQoSNotification,



    -- SCEF events, see clause 7.8.6.2

    sCEFASSessionWithQoSProvision                       [4610] SCEFASSessionWithQoSProvision,

    sCEFASSessionWithQoSNotification                    [4611] SCEFASSessionWithQoSNotification

    sCEFASSessionWithQoSProvision                       [137] SCEFASSessionWithQoSProvision,

    sCEFASSessionWithQoSNotification                    [138] SCEFASSessionWithQoSNotification

}



IRITargetIdentifier ::= SEQUENCE
@@ -3840,8 +3840,8 @@ IMSMessage ::= SEQUENCE 
    -- Tag [4] is not used.

    -- Tag [5] is not used.

    location                   [6] Location OPTIONAL,

    accessNetworkInformation   [4971] SEQUENCE OF SIPAccessNetworkInformation OPTIONAL,

    cellularNetworkInformation [4972] SEQUENCE OF SIPCellularNetworkInformation OPTIONAL

    accessNetworkInformation   [7] SEQUENCE OF SIPAccessNetworkInformation OPTIONAL,

    cellularNetworkInformation [8] SEQUENCE OF SIPCellularNetworkInformation OPTIONAL

}

-- See clause 7.12.4.2.2 for details of this structure

StartOfInterceptionForActiveIMSSession ::= SEQUENCE
@@ -3853,8 +3853,8 @@ StartOfInterceptionForActiveIMSSession ::= SEQUENCE 
    voIPRoamingIndication      [5] VoIPRoamingIndication OPTIONAL,

    -- Tag [6] is not used.

    location                   [7] Location OPTIONAL,

    accessNetworkInformation   [4971] SEQUENCE OF SIPAccessNetworkInformation OPTIONAL,

    cellularNetworkInformation [4972] SEQUENCE OF SIPCellularNetworkInformation OPTIONAL

    accessNetworkInformation   [8] SEQUENCE OF SIPAccessNetworkInformation OPTIONAL,

    cellularNetworkInformation [9] SEQUENCE OF SIPCellularNetworkInformation OPTIONAL

}



-- See clause 7.12.4.2.3 for the details.