Commit 39e19141 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflicts

parents 076b0b87 12ed3faa

33128/r18/TS33128Payloads.asn

+26 −4
Original line number Diff line number Diff line
@@ -258,11 +258,15 @@ XIRIEvent ::= CHOICE 
    nWDAFEventsNotification                             [153] NWDAFEventsNotification,

    nWDAFAnalyticsInfoQuery                             [154] NWDAFAnalyticsInfoQuery,

    nWDAFRoamingAnalyticsSubscription                   [155] NWDAFRoamingAnalyticsSubscription,

    nWDAFRoamingAnalyticsNotification                   [156] NWDAFRoamingAnalyticsNotification

    nWDAFRoamingAnalyticsNotification                   [156] NWDAFRoamingAnalyticsNotification,



    -- RCS events, see clause 7.13.3, continued from tag 145

    startOfInterceptForRegisteredRCSUser                [157] StartOfInterceptForRegisteredRCSUser,

    startOfInterceptWithEstablisedRCSSession            [158] StartOfInterceptWithEstablisedRCSSession

    startOfInterceptWithEstablisedRCSSession            [158] StartOfInterceptWithEstablisedRCSSession,

    

    -- UDM events, see clause 7.2.2.3, continued from tag 124

    uDMProSeTargetIdentifierDeconcealment               [159] UDMProSeTargetIdentifierDeconcealment,

    uDMProSeTargetAuthentication                        [160] UDMProSeTargetAuthentication

}



-- ==============
@@ -513,11 +517,15 @@ IRIEvent ::= CHOICE 
    nWDAFEventsNotification                             [153] NWDAFEventsNotification,

    nWDAFAnalyticsInfoQuery                             [154] NWDAFAnalyticsInfoQuery,

    nWDAFRoamingAnalyticsSubscription                   [155] NWDAFRoamingAnalyticsSubscription,

    nWDAFRoamingAnalyticsNotification                   [156] NWDAFRoamingAnalyticsNotification

    nWDAFRoamingAnalyticsNotification                   [156] NWDAFRoamingAnalyticsNotification,

    

    -- RCS events, see clause 7.13.3, continued from tag 145

    startOfInterceptForRegisteredRCSUser                [157] StartOfInterceptForRegisteredRCSUser,

    startOfInterceptWithEstablisedRCSSession            [158] StartOfInterceptWithEstablisedRCSSession

    startOfInterceptWithEstablisedRCSSession            [158] StartOfInterceptWithEstablisedRCSSession,



    -- UDM events, see clause 7.2.2.3, continued from tag 124

    uDMProSeTargetIdentifierDeconcealment               [159] UDMProSeTargetIdentifierDeconcealment,

    uDMProSeTargetAuthentication                        [160] UDMProSeTargetAuthentication

}



IRITargetIdentifier ::= SEQUENCE
@@ -2939,6 +2947,20 @@ UDMStartOfInterceptionWithRegisteredTarget ::= SEQUENCE 
    uDMSubscriptionDataSets     [3] SBIType

}



UDMProSeTargetIdentifierDeconcealment ::= SEQUENCE

{

    sUPI                        [1] SUPI,

    sUCI                        [2] SUCI

}



UDMProSeTargetAuthentication ::= SEQUENCE

{

    servingNetworkName           [1] UTF8String,

    relayServiceCode             [2] INTEGER,

    authenticationType           [3] PrimaryAuthenticationType,

    sUPI                         [4] SUPI

}



ServerAddressingInfoList ::= SEQUENCE (SIZE(1..MAX)) OF ServerAddressingInfo



ServerAddressingInfo ::= SEQUENCE