Commit 660000b4 authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parents 76b6a1a2 30dc4dd9

33128/r18/TS33128Payloads.asn

+107 −2
Original line number Diff line number Diff line
@@ -233,7 +233,12 @@ XIRIEvent ::= CHOICE 
    sCEFASSessionWithQoSNotification                    [138] SCEFASSessionWithQoSNotification,



    -- AMF events, see 6.2.2.3, continued from tag 132

    aMFRANTraceReport                                   [139] AMFRANTraceReport

    aMFRANTraceReport                                   [139] AMFRANTraceReport,



    -- RCS events, see clause 7.13.3

    rCSRegistration                                     [140] RCSRegistration,

    rCSMessage                                          [141] RCSMessage,

    rcsCapabilityDiscovery                              [142] RCSCapabilityDiscovery

}



-- ==============
@@ -459,7 +464,12 @@ IRIEvent ::= CHOICE 
    sCEFASSessionWithQoSNotification                    [138] SCEFASSessionWithQoSNotification,



    -- AMF events, see 6.2.2.3, continued from tag 132

    aMFRANTraceReport                                   [139] AMFRANTraceReport

    aMFRANTraceReport                                   [139] AMFRANTraceReport,



    -- RCS events, see clause 7.13.3

    rCSRegistration                                     [140] RCSRegistration,

    rCSMessage                                          [141] RCSMessage,

    rcsCapabilityDiscovery                              [142] RCSCapabilityDiscovery

}



IRITargetIdentifier ::= SEQUENCE
@@ -4122,6 +4132,88 @@ RCDDisplayInfo ::= SEQUENCE 
    jcl  [3] OCTET STRING OPTIONAL

}



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

-- RCS Definitions

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



-- See clause 7.13.3.2 for details of this structure

RCSRegistration ::= SEQUENCE

{

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

    rCSRegistrationType              [2] RCSRegistrationType,

    rCSRegistrationUpdateRequest     [3] IMSPayload,

    rCSRegistrationUpdateResponse    [4] IMSPayload,

    location                         [5] Location OPTIONAL

}



-- See clause 7.13.3.3 for details of this structure

RCSMessage ::= SEQUENCE

{

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

    groupChatSessionID      [2] RCSGroupChatSessionID OPTIONAL,

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

    destinationIdentities   [4] RCSDestinations,

    direction               [5] Direction,

    messageType             [6] RCSMessageType,

    conversationID          [7] RCSConversationID,

    contributionID          [8] RCSContributionID,

    inReplyToContributionID [9] RCSContributionID OPTIONAL,

    messageID               [10] IMDNMessageID OPTIONAL,

    location                [11] Location OPTIONAL,

    messagePayload          [12] RCSPayload

}



-- See clause 7.13.3.5 for details of this structure

RCSCapabilityDiscovery ::= SEQUENCE

{

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

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

    sIPMessage                    [3] IMSPayload,

    direction                     [4] Direction,

    location                      [5] Location OPTIONAL

}



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

-- RCS Parameters

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



IMDNMessageID ::= UTF8String



RCSConversationID ::= UUID



RCSContributionID ::= UUID



RCSDestinations ::= SEQUENCE SIZE (1..MAX) OF RCSDestination



RCSDestination ::= SEQUENCE SIZE (1..MAX) OF RCSIdentity



RCSGroupChatSessionID ::= SIPURI



RCSServerURI ::= UTF8String



RCSIdentity ::= CHOICE

{

    fiveGSIdentities [1] FiveGSSubscriberIDs,

    ePSIdentities    [2] EPSSubscriberIDs,

    iMSIdentities    [3] IMSSubscriberIDs

}



RCSMessageType ::= ENUMERATED

{

    messageWithUserContent(1),

    fileTransferMessage(2),

    geoLocationPUSHMessage(3),

    iMDNNotification(4)

}



RCSRegistrationType ::= ENUMERATED

{

    registration(1),

    reRegistration(2),

    uEDeregistration(3),

    networkDeregistration(4)

}



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

-- EES definitions

-- =================
@@ -5637,6 +5729,8 @@ UserIdentifiers ::= SEQUENCE 
    ePSSubscriberIDs    [2] EPSSubscriberIDs OPTIONAL

}



UUID ::= OCTET STRING (SIZE (16))



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

-- Location parameters

-- ===================
@@ -6556,6 +6650,17 @@ SIPCellularNetworkInformation ::= SEQUENCE 
-- Structures to allow reuse of encapsulated payloads

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



RCSPayload ::= CHOICE

{

    fullPayload     [1] EncapsulatedRCSPayload

}



EncapsulatedRCSPayload ::= CHOICE

{

    mIME [1] MIMEEntity,

    mSRP [2] MSRPMessage,

    sIP  [3] SIPMessage

}



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

-- Externally Defined Structures - MSRP Parameters