From f1ab326651b0d98b09f2e01f4bb8bfbc96ca5fc1 Mon Sep 17 00:00:00 2001 From: lovieno Date: Tue, 4 Apr 2023 07:26:29 +0000 Subject: [PATCH 1/2] Update 33108/r16/Eps-HI3-PS.asn, 33108/r16/CONF-HI3-IMS.asn, 33108/r16/VoIP-HI3-IMS.asn, 33108/r16/GCSE-HI3.asn, 33108/r16/CSvoice-HI3-IP.asn --- 33108/r16/CONF-HI3-IMS.asn | 16 ++++++++-------- 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, 46 insertions(+), 46 deletions(-) diff --git a/33108/r16/CONF-HI3-IMS.asn b/33108/r16/CONF-HI3-IMS.asn index ce3fe837..86f45745 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,7 +17,7 @@ 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)} @@ -25,7 +25,7 @@ ConfPartyInformation 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 b479ef74ea540162a027934e905131a2ab3f240f Mon Sep 17 00:00:00 2001 From: lovieno Date: Tue, 4 Apr 2023 07:43:55 +0000 Subject: [PATCH 2/2] Update 33108/r16/CONF-HI3-IMS.asn --- 33108/r16/CONF-HI3-IMS.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33108/r16/CONF-HI3-IMS.asn b/33108/r16/CONF-HI3-IMS.asn index 86f45745..3bbcb99f 100644 --- a/33108/r16/CONF-HI3-IMS.asn +++ b/33108/r16/CONF-HI3-IMS.asn @@ -20,7 +20,7 @@ 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 -- GitLab