diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4786e7f9e0ad3df33d04f95daf635d83643d5fb2..acf61b68c2abaec1a6f46f2a2adaecced78663de 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_MERGE_REQUEST_IID artifacts: untracked: true paths: diff --git a/33108/r16/CONF-HI3-IMS.asn b/33108/r16/CONF-HI3-IMS.asn index ce3fe8377626c2b8303e641571c24c82d4fa29c2..3bbcb99f6cb70e00354637352f03265cb042fce9 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 21c298566d5fe6100c5677cf0895c5932c7084bb..2f7b31b07b06a490e106136027654f7919b724a6 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 e4fc5911e840abec0a309819d9ce4e53dcbb9661..47e37b52a422ceab35ca104716fdc546b54192c9 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 cbcd7df709085ad40b39b09b238f0bf5260faf9f..d4ffa22b25ad8205864f71203e36917b3ce3ceb7 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 c770609ab3b12c924f704fb64fbb106d4d0d2d85..c78e196bf9a11860b2d69edee290d325303646ec 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 diff --git a/33108/r17/CONF-HI3-IMS.asn b/33108/r17/CONF-HI3-IMS.asn index ce3fe8377626c2b8303e641571c24c82d4fa29c2..9ecb740bd9623aabb473aeddf0b435eb1e64f038 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 21c298566d5fe6100c5677cf0895c5932c7084bb..09aa42f7718790c80e9395bc4ac32d19973fd5c7 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 e4fc5911e840abec0a309819d9ce4e53dcbb9661..e94a4c13b0d918c0d2ce99b722306f2d6526f94a 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 cbcd7df709085ad40b39b09b238f0bf5260faf9f..3d3232ed78d0c6c203761d3fb3e4448a01b09223 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 c770609ab3b12c924f704fb64fbb106d4d0d2d85..b9a2202e578b55b81433a0feb14f72c991624f70 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 diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index d66928c87b512798b7fbb6cbcbc577784c83a727..dca38fceefc6b60ce869538a87709781007d6755 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)} @@ -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 @@ -4901,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, @@ -4912,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 07996815f18fc83c10a72369dc1a51df367669bf..e9db4b28942b8d26a0718b1fd4c90dcaf58081fd 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)} @@ -230,7 +230,15 @@ 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, + + -- RCS events, see clause 7.13.3 + rCSRegistration [140] RCSRegistration, + rCSMessage [141] RCSMessage, + rcsCapabilityDiscovery [142] RCSCapabilityDiscovery } -- ============== @@ -453,7 +461,15 @@ 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, + + -- RCS events, see clause 7.13.3 + rCSRegistration [140] RCSRegistration, + rCSMessage [141] RCSMessage, + rcsCapabilityDiscovery [142] RCSCapabilityDiscovery } IRITargetIdentifier ::= SEQUENCE @@ -1161,7 +1177,7 @@ GenericUAStarParams ::= SEQUENCE } -- =========================================== --- Specific UaStarParmas for TLS 1.2 (RFC5246) +-- Specific UaStarParams for TLS 1.2 (RFC5246) -- =========================================== TLSCipherType ::= ENUMERATED @@ -1186,8 +1202,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 +1214,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 @@ -1432,6 +1449,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 -- ================= @@ -1488,9 +1521,93 @@ 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.423 [112], 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, @@ -4014,6 +4131,88 @@ RCDDisplayInfo ::= SEQUENCE jcl [3] OCTET STRING OPTIONAL } +-- ================= +-- RCS Definitions +-- ================= + +-- See clause 7.13.3.2 for details of this structure +RCSRegistration ::= SEQUENCE +{ + rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + rCSRegistrationType [2] RCSRegistrationType, + rCSRegistrationUpdateRequest [3] IMSPayload, + rCSRegistrationUpdateResponse [4] IMSPayload, + location [5] Location OPTIONAL +} + +-- See clause 7.13.3.3 for details of this structure +RCSMessage ::= SEQUENCE +{ + rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + 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 [9] RCSContributionID OPTIONAL, + messageID [10] IMDNMessageID OPTIONAL, + location [11] Location OPTIONAL, + messagePayload [12] RCSPayload +} + +-- See clause 7.13.3.5 for details of this structure +RCSCapabilityDiscovery ::= SEQUENCE +{ + rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + rCSTargetContactIdentities [2] SEQUENCE SIZE (1..MAX) OF RCSIdentity OPTIONAL, + sIPMessage [3] IMSPayload, + direction [4] Direction, + location [5] Location OPTIONAL +} + +-- ============== +-- RCS Parameters +-- ============== + +IMDNMessageID ::= UTF8String + +RCSConversationID ::= UUID + +RCSContributionID ::= UUID + +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) +} + +RCSRegistrationType ::= ENUMERATED +{ + registration(1), + reRegistration(2), + uEDeregistration(3), + networkDeregistration(4) +} + -- ================= -- EES definitions -- ================= @@ -4749,7 +4948,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 } -- ========================== @@ -4820,7 +5021,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 } -- ======================= @@ -5390,19 +5592,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 @@ -5539,16 +5728,7 @@ UserIdentifiers ::= SEQUENCE ePSSubscriberIDs [2] EPSSubscriberIDs OPTIONAL } -XMLType ::= SEQUENCE -{ - xMLNamespace [1] XMLNamespace, - xMLValue [2] XMLValue -} - -XMLNamespace ::= UTF8String - -XMLValue ::= UTF8String - +UUID ::= OCTET STRING (SIZE (16)) -- =================== -- Location parameters @@ -5959,7 +6139,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, @@ -5969,7 +6149,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, @@ -5983,7 +6163,7 @@ MMELocationInformation ::= SEQUENCE additionalCellIDs [9] SEQUENCE OF CellInformation OPTIONAL } --- TS 32.299 [Re2], clause 7.3.240A +-- TS 32.299 [111], clause 7.3.240A UserCSGInformation ::= SEQUENCE { cSGID [1] CSGID, @@ -5991,24 +6171,24 @@ 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 +-- TS 32.299 [111], clause 7.2.46A CSGAccessMode ::= ENUMERATED { closedMode(1), hybridMode(2) } --- TS 32.299 [Re2], clause 7.2.46B +-- TS 32.299 [111], clause 7.2.46B CSGMembershipIndication ::= ENUMERATED { notCSGMember(1), cSGMember(2) } --- TS 29.272 [108], clause 7.3.116 +-- TS 29.272 [106], clause 7.3.116 SGSNLocationInformation ::= SEQUENCE { cGI [1] CGI OPTIONAL, @@ -6465,4 +6645,88 @@ SIPCellularNetworkInformation ::= SEQUENCE servingPLMN [2] PLMNID OPTIONAL } +-- ================================================== +-- Structures to allow reuse of encapsulated payloads +-- ================================================== + +RCSPayload ::= CHOICE +{ + fullPayload [1] EncapsulatedRCSPayload +} + +EncapsulatedRCSPayload ::= CHOICE +{ + mIME [1] MIMEEntity, + mSRP [2] MSRPMessage, + sIP [3] SIPMessage +} + +-- =============================================== +-- 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 diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 8918bc0d2b3eebfd858cb6998a978de451fde219..d79c3e1fb13f88e7a29544ec289b3ebde12d5569 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 d6856f5faff3e30d164ab3550e7be43b38e10587..7cea78b854b910644b13d202a0acb8510be38b7f 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -1,10 +1,10 @@ @@ -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 4e9dd41edc230c2003e208e7e7f9ff7ad740af3d..6e3f041dbd9fb011f2469f36df86707282e83e87 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -1,13 +1,15 @@ - + + @@ -49,6 +51,7 @@ + @@ -58,6 +61,12 @@ + + + + + + @@ -67,5 +76,14 @@ + + + + + + + + + diff --git a/coversheets/delimiter_end.docx b/coversheets/delimiter_end.docx new file mode 100644 index 0000000000000000000000000000000000000000..fcd5b1918d1f102ae3b039a2b00ef6557e235be7 Binary files /dev/null and b/coversheets/delimiter_end.docx differ diff --git a/coversheets/delimiter_start.docx b/coversheets/delimiter_start.docx new file mode 100644 index 0000000000000000000000000000000000000000..219e89865c9e9a9cf44a7364493bc8d76d1db765 Binary files /dev/null and b/coversheets/delimiter_start.docx differ