From 9f1d99d8af0a89c625af9a73ffd08a9355096a5c Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 13 Jul 2023 13:23:15 +0100 Subject: [PATCH 1/7] Resolving merge conflicts --- 33128/r18/TS33128Payloads.asn | 100 ++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 7659f718..dc4a1955 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -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 -- ================= -- GitLab From 9e3de1c226d2c2151a97a837d1cfe59306aa5d44 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 20 Jun 2023 19:37:53 +0000 Subject: [PATCH 2/7] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index dc4a1955..f6cf4c70 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4278,6 +4278,15 @@ 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 -- ============== -- GitLab From 736a4e2ea432a67ff1da8ff43f879735621df245 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 20 Jun 2023 19:40:13 +0000 Subject: [PATCH 3/7] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index f6cf4c70..6f958a37 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -476,7 +476,7 @@ IRIEvent ::= CHOICE -- RCS events, see clause 7.13.3 rCSRegistration [140] RCSRegistration, rCSMessage [141] RCSMessage, - rcsCapabilityDiscovery [142] RCSCapabilityDiscovery, + rCSCapabilityDiscovery [142] RCSCapabilityDiscovery, rCSSessionEstablishment [143] RCSSessionEstablishment, rCSSessionModification [144] RCSSessionModification, rCSSessionRelease [145] RCSSessionRelease, -- GitLab From b1b0a8f186108a33a50d4bb5481906f613ca3a4b Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 29 Jun 2023 12:42:22 +0000 Subject: [PATCH 4/7] Resolving merge conflics --- 33128/r18/TS33128Payloads.asn | 107 ++++++++++++++++------------------ 1 file changed, 50 insertions(+), 57 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 6f958a37..575da7c3 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -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 + sessionLeg [1] RCSSessionLeg, + 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) } -- ================= -- GitLab From 553fbb2af4c3cc557de26e9deb36c8646d53ccf2 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 29 Jun 2023 12:44:21 +0000 Subject: [PATCH 5/7] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 575da7c3..781e1720 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4236,8 +4236,7 @@ RCSSessionEstablishment ::= SEQUENCE rCSSessionType [6] RCSSessionType, sessionDirection [7] Direction, rCSSessionMessage [8] RCSSIPSessionMessage, - sIPSesssionsToBeAdded [9] SEQUENCE OF RCSSIPSessionExchange, - location [10] Location + location [9] Location } -- See clause 7.13.3.4.3.1 for details of this structure -- GitLab From e21af93be6262015e15b5b0163eb0ca2d4249246 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 14 Jul 2023 12:42:48 +0100 Subject: [PATCH 6/7] Resolving merge conflicts again --- 33128/r18/TS33128Payloads.asn | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 781e1720..83933c56 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -238,18 +238,13 @@ XIRIEvent ::= CHOICE -- RCS events, see clause 7.13.3 rCSRegistration [140] RCSRegistration, rCSMessage [141] RCSMessage, - rcsCapabilityDiscovery [142] RCSCapabilityDiscovery, + 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) + aMFUEPolicyTransfer [146] AMFUEPolicyTransfer } -- ============== @@ -483,15 +478,10 @@ 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) + aMFUEPolicyTransfer [146] AMFUEPolicyTransfer } IRITargetIdentifier ::= SEQUENCE @@ -4276,6 +4266,16 @@ 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 -- ============== -- GitLab From 8930af0d70d03a5a3f802475b7aabf52557ee43b Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 14 Jul 2023 13:58:38 +0100 Subject: [PATCH 7/7] Re-removing RCSStartOfInterceptionWithAlreadyRegisteredUE --- 33128/r18/TS33128Payloads.asn | 9 --------- 1 file changed, 9 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 83933c56..d4452b19 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4266,15 +4266,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 -- GitLab