From dfd829383386879071ca25de61710f2ef8f4ab86 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Wed, 18 Jan 2023 10:20:16 +1100 Subject: [PATCH] TS 102 232-1 CR102: Prefix types with module name Fully qualify type names by prefixing with the module name that they're imported from. Remove trailing spaces and tabs. Consistently use a 4 character tab instead of spaces. Ensure comment marker has space (or tab) before text. --- 102232-1/LI-PS-PDU.asn | 182 ++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 002e2284..fdff841b 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -95,7 +95,7 @@ IMPORTS FROM CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2conf(10)} -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. + -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] IRI-Parameters, @@ -112,60 +112,60 @@ IMPORTS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2gcse(13)} -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - + -- from 3GPP TS 33.108 [9] - CC-PDU - FROM Umts-HI3-PS - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)} - -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - CC-PDU - FROM Eps-HI3-PS - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)} - -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. + CC-PDU + FROM Umts-HI3-PS + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] - Conf-CC-PDU - FROM CONF-HI3-IMS - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)} - -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. + CC-PDU + FROM Eps-HI3-PS + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] - Voip-CC-PDU - FROM VoIP-HI3-IMS - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)} - -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. + Conf-CC-PDU + FROM CONF-HI3-IMS + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] - Gcse-CC-PDU - FROM GCSE-HI3 - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)} - -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - ThreeGPP-HI1-Operation - FROM ThreeGPP-HI1NotificationOperations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)} - -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. + Voip-CC-PDU + FROM VoIP-HI3-IMS + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + Gcse-CC-PDU + FROM GCSE-HI3 + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + ThreeGPP-HI1-Operation + FROM ThreeGPP-HI1NotificationOperations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. -- TS 101 671 HI1 and 3GPP HI1 are related to the same functionality but are -- corresponding to different implementations and exclusive usage each other. - -- The implementation depends of national regulations or LEA/CSP negotiations. + -- The implementation depends of national regulations or LEA/CSP negotiations. -- 3GPP HI1 may be used with other services/networks than 3GPP's one. - -- from 3GPP TS 33.108 [9] - CSvoice-CC-PDU - FROM CSvoice-HI3-IP - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)} - -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. - -- The implementation of the CS domain delivery in IP have to be based on 3GPP TS 33.108 [9]. + -- from 3GPP TS 33.108 [9] + CSvoice-CC-PDU + FROM CSvoice-HI3-IP + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + -- The implementation of the CS domain delivery in IP have to be based on 3GPP TS 33.108 [9]. -- from ETSI TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -224,7 +224,7 @@ PSHeader ::= SEQUENCE -- As of ASN.1 version 26 this parameter is included from ETSI TS 103 280 [44] authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.3 - communicationIdentifier [3] CommunicationIdentifier, + communicationIdentifier [3] CommunicationIdentifier, sequenceNumber [4] INTEGER (0..4294967295), timeStamp [5] GeneralizedTime OPTIONAL, -- see clause 5.2.6 @@ -246,11 +246,11 @@ Payload ::= CHOICE -- Clause 6.2.3 explains how to include more than one payload in the same PDU tRIPayload [2] TRIPayload, ..., - hI1-Operation [3] HI1-Operation, + hI1-Operation [3] HI1NotificationOperations.HI1-Operation, encryptionContainer [4] EncryptionContainer, - threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, + threeGPP-HI1-Operation [5] ThreeGPP-HI1NotificationOperations.ThreeGPP-HI1-Operation, -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] - iLHIPayload [6] SEQUENCE OF ILHIPayload, + iLHIPayload [6] SEQUENCE OF ILHIPDU.ILHIPayload, -- For typical use cases see ETSI TS 103 462 [45] hI4Payload [7] SEQUENCE OF HI4Payload } @@ -267,7 +267,7 @@ TimeStampQualifier ::= ENUMERATED HI4Payload ::= CHOICE { threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload, - ... + ... } -- ==================================== @@ -283,7 +283,7 @@ CommunicationIdentifier ::= SEQUENCE deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.4 ..., - cINExtension [3] CorrelationValues OPTIONAL + cINExtension [3] UmtsHI2Operations.CorrelationValues OPTIONAL -- To be used when a single INTEGER is not sufficient to identify -- a particular session (see clause 5.2.4) } @@ -293,7 +293,7 @@ NetworkIdentifier ::= SEQUENCE operatorIdentifier [0] OCTET STRING (SIZE(1..16)), networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, ..., - eTSI671NEID [2] Network-Element-Identifier OPTIONAL + eTSI671NEID [2] HI2Operations.Network-Element-Identifier OPTIONAL -- For network element identifier, use either networkElementIdentifier or eTSI671NEID } @@ -331,25 +331,25 @@ CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { -- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02) - emailCC [1] EmailCC, - iPCC [2] IPCC, + emailCC [1] EmailPDU.EmailCC, + iPCC [2] IPAccessPDU.IPCC, -- tag [3] not used uMTSCC [4] OCTET STRING, ..., -- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02) - l2CC [6] L2CC, + l2CC [6] L2AccessPDU.L2CC, tTRAFFIC-1 [7] TS101909201.TTRAFFIC, cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, tTRAFFIC-2 [9] TS101909202.TTRAFFIC, cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, - pstnIsdnCC [11] PstnIsdnCC, - iPMMCC [12] IPMMCC, + pstnIsdnCC [11] PstnIsdnPDU.PstnIsdnCC, + iPMMCC [12] IPMultimediaPDU.IPMMCC, -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) - messagingCC [14] MessagingCC, + messagingCC [14] EmailPDU.MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, - messagingMMCC [18] MessagingMMCC, + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + messagingMMCC [18] EmailPDU.MessagingMMCC, confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU, @@ -381,12 +381,12 @@ IRIPayload ::= SEQUENCE -- For aggregated payloads (see clause 6.2.3) timeStampQualifier [4] TimeStampQualifier OPTIONAL, sessionDirection [5] PayloadDirection OPTIONAL, - -- If the sessionDirection field is to be used for a given service then - -- the exact meaning and use of the field will be described in the + -- If the sessionDirection field is to be used for a given service then + -- the exact meaning and use of the field will be described in the -- relevant service-specific details payloadDirection [6] PayloadDirection OPTIONAL - -- If the payloadDirection field is to be used for a given service then - -- the exact meaning and use of the field will be described in the + -- If the payloadDirection field is to be used for a given service then + -- the exact meaning and use of the field will be described in the -- relevant service-specific details } @@ -402,21 +402,21 @@ IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { -- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02) - emailIRI [1] EmailIRI, - iPIRI [2] IPIRI, - iPIRIOnly [3] IPIRIOnly, + emailIRI [1] EmailPDU.EmailIRI, + iPIRI [2] IPAccessPDU.IPIRI, + iPIRIOnly [3] IPAccessPDU.IPIRIOnly, uMTSIRI [4] UMTSIRI, eTSI671IRI [5] ETSI671IRI, ..., - l2IRI [6] L2IRI, - l2IRIOnly [7] L2IRIOnly, + l2IRI [6] L2AccessPDU.L2IRI, + l2IRIOnly [7] L2AccessPDU.L2IRIOnly, tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, - pstnIsdnIRI [10] PstnIsdnIRI, - iPMMIRI [11] IPMMIRI, + pstnIsdnIRI [10] PstnIsdnPDU.PstnIsdnIRI, + iPMMIRI [11] IPMultimediaPDU.IPMMIRI, -- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) - messagingIRI [14] MessagingIRI, + messagingIRI [14] EmailPDU.MessagingIRI, ePSIRI [15] EPSIRI, confIRI [16] ConfIRI, proseIRI [17] ProSeIRI, @@ -428,17 +428,17 @@ UMTSIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, - umtsIRIsContent [1] UmtsIRIsContent, + umtsIRIsContent [1] UmtsHI2Operations.UmtsIRIsContent, ..., iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, - umtsCS-IRIsContent [3] UmtsCS-IRIsContent + umtsCS-IRIsContent [3] UmtsCS-HI2Operations.UmtsCS-IRIsContent } ETSI671IRI ::= CHOICE -- This structure may be commented out if not used { iRI-Parameters [0] HI2Operations.IRI-Parameters, - iRIsContent [1] IRIsContent, + iRIsContent [1] HI2Operations.IRIsContent, ... } @@ -446,7 +446,7 @@ EPSIRI ::= CHOICE -- This structure may be commented out if not used { iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, - epsIRIsContent [1] EpsIRIsContent, + epsIRIsContent [1] EpsHI2Operations.EpsIRIsContent, ... } @@ -454,7 +454,7 @@ ConfIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, - confIRIsContent [1] ConfIRIsContent, + confIRIsContent [1] CONFHI2Operations.ConfIRIsContent, ... } @@ -463,7 +463,7 @@ ProSeIRI ::= CHOICE -- This structure may be commented out if not used { iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, - proseIRIsContent [1] ProSeIRIsContent, + proseIRIsContent [1] ProSeHI2Operations.ProSeIRIsContent, ... } @@ -472,7 +472,7 @@ GcseIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, - gcseIRIsContent [1] GcseIRIsContent, + gcseIRIsContent [1] GCSEHI2Operations.GcseIRIsContent, ... } @@ -512,7 +512,7 @@ IntegrityCheck ::= SEQUENCE checkValue [3] OCTET STRING, -- Network byte order -- If checkValue contains a signature, the octet string field space may be - -- used to insert the appropriate ASN.1 DER or BER encoded structure for the + -- used to insert the appropriate ASN.1 DER or BER encoded structure for the -- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2. ..., hashAlgorithm [4] HashAlgorithm OPTIONAL @@ -628,11 +628,11 @@ EncryptedPayload ::= SEQUENCE -- multiplied by 2^32 at first use. -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) -- as defined in annex G: - -- IF N > 0 THEN - -- PDU[N].byteCounter = PDU[N-1].byteCounter + size(PDU[N-1]) - -- ELSE - -- PDU[N].byteCounter = ( unixTime(now) << 32 ) - -- ENDIF + -- IF N > 0 THEN + -- PDU[N].byteCounter = PDU[N-1].byteCounter + size(PDU[N-1]) + -- ELSE + -- PDU[N].byteCounter = ( unixTime(now) << 32 ) + -- ENDIF payload [1] Payload, ... } @@ -674,16 +674,16 @@ Location ::= SEQUENCE WlanLocationAttributes ::= SEQUENCE { - wlanAPMACAddress [0] OCTET STRING (SIZE(6)) OPTIONAL, + wlanAPMACAddress [0] OCTET STRING (SIZE(6)) OPTIONAL, -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID ... -} +} IPAddress ::= SEQUENCE -- This parameter was previously imported from ETSI TS 101 671 [4] but has been copied - -- to ETSI TS 102 232-1 (the present document). It is not recommended to use this parameter in - -- future change requests. Suggested approach is to use a parameter from ETSI TS 103 280 [44] - -- instead. + -- to ETSI TS 102 232-1 (the present document). It is not recommended to use this parameter in + -- future change requests. Suggested approach is to use a parameter from ETSI TS 103 280 [44] + -- instead. { iP-type [1] ENUMERATED { @@ -728,10 +728,10 @@ IP-value ::= CHOICE ... } -LawfulInterceptionIdentifier ::= LIID +LawfulInterceptionIdentifier ::= Common-Parameters.LIID -- LIID is a common parameter imported from ETSI TS 103 280 [44]. -- It is redefined as LawfulInterceptionIdentifier in this -- module to preserve the original type name during the -- removal of imports from ETSI TS 101 671 [4]. -END --end of LI-PS-PDU +END -- end of LI-PS-PDU -- GitLab