Resolving merge conflics (b1b0a8f1) · Commits · SA3 / SA3 LI

33128/r18/TS33128Payloads.asn

+50 −57

Original line number	Diff line number	Diff line
		@@ -241,11 +241,15 @@ XIRIEvent ::= CHOICE
		rcsCapabilityDiscovery [142] RCSCapabilityDiscovery,
		rCSSessionEstablishment [143] RCSSessionEstablishment,
		rCSSessionModification [144] RCSSessionModification,
		<<<<<<< HEAD
		rCSSessionRelease [145] RCSSessionRelease,
		rCSStartOfInterceptionWithAlreadyRegisteredUE [146] RCSStartOfInterceptionWithAlreadyRegisteredUE

		-- AMF events, see clause 6.2.2.2.X, continued from tag 139
		aMFUEPolicyTransfer [147] AMFUEPolicyTransfer
		=======
		rCSSessionRelease [145] RCSSessionRelease
		>>>>>>> faffcd9 (Update 33128/r18/TS33128Payloads.asn)
		}

		-- ==============
		@@ -479,11 +483,15 @@ IRIEvent ::= CHOICE
		rCSCapabilityDiscovery [142] RCSCapabilityDiscovery,
		rCSSessionEstablishment [143] RCSSessionEstablishment,
		rCSSessionModification [144] RCSSessionModification,
		<<<<<<< HEAD
		rCSSessionRelease [145] RCSSessionRelease,
		rCSStartOfInterceptionWithAlreadyRegisteredUE [146] RCSStartOfInterceptionWithAlreadyRegisteredUE

		-- AMF events, see clause 6.2.2.3, continued from tag 139
		aMFUEPolicyTransfer [147] AMFUEPolicyTransfer
		=======
		rCSSessionRelease [145] RCSSessionRelease
		>>>>>>> faffcd9 (Update 33128/r18/TS33128Payloads.asn)
		}

		IRITargetIdentifier ::= SEQUENCE
		@@ -4217,57 +4225,48 @@ RCSMessage ::= SEQUENCE
		messagePayload [12] RCSPayload
		}

		-- See clause 7.13.3.4.2 for details of this structure
		-- See clause 7.13.3.4.2.1 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
		conversationID [2] RCSConversationID,
		contributionID [3] RCSContributionID,
		inReplyToContributionID [4] RCSContributionID OPTIONAL,
		sessionReplaces [5] RCSContributionID OPTIONAL,
		rCSSessionType [6] RCSSessionType,
		sessionDirection [7] Direction,
		rCSSessionMessage [8] RCSSIPSessionMessage,
		sIPSesssionsToBeAdded [9] SEQUENCE OF RCSSIPSessionExchange,
		location [10] Location
		}

		-- See clause 7.13.3.4.3.1 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,
		conversationID [2] RCSConversationID,
		contributionID [3] RCSContributionID,
		inReplyToContributionID [4] RCSContributionID OPTIONAL,
		sessionReplaces [5] RCSContributionID OPTIONAL,
		rCSSessionType [6] RCSSessionType,
		sessionDirection [7] Direction,
		sessionEndpoints [8] RCSSessionEndpoints,
		sIPSessionsToBeRemoved [9] SEQUENCE OF RCSSIPSessionExchange,
		rCSSIPSessionMessage [9] RCSSIPSessionMessage,
		location [10] Location
		}

		-- See clause 7.13.3.4.4.1 for details of this structure
		RCSSessionRelease ::= SEQUENCE
		{
		rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity,
		conversationID [2] RCSConversationID,
		contributionID [3] RCSContributionID,
		rCSSessionType [4] RCSSessionType,
		sessionDirection [5] Direction,
		rCSSIPSessionMessage [6] RCSSIPSessionMessage,
		location [7] Location
		}

		-- See clause 7.13.3.5 for details of this structure
		RCSCapabilityDiscovery ::= SEQUENCE
		{
		@@ -4278,15 +4277,6 @@ RCSCapabilityDiscovery ::= SEQUENCE
		location [5] Location OPTIONAL
		}

		-- See clause 7.13.3.X for details of this structure
		RCSStartOfInterceptionWithAlreadyRegisteredUE ::= SEQUENCE
		{
		rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity,
		rCSRegistrationRequest [2] IMSPayload,
		rCSRegistrationResponse [3] IMSPayload,
		location [4] Location
		}

		-- ==============
		-- RCS Parameters
		-- ==============
		@@ -4344,21 +4334,24 @@ RCSSessionLeg ::= ENUMERATED
		RCSSessionType ::= ENUMERATED
		{
		largeMessageStandalone(1),
		oneTo1Chat
		oneTo1Chat(2)
		}

		RCSSIPSessionExchange ::= SEQUENCE
		RCSSIPSessionMessage ::= SEQUENCE
		{
		sessionLeg [1] RCSSessionLeg,
		sIPRequest [2] IMSPayload,
		sIPResponse [3] IMSPayload
		sIPMessage [2] IMSPayload,
		rCSSessionResult [3] RCSSessionResult
		}

		RCSSIPSessionInfo ::= SEQUENCE
		RCSSessionResult ::= ENUMERATED
		{
		toHeader [1] UTF8String,
		fromHeader [2] UTF8String,
		callID [3] UTF8String
		newLegRequested(1),
		newLegEstablished(2),
		legModificationRequested(3),
		legModificationComplete(4),
		legRemovalRequest(5),
		legRemovalComplete(6)
		}

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