From 177647187735906bd60453cead30db860ac55812 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 22 Jun 2023 17:52:25 +0000 Subject: [PATCH 1/4] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 87 ++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 4ab112bf..a7e323d2 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4039,7 +4039,14 @@ IMSCCPDUPayload ::= OCTET STRING IMSPayload ::= CHOICE { - encapsulatedSIPMessage [1] SIPMessage + encapsulatedSIPMessage [1] SIPMessage, + modifiedSIPMessage [2] ModifiedSIPMessage +} + +ModifiedSIPMessage ::= SEQUENCE +{ + modifiedSIPContent [1] SIPMessage, + modifications [2] PayloadModifications } SIPMessage ::= SEQUENCE @@ -6691,7 +6698,8 @@ SIPCellularNetworkInformation ::= SEQUENCE RCSPayload ::= CHOICE { - fullPayload [1] EncapsulatedRCSPayload + fullPayload [1] EncapsulatedRCSPayload, + modifiedPayload [2] ModifiedRCSPayload } EncapsulatedRCSPayload ::= CHOICE @@ -6701,6 +6709,81 @@ EncapsulatedRCSPayload ::= CHOICE sIP [3] SIPMessage } +ModifiedRCSPayload ::= SEQUENCE +{ + modifiedRCSPayload [1] EncapsulatedRCSPayload, + modifications [2] PayloadModifications +} + +PayloadModifications ::= SEQUENCE +{ + modificationList [1] SEQUENCE OF PayloadModification +} + +PayloadModification ::= SEQUENCE +{ + modificationLocation [1] ModificationLocation, + modificationType [2] ModificationType, + lengthRecalculated [3] BOOLEAN +} + +ModificationLocation ::= CHOICE +{ + jSONPointer [1] UTF8String, + xPath [2] UTF8String, + sIPHeader [3] UTF8String, + sIPBody [4] NULL, + mIMEHeader [5] UTF8String, + mIMEBody [6] MIMEBody, + uTF8Location [7] IndexRange, + octetLocation [8] IndexRange, + sMSTPIEI [9] SMSTPIEI, + sMSRPIEI [10] SMSRPIEI, + aBNFRule [11] ABNFRuleLocation +} + +ABNFRuleLocation ::= UTF8String + +SMSTPIEI ::= CHOICE +{ + sMSTPPDU [1] NULL, + sMSTPDUField [2] UTF8String, + sMSTPDUFieldIEI [3] OCTET STRING +} + +SMSRPIEI ::= CHOICE +{ + sMSRPPDU [1] NULL, + sMSRPDUField [2] UTF8String +} + +ModificationType ::= CHOICE +{ + nestedModifications [1] SEQUENCE OF PayloadModification, + removed [2] PayloadInformationRemoved, + replacedWithCharacters [3] PayloadInformationReplacedWithCharacters, + replacedWithOctets [4] OCTET STRING, + replacedWithBits [5] BIT STRING +} + +PayloadInformationRemoved ::= CHOICE +{ + charactersRemoved [1] INTEGER, + octetsRemoved [2] INTEGER, + bitsRemoved [3] INTEGER +} + +PayloadInformationReplacedWithCharacters ::= SEQUENCE +{ + characters [1] UTF8String +} + +IndexRange ::= SEQUENCE +{ + start [1] INTEGER, + end [2] INTEGER +} + -- =============================================== -- Externally Defined Structures - MSRP Parameters -- =============================================== -- GitLab From 6b835369b6a467f442d6c83268b3dcfc4cd1b0a2 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 29 Jun 2023 13:10:19 +0000 Subject: [PATCH 2/4] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 42 +++++++++++++++-------------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index a7e323d2..6f060f1b 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -6720,11 +6720,21 @@ PayloadModifications ::= SEQUENCE modificationList [1] SEQUENCE OF PayloadModification } -PayloadModification ::= SEQUENCE +PayloadModification ::= CHOICE +{ + predefinedModification [1] PredefinedPayloadModification, + describedModification [2] PayloadModificationDescription +} + +PredefinedPayloadModifcation ::= ENUMERATED +{ + tS33128sMSRedaction(1) +} + +PayloadModificationDescription ::= SEQUENCE { modificationLocation [1] ModificationLocation, - modificationType [2] ModificationType, - lengthRecalculated [3] BOOLEAN + modificationType [2] ModificationType } ModificationLocation ::= CHOICE @@ -6737,33 +6747,17 @@ ModificationLocation ::= CHOICE mIMEBody [6] MIMEBody, uTF8Location [7] IndexRange, octetLocation [8] IndexRange, - sMSTPIEI [9] SMSTPIEI, - sMSRPIEI [10] SMSRPIEI, - aBNFRule [11] ABNFRuleLocation + aBNFRule [9] ABNFRuleLocation } ABNFRuleLocation ::= UTF8String -SMSTPIEI ::= CHOICE -{ - sMSTPPDU [1] NULL, - sMSTPDUField [2] UTF8String, - sMSTPDUFieldIEI [3] OCTET STRING -} - -SMSRPIEI ::= CHOICE -{ - sMSRPPDU [1] NULL, - sMSRPDUField [2] UTF8String -} - ModificationType ::= CHOICE { - nestedModifications [1] SEQUENCE OF PayloadModification, - removed [2] PayloadInformationRemoved, - replacedWithCharacters [3] PayloadInformationReplacedWithCharacters, - replacedWithOctets [4] OCTET STRING, - replacedWithBits [5] BIT STRING + removed [1] PayloadInformationRemoved, + replacedWithCharacters [2] PayloadInformationReplacedWithCharacters, + replacedWithOctets [3] OCTET STRING, + replacedWithBits [4] BIT STRING } PayloadInformationRemoved ::= CHOICE -- GitLab From 5a4be1423ae85a6e9e624353d0aa7ca18051d5ab Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 29 Jun 2023 13:13:12 +0000 Subject: [PATCH 3/4] 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 6f060f1b..079cd63a 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -6726,7 +6726,7 @@ PayloadModification ::= CHOICE describedModification [2] PayloadModificationDescription } -PredefinedPayloadModifcation ::= ENUMERATED +PredefinedPayloadModification ::= ENUMERATED { tS33128sMSRedaction(1) } -- GitLab From c6341299251ad261dff65da27308ee424320dd7c Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 29 Jun 2023 17:40:15 +0000 Subject: [PATCH 4/4] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 079cd63a..7659f718 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -6728,7 +6728,14 @@ PayloadModification ::= CHOICE PredefinedPayloadModification ::= ENUMERATED { - tS33128sMSRedaction(1) + pANILocationRemoval(1), + cNILocationRemoval(2), + sIPGeolocationInfoRemoval(3), + presenceInformationLocationRemoval(4), + tS33128SMSTPDURedaction(5), + tS33128TruncatedSMSTPDU(6), + iMSTextContentRemoval(7), + iMSSubjectContentRemoval(8) } PayloadModificationDescription ::= SEQUENCE -- GitLab