Commit 9f1d99d8 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflicts

parent b55fae77

33128/r18/TS33128Payloads.asn

+96 −4
Original line number Diff line number Diff line
@@ -239,9 +239,13 @@ XIRIEvent ::= CHOICE 
    rCSRegistration                                     [140] RCSRegistration,

    rCSMessage                                          [141] RCSMessage,

    rcsCapabilityDiscovery                              [142] RCSCapabilityDiscovery,

    rCSSessionEstablishment                             [143] RCSSessionEstablishment,

    rCSSessionModification                              [144] RCSSessionModification,

    rCSSessionRelease                                   [145] RCSSessionRelease,

    rCSStartOfInterceptionWithAlreadyRegisteredUE       [146] RCSStartOfInterceptionWithAlreadyRegisteredUE



    -- AMF events, see clause 6.2.2.2.X, continued from tag 139

    aMFUEPolicyTransfer                                 [143] AMFUEPolicyTransfer

    aMFUEPolicyTransfer                                 [147] AMFUEPolicyTransfer

}



-- ==============
@@ -473,9 +477,13 @@ IRIEvent ::= CHOICE 
    rCSRegistration                                     [140] RCSRegistration,

    rCSMessage                                          [141] RCSMessage,

    rcsCapabilityDiscovery                              [142] RCSCapabilityDiscovery,

    rCSSessionEstablishment                             [143] RCSSessionEstablishment,

    rCSSessionModification                              [144] RCSSessionModification,

    rCSSessionRelease                                   [145] RCSSessionRelease,

    rCSStartOfInterceptionWithAlreadyRegisteredUE       [146] RCSStartOfInterceptionWithAlreadyRegisteredUE



    -- AMF events, see clause 6.2.2.3, continued from tag 139

    aMFUEPolicyTransfer                                 [143] AMFUEPolicyTransfer

    aMFUEPolicyTransfer                                 [147] AMFUEPolicyTransfer

}



IRITargetIdentifier ::= SEQUENCE
@@ -4209,6 +4217,57 @@ RCSMessage ::= SEQUENCE 
    messagePayload          [12] RCSPayload

}



-- See clause 7.13.3.4.2 for details of this structure

RCSSessionEstablishment ::= SEQUENCE

{

    rCSTargetIdentities     [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity,

    originatingIdentity     [2] SEQUENCE SIZE (1..MAX) OF RCSIdentity,

    destinationIdentities   [3] SEQUENCE SIZE (1..MAX) OF RCSIdentity,

    conversationID          [4] RCSConversationID,

    contributionID          [5] RCSContributionID,

    inReplyToContributionID [6] RCSContributionID OPTIONAL,

    sessionReplaces         [7] RCSContributionID OPTIONAL,

    rCSSessionType          [8] RCSSessionType,

    sessionDirection        [9] Direction,

    sessionEndpoints        [10] RCSSessionEndpoints,

    sIPSesssionsToBeAdded   [11] SEQUENCE OF RCSSIPSessionExchange,

    location                [12] Location

}



-- See clause 7.13.3.4.3 for details of this structure

RCSSessionModification ::= SEQUENCE

{

    rCSTargetIdentities     [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity,

    originatingIdentity     [2] SEQUENCE SIZE (1..MAX) OF RCSIdentity,

    destinationIdentities   [3] SEQUENCE SIZE (1..MAX) OF RCSIdentity,

    conversationID          [4] RCSConversationID,

    contributionID          [5] RCSContributionID,

    inReplyToContributionID [6] RCSContributionID OPTIONAL,

    sessionReplaces         [7] RCSContributionID OPTIONAL,

    rCSSessionType          [8] RCSSessionType,

    sessionDirection        [9] Direction,

    sessionEndpoints        [10] RCSSessionEndpoints,

    sIPSesssionsToBeAdded   [11] SEQUENCE OF RCSSIPSessionExchange OPTIONAL,

    sIPSessionsToBeRemoved  [12] SEQUENCE OF RCSSIPSessionExchange OPTIONAL,

    sIPSessionsToRemain     [13] SEQUENCE OF RCSSIPSessionInfo OPTIONAL,

    location                [14] Location

}



-- See clause 7.13.3.4.4 for details of this structure

RCSSessionRelease ::= SEQUENCE

{

    rCSTargetIdentities     [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity,

    originatingIdentity     [2] SEQUENCE SIZE (1..MAX) OF RCSIdentity,

    destinationIdentities   [3] SEQUENCE SIZE (1..MAX) OF RCSIdentity,

    conversationID          [4] RCSConversationID,

    contributionID          [5] RCSContributionID,

    rCSSessionType          [6] RCSSessionType,

    sessionDirection        [7] Direction,

    sessionEndpoints        [8] RCSSessionEndpoints,

    sIPSessionsToBeRemoved  [9] SEQUENCE OF RCSSIPSessionExchange,

    location                [10] Location

}



-- See clause 7.13.3.5 for details of this structure

RCSCapabilityDiscovery ::= SEQUENCE

{
@@ -4235,8 +4294,6 @@ RCSDestination ::= SEQUENCE SIZE (1..MAX) OF RCSIdentity 


RCSGroupChatSessionID ::= SIPURI



RCSServerURI ::= UTF8String



RCSIdentity ::= CHOICE

{

    fiveGSIdentities [1] FiveGSSubscriberIDs,
@@ -4260,6 +4317,41 @@ RCSRegistrationType ::= ENUMERATED 
    networkDeregistration(4)

}



RCSServerURI ::= UTF8String



RCSSessionEndpoints ::= ENUMERATED

{

    remoteOnly(1),

    locatlOnly(2),

    localAndRemote(3)

}



RCSSessionLeg ::= ENUMERATED

{

    remoteLeg(1),

    localLeg(2)

}



RCSSessionType ::= ENUMERATED

{

    largeMessageStandalone(1),

    oneTo1Chat

}



RCSSIPSessionExchange ::= SEQUENCE

{

    sessionLeg  [1] RCSSessionLeg,

    sIPRequest  [2] IMSPayload,

    sIPResponse [3] IMSPayload

}



RCSSIPSessionInfo ::= SEQUENCE

{

    toHeader   [1] UTF8String,

    fromHeader [2] UTF8String,

    callID     [3] UTF8String

}



-- =================

-- EES definitions

-- =================