From 5e3b95d2858bd50c5db2fcda9d042b096cbb29f3 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 14 Apr 2023 13:29:39 +0000 Subject: [PATCH 1/5] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 183 +++++++++++++++++++++++++++++----- 1 file changed, 159 insertions(+), 24 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 058c4000..06df1a78 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5392,19 +5392,6 @@ ReRegRequiredIndicator ::= ENUMERATED RoutingIndicator ::= INTEGER (0..9999) --- Details for the encoding and use of this parameter may be found in the clause --- that defines the xIRI that carries it. This parameter provides a generic --- mechanism to convey service based interface structures defined in Stage 3 working groups. -SBIType ::= SEQUENCE -{ - sBIReference [1] SBIReference, - sBIValue [2] SBIValue -} - -SBIReference ::= UTF8String - -SBIValue ::= UTF8String - SchemeOutput ::= OCTET STRING ServiceAreaInformation ::= SEQUENCE (SIZE(1..MAX)) OF ServiceAreaInfo @@ -5541,17 +5528,6 @@ UserIdentifiers ::= SEQUENCE ePSSubscriberIDs [2] EPSSubscriberIDs OPTIONAL } -XMLType ::= SEQUENCE -{ - xMLNamespace [1] XMLNamespace, - xMLValue [2] XMLValue -} - -XMLNamespace ::= UTF8String - -XMLValue ::= UTF8String - - -- =================== -- Location parameters -- =================== @@ -6467,4 +6443,163 @@ SIPCellularNetworkInformation ::= SEQUENCE servingPLMN [2] PLMNID OPTIONAL } +-- ================================================== +-- Structures to allow reuse of encapsulated payloads +-- ================================================== + +EncapsulatedInformation ::= CHOICE +{ + fullPayload [1] EncapsulatedPayload, + modifiedPayload [2] ModifiedPayload +} + +EncapsulatedPayload ::= CHOICE +{ + sBI [1] SBIType, + xML [2] XMLType, + mIME [3] MIMEEntity, + mSRP [4] MSRPMessage, + sIP [5] SIPMessage +} + +ModifiedPayload ::= SEQUENCE +{ + modifiedPayload [1] EncapsulatedPayload, + modifications [2] SEQUENCE OF PayloadModification +} + +PayloadModification ::= SEQUENCE +{ + modificationLocation [1] ModificationLocation, + modificationType [2] ModificationType +} + +ModificationLocation ::= CHOICE +{ + jSONPointer [2] UTF8String, + xPath [3] UTF8String, + sIPHeader [4] UTF8String, + sIPBody [5] NULL, + mIMEHeader [6] UTF8String, + mIMEBody [7] MIMEBody, + uTF8Location [8] IndexRange, + octetLocation [9] IndexRange, + sMSTPIEI [10] SMSTPIEI, + sMSRPIEI [11] SMSRPIEI, + aBNFRule [12] 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 [2] SEQUENCE OF PayloadModification, + removed [3] PayloadInformationRemoved, + replacedWithCharacters [4] PayloadInformationReplacedWithCharacters, + replacedWithOctets [5] OCTET STRING, + replacedWithBits [6] 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 +-- =============================================== + +EncapsulatedMSRP ::= UTF8String + +MSRPMessage ::= SEQUENCE +{ + encapsulatedMSRP [1] EncapsulatedMSRP +} + +-- ================================================== +-- Externally Defined Structures - SBIType Parameters +-- ================================================== + +-- Details for the encoding and use of this parameter may be found in the clause +-- that defines the xIRI that carries it. This parameter provides a generic +-- mechanism to convey service based interface structures defined in Stage 3 working groups. + +SBIType ::= SEQUENCE +{ + sBIReference [1] SBIReference, + sBIValue [2] SBIValue +} + +SBIReference ::= UTF8String + +SBIValue ::= UTF8String + +-- ================================================== +-- Externally Defined Structures - XMLType Parameters +-- ================================================== + +XMLType ::= SEQUENCE +{ + xMLNamespace [1] XMLNamespace, + xMLValue [2] XMLValue, + xPath [3] XPath OPTIONAL +} + +XMLNamespace ::= UTF8String + +XPath ::= UTF8String + +XMLValue ::= UTF8String + +-- ====================================================== +-- Externally Defined Structures - MIME Entity Parameters +-- ====================================================== + +EncapsulatedMIMEEntity ::= UTF8String + +MIMEContentType ::= UTF8String + +MIMEEntity ::= SEQUENCE +{ + contentType [1] MIMEContentType, + encapsulatedMIMEEntity [2] EncapsulatedMIMEEntity +} + +MIMEPartIdentifier ::= CHOICE +{ + index [1] INTEGER +} + +MIMEBody ::= CHOICE +{ + fullBody [1] NULL, + bodyPart [2] MIMEPartIdentifier +} + END -- GitLab From 50749aac9a8bc9a788044ff5c15f233c3bc1d93e Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 14 Apr 2023 13:32:37 +0000 Subject: [PATCH 2/5] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 06df1a78..10575280 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -6476,17 +6476,17 @@ PayloadModification ::= SEQUENCE ModificationLocation ::= CHOICE { - jSONPointer [2] UTF8String, - xPath [3] UTF8String, - sIPHeader [4] UTF8String, - sIPBody [5] NULL, - mIMEHeader [6] UTF8String, - mIMEBody [7] MIMEBody, - uTF8Location [8] IndexRange, - octetLocation [9] IndexRange, - sMSTPIEI [10] SMSTPIEI, - sMSRPIEI [11] SMSRPIEI, - aBNFRule [12] ABNFRuleLocation + 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 @@ -6506,11 +6506,11 @@ SMSRPIEI ::= CHOICE ModificationType ::= CHOICE { - nestedModifications [2] SEQUENCE OF PayloadModification, - removed [3] PayloadInformationRemoved, - replacedWithCharacters [4] PayloadInformationReplacedWithCharacters, - replacedWithOctets [5] OCTET STRING, - replacedWithBits [6] BIT STRING + nestedModifications [1] SEQUENCE OF PayloadModification, + removed [2] PayloadInformationRemoved, + replacedWithCharacters [3] PayloadInformationReplacedWithCharacters, + replacedWithOctets [4] OCTET STRING, + replacedWithBits [5] BIT STRING } PayloadInformationRemoved ::= CHOICE -- GitLab From f17bf6845d527813d9df20f801e9e45e8f895ea5 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 27 Apr 2023 16:37:40 +0000 Subject: [PATCH 3/5] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 83 ----------------------------------- 1 file changed, 83 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 10575280..d0f22207 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -6447,89 +6447,6 @@ SIPCellularNetworkInformation ::= SEQUENCE -- Structures to allow reuse of encapsulated payloads -- ================================================== -EncapsulatedInformation ::= CHOICE -{ - fullPayload [1] EncapsulatedPayload, - modifiedPayload [2] ModifiedPayload -} - -EncapsulatedPayload ::= CHOICE -{ - sBI [1] SBIType, - xML [2] XMLType, - mIME [3] MIMEEntity, - mSRP [4] MSRPMessage, - sIP [5] SIPMessage -} - -ModifiedPayload ::= SEQUENCE -{ - modifiedPayload [1] EncapsulatedPayload, - modifications [2] SEQUENCE OF PayloadModification -} - -PayloadModification ::= SEQUENCE -{ - modificationLocation [1] ModificationLocation, - modificationType [2] ModificationType -} - -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 51f16ae31517f91d1be984bb401c403d87ce5ffe Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 27 Apr 2023 19:15:42 +0000 Subject: [PATCH 4/5] Apply 1 suggestion(s) to 1 file(s) --- 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 d0f22207..f4acffcf 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -6484,8 +6484,7 @@ SBIValue ::= UTF8String XMLType ::= SEQUENCE { xMLNamespace [1] XMLNamespace, - xMLValue [2] XMLValue, - xPath [3] XPath OPTIONAL + xMLValue [2] XMLValue } XMLNamespace ::= UTF8String -- GitLab From 2379d104f7e8a305d2f032333b86ece332cc14fd Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 27 Apr 2023 19:32:45 +0000 Subject: [PATCH 5/5] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 2 -- 1 file changed, 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index f4acffcf..15cd8aa8 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -6489,8 +6489,6 @@ XMLType ::= SEQUENCE XMLNamespace ::= UTF8String -XPath ::= UTF8String - XMLValue ::= UTF8String -- ====================================================== -- GitLab