From 4c753185a85b81ef9b3e9037c82e5a7b007a60b6 Mon Sep 17 00:00:00 2001 From: znaty Date: Sun, 16 Apr 2023 12:31:20 +0000 Subject: [PATCH 01/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 223 +++++++++++++++++++++++++++++++++- 1 file changed, 221 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 07996815..0a824e17 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -230,7 +230,12 @@ XIRIEvent ::= CHOICE -- SCEF events, see clause 7.8.6.1 sCEFASSessionWithQoSProvision [137] SCEFASSessionWithQoSProvision, - sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification + sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification, + + -- RCS events, see clause 7.13.3 + rCSRegistration [5290] RCSRegistration, + rCSMessage [5291] RCSMessage, + rcsCapabilityDiscovery [5292] RCSCapabilityDiscovery } -- ============== @@ -453,7 +458,12 @@ IRIEvent ::= CHOICE -- SCEF events, see clause 7.8.6.2 sCEFASSessionWithQoSProvision [137] SCEFASSessionWithQoSProvision, - sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification + sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification, + + -- RCS events, see clause 7.13.3 + rCSRegistration [5290] RCSRegistration, + rCSMessage [5291] RCSMessage, + rcsCapabilityDiscovery [5292] RCSCapabilityDiscovery } IRITargetIdentifier ::= SEQUENCE @@ -4014,6 +4024,215 @@ RCDDisplayInfo ::= SEQUENCE jcl [3] OCTET STRING OPTIONAL } +-- ================= +-- RCS Definitions +-- ================= + +-- See clause 7.13.3.X for details of this structure +RCSRegistration ::= SEQUENCE +{ + rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + rCSRegistrationType [3] RCSRegistrationType, + rCSRegistrationUpdateRequest [4] IMSPayload, + rCSRegistrationUpdateResponse [5] IMSPayload, + location [6] Location OPTIONAL +} + +-- See clause 7.X.2.1.2 for details of this structure +RCSMessage ::= SEQUENCE +{ + rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + rCSServerURI [2] RCSServerURI, + groupChatSessionID [3] RCSGroupChatSessionID OPTIONAL, + originatingIdentity [4] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + destinationIdentities [5] RCSDestinations, + direction [6] Direction, + messageType [7] RCSMessageType, + conversationID [8] UUID, + contributionID [9] UUID, + inReplyToContributionID [10] UUID OPTIONAL, + messageID [11] IMDNMessageID OPTIONAL, + location [12] Location OPTIONAL, + messagePayload [13] ReportedMessagePayload +} + +-- See clause 7.X.2.1.4 for details of this structure +RCSCapabilityDiscovery ::= SEQUENCE +{ + rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + sIPMessage [3] IMSPayload, + direction [4] Direction, + sIPMessageType [5] SIPMessageType, + location [6] Location OPTIONAL +} + +-- ============== +-- RCS Parameters +-- ============== + +IMDNMessageID ::= UTF8String + +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) +} + +ReportedMessagePayload ::= CHOICE +{ + mIMEEntityContainer [1] MIMEEntityContainer, + mSRPContainer [2] MSRPContainer +} + +RCSRegistrationType ::= ENUMERATED +{ + registration(1), + reregistration(2), + uEDeregistration(3), + networkDeregistration(4) +} + +SIPMessageType ::= ENUMERATED +{ + oPTIONS(1), + sUBSCRIBE(2), + nOTIFY(3), + pUBLISH(4), + oPTIONSResponse(5) +} + +UUID ::= OCTET STRING (SIZE (16)) + +-- ========================================================== +-- Structures to allow reuse of externally defined structures +-- ========================================================== + +EncapsulatedMSRP ::= OCTET STRING + +MSRPContainer ::= CHOICE +{ + encapsulatedMSRP [1] EncapsulatedMSRP, + separatedMSRP [2] SeparatedMSRP +} + +MSRPEndLine ::= UTF8String + +MSRPHeaders ::= UTF8String + +MSRPStartLine ::= UTF8String + +SeparatedMSRP ::= SEQUENCE +{ + startLine [1] MSRPStartLine, + headers [2] MSRPHeaders, + body [3] MIMEEntityContainer OPTIONAL, + endLine [4] MSRPEndLine +} + +-- 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 + +XMLType ::= SEQUENCE +{ + xMLNamespace [1] XMLNamespace, + xMLValue [2] XMLValue +} + +XMLNamespace ::= UTF8String + +XMLValue ::= UTF8String + +-- ====================== +-- MIME Entity Parameters +-- ====================== + +EncapsulatedMIMEEntity ::= OCTET STRING + +MIMEBody ::= UTF8String + +MIMEBodyLength ::= INTEGER + +MIMEEntityBody ::= CHOICE +{ + mIMEEntityContainer [1] MIMEEntityContainer, + communicationsContent [2] MIMEEntityBodyWithCC, + body [3] MIMEBody +} + +MIMEEntityBodyWithCC ::= SEQUENCE +{ + mIMEBodyLength [1] MIMEBodyLength +} + +MIMEContentType ::= UTF8String + +MIMEEntityContainer ::= SEQUENCE +{ + contentType [1] MIMEContentType, + mIMEEntity [2] MIMEEntity +} + +MIMEEntity ::= CHOICE +{ + encapsulatedMIMEEntity [1] EncapsulatedMIMEEntity, + separatedMIMEHeadersAndBody [2] SeparatedMIMEHeadersAndBody +} + +MIMEEntityHeaders ::= SEQUENCE +{ + headers [1] MIMEHeaders, + removedHeaders [2] SEQUENCE OF RemovedMIMEHeaders OPTIONAL +} + +MIMEHeaderBodyLength ::= INTEGER + +MIMEHeaderFieldName ::= UTF8String + +MIMEHeaderHash ::= OCTET STRING + +MIMEHeaders ::= UTF8String + +RemovedMIMEHeaders ::= SEQUENCE +{ + headerFieldName [1] MIMEHeaderFieldName, + headerBodyLength [2] MIMEHeaderBodyLength, + headerHash [3] MIMEHeaderHash OPTIONAL +} + +SeparatedMIMEHeadersAndBody ::= SEQUENCE +{ + entityHeaders [1] MIMEEntityHeaders, + entityBody [2] MIMEEntityBody OPTIONAL +} + -- ================= -- EES definitions -- ================= -- GitLab From 006d8de7dc39d2427a72f81dd04077afb774af12 Mon Sep 17 00:00:00 2001 From: znaty Date: Sun, 16 Apr 2023 12:36:02 +0000 Subject: [PATCH 02/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 0a824e17..bf7551c8 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4150,25 +4150,6 @@ SeparatedMSRP ::= SEQUENCE -- 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 - -XMLType ::= SEQUENCE -{ - xMLNamespace [1] XMLNamespace, - xMLValue [2] XMLValue -} - -XMLNamespace ::= UTF8String - -XMLValue ::= UTF8String -- ====================== -- MIME Entity Parameters -- GitLab From 6bb0fcfce6ec3985559fda15afac7d68f5a1b683 Mon Sep 17 00:00:00 2001 From: znaty Date: Sun, 16 Apr 2023 12:47:28 +0000 Subject: [PATCH 03/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index bf7551c8..b66edbc4 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -460,7 +460,7 @@ IRIEvent ::= CHOICE sCEFASSessionWithQoSProvision [137] SCEFASSessionWithQoSProvision, sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification, - -- RCS events, see clause 7.13.3 + -- RCS events, see clause 7.13.3 rCSRegistration [5290] RCSRegistration, rCSMessage [5291] RCSMessage, rcsCapabilityDiscovery [5292] RCSCapabilityDiscovery @@ -4028,17 +4028,17 @@ RCDDisplayInfo ::= SEQUENCE -- RCS Definitions -- ================= --- See clause 7.13.3.X for details of this structure +-- See clause 7.13.3.2 for details of this structure RCSRegistration ::= SEQUENCE { rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, - rCSRegistrationType [3] RCSRegistrationType, - rCSRegistrationUpdateRequest [4] IMSPayload, - rCSRegistrationUpdateResponse [5] IMSPayload, - location [6] Location OPTIONAL + rCSRegistrationType [2] RCSRegistrationType, + rCSRegistrationUpdateRequest [3] IMSPayload, + rCSRegistrationUpdateResponse [4] IMSPayload, + location [5] Location OPTIONAL } --- See clause 7.X.2.1.2 for details of this structure +-- See clause 7.13.3.3 for details of this structure RCSMessage ::= SEQUENCE { rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, @@ -4056,14 +4056,14 @@ RCSMessage ::= SEQUENCE messagePayload [13] ReportedMessagePayload } --- See clause 7.X.2.1.4 for details of this structure +-- See clause 7.13.3.5 for details of this structure RCSCapabilityDiscovery ::= SEQUENCE { rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, - sIPMessage [3] IMSPayload, - direction [4] Direction, - sIPMessageType [5] SIPMessageType, - location [6] Location OPTIONAL + sIPMessage [2] IMSPayload, + direction [3] Direction, + sIPMessageType [4] SIPMessageType, + location [5] Location OPTIONAL } -- ============== @@ -4081,7 +4081,6 @@ RCSGroupChatSessionID ::= SIPURI RCSServerURI ::= UTF8String RCSIdentity ::= CHOICE - { fiveGSIdentities [1] FiveGSSubscriberIDs, ePSIdentities [2] EPSSubscriberIDs, -- GitLab From 7fa01f32151c7a354e445f25ff1f714b8d39daa8 Mon Sep 17 00:00:00 2001 From: znaty Date: Sun, 16 Apr 2023 12:58:23 +0000 Subject: [PATCH 04/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 190 +++++++++++++++++----------------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index b66edbc4..7c643dba 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4118,101 +4118,6 @@ SIPMessageType ::= ENUMERATED oPTIONSResponse(5) } -UUID ::= OCTET STRING (SIZE (16)) - --- ========================================================== --- Structures to allow reuse of externally defined structures --- ========================================================== - -EncapsulatedMSRP ::= OCTET STRING - -MSRPContainer ::= CHOICE -{ - encapsulatedMSRP [1] EncapsulatedMSRP, - separatedMSRP [2] SeparatedMSRP -} - -MSRPEndLine ::= UTF8String - -MSRPHeaders ::= UTF8String - -MSRPStartLine ::= UTF8String - -SeparatedMSRP ::= SEQUENCE -{ - startLine [1] MSRPStartLine, - headers [2] MSRPHeaders, - body [3] MIMEEntityContainer OPTIONAL, - endLine [4] MSRPEndLine -} - --- 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. - --- ====================== --- MIME Entity Parameters --- ====================== - -EncapsulatedMIMEEntity ::= OCTET STRING - -MIMEBody ::= UTF8String - -MIMEBodyLength ::= INTEGER - -MIMEEntityBody ::= CHOICE -{ - mIMEEntityContainer [1] MIMEEntityContainer, - communicationsContent [2] MIMEEntityBodyWithCC, - body [3] MIMEBody -} - -MIMEEntityBodyWithCC ::= SEQUENCE -{ - mIMEBodyLength [1] MIMEBodyLength -} - -MIMEContentType ::= UTF8String - -MIMEEntityContainer ::= SEQUENCE -{ - contentType [1] MIMEContentType, - mIMEEntity [2] MIMEEntity -} - -MIMEEntity ::= CHOICE -{ - encapsulatedMIMEEntity [1] EncapsulatedMIMEEntity, - separatedMIMEHeadersAndBody [2] SeparatedMIMEHeadersAndBody -} - -MIMEEntityHeaders ::= SEQUENCE -{ - headers [1] MIMEHeaders, - removedHeaders [2] SEQUENCE OF RemovedMIMEHeaders OPTIONAL -} - -MIMEHeaderBodyLength ::= INTEGER - -MIMEHeaderFieldName ::= UTF8String - -MIMEHeaderHash ::= OCTET STRING - -MIMEHeaders ::= UTF8String - -RemovedMIMEHeaders ::= SEQUENCE -{ - headerFieldName [1] MIMEHeaderFieldName, - headerBodyLength [2] MIMEHeaderBodyLength, - headerHash [3] MIMEHeaderHash OPTIONAL -} - -SeparatedMIMEHeadersAndBody ::= SEQUENCE -{ - entityHeaders [1] MIMEEntityHeaders, - entityBody [2] MIMEEntityBody OPTIONAL -} - -- ================= -- EES definitions -- ================= @@ -5738,6 +5643,8 @@ UserIdentifiers ::= SEQUENCE ePSSubscriberIDs [2] EPSSubscriberIDs OPTIONAL } +UUID ::= OCTET STRING (SIZE (16)) + XMLType ::= SEQUENCE { xMLNamespace [1] XMLNamespace, @@ -6664,4 +6571,97 @@ SIPCellularNetworkInformation ::= SEQUENCE servingPLMN [2] PLMNID OPTIONAL } +-- ========================================================== +-- Structures to allow reuse of externally defined structures +-- ========================================================== + +EncapsulatedMSRP ::= OCTET STRING + +MSRPContainer ::= CHOICE +{ + encapsulatedMSRP [1] EncapsulatedMSRP, + separatedMSRP [2] SeparatedMSRP +} + +MSRPEndLine ::= UTF8String + +MSRPHeaders ::= UTF8String + +MSRPStartLine ::= UTF8String + +SeparatedMSRP ::= SEQUENCE +{ + startLine [1] MSRPStartLine, + headers [2] MSRPHeaders, + body [3] MIMEEntityContainer OPTIONAL, + endLine [4] MSRPEndLine +} + +-- 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. + +-- ====================== +-- MIME Entity Parameters +-- ====================== + +EncapsulatedMIMEEntity ::= OCTET STRING + +MIMEBody ::= UTF8String + +MIMEBodyLength ::= INTEGER + +MIMEEntityBody ::= CHOICE +{ + mIMEEntityContainer [1] MIMEEntityContainer, + communicationsContent [2] MIMEEntityBodyWithCC, + body [3] MIMEBody +} + +MIMEEntityBodyWithCC ::= SEQUENCE +{ + mIMEBodyLength [1] MIMEBodyLength +} + +MIMEContentType ::= UTF8String + +MIMEEntityContainer ::= SEQUENCE +{ + contentType [1] MIMEContentType, + mIMEEntity [2] MIMEEntity +} + +MIMEEntity ::= CHOICE +{ + encapsulatedMIMEEntity [1] EncapsulatedMIMEEntity, + separatedMIMEHeadersAndBody [2] SeparatedMIMEHeadersAndBody +} + +MIMEEntityHeaders ::= SEQUENCE +{ + headers [1] MIMEHeaders, + removedHeaders [2] SEQUENCE OF RemovedMIMEHeaders OPTIONAL +} + +MIMEHeaderBodyLength ::= INTEGER + +MIMEHeaderFieldName ::= UTF8String + +MIMEHeaderHash ::= OCTET STRING + +MIMEHeaders ::= UTF8String + +RemovedMIMEHeaders ::= SEQUENCE +{ + headerFieldName [1] MIMEHeaderFieldName, + headerBodyLength [2] MIMEHeaderBodyLength, + headerHash [3] MIMEHeaderHash OPTIONAL +} + +SeparatedMIMEHeadersAndBody ::= SEQUENCE +{ + entityHeaders [1] MIMEEntityHeaders, + entityBody [2] MIMEEntityBody OPTIONAL +} + END -- GitLab From ae8d5fb144e1ce3b916c28daea83d79dc870b58f Mon Sep 17 00:00:00 2001 From: znaty Date: Sun, 16 Apr 2023 13:31:54 +0000 Subject: [PATCH 05/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 7c643dba..b0390bbf 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4059,11 +4059,12 @@ RCSMessage ::= SEQUENCE -- See clause 7.13.3.5 for details of this structure RCSCapabilityDiscovery ::= SEQUENCE { - rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, - sIPMessage [2] IMSPayload, - direction [3] Direction, - sIPMessageType [4] SIPMessageType, - location [5] Location OPTIONAL + rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + rCSTargetContactIdentities [2] SEQUENCE SIZE (1..MAX) OF RCSIdentity OPTIONAL, + sIPMessage [3] IMSPayload, + direction [4] Direction, + sIPMessageType [5] SIPMessageType, + location [6] Location OPTIONAL } -- ============== -- GitLab From 05013549d13edca176a71d659365fea6a326c11f Mon Sep 17 00:00:00 2001 From: znaty Date: Sun, 16 Apr 2023 13:50:49 +0000 Subject: [PATCH 06/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index b0390bbf..ed788c3d 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -233,9 +233,9 @@ XIRIEvent ::= CHOICE sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification, -- RCS events, see clause 7.13.3 - rCSRegistration [5290] RCSRegistration, - rCSMessage [5291] RCSMessage, - rcsCapabilityDiscovery [5292] RCSCapabilityDiscovery + rCSRegistration [139] RCSRegistration, + rCSMessage [140] RCSMessage, + rcsCapabilityDiscovery [141] RCSCapabilityDiscovery } -- ============== @@ -461,9 +461,9 @@ IRIEvent ::= CHOICE sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification, -- RCS events, see clause 7.13.3 - rCSRegistration [5290] RCSRegistration, - rCSMessage [5291] RCSMessage, - rcsCapabilityDiscovery [5292] RCSCapabilityDiscovery + rCSRegistration [139] RCSRegistration, + rCSMessage [140] RCSMessage, + rcsCapabilityDiscovery [141] RCSCapabilityDiscovery } IRITargetIdentifier ::= SEQUENCE -- GitLab From 17ceeb9c029f8dd9aa7b7299555209eca9b7eb68 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 17 Apr 2023 13:32:21 +0000 Subject: [PATCH 07/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 229 ++++++++++++++++++++-------------- 1 file changed, 135 insertions(+), 94 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index ed788c3d..d0e55721 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4042,18 +4042,17 @@ RCSRegistration ::= SEQUENCE RCSMessage ::= SEQUENCE { rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, - rCSServerURI [2] RCSServerURI, - groupChatSessionID [3] RCSGroupChatSessionID OPTIONAL, - originatingIdentity [4] SEQUENCE SIZE (1..MAX) OF RCSIdentity, - destinationIdentities [5] RCSDestinations, - direction [6] Direction, - messageType [7] RCSMessageType, - conversationID [8] UUID, - contributionID [9] UUID, - inReplyToContributionID [10] UUID OPTIONAL, + 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 [10] RCSContributionID OPTIONAL, messageID [11] IMDNMessageID OPTIONAL, location [12] Location OPTIONAL, - messagePayload [13] ReportedMessagePayload + messagePayload [13] EncapsulatedInformation } -- See clause 7.13.3.5 for details of this structure @@ -4073,6 +4072,12 @@ RCSCapabilityDiscovery ::= SEQUENCE IMDNMessageID ::= UTF8String +RCSConversationID ::= UUID + +RCSContributionID ::= UUID + +IMDNMessageID ::= UTF8String + RCSDestinations ::= SEQUENCE SIZE (1..MAX) OF RCSDestination RCSDestination ::= SEQUENCE SIZE (1..MAX) OF RCSIdentity @@ -4092,20 +4097,14 @@ RCSMessageType ::= ENUMERATED { messageWithUserContent(1), fileTransferMessage(2), - geoLocationPushMessage(3), + geoLocationPUSHMessage(3), iMDNNotification(4) } -ReportedMessagePayload ::= CHOICE -{ - mIMEEntityContainer [1] MIMEEntityContainer, - mSRPContainer [2] MSRPContainer -} - RCSRegistrationType ::= ENUMERATED { registration(1), - reregistration(2), + reRegistration(2), uEDeregistration(3), networkDeregistration(4) } @@ -5495,19 +5494,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 @@ -5646,17 +5632,6 @@ UserIdentifiers ::= SEQUENCE UUID ::= OCTET STRING (SIZE (16)) -XMLType ::= SEQUENCE -{ - xMLNamespace [1] XMLNamespace, - xMLValue [2] XMLValue -} - -XMLNamespace ::= UTF8String - -XMLValue ::= UTF8String - - -- =================== -- Location parameters -- =================== @@ -6572,97 +6547,163 @@ SIPCellularNetworkInformation ::= SEQUENCE servingPLMN [2] PLMNID OPTIONAL } --- ========================================================== --- Structures to allow reuse of externally defined structures --- ========================================================== - -EncapsulatedMSRP ::= OCTET STRING +-- ================================================== +-- Structures to allow reuse of encapsulated payloads +-- ================================================== -MSRPContainer ::= CHOICE +EncapsulatedInformation ::= CHOICE { - encapsulatedMSRP [1] EncapsulatedMSRP, - separatedMSRP [2] SeparatedMSRP + fullPayload [1] EncapsulatedPayload, + modifiedPayload [2] ModifiedPayload } -MSRPEndLine ::= UTF8String +EncapsulatedPayload ::= CHOICE +{ + sBI [1] SBIType, + xML [2] XMLType, + mIME [3] MIMEEntity, + mSRP [4] MSRPMessage, + sIP [5] SIPMessage +} -MSRPHeaders ::= UTF8String +ModifiedPayload ::= SEQUENCE +{ + modifiedPayload [1] EncapsulatedPayload, + modifications [2] SEQUENCE OF PayloadModification +} -MSRPStartLine ::= UTF8String +PayloadModification ::= SEQUENCE +{ + modificationLocation [1] ModificationLocation, + modificationType [2] ModificationType +} -SeparatedMSRP ::= SEQUENCE +ModificationLocation ::= CHOICE { - startLine [1] MSRPStartLine, - headers [2] MSRPHeaders, - body [3] MIMEEntityContainer OPTIONAL, - endLine [4] MSRPEndLine + 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 } --- 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. +ABNFRuleLocation ::= UTF8String --- ====================== --- MIME Entity Parameters --- ====================== +SMSTPIEI ::= CHOICE +{ + sMSTPPDU [1] NULL, + sMSTPDUField [2] UTF8String, + sMSTPDUFieldIEI [3] OCTET STRING +} -EncapsulatedMIMEEntity ::= OCTET STRING +SMSRPIEI ::= CHOICE +{ + sMSRPPDU [1] NULL, + sMSRPDUField [2] UTF8String +} -MIMEBody ::= UTF8String +ModificationType ::= CHOICE +{ + nestedModifications [1] SEQUENCE OF PayloadModification, + removed [2] PayloadInformationRemoved, + replacedWithCharacters [3] PayloadInformationReplacedWithCharacters, + replacedWithOctets [4] OCTET STRING, + replacedWithBits [5] BIT STRING +} -MIMEBodyLength ::= INTEGER +PayloadInformationRemoved ::= CHOICE +{ + charactersRemoved [1] INTEGER, + octetsRemoved [2] INTEGER, + bitsRemoved [3] INTEGER +} -MIMEEntityBody ::= CHOICE +PayloadInformationReplacedWithCharacters ::= SEQUENCE { - mIMEEntityContainer [1] MIMEEntityContainer, - communicationsContent [2] MIMEEntityBodyWithCC, - body [3] MIMEBody + characters [1] UTF8String } -MIMEEntityBodyWithCC ::= SEQUENCE +IndexRange ::= SEQUENCE { - mIMEBodyLength [1] MIMEBodyLength + start [1] INTEGER, + end [2] INTEGER } -MIMEContentType ::= UTF8String +-- =============================================== +-- Externally Defined Structures - MSRP Parameters +-- =============================================== -MIMEEntityContainer ::= SEQUENCE +EncapsulatedMSRP ::= UTF8String + +MSRPMessage ::= SEQUENCE { - contentType [1] MIMEContentType, - mIMEEntity [2] MIMEEntity + encapsulatedMSRP [1] EncapsulatedMSRP } -MIMEEntity ::= CHOICE +-- ================================================== +-- 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 { - encapsulatedMIMEEntity [1] EncapsulatedMIMEEntity, - separatedMIMEHeadersAndBody [2] SeparatedMIMEHeadersAndBody + sBIReference [1] SBIReference, + sBIValue [2] SBIValue } -MIMEEntityHeaders ::= SEQUENCE +SBIReference ::= UTF8String + +SBIValue ::= UTF8String + +-- ================================================== +-- Externally Defined Structures - XMLType Parameters +-- ================================================== + +XMLType ::= SEQUENCE { - headers [1] MIMEHeaders, - removedHeaders [2] SEQUENCE OF RemovedMIMEHeaders OPTIONAL + xMLNamespace [1] XMLNamespace, + xMLValue [2] XMLValue, + xPath [3] XPath OPTIONAL } -MIMEHeaderBodyLength ::= INTEGER +XMLNamespace ::= UTF8String + +XPath ::= UTF8String + +XMLValue ::= UTF8String -MIMEHeaderFieldName ::= UTF8String +-- ====================================================== +-- Externally Defined Structures - MIME Entity Parameters +-- ====================================================== -MIMEHeaderHash ::= OCTET STRING +EncapsulatedMIMEEntity ::= UTF8String -MIMEHeaders ::= UTF8String +MIMEContentType ::= UTF8String + +MIMEEntity ::= SEQUENCE +{ + contentType [1] MIMEContentType, + encapsulatedMIMEEntity [2] EncapsulatedMIMEEntity +} -RemovedMIMEHeaders ::= SEQUENCE +MIMEPartIdentifier ::= CHOICE { - headerFieldName [1] MIMEHeaderFieldName, - headerBodyLength [2] MIMEHeaderBodyLength, - headerHash [3] MIMEHeaderHash OPTIONAL + index [1] INTEGER } -SeparatedMIMEHeadersAndBody ::= SEQUENCE +MIMEBody ::= CHOICE { - entityHeaders [1] MIMEEntityHeaders, - entityBody [2] MIMEEntityBody OPTIONAL + fullBody [1] NULL, + bodyPart [2] MIMEPartIdentifier } END -- GitLab From 516ef314c8b750c2cd6dac38c9e8387639b9a281 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 17 Apr 2023 13:33:37 +0000 Subject: [PATCH 08/35] 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 d0e55721..593c6229 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4076,8 +4076,6 @@ RCSConversationID ::= UUID RCSContributionID ::= UUID -IMDNMessageID ::= UTF8String - RCSDestinations ::= SEQUENCE SIZE (1..MAX) OF RCSDestination RCSDestination ::= SEQUENCE SIZE (1..MAX) OF RCSIdentity -- GitLab From 92f2090b0fbcc398ec30165680ab013e0afe60f4 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 17 Apr 2023 13:35:30 +0000 Subject: [PATCH 09/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 593c6229..d65748e4 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4049,10 +4049,10 @@ RCSMessage ::= SEQUENCE messageType [6] RCSMessageType, conversationID [7] RCSConversationID, contributionID [8] RCSContributionID, - inReplyToContributionID [10] RCSContributionID OPTIONAL, - messageID [11] IMDNMessageID OPTIONAL, - location [12] Location OPTIONAL, - messagePayload [13] EncapsulatedInformation + inReplyToContributionID [9] RCSContributionID OPTIONAL, + messageID [10] IMDNMessageID OPTIONAL, + location [11] Location OPTIONAL, + messagePayload [12] EncapsulatedInformation } -- See clause 7.13.3.5 for details of this structure -- GitLab From 75a9a1104e9f0838e0440f655bad83daab439d4d Mon Sep 17 00:00:00 2001 From: grahamj Date: Wed, 26 Apr 2023 13:15:11 +0000 Subject: [PATCH 10/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index d65748e4..542c17df 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4062,8 +4062,7 @@ RCSCapabilityDiscovery ::= SEQUENCE rCSTargetContactIdentities [2] SEQUENCE SIZE (1..MAX) OF RCSIdentity OPTIONAL, sIPMessage [3] IMSPayload, direction [4] Direction, - sIPMessageType [5] SIPMessageType, - location [6] Location OPTIONAL + location [5] Location OPTIONAL } -- ============== @@ -4107,15 +4106,6 @@ RCSRegistrationType ::= ENUMERATED networkDeregistration(4) } -SIPMessageType ::= ENUMERATED -{ - oPTIONS(1), - sUBSCRIBE(2), - nOTIFY(3), - pUBLISH(4), - oPTIONSResponse(5) -} - -- ================= -- EES definitions -- ================= -- GitLab From 10cc6b2c2b22a1c2be268465278abe9f0869b004 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 27 Apr 2023 13:39:52 +0000 Subject: [PATCH 11/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 78 ++--------------------------------- 1 file changed, 4 insertions(+), 74 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 542c17df..bfac7d45 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4052,7 +4052,7 @@ RCSMessage ::= SEQUENCE inReplyToContributionID [9] RCSContributionID OPTIONAL, messageID [10] IMDNMessageID OPTIONAL, location [11] Location OPTIONAL, - messagePayload [12] EncapsulatedInformation + messagePayload [12] RCSPayload } -- See clause 7.13.3.5 for details of this structure @@ -6539,13 +6539,12 @@ SIPCellularNetworkInformation ::= SEQUENCE -- Structures to allow reuse of encapsulated payloads -- ================================================== -EncapsulatedInformation ::= CHOICE +RCSPayload ::= CHOICE { - fullPayload [1] EncapsulatedPayload, - modifiedPayload [2] ModifiedPayload + fullPayload [1] EncapsulatedRCS } -EncapsulatedPayload ::= CHOICE +EncapsulatedRCSPayload ::= CHOICE { sBI [1] SBIType, xML [2] XMLType, @@ -6554,75 +6553,6 @@ EncapsulatedPayload ::= CHOICE 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 93f7d83dc98bbf2fb5897f89675c8791d0128276 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 27 Apr 2023 13:47:32 +0000 Subject: [PATCH 12/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index bfac7d45..562e4bda 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -6541,16 +6541,14 @@ SIPCellularNetworkInformation ::= SEQUENCE RCSPayload ::= CHOICE { - fullPayload [1] EncapsulatedRCS + fullPayload [1] EncapsulatedRCSPayload } EncapsulatedRCSPayload ::= CHOICE { - sBI [1] SBIType, - xML [2] XMLType, - mIME [3] MIMEEntity, - mSRP [4] MSRPMessage, - sIP [5] SIPMessage + mIME [1] MIMEEntity, + mSRP [2] MSRPMessage, + sIP [3] SIPMessage } -- =============================================== -- GitLab From 30dc4dd92adb4304c45ae5483c92b64909e45104 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 27 Apr 2023 19:32:13 +0000 Subject: [PATCH 13/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 562e4bda..f95c51c1 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -6587,14 +6587,11 @@ SBIValue ::= UTF8String XMLType ::= SEQUENCE { xMLNamespace [1] XMLNamespace, - xMLValue [2] XMLValue, - xPath [3] XPath OPTIONAL + xMLValue [2] XMLValue } XMLNamespace ::= UTF8String -XPath ::= UTF8String - XMLValue ::= UTF8String -- ====================================================== -- GitLab From 6430fa36736c2027264c0f5dc6d1735f9ea370e4 Mon Sep 17 00:00:00 2001 From: naslundma Date: Wed, 3 May 2023 11:32:37 +0000 Subject: [PATCH 14/35] TS 33.128 CR0525 - Correction of ASN.1 for TLS AKMA IRI Rel-18 --- 33128/r18/TS33128Payloads.asn | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 07996815..54826ef2 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1161,7 +1161,7 @@ GenericUAStarParams ::= SEQUENCE } -- =========================================== --- Specific UaStarParmas for TLS 1.2 (RFC5246) +-- Specific UaStarParams for TLS 1.2 (RFC5246) -- =========================================== TLSCipherType ::= ENUMERATED @@ -1186,8 +1186,8 @@ TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255) TLS12UAStarParams ::= SEQUENCE { - preMasterSecret [1] OCTET STRING (SIZE(6)) OPTIONAL, - masterSecret [2] OCTET STRING (SIZE(6)), + preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, + masterSecret [2] OCTET STRING (SIZE(48)), pRFAlgorithm [3] TLSPRFAlgorithm, cipherSuite [4] TLSCipherSuite, cipherType [5] TLSCipherType, @@ -1198,12 +1198,13 @@ TLS12UAStarParams ::= SEQUENCE macLength [10] INTEGER (0..255), macKeyLength [11] INTEGER (0..255), compressionAlgorithm [12] TLSCompressionAlgorithm, - clientRandom [13] OCTET STRING (SIZE(4)), - serverRandom [14] OCTET STRING (SIZE(4)), + clientRandom [13] OCTET STRING (SIZE(32)), + serverRandom [14] OCTET STRING (SIZE(32)), clientSequenceNumber [15] INTEGER, serverSequenceNumber [16] INTEGER, sessionID [17] OCTET STRING (SIZE(0..32)), - tLSExtensions [18] OCTET STRING (SIZE(0..65535)) + tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), + tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL } KAF ::= OCTET STRING -- GitLab From f9857a9cefe9bafdfea6e799cf5ec52a9cee05a1 Mon Sep 17 00:00:00 2001 From: naslundma Date: Wed, 3 May 2023 11:35:29 +0000 Subject: [PATCH 15/35] TS 33.128 CR0524 - Correction of ASN.1 for TLS AKMA IRI Rel-17 --- 33128/r17/TS33128Payloads.asn | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index d66928c8..b4925b0e 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1020,7 +1020,7 @@ GenericUAStarParams ::= SEQUENCE } -- =========================================== --- Specific UaStarParmas for TLS 1.2 (RFC5246) +-- Specific UaStarParams for TLS 1.2 (RFC5246) -- =========================================== TLSCipherType ::= ENUMERATED @@ -1045,8 +1045,8 @@ TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255) TLS12UAStarParams ::= SEQUENCE { - preMasterSecret [1] OCTET STRING (SIZE(6)) OPTIONAL, - masterSecret [2] OCTET STRING (SIZE(6)), + preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, + masterSecret [2] OCTET STRING (SIZE(48)), pRFAlgorithm [3] TLSPRFAlgorithm, cipherSuite [4] TLSCipherSuite, cipherType [5] TLSCipherType, @@ -1057,12 +1057,13 @@ TLS12UAStarParams ::= SEQUENCE macLength [10] INTEGER (0..255), macKeyLength [11] INTEGER (0..255), compressionAlgorithm [12] TLSCompressionAlgorithm, - clientRandom [13] OCTET STRING (SIZE(4)), - serverRandom [14] OCTET STRING (SIZE(4)), + clientRandom [13] OCTET STRING (SIZE(32)), + serverRandom [14] OCTET STRING (SIZE(32)), clientSequenceNumber [15] INTEGER, serverSequenceNumber [16] INTEGER, sessionID [17] OCTET STRING (SIZE(0..32)), - tLSExtensions [18] OCTET STRING (SIZE(0..65535)) + tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), + tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL } KAF ::= OCTET STRING -- GitLab From ea68daff4581b9d4006af3b5416b9e835c1e1632 Mon Sep 17 00:00:00 2001 From: grahamj Date: Wed, 3 May 2023 12:16:16 +0000 Subject: [PATCH 16/35] TS33.128 CR 0533 - Deletion of duplicate reference --- 33128/r18/TS33128Payloads.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 54826ef2..984a0e8d 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5960,7 +5960,7 @@ FourGLocationInfo ::= CHOICE ePSUserLocationInformation [2] EPSUserLocationInformation } --- TS 29.272 [108], clause 7.3.111 +-- TS 29.272 [106], clause 7.3.111 EPSLocationInformation ::= SEQUENCE { mMELocationInformation [1] MMELocationInformation OPTIONAL, @@ -5970,7 +5970,7 @@ EPSLocationInformation ::= SEQUENCE -- TS 29.274 [87], clause 8.21 EPSUserLocationInformation ::= OCTET STRING --- TS 29.272 [108], clause 7.3.115 +-- TS 29.272 [106], clause 7.3.115 MMELocationInformation ::= SEQUENCE { eCGI [1] ECGI OPTIONAL, @@ -5992,7 +5992,7 @@ UserCSGInformation ::= SEQUENCE cSGMembershipIndication [3] CSGMembershipIndication } --- TS 29.272 [108], clause 7.3.79 +-- TS 29.272 [106], clause 7.3.79 CSGID ::= INTEGER -- TS 32.299 [Re2], clause 7.2.46A @@ -6009,7 +6009,7 @@ CSGMembershipIndication ::= ENUMERATED cSGMember(2) } --- TS 29.272 [108], clause 7.3.116 +-- TS 29.272 [106], clause 7.3.116 SGSNLocationInformation ::= SEQUENCE { cGI [1] CGI OPTIONAL, -- GitLab From 7e39729f6d7c34a22d025aedf31fc8d434bfe3a0 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 18 Apr 2023 17:12:54 +0000 Subject: [PATCH 17/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 984a0e8d..058c4000 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4821,7 +4821,8 @@ SeparatedLocationReporting ::= SEQUENCE gUTI [5] FiveGGUTI OPTIONAL, location [6] Location, non3GPPAccessEndpoint [7] UEEndpointAddress OPTIONAL, - rATType [8] RATType OPTIONAL + rATType [8] RATType OPTIONAL, + ePSIdentities [9] EPSSubscriberIDs OPTIONAL } -- ======================= -- GitLab From a5a215550a7e888fe742b4f6bdabd1b6788bc495 Mon Sep 17 00:00:00 2001 From: grahamj Date: Wed, 3 May 2023 12:20:58 +0000 Subject: [PATCH 18/35] 33.128 CR 0536 - Solution to allow the reporting of encapsulated information --- 33128/r18/TS33128Payloads.asn | 97 ++++++++++++++++++++++++++--------- 1 file changed, 73 insertions(+), 24 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 058c4000..15cd8aa8 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,77 @@ SIPCellularNetworkInformation ::= SEQUENCE servingPLMN [2] PLMNID OPTIONAL } +-- ================================================== +-- Structures to allow reuse of encapsulated payloads +-- ================================================== + + +-- =============================================== +-- 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 +} + +XMLNamespace ::= 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 1c9a22bc59fa7e1f78ff2e51cd28426e15775dd7 Mon Sep 17 00:00:00 2001 From: DODDSTH Date: Wed, 3 May 2023 12:23:26 +0000 Subject: [PATCH 19/35] TS 33.128 CR0531 - Location Usage Specifics --- 33128/r18/TS33128Payloads.asn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 15cd8aa8..19515e70 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5961,7 +5961,7 @@ MMELocationInformation ::= SEQUENCE additionalCellIDs [9] SEQUENCE OF CellInformation OPTIONAL } --- TS 32.299 [Re2], clause 7.3.240A +-- TS 32.299 [Re1], clause 7.3.240A UserCSGInformation ::= SEQUENCE { cSGID [1] CSGID, @@ -5972,14 +5972,14 @@ UserCSGInformation ::= SEQUENCE -- TS 29.272 [106], clause 7.3.79 CSGID ::= INTEGER --- TS 32.299 [Re2], clause 7.2.46A +-- TS 32.299 [Re1], clause 7.2.46A CSGAccessMode ::= ENUMERATED { closedMode(1), hybridMode(2) } --- TS 32.299 [Re2], clause 7.2.46B +-- TS 32.299 [Re1], clause 7.2.46B CSGMembershipIndication ::= ENUMERATED { notCSGMember(1), -- GitLab From 410d8f935f0c8286838781fdb0f5b5c14ee79991 Mon Sep 17 00:00:00 2001 From: turkovic Date: Wed, 3 May 2023 12:25:37 +0000 Subject: [PATCH 20/35] TS 33.128 CR0501 - Location acquisition interfaces for the EPC and alignment of the 5G and the EPC procedure --- .../urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 4 ++++ 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index d6856f5f..14081eed 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -159,6 +159,10 @@ + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 4e9dd41e..b1781580 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -2,11 +2,13 @@ + @@ -49,6 +51,7 @@ + @@ -58,6 +61,12 @@ + + + + + + @@ -67,5 +76,14 @@ + + + + + + + + + -- GitLab From e05cd954c0e0145dab9d5dbccda04b50827b4423 Mon Sep 17 00:00:00 2001 From: hawbaker Date: Wed, 3 May 2023 12:43:45 +0000 Subject: [PATCH 21/35] TS 33.128 CR0530 - Addition of LI for Trace at the AMF Stage 3 --- 33128/r18/TS33128Payloads.asn | 111 +++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 19515e70..3a58f495 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -230,7 +230,10 @@ XIRIEvent ::= CHOICE -- SCEF events, see clause 7.8.6.1 sCEFASSessionWithQoSProvision [137] SCEFASSessionWithQoSProvision, - sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification + sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification, + + -- AMF events, see 6.2.2.3, continued from tag 132 + aMFRANTraceReport [139] AMFRANTraceReport } -- ============== @@ -453,7 +456,10 @@ IRIEvent ::= CHOICE -- SCEF events, see clause 7.8.6.2 sCEFASSessionWithQoSProvision [137] SCEFASSessionWithQoSProvision, - sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification + sCEFASSessionWithQoSNotification [138] SCEFASSessionWithQoSNotification, + + -- AMF events, see 6.2.2.3, continued from tag 132 + aMFRANTraceReport [139] AMFRANTraceReport } IRITargetIdentifier ::= SEQUENCE @@ -1433,6 +1439,22 @@ AMFUEConfigurationUpdate ::= SEQUENCE sMSOverNASIndicator [8] SMSOverNASIndicator OPTIONAL } +-- See clause 6.2.2.2.10.2 for details of this structure +AMFRANTraceReport ::= SEQUENCE +{ + userIdentifiers [1] UserIdentifiers, + aMFUENGAPID [2] AMFUENGAPID, + rANUENGAPID [3] RANUENGAPID, + traceRecordType [4] TraceRecordType, + traceDirection [5] TraceDirection, + traceActivationInfo [6] TraceActivationInfo OPTIONAL, + nGRANCGI [7] NCGI, + globalRANNodeID [8] GlobalRANNodeID, + traceCollectionEntityInfo [9] TraceCollectionEntityInfo OPTIONAL, + aMFTraceData [10] XMLType, + location [11] Location OPTIONAL +} + -- ================= -- 5G AMF parameters -- ================= @@ -1489,9 +1511,94 @@ AMFSetID ::= INTEGER (0..1023) AMFUENGAPID ::= INTEGER (0..1099511627775) +AreaScopeOfMDT ::= CHOICE +{ + cellBased [1] SEQUENCE (SIZE(1..MAX)) OF CellID, + tABased [2] SEQUENCE (SIZE(1..MAX)) OF TAC, + pLMNWide [3] PLMNID, + tAIBased [4] SEQUENCE (SIZE(1..MAX)) OF TAI +} + +MDTActivation ::= ENUMERATED +{ + immediateMDTOnly(1), + loggedMDTOnly(2), + immediateMDTandTrace(3) +} + +MDTConfiguration ::= ENUMERATED +{ + mDTConfigurationNR(1), + mDTConfigurationEUTRA(2) +} + +MDTConfigurationEUTRA ::= SEQUENCE +{ + mDTActivation [1] MDTActivation, + areaScopeofMDT [2] AreaScopeOfMDT, + mDTMode [3] MDTMode, + signallingBasedMDTPLMNList [4] PLMNList +} + +MDTConfigurationNR ::= SEQUENCE +{ + mDTActivation [1] MDTActivation, + areaScopeofMDT [2] AreaScopeOfMDT, + mDTModeNR [3] MDTMode, + signallingBasedMDTPLMNList [4] PLMNList +} + +-- TS 38.413 [23], clause 9.3.1.169 +MDTMode ::= CHOICE +{ + immediateMDT [1] OCTET STRING, + loggedMDT [2] OCTET STRING +} + -- TS 24.501 [13], clause 9.11.3.49 ServiceAreaList ::= OCTET STRING (SIZE(4..112)) +TraceActivationInfo ::= SEQUENCE +{ + nGRANTraceID [1] OCTET STRING (SIZE(8)), + interfacestoTrace [2] BIT STRING (SIZE(8)), + traceDepth [3] TraceDepth, + traceCollectionEntityIPAddress [4] IPAddress, + mDTConfiguration [5] MDTConfiguration OPTIONAL +} + +TraceCollectionEntityInfo ::= SEQUENCE +{ + traceCollectionEntityIPAddress [1] BIT STRING (SIZE(1..160, ...)), + traceCollectionEntityURI [2] UTF8String +} + + +-- TS 32.422 [XX], clause 5.3 +TraceDepth ::= ENUMERATED +{ + minimum(1), + medium(2), + maximum(3), + minimumWithoutVendorSpecificExtension(4), + mediumWithoutVendorSpecificExtension(5), + maximumWithoutVendorSpecificExtension(6) +} + +TraceDirection ::= ENUMERATED +{ + toAMF(1), + fromAMF(2) +} + +TraceRecordType ::= ENUMERATED +{ + traceStart(1), + cellTrafficTrace(2), + traceDataDelivery(3), + traceDeactivation(4) +} + NASTransportInitialInformation ::= SEQUENCE { rANUENGAPID [1] RANUENGAPID, -- GitLab From 5321117c8397cec61a09f9661f52da7c8eccc8ab Mon Sep 17 00:00:00 2001 From: znaty Date: Wed, 3 May 2023 12:46:29 +0000 Subject: [PATCH 22/35] TS 33.128 CR0526 - Update of LI notification message --- 33128/r18/TS33128Payloads.asn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 3a58f495..70b584c6 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4857,7 +4857,9 @@ LINotification ::= SEQUENCE appliedTargetID [2] TargetIdentifier OPTIONAL, appliedDeliveryInformation [3] SEQUENCE OF LIAppliedDeliveryInformation OPTIONAL, appliedStartTime [4] Timestamp OPTIONAL, - appliedEndTime [5] Timestamp OPTIONAL + appliedEndTime [5] Timestamp OPTIONAL, + appliedTargetIsLocal [6] BOOLEAN OPTIONAL, + appliedTargetIsNonLocal [7] BOOLEAN OPTIONAL } -- ========================== -- GitLab From f780dd27ae78859125f8dc2f3e0620ca70215d32 Mon Sep 17 00:00:00 2001 From: lovieno Date: Wed, 3 May 2023 12:48:41 +0000 Subject: [PATCH 23/35] TS 33.108 CR 0430 Corrections on ASN.1 import statements --- 33108/r17/CONF-HI3-IMS.asn | 18 +++++++++--------- 33108/r17/CSvoice-HI3-IP.asn | 26 +++++++++++++------------- 33108/r17/Eps-HI3-PS.asn | 12 ++++++------ 33108/r17/GCSE-HI3.asn | 18 +++++++++--------- 33108/r17/VoIP-HI3-IMS.asn | 20 ++++++++++---------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/33108/r17/CONF-HI3-IMS.asn b/33108/r17/CONF-HI3-IMS.asn index ce3fe837..9ecb740b 100644 --- a/33108/r17/CONF-HI3-IMS.asn +++ b/33108/r17/CONF-HI3-IMS.asn @@ -1,4 +1,4 @@ -CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11) r13 (13) version-0 (0)} +CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11) r17 (17) version-0 (0)} DEFINITIONS IMPLICIT TAGS ::= @@ -9,7 +9,7 @@ BEGIN IMPORTS LawfulInterceptionIdentifier, - + TimeStamp FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}-- from ETSI HI2Operations TS 101 671, version 3.12.1 @@ -17,15 +17,15 @@ TimeStamp ConfCorrelation, ConfPartyInformation - + FROM CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) - threeGPP(4) hi2conf(10) r13 (13) version-0 (0)} + threeGPP(4) hi2conf(10) r16 (16) version-0 (0)} -- Imported from Conf HI2 Operations part of this standard National-HI3-ASN1parameters FROM Eps-HI3-PS - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r12(12) version-55 (55)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r17(17) version-0 (0)}; -- Imported form EPS HI3 part of this standard -- Object Identifier Definitions @@ -36,7 +36,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi3confDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3conf(11) r13 (13) version-0 (0)} +hi3confDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3conf(11) r17 (17) version-0 (0)} Conf-CC-PDU ::= SEQUENCE { @@ -57,7 +57,7 @@ ConfLIC-header ::= SEQUENCE mediaID [9] MediaID OPTIONAL, -- Identifies the media being exchanged by parties on the conference. ... - + } MediaID ::= SEQUENCE @@ -66,7 +66,7 @@ MediaID ::= SEQUENCE -- describing Conf Server Side characteristics. streamID [2] OCTET STRING OPTIONAL, -- include streamID from SDP information. - + ... } @@ -87,4 +87,4 @@ TPDU-direction ::= ENUMERATED } -END \ No newline at end of file +END diff --git a/33108/r17/CSvoice-HI3-IP.asn b/33108/r17/CSvoice-HI3-IP.asn index 21c29856..09aa42f7 100644 --- a/33108/r17/CSvoice-HI3-IP.asn +++ b/33108/r17/CSvoice-HI3-IP.asn @@ -1,4 +1,4 @@ -CSvoice-HI3-IP {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18) r14 (14) version-0 (0)} +CSvoice-HI3-IP {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18) r17 (17) version-0 (0)} DEFINITIONS IMPLICIT TAGS ::= @@ -6,7 +6,7 @@ BEGIN IMPORTS - + -- from ETSI HI2Operations TS 101 671, version 3.12.1 CC-Link-Identifier, CommunicationIdentifier, @@ -15,14 +15,14 @@ IMPORTS FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - -- from 3GPPEps-HI3-PS TS 33.108 + -- from 3GPPEps-HI3-PS TS 33.108 National-HI3-ASN1parameters - FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r14 (14) version-0 (0)} - + FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r17 (17) version-0 (0)} + -- from VoIP-HI3-IMS TS 33.108 Payload-description, TPDU-direction - FROM VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r14(14) version-0(0)}; + FROM VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r17(17) version-0(0)}; -- Object Identifier Definitions @@ -32,7 +32,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi3CSvoiceDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3CSvoice(18) r14(14) version-0 (0)} +hi3CSvoiceDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3CSvoice(18) r17(17) version-0 (0)} CSvoice-CC-PDU ::= SEQUENCE { @@ -45,11 +45,11 @@ CSvoiceLIC-header ::= SEQUENCE { hi3CSvoiceDomainId [0] OBJECT IDENTIFIER, -- 3GPP IP-based delivery for CS HI3 Domain lIID [1] LawfulInterceptionIdentifier OPTIONAL, - communicationIdentifier [2] CommunicationIdentifier, - -- contents same as the contents of similar field sent in the linked IRI messages - ccLID [3] CC-Link-Identifier OPTIONAL, - -- Included only if the linked IRI messages have the similar field. When included, - -- the content is same as the content of similar field sent in the linked IRI messages. + communicationIdentifier [2] CommunicationIdentifier, + -- contents same as the contents of similar field sent in the linked IRI messages + ccLID [3] CC-Link-Identifier OPTIONAL, + -- Included only if the linked IRI messages have the similar field. When included, + -- the content is same as the content of similar field sent in the linked IRI messages. timeStamp [4] TimeStamp OPTIONAL, sequence-number [5] INTEGER (0..65535), t-PDU-direction [6] TPDU-direction, @@ -61,4 +61,4 @@ CSvoiceLIC-header ::= SEQUENCE } -END \ No newline at end of file +END diff --git a/33108/r17/Eps-HI3-PS.asn b/33108/r17/Eps-HI3-PS.asn index e4fc5911..e94a4c13 100644 --- a/33108/r17/Eps-HI3-PS.asn +++ b/33108/r17/Eps-HI3-PS.asn @@ -1,17 +1,17 @@ -Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r12(12) version-0(0)} +Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r17(17) version-0(0)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - + EPSCorrelationNumber FROM EpsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r12(12) version-55(55)} -- Imported from TS 33.108 v.12.5.0 + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r16(16) version-1(1)} -- Imported from TS 33.108 v.16.4.0 LawfulInterceptionIdentifier, - + TimeStamp FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}; -- from ETSI HI2Operations TS 101 671 v3.12.1 @@ -24,7 +24,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi3DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3eps(9) r12(12) version-0(0)} +hi3DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3eps(9) r17(17) version-0(0)} CC-PDU ::= SEQUENCE { @@ -82,4 +82,4 @@ ICE-type ::= ENUMERATED ePDG (6) } -END \ No newline at end of file +END diff --git a/33108/r17/GCSE-HI3.asn b/33108/r17/GCSE-HI3.asn index cbcd7df7..3d3232ed 100644 --- a/33108/r17/GCSE-HI3.asn +++ b/33108/r17/GCSE-HI3.asn @@ -1,4 +1,4 @@ -GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3gcse(14) r13(13) version-0(0)} +GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3gcse(14) r17(17) version-0(0)} DEFINITIONS IMPLICIT TAGS ::= @@ -7,23 +7,23 @@ BEGIN IMPORTS LawfulInterceptionIdentifier, - + TimeStamp FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}-- from ETSI HI2Operations TS 101 671, version 3.12.1 GcseCorrelation, GcsePartyIdentity - + FROM GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) - threeGPP(4) hi2gcse(13) r13(13) version-0 (0)} + threeGPP(4) hi2gcse(13) r16(16) version-0 (0)} -- Imported from Gcse HI2 Operations part of this standard National-HI3-ASN1parameters FROM Eps-HI3-PS - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r12 (12) version-0(0)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r17 (17) version-0(0)}; -- Object Identifier Definitions @@ -33,7 +33,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi3gcseDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3gcse(14) r13(13) version-0(0)} +hi3gcseDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3gcse(14) r17(17) version-0(0)} Gcse-CC-PDU ::= SEQUENCE { @@ -54,7 +54,7 @@ GcseLIC-header ::= SEQUENCE mediaID [8] MediaID OPTIONAL, -- Identifies the media being exchanged by parties on the GCSE group communications. ... - + } MediaID ::= SEQUENCE @@ -63,7 +63,7 @@ MediaID ::= SEQUENCE -- describing GCSE Server Side characteristics. streamID [2] OCTET STRING OPTIONAL, -- include streamID from SDP information. - + ... } @@ -75,4 +75,4 @@ TPDU-direction ::= ENUMERATED ... } -END \ No newline at end of file +END diff --git a/33108/r17/VoIP-HI3-IMS.asn b/33108/r17/VoIP-HI3-IMS.asn index c770609a..b9a2202e 100644 --- a/33108/r17/VoIP-HI3-IMS.asn +++ b/33108/r17/VoIP-HI3-IMS.asn @@ -1,4 +1,4 @@ -VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r15 (15) version-1 (1)} +VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r17 (17) version-0 (0)} DEFINITIONS IMPLICIT TAGS ::= @@ -15,7 +15,7 @@ Network-Identifier National-HI3-ASN1parameters -FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r14 (14) version-0 (0)}; +FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r17 (17) version-0 (0)}; -- Object Identifier Definitions @@ -26,7 +26,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi3voipDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3voip(12) r15 (15) version-1 (1)} +hi3voipDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3voip(12) r17 (17) version-0 (0)} Voip-CC-PDU ::= SEQUENCE { @@ -38,7 +38,7 @@ VoipLIC-header ::= SEQUENCE { hi3voipDomainId [0] OBJECT IDENTIFIER, -- 3GPP VoIP HI3 Domain lIID [2] LawfulInterceptionIdentifier OPTIONAL, - voipCorrelationNumber [3] VoipCorrelationNumber, + voipCorrelationNumber [3] VoipCorrelationNumber, -- For VoIP, contains the same contents as the -- cc parameter contained within an IRI-to-CC-Correlation parameter -- which is contained in the IMS-VoIP-Correlation parameter in the @@ -59,7 +59,7 @@ VoipLIC-header ::= SEQUENCE -- When this option is implemented, shall be used to provide the RTP payload description -- as soon as it is available at DF3 (initial one or each time the DF3 is notified of a -- change) - networkIdentifier [10] Network-Identifier OPTIONAL, + networkIdentifier [10] Network-Identifier OPTIONAL, -- Mandatory when used for PTC -- Identifies the network element that is reporting the CC pTCSessionInfo [11] UTF8String OPTIONAL @@ -76,7 +76,7 @@ TPDU-direction ::= ENUMERATED to-target (2), combined (3), -- Indicates that combined CC (i.e., from/to-target)delivery is used. unknown (4) -} +} ICE-type ::= ENUMERATED { ggsn (1), @@ -85,19 +85,19 @@ ICE-type ::= ENUMERATED { trGW (4), mGW (5), other (6), - unknown (7), + unknown (7), ... , mRF (8), lmISF (9), sGW (10) -} +} Payload-description ::= SEQUENCE { copyOfSDPdescription [1] OCTET STRING OPTIONAL, -- Copy of the SDP. Format as per RFC 4566 [94]. -- used for VoIP - ..., + ..., mediaFormat [2] INTEGER (0..127) OPTIONAL, -- as defined in RFC 3551 [93] -- used with IP-based delivery for CS @@ -107,4 +107,4 @@ Payload-description ::= SEQUENCE } -END \ No newline at end of file +END -- GitLab From e36dc411d83c9d714d0a9ace4df68e61e5ea4c9a Mon Sep 17 00:00:00 2001 From: lovieno Date: Wed, 3 May 2023 12:53:52 +0000 Subject: [PATCH 24/35] TS 33.108 CR0429 - Correction of ASN.1 import statements --- 33108/r16/CONF-HI3-IMS.asn | 18 +++++++++--------- 33108/r16/CSvoice-HI3-IP.asn | 26 +++++++++++++------------- 33108/r16/Eps-HI3-PS.asn | 12 ++++++------ 33108/r16/GCSE-HI3.asn | 18 +++++++++--------- 33108/r16/VoIP-HI3-IMS.asn | 20 ++++++++++---------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/33108/r16/CONF-HI3-IMS.asn b/33108/r16/CONF-HI3-IMS.asn index ce3fe837..3bbcb99f 100644 --- a/33108/r16/CONF-HI3-IMS.asn +++ b/33108/r16/CONF-HI3-IMS.asn @@ -1,4 +1,4 @@ -CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11) r13 (13) version-0 (0)} +CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11) r16 (16) version-0 (0)} DEFINITIONS IMPLICIT TAGS ::= @@ -9,7 +9,7 @@ BEGIN IMPORTS LawfulInterceptionIdentifier, - + TimeStamp FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}-- from ETSI HI2Operations TS 101 671, version 3.12.1 @@ -17,15 +17,15 @@ TimeStamp ConfCorrelation, ConfPartyInformation - + FROM CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) - threeGPP(4) hi2conf(10) r13 (13) version-0 (0)} + threeGPP(4) hi2conf(10) r16 (16) version-0 (0)} -- Imported from Conf HI2 Operations part of this standard National-HI3-ASN1parameters FROM Eps-HI3-PS - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r12(12) version-55 (55)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r16(16) version-0 (0)}; -- Imported form EPS HI3 part of this standard -- Object Identifier Definitions @@ -36,7 +36,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi3confDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3conf(11) r13 (13) version-0 (0)} +hi3confDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3conf(11) r16 (16) version-0 (0)} Conf-CC-PDU ::= SEQUENCE { @@ -57,7 +57,7 @@ ConfLIC-header ::= SEQUENCE mediaID [9] MediaID OPTIONAL, -- Identifies the media being exchanged by parties on the conference. ... - + } MediaID ::= SEQUENCE @@ -66,7 +66,7 @@ MediaID ::= SEQUENCE -- describing Conf Server Side characteristics. streamID [2] OCTET STRING OPTIONAL, -- include streamID from SDP information. - + ... } @@ -87,4 +87,4 @@ TPDU-direction ::= ENUMERATED } -END \ No newline at end of file +END diff --git a/33108/r16/CSvoice-HI3-IP.asn b/33108/r16/CSvoice-HI3-IP.asn index 21c29856..2f7b31b0 100644 --- a/33108/r16/CSvoice-HI3-IP.asn +++ b/33108/r16/CSvoice-HI3-IP.asn @@ -1,4 +1,4 @@ -CSvoice-HI3-IP {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18) r14 (14) version-0 (0)} +CSvoice-HI3-IP {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18) r16 (16) version-0 (0)} DEFINITIONS IMPLICIT TAGS ::= @@ -6,7 +6,7 @@ BEGIN IMPORTS - + -- from ETSI HI2Operations TS 101 671, version 3.12.1 CC-Link-Identifier, CommunicationIdentifier, @@ -15,14 +15,14 @@ IMPORTS FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - -- from 3GPPEps-HI3-PS TS 33.108 + -- from 3GPPEps-HI3-PS TS 33.108 National-HI3-ASN1parameters - FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r14 (14) version-0 (0)} - + FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r16 (16) version-0 (0)} + -- from VoIP-HI3-IMS TS 33.108 Payload-description, TPDU-direction - FROM VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r14(14) version-0(0)}; + FROM VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r16(16) version-0(0)}; -- Object Identifier Definitions @@ -32,7 +32,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi3CSvoiceDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3CSvoice(18) r14(14) version-0 (0)} +hi3CSvoiceDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3CSvoice(18) r16(16) version-0 (0)} CSvoice-CC-PDU ::= SEQUENCE { @@ -45,11 +45,11 @@ CSvoiceLIC-header ::= SEQUENCE { hi3CSvoiceDomainId [0] OBJECT IDENTIFIER, -- 3GPP IP-based delivery for CS HI3 Domain lIID [1] LawfulInterceptionIdentifier OPTIONAL, - communicationIdentifier [2] CommunicationIdentifier, - -- contents same as the contents of similar field sent in the linked IRI messages - ccLID [3] CC-Link-Identifier OPTIONAL, - -- Included only if the linked IRI messages have the similar field. When included, - -- the content is same as the content of similar field sent in the linked IRI messages. + communicationIdentifier [2] CommunicationIdentifier, + -- contents same as the contents of similar field sent in the linked IRI messages + ccLID [3] CC-Link-Identifier OPTIONAL, + -- Included only if the linked IRI messages have the similar field. When included, + -- the content is same as the content of similar field sent in the linked IRI messages. timeStamp [4] TimeStamp OPTIONAL, sequence-number [5] INTEGER (0..65535), t-PDU-direction [6] TPDU-direction, @@ -61,4 +61,4 @@ CSvoiceLIC-header ::= SEQUENCE } -END \ No newline at end of file +END diff --git a/33108/r16/Eps-HI3-PS.asn b/33108/r16/Eps-HI3-PS.asn index e4fc5911..47e37b52 100644 --- a/33108/r16/Eps-HI3-PS.asn +++ b/33108/r16/Eps-HI3-PS.asn @@ -1,17 +1,17 @@ -Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r12(12) version-0(0)} +Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r16(16) version-0(0)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - + EPSCorrelationNumber FROM EpsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r12(12) version-55(55)} -- Imported from TS 33.108 v.12.5.0 + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r16(16) version-1(1)} -- Imported from TS 33.108 v.16.4.0 LawfulInterceptionIdentifier, - + TimeStamp FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}; -- from ETSI HI2Operations TS 101 671 v3.12.1 @@ -24,7 +24,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi3DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3eps(9) r12(12) version-0(0)} +hi3DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3eps(9) r16(16) version-0(0)} CC-PDU ::= SEQUENCE { @@ -82,4 +82,4 @@ ICE-type ::= ENUMERATED ePDG (6) } -END \ No newline at end of file +END diff --git a/33108/r16/GCSE-HI3.asn b/33108/r16/GCSE-HI3.asn index cbcd7df7..d4ffa22b 100644 --- a/33108/r16/GCSE-HI3.asn +++ b/33108/r16/GCSE-HI3.asn @@ -1,4 +1,4 @@ -GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3gcse(14) r13(13) version-0(0)} +GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3gcse(14) r16(16) version-0(0)} DEFINITIONS IMPLICIT TAGS ::= @@ -7,23 +7,23 @@ BEGIN IMPORTS LawfulInterceptionIdentifier, - + TimeStamp FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}-- from ETSI HI2Operations TS 101 671, version 3.12.1 GcseCorrelation, GcsePartyIdentity - + FROM GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) - threeGPP(4) hi2gcse(13) r13(13) version-0 (0)} + threeGPP(4) hi2gcse(13) r16(16) version-0 (0)} -- Imported from Gcse HI2 Operations part of this standard National-HI3-ASN1parameters FROM Eps-HI3-PS - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r12 (12) version-0(0)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r16 (16) version-0(0)}; -- Object Identifier Definitions @@ -33,7 +33,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi3gcseDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3gcse(14) r13(13) version-0(0)} +hi3gcseDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3gcse(14) r16(16) version-0(0)} Gcse-CC-PDU ::= SEQUENCE { @@ -54,7 +54,7 @@ GcseLIC-header ::= SEQUENCE mediaID [8] MediaID OPTIONAL, -- Identifies the media being exchanged by parties on the GCSE group communications. ... - + } MediaID ::= SEQUENCE @@ -63,7 +63,7 @@ MediaID ::= SEQUENCE -- describing GCSE Server Side characteristics. streamID [2] OCTET STRING OPTIONAL, -- include streamID from SDP information. - + ... } @@ -75,4 +75,4 @@ TPDU-direction ::= ENUMERATED ... } -END \ No newline at end of file +END diff --git a/33108/r16/VoIP-HI3-IMS.asn b/33108/r16/VoIP-HI3-IMS.asn index c770609a..c78e196b 100644 --- a/33108/r16/VoIP-HI3-IMS.asn +++ b/33108/r16/VoIP-HI3-IMS.asn @@ -1,4 +1,4 @@ -VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r15 (15) version-1 (1)} +VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r16 (16) version-0 (0)} DEFINITIONS IMPLICIT TAGS ::= @@ -15,7 +15,7 @@ Network-Identifier National-HI3-ASN1parameters -FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r14 (14) version-0 (0)}; +FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r16 (16) version-0 (0)}; -- Object Identifier Definitions @@ -26,7 +26,7 @@ securityDomain(2) lawfulIntercept(2)} -- Security Subdomains threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} -hi3voipDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3voip(12) r15 (15) version-1 (1)} +hi3voipDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3voip(12) r16 (16) version-0 (0)} Voip-CC-PDU ::= SEQUENCE { @@ -38,7 +38,7 @@ VoipLIC-header ::= SEQUENCE { hi3voipDomainId [0] OBJECT IDENTIFIER, -- 3GPP VoIP HI3 Domain lIID [2] LawfulInterceptionIdentifier OPTIONAL, - voipCorrelationNumber [3] VoipCorrelationNumber, + voipCorrelationNumber [3] VoipCorrelationNumber, -- For VoIP, contains the same contents as the -- cc parameter contained within an IRI-to-CC-Correlation parameter -- which is contained in the IMS-VoIP-Correlation parameter in the @@ -59,7 +59,7 @@ VoipLIC-header ::= SEQUENCE -- When this option is implemented, shall be used to provide the RTP payload description -- as soon as it is available at DF3 (initial one or each time the DF3 is notified of a -- change) - networkIdentifier [10] Network-Identifier OPTIONAL, + networkIdentifier [10] Network-Identifier OPTIONAL, -- Mandatory when used for PTC -- Identifies the network element that is reporting the CC pTCSessionInfo [11] UTF8String OPTIONAL @@ -76,7 +76,7 @@ TPDU-direction ::= ENUMERATED to-target (2), combined (3), -- Indicates that combined CC (i.e., from/to-target)delivery is used. unknown (4) -} +} ICE-type ::= ENUMERATED { ggsn (1), @@ -85,19 +85,19 @@ ICE-type ::= ENUMERATED { trGW (4), mGW (5), other (6), - unknown (7), + unknown (7), ... , mRF (8), lmISF (9), sGW (10) -} +} Payload-description ::= SEQUENCE { copyOfSDPdescription [1] OCTET STRING OPTIONAL, -- Copy of the SDP. Format as per RFC 4566 [94]. -- used for VoIP - ..., + ..., mediaFormat [2] INTEGER (0..127) OPTIONAL, -- as defined in RFC 3551 [93] -- used with IP-based delivery for CS @@ -107,4 +107,4 @@ Payload-description ::= SEQUENCE } -END \ No newline at end of file +END -- GitLab From 4e1d4a6354e8d013705ce538c1d3bd0ad7dc3b1b Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 3 May 2023 14:24:41 +0100 Subject: [PATCH 25/35] Updating OIDs and XSD versions --- 33128/r17/TS33128Payloads.asn | 4 ++-- 33128/r18/TS33128Payloads.asn | 4 ++-- 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 4 ++-- 33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 4 ++-- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index b4925b0e..60235659 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version7(7)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version8(8)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version7(7)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version8(8)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 2f6a505a..aab4f27e 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version3(3)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version4(4)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version3(3)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version4(4)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 8918bc0d..d79c3e1f 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -3,13 +3,13 @@ xmlns="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v1" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" xmlns:common="http://uri.etsi.org/03280/common/2017/07" - xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v1" + xmlns:liqr="urn:3GPP:ns:li:3GPPLIQueryExtensions:r18:v2" targetNamespace="urn:3GPP:ns:li:3GPPIdentityExtensions:r18:v1" elementFormDefault="qualified"> - + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index 14081eed..7cea78b8 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -1,10 +1,10 @@ diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index b1781580..6e3f041d 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -1,15 +1,15 @@ - + -- GitLab From 22451479642f3fa39862ae1555bdeb5299701a67 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 23 May 2023 11:03:18 +0100 Subject: [PATCH 26/35] Removing extra crlf --- 33128/r18/TS33128Payloads.asn | 1 - 1 file changed, 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index aab4f27e..27b6bb37 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1583,7 +1583,6 @@ TraceCollectionEntityInfo ::= SEQUENCE traceCollectionEntityURI [2] UTF8String } - -- TS 32.422 [XX], clause 5.3 TraceDepth ::= ENUMERATED { -- GitLab From 7ab1d08d82237be1af218d8e9da534f29cd859f4 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 25 May 2023 08:25:48 +0100 Subject: [PATCH 27/35] Updating references --- 33128/r17/TS33128Payloads.asn | 6 +++--- 33128/r18/TS33128Payloads.asn | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 60235659..dca38fce 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -4902,7 +4902,7 @@ MMELocationInformation ::= SEQUENCE additionalCellIDs [9] SEQUENCE OF CellInformation OPTIONAL } --- TS 32.299 [Re2], clause 7.3.240A +-- TS 32.299 [97], clause 7.3.240A UserCSGInformation ::= SEQUENCE { cSGID [1] CSGID, @@ -4913,14 +4913,14 @@ UserCSGInformation ::= SEQUENCE -- TS 29.272 [96], clause 7.3.79 CSGID ::= INTEGER --- TS 32.299 [Re2], clause 7.2.46A +-- TS 32.299 [97], clause 7.2.46A CSGAccessMode ::= ENUMERATED { closedMode(1), hybridMode(2) } --- TS 32.299 [Re2], clause 7.2.46B +-- TS 32.299 [97], clause 7.2.46B CSGMembershipIndication ::= ENUMERATED { notCSGMember(1), diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 27b6bb37..e9db4b28 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1583,7 +1583,7 @@ TraceCollectionEntityInfo ::= SEQUENCE traceCollectionEntityURI [2] UTF8String } --- TS 32.422 [XX], clause 5.3 +-- TS 32.423 [112], clause 5.3 TraceDepth ::= ENUMERATED { minimum(1), @@ -6163,7 +6163,7 @@ MMELocationInformation ::= SEQUENCE additionalCellIDs [9] SEQUENCE OF CellInformation OPTIONAL } --- TS 32.299 [Re1], clause 7.3.240A +-- TS 32.299 [111], clause 7.3.240A UserCSGInformation ::= SEQUENCE { cSGID [1] CSGID, @@ -6174,14 +6174,14 @@ UserCSGInformation ::= SEQUENCE -- TS 29.272 [106], clause 7.3.79 CSGID ::= INTEGER --- TS 32.299 [Re1], clause 7.2.46A +-- TS 32.299 [111], clause 7.2.46A CSGAccessMode ::= ENUMERATED { closedMode(1), hybridMode(2) } --- TS 32.299 [Re1], clause 7.2.46B +-- TS 32.299 [111], clause 7.2.46B CSGMembershipIndication ::= ENUMERATED { notCSGMember(1), -- GitLab From 4c1ebeba92a833984383ed394cbad5052ff04430 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 1 Jun 2023 09:23:18 +0000 Subject: [PATCH 28/35] Update .gitlab-ci.yml to make diff blocks rather than track changes --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4786e7f9..b806e45d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ generate_artefacts: - echo $CI_MERGE_REQUEST_IID - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - echo $ARTEFACT_NAME - - forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + - forgelib-changedocs -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID artifacts: untracked: true paths: -- GitLab From c3fb0f204c4f889c0ed07c952f8b8d5ef24362f5 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 1 Jun 2023 09:48:10 +0000 Subject: [PATCH 29/35] Removing project path (now determined from project ID via API) --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b806e45d..acf61b68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ generate_artefacts: - echo $CI_MERGE_REQUEST_IID - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - echo $ARTEFACT_NAME - - forgelib-changedocs -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + - forgelib-changedocs -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_MERGE_REQUEST_IID artifacts: untracked: true paths: -- GitLab From a1e6293b9f142e72050dae29d980e2615beb20f8 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 1 Jun 2023 09:56:36 +0000 Subject: [PATCH 30/35] Adding delimiter templates --- coversheets/delimiter_end.docx | Bin 0 -> 23766 bytes coversheets/delimiter_start.docx | Bin 0 -> 23769 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 coversheets/delimiter_end.docx create mode 100644 coversheets/delimiter_start.docx diff --git a/coversheets/delimiter_end.docx b/coversheets/delimiter_end.docx new file mode 100644 index 0000000000000000000000000000000000000000..fcd5b1918d1f102ae3b039a2b00ef6557e235be7 GIT binary patch literal 23766 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 literal 0 HcmV?d00001 diff --git a/coversheets/delimiter_start.docx b/coversheets/delimiter_start.docx new file mode 100644 index 0000000000000000000000000000000000000000..219e89865c9e9a9cf44a7364493bc8d76d1db765 GIT binary patch literal 23769 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
  • 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 Date: Tue, 20 Jun 2023 20:06:47 +0000 Subject: [PATCH 31/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index e9db4b28..63e221af 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -238,7 +238,10 @@ XIRIEvent ::= CHOICE -- RCS events, see clause 7.13.3 rCSRegistration [140] RCSRegistration, rCSMessage [141] RCSMessage, - rcsCapabilityDiscovery [142] RCSCapabilityDiscovery + rcsCapabilityDiscovery [142] RCSCapabilityDiscovery, + + -- AMF events, see clause 6.2.2.2.X + aMFUEPolicyTransfer [200] AMFUEPolicyTransfer } -- ============== @@ -469,7 +472,10 @@ IRIEvent ::= CHOICE -- RCS events, see clause 7.13.3 rCSRegistration [140] RCSRegistration, rCSMessage [141] RCSMessage, - rcsCapabilityDiscovery [142] RCSCapabilityDiscovery + rcsCapabilityDiscovery [142] RCSCapabilityDiscovery, + + -- AMF events, see clause 6.2.2.2.X + aMFUEPolicyTransfer [200] AMFUEPolicyTransfer } IRITargetIdentifier ::= SEQUENCE @@ -1331,7 +1337,8 @@ AMFRegistration ::= SEQUENCE rATType [18] RATType OPTIONAL, rRCEstablishmentCause [19] RRCEstablishmentCause OPTIONAL, nGInformation [20] NGInformation OPTIONAL, - nASTransportInitialInformation [21] NASTransportInitialInformation OPTIONAL + nASTransportInitialInformation [21] NASTransportInitialInformation OPTIONAL, + sORTransparentContainer [22] SORTransparentContainer OPTIONAL } -- See clause 6.2.2.2.3 for details of this structure @@ -1380,7 +1387,9 @@ AMFStartOfInterceptionWithRegisteredUE ::= SEQUENCE fiveGSTAIList [12] TAIList OPTIONAL, sMSOverNASIndicator [13] SMSOverNASIndicator OPTIONAL, oldGUTI [14] EPS5GGUTI OPTIONAL, - eMM5GRegStatus [15] EMM5GMMStatus OPTIONAL + eMM5GRegStatus [15] EMM5GMMStatus OPTIONAL, + sORTransparentContainer [16] SORTransparentContainer OPTIONAL, + uEPolicy [17] UEPolicy OPTIONAL } -- See clause 6.2.2.2.6 for details of this structure @@ -1465,6 +1474,17 @@ AMFRANTraceReport ::= SEQUENCE location [11] Location OPTIONAL } +--See clause 6.2.2.2.X for details of this Structure +AMFUEPolicyTransfer ::= SEQUENCE +{ + sUPI [1] SUPI, + sUCI [2] SUCI OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + gUTI [5] FiveGGUTI OPTIONAL, + uEPolicy [6] UEPolicy +} + -- ================= -- 5G AMF parameters -- ================= @@ -1674,6 +1694,10 @@ EstablishmentCause ::= ENUMERATED exceptionData(12) } +SORTransparentContainer ::= OCTET STRING + +UEPolicy :: = OCTET STRING (SIZE(16..65540)) + -- ================== -- 5G SMF definitions -- ================== -- GitLab From 8d1810ff4e95305875a765fb3a8d7a0482f5c009 Mon Sep 17 00:00:00 2001 From: znaty Date: Tue, 20 Jun 2023 20:14:41 +0000 Subject: [PATCH 32/35] 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 63e221af..283a575f 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -474,7 +474,7 @@ IRIEvent ::= CHOICE rCSMessage [141] RCSMessage, rcsCapabilityDiscovery [142] RCSCapabilityDiscovery, - -- AMF events, see clause 6.2.2.2.X + -- AMF events, see clause 6.2.2.2.X aMFUEPolicyTransfer [200] AMFUEPolicyTransfer } -- GitLab From 2be970e9febe283671d6ccea6198f79b76a2674b Mon Sep 17 00:00:00 2001 From: znaty Date: Tue, 20 Jun 2023 20:28:52 +0000 Subject: [PATCH 33/35] 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 283a575f..b3b7dd8f 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1696,7 +1696,7 @@ EstablishmentCause ::= ENUMERATED SORTransparentContainer ::= OCTET STRING -UEPolicy :: = OCTET STRING (SIZE(16..65540)) +UEPolicy ::= OCTET STRING (SIZE(16..65540)) -- ================== -- 5G SMF definitions -- GitLab From a7e79b72933fb54dbebce692bc996e1cf5fcd0c1 Mon Sep 17 00:00:00 2001 From: znaty Date: Tue, 20 Jun 2023 20:36:07 +0000 Subject: [PATCH 34/35] 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 b3b7dd8f..ea28ed0b 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -241,7 +241,7 @@ XIRIEvent ::= CHOICE rcsCapabilityDiscovery [142] RCSCapabilityDiscovery, -- AMF events, see clause 6.2.2.2.X - aMFUEPolicyTransfer [200] AMFUEPolicyTransfer + aMFUEPolicyTransfer [200] AMFUEPolicyTransfer } -- ============== -- GitLab From e4ab82537de708a82fe9b9590ba69c65f84c1425 Mon Sep 17 00:00:00 2001 From: znaty Date: Tue, 20 Jun 2023 20:39:22 +0000 Subject: [PATCH 35/35] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index ea28ed0b..71f10a73 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -241,7 +241,7 @@ XIRIEvent ::= CHOICE rcsCapabilityDiscovery [142] RCSCapabilityDiscovery, -- AMF events, see clause 6.2.2.2.X - aMFUEPolicyTransfer [200] AMFUEPolicyTransfer + aMFUEPolicyTransfer [143] AMFUEPolicyTransfer } -- ============== @@ -475,7 +475,7 @@ IRIEvent ::= CHOICE rcsCapabilityDiscovery [142] RCSCapabilityDiscovery, -- AMF events, see clause 6.2.2.2.X - aMFUEPolicyTransfer [200] AMFUEPolicyTransfer + aMFUEPolicyTransfer [143] AMFUEPolicyTransfer } IRITargetIdentifier ::= SEQUENCE -- GitLab