From cb4f28565ac419b0246681a1201f71ede3c53bb0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 29 Mar 2021 00:00:00 +0000 Subject: [PATCH 001/208] TS 102 232-1 v3.23.1 (2021-03-29) agreed at LI#56-e (Online, 2021-02-15) --- 102232-1/LI-PS-PDU.asn | 88 +++++++-------- ...I-PS-PDU,ver30.txt => LI-PS-PDU,ver31.txt} | 100 +++++++++--------- 2 files changed, 96 insertions(+), 92 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver30.txt => LI-PS-PDU,ver31.txt} (91%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index e8b6eed..c857808 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -41,7 +41,7 @@ IMPORTS IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)} -- from ETSI TS 102 232-4 [32] L2CC, @@ -54,7 +54,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} -- from ETSI TS 102 232-6 [36] PstnIsdnCC, @@ -62,7 +62,7 @@ IMPORTS FROM PstnIsdnPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsIRIsContent, CorrelationValues, @@ -72,7 +72,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsCS-IRIsContent FROM UmtsCS-HI2Operations @@ -80,7 +80,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, EpsIRIsContent, EPSLocation @@ -89,7 +89,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, ConfIRIsContent FROM CONFHI2Operations @@ -97,7 +97,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, ProSeIRIsContent FROM ProSeHI2Operations @@ -105,7 +105,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, GcseIRIsContent FROM GCSEHI2Operations @@ -113,42 +113,42 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- 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 ETSI TS 133 108 [9] + -- 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. - -- from ETSI TS 133 108 [9] + -- 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. - -- from ETSI TS 133 108 [9] + -- 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. - -- from ETSI TS 133 108 [9] + -- 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 ETSI TS 133 108 [9] + -- 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)} @@ -159,13 +159,13 @@ IMPORTS -- The implementation depends of national regulations or LEA/CSP negotiations. -- 3GPP HI1 may be used with other services/networks than 3GPP's one. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] CSvoice-CC-PDU - FROM CSvoice-HI3-IP + 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 ETSI TS 133 108 [9]. + -- 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, @@ -205,7 +205,7 @@ IMPORTS FROM TS33128Payloads {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. + -- needs to be chosen when compiling the application. -- end of IMPORTS @@ -239,7 +239,7 @@ PSHeader ::= SEQUENCE timeStamp [5] GeneralizedTime OPTIONAL, -- see clause 5.2.6 ..., - interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, -- see clause 5.2.11 microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, timeStampQualifier [8] TimeStampQualifier OPTIONAL @@ -253,12 +253,12 @@ Payload ::= CHOICE tRIPayload [2] TRIPayload, ..., hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer, + encryptionContainer [4] EncryptionContainer, threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] iLHIPayload [6] SEQUENCE OF ILHIPayload, -- For typical use cases see ETSI TS 103 462 [45] - hI4Payload [7] SEQUENCE OF HI4Payload + hI4Payload [7] SEQUENCE OF HI4Payload } TimeStampQualifier ::= ENUMERATED @@ -336,28 +336,28 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { - emailCC [1] EmailCC, - iPCC [2] IPCC, - uMTSCC [4] OCTET STRING, + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, ..., - l2CC [6] 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, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] 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, - 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, - cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, - threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload) + l2CC [6] 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, + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + messagingCC [14] 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, + 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, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, + threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload) } MicroSecondTimeStamp ::= SEQUENCE @@ -423,7 +423,7 @@ IRIContents ::= CHOICE confIRI [16] ConfIRI, proseIRI [17] ProSeIRI, gcseIRI [18] GcseIRI, - threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) + threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) } UMTSIRI ::= CHOICE @@ -515,7 +515,7 @@ IntegrityCheck ::= SEQUENCE -- 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 - -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. + -- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2. ..., hashAlgorithm [4] HashAlgorithm OPTIONAL -- Clarifies the hash function if checkType is hash(1). diff --git a/102232-1/portal/LI-PS-PDU,ver30.txt b/102232-1/portal/LI-PS-PDU,ver31.txt similarity index 91% rename from 102232-1/portal/LI-PS-PDU,ver30.txt rename to 102232-1/portal/LI-PS-PDU,ver31.txt index 6def9ef..c857808 100644 --- a/102232-1/portal/LI-PS-PDU,ver30.txt +++ b/102232-1/portal/LI-PS-PDU,ver31.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)} DEFINITIONS IMPLICIT TAGS ::= @@ -41,7 +41,7 @@ IMPORTS IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)} -- from ETSI TS 102 232-4 [32] L2CC, @@ -54,7 +54,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} -- from ETSI TS 102 232-6 [36] PstnIsdnCC, @@ -62,7 +62,7 @@ IMPORTS FROM PstnIsdnPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsIRIsContent, CorrelationValues, @@ -72,7 +72,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsCS-IRIsContent FROM UmtsCS-HI2Operations @@ -80,7 +80,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, EpsIRIsContent, EPSLocation @@ -89,7 +89,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, ConfIRIsContent FROM CONFHI2Operations @@ -97,7 +97,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, ProSeIRIsContent FROM ProSeHI2Operations @@ -105,7 +105,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, GcseIRIsContent FROM GCSEHI2Operations @@ -113,42 +113,42 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- 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 ETSI TS 133 108 [9] + -- 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. - -- from ETSI TS 133 108 [9] + -- 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. - -- from ETSI TS 133 108 [9] + -- 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. - -- from ETSI TS 133 108 [9] + -- 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 ETSI TS 133 108 [9] + -- 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)} @@ -159,13 +159,13 @@ IMPORTS -- The implementation depends of national regulations or LEA/CSP negotiations. -- 3GPP HI1 may be used with other services/networks than 3GPP's one. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] CSvoice-CC-PDU - FROM CSvoice-HI3-IP + 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 ETSI TS 133 108 [9]. + -- 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, @@ -199,11 +199,13 @@ IMPORTS -- This import is only used for the handover between LEMFs. -- from 3GPP TS 33.128 [46] - LINotificationPayload + LINotificationPayload, + IRIPayload, + CCPayload FROM TS33128Payloads {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. + -- needs to be chosen when compiling the application. -- end of IMPORTS @@ -213,7 +215,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version30(30)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version31(31)} -- ==================== -- Top-level definition @@ -237,7 +239,7 @@ PSHeader ::= SEQUENCE timeStamp [5] GeneralizedTime OPTIONAL, -- see clause 5.2.6 ..., - interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, -- see clause 5.2.11 microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, timeStampQualifier [8] TimeStampQualifier OPTIONAL @@ -251,12 +253,12 @@ Payload ::= CHOICE tRIPayload [2] TRIPayload, ..., hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer, + encryptionContainer [4] EncryptionContainer, threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] iLHIPayload [6] SEQUENCE OF ILHIPayload, -- For typical use cases see ETSI TS 103 462 [45] - hI4Payload [7] SEQUENCE OF HI4Payload + hI4Payload [7] SEQUENCE OF HI4Payload } TimeStampQualifier ::= ENUMERATED @@ -270,7 +272,7 @@ TimeStampQualifier ::= ENUMERATED HI4Payload ::= CHOICE { - threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload, + threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload, ... } @@ -334,28 +336,29 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { - emailCC [1] EmailCC, - iPCC [2] IPCC, - uMTSCC [4] OCTET STRING, + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, ..., - l2CC [6] 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, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] 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, - 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, - cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, - threeGPP33128DefinedCC [23] OCTET STRING } + l2CC [6] 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, + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + messagingCC [14] 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, + 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, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, + threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload) +} MicroSecondTimeStamp ::= SEQUENCE { @@ -420,7 +423,8 @@ IRIContents ::= CHOICE confIRI [16] ConfIRI, proseIRI [17] ProSeIRI, gcseIRI [18] GcseIRI, - threeGPP33128DefinedIRI [19] OCTET STRING} + threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) +} UMTSIRI ::= CHOICE -- This structure may be commented out if not used @@ -511,7 +515,7 @@ IntegrityCheck ::= SEQUENCE -- 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 - -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. + -- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2. ..., hashAlgorithm [4] HashAlgorithm OPTIONAL -- Clarifies the hash function if checkType is hash(1). -- GitLab From 1998cf5c1f03e59c2aea87bc387505d29327c0a2 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 5 Nov 2020 00:00:00 +0000 Subject: [PATCH 003/208] Unexpected commit --- 102232-3/IPAccessPDU.asn | 62 +++++++++---------- ...essPDU,ver13.txt => IPAccessPDU,ver14.txt} | 46 ++++++++++---- 2 files changed, 66 insertions(+), 42 deletions(-) rename 102232-3/portal/{IPAccessPDU,ver13.txt => IPAccessPDU,ver14.txt} (91%) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 2461f42..b576557 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -5,9 +5,8 @@ DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from ETSI TS 102 232-1 [2] - IPAddress, + IPAddress, Location FROM LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; @@ -17,12 +16,13 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14)} -iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} -iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} - -- all four definitions relative to {itu-t(0) identified-organization(4) - -- etsi(0) securityDomain(2) lawfulintercept(2)} +iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14)} +iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} +iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} + -- all four definitions relative to {itu-t(0) identified-organization(4) + -- etsi(0) securityDomain(2) lawfulintercept(2)} + -- ========================== -- IP Communications Contents @@ -55,12 +55,12 @@ IPIRIContents ::= SEQUENCE { accessEventType [0] AccessEventType, targetUsername [1] OCTET STRING, - -- in ASCII characters + -- in ASCII-characters internetAccessType [2] InternetAccessType, iPVersion [3] IPVersion, targetIPAddress [4] IPAddress OPTIONAL, -- IP address may not be available in case of failed logon attempts. - -- If it is available, it shall be sent. + -- If it is available, it must be sent. -- This field will carry the first IPv4 or IPv6 target IP address with or without -- subnet. Use of this field is fully described in section 6.2.1. targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, @@ -114,7 +114,9 @@ IPIRIContents ::= SEQUENCE -- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]: -- This parameter shall be populated with the RADIUS value. framedRoutes [26] SEQUENCE OF FramedRoute OPTIONAL - -- It is used to list all the available Framed Route and Framed IPv6 Route informationX + -- It is used to list all the available Framed Route and Framed IPv6 Route information + + } AccessEventType ::= ENUMERATED @@ -141,7 +143,6 @@ AccessEventType ::= ENUMERATED endOfInterceptionWithSessionActive(9), -- LI is ended on a target who still has an active session unknown(10) - } InternetAccessType ::= ENUMERATED @@ -200,7 +201,7 @@ IPIRIIDType ::= CHOICE printableIDType [0] UTF8String (SIZE (1..128)), -- For printable userIDs, such as the Radius username, phonenumbers macAddressType [1] OCTET STRING (SIZE (6)), - -- For MAC address types, raw binary format as in IETF RFC 2132 [15] + -- For MAC address types, raw binary format as in RFC 2132 [15] ipAddressType [2] IPAddress, -- For IP address types ... @@ -242,13 +243,12 @@ OtherTargetIdentifiers ::= CHOICE -- This list is extensible to accommodate other target identifiers which -- may be required in future. iPAddress [0] IPAddress, - -- IPAddress imported from ETSI TS 102 232 [2]. + -- IPAddress imported from TS 102 232 [2]. -- This can be an IPv4 address (with or without a subnet range defined) or -- an IPv6 address (with or without a prefix range defined). ... } - FramedRoute ::= CHOICE { -- Additional Framed Route prefix information associated with the target service @@ -270,11 +270,11 @@ IPIRIOnly ::= SEQUENCE { iPIRIOnlyObjId [0] RELATIVE-OID, iPInformation [1] IPInformation, - protocolInformation [2] ProtocolInformation, + protocolInformation [2] ProtocolInformation, iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL, iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL, - pDSRInformation [5] PDSRInformation OPTIONAL, - ... + ..., + pDSRInformation [5] PDSRInformation OPTIONAL } IPInformation ::= CHOICE @@ -344,24 +344,24 @@ UDPInformation ::= SEQUENCE PDSRInformation::= SEQUENCE { - summaryTrigger [0] PDSRSummaryTrigger, - firstPacketTimestamp [1] GeneralizedTime, - lastPacketTimestamp [2] GeneralizedTime, - packetCount [3] INTEGER, - byteCount [4] INTEGER, - ... + summaryTrigger [0] PDSRSummaryTrigger, + firstPacketTimestamp [1] GeneralizedTime, + lastPacketTimestamp [2] GeneralizedTime, + packetCount [3] INTEGER, + byteCount [4] INTEGER, + ... } PDSRSummaryTrigger ::= ENUMERATED { - startOfFlow(0), - timerExpiry(1), - packetCount(2), - byteCount(3), - endOfFlow(4), - ... + startOfFlow(0), + timerExpiry(1), + packetCount(2), + byteCount(3), + endOfFlow(4), + ... } - END -- end of IPAccessPDU + diff --git a/102232-3/portal/IPAccessPDU,ver13.txt b/102232-3/portal/IPAccessPDU,ver14.txt similarity index 91% rename from 102232-3/portal/IPAccessPDU,ver13.txt rename to 102232-3/portal/IPAccessPDU,ver14.txt index e4813de..b576557 100644 --- a/102232-3/portal/IPAccessPDU,ver13.txt +++ b/102232-3/portal/IPAccessPDU,ver14.txt @@ -1,12 +1,12 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS -- from ETSI TS 102 232-1 [2] - IPAddress + IPAddress, Location FROM LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; @@ -16,11 +16,13 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRIOnly(3)} - -- all three definitions relative to {itu-t(0) identified-organization(4) - -- etsi(0) securityDomain(2) lawfulintercept(2)} +iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14)} +iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} +iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} + -- all four definitions relative to {itu-t(0) identified-organization(4) + -- etsi(0) securityDomain(2) lawfulintercept(2)} + -- ========================== -- IP Communications Contents @@ -53,7 +55,7 @@ IPIRIContents ::= SEQUENCE { accessEventType [0] AccessEventType, targetUsername [1] OCTET STRING, - -- in ASCIIcharacters + -- in ASCII-characters internetAccessType [2] InternetAccessType, iPVersion [3] IPVersion, targetIPAddress [4] IPAddress OPTIONAL, @@ -126,7 +128,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The Access_attempt timed-out or failed otherwise + -- The accessAttempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4) sessionEnd(5), @@ -241,7 +243,7 @@ OtherTargetIdentifiers ::= CHOICE -- This list is extensible to accommodate other target identifiers which -- may be required in future. iPAddress [0] IPAddress, - -- IPAddress imported from TS 101 671 [1]. + -- IPAddress imported from TS 102 232 [2]. -- This can be an IPv4 address (with or without a subnet range defined) or -- an IPv6 address (with or without a prefix range defined). ... @@ -271,7 +273,8 @@ IPIRIOnly ::= SEQUENCE protocolInformation [2] ProtocolInformation, iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL, iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL, - ... + ..., + pDSRInformation [5] PDSRInformation OPTIONAL } IPInformation ::= CHOICE @@ -339,5 +342,26 @@ UDPInformation ::= SEQUENCE checkSum [3] OCTET STRING (SIZE (2))OPTIONAL } +PDSRInformation::= SEQUENCE +{ + summaryTrigger [0] PDSRSummaryTrigger, + firstPacketTimestamp [1] GeneralizedTime, + lastPacketTimestamp [2] GeneralizedTime, + packetCount [3] INTEGER, + byteCount [4] INTEGER, + ... +} + +PDSRSummaryTrigger ::= ENUMERATED +{ + startOfFlow(0), + timerExpiry(1), + packetCount(2), + byteCount(3), + endOfFlow(4), + ... +} + + END -- end of IPAccessPDU -- GitLab From 77eb9403c9f258c2f3e53f53c6b3d1ca325a7ac6 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 6 Apr 2021 00:00:00 +0000 Subject: [PATCH 005/208] TS 102 232-5 v3.14.1 (2021-04-06) agreed at LI#56-e (Online, 2021-02-15) --- 102232-5/IPMultimediaPDU.asn | 17 ++++++++++------- ...aPDU,ver12.txt => IPMultimediaPDU,ver13.txt} | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) rename 102232-5/portal/{IPMultimediaPDU,ver12.txt => IPMultimediaPDU,ver13.txt} (93%) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 67e9fbe..d70768d 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -4,7 +4,7 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -22,8 +22,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -107,9 +107,11 @@ IPIRIContents ::= CHOICE originalIPMMMessage [0] OCTET STRING, -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address + -- Copy of the SIP content and the source and destination IP address of the intercepted + -- SIP message as transmitted on the network layer (see clause 5.2.7). h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address + -- Copy of the H.323 content and the source and destination IP address of the intercepted + -- H.323 message as transmitted on the network layer (see clause 5.2.7). ..., nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, -- This parameter is used according to national regulations @@ -120,8 +122,9 @@ IPIRIContents ::= CHOICE -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers -- see clause 5.2.6. iRIOnlySIPMessage [6] SIPMessage - -- Copy of the SIP content and the source and destination IP address - -- see clause 5.2.6. + -- Copy of the SIP content and the source and destination IP address of the intercepted + -- SIP message as transmitted on the network layer. + -- (see clause 5.2.6 and 5.2.7). } SIPMessage ::= SEQUENCE diff --git a/102232-5/portal/IPMultimediaPDU,ver12.txt b/102232-5/portal/IPMultimediaPDU,ver13.txt similarity index 93% rename from 102232-5/portal/IPMultimediaPDU,ver12.txt rename to 102232-5/portal/IPMultimediaPDU,ver13.txt index 67e9fbe..d70768d 100644 --- a/102232-5/portal/IPMultimediaPDU,ver12.txt +++ b/102232-5/portal/IPMultimediaPDU,ver13.txt @@ -4,7 +4,7 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -22,8 +22,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -107,9 +107,11 @@ IPIRIContents ::= CHOICE originalIPMMMessage [0] OCTET STRING, -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address + -- Copy of the SIP content and the source and destination IP address of the intercepted + -- SIP message as transmitted on the network layer (see clause 5.2.7). h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address + -- Copy of the H.323 content and the source and destination IP address of the intercepted + -- H.323 message as transmitted on the network layer (see clause 5.2.7). ..., nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, -- This parameter is used according to national regulations @@ -120,8 +122,9 @@ IPIRIContents ::= CHOICE -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers -- see clause 5.2.6. iRIOnlySIPMessage [6] SIPMessage - -- Copy of the SIP content and the source and destination IP address - -- see clause 5.2.6. + -- Copy of the SIP content and the source and destination IP address of the intercepted + -- SIP message as transmitted on the network layer. + -- (see clause 5.2.6 and 5.2.7). } SIPMessage ::= SEQUENCE -- GitLab From d53b7681889636b169d5a4417519eba4c6d8f49b Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 8 Apr 2021 00:00:00 +0000 Subject: [PATCH 008/208] TS 102 657 v1.27.1 (2021-04-08) agreed at LI#56-e (Online, 2021-02-15) --- 102657/RDMessage.asn | 7 +- 102657/RDMessage.xsd | 7 +- ...{RDMessagever23.txt => RDMessagever25.txt} | 124 ++++++++++++------ ...{RDMessagever23.xsd => RDMessagever25.xsd} | 39 +++++- 4 files changed, 125 insertions(+), 52 deletions(-) rename 102657/portal/{RDMessagever23.txt => RDMessagever25.txt} (97%) rename 102657/portal/{RDMessagever23.xsd => RDMessagever25.xsd} (98%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 9f4ff32..ea717ef 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version24(24)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version25(25)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version24(24)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version25(25)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -457,7 +457,8 @@ IndividualInfo ::= SEQUENCE { male(0), female(1), - ... + ..., + other(2) } OPTIONAL, identificationNumber [5] UTF8String OPTIONAL, authenticationInfo [6] AuthenticationInfo OPTIONAL, diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index f075f34..e74c0c2 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.26.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.27.1 @@ -603,6 +603,7 @@ + @@ -2366,7 +2367,7 @@ - + diff --git a/102657/portal/RDMessagever23.txt b/102657/portal/RDMessagever25.txt similarity index 97% rename from 102657/portal/RDMessagever23.txt rename to 102657/portal/RDMessagever25.txt index e806118..ea717ef 100644 --- a/102657/portal/RDMessagever23.txt +++ b/102657/portal/RDMessagever25.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version23(23)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version25(25)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version23(23)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version25(25)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -457,7 +457,8 @@ IndividualInfo ::= SEQUENCE { male(0), female(1), - ... + ..., + other(2) } OPTIONAL, identificationNumber [5] UTF8String OPTIONAL, authenticationInfo [6] AuthenticationInfo OPTIONAL, @@ -665,10 +666,13 @@ ICCIDInfo ::= SEQUENCE -- PUK2 code associated with the ICCID iMSI [5] IMSI OPTIONAL, sUPI [6] SUPI OPTIONAL, - gPSI [7] GPSI OPTIONAL + gPSI [7] GPSI OPTIONAL, + eID [8] NumericString (SIZE (32)) OPTIONAL + -- Identifier of the eUICC according to GSMA SGP.02, clause 2.2.2 [53] } + LoginInfo ::= SEQUENCE { login [1] UTF8String OPTIONAL, @@ -1322,10 +1326,12 @@ Location ::= SEQUENCE NCGI ::= SEQUENCE { - pLMNID [1] PLMNID, - nRCellID [2] NRCellID + pLMNID [1] PLMNID, + nRCellID [2] NRCellID, + ... } + N3gppaLocation ::= SEQUENCE { n3gppTai [1] OCTET STRING (SIZE (5..6)) OPTIONAL, @@ -2517,9 +2523,13 @@ NwAccessType ::= ENUMERATED wimax(6), mobilePacketData(7), -- Network access over GSM/3GPP GPRS, UMTS, etc. - ... + ..., + gPON(8) + -- Gigabit capable Passive Optical Network access, based on Optical Line Terminal, + -- see ITU-T G.984-1 [54] } + DialUpInformation ::= SEQUENCE { diallingNumber [1] PartyNumber OPTIONAL, @@ -2583,10 +2593,12 @@ EPSInformation ::= SEQUENCE -- RAT Type coding according to ETSI TS 129 274 [32] clause 8.17 -- NOTE - as of v1.23.1 of the present document, this field has changed to optional ePSEvent [15] EPSEvent OPTIONAL, - ... + ..., + uERadioCapID [16] UERadioCapID OPTIONAL } + IMSIUnauthenticatedFlag ::= BOOLEAN -- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI @@ -2628,59 +2640,65 @@ EPSEvent ::= ENUMERATED FIVEGSInformation ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - dNN [2] UTF8String OPTIONAL, - gPSI [3] GPSI OPTIONAL, - pEI [4] PEI OPTIONAL, + sUPI [1] SUPI OPTIONAL, + dNN [2] UTF8String OPTIONAL, + gPSI [3] GPSI OPTIONAL, + pEI [4] PEI OPTIONAL, pDUSessionID [6] INTEGER (0..255) OPTIONAL, - sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL, + sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL, pDUIpv4Address [8] IPAddress OPTIONAL, pDUIpv6Address [9] IPAddress OPTIONAL, - pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL, - rFSPIndex [11] INTEGER (1..255) OPTIONAL, + pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL, + rFSPIndex [11] INTEGER (1..255) OPTIONAL, applicationId [12] UTF8String OPTIONAL, - applicationServiceProviderIdentity [13] UTF8String OPTIONAL, - serviceId [14] INTEGER OPTIONAL, - chargingId [15] UTF8String OPTIONAL, - pDUType [16] PDUSessionType OPTIONAL, - sSCMode [17] SSCMode OPTIONAL, - vPLMNId [18] PLMNID OPTIONAL, - hPLMNId [19] PLMNID OPTIONAL, - chargingCharacteristics [20] UTF8String OPTIONAL, - chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL, + applicationServiceProviderIdentity [13] UTF8String OPTIONAL, + serviceId [14] INTEGER OPTIONAL, + chargingId [15] UTF8String OPTIONAL, + pDUType [16] PDUSessionType OPTIONAL, + sSCMode [17] SSCMode OPTIONAL, + vPLMNId [18] PLMNID OPTIONAL, + hPLMNId [19] PLMNID OPTIONAL, + chargingCharacteristics [20] UTF8String OPTIONAL, + chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL, pDUSessionStartTime [22] GeneralizedTime OPTIONAL, pDUSessionStopTime [23] GeneralizedTime OPTIONAL, - lowPriorityIndicator [24] BOOLEAN OPTIONAL, + lowPriorityIndicator [24] BOOLEAN OPTIONAL, dataOffStatus [25] BOOLEAN OPTIONAL, - diagnostics [26] INTEGER OPTIONAL, - uETimeZone [27] UTF8String OPTIONAL, - uPFAddress [28] IPAddress OPTIONAL, - aMFAddress [29] IPAddress OPTIONAL, - uDMAddress [30] IPAddress OPTIONAL, - sMFAddress [31] IPAddress OPTIONAL, - uPFId [32] UUID OPTIONAL, + diagnostics [26] INTEGER OPTIONAL, + uETimeZone [27] UTF8String OPTIONAL, + uPFAddress [28] IPAddress OPTIONAL, + aMFAddress [29] IPAddress OPTIONAL, + uDMAddress [30] IPAddress OPTIONAL, + sMFAddress [31] IPAddress OPTIONAL, + uPFId [32] UUID OPTIONAL, aMFIdentifier [33] AMFID OPTIONAL, uDMIdentifier [34] UUID OPTIONAL, sMFIdentifier [35] UUID OPTIONAL, uPFPDNAddress [36] IPAddress OPTIONAL, - uPFPDNAddressExtension [37] IPAddress OPTIONAL, + uPFPDNAddressExtension [37] IPAddress OPTIONAL, dynamicAddressFlag [38] BOOLEAN OPTIONAL, - dynamicAddressFlagExt [39] BOOLEAN OPTIONAL, - rAT5Type [40] RAT5Type OPTIONAL, - flowQosInfo [41] OCTET STRING OPTIONAL, - serviceID [42] INTEGER OPTIONAL - + dynamicAddressFlagExt [39] BOOLEAN OPTIONAL, + rAT5Type [40] RAT5Type OPTIONAL, + flowQosInfo [41] OCTET STRING OPTIONAL, + serviceID [42] INTEGER OPTIONAL, + ..., + uERadioCapID [43] UERadioCapID OPTIONAL, + rANSecondaryRATType [44] RAT5Type OPTIONAL } + + PDUSessionType ::= ENUMERATED { iPv4(1), iPv6(2), iPv4v6(3), unstructured(4), - ethernet(5) + ethernet(5), + ... } + -- ==================================== -- Definitions of Network Access Device -- ==================================== @@ -2699,9 +2717,11 @@ NADevice ::= SEQUENCE dslID [5] UTF8String OPTIONAL, imei [6] IMEI OPTIONAL, ..., - subscriberID [7] NaSubscriberID OPTIONAL + subscriberID [7] NaSubscriberID OPTIONAL, + uERadioCapID [8] UERadioCapID OPTIONAL } + SUPI ::= CHOICE { iMSI [1] IMSI, @@ -2719,9 +2739,11 @@ GPSI ::= CHOICE PEI ::= CHOICE { iMEI [1] IMEI, - iMEISV [2] IMEISV + iMEISV [2] IMEISV, + ... } + IMEI ::= OCTET STRING (SIZE(8)) -- format as per 3GPP TS 09.02 [8] -- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even @@ -2734,6 +2756,9 @@ IMSI ::= OCTET STRING (SIZE(3..8)) NAI ::= UTF8String +UERadioCapID ::= UTF8String (SIZE(12..22)) + -- format as per ETSI TS 123 003 [41] clause 29.2 + -- ====================================== -- Definitions of Message Network element -- ====================================== @@ -2849,14 +2874,27 @@ RAT5Type ::= ENUMERATED eutra(2), wlan(3), virtual(4), - ... + ..., + nBIoT(5), + wireline(6), + wirelineCable(7), + wirelineDSL(8), + wirelinePON(9), + lTEM(10), + nRU(11), + eUTRAU(12), + trustedN3GA(13), + trustedWLAN(14), + uTRA(15), + gERA(16) } AMFID ::= SEQUENCE { aMFRegionID [1] AMFRegionID, aMFSetID [2] AMFSetID, - aMFPointer [3] AMFPointer + aMFPointer [3] AMFPointer, + ... } AMFRegionID ::= INTEGER (0..255) diff --git a/102657/portal/RDMessagever23.xsd b/102657/portal/RDMessagever25.xsd similarity index 98% rename from 102657/portal/RDMessagever23.xsd rename to 102657/portal/RDMessagever25.xsd index 0f6a4b5..e74c0c2 100644 --- a/102657/portal/RDMessagever23.xsd +++ b/102657/portal/RDMessagever25.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.25.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.27.1 @@ -282,6 +282,7 @@ + @@ -602,6 +603,7 @@ + @@ -665,6 +667,14 @@ + + + + + + + + @@ -1498,7 +1508,7 @@ - + @@ -2251,6 +2261,7 @@ + @@ -2354,6 +2365,9 @@ + + + @@ -2381,6 +2395,18 @@ + + + + + + + + + + + + @@ -2435,6 +2461,7 @@ + @@ -3240,4 +3267,10 @@ + + + + + + -- GitLab From a90368a9021f66507f53696bba31f3687010f3cd Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 31 Mar 2021 00:00:00 +0000 Subject: [PATCH 009/208] TS 103 120 v1.8.1 (2021-03-31) agreed at LI#56-e (Online, 2021-02-15) --- .../ts_103120_ETSIDictionaryDefinitions.xml | 147 +++++++++-- .../mutliple-auth-example-request.xml | 2 +- 103120/examples/request1.xml | 10 +- 103120/examples/request2.xml | 6 +- 103120/examples/request3.xml | 8 +- 103120/examples/request4.xml | 14 +- ...-Delivery.xml => request5-Binary-Deli.xml} | 8 +- ...XML-Delivery.xml => request5-XML-Deli.xml} | 8 +- 103120/examples/response1.xml | 6 +- 103120/examples/response2.xml | 12 +- 103120/examples/response3.xml | 8 +- 103120/examples/response4.xml | 6 +- 103120/examples/response5.xml | 6 +- ...sd => ts_103120v010801p0_Dictionaries.xsd} | 0 ...20v010801p0_ETSIDictionaryDefinitions.xml} | 183 ++++++++++++-- .../mutliple-auth-example-request.xml | 51 ++++ 103120/portal/examples/request1.xml | 10 +- 103120/portal/examples/request2.xml | 6 +- 103120/portal/examples/request3.xml | 8 +- 103120/portal/examples/request4.xml | 14 +- .../examples/request5-Binary-Delivery.xml | 8 +- .../portal/examples/request5-XML-Delivery.xml | 8 +- 103120/portal/examples/response1.xml | 6 +- 103120/portal/examples/response2.xml | 12 +- 103120/portal/examples/response3.xml | 8 +- 103120/portal/examples/response4.xml | 6 +- 103120/portal/examples/response5.xml | 6 +- 103120/portal/schema/TS_103_280_v020401.xsd | 239 ------------------ ...d => ts_103120v010801p0_Authorisation.xsd} | 6 +- ...mmon.xsd => ts_103120v010801p0_Common.xsd} | 0 ...0_Core.xsd => ts_103120v010801p0_Core.xsd} | 0 ...ry.xsd => ts_103120v010801p0_Delivery.xsd} | 0 ...nt.xsd => ts_103120v010801p0_Document.xsd} | 6 +- ...sd => ts_103120v010801p0_Notification.xsd} | 0 ...0_Task.xsd => ts_103120v010801p0_Task.xsd} | 8 +- 103120/portal/validate_examples.py | 42 --- ...103120_Delivery.xsd => ts_103120_Deli.xsd} | 0 103120/validate_examples.py | 49 ---- 38 files changed, 443 insertions(+), 474 deletions(-) rename 103120/examples/{request5-Binary-Delivery.xml => request5-Binary-Deli.xml} (92%) rename 103120/examples/{request5-XML-Delivery.xml => request5-XML-Deli.xml} (95%) rename 103120/portal/dictionaries/{ts_103120v010401p0_Dictionaries.xsd => ts_103120v010801p0_Dictionaries.xsd} (100%) rename 103120/portal/dictionaries/{ts_103120v010401p0_ETSIDictionaryDefinitions.xml => ts_103120v010801p0_ETSIDictionaryDefinitions.xml} (61%) create mode 100644 103120/portal/examples/mutliple-auth-example-request.xml delete mode 100644 103120/portal/schema/TS_103_280_v020401.xsd rename 103120/portal/schema/{ts_103120v010501p0_Authorisation.xsd => ts_103120v010801p0_Authorisation.xsd} (93%) rename 103120/portal/schema/{ts_103120v010501p0_Common.xsd => ts_103120v010801p0_Common.xsd} (100%) rename 103120/portal/schema/{ts_103120v010501p0_Core.xsd => ts_103120v010801p0_Core.xsd} (100%) rename 103120/portal/schema/{ts_103120v010501p0_Delivery.xsd => ts_103120v010801p0_Delivery.xsd} (100%) rename 103120/portal/schema/{ts_103120v010501p0_Document.xsd => ts_103120v010801p0_Document.xsd} (93%) rename 103120/portal/schema/{ts_103120v010501p0_Notification.xsd => ts_103120v010801p0_Notification.xsd} (100%) rename 103120/portal/schema/{ts_103120v010501p0_Task.xsd => ts_103120v010801p0_Task.xsd} (97%) delete mode 100644 103120/portal/validate_examples.py rename 103120/schema/{ts_103120_Delivery.xsd => ts_103120_Deli.xsd} (100%) delete mode 100644 103120/validate_examples.py diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 1a463ac..d571102 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -1,6 +1,6 @@ - + ETSI ObjectType @@ -30,7 +30,7 @@ - + ETSI AuthorisationLegalType @@ -40,7 +40,7 @@ - + ETSI AuthorisationPriority @@ -54,7 +54,7 @@ - + ETSI AuthorisationStatus @@ -92,7 +92,7 @@ - + ETSI AuthorisationDesiredStatus @@ -126,7 +126,7 @@ - + ETSI AuthorisationFlag @@ -144,7 +144,7 @@ - + ETSI DocumentStatus @@ -178,7 +178,7 @@ - + ETSI DocumentDesiredStatus @@ -208,17 +208,17 @@ - + ETSI DocumentType Warrant - This Document represents a legal Warrant + This Document represents a legal warrant - + ETSI NotificationType @@ -228,7 +228,7 @@ - + ETSI TaskStatus @@ -270,7 +270,7 @@ - + ETSI TaskDesiredStatus @@ -304,12 +304,12 @@ - + ETSI TaskServiceType - + - + ETSI TaskDeliveryType @@ -327,7 +327,7 @@ - + ETSI HandoverFormat @@ -357,7 +357,7 @@ - + ETSI TaskFlag @@ -372,14 +372,83 @@ IsNonLocal Indicates that the current Task shall be intercepted as a non-local identity. - + IsLocal Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed. - + + + + + ETSI + LDTaskStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + DisclosureNotAvailable + The Task has been processed and the CSP has determined there is no product available to disclosure + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + + + Error + The Task has not been processed due to a problem with the underlying LD system + + + Invalid + The Task is not active due to a problem with the current information populated in the Task Object + + + + + ETSI + LDTaskDesiredStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + - + + ETSI + RequestType + + + ETSI LDHandoverFormat @@ -401,4 +470,40 @@ + + ETSI + LDTaskFlag + + + IsTest + Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + + IsEmergency + Indicates if the LD Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + + IsNonLocal + Indicates that the current Task shall disclose information about a non-local identity. + + + IsLocal + Indicates that the current Task shall disclose information about a local identity. If both the IsNonLocal and IsLocal flag are absent, the identity provided within the Task shall be considered as a local identity unless otherwise agreed. + + + + + ETSI + ManifestSpecification + + + TS102657-ASN.1 + Delievery according to ETSI TS 102 657 using ASN.1 encoding + + + TS102657-XML + Delievery according to ETSI TS 102 657 using XML encoding + + + diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml index 198e00a..5e5f226 100644 --- a/103120/examples/mutliple-auth-example-request.xml +++ b/103120/examples/mutliple-auth-example-request.xml @@ -12,7 +12,7 @@ d442c58c-d5e1-4fd9-90ec-9c228ad947f1 2020-09-22T08:06:17.025833Z - V1.7.1 + V1.8.1 XX v1.1.1 diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index 34ecaed..e8b6a5f 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z @@ -41,7 +41,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index 81476ba..67cbefd 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index 59d4621..5da0df3 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 4193f541-5e19-468e-b4a3-1c636ce115e9 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index c4e750d..555974f 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2019-09-30T12:00:00Z @@ -41,11 +41,11 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 - XX-SENDER01-1234 + XX-ACTOR01-1234 2019-09-30T12:00:00Z 2019-12-30T12:00:00Z @@ -68,7 +68,7 @@ XX - RECEIVER01 + ACTOR02 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Deli.xml similarity index 92% rename from 103120/examples/request5-Binary-Delivery.xml rename to 103120/examples/request5-Binary-Deli.xml index 048837e..7d51707 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Deli.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR2 XX - RECEIVER01 + ACTOR1 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - XX-SENDER01-12345 + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Deli.xml similarity index 95% rename from 103120/examples/request5-XML-Delivery.xml rename to 103120/examples/request5-XML-Deli.xml index f663660..f9314cd 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Deli.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - ExampleLIID + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index aca92d1..25aa22c 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 1980184..9ae5d35 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 1 2015-09-01T12:00:00Z W000001 @@ -52,7 +52,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 1 7dbbc880-8750-4d3c-abe7-ea4a17646045 @@ -89,7 +89,7 @@ XX - RECVER01 + ACTOR02 3000 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index 6487a8d..e3b1537 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -33,7 +33,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 2 4193f541-5e19-468e-b4a3-1c636ce115e9 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index 4a5e16c..a8dc811 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index 030867e..e210444 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -8,16 +8,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd b/103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd similarity index 100% rename from 103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd rename to 103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd diff --git a/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml b/103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml similarity index 61% rename from 103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml rename to 103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml index 477914c..d571102 100644 --- a/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml +++ b/103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml @@ -1,6 +1,6 @@ - + ETSI ObjectType @@ -18,11 +18,19 @@ Task - A Task Object as defined in section 8.2 - + An LI Task Object as defined in section 8.2 + + + LDTask + An LD Task Object as defined in section 8.3 + + + Delivery + A Delivery Object as defined in section 10 + - + ETSI AuthorisationLegalType @@ -32,7 +40,7 @@ - + ETSI AuthorisationPriority @@ -46,7 +54,7 @@ - + ETSI AuthorisationStatus @@ -84,7 +92,7 @@ - + ETSI AuthorisationDesiredStatus @@ -118,7 +126,7 @@ - + ETSI AuthorisationFlag @@ -136,7 +144,7 @@ - + ETSI DocumentStatus @@ -170,7 +178,7 @@ - + ETSI DocumentDesiredStatus @@ -200,17 +208,17 @@ - + ETSI DocumentType Warrant - This Document represents a legal Warrant + This Document represents a legal warrant - + ETSI NotificationType @@ -220,7 +228,7 @@ - + ETSI TaskStatus @@ -262,7 +270,7 @@ - + ETSI TaskDesiredStatus @@ -296,12 +304,12 @@ - + ETSI TaskServiceType - + - + ETSI TaskDeliveryType @@ -319,7 +327,7 @@ - + ETSI HandoverFormat @@ -349,7 +357,7 @@ - + ETSI TaskFlag @@ -361,6 +369,141 @@ IsEmergency Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + IsNonLocal + Indicates that the current Task shall be intercepted as a non-local identity. + + + IsLocal + Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed. + + + + + ETSI + LDTaskStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + DisclosureNotAvailable + The Task has been processed and the CSP has determined there is no product available to disclosure + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + + + Error + The Task has not been processed due to a problem with the underlying LD system + + + Invalid + The Task is not active due to a problem with the current information populated in the Task Object + + + + + ETSI + LDTaskDesiredStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + + + + + ETSI + RequestType + + + + ETSI + LDHandoverFormat + + + TS102657 + Handed over in ETSI TS 102 657 format, using HI-B + + + EncapsulatedTS102657 + Handed over as ETSI TS 102 657 format using the DeliveryObject as described in clause 10 + + + TS103120 + Handed over using the DeliveryObject as described in clause 10 + + + TS103707 + Handed over as ETSI TS 103 707, using the DeliveryObject as described in clause 10 + + + + + ETSI + LDTaskFlag + + + IsTest + Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + + IsEmergency + Indicates if the LD Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + + IsNonLocal + Indicates that the current Task shall disclose information about a non-local identity. + + + IsLocal + Indicates that the current Task shall disclose information about a local identity. If both the IsNonLocal and IsLocal flag are absent, the identity provided within the Task shall be considered as a local identity unless otherwise agreed. + + + ETSI + ManifestSpecification + + + TS102657-ASN.1 + Delievery according to ETSI TS 102 657 using ASN.1 encoding + + + TS102657-XML + Delievery according to ETSI TS 102 657 using XML encoding + + + diff --git a/103120/portal/examples/mutliple-auth-example-request.xml b/103120/portal/examples/mutliple-auth-example-request.xml new file mode 100644 index 0000000..5e5f226 --- /dev/null +++ b/103120/portal/examples/mutliple-auth-example-request.xml @@ -0,0 +1,51 @@ + + +
+ + XX + Sender + + + XX + Receiver + + d442c58c-d5e1-4fd9-90ec-9c228ad947f1 + 2020-09-22T08:06:17.025833Z + + V1.8.1 + XX + v1.1.1 + +
+ + + + + 1 + + + cd3994b1-e5f3-4b59-a852-5fecd02bd247 + + Single Approval + + + + + + 2 + + + 64e8681a-a4de-4dea-9686-4a2a15e54786 + + First of two approvals + + + Second of two approvals + + + + + + + + \ No newline at end of file diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml index 94e2680..e8b6a5f 100644 --- a/103120/portal/examples/request1.xml +++ b/103120/portal/examples/request1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z @@ -41,7 +41,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml index 4841ccf..67cbefd 100644 --- a/103120/portal/examples/request2.xml +++ b/103120/portal/examples/request2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml index 4de508d..5da0df3 100644 --- a/103120/portal/examples/request3.xml +++ b/103120/portal/examples/request3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 4193f541-5e19-468e-b4a3-1c636ce115e9 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml index d3a0da0..555974f 100644 --- a/103120/portal/examples/request4.xml +++ b/103120/portal/examples/request4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2019-09-30T12:00:00Z @@ -41,11 +41,11 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 - XX-SENDER01-1234 + XX-ACTOR01-1234 2019-09-30T12:00:00Z 2019-12-30T12:00:00Z @@ -68,7 +68,7 @@ XX - RECEIVER01 + ACTOR02 diff --git a/103120/portal/examples/request5-Binary-Delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml index ae0caca..7d51707 100644 --- a/103120/portal/examples/request5-Binary-Delivery.xml +++ b/103120/portal/examples/request5-Binary-Delivery.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR2 XX - RECEIVER01 + ACTOR1 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - XX-SENDER01-12345 + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml index b70a8f7..f9314cd 100644 --- a/103120/portal/examples/request5-XML-Delivery.xml +++ b/103120/portal/examples/request5-XML-Delivery.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - ExampleLIID + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml index 5378b8e..25aa22c 100644 --- a/103120/portal/examples/response1.xml +++ b/103120/portal/examples/response1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml index 73da83e..9ae5d35 100644 --- a/103120/portal/examples/response2.xml +++ b/103120/portal/examples/response2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 1 2015-09-01T12:00:00Z W000001 @@ -52,7 +52,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 1 7dbbc880-8750-4d3c-abe7-ea4a17646045 @@ -89,7 +89,7 @@ XX - RECVER01 + ACTOR02 3000 diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml index 44ba51e..e3b1537 100644 --- a/103120/portal/examples/response3.xml +++ b/103120/portal/examples/response3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -33,7 +33,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 2 4193f541-5e19-468e-b4a3-1c636ce115e9 diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml index 39c27e6..a8dc811 100644 --- a/103120/portal/examples/response4.xml +++ b/103120/portal/examples/response4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml index e135903..e210444 100644 --- a/103120/portal/examples/response5.xml +++ b/103120/portal/examples/response5.xml @@ -8,16 +8,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/schema/TS_103_280_v020401.xsd b/103120/portal/schema/TS_103_280_v020401.xsd deleted file mode 100644 index 1f32155..0000000 --- a/103120/portal/schema/TS_103_280_v020401.xsd +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/103120/portal/schema/ts_103120v010501p0_Authorisation.xsd b/103120/portal/schema/ts_103120v010801p0_Authorisation.xsd similarity index 93% rename from 103120/portal/schema/ts_103120v010501p0_Authorisation.xsd rename to 103120/portal/schema/ts_103120v010801p0_Authorisation.xsd index 14b50d7..72e87c0 100644 --- a/103120/portal/schema/ts_103120v010501p0_Authorisation.xsd +++ b/103120/portal/schema/ts_103120v010801p0_Authorisation.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2016/02/Authorisation" - targetNamespace="http://uri.etsi.org/03120/common/2016/02/Authorisation" + xmlns="http://uri.etsi.org/03120/common/2020/09/Authorisation" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Authorisation" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -26,7 +26,7 @@ - + diff --git a/103120/portal/schema/ts_103120v010501p0_Common.xsd b/103120/portal/schema/ts_103120v010801p0_Common.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Common.xsd rename to 103120/portal/schema/ts_103120v010801p0_Common.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Core.xsd b/103120/portal/schema/ts_103120v010801p0_Core.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Core.xsd rename to 103120/portal/schema/ts_103120v010801p0_Core.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Delivery.xsd b/103120/portal/schema/ts_103120v010801p0_Delivery.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Delivery.xsd rename to 103120/portal/schema/ts_103120v010801p0_Delivery.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Document.xsd b/103120/portal/schema/ts_103120v010801p0_Document.xsd similarity index 93% rename from 103120/portal/schema/ts_103120v010501p0_Document.xsd rename to 103120/portal/schema/ts_103120v010801p0_Document.xsd index 86b7192..af6f139 100644 --- a/103120/portal/schema/ts_103120v010501p0_Document.xsd +++ b/103120/portal/schema/ts_103120v010801p0_Document.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2016/02/Document" - targetNamespace="http://uri.etsi.org/03120/common/2016/02/Document" + xmlns="http://uri.etsi.org/03120/common/2020/09/Document" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Document" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -24,7 +24,7 @@ - + diff --git a/103120/portal/schema/ts_103120v010501p0_Notification.xsd b/103120/portal/schema/ts_103120v010801p0_Notification.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Notification.xsd rename to 103120/portal/schema/ts_103120v010801p0_Notification.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Task.xsd b/103120/portal/schema/ts_103120v010801p0_Task.xsd similarity index 97% rename from 103120/portal/schema/ts_103120v010501p0_Task.xsd rename to 103120/portal/schema/ts_103120v010801p0_Task.xsd index ed8974e..ae3e65e 100644 --- a/103120/portal/schema/ts_103120v010501p0_Task.xsd +++ b/103120/portal/schema/ts_103120v010801p0_Task.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2019/10/Task" - targetNamespace="http://uri.etsi.org/03120/common/2019/10/Task" + xmlns="http://uri.etsi.org/03120/common/2020/09/Task" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Task" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -23,7 +23,7 @@ - + @@ -123,7 +123,7 @@ - + diff --git a/103120/portal/validate_examples.py b/103120/portal/validate_examples.py deleted file mode 100644 index 60c611c..0000000 --- a/103120/portal/validate_examples.py +++ /dev/null @@ -1,42 +0,0 @@ -import glob -import sys -from pathlib import Path -from pprint import pprint - -if __name__ == '__main__': - - if sys.version_info <= (3, 5): - sys.exit('ERROR: You need at least Python 3.5 to run this tool') - - try: - from lxml import etree - except ImportError: - sys.exit('ERROR: You need to install the Python lxml library') - - try: - import xmlschema - except ImportError: - sys.exit('ERROR: You need to install the xml schema library') - - - locations = [] - schemaFiles = glob.glob('schema/*.xsd') - for schemaFile in schemaFiles: - xs = xmlschema.XMLSchema(schemaFile, validation='skip') - locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - - coreSchema = xmlschema.XMLSchema('schema/ts_103120v010501p0_Core.xsd', locations=locations) - - for schema in schemaFiles: - newSchema = xmlschema.XMLSchema(schema, locations=locations) - coreSchema.import_schema(newSchema.default_namespace, schema) - - examples = glob.glob('examples/*.xml') - for example in examples: - try: - coreSchema.validate(example) - print ("{0} passed validation".format(example)) - except Exception as ex: - print ("{0} failed validation: {1}".format(example, ex)) - - print ('Done') \ No newline at end of file diff --git a/103120/schema/ts_103120_Delivery.xsd b/103120/schema/ts_103120_Deli.xsd similarity index 100% rename from 103120/schema/ts_103120_Delivery.xsd rename to 103120/schema/ts_103120_Deli.xsd diff --git a/103120/validate_examples.py b/103120/validate_examples.py deleted file mode 100644 index 133bad9..0000000 --- a/103120/validate_examples.py +++ /dev/null @@ -1,49 +0,0 @@ -import glob -import sys -from pathlib import Path -from pprint import pprint - -if __name__ == '__main__': - - if sys.version_info <= (3, 5): - sys.exit('ERROR: You need at least Python 3.5 to run this tool') - - try: - from lxml import etree - except ImportError: - sys.exit('ERROR: You need to install the Python lxml library') - - try: - import xmlschema - except ImportError: - sys.exit('ERROR: You need to install the xml schema library') - - - locations = [] - schemaFiles = glob.glob('schema/*.xsd') - for schemaFile in schemaFiles: - xs = xmlschema.XMLSchema(schemaFile, validation='skip') - locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - - etsiSchema = str(Path('../103280/TS_103_280.xsd')) - xs = xmlschema.XMLSchema(etsiSchema, validation='skip') - locations.append((xs.default_namespace, str(Path("../" + etsiSchema)))) - - for location in locations: - print (location) - - coreSchema = xmlschema.XMLSchema('schema/ts_103120_Core.xsd', locations=locations) - - for schema in schemaFiles: - newSchema = xmlschema.XMLSchema(schema, locations=locations) - coreSchema.import_schema(newSchema.default_namespace, schema) - - examples = glob.glob('examples/*.xml') - for example in examples: - try: - coreSchema.validate(example) - print ("{0} passed validation".format(example)) - except Exception as ex: - print ("{0} failed validation: {1}".format(example, ex)) - - print ('Done') \ No newline at end of file -- GitLab From 58211402159fa712623216e8e98fabb76539a7c4 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 6 Apr 2021 00:00:00 +0000 Subject: [PATCH 010/208] TS 103 221-1 v1.8.1 (2021-04-06) agreed at LI#56-e (Online, 2021-02-15) --- 103221-1/TS_103_221_01.xsd | 14 +++++++------- 103221-1/examples/desktop.ini | Bin 0 -> 246 bytes ...1_01_v010601.xsd => TS_103_221_01_v010801.xsd} | 14 +++++++------- 103221-1/{examples => }/validate_examples.py | 0 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 103221-1/examples/desktop.ini rename 103221-1/portal/{TS_103_221_01_v010601.xsd => TS_103_221_01_v010801.xsd} (99%) rename 103221-1/{examples => }/validate_examples.py (100%) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 73a0380..2cf5206 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,5 +1,5 @@ - + @@ -58,7 +58,7 @@ - + @@ -178,17 +178,17 @@ - + - + - + @@ -259,7 +259,7 @@ - + @@ -422,7 +422,7 @@ - + diff --git a/103221-1/examples/desktop.ini b/103221-1/examples/desktop.ini new file mode 100644 index 0000000000000000000000000000000000000000..8b699c692d358fa29d7ac0976e524fe25c5da053 GIT binary patch literal 246 zcmY+9%?iRW5QM+8;5+mIB=`d!gr1a2Pl_Imhf<;jsu82&<2%X0BEyE+-I+;pz_90n zqZ5{@hA7nBI1xB9WT1J-z30J|3NM{w!<~|GR@Agvv(r3^y`*f#OL-Sqw(0|CosANT zUq;k!txejcOv_3d&s)4#6?)@SbC=zgnP7CYVZuDK|CBzXlGDidQH_{NpZ@a&#q=qQ literal 0 HcmV?d00001 diff --git a/103221-1/portal/TS_103_221_01_v010601.xsd b/103221-1/portal/TS_103_221_01_v010801.xsd similarity index 99% rename from 103221-1/portal/TS_103_221_01_v010601.xsd rename to 103221-1/portal/TS_103_221_01_v010801.xsd index 73a0380..2cf5206 100644 --- a/103221-1/portal/TS_103_221_01_v010601.xsd +++ b/103221-1/portal/TS_103_221_01_v010801.xsd @@ -1,5 +1,5 @@ - + @@ -58,7 +58,7 @@ - + @@ -178,17 +178,17 @@ - + - + - + @@ -259,7 +259,7 @@ - + @@ -422,7 +422,7 @@ - + diff --git a/103221-1/examples/validate_examples.py b/103221-1/validate_examples.py similarity index 100% rename from 103221-1/examples/validate_examples.py rename to 103221-1/validate_examples.py -- GitLab From c7f42066adc9c90a69eaa377534c117411fbe76f Mon Sep 17 00:00:00 2001 From: ETSI CTI Date: Fri, 21 Feb 2020 17:30:03 +0100 Subject: [PATCH 014/208] Init --- LICENSE | 24 ++++++++++++++++++++++++ README.md | 9 +++++++++ 2 files changed, 33 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0178072 --- /dev/null +++ b/LICENSE @@ -0,0 +1,24 @@ +Copyright 2020 ETSI + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +3. Neither the name of the copyright holder nor the names of its contributors + may be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/README.md b/README.md new file mode 100644 index 0000000..7592485 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# TC Lawful Interface (LI) - Trial repository + +Trial repository for the ETSI Lawful Interception Technical Committee. + +For more information, visit https://www.etsi.org/committee/li or contact `espsupport` at `etsi` dot `org`. + +## License + +See [LICENSE](LICENSE) file. -- GitLab From 4645384825b35e0f0e0ca006e31495681bab5ed8 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 26 Feb 2020 16:37:47 +0000 Subject: [PATCH 015/208] Initial commit - gitignore and test fixtures --- .gitignore | 13 +++++++++++++ .gitlab-ci.yml | 20 ++++++++++++++++++++ testing/check_asn1.py | 17 +++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 .gitignore create mode 100644 .gitlab-ci.yml create mode 100644 testing/check_asn1.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9c0dc94 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +# OS cruft +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Standards cruft +.doc +.docx +.zip \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..9268863 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,20 @@ +image: "python:3.7" + +before_script: + - python --version + - pip install -q asn1tools + - pip install -q lxml + - pip install -q xmlschema + +stages: + - Check ASN.1 + +checkASN1: + stage: Check ASN.1 + script: + - python test/check_asn1.py + +checkXSD: + stage: Check ASN.1 + script: + - python test/check_xsd.py \ No newline at end of file diff --git a/testing/check_asn1.py b/testing/check_asn1.py new file mode 100644 index 0000000..9c896b6 --- /dev/null +++ b/testing/check_asn1.py @@ -0,0 +1,17 @@ +from asn1tools import parse_files, ParseError +import sys +from glob import glob +from pathlib import Path + + +schemaFileGlob = glob("*.asn1") +if (len(schemaFileGlob) != 1): + sys.exit("Found {0} XSD files, 1 expected".format(len(schemaFileGlob))) + +schemaFile = schemaFileGlob[0] +try: + parse_files(schemaFile) +except ParseError as ex: + sys.exit("ASN1 parser error: " + ex) + +print ("ASN1 schema OK") -- GitLab From 1d98b95256e83b47ce22695dbd846b707c1dbbc0 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 26 Feb 2020 17:54:13 +0100 Subject: [PATCH 016/208] Revert "Initial commit - gitignore and test fixtures" This reverts commit 4645384825b35e0f0e0ca006e31495681bab5ed8 --- .gitignore | 13 ------------- .gitlab-ci.yml | 20 -------------------- testing/check_asn1.py | 17 ----------------- 3 files changed, 50 deletions(-) delete mode 100644 .gitignore delete mode 100644 .gitlab-ci.yml delete mode 100644 testing/check_asn1.py diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9c0dc94..0000000 --- a/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# OS cruft -.DS_Store -.DS_Store? -._* -.Spotlight-V100 -.Trashes -ehthumbs.db -Thumbs.db - -# Standards cruft -.doc -.docx -.zip \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 9268863..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,20 +0,0 @@ -image: "python:3.7" - -before_script: - - python --version - - pip install -q asn1tools - - pip install -q lxml - - pip install -q xmlschema - -stages: - - Check ASN.1 - -checkASN1: - stage: Check ASN.1 - script: - - python test/check_asn1.py - -checkXSD: - stage: Check ASN.1 - script: - - python test/check_xsd.py \ No newline at end of file diff --git a/testing/check_asn1.py b/testing/check_asn1.py deleted file mode 100644 index 9c896b6..0000000 --- a/testing/check_asn1.py +++ /dev/null @@ -1,17 +0,0 @@ -from asn1tools import parse_files, ParseError -import sys -from glob import glob -from pathlib import Path - - -schemaFileGlob = glob("*.asn1") -if (len(schemaFileGlob) != 1): - sys.exit("Found {0} XSD files, 1 expected".format(len(schemaFileGlob))) - -schemaFile = schemaFileGlob[0] -try: - parse_files(schemaFile) -except ParseError as ex: - sys.exit("ASN1 parser error: " + ex) - -print ("ASN1 schema OK") -- GitLab From c95c332f89082b54042d3cb067fdba1a1f71140a Mon Sep 17 00:00:00 2001 From: reinaortega Date: Mon, 2 Mar 2020 15:14:42 +0100 Subject: [PATCH 017/208] v1.1.1 Signed-off-by: reinaortega --- ts_103280.xsd | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 ts_103280.xsd diff --git a/ts_103280.xsd b/ts_103280.xsd new file mode 100644 index 0000000..a99f0b0 --- /dev/null +++ b/ts_103280.xsd @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 5dfb72073527c05d627188416e6362fba862f8f4 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Mon, 2 Mar 2020 16:28:06 +0100 Subject: [PATCH 018/208] v1.2.1 Signed-off-by: reinaortega --- TS_103_280.asn1 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 TS_103_280.asn1 diff --git a/TS_103_280.asn1 b/TS_103_280.asn1 new file mode 100644 index 0000000..406dc28 --- /dev/null +++ b/TS_103_280.asn1 @@ -0,0 +1,14 @@ +Common-Parameters +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} + +DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN + +-- Object Identifier definitions + +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} + +-- Common Parameter: LIID (as defined in clause 6) + +LIID ::= OCTET STRING (SIZE (1..25)) + +END -- GitLab From 654d04bf1a859e7e8b7921811f006ed1a93d562d Mon Sep 17 00:00:00 2001 From: reinaortega Date: Mon, 2 Mar 2020 16:29:18 +0100 Subject: [PATCH 019/208] v2.1.1 Signed-off-by: reinaortega --- TS_103_280.asn1 | 44 ++++++++++++++++++++++++++++++++++++++++++-- ts_103280.xsd | 26 ++++++++++++++++++-------- 2 files changed, 60 insertions(+), 10 deletions(-) diff --git a/TS_103_280.asn1 b/TS_103_280.asn1 index 406dc28..e1d9936 100644 --- a/TS_103_280.asn1 +++ b/TS_103_280.asn1 @@ -1,14 +1,54 @@ Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -- Object Identifier definitions -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} -- Common Parameter: LIID (as defined in clause 6) LIID ::= OCTET STRING (SIZE (1..25)) +-- Common Parameter: TCPPort (as defined in clause 6) + +TCPPort ::= INTEGER (1..65535) + +-- Common Parameter: TCPPortRange (as defined in clause 6) + +TCPPortRange ::= SEQUENCE +{ + start [0] TCPPort, + end [1] TCPPort +} + +-- Common Parameter: UDPPort (as defined in clause 6) + +UDPPort ::= INTEGER (0..65535) + +-- Common Parameter: UDPPortRange (as defined in clause 6) + +UDPPortRange ::= SEQUENCE +{ + start [0] UDPPort, + end [1] UDPPort +} + +-- Common Parameter: Port (as defined in clause 6) + +Port ::= CHOICE +{ + tCPPort [0] TCPPort, + uDPPort [1] UDPPort +} + +-- Common Parameter: PortRange (as defined clause 6) + +PortRange ::= CHOICE +{ + tCPPortRange [0] TCPPortRange, + uDPPortRange [1] UDPPortRange +} + END diff --git a/ts_103280.xsd b/ts_103280.xsd index a99f0b0..23d5c12 100644 --- a/ts_103280.xsd +++ b/ts_103280.xsd @@ -1,5 +1,5 @@ - + @@ -42,7 +42,7 @@ - + @@ -80,13 +80,13 @@ - + - + @@ -116,25 +116,25 @@ - + - + - + - + @@ -155,4 +155,14 @@ + + + + + + + + + + -- GitLab From 5ddd02e714c412b9a7717948d5f8a28b1174b236 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Mon, 2 Mar 2020 16:30:14 +0100 Subject: [PATCH 020/208] v2.2.1 Signed-off-by: reinaortega --- TS_103_280.asn1 | 44 ++++++++++++++++++++++++++++++++++++++++++-- ts_103280.xsd | 46 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 81 insertions(+), 9 deletions(-) diff --git a/TS_103_280.asn1 b/TS_103_280.asn1 index e1d9936..0e186a9 100644 --- a/TS_103_280.asn1 +++ b/TS_103_280.asn1 @@ -1,11 +1,11 @@ Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -- Object Identifier definitions -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} -- Common Parameter: LIID (as defined in clause 6) @@ -51,4 +51,44 @@ PortRange ::= CHOICE uDPPortRange [1] UDPPortRange } +-- Common Parameter: QualifiedDateTime (as defined in clause 6) + +QualifiedDateTime ::= GeneralizedTime + +-- Common Parameter: QualifiedMicrosecondDateTime (as defined in clause 6) + +QualifiedMicrosecondDateTime ::= GeneralizedTime + +-- Common Parameter: WGS84CoordinateDecimal (as defined in clause 6) + +WGS84CoordinateDecimal ::= SEQUENCE +{ + latitude [0] WGS84LatitudeDecimal, + longitude [1] WGS84LongitudeDecimal +} + +-- Common Parameter: WGS84LatitudeDecimal (as defined in clause 6) + +WGS84LatitudeDecimal ::= OCTET STRING (SIZE (10)) + +-- Common Parameter: WGS84LongitudeDecimal (as defined in clause 6) + +WGS84LongitudeDecimal ::= OCTET STRING (SIZE (11)) + +-- Common Parameter: WGS84CoordinateAngular (as defined in clause 6) + +WGS84CoordinateAngular ::= SEQUENCE +{ + latitude [0] WGS84LatitudeAngular, + longitude [1] WGS84LongitudeAngular +} + +-- Common Parameter: WGS84LatitudeAngular (as defined in clause 6) + +WGS84LatitudeAngular ::= OCTET STRING (SIZE (10)) + +-- Common Parameter: WGS8LongitudeAngular (as defined in clause 6) + +WGS84LongitudeAngular ::= OCTET STRING (SIZE (11)) + END diff --git a/ts_103280.xsd b/ts_103280.xsd index 23d5c12..3313fa3 100644 --- a/ts_103280.xsd +++ b/ts_103280.xsd @@ -1,5 +1,5 @@ - + @@ -70,7 +70,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -116,25 +116,25 @@ - + - + - + - + @@ -165,4 +165,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From ea419f739b6987589bc02ea0bd136d3dc33840b6 Mon Sep 17 00:00:00 2001 From: reinaortega Date: Mon, 2 Mar 2020 16:38:07 +0100 Subject: [PATCH 021/208] v2.3.1 Signed-off-by: reinaortega --- TS_103_280.asn1 | 62 ++++++++++++++++++++++++------------------------- ts_103280.xsd | 48 ++++++++++++++++++++++++++++++++------ 2 files changed, 72 insertions(+), 38 deletions(-) diff --git a/TS_103_280.asn1 b/TS_103_280.asn1 index 0e186a9..68cfe54 100644 --- a/TS_103_280.asn1 +++ b/TS_103_280.asn1 @@ -1,94 +1,94 @@ Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -- Object Identifier definitions -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} --- Common Parameter: LIID (as defined in clause 6) +-- Common Parameters (below are as defined in clause 6) LIID ::= OCTET STRING (SIZE (1..25)) --- Common Parameter: TCPPort (as defined in clause 6) - TCPPort ::= INTEGER (1..65535) --- Common Parameter: TCPPortRange (as defined in clause 6) - TCPPortRange ::= SEQUENCE { start [0] TCPPort, end [1] TCPPort } --- Common Parameter: UDPPort (as defined in clause 6) - UDPPort ::= INTEGER (0..65535) --- Common Parameter: UDPPortRange (as defined in clause 6) - UDPPortRange ::= SEQUENCE { start [0] UDPPort, end [1] UDPPort } --- Common Parameter: Port (as defined in clause 6) - Port ::= CHOICE { tCPPort [0] TCPPort, uDPPort [1] UDPPort } --- Common Parameter: PortRange (as defined clause 6) - PortRange ::= CHOICE { tCPPortRange [0] TCPPortRange, uDPPortRange [1] UDPPortRange } --- Common Parameter: QualifiedDateTime (as defined in clause 6) - QualifiedDateTime ::= GeneralizedTime --- Common Parameter: QualifiedMicrosecondDateTime (as defined in clause 6) - QualifiedMicrosecondDateTime ::= GeneralizedTime --- Common Parameter: WGS84CoordinateDecimal (as defined in clause 6) - WGS84CoordinateDecimal ::= SEQUENCE { latitude [0] WGS84LatitudeDecimal, longitude [1] WGS84LongitudeDecimal } --- Common Parameter: WGS84LatitudeDecimal (as defined in clause 6) - WGS84LatitudeDecimal ::= OCTET STRING (SIZE (10)) --- Common Parameter: WGS84LongitudeDecimal (as defined in clause 6) - WGS84LongitudeDecimal ::= OCTET STRING (SIZE (11)) --- Common Parameter: WGS84CoordinateAngular (as defined in clause 6) - WGS84CoordinateAngular ::= SEQUENCE { latitude [0] WGS84LatitudeAngular, longitude [1] WGS84LongitudeAngular } --- Common Parameter: WGS84LatitudeAngular (as defined in clause 6) - WGS84LatitudeAngular ::= OCTET STRING (SIZE (10)) --- Common Parameter: WGS8LongitudeAngular (as defined in clause 6) - WGS84LongitudeAngular ::= OCTET STRING (SIZE (11)) +InternationalE164 ::= NumericString (SIZE(1..15)) + +IMSI ::= NumericString (SIZE(6..15)) + +IMEI ::= NumericString (SIZE(14)) + +IMEICheckDigit ::= NumericString (SIZE(15)) + +IMEISV ::= NumericString (SIZE(16)) + +SUPIIMSI ::= IMSI + +SUPINAI ::= NAI + +SUCI ::= OCTET STRING + +PEIIMEI ::= IMEI + +PEIIMEICheckDigit ::= IMEICheckDigit + +PEIIMEISV ::= IMEISV + +GPSIMSISDN ::= NumericString (SIZE(1..15)) + +GPSINAI ::= NAI + +NAI ::= UTF8String + END diff --git a/ts_103280.xsd b/ts_103280.xsd index 3313fa3..09ac93a 100644 --- a/ts_103280.xsd +++ b/ts_103280.xsd @@ -1,5 +1,5 @@ - + @@ -55,6 +55,11 @@ + + + + + @@ -86,7 +91,7 @@ - + @@ -116,25 +121,25 @@ - + - + - + - + @@ -165,7 +170,7 @@ - + @@ -197,4 +202,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From aa8261cb3b3f55d0a38e2fdb7618ac77aa5ef7cc Mon Sep 17 00:00:00 2001 From: reinaortega Date: Mon, 2 Mar 2020 16:38:49 +0100 Subject: [PATCH 022/208] v2.4.1 Signed-off-by: reinaortega --- ts_103280.xsd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ts_103280.xsd b/ts_103280.xsd index 09ac93a..e5c0bde 100644 --- a/ts_103280.xsd +++ b/ts_103280.xsd @@ -1,5 +1,5 @@ - + @@ -231,4 +231,9 @@ + + + + + -- GitLab From 21618990eebf2a7cbec6cd96f4c12a5e5df0df20 Mon Sep 17 00:00:00 2001 From: rengasamis Date: Tue, 3 Mar 2020 14:11:27 +0100 Subject: [PATCH 023/208] Update TS_103_280.asn1 --- TS_103_280.asn1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TS_103_280.asn1 b/TS_103_280.asn1 index 68cfe54..a833ec7 100644 --- a/TS_103_280.asn1 +++ b/TS_103_280.asn1 @@ -9,7 +9,7 @@ commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization( -- Common Parameters (below are as defined in clause 6) -LIID ::= OCTET STRING (SIZE (1..25)) +LIID ::= OCTET STRING (SIZE (10..25)) TCPPort ::= INTEGER (1..65535) @@ -77,7 +77,7 @@ SUPIIMSI ::= IMSI SUPINAI ::= NAI -SUCI ::= OCTET STRING +SUCI ::= OCTET STRING (SIZE(3000)) PEIIMEI ::= IMEI -- GitLab From 5b893e7e587b07428ebf37ecf1dbb8108ff76e88 Mon Sep 17 00:00:00 2001 From: SvS Date: Tue, 3 Mar 2020 14:16:08 +0100 Subject: [PATCH 024/208] Updated after meeting review --- TS_103_280.asn1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TS_103_280.asn1 b/TS_103_280.asn1 index a833ec7..83a4df8 100644 --- a/TS_103_280.asn1 +++ b/TS_103_280.asn1 @@ -1,15 +1,15 @@ Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version232(232)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -- Object Identifier definitions -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version232(232)} -- Common Parameters (below are as defined in clause 6) -LIID ::= OCTET STRING (SIZE (10..25)) +LIID ::= OCTET STRING (SIZE (10..9000)) TCPPort ::= INTEGER (1..65535) @@ -77,7 +77,7 @@ SUPIIMSI ::= IMSI SUPINAI ::= NAI -SUCI ::= OCTET STRING (SIZE(3000)) +SUCI ::= OCTET STRING (SIZE(3001)) PEIIMEI ::= IMEI -- GitLab From 672696cf73e40528e217b97492fdc8218d72dbcc Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 10:11:56 +0100 Subject: [PATCH 025/208] Cleaning up prior to LI#54 --- TS_103_280.asn1 | 94 ------------------- ts_103280.xsd | 239 ------------------------------------------------ 2 files changed, 333 deletions(-) delete mode 100644 TS_103_280.asn1 delete mode 100644 ts_103280.xsd diff --git a/TS_103_280.asn1 b/TS_103_280.asn1 deleted file mode 100644 index 83a4df8..0000000 --- a/TS_103_280.asn1 +++ /dev/null @@ -1,94 +0,0 @@ -Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version232(232)} - -DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN - --- Object Identifier definitions - -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version232(232)} - --- Common Parameters (below are as defined in clause 6) - -LIID ::= OCTET STRING (SIZE (10..9000)) - -TCPPort ::= INTEGER (1..65535) - -TCPPortRange ::= SEQUENCE -{ - start [0] TCPPort, - end [1] TCPPort -} - -UDPPort ::= INTEGER (0..65535) - -UDPPortRange ::= SEQUENCE -{ - start [0] UDPPort, - end [1] UDPPort -} - -Port ::= CHOICE -{ - tCPPort [0] TCPPort, - uDPPort [1] UDPPort -} - -PortRange ::= CHOICE -{ - tCPPortRange [0] TCPPortRange, - uDPPortRange [1] UDPPortRange -} - -QualifiedDateTime ::= GeneralizedTime - -QualifiedMicrosecondDateTime ::= GeneralizedTime - -WGS84CoordinateDecimal ::= SEQUENCE -{ - latitude [0] WGS84LatitudeDecimal, - longitude [1] WGS84LongitudeDecimal -} - -WGS84LatitudeDecimal ::= OCTET STRING (SIZE (10)) - -WGS84LongitudeDecimal ::= OCTET STRING (SIZE (11)) - -WGS84CoordinateAngular ::= SEQUENCE -{ - latitude [0] WGS84LatitudeAngular, - longitude [1] WGS84LongitudeAngular -} - -WGS84LatitudeAngular ::= OCTET STRING (SIZE (10)) - -WGS84LongitudeAngular ::= OCTET STRING (SIZE (11)) - -InternationalE164 ::= NumericString (SIZE(1..15)) - -IMSI ::= NumericString (SIZE(6..15)) - -IMEI ::= NumericString (SIZE(14)) - -IMEICheckDigit ::= NumericString (SIZE(15)) - -IMEISV ::= NumericString (SIZE(16)) - -SUPIIMSI ::= IMSI - -SUPINAI ::= NAI - -SUCI ::= OCTET STRING (SIZE(3001)) - -PEIIMEI ::= IMEI - -PEIIMEICheckDigit ::= IMEICheckDigit - -PEIIMEISV ::= IMEISV - -GPSIMSISDN ::= NumericString (SIZE(1..15)) - -GPSINAI ::= NAI - -NAI ::= UTF8String - -END diff --git a/ts_103280.xsd b/ts_103280.xsd deleted file mode 100644 index e5c0bde..0000000 --- a/ts_103280.xsd +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- GitLab From 58f005d935ef779259461f65fd5ab08b1691aa30 Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 15 Jun 2020 12:56:13 +0200 Subject: [PATCH 026/208] Adding testing --- .gitignore | 125 ++++++++++++++++++++++++++++++++++++++++++ .gitlab-ci.yml | 13 +++++ testing/check_asn1.py | 96 ++++++++++++++++++++++++++++++++ 3 files changed, 234 insertions(+) create mode 100644 .gitignore create mode 100644 .gitlab-ci.yml create mode 100644 testing/check_asn1.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3e37603 --- /dev/null +++ b/.gitignore @@ -0,0 +1,125 @@ +# Editors +.vscode/ +.idea/ + +# Vagrant +.vagrant/ + +# Mac/OSX +.DS_Store + +# Windows +Thumbs.db + +# Source for the following rules: https://raw.githubusercontent.com/github/gitignore/master/Python.gitignore +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..1b43a20 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,13 @@ +image: "python:3.7" + +before_script: + - python3 --version + - pip3 install -q asn1tools lxml xmlschema + +stages: + - Check Schemas + +checkASN1: + stage: Check Schemas + script: + - python3 testing/check_asn1.py \ No newline at end of file diff --git a/testing/check_asn1.py b/testing/check_asn1.py new file mode 100644 index 0000000..494737c --- /dev/null +++ b/testing/check_asn1.py @@ -0,0 +1,96 @@ +import logging + +from asn1tools import parse_files, compile_dict, ParseError, CompileError +from glob import glob +from pathlib import Path + +from pprint import pprint + + +def parseASN1File (asnFile): + try: + parse_files(asnFile) + except ParseError as ex: + return [ex] + return [] + + +def parseASN1Files (fileList): + if len(fileList) == 0: + logging.warning ("No files specified") + return {} + errors = {} + logging.info("Parsing files...") + for f in fileList: + ex = parseASN1File(f) + if ex: + logging.info (f" {f}: Failed - {ex!r}") + else: + logging.info (f" {f}: OK") + errors[f] = ex + return errors + + +def compileASN1Files (fileList): + logging.info("Compiling files...") + errors = [] + try: + d = parse_files(fileList) + for modulename, module in d.items(): + # Weird fix because the compiler doesn't like RELATIVE-OID as a type + # Not sure if the on-the-wire encoding would be affected or not + # but for most checking purposes this doesn't matter + module['types']["RELATIVE-OID"] = {'type' : 'OBJECT IDENTIFIER'} + c = compile_dict(d) + except CompileError as ex: + logging.info (f"Compiler error: {ex}") + errors.append(ex) + except ParseError as ex: + logging.info (f"Parse error: {ex}") + errors.append(ex) + logging.info ("Compiled OK") + return errors + + +def validateASN1Files (fileList): + parseErrors = parseASN1Files(fileList) +# if len(parseErrors > 0): +# logging.info ("Abandonding compile due to parse errors") +# compileErrors = compileASN1Files(fileList) +# leave this for now - TBD + compileErrors = [] + return parseErrors, compileErrors + + +def validateAllASN1FilesInPath (path): + p = Path(path) + fileGlob = [str(f) for f in p.rglob('*.asn')] + fileGlob += [str(f) for f in p.rglob('*.asn1')] + return validateASN1Files(fileGlob) + + +if __name__ == '__main__': + parseErrors, compileErrors = validateAllASN1FilesInPath("./") + parseErrorCount = 0 + print ("ASN.1 Parser checks:") + print ("-----------------------------") + for filename, errors in parseErrors.items(): + if len(errors) > 0: + parseErrorCount += len(errors) + print (f"{filename}: {len(errors)} errors") + for error in errors: + print (" " + str(error)) + else: + print (f"{filename}: OK") + print ("-----------------------------") + print ("ASN.1 Compilation:") + print ("-----------------------------") + if len(compileErrors) > 0: + for error in compileErrors: + print (" " + str(error)) + else: + print ("Compilation OK") + print ("-----------------------------") + print (f"{parseErrorCount} parse errors, {len(compileErrors)} compile errors") + exit (parseErrorCount + len(compileErrors)) + -- GitLab From ba500505b8fb63a145fec7b0e53cb5840ca6a2b6 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:25:58 +0100 Subject: [PATCH 027/208] TS 102 232-6 v2.3.1 (2008-08-29) agreed at LI#18 (Chania, Crete, 2008-05-27) --- 102232-6/PstnIsdnPDU.asn | 111 ++++++++++++++++++++++++++ 102232-6/portal/PstnIsdnPDU, ver3.txt | 111 ++++++++++++++++++++++++++ 2 files changed, 222 insertions(+) create mode 100644 102232-6/PstnIsdnPDU.asn create mode 100644 102232-6/portal/PstnIsdnPDU, ver3.txt diff --git a/102232-6/PstnIsdnPDU.asn b/102232-6/PstnIsdnPDU.asn new file mode 100644 index 0000000..212755a --- /dev/null +++ b/102232-6/PstnIsdnPDU.asn @@ -0,0 +1,111 @@ +PstnIsdnPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version3(3)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + + -- from TS 101 671 [1] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)} + + -- from TS 102 232-01 [2] + PayloadDirection + FROM LI-PS-PDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version8(8)}; + + +-- ============================ +-- Object Identifier Definition +-- ============================ + + -- definitions are relative to + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} +pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) iRI(1)} +pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) cC(2)} + + +-- =============================== +-- Description of the PstnIsdn IRI +-- =============================== + +PstnIsdnIRI ::= SEQUENCE +{ + pstnIsdnIRIObjId [0] RELATIVE-OID, + pstnIsdnIRIContents [1] PstnIsdnIRIContents +} + +PstnIsdnIRIContents ::= CHOICE +{ + supplementaryInfo [0] SupplementaryInfo, + ... +} + +SupplementaryInfo ::= SEQUENCE +{ + informationAppliesTo [0] InformationAppliesTo, + -- Identifies the PDUs to which this info applies + mediaFormat [1] INTEGER (0..127), + -- As defined in RFC 3551 [10] + mediaAttributes [2] OCTET STRING OPTIONAL, + -- Format as per RFC 4566 [7] + -- Clause 6.3 describes when the mediaAttributes shall be present + encryptionKey [3] OCTET STRING OPTIONAL, + -- Format as per RFC 4566 [7] + sessionName [4] OCTET STRING OPTIONAL, + -- Format as per RFC 4566 [7] + sessionInfo [5] OCTET STRING OPTIONAL, + -- Format as per RFC 4566 [7] + copyOfSDPMessage [6] OCTET STRING OPTIONAL, + -- Format as per RFC 4566 [7] + ..., + frameType [7] FrameType OPTIONAL + -- Populated if one or more protocol layers are missing from CC data + -- May be omitted if all headers are present. +} + +InformationAppliesTo ::= SEQUENCE + -- Identifies the PDUs to which a piece of supplementary information applies +{ + payloadDirection [0] PayloadDirection, + -- The direction of the traffic to which this info applies + cCLinkID [1] INTEGER (0..65535) OPTIONAL, + -- If there are multiple CCLinks, this field states CCLink to which this info applies + firstPDUNumber [2] INTEGER (0..4294967295) OPTIONAL, + -- The supplementary info applies to all PDUs with this sequence number and above + ... +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ... +} + +-- ============================== +-- Description of the PstnIsdn CC +-- ============================== + +PstnIsdnCC ::= SEQUENCE +{ + pstnIsdnCCObjId [0] RELATIVE-OID, + pstnIsdnCCContents [1] OCTET STRING, + -- See clause 6.2 for definition of format of PstnIsdn CC + cCLinkID [2] INTEGER (0..65535) OPTIONAL, + -- Shall be present if multiple CCLinks are used (see clause 6.3.4) + ..., + supplementaryInfo [3] SupplementaryInfo OPTIONAL + -- Shall be present at least in the first PDU +} + +END -- end of PstnIsdnPDU + diff --git a/102232-6/portal/PstnIsdnPDU, ver3.txt b/102232-6/portal/PstnIsdnPDU, ver3.txt new file mode 100644 index 0000000..212755a --- /dev/null +++ b/102232-6/portal/PstnIsdnPDU, ver3.txt @@ -0,0 +1,111 @@ +PstnIsdnPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version3(3)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + + -- from TS 101 671 [1] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)} + + -- from TS 102 232-01 [2] + PayloadDirection + FROM LI-PS-PDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version8(8)}; + + +-- ============================ +-- Object Identifier Definition +-- ============================ + + -- definitions are relative to + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} +pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) iRI(1)} +pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) cC(2)} + + +-- =============================== +-- Description of the PstnIsdn IRI +-- =============================== + +PstnIsdnIRI ::= SEQUENCE +{ + pstnIsdnIRIObjId [0] RELATIVE-OID, + pstnIsdnIRIContents [1] PstnIsdnIRIContents +} + +PstnIsdnIRIContents ::= CHOICE +{ + supplementaryInfo [0] SupplementaryInfo, + ... +} + +SupplementaryInfo ::= SEQUENCE +{ + informationAppliesTo [0] InformationAppliesTo, + -- Identifies the PDUs to which this info applies + mediaFormat [1] INTEGER (0..127), + -- As defined in RFC 3551 [10] + mediaAttributes [2] OCTET STRING OPTIONAL, + -- Format as per RFC 4566 [7] + -- Clause 6.3 describes when the mediaAttributes shall be present + encryptionKey [3] OCTET STRING OPTIONAL, + -- Format as per RFC 4566 [7] + sessionName [4] OCTET STRING OPTIONAL, + -- Format as per RFC 4566 [7] + sessionInfo [5] OCTET STRING OPTIONAL, + -- Format as per RFC 4566 [7] + copyOfSDPMessage [6] OCTET STRING OPTIONAL, + -- Format as per RFC 4566 [7] + ..., + frameType [7] FrameType OPTIONAL + -- Populated if one or more protocol layers are missing from CC data + -- May be omitted if all headers are present. +} + +InformationAppliesTo ::= SEQUENCE + -- Identifies the PDUs to which a piece of supplementary information applies +{ + payloadDirection [0] PayloadDirection, + -- The direction of the traffic to which this info applies + cCLinkID [1] INTEGER (0..65535) OPTIONAL, + -- If there are multiple CCLinks, this field states CCLink to which this info applies + firstPDUNumber [2] INTEGER (0..4294967295) OPTIONAL, + -- The supplementary info applies to all PDUs with this sequence number and above + ... +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ... +} + +-- ============================== +-- Description of the PstnIsdn CC +-- ============================== + +PstnIsdnCC ::= SEQUENCE +{ + pstnIsdnCCObjId [0] RELATIVE-OID, + pstnIsdnCCContents [1] OCTET STRING, + -- See clause 6.2 for definition of format of PstnIsdn CC + cCLinkID [2] INTEGER (0..65535) OPTIONAL, + -- Shall be present if multiple CCLinks are used (see clause 6.3.4) + ..., + supplementaryInfo [3] SupplementaryInfo OPTIONAL + -- Shall be present at least in the first PDU +} + +END -- end of PstnIsdnPDU + -- GitLab From 13f211860aee8b6d9df0b70c6d33977b0ce6d145 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:01 +0100 Subject: [PATCH 028/208] TS 102 232-1 v2.3.1 (2008-07-18) agreed at LI#18 (Chania, Crete, 2008-05-27) --- 102232-1/LI-PS-PDU.asn | 405 ++++++++++++++++++++++++++++ 102232-1/portal/LI-PS-PDU, ver8.txt | 405 ++++++++++++++++++++++++++++ 2 files changed, 810 insertions(+) create mode 100644 102232-1/LI-PS-PDU.asn create mode 100644 102232-1/portal/LI-PS-PDU, ver8.txt diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn new file mode 100644 index 0000000..1950302 --- /dev/null +++ b/102232-1/LI-PS-PDU.asn @@ -0,0 +1,405 @@ +LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version8(8)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + + -- from TS 101 671 [4] + LawfulInterceptionIdentifier, + IRI-Parameters, + IRIsContent, + Network-Element-Identifier + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)} + + -- from TS 101 671 [4] + HI1-Operation + FROM HI1NotificationOperations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} + + -- from TS 102 232-02 [5] + EmailCC, + EmailIRI + FROM EmailPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version4(4)} + + -- from TS 102 232-03 [6] + IPCC, + IPIRI, + IPIRIOnly + FROM IPAccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version5(5)} + + -- from TS 102 232-04 [32] + L2CC, + L2IRI, + L2IRIOnly + FROM L2AccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version4(4)} + + -- from TS 102 232-05 [37] + IPMMCC, + IPMMIRI + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version3(3)} + + -- from TS 102 232-06 [36] + PstnIsdnCC, + PstnIsdnIRI + FROM PstnIsdnPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version2(2)} + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + UmtsIRIsContent, + CorrelationValues + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} + -- The relevant module (including the UMTS release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + UmtsCS-IRIsContent + FROM UmtsCS-HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} + -- The relevant module (including the UMTS release and version number) needs + -- to be chosen when compiling the application. + + -- from TS 101 909-20-1 [33] + TARGETACTIVITYMONITOR-1, + TTRAFFIC, + CTTRAFFIC + FROM TS101909201 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} + + -- from TS 101 909-20-2 [34] + TARGETACTIVITYMONITOR, + TTRAFFIC, + CTTRAFFIC + FROM TS101909202 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)}; + +-- end of IMPORTS + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version8(8)} + +-- ==================== +-- Top-level definition +-- ==================== + +PS-PDU ::= SEQUENCE +{ + pSHeader [1] PSHeader, + payload [2] Payload +} + +PSHeader ::= SEQUENCE +{ + li-psDomainId [0] OBJECT IDENTIFIER, + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + -- see clause 5.2.3 + communicationIdentifier [3] CommunicationIdentifier, + sequenceNumber [4] INTEGER (0..4294967295), + timeStamp [5] GeneralizedTime OPTIONAL, + -- see clause 5.2.6 + ..., + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + -- see clause 5.2.11 + microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, + timeStampQualifier [8] TimeStampQualifier OPTIONAL +} + +Payload ::= CHOICE +{ + iRIPayloadSequence [0] SEQUENCE OF IRIPayload, + cCPayloadSequence [1] SEQUENCE OF CCPayload, + -- Clause 6.2.3 explains how to include more than one payload in the same PDU + tRIPayload [2] TRIPayload, + ..., + hI1-Operation [3] HI1-Operation, + encryptionHeader [4] EncryptionHeader +} + +TimeStampQualifier ::= ENUMERATED +{ + unknown(0), + timeOfInterception(1), + timeOfMediation(2), + ... +} + +-- ==================================== +-- Items contained within the PS-Header +-- ==================================== + +CommunicationIdentifier ::= SEQUENCE +{ + networkIdentifier [0] NetworkIdentifier, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + -- in case of transport of HI1 messages not required + -- Mandatory for CC and IRI, with certain exceptions (see 5.2.4) + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + -- see clause 5.2.4 + ..., + cINExtension [3] CorrelationValues OPTIONAL + -- To be used when a single INTEGER is not sufficient to identify + -- a particular session (see clause 5.2.4) +} + +NetworkIdentifier ::= SEQUENCE +{ + operatorIdentifier [0] OCTET STRING (SIZE(1..16)), + networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, + ..., + eTSI671NEID [2] Network-Element-Identifier OPTIONAL + -- For Network Element Identifier, use either OCTET STRING or ETSI671 definition +} + +-- ========================== +-- Definitions for CC Payload +-- ========================== + +CCPayload ::= SEQUENCE +{ + payloadDirection [0] PayloadDirection OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + cCContents [2] CCContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL + -- For aggregated payloads (see clause 6.2.3) +} + +PayloadDirection ::= ENUMERATED +{ + fromTarget(0), + toTarget(1), + ..., + indeterminate(2), + -- Indication whether intercepted CC was travelling to or from the target + -- or that the direction was indeterminate + combined(3), + -- Indication applicable to some services that the traffic is actually a combination + -- of To and From + notapplicable(4) + -- Indication that direction of interceptable service does not make sense +} + +CCContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used, see clause A.3 +{ + undefinedCC [0] OCTET STRING, + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, + eTSI671CC [5] OCTET STRING, + ..., + l2CC [6] 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 +} + +MicroSecondTimeStamp ::= SEQUENCE +{ + seconds [0] INTEGER (0..18446744073709551615), + -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch + microSeconds [1] INTEGER (0..999999), + ... +} + +-- =========================== +-- Definitions for IRI Payload +-- =========================== + +IRIPayload ::= SEQUENCE +{ + iRIType [0] IRIType OPTIONAL, + -- See clause 5.2.10 + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + iRIContents [2] IRIContents, + ... +} + +IRIType ::= ENUMERATED +{ + iRI-Begin(1), + iRI-End(2), + iRI-Continue(3), + iRI-Report(4) +} + +IRIContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used (see clause A.3) +{ + undefinedIRI [0] OCTET STRING, + emailIRI [1] EmailIRI, + iPIRI [2] IPIRI, + iPIRIOnly [3] IPIRIOnly, + uMTSIRI [4] UMTSIRI, + eTSI671IRI [5] ETSI671IRI, + ..., + l2IRI [6] L2IRI, + l2IRIOnly [7] L2IRIOnly, + tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, + tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, + pstnIsdnIRI [10] PstnIsdnIRI, + iPMMIRI [11] IPMMIRI +} + +UMTSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, + umtsIRIsContent [1] UmtsIRIsContent, + ..., + iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, + umtsCS-IRIsContent [3] UmtsCS-IRIsContent +} + +ETSI671IRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] HI2Operations.IRI-Parameters, + iRIsContent [1] IRIsContent, + ... +} + +-- =========================== +-- Definitions for TRI Payload +-- =========================== + +TRIPayload ::= CHOICE +{ + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, + -- Undefined contents (will be discarded) + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, + ..., + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage +} + +IntegrityCheck ::= SEQUENCE +{ + includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), + -- gives the order the PDUs were processed + checkType [1] CheckType, + dataType [2] DataType OPTIONAL, + -- From version5(5) the dataType is mandatory for hashes and for signatures + -- (see clause 7.2.3) + checkValue [3] OCTET STRING, + -- Network byte order + -- In case of a DSA/DSS signature, the r and s values shall be concatenated + ... +} + +CheckType ::= ENUMERATED +{ + hash(1), + -- SHA-1 hash value + signature(2), + -- DSS/DSA signature + ... +} + +DataType ::= ENUMERATED +{ + iRI(1), + cC(2), + ... +} + +-- ================================== +-- Definitions for OperatorLeaMessage +-- ================================== + +OperatorLeaMessage ::= SEQUENCE +{ + messagePriority [0] OperatorLeaMessagePriority, + message [1] OCTET STRING (SIZE(1..255)), + ... +} + +OperatorLeaMessagePriority ::= ENUMERATED +{ + error(1), + -- reporting of error conditions that have impact on the quality of the + -- intercepted data + informational(2), + -- reporting of conditions that will not have direct impact on the quality of + -- the intercepted data + ... +} + +-- ================================ +-- Definitions for EncryptionHeader +-- ================================ + +EncryptionHeader ::= SEQUENCE +{ + encryptionType [0] EncryptionType, + encryptedPayload [1] OCTET STRING, + -- once decrypted, it can be interpreted as payload [1] EncryptedPayload + ... +} + +EncryptionType ::= ENUMERATED +{ + none(1), + -- No encryption is applied. This option can be used for testing or to store data at the + -- LEMF after decryption + national-option(2), + -- Use this option when an encryption scheme is negotiated on a national level + aES-192-CBC(3), + -- The Advanced Encryption Standard using a 192 bit key in CBC mode + aES-256-CBC(4), + -- The Advanced Encryption Standard using a 256 bit key in CBC mode + blowfish-192-CBC(5), + -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode + blowfish-256-CBC(6), + -- Blowfish using a 256 bit key in CBC mode + threedes-cbc(7), + -- Triple-DES using a 192 bit key in CBC mode + ... +} + +EncryptedPayload ::= SEQUENCE +{ + byteCounter [0] INTEGER (0..18446744073709551615), + -- The sum of the sizes of all transferred PDUs before this PDU. + -- It is initialized with the unixTime (number of seconds since 01-01-1970) + -- multiplied by 232 at first use. + -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) + -- is defined to be the size of the PDU after BER encoding: + -- 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, + -- Once decrypted, it can be interpreted as payload [1] Payload + ... +} + +END -- end of LI-PS-PDU + diff --git a/102232-1/portal/LI-PS-PDU, ver8.txt b/102232-1/portal/LI-PS-PDU, ver8.txt new file mode 100644 index 0000000..1950302 --- /dev/null +++ b/102232-1/portal/LI-PS-PDU, ver8.txt @@ -0,0 +1,405 @@ +LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version8(8)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + + -- from TS 101 671 [4] + LawfulInterceptionIdentifier, + IRI-Parameters, + IRIsContent, + Network-Element-Identifier + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)} + + -- from TS 101 671 [4] + HI1-Operation + FROM HI1NotificationOperations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} + + -- from TS 102 232-02 [5] + EmailCC, + EmailIRI + FROM EmailPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version4(4)} + + -- from TS 102 232-03 [6] + IPCC, + IPIRI, + IPIRIOnly + FROM IPAccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version5(5)} + + -- from TS 102 232-04 [32] + L2CC, + L2IRI, + L2IRIOnly + FROM L2AccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version4(4)} + + -- from TS 102 232-05 [37] + IPMMCC, + IPMMIRI + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version3(3)} + + -- from TS 102 232-06 [36] + PstnIsdnCC, + PstnIsdnIRI + FROM PstnIsdnPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version2(2)} + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + UmtsIRIsContent, + CorrelationValues + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} + -- The relevant module (including the UMTS release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + UmtsCS-IRIsContent + FROM UmtsCS-HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} + -- The relevant module (including the UMTS release and version number) needs + -- to be chosen when compiling the application. + + -- from TS 101 909-20-1 [33] + TARGETACTIVITYMONITOR-1, + TTRAFFIC, + CTTRAFFIC + FROM TS101909201 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} + + -- from TS 101 909-20-2 [34] + TARGETACTIVITYMONITOR, + TTRAFFIC, + CTTRAFFIC + FROM TS101909202 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)}; + +-- end of IMPORTS + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version8(8)} + +-- ==================== +-- Top-level definition +-- ==================== + +PS-PDU ::= SEQUENCE +{ + pSHeader [1] PSHeader, + payload [2] Payload +} + +PSHeader ::= SEQUENCE +{ + li-psDomainId [0] OBJECT IDENTIFIER, + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + -- see clause 5.2.3 + communicationIdentifier [3] CommunicationIdentifier, + sequenceNumber [4] INTEGER (0..4294967295), + timeStamp [5] GeneralizedTime OPTIONAL, + -- see clause 5.2.6 + ..., + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + -- see clause 5.2.11 + microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, + timeStampQualifier [8] TimeStampQualifier OPTIONAL +} + +Payload ::= CHOICE +{ + iRIPayloadSequence [0] SEQUENCE OF IRIPayload, + cCPayloadSequence [1] SEQUENCE OF CCPayload, + -- Clause 6.2.3 explains how to include more than one payload in the same PDU + tRIPayload [2] TRIPayload, + ..., + hI1-Operation [3] HI1-Operation, + encryptionHeader [4] EncryptionHeader +} + +TimeStampQualifier ::= ENUMERATED +{ + unknown(0), + timeOfInterception(1), + timeOfMediation(2), + ... +} + +-- ==================================== +-- Items contained within the PS-Header +-- ==================================== + +CommunicationIdentifier ::= SEQUENCE +{ + networkIdentifier [0] NetworkIdentifier, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + -- in case of transport of HI1 messages not required + -- Mandatory for CC and IRI, with certain exceptions (see 5.2.4) + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + -- see clause 5.2.4 + ..., + cINExtension [3] CorrelationValues OPTIONAL + -- To be used when a single INTEGER is not sufficient to identify + -- a particular session (see clause 5.2.4) +} + +NetworkIdentifier ::= SEQUENCE +{ + operatorIdentifier [0] OCTET STRING (SIZE(1..16)), + networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, + ..., + eTSI671NEID [2] Network-Element-Identifier OPTIONAL + -- For Network Element Identifier, use either OCTET STRING or ETSI671 definition +} + +-- ========================== +-- Definitions for CC Payload +-- ========================== + +CCPayload ::= SEQUENCE +{ + payloadDirection [0] PayloadDirection OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + cCContents [2] CCContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL + -- For aggregated payloads (see clause 6.2.3) +} + +PayloadDirection ::= ENUMERATED +{ + fromTarget(0), + toTarget(1), + ..., + indeterminate(2), + -- Indication whether intercepted CC was travelling to or from the target + -- or that the direction was indeterminate + combined(3), + -- Indication applicable to some services that the traffic is actually a combination + -- of To and From + notapplicable(4) + -- Indication that direction of interceptable service does not make sense +} + +CCContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used, see clause A.3 +{ + undefinedCC [0] OCTET STRING, + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, + eTSI671CC [5] OCTET STRING, + ..., + l2CC [6] 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 +} + +MicroSecondTimeStamp ::= SEQUENCE +{ + seconds [0] INTEGER (0..18446744073709551615), + -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch + microSeconds [1] INTEGER (0..999999), + ... +} + +-- =========================== +-- Definitions for IRI Payload +-- =========================== + +IRIPayload ::= SEQUENCE +{ + iRIType [0] IRIType OPTIONAL, + -- See clause 5.2.10 + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + iRIContents [2] IRIContents, + ... +} + +IRIType ::= ENUMERATED +{ + iRI-Begin(1), + iRI-End(2), + iRI-Continue(3), + iRI-Report(4) +} + +IRIContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used (see clause A.3) +{ + undefinedIRI [0] OCTET STRING, + emailIRI [1] EmailIRI, + iPIRI [2] IPIRI, + iPIRIOnly [3] IPIRIOnly, + uMTSIRI [4] UMTSIRI, + eTSI671IRI [5] ETSI671IRI, + ..., + l2IRI [6] L2IRI, + l2IRIOnly [7] L2IRIOnly, + tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, + tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, + pstnIsdnIRI [10] PstnIsdnIRI, + iPMMIRI [11] IPMMIRI +} + +UMTSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, + umtsIRIsContent [1] UmtsIRIsContent, + ..., + iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, + umtsCS-IRIsContent [3] UmtsCS-IRIsContent +} + +ETSI671IRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] HI2Operations.IRI-Parameters, + iRIsContent [1] IRIsContent, + ... +} + +-- =========================== +-- Definitions for TRI Payload +-- =========================== + +TRIPayload ::= CHOICE +{ + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, + -- Undefined contents (will be discarded) + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, + ..., + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage +} + +IntegrityCheck ::= SEQUENCE +{ + includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), + -- gives the order the PDUs were processed + checkType [1] CheckType, + dataType [2] DataType OPTIONAL, + -- From version5(5) the dataType is mandatory for hashes and for signatures + -- (see clause 7.2.3) + checkValue [3] OCTET STRING, + -- Network byte order + -- In case of a DSA/DSS signature, the r and s values shall be concatenated + ... +} + +CheckType ::= ENUMERATED +{ + hash(1), + -- SHA-1 hash value + signature(2), + -- DSS/DSA signature + ... +} + +DataType ::= ENUMERATED +{ + iRI(1), + cC(2), + ... +} + +-- ================================== +-- Definitions for OperatorLeaMessage +-- ================================== + +OperatorLeaMessage ::= SEQUENCE +{ + messagePriority [0] OperatorLeaMessagePriority, + message [1] OCTET STRING (SIZE(1..255)), + ... +} + +OperatorLeaMessagePriority ::= ENUMERATED +{ + error(1), + -- reporting of error conditions that have impact on the quality of the + -- intercepted data + informational(2), + -- reporting of conditions that will not have direct impact on the quality of + -- the intercepted data + ... +} + +-- ================================ +-- Definitions for EncryptionHeader +-- ================================ + +EncryptionHeader ::= SEQUENCE +{ + encryptionType [0] EncryptionType, + encryptedPayload [1] OCTET STRING, + -- once decrypted, it can be interpreted as payload [1] EncryptedPayload + ... +} + +EncryptionType ::= ENUMERATED +{ + none(1), + -- No encryption is applied. This option can be used for testing or to store data at the + -- LEMF after decryption + national-option(2), + -- Use this option when an encryption scheme is negotiated on a national level + aES-192-CBC(3), + -- The Advanced Encryption Standard using a 192 bit key in CBC mode + aES-256-CBC(4), + -- The Advanced Encryption Standard using a 256 bit key in CBC mode + blowfish-192-CBC(5), + -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode + blowfish-256-CBC(6), + -- Blowfish using a 256 bit key in CBC mode + threedes-cbc(7), + -- Triple-DES using a 192 bit key in CBC mode + ... +} + +EncryptedPayload ::= SEQUENCE +{ + byteCounter [0] INTEGER (0..18446744073709551615), + -- The sum of the sizes of all transferred PDUs before this PDU. + -- It is initialized with the unixTime (number of seconds since 01-01-1970) + -- multiplied by 232 at first use. + -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) + -- is defined to be the size of the PDU after BER encoding: + -- 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, + -- Once decrypted, it can be interpreted as payload [1] Payload + ... +} + +END -- end of LI-PS-PDU + -- GitLab From 1dd8bf437e6e0d5470c6a0dbae46dd293dcd2983 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:05 +0100 Subject: [PATCH 029/208] TS 102 232-1 v2.4.1 (2008-07-28) agreed at LI#18 (Chania, Crete, 2008-05-27) --- 102232-1/LI-PS-PDU.asn | 6 +++--- .../portal/{LI-PS-PDU, ver8.txt => LI-PS-PDU ver9_Ralf.txt} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename 102232-1/portal/{LI-PS-PDU, ver8.txt => LI-PS-PDU ver9_Ralf.txt} (98%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 1950302..426c94b 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,4 +1,4 @@ -LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version8(8)} +LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version9(9)} DEFINITIONS IMPLICIT TAGS ::= @@ -50,7 +50,7 @@ IMPORTS PstnIsdnCC, PstnIsdnIRI FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version2(2)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version3(3)} -- from 3GPP TS 33.108 [9] IRI-Parameters, @@ -91,7 +91,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version8(8)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version9(9)} -- ==================== -- Top-level definition diff --git a/102232-1/portal/LI-PS-PDU, ver8.txt b/102232-1/portal/LI-PS-PDU ver9_Ralf.txt similarity index 98% rename from 102232-1/portal/LI-PS-PDU, ver8.txt rename to 102232-1/portal/LI-PS-PDU ver9_Ralf.txt index 1950302..426c94b 100644 --- a/102232-1/portal/LI-PS-PDU, ver8.txt +++ b/102232-1/portal/LI-PS-PDU ver9_Ralf.txt @@ -1,4 +1,4 @@ -LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version8(8)} +LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version9(9)} DEFINITIONS IMPLICIT TAGS ::= @@ -50,7 +50,7 @@ IMPORTS PstnIsdnCC, PstnIsdnIRI FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version2(2)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version3(3)} -- from 3GPP TS 33.108 [9] IRI-Parameters, @@ -91,7 +91,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version8(8)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version9(9)} -- ==================== -- Top-level definition -- GitLab From 4114e287792b22796eb5d1304a17e7944547e5c0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:11 +0100 Subject: [PATCH 030/208] TS 102 657 v1.1.2 (2008-12-17) agreed at LI#19 (Prague, 2008-09-30) --- 102657/RDMessage.asn | 1300 ++++++++++++++ 102657/RDMessage.xsd | 1507 +++++++++++++++++ 102657/portal/TS 102 657, RDMessage, ver1.asn | 1300 ++++++++++++++ 102657/portal/TS 102 657, RDMessage, ver1.xsd | 1507 +++++++++++++++++ 4 files changed, 5614 insertions(+) create mode 100644 102657/RDMessage.asn create mode 100644 102657/RDMessage.xsd create mode 100644 102657/portal/TS 102 657, RDMessage, ver1.asn create mode 100644 102657/portal/TS 102 657, RDMessage, ver1.xsd diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn new file mode 100644 index 0000000..11b4b8a --- /dev/null +++ b/102657/RDMessage.asn @@ -0,0 +1,1300 @@ +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version1(1)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} + +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version1(1)} + +-- ====================================== +-- Top level definitions for RDHI wrapper +-- ====================================== + +RetainedDataMessage ::= SEQUENCE +{ + rdHeaderId [0] OBJECT IDENTIFIER, + retainedDataHeader [1] RetainedDataHeader, + retainedDataPayload [2] RetainedDataPayload, + retainedDataDigest [3] OCTET STRING OPTIONAL, + -- The digitally signed hash of the combined fields above (retainedDataHeader and + -- retainedDataPayload) + ... +} + +-- ========================================================================== +-- Definitions for Retained Data header information, present in every message +-- ========================================================================== + +RetainedDataHeader ::= SEQUENCE +{ + requestID [1] RequestID, + cSPID [2] CSPID, + timeStamp [3] GeneralizedTime, + thirdPartyCSPID [4] CSPID OPTIONAL, + ... +} + +CSPID ::= UTF8String + -- Unique identifier for the CSP that issued the request + +RequestID ::= SEQUENCE +{ + countryCode [1] CountryCode, + authorisedOrganisationID [2] AuthorisedOrganisationID, + requestNumber [3] RequestNumber OPTIONAL, + -- all messages except GetStatusMessage and StatusMessage have a request number + -- (see clause 6.1.2) + ... +} + +CountryCode ::= UTF8String (SIZE(2)) +-- A country code as per ISO 3166-1 [4] + +AuthorisedOrganisationID::= UTF8String +-- A unique identifier for an Authorized Organization issuing a Retained Data request + +RequestNumber ::= UTF8String +-- Unique within a given country and Authorized Organization + +-- ================================================= +-- Definitions for Retained Data payload information +-- ================================================= + +RetainedDataPayload ::= CHOICE + -- Payload can be a request, response, error or acknowledgement +{ + requestMessage [1] RequestMessage, + requestAcknowledgement [2] RequestAcknowledgement, + responseMessage [3] ResponseMessage, + responseAcknowledgement [4] ResponseAcknowledgement, + errorMessage [5] FurtherInformation, + cancelMessage [6] CancelMessage, + cancelAcknowledgement [7] CancelAcknowledgement, + getstatusMessage [8] GetStatusMessage, + statusMessage [9] StatusMessage, + getResultsMessage [10] GetResultsMessage, + ... +} + +-- ================================================== +-- Definitions of Request message and acknowledgement +-- ================================================== + +RequestMessage ::= SEQUENCE +{ + requestPriority [1] RequestPriority, + requestParameters [2] RequestConstraints, + deliveryPointHIB [3] DeliveryPointHIB OPTIONAL, + -- pre-arranged set of delivery address(es) of that specific Authorized Organization + maxHits [4] INTEGER OPTIONAL, + -- Maximum number of records to be returned. + -- On a national basis maximum numbers could be considered + -- In case of maxHit a responseFailed message is sent and no data is sent (see 6.3.3.2) + nationalRequestParameters [5] NationalRequestParameters OPTIONAL, + -- to be defined on a national basis + -- only to be used in case the present document can not fulfil the national requirements + ... +} + +DeliveryPointHIB ::= UTF8String + +RequestConstraints ::= SEQUENCE +{ + equals [1] RetainedDataRecord OPTIONAL, + notEqualTo [2] RetainedDataRecord OPTIONAL, + lessThan [3] RetainedDataRecord OPTIONAL, + -- For numerical values + lessThanOrEqualTo [4] RetainedDataRecord OPTIONAL, + -- For numerical values + greaterThan [5] RetainedDataRecord OPTIONAL, + -- For numerical values + greaterThanOrEqualTo [6] RetainedDataRecord OPTIONAL, + -- For numerical values + startsWith [7] RetainedDataRecord OPTIONAL, + -- For strings + endsWith [8] RetainedDataRecord OPTIONAL, + -- For strings + isAMemberOf [9] SEQUENCE OF RetainedDataRecord OPTIONAL, + ... +} + +RequestPriority ::= OCTET STRING + -- Priority considerations are a matter for national implementation + -- This standard makes no statement regarding how such priorities are represented or used + + +RequestAcknowledgement ::= SEQUENCE +{ + suggestedCompletionTime [1] GeneralizedTime OPTIONAL, + -- indicative time that results will be ready + -- purely informational, not binding for either party + ... +} + +-- =================================================== +-- Definitions of Response message and acknowledgement +-- =================================================== + +ResponseMessage ::= SEQUENCE +{ + responseStatus [1] ResponseStatus, + responsePayload [2] SEQUENCE OF ResponseRecord OPTIONAL, + -- Clause 6 explains use of this field + -- A responseUnavailable message shall not have a responsePayload (see clause 5.3.3) + -- The responseComplete and responseIncomplete message shall have a responsePayload + -- If there are no responses, the responsePayload is present but has zero entries + nationalResponsePayload [3] NationalResponsePayload OPTIONAL, + -- to be defined on a national basis + -- only to be used in case the present document can not fulfil the national requirements + ... +} + +ResponseStatus ::= CHOICE +{ + responseComplete [1] NULL, + -- No further results to come + responseIncomplete [2] NULL, + -- There may be further results to come + responseUnavailable [3] NULL, + -- See clause 6.3.3 + responseFailed [4] FurtherInformation, + -- See clause 6.3.3.2 + ... +} + +ResponseRecord ::= SEQUENCE +{ + recordNumber [1] INTEGER, + recordPayload [2] RetainedDataRecord, + additionalInformation [3] AdditionalInformation OPTIONAL, + -- see clause 6.2.4 + nationalRecordPayload [4] NationalRecordPayload OPTIONAL, + ... +} + +AdditionalInformation ::= SEQUENCE +{ + contactInformation [1] UTF8String OPTIONAL, + -- Name or address of operator or person who may have further information + otherInformation [2] UTF8String OPTIONAL, + ... +} + +RetainedDataRecord ::= CHOICE +{ + telephonyRecord [1] TelephonyRecord, + messageRecord [2] MessageRecord, + networkAccess [3] NetworkAccessRecord, + -- other services will be included (like multimedia) as they are implemented + ... +} + +ResponseAcknowledgement ::= CHOICE +{ + -- acknowledges a response has been sent + acknowledgeCompleteResults [1] NULL, + acknowledgePartialResults [2] NULL, + ... +} + +-- ================================================== +-- Definitions of an error message and acknowledgment +-- ================================================== + +FurtherInformation ::= SEQUENCE +{ + information [1] UTF8String, + contactInformation [2] UTF8String OPTIONAL, + ... +} + +-- =================================================== +-- Definitions of a cancel message and acknowledgement +-- =================================================== + +CancelMessage ::= NULL + -- Cancels an active request + +CancelAcknowledgement ::= NULL + -- Acknowledges the receipt of a cancel message (no other information required) + +-- =================================================== +-- Definitions of status request and response messages +-- =================================================== + +GetStatusMessage ::= SEQUENCE +{ + requestNumbers [1] SEQUENCE OF RequestNumber, + ... +} + +StatusMessage ::= SEQUENCE +{ + statusResponse [1] SEQUENCE OF StatusResponse, + ... +} + +StatusResponse ::= SEQUENCE +{ + requestNumber [1] RequestNumber, + requestStatus [2] RequestStatus, + ... +} + +RequestStatus ::= CHOICE +{ + ready [1] NULL, + incompleteResultsReady [2] NULL, + failureResponseReady [3] NULL, + notReady [4] NULL, + error [5] FurtherInformation, + inDelivery [6] NULL, + invalidRequestID [7] NULL, + ... +} + +-- ========================================== +-- Definitions of status get results messages +-- ========================================== + +GetResultsMessage ::= NULL + -- No further information required (the RequestID is given in the header) + +-- =================== +-- National parameters +-- =================== + +NationalRequestParameters ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- Country Code according to ISO 3166-1 [4], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that an version indicator is included in the national parameters + -- definition. +} + +NationalResponsePayload ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +NationalRecordPayload ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +TimeSpan ::= SEQUENCE +{ + startTime [1] GeneralizedTime OPTIONAL, + endTime [2] GeneralizedTime OPTIONAL, + ... +} + +-- ============================================== +-- Definitions for Generic Subscriber Information +-- ============================================== + +GenericSubscriberInfo ::= SEQUENCE +{ + organizationInfo [1] OrganizationInfo OPTIONAL, + individualInfo [2] IndividualInfo OPTIONAL, + ... +} + +OrganizationInfo ::= SEQUENCE +{ + name [1] UTF8String OPTIONAL, + -- name of the organization + contactDetails [2] ContactDetails OPTIONAL, + -- address, and name/phone number of a point of contact + nationalRegistrationID [3] UTF8String OPTIONAL, + -- e.g. social security number + ... +} + +IndividualInfo ::= SEQUENCE +{ + name [1] PersonName OPTIONAL, + contactAddress [2] ContactDetails OPTIONAL, + dateOfBirth [3] GeneralizedTime OPTIONAL, + gender [4] ENUMERATED + { + male(0), + female(1), + ... + } OPTIONAL, + identificationNumber [5] UTF8String OPTIONAL, + authenticationInfo [6] AuthenticationInfo OPTIONAL, + ... +} + +PersonName ::= SEQUENCE +{ + salutation [1] UTF8String OPTIONAL, + surname [2] UTF8String OPTIONAL, + -- the non-chosen or inherited name of an individual, e.g. Arend + surnamePrefix [3] UTF8String OPTIONAL, + -- any prefix before the surname, e.g. von, van der + surnameSuffix [4] UTF8String OPTIONAL, + -- any suffix after the surname, e.g. Jr, III + middleNames [5] UTF8String OPTIONAL, + -- that part of the name excluding forename, separable and preceding the surname + firstname [6] UTF8String OPTIONAL, + -- the first name or initials, e.g. Peter + ... +} + +ContactDetails ::= SEQUENCE +{ + address [1] AddressInformation OPTIONAL, + emailAddress [2] UTF8String OPTIONAL, + contactNumber [3] SEQUENCE OF PartyNumber OPTIONAL, + -- several numbers (work, home, mobile) may be given for a single subscriber + ... +} + +AddressInformation ::= SEQUENCE +{ + flatNumber [1] UTF8String OPTIONAL, + buildingName [2] UTF8String OPTIONAL, + buildingNumber [3] UTF8String OPTIONAL, + streetName [4] UTF8String OPTIONAL, + poBox [5] UTF8String OPTIONAL, + -- PO box or Response number + postalCode [6] UTF8String OPTIONAL, + -- Postal code. Example: 2289AC + region [7] UTF8String OPTIONAL, + province [8] UTF8String OPTIONAL, + language [9] UTF8String OPTIONAL, + city [10] UTF8String OPTIONAL, + country [11] CountryCode OPTIONAL, + -- Country code as defined in ISO 3166-1 [4] + validity [12] TimeSpan OPTIONAL, + -- time from which the address was registered + ... +} + +AuthenticationInfo ::= SEQUENCE +{ + authenticationType [1] UTF8String OPTIONAL, + -- the type of document used to authenticate, e.g. passport, drivers license + authenticationNumber [2] UTF8String OPTIONAL, + -- the number of the document used to authenticate + ... +} + +TelephonyRecord ::= CHOICE +{ + telephonySubscriber [1] TelephonySubscriber, + telephonyBillingDetails [2] TelephonyBillingDetails, + telephonyServiceUsage [3] TelephonyServiceUsage, + telephonyDevice [4] TelephonyDevice, + telephonyNetworkElement [5] TelephonyNetworkElement, + ... +} + +-- ============================== +-- Definitions of Subscriber Data +-- ============================== + +TelephonySubscriber ::= SEQUENCE +{ + subscriberID [1] TelephonySubscriberId OPTIONAL, + -- unique identifier for this subscriber, e.g. account number + genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, + -- generic personal information about this subscriber + telephonySubscriberInfo [3] TelephonySubscriberInfo OPTIONAL, + -- service-specific information about this subscriber + subscribedTelephonyServices [4] SEQUENCE OF SubscribedTelephonyServices OPTIONAL, + -- a subscriber (or account) may have more than one service listed against them + ... +} + +TelephonySubscriberId ::= UTF8String + -- unique identifier for this subscriber, e.g. account number + +TelephonySubscriberInfo ::= NULL + -- Reserved + +SubscribedTelephonyServices ::= SEQUENCE +{ + serviceID [1] UTF8String OPTIONAL, + -- Unique identifier for this service within the operator + providerID [2] UTF8String OPTIONAL, + -- Unique identifier for the service provider + timeSpan [3] TimeSpan OPTIONAL, + -- Start and end data, if applicable, of the subsription + registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, + -- The set of telephone numbers registered for this service + registeredICCID [5] UTF8String OPTIONAL, + serviceType [6] TelephonyServiceType OPTIONAL, + installationAddress [7] AddressInformation OPTIONAL, + -- installation address, if different from the registered address + connectionDate [8] GeneralizedTime OPTIONAL, + -- Date the subscriber was actually connected + -- (May differ from the start of subscription) + iMSI [9] IMSI OPTIONAL, + carrierPreselect [10] BOOLEAN OPTIONAL, + lineStatus [11] UTF8String OPTIONAL, + -- CSP-specific description of current line status, + -- e.g. Active, Ceased, etc. + ... +} + +TelephonyBillingDetails ::= SEQUENCE +{ + subscriberID [1] TelephonySubscriberId OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] BillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, + ... +} + +BillingIdentifier ::= OCTET STRING + -- Used to correlate billing information + -- useful if the bill-payer is not the subscriber, e.g. company mobiles + +BillingRecords ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, + -- as per ISO 4217 [5] + method [5] UTF8String OPTIONAL, + -- i.e. credit card etc. + ... +} + +TelephonyServiceType ::= ENUMERATED +{ + private(0), + privatePABX(1), + publicPayphone(2), + ... +} + +-- ================================= +-- Definitions of Service Usage Data +-- ================================= + +TelephonyServiceUsage ::= SEQUENCE +{ + partyInformation [1] SEQUENCE OF TelephonyPartyInformation OPTIONAL, + -- This parameter provides the concerned party (Originating, Terminating or + -- forwarded party), the identity(ies) of the party and all the information + -- provided by the party + communicationTime [2] TimeSpan OPTIONAL, + -- Time and duration of the communication + eventInformation [3] SEQUENCE OF TelephonyEventInformation OPTIONAL, + -- A list of events that occurred during this service usage + endReason [4] INTEGER OPTIONAL, + -- Q.850 cause code for call termination + communicationType [5] TelephonyCommunicationType OPTIONAL, + bearerService [6] TelephonyBearerService OPTIONAL, + smsInformation [7] SmsInformation OPTIONAL, + ringDuration [8] INTEGER OPTIONAL, + ... +} + +TelephonyPartyInformation ::= SEQUENCE +{ + partyRole [1] TelephonyPartyRole OPTIONAL, + partyNumber [2] PartyNumber OPTIONAL, + subscriberID [3] TelephonySubscriberId OPTIONAL, + deviceID [4] TelephonyDeviceID OPTIONAL, + locations [5] SEQUENCE OF TelephonyLocation OPTIONAL, + -- List of cell locations used by this party during the service usage + communicationTime [6] TimeSpan OPTIONAL, + -- Time and duration of the communication + iCCID [7] UTF8String OPTIONAL, + -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format + iMSI [8] IMSI OPTIONAL, + natureOfAddress [9] UTF8String OPTIONAL, + -- Nature of address indicator, e.g. National, International + forwardedTransferredNumber [10] PartyNumber OPTIONAL, + terminatingTransferredNumber [11] PartyNumber OPTIONAL, + ... +} + +TelephonyCommunicationType ::= ENUMERATED +{ + telephonyFixedCS(0), + telephonyWirelessCS(1), + sMS(2), + ... +} + +TelephonyBearerService ::= ENUMERATED +{ + speech(0), + data(1), + fax(2), + ... +} + +SmsInformation ::= SEQUENCE +{ + smsEvent [1] ENUMERATED + { + shortMessage(1), + shortPartMessage(2), + compositeMessage(3), + notificationMessage(4), + ... + } OPTIONAL, + smsType [2] ENUMERATED + { + deliverSCtoMS(1), + deliverReportMStoSC(2), + statusReportSCtoMS(3), + commandMStoSC(4), + submitMStoSC(5), + submitReportSCtoMS(6), + reservedMTIValue(7), + ... + } OPTIONAL, + smsStatus [3] ENUMERATED + { + delivered(0), + expired(1), + deleted(2), + replaced(3), + submitted(4), + incomplete-submission(5), + incomplete-delivery(6), + undeliverable(7), + passed-on(8), + ... + } OPTIONAL, + smsCmRefNr [4] OCTET STRING (SIZE(1..2)) OPTIONAL, + -- format as per 3GPP 23.040 [16] + smsNumOfSM [5] INTEGER (0..65535) OPTIONAL, + smsNotifyInd [6] BOOLEAN OPTIONAL, + smsProtocolId [7] OCTET STRING (SIZE(1)) OPTIONAL, + -- format as per 3GPP 23.040 [16] + ... +} + +TelephonyEventInformation ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + -- time when the event occurred + type [2] TelephonyEventType OPTIONAL, + -- type of event + party [3] TelephonyPartyRole OPTIONAL, + -- party to which the event is related + location [4] TelephonyLocation OPTIONAL, + ... +} + +TelephonyEventType ::= CHOICE +{ + basicEventType [1] BasicEventType, + callConferenceEventType [2] CallConferenceEventType, + callForwardingEventType [3] CallForwardingEventType, + messagingEventType [4] MessagingEventType, + prepayServiceEventType [5] PrepayServiceEventType, + ... +} + +BasicEventType ::= ENUMERATED +{ + handover(1), + hold(2), + retrieve(3), + suspend(4), + resume(5), + ect(6), + mpty(7), + mptyHold(8), + mptyRetrieve(9), + mptySplit(10), + uus1(11), + uus2(12), + uus3(13), + serviceSpeech(14), + serviceFax(15), + tpyInvoke(16), + tpyPrivateComm(17), + serviceActivation(18), + transit(19), + mSOriginating(20), + callForwarding(21), + mSTerminating(22), + ... +} + +CallForwardingEventType ::= ENUMERATED +{ + cfuActivation(1), + cfuModification(2), + cfuDe-activation(3), + cfcNoReplyActivation(4), + cfcNoReplyModification(5), + cfcNoReplyDe-activation(6), + cfcBusyActivation(7), + cfcBusyModification(8), + cfcBusyDe-activation(9), + cfcOutOfRangeActivation(10), + cfcOutOfRangeModification(11), + cfcOutOfRangeDe-activation(12), + cfcUnavailableActivation(13), + cfcUnavailableModification(14), + cfcUnavailableDe-activation(15), + cfuFaxActivation(16), + cfuFaxModification(17), + cfuFaxDe-activation(18), + ... +} + +CallConferenceEventType ::= ENUMERATED +{ + confBeginSeizure(1), + confAdd(2), + confSplit(3), + confIsolate(4), + confReattach(5), + confDrop(6), + confBeginActive(7), + ... +} + +MessagingEventType ::= ENUMERATED +{ + mSOriginatingSMSinMSC(1), + mSTerminatingSMSinMSC(2), + shortMessageDelivery(3), + mMMessage(4), + mMNotification(5), + mMDeliveryReport(6), + mMReadReply(7), + ... +} + +PrepayServiceEventType ::= ENUMERATED +{ + serviceActivation(1), + ... +} + +TelephonyLocation ::= SEQUENCE +{ + telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, + -- ID of the network element location (e.g. Cell ID) + timeSpan [2] TimeSpan OPTIONAL, + -- Time span that this location was valid for + ... +} + +TelephonyPartyRole ::= ENUMERATED +{ + originating-Party(0), + terminating-Party(1), + forwarded-to-Party(2), + originalCalled (3), + redirecting(4), + connected(5), + userProvidedCalling(6), + roaming(7), + translated(8), + singlePersonalNumber(9), + smsOriginator(10), + smsRecipient(11), + smsOriginatorTrn(12), + smsRecipientTrn(13), + ... +} + +-- ======================= +-- Device Data definitions +-- ======================= + +TelephonyDevice ::= SEQUENCE +{ + deviceIDType [1] ENUMERATED + -- Type of identifier for telephony device + { + unknown(0), + imei(1), + macAddress(2), + ... + } OPTIONAL, + telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, + -- Unique identifier for this telephony device according to type of identifier + ... +} + +TelephonyDeviceID ::= OCTET STRING + -- A unique identifier for the telephony device. For example, the IMEI number + -- of a mobile handset + +-- ======================== +-- Network Data definitions +-- ======================== + +TelephonyNetworkElement ::= SEQUENCE +{ + telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, + cellInformation [2] Location OPTIONAL, + -- The Location information id + validity [3] TimeSpan OPTIONAL, + ... +} + +TelephonyNetworkID ::= OCTET STRING + -- Unique identifier for this network element: e.g. a Cell ID + +-- ==================== +-- Location information +-- ==================== + +Location ::= SEQUENCE +{ + e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, + -- Coded in the same format as the ISUP location number (parameter + -- field) of the ISUP (seeEN 300 356 [7]) + globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, + -- See MAP format (seeTS GSM 09.02 [8]) + + rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, + -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with + -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the + -- last 6 octets are used) + gsmLocation [4] GSMLocation OPTIONAL, + umtsLocation [5] UMTSLocation OPTIONAL, + sAI [6] OCTET STRING (SIZE (7)) OPTIONAL, + -- format: PLMN-ID 3 octets (no. 1-3) + -- LAC 2 octets (no. 4-5) + -- SAC 2 octets (no. 6-7) + -- (according to 3GPP TS 25.431 [10]) + oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, + -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with + -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI + -- (only the last 6 octets are used) + -- This parameter is duplicated from 3GPP TS 33.108 [11] + ... +} + +GSMLocation ::= CHOICE +{ + geoCoordinates [1] SEQUENCE + { + latitude [1] UTF8String (SIZE(7..10)) OPTIONAL, + -- format: XDDMMSS.SS + longitude [2] UTF8String (SIZE(8..11)) OPTIONAL, + -- format: XDDDMMSS.SS + mapDatum [3] MapDatum OPTIONAL, + azimuth [4] INTEGER (0..359) OPTIONAL, + -- The azimuth is the bearing, relative to true north + ... + }, + -- format: XDDMMSS.SS (on latitudes) or XDDDMMSS.SS (on longitudes) + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- MM : minutes (numeric characters) + -- SS.SS : seconds, the second part (.SS) is optional + -- Example: + -- latitude (short form) N502312 + -- longitude (long form) E1122312.18 + utmCoordinates [2] SEQUENCE + { + utm-Zone [1] UTF8String (SIZE(3)) OPTIONAL, + utm-East [2] UTF8String (SIZE(6)) OPTIONAL, + utm-North [3] UTF8String (SIZE(7)) OPTIONAL, + -- Universal Transverse Mercator + -- example utm-Zone 32U + -- utm-East 439955 + -- utm-North 5540736 + mapDatum [4] MapDatum OPTIONAL, + azimuth [5] INTEGER (0..359) OPTIONAL, + -- The azimuth is the bearing, relative to true north + ... + }, + utmRefCoordinates [3] SEQUENCE + { + utm-GridZone [1] UTF8String (SIZE(2)) OPTIONAL, + -- numerals from 1 to 60 + utm-GridBand [2] UTF8String (SIZE(1)) OPTIONAL, + -- character between C and X + squareID [3] UTF8String (SIZE(2)) OPTIONAL, + -- characters from A to Z + numericalLocationEasting [4] UTF8String (SIZE(5)) OPTIONAL, + numericalLocationNorthing [5] UTF8String (SIZE(5)) OPTIONAL, + -- Universal Transverse Mercator Reference = Military Grid Reference System (MGRS) + -- example utm-GridZone 32 + -- utm-GridBand U + -- squareID PU + -- numericalLocationEasting 9129 + -- mumericalLocationNorthing 4045 + -- In both panels, utm-GridBand and squareID the I and O characters are not used + -- because of their similarity to the digits one and zero. + mapDatum [6] MapDatum OPTIONAL, + azimuth [7] INTEGER (0..359) OPTIONAL, + -- The azimuth is the bearing, relative to true north + ... + }, + wGS84Coordinates [4] OCTET STRING, + -- format is as defined in 3GPP TS 03.32 [12] + ... +} + +MapDatum ::= ENUMERATED +{ + wGS84(1), + -- World Geodetic System 1984 + wGS72(2), + eD50(3), + -- European Datum 50 + rD(4), + -- Rijks Driehoek (Netherlands) + potsdamDatum(5), + datumAustria(6), + eTRS89(7), + -- European Terrestrial Reference System 1989 + nAD27(8), + -- North American Datum 1927 + oSGB36(9), + -- Ordnance Survey of Great Britain + oSNI52(10), + -- Ordnance Survey of Northern Ireland + tM65(11), + iTM(12), + -- Irish Transverse Mercator + ... +} + +UMTSLocation ::= CHOICE +{ + point [1] GA-Point, + pointWithUnCertainty [2] GA-PointWithUnCertainty, + polygon [3] GA-Polygon, + ... +} + +GeographicalCoordinates ::= SEQUENCE +{ + latitudeSign [1] ENUMERATED + { + north, + south + } OPTIONAL, + latitude [2] INTEGER (0..8388607) OPTIONAL, + longitude [3] INTEGER (-8388608..8388607) OPTIONAL, + ... +} + +GA-Point ::= SEQUENCE +{ + geographicalCoordinates [1] GeographicalCoordinates, + ... +} + +GA-PointWithUnCertainty ::=SEQUENCE +{ + geographicalCoordinates [1] GeographicalCoordinates, + uncertaintyCode [2] INTEGER (0..127) +} + +maxNrOfPoints INTEGER ::= 15 + +GA-Polygon ::= SEQUENCE (SIZE (1..maxNrOfPoints)) OF GA-Polygon-Elements + +GA-Polygon-Elements ::= SEQUENCE +{ + geographicalCoordinates [1] GeographicalCoordinates, + ... +} + +-- =================== +-- General definitions +-- =================== + +PartyNumber ::= UTF8String + -- E164 address of the node in international format + +MessageRecord ::= CHOICE +{ + msgSubscriber [1] MsgSubscriber, + msgServiceUsage [2] MsgServiceUsage, + ... +} + +-- ====================================== +-- Definitions of Message Subscriber Data +-- ====================================== + +MsgSubscriber ::= SEQUENCE + -- Generic information on a service subscriber, supplemented with information specific to + -- asynchronous message services +{ + validity [1] TimeSpan OPTIONAL, + subscriberID [2] MsgSubscriberId OPTIONAL, + msgStores [3] SEQUENCE OF MsgStore OPTIONAL, + -- message stores allocated to this subscriber + subscriber [4] GenericSubscriberInfo OPTIONAL, + ... +} + +MsgSubscriberId ::= OCTET STRING + -- Unique identifier for this subscriber, e.g. account number + +MsgStore ::= SEQUENCE + -- Location into which messages are temporarily stored. All asynchronous message services by + -- definition require some message store. E.g. in the case of e-mail this will be a mailbox +{ + validity [1] TimeSpan OPTIONAL, + msgStoreId [2] MsgStoreId OPTIONAL, + aliases [3] SEQUENCE OF MsgAddress OPTIONAL, + -- The complete list of all addresses that get delivered into this message store. + providerID [4] MsgProviderId OPTIONAL, + ... +} + +MsgStoreId ::= OCTET STRING + -- Unique identifier of the message store. Since not all IDs will necessarily be human + -- readable, a generic byte string is used + +MsgAddress ::= OCTET STRING + -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail + -- this will be an RFC822-style address + +MsgProviderId ::= OCTET STRING + -- Unique identifier for a service provider, e.g. company name + +-- ==================================== +-- Definitions of Message Service Usage +-- ==================================== + +MsgServiceUsage ::= CHOICE + -- Choice of different types of activities + -- Manipulation of stored address books is outside the scope +{ + msgTransmission [1] MsgTransmission, + msgStoreOperation [2] MsgStoreOperation, + ... +} + +MsgTransmission ::= SEQUENCE + -- Sending of an outgoing message, or reception of an incoming message +{ + dateTime [1] GeneralizedTime OPTIONAL, + subscriberId [2] MsgSubscriberId OPTIONAL, + senderAddress [3] MsgAddress OPTIONAL, + recipients [4] SEQUENCE OF MsgAddress OPTIONAL, + msgStores [5] SEQUENCE OF MsgStoreId OPTIONAL, + -- List of all local msgStores that received a copy of the message + -- For transit messages this field is not used + deliveryStatus [6] ENUMERATED + { + unknown(0), + succeeded(1), + -- Delivery might still fail at a subsequent mail server + failed(2), + -- E.g. when mailbox quota exceeded (mailbox full) + retried(3), + -- Deferred and retried at a later time + ... + } OPTIONAL, + protocol [7] ENUMERATED + { + smtp(0), + x400(1), + ... + } OPTIONAL, + clientID [8] IPAddress OPTIONAL, + serverID [9] IPAddress OPTIONAL, + ... +} + +MsgStoreOperation ::= SEQUENCE + -- Manipulation of a message store. +{ + dateTime [1] GeneralizedTime OPTIONAL, + subscriberId [2] MsgSubscriberId OPTIONAL, + msgStore [3] MsgStoreId OPTIONAL, + operation [4] ENUMERATED + { + connect(0), + -- Successful authorization for access to msgStore + disconnect(1), + retrieveMsg(2), + -- Viewing msg using a webmail client is also considered retrieval + partialretrieveMsg(3), + -- E.g. the TOP command in POP3 + deleteMsg(4), + addMsg(5), + -- E.g. the APPEND command in IMAP + ... + } OPTIONAL, + senderAddress [5] MsgAddress OPTIONAL, + -- For Internet email, use the From address in the mail headers + recipients [6] SEQUENCE OF MsgAddress OPTIONAL, + -- For Internet email, use the To, CC, and BCC addresses in the mail headers + protocol [7] ENUMERATED + { + pop(0), + imap(1), + ... + } OPTIONAL, + clientID [8] IPAddress OPTIONAL, + serverID [9] IPAddress OPTIONAL, + ... +} + +NetworkAccessRecord::= CHOICE +{ + naSubscriber [1] NASubscriber, + naServiceUsage [2] NAServiceUsage, + naDevice [3] NADevice, + naNetworkElement [4] NANwElement, + naBillingDetails [5] NABillingDetails, + ... +} + +-- ============================================= +-- Definitions of Network Access Subscriber Data +-- ============================================= + +NAProviderID ::= UTF8String + +NAAuthID ::= UTF8String + +NaSubscriberID ::= UTF8String + +NASubscriber ::= SEQUENCE + -- Generic information on a service subscriber, supplemented with information specific to + -- network access services. +{ + validity [1] TimeSpan OPTIONAL, + subscriberID [2] NaSubscriberID OPTIONAL, + -- Unique identifier for this subscriber, e.g. account number + naSubscriptions [3] SEQUENCE OF NAServiceSubscription OPTIONAL, + -- List of all known services subscribed to by this user + allocatedDeviceIDs [4] SEQUENCE OF NADeviceId OPTIONAL, + -- List of all known devices allocated to this user. + subscriber [5] GenericSubscriberInfo OPTIONAL , + -- Name, address and other generic subscriber information + ... +} + +NAServiceSubscription ::= SEQUENCE + -- Description of the subscription to a Network Access service +{ + validity [1] TimeSpan OPTIONAL, + naServiceID [2] UTF8String OPTIONAL, + -- Identifier for the service, e.g. account plan name. + naProviderID [3] NAProviderID OPTIONAL, + -- Unique identifier for the provider of the service, e.g. company name + naAuthID [4] NAAuthID OPTIONAL, + -- Unique identifier for this subscription, e.g. logon name + options [5] UTF8String OPTIONAL, + -- Human readable text with restrictions or options to the subscription + installationAddress [6] AddressInformation OPTIONAL, + fixIpAddress [7] IPAddress OPTIONAL, + -- fix assigned IP address + imsi [8] IMSI OPTIONAL, + ... +} + +-- =========================================== +-- Definitions of Network Access Service Usage +-- =========================================== + +NAServiceUsage ::= SEQUENCE +{ + naAccessTime [1] GeneralizedTime OPTIONAL, + -- Time of connection to the NAS + naAuthID [2] NAAuthID OPTIONAL, + -- Username used to obtain network access + nwAccessType [3] NwAccessType OPTIONAL, + -- Type of network access attempted. If not undefined(0), this should be one of the types + -- supported by the NAS (identified below by naNwElementID) + naStatus [4] ENUMERATED + { + unknown(0), + succeeded(1), + -- Authentication OK and access granted + failed(2), + -- Authentication failure (wrong credentials or time out) + rejected(3), + -- Rejected by the CSP (e.g. usage limits exceeded) + ... + } OPTIONAL, + interval [5] TimeSpan OPTIONAL, + -- Start time and end time (duration) of network access. + naDeviceId [6] NADeviceId OPTIONAL, + -- Device used to access the service + naNwElementID [7] NANwElementID OPTIONAL, + -- Network element (NAS) onto which the naDevice is connected + naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL, + -- IP address assigned by the network access service. May be fixed or dynamic + location [9] Location OPTIONAL, + -- Location of the access (for e.g. GPRS handsets) + dialUpInformation [10] DialUpInformation OPTIONAL, + gprsInformation [11] GprsInformation OPTIONAL, + ... +} + +NwAccessType ::= ENUMERATED +{ + undefined(0), + dialUp(1), + -- DialUp access + xDSL(2), + -- DSL access + cableModem(3), + -- Cable access + lAN(4), + -- LAN access + wirelessLAN(5), + -- Wireless LAN access (e.g. hotspot) + wimax(6), + mobilePacketData(7), + -- Network access over GSM/3GPP GPRS, UMTS, etc. + ... +} + +DialUpInformation ::= SEQUENCE +{ + diallingNumber [1] PartyNumber OPTIONAL, + -- Telephone number used for dial-up access + dialledNumber [2] PartyNumber OPTIONAL, + callback [3] PartyNumber OPTIONAL, + -- Call back number used for dial-up access + ... +} + +GprsInformation ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] PartyNumber OPTIONAL, + sgsnAddress [3] SEQUENCE OF IPAddress OPTIONAL, + ggsnAddress [4] IPAddress OPTIONAL, + pDP-address-allocated [5] IPAddress OPTIONAL, + aPN [6] UTF8String OPTIONAL, + pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, + -- format as per TS 101 671 [6] + ... +} + +-- ==================================== +-- Definitions of Network Access Device +-- ==================================== + +NADeviceId ::= UTF8String + +NADevice ::= SEQUENCE +{ + naDeviceId [1] NADeviceId OPTIONAL, + -- Identifier of this device. + description [2] UTF8String OPTIONAL, + -- Human readable description of device + location [3] Location OPTIONAL, + macAddress [4] OCTET STRING (SIZE (6)) OPTIONAL, + -- MAC or ethernet address + dslID [5] UTF8String OPTIONAL, + imei [6] IMEI OPTIONAL, + ... +} + +IMEI ::= OCTET STRING (SIZE(8)) + -- format as per TS GSM 09.02 [8] + +IMSI ::= OCTET STRING (SIZE(3..8)) + -- format as per TS GSM 09.02 [8] + +-- ====================================== +-- Definitions of Message Network element +-- ====================================== + +NANwElementID ::= UTF8String + +NANwElement ::= SEQUENCE + -- In this context, the network element is more commonly referred to as NAS +{ + validity [1] TimeSpan OPTIONAL, + -- Period for which this interval is valid + naNwElementID [2] NANwElementID OPTIONAL, + -- Unique ID of this NAS (Network Access Server) + naProviderID [3] NAProviderID OPTIONAL, + -- Unique identifier of the provider managing this NAS. + supportedAccessTypes [4] SEQUENCE OF NwAccessType OPTIONAL, + location [5] Location OPTIONAL, + ... +} + +IPAddress ::= CHOICE +{ + iPv4BinaryAddress [1] OCTET STRING (SIZE(4)), + iPv6BinaryAddress [2] OCTET STRING (SIZE(16)), + iPTextAddress [3] IA5String (SIZE(7..45)), + ... +} + +NAAssignedAddress ::= SEQUENCE +{ + addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, + portNumber [2] INTEGER OPTIONAL, + -- populated with the outbound port number + addressType [3] ENUMERATED + { + unknown(0), + internal(1), + external(2), + ... + } OPTIONAL, + assignedTime [4] TimeSpan OPTIONAL, + ... +} + +IPAddressSetOrRangeOrMask ::= CHOICE +{ + set [0] SEQUENCE OF IPAddress, + range [1] IPRange, + mask [2] IPMask +} + +IPRange ::= SEQUENCE + -- Things like 172.16.10.0/26 +{ + prefix [0] IPAddress, + subnetlength [1] INTEGER (1..128) +} + +IPMask ::= SEQUENCE + -- Things like 172.16.10.0/255.255.255.240 +{ + base [0] IPAddress, + mask [1] IPAddress +} + +NABillingDetails ::= SEQUENCE +{ + subscriberID [1] NaSubscriberID OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] BillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, + ... +} + +END -- of RDMessage + + + diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd new file mode 100644 index 0000000..7ce44f5 --- /dev/null +++ b/102657/RDMessage.xsd @@ -0,0 +1,1507 @@ + + + + + + + XSD translated from ASN.1 derived from outcome of LI-rap20 (TS 102 657 v1.1.2) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A country code as per ISO 3166-1 [xx] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/102657/portal/TS 102 657, RDMessage, ver1.asn b/102657/portal/TS 102 657, RDMessage, ver1.asn new file mode 100644 index 0000000..11b4b8a --- /dev/null +++ b/102657/portal/TS 102 657, RDMessage, ver1.asn @@ -0,0 +1,1300 @@ +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version1(1)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} + +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version1(1)} + +-- ====================================== +-- Top level definitions for RDHI wrapper +-- ====================================== + +RetainedDataMessage ::= SEQUENCE +{ + rdHeaderId [0] OBJECT IDENTIFIER, + retainedDataHeader [1] RetainedDataHeader, + retainedDataPayload [2] RetainedDataPayload, + retainedDataDigest [3] OCTET STRING OPTIONAL, + -- The digitally signed hash of the combined fields above (retainedDataHeader and + -- retainedDataPayload) + ... +} + +-- ========================================================================== +-- Definitions for Retained Data header information, present in every message +-- ========================================================================== + +RetainedDataHeader ::= SEQUENCE +{ + requestID [1] RequestID, + cSPID [2] CSPID, + timeStamp [3] GeneralizedTime, + thirdPartyCSPID [4] CSPID OPTIONAL, + ... +} + +CSPID ::= UTF8String + -- Unique identifier for the CSP that issued the request + +RequestID ::= SEQUENCE +{ + countryCode [1] CountryCode, + authorisedOrganisationID [2] AuthorisedOrganisationID, + requestNumber [3] RequestNumber OPTIONAL, + -- all messages except GetStatusMessage and StatusMessage have a request number + -- (see clause 6.1.2) + ... +} + +CountryCode ::= UTF8String (SIZE(2)) +-- A country code as per ISO 3166-1 [4] + +AuthorisedOrganisationID::= UTF8String +-- A unique identifier for an Authorized Organization issuing a Retained Data request + +RequestNumber ::= UTF8String +-- Unique within a given country and Authorized Organization + +-- ================================================= +-- Definitions for Retained Data payload information +-- ================================================= + +RetainedDataPayload ::= CHOICE + -- Payload can be a request, response, error or acknowledgement +{ + requestMessage [1] RequestMessage, + requestAcknowledgement [2] RequestAcknowledgement, + responseMessage [3] ResponseMessage, + responseAcknowledgement [4] ResponseAcknowledgement, + errorMessage [5] FurtherInformation, + cancelMessage [6] CancelMessage, + cancelAcknowledgement [7] CancelAcknowledgement, + getstatusMessage [8] GetStatusMessage, + statusMessage [9] StatusMessage, + getResultsMessage [10] GetResultsMessage, + ... +} + +-- ================================================== +-- Definitions of Request message and acknowledgement +-- ================================================== + +RequestMessage ::= SEQUENCE +{ + requestPriority [1] RequestPriority, + requestParameters [2] RequestConstraints, + deliveryPointHIB [3] DeliveryPointHIB OPTIONAL, + -- pre-arranged set of delivery address(es) of that specific Authorized Organization + maxHits [4] INTEGER OPTIONAL, + -- Maximum number of records to be returned. + -- On a national basis maximum numbers could be considered + -- In case of maxHit a responseFailed message is sent and no data is sent (see 6.3.3.2) + nationalRequestParameters [5] NationalRequestParameters OPTIONAL, + -- to be defined on a national basis + -- only to be used in case the present document can not fulfil the national requirements + ... +} + +DeliveryPointHIB ::= UTF8String + +RequestConstraints ::= SEQUENCE +{ + equals [1] RetainedDataRecord OPTIONAL, + notEqualTo [2] RetainedDataRecord OPTIONAL, + lessThan [3] RetainedDataRecord OPTIONAL, + -- For numerical values + lessThanOrEqualTo [4] RetainedDataRecord OPTIONAL, + -- For numerical values + greaterThan [5] RetainedDataRecord OPTIONAL, + -- For numerical values + greaterThanOrEqualTo [6] RetainedDataRecord OPTIONAL, + -- For numerical values + startsWith [7] RetainedDataRecord OPTIONAL, + -- For strings + endsWith [8] RetainedDataRecord OPTIONAL, + -- For strings + isAMemberOf [9] SEQUENCE OF RetainedDataRecord OPTIONAL, + ... +} + +RequestPriority ::= OCTET STRING + -- Priority considerations are a matter for national implementation + -- This standard makes no statement regarding how such priorities are represented or used + + +RequestAcknowledgement ::= SEQUENCE +{ + suggestedCompletionTime [1] GeneralizedTime OPTIONAL, + -- indicative time that results will be ready + -- purely informational, not binding for either party + ... +} + +-- =================================================== +-- Definitions of Response message and acknowledgement +-- =================================================== + +ResponseMessage ::= SEQUENCE +{ + responseStatus [1] ResponseStatus, + responsePayload [2] SEQUENCE OF ResponseRecord OPTIONAL, + -- Clause 6 explains use of this field + -- A responseUnavailable message shall not have a responsePayload (see clause 5.3.3) + -- The responseComplete and responseIncomplete message shall have a responsePayload + -- If there are no responses, the responsePayload is present but has zero entries + nationalResponsePayload [3] NationalResponsePayload OPTIONAL, + -- to be defined on a national basis + -- only to be used in case the present document can not fulfil the national requirements + ... +} + +ResponseStatus ::= CHOICE +{ + responseComplete [1] NULL, + -- No further results to come + responseIncomplete [2] NULL, + -- There may be further results to come + responseUnavailable [3] NULL, + -- See clause 6.3.3 + responseFailed [4] FurtherInformation, + -- See clause 6.3.3.2 + ... +} + +ResponseRecord ::= SEQUENCE +{ + recordNumber [1] INTEGER, + recordPayload [2] RetainedDataRecord, + additionalInformation [3] AdditionalInformation OPTIONAL, + -- see clause 6.2.4 + nationalRecordPayload [4] NationalRecordPayload OPTIONAL, + ... +} + +AdditionalInformation ::= SEQUENCE +{ + contactInformation [1] UTF8String OPTIONAL, + -- Name or address of operator or person who may have further information + otherInformation [2] UTF8String OPTIONAL, + ... +} + +RetainedDataRecord ::= CHOICE +{ + telephonyRecord [1] TelephonyRecord, + messageRecord [2] MessageRecord, + networkAccess [3] NetworkAccessRecord, + -- other services will be included (like multimedia) as they are implemented + ... +} + +ResponseAcknowledgement ::= CHOICE +{ + -- acknowledges a response has been sent + acknowledgeCompleteResults [1] NULL, + acknowledgePartialResults [2] NULL, + ... +} + +-- ================================================== +-- Definitions of an error message and acknowledgment +-- ================================================== + +FurtherInformation ::= SEQUENCE +{ + information [1] UTF8String, + contactInformation [2] UTF8String OPTIONAL, + ... +} + +-- =================================================== +-- Definitions of a cancel message and acknowledgement +-- =================================================== + +CancelMessage ::= NULL + -- Cancels an active request + +CancelAcknowledgement ::= NULL + -- Acknowledges the receipt of a cancel message (no other information required) + +-- =================================================== +-- Definitions of status request and response messages +-- =================================================== + +GetStatusMessage ::= SEQUENCE +{ + requestNumbers [1] SEQUENCE OF RequestNumber, + ... +} + +StatusMessage ::= SEQUENCE +{ + statusResponse [1] SEQUENCE OF StatusResponse, + ... +} + +StatusResponse ::= SEQUENCE +{ + requestNumber [1] RequestNumber, + requestStatus [2] RequestStatus, + ... +} + +RequestStatus ::= CHOICE +{ + ready [1] NULL, + incompleteResultsReady [2] NULL, + failureResponseReady [3] NULL, + notReady [4] NULL, + error [5] FurtherInformation, + inDelivery [6] NULL, + invalidRequestID [7] NULL, + ... +} + +-- ========================================== +-- Definitions of status get results messages +-- ========================================== + +GetResultsMessage ::= NULL + -- No further information required (the RequestID is given in the header) + +-- =================== +-- National parameters +-- =================== + +NationalRequestParameters ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- Country Code according to ISO 3166-1 [4], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that an version indicator is included in the national parameters + -- definition. +} + +NationalResponsePayload ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +NationalRecordPayload ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +TimeSpan ::= SEQUENCE +{ + startTime [1] GeneralizedTime OPTIONAL, + endTime [2] GeneralizedTime OPTIONAL, + ... +} + +-- ============================================== +-- Definitions for Generic Subscriber Information +-- ============================================== + +GenericSubscriberInfo ::= SEQUENCE +{ + organizationInfo [1] OrganizationInfo OPTIONAL, + individualInfo [2] IndividualInfo OPTIONAL, + ... +} + +OrganizationInfo ::= SEQUENCE +{ + name [1] UTF8String OPTIONAL, + -- name of the organization + contactDetails [2] ContactDetails OPTIONAL, + -- address, and name/phone number of a point of contact + nationalRegistrationID [3] UTF8String OPTIONAL, + -- e.g. social security number + ... +} + +IndividualInfo ::= SEQUENCE +{ + name [1] PersonName OPTIONAL, + contactAddress [2] ContactDetails OPTIONAL, + dateOfBirth [3] GeneralizedTime OPTIONAL, + gender [4] ENUMERATED + { + male(0), + female(1), + ... + } OPTIONAL, + identificationNumber [5] UTF8String OPTIONAL, + authenticationInfo [6] AuthenticationInfo OPTIONAL, + ... +} + +PersonName ::= SEQUENCE +{ + salutation [1] UTF8String OPTIONAL, + surname [2] UTF8String OPTIONAL, + -- the non-chosen or inherited name of an individual, e.g. Arend + surnamePrefix [3] UTF8String OPTIONAL, + -- any prefix before the surname, e.g. von, van der + surnameSuffix [4] UTF8String OPTIONAL, + -- any suffix after the surname, e.g. Jr, III + middleNames [5] UTF8String OPTIONAL, + -- that part of the name excluding forename, separable and preceding the surname + firstname [6] UTF8String OPTIONAL, + -- the first name or initials, e.g. Peter + ... +} + +ContactDetails ::= SEQUENCE +{ + address [1] AddressInformation OPTIONAL, + emailAddress [2] UTF8String OPTIONAL, + contactNumber [3] SEQUENCE OF PartyNumber OPTIONAL, + -- several numbers (work, home, mobile) may be given for a single subscriber + ... +} + +AddressInformation ::= SEQUENCE +{ + flatNumber [1] UTF8String OPTIONAL, + buildingName [2] UTF8String OPTIONAL, + buildingNumber [3] UTF8String OPTIONAL, + streetName [4] UTF8String OPTIONAL, + poBox [5] UTF8String OPTIONAL, + -- PO box or Response number + postalCode [6] UTF8String OPTIONAL, + -- Postal code. Example: 2289AC + region [7] UTF8String OPTIONAL, + province [8] UTF8String OPTIONAL, + language [9] UTF8String OPTIONAL, + city [10] UTF8String OPTIONAL, + country [11] CountryCode OPTIONAL, + -- Country code as defined in ISO 3166-1 [4] + validity [12] TimeSpan OPTIONAL, + -- time from which the address was registered + ... +} + +AuthenticationInfo ::= SEQUENCE +{ + authenticationType [1] UTF8String OPTIONAL, + -- the type of document used to authenticate, e.g. passport, drivers license + authenticationNumber [2] UTF8String OPTIONAL, + -- the number of the document used to authenticate + ... +} + +TelephonyRecord ::= CHOICE +{ + telephonySubscriber [1] TelephonySubscriber, + telephonyBillingDetails [2] TelephonyBillingDetails, + telephonyServiceUsage [3] TelephonyServiceUsage, + telephonyDevice [4] TelephonyDevice, + telephonyNetworkElement [5] TelephonyNetworkElement, + ... +} + +-- ============================== +-- Definitions of Subscriber Data +-- ============================== + +TelephonySubscriber ::= SEQUENCE +{ + subscriberID [1] TelephonySubscriberId OPTIONAL, + -- unique identifier for this subscriber, e.g. account number + genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, + -- generic personal information about this subscriber + telephonySubscriberInfo [3] TelephonySubscriberInfo OPTIONAL, + -- service-specific information about this subscriber + subscribedTelephonyServices [4] SEQUENCE OF SubscribedTelephonyServices OPTIONAL, + -- a subscriber (or account) may have more than one service listed against them + ... +} + +TelephonySubscriberId ::= UTF8String + -- unique identifier for this subscriber, e.g. account number + +TelephonySubscriberInfo ::= NULL + -- Reserved + +SubscribedTelephonyServices ::= SEQUENCE +{ + serviceID [1] UTF8String OPTIONAL, + -- Unique identifier for this service within the operator + providerID [2] UTF8String OPTIONAL, + -- Unique identifier for the service provider + timeSpan [3] TimeSpan OPTIONAL, + -- Start and end data, if applicable, of the subsription + registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, + -- The set of telephone numbers registered for this service + registeredICCID [5] UTF8String OPTIONAL, + serviceType [6] TelephonyServiceType OPTIONAL, + installationAddress [7] AddressInformation OPTIONAL, + -- installation address, if different from the registered address + connectionDate [8] GeneralizedTime OPTIONAL, + -- Date the subscriber was actually connected + -- (May differ from the start of subscription) + iMSI [9] IMSI OPTIONAL, + carrierPreselect [10] BOOLEAN OPTIONAL, + lineStatus [11] UTF8String OPTIONAL, + -- CSP-specific description of current line status, + -- e.g. Active, Ceased, etc. + ... +} + +TelephonyBillingDetails ::= SEQUENCE +{ + subscriberID [1] TelephonySubscriberId OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] BillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, + ... +} + +BillingIdentifier ::= OCTET STRING + -- Used to correlate billing information + -- useful if the bill-payer is not the subscriber, e.g. company mobiles + +BillingRecords ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, + -- as per ISO 4217 [5] + method [5] UTF8String OPTIONAL, + -- i.e. credit card etc. + ... +} + +TelephonyServiceType ::= ENUMERATED +{ + private(0), + privatePABX(1), + publicPayphone(2), + ... +} + +-- ================================= +-- Definitions of Service Usage Data +-- ================================= + +TelephonyServiceUsage ::= SEQUENCE +{ + partyInformation [1] SEQUENCE OF TelephonyPartyInformation OPTIONAL, + -- This parameter provides the concerned party (Originating, Terminating or + -- forwarded party), the identity(ies) of the party and all the information + -- provided by the party + communicationTime [2] TimeSpan OPTIONAL, + -- Time and duration of the communication + eventInformation [3] SEQUENCE OF TelephonyEventInformation OPTIONAL, + -- A list of events that occurred during this service usage + endReason [4] INTEGER OPTIONAL, + -- Q.850 cause code for call termination + communicationType [5] TelephonyCommunicationType OPTIONAL, + bearerService [6] TelephonyBearerService OPTIONAL, + smsInformation [7] SmsInformation OPTIONAL, + ringDuration [8] INTEGER OPTIONAL, + ... +} + +TelephonyPartyInformation ::= SEQUENCE +{ + partyRole [1] TelephonyPartyRole OPTIONAL, + partyNumber [2] PartyNumber OPTIONAL, + subscriberID [3] TelephonySubscriberId OPTIONAL, + deviceID [4] TelephonyDeviceID OPTIONAL, + locations [5] SEQUENCE OF TelephonyLocation OPTIONAL, + -- List of cell locations used by this party during the service usage + communicationTime [6] TimeSpan OPTIONAL, + -- Time and duration of the communication + iCCID [7] UTF8String OPTIONAL, + -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format + iMSI [8] IMSI OPTIONAL, + natureOfAddress [9] UTF8String OPTIONAL, + -- Nature of address indicator, e.g. National, International + forwardedTransferredNumber [10] PartyNumber OPTIONAL, + terminatingTransferredNumber [11] PartyNumber OPTIONAL, + ... +} + +TelephonyCommunicationType ::= ENUMERATED +{ + telephonyFixedCS(0), + telephonyWirelessCS(1), + sMS(2), + ... +} + +TelephonyBearerService ::= ENUMERATED +{ + speech(0), + data(1), + fax(2), + ... +} + +SmsInformation ::= SEQUENCE +{ + smsEvent [1] ENUMERATED + { + shortMessage(1), + shortPartMessage(2), + compositeMessage(3), + notificationMessage(4), + ... + } OPTIONAL, + smsType [2] ENUMERATED + { + deliverSCtoMS(1), + deliverReportMStoSC(2), + statusReportSCtoMS(3), + commandMStoSC(4), + submitMStoSC(5), + submitReportSCtoMS(6), + reservedMTIValue(7), + ... + } OPTIONAL, + smsStatus [3] ENUMERATED + { + delivered(0), + expired(1), + deleted(2), + replaced(3), + submitted(4), + incomplete-submission(5), + incomplete-delivery(6), + undeliverable(7), + passed-on(8), + ... + } OPTIONAL, + smsCmRefNr [4] OCTET STRING (SIZE(1..2)) OPTIONAL, + -- format as per 3GPP 23.040 [16] + smsNumOfSM [5] INTEGER (0..65535) OPTIONAL, + smsNotifyInd [6] BOOLEAN OPTIONAL, + smsProtocolId [7] OCTET STRING (SIZE(1)) OPTIONAL, + -- format as per 3GPP 23.040 [16] + ... +} + +TelephonyEventInformation ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + -- time when the event occurred + type [2] TelephonyEventType OPTIONAL, + -- type of event + party [3] TelephonyPartyRole OPTIONAL, + -- party to which the event is related + location [4] TelephonyLocation OPTIONAL, + ... +} + +TelephonyEventType ::= CHOICE +{ + basicEventType [1] BasicEventType, + callConferenceEventType [2] CallConferenceEventType, + callForwardingEventType [3] CallForwardingEventType, + messagingEventType [4] MessagingEventType, + prepayServiceEventType [5] PrepayServiceEventType, + ... +} + +BasicEventType ::= ENUMERATED +{ + handover(1), + hold(2), + retrieve(3), + suspend(4), + resume(5), + ect(6), + mpty(7), + mptyHold(8), + mptyRetrieve(9), + mptySplit(10), + uus1(11), + uus2(12), + uus3(13), + serviceSpeech(14), + serviceFax(15), + tpyInvoke(16), + tpyPrivateComm(17), + serviceActivation(18), + transit(19), + mSOriginating(20), + callForwarding(21), + mSTerminating(22), + ... +} + +CallForwardingEventType ::= ENUMERATED +{ + cfuActivation(1), + cfuModification(2), + cfuDe-activation(3), + cfcNoReplyActivation(4), + cfcNoReplyModification(5), + cfcNoReplyDe-activation(6), + cfcBusyActivation(7), + cfcBusyModification(8), + cfcBusyDe-activation(9), + cfcOutOfRangeActivation(10), + cfcOutOfRangeModification(11), + cfcOutOfRangeDe-activation(12), + cfcUnavailableActivation(13), + cfcUnavailableModification(14), + cfcUnavailableDe-activation(15), + cfuFaxActivation(16), + cfuFaxModification(17), + cfuFaxDe-activation(18), + ... +} + +CallConferenceEventType ::= ENUMERATED +{ + confBeginSeizure(1), + confAdd(2), + confSplit(3), + confIsolate(4), + confReattach(5), + confDrop(6), + confBeginActive(7), + ... +} + +MessagingEventType ::= ENUMERATED +{ + mSOriginatingSMSinMSC(1), + mSTerminatingSMSinMSC(2), + shortMessageDelivery(3), + mMMessage(4), + mMNotification(5), + mMDeliveryReport(6), + mMReadReply(7), + ... +} + +PrepayServiceEventType ::= ENUMERATED +{ + serviceActivation(1), + ... +} + +TelephonyLocation ::= SEQUENCE +{ + telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, + -- ID of the network element location (e.g. Cell ID) + timeSpan [2] TimeSpan OPTIONAL, + -- Time span that this location was valid for + ... +} + +TelephonyPartyRole ::= ENUMERATED +{ + originating-Party(0), + terminating-Party(1), + forwarded-to-Party(2), + originalCalled (3), + redirecting(4), + connected(5), + userProvidedCalling(6), + roaming(7), + translated(8), + singlePersonalNumber(9), + smsOriginator(10), + smsRecipient(11), + smsOriginatorTrn(12), + smsRecipientTrn(13), + ... +} + +-- ======================= +-- Device Data definitions +-- ======================= + +TelephonyDevice ::= SEQUENCE +{ + deviceIDType [1] ENUMERATED + -- Type of identifier for telephony device + { + unknown(0), + imei(1), + macAddress(2), + ... + } OPTIONAL, + telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, + -- Unique identifier for this telephony device according to type of identifier + ... +} + +TelephonyDeviceID ::= OCTET STRING + -- A unique identifier for the telephony device. For example, the IMEI number + -- of a mobile handset + +-- ======================== +-- Network Data definitions +-- ======================== + +TelephonyNetworkElement ::= SEQUENCE +{ + telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, + cellInformation [2] Location OPTIONAL, + -- The Location information id + validity [3] TimeSpan OPTIONAL, + ... +} + +TelephonyNetworkID ::= OCTET STRING + -- Unique identifier for this network element: e.g. a Cell ID + +-- ==================== +-- Location information +-- ==================== + +Location ::= SEQUENCE +{ + e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, + -- Coded in the same format as the ISUP location number (parameter + -- field) of the ISUP (seeEN 300 356 [7]) + globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, + -- See MAP format (seeTS GSM 09.02 [8]) + + rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, + -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with + -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the + -- last 6 octets are used) + gsmLocation [4] GSMLocation OPTIONAL, + umtsLocation [5] UMTSLocation OPTIONAL, + sAI [6] OCTET STRING (SIZE (7)) OPTIONAL, + -- format: PLMN-ID 3 octets (no. 1-3) + -- LAC 2 octets (no. 4-5) + -- SAC 2 octets (no. 6-7) + -- (according to 3GPP TS 25.431 [10]) + oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, + -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with + -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI + -- (only the last 6 octets are used) + -- This parameter is duplicated from 3GPP TS 33.108 [11] + ... +} + +GSMLocation ::= CHOICE +{ + geoCoordinates [1] SEQUENCE + { + latitude [1] UTF8String (SIZE(7..10)) OPTIONAL, + -- format: XDDMMSS.SS + longitude [2] UTF8String (SIZE(8..11)) OPTIONAL, + -- format: XDDDMMSS.SS + mapDatum [3] MapDatum OPTIONAL, + azimuth [4] INTEGER (0..359) OPTIONAL, + -- The azimuth is the bearing, relative to true north + ... + }, + -- format: XDDMMSS.SS (on latitudes) or XDDDMMSS.SS (on longitudes) + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- MM : minutes (numeric characters) + -- SS.SS : seconds, the second part (.SS) is optional + -- Example: + -- latitude (short form) N502312 + -- longitude (long form) E1122312.18 + utmCoordinates [2] SEQUENCE + { + utm-Zone [1] UTF8String (SIZE(3)) OPTIONAL, + utm-East [2] UTF8String (SIZE(6)) OPTIONAL, + utm-North [3] UTF8String (SIZE(7)) OPTIONAL, + -- Universal Transverse Mercator + -- example utm-Zone 32U + -- utm-East 439955 + -- utm-North 5540736 + mapDatum [4] MapDatum OPTIONAL, + azimuth [5] INTEGER (0..359) OPTIONAL, + -- The azimuth is the bearing, relative to true north + ... + }, + utmRefCoordinates [3] SEQUENCE + { + utm-GridZone [1] UTF8String (SIZE(2)) OPTIONAL, + -- numerals from 1 to 60 + utm-GridBand [2] UTF8String (SIZE(1)) OPTIONAL, + -- character between C and X + squareID [3] UTF8String (SIZE(2)) OPTIONAL, + -- characters from A to Z + numericalLocationEasting [4] UTF8String (SIZE(5)) OPTIONAL, + numericalLocationNorthing [5] UTF8String (SIZE(5)) OPTIONAL, + -- Universal Transverse Mercator Reference = Military Grid Reference System (MGRS) + -- example utm-GridZone 32 + -- utm-GridBand U + -- squareID PU + -- numericalLocationEasting 9129 + -- mumericalLocationNorthing 4045 + -- In both panels, utm-GridBand and squareID the I and O characters are not used + -- because of their similarity to the digits one and zero. + mapDatum [6] MapDatum OPTIONAL, + azimuth [7] INTEGER (0..359) OPTIONAL, + -- The azimuth is the bearing, relative to true north + ... + }, + wGS84Coordinates [4] OCTET STRING, + -- format is as defined in 3GPP TS 03.32 [12] + ... +} + +MapDatum ::= ENUMERATED +{ + wGS84(1), + -- World Geodetic System 1984 + wGS72(2), + eD50(3), + -- European Datum 50 + rD(4), + -- Rijks Driehoek (Netherlands) + potsdamDatum(5), + datumAustria(6), + eTRS89(7), + -- European Terrestrial Reference System 1989 + nAD27(8), + -- North American Datum 1927 + oSGB36(9), + -- Ordnance Survey of Great Britain + oSNI52(10), + -- Ordnance Survey of Northern Ireland + tM65(11), + iTM(12), + -- Irish Transverse Mercator + ... +} + +UMTSLocation ::= CHOICE +{ + point [1] GA-Point, + pointWithUnCertainty [2] GA-PointWithUnCertainty, + polygon [3] GA-Polygon, + ... +} + +GeographicalCoordinates ::= SEQUENCE +{ + latitudeSign [1] ENUMERATED + { + north, + south + } OPTIONAL, + latitude [2] INTEGER (0..8388607) OPTIONAL, + longitude [3] INTEGER (-8388608..8388607) OPTIONAL, + ... +} + +GA-Point ::= SEQUENCE +{ + geographicalCoordinates [1] GeographicalCoordinates, + ... +} + +GA-PointWithUnCertainty ::=SEQUENCE +{ + geographicalCoordinates [1] GeographicalCoordinates, + uncertaintyCode [2] INTEGER (0..127) +} + +maxNrOfPoints INTEGER ::= 15 + +GA-Polygon ::= SEQUENCE (SIZE (1..maxNrOfPoints)) OF GA-Polygon-Elements + +GA-Polygon-Elements ::= SEQUENCE +{ + geographicalCoordinates [1] GeographicalCoordinates, + ... +} + +-- =================== +-- General definitions +-- =================== + +PartyNumber ::= UTF8String + -- E164 address of the node in international format + +MessageRecord ::= CHOICE +{ + msgSubscriber [1] MsgSubscriber, + msgServiceUsage [2] MsgServiceUsage, + ... +} + +-- ====================================== +-- Definitions of Message Subscriber Data +-- ====================================== + +MsgSubscriber ::= SEQUENCE + -- Generic information on a service subscriber, supplemented with information specific to + -- asynchronous message services +{ + validity [1] TimeSpan OPTIONAL, + subscriberID [2] MsgSubscriberId OPTIONAL, + msgStores [3] SEQUENCE OF MsgStore OPTIONAL, + -- message stores allocated to this subscriber + subscriber [4] GenericSubscriberInfo OPTIONAL, + ... +} + +MsgSubscriberId ::= OCTET STRING + -- Unique identifier for this subscriber, e.g. account number + +MsgStore ::= SEQUENCE + -- Location into which messages are temporarily stored. All asynchronous message services by + -- definition require some message store. E.g. in the case of e-mail this will be a mailbox +{ + validity [1] TimeSpan OPTIONAL, + msgStoreId [2] MsgStoreId OPTIONAL, + aliases [3] SEQUENCE OF MsgAddress OPTIONAL, + -- The complete list of all addresses that get delivered into this message store. + providerID [4] MsgProviderId OPTIONAL, + ... +} + +MsgStoreId ::= OCTET STRING + -- Unique identifier of the message store. Since not all IDs will necessarily be human + -- readable, a generic byte string is used + +MsgAddress ::= OCTET STRING + -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail + -- this will be an RFC822-style address + +MsgProviderId ::= OCTET STRING + -- Unique identifier for a service provider, e.g. company name + +-- ==================================== +-- Definitions of Message Service Usage +-- ==================================== + +MsgServiceUsage ::= CHOICE + -- Choice of different types of activities + -- Manipulation of stored address books is outside the scope +{ + msgTransmission [1] MsgTransmission, + msgStoreOperation [2] MsgStoreOperation, + ... +} + +MsgTransmission ::= SEQUENCE + -- Sending of an outgoing message, or reception of an incoming message +{ + dateTime [1] GeneralizedTime OPTIONAL, + subscriberId [2] MsgSubscriberId OPTIONAL, + senderAddress [3] MsgAddress OPTIONAL, + recipients [4] SEQUENCE OF MsgAddress OPTIONAL, + msgStores [5] SEQUENCE OF MsgStoreId OPTIONAL, + -- List of all local msgStores that received a copy of the message + -- For transit messages this field is not used + deliveryStatus [6] ENUMERATED + { + unknown(0), + succeeded(1), + -- Delivery might still fail at a subsequent mail server + failed(2), + -- E.g. when mailbox quota exceeded (mailbox full) + retried(3), + -- Deferred and retried at a later time + ... + } OPTIONAL, + protocol [7] ENUMERATED + { + smtp(0), + x400(1), + ... + } OPTIONAL, + clientID [8] IPAddress OPTIONAL, + serverID [9] IPAddress OPTIONAL, + ... +} + +MsgStoreOperation ::= SEQUENCE + -- Manipulation of a message store. +{ + dateTime [1] GeneralizedTime OPTIONAL, + subscriberId [2] MsgSubscriberId OPTIONAL, + msgStore [3] MsgStoreId OPTIONAL, + operation [4] ENUMERATED + { + connect(0), + -- Successful authorization for access to msgStore + disconnect(1), + retrieveMsg(2), + -- Viewing msg using a webmail client is also considered retrieval + partialretrieveMsg(3), + -- E.g. the TOP command in POP3 + deleteMsg(4), + addMsg(5), + -- E.g. the APPEND command in IMAP + ... + } OPTIONAL, + senderAddress [5] MsgAddress OPTIONAL, + -- For Internet email, use the From address in the mail headers + recipients [6] SEQUENCE OF MsgAddress OPTIONAL, + -- For Internet email, use the To, CC, and BCC addresses in the mail headers + protocol [7] ENUMERATED + { + pop(0), + imap(1), + ... + } OPTIONAL, + clientID [8] IPAddress OPTIONAL, + serverID [9] IPAddress OPTIONAL, + ... +} + +NetworkAccessRecord::= CHOICE +{ + naSubscriber [1] NASubscriber, + naServiceUsage [2] NAServiceUsage, + naDevice [3] NADevice, + naNetworkElement [4] NANwElement, + naBillingDetails [5] NABillingDetails, + ... +} + +-- ============================================= +-- Definitions of Network Access Subscriber Data +-- ============================================= + +NAProviderID ::= UTF8String + +NAAuthID ::= UTF8String + +NaSubscriberID ::= UTF8String + +NASubscriber ::= SEQUENCE + -- Generic information on a service subscriber, supplemented with information specific to + -- network access services. +{ + validity [1] TimeSpan OPTIONAL, + subscriberID [2] NaSubscriberID OPTIONAL, + -- Unique identifier for this subscriber, e.g. account number + naSubscriptions [3] SEQUENCE OF NAServiceSubscription OPTIONAL, + -- List of all known services subscribed to by this user + allocatedDeviceIDs [4] SEQUENCE OF NADeviceId OPTIONAL, + -- List of all known devices allocated to this user. + subscriber [5] GenericSubscriberInfo OPTIONAL , + -- Name, address and other generic subscriber information + ... +} + +NAServiceSubscription ::= SEQUENCE + -- Description of the subscription to a Network Access service +{ + validity [1] TimeSpan OPTIONAL, + naServiceID [2] UTF8String OPTIONAL, + -- Identifier for the service, e.g. account plan name. + naProviderID [3] NAProviderID OPTIONAL, + -- Unique identifier for the provider of the service, e.g. company name + naAuthID [4] NAAuthID OPTIONAL, + -- Unique identifier for this subscription, e.g. logon name + options [5] UTF8String OPTIONAL, + -- Human readable text with restrictions or options to the subscription + installationAddress [6] AddressInformation OPTIONAL, + fixIpAddress [7] IPAddress OPTIONAL, + -- fix assigned IP address + imsi [8] IMSI OPTIONAL, + ... +} + +-- =========================================== +-- Definitions of Network Access Service Usage +-- =========================================== + +NAServiceUsage ::= SEQUENCE +{ + naAccessTime [1] GeneralizedTime OPTIONAL, + -- Time of connection to the NAS + naAuthID [2] NAAuthID OPTIONAL, + -- Username used to obtain network access + nwAccessType [3] NwAccessType OPTIONAL, + -- Type of network access attempted. If not undefined(0), this should be one of the types + -- supported by the NAS (identified below by naNwElementID) + naStatus [4] ENUMERATED + { + unknown(0), + succeeded(1), + -- Authentication OK and access granted + failed(2), + -- Authentication failure (wrong credentials or time out) + rejected(3), + -- Rejected by the CSP (e.g. usage limits exceeded) + ... + } OPTIONAL, + interval [5] TimeSpan OPTIONAL, + -- Start time and end time (duration) of network access. + naDeviceId [6] NADeviceId OPTIONAL, + -- Device used to access the service + naNwElementID [7] NANwElementID OPTIONAL, + -- Network element (NAS) onto which the naDevice is connected + naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL, + -- IP address assigned by the network access service. May be fixed or dynamic + location [9] Location OPTIONAL, + -- Location of the access (for e.g. GPRS handsets) + dialUpInformation [10] DialUpInformation OPTIONAL, + gprsInformation [11] GprsInformation OPTIONAL, + ... +} + +NwAccessType ::= ENUMERATED +{ + undefined(0), + dialUp(1), + -- DialUp access + xDSL(2), + -- DSL access + cableModem(3), + -- Cable access + lAN(4), + -- LAN access + wirelessLAN(5), + -- Wireless LAN access (e.g. hotspot) + wimax(6), + mobilePacketData(7), + -- Network access over GSM/3GPP GPRS, UMTS, etc. + ... +} + +DialUpInformation ::= SEQUENCE +{ + diallingNumber [1] PartyNumber OPTIONAL, + -- Telephone number used for dial-up access + dialledNumber [2] PartyNumber OPTIONAL, + callback [3] PartyNumber OPTIONAL, + -- Call back number used for dial-up access + ... +} + +GprsInformation ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] PartyNumber OPTIONAL, + sgsnAddress [3] SEQUENCE OF IPAddress OPTIONAL, + ggsnAddress [4] IPAddress OPTIONAL, + pDP-address-allocated [5] IPAddress OPTIONAL, + aPN [6] UTF8String OPTIONAL, + pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, + -- format as per TS 101 671 [6] + ... +} + +-- ==================================== +-- Definitions of Network Access Device +-- ==================================== + +NADeviceId ::= UTF8String + +NADevice ::= SEQUENCE +{ + naDeviceId [1] NADeviceId OPTIONAL, + -- Identifier of this device. + description [2] UTF8String OPTIONAL, + -- Human readable description of device + location [3] Location OPTIONAL, + macAddress [4] OCTET STRING (SIZE (6)) OPTIONAL, + -- MAC or ethernet address + dslID [5] UTF8String OPTIONAL, + imei [6] IMEI OPTIONAL, + ... +} + +IMEI ::= OCTET STRING (SIZE(8)) + -- format as per TS GSM 09.02 [8] + +IMSI ::= OCTET STRING (SIZE(3..8)) + -- format as per TS GSM 09.02 [8] + +-- ====================================== +-- Definitions of Message Network element +-- ====================================== + +NANwElementID ::= UTF8String + +NANwElement ::= SEQUENCE + -- In this context, the network element is more commonly referred to as NAS +{ + validity [1] TimeSpan OPTIONAL, + -- Period for which this interval is valid + naNwElementID [2] NANwElementID OPTIONAL, + -- Unique ID of this NAS (Network Access Server) + naProviderID [3] NAProviderID OPTIONAL, + -- Unique identifier of the provider managing this NAS. + supportedAccessTypes [4] SEQUENCE OF NwAccessType OPTIONAL, + location [5] Location OPTIONAL, + ... +} + +IPAddress ::= CHOICE +{ + iPv4BinaryAddress [1] OCTET STRING (SIZE(4)), + iPv6BinaryAddress [2] OCTET STRING (SIZE(16)), + iPTextAddress [3] IA5String (SIZE(7..45)), + ... +} + +NAAssignedAddress ::= SEQUENCE +{ + addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, + portNumber [2] INTEGER OPTIONAL, + -- populated with the outbound port number + addressType [3] ENUMERATED + { + unknown(0), + internal(1), + external(2), + ... + } OPTIONAL, + assignedTime [4] TimeSpan OPTIONAL, + ... +} + +IPAddressSetOrRangeOrMask ::= CHOICE +{ + set [0] SEQUENCE OF IPAddress, + range [1] IPRange, + mask [2] IPMask +} + +IPRange ::= SEQUENCE + -- Things like 172.16.10.0/26 +{ + prefix [0] IPAddress, + subnetlength [1] INTEGER (1..128) +} + +IPMask ::= SEQUENCE + -- Things like 172.16.10.0/255.255.255.240 +{ + base [0] IPAddress, + mask [1] IPAddress +} + +NABillingDetails ::= SEQUENCE +{ + subscriberID [1] NaSubscriberID OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] BillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, + ... +} + +END -- of RDMessage + + + diff --git a/102657/portal/TS 102 657, RDMessage, ver1.xsd b/102657/portal/TS 102 657, RDMessage, ver1.xsd new file mode 100644 index 0000000..7ce44f5 --- /dev/null +++ b/102657/portal/TS 102 657, RDMessage, ver1.xsd @@ -0,0 +1,1507 @@ + + + + + + + XSD translated from ASN.1 derived from outcome of LI-rap20 (TS 102 657 v1.1.2) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A country code as per ISO 3166-1 [xx] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- GitLab From f2cf65cc3cb553c66ed07f96e9ecf1bd8797a0cd Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:15 +0100 Subject: [PATCH 031/208] TS 102 232-3 v2.2.1 (2009-01-09) agreed at LI#19 (Prague, 2008-09-30) --- 102232-3/IPAccessPDU.asn | 268 ++++++++++++++++++++++++++ 102232-3/portal/IPAccessPDU, ver6.txt | 268 ++++++++++++++++++++++++++ 2 files changed, 536 insertions(+) create mode 100644 102232-3/IPAccessPDU.asn create mode 100644 102232-3/portal/IPAccessPDU, ver6.txt diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn new file mode 100644 index 0000000..a946754 --- /dev/null +++ b/102232-3/IPAccessPDU.asn @@ -0,0 +1,268 @@ +IPAccessPDU +{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version6(6)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + -- from ETSI TS 101 671 [1] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) iRIOnly(3)} + -- all three definitions relative to {itu-t(0) identified-organization(4) + -- etsi(0) securityDomain(2) lawfulintercept(2)} + +-- ========================== +-- IP Communications Contents +-- ========================== + +IPCC ::= SEQUENCE +{ + iPCCObjId [0] RELATIVE-OID, + iPCCContents [1] IPCCContents +} + +IPCCContents ::= CHOICE +{ + iPPackets [0] OCTET STRING, + ... +} + +-- =================================================== +-- Intercept-related information for general IP-Access +-- =================================================== + +IPIRI ::= SEQUENCE +{ + iPIRIObjId [0] RELATIVE-OID, + iPIRIContents [1] IPIRIContents, + ... +} + +IPIRIContents ::= SEQUENCE +{ + accessEventType [0] AccessEventType, + targetUsername [1] OCTET STRING, + -- in ASCIIcharacters + internetAccessType [2] InternetAccessType, + iPVersion [3] IPVersion, + targetIPAddress [4] IPAddress OPTIONAL, + -- IP address may not be available in case of failed logon attempts. + -- If it is available, it must be sent. + targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, + -- Target network ID (e.g. MAC address, PSTN number) + targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, + -- CPEID (e.g. Relay Agent info, computer name) + targetLocation [7] UTF8String (SIZE (1..64)) OPTIONAL, + -- When internetAccessType is Wireless LAN, this field should contain a string which + -- uniquely identifies the wireless accesspoint within the SvP domain + pOPPortNumber [8] INTEGER (0..4294967295) OPTIONAL, + -- The POP port number used by the target + callBackNumber [9] UTF8String (SIZE (1..20)) OPTIONAL, + -- The number used to call-back the target + startTime [10] GeneralizedTime OPTIONAL, + -- The start date-time of the session or lease + endTime [11] GeneralizedTime OPTIONAL, + -- The actual end date-time of the session or lease + endReason [12] EndReason OPTIONAL, + -- The reason for the session to end + octetsReceived [13] INTEGER (0..18446744073709551615) OPTIONAL, + -- The number of octets the target received + octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, + -- The number of octets the target transmitted + rawAAAData [15] OCTET STRING OPTIONAL, + -- Content of the raw AAA record + ..., + expectedEndTime [16] GeneralizedTime OPTIONAL, + -- The expected end date-time of the session or lease + pOPPhoneNumber [17] UTF8String (SIZE (1..20)) OPTIONAL, + -- The phone number dialed by the target for dial-up + pOPIdentifier [18] IPIRIIDType OPTIONAL, + -- The identifier or name of the POP + pOPIPAddress [19] IPAddress OPTIONAL, + -- The IP address of the POP + nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL +} + +AccessEventType ::= ENUMERATED +{ + accessAttempt(0), + -- A target requests access to the IAS + accessAccept(1), + -- IAS access is granted to the target, the session begins + accessReject(2), + -- IAS access is refused to the target + accessFailed(3), + -- The Access_attempt timed-out or failed otherwise + sessionStart(4), + -- A target starts using the IAS; not in use anymore from version 4(4) + sessionEnd(5), + -- A target stops using the IAS; not in use anymore from version 4(4) + interimUpdate(6), + -- Intermediate status report on service status or usage + ..., + startOfInterceptionWithSessionActive(7), + -- LI is started on a target who already has an active session + accessEnd(8) + -- A target stops using the IAS, the session ends +} + +InternetAccessType ::= ENUMERATED +{ + undefined(0), + dialUp(1), + -- IAS via DialUp access + xDSL(2), + -- IAS via DSL access + cableModem(3), + -- IAS via Cable access + lAN(4), + -- IAS via LAN access + ..., + wirelessLAN(5), + -- IAS via Wireless LAN access + fTTx(6), + -- IAS via Fiber access + wIMAX-HIPERMAN(7), + -- IAS via WIMAX/HIPERMAN (fixed access) + satellite(8) + -- IAS via Satellite access + -- (when it is not covered by any 3GPP or ETSI mobile Lawful Interception specifications) +} + +IPVersion ::= ENUMERATED +{ + iPV4(1), + -- The IPv4 protocol is used + iPV6(2) + -- The IPv6 protocol is used +} + +EndReason ::= ENUMERATED +{ + undefined(0), + regularLogoff(1), + -- The target logged off + connectionLoss(2), + -- The connection was lost + connectionTimeout(3), + -- The connection timed-out + leaseExpired(4), + -- The DHCP lease expired + ... +} + +IPIRIIDType ::= CHOICE +{ + printableIDType [0] UTF8String (SIZE (1..128)), + -- For printable userIDs, such as the Radius username, phonenumbers + macAddressType [1] OCTET STRING (SIZE (6)), + -- For MAC address types, raw binary format as in RFC 2132 [15] + ipAddressType [2] IPAddress, + -- For IP address types + ... +} + +NationalIPIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [16], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} + +-- ===================================================== +-- Intercept-related information for IRI-Only intercepts +-- ===================================================== + +IPIRIOnly ::= SEQUENCE +{ + iPIRIOnlyObjId [0] RELATIVE-OID, + iPInformation [1] IPInformation, + protocolInformation [2] ProtocolInformation, + iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL, + iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL, + ... +} + +IPInformation ::= CHOICE +{ + iPv4Information [0] IPv4Information, + iPv6Information [1] IPv6Information +} + +ProtocolInformation ::= CHOICE +{ + none [0] NULL, + -- No layer 4 protocol information is provided + tCPInformation [1] TCPInformation, + uDPInformation [2] UDPInformation, + ... +} + +IPv4Information ::= SEQUENCE +{ + headerLength [0] OCTET STRING OPTIONAL, + typeOfService [1] OCTET STRING OPTIONAL, + totalLength [2] OCTET STRING (SIZE (2))OPTIONAL, + identification [3] OCTET STRING (SIZE (2))OPTIONAL, + fragment [4] OCTET STRING (SIZE (2))OPTIONAL, + ttl [5] OCTET STRING OPTIONAL, + protocol [6] OCTET STRING OPTIONAL, + headerChecksum [7] OCTET STRING (SIZE (2))OPTIONAL, + source [8] OCTET STRING (SIZE (4)), + destination [9] OCTET STRING (SIZE (4)), + options [10] OCTET STRING (SIZE (0..40))OPTIONAL +} + +IPv6Information ::= SEQUENCE +{ + trafficClass [0] OCTET STRING OPTIONAL, + flowLabel [1] OCTET STRING (SIZE (20))OPTIONAL, + payloadLength [2] OCTET STRING (SIZE (4))OPTIONAL, + nextHeader [3] OCTET STRING OPTIONAL, + hopLimit [4] OCTET STRING OPTIONAL, + source [5] OCTET STRING (SIZE (16)), + destination [6] OCTET STRING (SIZE (16)) +} + +TCPInformation ::= SEQUENCE +{ + sourcePort [0] OCTET STRING (SIZE (2))OPTIONAL, + destinationPort [1] OCTET STRING (SIZE (2))OPTIONAL, + sequenceNumber [2] OCTET STRING (SIZE (4))OPTIONAL, + ackNumber [3] OCTET STRING (SIZE (4))OPTIONAL, + dataOffset [4] BIT STRING (SIZE (4))OPTIONAL, + -- First 4 bits + controlBits [5] BIT STRING (SIZE (6))OPTIONAL, + -- Last 6 bits + windowSize [6] OCTET STRING (SIZE (2))OPTIONAL, + checkSum [7] OCTET STRING (SIZE (2))OPTIONAL, + urgentPointer [8] OCTET STRING (SIZE (2))OPTIONAL, + options [9] OCTET STRING (SIZE (0..40))OPTIONAL +} + +UDPInformation ::= SEQUENCE +{ + sourcePort [0] OCTET STRING (SIZE (2))OPTIONAL, + destinationPort [1] OCTET STRING (SIZE (2))OPTIONAL, + length [2] OCTET STRING (SIZE (2))OPTIONAL, + checkSum [3] OCTET STRING (SIZE (2))OPTIONAL +} + +END -- end of IPAccessPDU diff --git a/102232-3/portal/IPAccessPDU, ver6.txt b/102232-3/portal/IPAccessPDU, ver6.txt new file mode 100644 index 0000000..a946754 --- /dev/null +++ b/102232-3/portal/IPAccessPDU, ver6.txt @@ -0,0 +1,268 @@ +IPAccessPDU +{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version6(6)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + -- from ETSI TS 101 671 [1] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) iRIOnly(3)} + -- all three definitions relative to {itu-t(0) identified-organization(4) + -- etsi(0) securityDomain(2) lawfulintercept(2)} + +-- ========================== +-- IP Communications Contents +-- ========================== + +IPCC ::= SEQUENCE +{ + iPCCObjId [0] RELATIVE-OID, + iPCCContents [1] IPCCContents +} + +IPCCContents ::= CHOICE +{ + iPPackets [0] OCTET STRING, + ... +} + +-- =================================================== +-- Intercept-related information for general IP-Access +-- =================================================== + +IPIRI ::= SEQUENCE +{ + iPIRIObjId [0] RELATIVE-OID, + iPIRIContents [1] IPIRIContents, + ... +} + +IPIRIContents ::= SEQUENCE +{ + accessEventType [0] AccessEventType, + targetUsername [1] OCTET STRING, + -- in ASCIIcharacters + internetAccessType [2] InternetAccessType, + iPVersion [3] IPVersion, + targetIPAddress [4] IPAddress OPTIONAL, + -- IP address may not be available in case of failed logon attempts. + -- If it is available, it must be sent. + targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, + -- Target network ID (e.g. MAC address, PSTN number) + targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, + -- CPEID (e.g. Relay Agent info, computer name) + targetLocation [7] UTF8String (SIZE (1..64)) OPTIONAL, + -- When internetAccessType is Wireless LAN, this field should contain a string which + -- uniquely identifies the wireless accesspoint within the SvP domain + pOPPortNumber [8] INTEGER (0..4294967295) OPTIONAL, + -- The POP port number used by the target + callBackNumber [9] UTF8String (SIZE (1..20)) OPTIONAL, + -- The number used to call-back the target + startTime [10] GeneralizedTime OPTIONAL, + -- The start date-time of the session or lease + endTime [11] GeneralizedTime OPTIONAL, + -- The actual end date-time of the session or lease + endReason [12] EndReason OPTIONAL, + -- The reason for the session to end + octetsReceived [13] INTEGER (0..18446744073709551615) OPTIONAL, + -- The number of octets the target received + octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, + -- The number of octets the target transmitted + rawAAAData [15] OCTET STRING OPTIONAL, + -- Content of the raw AAA record + ..., + expectedEndTime [16] GeneralizedTime OPTIONAL, + -- The expected end date-time of the session or lease + pOPPhoneNumber [17] UTF8String (SIZE (1..20)) OPTIONAL, + -- The phone number dialed by the target for dial-up + pOPIdentifier [18] IPIRIIDType OPTIONAL, + -- The identifier or name of the POP + pOPIPAddress [19] IPAddress OPTIONAL, + -- The IP address of the POP + nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL +} + +AccessEventType ::= ENUMERATED +{ + accessAttempt(0), + -- A target requests access to the IAS + accessAccept(1), + -- IAS access is granted to the target, the session begins + accessReject(2), + -- IAS access is refused to the target + accessFailed(3), + -- The Access_attempt timed-out or failed otherwise + sessionStart(4), + -- A target starts using the IAS; not in use anymore from version 4(4) + sessionEnd(5), + -- A target stops using the IAS; not in use anymore from version 4(4) + interimUpdate(6), + -- Intermediate status report on service status or usage + ..., + startOfInterceptionWithSessionActive(7), + -- LI is started on a target who already has an active session + accessEnd(8) + -- A target stops using the IAS, the session ends +} + +InternetAccessType ::= ENUMERATED +{ + undefined(0), + dialUp(1), + -- IAS via DialUp access + xDSL(2), + -- IAS via DSL access + cableModem(3), + -- IAS via Cable access + lAN(4), + -- IAS via LAN access + ..., + wirelessLAN(5), + -- IAS via Wireless LAN access + fTTx(6), + -- IAS via Fiber access + wIMAX-HIPERMAN(7), + -- IAS via WIMAX/HIPERMAN (fixed access) + satellite(8) + -- IAS via Satellite access + -- (when it is not covered by any 3GPP or ETSI mobile Lawful Interception specifications) +} + +IPVersion ::= ENUMERATED +{ + iPV4(1), + -- The IPv4 protocol is used + iPV6(2) + -- The IPv6 protocol is used +} + +EndReason ::= ENUMERATED +{ + undefined(0), + regularLogoff(1), + -- The target logged off + connectionLoss(2), + -- The connection was lost + connectionTimeout(3), + -- The connection timed-out + leaseExpired(4), + -- The DHCP lease expired + ... +} + +IPIRIIDType ::= CHOICE +{ + printableIDType [0] UTF8String (SIZE (1..128)), + -- For printable userIDs, such as the Radius username, phonenumbers + macAddressType [1] OCTET STRING (SIZE (6)), + -- For MAC address types, raw binary format as in RFC 2132 [15] + ipAddressType [2] IPAddress, + -- For IP address types + ... +} + +NationalIPIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [16], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} + +-- ===================================================== +-- Intercept-related information for IRI-Only intercepts +-- ===================================================== + +IPIRIOnly ::= SEQUENCE +{ + iPIRIOnlyObjId [0] RELATIVE-OID, + iPInformation [1] IPInformation, + protocolInformation [2] ProtocolInformation, + iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL, + iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL, + ... +} + +IPInformation ::= CHOICE +{ + iPv4Information [0] IPv4Information, + iPv6Information [1] IPv6Information +} + +ProtocolInformation ::= CHOICE +{ + none [0] NULL, + -- No layer 4 protocol information is provided + tCPInformation [1] TCPInformation, + uDPInformation [2] UDPInformation, + ... +} + +IPv4Information ::= SEQUENCE +{ + headerLength [0] OCTET STRING OPTIONAL, + typeOfService [1] OCTET STRING OPTIONAL, + totalLength [2] OCTET STRING (SIZE (2))OPTIONAL, + identification [3] OCTET STRING (SIZE (2))OPTIONAL, + fragment [4] OCTET STRING (SIZE (2))OPTIONAL, + ttl [5] OCTET STRING OPTIONAL, + protocol [6] OCTET STRING OPTIONAL, + headerChecksum [7] OCTET STRING (SIZE (2))OPTIONAL, + source [8] OCTET STRING (SIZE (4)), + destination [9] OCTET STRING (SIZE (4)), + options [10] OCTET STRING (SIZE (0..40))OPTIONAL +} + +IPv6Information ::= SEQUENCE +{ + trafficClass [0] OCTET STRING OPTIONAL, + flowLabel [1] OCTET STRING (SIZE (20))OPTIONAL, + payloadLength [2] OCTET STRING (SIZE (4))OPTIONAL, + nextHeader [3] OCTET STRING OPTIONAL, + hopLimit [4] OCTET STRING OPTIONAL, + source [5] OCTET STRING (SIZE (16)), + destination [6] OCTET STRING (SIZE (16)) +} + +TCPInformation ::= SEQUENCE +{ + sourcePort [0] OCTET STRING (SIZE (2))OPTIONAL, + destinationPort [1] OCTET STRING (SIZE (2))OPTIONAL, + sequenceNumber [2] OCTET STRING (SIZE (4))OPTIONAL, + ackNumber [3] OCTET STRING (SIZE (4))OPTIONAL, + dataOffset [4] BIT STRING (SIZE (4))OPTIONAL, + -- First 4 bits + controlBits [5] BIT STRING (SIZE (6))OPTIONAL, + -- Last 6 bits + windowSize [6] OCTET STRING (SIZE (2))OPTIONAL, + checkSum [7] OCTET STRING (SIZE (2))OPTIONAL, + urgentPointer [8] OCTET STRING (SIZE (2))OPTIONAL, + options [9] OCTET STRING (SIZE (0..40))OPTIONAL +} + +UDPInformation ::= SEQUENCE +{ + sourcePort [0] OCTET STRING (SIZE (2))OPTIONAL, + destinationPort [1] OCTET STRING (SIZE (2))OPTIONAL, + length [2] OCTET STRING (SIZE (2))OPTIONAL, + checkSum [3] OCTET STRING (SIZE (2))OPTIONAL +} + +END -- end of IPAccessPDU -- GitLab From e91e4d37498bc30e3405fc1d4c0043accec2d7d8 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:20 +0100 Subject: [PATCH 032/208] TS 102 657 v1.2.1 (2009-06-17) agreed at LI#20 (Levi, 2009-02-03) --- 102657/RDMessage.asn | 232 +++++++++++------- 102657/RDMessage.xsd | 122 +++++++-- ...r1.asn => TS 102 657, RDMessage, ver2.asn} | 232 +++++++++++------- ...r1.xsd => TS 102 657, RDMessage, ver2.xsd} | 122 +++++++-- 4 files changed, 482 insertions(+), 226 deletions(-) rename 102657/portal/{TS 102 657, RDMessage, ver1.asn => TS 102 657, RDMessage, ver2.asn} (85%) rename 102657/portal/{TS 102 657, RDMessage, ver1.xsd => TS 102 657, RDMessage, ver2.xsd} (92%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 11b4b8a..8286171 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,16 +1,18 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version1(1)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version2(2)} DEFINITIONS IMPLICIT TAGS ::= BEGIN -- ============================= --- Object Identifier Definitions +-- Object Identifier definitions -- ============================= +-- RetainedData DomainId retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version1(1)} +-- rdHeader +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version2(2)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -22,11 +24,10 @@ RetainedDataMessage ::= SEQUENCE retainedDataHeader [1] RetainedDataHeader, retainedDataPayload [2] RetainedDataPayload, retainedDataDigest [3] OCTET STRING OPTIONAL, - -- The digitally signed hash of the combined fields above (retainedDataHeader and - -- retainedDataPayload) + -- The digitally signed hash of the combined fields above (retainedDataHeader and + -- retainedDataPayload) ... } - -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -95,10 +96,11 @@ RequestMessage ::= SEQUENCE maxHits [4] INTEGER OPTIONAL, -- Maximum number of records to be returned. -- On a national basis maximum numbers could be considered - -- In case of maxHit a responseFailed message is sent and no data is sent (see 6.3.3.2) + -- In case of maxHit a responseFailed message is sent and no data is sent + -- (see clause 6.3.3.2) nationalRequestParameters [5] NationalRequestParameters OPTIONAL, - -- to be defined on a national basis - -- only to be used in case the present document can not fulfil the national requirements + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -128,12 +130,11 @@ RequestPriority ::= OCTET STRING -- Priority considerations are a matter for national implementation -- This standard makes no statement regarding how such priorities are represented or used - RequestAcknowledgement ::= SEQUENCE { suggestedCompletionTime [1] GeneralizedTime OPTIONAL, - -- indicative time that results will be ready - -- purely informational, not binding for either party + -- Indicative time that results will be ready + -- Purely informational, not binding for either party ... } @@ -151,7 +152,7 @@ ResponseMessage ::= SEQUENCE -- If there are no responses, the responsePayload is present but has zero entries nationalResponsePayload [3] NationalResponsePayload OPTIONAL, -- to be defined on a national basis - -- only to be used in case the present document can not fulfil the national requirements + -- only to be used in case the present document cannot fulfil the national requirements ... } @@ -164,7 +165,7 @@ ResponseStatus ::= CHOICE responseUnavailable [3] NULL, -- See clause 6.3.3 responseFailed [4] FurtherInformation, - -- See clause 6.3.3.2 + -- See clauses 6.2.2.2 and 6.3.3.2 ... } @@ -191,14 +192,14 @@ RetainedDataRecord ::= CHOICE telephonyRecord [1] TelephonyRecord, messageRecord [2] MessageRecord, networkAccess [3] NetworkAccessRecord, - -- other services will be included (like multimedia) as they are implemented + -- Other services will be included (like multimedia) as they are implemented ... } ResponseAcknowledgement ::= CHOICE { - -- acknowledges a response has been sent - acknowledgeCompleteResults [1] NULL, + -- Acknowledges a response has been sent + acknowledgeCompleteResults [1] NULL, acknowledgePartialResults [2] NULL, ... } @@ -342,23 +343,27 @@ IndividualInfo ::= SEQUENCE ... } -PersonName ::= SEQUENCE +PersonName ::= SEQUENCE { - salutation [1] UTF8String OPTIONAL, - surname [2] UTF8String OPTIONAL, - -- the non-chosen or inherited name of an individual, e.g. Arend - surnamePrefix [3] UTF8String OPTIONAL, - -- any prefix before the surname, e.g. von, van der - surnameSuffix [4] UTF8String OPTIONAL, - -- any suffix after the surname, e.g. Jr, III - middleNames [5] UTF8String OPTIONAL, + salutation [1] UTF8String OPTIONAL, + surname [2] UTF8String OPTIONAL, + -- the non-chosen or inherited name of an individual, e.g. "Arend" + surnamePrefix [3] UTF8String OPTIONAL, + -- any prefix before the surname, e.g. "von", "van der" + surnameSuffix [4] UTF8String OPTIONAL, + -- any suffix after the surname, e.g. "Jr", "III" + middleNames [5] UTF8String OPTIONAL, -- that part of the name excluding forename, separable and preceding the surname - firstname [6] UTF8String OPTIONAL, - -- the first name or initials, e.g. Peter - ... + firstname [6] UTF8String OPTIONAL, + -- the first name or initials, e.g. "Peter" + ..., + secondsurname [7] UTF8String OPTIONAL, + -- a second surname is used in several countries + secondsurnamePrefix [8] UTF8String OPTIONAL, + secondsurnameSuffix [9] UTF8String OPTIONAL } -ContactDetails ::= SEQUENCE +ContactDetails ::= SEQUENCE { address [1] AddressInformation OPTIONAL, emailAddress [2] UTF8String OPTIONAL, @@ -367,7 +372,7 @@ ContactDetails ::= SEQUENCE ... } -AddressInformation ::= SEQUENCE +AddressInformation ::= SEQUENCE { flatNumber [1] UTF8String OPTIONAL, buildingName [2] UTF8String OPTIONAL, @@ -391,7 +396,7 @@ AddressInformation ::= SEQUENCE AuthenticationInfo ::= SEQUENCE { authenticationType [1] UTF8String OPTIONAL, - -- the type of document used to authenticate, e.g. passport, drivers license + -- the type of document used to authenticate, e.g. passport, driver's license authenticationNumber [2] UTF8String OPTIONAL, -- the number of the document used to authenticate ... @@ -437,7 +442,7 @@ SubscribedTelephonyServices ::= SEQUENCE providerID [2] UTF8String OPTIONAL, -- Unique identifier for the service provider timeSpan [3] TimeSpan OPTIONAL, - -- Start and end data, if applicable, of the subsription + -- Start and end data, if applicable, of the subscription registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, -- The set of telephone numbers registered for this service registeredICCID [5] UTF8String OPTIONAL, @@ -450,8 +455,7 @@ SubscribedTelephonyServices ::= SEQUENCE iMSI [9] IMSI OPTIONAL, carrierPreselect [10] BOOLEAN OPTIONAL, lineStatus [11] UTF8String OPTIONAL, - -- CSP-specific description of current line status, - -- e.g. Active, Ceased, etc. + -- CSP-specific description of current line status, e.g. "Active", "Ceased", etc. ... } @@ -526,7 +530,7 @@ TelephonyPartyInformation ::= SEQUENCE -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [8] IMSI OPTIONAL, natureOfAddress [9] UTF8String OPTIONAL, - -- Nature of address indicator, e.g. National, International + -- Nature of address indicator, e.g. "National", "International" forwardedTransferredNumber [10] PartyNumber OPTIONAL, terminatingTransferredNumber [11] PartyNumber OPTIONAL, ... @@ -583,11 +587,11 @@ SmsInformation ::= SEQUENCE ... } OPTIONAL, smsCmRefNr [4] OCTET STRING (SIZE(1..2)) OPTIONAL, - -- format as per 3GPP 23.040 [16] + -- format as per 3GPP TS 23.040 [16] smsNumOfSM [5] INTEGER (0..65535) OPTIONAL, smsNotifyInd [6] BOOLEAN OPTIONAL, smsProtocolId [7] OCTET STRING (SIZE(1)) OPTIONAL, - -- format as per 3GPP 23.040 [16] + -- format as per 3GPP TS 23.040 [16] ... } @@ -677,8 +681,8 @@ CallConferenceEventType ::= ENUMERATED MessagingEventType ::= ENUMERATED { - mSOriginatingSMSinMSC(1), - mSTerminatingSMSinMSC(2), + mSOriginatingSMSinMSC(1), + mSTerminatingSMSinMSC(2), shortMessageDelivery(3), mMMessage(4), mMNotification(5), @@ -737,7 +741,10 @@ TelephonyDevice ::= SEQUENCE } OPTIONAL, telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, -- Unique identifier for this telephony device according to type of identifier - ... + ..., + subscriberID [3] TelephonySubscriberId OPTIONAL + -- Identifier for a known user of this equipment. + -- Usage of this parameter is subject to national legislation. } TelephonyDeviceID ::= OCTET STRING @@ -788,7 +795,8 @@ Location ::= SEQUENCE -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI -- (only the last 6 octets are used) -- This parameter is duplicated from 3GPP TS 33.108 [11] - ... + ..., + postalLocation [8] AddressInformation OPTIONAL } GSMLocation ::= CHOICE @@ -804,7 +812,7 @@ GSMLocation ::= CHOICE -- The azimuth is the bearing, relative to true north ... }, - -- format: XDDMMSS.SS (on latitudes) or XDDDMMSS.SS (on longitudes) + -- format: XDDMMSS.SS (on latitudes) or XDDDMMSS.SS (on longitudes) -- X : N(orth), S(outh), E(ast), W(est) -- DD or DDD : degrees (numeric characters) -- MM : minutes (numeric characters) @@ -819,7 +827,7 @@ GSMLocation ::= CHOICE utm-North [3] UTF8String (SIZE(7)) OPTIONAL, -- Universal Transverse Mercator -- example utm-Zone 32U - -- utm-East 439955 + -- utm-East 439955 -- utm-North 5540736 mapDatum [4] MapDatum OPTIONAL, azimuth [5] INTEGER (0..359) OPTIONAL, @@ -842,8 +850,8 @@ GSMLocation ::= CHOICE -- squareID PU -- numericalLocationEasting 9129 -- mumericalLocationNorthing 4045 - -- In both panels, utm-GridBand and squareID the I and O characters are not used - -- because of their similarity to the digits one and zero. + -- In both panels, utm-GridBand and squareID the 'I' and 'O' characters are not used + -- because of their similarity to the digits one and zero. mapDatum [6] MapDatum OPTIONAL, azimuth [7] INTEGER (0..359) OPTIONAL, -- The azimuth is the bearing, relative to true north @@ -851,7 +859,25 @@ GSMLocation ::= CHOICE }, wGS84Coordinates [4] OCTET STRING, -- format is as defined in 3GPP TS 03.32 [12] - ... + ..., + geoCoordinatesDec [5] SEQUENCE + { + latitudeDec [1] UTF8String (SIZE(3..12)) OPTIONAL, + -- format: XDD.nnnnnnnn + longitudeDec [2] UTF8String (SIZE(4..13)) OPTIONAL, + -- format: XDDD.nnnnnnnn + mapDatum [3] MapDatum OPTIONAL, + azimuth [4] INTEGER (0..359) OPTIONAL, + -- The azimuth is the bearing, relative to true north + ... + } + -- format: XDD.nnnnnnnn (on latitudes) or XDDD.nnnnnnnn (on longitudes) + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- nnnnnnnn : post decimal positions (numeric characters) + -- Example: + -- latitude N50.38666667 + -- longitude E112.38671670 } MapDatum ::= ENUMERATED @@ -930,8 +956,8 @@ PartyNumber ::= UTF8String MessageRecord ::= CHOICE { - msgSubscriber [1] MsgSubscriber, - msgServiceUsage [2] MsgServiceUsage, + msgSubscriber [1] MsgSubscriber, + msgServiceUsage [2] MsgServiceUsage, ... } @@ -944,14 +970,14 @@ MsgSubscriber ::= SEQUENCE -- asynchronous message services { validity [1] TimeSpan OPTIONAL, - subscriberID [2] MsgSubscriberId OPTIONAL, + subscriberID [2] MsgSubscriberID OPTIONAL, msgStores [3] SEQUENCE OF MsgStore OPTIONAL, -- message stores allocated to this subscriber subscriber [4] GenericSubscriberInfo OPTIONAL, ... } -MsgSubscriberId ::= OCTET STRING +MsgSubscriberID ::= OCTET STRING -- Unique identifier for this subscriber, e.g. account number MsgStore ::= SEQUENCE @@ -959,23 +985,25 @@ MsgStore ::= SEQUENCE -- definition require some message store. E.g. in the case of e-mail this will be a mailbox { validity [1] TimeSpan OPTIONAL, - msgStoreId [2] MsgStoreId OPTIONAL, + msgStoreID [2] MsgStoreID OPTIONAL, aliases [3] SEQUENCE OF MsgAddress OPTIONAL, -- The complete list of all addresses that get delivered into this message store. - providerID [4] MsgProviderId OPTIONAL, + providerID [4] MsgProviderID OPTIONAL, ... } -MsgStoreId ::= OCTET STRING +MsgStoreID ::= OCTET STRING -- Unique identifier of the message store. Since not all IDs will necessarily be human -- readable, a generic byte string is used -MsgAddress ::= OCTET STRING +MsgAddress ::= UTF8String -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail -- this will be an RFC822-style address + -- NOTE as of v1.2.1, this field has changed from OCTET STRING to UTF8String -MsgProviderId ::= OCTET STRING +MsgProviderID ::= UTF8String -- Unique identifier for a service provider, e.g. company name + -- NOTE as of v1.2.1, this field has changed from OCTET STRING to UTF8String -- ==================================== -- Definitions of Message Service Usage @@ -993,14 +1021,14 @@ MsgServiceUsage ::= CHOICE MsgTransmission ::= SEQUENCE -- Sending of an outgoing message, or reception of an incoming message { - dateTime [1] GeneralizedTime OPTIONAL, - subscriberId [2] MsgSubscriberId OPTIONAL, - senderAddress [3] MsgAddress OPTIONAL, - recipients [4] SEQUENCE OF MsgAddress OPTIONAL, - msgStores [5] SEQUENCE OF MsgStoreId OPTIONAL, + dateTime [1] GeneralizedTime OPTIONAL, + subscriberID [2] MsgSubscriberID OPTIONAL, + senderAddress [3] MsgAddress OPTIONAL, + recipients [4] SEQUENCE OF MsgAddress OPTIONAL, + msgStores [5] SEQUENCE OF MsgStoreID OPTIONAL, -- List of all local msgStores that received a copy of the message -- For transit messages this field is not used - deliveryStatus [6] ENUMERATED + deliveryStatus [6] ENUMERATED { unknown(0), succeeded(1), @@ -1011,23 +1039,26 @@ MsgTransmission ::= SEQUENCE -- Deferred and retried at a later time ... } OPTIONAL, - protocol [7] ENUMERATED + protocol [7] ENUMERATED { smtp(0), x400(1), ... } OPTIONAL, - clientID [8] IPAddress OPTIONAL, - serverID [9] IPAddress OPTIONAL, - ... + clientID [8] IPAddress OPTIONAL, + serverID [9] IPAddress OPTIONAL, + ..., + messageID [10] MessageID OPTIONAL, + sourceServerName [11] UTF8String OPTIONAL, + destinationServerName [12] UTF8String OPTIONAL } MsgStoreOperation ::= SEQUENCE -- Manipulation of a message store. { dateTime [1] GeneralizedTime OPTIONAL, - subscriberId [2] MsgSubscriberId OPTIONAL, - msgStore [3] MsgStoreId OPTIONAL, + subscriberID [2] MsgSubscriberID OPTIONAL, + msgStore [3] MsgStoreID OPTIONAL, operation [4] ENUMERATED { connect(0), @@ -1040,7 +1071,8 @@ MsgStoreOperation ::= SEQUENCE deleteMsg(4), addMsg(5), -- E.g. the APPEND command in IMAP - ... + ..., + editMsg(6) } OPTIONAL, senderAddress [5] MsgAddress OPTIONAL, -- For Internet email, use the From address in the mail headers @@ -1050,20 +1082,26 @@ MsgStoreOperation ::= SEQUENCE { pop(0), imap(1), - ... + ..., + webmail(2) } OPTIONAL, clientID [8] IPAddress OPTIONAL, serverID [9] IPAddress OPTIONAL, - ... + ..., + messageID [10] MessageID OPTIONAL } + +MessageID ::= UTF8String + -- Unique identifier for this message, e.g RFC 822 header + NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, naServiceUsage [2] NAServiceUsage, naDevice [3] NADevice, naNetworkElement [4] NANwElement, - naBillingDetails [5] NABillingDetails, + naBillingDetails [5] NABillingDetails, ... } @@ -1190,6 +1228,21 @@ GprsInformation ::= SEQUENCE aPN [6] UTF8String OPTIONAL, pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, -- format as per TS 101 671 [6] + ..., + gPRSEvent [8] GPRSEvent OPTIONAL + -- format as per 3GPP TS 33.108 [11] +} + +GPRSEvent ::= ENUMERATED +{ + pDPContextActivation(1), + pDPContextDeactivation(4), + gPRSAttach(5), + gPRSDetach(6), + locationInfoUpdate(10), + -- sMS ommited from 3GPP TS 33.108 [11], + pDPContextModification(11), + servingSystem(12), ... } @@ -1205,7 +1258,7 @@ NADevice ::= SEQUENCE -- Identifier of this device. description [2] UTF8String OPTIONAL, -- Human readable description of device - location [3] Location OPTIONAL, + location [3] Location OPTIONAL, macAddress [4] OCTET STRING (SIZE (6)) OPTIONAL, -- MAC or ethernet address dslID [5] UTF8String OPTIONAL, @@ -1241,33 +1294,39 @@ NANwElement ::= SEQUENCE IPAddress ::= CHOICE { - iPv4BinaryAddress [1] OCTET STRING (SIZE(4)), - iPv6BinaryAddress [2] OCTET STRING (SIZE(16)), - iPTextAddress [3] IA5String (SIZE(7..45)), + iPv4BinaryAddress [1] OCTET STRING (SIZE(4)), + iPv6BinaryAddress [2] OCTET STRING (SIZE(16)), + iPTextAddress [3] IA5String (SIZE(7..45)), ... } NAAssignedAddress ::= SEQUENCE { - addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, + addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, portNumber [2] INTEGER OPTIONAL, -- populated with the outbound port number - addressType [3] ENUMERATED + addressType [3] ENUMERATED { - unknown(0), + unknown(0), internal(1), external(2), ... } OPTIONAL, assignedTime [4] TimeSpan OPTIONAL, - ... + ..., + destinationAddress [5] IPAddress OPTIONAL, + -- used in cases where a single external IP/port pair is translated to multiple internal + -- IP/port pairs, with the destination IP/port used to multiplex them + destinationPort [6] INTEGER OPTIONAL + -- used in cases where a single external IP/port pair is translated to multiple internal + -- IP/port pairs, with the destination IP/port used to multiplex them } IPAddressSetOrRangeOrMask ::= CHOICE { - set [0] SEQUENCE OF IPAddress, - range [1] IPRange, - mask [2] IPMask + set [0] SEQUENCE OF IPAddress, + range [1] IPRange, + mask [2] IPMask } IPRange ::= SEQUENCE @@ -1280,8 +1339,8 @@ IPRange ::= SEQUENCE IPMask ::= SEQUENCE -- Things like 172.16.10.0/255.255.255.240 { - base [0] IPAddress, - mask [1] IPAddress + base [0] IPAddress, + mask [1] IPAddress } NABillingDetails ::= SEQUENCE @@ -1294,7 +1353,6 @@ NABillingDetails ::= SEQUENCE ... } -END -- of RDMessage - +END -- end of RDMessage diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 7ce44f5..e7e2ec6 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI-rap20 (TS 102 657 v1.1.2) + XSD translated from ASN.1 derived from outcome of LI-rap21 (TS 102 657 v1.2.1) @@ -259,20 +259,20 @@ - + - + - + - - + + @@ -505,6 +505,9 @@ + + + @@ -764,6 +767,7 @@ + @@ -892,6 +896,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1010,6 +1046,7 @@ + @@ -1037,13 +1074,15 @@ - + - - - + + + + + - + @@ -1051,7 +1090,7 @@ - + @@ -1064,20 +1103,28 @@ + + + + - + - - - + + + + + - - - + + + + + @@ -1099,6 +1146,9 @@ + + + @@ -1106,8 +1156,8 @@ - - + + @@ -1117,25 +1167,30 @@ + - - - + + + + + + + @@ -1207,6 +1262,8 @@ + + @@ -1220,6 +1277,18 @@ + + + + + + + + + + + + @@ -1241,6 +1310,7 @@ + diff --git a/102657/portal/TS 102 657, RDMessage, ver1.asn b/102657/portal/TS 102 657, RDMessage, ver2.asn similarity index 85% rename from 102657/portal/TS 102 657, RDMessage, ver1.asn rename to 102657/portal/TS 102 657, RDMessage, ver2.asn index 11b4b8a..8286171 100644 --- a/102657/portal/TS 102 657, RDMessage, ver1.asn +++ b/102657/portal/TS 102 657, RDMessage, ver2.asn @@ -1,16 +1,18 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version1(1)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version2(2)} DEFINITIONS IMPLICIT TAGS ::= BEGIN -- ============================= --- Object Identifier Definitions +-- Object Identifier definitions -- ============================= +-- RetainedData DomainId retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version1(1)} +-- rdHeader +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version2(2)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -22,11 +24,10 @@ RetainedDataMessage ::= SEQUENCE retainedDataHeader [1] RetainedDataHeader, retainedDataPayload [2] RetainedDataPayload, retainedDataDigest [3] OCTET STRING OPTIONAL, - -- The digitally signed hash of the combined fields above (retainedDataHeader and - -- retainedDataPayload) + -- The digitally signed hash of the combined fields above (retainedDataHeader and + -- retainedDataPayload) ... } - -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -95,10 +96,11 @@ RequestMessage ::= SEQUENCE maxHits [4] INTEGER OPTIONAL, -- Maximum number of records to be returned. -- On a national basis maximum numbers could be considered - -- In case of maxHit a responseFailed message is sent and no data is sent (see 6.3.3.2) + -- In case of maxHit a responseFailed message is sent and no data is sent + -- (see clause 6.3.3.2) nationalRequestParameters [5] NationalRequestParameters OPTIONAL, - -- to be defined on a national basis - -- only to be used in case the present document can not fulfil the national requirements + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -128,12 +130,11 @@ RequestPriority ::= OCTET STRING -- Priority considerations are a matter for national implementation -- This standard makes no statement regarding how such priorities are represented or used - RequestAcknowledgement ::= SEQUENCE { suggestedCompletionTime [1] GeneralizedTime OPTIONAL, - -- indicative time that results will be ready - -- purely informational, not binding for either party + -- Indicative time that results will be ready + -- Purely informational, not binding for either party ... } @@ -151,7 +152,7 @@ ResponseMessage ::= SEQUENCE -- If there are no responses, the responsePayload is present but has zero entries nationalResponsePayload [3] NationalResponsePayload OPTIONAL, -- to be defined on a national basis - -- only to be used in case the present document can not fulfil the national requirements + -- only to be used in case the present document cannot fulfil the national requirements ... } @@ -164,7 +165,7 @@ ResponseStatus ::= CHOICE responseUnavailable [3] NULL, -- See clause 6.3.3 responseFailed [4] FurtherInformation, - -- See clause 6.3.3.2 + -- See clauses 6.2.2.2 and 6.3.3.2 ... } @@ -191,14 +192,14 @@ RetainedDataRecord ::= CHOICE telephonyRecord [1] TelephonyRecord, messageRecord [2] MessageRecord, networkAccess [3] NetworkAccessRecord, - -- other services will be included (like multimedia) as they are implemented + -- Other services will be included (like multimedia) as they are implemented ... } ResponseAcknowledgement ::= CHOICE { - -- acknowledges a response has been sent - acknowledgeCompleteResults [1] NULL, + -- Acknowledges a response has been sent + acknowledgeCompleteResults [1] NULL, acknowledgePartialResults [2] NULL, ... } @@ -342,23 +343,27 @@ IndividualInfo ::= SEQUENCE ... } -PersonName ::= SEQUENCE +PersonName ::= SEQUENCE { - salutation [1] UTF8String OPTIONAL, - surname [2] UTF8String OPTIONAL, - -- the non-chosen or inherited name of an individual, e.g. Arend - surnamePrefix [3] UTF8String OPTIONAL, - -- any prefix before the surname, e.g. von, van der - surnameSuffix [4] UTF8String OPTIONAL, - -- any suffix after the surname, e.g. Jr, III - middleNames [5] UTF8String OPTIONAL, + salutation [1] UTF8String OPTIONAL, + surname [2] UTF8String OPTIONAL, + -- the non-chosen or inherited name of an individual, e.g. "Arend" + surnamePrefix [3] UTF8String OPTIONAL, + -- any prefix before the surname, e.g. "von", "van der" + surnameSuffix [4] UTF8String OPTIONAL, + -- any suffix after the surname, e.g. "Jr", "III" + middleNames [5] UTF8String OPTIONAL, -- that part of the name excluding forename, separable and preceding the surname - firstname [6] UTF8String OPTIONAL, - -- the first name or initials, e.g. Peter - ... + firstname [6] UTF8String OPTIONAL, + -- the first name or initials, e.g. "Peter" + ..., + secondsurname [7] UTF8String OPTIONAL, + -- a second surname is used in several countries + secondsurnamePrefix [8] UTF8String OPTIONAL, + secondsurnameSuffix [9] UTF8String OPTIONAL } -ContactDetails ::= SEQUENCE +ContactDetails ::= SEQUENCE { address [1] AddressInformation OPTIONAL, emailAddress [2] UTF8String OPTIONAL, @@ -367,7 +372,7 @@ ContactDetails ::= SEQUENCE ... } -AddressInformation ::= SEQUENCE +AddressInformation ::= SEQUENCE { flatNumber [1] UTF8String OPTIONAL, buildingName [2] UTF8String OPTIONAL, @@ -391,7 +396,7 @@ AddressInformation ::= SEQUENCE AuthenticationInfo ::= SEQUENCE { authenticationType [1] UTF8String OPTIONAL, - -- the type of document used to authenticate, e.g. passport, drivers license + -- the type of document used to authenticate, e.g. passport, driver's license authenticationNumber [2] UTF8String OPTIONAL, -- the number of the document used to authenticate ... @@ -437,7 +442,7 @@ SubscribedTelephonyServices ::= SEQUENCE providerID [2] UTF8String OPTIONAL, -- Unique identifier for the service provider timeSpan [3] TimeSpan OPTIONAL, - -- Start and end data, if applicable, of the subsription + -- Start and end data, if applicable, of the subscription registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, -- The set of telephone numbers registered for this service registeredICCID [5] UTF8String OPTIONAL, @@ -450,8 +455,7 @@ SubscribedTelephonyServices ::= SEQUENCE iMSI [9] IMSI OPTIONAL, carrierPreselect [10] BOOLEAN OPTIONAL, lineStatus [11] UTF8String OPTIONAL, - -- CSP-specific description of current line status, - -- e.g. Active, Ceased, etc. + -- CSP-specific description of current line status, e.g. "Active", "Ceased", etc. ... } @@ -526,7 +530,7 @@ TelephonyPartyInformation ::= SEQUENCE -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [8] IMSI OPTIONAL, natureOfAddress [9] UTF8String OPTIONAL, - -- Nature of address indicator, e.g. National, International + -- Nature of address indicator, e.g. "National", "International" forwardedTransferredNumber [10] PartyNumber OPTIONAL, terminatingTransferredNumber [11] PartyNumber OPTIONAL, ... @@ -583,11 +587,11 @@ SmsInformation ::= SEQUENCE ... } OPTIONAL, smsCmRefNr [4] OCTET STRING (SIZE(1..2)) OPTIONAL, - -- format as per 3GPP 23.040 [16] + -- format as per 3GPP TS 23.040 [16] smsNumOfSM [5] INTEGER (0..65535) OPTIONAL, smsNotifyInd [6] BOOLEAN OPTIONAL, smsProtocolId [7] OCTET STRING (SIZE(1)) OPTIONAL, - -- format as per 3GPP 23.040 [16] + -- format as per 3GPP TS 23.040 [16] ... } @@ -677,8 +681,8 @@ CallConferenceEventType ::= ENUMERATED MessagingEventType ::= ENUMERATED { - mSOriginatingSMSinMSC(1), - mSTerminatingSMSinMSC(2), + mSOriginatingSMSinMSC(1), + mSTerminatingSMSinMSC(2), shortMessageDelivery(3), mMMessage(4), mMNotification(5), @@ -737,7 +741,10 @@ TelephonyDevice ::= SEQUENCE } OPTIONAL, telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, -- Unique identifier for this telephony device according to type of identifier - ... + ..., + subscriberID [3] TelephonySubscriberId OPTIONAL + -- Identifier for a known user of this equipment. + -- Usage of this parameter is subject to national legislation. } TelephonyDeviceID ::= OCTET STRING @@ -788,7 +795,8 @@ Location ::= SEQUENCE -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI -- (only the last 6 octets are used) -- This parameter is duplicated from 3GPP TS 33.108 [11] - ... + ..., + postalLocation [8] AddressInformation OPTIONAL } GSMLocation ::= CHOICE @@ -804,7 +812,7 @@ GSMLocation ::= CHOICE -- The azimuth is the bearing, relative to true north ... }, - -- format: XDDMMSS.SS (on latitudes) or XDDDMMSS.SS (on longitudes) + -- format: XDDMMSS.SS (on latitudes) or XDDDMMSS.SS (on longitudes) -- X : N(orth), S(outh), E(ast), W(est) -- DD or DDD : degrees (numeric characters) -- MM : minutes (numeric characters) @@ -819,7 +827,7 @@ GSMLocation ::= CHOICE utm-North [3] UTF8String (SIZE(7)) OPTIONAL, -- Universal Transverse Mercator -- example utm-Zone 32U - -- utm-East 439955 + -- utm-East 439955 -- utm-North 5540736 mapDatum [4] MapDatum OPTIONAL, azimuth [5] INTEGER (0..359) OPTIONAL, @@ -842,8 +850,8 @@ GSMLocation ::= CHOICE -- squareID PU -- numericalLocationEasting 9129 -- mumericalLocationNorthing 4045 - -- In both panels, utm-GridBand and squareID the I and O characters are not used - -- because of their similarity to the digits one and zero. + -- In both panels, utm-GridBand and squareID the 'I' and 'O' characters are not used + -- because of their similarity to the digits one and zero. mapDatum [6] MapDatum OPTIONAL, azimuth [7] INTEGER (0..359) OPTIONAL, -- The azimuth is the bearing, relative to true north @@ -851,7 +859,25 @@ GSMLocation ::= CHOICE }, wGS84Coordinates [4] OCTET STRING, -- format is as defined in 3GPP TS 03.32 [12] - ... + ..., + geoCoordinatesDec [5] SEQUENCE + { + latitudeDec [1] UTF8String (SIZE(3..12)) OPTIONAL, + -- format: XDD.nnnnnnnn + longitudeDec [2] UTF8String (SIZE(4..13)) OPTIONAL, + -- format: XDDD.nnnnnnnn + mapDatum [3] MapDatum OPTIONAL, + azimuth [4] INTEGER (0..359) OPTIONAL, + -- The azimuth is the bearing, relative to true north + ... + } + -- format: XDD.nnnnnnnn (on latitudes) or XDDD.nnnnnnnn (on longitudes) + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- nnnnnnnn : post decimal positions (numeric characters) + -- Example: + -- latitude N50.38666667 + -- longitude E112.38671670 } MapDatum ::= ENUMERATED @@ -930,8 +956,8 @@ PartyNumber ::= UTF8String MessageRecord ::= CHOICE { - msgSubscriber [1] MsgSubscriber, - msgServiceUsage [2] MsgServiceUsage, + msgSubscriber [1] MsgSubscriber, + msgServiceUsage [2] MsgServiceUsage, ... } @@ -944,14 +970,14 @@ MsgSubscriber ::= SEQUENCE -- asynchronous message services { validity [1] TimeSpan OPTIONAL, - subscriberID [2] MsgSubscriberId OPTIONAL, + subscriberID [2] MsgSubscriberID OPTIONAL, msgStores [3] SEQUENCE OF MsgStore OPTIONAL, -- message stores allocated to this subscriber subscriber [4] GenericSubscriberInfo OPTIONAL, ... } -MsgSubscriberId ::= OCTET STRING +MsgSubscriberID ::= OCTET STRING -- Unique identifier for this subscriber, e.g. account number MsgStore ::= SEQUENCE @@ -959,23 +985,25 @@ MsgStore ::= SEQUENCE -- definition require some message store. E.g. in the case of e-mail this will be a mailbox { validity [1] TimeSpan OPTIONAL, - msgStoreId [2] MsgStoreId OPTIONAL, + msgStoreID [2] MsgStoreID OPTIONAL, aliases [3] SEQUENCE OF MsgAddress OPTIONAL, -- The complete list of all addresses that get delivered into this message store. - providerID [4] MsgProviderId OPTIONAL, + providerID [4] MsgProviderID OPTIONAL, ... } -MsgStoreId ::= OCTET STRING +MsgStoreID ::= OCTET STRING -- Unique identifier of the message store. Since not all IDs will necessarily be human -- readable, a generic byte string is used -MsgAddress ::= OCTET STRING +MsgAddress ::= UTF8String -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail -- this will be an RFC822-style address + -- NOTE as of v1.2.1, this field has changed from OCTET STRING to UTF8String -MsgProviderId ::= OCTET STRING +MsgProviderID ::= UTF8String -- Unique identifier for a service provider, e.g. company name + -- NOTE as of v1.2.1, this field has changed from OCTET STRING to UTF8String -- ==================================== -- Definitions of Message Service Usage @@ -993,14 +1021,14 @@ MsgServiceUsage ::= CHOICE MsgTransmission ::= SEQUENCE -- Sending of an outgoing message, or reception of an incoming message { - dateTime [1] GeneralizedTime OPTIONAL, - subscriberId [2] MsgSubscriberId OPTIONAL, - senderAddress [3] MsgAddress OPTIONAL, - recipients [4] SEQUENCE OF MsgAddress OPTIONAL, - msgStores [5] SEQUENCE OF MsgStoreId OPTIONAL, + dateTime [1] GeneralizedTime OPTIONAL, + subscriberID [2] MsgSubscriberID OPTIONAL, + senderAddress [3] MsgAddress OPTIONAL, + recipients [4] SEQUENCE OF MsgAddress OPTIONAL, + msgStores [5] SEQUENCE OF MsgStoreID OPTIONAL, -- List of all local msgStores that received a copy of the message -- For transit messages this field is not used - deliveryStatus [6] ENUMERATED + deliveryStatus [6] ENUMERATED { unknown(0), succeeded(1), @@ -1011,23 +1039,26 @@ MsgTransmission ::= SEQUENCE -- Deferred and retried at a later time ... } OPTIONAL, - protocol [7] ENUMERATED + protocol [7] ENUMERATED { smtp(0), x400(1), ... } OPTIONAL, - clientID [8] IPAddress OPTIONAL, - serverID [9] IPAddress OPTIONAL, - ... + clientID [8] IPAddress OPTIONAL, + serverID [9] IPAddress OPTIONAL, + ..., + messageID [10] MessageID OPTIONAL, + sourceServerName [11] UTF8String OPTIONAL, + destinationServerName [12] UTF8String OPTIONAL } MsgStoreOperation ::= SEQUENCE -- Manipulation of a message store. { dateTime [1] GeneralizedTime OPTIONAL, - subscriberId [2] MsgSubscriberId OPTIONAL, - msgStore [3] MsgStoreId OPTIONAL, + subscriberID [2] MsgSubscriberID OPTIONAL, + msgStore [3] MsgStoreID OPTIONAL, operation [4] ENUMERATED { connect(0), @@ -1040,7 +1071,8 @@ MsgStoreOperation ::= SEQUENCE deleteMsg(4), addMsg(5), -- E.g. the APPEND command in IMAP - ... + ..., + editMsg(6) } OPTIONAL, senderAddress [5] MsgAddress OPTIONAL, -- For Internet email, use the From address in the mail headers @@ -1050,20 +1082,26 @@ MsgStoreOperation ::= SEQUENCE { pop(0), imap(1), - ... + ..., + webmail(2) } OPTIONAL, clientID [8] IPAddress OPTIONAL, serverID [9] IPAddress OPTIONAL, - ... + ..., + messageID [10] MessageID OPTIONAL } + +MessageID ::= UTF8String + -- Unique identifier for this message, e.g RFC 822 header + NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, naServiceUsage [2] NAServiceUsage, naDevice [3] NADevice, naNetworkElement [4] NANwElement, - naBillingDetails [5] NABillingDetails, + naBillingDetails [5] NABillingDetails, ... } @@ -1190,6 +1228,21 @@ GprsInformation ::= SEQUENCE aPN [6] UTF8String OPTIONAL, pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, -- format as per TS 101 671 [6] + ..., + gPRSEvent [8] GPRSEvent OPTIONAL + -- format as per 3GPP TS 33.108 [11] +} + +GPRSEvent ::= ENUMERATED +{ + pDPContextActivation(1), + pDPContextDeactivation(4), + gPRSAttach(5), + gPRSDetach(6), + locationInfoUpdate(10), + -- sMS ommited from 3GPP TS 33.108 [11], + pDPContextModification(11), + servingSystem(12), ... } @@ -1205,7 +1258,7 @@ NADevice ::= SEQUENCE -- Identifier of this device. description [2] UTF8String OPTIONAL, -- Human readable description of device - location [3] Location OPTIONAL, + location [3] Location OPTIONAL, macAddress [4] OCTET STRING (SIZE (6)) OPTIONAL, -- MAC or ethernet address dslID [5] UTF8String OPTIONAL, @@ -1241,33 +1294,39 @@ NANwElement ::= SEQUENCE IPAddress ::= CHOICE { - iPv4BinaryAddress [1] OCTET STRING (SIZE(4)), - iPv6BinaryAddress [2] OCTET STRING (SIZE(16)), - iPTextAddress [3] IA5String (SIZE(7..45)), + iPv4BinaryAddress [1] OCTET STRING (SIZE(4)), + iPv6BinaryAddress [2] OCTET STRING (SIZE(16)), + iPTextAddress [3] IA5String (SIZE(7..45)), ... } NAAssignedAddress ::= SEQUENCE { - addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, + addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, portNumber [2] INTEGER OPTIONAL, -- populated with the outbound port number - addressType [3] ENUMERATED + addressType [3] ENUMERATED { - unknown(0), + unknown(0), internal(1), external(2), ... } OPTIONAL, assignedTime [4] TimeSpan OPTIONAL, - ... + ..., + destinationAddress [5] IPAddress OPTIONAL, + -- used in cases where a single external IP/port pair is translated to multiple internal + -- IP/port pairs, with the destination IP/port used to multiplex them + destinationPort [6] INTEGER OPTIONAL + -- used in cases where a single external IP/port pair is translated to multiple internal + -- IP/port pairs, with the destination IP/port used to multiplex them } IPAddressSetOrRangeOrMask ::= CHOICE { - set [0] SEQUENCE OF IPAddress, - range [1] IPRange, - mask [2] IPMask + set [0] SEQUENCE OF IPAddress, + range [1] IPRange, + mask [2] IPMask } IPRange ::= SEQUENCE @@ -1280,8 +1339,8 @@ IPRange ::= SEQUENCE IPMask ::= SEQUENCE -- Things like 172.16.10.0/255.255.255.240 { - base [0] IPAddress, - mask [1] IPAddress + base [0] IPAddress, + mask [1] IPAddress } NABillingDetails ::= SEQUENCE @@ -1294,7 +1353,6 @@ NABillingDetails ::= SEQUENCE ... } -END -- of RDMessage - +END -- end of RDMessage diff --git a/102657/portal/TS 102 657, RDMessage, ver1.xsd b/102657/portal/TS 102 657, RDMessage, ver2.xsd similarity index 92% rename from 102657/portal/TS 102 657, RDMessage, ver1.xsd rename to 102657/portal/TS 102 657, RDMessage, ver2.xsd index 7ce44f5..e7e2ec6 100644 --- a/102657/portal/TS 102 657, RDMessage, ver1.xsd +++ b/102657/portal/TS 102 657, RDMessage, ver2.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI-rap20 (TS 102 657 v1.1.2) + XSD translated from ASN.1 derived from outcome of LI-rap21 (TS 102 657 v1.2.1) @@ -259,20 +259,20 @@ - + - + - + - - + + @@ -505,6 +505,9 @@ + + + @@ -764,6 +767,7 @@ + @@ -892,6 +896,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1010,6 +1046,7 @@ + @@ -1037,13 +1074,15 @@ - + - - - + + + + + - + @@ -1051,7 +1090,7 @@ - + @@ -1064,20 +1103,28 @@ + + + + - + - - - + + + + + - - - + + + + + @@ -1099,6 +1146,9 @@ + + + @@ -1106,8 +1156,8 @@ - - + + @@ -1117,25 +1167,30 @@ + - - - + + + + + + + @@ -1207,6 +1262,8 @@ + + @@ -1220,6 +1277,18 @@ + + + + + + + + + + + + @@ -1241,6 +1310,7 @@ + -- GitLab From 845248d03890257d384c684352b9519fe00f0b9c Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:27 +0100 Subject: [PATCH 033/208] TS 102 657 v1.3.1 (2009-09-22) agreed at LI#22 (Trouville, 2009-09-22) --- 102657/RDMessage.asn | 295 ++++++++++++++---- 102657/RDMessage.xsd | 229 +++++++++++++- ...DMessage, ver2.asn => RDMessage, ver3.asn} | 295 ++++++++++++++---- ... 102 657, RDMessage, ver3 (MSC draft).xsd} | 229 +++++++++++++- 4 files changed, 912 insertions(+), 136 deletions(-) rename 102657/portal/{TS 102 657, RDMessage, ver2.asn => RDMessage, ver3.asn} (81%) rename 102657/portal/{TS 102 657, RDMessage, ver2.xsd => TS 102 657, RDMessage, ver3 (MSC draft).xsd} (87%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 8286171..0c83a44 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version2(2)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version3(3)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version2(2)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version3(3)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -28,6 +28,7 @@ RetainedDataMessage ::= SEQUENCE -- retainedDataPayload) ... } + -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -89,8 +90,9 @@ RetainedDataPayload ::= CHOICE RequestMessage ::= SEQUENCE { - requestPriority [1] RequestPriority, - requestParameters [2] RequestConstraints, + requestPriority [1] RequestPriority OPTIONAL, + requestParameters [2] RequestConstraints OPTIONAL, + -- Optional only in case a warrant is transmitted independently of a request deliveryPointHIB [3] DeliveryPointHIB OPTIONAL, -- pre-arranged set of delivery address(es) of that specific Authorized Organization maxHits [4] INTEGER OPTIONAL, @@ -101,6 +103,7 @@ RequestMessage ::= SEQUENCE nationalRequestParameters [5] NationalRequestParameters OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + -- or to transmit a warrant. ... } @@ -174,8 +177,10 @@ ResponseRecord ::= SEQUENCE recordNumber [1] INTEGER, recordPayload [2] RetainedDataRecord, additionalInformation [3] AdditionalInformation OPTIONAL, - -- see clause 6.2.4 + -- see clause 6.2.4 nationalRecordPayload [4] NationalRecordPayload OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -302,7 +307,9 @@ TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, endTime [2] GeneralizedTime OPTIONAL, - ... + ..., + durationTime [3] INTEGER OPTIONAL + -- duration in seconds } -- ============================================== @@ -426,6 +433,16 @@ TelephonySubscriber ::= SEQUENCE -- service-specific information about this subscriber subscribedTelephonyServices [4] SEQUENCE OF SubscribedTelephonyServices OPTIONAL, -- a subscriber (or account) may have more than one service listed against them + ..., + nationalTelephonySubscriberInfo [5] NationalTelephonySubscriberInfo OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonySubscriberInfo ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -437,35 +454,59 @@ TelephonySubscriberInfo ::= NULL SubscribedTelephonyServices ::= SEQUENCE { - serviceID [1] UTF8String OPTIONAL, + serviceID [1] UTF8String OPTIONAL, -- Unique identifier for this service within the operator - providerID [2] UTF8String OPTIONAL, + providerID [2] UTF8String OPTIONAL, -- Unique identifier for the service provider - timeSpan [3] TimeSpan OPTIONAL, + timeSpan [3] TimeSpan OPTIONAL, -- Start and end data, if applicable, of the subscription - registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, + registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, -- The set of telephone numbers registered for this service - registeredICCID [5] UTF8String OPTIONAL, - serviceType [6] TelephonyServiceType OPTIONAL, - installationAddress [7] AddressInformation OPTIONAL, + registeredICCID [5] UTF8String OPTIONAL, + serviceType [6] TelephonyServiceType OPTIONAL, + installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address - connectionDate [8] GeneralizedTime OPTIONAL, + connectionDate [8] GeneralizedTime OPTIONAL, -- Date the subscriber was actually connected -- (May differ from the start of subscription) - iMSI [9] IMSI OPTIONAL, - carrierPreselect [10] BOOLEAN OPTIONAL, - lineStatus [11] UTF8String OPTIONAL, + iMSI [9] IMSI OPTIONAL, + carrierPreselect [10] BOOLEAN OPTIONAL, + lineStatus [11] UTF8String OPTIONAL, -- CSP-specific description of current line status, e.g. "Active", "Ceased", etc. + ..., + allocatedDeviceIDs [12] SEQUENCE OF TelephonyDeviceID OPTIONAL, + pUKCode [13] UTF8String OPTIONAL, + pUK2Code [14] UTF8String OPTIONAL, + iMEI [15] SEQUENCE OF IMEI OPTIONAL, + nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonySubscriptionInfo ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } TelephonyBillingDetails ::= SEQUENCE { - subscriberID [1] TelephonySubscriberId OPTIONAL, - serviceID [2] UTF8String OPTIONAL, - billingAddress [3] ContactDetails OPTIONAL, - billingIdentifier [4] BillingIdentifier OPTIONAL, - billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, + subscriberID [1] TelephonySubscriberId OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] BillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, + ..., + nationalTelephonyBillingDetails [6] NationalTelephonyBillingDetails OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyBillingDetails ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -475,13 +516,23 @@ BillingIdentifier ::= OCTET STRING BillingRecords ::= SEQUENCE { - time [1] GeneralizedTime OPTIONAL, - place [2] UTF8String OPTIONAL, - amount [3] REAL OPTIONAL, - currency [4] UTF8String (SIZE(3)) OPTIONAL, + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] - method [5] UTF8String OPTIONAL, + method [5] UTF8String OPTIONAL, -- i.e. credit card etc. + ..., + nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyBillingRecords ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -499,40 +550,67 @@ TelephonyServiceType ::= ENUMERATED TelephonyServiceUsage ::= SEQUENCE { - partyInformation [1] SEQUENCE OF TelephonyPartyInformation OPTIONAL, + partyInformation [1] SEQUENCE OF TelephonyPartyInformation OPTIONAL, -- This parameter provides the concerned party (Originating, Terminating or -- forwarded party), the identity(ies) of the party and all the information -- provided by the party - communicationTime [2] TimeSpan OPTIONAL, + communicationTime [2] TimeSpan OPTIONAL, -- Time and duration of the communication - eventInformation [3] SEQUENCE OF TelephonyEventInformation OPTIONAL, + eventInformation [3] SEQUENCE OF TelephonyEventInformation OPTIONAL, -- A list of events that occurred during this service usage - endReason [4] INTEGER OPTIONAL, + endReason [4] INTEGER OPTIONAL, -- Q.850 cause code for call termination - communicationType [5] TelephonyCommunicationType OPTIONAL, - bearerService [6] TelephonyBearerService OPTIONAL, - smsInformation [7] SmsInformation OPTIONAL, - ringDuration [8] INTEGER OPTIONAL, + communicationType [5] TelephonyCommunicationType OPTIONAL, + bearerService [6] TelephonyBearerService OPTIONAL, + smsInformation [7] SmsInformation OPTIONAL, + ringDuration [8] INTEGER OPTIONAL, + ..., + mmsInformation [9] MmsInformation OPTIONAL, + nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyServiceUsage ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } TelephonyPartyInformation ::= SEQUENCE { - partyRole [1] TelephonyPartyRole OPTIONAL, - partyNumber [2] PartyNumber OPTIONAL, - subscriberID [3] TelephonySubscriberId OPTIONAL, - deviceID [4] TelephonyDeviceID OPTIONAL, - locations [5] SEQUENCE OF TelephonyLocation OPTIONAL, + partyRole [1] TelephonyPartyRole OPTIONAL, + partyNumber [2] PartyNumber OPTIONAL, + subscriberID [3] TelephonySubscriberId OPTIONAL, + deviceID [4] TelephonyDeviceID OPTIONAL, + locations [5] SEQUENCE OF TelephonyLocation OPTIONAL, -- List of cell locations used by this party during the service usage - communicationTime [6] TimeSpan OPTIONAL, + communicationTime [6] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [7] UTF8String OPTIONAL, + iCCID [7] UTF8String OPTIONAL, -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format - iMSI [8] IMSI OPTIONAL, - natureOfAddress [9] UTF8String OPTIONAL, + iMSI [8] IMSI OPTIONAL, + natureOfAddress [9] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" - forwardedTransferredNumber [10] PartyNumber OPTIONAL, - terminatingTransferredNumber [11] PartyNumber OPTIONAL, + forwardedTransferredNumber [10] PartyNumber OPTIONAL, + terminatingTransferredNumber [11] PartyNumber OPTIONAL, + ..., + emailAddress [12] UTF8String OPTIONAL, + -- used for MMS that supports also the use of E-Mail addresses (RFC 2822 [24]) + iMEI [13] IMEI OPTIONAL, + detailedLocation [14] TelephonyNetworkElement OPTIONAL, + -- In the case detailed location information per call and party is available + -- (e.g. the geoCoordinates for this partyNumber) + nationalTelephonyPartyInformation [15] NationalTelephonyPartyInformation OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyPartyInformation ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -541,7 +619,8 @@ TelephonyCommunicationType ::= ENUMERATED telephonyFixedCS(0), telephonyWirelessCS(1), sMS(2), - ... + ..., + mMS(3) } TelephonyBearerService ::= ENUMERATED @@ -595,6 +674,46 @@ SmsInformation ::= SEQUENCE ... } +MmsInformation ::= SEQUENCE +{ + mmsEvent [1] ENUMERATED + { + message(1), + notificationMessage(2), + deliveryReportMessage(3), + readReplyMessage(4), + ... + } OPTIONAL, + -- type of message exchanged + mmsStatus [2] ENUMERATED + { + delivered(0), + expired(1), + deleted(2), + replaced(3), + submitted(4), + undeliverable(5), + passed-on(6), + delivery-rejection(7), + delivery-forward(8), + delivery-copy(9), + submission-rejection(10), + submission-failure(11), + ... + } OPTIONAL, + mmsNotifInd [3] BOOLEAN OPTIONAL, + -- indication that a delivery notification has been generated + mmsMsgMod [4] ENUMERATED + { + none(1), + modified(2), + stripped(3), + ... + } OPTIONAL, + -- message modification indication for MMS + ... +} + TelephonyEventInformation ::= SEQUENCE { time [1] GeneralizedTime OPTIONAL, @@ -614,6 +733,16 @@ TelephonyEventType ::= CHOICE callForwardingEventType [3] CallForwardingEventType, messagingEventType [4] MessagingEventType, prepayServiceEventType [5] PrepayServiceEventType, + ..., + nationalTelephonyEventType [6] NationalTelephonyEventType + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyEventType ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -623,7 +752,7 @@ BasicEventType ::= ENUMERATED hold(2), retrieve(3), suspend(4), - resume(5), + resume(5), ect(6), mpty(7), mptyHold(8), @@ -639,9 +768,13 @@ BasicEventType ::= ENUMERATED serviceActivation(18), transit(19), mSOriginating(20), - callForwarding(21), + callForwarding(21), mSTerminating(22), - ... + ..., + callAttempt(23), + callStart(24), + callEnd(25), + cliWithheld(26) } CallForwardingEventType ::= ENUMERATED @@ -699,10 +832,20 @@ PrepayServiceEventType ::= ENUMERATED TelephonyLocation ::= SEQUENCE { - telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, + telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, -- ID of the network element location (e.g. Cell ID) - timeSpan [2] TimeSpan OPTIONAL, + timeSpan [2] TimeSpan OPTIONAL, -- Time span that this location was valid for + ..., + nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyLocation ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -722,7 +865,11 @@ TelephonyPartyRole ::= ENUMERATED smsRecipient(11), smsOriginatorTrn(12), smsRecipientTrn(13), - ... + ..., + mmsOriginator(14), + mmsRecipient(15), + mmsOriginatorTrn(16), + mmsRecipientTrn(17) } -- ======================= @@ -731,7 +878,7 @@ TelephonyPartyRole ::= ENUMERATED TelephonyDevice ::= SEQUENCE { - deviceIDType [1] ENUMERATED + deviceIDType [1] ENUMERATED -- Type of identifier for telephony device { unknown(0), @@ -739,12 +886,22 @@ TelephonyDevice ::= SEQUENCE macAddress(2), ... } OPTIONAL, - telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, + telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, -- Unique identifier for this telephony device according to type of identifier ..., - subscriberID [3] TelephonySubscriberId OPTIONAL + subscriberID [3] TelephonySubscriberId OPTIONAL, -- Identifier for a known user of this equipment. -- Usage of this parameter is subject to national legislation. + nationalTelephonyDevice [4] NationalTelephonyDevice OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyDevice ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... } TelephonyDeviceID ::= OCTET STRING @@ -757,10 +914,20 @@ TelephonyDeviceID ::= OCTET STRING TelephonyNetworkElement ::= SEQUENCE { - telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, - cellInformation [2] Location OPTIONAL, + telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, + cellInformation [2] Location OPTIONAL, -- The Location information id - validity [3] TimeSpan OPTIONAL, + validity [3] TimeSpan OPTIONAL, + ..., + nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyNetworkElement ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -1147,7 +1314,8 @@ NAServiceSubscription ::= SEQUENCE fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address imsi [8] IMSI OPTIONAL, - ... + ..., + allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL } -- =========================================== @@ -1186,7 +1354,9 @@ NAServiceUsage ::= SEQUENCE -- Location of the access (for e.g. GPRS handsets) dialUpInformation [10] DialUpInformation OPTIONAL, gprsInformation [11] GprsInformation OPTIONAL, - ... + ..., + octetsDownloaded [12] INTEGER OPTIONAL, + octetsUploaded [13] INTEGER OPTIONAL } NwAccessType ::= ENUMERATED @@ -1267,7 +1437,7 @@ NADevice ::= SEQUENCE } IMEI ::= OCTET STRING (SIZE(8)) - -- format as per TS GSM 09.02 [8] + -- format as per TS GSM 09.02 [8Error! Reference source not found.] IMSI ::= OCTET STRING (SIZE(3..8)) -- format as per TS GSM 09.02 [8] @@ -1355,4 +1525,3 @@ NABillingDetails ::= SEQUENCE END -- end of RDMessage - diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index e7e2ec6..9eec441 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI-rap21 (TS 102 657 v1.2.1) + XSD translated from ASN.1 derived from outcome of LI#21 (TS 102 657 v1.3.1) @@ -102,6 +102,7 @@ + @@ -120,6 +121,7 @@ + @@ -148,6 +150,10 @@ + + + + @@ -209,6 +215,19 @@ + + + + + + + + + + + + + @@ -225,6 +244,10 @@ + + + + @@ -451,6 +474,7 @@ + @@ -566,10 +590,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -582,9 +630,23 @@ + + + + + + + + + + + + + + @@ -599,9 +661,23 @@ + + + + + + + + + + + + + + @@ -615,6 +691,20 @@ + + + + + + + + + + + + + + @@ -624,9 +714,23 @@ + + + + + + + + + + + + + + @@ -647,10 +751,27 @@ + + + + + + + + + + + + + + + + + @@ -729,6 +850,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -751,9 +918,24 @@ + + + + + + + + + + + + + + + @@ -768,10 +950,24 @@ + + + + + + + + + + + + + + @@ -1056,6 +1252,20 @@ + + + + + + + + + + + + + + @@ -1221,6 +1431,13 @@ + + + + + + + @@ -1343,6 +1560,8 @@ + + @@ -1442,8 +1661,8 @@ - - + + diff --git a/102657/portal/TS 102 657, RDMessage, ver2.asn b/102657/portal/RDMessage, ver3.asn similarity index 81% rename from 102657/portal/TS 102 657, RDMessage, ver2.asn rename to 102657/portal/RDMessage, ver3.asn index 8286171..0c83a44 100644 --- a/102657/portal/TS 102 657, RDMessage, ver2.asn +++ b/102657/portal/RDMessage, ver3.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version2(2)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version3(3)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version2(2)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version3(3)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -28,6 +28,7 @@ RetainedDataMessage ::= SEQUENCE -- retainedDataPayload) ... } + -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -89,8 +90,9 @@ RetainedDataPayload ::= CHOICE RequestMessage ::= SEQUENCE { - requestPriority [1] RequestPriority, - requestParameters [2] RequestConstraints, + requestPriority [1] RequestPriority OPTIONAL, + requestParameters [2] RequestConstraints OPTIONAL, + -- Optional only in case a warrant is transmitted independently of a request deliveryPointHIB [3] DeliveryPointHIB OPTIONAL, -- pre-arranged set of delivery address(es) of that specific Authorized Organization maxHits [4] INTEGER OPTIONAL, @@ -101,6 +103,7 @@ RequestMessage ::= SEQUENCE nationalRequestParameters [5] NationalRequestParameters OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + -- or to transmit a warrant. ... } @@ -174,8 +177,10 @@ ResponseRecord ::= SEQUENCE recordNumber [1] INTEGER, recordPayload [2] RetainedDataRecord, additionalInformation [3] AdditionalInformation OPTIONAL, - -- see clause 6.2.4 + -- see clause 6.2.4 nationalRecordPayload [4] NationalRecordPayload OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -302,7 +307,9 @@ TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, endTime [2] GeneralizedTime OPTIONAL, - ... + ..., + durationTime [3] INTEGER OPTIONAL + -- duration in seconds } -- ============================================== @@ -426,6 +433,16 @@ TelephonySubscriber ::= SEQUENCE -- service-specific information about this subscriber subscribedTelephonyServices [4] SEQUENCE OF SubscribedTelephonyServices OPTIONAL, -- a subscriber (or account) may have more than one service listed against them + ..., + nationalTelephonySubscriberInfo [5] NationalTelephonySubscriberInfo OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonySubscriberInfo ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -437,35 +454,59 @@ TelephonySubscriberInfo ::= NULL SubscribedTelephonyServices ::= SEQUENCE { - serviceID [1] UTF8String OPTIONAL, + serviceID [1] UTF8String OPTIONAL, -- Unique identifier for this service within the operator - providerID [2] UTF8String OPTIONAL, + providerID [2] UTF8String OPTIONAL, -- Unique identifier for the service provider - timeSpan [3] TimeSpan OPTIONAL, + timeSpan [3] TimeSpan OPTIONAL, -- Start and end data, if applicable, of the subscription - registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, + registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, -- The set of telephone numbers registered for this service - registeredICCID [5] UTF8String OPTIONAL, - serviceType [6] TelephonyServiceType OPTIONAL, - installationAddress [7] AddressInformation OPTIONAL, + registeredICCID [5] UTF8String OPTIONAL, + serviceType [6] TelephonyServiceType OPTIONAL, + installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address - connectionDate [8] GeneralizedTime OPTIONAL, + connectionDate [8] GeneralizedTime OPTIONAL, -- Date the subscriber was actually connected -- (May differ from the start of subscription) - iMSI [9] IMSI OPTIONAL, - carrierPreselect [10] BOOLEAN OPTIONAL, - lineStatus [11] UTF8String OPTIONAL, + iMSI [9] IMSI OPTIONAL, + carrierPreselect [10] BOOLEAN OPTIONAL, + lineStatus [11] UTF8String OPTIONAL, -- CSP-specific description of current line status, e.g. "Active", "Ceased", etc. + ..., + allocatedDeviceIDs [12] SEQUENCE OF TelephonyDeviceID OPTIONAL, + pUKCode [13] UTF8String OPTIONAL, + pUK2Code [14] UTF8String OPTIONAL, + iMEI [15] SEQUENCE OF IMEI OPTIONAL, + nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonySubscriptionInfo ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } TelephonyBillingDetails ::= SEQUENCE { - subscriberID [1] TelephonySubscriberId OPTIONAL, - serviceID [2] UTF8String OPTIONAL, - billingAddress [3] ContactDetails OPTIONAL, - billingIdentifier [4] BillingIdentifier OPTIONAL, - billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, + subscriberID [1] TelephonySubscriberId OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] BillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, + ..., + nationalTelephonyBillingDetails [6] NationalTelephonyBillingDetails OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyBillingDetails ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -475,13 +516,23 @@ BillingIdentifier ::= OCTET STRING BillingRecords ::= SEQUENCE { - time [1] GeneralizedTime OPTIONAL, - place [2] UTF8String OPTIONAL, - amount [3] REAL OPTIONAL, - currency [4] UTF8String (SIZE(3)) OPTIONAL, + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] - method [5] UTF8String OPTIONAL, + method [5] UTF8String OPTIONAL, -- i.e. credit card etc. + ..., + nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyBillingRecords ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -499,40 +550,67 @@ TelephonyServiceType ::= ENUMERATED TelephonyServiceUsage ::= SEQUENCE { - partyInformation [1] SEQUENCE OF TelephonyPartyInformation OPTIONAL, + partyInformation [1] SEQUENCE OF TelephonyPartyInformation OPTIONAL, -- This parameter provides the concerned party (Originating, Terminating or -- forwarded party), the identity(ies) of the party and all the information -- provided by the party - communicationTime [2] TimeSpan OPTIONAL, + communicationTime [2] TimeSpan OPTIONAL, -- Time and duration of the communication - eventInformation [3] SEQUENCE OF TelephonyEventInformation OPTIONAL, + eventInformation [3] SEQUENCE OF TelephonyEventInformation OPTIONAL, -- A list of events that occurred during this service usage - endReason [4] INTEGER OPTIONAL, + endReason [4] INTEGER OPTIONAL, -- Q.850 cause code for call termination - communicationType [5] TelephonyCommunicationType OPTIONAL, - bearerService [6] TelephonyBearerService OPTIONAL, - smsInformation [7] SmsInformation OPTIONAL, - ringDuration [8] INTEGER OPTIONAL, + communicationType [5] TelephonyCommunicationType OPTIONAL, + bearerService [6] TelephonyBearerService OPTIONAL, + smsInformation [7] SmsInformation OPTIONAL, + ringDuration [8] INTEGER OPTIONAL, + ..., + mmsInformation [9] MmsInformation OPTIONAL, + nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyServiceUsage ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } TelephonyPartyInformation ::= SEQUENCE { - partyRole [1] TelephonyPartyRole OPTIONAL, - partyNumber [2] PartyNumber OPTIONAL, - subscriberID [3] TelephonySubscriberId OPTIONAL, - deviceID [4] TelephonyDeviceID OPTIONAL, - locations [5] SEQUENCE OF TelephonyLocation OPTIONAL, + partyRole [1] TelephonyPartyRole OPTIONAL, + partyNumber [2] PartyNumber OPTIONAL, + subscriberID [3] TelephonySubscriberId OPTIONAL, + deviceID [4] TelephonyDeviceID OPTIONAL, + locations [5] SEQUENCE OF TelephonyLocation OPTIONAL, -- List of cell locations used by this party during the service usage - communicationTime [6] TimeSpan OPTIONAL, + communicationTime [6] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [7] UTF8String OPTIONAL, + iCCID [7] UTF8String OPTIONAL, -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format - iMSI [8] IMSI OPTIONAL, - natureOfAddress [9] UTF8String OPTIONAL, + iMSI [8] IMSI OPTIONAL, + natureOfAddress [9] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" - forwardedTransferredNumber [10] PartyNumber OPTIONAL, - terminatingTransferredNumber [11] PartyNumber OPTIONAL, + forwardedTransferredNumber [10] PartyNumber OPTIONAL, + terminatingTransferredNumber [11] PartyNumber OPTIONAL, + ..., + emailAddress [12] UTF8String OPTIONAL, + -- used for MMS that supports also the use of E-Mail addresses (RFC 2822 [24]) + iMEI [13] IMEI OPTIONAL, + detailedLocation [14] TelephonyNetworkElement OPTIONAL, + -- In the case detailed location information per call and party is available + -- (e.g. the geoCoordinates for this partyNumber) + nationalTelephonyPartyInformation [15] NationalTelephonyPartyInformation OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyPartyInformation ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -541,7 +619,8 @@ TelephonyCommunicationType ::= ENUMERATED telephonyFixedCS(0), telephonyWirelessCS(1), sMS(2), - ... + ..., + mMS(3) } TelephonyBearerService ::= ENUMERATED @@ -595,6 +674,46 @@ SmsInformation ::= SEQUENCE ... } +MmsInformation ::= SEQUENCE +{ + mmsEvent [1] ENUMERATED + { + message(1), + notificationMessage(2), + deliveryReportMessage(3), + readReplyMessage(4), + ... + } OPTIONAL, + -- type of message exchanged + mmsStatus [2] ENUMERATED + { + delivered(0), + expired(1), + deleted(2), + replaced(3), + submitted(4), + undeliverable(5), + passed-on(6), + delivery-rejection(7), + delivery-forward(8), + delivery-copy(9), + submission-rejection(10), + submission-failure(11), + ... + } OPTIONAL, + mmsNotifInd [3] BOOLEAN OPTIONAL, + -- indication that a delivery notification has been generated + mmsMsgMod [4] ENUMERATED + { + none(1), + modified(2), + stripped(3), + ... + } OPTIONAL, + -- message modification indication for MMS + ... +} + TelephonyEventInformation ::= SEQUENCE { time [1] GeneralizedTime OPTIONAL, @@ -614,6 +733,16 @@ TelephonyEventType ::= CHOICE callForwardingEventType [3] CallForwardingEventType, messagingEventType [4] MessagingEventType, prepayServiceEventType [5] PrepayServiceEventType, + ..., + nationalTelephonyEventType [6] NationalTelephonyEventType + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyEventType ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -623,7 +752,7 @@ BasicEventType ::= ENUMERATED hold(2), retrieve(3), suspend(4), - resume(5), + resume(5), ect(6), mpty(7), mptyHold(8), @@ -639,9 +768,13 @@ BasicEventType ::= ENUMERATED serviceActivation(18), transit(19), mSOriginating(20), - callForwarding(21), + callForwarding(21), mSTerminating(22), - ... + ..., + callAttempt(23), + callStart(24), + callEnd(25), + cliWithheld(26) } CallForwardingEventType ::= ENUMERATED @@ -699,10 +832,20 @@ PrepayServiceEventType ::= ENUMERATED TelephonyLocation ::= SEQUENCE { - telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, + telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, -- ID of the network element location (e.g. Cell ID) - timeSpan [2] TimeSpan OPTIONAL, + timeSpan [2] TimeSpan OPTIONAL, -- Time span that this location was valid for + ..., + nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyLocation ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -722,7 +865,11 @@ TelephonyPartyRole ::= ENUMERATED smsRecipient(11), smsOriginatorTrn(12), smsRecipientTrn(13), - ... + ..., + mmsOriginator(14), + mmsRecipient(15), + mmsOriginatorTrn(16), + mmsRecipientTrn(17) } -- ======================= @@ -731,7 +878,7 @@ TelephonyPartyRole ::= ENUMERATED TelephonyDevice ::= SEQUENCE { - deviceIDType [1] ENUMERATED + deviceIDType [1] ENUMERATED -- Type of identifier for telephony device { unknown(0), @@ -739,12 +886,22 @@ TelephonyDevice ::= SEQUENCE macAddress(2), ... } OPTIONAL, - telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, + telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, -- Unique identifier for this telephony device according to type of identifier ..., - subscriberID [3] TelephonySubscriberId OPTIONAL + subscriberID [3] TelephonySubscriberId OPTIONAL, -- Identifier for a known user of this equipment. -- Usage of this parameter is subject to national legislation. + nationalTelephonyDevice [4] NationalTelephonyDevice OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyDevice ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... } TelephonyDeviceID ::= OCTET STRING @@ -757,10 +914,20 @@ TelephonyDeviceID ::= OCTET STRING TelephonyNetworkElement ::= SEQUENCE { - telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, - cellInformation [2] Location OPTIONAL, + telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, + cellInformation [2] Location OPTIONAL, -- The Location information id - validity [3] TimeSpan OPTIONAL, + validity [3] TimeSpan OPTIONAL, + ..., + nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements +} + +NationalTelephonyNetworkElement ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters ... } @@ -1147,7 +1314,8 @@ NAServiceSubscription ::= SEQUENCE fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address imsi [8] IMSI OPTIONAL, - ... + ..., + allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL } -- =========================================== @@ -1186,7 +1354,9 @@ NAServiceUsage ::= SEQUENCE -- Location of the access (for e.g. GPRS handsets) dialUpInformation [10] DialUpInformation OPTIONAL, gprsInformation [11] GprsInformation OPTIONAL, - ... + ..., + octetsDownloaded [12] INTEGER OPTIONAL, + octetsUploaded [13] INTEGER OPTIONAL } NwAccessType ::= ENUMERATED @@ -1267,7 +1437,7 @@ NADevice ::= SEQUENCE } IMEI ::= OCTET STRING (SIZE(8)) - -- format as per TS GSM 09.02 [8] + -- format as per TS GSM 09.02 [8Error! Reference source not found.] IMSI ::= OCTET STRING (SIZE(3..8)) -- format as per TS GSM 09.02 [8] @@ -1355,4 +1525,3 @@ NABillingDetails ::= SEQUENCE END -- end of RDMessage - diff --git a/102657/portal/TS 102 657, RDMessage, ver2.xsd b/102657/portal/TS 102 657, RDMessage, ver3 (MSC draft).xsd similarity index 87% rename from 102657/portal/TS 102 657, RDMessage, ver2.xsd rename to 102657/portal/TS 102 657, RDMessage, ver3 (MSC draft).xsd index e7e2ec6..9eec441 100644 --- a/102657/portal/TS 102 657, RDMessage, ver2.xsd +++ b/102657/portal/TS 102 657, RDMessage, ver3 (MSC draft).xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI-rap21 (TS 102 657 v1.2.1) + XSD translated from ASN.1 derived from outcome of LI#21 (TS 102 657 v1.3.1) @@ -102,6 +102,7 @@ + @@ -120,6 +121,7 @@ + @@ -148,6 +150,10 @@ + + + + @@ -209,6 +215,19 @@ + + + + + + + + + + + + + @@ -225,6 +244,10 @@ + + + + @@ -451,6 +474,7 @@ + @@ -566,10 +590,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -582,9 +630,23 @@ + + + + + + + + + + + + + + @@ -599,9 +661,23 @@ + + + + + + + + + + + + + + @@ -615,6 +691,20 @@ + + + + + + + + + + + + + + @@ -624,9 +714,23 @@ + + + + + + + + + + + + + + @@ -647,10 +751,27 @@ + + + + + + + + + + + + + + + + + @@ -729,6 +850,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -751,9 +918,24 @@ + + + + + + + + + + + + + + + @@ -768,10 +950,24 @@ + + + + + + + + + + + + + + @@ -1056,6 +1252,20 @@ + + + + + + + + + + + + + + @@ -1221,6 +1431,13 @@ + + + + + + + @@ -1343,6 +1560,8 @@ + + @@ -1442,8 +1661,8 @@ - - + + -- GitLab From 70c8575759109f3a2b1aabd8523957ab93ae9936 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:30 +0100 Subject: [PATCH 034/208] TS 102 657 v1.4.1 (2009-12-09) agreed at LI#22 (Trouville, 2009-09-22) --- 102657/RDMessage.asn | 123 +++++++++--------- 102657/RDMessage.xsd | 7 +- ...DMessage, ver3.asn => RDMessage, ver4.txt} | 123 +++++++++--------- ..._102_657,_RDMessage,_ver4_(MSC_draft).xsd} | 7 +- 4 files changed, 132 insertions(+), 128 deletions(-) rename 102657/portal/{RDMessage, ver3.asn => RDMessage, ver4.txt} (94%) rename 102657/portal/{TS 102 657, RDMessage, ver3 (MSC draft).xsd => TS_102_657,_RDMessage,_ver4_(MSC_draft).xsd} (99%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 0c83a44..e505f92 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version3(3)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version4(4)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version3(3)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version4(4)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -22,7 +22,7 @@ RetainedDataMessage ::= SEQUENCE { rdHeaderId [0] OBJECT IDENTIFIER, retainedDataHeader [1] RetainedDataHeader, - retainedDataPayload [2] RetainedDataPayload, + retainedDataPayload [2] RetainedDataPayload, retainedDataDigest [3] OCTET STRING OPTIONAL, -- The digitally signed hash of the combined fields above (retainedDataHeader and -- retainedDataPayload) @@ -71,16 +71,16 @@ RequestNumber ::= UTF8String RetainedDataPayload ::= CHOICE -- Payload can be a request, response, error or acknowledgement { - requestMessage [1] RequestMessage, - requestAcknowledgement [2] RequestAcknowledgement, - responseMessage [3] ResponseMessage, - responseAcknowledgement [4] ResponseAcknowledgement, - errorMessage [5] FurtherInformation, - cancelMessage [6] CancelMessage, - cancelAcknowledgement [7] CancelAcknowledgement, - getstatusMessage [8] GetStatusMessage, - statusMessage [9] StatusMessage, - getResultsMessage [10] GetResultsMessage, + requestMessage [1] RequestMessage, + requestAcknowledgement [2] RequestAcknowledgement, + responseMessage [3] ResponseMessage, + responseAcknowledgement [4] ResponseAcknowledgement, + errorMessage [5] FurtherInformation, + cancelMessage [6] CancelMessage, + cancelAcknowledgement [7] CancelAcknowledgement, + getstatusMessage [8] GetStatusMessage, + statusMessage [9] StatusMessage, + getResultsMessage [10] GetResultsMessage, ... } @@ -135,7 +135,7 @@ RequestPriority ::= OCTET STRING RequestAcknowledgement ::= SEQUENCE { - suggestedCompletionTime [1] GeneralizedTime OPTIONAL, + suggestedCompletionTime [1] GeneralizedTime OPTIONAL, -- Indicative time that results will be ready -- Purely informational, not binding for either party ... @@ -161,13 +161,13 @@ ResponseMessage ::= SEQUENCE ResponseStatus ::= CHOICE { - responseComplete [1] NULL, + responseComplete [1] NULL, -- No further results to come - responseIncomplete [2] NULL, + responseIncomplete [2] NULL, -- There may be further results to come - responseUnavailable [3] NULL, + responseUnavailable [3] NULL, -- See clause 6.3.3 - responseFailed [4] FurtherInformation, + responseFailed [4] FurtherInformation, -- See clauses 6.2.2.2 and 6.3.3.2 ... } @@ -177,7 +177,7 @@ ResponseRecord ::= SEQUENCE recordNumber [1] INTEGER, recordPayload [2] RetainedDataRecord, additionalInformation [3] AdditionalInformation OPTIONAL, - -- see clause 6.2.4 + -- see clause 6.2.4 nationalRecordPayload [4] NationalRecordPayload OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements @@ -248,8 +248,8 @@ StatusMessage ::= SEQUENCE StatusResponse ::= SEQUENCE { - requestNumber [1] RequestNumber, - requestStatus [2] RequestStatus, + requestNumber [1] RequestNumber, + requestStatus [2] RequestStatus, ... } @@ -492,13 +492,13 @@ NationalTelephonySubscriptionInfo ::= SEQUENCE TelephonyBillingDetails ::= SEQUENCE { - subscriberID [1] TelephonySubscriberId OPTIONAL, - serviceID [2] UTF8String OPTIONAL, - billingAddress [3] ContactDetails OPTIONAL, - billingIdentifier [4] BillingIdentifier OPTIONAL, - billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, + subscriberID [1] TelephonySubscriberId OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] BillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, ..., - nationalTelephonyBillingDetails [6] NationalTelephonyBillingDetails OPTIONAL + nationalTelephonyBillingDetails [6] NationalTelephonyBillingDetails OPTIONAL -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -516,15 +516,15 @@ BillingIdentifier ::= OCTET STRING BillingRecords ::= SEQUENCE { - time [1] GeneralizedTime OPTIONAL, - place [2] UTF8String OPTIONAL, - amount [3] REAL OPTIONAL, - currency [4] UTF8String (SIZE(3)) OPTIONAL, + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] - method [5] UTF8String OPTIONAL, + method [5] UTF8String OPTIONAL, -- i.e. credit card etc. ..., - nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL + nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -614,7 +614,7 @@ NationalTelephonyPartyInformation ::= SEQUENCE ... } -TelephonyCommunicationType ::= ENUMERATED +TelephonyCommunicationType ::= ENUMERATED { telephonyFixedCS(0), telephonyWirelessCS(1), @@ -623,7 +623,7 @@ TelephonyCommunicationType ::= ENUMERATED mMS(3) } -TelephonyBearerService ::= ENUMERATED +TelephonyBearerService ::= ENUMERATED { speech(0), data(1), @@ -699,7 +699,10 @@ MmsInformation ::= SEQUENCE delivery-copy(9), submission-rejection(10), submission-failure(11), - ... + ..., + delivered-application(12) + -- optional flag indicating MMS was retrieved using + -- something other than mobile deivce e.g. web browser } OPTIONAL, mmsNotifInd [3] BOOLEAN OPTIONAL, -- indication that a delivery notification has been generated @@ -854,7 +857,7 @@ TelephonyPartyRole ::= ENUMERATED originating-Party(0), terminating-Party(1), forwarded-to-Party(2), - originalCalled (3), + originalCalled(3), redirecting(4), connected(5), userProvidedCalling(6), @@ -878,7 +881,7 @@ TelephonyPartyRole ::= ENUMERATED TelephonyDevice ::= SEQUENCE { - deviceIDType [1] ENUMERATED + deviceIDType [1] ENUMERATED -- Type of identifier for telephony device { unknown(0), @@ -886,13 +889,13 @@ TelephonyDevice ::= SEQUENCE macAddress(2), ... } OPTIONAL, - telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, + telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, -- Unique identifier for this telephony device according to type of identifier ..., - subscriberID [3] TelephonySubscriberId OPTIONAL, + subscriberID [3] TelephonySubscriberId OPTIONAL, -- Identifier for a known user of this equipment. -- Usage of this parameter is subject to national legislation. - nationalTelephonyDevice [4] NationalTelephonyDevice OPTIONAL + nationalTelephonyDevice [4] NationalTelephonyDevice OPTIONAL -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -914,12 +917,12 @@ TelephonyDeviceID ::= OCTET STRING TelephonyNetworkElement ::= SEQUENCE { - telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, - cellInformation [2] Location OPTIONAL, + telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, + cellInformation [2] Location OPTIONAL, -- The Location information id - validity [3] TimeSpan OPTIONAL, + validity [3] TimeSpan OPTIONAL, ..., - nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL + nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -942,9 +945,9 @@ Location ::= SEQUENCE { e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, -- Coded in the same format as the ISUP location number (parameter - -- field) of the ISUP (seeEN 300 356 [7]) + -- field) of the ISUP (see EN 300 356 [7]) globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, - -- See MAP format (seeTS GSM 09.02 [8]) + -- See MAP format (see 3GPP TS 09.02 [8]) rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with @@ -1084,8 +1087,8 @@ GeographicalCoordinates ::= SEQUENCE { latitudeSign [1] ENUMERATED { - north, - south + north(0), + south(1) } OPTIONAL, latitude [2] INTEGER (0..8388607) OPTIONAL, longitude [3] INTEGER (-8388608..8388607) OPTIONAL, @@ -1258,7 +1261,6 @@ MsgStoreOperation ::= SEQUENCE messageID [10] MessageID OPTIONAL } - MessageID ::= UTF8String -- Unique identifier for this message, e.g RFC 822 header @@ -1301,21 +1303,21 @@ NASubscriber ::= SEQUENCE NAServiceSubscription ::= SEQUENCE -- Description of the subscription to a Network Access service { - validity [1] TimeSpan OPTIONAL, - naServiceID [2] UTF8String OPTIONAL, + validity [1] TimeSpan OPTIONAL, + naServiceID [2] UTF8String OPTIONAL, -- Identifier for the service, e.g. account plan name. - naProviderID [3] NAProviderID OPTIONAL, + naProviderID [3] NAProviderID OPTIONAL, -- Unique identifier for the provider of the service, e.g. company name - naAuthID [4] NAAuthID OPTIONAL, + naAuthID [4] NAAuthID OPTIONAL, -- Unique identifier for this subscription, e.g. logon name - options [5] UTF8String OPTIONAL, + options [5] UTF8String OPTIONAL, -- Human readable text with restrictions or options to the subscription installationAddress [6] AddressInformation OPTIONAL, - fixIpAddress [7] IPAddress OPTIONAL, + fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address - imsi [8] IMSI OPTIONAL, + imsi [8] IMSI OPTIONAL, ..., - allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL + allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL } -- =========================================== @@ -1437,10 +1439,10 @@ NADevice ::= SEQUENCE } IMEI ::= OCTET STRING (SIZE(8)) - -- format as per TS GSM 09.02 [8Error! Reference source not found.] + -- format as per 3GPP TS 09.02 [8] IMSI ::= OCTET STRING (SIZE(3..8)) - -- format as per TS GSM 09.02 [8] + -- format as per 3GPP TS 09.02 [8] -- ====================================== -- Definitions of Message Network element @@ -1524,4 +1526,3 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage - diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 9eec441..519eb00 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#21 (TS 102 657 v1.3.1) + XSD translated from ASN.1 derived from outcome of LI#22 (TS 102 657 v1.4.1) @@ -878,6 +878,7 @@ + diff --git a/102657/portal/RDMessage, ver3.asn b/102657/portal/RDMessage, ver4.txt similarity index 94% rename from 102657/portal/RDMessage, ver3.asn rename to 102657/portal/RDMessage, ver4.txt index 0c83a44..e505f92 100644 --- a/102657/portal/RDMessage, ver3.asn +++ b/102657/portal/RDMessage, ver4.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version3(3)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version4(4)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version3(3)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version4(4)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -22,7 +22,7 @@ RetainedDataMessage ::= SEQUENCE { rdHeaderId [0] OBJECT IDENTIFIER, retainedDataHeader [1] RetainedDataHeader, - retainedDataPayload [2] RetainedDataPayload, + retainedDataPayload [2] RetainedDataPayload, retainedDataDigest [3] OCTET STRING OPTIONAL, -- The digitally signed hash of the combined fields above (retainedDataHeader and -- retainedDataPayload) @@ -71,16 +71,16 @@ RequestNumber ::= UTF8String RetainedDataPayload ::= CHOICE -- Payload can be a request, response, error or acknowledgement { - requestMessage [1] RequestMessage, - requestAcknowledgement [2] RequestAcknowledgement, - responseMessage [3] ResponseMessage, - responseAcknowledgement [4] ResponseAcknowledgement, - errorMessage [5] FurtherInformation, - cancelMessage [6] CancelMessage, - cancelAcknowledgement [7] CancelAcknowledgement, - getstatusMessage [8] GetStatusMessage, - statusMessage [9] StatusMessage, - getResultsMessage [10] GetResultsMessage, + requestMessage [1] RequestMessage, + requestAcknowledgement [2] RequestAcknowledgement, + responseMessage [3] ResponseMessage, + responseAcknowledgement [4] ResponseAcknowledgement, + errorMessage [5] FurtherInformation, + cancelMessage [6] CancelMessage, + cancelAcknowledgement [7] CancelAcknowledgement, + getstatusMessage [8] GetStatusMessage, + statusMessage [9] StatusMessage, + getResultsMessage [10] GetResultsMessage, ... } @@ -135,7 +135,7 @@ RequestPriority ::= OCTET STRING RequestAcknowledgement ::= SEQUENCE { - suggestedCompletionTime [1] GeneralizedTime OPTIONAL, + suggestedCompletionTime [1] GeneralizedTime OPTIONAL, -- Indicative time that results will be ready -- Purely informational, not binding for either party ... @@ -161,13 +161,13 @@ ResponseMessage ::= SEQUENCE ResponseStatus ::= CHOICE { - responseComplete [1] NULL, + responseComplete [1] NULL, -- No further results to come - responseIncomplete [2] NULL, + responseIncomplete [2] NULL, -- There may be further results to come - responseUnavailable [3] NULL, + responseUnavailable [3] NULL, -- See clause 6.3.3 - responseFailed [4] FurtherInformation, + responseFailed [4] FurtherInformation, -- See clauses 6.2.2.2 and 6.3.3.2 ... } @@ -177,7 +177,7 @@ ResponseRecord ::= SEQUENCE recordNumber [1] INTEGER, recordPayload [2] RetainedDataRecord, additionalInformation [3] AdditionalInformation OPTIONAL, - -- see clause 6.2.4 + -- see clause 6.2.4 nationalRecordPayload [4] NationalRecordPayload OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements @@ -248,8 +248,8 @@ StatusMessage ::= SEQUENCE StatusResponse ::= SEQUENCE { - requestNumber [1] RequestNumber, - requestStatus [2] RequestStatus, + requestNumber [1] RequestNumber, + requestStatus [2] RequestStatus, ... } @@ -492,13 +492,13 @@ NationalTelephonySubscriptionInfo ::= SEQUENCE TelephonyBillingDetails ::= SEQUENCE { - subscriberID [1] TelephonySubscriberId OPTIONAL, - serviceID [2] UTF8String OPTIONAL, - billingAddress [3] ContactDetails OPTIONAL, - billingIdentifier [4] BillingIdentifier OPTIONAL, - billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, + subscriberID [1] TelephonySubscriberId OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] BillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, ..., - nationalTelephonyBillingDetails [6] NationalTelephonyBillingDetails OPTIONAL + nationalTelephonyBillingDetails [6] NationalTelephonyBillingDetails OPTIONAL -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -516,15 +516,15 @@ BillingIdentifier ::= OCTET STRING BillingRecords ::= SEQUENCE { - time [1] GeneralizedTime OPTIONAL, - place [2] UTF8String OPTIONAL, - amount [3] REAL OPTIONAL, - currency [4] UTF8String (SIZE(3)) OPTIONAL, + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] - method [5] UTF8String OPTIONAL, + method [5] UTF8String OPTIONAL, -- i.e. credit card etc. ..., - nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL + nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -614,7 +614,7 @@ NationalTelephonyPartyInformation ::= SEQUENCE ... } -TelephonyCommunicationType ::= ENUMERATED +TelephonyCommunicationType ::= ENUMERATED { telephonyFixedCS(0), telephonyWirelessCS(1), @@ -623,7 +623,7 @@ TelephonyCommunicationType ::= ENUMERATED mMS(3) } -TelephonyBearerService ::= ENUMERATED +TelephonyBearerService ::= ENUMERATED { speech(0), data(1), @@ -699,7 +699,10 @@ MmsInformation ::= SEQUENCE delivery-copy(9), submission-rejection(10), submission-failure(11), - ... + ..., + delivered-application(12) + -- optional flag indicating MMS was retrieved using + -- something other than mobile deivce e.g. web browser } OPTIONAL, mmsNotifInd [3] BOOLEAN OPTIONAL, -- indication that a delivery notification has been generated @@ -854,7 +857,7 @@ TelephonyPartyRole ::= ENUMERATED originating-Party(0), terminating-Party(1), forwarded-to-Party(2), - originalCalled (3), + originalCalled(3), redirecting(4), connected(5), userProvidedCalling(6), @@ -878,7 +881,7 @@ TelephonyPartyRole ::= ENUMERATED TelephonyDevice ::= SEQUENCE { - deviceIDType [1] ENUMERATED + deviceIDType [1] ENUMERATED -- Type of identifier for telephony device { unknown(0), @@ -886,13 +889,13 @@ TelephonyDevice ::= SEQUENCE macAddress(2), ... } OPTIONAL, - telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, + telephonyDeviceID [2] TelephonyDeviceID OPTIONAL, -- Unique identifier for this telephony device according to type of identifier ..., - subscriberID [3] TelephonySubscriberId OPTIONAL, + subscriberID [3] TelephonySubscriberId OPTIONAL, -- Identifier for a known user of this equipment. -- Usage of this parameter is subject to national legislation. - nationalTelephonyDevice [4] NationalTelephonyDevice OPTIONAL + nationalTelephonyDevice [4] NationalTelephonyDevice OPTIONAL -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -914,12 +917,12 @@ TelephonyDeviceID ::= OCTET STRING TelephonyNetworkElement ::= SEQUENCE { - telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, - cellInformation [2] Location OPTIONAL, + telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, + cellInformation [2] Location OPTIONAL, -- The Location information id - validity [3] TimeSpan OPTIONAL, + validity [3] TimeSpan OPTIONAL, ..., - nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL + nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -942,9 +945,9 @@ Location ::= SEQUENCE { e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, -- Coded in the same format as the ISUP location number (parameter - -- field) of the ISUP (seeEN 300 356 [7]) + -- field) of the ISUP (see EN 300 356 [7]) globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, - -- See MAP format (seeTS GSM 09.02 [8]) + -- See MAP format (see 3GPP TS 09.02 [8]) rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with @@ -1084,8 +1087,8 @@ GeographicalCoordinates ::= SEQUENCE { latitudeSign [1] ENUMERATED { - north, - south + north(0), + south(1) } OPTIONAL, latitude [2] INTEGER (0..8388607) OPTIONAL, longitude [3] INTEGER (-8388608..8388607) OPTIONAL, @@ -1258,7 +1261,6 @@ MsgStoreOperation ::= SEQUENCE messageID [10] MessageID OPTIONAL } - MessageID ::= UTF8String -- Unique identifier for this message, e.g RFC 822 header @@ -1301,21 +1303,21 @@ NASubscriber ::= SEQUENCE NAServiceSubscription ::= SEQUENCE -- Description of the subscription to a Network Access service { - validity [1] TimeSpan OPTIONAL, - naServiceID [2] UTF8String OPTIONAL, + validity [1] TimeSpan OPTIONAL, + naServiceID [2] UTF8String OPTIONAL, -- Identifier for the service, e.g. account plan name. - naProviderID [3] NAProviderID OPTIONAL, + naProviderID [3] NAProviderID OPTIONAL, -- Unique identifier for the provider of the service, e.g. company name - naAuthID [4] NAAuthID OPTIONAL, + naAuthID [4] NAAuthID OPTIONAL, -- Unique identifier for this subscription, e.g. logon name - options [5] UTF8String OPTIONAL, + options [5] UTF8String OPTIONAL, -- Human readable text with restrictions or options to the subscription installationAddress [6] AddressInformation OPTIONAL, - fixIpAddress [7] IPAddress OPTIONAL, + fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address - imsi [8] IMSI OPTIONAL, + imsi [8] IMSI OPTIONAL, ..., - allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL + allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL } -- =========================================== @@ -1437,10 +1439,10 @@ NADevice ::= SEQUENCE } IMEI ::= OCTET STRING (SIZE(8)) - -- format as per TS GSM 09.02 [8Error! Reference source not found.] + -- format as per 3GPP TS 09.02 [8] IMSI ::= OCTET STRING (SIZE(3..8)) - -- format as per TS GSM 09.02 [8] + -- format as per 3GPP TS 09.02 [8] -- ====================================== -- Definitions of Message Network element @@ -1524,4 +1526,3 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage - diff --git a/102657/portal/TS 102 657, RDMessage, ver3 (MSC draft).xsd b/102657/portal/TS_102_657,_RDMessage,_ver4_(MSC_draft).xsd similarity index 99% rename from 102657/portal/TS 102 657, RDMessage, ver3 (MSC draft).xsd rename to 102657/portal/TS_102_657,_RDMessage,_ver4_(MSC_draft).xsd index 9eec441..519eb00 100644 --- a/102657/portal/TS 102 657, RDMessage, ver3 (MSC draft).xsd +++ b/102657/portal/TS_102_657,_RDMessage,_ver4_(MSC_draft).xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#21 (TS 102 657 v1.3.1) + XSD translated from ASN.1 derived from outcome of LI#22 (TS 102 657 v1.4.1) @@ -878,6 +878,7 @@ + -- GitLab From 1f6182b3219d041d27ea6af152557888e682b254 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:34 +0100 Subject: [PATCH 035/208] TS 102 232-5 v2.3.2 (2009-10-02) agreed at LI#22 (Trouville, 2009-09-22) --- 102232-5/IPMultimediaPDU.asn | 102 ++++++++++++++++++ ...ent_102232-5v232_IPMultimediaPDU,_ver3.txt | 102 ++++++++++++++++++ 2 files changed, 204 insertions(+) create mode 100644 102232-5/IPMultimediaPDU.asn create mode 100644 102232-5/portal/Attachment_102232-5v232_IPMultimediaPDU,_ver3.txt diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn new file mode 100644 index 0000000..6a1deef --- /dev/null +++ b/102232-5/IPMultimediaPDU.asn @@ -0,0 +1,102 @@ +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version3(3)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + -- from TS 101 671 [1] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + +-- Object Identifier Definition + +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version3(3) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version3(3) cC(2)} + -- both definitions relative to: + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- ===================================== +-- IP Multimedia Communications Contents +-- ===================================== + +IPMMCC ::= SEQUENCE +{ + iPMMCCObjId [0] RELATIVE-OID, + rTPCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP and RTCP packets + ..., + frameType [2] FrameType OPTIONAL, + -- The availability of header information shall be signalled with the frameType parameter + -- The module is defined as OPTIONAL because of backwards compatibility reasons + -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 + streamIdentifier [3] OCTET STRING OPTIONAL + -- Used to identify the media stream within the current CIN, typically in case of + -- multiple media streams communications + -- May be used to correlate each media stream with the relevant SDP media description of IRI + -- May contain c= and m= lines extracts for instance +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ... +} + +-- ======================================================== +-- Intercept-related information for IP Multimedia sessions +-- ======================================================== + +IPMMIRI ::= SEQUENCE +{ + iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIContents [1] IPIRIContents, + ... +} + +IPIRIContents ::= CHOICE +{ + originalIPMMMessage [0] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + sIPMessage [1] SIPMessage, + -- Copy of the SIP content and the source and destination IP address + h323Message [2] H323Message, + -- Copy of the H.323 content and the source and destination IP address + ... + +} + +SIPMessage ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + sIPContent [2] OCTET STRING, + ... +} + +H323Message ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + h323Content [2] H323MessageContent, + ... +} + +H323MessageContent ::= CHOICE +{ + h225CSMessageContent [0] OCTET STRING, + h225RASMessageContent [1] OCTET STRING, + h245MessageContent [2] OCTET STRING, + genericMessageContent [3] OCTET STRING, + ... +} + +END -- end of IP Multimedia PDU diff --git a/102232-5/portal/Attachment_102232-5v232_IPMultimediaPDU,_ver3.txt b/102232-5/portal/Attachment_102232-5v232_IPMultimediaPDU,_ver3.txt new file mode 100644 index 0000000..6a1deef --- /dev/null +++ b/102232-5/portal/Attachment_102232-5v232_IPMultimediaPDU,_ver3.txt @@ -0,0 +1,102 @@ +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version3(3)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + -- from TS 101 671 [1] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + +-- Object Identifier Definition + +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version3(3) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version3(3) cC(2)} + -- both definitions relative to: + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- ===================================== +-- IP Multimedia Communications Contents +-- ===================================== + +IPMMCC ::= SEQUENCE +{ + iPMMCCObjId [0] RELATIVE-OID, + rTPCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP and RTCP packets + ..., + frameType [2] FrameType OPTIONAL, + -- The availability of header information shall be signalled with the frameType parameter + -- The module is defined as OPTIONAL because of backwards compatibility reasons + -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 + streamIdentifier [3] OCTET STRING OPTIONAL + -- Used to identify the media stream within the current CIN, typically in case of + -- multiple media streams communications + -- May be used to correlate each media stream with the relevant SDP media description of IRI + -- May contain c= and m= lines extracts for instance +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ... +} + +-- ======================================================== +-- Intercept-related information for IP Multimedia sessions +-- ======================================================== + +IPMMIRI ::= SEQUENCE +{ + iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIContents [1] IPIRIContents, + ... +} + +IPIRIContents ::= CHOICE +{ + originalIPMMMessage [0] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + sIPMessage [1] SIPMessage, + -- Copy of the SIP content and the source and destination IP address + h323Message [2] H323Message, + -- Copy of the H.323 content and the source and destination IP address + ... + +} + +SIPMessage ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + sIPContent [2] OCTET STRING, + ... +} + +H323Message ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + h323Content [2] H323MessageContent, + ... +} + +H323MessageContent ::= CHOICE +{ + h225CSMessageContent [0] OCTET STRING, + h225RASMessageContent [1] OCTET STRING, + h245MessageContent [2] OCTET STRING, + genericMessageContent [3] OCTET STRING, + ... +} + +END -- end of IP Multimedia PDU -- GitLab From 4cb5d6590f5805b4c98aaa84c11b31060a3c1415 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:37 +0100 Subject: [PATCH 036/208] TS 102 232-2 v2.4.1 (2009-10-02) agreed at LI#22 (Trouville, 2009-09-22) --- 102232-2/EmailPDU.asn | 177 ++++++++++++++++++ ...Attachment_102232-2v241_EmailPDU,_ver4.txt | 177 ++++++++++++++++++ 2 files changed, 354 insertions(+) create mode 100644 102232-2/EmailPDU.asn create mode 100644 102232-2/portal/Attachment_102232-2v241_EmailPDU,_ver4.txt diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn new file mode 100644 index 0000000..e4d65ff --- /dev/null +++ b/102232-2/EmailPDU.asn @@ -0,0 +1,177 @@ +EmailPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version4(4)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + + -- from TS 101 671 [4] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version4(4) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version1(1) cC(2)} + -- definitions are relative to + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} + + +-- ============================= +-- Email Communications Contents +-- ============================= + +EmailCC ::= SEQUENCE + -- EmailCC is the PDU sent for each "piece" of E-mail captured content +{ + emailCCObjId [0] RELATIVE-OID, + email-Format [1] Email-Format, + content [2] OCTET STRING + -- Network byte order +} + +Email-Format ::= ENUMERATED +{ + ip-packet(1), + -- When this is the email format, the content will contain the bytes of the IP packet from + -- the IP header through to the end of the IP packet + -- Meets requirement E.2.7. + application(2) + -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) + -- Meets requirement E.2.8 +} + +-- ======================================= +-- Intercept-related information for Email +-- ======================================= + +EmailIRI ::= SEQUENCE + -- EmailIRI is the PDU sent for each "piece" of E-mail IRI +{ + emailIRIObjId [0] RELATIVE-OID, + eventType [1] E-mail-Event, + client-Address [2] IPAddress OPTIONAL, + -- Provided if available + server-Address [3] IPAddress OPTIONAL, + -- Provided if available + client-Port [4] INTEGER OPTIONAL, + -- Provided if available + server-Port [5] INTEGER OPTIONAL, + -- Provided if available + server-Octets-Sent [6] INTEGER, + client-Octets-Sent [7] INTEGER, + protocol-ID [8] E-mail-Protocol, + e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, + -- Not available in some cases; if a value is available, it must be provided + e-mail-Recipients [10] E-mail-Address-List OPTIONAL, + -- Not available in some cases; if a value is available, it must be provided + status [11] E-mail-Status, + total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, + message-ID [13] OCTET STRING OPTIONAL, + -- Network byte order + nationalParameter [14] OCTET STRING OPTIONAL, + -- Completely defined on a national basis, including byte ordering + ..., + national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, + -- Completely defined on a national basis + aAAInformation [16] AAAInformation OPTIONAL +} + +E-mail-Status ::= ENUMERATED +{ + status-unknown(1), + operation-failed(2), + operation-succeeded(3) +} + +E-mail-Event ::= ENUMERATED +{ + e-mail-send(1), + e-mail-receive(2), + e-mail-download(3), + ..., + e-mail-logon-attempt(4), + e-mail-logon(5), + e-mail-logon-failure(6), + e-mail-logoff(7), + e-mail-partial-download(8), + e-mail-upload(9) +} + +E-mail-Protocol ::= ENUMERATED +{ + smtp(1), + pop3(2), + undefined(255), + -- The protocol is not known or not representable by the current enumeration + ..., + imap4(3) +} + +E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) + +National-EM-ASN1parameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [12], + -- the country to which the parameters inserted after the extension marker apply + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...) +} + +AAAInformation ::= CHOICE + -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information +{ + pOP3AAAInformation [0] POP3AAAInformation, + aSMTPAAAInformation [1] ASMTPAAAInformation, + ... +} + +POP3AAAInformation ::= SEQUENCE + -- The POP3AAAInformation field contains the POP3 username & optionally the password +{ + username [0] UTF8String (SIZE (0..64)), + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + aAAResult [2] AAAResult OPTIONAL, + ... +} + +ASMTPAAAInformation ::= SEQUENCE + -- The ASMTPAAAInformation field contains the SMTP username and + -- optionally the authentication fields +{ + username [0] UTF8String (SIZE (0..64)), + authMethod [1] AAAauthMethod OPTIONAL, + -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc + challenge [2] OCTET STRING OPTIONAL, + -- A BASE64 encoded challenge send by the SMTP server + response [3] OCTET STRING OPTIONAL, + -- A BASE64 encoded hashed response returned by the client + aAAResult [4] AAAResult OPTIONAL, + ... +} + +AAAResult ::= ENUMERATED +{ + resultUnknown(1), + aAAFailed(2), + aAASucceeded(3), + ... +} + +AAAauthMethod ::= ENUMERATED +{ + undefinedAuthMethod(1), + cramMD5(2), + digestMD5(3), + ... +} + +END -- end of EmailPDU diff --git a/102232-2/portal/Attachment_102232-2v241_EmailPDU,_ver4.txt b/102232-2/portal/Attachment_102232-2v241_EmailPDU,_ver4.txt new file mode 100644 index 0000000..e4d65ff --- /dev/null +++ b/102232-2/portal/Attachment_102232-2v241_EmailPDU,_ver4.txt @@ -0,0 +1,177 @@ +EmailPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version4(4)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + + -- from TS 101 671 [4] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version4(4) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version1(1) cC(2)} + -- definitions are relative to + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} + + +-- ============================= +-- Email Communications Contents +-- ============================= + +EmailCC ::= SEQUENCE + -- EmailCC is the PDU sent for each "piece" of E-mail captured content +{ + emailCCObjId [0] RELATIVE-OID, + email-Format [1] Email-Format, + content [2] OCTET STRING + -- Network byte order +} + +Email-Format ::= ENUMERATED +{ + ip-packet(1), + -- When this is the email format, the content will contain the bytes of the IP packet from + -- the IP header through to the end of the IP packet + -- Meets requirement E.2.7. + application(2) + -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) + -- Meets requirement E.2.8 +} + +-- ======================================= +-- Intercept-related information for Email +-- ======================================= + +EmailIRI ::= SEQUENCE + -- EmailIRI is the PDU sent for each "piece" of E-mail IRI +{ + emailIRIObjId [0] RELATIVE-OID, + eventType [1] E-mail-Event, + client-Address [2] IPAddress OPTIONAL, + -- Provided if available + server-Address [3] IPAddress OPTIONAL, + -- Provided if available + client-Port [4] INTEGER OPTIONAL, + -- Provided if available + server-Port [5] INTEGER OPTIONAL, + -- Provided if available + server-Octets-Sent [6] INTEGER, + client-Octets-Sent [7] INTEGER, + protocol-ID [8] E-mail-Protocol, + e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, + -- Not available in some cases; if a value is available, it must be provided + e-mail-Recipients [10] E-mail-Address-List OPTIONAL, + -- Not available in some cases; if a value is available, it must be provided + status [11] E-mail-Status, + total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, + message-ID [13] OCTET STRING OPTIONAL, + -- Network byte order + nationalParameter [14] OCTET STRING OPTIONAL, + -- Completely defined on a national basis, including byte ordering + ..., + national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, + -- Completely defined on a national basis + aAAInformation [16] AAAInformation OPTIONAL +} + +E-mail-Status ::= ENUMERATED +{ + status-unknown(1), + operation-failed(2), + operation-succeeded(3) +} + +E-mail-Event ::= ENUMERATED +{ + e-mail-send(1), + e-mail-receive(2), + e-mail-download(3), + ..., + e-mail-logon-attempt(4), + e-mail-logon(5), + e-mail-logon-failure(6), + e-mail-logoff(7), + e-mail-partial-download(8), + e-mail-upload(9) +} + +E-mail-Protocol ::= ENUMERATED +{ + smtp(1), + pop3(2), + undefined(255), + -- The protocol is not known or not representable by the current enumeration + ..., + imap4(3) +} + +E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) + +National-EM-ASN1parameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [12], + -- the country to which the parameters inserted after the extension marker apply + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...) +} + +AAAInformation ::= CHOICE + -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information +{ + pOP3AAAInformation [0] POP3AAAInformation, + aSMTPAAAInformation [1] ASMTPAAAInformation, + ... +} + +POP3AAAInformation ::= SEQUENCE + -- The POP3AAAInformation field contains the POP3 username & optionally the password +{ + username [0] UTF8String (SIZE (0..64)), + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + aAAResult [2] AAAResult OPTIONAL, + ... +} + +ASMTPAAAInformation ::= SEQUENCE + -- The ASMTPAAAInformation field contains the SMTP username and + -- optionally the authentication fields +{ + username [0] UTF8String (SIZE (0..64)), + authMethod [1] AAAauthMethod OPTIONAL, + -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc + challenge [2] OCTET STRING OPTIONAL, + -- A BASE64 encoded challenge send by the SMTP server + response [3] OCTET STRING OPTIONAL, + -- A BASE64 encoded hashed response returned by the client + aAAResult [4] AAAResult OPTIONAL, + ... +} + +AAAResult ::= ENUMERATED +{ + resultUnknown(1), + aAAFailed(2), + aAASucceeded(3), + ... +} + +AAAauthMethod ::= ENUMERATED +{ + undefinedAuthMethod(1), + cramMD5(2), + digestMD5(3), + ... +} + +END -- end of EmailPDU -- GitLab From 26e968a2332de15826601b3603bf2ec369b86648 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:43 +0100 Subject: [PATCH 037/208] TS 102 657 v1.5.1 (2010-06-09) agreed at LI#23 (Roma, 2010-02-09) --- 102657/RDMessage.asn | 355 ++++++++++++++- 102657/RDMessage.xsd | 416 +++++++++++++++++- ...DMessage, ver4.txt => RDMessage, ver5.txt} | 355 ++++++++++++++- ...t).xsd => TS 102 657, RDMessage, ver5.xml} | 416 +++++++++++++++++- 4 files changed, 1524 insertions(+), 18 deletions(-) rename 102657/portal/{RDMessage, ver4.txt => RDMessage, ver5.txt} (81%) rename 102657/portal/{TS_102_657,_RDMessage,_ver4_(MSC_draft).xsd => TS 102 657, RDMessage, ver5.xml} (80%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index e505f92..68778fb 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version4(4)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version5(5)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version4(4)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version5(5)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -195,10 +195,15 @@ AdditionalInformation ::= SEQUENCE RetainedDataRecord ::= CHOICE { telephonyRecord [1] TelephonyRecord, + -- Details are defined in Annex B messageRecord [2] MessageRecord, + -- Details are defined in Annex C networkAccess [3] NetworkAccessRecord, - -- Other services will be included (like multimedia) as they are implemented - ... + -- Details are defined in Annex E + ..., + multimediaRecord [4] MultimediaRecord + -- Details are defined in Annex D + -- Other services will be included (as they are implemented) } ResponseAcknowledgement ::= CHOICE @@ -411,7 +416,7 @@ AuthenticationInfo ::= SEQUENCE TelephonyRecord ::= CHOICE { - telephonySubscriber [1] TelephonySubscriber, + telephonySubscriber [1] TelephonySubscriber, telephonyBillingDetails [2] TelephonyBillingDetails, telephonyServiceUsage [3] TelephonyServiceUsage, telephonyDevice [4] TelephonyDevice, @@ -922,9 +927,10 @@ TelephonyNetworkElement ::= SEQUENCE -- The Location information id validity [3] TimeSpan OPTIONAL, ..., - nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL + nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + transmitterDetails [5] TransmitterDetails OPTIONAL } NationalTelephonyNetworkElement ::= SEQUENCE @@ -937,6 +943,42 @@ NationalTelephonyNetworkElement ::= SEQUENCE TelephonyNetworkID ::= OCTET STRING -- Unique identifier for this network element: e.g. a Cell ID +TransmitterDetails ::= SEQUENCE +{ + alternativeID [1] UTF8String OPTIONAL, + -- For use by CSPs with an alternative naming scheme for cells + beamWidth [2] INTEGER OPTIONAL, + -- beam width in degrees + -- note that the beam bearing is given in the gsmLocation Azimuth field + radiatedPower [3] INTEGER OPTIONAL, + -- Effective radiated power in watts. + antennaHeight [4] INTEGER OPTIONAL, + -- Height of antenna from ground in metres + range [5] INTEGER OPTIONAL, + -- Indication of range or radius of cell or sector coverage, in metres + -- Precise definition is to be decided on a national basis (e.g. distance + -- at which some fixed percentage of calls are connected) + frequency [6] INTEGER OPTIONAL, + -- transmitter frequency in kHz + technology [7] TransmitterTechnology OPTIONAL, + nationalTransmitterDetails [8] NationalTransmitterDetails OPTIONAL, + ... +} + +TransmitterTechnology ::= ENUMERATED +{ + gen2G(0), + gen3G(1), + ... +} + +NationalTransmitterDetails ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + -- ==================== -- Location information -- ==================== @@ -1264,6 +1306,307 @@ MsgStoreOperation ::= SEQUENCE MessageID ::= UTF8String -- Unique identifier for this message, e.g RFC 822 header +MultimediaRecord ::= CHOICE +{ + multimediaSubscriber [1] MultimediaSubscriber, + multimediaBillingDetails [2] MultimediaBillingDetails, + multimediaServiceUsage [3] MultimediaServiceUsage, + ... +} + +-- ============================== +-- Definitions of Subscriber Data +-- ============================== + +MultimediaSubscriber ::= SEQUENCE +{ + subscriberID [1] MultimediaSubscriberID OPTIONAL, + -- unique identifier for this subscriber, e.g. account number + genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, + -- generic personal information about this subscriber + multimediaSubscriberInfo [3] MultimediaSubscriberInfo OPTIONAL, + -- service-specific information about this subscriber + subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, + -- a subscriber (or account) may have more than one service listed against them + ... +} + +MultimediaSubscriberInfo ::= SEQUENCE +{ + nationalMultimediaSubscriberInfo [1] NationalMultimediaSubscriberInfo OPTIONAL, + ... +} + +MultimediaSubscriberID ::= UTF8String + -- unique identifier for this subscriber, e.g. account number + +SubscribedMultimediaServices ::= SEQUENCE +{ + serviceID [1] UTF8String OPTIONAL, + -- Unique identifier for this service within the operator + providerID [2] UTF8String OPTIONAL, + -- Unique identifier for the service provider + timeSpan [3] TimeSpan OPTIONAL, + -- Start and end data, if applicable, of the subscription + registeredIdentifiers [4] SEQUENCE OF PartyIdentity OPTIONAL, + -- The set of identifiers registered for this service + registeredICCID [5] UTF8String OPTIONAL, + serviceType [6] MultimediaServiceType OPTIONAL, + installationAddress [7] AddressInformation OPTIONAL, + -- installation address, if different from the registered address + connectionDate [8] GeneralizedTime OPTIONAL, + -- Date the subscriber was actually connected + -- (May differ from the start of subscription) + iMSI [9] IMSI OPTIONAL, + carrierPreselect [10] BOOLEAN OPTIONAL, + lineStatus [11] UTF8String OPTIONAL, + -- CSP-specific description of current line status, + -- e.g. "Active", "Ceased", etc. + nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL, + -- national extension + ... +} + +MultimediaServiceType ::= ENUMERATED +{ + private(0), + privatePABX(1), + publicPayphone(2), + geographicalfixed(3), + geographicalindependent(4), + ... +} + +-- ================================= +-- Definitions of Service Usage Data +-- ================================= + +MultimediaServiceUsage ::= SEQUENCE +{ + partyInformation [1] SEQUENCE OF MultimediaPartyInformation OPTIONAL, + -- This parameter provides the concerned party (Originating, Terminating or + -- forwarded party), the identity(ies) of the party and all the information + -- provided by the party + communicationTime [2] TimeSpan OPTIONAL, + -- Time and duration of the communication + reasonCause [3] INTEGER OPTIONAL, + -- cause code for call termination e.g. SIP Reason code + communicationType [4] MultimediaCommunicationType OPTIONAL, + bearerService [5] MultimediaBearerService OPTIONAL, + qualityOfService [6] QualityOfService OPTIONAL, + ringDuration [7] INTEGER OPTIONAL, + callID [8] MultimediaCallID OPTIONAL, + originalCallID [9] MultimediaCallID OPTIONAL, + callState [10] ENUMERATED + { + bNotReached(1), + bAlert(2), + bAnswered(3), + ... + } OPTIONAL, + answerTime [11] GeneralizedTime OPTIONAL, + contentType [12] SEQUENCE OF UTF8String OPTIONAL, + mediaComponents [13] SEQUENCE OF MediaComponent OPTIONAL, + imsInformation [14] ImsInformation OPTIONAL, + nationalMultimediaServiceUsage [15] NationalMultimediaServiceUsage OPTIONAL, + serviceID [16] UTF8String OPTIONAL, + providerID [17] UTF8String OPTIONAL, + ... +} + +MultimediaPartyInformation ::= SEQUENCE +{ + partyRole [1] MultimediaPartyRole OPTIONAL, + partyIdentity [2] PartyIdentity OPTIONAL, + subscriberID [3] MultimediaSubscriberID OPTIONAL, + communicationTime [4] TimeSpan OPTIONAL, + -- Time and duration of the communication + iCCID [5] UTF8String OPTIONAL, + -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format + iMSI [6] IMSI OPTIONAL, + natureOfAddress [7] UTF8String OPTIONAL, + -- Nature of address indicator, e.g. "National", "International" + uRI [8] UTF8String OPTIONAL, + partyNumber [9] PartyNumber OPTIONAL, + naAssignedAddress [10] NAAssignedAddress OPTIONAL, + forwardedTransferredIdentifier [11] PartyIdentity OPTIONAL, + terminatingTransferredIdentifier [12] PartyIdentity OPTIONAL, + nationalMultimediaPartyInformation [13] NationalMultimediaPartyInformation OPTIONAL, + ... +} + +MultimediaCallID ::= UTF8String + +MultimediaCommunicationType ::= ENUMERATED +{ + multimediaFixed(0), + multimediaWireless(1), + multimediaNetworkIndependent(2), + ... +} + +MultimediaPartyRole ::= ENUMERATED +{ + calling(0), + called(1), + calledAssertedIdentity(2), + calledApplicationServer(3), + originalCalled(4), + redirecting(5), + multimediaNetworkIndependent(6), + directory(7), + broadcastReceiver(8), + broadcastSender(9), + ... +} + +MultimediaBearerService ::= ENUMERATED +{ + speech(0), + data(1), + fax(2), + video(3), + emergencyCall(4), + ... +} + +ImsInformation ::= SEQUENCE +{ + service [1] ENUMERATED + { + session(1), + message(2), + refer(3), + ... + } OPTIONAL, + roleOfNode [2] ENUMERATED + { + originating(1), + terminating(2), + proxy(3), + b2bua(4), + ... + } OPTIONAL, + serviceInfo [4] SEQUENCE OF ImsServiceInfo OPTIONAL, + ... +} + +ImsServiceInfo ::= SEQUENCE +{ + serviceData [1] OCTET STRING OPTIONAL, + -- service data + serviceType [2] INTEGER OPTIONAL, + -- service type + ... +} + +MediaComponent ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + mediaName [2] UTF8String OPTIONAL, + mediaDescription [3] UTF8String OPTIONAL, + mediaInitiator [4] PartyIdentity OPTIONAL, + accessCorrelationID [5] OCTET STRING OPTIONAL, + nationalMultimediaMediaComponent [6] NationalMultimediaMediaComponent OPTIONAL, + ... +} + +-- ============================== +-- Definitions of Billing Data +-- ============================== + +MultimediaBillingDetails ::= SEQUENCE +{ + subscriberID [1] MultimediaSubscriberID OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] MultimediaBillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF MultimediaBillingRecords OPTIONAL, + nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements + ... +} + +NationalMultimediaBillingDetails ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +MultimediaBillingIdentifier ::= OCTET STRING + -- Used to correlate billing information + -- useful if the bill-payer is not the subscriber, e.g. company mobiles + +MultimediaBillingRecords ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, + -- as per ISO 4217 [5] + method [5] UTF8String OPTIONAL, + -- i.e. credit card etc. + nationalMultimediaBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements + ... +} + +NationalMultimediaBillingRecords ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +-- =================== +-- General definitions +-- =================== + +PartyIdentity ::= UTF8String + -- E164 address of the node in international format, or + -- SIP URL or TEL URL as in ETSIEN300356[7] + + +QualityOfService ::= UTF8String + -- Free text description of the invoked quality of service + +NationalMultimediaSubscriberInfo ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +NationalMultimediaServices ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +NationalMultimediaServiceUsage ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +NationalMultimediaPartyInformation ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +NationalMultimediaMediaComponent ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 519eb00..d29fdce 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#22 (TS 102 657 v1.4.1) + XSD translated from ASN.1 derived from outcome of LI#23 (TS 102 657 v1.5.1) @@ -1254,6 +1254,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1635,6 +1671,7 @@ + @@ -1794,4 +1831,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/102657/portal/RDMessage, ver4.txt b/102657/portal/RDMessage, ver5.txt similarity index 81% rename from 102657/portal/RDMessage, ver4.txt rename to 102657/portal/RDMessage, ver5.txt index e505f92..68778fb 100644 --- a/102657/portal/RDMessage, ver4.txt +++ b/102657/portal/RDMessage, ver5.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version4(4)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version5(5)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version4(4)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version5(5)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -195,10 +195,15 @@ AdditionalInformation ::= SEQUENCE RetainedDataRecord ::= CHOICE { telephonyRecord [1] TelephonyRecord, + -- Details are defined in Annex B messageRecord [2] MessageRecord, + -- Details are defined in Annex C networkAccess [3] NetworkAccessRecord, - -- Other services will be included (like multimedia) as they are implemented - ... + -- Details are defined in Annex E + ..., + multimediaRecord [4] MultimediaRecord + -- Details are defined in Annex D + -- Other services will be included (as they are implemented) } ResponseAcknowledgement ::= CHOICE @@ -411,7 +416,7 @@ AuthenticationInfo ::= SEQUENCE TelephonyRecord ::= CHOICE { - telephonySubscriber [1] TelephonySubscriber, + telephonySubscriber [1] TelephonySubscriber, telephonyBillingDetails [2] TelephonyBillingDetails, telephonyServiceUsage [3] TelephonyServiceUsage, telephonyDevice [4] TelephonyDevice, @@ -922,9 +927,10 @@ TelephonyNetworkElement ::= SEQUENCE -- The Location information id validity [3] TimeSpan OPTIONAL, ..., - nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL + nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + transmitterDetails [5] TransmitterDetails OPTIONAL } NationalTelephonyNetworkElement ::= SEQUENCE @@ -937,6 +943,42 @@ NationalTelephonyNetworkElement ::= SEQUENCE TelephonyNetworkID ::= OCTET STRING -- Unique identifier for this network element: e.g. a Cell ID +TransmitterDetails ::= SEQUENCE +{ + alternativeID [1] UTF8String OPTIONAL, + -- For use by CSPs with an alternative naming scheme for cells + beamWidth [2] INTEGER OPTIONAL, + -- beam width in degrees + -- note that the beam bearing is given in the gsmLocation Azimuth field + radiatedPower [3] INTEGER OPTIONAL, + -- Effective radiated power in watts. + antennaHeight [4] INTEGER OPTIONAL, + -- Height of antenna from ground in metres + range [5] INTEGER OPTIONAL, + -- Indication of range or radius of cell or sector coverage, in metres + -- Precise definition is to be decided on a national basis (e.g. distance + -- at which some fixed percentage of calls are connected) + frequency [6] INTEGER OPTIONAL, + -- transmitter frequency in kHz + technology [7] TransmitterTechnology OPTIONAL, + nationalTransmitterDetails [8] NationalTransmitterDetails OPTIONAL, + ... +} + +TransmitterTechnology ::= ENUMERATED +{ + gen2G(0), + gen3G(1), + ... +} + +NationalTransmitterDetails ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + -- ==================== -- Location information -- ==================== @@ -1264,6 +1306,307 @@ MsgStoreOperation ::= SEQUENCE MessageID ::= UTF8String -- Unique identifier for this message, e.g RFC 822 header +MultimediaRecord ::= CHOICE +{ + multimediaSubscriber [1] MultimediaSubscriber, + multimediaBillingDetails [2] MultimediaBillingDetails, + multimediaServiceUsage [3] MultimediaServiceUsage, + ... +} + +-- ============================== +-- Definitions of Subscriber Data +-- ============================== + +MultimediaSubscriber ::= SEQUENCE +{ + subscriberID [1] MultimediaSubscriberID OPTIONAL, + -- unique identifier for this subscriber, e.g. account number + genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, + -- generic personal information about this subscriber + multimediaSubscriberInfo [3] MultimediaSubscriberInfo OPTIONAL, + -- service-specific information about this subscriber + subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, + -- a subscriber (or account) may have more than one service listed against them + ... +} + +MultimediaSubscriberInfo ::= SEQUENCE +{ + nationalMultimediaSubscriberInfo [1] NationalMultimediaSubscriberInfo OPTIONAL, + ... +} + +MultimediaSubscriberID ::= UTF8String + -- unique identifier for this subscriber, e.g. account number + +SubscribedMultimediaServices ::= SEQUENCE +{ + serviceID [1] UTF8String OPTIONAL, + -- Unique identifier for this service within the operator + providerID [2] UTF8String OPTIONAL, + -- Unique identifier for the service provider + timeSpan [3] TimeSpan OPTIONAL, + -- Start and end data, if applicable, of the subscription + registeredIdentifiers [4] SEQUENCE OF PartyIdentity OPTIONAL, + -- The set of identifiers registered for this service + registeredICCID [5] UTF8String OPTIONAL, + serviceType [6] MultimediaServiceType OPTIONAL, + installationAddress [7] AddressInformation OPTIONAL, + -- installation address, if different from the registered address + connectionDate [8] GeneralizedTime OPTIONAL, + -- Date the subscriber was actually connected + -- (May differ from the start of subscription) + iMSI [9] IMSI OPTIONAL, + carrierPreselect [10] BOOLEAN OPTIONAL, + lineStatus [11] UTF8String OPTIONAL, + -- CSP-specific description of current line status, + -- e.g. "Active", "Ceased", etc. + nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL, + -- national extension + ... +} + +MultimediaServiceType ::= ENUMERATED +{ + private(0), + privatePABX(1), + publicPayphone(2), + geographicalfixed(3), + geographicalindependent(4), + ... +} + +-- ================================= +-- Definitions of Service Usage Data +-- ================================= + +MultimediaServiceUsage ::= SEQUENCE +{ + partyInformation [1] SEQUENCE OF MultimediaPartyInformation OPTIONAL, + -- This parameter provides the concerned party (Originating, Terminating or + -- forwarded party), the identity(ies) of the party and all the information + -- provided by the party + communicationTime [2] TimeSpan OPTIONAL, + -- Time and duration of the communication + reasonCause [3] INTEGER OPTIONAL, + -- cause code for call termination e.g. SIP Reason code + communicationType [4] MultimediaCommunicationType OPTIONAL, + bearerService [5] MultimediaBearerService OPTIONAL, + qualityOfService [6] QualityOfService OPTIONAL, + ringDuration [7] INTEGER OPTIONAL, + callID [8] MultimediaCallID OPTIONAL, + originalCallID [9] MultimediaCallID OPTIONAL, + callState [10] ENUMERATED + { + bNotReached(1), + bAlert(2), + bAnswered(3), + ... + } OPTIONAL, + answerTime [11] GeneralizedTime OPTIONAL, + contentType [12] SEQUENCE OF UTF8String OPTIONAL, + mediaComponents [13] SEQUENCE OF MediaComponent OPTIONAL, + imsInformation [14] ImsInformation OPTIONAL, + nationalMultimediaServiceUsage [15] NationalMultimediaServiceUsage OPTIONAL, + serviceID [16] UTF8String OPTIONAL, + providerID [17] UTF8String OPTIONAL, + ... +} + +MultimediaPartyInformation ::= SEQUENCE +{ + partyRole [1] MultimediaPartyRole OPTIONAL, + partyIdentity [2] PartyIdentity OPTIONAL, + subscriberID [3] MultimediaSubscriberID OPTIONAL, + communicationTime [4] TimeSpan OPTIONAL, + -- Time and duration of the communication + iCCID [5] UTF8String OPTIONAL, + -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format + iMSI [6] IMSI OPTIONAL, + natureOfAddress [7] UTF8String OPTIONAL, + -- Nature of address indicator, e.g. "National", "International" + uRI [8] UTF8String OPTIONAL, + partyNumber [9] PartyNumber OPTIONAL, + naAssignedAddress [10] NAAssignedAddress OPTIONAL, + forwardedTransferredIdentifier [11] PartyIdentity OPTIONAL, + terminatingTransferredIdentifier [12] PartyIdentity OPTIONAL, + nationalMultimediaPartyInformation [13] NationalMultimediaPartyInformation OPTIONAL, + ... +} + +MultimediaCallID ::= UTF8String + +MultimediaCommunicationType ::= ENUMERATED +{ + multimediaFixed(0), + multimediaWireless(1), + multimediaNetworkIndependent(2), + ... +} + +MultimediaPartyRole ::= ENUMERATED +{ + calling(0), + called(1), + calledAssertedIdentity(2), + calledApplicationServer(3), + originalCalled(4), + redirecting(5), + multimediaNetworkIndependent(6), + directory(7), + broadcastReceiver(8), + broadcastSender(9), + ... +} + +MultimediaBearerService ::= ENUMERATED +{ + speech(0), + data(1), + fax(2), + video(3), + emergencyCall(4), + ... +} + +ImsInformation ::= SEQUENCE +{ + service [1] ENUMERATED + { + session(1), + message(2), + refer(3), + ... + } OPTIONAL, + roleOfNode [2] ENUMERATED + { + originating(1), + terminating(2), + proxy(3), + b2bua(4), + ... + } OPTIONAL, + serviceInfo [4] SEQUENCE OF ImsServiceInfo OPTIONAL, + ... +} + +ImsServiceInfo ::= SEQUENCE +{ + serviceData [1] OCTET STRING OPTIONAL, + -- service data + serviceType [2] INTEGER OPTIONAL, + -- service type + ... +} + +MediaComponent ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + mediaName [2] UTF8String OPTIONAL, + mediaDescription [3] UTF8String OPTIONAL, + mediaInitiator [4] PartyIdentity OPTIONAL, + accessCorrelationID [5] OCTET STRING OPTIONAL, + nationalMultimediaMediaComponent [6] NationalMultimediaMediaComponent OPTIONAL, + ... +} + +-- ============================== +-- Definitions of Billing Data +-- ============================== + +MultimediaBillingDetails ::= SEQUENCE +{ + subscriberID [1] MultimediaSubscriberID OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] MultimediaBillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF MultimediaBillingRecords OPTIONAL, + nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements + ... +} + +NationalMultimediaBillingDetails ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +MultimediaBillingIdentifier ::= OCTET STRING + -- Used to correlate billing information + -- useful if the bill-payer is not the subscriber, e.g. company mobiles + +MultimediaBillingRecords ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, + -- as per ISO 4217 [5] + method [5] UTF8String OPTIONAL, + -- i.e. credit card etc. + nationalMultimediaBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements + ... +} + +NationalMultimediaBillingRecords ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +-- =================== +-- General definitions +-- =================== + +PartyIdentity ::= UTF8String + -- E164 address of the node in international format, or + -- SIP URL or TEL URL as in ETSIEN300356[7] + + +QualityOfService ::= UTF8String + -- Free text description of the invoked quality of service + +NationalMultimediaSubscriberInfo ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +NationalMultimediaServices ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +NationalMultimediaServiceUsage ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +NationalMultimediaPartyInformation ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +NationalMultimediaMediaComponent ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, diff --git a/102657/portal/TS_102_657,_RDMessage,_ver4_(MSC_draft).xsd b/102657/portal/TS 102 657, RDMessage, ver5.xml similarity index 80% rename from 102657/portal/TS_102_657,_RDMessage,_ver4_(MSC_draft).xsd rename to 102657/portal/TS 102 657, RDMessage, ver5.xml index 519eb00..d29fdce 100644 --- a/102657/portal/TS_102_657,_RDMessage,_ver4_(MSC_draft).xsd +++ b/102657/portal/TS 102 657, RDMessage, ver5.xml @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#22 (TS 102 657 v1.4.1) + XSD translated from ASN.1 derived from outcome of LI#23 (TS 102 657 v1.5.1) @@ -1254,6 +1254,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1635,6 +1671,7 @@ + @@ -1794,4 +1831,377 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- GitLab From 25c3c952b379b86222952c12ec166b6cb2333ea1 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:46 +0100 Subject: [PATCH 038/208] TS 102 232-5 v2.4.1 (2010-04-07) agreed at LI#23 (Roma, 2010-02-09) --- 102232-5/IPMultimediaPDU.asn | 31 +++++++++++++++---- ...DU,_ver3.txt => IPMultimediaPDU, ver4.txt} | 31 +++++++++++++++---- 2 files changed, 50 insertions(+), 12 deletions(-) rename 102232-5/portal/{Attachment_102232-5v232_IPMultimediaPDU,_ver3.txt => IPMultimediaPDU, ver4.txt} (76%) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 6a1deef..f4d838e 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,5 +1,5 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version3(3)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version4(4)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -10,10 +10,12 @@ IMPORTS FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; +-- ============================ -- Object Identifier Definition +-- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version3(3) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version3(3) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version4(4) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version4(4) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -24,18 +26,23 @@ iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version3(3) cC(2)} IPMMCC ::= SEQUENCE { iPMMCCObjId [0] RELATIVE-OID, - rTPCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP and RTCP packets + mMCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP/RTCP or MSRP packets + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. ..., frameType [2] FrameType OPTIONAL, -- The availability of header information shall be signalled with the frameType parameter -- The module is defined as OPTIONAL because of backwards compatibility reasons -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 - streamIdentifier [3] OCTET STRING OPTIONAL + streamIdentifier [3] OCTET STRING OPTIONAL, -- Used to identify the media stream within the current CIN, typically in case of -- multiple media streams communications -- May be used to correlate each media stream with the relevant SDP media description of IRI -- May contain c= and m= lines extracts for instance + mMCCprotocol [4] MMCCprotocol OPTIONAL + -- Used to identify the protocol of packets sent in MMCCContent (RTP, MSRP, etc.) + -- Absence means mMCCContents contains RTP/RTCP packets } FrameType ::= ENUMERATED @@ -48,6 +55,17 @@ FrameType ::= ENUMERATED -- UDP and IP headers are missing audioFrame(3), -- All headers are missing + ..., + tcpFrame(4) + -- IP header is missing +} + +MMCCprotocol ::= ENUMERATED +{ + rTP(0), + -- mMCCContents parameter contains RTP/RTCP packets + mSRP(1), + -- mMCCContents parameter contains MSRP packets ... } @@ -100,3 +118,4 @@ H323MessageContent ::= CHOICE } END -- end of IP Multimedia PDU + diff --git a/102232-5/portal/Attachment_102232-5v232_IPMultimediaPDU,_ver3.txt b/102232-5/portal/IPMultimediaPDU, ver4.txt similarity index 76% rename from 102232-5/portal/Attachment_102232-5v232_IPMultimediaPDU,_ver3.txt rename to 102232-5/portal/IPMultimediaPDU, ver4.txt index 6a1deef..f4d838e 100644 --- a/102232-5/portal/Attachment_102232-5v232_IPMultimediaPDU,_ver3.txt +++ b/102232-5/portal/IPMultimediaPDU, ver4.txt @@ -1,5 +1,5 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version3(3)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version4(4)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -10,10 +10,12 @@ IMPORTS FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; +-- ============================ -- Object Identifier Definition +-- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version3(3) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version3(3) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version4(4) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version4(4) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -24,18 +26,23 @@ iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version3(3) cC(2)} IPMMCC ::= SEQUENCE { iPMMCCObjId [0] RELATIVE-OID, - rTPCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP and RTCP packets + mMCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP/RTCP or MSRP packets + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. ..., frameType [2] FrameType OPTIONAL, -- The availability of header information shall be signalled with the frameType parameter -- The module is defined as OPTIONAL because of backwards compatibility reasons -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 - streamIdentifier [3] OCTET STRING OPTIONAL + streamIdentifier [3] OCTET STRING OPTIONAL, -- Used to identify the media stream within the current CIN, typically in case of -- multiple media streams communications -- May be used to correlate each media stream with the relevant SDP media description of IRI -- May contain c= and m= lines extracts for instance + mMCCprotocol [4] MMCCprotocol OPTIONAL + -- Used to identify the protocol of packets sent in MMCCContent (RTP, MSRP, etc.) + -- Absence means mMCCContents contains RTP/RTCP packets } FrameType ::= ENUMERATED @@ -48,6 +55,17 @@ FrameType ::= ENUMERATED -- UDP and IP headers are missing audioFrame(3), -- All headers are missing + ..., + tcpFrame(4) + -- IP header is missing +} + +MMCCprotocol ::= ENUMERATED +{ + rTP(0), + -- mMCCContents parameter contains RTP/RTCP packets + mSRP(1), + -- mMCCContents parameter contains MSRP packets ... } @@ -100,3 +118,4 @@ H323MessageContent ::= CHOICE } END -- end of IP Multimedia PDU + -- GitLab From 373f9e441db353e44684f252e5f74eab1cbade47 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:50 +0100 Subject: [PATCH 039/208] TS 102 232-4 v2.2.1 (2010-04-07) agreed at LI#23 (Roma, 2010-02-09) --- 102232-4/L2AccessPDU.asn | 166 ++++++++++++++++++++++++++ 102232-4/portal/L2AccessPDU, ver4.txt | 166 ++++++++++++++++++++++++++ 2 files changed, 332 insertions(+) create mode 100644 102232-4/L2AccessPDU.asn create mode 100644 102232-4/portal/L2AccessPDU, ver4.txt diff --git a/102232-4/L2AccessPDU.asn b/102232-4/L2AccessPDU.asn new file mode 100644 index 0000000..c18be42 --- /dev/null +++ b/102232-4/L2AccessPDU.asn @@ -0,0 +1,166 @@ +L2AccessPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) +li-ps(5) l2Access(4) version4(4)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +-- ============================ +-- Object Identifier Definition +-- ============================ + +l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) iRI(1)} +l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) cC(2)} +l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) iRIOnly(3)} + -- all three definitions relative to {itu-t(0) identified-organization(4) + -- etsi(0) securityDomain(2) lawfulintercept(2)} + +-- ========================== +-- L2 Communications Contents +-- ========================== + +L2CC ::= SEQUENCE +{ + l2CCObjId [0] RELATIVE-OID, + l2CCContents [1] CHOICE + { + l2TP [1] OCTET STRING, + -- The L2TP protocol is used + l2F [2] OCTET STRING, + -- The L2F protocol is used + pPTP [3] OCTET STRING, + -- The PPTP protocol is used + pPP [4] OCTET STRING, + -- The PPP protocol is used + ethernet [5] OCTET STRING, + -- The ethernet protocol is used + ..., + l2ATM2684 [6] OCTET STRING + -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used + } +} + +-- =================================================== +-- Intercept-related information for general L2-Access +-- =================================================== + +L2IRI ::= SEQUENCE +{ + l2IRIObjId [0] RELATIVE-OID, + l2IRIContents [1] L2IRIContents, + ... +} + +L2IRIContents ::= SEQUENCE +{ + accessEventType [0] AccessEventType, + internetAccessType [2] InternetAccessType OPTIONAL, + targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, + -- Target network ID (e.g. MAC address, PSTN number) + targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, + -- CPEID (e.g. Relay Agent info, computer name) + targetLocation [7] UTF8String (SIZE (1..64))OPTIONAL, + -- + nASPortNumber [8] INTEGER (0..4294967295) OPTIONAL, + -- The NAS port number used by the target + callBackNumber [9] UTF8String (SIZE (1..20)) OPTIONAL, + -- The number used to call-back the target + startTime [10] GeneralizedTime OPTIONAL, + -- The start date-time of the session or lease + endTime [11] GeneralizedTime OPTIONAL, + -- The end date-time of the session or lease + endReason [12] EndReason OPTIONAL, + -- The reason for the session to end + octetsReceived [13] INTEGER (0..18446744073709551615) OPTIONAL, + -- The number of octets the target received + octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, + -- The number of octets the target transmitted + rawAAAData [15] OCTET STRING OPTIONAL + -- Content of the raw AAA record +} + +AccessEventType ::= ENUMERATED +{ + accessAttempt(0), + -- A target requests access to the IAS + accessAccept(1), + -- IAS access is granted to the target, the session begins + accessReject(2), + -- IAS access is refused to the target + accessFailed(3), + -- The Access_attempt timed-out or failed otherwise + sessionStart(4), + -- A target starts using the IAS; not in use anymore from version 4(4). + sessionEnd(5), + -- A target stops using the IAS; not in use anymore from version 4(4). + interimUpdate(6), + -- Intermediate status report on service status or usage + unknown(7), + ..., + startOfInterceptionWithSessionActive(8), + -- LI is started on a target who already has an active session + accessEnd(9) + -- A target stops using the IAS, the session ends. +} + +InternetAccessType ::= ENUMERATED +{ + undefined(0), + dialUp(1), + -- IAS via DialUp access + xDSL(2), + -- IAS via DSL access + cableModem(3), + -- IAS via Cable access + lAN(4), + -- IAS via LAN access + ... +} + +EndReason ::= ENUMERATED +{ + undefined(0), + regularLogoff(1), + -- The target logged off + connectionLoss(2), + -- The connection was lost + connectionTimeout(3), + -- The connection timed-out + leaseExpired(4), + -- The DHCP lease expired + ... +} + +-- ===================================================== +-- Intercept-related information for IRI-Only intercepts +-- ===================================================== + +L2IRIOnly ::= SEQUENCE +{ + l2IRIOnlyObjId [0] RELATIVE-OID, + l2protocolInformation [2] L2ProtocolInformation, + l2AggregatedNbrOfPackets [3] INTEGER OPTIONAL, + l2AggregatedNbrOfBytes [4] INTEGER OPTIONAL, + ... +} + +L2ProtocolInformation ::= ENUMERATED +{ + l2ProtocolL2tp(1), + -- The L2TP protocol is used + l2ProtocolL2f(2), + -- The L2F protocol is used + l2ProtocolPptp(3), + -- The PPTP protocol is used + l2ProtocolPpp(4), + -- The PPP protocol is used + ethernetProtocol(5), + -- The ethernet protocol is used + undefined(6), + ..., + l2ProtocolATM2684(7) + -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used +} + +END -- end of L2AccessPDU + diff --git a/102232-4/portal/L2AccessPDU, ver4.txt b/102232-4/portal/L2AccessPDU, ver4.txt new file mode 100644 index 0000000..c18be42 --- /dev/null +++ b/102232-4/portal/L2AccessPDU, ver4.txt @@ -0,0 +1,166 @@ +L2AccessPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) +li-ps(5) l2Access(4) version4(4)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +-- ============================ +-- Object Identifier Definition +-- ============================ + +l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) iRI(1)} +l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) cC(2)} +l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) iRIOnly(3)} + -- all three definitions relative to {itu-t(0) identified-organization(4) + -- etsi(0) securityDomain(2) lawfulintercept(2)} + +-- ========================== +-- L2 Communications Contents +-- ========================== + +L2CC ::= SEQUENCE +{ + l2CCObjId [0] RELATIVE-OID, + l2CCContents [1] CHOICE + { + l2TP [1] OCTET STRING, + -- The L2TP protocol is used + l2F [2] OCTET STRING, + -- The L2F protocol is used + pPTP [3] OCTET STRING, + -- The PPTP protocol is used + pPP [4] OCTET STRING, + -- The PPP protocol is used + ethernet [5] OCTET STRING, + -- The ethernet protocol is used + ..., + l2ATM2684 [6] OCTET STRING + -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used + } +} + +-- =================================================== +-- Intercept-related information for general L2-Access +-- =================================================== + +L2IRI ::= SEQUENCE +{ + l2IRIObjId [0] RELATIVE-OID, + l2IRIContents [1] L2IRIContents, + ... +} + +L2IRIContents ::= SEQUENCE +{ + accessEventType [0] AccessEventType, + internetAccessType [2] InternetAccessType OPTIONAL, + targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, + -- Target network ID (e.g. MAC address, PSTN number) + targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, + -- CPEID (e.g. Relay Agent info, computer name) + targetLocation [7] UTF8String (SIZE (1..64))OPTIONAL, + -- + nASPortNumber [8] INTEGER (0..4294967295) OPTIONAL, + -- The NAS port number used by the target + callBackNumber [9] UTF8String (SIZE (1..20)) OPTIONAL, + -- The number used to call-back the target + startTime [10] GeneralizedTime OPTIONAL, + -- The start date-time of the session or lease + endTime [11] GeneralizedTime OPTIONAL, + -- The end date-time of the session or lease + endReason [12] EndReason OPTIONAL, + -- The reason for the session to end + octetsReceived [13] INTEGER (0..18446744073709551615) OPTIONAL, + -- The number of octets the target received + octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, + -- The number of octets the target transmitted + rawAAAData [15] OCTET STRING OPTIONAL + -- Content of the raw AAA record +} + +AccessEventType ::= ENUMERATED +{ + accessAttempt(0), + -- A target requests access to the IAS + accessAccept(1), + -- IAS access is granted to the target, the session begins + accessReject(2), + -- IAS access is refused to the target + accessFailed(3), + -- The Access_attempt timed-out or failed otherwise + sessionStart(4), + -- A target starts using the IAS; not in use anymore from version 4(4). + sessionEnd(5), + -- A target stops using the IAS; not in use anymore from version 4(4). + interimUpdate(6), + -- Intermediate status report on service status or usage + unknown(7), + ..., + startOfInterceptionWithSessionActive(8), + -- LI is started on a target who already has an active session + accessEnd(9) + -- A target stops using the IAS, the session ends. +} + +InternetAccessType ::= ENUMERATED +{ + undefined(0), + dialUp(1), + -- IAS via DialUp access + xDSL(2), + -- IAS via DSL access + cableModem(3), + -- IAS via Cable access + lAN(4), + -- IAS via LAN access + ... +} + +EndReason ::= ENUMERATED +{ + undefined(0), + regularLogoff(1), + -- The target logged off + connectionLoss(2), + -- The connection was lost + connectionTimeout(3), + -- The connection timed-out + leaseExpired(4), + -- The DHCP lease expired + ... +} + +-- ===================================================== +-- Intercept-related information for IRI-Only intercepts +-- ===================================================== + +L2IRIOnly ::= SEQUENCE +{ + l2IRIOnlyObjId [0] RELATIVE-OID, + l2protocolInformation [2] L2ProtocolInformation, + l2AggregatedNbrOfPackets [3] INTEGER OPTIONAL, + l2AggregatedNbrOfBytes [4] INTEGER OPTIONAL, + ... +} + +L2ProtocolInformation ::= ENUMERATED +{ + l2ProtocolL2tp(1), + -- The L2TP protocol is used + l2ProtocolL2f(2), + -- The L2F protocol is used + l2ProtocolPptp(3), + -- The PPTP protocol is used + l2ProtocolPpp(4), + -- The PPP protocol is used + ethernetProtocol(5), + -- The ethernet protocol is used + undefined(6), + ..., + l2ProtocolATM2684(7) + -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used +} + +END -- end of L2AccessPDU + -- GitLab From cf380febe06c1e091ed58a4434a53c02c9cf172d Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:26:56 +0100 Subject: [PATCH 040/208] TS 102 657 v1.6.1 (2010-09-03) agreed at LI#24 (Aachen, 2010-06-15) --- 102657/RDMessage.asn | 91 ++++++++++++++++--- 102657/RDMessage.xsd | 86 +++++++++++++++++- ...RDMessage, ver5.txt => RDMessage,ver6.txt} | 91 ++++++++++++++++--- ...RDMessage, ver5.xml => RDMessage,ver6.xml} | 86 +++++++++++++++++- 4 files changed, 320 insertions(+), 34 deletions(-) rename 102657/portal/{RDMessage, ver5.txt => RDMessage,ver6.txt} (95%) rename 102657/portal/{TS 102 657, RDMessage, ver5.xml => RDMessage,ver6.xml} (96%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 68778fb..7062e5b 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version5(5)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version6(6)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version5(5)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version6(6)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -150,7 +150,7 @@ ResponseMessage ::= SEQUENCE responseStatus [1] ResponseStatus, responsePayload [2] SEQUENCE OF ResponseRecord OPTIONAL, -- Clause 6 explains use of this field - -- A responseUnavailable message shall not have a responsePayload (see clause 5.3.3) + -- A responseUnavailable message shall not have a responsePayload (see clause 5.3.1) -- The responseComplete and responseIncomplete message shall have a responsePayload -- If there are no responses, the responsePayload is present but has zero entries nationalResponsePayload [3] NationalResponsePayload OPTIONAL, @@ -166,7 +166,7 @@ ResponseStatus ::= CHOICE responseIncomplete [2] NULL, -- There may be further results to come responseUnavailable [3] NULL, - -- See clause 6.3.3 + -- See clause 5.3.1 responseFailed [4] FurtherInformation, -- See clauses 6.2.2.2 and 6.3.3.2 ... @@ -377,11 +377,13 @@ PersonName ::= SEQUENCE ContactDetails ::= SEQUENCE { - address [1] AddressInformation OPTIONAL, - emailAddress [2] UTF8String OPTIONAL, - contactNumber [3] SEQUENCE OF PartyNumber OPTIONAL, + address [1] AddressInformation OPTIONAL, + emailAddress [2] UTF8String OPTIONAL, + contactNumber [3] SEQUENCE OF PartyNumber OPTIONAL, -- several numbers (work, home, mobile) may be given for a single subscriber - ... + ..., + additionalEmailAddresses [4] SEQUENCE OF UTF8String OPTIONAL + -- several email addresses may be given for a single subscriber } AddressInformation ::= SEQUENCE @@ -413,10 +415,9 @@ AuthenticationInfo ::= SEQUENCE -- the number of the document used to authenticate ... } - TelephonyRecord ::= CHOICE { - telephonySubscriber [1] TelephonySubscriber, + telephonySubscriber [1] TelephonySubscriber, telephonyBillingDetails [2] TelephonyBillingDetails, telephonyServiceUsage [3] TelephonyServiceUsage, telephonyDevice [4] TelephonyDevice, @@ -1170,7 +1171,8 @@ MessageRecord ::= CHOICE { msgSubscriber [1] MsgSubscriber, msgServiceUsage [2] MsgServiceUsage, - ... + ..., + msgBillingDetails [3] MsgBillingDetails } -- ====================================== @@ -1306,6 +1308,56 @@ MsgStoreOperation ::= SEQUENCE MessageID ::= UTF8String -- Unique identifier for this message, e.g RFC 822 header +-- ============================== +-- Definitions of Billing Data +-- ============================== + +MsgBillingDetails ::= SEQUENCE +{ + subscriberID [1] MsgSubscriberID OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] MsgBillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF MsgBillingRecords OPTIONAL, + nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements + ... +} + +NationalMsgBillingDetails ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +MsgBillingIdentifier ::= OCTET STRING + -- Used to correlate billing information + -- useful if the bill-payer is not the subscriber, e.g. company mobiles + +MsgBillingRecords ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, + -- as per ISO 4217 [5] + method [5] UTF8String OPTIONAL, + -- i.e. credit card etc. + nationalMsgBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements + ... +} + +NationalMsgBillingRecords ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + MultimediaRecord ::= CHOICE { multimediaSubscriber [1] MultimediaSubscriber, @@ -1432,7 +1484,11 @@ MultimediaPartyInformation ::= SEQUENCE forwardedTransferredIdentifier [11] PartyIdentity OPTIONAL, terminatingTransferredIdentifier [12] PartyIdentity OPTIONAL, nationalMultimediaPartyInformation [13] NationalMultimediaPartyInformation OPTIONAL, - ... + ..., + userAgent [14] UTF8String OPTIONAL, + -- e.g. SIP User-Agent field (see RFC 3261 [26]) + octetsUploaded [15] INTEGER OPTIONAL, + octetsDownloaded [16] INTEGER OPTIONAL } MultimediaCallID ::= UTF8String @@ -1607,6 +1663,7 @@ NationalMultimediaMediaComponent ::= SEQUENCE -- see comment in NationalRequestParameters ... } + NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -1660,7 +1717,10 @@ NAServiceSubscription ::= SEQUENCE -- fix assigned IP address imsi [8] IMSI OPTIONAL, ..., - allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL + allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL, + naServiceStatus [10] UTF8String OPTIONAL, + -- CSP-specific description of current service status, e.g. Active, Ceased, etc. + registeredICCID [11] UTF8String OPTIONAL } -- =========================================== @@ -1744,8 +1804,10 @@ GprsInformation ::= SEQUENCE pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, -- format as per TS 101 671 [6] ..., - gPRSEvent [8] GPRSEvent OPTIONAL + gPRSEvent [8] GPRSEvent OPTIONAL, -- format as per 3GPP TS 33.108 [11] + iCCID [9] UTF8String OPTIONAL + -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format } GPRSEvent ::= ENUMERATED @@ -1869,3 +1931,4 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage + diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index d29fdce..cc1aea3 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#23 (TS 102 657 v1.5.1) + XSD translated from ASN.1 derived from outcome of LI#24 (TS 102 657 v1.6.1) @@ -508,6 +508,13 @@ + + + + + + + @@ -1450,10 +1457,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1475,6 +1549,8 @@ + + @@ -1565,6 +1641,7 @@ + @@ -1967,6 +2044,9 @@ + + + diff --git a/102657/portal/RDMessage, ver5.txt b/102657/portal/RDMessage,ver6.txt similarity index 95% rename from 102657/portal/RDMessage, ver5.txt rename to 102657/portal/RDMessage,ver6.txt index 68778fb..7062e5b 100644 --- a/102657/portal/RDMessage, ver5.txt +++ b/102657/portal/RDMessage,ver6.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version5(5)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version6(6)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version5(5)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version6(6)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -150,7 +150,7 @@ ResponseMessage ::= SEQUENCE responseStatus [1] ResponseStatus, responsePayload [2] SEQUENCE OF ResponseRecord OPTIONAL, -- Clause 6 explains use of this field - -- A responseUnavailable message shall not have a responsePayload (see clause 5.3.3) + -- A responseUnavailable message shall not have a responsePayload (see clause 5.3.1) -- The responseComplete and responseIncomplete message shall have a responsePayload -- If there are no responses, the responsePayload is present but has zero entries nationalResponsePayload [3] NationalResponsePayload OPTIONAL, @@ -166,7 +166,7 @@ ResponseStatus ::= CHOICE responseIncomplete [2] NULL, -- There may be further results to come responseUnavailable [3] NULL, - -- See clause 6.3.3 + -- See clause 5.3.1 responseFailed [4] FurtherInformation, -- See clauses 6.2.2.2 and 6.3.3.2 ... @@ -377,11 +377,13 @@ PersonName ::= SEQUENCE ContactDetails ::= SEQUENCE { - address [1] AddressInformation OPTIONAL, - emailAddress [2] UTF8String OPTIONAL, - contactNumber [3] SEQUENCE OF PartyNumber OPTIONAL, + address [1] AddressInformation OPTIONAL, + emailAddress [2] UTF8String OPTIONAL, + contactNumber [3] SEQUENCE OF PartyNumber OPTIONAL, -- several numbers (work, home, mobile) may be given for a single subscriber - ... + ..., + additionalEmailAddresses [4] SEQUENCE OF UTF8String OPTIONAL + -- several email addresses may be given for a single subscriber } AddressInformation ::= SEQUENCE @@ -413,10 +415,9 @@ AuthenticationInfo ::= SEQUENCE -- the number of the document used to authenticate ... } - TelephonyRecord ::= CHOICE { - telephonySubscriber [1] TelephonySubscriber, + telephonySubscriber [1] TelephonySubscriber, telephonyBillingDetails [2] TelephonyBillingDetails, telephonyServiceUsage [3] TelephonyServiceUsage, telephonyDevice [4] TelephonyDevice, @@ -1170,7 +1171,8 @@ MessageRecord ::= CHOICE { msgSubscriber [1] MsgSubscriber, msgServiceUsage [2] MsgServiceUsage, - ... + ..., + msgBillingDetails [3] MsgBillingDetails } -- ====================================== @@ -1306,6 +1308,56 @@ MsgStoreOperation ::= SEQUENCE MessageID ::= UTF8String -- Unique identifier for this message, e.g RFC 822 header +-- ============================== +-- Definitions of Billing Data +-- ============================== + +MsgBillingDetails ::= SEQUENCE +{ + subscriberID [1] MsgSubscriberID OPTIONAL, + serviceID [2] UTF8String OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + billingIdentifier [4] MsgBillingIdentifier OPTIONAL, + billingRecords [5] SEQUENCE OF MsgBillingRecords OPTIONAL, + nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements + ... +} + +NationalMsgBillingDetails ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +MsgBillingIdentifier ::= OCTET STRING + -- Used to correlate billing information + -- useful if the bill-payer is not the subscriber, e.g. company mobiles + +MsgBillingRecords ::= SEQUENCE +{ + time [1] GeneralizedTime OPTIONAL, + place [2] UTF8String OPTIONAL, + amount [3] REAL OPTIONAL, + currency [4] UTF8String (SIZE(3)) OPTIONAL, + -- as per ISO 4217 [5] + method [5] UTF8String OPTIONAL, + -- i.e. credit card etc. + nationalMsgBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements + ... +} + +NationalMsgBillingRecords ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + MultimediaRecord ::= CHOICE { multimediaSubscriber [1] MultimediaSubscriber, @@ -1432,7 +1484,11 @@ MultimediaPartyInformation ::= SEQUENCE forwardedTransferredIdentifier [11] PartyIdentity OPTIONAL, terminatingTransferredIdentifier [12] PartyIdentity OPTIONAL, nationalMultimediaPartyInformation [13] NationalMultimediaPartyInformation OPTIONAL, - ... + ..., + userAgent [14] UTF8String OPTIONAL, + -- e.g. SIP User-Agent field (see RFC 3261 [26]) + octetsUploaded [15] INTEGER OPTIONAL, + octetsDownloaded [16] INTEGER OPTIONAL } MultimediaCallID ::= UTF8String @@ -1607,6 +1663,7 @@ NationalMultimediaMediaComponent ::= SEQUENCE -- see comment in NationalRequestParameters ... } + NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -1660,7 +1717,10 @@ NAServiceSubscription ::= SEQUENCE -- fix assigned IP address imsi [8] IMSI OPTIONAL, ..., - allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL + allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL, + naServiceStatus [10] UTF8String OPTIONAL, + -- CSP-specific description of current service status, e.g. Active, Ceased, etc. + registeredICCID [11] UTF8String OPTIONAL } -- =========================================== @@ -1744,8 +1804,10 @@ GprsInformation ::= SEQUENCE pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, -- format as per TS 101 671 [6] ..., - gPRSEvent [8] GPRSEvent OPTIONAL + gPRSEvent [8] GPRSEvent OPTIONAL, -- format as per 3GPP TS 33.108 [11] + iCCID [9] UTF8String OPTIONAL + -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format } GPRSEvent ::= ENUMERATED @@ -1869,3 +1931,4 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage + diff --git a/102657/portal/TS 102 657, RDMessage, ver5.xml b/102657/portal/RDMessage,ver6.xml similarity index 96% rename from 102657/portal/TS 102 657, RDMessage, ver5.xml rename to 102657/portal/RDMessage,ver6.xml index d29fdce..cc1aea3 100644 --- a/102657/portal/TS 102 657, RDMessage, ver5.xml +++ b/102657/portal/RDMessage,ver6.xml @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#23 (TS 102 657 v1.5.1) + XSD translated from ASN.1 derived from outcome of LI#24 (TS 102 657 v1.6.1) @@ -508,6 +508,13 @@ + + + + + + + @@ -1450,10 +1457,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1475,6 +1549,8 @@ + + @@ -1565,6 +1641,7 @@ + @@ -1967,6 +2044,9 @@ + + + -- GitLab From 0386343f9f84be20dc97eb2c3471896c0512bd8d Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:06 +0100 Subject: [PATCH 041/208] TS 102 232-4 v2.3.1 (2010-08-27) agreed at LI#24 (Aachen, 2010-06-15) --- 102232-4/L2AccessPDU.asn | 36 ++++++++++++------- ...cessPDU, ver4.txt => L2AccessPDU,ver5.txt} | 36 ++++++++++++------- 2 files changed, 46 insertions(+), 26 deletions(-) rename 102232-4/portal/{L2AccessPDU, ver4.txt => L2AccessPDU,ver5.txt} (82%) diff --git a/102232-4/L2AccessPDU.asn b/102232-4/L2AccessPDU.asn index c18be42..0920565 100644 --- a/102232-4/L2AccessPDU.asn +++ b/102232-4/L2AccessPDU.asn @@ -1,6 +1,6 @@ L2AccessPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) -li-ps(5) l2Access(4) version4(4)} +li-ps(5) l2Access(4) version5(5)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,9 +9,9 @@ BEGIN -- Object Identifier Definition -- ============================ -l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) iRI(1)} -l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) cC(2)} -l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) iRIOnly(3)} +l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRI(1)} +l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) cC(2)} +l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -26,16 +26,16 @@ L2CC ::= SEQUENCE { l2TP [1] OCTET STRING, -- The L2TP protocol is used - l2F [2] OCTET STRING, + l2F [2] OCTET STRING, -- The L2F protocol is used pPTP [3] OCTET STRING, -- The PPTP protocol is used - pPP [4] OCTET STRING, + pPP [4] OCTET STRING, -- The PPP protocol is used ethernet [5] OCTET STRING, -- The ethernet protocol is used ..., - l2ATM2684 [6] OCTET STRING + l2ATM2684 [6] OCTET STRING -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used } } @@ -53,9 +53,9 @@ L2IRI ::= SEQUENCE L2IRIContents ::= SEQUENCE { - accessEventType [0] AccessEventType, - internetAccessType [2] InternetAccessType OPTIONAL, - targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, + accessEventType [0] AccessEventType, + internetAccessType [2] InternetAccessType OPTIONAL, + targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, -- Target network ID (e.g. MAC address, PSTN number) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, -- CPEID (e.g. Relay Agent info, computer name) @@ -114,7 +114,16 @@ InternetAccessType ::= ENUMERATED -- IAS via Cable access lAN(4), -- IAS via LAN access - ... + ..., + wirelessLAN(5), + -- IAS via Wireless LAN access + fTTx(6), + -- IAS via Fiber access + wIMAX-HIPERMAN(7), + -- IAS via WIMAX/HIPERMAN (fixed access) + satellite(8) + -- IAS via Satellite access + -- (when it is not covered by any 3GPP or ETSI mobile Lawful Interception specifications) } EndReason ::= ENUMERATED @@ -158,9 +167,10 @@ L2ProtocolInformation ::= ENUMERATED -- The ethernet protocol is used undefined(6), ..., - l2ProtocolATM2684(7) + l2ProtocolATM2684(7), -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used + l2ProtocolFR2427(8) + -- The protocol RFC2427 Multiprotocol Interconnect over Frame Relay [18] is used } END -- end of L2AccessPDU - diff --git a/102232-4/portal/L2AccessPDU, ver4.txt b/102232-4/portal/L2AccessPDU,ver5.txt similarity index 82% rename from 102232-4/portal/L2AccessPDU, ver4.txt rename to 102232-4/portal/L2AccessPDU,ver5.txt index c18be42..0920565 100644 --- a/102232-4/portal/L2AccessPDU, ver4.txt +++ b/102232-4/portal/L2AccessPDU,ver5.txt @@ -1,6 +1,6 @@ L2AccessPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) -li-ps(5) l2Access(4) version4(4)} +li-ps(5) l2Access(4) version5(5)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,9 +9,9 @@ BEGIN -- Object Identifier Definition -- ============================ -l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) iRI(1)} -l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) cC(2)} -l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version4(4) iRIOnly(3)} +l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRI(1)} +l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) cC(2)} +l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -26,16 +26,16 @@ L2CC ::= SEQUENCE { l2TP [1] OCTET STRING, -- The L2TP protocol is used - l2F [2] OCTET STRING, + l2F [2] OCTET STRING, -- The L2F protocol is used pPTP [3] OCTET STRING, -- The PPTP protocol is used - pPP [4] OCTET STRING, + pPP [4] OCTET STRING, -- The PPP protocol is used ethernet [5] OCTET STRING, -- The ethernet protocol is used ..., - l2ATM2684 [6] OCTET STRING + l2ATM2684 [6] OCTET STRING -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used } } @@ -53,9 +53,9 @@ L2IRI ::= SEQUENCE L2IRIContents ::= SEQUENCE { - accessEventType [0] AccessEventType, - internetAccessType [2] InternetAccessType OPTIONAL, - targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, + accessEventType [0] AccessEventType, + internetAccessType [2] InternetAccessType OPTIONAL, + targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, -- Target network ID (e.g. MAC address, PSTN number) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, -- CPEID (e.g. Relay Agent info, computer name) @@ -114,7 +114,16 @@ InternetAccessType ::= ENUMERATED -- IAS via Cable access lAN(4), -- IAS via LAN access - ... + ..., + wirelessLAN(5), + -- IAS via Wireless LAN access + fTTx(6), + -- IAS via Fiber access + wIMAX-HIPERMAN(7), + -- IAS via WIMAX/HIPERMAN (fixed access) + satellite(8) + -- IAS via Satellite access + -- (when it is not covered by any 3GPP or ETSI mobile Lawful Interception specifications) } EndReason ::= ENUMERATED @@ -158,9 +167,10 @@ L2ProtocolInformation ::= ENUMERATED -- The ethernet protocol is used undefined(6), ..., - l2ProtocolATM2684(7) + l2ProtocolATM2684(7), -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used + l2ProtocolFR2427(8) + -- The protocol RFC2427 Multiprotocol Interconnect over Frame Relay [18] is used } END -- end of L2AccessPDU - -- GitLab From 2a9c8add189e16e9a98244da0165c643f6d9a002 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:09 +0100 Subject: [PATCH 042/208] TS 102 232-2 v2.5.1 (2010-08-10) agreed at LI#24 (Aachen, 2010-06-15) --- 102232-2/EmailPDU.asn | 20 ++++++++++++++----- ...1_EmailPDU,_ver4.txt => EmailPDU,ver5.txt} | 20 ++++++++++++++----- 2 files changed, 30 insertions(+), 10 deletions(-) rename 102232-2/portal/{Attachment_102232-2v241_EmailPDU,_ver4.txt => EmailPDU,ver5.txt} (89%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index e4d65ff..95a01f9 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version4(4)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version5(5)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,15 +9,15 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version12(12)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version4(4) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version1(1) cC(2)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version5(5) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version5(5) cC(2)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -131,7 +131,8 @@ AAAInformation ::= CHOICE { pOP3AAAInformation [0] POP3AAAInformation, aSMTPAAAInformation [1] ASMTPAAAInformation, - ... + ..., + iMAPAAAInformation [2] IMAPAAAInformation } POP3AAAInformation ::= SEQUENCE @@ -158,6 +159,15 @@ ASMTPAAAInformation ::= SEQUENCE ... } +IMAPAAAInformation ::= SEQUENCE + --- The iMAPAAAInformation field contains the IMAP username & optionally the password +{ + username [0] UTF8String (SIZE (0..64)), + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + aAAResult [2] AAAResult OPTIONAL, + ... +} + AAAResult ::= ENUMERATED { resultUnknown(1), diff --git a/102232-2/portal/Attachment_102232-2v241_EmailPDU,_ver4.txt b/102232-2/portal/EmailPDU,ver5.txt similarity index 89% rename from 102232-2/portal/Attachment_102232-2v241_EmailPDU,_ver4.txt rename to 102232-2/portal/EmailPDU,ver5.txt index e4d65ff..95a01f9 100644 --- a/102232-2/portal/Attachment_102232-2v241_EmailPDU,_ver4.txt +++ b/102232-2/portal/EmailPDU,ver5.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version4(4)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version5(5)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,15 +9,15 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version12(12)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version4(4) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version1(1) cC(2)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version5(5) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version5(5) cC(2)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -131,7 +131,8 @@ AAAInformation ::= CHOICE { pOP3AAAInformation [0] POP3AAAInformation, aSMTPAAAInformation [1] ASMTPAAAInformation, - ... + ..., + iMAPAAAInformation [2] IMAPAAAInformation } POP3AAAInformation ::= SEQUENCE @@ -158,6 +159,15 @@ ASMTPAAAInformation ::= SEQUENCE ... } +IMAPAAAInformation ::= SEQUENCE + --- The iMAPAAAInformation field contains the IMAP username & optionally the password +{ + username [0] UTF8String (SIZE (0..64)), + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + aAAResult [2] AAAResult OPTIONAL, + ... +} + AAAResult ::= ENUMERATED { resultUnknown(1), -- GitLab From d6d3cd7bf4001b376637f62d8b2997e96548848d Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:12 +0100 Subject: [PATCH 043/208] TS 102 232-1 v2.5.1 (2010-08-27) agreed at LI#24 (Aachen, 2010-06-15) --- 102232-1/LI-PS-PDU.asn | 16 ++++++++-------- ...-PS-PDU ver9_Ralf.txt => LI-PS-PDU,ver10.txt} | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) rename 102232-1/portal/{LI-PS-PDU ver9_Ralf.txt => LI-PS-PDU,ver10.txt} (96%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 426c94b..55fb387 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,4 +1,5 @@ -LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version9(9)} +LI-PS-PDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version10(10)} DEFINITIONS IMPLICIT TAGS ::= @@ -13,7 +14,7 @@ IMPORTS IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version12(12)} -- from TS 101 671 [4] HI1-Operation @@ -24,27 +25,27 @@ IMPORTS EmailCC, EmailIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version4(4)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version5(5)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version5(5)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version6(6)} -- from TS 102 232-04 [32] L2CC, L2IRI, L2IRIOnly FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version4(4)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version5(5)} -- from TS 102 232-05 [37] IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version3(3)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version4(4)} -- from TS 102 232-06 [36] PstnIsdnCC, @@ -91,7 +92,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version9(9)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version10(10)} -- ==================== -- Top-level definition @@ -402,4 +403,3 @@ EncryptedPayload ::= SEQUENCE } END -- end of LI-PS-PDU - diff --git a/102232-1/portal/LI-PS-PDU ver9_Ralf.txt b/102232-1/portal/LI-PS-PDU,ver10.txt similarity index 96% rename from 102232-1/portal/LI-PS-PDU ver9_Ralf.txt rename to 102232-1/portal/LI-PS-PDU,ver10.txt index 426c94b..55fb387 100644 --- a/102232-1/portal/LI-PS-PDU ver9_Ralf.txt +++ b/102232-1/portal/LI-PS-PDU,ver10.txt @@ -1,4 +1,5 @@ -LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version9(9)} +LI-PS-PDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version10(10)} DEFINITIONS IMPLICIT TAGS ::= @@ -13,7 +14,7 @@ IMPORTS IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version12(12)} -- from TS 101 671 [4] HI1-Operation @@ -24,27 +25,27 @@ IMPORTS EmailCC, EmailIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version4(4)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version5(5)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version5(5)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version6(6)} -- from TS 102 232-04 [32] L2CC, L2IRI, L2IRIOnly FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version4(4)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version5(5)} -- from TS 102 232-05 [37] IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version3(3)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version4(4)} -- from TS 102 232-06 [36] PstnIsdnCC, @@ -91,7 +92,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version9(9)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version10(10)} -- ==================== -- Top-level definition @@ -402,4 +403,3 @@ EncryptedPayload ::= SEQUENCE } END -- end of LI-PS-PDU - -- GitLab From c8fbf32da440a47735ce80ba3dc84559a979f2bc Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:17 +0100 Subject: [PATCH 044/208] TS 102 657 v1.7.1 (2010-10-11) agreed at LI#25 (Saint Petersburg, 2010-09-21) --- 102657/RDMessage.asn | 97 ++++++++++++++++--- 102657/RDMessage.xsd | 83 +++++++++++++++- ...{RDMessage,ver6.txt => RDMessage,ver7.txt} | 97 ++++++++++++++++--- ...{RDMessage,ver6.xml => RDMessage,ver7.xml} | 83 +++++++++++++++- 4 files changed, 324 insertions(+), 36 deletions(-) rename 102657/portal/{RDMessage,ver6.txt => RDMessage,ver7.txt} (96%) rename 102657/portal/{RDMessage,ver6.xml => RDMessage,ver7.xml} (96%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 7062e5b..b7784e3 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version6(6)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version7(7)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version6(6)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version7(7)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -307,7 +307,6 @@ NationalRecordPayload ::= SEQUENCE -- see comment in NationalRequestParameters ... } - TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -351,8 +350,8 @@ IndividualInfo ::= SEQUENCE ... } OPTIONAL, identificationNumber [5] UTF8String OPTIONAL, - authenticationInfo [6] AuthenticationInfo OPTIONAL, - ... + authenticationInfo [6] AuthenticationInfo OPTIONAL, ..., + profession [7] UTF8String OPTIONAL } PersonName ::= SEQUENCE @@ -530,9 +529,15 @@ BillingRecords ::= SEQUENCE method [5] UTF8String OPTIONAL, -- i.e. credit card etc. ..., - nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL + nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + transactionID [7] UTF8String OPTIONAL, + -- Unique reference for this transaction/billing record + -- Details to be defined on a national basis + transactionStatus [8] UTF8String OPTIONAL + -- Status of the transaction (i.e. declined, succeeded etc.) + -- Details to be defined on a national bases } NationalTelephonyBillingRecords ::= SEQUENCE @@ -775,7 +780,7 @@ BasicEventType ::= ENUMERATED tpyInvoke(16), tpyPrivateComm(17), serviceActivation(18), - transit(19), + transit(19), mSOriginating(20), callForwarding(21), mSTerminating(22), @@ -991,7 +996,6 @@ Location ::= SEQUENCE -- field) of the ISUP (see EN 300 356 [7]) globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, -- See MAP format (see 3GPP TS 09.02 [8]) - rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the @@ -1009,7 +1013,8 @@ Location ::= SEQUENCE -- (only the last 6 octets are used) -- This parameter is duplicated from 3GPP TS 33.108 [11] ..., - postalLocation [8] AddressInformation OPTIONAL + postalLocation [8] AddressInformation OPTIONAL, + extendedLocation [9] ExtendedLocation OPTIONAL } GSMLocation ::= CHOICE @@ -1115,7 +1120,9 @@ MapDatum ::= ENUMERATED tM65(11), iTM(12), -- Irish Transverse Mercator - ... + ..., + cH1903(13) + -- Swiss reference system } UMTSLocation ::= CHOICE @@ -1160,6 +1167,45 @@ GA-Polygon-Elements ::= SEQUENCE ... } +ExtendedLocation ::= CHOICE +{ + spot [1] Spot, + circle [2] Circle, + region [3] Region, + route [4] Route, + ... +} + +Spot ::= CHOICE +{ + gsmLocation [1] GSMLocation, + postalLocation [2] AddressInformation, + ... +} + +Circle ::= SEQUENCE +{ + centre [1] Spot, + radius [2] HorizontalExtent, + ... +} + +Region ::= SEQUENCE +{ + cornerMarks [1] SEQUENCE OF Spot, + ... +} + +Route ::= SEQUENCE +{ + routeMarks [1] SEQUENCE OF Spot, + width [2] HorizontalExtent OPTIONAL, + ... +} + +HorizontalExtent ::= INTEGER + -- metres + -- =================== -- General definitions -- =================== @@ -1345,10 +1391,16 @@ MsgBillingRecords ::= SEQUENCE -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, -- i.e. credit card etc. - nationalMsgBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, + nationalMsgBillingRecords [6] NationalMsgBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - ... + ..., + msgTransactionID [7] UTF8String OPTIONAL, + -- Unique reference for this transaction/billing record + -- Details to be defined on a national basis + mgsTransactionStatus [8] UTF8String OPTIONAL + -- Status of the transaction (i.e. declined, succeeded etc.) + -- Details to be defined on a national bases } NationalMsgBillingRecords ::= SEQUENCE @@ -1607,7 +1659,13 @@ MultimediaBillingRecords ::= SEQUENCE nationalMultimediaBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - ... + ... , + multimediaTransactionID [7] UTF8String OPTIONAL, + -- Unique reference for this transaction/billing record + -- Details to be defined on a national basis + multimediaTransactionStatus [8] UTF8String OPTIONAL + -- Status of the transaction (i.e. declined, succeeded etc.) + -- Details to be defined on a national bases } NationalMultimediaBillingRecords ::= SEQUENCE @@ -1719,8 +1777,17 @@ NAServiceSubscription ::= SEQUENCE ..., allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL, naServiceStatus [10] UTF8String OPTIONAL, - -- CSP-specific description of current service status, e.g. Active, Ceased, etc. - registeredICCID [11] UTF8String OPTIONAL + -- CSP-specific description of current service status, e.g. "Active", "Ceased", etc. + registeredICCID [11] UTF8String OPTIONAL, + nationalNASubscription [12] NationalNASubscription OPTIONAL +} + +NationalNASubscription ::= SEQUENCE + -- Description of the subscription to a Network Access service +{ + countryCode [1] UTF8String (SIZE(2)), + -- see comment in NationalRequestParameters + ... } -- =========================================== diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index cc1aea3..61dc0f9 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#24 (TS 102 657 v1.6.1) + XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.7.1) @@ -274,6 +274,7 @@ + @@ -566,6 +567,7 @@ + @@ -669,6 +671,8 @@ + + @@ -1251,9 +1255,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1471,6 +1530,8 @@ + + @@ -1551,6 +1612,20 @@ + + + + + + + + + + + + + + @@ -2194,6 +2269,8 @@ + + diff --git a/102657/portal/RDMessage,ver6.txt b/102657/portal/RDMessage,ver7.txt similarity index 96% rename from 102657/portal/RDMessage,ver6.txt rename to 102657/portal/RDMessage,ver7.txt index 7062e5b..b7784e3 100644 --- a/102657/portal/RDMessage,ver6.txt +++ b/102657/portal/RDMessage,ver7.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version6(6)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version7(7)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version6(6)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version7(7)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -307,7 +307,6 @@ NationalRecordPayload ::= SEQUENCE -- see comment in NationalRequestParameters ... } - TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -351,8 +350,8 @@ IndividualInfo ::= SEQUENCE ... } OPTIONAL, identificationNumber [5] UTF8String OPTIONAL, - authenticationInfo [6] AuthenticationInfo OPTIONAL, - ... + authenticationInfo [6] AuthenticationInfo OPTIONAL, ..., + profession [7] UTF8String OPTIONAL } PersonName ::= SEQUENCE @@ -530,9 +529,15 @@ BillingRecords ::= SEQUENCE method [5] UTF8String OPTIONAL, -- i.e. credit card etc. ..., - nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL + nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + transactionID [7] UTF8String OPTIONAL, + -- Unique reference for this transaction/billing record + -- Details to be defined on a national basis + transactionStatus [8] UTF8String OPTIONAL + -- Status of the transaction (i.e. declined, succeeded etc.) + -- Details to be defined on a national bases } NationalTelephonyBillingRecords ::= SEQUENCE @@ -775,7 +780,7 @@ BasicEventType ::= ENUMERATED tpyInvoke(16), tpyPrivateComm(17), serviceActivation(18), - transit(19), + transit(19), mSOriginating(20), callForwarding(21), mSTerminating(22), @@ -991,7 +996,6 @@ Location ::= SEQUENCE -- field) of the ISUP (see EN 300 356 [7]) globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, -- See MAP format (see 3GPP TS 09.02 [8]) - rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the @@ -1009,7 +1013,8 @@ Location ::= SEQUENCE -- (only the last 6 octets are used) -- This parameter is duplicated from 3GPP TS 33.108 [11] ..., - postalLocation [8] AddressInformation OPTIONAL + postalLocation [8] AddressInformation OPTIONAL, + extendedLocation [9] ExtendedLocation OPTIONAL } GSMLocation ::= CHOICE @@ -1115,7 +1120,9 @@ MapDatum ::= ENUMERATED tM65(11), iTM(12), -- Irish Transverse Mercator - ... + ..., + cH1903(13) + -- Swiss reference system } UMTSLocation ::= CHOICE @@ -1160,6 +1167,45 @@ GA-Polygon-Elements ::= SEQUENCE ... } +ExtendedLocation ::= CHOICE +{ + spot [1] Spot, + circle [2] Circle, + region [3] Region, + route [4] Route, + ... +} + +Spot ::= CHOICE +{ + gsmLocation [1] GSMLocation, + postalLocation [2] AddressInformation, + ... +} + +Circle ::= SEQUENCE +{ + centre [1] Spot, + radius [2] HorizontalExtent, + ... +} + +Region ::= SEQUENCE +{ + cornerMarks [1] SEQUENCE OF Spot, + ... +} + +Route ::= SEQUENCE +{ + routeMarks [1] SEQUENCE OF Spot, + width [2] HorizontalExtent OPTIONAL, + ... +} + +HorizontalExtent ::= INTEGER + -- metres + -- =================== -- General definitions -- =================== @@ -1345,10 +1391,16 @@ MsgBillingRecords ::= SEQUENCE -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, -- i.e. credit card etc. - nationalMsgBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, + nationalMsgBillingRecords [6] NationalMsgBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - ... + ..., + msgTransactionID [7] UTF8String OPTIONAL, + -- Unique reference for this transaction/billing record + -- Details to be defined on a national basis + mgsTransactionStatus [8] UTF8String OPTIONAL + -- Status of the transaction (i.e. declined, succeeded etc.) + -- Details to be defined on a national bases } NationalMsgBillingRecords ::= SEQUENCE @@ -1607,7 +1659,13 @@ MultimediaBillingRecords ::= SEQUENCE nationalMultimediaBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - ... + ... , + multimediaTransactionID [7] UTF8String OPTIONAL, + -- Unique reference for this transaction/billing record + -- Details to be defined on a national basis + multimediaTransactionStatus [8] UTF8String OPTIONAL + -- Status of the transaction (i.e. declined, succeeded etc.) + -- Details to be defined on a national bases } NationalMultimediaBillingRecords ::= SEQUENCE @@ -1719,8 +1777,17 @@ NAServiceSubscription ::= SEQUENCE ..., allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL, naServiceStatus [10] UTF8String OPTIONAL, - -- CSP-specific description of current service status, e.g. Active, Ceased, etc. - registeredICCID [11] UTF8String OPTIONAL + -- CSP-specific description of current service status, e.g. "Active", "Ceased", etc. + registeredICCID [11] UTF8String OPTIONAL, + nationalNASubscription [12] NationalNASubscription OPTIONAL +} + +NationalNASubscription ::= SEQUENCE + -- Description of the subscription to a Network Access service +{ + countryCode [1] UTF8String (SIZE(2)), + -- see comment in NationalRequestParameters + ... } -- =========================================== diff --git a/102657/portal/RDMessage,ver6.xml b/102657/portal/RDMessage,ver7.xml similarity index 96% rename from 102657/portal/RDMessage,ver6.xml rename to 102657/portal/RDMessage,ver7.xml index cc1aea3..61dc0f9 100644 --- a/102657/portal/RDMessage,ver6.xml +++ b/102657/portal/RDMessage,ver7.xml @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#24 (TS 102 657 v1.6.1) + XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.7.1) @@ -274,6 +274,7 @@ + @@ -566,6 +567,7 @@ + @@ -669,6 +671,8 @@ + + @@ -1251,9 +1255,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1471,6 +1530,8 @@ + + @@ -1551,6 +1612,20 @@ + + + + + + + + + + + + + + @@ -2194,6 +2269,8 @@ + + -- GitLab From a96df855e7f6ad48c3d23b7b5e7c5f72e82febcb Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:21 +0100 Subject: [PATCH 045/208] TS 102 232-5 v2.5.1 (2010-10-21) agreed at LI#25 (Saint Petersburg, 2010-09-21) --- 102232-5/IPMultimediaPDU.asn | 1 + .../{IPMultimediaPDU, ver4.txt => IPMultimediaPDU,ver4.txt} | 1 + 2 files changed, 2 insertions(+) rename 102232-5/portal/{IPMultimediaPDU, ver4.txt => IPMultimediaPDU,ver4.txt} (98%) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index f4d838e..93731a2 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -28,6 +28,7 @@ IPMMCC ::= SEQUENCE iPMMCCObjId [0] RELATIVE-OID, mMCCContents [1] OCTET STRING, -- Copy of the multimediastream, i.e. all related RTP/RTCP or MSRP packets + -- Each IPMMCC shall contain one intercepted packet -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. ..., diff --git a/102232-5/portal/IPMultimediaPDU, ver4.txt b/102232-5/portal/IPMultimediaPDU,ver4.txt similarity index 98% rename from 102232-5/portal/IPMultimediaPDU, ver4.txt rename to 102232-5/portal/IPMultimediaPDU,ver4.txt index f4d838e..93731a2 100644 --- a/102232-5/portal/IPMultimediaPDU, ver4.txt +++ b/102232-5/portal/IPMultimediaPDU,ver4.txt @@ -28,6 +28,7 @@ IPMMCC ::= SEQUENCE iPMMCCObjId [0] RELATIVE-OID, mMCCContents [1] OCTET STRING, -- Copy of the multimediastream, i.e. all related RTP/RTCP or MSRP packets + -- Each IPMMCC shall contain one intercepted packet -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. ..., -- GitLab From ecd285d50fc50714bff2ce2f83f3030be58287a6 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:27 +0100 Subject: [PATCH 046/208] TS 102 657 v1.8.1 (2011-06-24) agreed at LI#26 (Sophia Antipolis, 2011-02-15) --- 102657/RDMessage.asn | 48 ++++++++++++------- 102657/RDMessage.xsd | 34 ++++++++----- ...{RDMessage,ver7.xml => RDMessage,ver8.xsd} | 34 ++++++++----- .../{RDMessage,ver7.txt => RDMessagever8.txt} | 48 ++++++++++++------- 4 files changed, 106 insertions(+), 58 deletions(-) rename 102657/portal/{RDMessage,ver7.xml => RDMessage,ver8.xsd} (98%) rename 102657/portal/{RDMessage,ver7.txt => RDMessagever8.txt} (98%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index b7784e3..d733404 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version7(7)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version8(8)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version7(7)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version8(8)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -22,7 +22,7 @@ RetainedDataMessage ::= SEQUENCE { rdHeaderId [0] OBJECT IDENTIFIER, retainedDataHeader [1] RetainedDataHeader, - retainedDataPayload [2] RetainedDataPayload, + retainedDataPayload [2] RetainedDataPayload, retainedDataDigest [3] OCTET STRING OPTIONAL, -- The digitally signed hash of the combined fields above (retainedDataHeader and -- retainedDataPayload) @@ -135,7 +135,7 @@ RequestPriority ::= OCTET STRING RequestAcknowledgement ::= SEQUENCE { - suggestedCompletionTime [1] GeneralizedTime OPTIONAL, + suggestedCompletionTime [1] GeneralizedTime OPTIONAL, -- Indicative time that results will be ready -- Purely informational, not binding for either party ... @@ -350,7 +350,8 @@ IndividualInfo ::= SEQUENCE ... } OPTIONAL, identificationNumber [5] UTF8String OPTIONAL, - authenticationInfo [6] AuthenticationInfo OPTIONAL, ..., + authenticationInfo [6] AuthenticationInfo OPTIONAL, + ..., profession [7] UTF8String OPTIONAL } @@ -414,6 +415,7 @@ AuthenticationInfo ::= SEQUENCE -- the number of the document used to authenticate ... } + TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -599,7 +601,7 @@ TelephonyPartyInformation ::= SEQUENCE -- List of cell locations used by this party during the service usage communicationTime [6] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [7] UTF8String OPTIONAL, + iCCID [7] UTF8String OPTIONAL, -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [8] IMSI OPTIONAL, natureOfAddress [9] UTF8String OPTIONAL, @@ -1683,7 +1685,6 @@ PartyIdentity ::= UTF8String -- E164 address of the node in international format, or -- SIP URL or TEL URL as in ETSIEN300356[7] - QualityOfService ::= UTF8String -- Free text description of the invoked quality of service @@ -1828,7 +1829,20 @@ NAServiceUsage ::= SEQUENCE gprsInformation [11] GprsInformation OPTIONAL, ..., octetsDownloaded [12] INTEGER OPTIONAL, - octetsUploaded [13] INTEGER OPTIONAL + octetsUploaded [13] INTEGER OPTIONAL, + endReason [14] NAEndReason OPTIONAL +} + +NAEndReason ::= ENUMERATED +{ + unknownReason(0), + timeout(1), + userDisconnect(2), + -- e.g. user logs off + networkDisconnect(3), + -- e.g. users time/credits have been used up + networkError(4), + ... } NwAccessType ::= ENUMERATED @@ -1842,20 +1856,19 @@ NwAccessType ::= ENUMERATED -- Cable access lAN(4), -- LAN access - wirelessLAN(5), + wirelessLAN(5), -- Wireless LAN access (e.g. hotspot) wimax(6), - mobilePacketData(7), - -- Network access over GSM/3GPP GPRS, UMTS, etc. + mobilePacketData(7), -- Network access over GSM/3GPP GPRS, UMTS, etc. ... } DialUpInformation ::= SEQUENCE { - diallingNumber [1] PartyNumber OPTIONAL, + diallingNumber [1] PartyNumber OPTIONAL, -- Telephone number used for dial-up access dialledNumber [2] PartyNumber OPTIONAL, - callback [3] PartyNumber OPTIONAL, + callback [3] PartyNumber OPTIONAL, -- Call back number used for dial-up access ... } @@ -1869,11 +1882,11 @@ GprsInformation ::= SEQUENCE pDP-address-allocated [5] IPAddress OPTIONAL, aPN [6] UTF8String OPTIONAL, pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, - -- format as per TS 101 671 [6] + -- format as per TS 101 671 [6] ..., gPRSEvent [8] GPRSEvent OPTIONAL, -- format as per 3GPP TS 33.108 [11] - iCCID [9] UTF8String OPTIONAL + iCCID [9] UTF8String OPTIONAL -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format } @@ -1883,7 +1896,7 @@ GPRSEvent ::= ENUMERATED pDPContextDeactivation(4), gPRSAttach(5), gPRSDetach(6), - locationInfoUpdate(10), + locationInfoUpdate(10), -- sMS ommited from 3GPP TS 33.108 [11], pDPContextModification(11), servingSystem(12), @@ -1930,7 +1943,7 @@ NANwElement ::= SEQUENCE naNwElementID [2] NANwElementID OPTIONAL, -- Unique ID of this NAS (Network Access Server) naProviderID [3] NAProviderID OPTIONAL, - -- Unique identifier of the provider managing this NAS. + -- Unique identifier of the provider managing this NAS. supportedAccessTypes [4] SEQUENCE OF NwAccessType OPTIONAL, location [5] Location OPTIONAL, ... @@ -1998,4 +2011,3 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage - diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 61dc0f9..05db535 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.7.1) + XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.8.1) @@ -609,7 +609,7 @@ - + @@ -639,7 +639,7 @@ - + @@ -931,7 +931,7 @@ - + @@ -1555,7 +1555,7 @@ - + @@ -1751,10 +1751,22 @@ + + + + + + + + + + + + @@ -1983,7 +1995,7 @@ - + @@ -1992,7 +2004,7 @@ - + @@ -2054,7 +2066,7 @@ - + @@ -2118,7 +2130,7 @@ - + diff --git a/102657/portal/RDMessage,ver7.xml b/102657/portal/RDMessage,ver8.xsd similarity index 98% rename from 102657/portal/RDMessage,ver7.xml rename to 102657/portal/RDMessage,ver8.xsd index 61dc0f9..05db535 100644 --- a/102657/portal/RDMessage,ver7.xml +++ b/102657/portal/RDMessage,ver8.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.7.1) + XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.8.1) @@ -609,7 +609,7 @@ - + @@ -639,7 +639,7 @@ - + @@ -931,7 +931,7 @@ - + @@ -1555,7 +1555,7 @@ - + @@ -1751,10 +1751,22 @@ + + + + + + + + + + + + @@ -1983,7 +1995,7 @@ - + @@ -1992,7 +2004,7 @@ - + @@ -2054,7 +2066,7 @@ - + @@ -2118,7 +2130,7 @@ - + diff --git a/102657/portal/RDMessage,ver7.txt b/102657/portal/RDMessagever8.txt similarity index 98% rename from 102657/portal/RDMessage,ver7.txt rename to 102657/portal/RDMessagever8.txt index b7784e3..d733404 100644 --- a/102657/portal/RDMessage,ver7.txt +++ b/102657/portal/RDMessagever8.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version7(7)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version8(8)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version7(7)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version8(8)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -22,7 +22,7 @@ RetainedDataMessage ::= SEQUENCE { rdHeaderId [0] OBJECT IDENTIFIER, retainedDataHeader [1] RetainedDataHeader, - retainedDataPayload [2] RetainedDataPayload, + retainedDataPayload [2] RetainedDataPayload, retainedDataDigest [3] OCTET STRING OPTIONAL, -- The digitally signed hash of the combined fields above (retainedDataHeader and -- retainedDataPayload) @@ -135,7 +135,7 @@ RequestPriority ::= OCTET STRING RequestAcknowledgement ::= SEQUENCE { - suggestedCompletionTime [1] GeneralizedTime OPTIONAL, + suggestedCompletionTime [1] GeneralizedTime OPTIONAL, -- Indicative time that results will be ready -- Purely informational, not binding for either party ... @@ -350,7 +350,8 @@ IndividualInfo ::= SEQUENCE ... } OPTIONAL, identificationNumber [5] UTF8String OPTIONAL, - authenticationInfo [6] AuthenticationInfo OPTIONAL, ..., + authenticationInfo [6] AuthenticationInfo OPTIONAL, + ..., profession [7] UTF8String OPTIONAL } @@ -414,6 +415,7 @@ AuthenticationInfo ::= SEQUENCE -- the number of the document used to authenticate ... } + TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -599,7 +601,7 @@ TelephonyPartyInformation ::= SEQUENCE -- List of cell locations used by this party during the service usage communicationTime [6] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [7] UTF8String OPTIONAL, + iCCID [7] UTF8String OPTIONAL, -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [8] IMSI OPTIONAL, natureOfAddress [9] UTF8String OPTIONAL, @@ -1683,7 +1685,6 @@ PartyIdentity ::= UTF8String -- E164 address of the node in international format, or -- SIP URL or TEL URL as in ETSIEN300356[7] - QualityOfService ::= UTF8String -- Free text description of the invoked quality of service @@ -1828,7 +1829,20 @@ NAServiceUsage ::= SEQUENCE gprsInformation [11] GprsInformation OPTIONAL, ..., octetsDownloaded [12] INTEGER OPTIONAL, - octetsUploaded [13] INTEGER OPTIONAL + octetsUploaded [13] INTEGER OPTIONAL, + endReason [14] NAEndReason OPTIONAL +} + +NAEndReason ::= ENUMERATED +{ + unknownReason(0), + timeout(1), + userDisconnect(2), + -- e.g. user logs off + networkDisconnect(3), + -- e.g. users time/credits have been used up + networkError(4), + ... } NwAccessType ::= ENUMERATED @@ -1842,20 +1856,19 @@ NwAccessType ::= ENUMERATED -- Cable access lAN(4), -- LAN access - wirelessLAN(5), + wirelessLAN(5), -- Wireless LAN access (e.g. hotspot) wimax(6), - mobilePacketData(7), - -- Network access over GSM/3GPP GPRS, UMTS, etc. + mobilePacketData(7), -- Network access over GSM/3GPP GPRS, UMTS, etc. ... } DialUpInformation ::= SEQUENCE { - diallingNumber [1] PartyNumber OPTIONAL, + diallingNumber [1] PartyNumber OPTIONAL, -- Telephone number used for dial-up access dialledNumber [2] PartyNumber OPTIONAL, - callback [3] PartyNumber OPTIONAL, + callback [3] PartyNumber OPTIONAL, -- Call back number used for dial-up access ... } @@ -1869,11 +1882,11 @@ GprsInformation ::= SEQUENCE pDP-address-allocated [5] IPAddress OPTIONAL, aPN [6] UTF8String OPTIONAL, pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, - -- format as per TS 101 671 [6] + -- format as per TS 101 671 [6] ..., gPRSEvent [8] GPRSEvent OPTIONAL, -- format as per 3GPP TS 33.108 [11] - iCCID [9] UTF8String OPTIONAL + iCCID [9] UTF8String OPTIONAL -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format } @@ -1883,7 +1896,7 @@ GPRSEvent ::= ENUMERATED pDPContextDeactivation(4), gPRSAttach(5), gPRSDetach(6), - locationInfoUpdate(10), + locationInfoUpdate(10), -- sMS ommited from 3GPP TS 33.108 [11], pDPContextModification(11), servingSystem(12), @@ -1930,7 +1943,7 @@ NANwElement ::= SEQUENCE naNwElementID [2] NANwElementID OPTIONAL, -- Unique ID of this NAS (Network Access Server) naProviderID [3] NAProviderID OPTIONAL, - -- Unique identifier of the provider managing this NAS. + -- Unique identifier of the provider managing this NAS. supportedAccessTypes [4] SEQUENCE OF NwAccessType OPTIONAL, location [5] Location OPTIONAL, ... @@ -1998,4 +2011,3 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage - -- GitLab From c77af551e9a5c62bc993a84966d7889ab24ecce9 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:31 +0100 Subject: [PATCH 047/208] TS 102 232-1 v2.6.1 (2011-05-19) agreed at LI#26 (Sophia Antipolis, 2011-02-15) --- 102232-1/LI-PS-PDU.asn | 46 ++++++++++++------- ...I-PS-PDU,ver10.txt => LI-PS-PDU,ver11.txt} | 46 ++++++++++++------- 2 files changed, 60 insertions(+), 32 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver10.txt => LI-PS-PDU,ver11.txt} (90%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 55fb387..a43e0c7 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version10(10)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version11(11)} DEFINITIONS IMPLICIT TAGS ::= @@ -82,7 +82,18 @@ IMPORTS TTRAFFIC, CTTRAFFIC FROM TS101909202 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)}; + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} + + -- from J-STD-025-B [39] + LAESProtocol + FROM Laesp-j-std-025-b + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} + CDMA2000LAESMessage + FROM CDMA2000CIIModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} + CCIPPacketHeader + FROM CDMA2000CCModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}; -- end of IMPORTS @@ -92,7 +103,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version10(10)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version11(11)} -- ==================== -- Top-level definition @@ -200,19 +211,20 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { - undefinedCC [0] OCTET STRING, - emailCC [1] EmailCC, - iPCC [2] IPCC, - uMTSCC [4] OCTET STRING, - eTSI671CC [5] OCTET STRING, + undefinedCC [0] OCTET STRING, + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, + eTSI671CC [5] OCTET STRING, ..., - l2CC [6] 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 + l2CC [6] 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, + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader } MicroSecondTimeStamp ::= SEQUENCE @@ -260,7 +272,9 @@ IRIContents ::= CHOICE tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, pstnIsdnIRI [10] PstnIsdnIRI, - iPMMIRI [11] IPMMIRI + iPMMIRI [11] IPMMIRI, + lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, + cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage } UMTSIRI ::= CHOICE diff --git a/102232-1/portal/LI-PS-PDU,ver10.txt b/102232-1/portal/LI-PS-PDU,ver11.txt similarity index 90% rename from 102232-1/portal/LI-PS-PDU,ver10.txt rename to 102232-1/portal/LI-PS-PDU,ver11.txt index 55fb387..a43e0c7 100644 --- a/102232-1/portal/LI-PS-PDU,ver10.txt +++ b/102232-1/portal/LI-PS-PDU,ver11.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version10(10)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version11(11)} DEFINITIONS IMPLICIT TAGS ::= @@ -82,7 +82,18 @@ IMPORTS TTRAFFIC, CTTRAFFIC FROM TS101909202 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)}; + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} + + -- from J-STD-025-B [39] + LAESProtocol + FROM Laesp-j-std-025-b + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} + CDMA2000LAESMessage + FROM CDMA2000CIIModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} + CCIPPacketHeader + FROM CDMA2000CCModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}; -- end of IMPORTS @@ -92,7 +103,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version10(10)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version11(11)} -- ==================== -- Top-level definition @@ -200,19 +211,20 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { - undefinedCC [0] OCTET STRING, - emailCC [1] EmailCC, - iPCC [2] IPCC, - uMTSCC [4] OCTET STRING, - eTSI671CC [5] OCTET STRING, + undefinedCC [0] OCTET STRING, + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, + eTSI671CC [5] OCTET STRING, ..., - l2CC [6] 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 + l2CC [6] 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, + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader } MicroSecondTimeStamp ::= SEQUENCE @@ -260,7 +272,9 @@ IRIContents ::= CHOICE tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, pstnIsdnIRI [10] PstnIsdnIRI, - iPMMIRI [11] IPMMIRI + iPMMIRI [11] IPMMIRI, + lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, + cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage } UMTSIRI ::= CHOICE -- GitLab From f023290eb1dc254e7de7c126c8a518ef3bcfe58a Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:37 +0100 Subject: [PATCH 048/208] TS 102 232-3 v2.3.1 (2011-08-17) agreed at LI#27 (Aaland, 2011-06-28) --- 102232-3/IPAccessPDU.asn | 21 ++++++++++++------- ...cessPDU, ver6.txt => IPAccessPDU,ver7.txt} | 21 ++++++++++++------- 2 files changed, 28 insertions(+), 14 deletions(-) rename 102232-3/portal/{IPAccessPDU, ver6.txt => IPAccessPDU,ver7.txt} (91%) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index a946754..9491198 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version6(6)} +{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version7(7)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,15 +8,15 @@ IMPORTS -- from ETSI TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -57,6 +57,9 @@ IPIRIContents ::= SEQUENCE targetIPAddress [4] IPAddress OPTIONAL, -- IP address may not be available in case of failed logon attempts. -- If it is available, it must be sent. + -- When iPVersion is iPV4 or iPV6, the IP address is carried by this parameter + -- when iPVersion is iPV4andV6 (Ex : in case of Dual Stack IPv4-IPv6 architecture), + -- the additional IP address is carried by parameter additionalIPaddress. targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, -- Target network ID (e.g. MAC address, PSTN number) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, @@ -89,7 +92,8 @@ IPIRIContents ::= SEQUENCE -- The identifier or name of the POP pOPIPAddress [19] IPAddress OPTIONAL, -- The IP address of the POP - nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL + nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL, + additionalIPAddress [21] IPAddress OPTIONAL } AccessEventType ::= ENUMERATED @@ -142,8 +146,11 @@ IPVersion ::= ENUMERATED { iPV4(1), -- The IPv4 protocol is used - iPV6(2) + iPV6(2), -- The IPv6 protocol is used + iPV4andV6(3), + -- The IPv4 and IPv6 protocols are used + ... } EndReason ::= ENUMERATED diff --git a/102232-3/portal/IPAccessPDU, ver6.txt b/102232-3/portal/IPAccessPDU,ver7.txt similarity index 91% rename from 102232-3/portal/IPAccessPDU, ver6.txt rename to 102232-3/portal/IPAccessPDU,ver7.txt index a946754..9491198 100644 --- a/102232-3/portal/IPAccessPDU, ver6.txt +++ b/102232-3/portal/IPAccessPDU,ver7.txt @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version6(6)} +{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version7(7)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,15 +8,15 @@ IMPORTS -- from ETSI TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version6(6) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -57,6 +57,9 @@ IPIRIContents ::= SEQUENCE targetIPAddress [4] IPAddress OPTIONAL, -- IP address may not be available in case of failed logon attempts. -- If it is available, it must be sent. + -- When iPVersion is iPV4 or iPV6, the IP address is carried by this parameter + -- when iPVersion is iPV4andV6 (Ex : in case of Dual Stack IPv4-IPv6 architecture), + -- the additional IP address is carried by parameter additionalIPaddress. targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, -- Target network ID (e.g. MAC address, PSTN number) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, @@ -89,7 +92,8 @@ IPIRIContents ::= SEQUENCE -- The identifier or name of the POP pOPIPAddress [19] IPAddress OPTIONAL, -- The IP address of the POP - nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL + nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL, + additionalIPAddress [21] IPAddress OPTIONAL } AccessEventType ::= ENUMERATED @@ -142,8 +146,11 @@ IPVersion ::= ENUMERATED { iPV4(1), -- The IPv4 protocol is used - iPV6(2) + iPV6(2), -- The IPv6 protocol is used + iPV4andV6(3), + -- The IPv4 and IPv6 protocols are used + ... } EndReason ::= ENUMERATED -- GitLab From 5a3bf7b6a07007875688ba7af58b18c9b7470bdc Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:41 +0100 Subject: [PATCH 049/208] TS 102 232-2 v2.6.1 (2011-08-17) agreed at LI#27 (Aaland, 2011-06-28) --- 102232-2/EmailPDU.asn | 18 +++++++++++++----- .../{EmailPDU,ver5.txt => EmailPDU,ver6.txt} | 18 +++++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) rename 102232-2/portal/{EmailPDU,ver5.txt => EmailPDU,ver6.txt} (91%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index 95a01f9..56f0e73 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version5(5)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version6(6)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,15 +9,15 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version12(12)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version5(5) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version5(5) cC(2)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version6(6) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version6(6) cC(2)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -79,7 +79,15 @@ EmailIRI ::= SEQUENCE ..., national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, -- Completely defined on a national basis - aAAInformation [16] AAAInformation OPTIONAL + aAAInformation [16] AAAInformation OPTIONAL, + e-mail-Sender-Validity [17] ENUMERATED + { + validated(0), + -- The operator has assured the e-mail-sender + nonvalidated(1), + -- The operator does not assure the e-mail-sender + ... + } OPTIONAL } E-mail-Status ::= ENUMERATED diff --git a/102232-2/portal/EmailPDU,ver5.txt b/102232-2/portal/EmailPDU,ver6.txt similarity index 91% rename from 102232-2/portal/EmailPDU,ver5.txt rename to 102232-2/portal/EmailPDU,ver6.txt index 95a01f9..56f0e73 100644 --- a/102232-2/portal/EmailPDU,ver5.txt +++ b/102232-2/portal/EmailPDU,ver6.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version5(5)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version6(6)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,15 +9,15 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version12(12)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version5(5) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version5(5) cC(2)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version6(6) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version6(6) cC(2)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -79,7 +79,15 @@ EmailIRI ::= SEQUENCE ..., national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, -- Completely defined on a national basis - aAAInformation [16] AAAInformation OPTIONAL + aAAInformation [16] AAAInformation OPTIONAL, + e-mail-Sender-Validity [17] ENUMERATED + { + validated(0), + -- The operator has assured the e-mail-sender + nonvalidated(1), + -- The operator does not assure the e-mail-sender + ... + } OPTIONAL } E-mail-Status ::= ENUMERATED -- GitLab From 43c0e6967829fc7603247503dd003cf35646fc37 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:44 +0100 Subject: [PATCH 050/208] TS 102 232-1 v2.7.1 (2011-08-17) agreed at LI#27 (Aaland, 2011-06-28) --- 102232-1/LI-PS-PDU.asn | 42 ++++++++++++++----- ...I-PS-PDU,ver11.txt => LI-PS-PDU,ver12.txt} | 42 ++++++++++++++----- 2 files changed, 62 insertions(+), 22 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver11.txt => LI-PS-PDU,ver12.txt} (93%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index a43e0c7..aa37526 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version11(11)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version12(12)} DEFINITIONS IMPLICIT TAGS ::= @@ -14,7 +14,7 @@ IMPORTS IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version12(12)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)} -- from TS 101 671 [4] HI1-Operation @@ -103,7 +103,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version11(11)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version12(12)} -- ==================== -- Top-level definition @@ -375,7 +375,8 @@ EncryptionHeader ::= SEQUENCE encryptionType [0] EncryptionType, encryptedPayload [1] OCTET STRING, -- once decrypted, it can be interpreted as payload [1] EncryptedPayload - ... + ..., + encryptedPayloadType [2] EncryptedPayloadType OPTIONAL } EncryptionType ::= ENUMERATED @@ -400,20 +401,39 @@ EncryptionType ::= ENUMERATED EncryptedPayload ::= SEQUENCE { - byteCounter [0] INTEGER (0..18446744073709551615), + byteCounter [0] INTEGER (0..18446744073709551615), -- The sum of the sizes of all transferred PDUs before this PDU. -- It is initialized with the unixTime (number of seconds since 01-01-1970) -- multiplied by 232 at first use. -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) -- is defined to be the size of the PDU after BER encoding: - -- 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, + -- 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, -- Once decrypted, it can be interpreted as payload [1] Payload ... } +EncryptedPayloadType ::= ENUMERATED +{ + unknown(1), + part2(2), + -- encrypted payload is TS 102 232 part 2 [5] + part3(3), + -- encrypted payload is TS 102 232 part 3 [6] + part4(4), + -- encrypted payload is TS 102 232 part 4 [32] + part5(5), + -- encrypted payload is TS 102 232 part 5 [37] + part6(6), + -- encrypted payload is TS 102 232 part 6 [36] + part7(7), + -- encrypted payload is TS 102 232 part 7 [38] + ... +} + END -- end of LI-PS-PDU + diff --git a/102232-1/portal/LI-PS-PDU,ver11.txt b/102232-1/portal/LI-PS-PDU,ver12.txt similarity index 93% rename from 102232-1/portal/LI-PS-PDU,ver11.txt rename to 102232-1/portal/LI-PS-PDU,ver12.txt index a43e0c7..aa37526 100644 --- a/102232-1/portal/LI-PS-PDU,ver11.txt +++ b/102232-1/portal/LI-PS-PDU,ver12.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version11(11)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version12(12)} DEFINITIONS IMPLICIT TAGS ::= @@ -14,7 +14,7 @@ IMPORTS IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version12(12)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)} -- from TS 101 671 [4] HI1-Operation @@ -103,7 +103,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version11(11)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version12(12)} -- ==================== -- Top-level definition @@ -375,7 +375,8 @@ EncryptionHeader ::= SEQUENCE encryptionType [0] EncryptionType, encryptedPayload [1] OCTET STRING, -- once decrypted, it can be interpreted as payload [1] EncryptedPayload - ... + ..., + encryptedPayloadType [2] EncryptedPayloadType OPTIONAL } EncryptionType ::= ENUMERATED @@ -400,20 +401,39 @@ EncryptionType ::= ENUMERATED EncryptedPayload ::= SEQUENCE { - byteCounter [0] INTEGER (0..18446744073709551615), + byteCounter [0] INTEGER (0..18446744073709551615), -- The sum of the sizes of all transferred PDUs before this PDU. -- It is initialized with the unixTime (number of seconds since 01-01-1970) -- multiplied by 232 at first use. -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) -- is defined to be the size of the PDU after BER encoding: - -- 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, + -- 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, -- Once decrypted, it can be interpreted as payload [1] Payload ... } +EncryptedPayloadType ::= ENUMERATED +{ + unknown(1), + part2(2), + -- encrypted payload is TS 102 232 part 2 [5] + part3(3), + -- encrypted payload is TS 102 232 part 3 [6] + part4(4), + -- encrypted payload is TS 102 232 part 4 [32] + part5(5), + -- encrypted payload is TS 102 232 part 5 [37] + part6(6), + -- encrypted payload is TS 102 232 part 6 [36] + part7(7), + -- encrypted payload is TS 102 232 part 7 [38] + ... +} + END -- end of LI-PS-PDU + -- GitLab From 13c0c89577797e90c04b37c65d7b985b8e21e37d Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:49 +0100 Subject: [PATCH 051/208] TS 102 657 v1.9.1 (2011-12-13) agreed at LI#28 (Otranto (Salento), 2011-09-13) --- 102657/RDMessage.asn | 111 +++- 102657/RDMessage.xsd | 520 ++++++++++-------- .../{RDMessagever8.txt => RDMessage,ver9.txt} | 111 +++- ...{RDMessage,ver8.xsd => RDMessage,ver9.xsd} | 520 ++++++++++-------- 4 files changed, 772 insertions(+), 490 deletions(-) rename 102657/portal/{RDMessagever8.txt => RDMessage,ver9.txt} (95%) rename 102657/portal/{RDMessage,ver8.xsd => RDMessage,ver9.xsd} (86%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index d733404..9ca87ae 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version8(8)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version9(9)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version8(8)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version9(9)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -156,7 +156,9 @@ ResponseMessage ::= SEQUENCE nationalResponsePayload [3] NationalResponsePayload OPTIONAL, -- to be defined on a national basis -- only to be used in case the present document cannot fulfil the national requirements - ... + ..., + responseNumber [4] INTEGER OPTIONAL + -- number to identify partial results within parallel multi-part delivery } ResponseStatus ::= CHOICE @@ -164,7 +166,7 @@ ResponseStatus ::= CHOICE responseComplete [1] NULL, -- No further results to come responseIncomplete [2] NULL, - -- There may be further results to come + -- There will be at least one further response message to come responseUnavailable [3] NULL, -- See clause 5.3.1 responseFailed [4] FurtherInformation, @@ -211,7 +213,9 @@ ResponseAcknowledgement ::= CHOICE -- Acknowledges a response has been sent acknowledgeCompleteResults [1] NULL, acknowledgePartialResults [2] NULL, - ... + ..., + acknowledgePartialResultsNumber [3] INTEGER + -- number to acknowledge a specific resultMessage within parallel multi-part delivery } -- ================================================== @@ -307,6 +311,7 @@ NationalRecordPayload ::= SEQUENCE -- see comment in NationalRequestParameters ... } + TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -416,6 +421,43 @@ AuthenticationInfo ::= SEQUENCE ... } +PaymentDetails ::= SEQUENCE +{ + billingMethod [1] BillingMethod OPTIONAL, + bankAccount [2] BankAccount OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + ... +} + +BankAccount ::= SEQUENCE +{ + iBAN [1] IBAN OPTIONAL, + bIC [2] BIC OPTIONAL, + accountHolder [3] UTF8String OPTIONAL, + nationalAccountNumber [4] UTF8String OPTIONAL, + -- To be used in case that the account holding bank has no IBAN + nationalBankNumber [5] UTF8String OPTIONAL, + -- To be used in case that the account holding bank has neither IBAN nor BIC + bankName [6] UTF8String OPTIONAL, + ... +} + +IBAN ::= UTF8String + -- International Banking Account Number + -- format as per ISO 13616-1:2007 [28] + +BIC ::= UTF8String + -- Business Identifier Code + -- format as per ISO 9362:2009 [29] + +BillingMethod ::= ENUMERATED +{ + debit(0), + transfer(1), + prepaid(2), + ... +} + TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -485,9 +527,10 @@ SubscribedTelephonyServices ::= SEQUENCE pUKCode [13] UTF8String OPTIONAL, pUK2Code [14] UTF8String OPTIONAL, iMEI [15] SEQUENCE OF IMEI OPTIONAL, - nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL + nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + paymentDetails [17] PaymentDetails OPTIONAL } NationalTelephonySubscriptionInfo ::= SEQUENCE @@ -601,7 +644,7 @@ TelephonyPartyInformation ::= SEQUENCE -- List of cell locations used by this party during the service usage communicationTime [6] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [7] UTF8String OPTIONAL, + iCCID [7] UTF8String OPTIONAL, -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [8] IMSI OPTIONAL, natureOfAddress [9] UTF8String OPTIONAL, @@ -610,14 +653,16 @@ TelephonyPartyInformation ::= SEQUENCE terminatingTransferredNumber [11] PartyNumber OPTIONAL, ..., emailAddress [12] UTF8String OPTIONAL, - -- used for MMS that supports also the use of E-Mail addresses (RFC 2822 [24]) + -- used for MMS that supports also the use of E-Mail addresses (RFC 5322 [24]) iMEI [13] IMEI OPTIONAL, detailedLocation [14] TelephonyNetworkElement OPTIONAL, -- In the case detailed location information per call and party is available -- (e.g. the geoCoordinates for this partyNumber) - nationalTelephonyPartyInformation [15] NationalTelephonyPartyInformation OPTIONAL + nationalTelephonyPartyInformation [15] NationalTelephonyPartyInformation OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + partyType [16] TelephonyPartyType OPTIONAL, + dialledDigits [17] UTF8String OPTIONAL } NationalTelephonyPartyInformation ::= SEQUENCE @@ -627,6 +672,14 @@ NationalTelephonyPartyInformation ::= SEQUENCE ... } +TelephonyPartyType ::= CHOICE +{ + voicemail [1] NULL, + smsServer [2] NULL, + other [3] UTF8String, + ... +} + TelephonyCommunicationType ::= ENUMERATED { telephonyFixedCS(0), @@ -1008,7 +1061,7 @@ Location ::= SEQUENCE -- format: PLMN-ID 3 octets (no. 1-3) -- LAC 2 octets (no. 4-5) -- SAC 2 octets (no. 6-7) - -- (according to 3GPP TS 25.431 [10]) + -- (according to 3GPP TS 23.003 [30]) oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI @@ -1144,7 +1197,10 @@ GeographicalCoordinates ::= SEQUENCE } OPTIONAL, latitude [2] INTEGER (0..8388607) OPTIONAL, longitude [3] INTEGER (-8388608..8388607) OPTIONAL, - ... + ..., + mapDatum [4] MapDatum OPTIONAL, + azimuth [5] INTEGER (0..359) OPTIONAL + -- The azimuth is the bearing, relative to true north } GA-Point ::= SEQUENCE @@ -1213,7 +1269,7 @@ HorizontalExtent ::= INTEGER -- =================== PartyNumber ::= UTF8String - -- E164 address of the node in international format + -- E.164 address of the party in international format MessageRecord ::= CHOICE { @@ -1236,7 +1292,8 @@ MsgSubscriber ::= SEQUENCE msgStores [3] SEQUENCE OF MsgStore OPTIONAL, -- message stores allocated to this subscriber subscriber [4] GenericSubscriberInfo OPTIONAL, - ... + ..., + paymentDetails [5] PaymentDetails OPTIONAL } MsgSubscriberID ::= OCTET STRING @@ -1470,7 +1527,8 @@ SubscribedMultimediaServices ::= SEQUENCE -- e.g. "Active", "Ceased", etc. nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL, -- national extension - ... + ..., + paymentDetails [13] PaymentDetails OPTIONAL } MultimediaServiceType ::= ENUMERATED @@ -1682,8 +1740,8 @@ NationalMultimediaBillingRecords ::= SEQUENCE -- =================== PartyIdentity ::= UTF8String - -- E164 address of the node in international format, or - -- SIP URL or TEL URL as in ETSIEN300356[7] + -- E.164 address of the party in international format, or + -- SIP URI or TEL URI representing E.164 QualityOfService ::= UTF8String -- Free text description of the invoked quality of service @@ -1780,7 +1838,9 @@ NAServiceSubscription ::= SEQUENCE naServiceStatus [10] UTF8String OPTIONAL, -- CSP-specific description of current service status, e.g. "Active", "Ceased", etc. registeredICCID [11] UTF8String OPTIONAL, - nationalNASubscription [12] NationalNASubscription OPTIONAL + nationalNASubscription [12] NationalNASubscription OPTIONAL, + paymentDetails [13] PaymentDetails OPTIONAL, + additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL } NationalNASubscription ::= SEQUENCE @@ -1830,7 +1890,9 @@ NAServiceUsage ::= SEQUENCE ..., octetsDownloaded [12] INTEGER OPTIONAL, octetsUploaded [13] INTEGER OPTIONAL, - endReason [14] NAEndReason OPTIONAL + endReason [14] NAEndReason OPTIONAL, + subscriberID [15] NaSubscriberID OPTIONAL + -- Identifier for a known user of this network access } NAEndReason ::= ENUMERATED @@ -1920,11 +1982,14 @@ NADevice ::= SEQUENCE -- MAC or ethernet address dslID [5] UTF8String OPTIONAL, imei [6] IMEI OPTIONAL, - ... + ..., + subscriberID [7] NaSubscriberID OPTIONAL } IMEI ::= OCTET STRING (SIZE(8)) -- format as per 3GPP TS 09.02 [8] + -- NOTE: When comparing IMEIs, an IMEI can be considered equal to the requested IMEI even + -- if the checksum or software version digits are different or not present. IMSI ::= OCTET STRING (SIZE(3..8)) -- format as per 3GPP TS 09.02 [8] @@ -2007,7 +2072,13 @@ NABillingDetails ::= SEQUENCE billingAddress [3] ContactDetails OPTIONAL, billingIdentifier [4] BillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, - ... + ..., + naTransactionID [6] UTF8String OPTIONAL, + -- Unique reference for this transaction/billing record + -- Details to be defined on a national basis + naTransactionStatus [7] UTF8String OPTIONAL + -- Status of the transaction (i.e. declined, succeeded etc.) + -- Details to be defined on a national basis } END -- end of RDMessage diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 05db535..e1e1f7c 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.8.1) + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.9.1 @@ -67,8 +67,9 @@ - - + + + @@ -91,26 +92,26 @@ - - - + + + - - - - + + + + - - - + + + @@ -128,89 +129,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + @@ -230,24 +231,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -262,19 +263,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -313,14 +314,14 @@ - - - - - - - - + + + + + + + + @@ -427,10 +428,6 @@ - - - - @@ -552,6 +549,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -560,8 +594,8 @@ - - + + @@ -610,6 +644,7 @@ + @@ -766,6 +801,8 @@ + + @@ -783,6 +820,15 @@ + + + + + + + + + @@ -798,10 +844,10 @@ - - - - + + + + @@ -809,13 +855,13 @@ - - - - - - - + + + + + + + @@ -823,15 +869,15 @@ - - - - - - - - - + + + + + + + + + @@ -866,10 +912,10 @@ - - - - + + + + @@ -877,19 +923,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -898,9 +944,9 @@ - - - + + + @@ -954,9 +1000,9 @@ - - - + + + @@ -1004,7 +1050,7 @@ - + @@ -1041,7 +1087,7 @@ - + @@ -1093,7 +1139,7 @@ - + @@ -1126,7 +1172,7 @@ - + @@ -1145,8 +1191,8 @@ - - + + @@ -1165,6 +1211,15 @@ + + + + + + + + + @@ -1262,7 +1317,7 @@ - + @@ -1272,8 +1327,8 @@ - - + + @@ -1341,9 +1396,9 @@ - - - + + + @@ -1412,6 +1467,7 @@ + @@ -1442,18 +1498,18 @@ - - - - + + + + - - + + @@ -1474,13 +1530,13 @@ - - - - - - - + + + + + + + @@ -1495,9 +1551,9 @@ - - - + + + @@ -1613,7 +1669,15 @@ - + + + + + + + + + @@ -1660,9 +1724,9 @@ - - - + + + @@ -1684,13 +1748,13 @@ - - - - - - - + + + + + + + @@ -1729,10 +1793,10 @@ - - - - + + + + @@ -1752,7 +1816,8 @@ - + + @@ -1761,8 +1826,8 @@ - - + + @@ -1781,7 +1846,8 @@ - + + @@ -1815,6 +1881,8 @@ + + @@ -1928,7 +1996,8 @@ - + + @@ -2050,7 +2119,8 @@ - + + @@ -2086,10 +2156,10 @@ - - - - + + + + @@ -2183,21 +2253,21 @@ - - - - + + + + - + - - - - - + + + + + diff --git a/102657/portal/RDMessagever8.txt b/102657/portal/RDMessage,ver9.txt similarity index 95% rename from 102657/portal/RDMessagever8.txt rename to 102657/portal/RDMessage,ver9.txt index d733404..9ca87ae 100644 --- a/102657/portal/RDMessagever8.txt +++ b/102657/portal/RDMessage,ver9.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version8(8)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version9(9)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version8(8)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version9(9)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -156,7 +156,9 @@ ResponseMessage ::= SEQUENCE nationalResponsePayload [3] NationalResponsePayload OPTIONAL, -- to be defined on a national basis -- only to be used in case the present document cannot fulfil the national requirements - ... + ..., + responseNumber [4] INTEGER OPTIONAL + -- number to identify partial results within parallel multi-part delivery } ResponseStatus ::= CHOICE @@ -164,7 +166,7 @@ ResponseStatus ::= CHOICE responseComplete [1] NULL, -- No further results to come responseIncomplete [2] NULL, - -- There may be further results to come + -- There will be at least one further response message to come responseUnavailable [3] NULL, -- See clause 5.3.1 responseFailed [4] FurtherInformation, @@ -211,7 +213,9 @@ ResponseAcknowledgement ::= CHOICE -- Acknowledges a response has been sent acknowledgeCompleteResults [1] NULL, acknowledgePartialResults [2] NULL, - ... + ..., + acknowledgePartialResultsNumber [3] INTEGER + -- number to acknowledge a specific resultMessage within parallel multi-part delivery } -- ================================================== @@ -307,6 +311,7 @@ NationalRecordPayload ::= SEQUENCE -- see comment in NationalRequestParameters ... } + TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -416,6 +421,43 @@ AuthenticationInfo ::= SEQUENCE ... } +PaymentDetails ::= SEQUENCE +{ + billingMethod [1] BillingMethod OPTIONAL, + bankAccount [2] BankAccount OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + ... +} + +BankAccount ::= SEQUENCE +{ + iBAN [1] IBAN OPTIONAL, + bIC [2] BIC OPTIONAL, + accountHolder [3] UTF8String OPTIONAL, + nationalAccountNumber [4] UTF8String OPTIONAL, + -- To be used in case that the account holding bank has no IBAN + nationalBankNumber [5] UTF8String OPTIONAL, + -- To be used in case that the account holding bank has neither IBAN nor BIC + bankName [6] UTF8String OPTIONAL, + ... +} + +IBAN ::= UTF8String + -- International Banking Account Number + -- format as per ISO 13616-1:2007 [28] + +BIC ::= UTF8String + -- Business Identifier Code + -- format as per ISO 9362:2009 [29] + +BillingMethod ::= ENUMERATED +{ + debit(0), + transfer(1), + prepaid(2), + ... +} + TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -485,9 +527,10 @@ SubscribedTelephonyServices ::= SEQUENCE pUKCode [13] UTF8String OPTIONAL, pUK2Code [14] UTF8String OPTIONAL, iMEI [15] SEQUENCE OF IMEI OPTIONAL, - nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL + nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + paymentDetails [17] PaymentDetails OPTIONAL } NationalTelephonySubscriptionInfo ::= SEQUENCE @@ -601,7 +644,7 @@ TelephonyPartyInformation ::= SEQUENCE -- List of cell locations used by this party during the service usage communicationTime [6] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [7] UTF8String OPTIONAL, + iCCID [7] UTF8String OPTIONAL, -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [8] IMSI OPTIONAL, natureOfAddress [9] UTF8String OPTIONAL, @@ -610,14 +653,16 @@ TelephonyPartyInformation ::= SEQUENCE terminatingTransferredNumber [11] PartyNumber OPTIONAL, ..., emailAddress [12] UTF8String OPTIONAL, - -- used for MMS that supports also the use of E-Mail addresses (RFC 2822 [24]) + -- used for MMS that supports also the use of E-Mail addresses (RFC 5322 [24]) iMEI [13] IMEI OPTIONAL, detailedLocation [14] TelephonyNetworkElement OPTIONAL, -- In the case detailed location information per call and party is available -- (e.g. the geoCoordinates for this partyNumber) - nationalTelephonyPartyInformation [15] NationalTelephonyPartyInformation OPTIONAL + nationalTelephonyPartyInformation [15] NationalTelephonyPartyInformation OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + partyType [16] TelephonyPartyType OPTIONAL, + dialledDigits [17] UTF8String OPTIONAL } NationalTelephonyPartyInformation ::= SEQUENCE @@ -627,6 +672,14 @@ NationalTelephonyPartyInformation ::= SEQUENCE ... } +TelephonyPartyType ::= CHOICE +{ + voicemail [1] NULL, + smsServer [2] NULL, + other [3] UTF8String, + ... +} + TelephonyCommunicationType ::= ENUMERATED { telephonyFixedCS(0), @@ -1008,7 +1061,7 @@ Location ::= SEQUENCE -- format: PLMN-ID 3 octets (no. 1-3) -- LAC 2 octets (no. 4-5) -- SAC 2 octets (no. 6-7) - -- (according to 3GPP TS 25.431 [10]) + -- (according to 3GPP TS 23.003 [30]) oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI @@ -1144,7 +1197,10 @@ GeographicalCoordinates ::= SEQUENCE } OPTIONAL, latitude [2] INTEGER (0..8388607) OPTIONAL, longitude [3] INTEGER (-8388608..8388607) OPTIONAL, - ... + ..., + mapDatum [4] MapDatum OPTIONAL, + azimuth [5] INTEGER (0..359) OPTIONAL + -- The azimuth is the bearing, relative to true north } GA-Point ::= SEQUENCE @@ -1213,7 +1269,7 @@ HorizontalExtent ::= INTEGER -- =================== PartyNumber ::= UTF8String - -- E164 address of the node in international format + -- E.164 address of the party in international format MessageRecord ::= CHOICE { @@ -1236,7 +1292,8 @@ MsgSubscriber ::= SEQUENCE msgStores [3] SEQUENCE OF MsgStore OPTIONAL, -- message stores allocated to this subscriber subscriber [4] GenericSubscriberInfo OPTIONAL, - ... + ..., + paymentDetails [5] PaymentDetails OPTIONAL } MsgSubscriberID ::= OCTET STRING @@ -1470,7 +1527,8 @@ SubscribedMultimediaServices ::= SEQUENCE -- e.g. "Active", "Ceased", etc. nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL, -- national extension - ... + ..., + paymentDetails [13] PaymentDetails OPTIONAL } MultimediaServiceType ::= ENUMERATED @@ -1682,8 +1740,8 @@ NationalMultimediaBillingRecords ::= SEQUENCE -- =================== PartyIdentity ::= UTF8String - -- E164 address of the node in international format, or - -- SIP URL or TEL URL as in ETSIEN300356[7] + -- E.164 address of the party in international format, or + -- SIP URI or TEL URI representing E.164 QualityOfService ::= UTF8String -- Free text description of the invoked quality of service @@ -1780,7 +1838,9 @@ NAServiceSubscription ::= SEQUENCE naServiceStatus [10] UTF8String OPTIONAL, -- CSP-specific description of current service status, e.g. "Active", "Ceased", etc. registeredICCID [11] UTF8String OPTIONAL, - nationalNASubscription [12] NationalNASubscription OPTIONAL + nationalNASubscription [12] NationalNASubscription OPTIONAL, + paymentDetails [13] PaymentDetails OPTIONAL, + additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL } NationalNASubscription ::= SEQUENCE @@ -1830,7 +1890,9 @@ NAServiceUsage ::= SEQUENCE ..., octetsDownloaded [12] INTEGER OPTIONAL, octetsUploaded [13] INTEGER OPTIONAL, - endReason [14] NAEndReason OPTIONAL + endReason [14] NAEndReason OPTIONAL, + subscriberID [15] NaSubscriberID OPTIONAL + -- Identifier for a known user of this network access } NAEndReason ::= ENUMERATED @@ -1920,11 +1982,14 @@ NADevice ::= SEQUENCE -- MAC or ethernet address dslID [5] UTF8String OPTIONAL, imei [6] IMEI OPTIONAL, - ... + ..., + subscriberID [7] NaSubscriberID OPTIONAL } IMEI ::= OCTET STRING (SIZE(8)) -- format as per 3GPP TS 09.02 [8] + -- NOTE: When comparing IMEIs, an IMEI can be considered equal to the requested IMEI even + -- if the checksum or software version digits are different or not present. IMSI ::= OCTET STRING (SIZE(3..8)) -- format as per 3GPP TS 09.02 [8] @@ -2007,7 +2072,13 @@ NABillingDetails ::= SEQUENCE billingAddress [3] ContactDetails OPTIONAL, billingIdentifier [4] BillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, - ... + ..., + naTransactionID [6] UTF8String OPTIONAL, + -- Unique reference for this transaction/billing record + -- Details to be defined on a national basis + naTransactionStatus [7] UTF8String OPTIONAL + -- Status of the transaction (i.e. declined, succeeded etc.) + -- Details to be defined on a national basis } END -- end of RDMessage diff --git a/102657/portal/RDMessage,ver8.xsd b/102657/portal/RDMessage,ver9.xsd similarity index 86% rename from 102657/portal/RDMessage,ver8.xsd rename to 102657/portal/RDMessage,ver9.xsd index 05db535..e1e1f7c 100644 --- a/102657/portal/RDMessage,ver8.xsd +++ b/102657/portal/RDMessage,ver9.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of LI#25 (TS 102 657 v1.8.1) + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.9.1 @@ -67,8 +67,9 @@ - - + + + @@ -91,26 +92,26 @@ - - - + + + - - - - + + + + - - - + + + @@ -128,89 +129,89 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + @@ -230,24 +231,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -262,19 +263,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -313,14 +314,14 @@ - - - - - - - - + + + + + + + + @@ -427,10 +428,6 @@ - - - - @@ -552,6 +549,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -560,8 +594,8 @@ - - + + @@ -610,6 +644,7 @@ + @@ -766,6 +801,8 @@ + + @@ -783,6 +820,15 @@ + + + + + + + + + @@ -798,10 +844,10 @@ - - - - + + + + @@ -809,13 +855,13 @@ - - - - - - - + + + + + + + @@ -823,15 +869,15 @@ - - - - - - - - - + + + + + + + + + @@ -866,10 +912,10 @@ - - - - + + + + @@ -877,19 +923,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -898,9 +944,9 @@ - - - + + + @@ -954,9 +1000,9 @@ - - - + + + @@ -1004,7 +1050,7 @@ - + @@ -1041,7 +1087,7 @@ - + @@ -1093,7 +1139,7 @@ - + @@ -1126,7 +1172,7 @@ - + @@ -1145,8 +1191,8 @@ - - + + @@ -1165,6 +1211,15 @@ + + + + + + + + + @@ -1262,7 +1317,7 @@ - + @@ -1272,8 +1327,8 @@ - - + + @@ -1341,9 +1396,9 @@ - - - + + + @@ -1412,6 +1467,7 @@ + @@ -1442,18 +1498,18 @@ - - - - + + + + - - + + @@ -1474,13 +1530,13 @@ - - - - - - - + + + + + + + @@ -1495,9 +1551,9 @@ - - - + + + @@ -1613,7 +1669,15 @@ - + + + + + + + + + @@ -1660,9 +1724,9 @@ - - - + + + @@ -1684,13 +1748,13 @@ - - - - - - - + + + + + + + @@ -1729,10 +1793,10 @@ - - - - + + + + @@ -1752,7 +1816,8 @@ - + + @@ -1761,8 +1826,8 @@ - - + + @@ -1781,7 +1846,8 @@ - + + @@ -1815,6 +1881,8 @@ + + @@ -1928,7 +1996,8 @@ - + + @@ -2050,7 +2119,8 @@ - + + @@ -2086,10 +2156,10 @@ - - - - + + + + @@ -2183,21 +2253,21 @@ - - - - + + + + - + - - - - - + + + + + -- GitLab From 908b73d67bfad015935d5beb1f6a9c09e17f2257 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:53 +0100 Subject: [PATCH 052/208] TS 102 232-1 v2.8.1 (2011-10-26) agreed at LI#28 (Otranto (Salento), 2011-09-13) --- 102232-1/LI-PS-PDU.asn | 8 +++----- .../portal/{LI-PS-PDU,ver12.txt => LI-PS-PDU,ver12,2.txt} | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver12.txt => LI-PS-PDU,ver12,2.txt} (98%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index aa37526..721b58d 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -404,7 +404,7 @@ EncryptedPayload ::= SEQUENCE byteCounter [0] INTEGER (0..18446744073709551615), -- The sum of the sizes of all transferred PDUs before this PDU. -- It is initialized with the unixTime (number of seconds since 01-01-1970) - -- multiplied by 232 at first use. + -- multiplied by 2^32 at first use. -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) -- is defined to be the size of the PDU after BER encoding: -- IF N > 0 THEN @@ -413,8 +413,7 @@ EncryptedPayload ::= SEQUENCE -- PDU[N].byteCounter = ( unixTime(now) << 32 ) -- ENDIF payload [1] Payload, - -- Once decrypted, it can be interpreted as payload [1] Payload - ... + ... } EncryptedPayloadType ::= ENUMERATED @@ -435,5 +434,4 @@ EncryptedPayloadType ::= ENUMERATED ... } -END -- end of LI-PS-PDU - +END --end of LI-PS-PDU diff --git a/102232-1/portal/LI-PS-PDU,ver12.txt b/102232-1/portal/LI-PS-PDU,ver12,2.txt similarity index 98% rename from 102232-1/portal/LI-PS-PDU,ver12.txt rename to 102232-1/portal/LI-PS-PDU,ver12,2.txt index aa37526..721b58d 100644 --- a/102232-1/portal/LI-PS-PDU,ver12.txt +++ b/102232-1/portal/LI-PS-PDU,ver12,2.txt @@ -404,7 +404,7 @@ EncryptedPayload ::= SEQUENCE byteCounter [0] INTEGER (0..18446744073709551615), -- The sum of the sizes of all transferred PDUs before this PDU. -- It is initialized with the unixTime (number of seconds since 01-01-1970) - -- multiplied by 232 at first use. + -- multiplied by 2^32 at first use. -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) -- is defined to be the size of the PDU after BER encoding: -- IF N > 0 THEN @@ -413,8 +413,7 @@ EncryptedPayload ::= SEQUENCE -- PDU[N].byteCounter = ( unixTime(now) << 32 ) -- ENDIF payload [1] Payload, - -- Once decrypted, it can be interpreted as payload [1] Payload - ... + ... } EncryptedPayloadType ::= ENUMERATED @@ -435,5 +434,4 @@ EncryptedPayloadType ::= ENUMERATED ... } -END -- end of LI-PS-PDU - +END --end of LI-PS-PDU -- GitLab From 7cab3beb92ed72321d37f64da2568f697061e959 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:27:58 +0100 Subject: [PATCH 053/208] TS 102 232-5 v3.1.1 (2012-02-28) agreed at LI#29 (Dun Laoghaire, 2012-01-24) --- 102232-5/IPMultimediaPDU.asn | 48 ++++++++++++------- ...aPDU,ver4.txt => IPMultimediaPDU,ver5.txt} | 48 ++++++++++++------- 2 files changed, 64 insertions(+), 32 deletions(-) rename 102232-5/portal/{IPMultimediaPDU,ver4.txt => IPMultimediaPDU,ver5.txt} (71%) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 93731a2..1ce9a63 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,5 +1,5 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version4(4)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version5(5)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,14 +8,14 @@ IMPORTS -- from TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; -- ============================ -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version4(4) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version4(4) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -23,13 +23,13 @@ iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version4(4) cC(2)} -- IP Multimedia Communications Contents -- ===================================== -IPMMCC ::= SEQUENCE +IPMMCC ::= SEQUENCE { iPMMCCObjId [0] RELATIVE-OID, mMCCContents [1] OCTET STRING, -- Copy of the multimediastream, i.e. all related RTP/RTCP or MSRP packets -- Each IPMMCC shall contain one intercepted packet - -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. ..., frameType [2] FrameType OPTIONAL, @@ -46,7 +46,7 @@ IPMMCC ::= SEQUENCE -- Absence means mMCCContents contains RTP/RTCP packets } -FrameType ::= ENUMERATED +FrameType ::= ENUMERATED { ipFrame(0), -- All headers are present @@ -61,7 +61,7 @@ FrameType ::= ENUMERATED -- IP header is missing } -MMCCprotocol ::= ENUMERATED +MMCCprotocol ::= ENUMERATED { rTP(0), -- mMCCContents parameter contains RTP/RTCP packets @@ -74,14 +74,14 @@ MMCCprotocol ::= ENUMERATED -- Intercept-related information for IP Multimedia sessions -- ======================================================== -IPMMIRI ::= SEQUENCE +IPMMIRI ::= SEQUENCE { iPMMIRIObjId [0] RELATIVE-OID, iPMMIRIContents [1] IPIRIContents, ... } -IPIRIContents ::= CHOICE +IPIRIContents ::= CHOICE { originalIPMMMessage [0] OCTET STRING, -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers @@ -89,11 +89,13 @@ IPIRIContents ::= CHOICE -- Copy of the SIP content and the source and destination IP address h323Message [2] H323Message, -- Copy of the H.323 content and the source and destination IP address - ... - + ..., + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters + -- This parameter is used according to national regulations + -- This parameter shall be delivered as an IRI-Report-record } -SIPMessage ::= SEQUENCE +SIPMessage ::= SEQUENCE { iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, @@ -101,7 +103,7 @@ SIPMessage ::= SEQUENCE ... } -H323Message ::= SEQUENCE +H323Message ::= SEQUENCE { iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, @@ -109,7 +111,7 @@ H323Message ::= SEQUENCE ... } -H323MessageContent ::= CHOICE +H323MessageContent ::= CHOICE { h225CSMessageContent [0] OCTET STRING, h225RASMessageContent [1] OCTET STRING, @@ -118,5 +120,19 @@ H323MessageContent ::= CHOICE ... } -END -- end of IP Multimedia PDU +NationalIPMMIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [16], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} +END -- end of IP Multimedia PDU diff --git a/102232-5/portal/IPMultimediaPDU,ver4.txt b/102232-5/portal/IPMultimediaPDU,ver5.txt similarity index 71% rename from 102232-5/portal/IPMultimediaPDU,ver4.txt rename to 102232-5/portal/IPMultimediaPDU,ver5.txt index 93731a2..1ce9a63 100644 --- a/102232-5/portal/IPMultimediaPDU,ver4.txt +++ b/102232-5/portal/IPMultimediaPDU,ver5.txt @@ -1,5 +1,5 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version4(4)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version5(5)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,14 +8,14 @@ IMPORTS -- from TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; -- ============================ -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version4(4) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version4(4) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -23,13 +23,13 @@ iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version4(4) cC(2)} -- IP Multimedia Communications Contents -- ===================================== -IPMMCC ::= SEQUENCE +IPMMCC ::= SEQUENCE { iPMMCCObjId [0] RELATIVE-OID, mMCCContents [1] OCTET STRING, -- Copy of the multimediastream, i.e. all related RTP/RTCP or MSRP packets -- Each IPMMCC shall contain one intercepted packet - -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. ..., frameType [2] FrameType OPTIONAL, @@ -46,7 +46,7 @@ IPMMCC ::= SEQUENCE -- Absence means mMCCContents contains RTP/RTCP packets } -FrameType ::= ENUMERATED +FrameType ::= ENUMERATED { ipFrame(0), -- All headers are present @@ -61,7 +61,7 @@ FrameType ::= ENUMERATED -- IP header is missing } -MMCCprotocol ::= ENUMERATED +MMCCprotocol ::= ENUMERATED { rTP(0), -- mMCCContents parameter contains RTP/RTCP packets @@ -74,14 +74,14 @@ MMCCprotocol ::= ENUMERATED -- Intercept-related information for IP Multimedia sessions -- ======================================================== -IPMMIRI ::= SEQUENCE +IPMMIRI ::= SEQUENCE { iPMMIRIObjId [0] RELATIVE-OID, iPMMIRIContents [1] IPIRIContents, ... } -IPIRIContents ::= CHOICE +IPIRIContents ::= CHOICE { originalIPMMMessage [0] OCTET STRING, -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers @@ -89,11 +89,13 @@ IPIRIContents ::= CHOICE -- Copy of the SIP content and the source and destination IP address h323Message [2] H323Message, -- Copy of the H.323 content and the source and destination IP address - ... - + ..., + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters + -- This parameter is used according to national regulations + -- This parameter shall be delivered as an IRI-Report-record } -SIPMessage ::= SEQUENCE +SIPMessage ::= SEQUENCE { iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, @@ -101,7 +103,7 @@ SIPMessage ::= SEQUENCE ... } -H323Message ::= SEQUENCE +H323Message ::= SEQUENCE { iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, @@ -109,7 +111,7 @@ H323Message ::= SEQUENCE ... } -H323MessageContent ::= CHOICE +H323MessageContent ::= CHOICE { h225CSMessageContent [0] OCTET STRING, h225RASMessageContent [1] OCTET STRING, @@ -118,5 +120,19 @@ H323MessageContent ::= CHOICE ... } -END -- end of IP Multimedia PDU +NationalIPMMIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [16], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} +END -- end of IP Multimedia PDU -- GitLab From b0f22c5ddce041d83030a28ce9a149706be63b46 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:04 +0100 Subject: [PATCH 054/208] TS 102 232-4 v3.1.1 (2012-02-28) agreed at LI#29 (Dun Laoghaire, 2012-01-24) --- 102232-4/L2AccessPDU.asn | 38 +++++++++++++++---- ...ccessPDU,ver5.txt => L2AccessPDU,ver6.txt} | 38 +++++++++++++++---- 2 files changed, 60 insertions(+), 16 deletions(-) rename 102232-4/portal/{L2AccessPDU,ver5.txt => L2AccessPDU,ver6.txt} (80%) diff --git a/102232-4/L2AccessPDU.asn b/102232-4/L2AccessPDU.asn index 0920565..89375ee 100644 --- a/102232-4/L2AccessPDU.asn +++ b/102232-4/L2AccessPDU.asn @@ -1,6 +1,6 @@ L2AccessPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) -li-ps(5) l2Access(4) version5(5)} +li-ps(5) l2Access(4) version6(6)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,9 +9,9 @@ BEGIN -- Object Identifier Definition -- ============================ -l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRI(1)} -l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) cC(2)} -l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRIOnly(3)} +l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRI(1)} +l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) cC(2)} +l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -35,8 +35,10 @@ L2CC ::= SEQUENCE ethernet [5] OCTET STRING, -- The ethernet protocol is used ..., - l2ATM2684 [6] OCTET STRING + l2ATM2684 [6] OCTET STRING, -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used + l2FR2427 [7] OCTET STRING + -- The protocol RFC 2427 Multiprotocol Interconnect over Frame Relay [18] is used } } @@ -55,8 +57,9 @@ L2IRIContents ::= SEQUENCE { accessEventType [0] AccessEventType, internetAccessType [2] InternetAccessType OPTIONAL, - targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, - -- Target network ID (e.g. MAC address, PSTN number) + targetNetworkID [5] UTF8String (SIZE (1..128)) OPTIONAL, + -- Target network ID (e.g. MAC address, PSTN number, additional information from + -- network elements) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, -- CPEID (e.g. Relay Agent info, computer name) targetLocation [7] UTF8String (SIZE (1..64))OPTIONAL, @@ -75,8 +78,11 @@ L2IRIContents ::= SEQUENCE -- The number of octets the target received octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, -- The number of octets the target transmitted - rawAAAData [15] OCTET STRING OPTIONAL + rawAAAData [15] OCTET STRING OPTIONAL, -- Content of the raw AAA record + ..., + authenticationType [16] AuthenticationType OPTIONAL + -- Field used to identify the authentication type to assist with LEMF data validation } AccessEventType ::= ENUMERATED @@ -140,6 +146,22 @@ EndReason ::= ENUMERATED ... } +AuthenticationType ::= ENUMERATED +{ + unknown(0), + -- AAA function for the target service is unknown + static(1), + -- The target service is assigned a static IP address & no AAA expected + radiusAAA(2), + -- AAA function for the target service is provided by RADIUS + dhcpAAA(3), + -- AAA function for the target service is provided by DHCP + diameterAAA(4), + -- AAA function for the target service is provided by DIAMETER + ... +} + + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== diff --git a/102232-4/portal/L2AccessPDU,ver5.txt b/102232-4/portal/L2AccessPDU,ver6.txt similarity index 80% rename from 102232-4/portal/L2AccessPDU,ver5.txt rename to 102232-4/portal/L2AccessPDU,ver6.txt index 0920565..89375ee 100644 --- a/102232-4/portal/L2AccessPDU,ver5.txt +++ b/102232-4/portal/L2AccessPDU,ver6.txt @@ -1,6 +1,6 @@ L2AccessPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) -li-ps(5) l2Access(4) version5(5)} +li-ps(5) l2Access(4) version6(6)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,9 +9,9 @@ BEGIN -- Object Identifier Definition -- ============================ -l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRI(1)} -l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) cC(2)} -l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version5(5) iRIOnly(3)} +l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRI(1)} +l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) cC(2)} +l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -35,8 +35,10 @@ L2CC ::= SEQUENCE ethernet [5] OCTET STRING, -- The ethernet protocol is used ..., - l2ATM2684 [6] OCTET STRING + l2ATM2684 [6] OCTET STRING, -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used + l2FR2427 [7] OCTET STRING + -- The protocol RFC 2427 Multiprotocol Interconnect over Frame Relay [18] is used } } @@ -55,8 +57,9 @@ L2IRIContents ::= SEQUENCE { accessEventType [0] AccessEventType, internetAccessType [2] InternetAccessType OPTIONAL, - targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, - -- Target network ID (e.g. MAC address, PSTN number) + targetNetworkID [5] UTF8String (SIZE (1..128)) OPTIONAL, + -- Target network ID (e.g. MAC address, PSTN number, additional information from + -- network elements) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, -- CPEID (e.g. Relay Agent info, computer name) targetLocation [7] UTF8String (SIZE (1..64))OPTIONAL, @@ -75,8 +78,11 @@ L2IRIContents ::= SEQUENCE -- The number of octets the target received octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, -- The number of octets the target transmitted - rawAAAData [15] OCTET STRING OPTIONAL + rawAAAData [15] OCTET STRING OPTIONAL, -- Content of the raw AAA record + ..., + authenticationType [16] AuthenticationType OPTIONAL + -- Field used to identify the authentication type to assist with LEMF data validation } AccessEventType ::= ENUMERATED @@ -140,6 +146,22 @@ EndReason ::= ENUMERATED ... } +AuthenticationType ::= ENUMERATED +{ + unknown(0), + -- AAA function for the target service is unknown + static(1), + -- The target service is assigned a static IP address & no AAA expected + radiusAAA(2), + -- AAA function for the target service is provided by RADIUS + dhcpAAA(3), + -- AAA function for the target service is provided by DHCP + diameterAAA(4), + -- AAA function for the target service is provided by DIAMETER + ... +} + + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== -- GitLab From b432730c9863848049516eee5d8f4b97147ca89f Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:07 +0100 Subject: [PATCH 055/208] TS 102 232-3 v3.1.1 (2012-02-28) agreed at LI#29 (Dun Laoghaire, 2012-01-24) --- 102232-3/IPAccessPDU.asn | 35 +++++++++++++++---- ...ccessPDU,ver7.txt => IPAccessPDU,ver8.txt} | 35 +++++++++++++++---- 2 files changed, 56 insertions(+), 14 deletions(-) rename 102232-3/portal/{IPAccessPDU,ver7.txt => IPAccessPDU,ver8.txt} (87%) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 9491198..adc177e 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version7(7)} +{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version8(8)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -14,9 +14,9 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -58,7 +58,7 @@ IPIRIContents ::= SEQUENCE -- IP address may not be available in case of failed logon attempts. -- If it is available, it must be sent. -- When iPVersion is iPV4 or iPV6, the IP address is carried by this parameter - -- when iPVersion is iPV4andV6 (Ex : in case of Dual Stack IPv4-IPv6 architecture), + -- when iPVersion is iPV4andV6 (Example: in case of Dual Stack IPv4-IPv6 architecture), -- the additional IP address is carried by parameter additionalIPaddress. targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, -- Target network ID (e.g. MAC address, PSTN number) @@ -93,7 +93,10 @@ IPIRIContents ::= SEQUENCE pOPIPAddress [19] IPAddress OPTIONAL, -- The IP address of the POP nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL, - additionalIPAddress [21] IPAddress OPTIONAL + -- National IP IRI Parameters + additionalIPAddress [21] IPAddress OPTIONAL, + authenticationType [22] AuthenticationType OPTIONAL + -- Field used to identify the authentication type to assist with LEMF data validation } AccessEventType ::= ENUMERATED @@ -137,9 +140,12 @@ InternetAccessType ::= ENUMERATED -- IAS via Fiber access wIMAX-HIPERMAN(7), -- IAS via WIMAX/HIPERMAN (fixed access) - satellite(8) + satellite(8), -- IAS via Satellite access -- (when it is not covered by any 3GPP or ETSI mobile Lawful Interception specifications) + wireless-other(9) + -- IAS via other type of Wireless access + -- (when it is not covered by any 3GPP or ETSI mobile Lawful Interception specifications) } IPVersion ::= ENUMERATED @@ -193,6 +199,21 @@ NationalIPIRIParameters ::= SEQUENCE -- to avoid using tags from 240 to 255 in a formal type definition. } +AuthenticationType ::= ENUMERATED +{ + unknown(0), + -- AAA function for the target service is unknown + static(1), + -- The target service is assigned a static IP address & no AAA expected + radiusAAA(2), + -- AAA function for the target service is provided by RADIUS + dhcpAAA(3), + -- AAA function for the target service is provided by DHCP + diameterAAA(4), + -- AAA function for the target service is provided by DIAMETER + ... +} + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== diff --git a/102232-3/portal/IPAccessPDU,ver7.txt b/102232-3/portal/IPAccessPDU,ver8.txt similarity index 87% rename from 102232-3/portal/IPAccessPDU,ver7.txt rename to 102232-3/portal/IPAccessPDU,ver8.txt index 9491198..adc177e 100644 --- a/102232-3/portal/IPAccessPDU,ver7.txt +++ b/102232-3/portal/IPAccessPDU,ver8.txt @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version7(7)} +{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version8(8)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -14,9 +14,9 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version7(7) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -58,7 +58,7 @@ IPIRIContents ::= SEQUENCE -- IP address may not be available in case of failed logon attempts. -- If it is available, it must be sent. -- When iPVersion is iPV4 or iPV6, the IP address is carried by this parameter - -- when iPVersion is iPV4andV6 (Ex : in case of Dual Stack IPv4-IPv6 architecture), + -- when iPVersion is iPV4andV6 (Example: in case of Dual Stack IPv4-IPv6 architecture), -- the additional IP address is carried by parameter additionalIPaddress. targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, -- Target network ID (e.g. MAC address, PSTN number) @@ -93,7 +93,10 @@ IPIRIContents ::= SEQUENCE pOPIPAddress [19] IPAddress OPTIONAL, -- The IP address of the POP nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL, - additionalIPAddress [21] IPAddress OPTIONAL + -- National IP IRI Parameters + additionalIPAddress [21] IPAddress OPTIONAL, + authenticationType [22] AuthenticationType OPTIONAL + -- Field used to identify the authentication type to assist with LEMF data validation } AccessEventType ::= ENUMERATED @@ -137,9 +140,12 @@ InternetAccessType ::= ENUMERATED -- IAS via Fiber access wIMAX-HIPERMAN(7), -- IAS via WIMAX/HIPERMAN (fixed access) - satellite(8) + satellite(8), -- IAS via Satellite access -- (when it is not covered by any 3GPP or ETSI mobile Lawful Interception specifications) + wireless-other(9) + -- IAS via other type of Wireless access + -- (when it is not covered by any 3GPP or ETSI mobile Lawful Interception specifications) } IPVersion ::= ENUMERATED @@ -193,6 +199,21 @@ NationalIPIRIParameters ::= SEQUENCE -- to avoid using tags from 240 to 255 in a formal type definition. } +AuthenticationType ::= ENUMERATED +{ + unknown(0), + -- AAA function for the target service is unknown + static(1), + -- The target service is assigned a static IP address & no AAA expected + radiusAAA(2), + -- AAA function for the target service is provided by RADIUS + dhcpAAA(3), + -- AAA function for the target service is provided by DHCP + diameterAAA(4), + -- AAA function for the target service is provided by DIAMETER + ... +} + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== -- GitLab From 4285ce0c9ae057b9c20ae75f109949615a63f226 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:11 +0100 Subject: [PATCH 056/208] TS 102 232-2 v3.1.1 (2012-02-28) agreed at LI#29 (Dun Laoghaire, 2012-01-24) --- 102232-2/EmailPDU.asn | 198 ++++++++++++++++-- .../{EmailPDU,ver6.txt => EmailPDU,ver7.txt} | 198 ++++++++++++++++-- 2 files changed, 358 insertions(+), 38 deletions(-) rename 102232-2/portal/{EmailPDU,ver6.txt => EmailPDU,ver7.txt} (51%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index 56f0e73..f607fe0 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version6(6)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version7(7)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -16,8 +16,11 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version6(6) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version6(6) cC(2)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingCC(4)} + -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -26,7 +29,7 @@ emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version6(6) cC(2)} -- Email Communications Contents -- ============================= -EmailCC ::= SEQUENCE +EmailCC ::= SEQUENCE -- EmailCC is the PDU sent for each "piece" of E-mail captured content { emailCCObjId [0] RELATIVE-OID, @@ -35,7 +38,7 @@ EmailCC ::= SEQUENCE -- Network byte order } -Email-Format ::= ENUMERATED +Email-Format ::= ENUMERATED { ip-packet(1), -- When this is the email format, the content will contain the bytes of the IP packet from @@ -50,7 +53,7 @@ Email-Format ::= ENUMERATED -- Intercept-related information for Email -- ======================================= -EmailIRI ::= SEQUENCE +EmailIRI ::= SEQUENCE -- EmailIRI is the PDU sent for each "piece" of E-mail IRI { emailIRIObjId [0] RELATIVE-OID, @@ -90,14 +93,14 @@ EmailIRI ::= SEQUENCE } OPTIONAL } -E-mail-Status ::= ENUMERATED +E-mail-Status ::= ENUMERATED { status-unknown(1), operation-failed(2), operation-succeeded(3) } -E-mail-Event ::= ENUMERATED +E-mail-Event ::= ENUMERATED { e-mail-send(1), e-mail-receive(2), @@ -111,19 +114,19 @@ E-mail-Event ::= ENUMERATED e-mail-upload(9) } -E-mail-Protocol ::= ENUMERATED +E-mail-Protocol ::= ENUMERATED { smtp(1), pop3(2), + imap4(3), undefined(255), -- The protocol is not known or not representable by the current enumeration - ..., - imap4(3) + ... } -E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) +E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) -National-EM-ASN1parameters ::= SEQUENCE +National-EM-ASN1parameters ::= SEQUENCE { countryCode [1] PrintableString (SIZE (2)), -- Country Code according to ISO 3166-1 [12], @@ -134,7 +137,7 @@ National-EM-ASN1parameters ::= SEQUENCE -- extension marker (...) } -AAAInformation ::= CHOICE +AAAInformation ::= CHOICE -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information { pOP3AAAInformation [0] POP3AAAInformation, @@ -143,7 +146,7 @@ AAAInformation ::= CHOICE iMAPAAAInformation [2] IMAPAAAInformation } -POP3AAAInformation ::= SEQUENCE +POP3AAAInformation ::= SEQUENCE -- The POP3AAAInformation field contains the POP3 username & optionally the password { username [0] UTF8String (SIZE (0..64)), @@ -152,7 +155,7 @@ POP3AAAInformation ::= SEQUENCE ... } -ASMTPAAAInformation ::= SEQUENCE +ASMTPAAAInformation ::= SEQUENCE -- The ASMTPAAAInformation field contains the SMTP username and -- optionally the authentication fields { @@ -167,7 +170,7 @@ ASMTPAAAInformation ::= SEQUENCE ... } -IMAPAAAInformation ::= SEQUENCE +IMAPAAAInformation ::= SEQUENCE --- The iMAPAAAInformation field contains the IMAP username & optionally the password { username [0] UTF8String (SIZE (0..64)), @@ -176,7 +179,7 @@ IMAPAAAInformation ::= SEQUENCE ... } -AAAResult ::= ENUMERATED +AAAResult ::= ENUMERATED { resultUnknown(1), aAAFailed(2), @@ -184,7 +187,7 @@ AAAResult ::= ENUMERATED ... } -AAAauthMethod ::= ENUMERATED +AAAauthMethod ::= ENUMERATED { undefinedAuthMethod(1), cramMD5(2), @@ -192,4 +195,161 @@ AAAauthMethod ::= ENUMERATED ... } +-- ================================= +-- Messaging Communications Contents +-- ================================= + +MessagingCC ::= SEQUENCE + -- MessagingCC is the PDU sent for the captured content +{ + messaging-cc-obj-id [0] RELATIVE-OID, + event-identifier [1] INTEGER (0..4294967295), + -- Used to correlate to MessagingIRI within the same CIN + content-type [2] OCTET STRING, + -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA + content [3] OCTET STRING, + ... +} + +-- =========================================== +-- Intercept-related information for Messaging +-- =========================================== + +MessagingIRI ::= SEQUENCE +{ + messaging-iri-obj-id [0] RELATIVE-OID, + system-type [1] Messaging-System-Type, + system-identifier [2] OCTET STRING OPTIONAL, + -- Identifier up to national agreement, uniquely identifies a certain messaging system + category [3] Messaging-Event-Category OPTIONAL, + status [4] Messaging-Status, + party-information [5] SET OF Messaging-Party-Information OPTIONAL, + trigger [6] Messaging-Trigger, + properties [7] SEQUENCE OF Messaging-Property OPTIONAL, + event-identifier [8] INTEGER (0..4294967295) OPTIONAL, + -- Used to correlate to MessagingCC within the same CIN. Mandatory when CC is also sent + original-message [9] OCTET STRING OPTIONAL, + ... +} + +Messaging-System-Type ::= ENUMERATED +{ + unified-messaging(1), + ... +} + +Messaging-Event-Category ::= CHOICE +{ + message [0] Messaging-Event, + message-box [1] Messaging-Box-Event, + message-notification [2] Messaging-Notification-Event, + call [3] Messaging-Call-Event, + ... +} + +Messaging-Event ::= ENUMERATED +{ + deposit(1), + retrieve(2), + delete(3), + save(4), + ... +} + +Messaging-Box-Event ::= ENUMERATED +{ + login(1), + logout(2), + lock(3), + unlock(4), + activate(5), + deactivate(6), + delete(7), + pin-change(8), + greeting-record(9), + greeting-change(10), + greeting-delete(11), + greeting-enable(12), + greeting-disable(13), + notification-enable(14), + notification-disable(15), + disconnect(16), + ... +} + +Messaging-Notification-Event ::= ENUMERATED +{ + sms(1), + sms-deposit(2), + sms-slamdown(3), + sms-pin-reminder(4), + email(5), + fax-to-email(6), + ... +} + +Messaging-Call-Event ::= ENUMERATED +{ + callout(1), + ... +} + +Messaging-Status ::= ENUMERATED +{ + status-unknown(1), + operation-failed(2), + operation-succeeded(3), + operation-cancelled(4), + ... +} + +Messaging-Party-Information ::= SEQUENCE +{ + party-qualifier [0] Messaging-Party-Qualifier, + party-identity [1] Messaging-Party-Identity, + ... +} + +Messaging-Party-Qualifier ::= ENUMERATED +{ + unknown-party(0), + -- In this case the party cannot be classified as either originating or terminating + originating-party(1), + -- In this case, the partyInformation parameter provides the identities related to + -- the originating party and all information provided by this party. + terminating-party(2), + -- In this case, the partyInformation parameter provides the identities related to + -- the terminating party and all information provided by this party. + ... +} + +Messaging-Party-Identity ::= CHOICE +{ + msisdn [0] OCTET STRING (SIZE (1..9)), + -- MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format TS GSM 09.02 [32], clause 14.7.8. + e164-format [1] OCTET STRING (SIZE (1..25)), + -- E.164 address of the node in international format. Coded in the same format as + -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [5]) + email-address [2] E-mail-Address-List, + ... +} + +Messaging-Trigger ::= ENUMERATED +{ + unknown(0), + fixed-device(1), + mobile-device(2), + mobile-application(3), + web-application(4), + network-operator(5), + ... +} + +Messaging-Property ::= CHOICE +{ + pincode [0] OCTET STRING (SIZE (1..8)), + ... +} + END -- end of EmailPDU diff --git a/102232-2/portal/EmailPDU,ver6.txt b/102232-2/portal/EmailPDU,ver7.txt similarity index 51% rename from 102232-2/portal/EmailPDU,ver6.txt rename to 102232-2/portal/EmailPDU,ver7.txt index 56f0e73..f607fe0 100644 --- a/102232-2/portal/EmailPDU,ver6.txt +++ b/102232-2/portal/EmailPDU,ver7.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version6(6)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version7(7)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -16,8 +16,11 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version6(6) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version6(6) cC(2)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingCC(4)} + -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -26,7 +29,7 @@ emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version6(6) cC(2)} -- Email Communications Contents -- ============================= -EmailCC ::= SEQUENCE +EmailCC ::= SEQUENCE -- EmailCC is the PDU sent for each "piece" of E-mail captured content { emailCCObjId [0] RELATIVE-OID, @@ -35,7 +38,7 @@ EmailCC ::= SEQUENCE -- Network byte order } -Email-Format ::= ENUMERATED +Email-Format ::= ENUMERATED { ip-packet(1), -- When this is the email format, the content will contain the bytes of the IP packet from @@ -50,7 +53,7 @@ Email-Format ::= ENUMERATED -- Intercept-related information for Email -- ======================================= -EmailIRI ::= SEQUENCE +EmailIRI ::= SEQUENCE -- EmailIRI is the PDU sent for each "piece" of E-mail IRI { emailIRIObjId [0] RELATIVE-OID, @@ -90,14 +93,14 @@ EmailIRI ::= SEQUENCE } OPTIONAL } -E-mail-Status ::= ENUMERATED +E-mail-Status ::= ENUMERATED { status-unknown(1), operation-failed(2), operation-succeeded(3) } -E-mail-Event ::= ENUMERATED +E-mail-Event ::= ENUMERATED { e-mail-send(1), e-mail-receive(2), @@ -111,19 +114,19 @@ E-mail-Event ::= ENUMERATED e-mail-upload(9) } -E-mail-Protocol ::= ENUMERATED +E-mail-Protocol ::= ENUMERATED { smtp(1), pop3(2), + imap4(3), undefined(255), -- The protocol is not known or not representable by the current enumeration - ..., - imap4(3) + ... } -E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) +E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) -National-EM-ASN1parameters ::= SEQUENCE +National-EM-ASN1parameters ::= SEQUENCE { countryCode [1] PrintableString (SIZE (2)), -- Country Code according to ISO 3166-1 [12], @@ -134,7 +137,7 @@ National-EM-ASN1parameters ::= SEQUENCE -- extension marker (...) } -AAAInformation ::= CHOICE +AAAInformation ::= CHOICE -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information { pOP3AAAInformation [0] POP3AAAInformation, @@ -143,7 +146,7 @@ AAAInformation ::= CHOICE iMAPAAAInformation [2] IMAPAAAInformation } -POP3AAAInformation ::= SEQUENCE +POP3AAAInformation ::= SEQUENCE -- The POP3AAAInformation field contains the POP3 username & optionally the password { username [0] UTF8String (SIZE (0..64)), @@ -152,7 +155,7 @@ POP3AAAInformation ::= SEQUENCE ... } -ASMTPAAAInformation ::= SEQUENCE +ASMTPAAAInformation ::= SEQUENCE -- The ASMTPAAAInformation field contains the SMTP username and -- optionally the authentication fields { @@ -167,7 +170,7 @@ ASMTPAAAInformation ::= SEQUENCE ... } -IMAPAAAInformation ::= SEQUENCE +IMAPAAAInformation ::= SEQUENCE --- The iMAPAAAInformation field contains the IMAP username & optionally the password { username [0] UTF8String (SIZE (0..64)), @@ -176,7 +179,7 @@ IMAPAAAInformation ::= SEQUENCE ... } -AAAResult ::= ENUMERATED +AAAResult ::= ENUMERATED { resultUnknown(1), aAAFailed(2), @@ -184,7 +187,7 @@ AAAResult ::= ENUMERATED ... } -AAAauthMethod ::= ENUMERATED +AAAauthMethod ::= ENUMERATED { undefinedAuthMethod(1), cramMD5(2), @@ -192,4 +195,161 @@ AAAauthMethod ::= ENUMERATED ... } +-- ================================= +-- Messaging Communications Contents +-- ================================= + +MessagingCC ::= SEQUENCE + -- MessagingCC is the PDU sent for the captured content +{ + messaging-cc-obj-id [0] RELATIVE-OID, + event-identifier [1] INTEGER (0..4294967295), + -- Used to correlate to MessagingIRI within the same CIN + content-type [2] OCTET STRING, + -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA + content [3] OCTET STRING, + ... +} + +-- =========================================== +-- Intercept-related information for Messaging +-- =========================================== + +MessagingIRI ::= SEQUENCE +{ + messaging-iri-obj-id [0] RELATIVE-OID, + system-type [1] Messaging-System-Type, + system-identifier [2] OCTET STRING OPTIONAL, + -- Identifier up to national agreement, uniquely identifies a certain messaging system + category [3] Messaging-Event-Category OPTIONAL, + status [4] Messaging-Status, + party-information [5] SET OF Messaging-Party-Information OPTIONAL, + trigger [6] Messaging-Trigger, + properties [7] SEQUENCE OF Messaging-Property OPTIONAL, + event-identifier [8] INTEGER (0..4294967295) OPTIONAL, + -- Used to correlate to MessagingCC within the same CIN. Mandatory when CC is also sent + original-message [9] OCTET STRING OPTIONAL, + ... +} + +Messaging-System-Type ::= ENUMERATED +{ + unified-messaging(1), + ... +} + +Messaging-Event-Category ::= CHOICE +{ + message [0] Messaging-Event, + message-box [1] Messaging-Box-Event, + message-notification [2] Messaging-Notification-Event, + call [3] Messaging-Call-Event, + ... +} + +Messaging-Event ::= ENUMERATED +{ + deposit(1), + retrieve(2), + delete(3), + save(4), + ... +} + +Messaging-Box-Event ::= ENUMERATED +{ + login(1), + logout(2), + lock(3), + unlock(4), + activate(5), + deactivate(6), + delete(7), + pin-change(8), + greeting-record(9), + greeting-change(10), + greeting-delete(11), + greeting-enable(12), + greeting-disable(13), + notification-enable(14), + notification-disable(15), + disconnect(16), + ... +} + +Messaging-Notification-Event ::= ENUMERATED +{ + sms(1), + sms-deposit(2), + sms-slamdown(3), + sms-pin-reminder(4), + email(5), + fax-to-email(6), + ... +} + +Messaging-Call-Event ::= ENUMERATED +{ + callout(1), + ... +} + +Messaging-Status ::= ENUMERATED +{ + status-unknown(1), + operation-failed(2), + operation-succeeded(3), + operation-cancelled(4), + ... +} + +Messaging-Party-Information ::= SEQUENCE +{ + party-qualifier [0] Messaging-Party-Qualifier, + party-identity [1] Messaging-Party-Identity, + ... +} + +Messaging-Party-Qualifier ::= ENUMERATED +{ + unknown-party(0), + -- In this case the party cannot be classified as either originating or terminating + originating-party(1), + -- In this case, the partyInformation parameter provides the identities related to + -- the originating party and all information provided by this party. + terminating-party(2), + -- In this case, the partyInformation parameter provides the identities related to + -- the terminating party and all information provided by this party. + ... +} + +Messaging-Party-Identity ::= CHOICE +{ + msisdn [0] OCTET STRING (SIZE (1..9)), + -- MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format TS GSM 09.02 [32], clause 14.7.8. + e164-format [1] OCTET STRING (SIZE (1..25)), + -- E.164 address of the node in international format. Coded in the same format as + -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [5]) + email-address [2] E-mail-Address-List, + ... +} + +Messaging-Trigger ::= ENUMERATED +{ + unknown(0), + fixed-device(1), + mobile-device(2), + mobile-application(3), + web-application(4), + network-operator(5), + ... +} + +Messaging-Property ::= CHOICE +{ + pincode [0] OCTET STRING (SIZE (1..8)), + ... +} + END -- end of EmailPDU -- GitLab From 5af259d1012add09c5d7ef10a16b0db5e67f2b14 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:21 +0100 Subject: [PATCH 057/208] TS 102 232-6 v3.1.1 (2012-06-28) agreed at LI#30 (Amsterdam, 2012-05-14) --- 102232-6/PstnIsdnPDU.asn | 38 ++++++++++--------- ...IsdnPDU, ver3.txt => PstnIsdnPDU,ver4.txt} | 38 ++++++++++--------- 2 files changed, 40 insertions(+), 36 deletions(-) rename 102232-6/portal/{PstnIsdnPDU, ver3.txt => PstnIsdnPDU,ver4.txt} (75%) diff --git a/102232-6/PstnIsdnPDU.asn b/102232-6/PstnIsdnPDU.asn index 212755a..c9f363d 100644 --- a/102232-6/PstnIsdnPDU.asn +++ b/102232-6/PstnIsdnPDU.asn @@ -1,5 +1,5 @@ PstnIsdnPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version3(3)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,12 +9,12 @@ IMPORTS -- from TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)} -- from TS 102 232-01 [2] PayloadDirection FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version8(8)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version13(13)}; -- ============================ @@ -23,29 +23,29 @@ IMPORTS -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) iRI(1)} -pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) cC(2)} +pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) iRI(1)} +pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) cC(2)} -- =============================== -- Description of the PstnIsdn IRI -- =============================== -PstnIsdnIRI ::= SEQUENCE +PstnIsdnIRI ::= SEQUENCE { - pstnIsdnIRIObjId [0] RELATIVE-OID, - pstnIsdnIRIContents [1] PstnIsdnIRIContents + pstnIsdnIRIObjId [0] RELATIVE-OID, + pstnIsdnIRIContents [1] PstnIsdnIRIContents } -PstnIsdnIRIContents ::= CHOICE +PstnIsdnIRIContents ::= CHOICE { - supplementaryInfo [0] SupplementaryInfo, + supplementaryInfo [0] SupplementaryInfo, ... } -SupplementaryInfo ::= SEQUENCE +SupplementaryInfo ::= SEQUENCE { - informationAppliesTo [0] InformationAppliesTo, + informationAppliesTo [0] InformationAppliesTo, -- Identifies the PDUs to which this info applies mediaFormat [1] INTEGER (0..127), -- As defined in RFC 3551 [10] @@ -66,10 +66,10 @@ SupplementaryInfo ::= SEQUENCE -- May be omitted if all headers are present. } -InformationAppliesTo ::= SEQUENCE +InformationAppliesTo ::= SEQUENCE -- Identifies the PDUs to which a piece of supplementary information applies { - payloadDirection [0] PayloadDirection, + payloadDirection [0] PayloadDirection, -- The direction of the traffic to which this info applies cCLinkID [1] INTEGER (0..65535) OPTIONAL, -- If there are multiple CCLinks, this field states CCLink to which this info applies @@ -78,7 +78,7 @@ InformationAppliesTo ::= SEQUENCE ... } -FrameType ::= ENUMERATED +FrameType ::= ENUMERATED { ipFrame(0), -- All headers are present @@ -88,16 +88,18 @@ FrameType ::= ENUMERATED -- UDP and IP headers are missing audioFrame(3), -- All headers are missing - ... + ..., + artificialRtpFrame(4) + -- UDP and IP headers are missing, artificial RTP frame has been added } -- ============================== -- Description of the PstnIsdn CC -- ============================== -PstnIsdnCC ::= SEQUENCE +PstnIsdnCC ::= SEQUENCE { - pstnIsdnCCObjId [0] RELATIVE-OID, + pstnIsdnCCObjId [0] RELATIVE-OID, pstnIsdnCCContents [1] OCTET STRING, -- See clause 6.2 for definition of format of PstnIsdn CC cCLinkID [2] INTEGER (0..65535) OPTIONAL, diff --git a/102232-6/portal/PstnIsdnPDU, ver3.txt b/102232-6/portal/PstnIsdnPDU,ver4.txt similarity index 75% rename from 102232-6/portal/PstnIsdnPDU, ver3.txt rename to 102232-6/portal/PstnIsdnPDU,ver4.txt index 212755a..c9f363d 100644 --- a/102232-6/portal/PstnIsdnPDU, ver3.txt +++ b/102232-6/portal/PstnIsdnPDU,ver4.txt @@ -1,5 +1,5 @@ PstnIsdnPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version3(3)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,12 +9,12 @@ IMPORTS -- from TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)} -- from TS 102 232-01 [2] PayloadDirection FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version8(8)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version13(13)}; -- ============================ @@ -23,29 +23,29 @@ IMPORTS -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) iRI(1)} -pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version3(3) cC(2)} +pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) iRI(1)} +pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) cC(2)} -- =============================== -- Description of the PstnIsdn IRI -- =============================== -PstnIsdnIRI ::= SEQUENCE +PstnIsdnIRI ::= SEQUENCE { - pstnIsdnIRIObjId [0] RELATIVE-OID, - pstnIsdnIRIContents [1] PstnIsdnIRIContents + pstnIsdnIRIObjId [0] RELATIVE-OID, + pstnIsdnIRIContents [1] PstnIsdnIRIContents } -PstnIsdnIRIContents ::= CHOICE +PstnIsdnIRIContents ::= CHOICE { - supplementaryInfo [0] SupplementaryInfo, + supplementaryInfo [0] SupplementaryInfo, ... } -SupplementaryInfo ::= SEQUENCE +SupplementaryInfo ::= SEQUENCE { - informationAppliesTo [0] InformationAppliesTo, + informationAppliesTo [0] InformationAppliesTo, -- Identifies the PDUs to which this info applies mediaFormat [1] INTEGER (0..127), -- As defined in RFC 3551 [10] @@ -66,10 +66,10 @@ SupplementaryInfo ::= SEQUENCE -- May be omitted if all headers are present. } -InformationAppliesTo ::= SEQUENCE +InformationAppliesTo ::= SEQUENCE -- Identifies the PDUs to which a piece of supplementary information applies { - payloadDirection [0] PayloadDirection, + payloadDirection [0] PayloadDirection, -- The direction of the traffic to which this info applies cCLinkID [1] INTEGER (0..65535) OPTIONAL, -- If there are multiple CCLinks, this field states CCLink to which this info applies @@ -78,7 +78,7 @@ InformationAppliesTo ::= SEQUENCE ... } -FrameType ::= ENUMERATED +FrameType ::= ENUMERATED { ipFrame(0), -- All headers are present @@ -88,16 +88,18 @@ FrameType ::= ENUMERATED -- UDP and IP headers are missing audioFrame(3), -- All headers are missing - ... + ..., + artificialRtpFrame(4) + -- UDP and IP headers are missing, artificial RTP frame has been added } -- ============================== -- Description of the PstnIsdn CC -- ============================== -PstnIsdnCC ::= SEQUENCE +PstnIsdnCC ::= SEQUENCE { - pstnIsdnCCObjId [0] RELATIVE-OID, + pstnIsdnCCObjId [0] RELATIVE-OID, pstnIsdnCCContents [1] OCTET STRING, -- See clause 6.2 for definition of format of PstnIsdn CC cCLinkID [2] INTEGER (0..65535) OPTIONAL, -- GitLab From 01cd4aa3b99c794f2262879c4731b6f1652885e5 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:24 +0100 Subject: [PATCH 058/208] TS 102 232-5 v3.2.1 (2012-06-28) agreed at LI#30 (Amsterdam, 2012-05-14) --- 102232-5/IPMultimediaPDU.asn | 30 +++++++++++-------- ...aPDU,ver5.txt => IPMultimediaPDU,ver6.txt} | 30 +++++++++++-------- 2 files changed, 36 insertions(+), 24 deletions(-) rename 102232-5/portal/{IPMultimediaPDU,ver5.txt => IPMultimediaPDU,ver6.txt} (87%) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 1ce9a63..09f834c 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,5 +1,5 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version5(5)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,14 +8,14 @@ IMPORTS -- from TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; -- ============================ -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version6(6) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version6(6) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -25,9 +25,9 @@ iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) cC(2)} IPMMCC ::= SEQUENCE { - iPMMCCObjId [0] RELATIVE-OID, + iPMMCCObjId [0] RELATIVE-OID, mMCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP/RTCP or MSRP packets + -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets -- Each IPMMCC shall contain one intercepted packet -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. @@ -42,7 +42,7 @@ IPMMCC ::= SEQUENCE -- May be used to correlate each media stream with the relevant SDP media description of IRI -- May contain c= and m= lines extracts for instance mMCCprotocol [4] MMCCprotocol OPTIONAL - -- Used to identify the protocol of packets sent in MMCCContent (RTP, MSRP, etc.) + -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) -- Absence means mMCCContents contains RTP/RTCP packets } @@ -57,8 +57,12 @@ FrameType ::= ENUMERATED audioFrame(3), -- All headers are missing ..., - tcpFrame(4) + tcpFrame(4), -- IP header is missing + artificialRtpFrame(5), + -- UDP and IP headers are missing, artificial RTP frame has been added + udptlFrame(6) + -- UDP and IP headers are missing } MMCCprotocol ::= ENUMERATED @@ -67,7 +71,9 @@ MMCCprotocol ::= ENUMERATED -- mMCCContents parameter contains RTP/RTCP packets mSRP(1), -- mMCCContents parameter contains MSRP packets - ... + ..., + uDPTL(2) + -- mMCCContents parameter contains UDPTL packets } -- ======================================================== @@ -76,7 +82,7 @@ MMCCprotocol ::= ENUMERATED IPMMIRI ::= SEQUENCE { - iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIObjId [0] RELATIVE-OID, iPMMIRIContents [1] IPIRIContents, ... } @@ -97,7 +103,7 @@ IPIRIContents ::= CHOICE SIPMessage ::= SEQUENCE { - iPSourceAddress [0] IPAddress, + iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, sIPContent [2] OCTET STRING, ... @@ -105,7 +111,7 @@ SIPMessage ::= SEQUENCE H323Message ::= SEQUENCE { - iPSourceAddress [0] IPAddress, + iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, h323Content [2] H323MessageContent, ... diff --git a/102232-5/portal/IPMultimediaPDU,ver5.txt b/102232-5/portal/IPMultimediaPDU,ver6.txt similarity index 87% rename from 102232-5/portal/IPMultimediaPDU,ver5.txt rename to 102232-5/portal/IPMultimediaPDU,ver6.txt index 1ce9a63..09f834c 100644 --- a/102232-5/portal/IPMultimediaPDU,ver5.txt +++ b/102232-5/portal/IPMultimediaPDU,ver6.txt @@ -1,5 +1,5 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version5(5)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,14 +8,14 @@ IMPORTS -- from TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; -- ============================ -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version6(6) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version6(6) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -25,9 +25,9 @@ iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) cC(2)} IPMMCC ::= SEQUENCE { - iPMMCCObjId [0] RELATIVE-OID, + iPMMCCObjId [0] RELATIVE-OID, mMCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP/RTCP or MSRP packets + -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets -- Each IPMMCC shall contain one intercepted packet -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. @@ -42,7 +42,7 @@ IPMMCC ::= SEQUENCE -- May be used to correlate each media stream with the relevant SDP media description of IRI -- May contain c= and m= lines extracts for instance mMCCprotocol [4] MMCCprotocol OPTIONAL - -- Used to identify the protocol of packets sent in MMCCContent (RTP, MSRP, etc.) + -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) -- Absence means mMCCContents contains RTP/RTCP packets } @@ -57,8 +57,12 @@ FrameType ::= ENUMERATED audioFrame(3), -- All headers are missing ..., - tcpFrame(4) + tcpFrame(4), -- IP header is missing + artificialRtpFrame(5), + -- UDP and IP headers are missing, artificial RTP frame has been added + udptlFrame(6) + -- UDP and IP headers are missing } MMCCprotocol ::= ENUMERATED @@ -67,7 +71,9 @@ MMCCprotocol ::= ENUMERATED -- mMCCContents parameter contains RTP/RTCP packets mSRP(1), -- mMCCContents parameter contains MSRP packets - ... + ..., + uDPTL(2) + -- mMCCContents parameter contains UDPTL packets } -- ======================================================== @@ -76,7 +82,7 @@ MMCCprotocol ::= ENUMERATED IPMMIRI ::= SEQUENCE { - iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIObjId [0] RELATIVE-OID, iPMMIRIContents [1] IPIRIContents, ... } @@ -97,7 +103,7 @@ IPIRIContents ::= CHOICE SIPMessage ::= SEQUENCE { - iPSourceAddress [0] IPAddress, + iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, sIPContent [2] OCTET STRING, ... @@ -105,7 +111,7 @@ SIPMessage ::= SEQUENCE H323Message ::= SEQUENCE { - iPSourceAddress [0] IPAddress, + iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, h323Content [2] H323MessageContent, ... -- GitLab From 79cd4a058b718b768eccbe78831339f7df58aa28 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:27 +0100 Subject: [PATCH 059/208] TS 102 232-3 v3.2.1 (2012-06-28) agreed at LI#30 (Amsterdam, 2012-05-14) --- 102232-3/IPAccessPDU.asn | 47 +++++++++++++------ ...ccessPDU,ver8.txt => IPAccessPDU,ver9.txt} | 47 +++++++++++++------ 2 files changed, 66 insertions(+), 28 deletions(-) rename 102232-3/portal/{IPAccessPDU,ver8.txt => IPAccessPDU,ver9.txt} (83%) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index adc177e..49fb540 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version8(8)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,15 +8,15 @@ IMPORTS -- from ETSI TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -26,13 +26,13 @@ iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRIOnly(3)} IPCC ::= SEQUENCE { - iPCCObjId [0] RELATIVE-OID, + iPCCObjId [0] RELATIVE-OID, iPCCContents [1] IPCCContents } IPCCContents ::= CHOICE { - iPPackets [0] OCTET STRING, + iPPackets [0] OCTET STRING, ... } @@ -42,7 +42,7 @@ IPCCContents ::= CHOICE IPIRI ::= SEQUENCE { - iPIRIObjId [0] RELATIVE-OID, + iPIRIObjId [0] RELATIVE-OID, iPIRIContents [1] IPIRIContents, ... } @@ -57,9 +57,8 @@ IPIRIContents ::= SEQUENCE targetIPAddress [4] IPAddress OPTIONAL, -- IP address may not be available in case of failed logon attempts. -- If it is available, it must be sent. - -- When iPVersion is iPV4 or iPV6, the IP address is carried by this parameter - -- when iPVersion is iPV4andV6 (Example: in case of Dual Stack IPv4-IPv6 architecture), - -- the additional IP address is carried by parameter additionalIPaddress. + -- This field will carry the first IPv4 or IPv6 target IP address with or without + -- subnet. Use of this field is fully described in section 6.2.1. targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, -- Target network ID (e.g. MAC address, PSTN number) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, @@ -81,7 +80,7 @@ IPIRIContents ::= SEQUENCE -- The number of octets the target received octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, -- The number of octets the target transmitted - rawAAAData [15] OCTET STRING OPTIONAL, + rawAAAData [15] OCTET STRING OPTIONAL, -- Content of the raw AAA record ..., expectedEndTime [16] GeneralizedTime OPTIONAL, @@ -95,8 +94,15 @@ IPIRIContents ::= SEQUENCE nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL, -- National IP IRI Parameters additionalIPAddress [21] IPAddress OPTIONAL, - authenticationType [22] AuthenticationType OPTIONAL + -- This field will carry the first IPv6 target IP address with or without prefix when the + -- iPVersion parameter is set to iPV4andV6. + -- Use of this field is fully described in section 6.2.1 + authenticationType [22] AuthenticationType OPTIONAL, -- Field used to identify the authentication type to assist with LEMF data validation + otherTargetIdentifiers [23] SEQUENCE OF OtherTargetIdentifiers OPTIONAL + -- This parameter will carry the second and subsequent IPv4 or IPv6 target IP addresses + -- It is used when multiple subnet/prefix ranges are assigned to a target service. + -- Use of this field is fully described in section 6.2.1 } AccessEventType ::= ENUMERATED @@ -186,7 +192,7 @@ IPIRIIDType ::= CHOICE NationalIPIRIParameters ::= SEQUENCE { - countryCode [1] PrintableString (SIZE (2)), + countryCode [1] PrintableString (SIZE (2)), -- Country Code according to ISO 3166-1 [16], -- the country to which the parameters inserted after the extension marker apply. ... @@ -214,6 +220,18 @@ AuthenticationType ::= ENUMERATED ... } +OtherTargetIdentifiers ::= CHOICE +{ + -- Additional target identifiers associated with the target service + -- This list is extensible to accommodate other target identifiers which + -- may be required in future. + iPAddress [0] IPAddress, + -- IPAddress imported from TS 101 671 [1]. + -- This can be an IPv4 address (with or without a subnet range defined) or + -- an IPv6 address (with or without a prefix range defined). + ... +} + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== @@ -294,3 +312,4 @@ UDPInformation ::= SEQUENCE } END -- end of IPAccessPDU + diff --git a/102232-3/portal/IPAccessPDU,ver8.txt b/102232-3/portal/IPAccessPDU,ver9.txt similarity index 83% rename from 102232-3/portal/IPAccessPDU,ver8.txt rename to 102232-3/portal/IPAccessPDU,ver9.txt index adc177e..49fb540 100644 --- a/102232-3/portal/IPAccessPDU,ver8.txt +++ b/102232-3/portal/IPAccessPDU,ver9.txt @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) dentified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version8(8)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,15 +8,15 @@ IMPORTS -- from ETSI TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -26,13 +26,13 @@ iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version8(8) iRIOnly(3)} IPCC ::= SEQUENCE { - iPCCObjId [0] RELATIVE-OID, + iPCCObjId [0] RELATIVE-OID, iPCCContents [1] IPCCContents } IPCCContents ::= CHOICE { - iPPackets [0] OCTET STRING, + iPPackets [0] OCTET STRING, ... } @@ -42,7 +42,7 @@ IPCCContents ::= CHOICE IPIRI ::= SEQUENCE { - iPIRIObjId [0] RELATIVE-OID, + iPIRIObjId [0] RELATIVE-OID, iPIRIContents [1] IPIRIContents, ... } @@ -57,9 +57,8 @@ IPIRIContents ::= SEQUENCE targetIPAddress [4] IPAddress OPTIONAL, -- IP address may not be available in case of failed logon attempts. -- If it is available, it must be sent. - -- When iPVersion is iPV4 or iPV6, the IP address is carried by this parameter - -- when iPVersion is iPV4andV6 (Example: in case of Dual Stack IPv4-IPv6 architecture), - -- the additional IP address is carried by parameter additionalIPaddress. + -- This field will carry the first IPv4 or IPv6 target IP address with or without + -- subnet. Use of this field is fully described in section 6.2.1. targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, -- Target network ID (e.g. MAC address, PSTN number) targetCPEID [6] UTF8String (SIZE (1..128)) OPTIONAL, @@ -81,7 +80,7 @@ IPIRIContents ::= SEQUENCE -- The number of octets the target received octetsTransmitted [14] INTEGER (0..18446744073709551615) OPTIONAL, -- The number of octets the target transmitted - rawAAAData [15] OCTET STRING OPTIONAL, + rawAAAData [15] OCTET STRING OPTIONAL, -- Content of the raw AAA record ..., expectedEndTime [16] GeneralizedTime OPTIONAL, @@ -95,8 +94,15 @@ IPIRIContents ::= SEQUENCE nationalIPIRIParameters [20] NationalIPIRIParameters OPTIONAL, -- National IP IRI Parameters additionalIPAddress [21] IPAddress OPTIONAL, - authenticationType [22] AuthenticationType OPTIONAL + -- This field will carry the first IPv6 target IP address with or without prefix when the + -- iPVersion parameter is set to iPV4andV6. + -- Use of this field is fully described in section 6.2.1 + authenticationType [22] AuthenticationType OPTIONAL, -- Field used to identify the authentication type to assist with LEMF data validation + otherTargetIdentifiers [23] SEQUENCE OF OtherTargetIdentifiers OPTIONAL + -- This parameter will carry the second and subsequent IPv4 or IPv6 target IP addresses + -- It is used when multiple subnet/prefix ranges are assigned to a target service. + -- Use of this field is fully described in section 6.2.1 } AccessEventType ::= ENUMERATED @@ -186,7 +192,7 @@ IPIRIIDType ::= CHOICE NationalIPIRIParameters ::= SEQUENCE { - countryCode [1] PrintableString (SIZE (2)), + countryCode [1] PrintableString (SIZE (2)), -- Country Code according to ISO 3166-1 [16], -- the country to which the parameters inserted after the extension marker apply. ... @@ -214,6 +220,18 @@ AuthenticationType ::= ENUMERATED ... } +OtherTargetIdentifiers ::= CHOICE +{ + -- Additional target identifiers associated with the target service + -- This list is extensible to accommodate other target identifiers which + -- may be required in future. + iPAddress [0] IPAddress, + -- IPAddress imported from TS 101 671 [1]. + -- This can be an IPv4 address (with or without a subnet range defined) or + -- an IPv6 address (with or without a prefix range defined). + ... +} + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== @@ -294,3 +312,4 @@ UDPInformation ::= SEQUENCE } END -- end of IPAccessPDU + -- GitLab From f8279429efd641ecf700f851f02a0d564b1a7751 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:31 +0100 Subject: [PATCH 060/208] TS 102 232-2 v3.2.1 (2012-06-28) agreed at LI#30 (Amsterdam, 2012-05-14) --- 102232-2/EmailPDU.asn | 44 +++++++++++-------- .../{EmailPDU,ver7.txt => EmailPDU,ver8.txt} | 44 +++++++++++-------- 2 files changed, 50 insertions(+), 38 deletions(-) rename 102232-2/portal/{EmailPDU,ver7.txt => EmailPDU,ver8.txt} (90%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index f607fe0..f3a73f5 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ -EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version7(7)} +EmailPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,17 +9,17 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -43,7 +43,7 @@ Email-Format ::= ENUMERATED ip-packet(1), -- When this is the email format, the content will contain the bytes of the IP packet from -- the IP header through to the end of the IP packet - -- Meets requirement E.2.7. + -- Meets requirement E.2.7 application(2) -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) -- Meets requirement E.2.8 @@ -205,9 +205,12 @@ MessagingCC ::= SEQUENCE messaging-cc-obj-id [0] RELATIVE-OID, event-identifier [1] INTEGER (0..4294967295), -- Used to correlate to MessagingIRI within the same CIN - content-type [2] OCTET STRING, + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + sequence-number [3] INTEGER (0..4294967295) OPTIONAL, + end-of-sequence [4] BOOLEAN DEFAULT FALSE, + content-type [5] OCTET STRING, -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA - content [3] OCTET STRING, + content [6] OCTET STRING, ... } @@ -253,6 +256,7 @@ Messaging-Event ::= ENUMERATED retrieve(2), delete(3), save(4), + slamdown(5), ... } @@ -274,6 +278,7 @@ Messaging-Box-Event ::= ENUMERATED notification-enable(14), notification-disable(15), disconnect(16), + connect(17), ... } @@ -296,16 +301,18 @@ Messaging-Call-Event ::= ENUMERATED Messaging-Status ::= ENUMERATED { - status-unknown(1), + unknown(0), + not-applicable(1), operation-failed(2), operation-succeeded(3), operation-cancelled(4), + operation-started(5), ... } Messaging-Party-Information ::= SEQUENCE { - party-qualifier [0] Messaging-Party-Qualifier, + party-qualifier [0] Messaging-Party-Qualifier, party-identity [1] Messaging-Party-Identity, ... } @@ -327,10 +334,10 @@ Messaging-Party-Identity ::= CHOICE { msisdn [0] OCTET STRING (SIZE (1..9)), -- MSISDN of the target, encoded in the same format as the AddressString - -- parameters defined in MAP format TS GSM 09.02 [32], clause 14.7.8. + -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. e164-format [1] OCTET STRING (SIZE (1..25)), -- E.164 address of the node in international format. Coded in the same format as - -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [5]) + -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) email-address [2] E-mail-Address-List, ... } @@ -338,11 +345,10 @@ Messaging-Party-Identity ::= CHOICE Messaging-Trigger ::= ENUMERATED { unknown(0), - fixed-device(1), - mobile-device(2), - mobile-application(3), - web-application(4), - network-operator(5), + user(1), + user-agent(2), + system(3), + system-operator(4), ... } diff --git a/102232-2/portal/EmailPDU,ver7.txt b/102232-2/portal/EmailPDU,ver8.txt similarity index 90% rename from 102232-2/portal/EmailPDU,ver7.txt rename to 102232-2/portal/EmailPDU,ver8.txt index f607fe0..f3a73f5 100644 --- a/102232-2/portal/EmailPDU,ver7.txt +++ b/102232-2/portal/EmailPDU,ver8.txt @@ -1,5 +1,5 @@ -EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version7(7)} +EmailPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,17 +9,17 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version7(7) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -43,7 +43,7 @@ Email-Format ::= ENUMERATED ip-packet(1), -- When this is the email format, the content will contain the bytes of the IP packet from -- the IP header through to the end of the IP packet - -- Meets requirement E.2.7. + -- Meets requirement E.2.7 application(2) -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) -- Meets requirement E.2.8 @@ -205,9 +205,12 @@ MessagingCC ::= SEQUENCE messaging-cc-obj-id [0] RELATIVE-OID, event-identifier [1] INTEGER (0..4294967295), -- Used to correlate to MessagingIRI within the same CIN - content-type [2] OCTET STRING, + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + sequence-number [3] INTEGER (0..4294967295) OPTIONAL, + end-of-sequence [4] BOOLEAN DEFAULT FALSE, + content-type [5] OCTET STRING, -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA - content [3] OCTET STRING, + content [6] OCTET STRING, ... } @@ -253,6 +256,7 @@ Messaging-Event ::= ENUMERATED retrieve(2), delete(3), save(4), + slamdown(5), ... } @@ -274,6 +278,7 @@ Messaging-Box-Event ::= ENUMERATED notification-enable(14), notification-disable(15), disconnect(16), + connect(17), ... } @@ -296,16 +301,18 @@ Messaging-Call-Event ::= ENUMERATED Messaging-Status ::= ENUMERATED { - status-unknown(1), + unknown(0), + not-applicable(1), operation-failed(2), operation-succeeded(3), operation-cancelled(4), + operation-started(5), ... } Messaging-Party-Information ::= SEQUENCE { - party-qualifier [0] Messaging-Party-Qualifier, + party-qualifier [0] Messaging-Party-Qualifier, party-identity [1] Messaging-Party-Identity, ... } @@ -327,10 +334,10 @@ Messaging-Party-Identity ::= CHOICE { msisdn [0] OCTET STRING (SIZE (1..9)), -- MSISDN of the target, encoded in the same format as the AddressString - -- parameters defined in MAP format TS GSM 09.02 [32], clause 14.7.8. + -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. e164-format [1] OCTET STRING (SIZE (1..25)), -- E.164 address of the node in international format. Coded in the same format as - -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [5]) + -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) email-address [2] E-mail-Address-List, ... } @@ -338,11 +345,10 @@ Messaging-Party-Identity ::= CHOICE Messaging-Trigger ::= ENUMERATED { unknown(0), - fixed-device(1), - mobile-device(2), - mobile-application(3), - web-application(4), - network-operator(5), + user(1), + user-agent(2), + system(3), + system-operator(4), ... } -- GitLab From b18c69c9933afdb10cf924ac6f5120f02a1179a2 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:44 +0100 Subject: [PATCH 061/208] TS 102 232-1 v3.1.1 (2012-06-28) agreed at LI#30 (Amsterdam, 2012-05-14) --- 102232-1/LI-PS-PDU.asn | 66 +++++++++++++------ ...PS-PDU,ver12,2.txt => LI-PS-PDU,ver13.txt} | 66 +++++++++++++------ 2 files changed, 90 insertions(+), 42 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver12,2.txt => LI-PS-PDU,ver13.txt} (88%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 721b58d..beb3f35 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ -LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version12(12)} +LI-PS-PDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version13(13)} DEFINITIONS IMPLICIT TAGS ::= @@ -23,35 +23,37 @@ IMPORTS -- from TS 102 232-02 [5] EmailCC, - EmailIRI + EmailIRI, + MessagingCC, + MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version5(5)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version6(6)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)} -- from TS 102 232-04 [32] L2CC, L2IRI, L2IRIOnly FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version5(5)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version6(6)} -- from TS 102 232-05 [37] IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version4(4)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)} -- from TS 102 232-06 [36] PstnIsdnCC, PstnIsdnIRI FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version3(3)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)} -- from 3GPP TS 33.108 [9] IRI-Parameters, @@ -70,6 +72,14 @@ IMPORTS -- The relevant module (including the UMTS release and version number) needs -- to be chosen when compiling the application. + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + EpsIRIsContent + FROM EpsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} + -- The relevant module (including the UMTS release and version number) needs + -- to be chosen when compiling the application. + -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, TTRAFFIC, @@ -103,7 +113,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version12(12)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version13(13)} -- ==================== -- Top-level definition @@ -140,7 +150,7 @@ Payload ::= CHOICE tRIPayload [2] TRIPayload, ..., hI1-Operation [3] HI1-Operation, - encryptionHeader [4] EncryptionHeader + encryptionContainer [4] EncryptionContainer } TimeStampQualifier ::= ENUMERATED @@ -224,7 +234,9 @@ CCContents ::= CHOICE cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + messagingCC [14] MessagingCC, + ePSCC [15] OCTET STRING } MicroSecondTimeStamp ::= SEQUENCE @@ -274,7 +286,9 @@ IRIContents ::= CHOICE pstnIsdnIRI [10] PstnIsdnIRI, iPMMIRI [11] IPMMIRI, lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, - cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage + cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, + messagingIRI [14] MessagingIRI, + ePSIRI [15] EPSIRI } UMTSIRI ::= CHOICE @@ -295,6 +309,14 @@ ETSI671IRI ::= CHOICE ... } +EPSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, + ... +} + -- =========================== -- Definitions for TRI Payload -- =========================== @@ -367,14 +389,14 @@ OperatorLeaMessagePriority ::= ENUMERATED } -- ================================ --- Definitions for EncryptionHeader +-- Definitions for EncryptionContainer -- ================================ -EncryptionHeader ::= SEQUENCE +EncryptionContainer ::= SEQUENCE { encryptionType [0] EncryptionType, encryptedPayload [1] OCTET STRING, - -- once decrypted, it can be interpreted as payload [1] EncryptedPayload + -- once decrypted, it can be interpreted as EncryptedPayload ..., encryptedPayloadType [2] EncryptedPayloadType OPTIONAL } @@ -382,8 +404,7 @@ EncryptionHeader ::= SEQUENCE EncryptionType ::= ENUMERATED { none(1), - -- No encryption is applied. This option can be used for testing or to store data at the - -- LEMF after decryption + -- No encryption is applied. national-option(2), -- Use this option when an encryption scheme is negotiated on a national level aES-192-CBC(3), @@ -402,23 +423,25 @@ EncryptionType ::= ENUMERATED EncryptedPayload ::= SEQUENCE { byteCounter [0] INTEGER (0..18446744073709551615), - -- The sum of the sizes of all transferred PDUs before this PDU. + -- The sum of the sizes of all PDUs before this PDU. -- It is initialized with the unixTime (number of seconds since 01-01-1970) -- multiplied by 2^32 at first use. -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) - -- is defined to be the size of the PDU after BER encoding: + -- as defined in Annex I: -- 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, - ... + ... } EncryptedPayloadType ::= ENUMERATED { - unknown(1), + unknown(0), + part1(1), + -- encrypted payload is TS 102 232 part 1 part2(2), -- encrypted payload is TS 102 232 part 2 [5] part3(3), @@ -435,3 +458,4 @@ EncryptedPayloadType ::= ENUMERATED } END --end of LI-PS-PDU + diff --git a/102232-1/portal/LI-PS-PDU,ver12,2.txt b/102232-1/portal/LI-PS-PDU,ver13.txt similarity index 88% rename from 102232-1/portal/LI-PS-PDU,ver12,2.txt rename to 102232-1/portal/LI-PS-PDU,ver13.txt index 721b58d..beb3f35 100644 --- a/102232-1/portal/LI-PS-PDU,ver12,2.txt +++ b/102232-1/portal/LI-PS-PDU,ver13.txt @@ -1,5 +1,5 @@ -LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version12(12)} +LI-PS-PDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version13(13)} DEFINITIONS IMPLICIT TAGS ::= @@ -23,35 +23,37 @@ IMPORTS -- from TS 102 232-02 [5] EmailCC, - EmailIRI + EmailIRI, + MessagingCC, + MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version5(5)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version6(6)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)} -- from TS 102 232-04 [32] L2CC, L2IRI, L2IRIOnly FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version5(5)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version6(6)} -- from TS 102 232-05 [37] IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version4(4)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)} -- from TS 102 232-06 [36] PstnIsdnCC, PstnIsdnIRI FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version3(3)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)} -- from 3GPP TS 33.108 [9] IRI-Parameters, @@ -70,6 +72,14 @@ IMPORTS -- The relevant module (including the UMTS release and version number) needs -- to be chosen when compiling the application. + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + EpsIRIsContent + FROM EpsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} + -- The relevant module (including the UMTS release and version number) needs + -- to be chosen when compiling the application. + -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, TTRAFFIC, @@ -103,7 +113,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version12(12)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version13(13)} -- ==================== -- Top-level definition @@ -140,7 +150,7 @@ Payload ::= CHOICE tRIPayload [2] TRIPayload, ..., hI1-Operation [3] HI1-Operation, - encryptionHeader [4] EncryptionHeader + encryptionContainer [4] EncryptionContainer } TimeStampQualifier ::= ENUMERATED @@ -224,7 +234,9 @@ CCContents ::= CHOICE cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + messagingCC [14] MessagingCC, + ePSCC [15] OCTET STRING } MicroSecondTimeStamp ::= SEQUENCE @@ -274,7 +286,9 @@ IRIContents ::= CHOICE pstnIsdnIRI [10] PstnIsdnIRI, iPMMIRI [11] IPMMIRI, lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, - cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage + cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, + messagingIRI [14] MessagingIRI, + ePSIRI [15] EPSIRI } UMTSIRI ::= CHOICE @@ -295,6 +309,14 @@ ETSI671IRI ::= CHOICE ... } +EPSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, + ... +} + -- =========================== -- Definitions for TRI Payload -- =========================== @@ -367,14 +389,14 @@ OperatorLeaMessagePriority ::= ENUMERATED } -- ================================ --- Definitions for EncryptionHeader +-- Definitions for EncryptionContainer -- ================================ -EncryptionHeader ::= SEQUENCE +EncryptionContainer ::= SEQUENCE { encryptionType [0] EncryptionType, encryptedPayload [1] OCTET STRING, - -- once decrypted, it can be interpreted as payload [1] EncryptedPayload + -- once decrypted, it can be interpreted as EncryptedPayload ..., encryptedPayloadType [2] EncryptedPayloadType OPTIONAL } @@ -382,8 +404,7 @@ EncryptionHeader ::= SEQUENCE EncryptionType ::= ENUMERATED { none(1), - -- No encryption is applied. This option can be used for testing or to store data at the - -- LEMF after decryption + -- No encryption is applied. national-option(2), -- Use this option when an encryption scheme is negotiated on a national level aES-192-CBC(3), @@ -402,23 +423,25 @@ EncryptionType ::= ENUMERATED EncryptedPayload ::= SEQUENCE { byteCounter [0] INTEGER (0..18446744073709551615), - -- The sum of the sizes of all transferred PDUs before this PDU. + -- The sum of the sizes of all PDUs before this PDU. -- It is initialized with the unixTime (number of seconds since 01-01-1970) -- multiplied by 2^32 at first use. -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) - -- is defined to be the size of the PDU after BER encoding: + -- as defined in Annex I: -- 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, - ... + ... } EncryptedPayloadType ::= ENUMERATED { - unknown(1), + unknown(0), + part1(1), + -- encrypted payload is TS 102 232 part 1 part2(2), -- encrypted payload is TS 102 232 part 2 [5] part3(3), @@ -435,3 +458,4 @@ EncryptedPayloadType ::= ENUMERATED } END --end of LI-PS-PDU + -- GitLab From d4191bdc6ab8ce28bea349a59977e6211030e159 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:51 +0100 Subject: [PATCH 062/208] TS 102 657 v1.10.1 (2012-09-28) agreed at LI#31 (Split, 2012-09-25) --- 102657/RDMessage.asn | 63 +++++++++++++------ 102657/RDMessage.xsd | 52 ++++++++++++--- ...RDMessage,ver9.txt => RDMessage,ver10.txt} | 63 +++++++++++++------ ...RDMessage,ver9.xsd => RDMessage,ver10.xsd} | 52 ++++++++++++--- 4 files changed, 180 insertions(+), 50 deletions(-) rename 102657/portal/{RDMessage,ver9.txt => RDMessage,ver10.txt} (97%) rename 102657/portal/{RDMessage,ver9.xsd => RDMessage,ver10.xsd} (98%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 9ca87ae..9bc7dd6 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version9(9)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version10(10)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version9(9)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version10(10)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -28,7 +28,6 @@ RetainedDataMessage ::= SEQUENCE -- retainedDataPayload) ... } - -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -81,7 +80,9 @@ RetainedDataPayload ::= CHOICE getstatusMessage [8] GetStatusMessage, statusMessage [9] StatusMessage, getResultsMessage [10] GetResultsMessage, - ... + ..., + supplementaryRequest [11] SupplementaryRequest, + supplementaryResponse [12] SupplementaryResponse } -- ================================================== @@ -312,6 +313,41 @@ NationalRecordPayload ::= SEQUENCE ... } +SupplementaryRequest ::= CHOICE +{ + nationalSupplementaryRequest [1] NationalSupplementaryRequest, + ... +} + +SupplementaryResponse ::= CHOICE +{ + nationalSupplementaryResponse [1] NationalSupplementaryResponse, + ... +} + +NationalSupplementaryRequest ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- Country Code according to ISO 3166-1 [4], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that a version indicator is included. +} + +NationalSupplementaryResponse ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- Country Code according to ISO 3166-1 [4], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that a version indicator is included. +} TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -457,7 +493,6 @@ BillingMethod ::= ENUMERATED prepaid(2), ... } - TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -644,8 +679,6 @@ TelephonyPartyInformation ::= SEQUENCE -- List of cell locations used by this party during the service usage communicationTime [6] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [7] UTF8String OPTIONAL, - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [8] IMSI OPTIONAL, natureOfAddress [9] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" @@ -1061,7 +1094,7 @@ Location ::= SEQUENCE -- format: PLMN-ID 3 octets (no. 1-3) -- LAC 2 octets (no. 4-5) -- SAC 2 octets (no. 6-7) - -- (according to 3GPP TS 23.003 [30]) + -- (according to 3GPP TS 25.413 [31]) oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI @@ -1270,7 +1303,6 @@ HorizontalExtent ::= INTEGER PartyNumber ::= UTF8String -- E.164 address of the party in international format - MessageRecord ::= CHOICE { msgSubscriber [1] MsgSubscriber, @@ -1449,7 +1481,7 @@ MsgBillingRecords ::= SEQUENCE currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, - -- i.e. credit card etc. + -- i.e. credit card etc. nationalMsgBillingRecords [6] NationalMsgBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements @@ -1468,7 +1500,6 @@ NationalMsgBillingRecords ::= SEQUENCE -- see comment in NationalRequestParameters ... } - MultimediaRecord ::= CHOICE { multimediaSubscriber [1] MultimediaSubscriber, @@ -1585,8 +1616,6 @@ MultimediaPartyInformation ::= SEQUENCE subscriberID [3] MultimediaSubscriberID OPTIONAL, communicationTime [4] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [5] UTF8String OPTIONAL, - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [6] IMSI OPTIONAL, natureOfAddress [7] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" @@ -1780,7 +1809,6 @@ NationalMultimediaMediaComponent ::= SEQUENCE -- see comment in NationalRequestParameters ... } - NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -1902,7 +1930,7 @@ NAEndReason ::= ENUMERATED userDisconnect(2), -- e.g. user logs off networkDisconnect(3), - -- e.g. users time/credits have been used up + -- e.g. user's time/credits have been used up networkError(4), ... } @@ -1946,10 +1974,9 @@ GprsInformation ::= SEQUENCE pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, -- format as per TS 101 671 [6] ..., - gPRSEvent [8] GPRSEvent OPTIONAL, + gPRSEvent [8] GPRSEvent OPTIONAL -- format as per 3GPP TS 33.108 [11] - iCCID [9] UTF8String OPTIONAL - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format + -- Tag [9] was used in the past and shall not be reused. } GPRSEvent ::= ENUMERATED diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index e1e1f7c..04f9a72 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.9.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.10.1 @@ -792,7 +792,6 @@ - @@ -1780,7 +1779,6 @@ - @@ -2060,6 +2058,8 @@ + + @@ -2192,7 +2192,6 @@ - @@ -2442,5 +2441,44 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/102657/portal/RDMessage,ver9.txt b/102657/portal/RDMessage,ver10.txt similarity index 97% rename from 102657/portal/RDMessage,ver9.txt rename to 102657/portal/RDMessage,ver10.txt index 9ca87ae..9bc7dd6 100644 --- a/102657/portal/RDMessage,ver9.txt +++ b/102657/portal/RDMessage,ver10.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version9(9)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version10(10)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version9(9)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version10(10)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -28,7 +28,6 @@ RetainedDataMessage ::= SEQUENCE -- retainedDataPayload) ... } - -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -81,7 +80,9 @@ RetainedDataPayload ::= CHOICE getstatusMessage [8] GetStatusMessage, statusMessage [9] StatusMessage, getResultsMessage [10] GetResultsMessage, - ... + ..., + supplementaryRequest [11] SupplementaryRequest, + supplementaryResponse [12] SupplementaryResponse } -- ================================================== @@ -312,6 +313,41 @@ NationalRecordPayload ::= SEQUENCE ... } +SupplementaryRequest ::= CHOICE +{ + nationalSupplementaryRequest [1] NationalSupplementaryRequest, + ... +} + +SupplementaryResponse ::= CHOICE +{ + nationalSupplementaryResponse [1] NationalSupplementaryResponse, + ... +} + +NationalSupplementaryRequest ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- Country Code according to ISO 3166-1 [4], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that a version indicator is included. +} + +NationalSupplementaryResponse ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- Country Code according to ISO 3166-1 [4], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that a version indicator is included. +} TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -457,7 +493,6 @@ BillingMethod ::= ENUMERATED prepaid(2), ... } - TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -644,8 +679,6 @@ TelephonyPartyInformation ::= SEQUENCE -- List of cell locations used by this party during the service usage communicationTime [6] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [7] UTF8String OPTIONAL, - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [8] IMSI OPTIONAL, natureOfAddress [9] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" @@ -1061,7 +1094,7 @@ Location ::= SEQUENCE -- format: PLMN-ID 3 octets (no. 1-3) -- LAC 2 octets (no. 4-5) -- SAC 2 octets (no. 6-7) - -- (according to 3GPP TS 23.003 [30]) + -- (according to 3GPP TS 25.413 [31]) oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI @@ -1270,7 +1303,6 @@ HorizontalExtent ::= INTEGER PartyNumber ::= UTF8String -- E.164 address of the party in international format - MessageRecord ::= CHOICE { msgSubscriber [1] MsgSubscriber, @@ -1449,7 +1481,7 @@ MsgBillingRecords ::= SEQUENCE currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, - -- i.e. credit card etc. + -- i.e. credit card etc. nationalMsgBillingRecords [6] NationalMsgBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements @@ -1468,7 +1500,6 @@ NationalMsgBillingRecords ::= SEQUENCE -- see comment in NationalRequestParameters ... } - MultimediaRecord ::= CHOICE { multimediaSubscriber [1] MultimediaSubscriber, @@ -1585,8 +1616,6 @@ MultimediaPartyInformation ::= SEQUENCE subscriberID [3] MultimediaSubscriberID OPTIONAL, communicationTime [4] TimeSpan OPTIONAL, -- Time and duration of the communication - iCCID [5] UTF8String OPTIONAL, - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format iMSI [6] IMSI OPTIONAL, natureOfAddress [7] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" @@ -1780,7 +1809,6 @@ NationalMultimediaMediaComponent ::= SEQUENCE -- see comment in NationalRequestParameters ... } - NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -1902,7 +1930,7 @@ NAEndReason ::= ENUMERATED userDisconnect(2), -- e.g. user logs off networkDisconnect(3), - -- e.g. users time/credits have been used up + -- e.g. user's time/credits have been used up networkError(4), ... } @@ -1946,10 +1974,9 @@ GprsInformation ::= SEQUENCE pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, -- format as per TS 101 671 [6] ..., - gPRSEvent [8] GPRSEvent OPTIONAL, + gPRSEvent [8] GPRSEvent OPTIONAL -- format as per 3GPP TS 33.108 [11] - iCCID [9] UTF8String OPTIONAL - -- Integrated Circuit Card ID (ICCID) number of the party, in ASCII format + -- Tag [9] was used in the past and shall not be reused. } GPRSEvent ::= ENUMERATED diff --git a/102657/portal/RDMessage,ver9.xsd b/102657/portal/RDMessage,ver10.xsd similarity index 98% rename from 102657/portal/RDMessage,ver9.xsd rename to 102657/portal/RDMessage,ver10.xsd index e1e1f7c..04f9a72 100644 --- a/102657/portal/RDMessage,ver9.xsd +++ b/102657/portal/RDMessage,ver10.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.9.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.10.1 @@ -792,7 +792,6 @@ - @@ -1780,7 +1779,6 @@ - @@ -2060,6 +2058,8 @@ + + @@ -2192,7 +2192,6 @@ - @@ -2442,5 +2441,44 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- GitLab From cea02d9ad46d431965c660e2c96e7d5b6ff09e93 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:55 +0100 Subject: [PATCH 063/208] TS 102 657 v1.11.1 (2012-11-21) agreed at LI#31 (Split, 2012-09-25) --- 102657/RDMessage.asn | 79 ++++++++++++++++- 102657/RDMessage.xsd | 87 ++++++++++++++++++- ...DMessage,ver10.txt => RDMessage,ver11.txt} | 79 ++++++++++++++++- ...DMessage,ver10.xsd => RDMessage,ver11.xsd} | 87 ++++++++++++++++++- 4 files changed, 318 insertions(+), 14 deletions(-) rename 102657/portal/{RDMessage,ver10.txt => RDMessage,ver11.txt} (95%) rename 102657/portal/{RDMessage,ver10.xsd => RDMessage,ver11.xsd} (96%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 9bc7dd6..12b1295 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version10(10)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version11(11)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version10(10)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version11(11)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -1102,7 +1102,9 @@ Location ::= SEQUENCE -- This parameter is duplicated from 3GPP TS 33.108 [11] ..., postalLocation [8] AddressInformation OPTIONAL, - extendedLocation [9] ExtendedLocation OPTIONAL + extendedLocation [9] ExtendedLocation OPTIONAL, + userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL + -- coded according to 3GPP TS 29.274 [32]; the type IE is not included } GSMLocation ::= CHOICE @@ -1919,8 +1921,9 @@ NAServiceUsage ::= SEQUENCE octetsDownloaded [12] INTEGER OPTIONAL, octetsUploaded [13] INTEGER OPTIONAL, endReason [14] NAEndReason OPTIONAL, - subscriberID [15] NaSubscriberID OPTIONAL + subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access + ePSInformation [16] EPSInformation OPTIONAL } NAEndReason ::= ENUMERATED @@ -1992,6 +1995,74 @@ GPRSEvent ::= ENUMERATED ... } +EPSInformation ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, + mSISDN [3] PartyNumber OPTIONAL, + iMEISV [4] IMEI OPTIONAL, + s-GWAddress [5] IPAddress OPTIONAL, + p-GWAddress [6] IPAddress OPTIONAL, + p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL, + aPNNetworkID [8] AccessPointNameNI OPTIONAL, + pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL, + -- PDN/PDP Type number as defined in 3GPP TS 29.274 Clause 8.34 + pDP-PDNAddress [10] IPAddress OPTIONAL, + -- IP address allocated to the PDP context / PDN connection + -- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix + -- when PDP/PDN Type is IPv6 or IPv4v6. + pDP-PDNAddressExtension [11] IPAddress OPTIONAL, + -- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6 + dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL, + dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, + rATType [14] INTEGER (0..255), + -- RAT Type coding according to 3GPP TS 29.274 clause 8.17 + ePSEvent [15] EPSEvent OPTIONAL, + ... +} + +IMSIUnauthenticatedFlag ::= BOOLEAN +-- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI + +P-GWPLMN-ID ::= OCTET STRING (SIZE (3)) +-- This is a copy from the Tracking Area Identity (TAI) IE +-- specified in TS 29.274 clause 8.21.4: +-- Bits 8 7 6 5 4 3 2 1 +-- 1st OCTET MCC digit 2 MCC digit 1 +-- 2nd OCTET MNC digit 3 MCC digit 3 +-- 3rd OCTET MNC digit 2 MNC digit 1 + +AccessPointNameNI ::= IA5String (SIZE(1..63)) +-- Network Identifier part of APN in dot representation. +-- For example, if the complete APN is +-- 'apn1a.apn1b.apn1c.mnc022.mcc111.gprs' +-- NI is 'apn1a.apn1b.apn1c' + +DynamicAddressFlag ::= BOOLEAN +-- TRUE if the PDP/PDN address is dynamic. +-- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6 + +DynamicAddressFlagExt ::= BOOLEAN +-- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated +-- during IP CAN bearer activation, initial attach and UE requested +-- PDN connectivity with PDP/PDN type IPv4v6. +-- FALSE if IPv4 address is static. + + +EPSEvent ::= ENUMERATED +-- The list of EPSEvent below is partly taken from 3GPP TS 33.108 +-- EpsHI2Operations from the EPSEvent ::=ENUMERATED module +{ + e-UTRANAttach (16), + e-UTRANDetach (17), + bearerActivation (18), + bearerModification (20), + bearerDeactivation (21), + trackingAreaUpdate (25), + servingEvolvedPacketSystem (26), + ... +} + -- ==================================== -- Definitions of Network Access Device -- ==================================== diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 04f9a72..36a743f 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.10.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.11.1 @@ -1310,6 +1310,14 @@ + + + + + + + + @@ -1815,10 +1823,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/102657/portal/RDMessage,ver10.txt b/102657/portal/RDMessage,ver11.txt similarity index 95% rename from 102657/portal/RDMessage,ver10.txt rename to 102657/portal/RDMessage,ver11.txt index 9bc7dd6..12b1295 100644 --- a/102657/portal/RDMessage,ver10.txt +++ b/102657/portal/RDMessage,ver11.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version10(10)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version11(11)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version10(10)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version11(11)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -1102,7 +1102,9 @@ Location ::= SEQUENCE -- This parameter is duplicated from 3GPP TS 33.108 [11] ..., postalLocation [8] AddressInformation OPTIONAL, - extendedLocation [9] ExtendedLocation OPTIONAL + extendedLocation [9] ExtendedLocation OPTIONAL, + userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL + -- coded according to 3GPP TS 29.274 [32]; the type IE is not included } GSMLocation ::= CHOICE @@ -1919,8 +1921,9 @@ NAServiceUsage ::= SEQUENCE octetsDownloaded [12] INTEGER OPTIONAL, octetsUploaded [13] INTEGER OPTIONAL, endReason [14] NAEndReason OPTIONAL, - subscriberID [15] NaSubscriberID OPTIONAL + subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access + ePSInformation [16] EPSInformation OPTIONAL } NAEndReason ::= ENUMERATED @@ -1992,6 +1995,74 @@ GPRSEvent ::= ENUMERATED ... } +EPSInformation ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, + mSISDN [3] PartyNumber OPTIONAL, + iMEISV [4] IMEI OPTIONAL, + s-GWAddress [5] IPAddress OPTIONAL, + p-GWAddress [6] IPAddress OPTIONAL, + p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL, + aPNNetworkID [8] AccessPointNameNI OPTIONAL, + pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL, + -- PDN/PDP Type number as defined in 3GPP TS 29.274 Clause 8.34 + pDP-PDNAddress [10] IPAddress OPTIONAL, + -- IP address allocated to the PDP context / PDN connection + -- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix + -- when PDP/PDN Type is IPv6 or IPv4v6. + pDP-PDNAddressExtension [11] IPAddress OPTIONAL, + -- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6 + dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL, + dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, + rATType [14] INTEGER (0..255), + -- RAT Type coding according to 3GPP TS 29.274 clause 8.17 + ePSEvent [15] EPSEvent OPTIONAL, + ... +} + +IMSIUnauthenticatedFlag ::= BOOLEAN +-- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI + +P-GWPLMN-ID ::= OCTET STRING (SIZE (3)) +-- This is a copy from the Tracking Area Identity (TAI) IE +-- specified in TS 29.274 clause 8.21.4: +-- Bits 8 7 6 5 4 3 2 1 +-- 1st OCTET MCC digit 2 MCC digit 1 +-- 2nd OCTET MNC digit 3 MCC digit 3 +-- 3rd OCTET MNC digit 2 MNC digit 1 + +AccessPointNameNI ::= IA5String (SIZE(1..63)) +-- Network Identifier part of APN in dot representation. +-- For example, if the complete APN is +-- 'apn1a.apn1b.apn1c.mnc022.mcc111.gprs' +-- NI is 'apn1a.apn1b.apn1c' + +DynamicAddressFlag ::= BOOLEAN +-- TRUE if the PDP/PDN address is dynamic. +-- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6 + +DynamicAddressFlagExt ::= BOOLEAN +-- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated +-- during IP CAN bearer activation, initial attach and UE requested +-- PDN connectivity with PDP/PDN type IPv4v6. +-- FALSE if IPv4 address is static. + + +EPSEvent ::= ENUMERATED +-- The list of EPSEvent below is partly taken from 3GPP TS 33.108 +-- EpsHI2Operations from the EPSEvent ::=ENUMERATED module +{ + e-UTRANAttach (16), + e-UTRANDetach (17), + bearerActivation (18), + bearerModification (20), + bearerDeactivation (21), + trackingAreaUpdate (25), + servingEvolvedPacketSystem (26), + ... +} + -- ==================================== -- Definitions of Network Access Device -- ==================================== diff --git a/102657/portal/RDMessage,ver10.xsd b/102657/portal/RDMessage,ver11.xsd similarity index 96% rename from 102657/portal/RDMessage,ver10.xsd rename to 102657/portal/RDMessage,ver11.xsd index 04f9a72..36a743f 100644 --- a/102657/portal/RDMessage,ver10.xsd +++ b/102657/portal/RDMessage,ver11.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.10.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.11.1 @@ -1310,6 +1310,14 @@ + + + + + + + + @@ -1815,10 +1823,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 306de33130a80f614910a47c38b1f6f24421c9f5 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:58 +0100 Subject: [PATCH 064/208] TS 102 232-2 v3.3.1 (2012-11-19) agreed at LI#31 (Split, 2012-09-25) --- 102232-2/EmailPDU.asn | 63 +++++++++++++++---- .../{EmailPDU,ver8.txt => EmailPDU,ver9.txt} | 63 +++++++++++++++---- 2 files changed, 104 insertions(+), 22 deletions(-) rename 102232-2/portal/{EmailPDU,ver8.txt => EmailPDU,ver9.txt} (87%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index f3a73f5..284c1e6 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,17 +9,17 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -232,7 +232,8 @@ MessagingIRI ::= SEQUENCE event-identifier [8] INTEGER (0..4294967295) OPTIONAL, -- Used to correlate to MessagingCC within the same CIN. Mandatory when CC is also sent original-message [9] OCTET STRING OPTIONAL, - ... + ..., + box-identifier [10] OCTET STRING OPTIONAL } Messaging-System-Type ::= ENUMERATED @@ -279,7 +280,11 @@ Messaging-Box-Event ::= ENUMERATED notification-disable(15), disconnect(16), connect(17), - ... + ..., + greeting-play(18), + language-change(19), + pin-security-enable(20), + pin-security-disable(21) } Messaging-Notification-Event ::= ENUMERATED @@ -327,7 +332,10 @@ Messaging-Party-Qualifier ::= ENUMERATED terminating-party(2), -- In this case, the partyInformation parameter provides the identities related to -- the terminating party and all information provided by this party. - ... + ..., + associated-party(3) + -- In this case, the partyInformation parameter provides the identites related to + -- an associated party and all information provided by this party } Messaging-Party-Identity ::= CHOICE @@ -339,7 +347,9 @@ Messaging-Party-Identity ::= CHOICE -- E.164 address of the node in international format. Coded in the same format as -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) email-address [2] E-mail-Address-List, - ... + ..., + ip-address [3] IPAddress, + alphanumeric [4] UTF8String } Messaging-Trigger ::= ENUMERATED @@ -354,7 +364,38 @@ Messaging-Trigger ::= ENUMERATED Messaging-Property ::= CHOICE { - pincode [0] OCTET STRING (SIZE (1..8)), + pincode [0] OCTET STRING (SIZE (1..32)), + ..., + priority [1] Messaging-Property-Priority, + greeting-type [2] Messaging-Property-Greeting-Type, + notification-type [3] Messaging-Property-Notification-Type, + language [4] OCTET STRING + -- Language according to RFC 3066 [24] +} + +Messaging-Property-Priority ::= ENUMERATED +{ + low(1), + medium(2), + high(3), + private(4), + ... +} + +Messaging-Property-Greeting-Type ::= ENUMERATED +{ + general(1), + name(2), + personal(3), + absence(4), + number(5), + ... +} + +Messaging-Property-Notification-Type ::= ENUMERATED +{ + empty-call(1), + lost-call(2), ... } diff --git a/102232-2/portal/EmailPDU,ver8.txt b/102232-2/portal/EmailPDU,ver9.txt similarity index 87% rename from 102232-2/portal/EmailPDU,ver8.txt rename to 102232-2/portal/EmailPDU,ver9.txt index f3a73f5..284c1e6 100644 --- a/102232-2/portal/EmailPDU,ver8.txt +++ b/102232-2/portal/EmailPDU,ver9.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,17 +9,17 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version8(8) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -232,7 +232,8 @@ MessagingIRI ::= SEQUENCE event-identifier [8] INTEGER (0..4294967295) OPTIONAL, -- Used to correlate to MessagingCC within the same CIN. Mandatory when CC is also sent original-message [9] OCTET STRING OPTIONAL, - ... + ..., + box-identifier [10] OCTET STRING OPTIONAL } Messaging-System-Type ::= ENUMERATED @@ -279,7 +280,11 @@ Messaging-Box-Event ::= ENUMERATED notification-disable(15), disconnect(16), connect(17), - ... + ..., + greeting-play(18), + language-change(19), + pin-security-enable(20), + pin-security-disable(21) } Messaging-Notification-Event ::= ENUMERATED @@ -327,7 +332,10 @@ Messaging-Party-Qualifier ::= ENUMERATED terminating-party(2), -- In this case, the partyInformation parameter provides the identities related to -- the terminating party and all information provided by this party. - ... + ..., + associated-party(3) + -- In this case, the partyInformation parameter provides the identites related to + -- an associated party and all information provided by this party } Messaging-Party-Identity ::= CHOICE @@ -339,7 +347,9 @@ Messaging-Party-Identity ::= CHOICE -- E.164 address of the node in international format. Coded in the same format as -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) email-address [2] E-mail-Address-List, - ... + ..., + ip-address [3] IPAddress, + alphanumeric [4] UTF8String } Messaging-Trigger ::= ENUMERATED @@ -354,7 +364,38 @@ Messaging-Trigger ::= ENUMERATED Messaging-Property ::= CHOICE { - pincode [0] OCTET STRING (SIZE (1..8)), + pincode [0] OCTET STRING (SIZE (1..32)), + ..., + priority [1] Messaging-Property-Priority, + greeting-type [2] Messaging-Property-Greeting-Type, + notification-type [3] Messaging-Property-Notification-Type, + language [4] OCTET STRING + -- Language according to RFC 3066 [24] +} + +Messaging-Property-Priority ::= ENUMERATED +{ + low(1), + medium(2), + high(3), + private(4), + ... +} + +Messaging-Property-Greeting-Type ::= ENUMERATED +{ + general(1), + name(2), + personal(3), + absence(4), + number(5), + ... +} + +Messaging-Property-Notification-Type ::= ENUMERATED +{ + empty-call(1), + lost-call(2), ... } -- GitLab From 68245b05f3c69963ab9b87b3c7f593d8566a8d6b Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:29:02 +0100 Subject: [PATCH 065/208] TS 102 232-1 v3.2.1 (2012-11-22) agreed at LI#31 (Split, 2012-09-25) --- 102232-1/LI-PS-PDU.asn | 83 +++++++++---------- ...I-PS-PDU,ver13.txt => LI-PS-PDU,ver14.txt} | 83 +++++++++---------- 2 files changed, 82 insertions(+), 84 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver13.txt => LI-PS-PDU,ver14.txt} (89%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index beb3f35..41bb6d8 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version14(14)} DEFINITIONS IMPLICIT TAGS ::= @@ -9,12 +9,12 @@ IMPORTS -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) -- from TS 101 671 [4] - LawfulInterceptionIdentifier, - IRI-Parameters, + LawfulInterceptionIdentifier, + IRI-Parameters, IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} -- from TS 101 671 [4] HI1-Operation @@ -27,7 +27,7 @@ IMPORTS MessagingCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} -- from TS 102 232-03 [6] IPCC, @@ -113,19 +113,19 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version13(13)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version14(14)} -- ==================== -- Top-level definition -- ==================== -PS-PDU ::= SEQUENCE +PS-PDU ::= SEQUENCE { pSHeader [1] PSHeader, payload [2] Payload } -PSHeader ::= SEQUENCE +PSHeader ::= SEQUENCE { li-psDomainId [0] OBJECT IDENTIFIER, lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, @@ -153,7 +153,7 @@ Payload ::= CHOICE encryptionContainer [4] EncryptionContainer } -TimeStampQualifier ::= ENUMERATED +TimeStampQualifier ::= ENUMERATED { unknown(0), timeOfInterception(1), @@ -165,7 +165,7 @@ TimeStampQualifier ::= ENUMERATED -- Items contained within the PS-Header -- ==================================== -CommunicationIdentifier ::= SEQUENCE +CommunicationIdentifier ::= SEQUENCE { networkIdentifier [0] NetworkIdentifier, communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, @@ -179,7 +179,7 @@ CommunicationIdentifier ::= SEQUENCE -- a particular session (see clause 5.2.4) } -NetworkIdentifier ::= SEQUENCE +NetworkIdentifier ::= SEQUENCE { operatorIdentifier [0] OCTET STRING (SIZE(1..16)), networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, @@ -192,7 +192,7 @@ NetworkIdentifier ::= SEQUENCE -- Definitions for CC Payload -- ========================== -CCPayload ::= SEQUENCE +CCPayload ::= SEQUENCE { payloadDirection [0] PayloadDirection OPTIONAL, timeStamp [1] GeneralizedTime OPTIONAL, @@ -235,8 +235,8 @@ CCContents ::= CHOICE pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] MessagingCC, - ePSCC [15] OCTET STRING + messagingCC [14] MessagingCC, + ePSCC [15] OCTET STRING } MicroSecondTimeStamp ::= SEQUENCE @@ -261,7 +261,7 @@ IRIPayload ::= SEQUENCE ... } -IRIType ::= ENUMERATED +IRIType ::= ENUMERATED { iRI-Begin(1), iRI-End(2), @@ -269,7 +269,7 @@ IRIType ::= ENUMERATED iRI-Report(4) } -IRIContents ::= CHOICE +IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { undefinedIRI [0] OCTET STRING, @@ -287,11 +287,11 @@ IRIContents ::= CHOICE iPMMIRI [11] IPMMIRI, lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, - messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI + messagingIRI [14] MessagingIRI, + ePSIRI [15] EPSIRI } -UMTSIRI ::= CHOICE +UMTSIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, @@ -301,7 +301,7 @@ UMTSIRI ::= CHOICE umtsCS-IRIsContent [3] UmtsCS-IRIsContent } -ETSI671IRI ::= CHOICE +ETSI671IRI ::= CHOICE -- This structure may be commented out if not used { iRI-Parameters [0] HI2Operations.IRI-Parameters, @@ -309,11 +309,11 @@ ETSI671IRI ::= CHOICE ... } -EPSIRI ::= CHOICE - -- This structure may be commented out if not used +EPSIRI ::= CHOICE + -- This structure may be commented out if not used { - iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, - epsIRIsContent [1] EpsIRIsContent, + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, ... } @@ -321,7 +321,7 @@ EPSIRI ::= CHOICE -- Definitions for TRI Payload -- =========================== -TRIPayload ::= CHOICE +TRIPayload ::= CHOICE { integrityCheck [0] IntegrityCheck, testPDU [1] NULL, @@ -336,7 +336,7 @@ TRIPayload ::= CHOICE operatorLeaMessage [8] OperatorLeaMessage } -IntegrityCheck ::= SEQUENCE +IntegrityCheck ::= SEQUENCE { includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), -- gives the order the PDUs were processed @@ -350,7 +350,7 @@ IntegrityCheck ::= SEQUENCE ... } -CheckType ::= ENUMERATED +CheckType ::= ENUMERATED { hash(1), -- SHA-1 hash value @@ -359,7 +359,7 @@ CheckType ::= ENUMERATED ... } -DataType ::= ENUMERATED +DataType ::= ENUMERATED { iRI(1), cC(2), @@ -370,14 +370,14 @@ DataType ::= ENUMERATED -- Definitions for OperatorLeaMessage -- ================================== -OperatorLeaMessage ::= SEQUENCE +OperatorLeaMessage ::= SEQUENCE { messagePriority [0] OperatorLeaMessagePriority, message [1] OCTET STRING (SIZE(1..255)), ... } -OperatorLeaMessagePriority ::= ENUMERATED +OperatorLeaMessagePriority ::= ENUMERATED { error(1), -- reporting of error conditions that have impact on the quality of the @@ -388,11 +388,11 @@ OperatorLeaMessagePriority ::= ENUMERATED ... } --- ================================ +-- =================================== -- Definitions for EncryptionContainer --- ================================ +-- =================================== -EncryptionContainer ::= SEQUENCE +EncryptionContainer ::= SEQUENCE { encryptionType [0] EncryptionType, encryptedPayload [1] OCTET STRING, @@ -401,7 +401,7 @@ EncryptionContainer ::= SEQUENCE encryptedPayloadType [2] EncryptedPayloadType OPTIONAL } -EncryptionType ::= ENUMERATED +EncryptionType ::= ENUMERATED { none(1), -- No encryption is applied. @@ -420,14 +420,14 @@ EncryptionType ::= ENUMERATED ... } -EncryptedPayload ::= SEQUENCE +EncryptedPayload ::= SEQUENCE { byteCounter [0] INTEGER (0..18446744073709551615), -- The sum of the sizes of all PDUs before this PDU. -- It is initialized with the unixTime (number of seconds since 01-01-1970) -- 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 I: + -- as defined in annex G: -- IF N > 0 THEN -- PDU[N].byteCounter = PDU[N-1].byteCounter + size(PDU[N-1]) -- ELSE @@ -437,11 +437,9 @@ EncryptedPayload ::= SEQUENCE ... } -EncryptedPayloadType ::= ENUMERATED +EncryptedPayloadType ::= ENUMERATED { - unknown(0), - part1(1), - -- encrypted payload is TS 102 232 part 1 + unknown(1), part2(2), -- encrypted payload is TS 102 232 part 2 [5] part3(3), @@ -454,8 +452,9 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is TS 102 232 part 6 [36] part7(7), -- encrypted payload is TS 102 232 part 7 [38] - ... + ..., + part1(8) + -- encrypted payload is TS 102 232 part 1 (the present document) } END --end of LI-PS-PDU - diff --git a/102232-1/portal/LI-PS-PDU,ver13.txt b/102232-1/portal/LI-PS-PDU,ver14.txt similarity index 89% rename from 102232-1/portal/LI-PS-PDU,ver13.txt rename to 102232-1/portal/LI-PS-PDU,ver14.txt index beb3f35..41bb6d8 100644 --- a/102232-1/portal/LI-PS-PDU,ver13.txt +++ b/102232-1/portal/LI-PS-PDU,ver14.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version14(14)} DEFINITIONS IMPLICIT TAGS ::= @@ -9,12 +9,12 @@ IMPORTS -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) -- from TS 101 671 [4] - LawfulInterceptionIdentifier, - IRI-Parameters, + LawfulInterceptionIdentifier, + IRI-Parameters, IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} -- from TS 101 671 [4] HI1-Operation @@ -27,7 +27,7 @@ IMPORTS MessagingCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} -- from TS 102 232-03 [6] IPCC, @@ -113,19 +113,19 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version13(13)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version14(14)} -- ==================== -- Top-level definition -- ==================== -PS-PDU ::= SEQUENCE +PS-PDU ::= SEQUENCE { pSHeader [1] PSHeader, payload [2] Payload } -PSHeader ::= SEQUENCE +PSHeader ::= SEQUENCE { li-psDomainId [0] OBJECT IDENTIFIER, lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, @@ -153,7 +153,7 @@ Payload ::= CHOICE encryptionContainer [4] EncryptionContainer } -TimeStampQualifier ::= ENUMERATED +TimeStampQualifier ::= ENUMERATED { unknown(0), timeOfInterception(1), @@ -165,7 +165,7 @@ TimeStampQualifier ::= ENUMERATED -- Items contained within the PS-Header -- ==================================== -CommunicationIdentifier ::= SEQUENCE +CommunicationIdentifier ::= SEQUENCE { networkIdentifier [0] NetworkIdentifier, communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, @@ -179,7 +179,7 @@ CommunicationIdentifier ::= SEQUENCE -- a particular session (see clause 5.2.4) } -NetworkIdentifier ::= SEQUENCE +NetworkIdentifier ::= SEQUENCE { operatorIdentifier [0] OCTET STRING (SIZE(1..16)), networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, @@ -192,7 +192,7 @@ NetworkIdentifier ::= SEQUENCE -- Definitions for CC Payload -- ========================== -CCPayload ::= SEQUENCE +CCPayload ::= SEQUENCE { payloadDirection [0] PayloadDirection OPTIONAL, timeStamp [1] GeneralizedTime OPTIONAL, @@ -235,8 +235,8 @@ CCContents ::= CHOICE pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] MessagingCC, - ePSCC [15] OCTET STRING + messagingCC [14] MessagingCC, + ePSCC [15] OCTET STRING } MicroSecondTimeStamp ::= SEQUENCE @@ -261,7 +261,7 @@ IRIPayload ::= SEQUENCE ... } -IRIType ::= ENUMERATED +IRIType ::= ENUMERATED { iRI-Begin(1), iRI-End(2), @@ -269,7 +269,7 @@ IRIType ::= ENUMERATED iRI-Report(4) } -IRIContents ::= CHOICE +IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { undefinedIRI [0] OCTET STRING, @@ -287,11 +287,11 @@ IRIContents ::= CHOICE iPMMIRI [11] IPMMIRI, lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, - messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI + messagingIRI [14] MessagingIRI, + ePSIRI [15] EPSIRI } -UMTSIRI ::= CHOICE +UMTSIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, @@ -301,7 +301,7 @@ UMTSIRI ::= CHOICE umtsCS-IRIsContent [3] UmtsCS-IRIsContent } -ETSI671IRI ::= CHOICE +ETSI671IRI ::= CHOICE -- This structure may be commented out if not used { iRI-Parameters [0] HI2Operations.IRI-Parameters, @@ -309,11 +309,11 @@ ETSI671IRI ::= CHOICE ... } -EPSIRI ::= CHOICE - -- This structure may be commented out if not used +EPSIRI ::= CHOICE + -- This structure may be commented out if not used { - iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, - epsIRIsContent [1] EpsIRIsContent, + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, ... } @@ -321,7 +321,7 @@ EPSIRI ::= CHOICE -- Definitions for TRI Payload -- =========================== -TRIPayload ::= CHOICE +TRIPayload ::= CHOICE { integrityCheck [0] IntegrityCheck, testPDU [1] NULL, @@ -336,7 +336,7 @@ TRIPayload ::= CHOICE operatorLeaMessage [8] OperatorLeaMessage } -IntegrityCheck ::= SEQUENCE +IntegrityCheck ::= SEQUENCE { includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), -- gives the order the PDUs were processed @@ -350,7 +350,7 @@ IntegrityCheck ::= SEQUENCE ... } -CheckType ::= ENUMERATED +CheckType ::= ENUMERATED { hash(1), -- SHA-1 hash value @@ -359,7 +359,7 @@ CheckType ::= ENUMERATED ... } -DataType ::= ENUMERATED +DataType ::= ENUMERATED { iRI(1), cC(2), @@ -370,14 +370,14 @@ DataType ::= ENUMERATED -- Definitions for OperatorLeaMessage -- ================================== -OperatorLeaMessage ::= SEQUENCE +OperatorLeaMessage ::= SEQUENCE { messagePriority [0] OperatorLeaMessagePriority, message [1] OCTET STRING (SIZE(1..255)), ... } -OperatorLeaMessagePriority ::= ENUMERATED +OperatorLeaMessagePriority ::= ENUMERATED { error(1), -- reporting of error conditions that have impact on the quality of the @@ -388,11 +388,11 @@ OperatorLeaMessagePriority ::= ENUMERATED ... } --- ================================ +-- =================================== -- Definitions for EncryptionContainer --- ================================ +-- =================================== -EncryptionContainer ::= SEQUENCE +EncryptionContainer ::= SEQUENCE { encryptionType [0] EncryptionType, encryptedPayload [1] OCTET STRING, @@ -401,7 +401,7 @@ EncryptionContainer ::= SEQUENCE encryptedPayloadType [2] EncryptedPayloadType OPTIONAL } -EncryptionType ::= ENUMERATED +EncryptionType ::= ENUMERATED { none(1), -- No encryption is applied. @@ -420,14 +420,14 @@ EncryptionType ::= ENUMERATED ... } -EncryptedPayload ::= SEQUENCE +EncryptedPayload ::= SEQUENCE { byteCounter [0] INTEGER (0..18446744073709551615), -- The sum of the sizes of all PDUs before this PDU. -- It is initialized with the unixTime (number of seconds since 01-01-1970) -- 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 I: + -- as defined in annex G: -- IF N > 0 THEN -- PDU[N].byteCounter = PDU[N-1].byteCounter + size(PDU[N-1]) -- ELSE @@ -437,11 +437,9 @@ EncryptedPayload ::= SEQUENCE ... } -EncryptedPayloadType ::= ENUMERATED +EncryptedPayloadType ::= ENUMERATED { - unknown(0), - part1(1), - -- encrypted payload is TS 102 232 part 1 + unknown(1), part2(2), -- encrypted payload is TS 102 232 part 2 [5] part3(3), @@ -454,8 +452,9 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is TS 102 232 part 6 [36] part7(7), -- encrypted payload is TS 102 232 part 7 [38] - ... + ..., + part1(8) + -- encrypted payload is TS 102 232 part 1 (the present document) } END --end of LI-PS-PDU - -- GitLab From 504a44315b1dc25f6b0007e28d99752f97af991b Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:29:07 +0100 Subject: [PATCH 066/208] TS 102 232-2 v3.4.1 (2013-02-08) agreed at LI#32 (Sophia Antipolis, 2013-01-14) --- 102232-2/EmailPDU.asn | 47 +++++++++++++++---- .../{EmailPDU,ver9.txt => EmailPDU,ver10.txt} | 47 +++++++++++++++---- 2 files changed, 78 insertions(+), 16 deletions(-) rename 102232-2/portal/{EmailPDU,ver9.txt => EmailPDU,ver10.txt} (84%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index 284c1e6..eb2ebda 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -16,10 +16,10 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -171,7 +171,7 @@ ASMTPAAAInformation ::= SEQUENCE } IMAPAAAInformation ::= SEQUENCE - --- The iMAPAAAInformation field contains the IMAP username & optionally the password + -- The iMAPAAAInformation field contains the IMAP username & optionally the password { username [0] UTF8String (SIZE (0..64)), password [1] UTF8String (SIZE (0..64)) OPTIONAL, @@ -349,7 +349,37 @@ Messaging-Party-Identity ::= CHOICE email-address [2] E-mail-Address-List, ..., ip-address [3] IPAddress, - alphanumeric [4] UTF8String + --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + alphanumeric [4] UTF8String, + ip-address-and-port [5] IP-Address-And-Port, + imsi [6] OCTET STRING (SIZE (3..8)), + -- see MAP format in TS 133.108 [5] for International Mobile Station Identity + -- ITU-T E 212 [27] number beginning with Mobile Country Code. + imei [7] OCTET STRING (SIZE (8)), + -- see MAP format in TS 133.108 [5] for International Mobile Equipment Identity number. + -- It is defined in 3GPP TS 22.016 [28]. + fax-url [8] OCTET STRING, + -- see format defined in RFC 2806 [29]. + tel-url [9] OCTET STRING, + -- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. + modem-url [10] OCTET STRING, + -- see format defined in RFC 2806 [29]. + sip-uri [11] OCTET STRING, + -- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. + sips-uri [12] OCTET STRING, + -- see format defined in RFC 3261 [32]. + nai [13] OCTET STRING + -- Network Access Identity of the party, encoded in the same format as used EPS + -- domain in TS 133.108 [5] and defined in RFC 4282 [33]. +} + +IP-Address-And-Port ::= SEQUENCE +{ + ip-address [0] IPAddress, + -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + port-number [1] INTEGER, + -- port-number is defined by IETF RFC 6533 [35] + ... } Messaging-Trigger ::= ENUMERATED @@ -396,7 +426,8 @@ Messaging-Property-Notification-Type ::= ENUMERATED { empty-call(1), lost-call(2), - ... + ..., + message-to-email(3) } END -- end of EmailPDU diff --git a/102232-2/portal/EmailPDU,ver9.txt b/102232-2/portal/EmailPDU,ver10.txt similarity index 84% rename from 102232-2/portal/EmailPDU,ver9.txt rename to 102232-2/portal/EmailPDU,ver10.txt index 284c1e6..eb2ebda 100644 --- a/102232-2/portal/EmailPDU,ver9.txt +++ b/102232-2/portal/EmailPDU,ver10.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -16,10 +16,10 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version9(9) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -171,7 +171,7 @@ ASMTPAAAInformation ::= SEQUENCE } IMAPAAAInformation ::= SEQUENCE - --- The iMAPAAAInformation field contains the IMAP username & optionally the password + -- The iMAPAAAInformation field contains the IMAP username & optionally the password { username [0] UTF8String (SIZE (0..64)), password [1] UTF8String (SIZE (0..64)) OPTIONAL, @@ -349,7 +349,37 @@ Messaging-Party-Identity ::= CHOICE email-address [2] E-mail-Address-List, ..., ip-address [3] IPAddress, - alphanumeric [4] UTF8String + --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + alphanumeric [4] UTF8String, + ip-address-and-port [5] IP-Address-And-Port, + imsi [6] OCTET STRING (SIZE (3..8)), + -- see MAP format in TS 133.108 [5] for International Mobile Station Identity + -- ITU-T E 212 [27] number beginning with Mobile Country Code. + imei [7] OCTET STRING (SIZE (8)), + -- see MAP format in TS 133.108 [5] for International Mobile Equipment Identity number. + -- It is defined in 3GPP TS 22.016 [28]. + fax-url [8] OCTET STRING, + -- see format defined in RFC 2806 [29]. + tel-url [9] OCTET STRING, + -- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. + modem-url [10] OCTET STRING, + -- see format defined in RFC 2806 [29]. + sip-uri [11] OCTET STRING, + -- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. + sips-uri [12] OCTET STRING, + -- see format defined in RFC 3261 [32]. + nai [13] OCTET STRING + -- Network Access Identity of the party, encoded in the same format as used EPS + -- domain in TS 133.108 [5] and defined in RFC 4282 [33]. +} + +IP-Address-And-Port ::= SEQUENCE +{ + ip-address [0] IPAddress, + -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + port-number [1] INTEGER, + -- port-number is defined by IETF RFC 6533 [35] + ... } Messaging-Trigger ::= ENUMERATED @@ -396,7 +426,8 @@ Messaging-Property-Notification-Type ::= ENUMERATED { empty-call(1), lost-call(2), - ... + ..., + message-to-email(3) } END -- end of EmailPDU -- GitLab From 077813cdb97e76e8b8165cf85bdb9456869d4ba0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:29:15 +0100 Subject: [PATCH 067/208] TS 102 232-1 v3.3.1 (2013-02-08) agreed at LI#32 (Sophia Antipolis, 2013-01-14) --- 102232-1/LI-PS-PDU.asn | 11 ++++------- .../{LI-PS-PDU,ver14.txt => LI-PS-PDU,ver15.txt} | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver14.txt => LI-PS-PDU,ver15.txt} (97%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 41bb6d8..31457fa 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version14(14)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version15(15)} DEFINITIONS IMPLICIT TAGS ::= @@ -27,7 +27,7 @@ IMPORTS MessagingCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} -- from TS 102 232-03 [6] IPCC, @@ -113,7 +113,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version14(14)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version15(15)} -- ==================== -- Top-level definition @@ -185,7 +185,7 @@ NetworkIdentifier ::= SEQUENCE networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, ..., eTSI671NEID [2] Network-Element-Identifier OPTIONAL - -- For Network Element Identifier, use either OCTET STRING or ETSI671 definition + -- For network element identifier, use either networkElementIdentifier or eTSI671NEID } -- ========================== @@ -221,11 +221,9 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { - undefinedCC [0] OCTET STRING, emailCC [1] EmailCC, iPCC [2] IPCC, uMTSCC [4] OCTET STRING, - eTSI671CC [5] OCTET STRING, ..., l2CC [6] L2CC, tTRAFFIC-1 [7] TS101909201.TTRAFFIC, @@ -272,7 +270,6 @@ IRIType ::= ENUMERATED IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { - undefinedIRI [0] OCTET STRING, emailIRI [1] EmailIRI, iPIRI [2] IPIRI, iPIRIOnly [3] IPIRIOnly, diff --git a/102232-1/portal/LI-PS-PDU,ver14.txt b/102232-1/portal/LI-PS-PDU,ver15.txt similarity index 97% rename from 102232-1/portal/LI-PS-PDU,ver14.txt rename to 102232-1/portal/LI-PS-PDU,ver15.txt index 41bb6d8..31457fa 100644 --- a/102232-1/portal/LI-PS-PDU,ver14.txt +++ b/102232-1/portal/LI-PS-PDU,ver15.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version14(14)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version15(15)} DEFINITIONS IMPLICIT TAGS ::= @@ -27,7 +27,7 @@ IMPORTS MessagingCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} -- from TS 102 232-03 [6] IPCC, @@ -113,7 +113,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version14(14)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version15(15)} -- ==================== -- Top-level definition @@ -185,7 +185,7 @@ NetworkIdentifier ::= SEQUENCE networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, ..., eTSI671NEID [2] Network-Element-Identifier OPTIONAL - -- For Network Element Identifier, use either OCTET STRING or ETSI671 definition + -- For network element identifier, use either networkElementIdentifier or eTSI671NEID } -- ========================== @@ -221,11 +221,9 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { - undefinedCC [0] OCTET STRING, emailCC [1] EmailCC, iPCC [2] IPCC, uMTSCC [4] OCTET STRING, - eTSI671CC [5] OCTET STRING, ..., l2CC [6] L2CC, tTRAFFIC-1 [7] TS101909201.TTRAFFIC, @@ -272,7 +270,6 @@ IRIType ::= ENUMERATED IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { - undefinedIRI [0] OCTET STRING, emailIRI [1] EmailIRI, iPIRI [2] IPIRI, iPIRIOnly [3] IPIRIOnly, -- GitLab From 0f8d06006fe6c9b63573a5bd32ff7d386254d334 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:29:21 +0100 Subject: [PATCH 068/208] TS 102 657 v1.12.1 (2013-08-13) agreed at LI#33 (Joensuu, 2013-06-11) --- 102657/RDMessage.asn | 78 +++++++++++++++++-- 102657/RDMessage.xsd | 62 ++++++++++++++- ...ge,ver11.txt => RDMessage,ver12 (MSC).txt} | 78 +++++++++++++++++-- ...ge,ver11.xsd => RDMessage,ver12 (MSC).xsd} | 62 ++++++++++++++- 4 files changed, 264 insertions(+), 16 deletions(-) rename 102657/portal/{RDMessage,ver11.txt => RDMessage,ver12 (MSC).txt} (96%) rename 102657/portal/{RDMessage,ver11.xsd => RDMessage,ver12 (MSC).xsd} (97%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 12b1295..09d6d90 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version11(11)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version12(12)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,8 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version11(11)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version12(12)} + -- ====================================== -- Top level definitions for RDHI wrapper @@ -565,7 +566,17 @@ SubscribedTelephonyServices ::= SEQUENCE nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - paymentDetails [17] PaymentDetails OPTIONAL + paymentDetails [17] PaymentDetails OPTIONAL, + subscriptionType [18] ENUMERATED + { + unknown(0), + postpay(1), + prepay(2), + other(3), + ... + } OPTIONAL + -- Describes the nature of the subscription + } NationalTelephonySubscriptionInfo ::= SEQUENCE @@ -939,9 +950,13 @@ TelephonyLocation ::= SEQUENCE timeSpan [2] TimeSpan OPTIONAL, -- Time span that this location was valid for ..., - nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL + nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + detailedLocation [4] TelephonyNetworkElement OPTIONAL + -- The extended information for this network element as it was at the time of the + -- communication + } NationalTelephonyLocation ::= SEQUENCE @@ -1923,7 +1938,8 @@ NAServiceUsage ::= SEQUENCE endReason [14] NAEndReason OPTIONAL, subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access - ePSInformation [16] EPSInformation OPTIONAL + ePSInformation [16] EPSInformation OPTIONAL, + wifiInformation [17] WifiInformation OPTIONAL } NAEndReason ::= ENUMERATED @@ -2063,6 +2079,45 @@ EPSEvent ::= ENUMERATED ... } + +WifiInformation ::= SEQUENCE +{ + bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, + -- The Basic Service Set Identification for the connection. + -- This is also the MAC address of the access point (the present document assumes + -- that records are for infrastructure mode, not ad-hoc mode). + -- The MAC address of the user is given in the naDeviceID in the structure (one level up) + sSID [2] UTF8String OPTIONAL, + -- The human-readable Service Set Identifier + username [3] UTF8String OPTIONAL, + protocol [4] ENUMERATED + { + iEEE80211 (1), + iEEE80211a (2), + iEEE80211b (3), + iEEE80211g (4), + iEEE80211n (5), + iEEE80211ac (6), + iEEE80211ad (7), + ... + } OPTIONAL, + securityMode [5] ENUMERATED + { + wEP (0), + wPA (1), + wPA2 (2), + ... + } OPTIONAL, + authenticationTelephoneNumber [6] PartyNumber OPTIONAL, + -- if authentication arranged through a code sent to mobile, this is the number + -- to which the code was sent + authenticationPaymentReference [7] UTF8String OPTIONAL, + -- For example, the number of a voucher that was used in authentication + ... +} + + + -- ==================================== -- Definitions of Network Access Device -- ==================================== @@ -2180,3 +2235,16 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage + +Please consider the environment before printing this email. + +This message should be regarded as confidential. If you have received this email in error please notify the sender and destroy it immediately. + +Statements of intent shall only become binding when confirmed in hard copy by an authorised signatory. + +The contents of this email may relate to dealings with other companies under the control of BAE Systems plc details of which can be found at http://www.baesystems.com/Businesses/index.htm. + +Detica Limited is a BAE Systems company trading as BAE Systems Detica. +Detica Limited is registered in England and Wales under No: 1337451. +Registered office: Surrey Research Park, Guildford, Surrey, GU2 7YP, England. + diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 36a743f..e530860 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.11.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.12.1 @@ -645,6 +645,19 @@ + + + + + + + + + + + + + @@ -761,6 +774,7 @@ + @@ -1824,10 +1838,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/102657/portal/RDMessage,ver11.txt b/102657/portal/RDMessage,ver12 (MSC).txt similarity index 96% rename from 102657/portal/RDMessage,ver11.txt rename to 102657/portal/RDMessage,ver12 (MSC).txt index 12b1295..09d6d90 100644 --- a/102657/portal/RDMessage,ver11.txt +++ b/102657/portal/RDMessage,ver12 (MSC).txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version11(11)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version12(12)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,8 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version11(11)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version12(12)} + -- ====================================== -- Top level definitions for RDHI wrapper @@ -565,7 +566,17 @@ SubscribedTelephonyServices ::= SEQUENCE nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - paymentDetails [17] PaymentDetails OPTIONAL + paymentDetails [17] PaymentDetails OPTIONAL, + subscriptionType [18] ENUMERATED + { + unknown(0), + postpay(1), + prepay(2), + other(3), + ... + } OPTIONAL + -- Describes the nature of the subscription + } NationalTelephonySubscriptionInfo ::= SEQUENCE @@ -939,9 +950,13 @@ TelephonyLocation ::= SEQUENCE timeSpan [2] TimeSpan OPTIONAL, -- Time span that this location was valid for ..., - nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL + nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + detailedLocation [4] TelephonyNetworkElement OPTIONAL + -- The extended information for this network element as it was at the time of the + -- communication + } NationalTelephonyLocation ::= SEQUENCE @@ -1923,7 +1938,8 @@ NAServiceUsage ::= SEQUENCE endReason [14] NAEndReason OPTIONAL, subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access - ePSInformation [16] EPSInformation OPTIONAL + ePSInformation [16] EPSInformation OPTIONAL, + wifiInformation [17] WifiInformation OPTIONAL } NAEndReason ::= ENUMERATED @@ -2063,6 +2079,45 @@ EPSEvent ::= ENUMERATED ... } + +WifiInformation ::= SEQUENCE +{ + bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, + -- The Basic Service Set Identification for the connection. + -- This is also the MAC address of the access point (the present document assumes + -- that records are for infrastructure mode, not ad-hoc mode). + -- The MAC address of the user is given in the naDeviceID in the structure (one level up) + sSID [2] UTF8String OPTIONAL, + -- The human-readable Service Set Identifier + username [3] UTF8String OPTIONAL, + protocol [4] ENUMERATED + { + iEEE80211 (1), + iEEE80211a (2), + iEEE80211b (3), + iEEE80211g (4), + iEEE80211n (5), + iEEE80211ac (6), + iEEE80211ad (7), + ... + } OPTIONAL, + securityMode [5] ENUMERATED + { + wEP (0), + wPA (1), + wPA2 (2), + ... + } OPTIONAL, + authenticationTelephoneNumber [6] PartyNumber OPTIONAL, + -- if authentication arranged through a code sent to mobile, this is the number + -- to which the code was sent + authenticationPaymentReference [7] UTF8String OPTIONAL, + -- For example, the number of a voucher that was used in authentication + ... +} + + + -- ==================================== -- Definitions of Network Access Device -- ==================================== @@ -2180,3 +2235,16 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage + +Please consider the environment before printing this email. + +This message should be regarded as confidential. If you have received this email in error please notify the sender and destroy it immediately. + +Statements of intent shall only become binding when confirmed in hard copy by an authorised signatory. + +The contents of this email may relate to dealings with other companies under the control of BAE Systems plc details of which can be found at http://www.baesystems.com/Businesses/index.htm. + +Detica Limited is a BAE Systems company trading as BAE Systems Detica. +Detica Limited is registered in England and Wales under No: 1337451. +Registered office: Surrey Research Park, Guildford, Surrey, GU2 7YP, England. + diff --git a/102657/portal/RDMessage,ver11.xsd b/102657/portal/RDMessage,ver12 (MSC).xsd similarity index 97% rename from 102657/portal/RDMessage,ver11.xsd rename to 102657/portal/RDMessage,ver12 (MSC).xsd index 36a743f..e530860 100644 --- a/102657/portal/RDMessage,ver11.xsd +++ b/102657/portal/RDMessage,ver12 (MSC).xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.11.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.12.1 @@ -645,6 +645,19 @@ + + + + + + + + + + + + + @@ -761,6 +774,7 @@ + @@ -1824,10 +1838,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 4064af083e5b922bb44ae96936939fa557bf622e Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:29:28 +0100 Subject: [PATCH 070/208] TS 102 232-2 v3.5.1 (2013-07-18) agreed at LI#33 (Joensuu, 2013-06-11) --- 102232-2/EmailPDU.asn | 88 ++++++++++++++++--- ...{EmailPDU,ver10.txt => EmailPDU,ver11.txt} | 88 ++++++++++++++++--- 2 files changed, 148 insertions(+), 28 deletions(-) rename 102232-2/portal/{EmailPDU,ver10.txt => EmailPDU,ver11.txt} (85%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index eb2ebda..dafb0c4 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -16,10 +16,10 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -295,7 +295,8 @@ Messaging-Notification-Event ::= ENUMERATED sms-pin-reminder(4), email(5), fax-to-email(6), - ... + ..., + mms(7) } Messaging-Call-Event ::= ENUMERATED @@ -312,14 +313,17 @@ Messaging-Status ::= ENUMERATED operation-succeeded(3), operation-cancelled(4), operation-started(5), - ... + ..., + operation-lost(6) } Messaging-Party-Information ::= SEQUENCE { party-qualifier [0] Messaging-Party-Qualifier, party-identity [1] Messaging-Party-Identity, - ... + ..., + party-validity [2] Messaging-Party-Validity OPTIONAL, + copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL } Messaging-Party-Qualifier ::= ENUMERATED @@ -353,11 +357,12 @@ Messaging-Party-Identity ::= CHOICE alphanumeric [4] UTF8String, ip-address-and-port [5] IP-Address-And-Port, imsi [6] OCTET STRING (SIZE (3..8)), - -- see MAP format in TS 133.108 [5] for International Mobile Station Identity - -- ITU-T E 212 [27] number beginning with Mobile Country Code. + -- International Mobile Subscriber Identity of the target, encoded in the same format as the + -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. + -- It is described in 3GPP TS 23.003 [37] clause 2.2. imei [7] OCTET STRING (SIZE (8)), - -- see MAP format in TS 133.108 [5] for International Mobile Equipment Identity number. - -- It is defined in 3GPP TS 22.016 [28]. + -- International Mobile Equipment Identity of the target, encoded in the same format as the + -- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6 fax-url [8] OCTET STRING, -- see format defined in RFC 2806 [29]. tel-url [9] OCTET STRING, @@ -382,6 +387,24 @@ IP-Address-And-Port ::= SEQUENCE ... } +Messaging-Party-Validity ::= ENUMERATED +{ + unknown(0), + trusted(1), + untrusted(2), + ... +} + +Messaging-Copy-Qualifier ::= ENUMERATED +{ + unknown(0), + none(1), + cc(2), + bcc(3), + ... +} + + Messaging-Trigger ::= ENUMERATED { unknown(0), @@ -399,8 +422,16 @@ Messaging-Property ::= CHOICE priority [1] Messaging-Property-Priority, greeting-type [2] Messaging-Property-Greeting-Type, notification-type [3] Messaging-Property-Notification-Type, - language [4] OCTET STRING + language [4] OCTET STRING, -- Language according to RFC 3066 [24] + message-identifier [5] OCTET STRING, + subject [6] UTF8String, + user-agent [7] UTF8String, + password [8] OCTET STRING, + message-status [9] Messaging-Property-Message-Status, + requested-reports [10] Messaging-Property-Requested-Reports, + expires [11] GeneralizedTime, + message-date [12] GeneralizedTime } Messaging-Property-Priority ::= ENUMERATED @@ -427,7 +458,36 @@ Messaging-Property-Notification-Type ::= ENUMERATED empty-call(1), lost-call(2), ..., - message-to-email(3) + message-to-email(3), + read-report(4), + delivery-report(5), + allow-delivery-report(6), + deny-delivery-report(7) +} + +Messaging-Property-Message-Status ::= ENUMERATED +{ + indeterminate(0), + expired(1), + retrieved(2), + rejected(3), + deferred(4), + forwarded(5), + unrecognized(6), + unreachable(7), + read(8), + deleted-without-being-read(9), + delivery-condition-not-met(10), + ... +} + +Messaging-Property-Requested-Reports ::= ENUMERATED +{ + none(0), + delivery(1), + read(2), + delivery-and-read(3), + ... } END -- end of EmailPDU diff --git a/102232-2/portal/EmailPDU,ver10.txt b/102232-2/portal/EmailPDU,ver11.txt similarity index 85% rename from 102232-2/portal/EmailPDU,ver10.txt rename to 102232-2/portal/EmailPDU,ver11.txt index eb2ebda..dafb0c4 100644 --- a/102232-2/portal/EmailPDU,ver10.txt +++ b/102232-2/portal/EmailPDU,ver11.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -16,10 +16,10 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version10(10) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingCC(4)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -295,7 +295,8 @@ Messaging-Notification-Event ::= ENUMERATED sms-pin-reminder(4), email(5), fax-to-email(6), - ... + ..., + mms(7) } Messaging-Call-Event ::= ENUMERATED @@ -312,14 +313,17 @@ Messaging-Status ::= ENUMERATED operation-succeeded(3), operation-cancelled(4), operation-started(5), - ... + ..., + operation-lost(6) } Messaging-Party-Information ::= SEQUENCE { party-qualifier [0] Messaging-Party-Qualifier, party-identity [1] Messaging-Party-Identity, - ... + ..., + party-validity [2] Messaging-Party-Validity OPTIONAL, + copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL } Messaging-Party-Qualifier ::= ENUMERATED @@ -353,11 +357,12 @@ Messaging-Party-Identity ::= CHOICE alphanumeric [4] UTF8String, ip-address-and-port [5] IP-Address-And-Port, imsi [6] OCTET STRING (SIZE (3..8)), - -- see MAP format in TS 133.108 [5] for International Mobile Station Identity - -- ITU-T E 212 [27] number beginning with Mobile Country Code. + -- International Mobile Subscriber Identity of the target, encoded in the same format as the + -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. + -- It is described in 3GPP TS 23.003 [37] clause 2.2. imei [7] OCTET STRING (SIZE (8)), - -- see MAP format in TS 133.108 [5] for International Mobile Equipment Identity number. - -- It is defined in 3GPP TS 22.016 [28]. + -- International Mobile Equipment Identity of the target, encoded in the same format as the + -- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6 fax-url [8] OCTET STRING, -- see format defined in RFC 2806 [29]. tel-url [9] OCTET STRING, @@ -382,6 +387,24 @@ IP-Address-And-Port ::= SEQUENCE ... } +Messaging-Party-Validity ::= ENUMERATED +{ + unknown(0), + trusted(1), + untrusted(2), + ... +} + +Messaging-Copy-Qualifier ::= ENUMERATED +{ + unknown(0), + none(1), + cc(2), + bcc(3), + ... +} + + Messaging-Trigger ::= ENUMERATED { unknown(0), @@ -399,8 +422,16 @@ Messaging-Property ::= CHOICE priority [1] Messaging-Property-Priority, greeting-type [2] Messaging-Property-Greeting-Type, notification-type [3] Messaging-Property-Notification-Type, - language [4] OCTET STRING + language [4] OCTET STRING, -- Language according to RFC 3066 [24] + message-identifier [5] OCTET STRING, + subject [6] UTF8String, + user-agent [7] UTF8String, + password [8] OCTET STRING, + message-status [9] Messaging-Property-Message-Status, + requested-reports [10] Messaging-Property-Requested-Reports, + expires [11] GeneralizedTime, + message-date [12] GeneralizedTime } Messaging-Property-Priority ::= ENUMERATED @@ -427,7 +458,36 @@ Messaging-Property-Notification-Type ::= ENUMERATED empty-call(1), lost-call(2), ..., - message-to-email(3) + message-to-email(3), + read-report(4), + delivery-report(5), + allow-delivery-report(6), + deny-delivery-report(7) +} + +Messaging-Property-Message-Status ::= ENUMERATED +{ + indeterminate(0), + expired(1), + retrieved(2), + rejected(3), + deferred(4), + forwarded(5), + unrecognized(6), + unreachable(7), + read(8), + deleted-without-being-read(9), + delivery-condition-not-met(10), + ... +} + +Messaging-Property-Requested-Reports ::= ENUMERATED +{ + none(0), + delivery(1), + read(2), + delivery-and-read(3), + ... } END -- end of EmailPDU -- GitLab From e9dfae43563f23b041a339ae1d2f8512b3b40f18 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:29:36 +0100 Subject: [PATCH 071/208] TS 102 232-1 v3.4.2 (2013-09-13) agreed at LI#33 (Joensuu, 2013-06-11) --- 102232-1/LI-PS-PDU.asn | 26 ++++++++++++++++--- ...PS-PDU,ver15.txt => LI-PS-PDU,ver16,1.txt} | 26 ++++++++++++++++--- 2 files changed, 44 insertions(+), 8 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver15.txt => LI-PS-PDU,ver16,1.txt} (93%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 31457fa..e285180 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version15(15)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version16(16)} DEFINITIONS IMPLICIT TAGS ::= @@ -27,7 +27,7 @@ IMPORTS MessagingCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)} -- from TS 102 232-03 [6] IPCC, @@ -80,6 +80,21 @@ IMPORTS -- The relevant module (including the UMTS 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 UMTS 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 UMTS release and version number) + -- needs to be chosen when compiling the application. + -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, TTRAFFIC, @@ -113,7 +128,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version15(15)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version16(16)} -- ==================== -- Top-level definition @@ -234,7 +249,9 @@ CCContents ::= CHOICE iPMMCC [12] IPMMCC, cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, messagingCC [14] MessagingCC, - ePSCC [15] OCTET STRING + ePSCC [15] OCTET STRING, + uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU } MicroSecondTimeStamp ::= SEQUENCE @@ -455,3 +472,4 @@ EncryptedPayloadType ::= ENUMERATED } END --end of LI-PS-PDU + diff --git a/102232-1/portal/LI-PS-PDU,ver15.txt b/102232-1/portal/LI-PS-PDU,ver16,1.txt similarity index 93% rename from 102232-1/portal/LI-PS-PDU,ver15.txt rename to 102232-1/portal/LI-PS-PDU,ver16,1.txt index 31457fa..e285180 100644 --- a/102232-1/portal/LI-PS-PDU,ver15.txt +++ b/102232-1/portal/LI-PS-PDU,ver16,1.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version15(15)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version16(16)} DEFINITIONS IMPLICIT TAGS ::= @@ -27,7 +27,7 @@ IMPORTS MessagingCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)} -- from TS 102 232-03 [6] IPCC, @@ -80,6 +80,21 @@ IMPORTS -- The relevant module (including the UMTS 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 UMTS 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 UMTS release and version number) + -- needs to be chosen when compiling the application. + -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, TTRAFFIC, @@ -113,7 +128,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version15(15)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version16(16)} -- ==================== -- Top-level definition @@ -234,7 +249,9 @@ CCContents ::= CHOICE iPMMCC [12] IPMMCC, cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, messagingCC [14] MessagingCC, - ePSCC [15] OCTET STRING + ePSCC [15] OCTET STRING, + uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU } MicroSecondTimeStamp ::= SEQUENCE @@ -455,3 +472,4 @@ EncryptedPayloadType ::= ENUMERATED } END --end of LI-PS-PDU + -- GitLab From 5347ce8795dca5c67b3f3e1a894532452ef4a939 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:29:42 +0100 Subject: [PATCH 072/208] TS 102 657 v1.13.1 (2013-11-22) agreed at LI#34 (Edinburgh, 2013-09-24) --- 102657/RDMessage.asn | 48 +++++++++---------- 102657/RDMessage.xsd | 39 +++++++-------- ...ge,ver12 (MSC).xsd => RDMessage,ver13.xsd} | 39 +++++++-------- ...age,ver12 (MSC).txt => RDMessagever13.txt} | 48 +++++++++---------- 4 files changed, 86 insertions(+), 88 deletions(-) rename 102657/portal/{RDMessage,ver12 (MSC).xsd => RDMessage,ver13.xsd} (99%) rename 102657/portal/{RDMessage,ver12 (MSC).txt => RDMessagever13.txt} (98%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 09d6d90..d0d4c20 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version12(12)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version13(13)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version12(12)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version13(13)} -- ====================================== @@ -567,14 +567,7 @@ SubscribedTelephonyServices ::= SEQUENCE -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements paymentDetails [17] PaymentDetails OPTIONAL, - subscriptionType [18] ENUMERATED - { - unknown(0), - postpay(1), - prepay(2), - other(3), - ... - } OPTIONAL + subscriptionType [18] SubscriptionType OPTIONAL -- Describes the nature of the subscription } @@ -586,6 +579,19 @@ NationalTelephonySubscriptionInfo ::= SEQUENCE ... } + +SubscriptionType ::= ENUMERATED -- Describes the nature of the subscription + { + unknown(0), + postpay(1), + prepay(2), + other(3), + ... + } + + + + TelephonyBillingDetails ::= SEQUENCE { subscriberID [1] TelephonySubscriberId OPTIONAL, @@ -1576,7 +1582,10 @@ SubscribedMultimediaServices ::= SEQUENCE nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL, -- national extension ..., - paymentDetails [13] PaymentDetails OPTIONAL + paymentDetails [13] PaymentDetails OPTIONAL, + subscriptionType [14] SubscriptionType OPTIONAL + -- Describes the nature of the subscription + } MultimediaServiceType ::= ENUMERATED @@ -1885,7 +1894,9 @@ NAServiceSubscription ::= SEQUENCE registeredICCID [11] UTF8String OPTIONAL, nationalNASubscription [12] NationalNASubscription OPTIONAL, paymentDetails [13] PaymentDetails OPTIONAL, - additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL + additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL, + subscriptionType [15] SubscriptionType OPTIONAL + -- Describes the nature of the subscription } NationalNASubscription ::= SEQUENCE @@ -2235,16 +2246,3 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage - -Please consider the environment before printing this email. - -This message should be regarded as confidential. If you have received this email in error please notify the sender and destroy it immediately. - -Statements of intent shall only become binding when confirmed in hard copy by an authorised signatory. - -The contents of this email may relate to dealings with other companies under the control of BAE Systems plc details of which can be found at http://www.baesystems.com/Businesses/index.htm. - -Detica Limited is a BAE Systems company trading as BAE Systems Detica. -Detica Limited is registered in England and Wales under No: 1337451. -Registered office: Surrey Research Park, Guildford, Surrey, GU2 7YP, England. - diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index e530860..32636be 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.12.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.13.1 @@ -645,20 +645,8 @@ - - - - - - - - - - - - - - + + @@ -736,9 +724,19 @@ - + - + + + + + + + + + + + @@ -1698,6 +1696,7 @@ + @@ -2258,6 +2257,7 @@ + @@ -2618,4 +2618,5 @@ + \ No newline at end of file diff --git a/102657/portal/RDMessage,ver12 (MSC).xsd b/102657/portal/RDMessage,ver13.xsd similarity index 99% rename from 102657/portal/RDMessage,ver12 (MSC).xsd rename to 102657/portal/RDMessage,ver13.xsd index e530860..32636be 100644 --- a/102657/portal/RDMessage,ver12 (MSC).xsd +++ b/102657/portal/RDMessage,ver13.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.12.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.13.1 @@ -645,20 +645,8 @@ - - - - - - - - - - - - - - + + @@ -736,9 +724,19 @@ - + - + + + + + + + + + + + @@ -1698,6 +1696,7 @@ + @@ -2258,6 +2257,7 @@ + @@ -2618,4 +2618,5 @@ + \ No newline at end of file diff --git a/102657/portal/RDMessage,ver12 (MSC).txt b/102657/portal/RDMessagever13.txt similarity index 98% rename from 102657/portal/RDMessage,ver12 (MSC).txt rename to 102657/portal/RDMessagever13.txt index 09d6d90..d0d4c20 100644 --- a/102657/portal/RDMessage,ver12 (MSC).txt +++ b/102657/portal/RDMessagever13.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version12(12)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version13(13)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version12(12)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version13(13)} -- ====================================== @@ -567,14 +567,7 @@ SubscribedTelephonyServices ::= SEQUENCE -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements paymentDetails [17] PaymentDetails OPTIONAL, - subscriptionType [18] ENUMERATED - { - unknown(0), - postpay(1), - prepay(2), - other(3), - ... - } OPTIONAL + subscriptionType [18] SubscriptionType OPTIONAL -- Describes the nature of the subscription } @@ -586,6 +579,19 @@ NationalTelephonySubscriptionInfo ::= SEQUENCE ... } + +SubscriptionType ::= ENUMERATED -- Describes the nature of the subscription + { + unknown(0), + postpay(1), + prepay(2), + other(3), + ... + } + + + + TelephonyBillingDetails ::= SEQUENCE { subscriberID [1] TelephonySubscriberId OPTIONAL, @@ -1576,7 +1582,10 @@ SubscribedMultimediaServices ::= SEQUENCE nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL, -- national extension ..., - paymentDetails [13] PaymentDetails OPTIONAL + paymentDetails [13] PaymentDetails OPTIONAL, + subscriptionType [14] SubscriptionType OPTIONAL + -- Describes the nature of the subscription + } MultimediaServiceType ::= ENUMERATED @@ -1885,7 +1894,9 @@ NAServiceSubscription ::= SEQUENCE registeredICCID [11] UTF8String OPTIONAL, nationalNASubscription [12] NationalNASubscription OPTIONAL, paymentDetails [13] PaymentDetails OPTIONAL, - additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL + additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL, + subscriptionType [15] SubscriptionType OPTIONAL + -- Describes the nature of the subscription } NationalNASubscription ::= SEQUENCE @@ -2235,16 +2246,3 @@ NABillingDetails ::= SEQUENCE } END -- end of RDMessage - -Please consider the environment before printing this email. - -This message should be regarded as confidential. If you have received this email in error please notify the sender and destroy it immediately. - -Statements of intent shall only become binding when confirmed in hard copy by an authorised signatory. - -The contents of this email may relate to dealings with other companies under the control of BAE Systems plc details of which can be found at http://www.baesystems.com/Businesses/index.htm. - -Detica Limited is a BAE Systems company trading as BAE Systems Detica. -Detica Limited is registered in England and Wales under No: 1337451. -Registered office: Surrey Research Park, Guildford, Surrey, GU2 7YP, England. - -- GitLab From e6f9dd8c4e8520206abe4a4f6b6a4e3dfd5372c3 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:29:48 +0100 Subject: [PATCH 073/208] TS 102 232-3 v3.3.1 (2013-10-22) agreed at LI#34 (Edinburgh, 2013-09-24) --- 102232-3/IPAccessPDU.asn | 15 +++++++++------ ...IPAccessPDU,ver9.txt => IPAccessPDU,ver10.txt} | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) rename 102232-3/portal/{IPAccessPDU,ver9.txt => IPAccessPDU,ver10.txt} (95%) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 49fb540..cc72e9e 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version10(10)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,15 +8,15 @@ IMPORTS -- from ETSI TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -124,8 +124,11 @@ AccessEventType ::= ENUMERATED ..., startOfInterceptionWithSessionActive(7), -- LI is started on a target who already has an active session - accessEnd(8) + accessEnd(8), -- A target stops using the IAS, the session ends + endOfInterceptionWithSessionActive(9), + -- LI is ended on a target who still has an active session + unknown(10) } InternetAccessType ::= ENUMERATED diff --git a/102232-3/portal/IPAccessPDU,ver9.txt b/102232-3/portal/IPAccessPDU,ver10.txt similarity index 95% rename from 102232-3/portal/IPAccessPDU,ver9.txt rename to 102232-3/portal/IPAccessPDU,ver10.txt index 49fb540..cc72e9e 100644 --- a/102232-3/portal/IPAccessPDU,ver9.txt +++ b/102232-3/portal/IPAccessPDU,ver10.txt @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version10(10)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,15 +8,15 @@ IMPORTS -- from ETSI TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version9(9) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -124,8 +124,11 @@ AccessEventType ::= ENUMERATED ..., startOfInterceptionWithSessionActive(7), -- LI is started on a target who already has an active session - accessEnd(8) + accessEnd(8), -- A target stops using the IAS, the session ends + endOfInterceptionWithSessionActive(9), + -- LI is ended on a target who still has an active session + unknown(10) } InternetAccessType ::= ENUMERATED -- GitLab From 44f79f5a9bc440778d097ebc16ca2c5f05805177 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:29:51 +0100 Subject: [PATCH 074/208] TS 102 232-2 v3.6.1 (2013-10-22) agreed at LI#34 (Edinburgh, 2013-09-24) --- 102232-2/EmailPDU.asn | 32 +++++++++++++++---- ...{EmailPDU,ver11.txt => EmailPDU,ver12.txt} | 32 +++++++++++++++---- 2 files changed, 50 insertions(+), 14 deletions(-) rename 102232-2/portal/{EmailPDU,ver11.txt => EmailPDU,ver12.txt} (91%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index dafb0c4..fb69aae 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,17 +9,23 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + + -- from TS 102 232-5 [38] + IPMMCC + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -214,6 +220,18 @@ MessagingCC ::= SEQUENCE ... } +MessagingMMCC ::= SEQUENCE + -- MessagingMMCC is the PDU sent for the captured IPMMCC content +{ + messaging-mm-cc-obj-id [0] RELATIVE-OID, + event-identifier [1] INTEGER (0..4294967295), + -- Used to correlate to MessagingIRI within the same CIN + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + content [3] IPMMCC, + ... +} + + -- =========================================== -- Intercept-related information for Messaging -- =========================================== @@ -230,7 +248,7 @@ MessagingIRI ::= SEQUENCE trigger [6] Messaging-Trigger, properties [7] SEQUENCE OF Messaging-Property OPTIONAL, event-identifier [8] INTEGER (0..4294967295) OPTIONAL, - -- Used to correlate to MessagingCC within the same CIN. Mandatory when CC is also sent + -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent original-message [9] OCTET STRING OPTIONAL, ..., box-identifier [10] OCTET STRING OPTIONAL diff --git a/102232-2/portal/EmailPDU,ver11.txt b/102232-2/portal/EmailPDU,ver12.txt similarity index 91% rename from 102232-2/portal/EmailPDU,ver11.txt rename to 102232-2/portal/EmailPDU,ver12.txt index dafb0c4..fb69aae 100644 --- a/102232-2/portal/EmailPDU,ver11.txt +++ b/102232-2/portal/EmailPDU,ver12.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,17 +9,23 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + + -- from TS 102 232-5 [38] + IPMMCC + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version11(11) messagingCC(4)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -214,6 +220,18 @@ MessagingCC ::= SEQUENCE ... } +MessagingMMCC ::= SEQUENCE + -- MessagingMMCC is the PDU sent for the captured IPMMCC content +{ + messaging-mm-cc-obj-id [0] RELATIVE-OID, + event-identifier [1] INTEGER (0..4294967295), + -- Used to correlate to MessagingIRI within the same CIN + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + content [3] IPMMCC, + ... +} + + -- =========================================== -- Intercept-related information for Messaging -- =========================================== @@ -230,7 +248,7 @@ MessagingIRI ::= SEQUENCE trigger [6] Messaging-Trigger, properties [7] SEQUENCE OF Messaging-Property OPTIONAL, event-identifier [8] INTEGER (0..4294967295) OPTIONAL, - -- Used to correlate to MessagingCC within the same CIN. Mandatory when CC is also sent + -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent original-message [9] OCTET STRING OPTIONAL, ..., box-identifier [10] OCTET STRING OPTIONAL -- GitLab From 216395c7044991138dd71d179f78f3778338b419 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:29:54 +0100 Subject: [PATCH 075/208] TS 102 232-1 v3.5.1 (2013-10-22) agreed at LI#34 (Edinburgh, 2013-09-24) --- 102232-1/LI-PS-PDU.asn | 66 ++++++++++++++----- ...PS-PDU,ver16,1.txt => LI-PS-PDU,ver17.txt} | 66 ++++++++++++++----- 2 files changed, 96 insertions(+), 36 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver16,1.txt => LI-PS-PDU,ver17.txt} (90%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index e285180..a94056e 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version16(16)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version17(17)} DEFINITIONS IMPLICIT TAGS ::= @@ -25,16 +25,17 @@ IMPORTS EmailCC, EmailIRI, MessagingCC, + MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version10(10)} -- from TS 102 232-04 [32] L2CC, @@ -128,7 +129,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version16(16)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version17(17)} -- ==================== -- Top-level definition @@ -173,7 +174,8 @@ TimeStampQualifier ::= ENUMERATED unknown(0), timeOfInterception(1), timeOfMediation(2), - ... + ..., + timeOfAggregation(3) } -- ==================================== @@ -214,8 +216,9 @@ CCPayload ::= SEQUENCE -- For aggregated payloads (see clause 6.2.3) cCContents [2] CCContents, ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, -- For aggregated payloads (see clause 6.2.3) + timeStampQualifier [4] TimeStampQualifier OPTIONAL } PayloadDirection ::= ENUMERATED @@ -251,7 +254,8 @@ CCContents ::= CHOICE messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + messagingMMCC [18] MessagingMMCC } MicroSecondTimeStamp ::= SEQUENCE @@ -273,7 +277,10 @@ IRIPayload ::= SEQUENCE timeStamp [1] GeneralizedTime OPTIONAL, -- For aggregated payloads (see clause 6.2.3) iRIContents [2] IRIContents, - ... + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + timeStampQualifier [4] TimeStampQualifier OPTIONAL } IRIType ::= ENUMERATED @@ -337,17 +344,22 @@ EPSIRI ::= CHOICE TRIPayload ::= CHOICE { - integrityCheck [0] IntegrityCheck, - testPDU [1] NULL, - paddingPDU [2] OCTET STRING, + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, -- Undefined contents (will be discarded) - keep-alive [3] NULL, - keep-aliveResponse [4] NULL, - firstSegmentFlag [5] NULL, - lastSegmentFlag [6] NULL, + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, ..., - cINReset [7] NULL, - operatorLeaMessage [8] OperatorLeaMessage + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage, + optionRequest [9] OptionRequest, + optionResponse [10] OptionResponse, + optionComplete [11] NULL, + pDUAcknowledgementRequest [12] NULL, + pDUAcknowledgementResponse [13] NULL } IntegrityCheck ::= SEQUENCE @@ -380,6 +392,25 @@ DataType ::= ENUMERATED ... } +Option ::= CHOICE +{ + pDUAcknowledgement [0] NULL, + ... +} + +OptionRequest ::= SEQUENCE +{ + requestedOptions [0] SEQUENCE OF Option, + ... +} + +OptionResponse ::= SEQUENCE +{ + acceptedOptions [0] SEQUENCE OF Option, + declinedOptions [1] SEQUENCE OF Option, + ... +} + -- ================================== -- Definitions for OperatorLeaMessage -- ================================== @@ -472,4 +503,3 @@ EncryptedPayloadType ::= ENUMERATED } END --end of LI-PS-PDU - diff --git a/102232-1/portal/LI-PS-PDU,ver16,1.txt b/102232-1/portal/LI-PS-PDU,ver17.txt similarity index 90% rename from 102232-1/portal/LI-PS-PDU,ver16,1.txt rename to 102232-1/portal/LI-PS-PDU,ver17.txt index e285180..a94056e 100644 --- a/102232-1/portal/LI-PS-PDU,ver16,1.txt +++ b/102232-1/portal/LI-PS-PDU,ver17.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version16(16)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version17(17)} DEFINITIONS IMPLICIT TAGS ::= @@ -25,16 +25,17 @@ IMPORTS EmailCC, EmailIRI, MessagingCC, + MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version11(11)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version9(9)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version10(10)} -- from TS 102 232-04 [32] L2CC, @@ -128,7 +129,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version16(16)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version17(17)} -- ==================== -- Top-level definition @@ -173,7 +174,8 @@ TimeStampQualifier ::= ENUMERATED unknown(0), timeOfInterception(1), timeOfMediation(2), - ... + ..., + timeOfAggregation(3) } -- ==================================== @@ -214,8 +216,9 @@ CCPayload ::= SEQUENCE -- For aggregated payloads (see clause 6.2.3) cCContents [2] CCContents, ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, -- For aggregated payloads (see clause 6.2.3) + timeStampQualifier [4] TimeStampQualifier OPTIONAL } PayloadDirection ::= ENUMERATED @@ -251,7 +254,8 @@ CCContents ::= CHOICE messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + messagingMMCC [18] MessagingMMCC } MicroSecondTimeStamp ::= SEQUENCE @@ -273,7 +277,10 @@ IRIPayload ::= SEQUENCE timeStamp [1] GeneralizedTime OPTIONAL, -- For aggregated payloads (see clause 6.2.3) iRIContents [2] IRIContents, - ... + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + timeStampQualifier [4] TimeStampQualifier OPTIONAL } IRIType ::= ENUMERATED @@ -337,17 +344,22 @@ EPSIRI ::= CHOICE TRIPayload ::= CHOICE { - integrityCheck [0] IntegrityCheck, - testPDU [1] NULL, - paddingPDU [2] OCTET STRING, + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, -- Undefined contents (will be discarded) - keep-alive [3] NULL, - keep-aliveResponse [4] NULL, - firstSegmentFlag [5] NULL, - lastSegmentFlag [6] NULL, + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, ..., - cINReset [7] NULL, - operatorLeaMessage [8] OperatorLeaMessage + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage, + optionRequest [9] OptionRequest, + optionResponse [10] OptionResponse, + optionComplete [11] NULL, + pDUAcknowledgementRequest [12] NULL, + pDUAcknowledgementResponse [13] NULL } IntegrityCheck ::= SEQUENCE @@ -380,6 +392,25 @@ DataType ::= ENUMERATED ... } +Option ::= CHOICE +{ + pDUAcknowledgement [0] NULL, + ... +} + +OptionRequest ::= SEQUENCE +{ + requestedOptions [0] SEQUENCE OF Option, + ... +} + +OptionResponse ::= SEQUENCE +{ + acceptedOptions [0] SEQUENCE OF Option, + declinedOptions [1] SEQUENCE OF Option, + ... +} + -- ================================== -- Definitions for OperatorLeaMessage -- ================================== @@ -472,4 +503,3 @@ EncryptedPayloadType ::= ENUMERATED } END --end of LI-PS-PDU - -- GitLab From 86912c407fc83eaaa74c3997ccc0c0cde2dc890c Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:30:00 +0100 Subject: [PATCH 076/208] TS 102 657 v1.14.1 (2014-03-12) agreed at LI#35 (Milan, 2014-01-28) --- 102657/RDMessage.asn | 314 ++++++++++++++---- 102657/RDMessage.xsd | 246 ++++++++++++-- ...DMessage,ver13.xsd => RDMessage,ver14.xsd} | 246 ++++++++++++-- ...{RDMessagever13.txt => RDMessagever14.txt} | 314 ++++++++++++++---- 4 files changed, 944 insertions(+), 176 deletions(-) rename 102657/portal/{RDMessage,ver13.xsd => RDMessage,ver14.xsd} (91%) rename 102657/portal/{RDMessagever13.txt => RDMessagever14.txt} (88%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index d0d4c20..9fc0818 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version13(13)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version14(14)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version13(13)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version14(14)} -- ====================================== @@ -106,7 +106,12 @@ RequestMessage ::= SEQUENCE -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements -- or to transmit a warrant. - ... + ..., + maxRecordsPerBatch [6] INTEGER OPTIONAL + -- Indicates that multi-part delivery shall be used and each ResponseMessage shall not + -- contain more records than specified. (see clause 6.3.3.3) + + } DeliveryPointHIB ::= UTF8String @@ -377,7 +382,28 @@ OrganizationInfo ::= SEQUENCE -- address, and name/phone number of a point of contact nationalRegistrationID [3] UTF8String OPTIONAL, -- e.g. social security number - ... + ..., + registeredAddress [4] AddressInformation OPTIONAL, + tradingAddress [5] AddressInformation OPTIONAL, + otherAddresses [6] SEQUENCE OF OtherAddress OPTIONAL, + groupID [7] UTF8String OPTIONAL, + -- identity of organization group + groupAdministrator [8] UTF8String OPTIONAL, + -- identity of organization administrator + companyType [9] UTF8String OPTIONAL, + -- type of company + vatEnabled [10] BOOLEAN OPTIONAL, + -- VAT enabled or not + vatNumber [11] UTF8String OPTIONAL, + -- VAT number + createIP [12] IPAddress OPTIONAL, + -- IP used to create the subscriber account + createTime [13] GeneralizedTime OPTIONAL, + -- time that subscriber account was created + modifiedDate [14] GeneralizedTime OPTIONAL + -- date that subscriber account was modified + + } IndividualInfo ::= SEQUENCE @@ -394,7 +420,11 @@ IndividualInfo ::= SEQUENCE identificationNumber [5] UTF8String OPTIONAL, authenticationInfo [6] AuthenticationInfo OPTIONAL, ..., - profession [7] UTF8String OPTIONAL + profession [7] UTF8String OPTIONAL, + otherAddresses [8] SEQUENCE OF OtherAddress OPTIONAL, + createTime [9] GeneralizedTime OPTIONAL + -- time that subscriber account was created + } PersonName ::= SEQUENCE @@ -449,6 +479,18 @@ AddressInformation ::= SEQUENCE ... } + +OtherAddress ::= SEQUENCE +{ + address [1] AddressInformation OPTIONAL, + addressType [2] UTF8String OPTIONAL, + -- Description of the type of address that has been given in the address field + addressComments [3] UTF8String OPTIONAL, + -- Any extra information to aid the understanding of the address given + ... +} + + AuthenticationInfo ::= SEQUENCE { authenticationType [1] UTF8String OPTIONAL, @@ -567,8 +609,11 @@ SubscribedTelephonyServices ::= SEQUENCE -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements paymentDetails [17] PaymentDetails OPTIONAL, - subscriptionType [18] SubscriptionType OPTIONAL + subscriptionType [18] SubscriptionType OPTIONAL, -- Describes the nature of the subscription + deliveryAddress [19] AddressInformation OPTIONAL, + resellerAddress [20] AddressInformation OPTIONAL, + otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL } @@ -1082,9 +1127,17 @@ TransmitterDetails ::= SEQUENCE TransmitterTechnology ::= ENUMERATED { - gen2G(0), - gen3G(1), - ... + gen2G(0), -- This corresponds to GERAN in 3GPP TS 29.274 [32] + gen3G(1), -- This corresponds to UTRAN in 3GPP TS 29.274 [32] + ..., + eUTRAN(2), + wLAN(3), + hSPAEvolution(4), + gAN(5), + vIRTUAL(6) + -- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the + -- enumeration values (0 to 6) are not. + } NationalTransmitterDetails ::= SEQUENCE @@ -1124,8 +1177,15 @@ Location ::= SEQUENCE ..., postalLocation [8] AddressInformation OPTIONAL, extendedLocation [9] ExtendedLocation OPTIONAL, - userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL + userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL, -- coded according to 3GPP TS 29.274 [32]; the type IE is not included + tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, + -- Only applicable to the CS traffic cases, such as SMS over SGs, according to + -- 3GPP TS 23.272 [35] + eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL + -- Only applicable to the CS traffic cases, such as SMS over SGs, according to + -- 3GPP TS 23.272 [35] + } GSMLocation ::= CHOICE @@ -1545,7 +1605,9 @@ MultimediaSubscriber ::= SEQUENCE -- service-specific information about this subscriber subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, -- a subscriber (or account) may have more than one service listed against them - ... + ..., + multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL + } MultimediaSubscriberInfo ::= SEQUENCE @@ -1557,6 +1619,25 @@ MultimediaSubscriberInfo ::= SEQUENCE MultimediaSubscriberID ::= UTF8String -- unique identifier for this subscriber, e.g. account number + +MultimediaServiceRegistrationInfo ::= SEQUENCE +{ + emailAddress [1] UTF8String OPTIONAL, + -- subscriber email address in RFC2822 format + languageAtRegistration [2] UTF8String OPTIONAL, + -- subscriber language as in ISO 639 + accountCreationTime [3] GeneralizedTime OPTIONAL, -- start time of account + accountCreationIP [4] IPAddress OPTIONAL, -- subscriber IP at creation + accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, + -- subscriber country as specified in ISO 3166-2 + clientPlatformType [6] UTF8String OPTIONAL, -- subscriber platform + clientVersion [7] UTF8String OPTIONAL, -- subscriber platform version + ... +} + + + + SubscribedMultimediaServices ::= SEQUENCE { serviceID [1] UTF8String OPTIONAL, @@ -1583,8 +1664,16 @@ SubscribedMultimediaServices ::= SEQUENCE -- national extension ..., paymentDetails [13] PaymentDetails OPTIONAL, - subscriptionType [14] SubscriptionType OPTIONAL + subscriptionType [14] SubscriptionType OPTIONAL, -- Describes the nature of the subscription + deliveryAddress [15] AddressInformation OPTIONAL, + resellerAddress [16] AddressInformation OPTIONAL, + otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL, + multimediaServiceType [18] UTF8String OPTIONAL, + -- Service name used by the service provider which may be proprietary + orderTime [19] GeneralizedTime OPTIONAL + -- Time when the subscribed service was ordered by the user + } @@ -1632,7 +1721,14 @@ MultimediaServiceUsage ::= SEQUENCE nationalMultimediaServiceUsage [15] NationalMultimediaServiceUsage OPTIONAL, serviceID [16] UTF8String OPTIONAL, providerID [17] UTF8String OPTIONAL, - ... + ..., + cdrNumber [18] UTF8String OPTIONAL, -- as per CSP defined format + clientIP [19] IPAddress OPTIONAL, + relayIP [20] IPAddress OPTIONAL, + vmLength [21] INTEGER OPTIONAL, -- number of seconds + reason [22] UTF8String OPTIONAL + + } MultimediaPartyInformation ::= SEQUENCE @@ -1680,7 +1776,8 @@ MultimediaPartyRole ::= ENUMERATED directory(7), broadcastReceiver(8), broadcastSender(9), - ... + ..., + originalCalling (10) } MultimediaBearerService ::= ENUMERATED @@ -1748,9 +1845,20 @@ MultimediaBillingDetails ::= SEQUENCE nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + ..., + multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL + +} + +MultimediaBillingAddress ::= SEQUENCE +{ + addressSuppliedTime [1] GeneralizedTime OPTIONAL, + name [2] PersonName OPTIONAL, + address [3] AddressInformation OPTIONAL, ... } + NationalMultimediaBillingDetails ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1895,8 +2003,13 @@ NAServiceSubscription ::= SEQUENCE nationalNASubscription [12] NationalNASubscription OPTIONAL, paymentDetails [13] PaymentDetails OPTIONAL, additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL, - subscriptionType [15] SubscriptionType OPTIONAL + subscriptionType [15] SubscriptionType OPTIONAL, -- Describes the nature of the subscription + deliveryAddress [16] AddressInformation OPTIONAL, + resellerAddress [17] AddressInformation OPTIONAL, + otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL + + } NationalNASubscription ::= SEQUENCE @@ -1950,7 +2063,135 @@ NAServiceUsage ::= SEQUENCE subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access ePSInformation [16] EPSInformation OPTIONAL, - wifiInformation [17] WifiInformation OPTIONAL + wifiInformation [17] WifiInformation OPTIONAL, + addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL + -- contains extended information about the NAT or PAT operations carried out within this + -- service usage session + + +} + + + +WifiInformation ::= SEQUENCE +{ + bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, + -- The Basic Service Set Identification for the connection. + -- This is also the MAC address of the access point (the present document assumes + -- that records are for infrastructure mode, not ad-hoc mode). + -- The MAC address of the user is given in the naDeviceID in the structure (one level up) + sSID [2] UTF8String OPTIONAL, + -- The human-readable Service Set Identifier + -- It should be noted that this is typically only available on the air interface and so + -- is not likely to be logged by CSPs (though may be recorded at a more local level). + -- Therefore requesting organizations should not expect this to be populated typically. + -- It is not guaranteed to be unique. + username [3] UTF8String OPTIONAL, + locationOfAccessPoint [4] Location OPTIONAL, + -- Location of the Access Point as lat/long, grid reference or postal address. + -- Requesting organizations should be aware that Access Points can be moved, sometimes + -- without the knowledge of the CSP + authenticationType [5] AuthenticationType OPTIONAL, + additionalAuthenticationInformation [6] AdditionalAuthenticationInformation OPTIONAL, + ..., + + accessPointIPAddress [7] IPAddress OPTIONAL, + accessPointAdditionalDescriptions[8] SEQUENCE OF UTF8String OPTIONAL, + -- Informal description of location, category or type of access point, + -- or a name of the network to which the access point belongs. + accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL + -- For WiFi, there may be other parties involved in hosting or owning the + -- Access Points, e.g. access point provider or partner providers + +} + + +AuthenticationType ::= ENUMERATED +{ + authenticationBySMS (1), + -- Used if authentication arranged through a code sent to mobile + -- additionalAuthenticationInformation shall contain the phone number + authenticationByCookie (2), + -- If authentication was granted on the basis of a cookie left from a previous visit to a + -- site. + -- No other mandatory addtionalAuthenticationInformation + authenticationByMACAddress (3), + -- If authentication was granted because the MAC address of the UE was recognised due + -- to a previous visit. + -- additionalAuthenticationInformation shall contain the MAC Address unless it is already + -- populated as NADeviceID in this record. + authenticationByEAPSIM (4), + -- If authenticated by EAP SIM see TS 33.234 [X] + -- additionalAuthenticationInformation shall contain the IMSI + -- Other varieties of EAP could be added here later, together with any extra information they + -- could provide. + authenticationByUsernameAndPassword (5), + -- additionalAuthenticationInformation should contain username and password if appropriate + authenticationByPaymentOrVoucher (6), + -- additionalAuthenticationInformation should contain Voucher or Payment details + -- if appropriate. + ... +} + +AdditionalAuthenticationInformation ::= SEQUENCE +{ + phoneNumber [1] PartyNumber OPTIONAL, + -- e.g. number to which an SMS was sent + mACAddress [2] OCTET STRING (SIZE (6)) OPTIONAL, + iMSI [3] IMSI OPTIONAL, + username [4] UTF8String OPTIONAL, + -- Names supplied are unlikely to be verified + password [5] UTF8String OPTIONAL, + -- Only to be populated if it is both appropriate and available + paymentReference [6] UTF8String OPTIONAL, + -- For example, the number of a voucher that was used in authentication + ... +} + + + +AddressTranslationRecord ::= SEQUENCE +{ + validity [1] TimeSpan OPTIONAL, + -- time at which the address translation started and/or ended + privateIPAddress [2] IPAddress OPTIONAL, + -- the private IP of the host + privatePort [3] INTEGER OPTIONAL, + -- the private port of the host + publicIPAddress [4] IPAddress OPTIONAL, + -- the translated IP of the host, i.e. the address known by the remote host + publicPort [5] AddressTranslationPortAssignment OPTIONAL, + -- the translated port(s) of the host, i.e. the port(s) known by the remote host, if applicable + destinationIPAddress [6] IPAddress OPTIONAL, + -- the IP address of the remote host + destinationPort [7] INTEGER OPTIONAL, + -- the port of the remote host + connectionType [8] ENUMERATED + { + udp (0), + tcp (1), + sctp (2), + other (3), + ... + } OPTIONAL, + ... +} + +AddressTranslationPortAssignment ::= CHOICE +{ + singlePort [1] INTEGER, + -- only one port is assigned to the host, that port number is specified here + portRange [2] SEQUENCE OF PortRange, + -- if a range of translated ports is assigned to the host, specify it here + ... +} + +PortRange ::= SEQUENCE +{ + -- The range given is inclusive of both ends + lowerBound [1] INTEGER OPTIONAL, + upperBound [2] INTEGER OPTIONAL, + ... } NAEndReason ::= ENUMERATED @@ -2080,7 +2321,7 @@ EPSEvent ::= ENUMERATED -- The list of EPSEvent below is partly taken from 3GPP TS 33.108 -- EpsHI2Operations from the EPSEvent ::=ENUMERATED module { - e-UTRANAttach (16), + e-UTRANAttach (16), e-UTRANDetach (17), bearerActivation (18), bearerModification (20), @@ -2090,45 +2331,6 @@ EPSEvent ::= ENUMERATED ... } - -WifiInformation ::= SEQUENCE -{ - bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, - -- The Basic Service Set Identification for the connection. - -- This is also the MAC address of the access point (the present document assumes - -- that records are for infrastructure mode, not ad-hoc mode). - -- The MAC address of the user is given in the naDeviceID in the structure (one level up) - sSID [2] UTF8String OPTIONAL, - -- The human-readable Service Set Identifier - username [3] UTF8String OPTIONAL, - protocol [4] ENUMERATED - { - iEEE80211 (1), - iEEE80211a (2), - iEEE80211b (3), - iEEE80211g (4), - iEEE80211n (5), - iEEE80211ac (6), - iEEE80211ad (7), - ... - } OPTIONAL, - securityMode [5] ENUMERATED - { - wEP (0), - wPA (1), - wPA2 (2), - ... - } OPTIONAL, - authenticationTelephoneNumber [6] PartyNumber OPTIONAL, - -- if authentication arranged through a code sent to mobile, this is the number - -- to which the code was sent - authenticationPaymentReference [7] UTF8String OPTIONAL, - -- For example, the number of a voucher that was used in authentication - ... -} - - - -- ==================================== -- Definitions of Network Access Device -- ==================================== diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 32636be..a67efde 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.13.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.14.1 @@ -495,7 +495,16 @@ - + + + + + + + + + + @@ -522,6 +531,23 @@ + + + + + + + + + + + + + + + + + @@ -602,7 +628,15 @@ - + + + + + + + + + @@ -646,6 +680,15 @@ + + + + + + + + + @@ -1330,6 +1373,20 @@ + + + + + + + + + + + + + + @@ -1417,6 +1474,11 @@ + + + + + @@ -1697,6 +1759,15 @@ + + + + + + + + + @@ -1838,6 +1909,13 @@ + + + + + + + @@ -1851,39 +1929,95 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + - + + + + + + + + - - - - - - + + + - - + + + + + + + + - - + + @@ -2068,8 +2202,9 @@ - + + @@ -2221,6 +2356,7 @@ + @@ -2235,8 +2371,27 @@ - - + + + + + + + + + + + + + + + + + + + + + @@ -2258,7 +2413,18 @@ - + + + + + + + + + + + + @@ -2318,8 +2484,13 @@ - - + + + + + + + @@ -2369,6 +2540,7 @@ + @@ -2452,11 +2624,21 @@ + - + + + + + + + + + + diff --git a/102657/portal/RDMessage,ver13.xsd b/102657/portal/RDMessage,ver14.xsd similarity index 91% rename from 102657/portal/RDMessage,ver13.xsd rename to 102657/portal/RDMessage,ver14.xsd index 32636be..a67efde 100644 --- a/102657/portal/RDMessage,ver13.xsd +++ b/102657/portal/RDMessage,ver14.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.13.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.14.1 @@ -495,7 +495,16 @@ - + + + + + + + + + + @@ -522,6 +531,23 @@ + + + + + + + + + + + + + + + + + @@ -602,7 +628,15 @@ - + + + + + + + + + @@ -646,6 +680,15 @@ + + + + + + + + + @@ -1330,6 +1373,20 @@ + + + + + + + + + + + + + + @@ -1417,6 +1474,11 @@ + + + + + @@ -1697,6 +1759,15 @@ + + + + + + + + + @@ -1838,6 +1909,13 @@ + + + + + + + @@ -1851,39 +1929,95 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + - + + + + + + + + - - - - - - + + + - - + + + + + + + + - - + + @@ -2068,8 +2202,9 @@ - + + @@ -2221,6 +2356,7 @@ + @@ -2235,8 +2371,27 @@ - - + + + + + + + + + + + + + + + + + + + + + @@ -2258,7 +2413,18 @@ - + + + + + + + + + + + + @@ -2318,8 +2484,13 @@ - - + + + + + + + @@ -2369,6 +2540,7 @@ + @@ -2452,11 +2624,21 @@ + - + + + + + + + + + + diff --git a/102657/portal/RDMessagever13.txt b/102657/portal/RDMessagever14.txt similarity index 88% rename from 102657/portal/RDMessagever13.txt rename to 102657/portal/RDMessagever14.txt index d0d4c20..9fc0818 100644 --- a/102657/portal/RDMessagever13.txt +++ b/102657/portal/RDMessagever14.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version13(13)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version14(14)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version13(13)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version14(14)} -- ====================================== @@ -106,7 +106,12 @@ RequestMessage ::= SEQUENCE -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements -- or to transmit a warrant. - ... + ..., + maxRecordsPerBatch [6] INTEGER OPTIONAL + -- Indicates that multi-part delivery shall be used and each ResponseMessage shall not + -- contain more records than specified. (see clause 6.3.3.3) + + } DeliveryPointHIB ::= UTF8String @@ -377,7 +382,28 @@ OrganizationInfo ::= SEQUENCE -- address, and name/phone number of a point of contact nationalRegistrationID [3] UTF8String OPTIONAL, -- e.g. social security number - ... + ..., + registeredAddress [4] AddressInformation OPTIONAL, + tradingAddress [5] AddressInformation OPTIONAL, + otherAddresses [6] SEQUENCE OF OtherAddress OPTIONAL, + groupID [7] UTF8String OPTIONAL, + -- identity of organization group + groupAdministrator [8] UTF8String OPTIONAL, + -- identity of organization administrator + companyType [9] UTF8String OPTIONAL, + -- type of company + vatEnabled [10] BOOLEAN OPTIONAL, + -- VAT enabled or not + vatNumber [11] UTF8String OPTIONAL, + -- VAT number + createIP [12] IPAddress OPTIONAL, + -- IP used to create the subscriber account + createTime [13] GeneralizedTime OPTIONAL, + -- time that subscriber account was created + modifiedDate [14] GeneralizedTime OPTIONAL + -- date that subscriber account was modified + + } IndividualInfo ::= SEQUENCE @@ -394,7 +420,11 @@ IndividualInfo ::= SEQUENCE identificationNumber [5] UTF8String OPTIONAL, authenticationInfo [6] AuthenticationInfo OPTIONAL, ..., - profession [7] UTF8String OPTIONAL + profession [7] UTF8String OPTIONAL, + otherAddresses [8] SEQUENCE OF OtherAddress OPTIONAL, + createTime [9] GeneralizedTime OPTIONAL + -- time that subscriber account was created + } PersonName ::= SEQUENCE @@ -449,6 +479,18 @@ AddressInformation ::= SEQUENCE ... } + +OtherAddress ::= SEQUENCE +{ + address [1] AddressInformation OPTIONAL, + addressType [2] UTF8String OPTIONAL, + -- Description of the type of address that has been given in the address field + addressComments [3] UTF8String OPTIONAL, + -- Any extra information to aid the understanding of the address given + ... +} + + AuthenticationInfo ::= SEQUENCE { authenticationType [1] UTF8String OPTIONAL, @@ -567,8 +609,11 @@ SubscribedTelephonyServices ::= SEQUENCE -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements paymentDetails [17] PaymentDetails OPTIONAL, - subscriptionType [18] SubscriptionType OPTIONAL + subscriptionType [18] SubscriptionType OPTIONAL, -- Describes the nature of the subscription + deliveryAddress [19] AddressInformation OPTIONAL, + resellerAddress [20] AddressInformation OPTIONAL, + otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL } @@ -1082,9 +1127,17 @@ TransmitterDetails ::= SEQUENCE TransmitterTechnology ::= ENUMERATED { - gen2G(0), - gen3G(1), - ... + gen2G(0), -- This corresponds to GERAN in 3GPP TS 29.274 [32] + gen3G(1), -- This corresponds to UTRAN in 3GPP TS 29.274 [32] + ..., + eUTRAN(2), + wLAN(3), + hSPAEvolution(4), + gAN(5), + vIRTUAL(6) + -- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the + -- enumeration values (0 to 6) are not. + } NationalTransmitterDetails ::= SEQUENCE @@ -1124,8 +1177,15 @@ Location ::= SEQUENCE ..., postalLocation [8] AddressInformation OPTIONAL, extendedLocation [9] ExtendedLocation OPTIONAL, - userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL + userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL, -- coded according to 3GPP TS 29.274 [32]; the type IE is not included + tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, + -- Only applicable to the CS traffic cases, such as SMS over SGs, according to + -- 3GPP TS 23.272 [35] + eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL + -- Only applicable to the CS traffic cases, such as SMS over SGs, according to + -- 3GPP TS 23.272 [35] + } GSMLocation ::= CHOICE @@ -1545,7 +1605,9 @@ MultimediaSubscriber ::= SEQUENCE -- service-specific information about this subscriber subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, -- a subscriber (or account) may have more than one service listed against them - ... + ..., + multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL + } MultimediaSubscriberInfo ::= SEQUENCE @@ -1557,6 +1619,25 @@ MultimediaSubscriberInfo ::= SEQUENCE MultimediaSubscriberID ::= UTF8String -- unique identifier for this subscriber, e.g. account number + +MultimediaServiceRegistrationInfo ::= SEQUENCE +{ + emailAddress [1] UTF8String OPTIONAL, + -- subscriber email address in RFC2822 format + languageAtRegistration [2] UTF8String OPTIONAL, + -- subscriber language as in ISO 639 + accountCreationTime [3] GeneralizedTime OPTIONAL, -- start time of account + accountCreationIP [4] IPAddress OPTIONAL, -- subscriber IP at creation + accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, + -- subscriber country as specified in ISO 3166-2 + clientPlatformType [6] UTF8String OPTIONAL, -- subscriber platform + clientVersion [7] UTF8String OPTIONAL, -- subscriber platform version + ... +} + + + + SubscribedMultimediaServices ::= SEQUENCE { serviceID [1] UTF8String OPTIONAL, @@ -1583,8 +1664,16 @@ SubscribedMultimediaServices ::= SEQUENCE -- national extension ..., paymentDetails [13] PaymentDetails OPTIONAL, - subscriptionType [14] SubscriptionType OPTIONAL + subscriptionType [14] SubscriptionType OPTIONAL, -- Describes the nature of the subscription + deliveryAddress [15] AddressInformation OPTIONAL, + resellerAddress [16] AddressInformation OPTIONAL, + otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL, + multimediaServiceType [18] UTF8String OPTIONAL, + -- Service name used by the service provider which may be proprietary + orderTime [19] GeneralizedTime OPTIONAL + -- Time when the subscribed service was ordered by the user + } @@ -1632,7 +1721,14 @@ MultimediaServiceUsage ::= SEQUENCE nationalMultimediaServiceUsage [15] NationalMultimediaServiceUsage OPTIONAL, serviceID [16] UTF8String OPTIONAL, providerID [17] UTF8String OPTIONAL, - ... + ..., + cdrNumber [18] UTF8String OPTIONAL, -- as per CSP defined format + clientIP [19] IPAddress OPTIONAL, + relayIP [20] IPAddress OPTIONAL, + vmLength [21] INTEGER OPTIONAL, -- number of seconds + reason [22] UTF8String OPTIONAL + + } MultimediaPartyInformation ::= SEQUENCE @@ -1680,7 +1776,8 @@ MultimediaPartyRole ::= ENUMERATED directory(7), broadcastReceiver(8), broadcastSender(9), - ... + ..., + originalCalling (10) } MultimediaBearerService ::= ENUMERATED @@ -1748,9 +1845,20 @@ MultimediaBillingDetails ::= SEQUENCE nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + ..., + multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL + +} + +MultimediaBillingAddress ::= SEQUENCE +{ + addressSuppliedTime [1] GeneralizedTime OPTIONAL, + name [2] PersonName OPTIONAL, + address [3] AddressInformation OPTIONAL, ... } + NationalMultimediaBillingDetails ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1895,8 +2003,13 @@ NAServiceSubscription ::= SEQUENCE nationalNASubscription [12] NationalNASubscription OPTIONAL, paymentDetails [13] PaymentDetails OPTIONAL, additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL, - subscriptionType [15] SubscriptionType OPTIONAL + subscriptionType [15] SubscriptionType OPTIONAL, -- Describes the nature of the subscription + deliveryAddress [16] AddressInformation OPTIONAL, + resellerAddress [17] AddressInformation OPTIONAL, + otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL + + } NationalNASubscription ::= SEQUENCE @@ -1950,7 +2063,135 @@ NAServiceUsage ::= SEQUENCE subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access ePSInformation [16] EPSInformation OPTIONAL, - wifiInformation [17] WifiInformation OPTIONAL + wifiInformation [17] WifiInformation OPTIONAL, + addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL + -- contains extended information about the NAT or PAT operations carried out within this + -- service usage session + + +} + + + +WifiInformation ::= SEQUENCE +{ + bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, + -- The Basic Service Set Identification for the connection. + -- This is also the MAC address of the access point (the present document assumes + -- that records are for infrastructure mode, not ad-hoc mode). + -- The MAC address of the user is given in the naDeviceID in the structure (one level up) + sSID [2] UTF8String OPTIONAL, + -- The human-readable Service Set Identifier + -- It should be noted that this is typically only available on the air interface and so + -- is not likely to be logged by CSPs (though may be recorded at a more local level). + -- Therefore requesting organizations should not expect this to be populated typically. + -- It is not guaranteed to be unique. + username [3] UTF8String OPTIONAL, + locationOfAccessPoint [4] Location OPTIONAL, + -- Location of the Access Point as lat/long, grid reference or postal address. + -- Requesting organizations should be aware that Access Points can be moved, sometimes + -- without the knowledge of the CSP + authenticationType [5] AuthenticationType OPTIONAL, + additionalAuthenticationInformation [6] AdditionalAuthenticationInformation OPTIONAL, + ..., + + accessPointIPAddress [7] IPAddress OPTIONAL, + accessPointAdditionalDescriptions[8] SEQUENCE OF UTF8String OPTIONAL, + -- Informal description of location, category or type of access point, + -- or a name of the network to which the access point belongs. + accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL + -- For WiFi, there may be other parties involved in hosting or owning the + -- Access Points, e.g. access point provider or partner providers + +} + + +AuthenticationType ::= ENUMERATED +{ + authenticationBySMS (1), + -- Used if authentication arranged through a code sent to mobile + -- additionalAuthenticationInformation shall contain the phone number + authenticationByCookie (2), + -- If authentication was granted on the basis of a cookie left from a previous visit to a + -- site. + -- No other mandatory addtionalAuthenticationInformation + authenticationByMACAddress (3), + -- If authentication was granted because the MAC address of the UE was recognised due + -- to a previous visit. + -- additionalAuthenticationInformation shall contain the MAC Address unless it is already + -- populated as NADeviceID in this record. + authenticationByEAPSIM (4), + -- If authenticated by EAP SIM see TS 33.234 [X] + -- additionalAuthenticationInformation shall contain the IMSI + -- Other varieties of EAP could be added here later, together with any extra information they + -- could provide. + authenticationByUsernameAndPassword (5), + -- additionalAuthenticationInformation should contain username and password if appropriate + authenticationByPaymentOrVoucher (6), + -- additionalAuthenticationInformation should contain Voucher or Payment details + -- if appropriate. + ... +} + +AdditionalAuthenticationInformation ::= SEQUENCE +{ + phoneNumber [1] PartyNumber OPTIONAL, + -- e.g. number to which an SMS was sent + mACAddress [2] OCTET STRING (SIZE (6)) OPTIONAL, + iMSI [3] IMSI OPTIONAL, + username [4] UTF8String OPTIONAL, + -- Names supplied are unlikely to be verified + password [5] UTF8String OPTIONAL, + -- Only to be populated if it is both appropriate and available + paymentReference [6] UTF8String OPTIONAL, + -- For example, the number of a voucher that was used in authentication + ... +} + + + +AddressTranslationRecord ::= SEQUENCE +{ + validity [1] TimeSpan OPTIONAL, + -- time at which the address translation started and/or ended + privateIPAddress [2] IPAddress OPTIONAL, + -- the private IP of the host + privatePort [3] INTEGER OPTIONAL, + -- the private port of the host + publicIPAddress [4] IPAddress OPTIONAL, + -- the translated IP of the host, i.e. the address known by the remote host + publicPort [5] AddressTranslationPortAssignment OPTIONAL, + -- the translated port(s) of the host, i.e. the port(s) known by the remote host, if applicable + destinationIPAddress [6] IPAddress OPTIONAL, + -- the IP address of the remote host + destinationPort [7] INTEGER OPTIONAL, + -- the port of the remote host + connectionType [8] ENUMERATED + { + udp (0), + tcp (1), + sctp (2), + other (3), + ... + } OPTIONAL, + ... +} + +AddressTranslationPortAssignment ::= CHOICE +{ + singlePort [1] INTEGER, + -- only one port is assigned to the host, that port number is specified here + portRange [2] SEQUENCE OF PortRange, + -- if a range of translated ports is assigned to the host, specify it here + ... +} + +PortRange ::= SEQUENCE +{ + -- The range given is inclusive of both ends + lowerBound [1] INTEGER OPTIONAL, + upperBound [2] INTEGER OPTIONAL, + ... } NAEndReason ::= ENUMERATED @@ -2080,7 +2321,7 @@ EPSEvent ::= ENUMERATED -- The list of EPSEvent below is partly taken from 3GPP TS 33.108 -- EpsHI2Operations from the EPSEvent ::=ENUMERATED module { - e-UTRANAttach (16), + e-UTRANAttach (16), e-UTRANDetach (17), bearerActivation (18), bearerModification (20), @@ -2090,45 +2331,6 @@ EPSEvent ::= ENUMERATED ... } - -WifiInformation ::= SEQUENCE -{ - bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, - -- The Basic Service Set Identification for the connection. - -- This is also the MAC address of the access point (the present document assumes - -- that records are for infrastructure mode, not ad-hoc mode). - -- The MAC address of the user is given in the naDeviceID in the structure (one level up) - sSID [2] UTF8String OPTIONAL, - -- The human-readable Service Set Identifier - username [3] UTF8String OPTIONAL, - protocol [4] ENUMERATED - { - iEEE80211 (1), - iEEE80211a (2), - iEEE80211b (3), - iEEE80211g (4), - iEEE80211n (5), - iEEE80211ac (6), - iEEE80211ad (7), - ... - } OPTIONAL, - securityMode [5] ENUMERATED - { - wEP (0), - wPA (1), - wPA2 (2), - ... - } OPTIONAL, - authenticationTelephoneNumber [6] PartyNumber OPTIONAL, - -- if authentication arranged through a code sent to mobile, this is the number - -- to which the code was sent - authenticationPaymentReference [7] UTF8String OPTIONAL, - -- For example, the number of a voucher that was used in authentication - ... -} - - - -- ==================================== -- Definitions of Network Access Device -- ==================================== -- GitLab From 70cafce7e68529231a76c91e4570a85f29fa839f Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:30:03 +0100 Subject: [PATCH 077/208] TS 102 232-6 v3.3.1 (2014-03-10) agreed at LI#35 (Milan, 2014-01-28) --- 102232-6/PstnIsdnPDU.asn | 40 ++++++++++++------- ...nIsdnPDU,ver4.txt => PstnIsdnPDU,ver5.txt} | 40 ++++++++++++------- 2 files changed, 52 insertions(+), 28 deletions(-) rename 102232-6/portal/{PstnIsdnPDU,ver4.txt => PstnIsdnPDU,ver5.txt} (74%) diff --git a/102232-6/PstnIsdnPDU.asn b/102232-6/PstnIsdnPDU.asn index c9f363d..0983a7e 100644 --- a/102232-6/PstnIsdnPDU.asn +++ b/102232-6/PstnIsdnPDU.asn @@ -1,20 +1,21 @@ +-- =============================== +-- Description of the PstnIsdn PDU +-- =============================== + PstnIsdnPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)} + -- from TS 102 232-01 [2] PayloadDirection FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version13(13)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version18(18)}; -- ============================ @@ -23,8 +24,8 @@ IMPORTS -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) iRI(1)} -pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) cC(2)} +pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version5(5) iRI(1)} +pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version5(5) cC(2)} -- =============================== @@ -61,9 +62,13 @@ SupplementaryInfo ::= SEQUENCE copyOfSDPMessage [6] OCTET STRING OPTIONAL, -- Format as per RFC 4566 [7] ..., - frameType [7] FrameType OPTIONAL + frameType [7] FrameType OPTIONAL, -- Populated if one or more protocol layers are missing from CC data -- May be omitted if all headers are present. + alternateProtocol [8] AlternateProtocol OPTIONAL + -- Used to identify the protocol of packets sent in pstnIsdnCCContents + + } InformationAppliesTo ::= SEQUENCE @@ -81,18 +86,26 @@ InformationAppliesTo ::= SEQUENCE FrameType ::= ENUMERATED { ipFrame(0), - -- All headers are present + -- All headers are present. Use AlternateProtocol to signal the contents if not RTP udpFrame(1), - -- IP header is missing - rtpFrame(2), - -- UDP and IP headers are missing + -- IP header is missing. Use AlternateProtocol to signal the contents if not RTP + applicationFrame(2), + -- UDP and IP headers are missing. Use AlternateProtocol to signal the contents if not RTP audioFrame(3), -- All headers are missing ..., artificialRtpFrame(4) -- UDP and IP headers are missing, artificial RTP frame has been added + +} +AlternateProtocol ::= ENUMERATED +{ + uDPTL(1), + -- pstnIsdnCCContents parameter contains UDPTL packets + ... } + -- ============================== -- Description of the PstnIsdn CC -- ============================== @@ -110,4 +123,3 @@ PstnIsdnCC ::= SEQUENCE } END -- end of PstnIsdnPDU - diff --git a/102232-6/portal/PstnIsdnPDU,ver4.txt b/102232-6/portal/PstnIsdnPDU,ver5.txt similarity index 74% rename from 102232-6/portal/PstnIsdnPDU,ver4.txt rename to 102232-6/portal/PstnIsdnPDU,ver5.txt index c9f363d..0983a7e 100644 --- a/102232-6/portal/PstnIsdnPDU,ver4.txt +++ b/102232-6/portal/PstnIsdnPDU,ver5.txt @@ -1,20 +1,21 @@ +-- =============================== +-- Description of the PstnIsdn PDU +-- =============================== + PstnIsdnPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)} + -- from TS 102 232-01 [2] PayloadDirection FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version13(13)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version18(18)}; -- ============================ @@ -23,8 +24,8 @@ IMPORTS -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) iRI(1)} -pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version4(4) cC(2)} +pstnIsdnIRIObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version5(5) iRI(1)} +pstnIsdnCCObjId RELATIVE-OID ::= {li-ps(5) pstnIsdn(6) version5(5) cC(2)} -- =============================== @@ -61,9 +62,13 @@ SupplementaryInfo ::= SEQUENCE copyOfSDPMessage [6] OCTET STRING OPTIONAL, -- Format as per RFC 4566 [7] ..., - frameType [7] FrameType OPTIONAL + frameType [7] FrameType OPTIONAL, -- Populated if one or more protocol layers are missing from CC data -- May be omitted if all headers are present. + alternateProtocol [8] AlternateProtocol OPTIONAL + -- Used to identify the protocol of packets sent in pstnIsdnCCContents + + } InformationAppliesTo ::= SEQUENCE @@ -81,18 +86,26 @@ InformationAppliesTo ::= SEQUENCE FrameType ::= ENUMERATED { ipFrame(0), - -- All headers are present + -- All headers are present. Use AlternateProtocol to signal the contents if not RTP udpFrame(1), - -- IP header is missing - rtpFrame(2), - -- UDP and IP headers are missing + -- IP header is missing. Use AlternateProtocol to signal the contents if not RTP + applicationFrame(2), + -- UDP and IP headers are missing. Use AlternateProtocol to signal the contents if not RTP audioFrame(3), -- All headers are missing ..., artificialRtpFrame(4) -- UDP and IP headers are missing, artificial RTP frame has been added + +} +AlternateProtocol ::= ENUMERATED +{ + uDPTL(1), + -- pstnIsdnCCContents parameter contains UDPTL packets + ... } + -- ============================== -- Description of the PstnIsdn CC -- ============================== @@ -110,4 +123,3 @@ PstnIsdnCC ::= SEQUENCE } END -- end of PstnIsdnPDU - -- GitLab From 218b1f6354ca359ce850a5aa115395471e127da0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:30:07 +0100 Subject: [PATCH 078/208] TS 102 232-2 v3.7.1 (2014-02-21) agreed at LI#35 (Milan, 2014-01-28) --- 102232-2/EmailPDU.asn | 16 +++++++++------- .../{EmailPDU,ver12.txt => EmailPDU,ver13.txt} | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) rename 102232-2/portal/{EmailPDU,ver12.txt => EmailPDU,ver13.txt} (96%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index fb69aae..ba29621 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,7 +9,7 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- from TS 102 232-5 [38] IPMMCC @@ -21,11 +21,11 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingMMCC(5)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -125,6 +125,8 @@ E-mail-Protocol ::= ENUMERATED smtp(1), pop3(2), imap4(3), + webmail(4), + -- See Annex H for more information undefined(255), -- The protocol is not known or not representable by the current enumeration ... diff --git a/102232-2/portal/EmailPDU,ver12.txt b/102232-2/portal/EmailPDU,ver13.txt similarity index 96% rename from 102232-2/portal/EmailPDU,ver12.txt rename to 102232-2/portal/EmailPDU,ver13.txt index fb69aae..ba29621 100644 --- a/102232-2/portal/EmailPDU,ver12.txt +++ b/102232-2/portal/EmailPDU,ver13.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,7 +9,7 @@ IMPORTS -- from TS 101 671 [4] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- from TS 102 232-5 [38] IPMMCC @@ -21,11 +21,11 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version12(12) messagingMMCC(5)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -125,6 +125,8 @@ E-mail-Protocol ::= ENUMERATED smtp(1), pop3(2), imap4(3), + webmail(4), + -- See Annex H for more information undefined(255), -- The protocol is not known or not representable by the current enumeration ... -- GitLab From 393327c5f19dd3b08f80f6cc3578621e75970aa7 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:30:10 +0100 Subject: [PATCH 079/208] TS 102 232-1 v3.6.1 (2014-02-21) agreed at LI#35 (Milan, 2014-01-28) --- 102232-1/LI-PS-PDU.asn | 67 +++++++++---------- ...I-PS-PDU,ver17.txt => LI-PS-PDU,ver18.txt} | 67 +++++++++---------- 2 files changed, 66 insertions(+), 68 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver17.txt => LI-PS-PDU,ver18.txt} (90%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index a94056e..3a535a9 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version17(17)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version18(18)} DEFINITIONS IMPLICIT TAGS ::= @@ -28,7 +28,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)} -- from TS 102 232-03 [6] IPCC, @@ -42,7 +42,7 @@ IMPORTS L2IRI, L2IRIOnly FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version6(6)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} -- from TS 102 232-05 [37] IPMMCC, @@ -54,7 +54,7 @@ IMPORTS PstnIsdnCC, PstnIsdnIRI FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} -- from 3GPP TS 33.108 [9] IRI-Parameters, @@ -80,21 +80,20 @@ IMPORTS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} -- The relevant module (including the UMTS 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 UMTS 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 UMTS 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 UMTS 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 UMTS release and version number) + -- needs to be chosen when compiling the application. -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -129,7 +128,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version17(17)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version18(18)} -- ==================== -- Top-level definition @@ -253,8 +252,8 @@ CCContents ::= CHOICE cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, - uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, messagingMMCC [18] MessagingMMCC } @@ -344,22 +343,22 @@ EPSIRI ::= CHOICE TRIPayload ::= CHOICE { - integrityCheck [0] IntegrityCheck, - testPDU [1] NULL, - paddingPDU [2] OCTET STRING, + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, -- Undefined contents (will be discarded) - keep-alive [3] NULL, - keep-aliveResponse [4] NULL, - firstSegmentFlag [5] NULL, - lastSegmentFlag [6] NULL, + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, ..., - cINReset [7] NULL, - operatorLeaMessage [8] OperatorLeaMessage, - optionRequest [9] OptionRequest, - optionResponse [10] OptionResponse, - optionComplete [11] NULL, - pDUAcknowledgementRequest [12] NULL, - pDUAcknowledgementResponse [13] NULL + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage, + optionRequest [9] OptionRequest, + optionResponse [10] OptionResponse, + optionComplete [11] NULL, + pDUAcknowledgementRequest [12] NULL, + pDUAcknowledgementResponse [13] NULL } IntegrityCheck ::= SEQUENCE diff --git a/102232-1/portal/LI-PS-PDU,ver17.txt b/102232-1/portal/LI-PS-PDU,ver18.txt similarity index 90% rename from 102232-1/portal/LI-PS-PDU,ver17.txt rename to 102232-1/portal/LI-PS-PDU,ver18.txt index a94056e..3a535a9 100644 --- a/102232-1/portal/LI-PS-PDU,ver17.txt +++ b/102232-1/portal/LI-PS-PDU,ver18.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version17(17)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version18(18)} DEFINITIONS IMPLICIT TAGS ::= @@ -28,7 +28,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)} -- from TS 102 232-03 [6] IPCC, @@ -42,7 +42,7 @@ IMPORTS L2IRI, L2IRIOnly FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version6(6)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} -- from TS 102 232-05 [37] IPMMCC, @@ -54,7 +54,7 @@ IMPORTS PstnIsdnCC, PstnIsdnIRI FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} -- from 3GPP TS 33.108 [9] IRI-Parameters, @@ -80,21 +80,20 @@ IMPORTS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} -- The relevant module (including the UMTS 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 UMTS 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 UMTS 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 UMTS 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 UMTS release and version number) + -- needs to be chosen when compiling the application. -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -129,7 +128,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version17(17)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version18(18)} -- ==================== -- Top-level definition @@ -253,8 +252,8 @@ CCContents ::= CHOICE cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, - uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, messagingMMCC [18] MessagingMMCC } @@ -344,22 +343,22 @@ EPSIRI ::= CHOICE TRIPayload ::= CHOICE { - integrityCheck [0] IntegrityCheck, - testPDU [1] NULL, - paddingPDU [2] OCTET STRING, + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, -- Undefined contents (will be discarded) - keep-alive [3] NULL, - keep-aliveResponse [4] NULL, - firstSegmentFlag [5] NULL, - lastSegmentFlag [6] NULL, + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, ..., - cINReset [7] NULL, - operatorLeaMessage [8] OperatorLeaMessage, - optionRequest [9] OptionRequest, - optionResponse [10] OptionResponse, - optionComplete [11] NULL, - pDUAcknowledgementRequest [12] NULL, - pDUAcknowledgementResponse [13] NULL + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage, + optionRequest [9] OptionRequest, + optionResponse [10] OptionResponse, + optionComplete [11] NULL, + pDUAcknowledgementRequest [12] NULL, + pDUAcknowledgementResponse [13] NULL } IntegrityCheck ::= SEQUENCE -- GitLab From 49fba19f9aaa96c9e7cc83be8194b8f35c2d003a Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:30:35 +0100 Subject: [PATCH 080/208] TS 102 657 v1.15.1 (2014-08-12) agreed at LI#36 (Bad Homburg, 2014-06-24) --- 102657/RDMessage.asn | 19 +++++---- 102657/RDMessage.xsd | 39 +++++++++++++------ ...DMessage,ver14.xsd => RDMessage,ver15.xsd} | 39 +++++++++++++------ ...{RDMessagever14.txt => RDMessagever15.txt} | 19 +++++---- 4 files changed, 78 insertions(+), 38 deletions(-) rename 102657/portal/{RDMessage,ver14.xsd => RDMessage,ver15.xsd} (98%) rename 102657/portal/{RDMessagever14.txt => RDMessagever15.txt} (99%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 9fc0818..cd26c72 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version14(14)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version15(15)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version14(14)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version15(15)} -- ====================================== @@ -1976,7 +1976,10 @@ NASubscriber ::= SEQUENCE -- List of all known devices allocated to this user. subscriber [5] GenericSubscriberInfo OPTIONAL , -- Name, address and other generic subscriber information - ... + ..., + allocatedDevices [6] SEQUENCE OF NADevice OPTIONAL + -- If present, contains device details for all elements from allocatedDeviceIDs + } NAServiceSubscription ::= SEQUENCE @@ -2007,9 +2010,9 @@ NAServiceSubscription ::= SEQUENCE -- Describes the nature of the subscription deliveryAddress [16] AddressInformation OPTIONAL, resellerAddress [17] AddressInformation OPTIONAL, - otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL - - + otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL, + allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL + -- If present, contains device details for all elements from allocatedDeviceIDs } NationalNASubscription ::= SEQUENCE @@ -2064,9 +2067,11 @@ NAServiceUsage ::= SEQUENCE -- Identifier for a known user of this network access ePSInformation [16] EPSInformation OPTIONAL, wifiInformation [17] WifiInformation OPTIONAL, - addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL + addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL, -- contains extended information about the NAT or PAT operations carried out within this -- service usage session + naDevice [19] NADevice OPTIONAL + -- If present, contains the device details for the device referenced in naDeviceID } diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index a67efde..081f77e 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.14.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.15.1 @@ -1413,7 +1413,7 @@ - + @@ -1426,7 +1426,7 @@ - + @@ -1440,7 +1440,7 @@ - + @@ -1768,8 +1768,15 @@ - - + + + + + + + + + @@ -1804,7 +1811,14 @@ - + + + + + + + + @@ -1907,7 +1921,7 @@ - + @@ -1915,8 +1929,9 @@ - - + + + diff --git a/102657/portal/RDMessage,ver14.xsd b/102657/portal/RDMessage,ver15.xsd similarity index 98% rename from 102657/portal/RDMessage,ver14.xsd rename to 102657/portal/RDMessage,ver15.xsd index a67efde..081f77e 100644 --- a/102657/portal/RDMessage,ver14.xsd +++ b/102657/portal/RDMessage,ver15.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.14.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.15.1 @@ -1413,7 +1413,7 @@ - + @@ -1426,7 +1426,7 @@ - + @@ -1440,7 +1440,7 @@ - + @@ -1768,8 +1768,15 @@ - - + + + + + + + + + @@ -1804,7 +1811,14 @@ - + + + + + + + + @@ -1907,7 +1921,7 @@ - + @@ -1915,8 +1929,9 @@ - - + + + diff --git a/102657/portal/RDMessagever14.txt b/102657/portal/RDMessagever15.txt similarity index 99% rename from 102657/portal/RDMessagever14.txt rename to 102657/portal/RDMessagever15.txt index 9fc0818..cd26c72 100644 --- a/102657/portal/RDMessagever14.txt +++ b/102657/portal/RDMessagever15.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version14(14)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version15(15)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version14(14)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version15(15)} -- ====================================== @@ -1976,7 +1976,10 @@ NASubscriber ::= SEQUENCE -- List of all known devices allocated to this user. subscriber [5] GenericSubscriberInfo OPTIONAL , -- Name, address and other generic subscriber information - ... + ..., + allocatedDevices [6] SEQUENCE OF NADevice OPTIONAL + -- If present, contains device details for all elements from allocatedDeviceIDs + } NAServiceSubscription ::= SEQUENCE @@ -2007,9 +2010,9 @@ NAServiceSubscription ::= SEQUENCE -- Describes the nature of the subscription deliveryAddress [16] AddressInformation OPTIONAL, resellerAddress [17] AddressInformation OPTIONAL, - otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL - - + otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL, + allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL + -- If present, contains device details for all elements from allocatedDeviceIDs } NationalNASubscription ::= SEQUENCE @@ -2064,9 +2067,11 @@ NAServiceUsage ::= SEQUENCE -- Identifier for a known user of this network access ePSInformation [16] EPSInformation OPTIONAL, wifiInformation [17] WifiInformation OPTIONAL, - addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL + addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL, -- contains extended information about the NAT or PAT operations carried out within this -- service usage session + naDevice [19] NADevice OPTIONAL + -- If present, contains the device details for the device referenced in naDeviceID } -- GitLab From 526056fe12340343ed69f399a13f796ecb942277 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:30:39 +0100 Subject: [PATCH 081/208] TS 102 232-5 v3.3.1 (2014-07-25) agreed at LI#36 (Bad Homburg, 2014-06-24) --- 102232-5/IPMultimediaPDU.asn | 298 ++++++++++++----------- 102232-5/portal/IPMultimediaPDU,ver6.txt | 144 ----------- 102232-5/portal/IPMultimediaPDU,ver7.txt | 154 ++++++++++++ 3 files changed, 308 insertions(+), 288 deletions(-) delete mode 100644 102232-5/portal/IPMultimediaPDU,ver6.txt create mode 100644 102232-5/portal/IPMultimediaPDU,ver7.txt diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 09f834c..8b87164 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,144 +1,154 @@ -IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - -- from TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; - --- ============================ --- Object Identifier Definition --- ============================ - -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version6(6) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version6(6) cC(2)} - -- both definitions relative to: - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - --- ===================================== --- IP Multimedia Communications Contents --- ===================================== - -IPMMCC ::= SEQUENCE -{ - iPMMCCObjId [0] RELATIVE-OID, - mMCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets - -- Each IPMMCC shall contain one intercepted packet - -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter - -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. - ..., - frameType [2] FrameType OPTIONAL, - -- The availability of header information shall be signalled with the frameType parameter - -- The module is defined as OPTIONAL because of backwards compatibility reasons - -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 - streamIdentifier [3] OCTET STRING OPTIONAL, - -- Used to identify the media stream within the current CIN, typically in case of - -- multiple media streams communications - -- May be used to correlate each media stream with the relevant SDP media description of IRI - -- May contain c= and m= lines extracts for instance - mMCCprotocol [4] MMCCprotocol OPTIONAL - -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) - -- Absence means mMCCContents contains RTP/RTCP packets -} - -FrameType ::= ENUMERATED -{ - ipFrame(0), - -- All headers are present - udpFrame(1), - -- IP header is missing - rtpFrame(2), - -- UDP and IP headers are missing - audioFrame(3), - -- All headers are missing - ..., - tcpFrame(4), - -- IP header is missing - artificialRtpFrame(5), - -- UDP and IP headers are missing, artificial RTP frame has been added - udptlFrame(6) - -- UDP and IP headers are missing -} - -MMCCprotocol ::= ENUMERATED -{ - rTP(0), - -- mMCCContents parameter contains RTP/RTCP packets - mSRP(1), - -- mMCCContents parameter contains MSRP packets - ..., - uDPTL(2) - -- mMCCContents parameter contains UDPTL packets -} - --- ======================================================== --- Intercept-related information for IP Multimedia sessions --- ======================================================== - -IPMMIRI ::= SEQUENCE -{ - iPMMIRIObjId [0] RELATIVE-OID, - iPMMIRIContents [1] IPIRIContents, - ... -} - -IPIRIContents ::= CHOICE -{ - originalIPMMMessage [0] OCTET STRING, - -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers - sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address - h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address - ..., - nationalIPMMIRIParameters [3] NationalIPMMIRIParameters - -- This parameter is used according to national regulations - -- This parameter shall be delivered as an IRI-Report-record -} - -SIPMessage ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - sIPContent [2] OCTET STRING, - ... -} - -H323Message ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - h323Content [2] H323MessageContent, - ... -} - -H323MessageContent ::= CHOICE -{ - h225CSMessageContent [0] OCTET STRING, - h225RASMessageContent [1] OCTET STRING, - h245MessageContent [2] OCTET STRING, - genericMessageContent [3] OCTET STRING, - ... -} - -NationalIPMMIRIParameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [16], - -- the country to which the parameters inserted after the extension marker apply. - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...). - -- It is recommended that "version parameter" and "vendor identification parameter" are - -- included in the national parameters definition. Vendor identifications can be - -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended - -- to avoid using tags from 240 to 255 in a formal type definition. -} - -END -- end of IP Multimedia PDU +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version7(7)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + -- from TS 101 671 [1] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)} + + -- from TS 102 232-1 [2] + Location + FROM LI-PS-PDU + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version19(19)}; + + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version7(7) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version7(7) cC(2)} + -- both definitions relative to: + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- ===================================== +-- IP Multimedia Communications Contents +-- ===================================== + +IPMMCC ::= SEQUENCE +{ + iPMMCCObjId [0] RELATIVE-OID, + mMCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets + -- Each IPMMCC shall contain one intercepted packet + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. + ..., + frameType [2] FrameType OPTIONAL, + -- The availability of header information shall be signalled with the frameType parameter + -- The module is defined as OPTIONAL because of backwards compatibility reasons + -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 + streamIdentifier [3] OCTET STRING OPTIONAL, + -- Used to identify the media stream within the current CIN, typically in case of + -- multiple media streams communications + -- May be used to correlate each media stream with the relevant SDP media description of IRI + -- May contain c= and m= lines extracts for instance + mMCCprotocol [4] MMCCprotocol OPTIONAL + -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) + -- Absence means mMCCContents contains RTP/RTCP packets +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ..., + tcpFrame(4), + -- IP header is missing + artificialRtpFrame(5), + -- UDP and IP headers are missing, artificial RTP frame has been added + udptlFrame(6) + -- UDP and IP headers are missing +} + +MMCCprotocol ::= ENUMERATED +{ + rTP(0), + -- mMCCContents parameter contains RTP/RTCP packets + mSRP(1), + -- mMCCContents parameter contains MSRP packets + ..., + uDPTL(2) + -- mMCCContents parameter contains UDPTL packets +} + +-- ======================================================== +-- Intercept-related information for IP Multimedia sessions +-- ======================================================== + +IPMMIRI ::= SEQUENCE +{ + iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIContents [1] IPIRIContents, + ..., + targetLocation [2] Location OPTIONAL + -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 + +} + +IPIRIContents ::= CHOICE +{ + originalIPMMMessage [0] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + sIPMessage [1] SIPMessage, + -- Copy of the SIP content and the source and destination IP address + h323Message [2] H323Message, + -- Copy of the H.323 content and the source and destination IP address + ..., + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters + -- This parameter is used according to national regulations + -- This parameter shall be delivered as an IRI-Report-record +} + +SIPMessage ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + sIPContent [2] OCTET STRING, + ... +} + +H323Message ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + h323Content [2] H323MessageContent, + ... +} + +H323MessageContent ::= CHOICE +{ + h225CSMessageContent [0] OCTET STRING, + h225RASMessageContent [1] OCTET STRING, + h245MessageContent [2] OCTET STRING, + genericMessageContent [3] OCTET STRING, + ... +} + +NationalIPMMIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [16], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} + +END -- end of IP Multimedia PDU diff --git a/102232-5/portal/IPMultimediaPDU,ver6.txt b/102232-5/portal/IPMultimediaPDU,ver6.txt deleted file mode 100644 index 09f834c..0000000 --- a/102232-5/portal/IPMultimediaPDU,ver6.txt +++ /dev/null @@ -1,144 +0,0 @@ -IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - -- from TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)}; - --- ============================ --- Object Identifier Definition --- ============================ - -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version6(6) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version6(6) cC(2)} - -- both definitions relative to: - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - --- ===================================== --- IP Multimedia Communications Contents --- ===================================== - -IPMMCC ::= SEQUENCE -{ - iPMMCCObjId [0] RELATIVE-OID, - mMCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets - -- Each IPMMCC shall contain one intercepted packet - -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter - -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. - ..., - frameType [2] FrameType OPTIONAL, - -- The availability of header information shall be signalled with the frameType parameter - -- The module is defined as OPTIONAL because of backwards compatibility reasons - -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 - streamIdentifier [3] OCTET STRING OPTIONAL, - -- Used to identify the media stream within the current CIN, typically in case of - -- multiple media streams communications - -- May be used to correlate each media stream with the relevant SDP media description of IRI - -- May contain c= and m= lines extracts for instance - mMCCprotocol [4] MMCCprotocol OPTIONAL - -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) - -- Absence means mMCCContents contains RTP/RTCP packets -} - -FrameType ::= ENUMERATED -{ - ipFrame(0), - -- All headers are present - udpFrame(1), - -- IP header is missing - rtpFrame(2), - -- UDP and IP headers are missing - audioFrame(3), - -- All headers are missing - ..., - tcpFrame(4), - -- IP header is missing - artificialRtpFrame(5), - -- UDP and IP headers are missing, artificial RTP frame has been added - udptlFrame(6) - -- UDP and IP headers are missing -} - -MMCCprotocol ::= ENUMERATED -{ - rTP(0), - -- mMCCContents parameter contains RTP/RTCP packets - mSRP(1), - -- mMCCContents parameter contains MSRP packets - ..., - uDPTL(2) - -- mMCCContents parameter contains UDPTL packets -} - --- ======================================================== --- Intercept-related information for IP Multimedia sessions --- ======================================================== - -IPMMIRI ::= SEQUENCE -{ - iPMMIRIObjId [0] RELATIVE-OID, - iPMMIRIContents [1] IPIRIContents, - ... -} - -IPIRIContents ::= CHOICE -{ - originalIPMMMessage [0] OCTET STRING, - -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers - sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address - h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address - ..., - nationalIPMMIRIParameters [3] NationalIPMMIRIParameters - -- This parameter is used according to national regulations - -- This parameter shall be delivered as an IRI-Report-record -} - -SIPMessage ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - sIPContent [2] OCTET STRING, - ... -} - -H323Message ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - h323Content [2] H323MessageContent, - ... -} - -H323MessageContent ::= CHOICE -{ - h225CSMessageContent [0] OCTET STRING, - h225RASMessageContent [1] OCTET STRING, - h245MessageContent [2] OCTET STRING, - genericMessageContent [3] OCTET STRING, - ... -} - -NationalIPMMIRIParameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [16], - -- the country to which the parameters inserted after the extension marker apply. - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...). - -- It is recommended that "version parameter" and "vendor identification parameter" are - -- included in the national parameters definition. Vendor identifications can be - -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended - -- to avoid using tags from 240 to 255 in a formal type definition. -} - -END -- end of IP Multimedia PDU diff --git a/102232-5/portal/IPMultimediaPDU,ver7.txt b/102232-5/portal/IPMultimediaPDU,ver7.txt new file mode 100644 index 0000000..8b87164 --- /dev/null +++ b/102232-5/portal/IPMultimediaPDU,ver7.txt @@ -0,0 +1,154 @@ +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version7(7)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + -- from TS 101 671 [1] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)} + + -- from TS 102 232-1 [2] + Location + FROM LI-PS-PDU + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version19(19)}; + + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version7(7) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version7(7) cC(2)} + -- both definitions relative to: + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- ===================================== +-- IP Multimedia Communications Contents +-- ===================================== + +IPMMCC ::= SEQUENCE +{ + iPMMCCObjId [0] RELATIVE-OID, + mMCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets + -- Each IPMMCC shall contain one intercepted packet + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. + ..., + frameType [2] FrameType OPTIONAL, + -- The availability of header information shall be signalled with the frameType parameter + -- The module is defined as OPTIONAL because of backwards compatibility reasons + -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 + streamIdentifier [3] OCTET STRING OPTIONAL, + -- Used to identify the media stream within the current CIN, typically in case of + -- multiple media streams communications + -- May be used to correlate each media stream with the relevant SDP media description of IRI + -- May contain c= and m= lines extracts for instance + mMCCprotocol [4] MMCCprotocol OPTIONAL + -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) + -- Absence means mMCCContents contains RTP/RTCP packets +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ..., + tcpFrame(4), + -- IP header is missing + artificialRtpFrame(5), + -- UDP and IP headers are missing, artificial RTP frame has been added + udptlFrame(6) + -- UDP and IP headers are missing +} + +MMCCprotocol ::= ENUMERATED +{ + rTP(0), + -- mMCCContents parameter contains RTP/RTCP packets + mSRP(1), + -- mMCCContents parameter contains MSRP packets + ..., + uDPTL(2) + -- mMCCContents parameter contains UDPTL packets +} + +-- ======================================================== +-- Intercept-related information for IP Multimedia sessions +-- ======================================================== + +IPMMIRI ::= SEQUENCE +{ + iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIContents [1] IPIRIContents, + ..., + targetLocation [2] Location OPTIONAL + -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 + +} + +IPIRIContents ::= CHOICE +{ + originalIPMMMessage [0] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + sIPMessage [1] SIPMessage, + -- Copy of the SIP content and the source and destination IP address + h323Message [2] H323Message, + -- Copy of the H.323 content and the source and destination IP address + ..., + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters + -- This parameter is used according to national regulations + -- This parameter shall be delivered as an IRI-Report-record +} + +SIPMessage ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + sIPContent [2] OCTET STRING, + ... +} + +H323Message ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + h323Content [2] H323MessageContent, + ... +} + +H323MessageContent ::= CHOICE +{ + h225CSMessageContent [0] OCTET STRING, + h225RASMessageContent [1] OCTET STRING, + h245MessageContent [2] OCTET STRING, + genericMessageContent [3] OCTET STRING, + ... +} + +NationalIPMMIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [16], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} + +END -- end of IP Multimedia PDU -- GitLab From f6c8e005c2081dbec83d66c779fda7a67fadbc1b Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:30:42 +0100 Subject: [PATCH 082/208] TS 102 232-4 v3.2.2 (2014-07-23) agreed at LI#36 (Bad Homburg, 2014-06-24) --- 102232-4/L2AccessPDU.asn | 12 +++++++----- .../{L2AccessPDU,ver6.txt => L2AccessPDU,ver7.txt} | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) rename 102232-4/portal/{L2AccessPDU,ver6.txt => L2AccessPDU,ver7.txt} (94%) diff --git a/102232-4/L2AccessPDU.asn b/102232-4/L2AccessPDU.asn index 89375ee..b17f3de 100644 --- a/102232-4/L2AccessPDU.asn +++ b/102232-4/L2AccessPDU.asn @@ -1,6 +1,6 @@ L2AccessPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) -li-ps(5) l2Access(4) version6(6)} +li-ps(5) l2Access(4) version7(7)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,9 +9,9 @@ BEGIN -- Object Identifier Definition -- ============================ -l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRI(1)} -l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) cC(2)} -l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRIOnly(3)} +l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version7(7) iRI(1)} +l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version7(7) cC(2)} +l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version7(7) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -105,8 +105,10 @@ AccessEventType ::= ENUMERATED ..., startOfInterceptionWithSessionActive(8), -- LI is started on a target who already has an active session - accessEnd(9) + accessEnd(9), -- A target stops using the IAS, the session ends. + endOfInterceptionWithSessionActive(10) + -- LI is ended on a target who still has an active session } InternetAccessType ::= ENUMERATED diff --git a/102232-4/portal/L2AccessPDU,ver6.txt b/102232-4/portal/L2AccessPDU,ver7.txt similarity index 94% rename from 102232-4/portal/L2AccessPDU,ver6.txt rename to 102232-4/portal/L2AccessPDU,ver7.txt index 89375ee..b17f3de 100644 --- a/102232-4/portal/L2AccessPDU,ver6.txt +++ b/102232-4/portal/L2AccessPDU,ver7.txt @@ -1,6 +1,6 @@ L2AccessPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) -li-ps(5) l2Access(4) version6(6)} +li-ps(5) l2Access(4) version7(7)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -9,9 +9,9 @@ BEGIN -- Object Identifier Definition -- ============================ -l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRI(1)} -l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) cC(2)} -l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version6(6) iRIOnly(3)} +l2IRIObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version7(7) iRI(1)} +l2CCObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version7(7) cC(2)} +l2IRIOnlyObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version7(7) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -105,8 +105,10 @@ AccessEventType ::= ENUMERATED ..., startOfInterceptionWithSessionActive(8), -- LI is started on a target who already has an active session - accessEnd(9) + accessEnd(9), -- A target stops using the IAS, the session ends. + endOfInterceptionWithSessionActive(10) + -- LI is ended on a target who still has an active session } InternetAccessType ::= ENUMERATED -- GitLab From 9c63d135282610d5790c8b504ea842a1ca0de5ef Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:30:46 +0100 Subject: [PATCH 083/208] TS 102 232-1 v3.7.1 (2014-07-25) agreed at LI#36 (Bad Homburg, 2014-06-24) --- 102232-1/LI-PS-PDU.asn | 24 +++++++++++++++---- ...I-PS-PDU,ver18.txt => LI-PS-PDU,ver19.txt} | 24 +++++++++++++++---- 2 files changed, 38 insertions(+), 10 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver18.txt => LI-PS-PDU,ver19.txt} (96%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 3a535a9..f085bbe 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version18(18)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version19(19)} DEFINITIONS IMPLICIT TAGS ::= @@ -48,7 +48,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version7(7)} -- from TS 102 232-06 [36] PstnIsdnCC, @@ -59,7 +59,8 @@ IMPORTS -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsIRIsContent, - CorrelationValues + CorrelationValues, + Location FROM UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} -- The relevant module (including the UMTS release and version number) needs @@ -75,7 +76,8 @@ IMPORTS -- from 3GPP TS 33.108 [9] IRI-Parameters, - EpsIRIsContent + EpsIRIsContent, + EPSLocation FROM EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} -- The relevant module (including the UMTS release and version number) needs @@ -128,7 +130,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version18(18)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version19(19)} -- ==================== -- Top-level definition @@ -501,4 +503,16 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is TS 102 232 part 1 (the present document) } +-- ================== +-- Common Parameters +-- ================== + +Location ::= SEQUENCE + -- This is a common parameter, the use of this parameter is described in clause 4.5 +{ + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + ... +} + END --end of LI-PS-PDU diff --git a/102232-1/portal/LI-PS-PDU,ver18.txt b/102232-1/portal/LI-PS-PDU,ver19.txt similarity index 96% rename from 102232-1/portal/LI-PS-PDU,ver18.txt rename to 102232-1/portal/LI-PS-PDU,ver19.txt index 3a535a9..f085bbe 100644 --- a/102232-1/portal/LI-PS-PDU,ver18.txt +++ b/102232-1/portal/LI-PS-PDU,ver19.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version18(18)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version19(19)} DEFINITIONS IMPLICIT TAGS ::= @@ -48,7 +48,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version7(7)} -- from TS 102 232-06 [36] PstnIsdnCC, @@ -59,7 +59,8 @@ IMPORTS -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsIRIsContent, - CorrelationValues + CorrelationValues, + Location FROM UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} -- The relevant module (including the UMTS release and version number) needs @@ -75,7 +76,8 @@ IMPORTS -- from 3GPP TS 33.108 [9] IRI-Parameters, - EpsIRIsContent + EpsIRIsContent, + EPSLocation FROM EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} -- The relevant module (including the UMTS release and version number) needs @@ -128,7 +130,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version18(18)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version19(19)} -- ==================== -- Top-level definition @@ -501,4 +503,16 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is TS 102 232 part 1 (the present document) } +-- ================== +-- Common Parameters +-- ================== + +Location ::= SEQUENCE + -- This is a common parameter, the use of this parameter is described in clause 4.5 +{ + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + ... +} + END --end of LI-PS-PDU -- GitLab From 5af35eef7c2b21ef3fddeae1972c2f34e88b8092 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:30:51 +0100 Subject: [PATCH 084/208] TS 102 657 v1.16.1 (2014-10-24) agreed at LI#37 (Lecce, 2014-09-23) --- 102657/RDMessage.asn | 17 +++++++++++++++-- 102657/RDMessage.xsd | 15 ++++++++++++--- .../{RDMessagever15.txt => RDMessagever16.txt} | 17 +++++++++++++++-- .../{RDMessage,ver15.xsd => RDMessagever16.xsd} | 15 ++++++++++++--- 4 files changed, 54 insertions(+), 10 deletions(-) rename 102657/portal/{RDMessagever15.txt => RDMessagever16.txt} (99%) rename 102657/portal/{RDMessage,ver15.xsd => RDMessagever16.xsd} (99%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index cd26c72..2b94172 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version15(15)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version16(16)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version15(15)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version16(16)} -- ====================================== @@ -233,9 +233,22 @@ FurtherInformation ::= SEQUENCE { information [1] UTF8String, contactInformation [2] UTF8String OPTIONAL, + ..., + categorisedErrorDescription [3] CategorisedErrorDescription OPTIONAL -- see 6.4 +} + + +CategorisedErrorDescription ::= SEQUENCE +{ + value [1] INTEGER, + description [2] UTF8String OPTIONAL, ... } + + + + -- =================================================== -- Definitions of a cancel message and acknowledgement -- =================================================== diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 081f77e..2ec34b4 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.15.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.16.1 @@ -2235,6 +2235,15 @@ + + + + + + + + + diff --git a/102657/portal/RDMessagever15.txt b/102657/portal/RDMessagever16.txt similarity index 99% rename from 102657/portal/RDMessagever15.txt rename to 102657/portal/RDMessagever16.txt index cd26c72..2b94172 100644 --- a/102657/portal/RDMessagever15.txt +++ b/102657/portal/RDMessagever16.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version15(15)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version16(16)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version15(15)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version16(16)} -- ====================================== @@ -233,9 +233,22 @@ FurtherInformation ::= SEQUENCE { information [1] UTF8String, contactInformation [2] UTF8String OPTIONAL, + ..., + categorisedErrorDescription [3] CategorisedErrorDescription OPTIONAL -- see 6.4 +} + + +CategorisedErrorDescription ::= SEQUENCE +{ + value [1] INTEGER, + description [2] UTF8String OPTIONAL, ... } + + + + -- =================================================== -- Definitions of a cancel message and acknowledgement -- =================================================== diff --git a/102657/portal/RDMessage,ver15.xsd b/102657/portal/RDMessagever16.xsd similarity index 99% rename from 102657/portal/RDMessage,ver15.xsd rename to 102657/portal/RDMessagever16.xsd index 081f77e..2ec34b4 100644 --- a/102657/portal/RDMessage,ver15.xsd +++ b/102657/portal/RDMessagever16.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.15.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.16.1 @@ -2235,6 +2235,15 @@ + + + + + + + + + -- GitLab From 960fef6bfca4d697ac2528c3a8658845b316284f Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:30:58 +0100 Subject: [PATCH 086/208] TS 102 232-2 v3.8.1 (2014-10-28) agreed at LI#37 (Lecce, 2014-09-23) --- 102232-2/EmailPDU.asn | 35 +++++++++++++------ ...{EmailPDU,ver13.txt => EmailPDU,ver14.txt} | 35 +++++++++++++------ 2 files changed, 50 insertions(+), 20 deletions(-) rename 102232-2/portal/{EmailPDU,ver13.txt => EmailPDU,ver14.txt} (93%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index ba29621..b3021cd 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version14(14)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -21,11 +21,11 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingMMCC(5)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -219,7 +219,10 @@ MessagingCC ::= SEQUENCE content-type [5] OCTET STRING, -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA content [6] OCTET STRING, - ... + ..., + content-transfer-encoding [7] OCTET STRING OPTIONAL + -- MIME Content-Transfer-Encoding mechanism. + -- Refer to IETF RFC 2045 [20] } MessagingMMCC ::= SEQUENCE @@ -301,10 +304,18 @@ Messaging-Box-Event ::= ENUMERATED disconnect(16), connect(17), ..., + unknown(0), + greeting-play(18), language-change(19), pin-security-enable(20), - pin-security-disable(21) + pin-security-disable(21), + personal-operator-add(22), + personal-operator-change(23), + personal-operator-remove(24), + additional-destination-add(25), + additional-destination-change(26), + additional-destination-remove(27) } Messaging-Notification-Event ::= ENUMERATED @@ -316,7 +327,8 @@ Messaging-Notification-Event ::= ENUMERATED email(5), fax-to-email(6), ..., - mms(7) + mms(7), + generic(8) } Messaging-Call-Event ::= ENUMERATED @@ -482,7 +494,10 @@ Messaging-Property-Notification-Type ::= ENUMERATED read-report(4), delivery-report(5), allow-delivery-report(6), - deny-delivery-report(7) + deny-delivery-report(7), + message-wait-indication(8), + voice-to-text(9) + } Messaging-Property-Message-Status ::= ENUMERATED diff --git a/102232-2/portal/EmailPDU,ver13.txt b/102232-2/portal/EmailPDU,ver14.txt similarity index 93% rename from 102232-2/portal/EmailPDU,ver13.txt rename to 102232-2/portal/EmailPDU,ver14.txt index ba29621..b3021cd 100644 --- a/102232-2/portal/EmailPDU,ver13.txt +++ b/102232-2/portal/EmailPDU,ver14.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version14(14)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -21,11 +21,11 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version13(13) messagingMMCC(5)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -219,7 +219,10 @@ MessagingCC ::= SEQUENCE content-type [5] OCTET STRING, -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA content [6] OCTET STRING, - ... + ..., + content-transfer-encoding [7] OCTET STRING OPTIONAL + -- MIME Content-Transfer-Encoding mechanism. + -- Refer to IETF RFC 2045 [20] } MessagingMMCC ::= SEQUENCE @@ -301,10 +304,18 @@ Messaging-Box-Event ::= ENUMERATED disconnect(16), connect(17), ..., + unknown(0), + greeting-play(18), language-change(19), pin-security-enable(20), - pin-security-disable(21) + pin-security-disable(21), + personal-operator-add(22), + personal-operator-change(23), + personal-operator-remove(24), + additional-destination-add(25), + additional-destination-change(26), + additional-destination-remove(27) } Messaging-Notification-Event ::= ENUMERATED @@ -316,7 +327,8 @@ Messaging-Notification-Event ::= ENUMERATED email(5), fax-to-email(6), ..., - mms(7) + mms(7), + generic(8) } Messaging-Call-Event ::= ENUMERATED @@ -482,7 +494,10 @@ Messaging-Property-Notification-Type ::= ENUMERATED read-report(4), delivery-report(5), allow-delivery-report(6), - deny-delivery-report(7) + deny-delivery-report(7), + message-wait-indication(8), + voice-to-text(9) + } Messaging-Property-Message-Status ::= ENUMERATED -- GitLab From b05d97e1bd6bcfd048550fec9acee879eed63cce Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:04 +0100 Subject: [PATCH 087/208] TS 102 232-1 v3.8.1 (2014-10-28) agreed at LI#37 (Lecce, 2014-09-23) --- 102232-1/LI-PS-PDU.asn | 6 +++--- .../portal/{LI-PS-PDU,ver19.txt => LI-PS-PDU,ver20.txt} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver19.txt => LI-PS-PDU,ver20.txt} (99%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index f085bbe..54523e6 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version19(19)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version20(20)} DEFINITIONS IMPLICIT TAGS ::= @@ -28,7 +28,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version14(14)} -- from TS 102 232-03 [6] IPCC, @@ -130,7 +130,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version19(19)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version20(20)} -- ==================== -- Top-level definition diff --git a/102232-1/portal/LI-PS-PDU,ver19.txt b/102232-1/portal/LI-PS-PDU,ver20.txt similarity index 99% rename from 102232-1/portal/LI-PS-PDU,ver19.txt rename to 102232-1/portal/LI-PS-PDU,ver20.txt index f085bbe..54523e6 100644 --- a/102232-1/portal/LI-PS-PDU,ver19.txt +++ b/102232-1/portal/LI-PS-PDU,ver20.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version19(19)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version20(20)} DEFINITIONS IMPLICIT TAGS ::= @@ -28,7 +28,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version14(14)} -- from TS 102 232-03 [6] IPCC, @@ -130,7 +130,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version19(19)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version20(20)} -- ==================== -- Top-level definition -- GitLab From 4fa52d613f584e2b8bc0497795a31f0734ea2867 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:11 +0100 Subject: [PATCH 088/208] TS 103 280 v1.1.1 (2015-08-21) agreed at LI#39 (Svalbard (Longyearbyen), 2015-06-16) --- 103280/portal/ts_103280v010101p0.xsd | 158 +++++++++++++++++++++++++++ 103280/ts_103280.xsd | 158 +++++++++++++++++++++++++++ 2 files changed, 316 insertions(+) create mode 100644 103280/portal/ts_103280v010101p0.xsd create mode 100644 103280/ts_103280.xsd diff --git a/103280/portal/ts_103280v010101p0.xsd b/103280/portal/ts_103280v010101p0.xsd new file mode 100644 index 0000000..a99f0b0 --- /dev/null +++ b/103280/portal/ts_103280v010101p0.xsd @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103280/ts_103280.xsd b/103280/ts_103280.xsd new file mode 100644 index 0000000..a99f0b0 --- /dev/null +++ b/103280/ts_103280.xsd @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 29a83da79a8f4e2cd90f204d6c790a035d447807 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:15 +0100 Subject: [PATCH 089/208] TS 103 280 v1.1.2 (2015-08-28) agreed at LI#39 (Svalbard (Longyearbyen), 2015-06-16) --- 103280/{portal/ts_103280v010101p0.xsd => TS_103_280_v111.xsd} | 0 103280/{ts_103280.xsd => portal/TS_103_280_v111.xsd} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename 103280/{portal/ts_103280v010101p0.xsd => TS_103_280_v111.xsd} (100%) rename 103280/{ts_103280.xsd => portal/TS_103_280_v111.xsd} (100%) diff --git a/103280/portal/ts_103280v010101p0.xsd b/103280/TS_103_280_v111.xsd similarity index 100% rename from 103280/portal/ts_103280v010101p0.xsd rename to 103280/TS_103_280_v111.xsd diff --git a/103280/ts_103280.xsd b/103280/portal/TS_103_280_v111.xsd similarity index 100% rename from 103280/ts_103280.xsd rename to 103280/portal/TS_103_280_v111.xsd -- GitLab From 87a1f1ae2f22ac035f2daf7dc8ea5952a4d439ce Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:18 +0100 Subject: [PATCH 090/208] TS 102 232-1 v3.9.1 (2015-08-06) agreed at LI#39 (Svalbard (Longyearbyen), 2015-06-16) --- 102232-1/LI-PS-PDU.asn | 23 +++++++++++++++---- ...I-PS-PDU,ver20.txt => LI-PS-PDU,ver21.txt} | 23 +++++++++++++++---- 2 files changed, 38 insertions(+), 8 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver20.txt => LI-PS-PDU,ver21.txt} (93%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 54523e6..d64c2ec 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version20(20)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version21(21)} DEFINITIONS IMPLICIT TAGS ::= @@ -14,7 +14,7 @@ IMPORTS IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- from TS 101 671 [4] HI1-Operation @@ -97,6 +97,18 @@ IMPORTS -- The relevant module (including the UMTS 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 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. + -- 3GPP HI1 may be used with other services/networks than 3GPPs one. + + -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, TTRAFFIC, @@ -130,7 +142,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version20(20)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version21(21)} -- ==================== -- Top-level definition @@ -167,7 +179,10 @@ Payload ::= CHOICE tRIPayload [2] TRIPayload, ..., hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer + encryptionContainer [4] EncryptionContainer, + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation + -- This structure may be functionally redundant with hI1-Operation from TS 101 671 + } TimeStampQualifier ::= ENUMERATED diff --git a/102232-1/portal/LI-PS-PDU,ver20.txt b/102232-1/portal/LI-PS-PDU,ver21.txt similarity index 93% rename from 102232-1/portal/LI-PS-PDU,ver20.txt rename to 102232-1/portal/LI-PS-PDU,ver21.txt index 54523e6..d64c2ec 100644 --- a/102232-1/portal/LI-PS-PDU,ver20.txt +++ b/102232-1/portal/LI-PS-PDU,ver21.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version20(20)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version21(21)} DEFINITIONS IMPLICIT TAGS ::= @@ -14,7 +14,7 @@ IMPORTS IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- from TS 101 671 [4] HI1-Operation @@ -97,6 +97,18 @@ IMPORTS -- The relevant module (including the UMTS 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 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. + -- 3GPP HI1 may be used with other services/networks than 3GPPs one. + + -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, TTRAFFIC, @@ -130,7 +142,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version20(20)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version21(21)} -- ==================== -- Top-level definition @@ -167,7 +179,10 @@ Payload ::= CHOICE tRIPayload [2] TRIPayload, ..., hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer + encryptionContainer [4] EncryptionContainer, + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation + -- This structure may be functionally redundant with hI1-Operation from TS 101 671 + } TimeStampQualifier ::= ENUMERATED -- GitLab From 8500087a98440ecccb734694fe13775af2dba384 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:24 +0100 Subject: [PATCH 091/208] TS 103 120 v1.1.1 (2016-01-13) agreed at LI#40 (Aachen, 2015-09-08) --- .../dictionaries/ts_103120_Dictionaries.xsd | 28 ++ .../ts_103120_ETSIDictionaryDefinitions.xml | 363 ++++++++++++++++++ .../ts_103120v010101p0_Dictionaries.xsd | 28 ++ ...120v010101p0_ETSIDictionaryDefinitions.xml | 363 ++++++++++++++++++ .../ts_103120v010101p0_Authorisation.xsd | 59 +++ .../schema/ts_103120v010101p0_Common.xsd | 67 ++++ .../portal/schema/ts_103120v010101p0_Core.xsd | 167 ++++++++ .../schema/ts_103120v010101p0_Document.xsd | 65 ++++ .../schema/ts_103120v010101p0_LITask.xsd | 114 ++++++ .../ts_103120v010101p0_Notification.xsd | 34 ++ 103120/schema/ts_103120_Authorisation.xsd | 59 +++ 103120/schema/ts_103120_Common.xsd | 67 ++++ 103120/schema/ts_103120_Core.xsd | 167 ++++++++ 103120/schema/ts_103120_Document.xsd | 65 ++++ 103120/schema/ts_103120_LITask.xsd | 114 ++++++ 103120/schema/ts_103120_Notification.xsd | 34 ++ 16 files changed, 1794 insertions(+) create mode 100644 103120/dictionaries/ts_103120_Dictionaries.xsd create mode 100644 103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml create mode 100644 103120/portal/dictionaries/ts_103120v010101p0_Dictionaries.xsd create mode 100644 103120/portal/dictionaries/ts_103120v010101p0_ETSIDictionaryDefinitions.xml create mode 100644 103120/portal/schema/ts_103120v010101p0_Authorisation.xsd create mode 100644 103120/portal/schema/ts_103120v010101p0_Common.xsd create mode 100644 103120/portal/schema/ts_103120v010101p0_Core.xsd create mode 100644 103120/portal/schema/ts_103120v010101p0_Document.xsd create mode 100644 103120/portal/schema/ts_103120v010101p0_LITask.xsd create mode 100644 103120/portal/schema/ts_103120v010101p0_Notification.xsd create mode 100644 103120/schema/ts_103120_Authorisation.xsd create mode 100644 103120/schema/ts_103120_Common.xsd create mode 100644 103120/schema/ts_103120_Core.xsd create mode 100644 103120/schema/ts_103120_Document.xsd create mode 100644 103120/schema/ts_103120_LITask.xsd create mode 100644 103120/schema/ts_103120_Notification.xsd diff --git a/103120/dictionaries/ts_103120_Dictionaries.xsd b/103120/dictionaries/ts_103120_Dictionaries.xsd new file mode 100644 index 0000000..bcd1db5 --- /dev/null +++ b/103120/dictionaries/ts_103120_Dictionaries.xsd @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml new file mode 100644 index 0000000..51b3265 --- /dev/null +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -0,0 +1,363 @@ + + + + ETSI + ObjectType + + + Authorisation + An Authorisation Object as defined in section 7.2 + + + Document + A Document Object as defined in section 7.3 + + + Notification + A Notification Object as defined in section 7.4 + + + Task + A Task Object as defined in section 8.2 + + + + + ETSI + AuthorisationLegalType + + + Manual + The implementation should consult the AuthorisationManualInformation field for details on the type of legal Authorisation + + + + + ETSI + AuthorisationPriority + + + High + An Authorisation has high priority + + + Routine + The Authorisation has a routine priority + + + + + ETSI + AuthorisationStatus + + + AwaitingApproval + Authorisation is still waiting approval from one or more relevant authorities + + + EmergencyApproval + The Authorisation has been approved under emergency procedures + + + Approved + The Authorisation has been approved by the relevant authorities + + + Rejected + The Authorisation has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Authorisation has been suspended temporarily + + + Cancelled + The Authorisation has been permanently cancelled + + + Expired + The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. + + + Invalid + The Authorisation is not active due to a problem with the current information populated in the Authorisation Object. + + + + + ETSI + AuthorisationDesiredStatus + + + AwaitingApproval + Authorisation is still waiting approval from one or more relevant authorities + + + EmergencyApproval + The Authorisation has been approved under emergency procedures + + + Approved + The Authorisation has been approved by the relevant authorities + + + Rejected + The Authorisation has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Authorisation has been suspended temporarily + + + Cancelled + The Authorisation has been permanently cancelled + + + Expired + The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. + + + + + ETSI + AuthorisationFlag + + + IsEmergency + Indicates if the authorisation was issued under nationally-defined emergency procedures (e.g. orally). The circumstances and consequences for setting the field shall be defined by the relevant national profile + + + IsConsensual + Indicates that the current authorisation is for consensual interception. This may alter the process or documentation accompanying the authorisation + + + IsTest + Indicates that the current authorisation is given for test purposes. This may alter the process or documentation accompanying the authorisation + + + + + ETSI + DocumentStatus + + + AwaitingApproval + The Document is still waiting approval from one or more relevant authorities + + + Approved + The Document has been approved by the relevant authorities + + + Rejected + The Document has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Document has been suspended temporarily + + + Cancelled + The Document has been permanently cancelled + + + Expired + The expiry date for this Document has passed. + + + Invalid + The Document is invalid due to a problem with the current information populated in the Document Object. + + + + + ETSI + DocumentDesiredStatus + + + AwaitingApproval + The Document is still waiting approval from one or more relevant authorities + + + Approved + The Document has been approved by the relevant authorities + + + Rejected + The Document has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Document has been suspended temporarily + + + Cancelled + The Document has been permanently cancelled + + + Expired + The expiry date for this Document has passed. + + + + + ETSI + DocumentType + + + Warrant + This Document represents a legal Warrant + + + + + ETSI + NotificationType + + + General + A general notification that a change has occurred with the specified Objects + + + + + ETSI + TaskStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingProvisioning + The Task is approved, but is not yet provisioned in the LI system + + + Active + The Task is active and can produce LI traffic + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Task has been suspended temporarily + + + Cancelled + The Task has been permanently cancelled + + + Expired + The Task date for this Document has passed, meaning that the Task has lapsed + + + Error + The Task is not active due to a problem with the underlying LI system + + + Invalid + The Task is not active due to a problem with the current information populated in the Task Object + + + + + ETSI + TaskDesiredStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingProvisioning + The Task is approved, but is not yet provisioned in the LI system + + + Active + The Task is active and can produce LI traffic + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Task has been suspended temporarily + + + Cancelled + The Task has been permanently cancelled + + + Expired + The Task date for this Document has passed, meaning that the Task has lapsed + + + + + ETSI + TaskServiceType + + + + ETSI + TaskDeliveryType + + + IRIOnly + Only IRI is delivered + + + CCOnly + Only CC is delivered + + + IRIandCC + Both IRI and CC is delivered + + + + + ETSI + HandoverFormat + + + TS102232-2 + Handed over in TS 102 232 part 2 format + + + TS102232-3 + Handed over in TS 102 232 part 3 format + + + TS102232-4 + Handed over in TS 102 232 part 4 format + + + TS102232-5 + Handed over in TS 102 232 part 5 format + + + TS102232-6 + Handed over in TS 102 232 part 6 format + + + TS102232-7 + Handed over in TS 102 232 part 7 format + + + + + ETSI + TaskFlag + + + IsTest + Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + + + + diff --git a/103120/portal/dictionaries/ts_103120v010101p0_Dictionaries.xsd b/103120/portal/dictionaries/ts_103120v010101p0_Dictionaries.xsd new file mode 100644 index 0000000..bcd1db5 --- /dev/null +++ b/103120/portal/dictionaries/ts_103120v010101p0_Dictionaries.xsd @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/dictionaries/ts_103120v010101p0_ETSIDictionaryDefinitions.xml b/103120/portal/dictionaries/ts_103120v010101p0_ETSIDictionaryDefinitions.xml new file mode 100644 index 0000000..51b3265 --- /dev/null +++ b/103120/portal/dictionaries/ts_103120v010101p0_ETSIDictionaryDefinitions.xml @@ -0,0 +1,363 @@ + + + + ETSI + ObjectType + + + Authorisation + An Authorisation Object as defined in section 7.2 + + + Document + A Document Object as defined in section 7.3 + + + Notification + A Notification Object as defined in section 7.4 + + + Task + A Task Object as defined in section 8.2 + + + + + ETSI + AuthorisationLegalType + + + Manual + The implementation should consult the AuthorisationManualInformation field for details on the type of legal Authorisation + + + + + ETSI + AuthorisationPriority + + + High + An Authorisation has high priority + + + Routine + The Authorisation has a routine priority + + + + + ETSI + AuthorisationStatus + + + AwaitingApproval + Authorisation is still waiting approval from one or more relevant authorities + + + EmergencyApproval + The Authorisation has been approved under emergency procedures + + + Approved + The Authorisation has been approved by the relevant authorities + + + Rejected + The Authorisation has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Authorisation has been suspended temporarily + + + Cancelled + The Authorisation has been permanently cancelled + + + Expired + The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. + + + Invalid + The Authorisation is not active due to a problem with the current information populated in the Authorisation Object. + + + + + ETSI + AuthorisationDesiredStatus + + + AwaitingApproval + Authorisation is still waiting approval from one or more relevant authorities + + + EmergencyApproval + The Authorisation has been approved under emergency procedures + + + Approved + The Authorisation has been approved by the relevant authorities + + + Rejected + The Authorisation has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Authorisation has been suspended temporarily + + + Cancelled + The Authorisation has been permanently cancelled + + + Expired + The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. + + + + + ETSI + AuthorisationFlag + + + IsEmergency + Indicates if the authorisation was issued under nationally-defined emergency procedures (e.g. orally). The circumstances and consequences for setting the field shall be defined by the relevant national profile + + + IsConsensual + Indicates that the current authorisation is for consensual interception. This may alter the process or documentation accompanying the authorisation + + + IsTest + Indicates that the current authorisation is given for test purposes. This may alter the process or documentation accompanying the authorisation + + + + + ETSI + DocumentStatus + + + AwaitingApproval + The Document is still waiting approval from one or more relevant authorities + + + Approved + The Document has been approved by the relevant authorities + + + Rejected + The Document has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Document has been suspended temporarily + + + Cancelled + The Document has been permanently cancelled + + + Expired + The expiry date for this Document has passed. + + + Invalid + The Document is invalid due to a problem with the current information populated in the Document Object. + + + + + ETSI + DocumentDesiredStatus + + + AwaitingApproval + The Document is still waiting approval from one or more relevant authorities + + + Approved + The Document has been approved by the relevant authorities + + + Rejected + The Document has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Document has been suspended temporarily + + + Cancelled + The Document has been permanently cancelled + + + Expired + The expiry date for this Document has passed. + + + + + ETSI + DocumentType + + + Warrant + This Document represents a legal Warrant + + + + + ETSI + NotificationType + + + General + A general notification that a change has occurred with the specified Objects + + + + + ETSI + TaskStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingProvisioning + The Task is approved, but is not yet provisioned in the LI system + + + Active + The Task is active and can produce LI traffic + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Task has been suspended temporarily + + + Cancelled + The Task has been permanently cancelled + + + Expired + The Task date for this Document has passed, meaning that the Task has lapsed + + + Error + The Task is not active due to a problem with the underlying LI system + + + Invalid + The Task is not active due to a problem with the current information populated in the Task Object + + + + + ETSI + TaskDesiredStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingProvisioning + The Task is approved, but is not yet provisioned in the LI system + + + Active + The Task is active and can produce LI traffic + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Task has been suspended temporarily + + + Cancelled + The Task has been permanently cancelled + + + Expired + The Task date for this Document has passed, meaning that the Task has lapsed + + + + + ETSI + TaskServiceType + + + + ETSI + TaskDeliveryType + + + IRIOnly + Only IRI is delivered + + + CCOnly + Only CC is delivered + + + IRIandCC + Both IRI and CC is delivered + + + + + ETSI + HandoverFormat + + + TS102232-2 + Handed over in TS 102 232 part 2 format + + + TS102232-3 + Handed over in TS 102 232 part 3 format + + + TS102232-4 + Handed over in TS 102 232 part 4 format + + + TS102232-5 + Handed over in TS 102 232 part 5 format + + + TS102232-6 + Handed over in TS 102 232 part 6 format + + + TS102232-7 + Handed over in TS 102 232 part 7 format + + + + + ETSI + TaskFlag + + + IsTest + Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + + + + diff --git a/103120/portal/schema/ts_103120v010101p0_Authorisation.xsd b/103120/portal/schema/ts_103120v010101p0_Authorisation.xsd new file mode 100644 index 0000000..b6bc7ee --- /dev/null +++ b/103120/portal/schema/ts_103120v010101p0_Authorisation.xsd @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/schema/ts_103120v010101p0_Common.xsd b/103120/portal/schema/ts_103120v010101p0_Common.xsd new file mode 100644 index 0000000..fedfb4e --- /dev/null +++ b/103120/portal/schema/ts_103120v010101p0_Common.xsd @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/schema/ts_103120v010101p0_Core.xsd b/103120/portal/schema/ts_103120v010101p0_Core.xsd new file mode 100644 index 0000000..3870f0f --- /dev/null +++ b/103120/portal/schema/ts_103120v010101p0_Core.xsd @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/schema/ts_103120v010101p0_Document.xsd b/103120/portal/schema/ts_103120v010101p0_Document.xsd new file mode 100644 index 0000000..e0d18ca --- /dev/null +++ b/103120/portal/schema/ts_103120v010101p0_Document.xsd @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/schema/ts_103120v010101p0_LITask.xsd b/103120/portal/schema/ts_103120v010101p0_LITask.xsd new file mode 100644 index 0000000..88ec469 --- /dev/null +++ b/103120/portal/schema/ts_103120v010101p0_LITask.xsd @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/schema/ts_103120v010101p0_Notification.xsd b/103120/portal/schema/ts_103120v010101p0_Notification.xsd new file mode 100644 index 0000000..53dae32 --- /dev/null +++ b/103120/portal/schema/ts_103120v010101p0_Notification.xsd @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/ts_103120_Authorisation.xsd b/103120/schema/ts_103120_Authorisation.xsd new file mode 100644 index 0000000..b6bc7ee --- /dev/null +++ b/103120/schema/ts_103120_Authorisation.xsd @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/ts_103120_Common.xsd b/103120/schema/ts_103120_Common.xsd new file mode 100644 index 0000000..fedfb4e --- /dev/null +++ b/103120/schema/ts_103120_Common.xsd @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd new file mode 100644 index 0000000..3870f0f --- /dev/null +++ b/103120/schema/ts_103120_Core.xsd @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/ts_103120_Document.xsd b/103120/schema/ts_103120_Document.xsd new file mode 100644 index 0000000..e0d18ca --- /dev/null +++ b/103120/schema/ts_103120_Document.xsd @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/ts_103120_LITask.xsd b/103120/schema/ts_103120_LITask.xsd new file mode 100644 index 0000000..88ec469 --- /dev/null +++ b/103120/schema/ts_103120_LITask.xsd @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/ts_103120_Notification.xsd b/103120/schema/ts_103120_Notification.xsd new file mode 100644 index 0000000..53dae32 --- /dev/null +++ b/103120/schema/ts_103120_Notification.xsd @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 42061c3b365958aa844280d46471991c4eafaed0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:27 +0100 Subject: [PATCH 092/208] TS 102 657 v1.17.1 (2015-12-04) agreed at LI#40 (Aachen, 2015-09-08) --- 102657/RDMessage.asn | 667 +++++++++--------- 102657/RDMessage.xsd | 90 ++- ...{RDMessagever16.txt => RDMessagever17.txt} | 667 +++++++++--------- ...{RDMessagever16.xsd => RDMessagever17.xsd} | 90 ++- 4 files changed, 856 insertions(+), 658 deletions(-) rename 102657/portal/{RDMessagever16.txt => RDMessagever17.txt} (81%) rename 102657/portal/{RDMessagever16.xsd => RDMessagever17.xsd} (97%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 2b94172..2d4e982 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version16(16)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version17(17)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,8 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version16(16)} - +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version17(17)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -29,6 +28,7 @@ RetainedDataMessage ::= SEQUENCE -- retainedDataPayload) ... } + -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -100,18 +100,19 @@ RequestMessage ::= SEQUENCE maxHits [4] INTEGER OPTIONAL, -- Maximum number of records to be returned. -- On a national basis maximum numbers could be considered - -- In case of maxHit a responseFailed message is sent and no data is sent + -- In case of maxHit a responseFailed message is sent and no data is sent -- (see clause 6.3.3.2) nationalRequestParameters [5] NationalRequestParameters OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements -- or to transmit a warrant. ..., - maxRecordsPerBatch [6] INTEGER OPTIONAL + maxRecordsPerBatch [6] INTEGER OPTIONAL, -- Indicates that multi-part delivery shall be used and each ResponseMessage shall not -- contain more records than specified. (see clause 6.3.3.3) - - + requestedData [7] SEQUENCE OF UTF8String OPTIONAL + -- only to use in case of selective requests, it contains + -- the path to the selected parameter in XPATH notation } DeliveryPointHIB ::= UTF8String @@ -152,7 +153,7 @@ RequestAcknowledgement ::= SEQUENCE -- Definitions of Response message and acknowledgement -- =================================================== -ResponseMessage ::= SEQUENCE +ResponseMessage ::= SEQUENCE { responseStatus [1] ResponseStatus, responsePayload [2] SEQUENCE OF ResponseRecord OPTIONAL, @@ -186,9 +187,9 @@ ResponseRecord ::= SEQUENCE recordNumber [1] INTEGER, recordPayload [2] RetainedDataRecord, additionalInformation [3] AdditionalInformation OPTIONAL, - -- see clause 6.2.4 + -- see clause 6.2.4 nationalRecordPayload [4] NationalRecordPayload OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -204,25 +205,25 @@ AdditionalInformation ::= SEQUENCE RetainedDataRecord ::= CHOICE { telephonyRecord [1] TelephonyRecord, - -- Details are defined in Annex B + -- Details are defined in Annex B messageRecord [2] MessageRecord, - -- Details are defined in Annex C + -- Details are defined in Annex C networkAccess [3] NetworkAccessRecord, - -- Details are defined in Annex E + -- Details are defined in Annex E ..., multimediaRecord [4] MultimediaRecord - -- Details are defined in Annex D + -- Details are defined in Annex D -- Other services will be included (as they are implemented) } ResponseAcknowledgement ::= CHOICE { -- Acknowledges a response has been sent - acknowledgeCompleteResults [1] NULL, - acknowledgePartialResults [2] NULL, + acknowledgeCompleteResults [1] NULL, + acknowledgePartialResults [2] NULL, ..., - acknowledgePartialResultsNumber [3] INTEGER - -- number to acknowledge a specific resultMessage within parallel multi-part delivery + acknowledgePartialResultsNumber [3] INTEGER + -- number to acknowledge a specific resultMessage within parallel multi-part delivery } -- ================================================== @@ -231,13 +232,12 @@ ResponseAcknowledgement ::= CHOICE FurtherInformation ::= SEQUENCE { - information [1] UTF8String, - contactInformation [2] UTF8String OPTIONAL, + information [1] UTF8String, + contactInformation [2] UTF8String OPTIONAL, ..., categorisedErrorDescription [3] CategorisedErrorDescription OPTIONAL -- see 6.4 } - CategorisedErrorDescription ::= SEQUENCE { value [1] INTEGER, @@ -245,10 +245,6 @@ CategorisedErrorDescription ::= SEQUENCE ... } - - - - -- =================================================== -- Definitions of a cancel message and acknowledgement -- =================================================== @@ -314,7 +310,7 @@ NationalRequestParameters ::= SEQUENCE -- In case a given country wants to use additional national parameters according to its law, -- these national parameters should be defined using the ASN.1 syntax and added after the -- extension marker (...). - -- It is recommended that an version indicator is included in the national parameters + -- It is recommended that an version indicator is included in the national parameters -- definition. } @@ -334,13 +330,13 @@ NationalRecordPayload ::= SEQUENCE SupplementaryRequest ::= CHOICE { - nationalSupplementaryRequest [1] NationalSupplementaryRequest, + nationalSupplementaryRequest [1] NationalSupplementaryRequest, ... } SupplementaryResponse ::= CHOICE { - nationalSupplementaryResponse [1] NationalSupplementaryResponse, + nationalSupplementaryResponse [1] NationalSupplementaryResponse, ... } @@ -367,6 +363,7 @@ NationalSupplementaryResponse ::= SEQUENCE -- extension marker (...). -- It is recommended that a version indicator is included. } + TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -415,8 +412,6 @@ OrganizationInfo ::= SEQUENCE -- time that subscriber account was created modifiedDate [14] GeneralizedTime OPTIONAL -- date that subscriber account was modified - - } IndividualInfo ::= SEQUENCE @@ -437,7 +432,6 @@ IndividualInfo ::= SEQUENCE otherAddresses [8] SEQUENCE OF OtherAddress OPTIONAL, createTime [9] GeneralizedTime OPTIONAL -- time that subscriber account was created - } PersonName ::= SEQUENCE @@ -473,26 +467,29 @@ ContactDetails ::= SEQUENCE AddressInformation ::= SEQUENCE { - flatNumber [1] UTF8String OPTIONAL, - buildingName [2] UTF8String OPTIONAL, - buildingNumber [3] UTF8String OPTIONAL, - streetName [4] UTF8String OPTIONAL, - poBox [5] UTF8String OPTIONAL, + flatNumber [1] UTF8String OPTIONAL, + buildingName [2] UTF8String OPTIONAL, + buildingNumber [3] UTF8String OPTIONAL, + streetName [4] UTF8String OPTIONAL, + poBox [5] UTF8String OPTIONAL, -- PO box or Response number - postalCode [6] UTF8String OPTIONAL, + postalCode [6] UTF8String OPTIONAL, -- Postal code. Example: 2289AC - region [7] UTF8String OPTIONAL, - province [8] UTF8String OPTIONAL, - language [9] UTF8String OPTIONAL, - city [10] UTF8String OPTIONAL, - country [11] CountryCode OPTIONAL, + region [7] UTF8String OPTIONAL, + province [8] UTF8String OPTIONAL, + language [9] UTF8String OPTIONAL, + city [10] UTF8String OPTIONAL, + country [11] CountryCode OPTIONAL, -- Country code as defined in ISO 3166-1 [4] - validity [12] TimeSpan OPTIONAL, + validity [12] TimeSpan OPTIONAL, -- time from which the address was registered - ... + ..., + relatedOrganizationInfo [13] OrganizationInfo OPTIONAL, + relatedPersonName [14] PersonName OPTIONAL, + otherInformation [15] UTF8String OPTIONAL + -- additional information in cases of divergent addresses } - OtherAddress ::= SEQUENCE { address [1] AddressInformation OPTIONAL, @@ -503,7 +500,6 @@ OtherAddress ::= SEQUENCE ... } - AuthenticationInfo ::= SEQUENCE { authenticationType [1] UTF8String OPTIONAL, @@ -531,14 +527,16 @@ BankAccount ::= SEQUENCE nationalBankNumber [5] UTF8String OPTIONAL, -- To be used in case that the account holding bank has neither IBAN nor BIC bankName [6] UTF8String OPTIONAL, - ... + ..., + sepaRefNumber [7] UTF8String OPTIONAL + -- To be used for referenceNumber of a SEPA direct debit mandate } -IBAN ::= UTF8String +IBAN ::= UTF8String -- International Banking Account Number -- format as per ISO 13616-1:2007 [28] -BIC ::= UTF8String +BIC ::= UTF8String -- Business Identifier Code -- format as per ISO 9362:2009 [29] @@ -549,6 +547,7 @@ BillingMethod ::= ENUMERATED prepaid(2), ... } + TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -575,7 +574,7 @@ TelephonySubscriber ::= SEQUENCE -- a subscriber (or account) may have more than one service listed against them ..., nationalTelephonySubscriberInfo [5] NationalTelephonySubscriberInfo OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -592,6 +591,40 @@ TelephonySubscriberId ::= UTF8String TelephonySubscriberInfo ::= NULL -- Reserved +PartyNumberInfo ::= SEQUENCE +{ + partyNumber [1] PartyNumber OPTIONAL, + -- referenced partyNumber for the additional information in this type + timeSpan [2] TimeSpan OPTIONAL, + -- start and end date if applicable in which the number was active + disableReason [3] UTF8String OPTIONAL, + -- reason of temporarily disable procedure - if applicable + ... +} + +ICCIDInfo ::= SEQUENCE +{ + iCCID [1] UTF8String OPTIONAL, + timeSpan [2] TimeSpan OPTIONAL, + -- activation- and deactivation-date if applicable in which the ICCID was active + ... +} + +LoginInfo ::= SEQUENCE +{ + login [1] UTF8String OPTIONAL, + -- login used for authentication, usually a username or email address + password [2] UTF8String OPTIONAL, + serviceName [3] UTF8String OPTIONAL, + -- short description of the kind of service the login / password is used for + needsAdditionalAuthentication [4] BOOLEAN OPTIONAL, + -- true if additional authentication methods are required, like security questions or + -- e-tokens + timeSpan [5] TimeSpan OPTIONAL, + -- timespan when the login / password was valid + ... +} + SubscribedTelephonyServices ::= SEQUENCE { serviceID [1] UTF8String OPTIONAL, @@ -607,7 +640,7 @@ SubscribedTelephonyServices ::= SEQUENCE installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address connectionDate [8] GeneralizedTime OPTIONAL, - -- Date the subscriber was actually connected + -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, carrierPreselect [10] BOOLEAN OPTIONAL, @@ -618,17 +651,32 @@ SubscribedTelephonyServices ::= SEQUENCE pUKCode [13] UTF8String OPTIONAL, pUK2Code [14] UTF8String OPTIONAL, iMEI [15] SEQUENCE OF IMEI OPTIONAL, - nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, - -- To be defined on a national basis + nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements paymentDetails [17] PaymentDetails OPTIONAL, - subscriptionType [18] SubscriptionType OPTIONAL, + subscriptionType [18] SubscriptionType OPTIONAL, -- Describes the nature of the subscription deliveryAddress [19] AddressInformation OPTIONAL, resellerAddress [20] AddressInformation OPTIONAL, - otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL + otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL, + registeredNumbersInfo [22] SEQUENCE OF PartyNumberInfo OPTIONAL, + -- information about timespan of the active number and deactivation events + registeredICCIDs [23] SEQUENCE OF ICCIDInfo OPTIONAL, + -- in cases of MultiSIM card contracts + loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL + -- e.g. login information according a VMS/UMS account +} +SubscriptionType ::= ENUMERATED +{ + unknown(0), + postpay(1), + prepay(2), + other(3), + ... } + -- Describes the nature of the subscription NationalTelephonySubscriptionInfo ::= SEQUENCE { @@ -637,19 +685,6 @@ NationalTelephonySubscriptionInfo ::= SEQUENCE ... } - -SubscriptionType ::= ENUMERATED -- Describes the nature of the subscription - { - unknown(0), - postpay(1), - prepay(2), - other(3), - ... - } - - - - TelephonyBillingDetails ::= SEQUENCE { subscriberID [1] TelephonySubscriberId OPTIONAL, @@ -659,7 +694,7 @@ TelephonyBillingDetails ::= SEQUENCE billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, ..., nationalTelephonyBillingDetails [6] NationalTelephonyBillingDetails OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -682,16 +717,16 @@ BillingRecords ::= SEQUENCE currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, - -- i.e. credit card etc. + -- i.e. credit card, etc. ..., nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements transactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis transactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. declined, succeeded etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national bases } @@ -717,7 +752,7 @@ TelephonyServiceType ::= ENUMERATED TelephonyServiceUsage ::= SEQUENCE { partyInformation [1] SEQUENCE OF TelephonyPartyInformation OPTIONAL, - -- This parameter provides the concerned party (Originating, Terminating or + -- This parameter provides the concerned party (Originating, Terminating or -- forwarded party), the identity(ies) of the party and all the information -- provided by the party communicationTime [2] TimeSpan OPTIONAL, @@ -732,9 +767,12 @@ TelephonyServiceUsage ::= SEQUENCE ringDuration [8] INTEGER OPTIONAL, ..., mmsInformation [9] MmsInformation OPTIONAL, - nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL - -- To be defined on a national basis + nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL, + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + operatorSpecificCallDetails [11] UTF8String OPTIONAL + -- CSP specific value which indicates the nature of a call + -- (e.g. "CallIndicator: GPR, CallActionCode: 2") } NationalTelephonyServiceUsage ::= SEQUENCE @@ -746,7 +784,7 @@ NationalTelephonyServiceUsage ::= SEQUENCE TelephonyPartyInformation ::= SEQUENCE { - partyRole [1] TelephonyPartyRole OPTIONAL, + partyRole [1] TelephonyPartyRole OPTIONAL, partyNumber [2] PartyNumber OPTIONAL, subscriberID [3] TelephonySubscriberId OPTIONAL, deviceID [4] TelephonyDeviceID OPTIONAL, @@ -758,16 +796,16 @@ TelephonyPartyInformation ::= SEQUENCE natureOfAddress [9] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" forwardedTransferredNumber [10] PartyNumber OPTIONAL, - terminatingTransferredNumber [11] PartyNumber OPTIONAL, + terminatingTransferredNumber [11] PartyNumber OPTIONAL, ..., emailAddress [12] UTF8String OPTIONAL, -- used for MMS that supports also the use of E-Mail addresses (RFC 5322 [24]) iMEI [13] IMEI OPTIONAL, detailedLocation [14] TelephonyNetworkElement OPTIONAL, - -- In the case detailed location information per call and party is available + -- In the case detailed location information per call and party is available -- (e.g. the geoCoordinates for this partyNumber) nationalTelephonyPartyInformation [15] NationalTelephonyPartyInformation OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements partyType [16] TelephonyPartyType OPTIONAL, dialledDigits [17] UTF8String OPTIONAL @@ -893,11 +931,11 @@ MmsInformation ::= SEQUENCE TelephonyEventInformation ::= SEQUENCE { - time [1] GeneralizedTime OPTIONAL, + time [1] GeneralizedTime OPTIONAL, -- time when the event occurred - type [2] TelephonyEventType OPTIONAL, + type [2] TelephonyEventType OPTIONAL, -- type of event - party [3] TelephonyPartyRole OPTIONAL, + party [3] TelephonyPartyRole OPTIONAL, -- party to which the event is related location [4] TelephonyLocation OPTIONAL, ... @@ -912,7 +950,7 @@ TelephonyEventType ::= CHOICE prepayServiceEventType [5] PrepayServiceEventType, ..., nationalTelephonyEventType [6] NationalTelephonyEventType - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -1015,12 +1053,11 @@ TelephonyLocation ::= SEQUENCE -- Time span that this location was valid for ..., nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - detailedLocation [4] TelephonyNetworkElement OPTIONAL + detailedLocation [4] TelephonyNetworkElement OPTIONAL -- The extended information for this network element as it was at the time of the - -- communication - + -- communication } NationalTelephonyLocation ::= SEQUENCE @@ -1071,10 +1108,10 @@ TelephonyDevice ::= SEQUENCE -- Unique identifier for this telephony device according to type of identifier ..., subscriberID [3] TelephonySubscriberId OPTIONAL, - -- Identifier for a known user of this equipment. + -- Identifier for a known user of this equipment. -- Usage of this parameter is subject to national legislation. nationalTelephonyDevice [4] NationalTelephonyDevice OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -1086,7 +1123,7 @@ NationalTelephonyDevice ::= SEQUENCE } TelephonyDeviceID ::= OCTET STRING - -- A unique identifier for the telephony device. For example, the IMEI number + -- A unique identifier for the telephony device. For example, the IMEI number -- of a mobile handset -- ======================== @@ -1097,11 +1134,11 @@ TelephonyNetworkElement ::= SEQUENCE { telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, cellInformation [2] Location OPTIONAL, - -- The Location information id - validity [3] TimeSpan OPTIONAL, + -- The Location information id + validity [3] TimeSpan OPTIONAL, ..., nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements transmitterDetails [5] TransmitterDetails OPTIONAL } @@ -1150,7 +1187,6 @@ TransmitterTechnology ::= ENUMERATED vIRTUAL(6) -- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the -- enumeration values (0 to 6) are not. - } NationalTransmitterDetails ::= SEQUENCE @@ -1166,44 +1202,43 @@ NationalTransmitterDetails ::= SEQUENCE Location ::= SEQUENCE { - e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, - -- Coded in the same format as the ISUP location number (parameter - -- field) of the ISUP (see EN 300 356 [7]) - globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, + e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, + -- Coded in the same format as the ISUP location number (parameter field) + -- of the ISUP (see EN 300 356 [7]) + globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, -- See MAP format (see 3GPP TS 09.02 [8]) - rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, + rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the -- last 6 octets are used) - gsmLocation [4] GSMLocation OPTIONAL, - umtsLocation [5] UMTSLocation OPTIONAL, - sAI [6] OCTET STRING (SIZE (7)) OPTIONAL, + gsmLocation [4] GSMLocation OPTIONAL, + umtsLocation [5] UMTSLocation OPTIONAL, + sAI [6] OCTET STRING (SIZE (7)) OPTIONAL, -- format: PLMN-ID 3 octets (no. 1-3) - -- LAC 2 octets (no. 4-5) - -- SAC 2 octets (no. 6-7) - -- (according to 3GPP TS 25.413 [31]) - oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, + -- LAC 2 octets (no. 4-5) + -- SAC 2 octets (no. 6-7) + -- (according to 3GPP TS 25.413 [31]) + oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI -- (only the last 6 octets are used) -- This parameter is duplicated from 3GPP TS 33.108 [11] ..., - postalLocation [8] AddressInformation OPTIONAL, - extendedLocation [9] ExtendedLocation OPTIONAL, + postalLocation [8] AddressInformation OPTIONAL, + extendedLocation [9] ExtendedLocation OPTIONAL, userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL, -- coded according to 3GPP TS 29.274 [32]; the type IE is not included - tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, - -- Only applicable to the CS traffic cases, such as SMS over SGs, according to + tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, + -- Only applicable to the CS traffic cases, such as SMS over SGs, according to -- 3GPP TS 23.272 [35] - eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL - -- Only applicable to the CS traffic cases, such as SMS over SGs, according to + eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL + -- Only applicable to the CS traffic cases, such as SMS over SGs, according to -- 3GPP TS 23.272 [35] - } GSMLocation ::= CHOICE { - geoCoordinates [1] SEQUENCE + geoCoordinates [1] SEQUENCE { latitude [1] UTF8String (SIZE(7..10)) OPTIONAL, -- format: XDDMMSS.SS @@ -1215,22 +1250,22 @@ GSMLocation ::= CHOICE ... }, -- format: XDDMMSS.SS (on latitudes) or XDDDMMSS.SS (on longitudes) - -- X : N(orth), S(outh), E(ast), W(est) - -- DD or DDD : degrees (numeric characters) - -- MM : minutes (numeric characters) - -- SS.SS : seconds, the second part (.SS) is optional + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- MM : minutes (numeric characters) + -- SS.SS : seconds, the second part (.SS) is optional -- Example: - -- latitude (short form) N502312 - -- longitude (long form) E1122312.18 + -- latitude (short form) N502312 + -- longitude (long form) E1122312.18 utmCoordinates [2] SEQUENCE { utm-Zone [1] UTF8String (SIZE(3)) OPTIONAL, - utm-East [2] UTF8String (SIZE(6)) OPTIONAL, - utm-North [3] UTF8String (SIZE(7)) OPTIONAL, + utm-East [2] UTF8String (SIZE(6)) OPTIONAL, + utm-North [3] UTF8String (SIZE(7)) OPTIONAL, -- Universal Transverse Mercator -- example utm-Zone 32U - -- utm-East 439955 - -- utm-North 5540736 + -- utm-East 439955 + -- utm-North 5540736 mapDatum [4] MapDatum OPTIONAL, azimuth [5] INTEGER (0..359) OPTIONAL, -- The azimuth is the bearing, relative to true north @@ -1252,17 +1287,17 @@ GSMLocation ::= CHOICE -- squareID PU -- numericalLocationEasting 9129 -- mumericalLocationNorthing 4045 - -- In both panels, utm-GridBand and squareID the 'I' and 'O' characters are not used + -- In both panels, utm-GridBand and squareID the 'I' and 'O' characters are not used -- because of their similarity to the digits one and zero. - mapDatum [6] MapDatum OPTIONAL, - azimuth [7] INTEGER (0..359) OPTIONAL, + mapDatum [6] MapDatum OPTIONAL, + azimuth [7] INTEGER (0..359) OPTIONAL, -- The azimuth is the bearing, relative to true north ... }, - wGS84Coordinates [4] OCTET STRING, + wGS84Coordinates [4] OCTET STRING, -- format is as defined in 3GPP TS 03.32 [12] ..., - geoCoordinatesDec [5] SEQUENCE + geoCoordinatesDec [5] SEQUENCE { latitudeDec [1] UTF8String (SIZE(3..12)) OPTIONAL, -- format: XDD.nnnnnnnn @@ -1274,12 +1309,12 @@ GSMLocation ::= CHOICE ... } -- format: XDD.nnnnnnnn (on latitudes) or XDDD.nnnnnnnn (on longitudes) - -- X : N(orth), S(outh), E(ast), W(est) - -- DD or DDD : degrees (numeric characters) - -- nnnnnnnn : post decimal positions (numeric characters) + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- nnnnnnnn : post decimal positions (numeric characters) -- Example: - -- latitude N50.38666667 - -- longitude E112.38671670 + -- latitude N50.38666667 + -- longitude E112.38671670 } MapDatum ::= ENUMERATED @@ -1390,7 +1425,7 @@ Route ::= SEQUENCE ... } -HorizontalExtent ::= INTEGER +HorizontalExtent ::= INTEGER -- metres -- =================== @@ -1399,6 +1434,7 @@ HorizontalExtent ::= INTEGER PartyNumber ::= UTF8String -- E.164 address of the party in international format + MessageRecord ::= CHOICE { msgSubscriber [1] MsgSubscriber, @@ -1440,17 +1476,17 @@ MsgStore ::= SEQUENCE } MsgStoreID ::= OCTET STRING - -- Unique identifier of the message store. Since not all IDs will necessarily be human - -- readable, a generic byte string is used + -- Unique identifier of the message store. Since not all IDs will necessarily be human + -- readable, a generic byte string is used MsgAddress ::= UTF8String - -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail - -- this will be an RFC822-style address - -- NOTE as of v1.2.1, this field has changed from OCTET STRING to UTF8String + -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail + -- this will be an RFC822-style address + -- NOTE - as of v1.2.1, this field has changed from OCTET STRING to UTF8String MsgProviderID ::= UTF8String -- Unique identifier for a service provider, e.g. company name - -- NOTE as of v1.2.1, this field has changed from OCTET STRING to UTF8String + -- NOTE - as of v1.2.1, this field has changed from OCTET STRING to UTF8String -- ==================================== -- Definitions of Message Service Usage @@ -1553,7 +1589,7 @@ MsgBillingDetails ::= SEQUENCE billingIdentifier [4] MsgBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MsgBillingRecords OPTIONAL, nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -1579,14 +1615,14 @@ MsgBillingRecords ::= SEQUENCE method [5] UTF8String OPTIONAL, -- i.e. credit card etc. nationalMsgBillingRecords [6] NationalMsgBillingRecords OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ..., msgTransactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis mgsTransactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. declined, succeeded etc.) + -- Status of the transaction (i.e. "declined", "succeeded" etc.) -- Details to be defined on a national bases } @@ -1596,6 +1632,7 @@ NationalMsgBillingRecords ::= SEQUENCE -- see comment in NationalRequestParameters ... } + MultimediaRecord ::= CHOICE { multimediaSubscriber [1] MultimediaSubscriber, @@ -1610,17 +1647,16 @@ MultimediaRecord ::= CHOICE MultimediaSubscriber ::= SEQUENCE { - subscriberID [1] MultimediaSubscriberID OPTIONAL, + subscriberID [1] MultimediaSubscriberID OPTIONAL, -- unique identifier for this subscriber, e.g. account number - genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, + genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, -- generic personal information about this subscriber - multimediaSubscriberInfo [3] MultimediaSubscriberInfo OPTIONAL, + multimediaSubscriberInfo [3] MultimediaSubscriberInfo OPTIONAL, -- service-specific information about this subscriber - subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, + subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, -- a subscriber (or account) may have more than one service listed against them ..., - multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL - + multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL } MultimediaSubscriberInfo ::= SEQUENCE @@ -1632,25 +1668,21 @@ MultimediaSubscriberInfo ::= SEQUENCE MultimediaSubscriberID ::= UTF8String -- unique identifier for this subscriber, e.g. account number - MultimediaServiceRegistrationInfo ::= SEQUENCE { - emailAddress [1] UTF8String OPTIONAL, + emailAddress [1] UTF8String OPTIONAL, -- subscriber email address in RFC2822 format - languageAtRegistration [2] UTF8String OPTIONAL, + languageAtRegistration [2] UTF8String OPTIONAL, -- subscriber language as in ISO 639 accountCreationTime [3] GeneralizedTime OPTIONAL, -- start time of account accountCreationIP [4] IPAddress OPTIONAL, -- subscriber IP at creation - accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, + accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, -- subscriber country as specified in ISO 3166-2 clientPlatformType [6] UTF8String OPTIONAL, -- subscriber platform clientVersion [7] UTF8String OPTIONAL, -- subscriber platform version ... } - - - SubscribedMultimediaServices ::= SEQUENCE { serviceID [1] UTF8String OPTIONAL, @@ -1666,7 +1698,7 @@ SubscribedMultimediaServices ::= SEQUENCE installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address connectionDate [8] GeneralizedTime OPTIONAL, - -- Date the subscriber was actually connected + -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, carrierPreselect [10] BOOLEAN OPTIONAL, @@ -1677,7 +1709,7 @@ SubscribedMultimediaServices ::= SEQUENCE -- national extension ..., paymentDetails [13] PaymentDetails OPTIONAL, - subscriptionType [14] SubscriptionType OPTIONAL, + subscriptionType [14] SubscriptionType OPTIONAL, -- Describes the nature of the subscription deliveryAddress [15] AddressInformation OPTIONAL, resellerAddress [16] AddressInformation OPTIONAL, @@ -1686,8 +1718,6 @@ SubscribedMultimediaServices ::= SEQUENCE -- Service name used by the service provider which may be proprietary orderTime [19] GeneralizedTime OPTIONAL -- Time when the subscribed service was ordered by the user - - } MultimediaServiceType ::= ENUMERATED @@ -1707,7 +1737,7 @@ MultimediaServiceType ::= ENUMERATED MultimediaServiceUsage ::= SEQUENCE { partyInformation [1] SEQUENCE OF MultimediaPartyInformation OPTIONAL, - -- This parameter provides the concerned party (Originating, Terminating or + -- This parameter provides the concerned party (Originating, Terminating or -- forwarded party), the identity(ies) of the party and all the information -- provided by the party communicationTime [2] TimeSpan OPTIONAL, @@ -1721,7 +1751,7 @@ MultimediaServiceUsage ::= SEQUENCE callID [8] MultimediaCallID OPTIONAL, originalCallID [9] MultimediaCallID OPTIONAL, callState [10] ENUMERATED - { + { bNotReached(1), bAlert(2), bAnswered(3), @@ -1740,13 +1770,11 @@ MultimediaServiceUsage ::= SEQUENCE relayIP [20] IPAddress OPTIONAL, vmLength [21] INTEGER OPTIONAL, -- number of seconds reason [22] UTF8String OPTIONAL - - } MultimediaPartyInformation ::= SEQUENCE { - partyRole [1] MultimediaPartyRole OPTIONAL, + partyRole [1] MultimediaPartyRole OPTIONAL, partyIdentity [2] PartyIdentity OPTIONAL, subscriberID [3] MultimediaSubscriberID OPTIONAL, communicationTime [4] TimeSpan OPTIONAL, @@ -1790,7 +1818,7 @@ MultimediaPartyRole ::= ENUMERATED broadcastReceiver(8), broadcastSender(9), ..., - originalCalling (10) + originalCalling(10) } MultimediaBearerService ::= ENUMERATED @@ -1826,11 +1854,11 @@ ImsInformation ::= SEQUENCE ImsServiceInfo ::= SEQUENCE { - serviceData [1] OCTET STRING OPTIONAL, + serviceData [1] OCTET STRING OPTIONAL, -- service data - serviceType [2] INTEGER OPTIONAL, + serviceType [2] INTEGER OPTIONAL, -- service type - ... + ... } MediaComponent ::= SEQUENCE @@ -1856,11 +1884,10 @@ MultimediaBillingDetails ::= SEQUENCE billingIdentifier [4] MultimediaBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MultimediaBillingRecords OPTIONAL, nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ..., multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL - } MultimediaBillingAddress ::= SEQUENCE @@ -1871,7 +1898,6 @@ MultimediaBillingAddress ::= SEQUENCE ... } - NationalMultimediaBillingDetails ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1891,16 +1917,16 @@ MultimediaBillingRecords ::= SEQUENCE currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, - -- i.e. credit card etc. + -- i.e. credit card etc. nationalMultimediaBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - ... , + ..., multimediaTransactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis multimediaTransactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. declined, succeeded etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national bases } @@ -1956,6 +1982,7 @@ NationalMultimediaMediaComponent ::= SEQUENCE -- see comment in NationalRequestParameters ... } + NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -1986,13 +2013,12 @@ NASubscriber ::= SEQUENCE naSubscriptions [3] SEQUENCE OF NAServiceSubscription OPTIONAL, -- List of all known services subscribed to by this user allocatedDeviceIDs [4] SEQUENCE OF NADeviceId OPTIONAL, - -- List of all known devices allocated to this user. - subscriber [5] GenericSubscriberInfo OPTIONAL , + -- List of all known devices allocated to this user. + subscriber [5] GenericSubscriberInfo OPTIONAL, -- Name, address and other generic subscriber information ..., allocatedDevices [6] SEQUENCE OF NADevice OPTIONAL -- If present, contains device details for all elements from allocatedDeviceIDs - } NAServiceSubscription ::= SEQUENCE @@ -2000,14 +2026,14 @@ NAServiceSubscription ::= SEQUENCE { validity [1] TimeSpan OPTIONAL, naServiceID [2] UTF8String OPTIONAL, - -- Identifier for the service, e.g. account plan name. + -- Identifier for the service, e.g. account plan name. naProviderID [3] NAProviderID OPTIONAL, -- Unique identifier for the provider of the service, e.g. company name naAuthID [4] NAAuthID OPTIONAL, -- Unique identifier for this subscription, e.g. logon name options [5] UTF8String OPTIONAL, -- Human readable text with restrictions or options to the subscription - installationAddress [6] AddressInformation OPTIONAL, + installationAddress [6] AddressInformation OPTIONAL, fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address imsi [8] IMSI OPTIONAL, @@ -2042,14 +2068,14 @@ NationalNASubscription ::= SEQUENCE NAServiceUsage ::= SEQUENCE { - naAccessTime [1] GeneralizedTime OPTIONAL, + naAccessTime [1] GeneralizedTime OPTIONAL, -- Time of connection to the NAS - naAuthID [2] NAAuthID OPTIONAL, + naAuthID [2] NAAuthID OPTIONAL, -- Username used to obtain network access - nwAccessType [3] NwAccessType OPTIONAL, + nwAccessType [3] NwAccessType OPTIONAL, -- Type of network access attempted. If not undefined(0), this should be one of the types -- supported by the NAS (identified below by naNwElementID) - naStatus [4] ENUMERATED + naStatus [4] ENUMERATED { unknown(0), succeeded(1), @@ -2060,104 +2086,107 @@ NAServiceUsage ::= SEQUENCE -- Rejected by the CSP (e.g. usage limits exceeded) ... } OPTIONAL, - interval [5] TimeSpan OPTIONAL, - -- Start time and end time (duration) of network access. - naDeviceId [6] NADeviceId OPTIONAL, + interval [5] TimeSpan OPTIONAL, + -- Start time and end time (duration) of network access. + naDeviceId [6] NADeviceId OPTIONAL, -- Device used to access the service - naNwElementID [7] NANwElementID OPTIONAL, + naNwElementID [7] NANwElementID OPTIONAL, -- Network element (NAS) onto which the naDevice is connected - naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL, + naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL, -- IP address assigned by the network access service. May be fixed or dynamic - location [9] Location OPTIONAL, + location [9] Location OPTIONAL, -- Location of the access (for e.g. GPRS handsets) - dialUpInformation [10] DialUpInformation OPTIONAL, - gprsInformation [11] GprsInformation OPTIONAL, + dialUpInformation [10] DialUpInformation OPTIONAL, + gprsInformation [11] GprsInformation OPTIONAL, ..., - octetsDownloaded [12] INTEGER OPTIONAL, - octetsUploaded [13] INTEGER OPTIONAL, - endReason [14] NAEndReason OPTIONAL, - subscriberID [15] NaSubscriberID OPTIONAL, + octetsDownloaded [12] INTEGER OPTIONAL, + octetsUploaded [13] INTEGER OPTIONAL, + endReason [14] NAEndReason OPTIONAL, + subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access - ePSInformation [16] EPSInformation OPTIONAL, - wifiInformation [17] WifiInformation OPTIONAL, - addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL, - -- contains extended information about the NAT or PAT operations carried out within this - -- service usage session - naDevice [19] NADevice OPTIONAL + ePSInformation [16] EPSInformation OPTIONAL, + wifiInformation [17] WifiInformation OPTIONAL, + addressTranslationRecords [18] SEQUENCE OF AddressTranslationRecord OPTIONAL, + -- contains extended information about the NAT or PAT operations carried out within this + -- service usage session + naDevice [19] NADevice OPTIONAL, -- If present, contains the device details for the device referenced in naDeviceID - - + additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL + -- List of additional locations and optional access time during the network access service + -- usage } - +TimedLocation ::= SEQUENCE +{ + location [1] Location, + naAccessTime [2] GeneralizedTime OPTIONAL, + ... +} WifiInformation ::= SEQUENCE { - bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, + bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, -- The Basic Service Set Identification for the connection. - -- This is also the MAC address of the access point (the present document assumes + -- This is also the MAC address of the access point (the present document assumes -- that records are for infrastructure mode, not ad-hoc mode). - -- The MAC address of the user is given in the naDeviceID in the structure (one level up) - sSID [2] UTF8String OPTIONAL, + -- The MAC address of the user is given in the naDeviceID in the structure (one level up) + sSID [2] UTF8String OPTIONAL, -- The human-readable Service Set Identifier - -- It should be noted that this is typically only available on the air interface and so + -- It should be noted that this is typically only available on the air interface and so -- is not likely to be logged by CSPs (though may be recorded at a more local level). -- Therefore requesting organizations should not expect this to be populated typically. -- It is not guaranteed to be unique. - username [3] UTF8String OPTIONAL, - locationOfAccessPoint [4] Location OPTIONAL, - -- Location of the Access Point as lat/long, grid reference or postal address. - -- Requesting organizations should be aware that Access Points can be moved, sometimes - -- without the knowledge of the CSP - authenticationType [5] AuthenticationType OPTIONAL, - additionalAuthenticationInformation [6] AdditionalAuthenticationInformation OPTIONAL, + username [3] UTF8String OPTIONAL, + locationOfAccessPoint [4] Location OPTIONAL, + -- Location of the Access Point as lat/long, grid reference or postal address. + -- Requesting organizations should be aware that Access Points can be moved, sometimes + -- without the knowledge of the CSP + authenticationType [5] AuthenticationType OPTIONAL, + additionalAuthenticationInformation [6] AdditionalAuthenticationInformation OPTIONAL, ..., - - accessPointIPAddress [7] IPAddress OPTIONAL, - accessPointAdditionalDescriptions[8] SEQUENCE OF UTF8String OPTIONAL, - -- Informal description of location, category or type of access point, + accessPointIPAddress [7] IPAddress OPTIONAL, + accessPointAdditionalDescriptions [8] SEQUENCE OF UTF8String OPTIONAL, + -- Informal description of location, category or type of access point, -- or a name of the network to which the access point belongs. - accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL + accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL -- For WiFi, there may be other parties involved in hosting or owning the -- Access Points, e.g. access point provider or partner providers - } - AuthenticationType ::= ENUMERATED { - authenticationBySMS (1), - -- Used if authentication arranged through a code sent to mobile + authenticationBySMS(1), + -- Used if authentication arranged through a code sent to mobile -- additionalAuthenticationInformation shall contain the phone number - authenticationByCookie (2), - -- If authentication was granted on the basis of a cookie left from a previous visit to a + authenticationByCookie(2), + -- If authentication was granted on the basis of a cookie left from a previous visit to a -- site. -- No other mandatory addtionalAuthenticationInformation - authenticationByMACAddress (3), + authenticationByMACAddress(3), -- If authentication was granted because the MAC address of the UE was recognised due - -- to a previous visit. - -- additionalAuthenticationInformation shall contain the MAC Address unless it is already + -- to a previous visit. + -- additionalAuthenticationInformation shall contain the MAC Address unless it is already -- populated as NADeviceID in this record. - authenticationByEAPSIM (4), - -- If authenticated by EAP SIM see TS 33.234 [X] + authenticationByEAPSIM(4), + -- If authenticated by EAP SIM see TS 33.234 [36] -- additionalAuthenticationInformation shall contain the IMSI - -- Other varieties of EAP could be added here later, together with any extra information they - -- could provide. - authenticationByUsernameAndPassword (5), + -- Other varieties of EAP could be added here later, together with any extra information + -- they could provide. + authenticationByUsernameAndPassword(5), -- additionalAuthenticationInformation should contain username and password if appropriate - authenticationByPaymentOrVoucher (6), - -- additionalAuthenticationInformation should contain Voucher or Payment details - -- if appropriate. + authenticationByPaymentOrVoucher(6), + -- additionalAuthenticationInformation should contain Voucher or Payment details + -- if appropriate. ... } AdditionalAuthenticationInformation ::= SEQUENCE { - phoneNumber [1] PartyNumber OPTIONAL, - -- e.g. number to which an SMS was sent + phoneNumber [1] PartyNumber OPTIONAL, + -- e.g. number to which an SMS was sent mACAddress [2] OCTET STRING (SIZE (6)) OPTIONAL, iMSI [3] IMSI OPTIONAL, - username [4] UTF8String OPTIONAL, + username [4] UTF8String OPTIONAL, -- Names supplied are unlikely to be verified password [5] UTF8String OPTIONAL, -- Only to be populated if it is both appropriate and available @@ -2166,30 +2195,29 @@ AdditionalAuthenticationInformation ::= SEQUENCE ... } - - AddressTranslationRecord ::= SEQUENCE { - validity [1] TimeSpan OPTIONAL, + validity [1] TimeSpan OPTIONAL, -- time at which the address translation started and/or ended - privateIPAddress [2] IPAddress OPTIONAL, + privateIPAddress [2] IPAddress OPTIONAL, -- the private IP of the host - privatePort [3] INTEGER OPTIONAL, + privatePort [3] INTEGER OPTIONAL, -- the private port of the host publicIPAddress [4] IPAddress OPTIONAL, - -- the translated IP of the host, i.e. the address known by the remote host + -- the translated IP of the host, i.e. the address known by the remote host publicPort [5] AddressTranslationPortAssignment OPTIONAL, - -- the translated port(s) of the host, i.e. the port(s) known by the remote host, if applicable + -- the translated port(s) of the host, i.e. the port(s) known by the remote host, if + -- applicable destinationIPAddress [6] IPAddress OPTIONAL, -- the IP address of the remote host destinationPort [7] INTEGER OPTIONAL, -- the port of the remote host connectionType [8] ENUMERATED { - udp (0), - tcp (1), - sctp (2), - other (3), + udp(0), + tcp(1), + sctp(2), + other(3), ... } OPTIONAL, ... @@ -2235,19 +2263,20 @@ NwAccessType ::= ENUMERATED -- Cable access lAN(4), -- LAN access - wirelessLAN(5), + wirelessLAN(5), -- Wireless LAN access (e.g. hotspot) wimax(6), - mobilePacketData(7), -- Network access over GSM/3GPP GPRS, UMTS, etc. + mobilePacketData(7), + -- Network access over GSM/3GPP GPRS, UMTS, etc. ... } DialUpInformation ::= SEQUENCE { - diallingNumber [1] PartyNumber OPTIONAL, + diallingNumber [1] PartyNumber OPTIONAL, -- Telephone number used for dial-up access dialledNumber [2] PartyNumber OPTIONAL, - callback [3] PartyNumber OPTIONAL, + callback [3] PartyNumber OPTIONAL, -- Call back number used for dial-up access ... } @@ -2256,26 +2285,26 @@ GprsInformation ::= SEQUENCE { iMSI [1] IMSI OPTIONAL, mSISDN [2] PartyNumber OPTIONAL, - sgsnAddress [3] SEQUENCE OF IPAddress OPTIONAL, - ggsnAddress [4] IPAddress OPTIONAL, + sgsnAddress [3] SEQUENCE OF IPAddress OPTIONAL, + ggsnAddress [4] IPAddress OPTIONAL, pDP-address-allocated [5] IPAddress OPTIONAL, aPN [6] UTF8String OPTIONAL, pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, - -- format as per TS 101 671 [6] + -- format as per TS 101 671 [6] ..., gPRSEvent [8] GPRSEvent OPTIONAL -- format as per 3GPP TS 33.108 [11] -- Tag [9] was used in the past and shall not be reused. } -GPRSEvent ::= ENUMERATED +GPRSEvent ::= ENUMERATED { pDPContextActivation(1), pDPContextDeactivation(4), gPRSAttach(5), gPRSDetach(6), - locationInfoUpdate(10), - -- sMS ommited from 3GPP TS 33.108 [11], + locationInfoUpdate(10), + -- sMS ommited from 3GPP TS 33.108 [11] pDPContextModification(11), servingSystem(12), ... @@ -2283,69 +2312,66 @@ GPRSEvent ::= ENUMERATED EPSInformation ::= SEQUENCE { - iMSI [1] IMSI OPTIONAL, - iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, - mSISDN [3] PartyNumber OPTIONAL, - iMEISV [4] IMEI OPTIONAL, + iMSI [1] IMSI OPTIONAL, + iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, + mSISDN [3] PartyNumber OPTIONAL, + iMEISV [4] IMEI OPTIONAL, s-GWAddress [5] IPAddress OPTIONAL, p-GWAddress [6] IPAddress OPTIONAL, p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL, - aPNNetworkID [8] AccessPointNameNI OPTIONAL, + aPNNetworkID [8] AccessPointNameNI OPTIONAL, pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL, - -- PDN/PDP Type number as defined in 3GPP TS 29.274 Clause 8.34 + -- PDN/PDP Type number as defined in 3GPP TS 29.274 [32] clause 8.34 pDP-PDNAddress [10] IPAddress OPTIONAL, - -- IP address allocated to the PDP context / PDN connection - -- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix - -- when PDP/PDN Type is IPv6 or IPv4v6. - pDP-PDNAddressExtension [11] IPAddress OPTIONAL, - -- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6 + -- IP address allocated to the PDP context / PDN connection + -- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix + -- when PDP/PDN Type is IPv6 or IPv4v6. + pDP-PDNAddressExtension [11] IPAddress OPTIONAL, + -- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6 dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL, - dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, - rATType [14] INTEGER (0..255), - -- RAT Type coding according to 3GPP TS 29.274 clause 8.17 - ePSEvent [15] EPSEvent OPTIONAL, + dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, + rATType [14] INTEGER (0..255), + -- RAT Type coding according to 3GPP TS 29.274 [32] clause 8.17 + ePSEvent [15] EPSEvent OPTIONAL, ... } IMSIUnauthenticatedFlag ::= BOOLEAN --- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI + -- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI P-GWPLMN-ID ::= OCTET STRING (SIZE (3)) --- This is a copy from the Tracking Area Identity (TAI) IE --- specified in TS 29.274 clause 8.21.4: --- Bits 8 7 6 5 4 3 2 1 --- 1st OCTET MCC digit 2 MCC digit 1 --- 2nd OCTET MNC digit 3 MCC digit 3 --- 3rd OCTET MNC digit 2 MNC digit 1 + -- This is a copy from the Tracking Area Identity (TAI) IE + -- specified in TS 29.274 [32] clause 8.21.4: + -- Bits 8 7 6 5 4 3 2 1 + -- 1st OCTET MCC digit 2 MCC digit 1 + -- 2nd OCTET MNC digit 3 MCC digit 3 + -- 3rd OCTET MNC digit 2 MNC digit 1 AccessPointNameNI ::= IA5String (SIZE(1..63)) --- Network Identifier part of APN in dot representation. --- For example, if the complete APN is --- 'apn1a.apn1b.apn1c.mnc022.mcc111.gprs' --- NI is 'apn1a.apn1b.apn1c' + -- Network Identifier part of APN in dot representation. + -- For example, if the complete APN is "apn1a.apn1b.apn1c.mnc022.mcc111.gprs" + -- NI is "apn1a.apn1b.apn1c" DynamicAddressFlag ::= BOOLEAN --- TRUE if the PDP/PDN address is dynamic. --- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6 + -- TRUE if the PDP/PDN address is dynamic. + -- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6 DynamicAddressFlagExt ::= BOOLEAN --- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated --- during IP CAN bearer activation, initial attach and UE requested --- PDN connectivity with PDP/PDN type IPv4v6. --- FALSE if IPv4 address is static. + -- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated during IP CAN bearer activation, + -- initial attach and UE requested PDN connectivity with PDP/PDN type IPv4v6. + -- FALSE if IPv4 address is static. - -EPSEvent ::= ENUMERATED --- The list of EPSEvent below is partly taken from 3GPP TS 33.108 --- EpsHI2Operations from the EPSEvent ::=ENUMERATED module +EPSEvent ::= ENUMERATED + -- The list of "EPSEvent" below is partly taken from 3GPP TS 33.108 [11] EpsHI2Operations + -- from the "EPSEvent ::=ENUMERATED" module { - e-UTRANAttach (16), - e-UTRANDetach (17), - bearerActivation (18), - bearerModification (20), - bearerDeactivation (21), - trackingAreaUpdate (25), - servingEvolvedPacketSystem (26), + e-UTRANAttach(16), + e-UTRANDetach(17), + bearerActivation(18), + bearerModification(20), + bearerDeactivation(21), + trackingAreaUpdate(25), + servingEvolvedPacketSystem(26), ... } @@ -2358,7 +2384,7 @@ NADeviceId ::= UTF8String NADevice ::= SEQUENCE { naDeviceId [1] NADeviceId OPTIONAL, - -- Identifier of this device. + -- Identifier of this device. description [2] UTF8String OPTIONAL, -- Human readable description of device location [3] Location OPTIONAL, @@ -2370,12 +2396,12 @@ NADevice ::= SEQUENCE subscriberID [7] NaSubscriberID OPTIONAL } -IMEI ::= OCTET STRING (SIZE(8)) +IMEI ::= OCTET STRING (SIZE(8)) -- format as per 3GPP TS 09.02 [8] - -- NOTE: When comparing IMEIs, an IMEI can be considered equal to the requested IMEI even + -- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even -- if the checksum or software version digits are different or not present. -IMSI ::= OCTET STRING (SIZE(3..8)) +IMSI ::= OCTET STRING (SIZE(3..8)) -- format as per 3GPP TS 09.02 [8] -- ====================================== @@ -2392,7 +2418,7 @@ NANwElement ::= SEQUENCE naNwElementID [2] NANwElementID OPTIONAL, -- Unique ID of this NAS (Network Access Server) naProviderID [3] NAProviderID OPTIONAL, - -- Unique identifier of the provider managing this NAS. + -- Unique identifier of the provider managing this NAS. supportedAccessTypes [4] SEQUENCE OF NwAccessType OPTIONAL, location [5] Location OPTIONAL, ... @@ -2411,7 +2437,7 @@ NAAssignedAddress ::= SEQUENCE addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, portNumber [2] INTEGER OPTIONAL, -- populated with the outbound port number - addressType [3] ENUMERATED + addressType [3] ENUMERATED { unknown(0), internal(1), @@ -2421,10 +2447,10 @@ NAAssignedAddress ::= SEQUENCE assignedTime [4] TimeSpan OPTIONAL, ..., destinationAddress [5] IPAddress OPTIONAL, - -- used in cases where a single external IP/port pair is translated to multiple internal + -- used in cases where a single external IP/port pair is translated to multiple internal -- IP/port pairs, with the destination IP/port used to multiplex them destinationPort [6] INTEGER OPTIONAL - -- used in cases where a single external IP/port pair is translated to multiple internal + -- used in cases where a single external IP/port pair is translated to multiple internal -- IP/port pairs, with the destination IP/port used to multiplex them } @@ -2435,7 +2461,7 @@ IPAddressSetOrRangeOrMask ::= CHOICE mask [2] IPMask } -IPRange ::= SEQUENCE +IPRange ::= SEQUENCE -- Things like 172.16.10.0/26 { prefix [0] IPAddress, @@ -2449,7 +2475,7 @@ IPMask ::= SEQUENCE mask [1] IPAddress } -NABillingDetails ::= SEQUENCE +NABillingDetails ::= SEQUENCE { subscriberID [1] NaSubscriberID OPTIONAL, serviceID [2] UTF8String OPTIONAL, @@ -2461,8 +2487,9 @@ NABillingDetails ::= SEQUENCE -- Unique reference for this transaction/billing record -- Details to be defined on a national basis naTransactionStatus [7] UTF8String OPTIONAL - -- Status of the transaction (i.e. declined, succeeded etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national basis } END -- end of RDMessage + diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 2ec34b4..0c02a69 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.16.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.17.1 @@ -491,6 +491,9 @@ + + + @@ -588,10 +591,11 @@ - - - - + + + + + @@ -648,6 +652,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -689,6 +718,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -1032,6 +1082,7 @@ + @@ -1931,10 +1982,24 @@ + + + + + + + + + + + + + + @@ -2217,9 +2282,16 @@ - + - + + + + + + + + diff --git a/102657/portal/RDMessagever16.txt b/102657/portal/RDMessagever17.txt similarity index 81% rename from 102657/portal/RDMessagever16.txt rename to 102657/portal/RDMessagever17.txt index 2b94172..2d4e982 100644 --- a/102657/portal/RDMessagever16.txt +++ b/102657/portal/RDMessagever17.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version16(16)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version17(17)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,8 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version16(16)} - +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version17(17)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -29,6 +28,7 @@ RetainedDataMessage ::= SEQUENCE -- retainedDataPayload) ... } + -- ========================================================================== -- Definitions for Retained Data header information, present in every message -- ========================================================================== @@ -100,18 +100,19 @@ RequestMessage ::= SEQUENCE maxHits [4] INTEGER OPTIONAL, -- Maximum number of records to be returned. -- On a national basis maximum numbers could be considered - -- In case of maxHit a responseFailed message is sent and no data is sent + -- In case of maxHit a responseFailed message is sent and no data is sent -- (see clause 6.3.3.2) nationalRequestParameters [5] NationalRequestParameters OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements -- or to transmit a warrant. ..., - maxRecordsPerBatch [6] INTEGER OPTIONAL + maxRecordsPerBatch [6] INTEGER OPTIONAL, -- Indicates that multi-part delivery shall be used and each ResponseMessage shall not -- contain more records than specified. (see clause 6.3.3.3) - - + requestedData [7] SEQUENCE OF UTF8String OPTIONAL + -- only to use in case of selective requests, it contains + -- the path to the selected parameter in XPATH notation } DeliveryPointHIB ::= UTF8String @@ -152,7 +153,7 @@ RequestAcknowledgement ::= SEQUENCE -- Definitions of Response message and acknowledgement -- =================================================== -ResponseMessage ::= SEQUENCE +ResponseMessage ::= SEQUENCE { responseStatus [1] ResponseStatus, responsePayload [2] SEQUENCE OF ResponseRecord OPTIONAL, @@ -186,9 +187,9 @@ ResponseRecord ::= SEQUENCE recordNumber [1] INTEGER, recordPayload [2] RetainedDataRecord, additionalInformation [3] AdditionalInformation OPTIONAL, - -- see clause 6.2.4 + -- see clause 6.2.4 nationalRecordPayload [4] NationalRecordPayload OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -204,25 +205,25 @@ AdditionalInformation ::= SEQUENCE RetainedDataRecord ::= CHOICE { telephonyRecord [1] TelephonyRecord, - -- Details are defined in Annex B + -- Details are defined in Annex B messageRecord [2] MessageRecord, - -- Details are defined in Annex C + -- Details are defined in Annex C networkAccess [3] NetworkAccessRecord, - -- Details are defined in Annex E + -- Details are defined in Annex E ..., multimediaRecord [4] MultimediaRecord - -- Details are defined in Annex D + -- Details are defined in Annex D -- Other services will be included (as they are implemented) } ResponseAcknowledgement ::= CHOICE { -- Acknowledges a response has been sent - acknowledgeCompleteResults [1] NULL, - acknowledgePartialResults [2] NULL, + acknowledgeCompleteResults [1] NULL, + acknowledgePartialResults [2] NULL, ..., - acknowledgePartialResultsNumber [3] INTEGER - -- number to acknowledge a specific resultMessage within parallel multi-part delivery + acknowledgePartialResultsNumber [3] INTEGER + -- number to acknowledge a specific resultMessage within parallel multi-part delivery } -- ================================================== @@ -231,13 +232,12 @@ ResponseAcknowledgement ::= CHOICE FurtherInformation ::= SEQUENCE { - information [1] UTF8String, - contactInformation [2] UTF8String OPTIONAL, + information [1] UTF8String, + contactInformation [2] UTF8String OPTIONAL, ..., categorisedErrorDescription [3] CategorisedErrorDescription OPTIONAL -- see 6.4 } - CategorisedErrorDescription ::= SEQUENCE { value [1] INTEGER, @@ -245,10 +245,6 @@ CategorisedErrorDescription ::= SEQUENCE ... } - - - - -- =================================================== -- Definitions of a cancel message and acknowledgement -- =================================================== @@ -314,7 +310,7 @@ NationalRequestParameters ::= SEQUENCE -- In case a given country wants to use additional national parameters according to its law, -- these national parameters should be defined using the ASN.1 syntax and added after the -- extension marker (...). - -- It is recommended that an version indicator is included in the national parameters + -- It is recommended that an version indicator is included in the national parameters -- definition. } @@ -334,13 +330,13 @@ NationalRecordPayload ::= SEQUENCE SupplementaryRequest ::= CHOICE { - nationalSupplementaryRequest [1] NationalSupplementaryRequest, + nationalSupplementaryRequest [1] NationalSupplementaryRequest, ... } SupplementaryResponse ::= CHOICE { - nationalSupplementaryResponse [1] NationalSupplementaryResponse, + nationalSupplementaryResponse [1] NationalSupplementaryResponse, ... } @@ -367,6 +363,7 @@ NationalSupplementaryResponse ::= SEQUENCE -- extension marker (...). -- It is recommended that a version indicator is included. } + TimeSpan ::= SEQUENCE { startTime [1] GeneralizedTime OPTIONAL, @@ -415,8 +412,6 @@ OrganizationInfo ::= SEQUENCE -- time that subscriber account was created modifiedDate [14] GeneralizedTime OPTIONAL -- date that subscriber account was modified - - } IndividualInfo ::= SEQUENCE @@ -437,7 +432,6 @@ IndividualInfo ::= SEQUENCE otherAddresses [8] SEQUENCE OF OtherAddress OPTIONAL, createTime [9] GeneralizedTime OPTIONAL -- time that subscriber account was created - } PersonName ::= SEQUENCE @@ -473,26 +467,29 @@ ContactDetails ::= SEQUENCE AddressInformation ::= SEQUENCE { - flatNumber [1] UTF8String OPTIONAL, - buildingName [2] UTF8String OPTIONAL, - buildingNumber [3] UTF8String OPTIONAL, - streetName [4] UTF8String OPTIONAL, - poBox [5] UTF8String OPTIONAL, + flatNumber [1] UTF8String OPTIONAL, + buildingName [2] UTF8String OPTIONAL, + buildingNumber [3] UTF8String OPTIONAL, + streetName [4] UTF8String OPTIONAL, + poBox [5] UTF8String OPTIONAL, -- PO box or Response number - postalCode [6] UTF8String OPTIONAL, + postalCode [6] UTF8String OPTIONAL, -- Postal code. Example: 2289AC - region [7] UTF8String OPTIONAL, - province [8] UTF8String OPTIONAL, - language [9] UTF8String OPTIONAL, - city [10] UTF8String OPTIONAL, - country [11] CountryCode OPTIONAL, + region [7] UTF8String OPTIONAL, + province [8] UTF8String OPTIONAL, + language [9] UTF8String OPTIONAL, + city [10] UTF8String OPTIONAL, + country [11] CountryCode OPTIONAL, -- Country code as defined in ISO 3166-1 [4] - validity [12] TimeSpan OPTIONAL, + validity [12] TimeSpan OPTIONAL, -- time from which the address was registered - ... + ..., + relatedOrganizationInfo [13] OrganizationInfo OPTIONAL, + relatedPersonName [14] PersonName OPTIONAL, + otherInformation [15] UTF8String OPTIONAL + -- additional information in cases of divergent addresses } - OtherAddress ::= SEQUENCE { address [1] AddressInformation OPTIONAL, @@ -503,7 +500,6 @@ OtherAddress ::= SEQUENCE ... } - AuthenticationInfo ::= SEQUENCE { authenticationType [1] UTF8String OPTIONAL, @@ -531,14 +527,16 @@ BankAccount ::= SEQUENCE nationalBankNumber [5] UTF8String OPTIONAL, -- To be used in case that the account holding bank has neither IBAN nor BIC bankName [6] UTF8String OPTIONAL, - ... + ..., + sepaRefNumber [7] UTF8String OPTIONAL + -- To be used for referenceNumber of a SEPA direct debit mandate } -IBAN ::= UTF8String +IBAN ::= UTF8String -- International Banking Account Number -- format as per ISO 13616-1:2007 [28] -BIC ::= UTF8String +BIC ::= UTF8String -- Business Identifier Code -- format as per ISO 9362:2009 [29] @@ -549,6 +547,7 @@ BillingMethod ::= ENUMERATED prepaid(2), ... } + TelephonyRecord ::= CHOICE { telephonySubscriber [1] TelephonySubscriber, @@ -575,7 +574,7 @@ TelephonySubscriber ::= SEQUENCE -- a subscriber (or account) may have more than one service listed against them ..., nationalTelephonySubscriberInfo [5] NationalTelephonySubscriberInfo OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -592,6 +591,40 @@ TelephonySubscriberId ::= UTF8String TelephonySubscriberInfo ::= NULL -- Reserved +PartyNumberInfo ::= SEQUENCE +{ + partyNumber [1] PartyNumber OPTIONAL, + -- referenced partyNumber for the additional information in this type + timeSpan [2] TimeSpan OPTIONAL, + -- start and end date if applicable in which the number was active + disableReason [3] UTF8String OPTIONAL, + -- reason of temporarily disable procedure - if applicable + ... +} + +ICCIDInfo ::= SEQUENCE +{ + iCCID [1] UTF8String OPTIONAL, + timeSpan [2] TimeSpan OPTIONAL, + -- activation- and deactivation-date if applicable in which the ICCID was active + ... +} + +LoginInfo ::= SEQUENCE +{ + login [1] UTF8String OPTIONAL, + -- login used for authentication, usually a username or email address + password [2] UTF8String OPTIONAL, + serviceName [3] UTF8String OPTIONAL, + -- short description of the kind of service the login / password is used for + needsAdditionalAuthentication [4] BOOLEAN OPTIONAL, + -- true if additional authentication methods are required, like security questions or + -- e-tokens + timeSpan [5] TimeSpan OPTIONAL, + -- timespan when the login / password was valid + ... +} + SubscribedTelephonyServices ::= SEQUENCE { serviceID [1] UTF8String OPTIONAL, @@ -607,7 +640,7 @@ SubscribedTelephonyServices ::= SEQUENCE installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address connectionDate [8] GeneralizedTime OPTIONAL, - -- Date the subscriber was actually connected + -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, carrierPreselect [10] BOOLEAN OPTIONAL, @@ -618,17 +651,32 @@ SubscribedTelephonyServices ::= SEQUENCE pUKCode [13] UTF8String OPTIONAL, pUK2Code [14] UTF8String OPTIONAL, iMEI [15] SEQUENCE OF IMEI OPTIONAL, - nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, - -- To be defined on a national basis + nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements paymentDetails [17] PaymentDetails OPTIONAL, - subscriptionType [18] SubscriptionType OPTIONAL, + subscriptionType [18] SubscriptionType OPTIONAL, -- Describes the nature of the subscription deliveryAddress [19] AddressInformation OPTIONAL, resellerAddress [20] AddressInformation OPTIONAL, - otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL + otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL, + registeredNumbersInfo [22] SEQUENCE OF PartyNumberInfo OPTIONAL, + -- information about timespan of the active number and deactivation events + registeredICCIDs [23] SEQUENCE OF ICCIDInfo OPTIONAL, + -- in cases of MultiSIM card contracts + loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL + -- e.g. login information according a VMS/UMS account +} +SubscriptionType ::= ENUMERATED +{ + unknown(0), + postpay(1), + prepay(2), + other(3), + ... } + -- Describes the nature of the subscription NationalTelephonySubscriptionInfo ::= SEQUENCE { @@ -637,19 +685,6 @@ NationalTelephonySubscriptionInfo ::= SEQUENCE ... } - -SubscriptionType ::= ENUMERATED -- Describes the nature of the subscription - { - unknown(0), - postpay(1), - prepay(2), - other(3), - ... - } - - - - TelephonyBillingDetails ::= SEQUENCE { subscriberID [1] TelephonySubscriberId OPTIONAL, @@ -659,7 +694,7 @@ TelephonyBillingDetails ::= SEQUENCE billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, ..., nationalTelephonyBillingDetails [6] NationalTelephonyBillingDetails OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -682,16 +717,16 @@ BillingRecords ::= SEQUENCE currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, - -- i.e. credit card etc. + -- i.e. credit card, etc. ..., nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements transactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis transactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. declined, succeeded etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national bases } @@ -717,7 +752,7 @@ TelephonyServiceType ::= ENUMERATED TelephonyServiceUsage ::= SEQUENCE { partyInformation [1] SEQUENCE OF TelephonyPartyInformation OPTIONAL, - -- This parameter provides the concerned party (Originating, Terminating or + -- This parameter provides the concerned party (Originating, Terminating or -- forwarded party), the identity(ies) of the party and all the information -- provided by the party communicationTime [2] TimeSpan OPTIONAL, @@ -732,9 +767,12 @@ TelephonyServiceUsage ::= SEQUENCE ringDuration [8] INTEGER OPTIONAL, ..., mmsInformation [9] MmsInformation OPTIONAL, - nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL - -- To be defined on a national basis + nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL, + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements + operatorSpecificCallDetails [11] UTF8String OPTIONAL + -- CSP specific value which indicates the nature of a call + -- (e.g. "CallIndicator: GPR, CallActionCode: 2") } NationalTelephonyServiceUsage ::= SEQUENCE @@ -746,7 +784,7 @@ NationalTelephonyServiceUsage ::= SEQUENCE TelephonyPartyInformation ::= SEQUENCE { - partyRole [1] TelephonyPartyRole OPTIONAL, + partyRole [1] TelephonyPartyRole OPTIONAL, partyNumber [2] PartyNumber OPTIONAL, subscriberID [3] TelephonySubscriberId OPTIONAL, deviceID [4] TelephonyDeviceID OPTIONAL, @@ -758,16 +796,16 @@ TelephonyPartyInformation ::= SEQUENCE natureOfAddress [9] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" forwardedTransferredNumber [10] PartyNumber OPTIONAL, - terminatingTransferredNumber [11] PartyNumber OPTIONAL, + terminatingTransferredNumber [11] PartyNumber OPTIONAL, ..., emailAddress [12] UTF8String OPTIONAL, -- used for MMS that supports also the use of E-Mail addresses (RFC 5322 [24]) iMEI [13] IMEI OPTIONAL, detailedLocation [14] TelephonyNetworkElement OPTIONAL, - -- In the case detailed location information per call and party is available + -- In the case detailed location information per call and party is available -- (e.g. the geoCoordinates for this partyNumber) nationalTelephonyPartyInformation [15] NationalTelephonyPartyInformation OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements partyType [16] TelephonyPartyType OPTIONAL, dialledDigits [17] UTF8String OPTIONAL @@ -893,11 +931,11 @@ MmsInformation ::= SEQUENCE TelephonyEventInformation ::= SEQUENCE { - time [1] GeneralizedTime OPTIONAL, + time [1] GeneralizedTime OPTIONAL, -- time when the event occurred - type [2] TelephonyEventType OPTIONAL, + type [2] TelephonyEventType OPTIONAL, -- type of event - party [3] TelephonyPartyRole OPTIONAL, + party [3] TelephonyPartyRole OPTIONAL, -- party to which the event is related location [4] TelephonyLocation OPTIONAL, ... @@ -912,7 +950,7 @@ TelephonyEventType ::= CHOICE prepayServiceEventType [5] PrepayServiceEventType, ..., nationalTelephonyEventType [6] NationalTelephonyEventType - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -1015,12 +1053,11 @@ TelephonyLocation ::= SEQUENCE -- Time span that this location was valid for ..., nationalTelephonyLocation [3] NationalTelephonyLocation OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - detailedLocation [4] TelephonyNetworkElement OPTIONAL + detailedLocation [4] TelephonyNetworkElement OPTIONAL -- The extended information for this network element as it was at the time of the - -- communication - + -- communication } NationalTelephonyLocation ::= SEQUENCE @@ -1071,10 +1108,10 @@ TelephonyDevice ::= SEQUENCE -- Unique identifier for this telephony device according to type of identifier ..., subscriberID [3] TelephonySubscriberId OPTIONAL, - -- Identifier for a known user of this equipment. + -- Identifier for a known user of this equipment. -- Usage of this parameter is subject to national legislation. nationalTelephonyDevice [4] NationalTelephonyDevice OPTIONAL - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements } @@ -1086,7 +1123,7 @@ NationalTelephonyDevice ::= SEQUENCE } TelephonyDeviceID ::= OCTET STRING - -- A unique identifier for the telephony device. For example, the IMEI number + -- A unique identifier for the telephony device. For example, the IMEI number -- of a mobile handset -- ======================== @@ -1097,11 +1134,11 @@ TelephonyNetworkElement ::= SEQUENCE { telephonyNetworkID [1] TelephonyNetworkID OPTIONAL, cellInformation [2] Location OPTIONAL, - -- The Location information id - validity [3] TimeSpan OPTIONAL, + -- The Location information id + validity [3] TimeSpan OPTIONAL, ..., nationalTelephonyNetworkElement [4] NationalTelephonyNetworkElement OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements transmitterDetails [5] TransmitterDetails OPTIONAL } @@ -1150,7 +1187,6 @@ TransmitterTechnology ::= ENUMERATED vIRTUAL(6) -- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the -- enumeration values (0 to 6) are not. - } NationalTransmitterDetails ::= SEQUENCE @@ -1166,44 +1202,43 @@ NationalTransmitterDetails ::= SEQUENCE Location ::= SEQUENCE { - e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, - -- Coded in the same format as the ISUP location number (parameter - -- field) of the ISUP (see EN 300 356 [7]) - globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, + e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, + -- Coded in the same format as the ISUP location number (parameter field) + -- of the ISUP (see EN 300 356 [7]) + globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, -- See MAP format (see 3GPP TS 09.02 [8]) - rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, + rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the -- last 6 octets are used) - gsmLocation [4] GSMLocation OPTIONAL, - umtsLocation [5] UMTSLocation OPTIONAL, - sAI [6] OCTET STRING (SIZE (7)) OPTIONAL, + gsmLocation [4] GSMLocation OPTIONAL, + umtsLocation [5] UMTSLocation OPTIONAL, + sAI [6] OCTET STRING (SIZE (7)) OPTIONAL, -- format: PLMN-ID 3 octets (no. 1-3) - -- LAC 2 octets (no. 4-5) - -- SAC 2 octets (no. 6-7) - -- (according to 3GPP TS 25.413 [31]) - oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, + -- LAC 2 octets (no. 4-5) + -- SAC 2 octets (no. 6-7) + -- (according to 3GPP TS 25.413 [31]) + oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI -- (only the last 6 octets are used) -- This parameter is duplicated from 3GPP TS 33.108 [11] ..., - postalLocation [8] AddressInformation OPTIONAL, - extendedLocation [9] ExtendedLocation OPTIONAL, + postalLocation [8] AddressInformation OPTIONAL, + extendedLocation [9] ExtendedLocation OPTIONAL, userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL, -- coded according to 3GPP TS 29.274 [32]; the type IE is not included - tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, - -- Only applicable to the CS traffic cases, such as SMS over SGs, according to + tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, + -- Only applicable to the CS traffic cases, such as SMS over SGs, according to -- 3GPP TS 23.272 [35] - eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL - -- Only applicable to the CS traffic cases, such as SMS over SGs, according to + eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL + -- Only applicable to the CS traffic cases, such as SMS over SGs, according to -- 3GPP TS 23.272 [35] - } GSMLocation ::= CHOICE { - geoCoordinates [1] SEQUENCE + geoCoordinates [1] SEQUENCE { latitude [1] UTF8String (SIZE(7..10)) OPTIONAL, -- format: XDDMMSS.SS @@ -1215,22 +1250,22 @@ GSMLocation ::= CHOICE ... }, -- format: XDDMMSS.SS (on latitudes) or XDDDMMSS.SS (on longitudes) - -- X : N(orth), S(outh), E(ast), W(est) - -- DD or DDD : degrees (numeric characters) - -- MM : minutes (numeric characters) - -- SS.SS : seconds, the second part (.SS) is optional + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- MM : minutes (numeric characters) + -- SS.SS : seconds, the second part (.SS) is optional -- Example: - -- latitude (short form) N502312 - -- longitude (long form) E1122312.18 + -- latitude (short form) N502312 + -- longitude (long form) E1122312.18 utmCoordinates [2] SEQUENCE { utm-Zone [1] UTF8String (SIZE(3)) OPTIONAL, - utm-East [2] UTF8String (SIZE(6)) OPTIONAL, - utm-North [3] UTF8String (SIZE(7)) OPTIONAL, + utm-East [2] UTF8String (SIZE(6)) OPTIONAL, + utm-North [3] UTF8String (SIZE(7)) OPTIONAL, -- Universal Transverse Mercator -- example utm-Zone 32U - -- utm-East 439955 - -- utm-North 5540736 + -- utm-East 439955 + -- utm-North 5540736 mapDatum [4] MapDatum OPTIONAL, azimuth [5] INTEGER (0..359) OPTIONAL, -- The azimuth is the bearing, relative to true north @@ -1252,17 +1287,17 @@ GSMLocation ::= CHOICE -- squareID PU -- numericalLocationEasting 9129 -- mumericalLocationNorthing 4045 - -- In both panels, utm-GridBand and squareID the 'I' and 'O' characters are not used + -- In both panels, utm-GridBand and squareID the 'I' and 'O' characters are not used -- because of their similarity to the digits one and zero. - mapDatum [6] MapDatum OPTIONAL, - azimuth [7] INTEGER (0..359) OPTIONAL, + mapDatum [6] MapDatum OPTIONAL, + azimuth [7] INTEGER (0..359) OPTIONAL, -- The azimuth is the bearing, relative to true north ... }, - wGS84Coordinates [4] OCTET STRING, + wGS84Coordinates [4] OCTET STRING, -- format is as defined in 3GPP TS 03.32 [12] ..., - geoCoordinatesDec [5] SEQUENCE + geoCoordinatesDec [5] SEQUENCE { latitudeDec [1] UTF8String (SIZE(3..12)) OPTIONAL, -- format: XDD.nnnnnnnn @@ -1274,12 +1309,12 @@ GSMLocation ::= CHOICE ... } -- format: XDD.nnnnnnnn (on latitudes) or XDDD.nnnnnnnn (on longitudes) - -- X : N(orth), S(outh), E(ast), W(est) - -- DD or DDD : degrees (numeric characters) - -- nnnnnnnn : post decimal positions (numeric characters) + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- nnnnnnnn : post decimal positions (numeric characters) -- Example: - -- latitude N50.38666667 - -- longitude E112.38671670 + -- latitude N50.38666667 + -- longitude E112.38671670 } MapDatum ::= ENUMERATED @@ -1390,7 +1425,7 @@ Route ::= SEQUENCE ... } -HorizontalExtent ::= INTEGER +HorizontalExtent ::= INTEGER -- metres -- =================== @@ -1399,6 +1434,7 @@ HorizontalExtent ::= INTEGER PartyNumber ::= UTF8String -- E.164 address of the party in international format + MessageRecord ::= CHOICE { msgSubscriber [1] MsgSubscriber, @@ -1440,17 +1476,17 @@ MsgStore ::= SEQUENCE } MsgStoreID ::= OCTET STRING - -- Unique identifier of the message store. Since not all IDs will necessarily be human - -- readable, a generic byte string is used + -- Unique identifier of the message store. Since not all IDs will necessarily be human + -- readable, a generic byte string is used MsgAddress ::= UTF8String - -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail - -- this will be an RFC822-style address - -- NOTE as of v1.2.1, this field has changed from OCTET STRING to UTF8String + -- Messaging address, an address to which messages can be sent. In the case of Internet e-mail + -- this will be an RFC822-style address + -- NOTE - as of v1.2.1, this field has changed from OCTET STRING to UTF8String MsgProviderID ::= UTF8String -- Unique identifier for a service provider, e.g. company name - -- NOTE as of v1.2.1, this field has changed from OCTET STRING to UTF8String + -- NOTE - as of v1.2.1, this field has changed from OCTET STRING to UTF8String -- ==================================== -- Definitions of Message Service Usage @@ -1553,7 +1589,7 @@ MsgBillingDetails ::= SEQUENCE billingIdentifier [4] MsgBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MsgBillingRecords OPTIONAL, nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ... } @@ -1579,14 +1615,14 @@ MsgBillingRecords ::= SEQUENCE method [5] UTF8String OPTIONAL, -- i.e. credit card etc. nationalMsgBillingRecords [6] NationalMsgBillingRecords OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ..., msgTransactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis mgsTransactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. declined, succeeded etc.) + -- Status of the transaction (i.e. "declined", "succeeded" etc.) -- Details to be defined on a national bases } @@ -1596,6 +1632,7 @@ NationalMsgBillingRecords ::= SEQUENCE -- see comment in NationalRequestParameters ... } + MultimediaRecord ::= CHOICE { multimediaSubscriber [1] MultimediaSubscriber, @@ -1610,17 +1647,16 @@ MultimediaRecord ::= CHOICE MultimediaSubscriber ::= SEQUENCE { - subscriberID [1] MultimediaSubscriberID OPTIONAL, + subscriberID [1] MultimediaSubscriberID OPTIONAL, -- unique identifier for this subscriber, e.g. account number - genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, + genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL, -- generic personal information about this subscriber - multimediaSubscriberInfo [3] MultimediaSubscriberInfo OPTIONAL, + multimediaSubscriberInfo [3] MultimediaSubscriberInfo OPTIONAL, -- service-specific information about this subscriber - subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, + subscribedMultimediaServices [4] SEQUENCE OF SubscribedMultimediaServices OPTIONAL, -- a subscriber (or account) may have more than one service listed against them ..., - multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL - + multimediaServiceRegistrationInfo [5] MultimediaServiceRegistrationInfo OPTIONAL } MultimediaSubscriberInfo ::= SEQUENCE @@ -1632,25 +1668,21 @@ MultimediaSubscriberInfo ::= SEQUENCE MultimediaSubscriberID ::= UTF8String -- unique identifier for this subscriber, e.g. account number - MultimediaServiceRegistrationInfo ::= SEQUENCE { - emailAddress [1] UTF8String OPTIONAL, + emailAddress [1] UTF8String OPTIONAL, -- subscriber email address in RFC2822 format - languageAtRegistration [2] UTF8String OPTIONAL, + languageAtRegistration [2] UTF8String OPTIONAL, -- subscriber language as in ISO 639 accountCreationTime [3] GeneralizedTime OPTIONAL, -- start time of account accountCreationIP [4] IPAddress OPTIONAL, -- subscriber IP at creation - accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, + accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, -- subscriber country as specified in ISO 3166-2 clientPlatformType [6] UTF8String OPTIONAL, -- subscriber platform clientVersion [7] UTF8String OPTIONAL, -- subscriber platform version ... } - - - SubscribedMultimediaServices ::= SEQUENCE { serviceID [1] UTF8String OPTIONAL, @@ -1666,7 +1698,7 @@ SubscribedMultimediaServices ::= SEQUENCE installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address connectionDate [8] GeneralizedTime OPTIONAL, - -- Date the subscriber was actually connected + -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, carrierPreselect [10] BOOLEAN OPTIONAL, @@ -1677,7 +1709,7 @@ SubscribedMultimediaServices ::= SEQUENCE -- national extension ..., paymentDetails [13] PaymentDetails OPTIONAL, - subscriptionType [14] SubscriptionType OPTIONAL, + subscriptionType [14] SubscriptionType OPTIONAL, -- Describes the nature of the subscription deliveryAddress [15] AddressInformation OPTIONAL, resellerAddress [16] AddressInformation OPTIONAL, @@ -1686,8 +1718,6 @@ SubscribedMultimediaServices ::= SEQUENCE -- Service name used by the service provider which may be proprietary orderTime [19] GeneralizedTime OPTIONAL -- Time when the subscribed service was ordered by the user - - } MultimediaServiceType ::= ENUMERATED @@ -1707,7 +1737,7 @@ MultimediaServiceType ::= ENUMERATED MultimediaServiceUsage ::= SEQUENCE { partyInformation [1] SEQUENCE OF MultimediaPartyInformation OPTIONAL, - -- This parameter provides the concerned party (Originating, Terminating or + -- This parameter provides the concerned party (Originating, Terminating or -- forwarded party), the identity(ies) of the party and all the information -- provided by the party communicationTime [2] TimeSpan OPTIONAL, @@ -1721,7 +1751,7 @@ MultimediaServiceUsage ::= SEQUENCE callID [8] MultimediaCallID OPTIONAL, originalCallID [9] MultimediaCallID OPTIONAL, callState [10] ENUMERATED - { + { bNotReached(1), bAlert(2), bAnswered(3), @@ -1740,13 +1770,11 @@ MultimediaServiceUsage ::= SEQUENCE relayIP [20] IPAddress OPTIONAL, vmLength [21] INTEGER OPTIONAL, -- number of seconds reason [22] UTF8String OPTIONAL - - } MultimediaPartyInformation ::= SEQUENCE { - partyRole [1] MultimediaPartyRole OPTIONAL, + partyRole [1] MultimediaPartyRole OPTIONAL, partyIdentity [2] PartyIdentity OPTIONAL, subscriberID [3] MultimediaSubscriberID OPTIONAL, communicationTime [4] TimeSpan OPTIONAL, @@ -1790,7 +1818,7 @@ MultimediaPartyRole ::= ENUMERATED broadcastReceiver(8), broadcastSender(9), ..., - originalCalling (10) + originalCalling(10) } MultimediaBearerService ::= ENUMERATED @@ -1826,11 +1854,11 @@ ImsInformation ::= SEQUENCE ImsServiceInfo ::= SEQUENCE { - serviceData [1] OCTET STRING OPTIONAL, + serviceData [1] OCTET STRING OPTIONAL, -- service data - serviceType [2] INTEGER OPTIONAL, + serviceType [2] INTEGER OPTIONAL, -- service type - ... + ... } MediaComponent ::= SEQUENCE @@ -1856,11 +1884,10 @@ MultimediaBillingDetails ::= SEQUENCE billingIdentifier [4] MultimediaBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MultimediaBillingRecords OPTIONAL, nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ..., multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL - } MultimediaBillingAddress ::= SEQUENCE @@ -1871,7 +1898,6 @@ MultimediaBillingAddress ::= SEQUENCE ... } - NationalMultimediaBillingDetails ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1891,16 +1917,16 @@ MultimediaBillingRecords ::= SEQUENCE currency [4] UTF8String (SIZE(3)) OPTIONAL, -- as per ISO 4217 [5] method [5] UTF8String OPTIONAL, - -- i.e. credit card etc. + -- i.e. credit card etc. nationalMultimediaBillingRecords [6] NationalMultimediaBillingRecords OPTIONAL, - -- To be defined on a national basis + -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - ... , + ..., multimediaTransactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis multimediaTransactionStatus [8] UTF8String OPTIONAL - -- Status of the transaction (i.e. declined, succeeded etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national bases } @@ -1956,6 +1982,7 @@ NationalMultimediaMediaComponent ::= SEQUENCE -- see comment in NationalRequestParameters ... } + NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -1986,13 +2013,12 @@ NASubscriber ::= SEQUENCE naSubscriptions [3] SEQUENCE OF NAServiceSubscription OPTIONAL, -- List of all known services subscribed to by this user allocatedDeviceIDs [4] SEQUENCE OF NADeviceId OPTIONAL, - -- List of all known devices allocated to this user. - subscriber [5] GenericSubscriberInfo OPTIONAL , + -- List of all known devices allocated to this user. + subscriber [5] GenericSubscriberInfo OPTIONAL, -- Name, address and other generic subscriber information ..., allocatedDevices [6] SEQUENCE OF NADevice OPTIONAL -- If present, contains device details for all elements from allocatedDeviceIDs - } NAServiceSubscription ::= SEQUENCE @@ -2000,14 +2026,14 @@ NAServiceSubscription ::= SEQUENCE { validity [1] TimeSpan OPTIONAL, naServiceID [2] UTF8String OPTIONAL, - -- Identifier for the service, e.g. account plan name. + -- Identifier for the service, e.g. account plan name. naProviderID [3] NAProviderID OPTIONAL, -- Unique identifier for the provider of the service, e.g. company name naAuthID [4] NAAuthID OPTIONAL, -- Unique identifier for this subscription, e.g. logon name options [5] UTF8String OPTIONAL, -- Human readable text with restrictions or options to the subscription - installationAddress [6] AddressInformation OPTIONAL, + installationAddress [6] AddressInformation OPTIONAL, fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address imsi [8] IMSI OPTIONAL, @@ -2042,14 +2068,14 @@ NationalNASubscription ::= SEQUENCE NAServiceUsage ::= SEQUENCE { - naAccessTime [1] GeneralizedTime OPTIONAL, + naAccessTime [1] GeneralizedTime OPTIONAL, -- Time of connection to the NAS - naAuthID [2] NAAuthID OPTIONAL, + naAuthID [2] NAAuthID OPTIONAL, -- Username used to obtain network access - nwAccessType [3] NwAccessType OPTIONAL, + nwAccessType [3] NwAccessType OPTIONAL, -- Type of network access attempted. If not undefined(0), this should be one of the types -- supported by the NAS (identified below by naNwElementID) - naStatus [4] ENUMERATED + naStatus [4] ENUMERATED { unknown(0), succeeded(1), @@ -2060,104 +2086,107 @@ NAServiceUsage ::= SEQUENCE -- Rejected by the CSP (e.g. usage limits exceeded) ... } OPTIONAL, - interval [5] TimeSpan OPTIONAL, - -- Start time and end time (duration) of network access. - naDeviceId [6] NADeviceId OPTIONAL, + interval [5] TimeSpan OPTIONAL, + -- Start time and end time (duration) of network access. + naDeviceId [6] NADeviceId OPTIONAL, -- Device used to access the service - naNwElementID [7] NANwElementID OPTIONAL, + naNwElementID [7] NANwElementID OPTIONAL, -- Network element (NAS) onto which the naDevice is connected - naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL, + naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL, -- IP address assigned by the network access service. May be fixed or dynamic - location [9] Location OPTIONAL, + location [9] Location OPTIONAL, -- Location of the access (for e.g. GPRS handsets) - dialUpInformation [10] DialUpInformation OPTIONAL, - gprsInformation [11] GprsInformation OPTIONAL, + dialUpInformation [10] DialUpInformation OPTIONAL, + gprsInformation [11] GprsInformation OPTIONAL, ..., - octetsDownloaded [12] INTEGER OPTIONAL, - octetsUploaded [13] INTEGER OPTIONAL, - endReason [14] NAEndReason OPTIONAL, - subscriberID [15] NaSubscriberID OPTIONAL, + octetsDownloaded [12] INTEGER OPTIONAL, + octetsUploaded [13] INTEGER OPTIONAL, + endReason [14] NAEndReason OPTIONAL, + subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access - ePSInformation [16] EPSInformation OPTIONAL, - wifiInformation [17] WifiInformation OPTIONAL, - addressTranslationRecords[18] SEQUENCE OF AddressTranslationRecord OPTIONAL, - -- contains extended information about the NAT or PAT operations carried out within this - -- service usage session - naDevice [19] NADevice OPTIONAL + ePSInformation [16] EPSInformation OPTIONAL, + wifiInformation [17] WifiInformation OPTIONAL, + addressTranslationRecords [18] SEQUENCE OF AddressTranslationRecord OPTIONAL, + -- contains extended information about the NAT or PAT operations carried out within this + -- service usage session + naDevice [19] NADevice OPTIONAL, -- If present, contains the device details for the device referenced in naDeviceID - - + additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL + -- List of additional locations and optional access time during the network access service + -- usage } - +TimedLocation ::= SEQUENCE +{ + location [1] Location, + naAccessTime [2] GeneralizedTime OPTIONAL, + ... +} WifiInformation ::= SEQUENCE { - bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, + bSSID [1] OCTET STRING (SIZE (6)) OPTIONAL, -- The Basic Service Set Identification for the connection. - -- This is also the MAC address of the access point (the present document assumes + -- This is also the MAC address of the access point (the present document assumes -- that records are for infrastructure mode, not ad-hoc mode). - -- The MAC address of the user is given in the naDeviceID in the structure (one level up) - sSID [2] UTF8String OPTIONAL, + -- The MAC address of the user is given in the naDeviceID in the structure (one level up) + sSID [2] UTF8String OPTIONAL, -- The human-readable Service Set Identifier - -- It should be noted that this is typically only available on the air interface and so + -- It should be noted that this is typically only available on the air interface and so -- is not likely to be logged by CSPs (though may be recorded at a more local level). -- Therefore requesting organizations should not expect this to be populated typically. -- It is not guaranteed to be unique. - username [3] UTF8String OPTIONAL, - locationOfAccessPoint [4] Location OPTIONAL, - -- Location of the Access Point as lat/long, grid reference or postal address. - -- Requesting organizations should be aware that Access Points can be moved, sometimes - -- without the knowledge of the CSP - authenticationType [5] AuthenticationType OPTIONAL, - additionalAuthenticationInformation [6] AdditionalAuthenticationInformation OPTIONAL, + username [3] UTF8String OPTIONAL, + locationOfAccessPoint [4] Location OPTIONAL, + -- Location of the Access Point as lat/long, grid reference or postal address. + -- Requesting organizations should be aware that Access Points can be moved, sometimes + -- without the knowledge of the CSP + authenticationType [5] AuthenticationType OPTIONAL, + additionalAuthenticationInformation [6] AdditionalAuthenticationInformation OPTIONAL, ..., - - accessPointIPAddress [7] IPAddress OPTIONAL, - accessPointAdditionalDescriptions[8] SEQUENCE OF UTF8String OPTIONAL, - -- Informal description of location, category or type of access point, + accessPointIPAddress [7] IPAddress OPTIONAL, + accessPointAdditionalDescriptions [8] SEQUENCE OF UTF8String OPTIONAL, + -- Informal description of location, category or type of access point, -- or a name of the network to which the access point belongs. - accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL + accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL -- For WiFi, there may be other parties involved in hosting or owning the -- Access Points, e.g. access point provider or partner providers - } - AuthenticationType ::= ENUMERATED { - authenticationBySMS (1), - -- Used if authentication arranged through a code sent to mobile + authenticationBySMS(1), + -- Used if authentication arranged through a code sent to mobile -- additionalAuthenticationInformation shall contain the phone number - authenticationByCookie (2), - -- If authentication was granted on the basis of a cookie left from a previous visit to a + authenticationByCookie(2), + -- If authentication was granted on the basis of a cookie left from a previous visit to a -- site. -- No other mandatory addtionalAuthenticationInformation - authenticationByMACAddress (3), + authenticationByMACAddress(3), -- If authentication was granted because the MAC address of the UE was recognised due - -- to a previous visit. - -- additionalAuthenticationInformation shall contain the MAC Address unless it is already + -- to a previous visit. + -- additionalAuthenticationInformation shall contain the MAC Address unless it is already -- populated as NADeviceID in this record. - authenticationByEAPSIM (4), - -- If authenticated by EAP SIM see TS 33.234 [X] + authenticationByEAPSIM(4), + -- If authenticated by EAP SIM see TS 33.234 [36] -- additionalAuthenticationInformation shall contain the IMSI - -- Other varieties of EAP could be added here later, together with any extra information they - -- could provide. - authenticationByUsernameAndPassword (5), + -- Other varieties of EAP could be added here later, together with any extra information + -- they could provide. + authenticationByUsernameAndPassword(5), -- additionalAuthenticationInformation should contain username and password if appropriate - authenticationByPaymentOrVoucher (6), - -- additionalAuthenticationInformation should contain Voucher or Payment details - -- if appropriate. + authenticationByPaymentOrVoucher(6), + -- additionalAuthenticationInformation should contain Voucher or Payment details + -- if appropriate. ... } AdditionalAuthenticationInformation ::= SEQUENCE { - phoneNumber [1] PartyNumber OPTIONAL, - -- e.g. number to which an SMS was sent + phoneNumber [1] PartyNumber OPTIONAL, + -- e.g. number to which an SMS was sent mACAddress [2] OCTET STRING (SIZE (6)) OPTIONAL, iMSI [3] IMSI OPTIONAL, - username [4] UTF8String OPTIONAL, + username [4] UTF8String OPTIONAL, -- Names supplied are unlikely to be verified password [5] UTF8String OPTIONAL, -- Only to be populated if it is both appropriate and available @@ -2166,30 +2195,29 @@ AdditionalAuthenticationInformation ::= SEQUENCE ... } - - AddressTranslationRecord ::= SEQUENCE { - validity [1] TimeSpan OPTIONAL, + validity [1] TimeSpan OPTIONAL, -- time at which the address translation started and/or ended - privateIPAddress [2] IPAddress OPTIONAL, + privateIPAddress [2] IPAddress OPTIONAL, -- the private IP of the host - privatePort [3] INTEGER OPTIONAL, + privatePort [3] INTEGER OPTIONAL, -- the private port of the host publicIPAddress [4] IPAddress OPTIONAL, - -- the translated IP of the host, i.e. the address known by the remote host + -- the translated IP of the host, i.e. the address known by the remote host publicPort [5] AddressTranslationPortAssignment OPTIONAL, - -- the translated port(s) of the host, i.e. the port(s) known by the remote host, if applicable + -- the translated port(s) of the host, i.e. the port(s) known by the remote host, if + -- applicable destinationIPAddress [6] IPAddress OPTIONAL, -- the IP address of the remote host destinationPort [7] INTEGER OPTIONAL, -- the port of the remote host connectionType [8] ENUMERATED { - udp (0), - tcp (1), - sctp (2), - other (3), + udp(0), + tcp(1), + sctp(2), + other(3), ... } OPTIONAL, ... @@ -2235,19 +2263,20 @@ NwAccessType ::= ENUMERATED -- Cable access lAN(4), -- LAN access - wirelessLAN(5), + wirelessLAN(5), -- Wireless LAN access (e.g. hotspot) wimax(6), - mobilePacketData(7), -- Network access over GSM/3GPP GPRS, UMTS, etc. + mobilePacketData(7), + -- Network access over GSM/3GPP GPRS, UMTS, etc. ... } DialUpInformation ::= SEQUENCE { - diallingNumber [1] PartyNumber OPTIONAL, + diallingNumber [1] PartyNumber OPTIONAL, -- Telephone number used for dial-up access dialledNumber [2] PartyNumber OPTIONAL, - callback [3] PartyNumber OPTIONAL, + callback [3] PartyNumber OPTIONAL, -- Call back number used for dial-up access ... } @@ -2256,26 +2285,26 @@ GprsInformation ::= SEQUENCE { iMSI [1] IMSI OPTIONAL, mSISDN [2] PartyNumber OPTIONAL, - sgsnAddress [3] SEQUENCE OF IPAddress OPTIONAL, - ggsnAddress [4] IPAddress OPTIONAL, + sgsnAddress [3] SEQUENCE OF IPAddress OPTIONAL, + ggsnAddress [4] IPAddress OPTIONAL, pDP-address-allocated [5] IPAddress OPTIONAL, aPN [6] UTF8String OPTIONAL, pDP-type [7] OCTET STRING (SIZE(2)) OPTIONAL, - -- format as per TS 101 671 [6] + -- format as per TS 101 671 [6] ..., gPRSEvent [8] GPRSEvent OPTIONAL -- format as per 3GPP TS 33.108 [11] -- Tag [9] was used in the past and shall not be reused. } -GPRSEvent ::= ENUMERATED +GPRSEvent ::= ENUMERATED { pDPContextActivation(1), pDPContextDeactivation(4), gPRSAttach(5), gPRSDetach(6), - locationInfoUpdate(10), - -- sMS ommited from 3GPP TS 33.108 [11], + locationInfoUpdate(10), + -- sMS ommited from 3GPP TS 33.108 [11] pDPContextModification(11), servingSystem(12), ... @@ -2283,69 +2312,66 @@ GPRSEvent ::= ENUMERATED EPSInformation ::= SEQUENCE { - iMSI [1] IMSI OPTIONAL, - iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, - mSISDN [3] PartyNumber OPTIONAL, - iMEISV [4] IMEI OPTIONAL, + iMSI [1] IMSI OPTIONAL, + iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, + mSISDN [3] PartyNumber OPTIONAL, + iMEISV [4] IMEI OPTIONAL, s-GWAddress [5] IPAddress OPTIONAL, p-GWAddress [6] IPAddress OPTIONAL, p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL, - aPNNetworkID [8] AccessPointNameNI OPTIONAL, + aPNNetworkID [8] AccessPointNameNI OPTIONAL, pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL, - -- PDN/PDP Type number as defined in 3GPP TS 29.274 Clause 8.34 + -- PDN/PDP Type number as defined in 3GPP TS 29.274 [32] clause 8.34 pDP-PDNAddress [10] IPAddress OPTIONAL, - -- IP address allocated to the PDP context / PDN connection - -- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix - -- when PDP/PDN Type is IPv6 or IPv4v6. - pDP-PDNAddressExtension [11] IPAddress OPTIONAL, - -- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6 + -- IP address allocated to the PDP context / PDN connection + -- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix + -- when PDP/PDN Type is IPv6 or IPv4v6. + pDP-PDNAddressExtension [11] IPAddress OPTIONAL, + -- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6 dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL, - dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, - rATType [14] INTEGER (0..255), - -- RAT Type coding according to 3GPP TS 29.274 clause 8.17 - ePSEvent [15] EPSEvent OPTIONAL, + dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, + rATType [14] INTEGER (0..255), + -- RAT Type coding according to 3GPP TS 29.274 [32] clause 8.17 + ePSEvent [15] EPSEvent OPTIONAL, ... } IMSIUnauthenticatedFlag ::= BOOLEAN --- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI + -- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI P-GWPLMN-ID ::= OCTET STRING (SIZE (3)) --- This is a copy from the Tracking Area Identity (TAI) IE --- specified in TS 29.274 clause 8.21.4: --- Bits 8 7 6 5 4 3 2 1 --- 1st OCTET MCC digit 2 MCC digit 1 --- 2nd OCTET MNC digit 3 MCC digit 3 --- 3rd OCTET MNC digit 2 MNC digit 1 + -- This is a copy from the Tracking Area Identity (TAI) IE + -- specified in TS 29.274 [32] clause 8.21.4: + -- Bits 8 7 6 5 4 3 2 1 + -- 1st OCTET MCC digit 2 MCC digit 1 + -- 2nd OCTET MNC digit 3 MCC digit 3 + -- 3rd OCTET MNC digit 2 MNC digit 1 AccessPointNameNI ::= IA5String (SIZE(1..63)) --- Network Identifier part of APN in dot representation. --- For example, if the complete APN is --- 'apn1a.apn1b.apn1c.mnc022.mcc111.gprs' --- NI is 'apn1a.apn1b.apn1c' + -- Network Identifier part of APN in dot representation. + -- For example, if the complete APN is "apn1a.apn1b.apn1c.mnc022.mcc111.gprs" + -- NI is "apn1a.apn1b.apn1c" DynamicAddressFlag ::= BOOLEAN --- TRUE if the PDP/PDN address is dynamic. --- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6 + -- TRUE if the PDP/PDN address is dynamic. + -- FALSE if IPv4 address is static when PDN type is IPv6 or IPv4v6 DynamicAddressFlagExt ::= BOOLEAN --- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated --- during IP CAN bearer activation, initial attach and UE requested --- PDN connectivity with PDP/PDN type IPv4v6. --- FALSE if IPv4 address is static. + -- TRUE if IPv4 PDP/PDN address is dynamic, which is allocated during IP CAN bearer activation, + -- initial attach and UE requested PDN connectivity with PDP/PDN type IPv4v6. + -- FALSE if IPv4 address is static. - -EPSEvent ::= ENUMERATED --- The list of EPSEvent below is partly taken from 3GPP TS 33.108 --- EpsHI2Operations from the EPSEvent ::=ENUMERATED module +EPSEvent ::= ENUMERATED + -- The list of "EPSEvent" below is partly taken from 3GPP TS 33.108 [11] EpsHI2Operations + -- from the "EPSEvent ::=ENUMERATED" module { - e-UTRANAttach (16), - e-UTRANDetach (17), - bearerActivation (18), - bearerModification (20), - bearerDeactivation (21), - trackingAreaUpdate (25), - servingEvolvedPacketSystem (26), + e-UTRANAttach(16), + e-UTRANDetach(17), + bearerActivation(18), + bearerModification(20), + bearerDeactivation(21), + trackingAreaUpdate(25), + servingEvolvedPacketSystem(26), ... } @@ -2358,7 +2384,7 @@ NADeviceId ::= UTF8String NADevice ::= SEQUENCE { naDeviceId [1] NADeviceId OPTIONAL, - -- Identifier of this device. + -- Identifier of this device. description [2] UTF8String OPTIONAL, -- Human readable description of device location [3] Location OPTIONAL, @@ -2370,12 +2396,12 @@ NADevice ::= SEQUENCE subscriberID [7] NaSubscriberID OPTIONAL } -IMEI ::= OCTET STRING (SIZE(8)) +IMEI ::= OCTET STRING (SIZE(8)) -- format as per 3GPP TS 09.02 [8] - -- NOTE: When comparing IMEIs, an IMEI can be considered equal to the requested IMEI even + -- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even -- if the checksum or software version digits are different or not present. -IMSI ::= OCTET STRING (SIZE(3..8)) +IMSI ::= OCTET STRING (SIZE(3..8)) -- format as per 3GPP TS 09.02 [8] -- ====================================== @@ -2392,7 +2418,7 @@ NANwElement ::= SEQUENCE naNwElementID [2] NANwElementID OPTIONAL, -- Unique ID of this NAS (Network Access Server) naProviderID [3] NAProviderID OPTIONAL, - -- Unique identifier of the provider managing this NAS. + -- Unique identifier of the provider managing this NAS. supportedAccessTypes [4] SEQUENCE OF NwAccessType OPTIONAL, location [5] Location OPTIONAL, ... @@ -2411,7 +2437,7 @@ NAAssignedAddress ::= SEQUENCE addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, portNumber [2] INTEGER OPTIONAL, -- populated with the outbound port number - addressType [3] ENUMERATED + addressType [3] ENUMERATED { unknown(0), internal(1), @@ -2421,10 +2447,10 @@ NAAssignedAddress ::= SEQUENCE assignedTime [4] TimeSpan OPTIONAL, ..., destinationAddress [5] IPAddress OPTIONAL, - -- used in cases where a single external IP/port pair is translated to multiple internal + -- used in cases where a single external IP/port pair is translated to multiple internal -- IP/port pairs, with the destination IP/port used to multiplex them destinationPort [6] INTEGER OPTIONAL - -- used in cases where a single external IP/port pair is translated to multiple internal + -- used in cases where a single external IP/port pair is translated to multiple internal -- IP/port pairs, with the destination IP/port used to multiplex them } @@ -2435,7 +2461,7 @@ IPAddressSetOrRangeOrMask ::= CHOICE mask [2] IPMask } -IPRange ::= SEQUENCE +IPRange ::= SEQUENCE -- Things like 172.16.10.0/26 { prefix [0] IPAddress, @@ -2449,7 +2475,7 @@ IPMask ::= SEQUENCE mask [1] IPAddress } -NABillingDetails ::= SEQUENCE +NABillingDetails ::= SEQUENCE { subscriberID [1] NaSubscriberID OPTIONAL, serviceID [2] UTF8String OPTIONAL, @@ -2461,8 +2487,9 @@ NABillingDetails ::= SEQUENCE -- Unique reference for this transaction/billing record -- Details to be defined on a national basis naTransactionStatus [7] UTF8String OPTIONAL - -- Status of the transaction (i.e. declined, succeeded etc.) + -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national basis } END -- end of RDMessage + diff --git a/102657/portal/RDMessagever16.xsd b/102657/portal/RDMessagever17.xsd similarity index 97% rename from 102657/portal/RDMessagever16.xsd rename to 102657/portal/RDMessagever17.xsd index 2ec34b4..0c02a69 100644 --- a/102657/portal/RDMessagever16.xsd +++ b/102657/portal/RDMessagever17.xsd @@ -1,13 +1,13 @@ - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.16.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.17.1 @@ -491,6 +491,9 @@ + + + @@ -588,10 +591,11 @@ - - - - + + + + + @@ -648,6 +652,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -689,6 +718,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -1032,6 +1082,7 @@ + @@ -1931,10 +1982,24 @@ + + + + + + + + + + + + + + @@ -2217,9 +2282,16 @@ - + - + + + + + + + + -- GitLab From 94d0d38ba3ee310b32f23aa3acd2c2fb2bce6f6e Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:35 +0100 Subject: [PATCH 094/208] TS 102 232-1 v3.10.1 (2015-11-20) agreed at LI#40 (Aachen, 2015-09-08) --- 102232-1/LI-PS-PDU.asn | 30 +++++++++++++++---- ...I-PS-PDU,ver21.txt => LI-PS-PDU,ver22.txt} | 30 +++++++++++++++---- 2 files changed, 48 insertions(+), 12 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver21.txt => LI-PS-PDU,ver22.txt} (94%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index d64c2ec..6607e34 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version21(21)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version22(22)} DEFINITIONS IMPLICIT TAGS ::= @@ -142,7 +142,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version21(21)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version22(22)} -- ==================== -- Top-level definition @@ -243,8 +243,7 @@ PayloadDirection ::= ENUMERATED toTarget(1), ..., indeterminate(2), - -- Indication whether intercepted CC was travelling to or from the target - -- or that the direction was indeterminate + -- Indication that the direction was indeterminate combined(3), -- Indication applicable to some services that the traffic is actually a combination -- of To and From @@ -296,7 +295,16 @@ IRIPayload ::= SEQUENCE ..., microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, -- For aggregated payloads (see clause 6.2.3) - timeStampQualifier [4] TimeStampQualifier OPTIONAL + 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 + -- 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 + -- relevant service-specific details + } IRIType ::= ENUMERATED @@ -527,7 +535,17 @@ Location ::= SEQUENCE { umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, - ... + ..., + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL + } +WlanLocationAttributes ::= SEQUENCE +{ + wlanAPMACAddress [0] OCTET STRING (SIZE(6)) OPTIONAL, + -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID + ... +} + + END --end of LI-PS-PDU diff --git a/102232-1/portal/LI-PS-PDU,ver21.txt b/102232-1/portal/LI-PS-PDU,ver22.txt similarity index 94% rename from 102232-1/portal/LI-PS-PDU,ver21.txt rename to 102232-1/portal/LI-PS-PDU,ver22.txt index d64c2ec..6607e34 100644 --- a/102232-1/portal/LI-PS-PDU,ver21.txt +++ b/102232-1/portal/LI-PS-PDU,ver22.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version21(21)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version22(22)} DEFINITIONS IMPLICIT TAGS ::= @@ -142,7 +142,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version21(21)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version22(22)} -- ==================== -- Top-level definition @@ -243,8 +243,7 @@ PayloadDirection ::= ENUMERATED toTarget(1), ..., indeterminate(2), - -- Indication whether intercepted CC was travelling to or from the target - -- or that the direction was indeterminate + -- Indication that the direction was indeterminate combined(3), -- Indication applicable to some services that the traffic is actually a combination -- of To and From @@ -296,7 +295,16 @@ IRIPayload ::= SEQUENCE ..., microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, -- For aggregated payloads (see clause 6.2.3) - timeStampQualifier [4] TimeStampQualifier OPTIONAL + 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 + -- 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 + -- relevant service-specific details + } IRIType ::= ENUMERATED @@ -527,7 +535,17 @@ Location ::= SEQUENCE { umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, - ... + ..., + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL + } +WlanLocationAttributes ::= SEQUENCE +{ + wlanAPMACAddress [0] OCTET STRING (SIZE(6)) OPTIONAL, + -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID + ... +} + + END --end of LI-PS-PDU -- GitLab From e97719de64457ed34009a766f55b949656accf18 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:41 +0100 Subject: [PATCH 095/208] TS 103 120 v1.2.1 (2016-03-18) agreed at LI#41 (Sophia-Antipolis, 2016-02-10) --- .../dictionaries/ts_103120_Dictionaries.xsd | 2 +- .../ts_103120_ETSIDictionaryDefinitions.xml | 6 +++++- ...d => ts_103120v010201p0_Authorisation.xsd} | 12 ++++++------ ...mmon.xsd => ts_103120v010201p0_Common.xsd} | 4 ++-- ...0_Core.xsd => ts_103120v010201p0_Core.xsd} | 19 +++++++++++++++---- ...sd => ts_103120v010201p0_Dictionaries.xsd} | 2 +- ...nt.xsd => ts_103120v010201p0_Document.xsd} | 12 ++++++------ ...20v010201p0_ETSIDictionaryDefinitions.xml} | 6 +++++- ...Task.xsd => ts_103120v010201p0_LITask.xsd} | 14 ++++++++------ ...sd => ts_103120v010201p0_Notification.xsd} | 12 ++++++------ 103120/schema/ts_103120_Authorisation.xsd | 12 ++++++------ 103120/schema/ts_103120_Common.xsd | 4 ++-- 103120/schema/ts_103120_Core.xsd | 19 +++++++++++++++---- 103120/schema/ts_103120_Document.xsd | 12 ++++++------ 103120/schema/ts_103120_LITask.xsd | 14 ++++++++------ 103120/schema/ts_103120_Notification.xsd | 12 ++++++------ 16 files changed, 98 insertions(+), 64 deletions(-) rename 103120/portal/{schema/ts_103120v010101p0_Authorisation.xsd => ts_103120v010201p0_Authorisation.xsd} (87%) rename 103120/portal/{schema/ts_103120v010101p0_Common.xsd => ts_103120v010201p0_Common.xsd} (97%) rename 103120/portal/{schema/ts_103120v010101p0_Core.xsd => ts_103120v010201p0_Core.xsd} (91%) rename 103120/portal/{dictionaries/ts_103120v010101p0_Dictionaries.xsd => ts_103120v010201p0_Dictionaries.xsd} (90%) rename 103120/portal/{schema/ts_103120v010101p0_Document.xsd => ts_103120v010201p0_Document.xsd} (87%) rename 103120/portal/{dictionaries/ts_103120v010101p0_ETSIDictionaryDefinitions.xml => ts_103120v010201p0_ETSIDictionaryDefinitions.xml} (97%) rename 103120/portal/{schema/ts_103120v010101p0_LITask.xsd => ts_103120v010201p0_LITask.xsd} (89%) rename 103120/portal/{schema/ts_103120v010101p0_Notification.xsd => ts_103120v010201p0_Notification.xsd} (74%) diff --git a/103120/dictionaries/ts_103120_Dictionaries.xsd b/103120/dictionaries/ts_103120_Dictionaries.xsd index bcd1db5..0d3801e 100644 --- a/103120/dictionaries/ts_103120_Dictionaries.xsd +++ b/103120/dictionaries/ts_103120_Dictionaries.xsd @@ -1,5 +1,5 @@  - + diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 51b3265..3d9af00 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -1,5 +1,5 @@  - + ETSI ObjectType @@ -357,6 +357,10 @@ IsTest Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + IsEmergency + Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + diff --git a/103120/portal/schema/ts_103120v010101p0_Authorisation.xsd b/103120/portal/ts_103120v010201p0_Authorisation.xsd similarity index 87% rename from 103120/portal/schema/ts_103120v010101p0_Authorisation.xsd rename to 103120/portal/ts_103120v010201p0_Authorisation.xsd index b6bc7ee..5cfd5b4 100644 --- a/103120/portal/schema/ts_103120v010101p0_Authorisation.xsd +++ b/103120/portal/ts_103120v010201p0_Authorisation.xsd @@ -1,15 +1,15 @@ - - + + diff --git a/103120/portal/schema/ts_103120v010101p0_Common.xsd b/103120/portal/ts_103120v010201p0_Common.xsd similarity index 97% rename from 103120/portal/schema/ts_103120v010101p0_Common.xsd rename to 103120/portal/ts_103120v010201p0_Common.xsd index fedfb4e..d5d315c 100644 --- a/103120/portal/schema/ts_103120v010101p0_Common.xsd +++ b/103120/portal/ts_103120v010201p0_Common.xsd @@ -1,8 +1,8 @@ diff --git a/103120/portal/schema/ts_103120v010101p0_Core.xsd b/103120/portal/ts_103120v010201p0_Core.xsd similarity index 91% rename from 103120/portal/schema/ts_103120v010101p0_Core.xsd rename to 103120/portal/ts_103120v010201p0_Core.xsd index 3870f0f..9aa2c89 100644 --- a/103120/portal/schema/ts_103120v010101p0_Core.xsd +++ b/103120/portal/ts_103120v010201p0_Core.xsd @@ -1,13 +1,13 @@ - + @@ -47,11 +47,22 @@ + + + + + + + + + + + diff --git a/103120/portal/dictionaries/ts_103120v010101p0_Dictionaries.xsd b/103120/portal/ts_103120v010201p0_Dictionaries.xsd similarity index 90% rename from 103120/portal/dictionaries/ts_103120v010101p0_Dictionaries.xsd rename to 103120/portal/ts_103120v010201p0_Dictionaries.xsd index bcd1db5..0d3801e 100644 --- a/103120/portal/dictionaries/ts_103120v010101p0_Dictionaries.xsd +++ b/103120/portal/ts_103120v010201p0_Dictionaries.xsd @@ -1,5 +1,5 @@  - + diff --git a/103120/portal/schema/ts_103120v010101p0_Document.xsd b/103120/portal/ts_103120v010201p0_Document.xsd similarity index 87% rename from 103120/portal/schema/ts_103120v010101p0_Document.xsd rename to 103120/portal/ts_103120v010201p0_Document.xsd index e0d18ca..d51d545 100644 --- a/103120/portal/schema/ts_103120v010101p0_Document.xsd +++ b/103120/portal/ts_103120v010201p0_Document.xsd @@ -1,15 +1,15 @@ - - + + diff --git a/103120/portal/dictionaries/ts_103120v010101p0_ETSIDictionaryDefinitions.xml b/103120/portal/ts_103120v010201p0_ETSIDictionaryDefinitions.xml similarity index 97% rename from 103120/portal/dictionaries/ts_103120v010101p0_ETSIDictionaryDefinitions.xml rename to 103120/portal/ts_103120v010201p0_ETSIDictionaryDefinitions.xml index 51b3265..3d9af00 100644 --- a/103120/portal/dictionaries/ts_103120v010101p0_ETSIDictionaryDefinitions.xml +++ b/103120/portal/ts_103120v010201p0_ETSIDictionaryDefinitions.xml @@ -1,5 +1,5 @@  - + ETSI ObjectType @@ -357,6 +357,10 @@ IsTest Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + IsEmergency + Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + diff --git a/103120/portal/schema/ts_103120v010101p0_LITask.xsd b/103120/portal/ts_103120v010201p0_LITask.xsd similarity index 89% rename from 103120/portal/schema/ts_103120v010101p0_LITask.xsd rename to 103120/portal/ts_103120v010201p0_LITask.xsd index 88ec469..d7b0d01 100644 --- a/103120/portal/schema/ts_103120v010101p0_LITask.xsd +++ b/103120/portal/ts_103120v010201p0_LITask.xsd @@ -1,15 +1,15 @@ - - + + @@ -84,6 +84,8 @@ + + diff --git a/103120/portal/schema/ts_103120v010101p0_Notification.xsd b/103120/portal/ts_103120v010201p0_Notification.xsd similarity index 74% rename from 103120/portal/schema/ts_103120v010101p0_Notification.xsd rename to 103120/portal/ts_103120v010201p0_Notification.xsd index 53dae32..eeb86a1 100644 --- a/103120/portal/schema/ts_103120v010101p0_Notification.xsd +++ b/103120/portal/ts_103120v010201p0_Notification.xsd @@ -1,15 +1,15 @@ - - + + diff --git a/103120/schema/ts_103120_Authorisation.xsd b/103120/schema/ts_103120_Authorisation.xsd index b6bc7ee..5cfd5b4 100644 --- a/103120/schema/ts_103120_Authorisation.xsd +++ b/103120/schema/ts_103120_Authorisation.xsd @@ -1,15 +1,15 @@ - - + + diff --git a/103120/schema/ts_103120_Common.xsd b/103120/schema/ts_103120_Common.xsd index fedfb4e..d5d315c 100644 --- a/103120/schema/ts_103120_Common.xsd +++ b/103120/schema/ts_103120_Common.xsd @@ -1,8 +1,8 @@ diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index 3870f0f..9aa2c89 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -1,13 +1,13 @@ - + @@ -47,11 +47,22 @@ + + + + + + + + + + + diff --git a/103120/schema/ts_103120_Document.xsd b/103120/schema/ts_103120_Document.xsd index e0d18ca..d51d545 100644 --- a/103120/schema/ts_103120_Document.xsd +++ b/103120/schema/ts_103120_Document.xsd @@ -1,15 +1,15 @@ - - + + diff --git a/103120/schema/ts_103120_LITask.xsd b/103120/schema/ts_103120_LITask.xsd index 88ec469..d7b0d01 100644 --- a/103120/schema/ts_103120_LITask.xsd +++ b/103120/schema/ts_103120_LITask.xsd @@ -1,15 +1,15 @@ - - + + @@ -84,6 +84,8 @@ + + diff --git a/103120/schema/ts_103120_Notification.xsd b/103120/schema/ts_103120_Notification.xsd index 53dae32..eeb86a1 100644 --- a/103120/schema/ts_103120_Notification.xsd +++ b/103120/schema/ts_103120_Notification.xsd @@ -1,15 +1,15 @@ - - + + -- GitLab From 7105ee3e756c0e8699e3e6d5f6f1d0d503e897b9 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:44 +0100 Subject: [PATCH 096/208] TS 102 232-2 v3.9.1 (2016-03-15) agreed at LI#41 (Sophia-Antipolis, 2016-02-10) --- 102232-2/EmailPDU.asn | 1058 ++++++++++++++-------------- 102232-2/portal/EmailPDU,ver14.txt | 528 -------------- 102232-2/portal/EmailPDU,ver15.txt | 530 ++++++++++++++ 3 files changed, 1060 insertions(+), 1056 deletions(-) delete mode 100644 102232-2/portal/EmailPDU,ver14.txt create mode 100644 102232-2/portal/EmailPDU,ver15.txt diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index b3021cd..70496e0 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,528 +1,530 @@ -EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version14(14)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - - -- from TS 101 671 [4] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - - -- from TS 102 232-5 [38] - IPMMCC - FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)}; - - --- ============================ --- Object Identifier Definition --- ============================ - -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingMMCC(5)} - - -- definitions are relative to - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} - - --- ============================= --- Email Communications Contents --- ============================= - -EmailCC ::= SEQUENCE - -- EmailCC is the PDU sent for each "piece" of E-mail captured content -{ - emailCCObjId [0] RELATIVE-OID, - email-Format [1] Email-Format, - content [2] OCTET STRING - -- Network byte order -} - -Email-Format ::= ENUMERATED -{ - ip-packet(1), - -- When this is the email format, the content will contain the bytes of the IP packet from - -- the IP header through to the end of the IP packet - -- Meets requirement E.2.7 - application(2) - -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) - -- Meets requirement E.2.8 -} - --- ======================================= --- Intercept-related information for Email --- ======================================= - -EmailIRI ::= SEQUENCE - -- EmailIRI is the PDU sent for each "piece" of E-mail IRI -{ - emailIRIObjId [0] RELATIVE-OID, - eventType [1] E-mail-Event, - client-Address [2] IPAddress OPTIONAL, - -- Provided if available - server-Address [3] IPAddress OPTIONAL, - -- Provided if available - client-Port [4] INTEGER OPTIONAL, - -- Provided if available - server-Port [5] INTEGER OPTIONAL, - -- Provided if available - server-Octets-Sent [6] INTEGER, - client-Octets-Sent [7] INTEGER, - protocol-ID [8] E-mail-Protocol, - e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, - -- Not available in some cases; if a value is available, it must be provided - e-mail-Recipients [10] E-mail-Address-List OPTIONAL, - -- Not available in some cases; if a value is available, it must be provided - status [11] E-mail-Status, - total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, - message-ID [13] OCTET STRING OPTIONAL, - -- Network byte order - nationalParameter [14] OCTET STRING OPTIONAL, - -- Completely defined on a national basis, including byte ordering - ..., - national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, - -- Completely defined on a national basis - aAAInformation [16] AAAInformation OPTIONAL, - e-mail-Sender-Validity [17] ENUMERATED - { - validated(0), - -- The operator has assured the e-mail-sender - nonvalidated(1), - -- The operator does not assure the e-mail-sender - ... - } OPTIONAL -} - -E-mail-Status ::= ENUMERATED -{ - status-unknown(1), - operation-failed(2), - operation-succeeded(3) -} - -E-mail-Event ::= ENUMERATED -{ - e-mail-send(1), - e-mail-receive(2), - e-mail-download(3), - ..., - e-mail-logon-attempt(4), - e-mail-logon(5), - e-mail-logon-failure(6), - e-mail-logoff(7), - e-mail-partial-download(8), - e-mail-upload(9) -} - -E-mail-Protocol ::= ENUMERATED -{ - smtp(1), - pop3(2), - imap4(3), - webmail(4), - -- See Annex H for more information - undefined(255), - -- The protocol is not known or not representable by the current enumeration - ... -} - -E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) - -National-EM-ASN1parameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [12], - -- the country to which the parameters inserted after the extension marker apply - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...) -} - -AAAInformation ::= CHOICE - -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information -{ - pOP3AAAInformation [0] POP3AAAInformation, - aSMTPAAAInformation [1] ASMTPAAAInformation, - ..., - iMAPAAAInformation [2] IMAPAAAInformation -} - -POP3AAAInformation ::= SEQUENCE - -- The POP3AAAInformation field contains the POP3 username & optionally the password -{ - username [0] UTF8String (SIZE (0..64)), - password [1] UTF8String (SIZE (0..64)) OPTIONAL, - aAAResult [2] AAAResult OPTIONAL, - ... -} - -ASMTPAAAInformation ::= SEQUENCE - -- The ASMTPAAAInformation field contains the SMTP username and - -- optionally the authentication fields -{ - username [0] UTF8String (SIZE (0..64)), - authMethod [1] AAAauthMethod OPTIONAL, - -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc - challenge [2] OCTET STRING OPTIONAL, - -- A BASE64 encoded challenge send by the SMTP server - response [3] OCTET STRING OPTIONAL, - -- A BASE64 encoded hashed response returned by the client - aAAResult [4] AAAResult OPTIONAL, - ... -} - -IMAPAAAInformation ::= SEQUENCE - -- The iMAPAAAInformation field contains the IMAP username & optionally the password -{ - username [0] UTF8String (SIZE (0..64)), - password [1] UTF8String (SIZE (0..64)) OPTIONAL, - aAAResult [2] AAAResult OPTIONAL, - ... -} - -AAAResult ::= ENUMERATED -{ - resultUnknown(1), - aAAFailed(2), - aAASucceeded(3), - ... -} - -AAAauthMethod ::= ENUMERATED -{ - undefinedAuthMethod(1), - cramMD5(2), - digestMD5(3), - ... -} - --- ================================= --- Messaging Communications Contents --- ================================= - -MessagingCC ::= SEQUENCE - -- MessagingCC is the PDU sent for the captured content -{ - messaging-cc-obj-id [0] RELATIVE-OID, - event-identifier [1] INTEGER (0..4294967295), - -- Used to correlate to MessagingIRI within the same CIN - content-identifier [2] INTEGER (0..4294967295) OPTIONAL, - sequence-number [3] INTEGER (0..4294967295) OPTIONAL, - end-of-sequence [4] BOOLEAN DEFAULT FALSE, - content-type [5] OCTET STRING, - -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA - content [6] OCTET STRING, - ..., - content-transfer-encoding [7] OCTET STRING OPTIONAL - -- MIME Content-Transfer-Encoding mechanism. - -- Refer to IETF RFC 2045 [20] -} - -MessagingMMCC ::= SEQUENCE - -- MessagingMMCC is the PDU sent for the captured IPMMCC content -{ - messaging-mm-cc-obj-id [0] RELATIVE-OID, - event-identifier [1] INTEGER (0..4294967295), - -- Used to correlate to MessagingIRI within the same CIN - content-identifier [2] INTEGER (0..4294967295) OPTIONAL, - content [3] IPMMCC, - ... -} - - --- =========================================== --- Intercept-related information for Messaging --- =========================================== - -MessagingIRI ::= SEQUENCE -{ - messaging-iri-obj-id [0] RELATIVE-OID, - system-type [1] Messaging-System-Type, - system-identifier [2] OCTET STRING OPTIONAL, - -- Identifier up to national agreement, uniquely identifies a certain messaging system - category [3] Messaging-Event-Category OPTIONAL, - status [4] Messaging-Status, - party-information [5] SET OF Messaging-Party-Information OPTIONAL, - trigger [6] Messaging-Trigger, - properties [7] SEQUENCE OF Messaging-Property OPTIONAL, - event-identifier [8] INTEGER (0..4294967295) OPTIONAL, - -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent - original-message [9] OCTET STRING OPTIONAL, - ..., - box-identifier [10] OCTET STRING OPTIONAL -} - -Messaging-System-Type ::= ENUMERATED -{ - unified-messaging(1), - ... -} - -Messaging-Event-Category ::= CHOICE -{ - message [0] Messaging-Event, - message-box [1] Messaging-Box-Event, - message-notification [2] Messaging-Notification-Event, - call [3] Messaging-Call-Event, - ... -} - -Messaging-Event ::= ENUMERATED -{ - deposit(1), - retrieve(2), - delete(3), - save(4), - slamdown(5), - ... -} - -Messaging-Box-Event ::= ENUMERATED -{ - login(1), - logout(2), - lock(3), - unlock(4), - activate(5), - deactivate(6), - delete(7), - pin-change(8), - greeting-record(9), - greeting-change(10), - greeting-delete(11), - greeting-enable(12), - greeting-disable(13), - notification-enable(14), - notification-disable(15), - disconnect(16), - connect(17), - ..., - unknown(0), - - greeting-play(18), - language-change(19), - pin-security-enable(20), - pin-security-disable(21), - personal-operator-add(22), - personal-operator-change(23), - personal-operator-remove(24), - additional-destination-add(25), - additional-destination-change(26), - additional-destination-remove(27) -} - -Messaging-Notification-Event ::= ENUMERATED -{ - sms(1), - sms-deposit(2), - sms-slamdown(3), - sms-pin-reminder(4), - email(5), - fax-to-email(6), - ..., - mms(7), - generic(8) -} - -Messaging-Call-Event ::= ENUMERATED -{ - callout(1), - ... -} - -Messaging-Status ::= ENUMERATED -{ - unknown(0), - not-applicable(1), - operation-failed(2), - operation-succeeded(3), - operation-cancelled(4), - operation-started(5), - ..., - operation-lost(6) -} - -Messaging-Party-Information ::= SEQUENCE -{ - party-qualifier [0] Messaging-Party-Qualifier, - party-identity [1] Messaging-Party-Identity, - ..., - party-validity [2] Messaging-Party-Validity OPTIONAL, - copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL -} - -Messaging-Party-Qualifier ::= ENUMERATED -{ - unknown-party(0), - -- In this case the party cannot be classified as either originating or terminating - originating-party(1), - -- In this case, the partyInformation parameter provides the identities related to - -- the originating party and all information provided by this party. - terminating-party(2), - -- In this case, the partyInformation parameter provides the identities related to - -- the terminating party and all information provided by this party. - ..., - associated-party(3) - -- In this case, the partyInformation parameter provides the identites related to - -- an associated party and all information provided by this party -} - -Messaging-Party-Identity ::= CHOICE -{ - msisdn [0] OCTET STRING (SIZE (1..9)), - -- MSISDN of the target, encoded in the same format as the AddressString - -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. - e164-format [1] OCTET STRING (SIZE (1..25)), - -- E.164 address of the node in international format. Coded in the same format as - -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) - email-address [2] E-mail-Address-List, - ..., - ip-address [3] IPAddress, - --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] - alphanumeric [4] UTF8String, - ip-address-and-port [5] IP-Address-And-Port, - imsi [6] OCTET STRING (SIZE (3..8)), - -- International Mobile Subscriber Identity of the target, encoded in the same format as the - -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. - -- It is described in 3GPP TS 23.003 [37] clause 2.2. - imei [7] OCTET STRING (SIZE (8)), - -- International Mobile Equipment Identity of the target, encoded in the same format as the - -- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6 - fax-url [8] OCTET STRING, - -- see format defined in RFC 2806 [29]. - tel-url [9] OCTET STRING, - -- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. - modem-url [10] OCTET STRING, - -- see format defined in RFC 2806 [29]. - sip-uri [11] OCTET STRING, - -- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. - sips-uri [12] OCTET STRING, - -- see format defined in RFC 3261 [32]. - nai [13] OCTET STRING - -- Network Access Identity of the party, encoded in the same format as used EPS - -- domain in TS 133.108 [5] and defined in RFC 4282 [33]. -} - -IP-Address-And-Port ::= SEQUENCE -{ - ip-address [0] IPAddress, - -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] - port-number [1] INTEGER, - -- port-number is defined by IETF RFC 6533 [35] - ... -} - -Messaging-Party-Validity ::= ENUMERATED -{ - unknown(0), - trusted(1), - untrusted(2), - ... -} - -Messaging-Copy-Qualifier ::= ENUMERATED -{ - unknown(0), - none(1), - cc(2), - bcc(3), - ... -} - - -Messaging-Trigger ::= ENUMERATED -{ - unknown(0), - user(1), - user-agent(2), - system(3), - system-operator(4), - ... -} - -Messaging-Property ::= CHOICE -{ - pincode [0] OCTET STRING (SIZE (1..32)), - ..., - priority [1] Messaging-Property-Priority, - greeting-type [2] Messaging-Property-Greeting-Type, - notification-type [3] Messaging-Property-Notification-Type, - language [4] OCTET STRING, - -- Language according to RFC 3066 [24] - message-identifier [5] OCTET STRING, - subject [6] UTF8String, - user-agent [7] UTF8String, - password [8] OCTET STRING, - message-status [9] Messaging-Property-Message-Status, - requested-reports [10] Messaging-Property-Requested-Reports, - expires [11] GeneralizedTime, - message-date [12] GeneralizedTime -} - -Messaging-Property-Priority ::= ENUMERATED -{ - low(1), - medium(2), - high(3), - private(4), - ... -} - -Messaging-Property-Greeting-Type ::= ENUMERATED -{ - general(1), - name(2), - personal(3), - absence(4), - number(5), - ... -} - -Messaging-Property-Notification-Type ::= ENUMERATED -{ - empty-call(1), - lost-call(2), - ..., - message-to-email(3), - read-report(4), - delivery-report(5), - allow-delivery-report(6), - deny-delivery-report(7), - message-wait-indication(8), - voice-to-text(9) - -} - -Messaging-Property-Message-Status ::= ENUMERATED -{ - indeterminate(0), - expired(1), - retrieved(2), - rejected(3), - deferred(4), - forwarded(5), - unrecognized(6), - unreachable(7), - read(8), - deleted-without-being-read(9), - delivery-condition-not-met(10), - ... -} - -Messaging-Property-Requested-Reports ::= ENUMERATED -{ - none(0), - delivery(1), - read(2), - delivery-and-read(3), - ... -} - -END -- end of EmailPDU +EmailPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version15(15)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + + -- from TS 101 671 [4] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + + -- from TS 102 232-5 [38] + IPMMCC + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)}; + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingMMCC(5)} + + -- definitions are relative to + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} + + +-- ============================= +-- Email Communications Contents +-- ============================= + +EmailCC ::= SEQUENCE + -- EmailCC is the PDU sent for each "piece" of E-mail captured content +{ + emailCCObjId [0] RELATIVE-OID, + email-Format [1] Email-Format, + content [2] OCTET STRING + -- Network byte order +} + +Email-Format ::= ENUMERATED +{ + ip-packet(1), + -- When this is the email format, the content will contain the bytes of the IP packet from + -- the IP header through to the end of the IP packet + -- Meets requirement E.2.7 + application(2) + -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) + -- Meets requirement E.2.8 +} + +-- ======================================= +-- Intercept-related information for Email +-- ======================================= + +EmailIRI ::= SEQUENCE + -- EmailIRI is the PDU sent for each "piece" of E-mail IRI +{ + emailIRIObjId [0] RELATIVE-OID, + eventType [1] E-mail-Event, + client-Address [2] IPAddress OPTIONAL, + -- Provided if available + server-Address [3] IPAddress OPTIONAL, + -- Provided if available + client-Port [4] INTEGER OPTIONAL, + -- Provided if available + server-Port [5] INTEGER OPTIONAL, + -- Provided if available + server-Octets-Sent [6] INTEGER, + client-Octets-Sent [7] INTEGER, + protocol-ID [8] E-mail-Protocol, + e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, + -- Not available in some cases; if a value is available, it must be provided + e-mail-Recipients [10] E-mail-Address-List OPTIONAL, + -- Not available in some cases; if a value is available, it must be provided + status [11] E-mail-Status, + total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, + message-ID [13] OCTET STRING OPTIONAL, + -- Network byte order + nationalParameter [14] OCTET STRING OPTIONAL, + -- Completely defined on a national basis, including byte ordering + ..., + national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, + -- Completely defined on a national basis + aAAInformation [16] AAAInformation OPTIONAL, + e-mail-Sender-Validity [17] ENUMERATED + { + validated(0), + -- The operator has assured the e-mail-sender + nonvalidated(1), + -- The operator does not assure the e-mail-sender + ... + } OPTIONAL +} + +E-mail-Status ::= ENUMERATED +{ + status-unknown(1), + operation-failed(2), + operation-succeeded(3) +} + +E-mail-Event ::= ENUMERATED +{ + e-mail-send(1), + e-mail-receive(2), + e-mail-download(3), + ..., + e-mail-logon-attempt(4), + e-mail-logon(5), + e-mail-logon-failure(6), + e-mail-logoff(7), + e-mail-partial-download(8), + e-mail-upload(9) +} + +E-mail-Protocol ::= ENUMERATED +{ + smtp(1), + pop3(2), + imap4(3), + webmail(4), + -- See Annex H for more information + undefined(255), + -- The protocol is not known or not representable by the current enumeration + ... +} + +E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) + +National-EM-ASN1parameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [12], + -- the country to which the parameters inserted after the extension marker apply + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...) +} + +AAAInformation ::= CHOICE + -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information +{ + pOP3AAAInformation [0] POP3AAAInformation, + aSMTPAAAInformation [1] ASMTPAAAInformation, + ..., + iMAPAAAInformation [2] IMAPAAAInformation +} + +POP3AAAInformation ::= SEQUENCE + -- The POP3AAAInformation field contains the POP3 username & optionally the password +{ + username [0] UTF8String (SIZE (0..64)), + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + aAAResult [2] AAAResult OPTIONAL, + ... +} + +ASMTPAAAInformation ::= SEQUENCE + -- The ASMTPAAAInformation field contains the SMTP username and + -- optionally the authentication fields +{ + username [0] UTF8String (SIZE (0..64)), + authMethod [1] AAAauthMethod OPTIONAL, + -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc + challenge [2] OCTET STRING OPTIONAL, + -- A BASE64 encoded challenge send by the SMTP server + response [3] OCTET STRING OPTIONAL, + -- A BASE64 encoded hashed response returned by the client + aAAResult [4] AAAResult OPTIONAL, + ... +} + +IMAPAAAInformation ::= SEQUENCE + -- The iMAPAAAInformation field contains the IMAP username & optionally the password +{ + username [0] UTF8String (SIZE (0..64)), + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + aAAResult [2] AAAResult OPTIONAL, + ... +} + +AAAResult ::= ENUMERATED +{ + resultUnknown(1), + aAAFailed(2), + aAASucceeded(3), + ... +} + +AAAauthMethod ::= ENUMERATED +{ + undefinedAuthMethod(1), + cramMD5(2), + digestMD5(3), + ... +} + +-- ================================= +-- Messaging Communications Contents +-- ================================= + +MessagingCC ::= SEQUENCE + -- MessagingCC is the PDU sent for the captured content +{ + messaging-cc-obj-id [0] RELATIVE-OID, + event-identifier [1] INTEGER (0..4294967295), + -- Used to correlate to MessagingIRI within the same CIN + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + sequence-number [3] INTEGER (0..4294967295) OPTIONAL, + end-of-sequence [4] BOOLEAN DEFAULT FALSE, + content-type [5] OCTET STRING, + -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA + content [6] OCTET STRING, + ..., + content-transfer-encoding [7] OCTET STRING OPTIONAL + -- MIME Content-Transfer-Encoding mechanism. + -- Refer to IETF RFC 2045 [20] +} + +MessagingMMCC ::= SEQUENCE + -- MessagingMMCC is the PDU sent for the captured IPMMCC content +{ + messaging-mm-cc-obj-id [0] RELATIVE-OID, + event-identifier [1] INTEGER (0..4294967295), + -- Used to correlate to MessagingIRI within the same CIN + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + content [3] IPMMCC, + ... +} + + +-- =========================================== +-- Intercept-related information for Messaging +-- =========================================== + +MessagingIRI ::= SEQUENCE +{ + messaging-iri-obj-id [0] RELATIVE-OID, + system-type [1] Messaging-System-Type, + system-identifier [2] OCTET STRING OPTIONAL, + -- Identifier up to national agreement, uniquely identifies a certain messaging system + category [3] Messaging-Event-Category OPTIONAL, + status [4] Messaging-Status, + party-information [5] SET OF Messaging-Party-Information OPTIONAL, + trigger [6] Messaging-Trigger, + properties [7] SEQUENCE OF Messaging-Property OPTIONAL, + event-identifier [8] INTEGER (0..4294967295) OPTIONAL, + -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent + original-message [9] OCTET STRING OPTIONAL, + ..., + box-identifier [10] OCTET STRING OPTIONAL +} + +Messaging-System-Type ::= ENUMERATED +{ + unified-messaging(1), + ... +} + +Messaging-Event-Category ::= CHOICE +{ + message [0] Messaging-Event, + message-box [1] Messaging-Box-Event, + message-notification [2] Messaging-Notification-Event, + call [3] Messaging-Call-Event, + ... +} + +Messaging-Event ::= ENUMERATED +{ + deposit(1), + retrieve(2), + delete(3), + save(4), + slamdown(5), + ..., + calendar(6), + contact(7) +} + +Messaging-Box-Event ::= ENUMERATED +{ + login(1), + logout(2), + lock(3), + unlock(4), + activate(5), + deactivate(6), + delete(7), + pin-change(8), + greeting-record(9), + greeting-change(10), + greeting-delete(11), + greeting-enable(12), + greeting-disable(13), + notification-enable(14), + notification-disable(15), + disconnect(16), + connect(17), + ..., + unknown(0), + + greeting-play(18), + language-change(19), + pin-security-enable(20), + pin-security-disable(21), + personal-operator-add(22), + personal-operator-change(23), + personal-operator-remove(24), + additional-destination-add(25), + additional-destination-change(26), + additional-destination-remove(27) +} + +Messaging-Notification-Event ::= ENUMERATED +{ + sms(1), + sms-deposit(2), + sms-slamdown(3), + sms-pin-reminder(4), + email(5), + fax-to-email(6), + ..., + mms(7), + generic(8) +} + +Messaging-Call-Event ::= ENUMERATED +{ + callout(1), + ... +} + +Messaging-Status ::= ENUMERATED +{ + unknown(0), + not-applicable(1), + operation-failed(2), + operation-succeeded(3), + operation-cancelled(4), + operation-started(5), + ..., + operation-lost(6) +} + +Messaging-Party-Information ::= SEQUENCE +{ + party-qualifier [0] Messaging-Party-Qualifier, + party-identity [1] Messaging-Party-Identity, + ..., + party-validity [2] Messaging-Party-Validity OPTIONAL, + copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL +} + +Messaging-Party-Qualifier ::= ENUMERATED +{ + unknown-party(0), + -- In this case the party cannot be classified as either originating or terminating + originating-party(1), + -- In this case, the partyInformation parameter provides the identities related to + -- the originating party and all information provided by this party. + terminating-party(2), + -- In this case, the partyInformation parameter provides the identities related to + -- the terminating party and all information provided by this party. + ..., + associated-party(3) + -- In this case, the partyInformation parameter provides the identites related to + -- an associated party and all information provided by this party +} + +Messaging-Party-Identity ::= CHOICE +{ + msisdn [0] OCTET STRING (SIZE (1..9)), + -- MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. + e164-format [1] OCTET STRING (SIZE (1..25)), + -- E.164 address of the node in international format. Coded in the same format as + -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) + email-address [2] E-mail-Address-List, + ..., + ip-address [3] IPAddress, + --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + alphanumeric [4] UTF8String, + ip-address-and-port [5] IP-Address-And-Port, + imsi [6] OCTET STRING (SIZE (3..8)), + -- International Mobile Subscriber Identity of the target, encoded in the same format as the + -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. + -- It is described in 3GPP TS 23.003 [37] clause 2.2. + imei [7] OCTET STRING (SIZE (8)), + -- International Mobile Equipment Identity of the target, encoded in the same format as the + -- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6 + fax-url [8] OCTET STRING, + -- see format defined in RFC 2806 [29]. + tel-url [9] OCTET STRING, + -- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. + modem-url [10] OCTET STRING, + -- see format defined in RFC 2806 [29]. + sip-uri [11] OCTET STRING, + -- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. + sips-uri [12] OCTET STRING, + -- see format defined in RFC 3261 [32]. + nai [13] OCTET STRING + -- Network Access Identity of the party, encoded in the same format as used EPS + -- domain in TS 133.108 [5] and defined in RFC 4282 [33]. +} + +IP-Address-And-Port ::= SEQUENCE +{ + ip-address [0] IPAddress, + -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + port-number [1] INTEGER, + -- port-number is defined by IETF RFC 6533 [35] + ... +} + +Messaging-Party-Validity ::= ENUMERATED +{ + unknown(0), + trusted(1), + untrusted(2), + ... +} + +Messaging-Copy-Qualifier ::= ENUMERATED +{ + unknown(0), + none(1), + cc(2), + bcc(3), + ... +} + + +Messaging-Trigger ::= ENUMERATED +{ + unknown(0), + user(1), + user-agent(2), + system(3), + system-operator(4), + ... +} + +Messaging-Property ::= CHOICE +{ + pincode [0] OCTET STRING (SIZE (1..32)), + ..., + priority [1] Messaging-Property-Priority, + greeting-type [2] Messaging-Property-Greeting-Type, + notification-type [3] Messaging-Property-Notification-Type, + language [4] OCTET STRING, + -- Language according to RFC 3066 [24] + message-identifier [5] OCTET STRING, + subject [6] UTF8String, + user-agent [7] UTF8String, + password [8] OCTET STRING, + message-status [9] Messaging-Property-Message-Status, + requested-reports [10] Messaging-Property-Requested-Reports, + expires [11] GeneralizedTime, + message-date [12] GeneralizedTime +} + +Messaging-Property-Priority ::= ENUMERATED +{ + low(1), + medium(2), + high(3), + private(4), + ... +} + +Messaging-Property-Greeting-Type ::= ENUMERATED +{ + general(1), + name(2), + personal(3), + absence(4), + number(5), + ... +} + +Messaging-Property-Notification-Type ::= ENUMERATED +{ + empty-call(1), + lost-call(2), + ..., + message-to-email(3), + read-report(4), + delivery-report(5), + allow-delivery-report(6), + deny-delivery-report(7), + message-wait-indication(8), + voice-to-text(9) + +} + +Messaging-Property-Message-Status ::= ENUMERATED +{ + indeterminate(0), + expired(1), + retrieved(2), + rejected(3), + deferred(4), + forwarded(5), + unrecognized(6), + unreachable(7), + read(8), + deleted-without-being-read(9), + delivery-condition-not-met(10), + ... +} + +Messaging-Property-Requested-Reports ::= ENUMERATED +{ + none(0), + delivery(1), + read(2), + delivery-and-read(3), + ... +} + +END -- end of EmailPDU diff --git a/102232-2/portal/EmailPDU,ver14.txt b/102232-2/portal/EmailPDU,ver14.txt deleted file mode 100644 index b3021cd..0000000 --- a/102232-2/portal/EmailPDU,ver14.txt +++ /dev/null @@ -1,528 +0,0 @@ -EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version14(14)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - - -- from TS 101 671 [4] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - - -- from TS 102 232-5 [38] - IPMMCC - FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)}; - - --- ============================ --- Object Identifier Definition --- ============================ - -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version14(14) messagingMMCC(5)} - - -- definitions are relative to - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} - - --- ============================= --- Email Communications Contents --- ============================= - -EmailCC ::= SEQUENCE - -- EmailCC is the PDU sent for each "piece" of E-mail captured content -{ - emailCCObjId [0] RELATIVE-OID, - email-Format [1] Email-Format, - content [2] OCTET STRING - -- Network byte order -} - -Email-Format ::= ENUMERATED -{ - ip-packet(1), - -- When this is the email format, the content will contain the bytes of the IP packet from - -- the IP header through to the end of the IP packet - -- Meets requirement E.2.7 - application(2) - -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) - -- Meets requirement E.2.8 -} - --- ======================================= --- Intercept-related information for Email --- ======================================= - -EmailIRI ::= SEQUENCE - -- EmailIRI is the PDU sent for each "piece" of E-mail IRI -{ - emailIRIObjId [0] RELATIVE-OID, - eventType [1] E-mail-Event, - client-Address [2] IPAddress OPTIONAL, - -- Provided if available - server-Address [3] IPAddress OPTIONAL, - -- Provided if available - client-Port [4] INTEGER OPTIONAL, - -- Provided if available - server-Port [5] INTEGER OPTIONAL, - -- Provided if available - server-Octets-Sent [6] INTEGER, - client-Octets-Sent [7] INTEGER, - protocol-ID [8] E-mail-Protocol, - e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, - -- Not available in some cases; if a value is available, it must be provided - e-mail-Recipients [10] E-mail-Address-List OPTIONAL, - -- Not available in some cases; if a value is available, it must be provided - status [11] E-mail-Status, - total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, - message-ID [13] OCTET STRING OPTIONAL, - -- Network byte order - nationalParameter [14] OCTET STRING OPTIONAL, - -- Completely defined on a national basis, including byte ordering - ..., - national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, - -- Completely defined on a national basis - aAAInformation [16] AAAInformation OPTIONAL, - e-mail-Sender-Validity [17] ENUMERATED - { - validated(0), - -- The operator has assured the e-mail-sender - nonvalidated(1), - -- The operator does not assure the e-mail-sender - ... - } OPTIONAL -} - -E-mail-Status ::= ENUMERATED -{ - status-unknown(1), - operation-failed(2), - operation-succeeded(3) -} - -E-mail-Event ::= ENUMERATED -{ - e-mail-send(1), - e-mail-receive(2), - e-mail-download(3), - ..., - e-mail-logon-attempt(4), - e-mail-logon(5), - e-mail-logon-failure(6), - e-mail-logoff(7), - e-mail-partial-download(8), - e-mail-upload(9) -} - -E-mail-Protocol ::= ENUMERATED -{ - smtp(1), - pop3(2), - imap4(3), - webmail(4), - -- See Annex H for more information - undefined(255), - -- The protocol is not known or not representable by the current enumeration - ... -} - -E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) - -National-EM-ASN1parameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [12], - -- the country to which the parameters inserted after the extension marker apply - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...) -} - -AAAInformation ::= CHOICE - -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information -{ - pOP3AAAInformation [0] POP3AAAInformation, - aSMTPAAAInformation [1] ASMTPAAAInformation, - ..., - iMAPAAAInformation [2] IMAPAAAInformation -} - -POP3AAAInformation ::= SEQUENCE - -- The POP3AAAInformation field contains the POP3 username & optionally the password -{ - username [0] UTF8String (SIZE (0..64)), - password [1] UTF8String (SIZE (0..64)) OPTIONAL, - aAAResult [2] AAAResult OPTIONAL, - ... -} - -ASMTPAAAInformation ::= SEQUENCE - -- The ASMTPAAAInformation field contains the SMTP username and - -- optionally the authentication fields -{ - username [0] UTF8String (SIZE (0..64)), - authMethod [1] AAAauthMethod OPTIONAL, - -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc - challenge [2] OCTET STRING OPTIONAL, - -- A BASE64 encoded challenge send by the SMTP server - response [3] OCTET STRING OPTIONAL, - -- A BASE64 encoded hashed response returned by the client - aAAResult [4] AAAResult OPTIONAL, - ... -} - -IMAPAAAInformation ::= SEQUENCE - -- The iMAPAAAInformation field contains the IMAP username & optionally the password -{ - username [0] UTF8String (SIZE (0..64)), - password [1] UTF8String (SIZE (0..64)) OPTIONAL, - aAAResult [2] AAAResult OPTIONAL, - ... -} - -AAAResult ::= ENUMERATED -{ - resultUnknown(1), - aAAFailed(2), - aAASucceeded(3), - ... -} - -AAAauthMethod ::= ENUMERATED -{ - undefinedAuthMethod(1), - cramMD5(2), - digestMD5(3), - ... -} - --- ================================= --- Messaging Communications Contents --- ================================= - -MessagingCC ::= SEQUENCE - -- MessagingCC is the PDU sent for the captured content -{ - messaging-cc-obj-id [0] RELATIVE-OID, - event-identifier [1] INTEGER (0..4294967295), - -- Used to correlate to MessagingIRI within the same CIN - content-identifier [2] INTEGER (0..4294967295) OPTIONAL, - sequence-number [3] INTEGER (0..4294967295) OPTIONAL, - end-of-sequence [4] BOOLEAN DEFAULT FALSE, - content-type [5] OCTET STRING, - -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA - content [6] OCTET STRING, - ..., - content-transfer-encoding [7] OCTET STRING OPTIONAL - -- MIME Content-Transfer-Encoding mechanism. - -- Refer to IETF RFC 2045 [20] -} - -MessagingMMCC ::= SEQUENCE - -- MessagingMMCC is the PDU sent for the captured IPMMCC content -{ - messaging-mm-cc-obj-id [0] RELATIVE-OID, - event-identifier [1] INTEGER (0..4294967295), - -- Used to correlate to MessagingIRI within the same CIN - content-identifier [2] INTEGER (0..4294967295) OPTIONAL, - content [3] IPMMCC, - ... -} - - --- =========================================== --- Intercept-related information for Messaging --- =========================================== - -MessagingIRI ::= SEQUENCE -{ - messaging-iri-obj-id [0] RELATIVE-OID, - system-type [1] Messaging-System-Type, - system-identifier [2] OCTET STRING OPTIONAL, - -- Identifier up to national agreement, uniquely identifies a certain messaging system - category [3] Messaging-Event-Category OPTIONAL, - status [4] Messaging-Status, - party-information [5] SET OF Messaging-Party-Information OPTIONAL, - trigger [6] Messaging-Trigger, - properties [7] SEQUENCE OF Messaging-Property OPTIONAL, - event-identifier [8] INTEGER (0..4294967295) OPTIONAL, - -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent - original-message [9] OCTET STRING OPTIONAL, - ..., - box-identifier [10] OCTET STRING OPTIONAL -} - -Messaging-System-Type ::= ENUMERATED -{ - unified-messaging(1), - ... -} - -Messaging-Event-Category ::= CHOICE -{ - message [0] Messaging-Event, - message-box [1] Messaging-Box-Event, - message-notification [2] Messaging-Notification-Event, - call [3] Messaging-Call-Event, - ... -} - -Messaging-Event ::= ENUMERATED -{ - deposit(1), - retrieve(2), - delete(3), - save(4), - slamdown(5), - ... -} - -Messaging-Box-Event ::= ENUMERATED -{ - login(1), - logout(2), - lock(3), - unlock(4), - activate(5), - deactivate(6), - delete(7), - pin-change(8), - greeting-record(9), - greeting-change(10), - greeting-delete(11), - greeting-enable(12), - greeting-disable(13), - notification-enable(14), - notification-disable(15), - disconnect(16), - connect(17), - ..., - unknown(0), - - greeting-play(18), - language-change(19), - pin-security-enable(20), - pin-security-disable(21), - personal-operator-add(22), - personal-operator-change(23), - personal-operator-remove(24), - additional-destination-add(25), - additional-destination-change(26), - additional-destination-remove(27) -} - -Messaging-Notification-Event ::= ENUMERATED -{ - sms(1), - sms-deposit(2), - sms-slamdown(3), - sms-pin-reminder(4), - email(5), - fax-to-email(6), - ..., - mms(7), - generic(8) -} - -Messaging-Call-Event ::= ENUMERATED -{ - callout(1), - ... -} - -Messaging-Status ::= ENUMERATED -{ - unknown(0), - not-applicable(1), - operation-failed(2), - operation-succeeded(3), - operation-cancelled(4), - operation-started(5), - ..., - operation-lost(6) -} - -Messaging-Party-Information ::= SEQUENCE -{ - party-qualifier [0] Messaging-Party-Qualifier, - party-identity [1] Messaging-Party-Identity, - ..., - party-validity [2] Messaging-Party-Validity OPTIONAL, - copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL -} - -Messaging-Party-Qualifier ::= ENUMERATED -{ - unknown-party(0), - -- In this case the party cannot be classified as either originating or terminating - originating-party(1), - -- In this case, the partyInformation parameter provides the identities related to - -- the originating party and all information provided by this party. - terminating-party(2), - -- In this case, the partyInformation parameter provides the identities related to - -- the terminating party and all information provided by this party. - ..., - associated-party(3) - -- In this case, the partyInformation parameter provides the identites related to - -- an associated party and all information provided by this party -} - -Messaging-Party-Identity ::= CHOICE -{ - msisdn [0] OCTET STRING (SIZE (1..9)), - -- MSISDN of the target, encoded in the same format as the AddressString - -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. - e164-format [1] OCTET STRING (SIZE (1..25)), - -- E.164 address of the node in international format. Coded in the same format as - -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) - email-address [2] E-mail-Address-List, - ..., - ip-address [3] IPAddress, - --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] - alphanumeric [4] UTF8String, - ip-address-and-port [5] IP-Address-And-Port, - imsi [6] OCTET STRING (SIZE (3..8)), - -- International Mobile Subscriber Identity of the target, encoded in the same format as the - -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. - -- It is described in 3GPP TS 23.003 [37] clause 2.2. - imei [7] OCTET STRING (SIZE (8)), - -- International Mobile Equipment Identity of the target, encoded in the same format as the - -- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6 - fax-url [8] OCTET STRING, - -- see format defined in RFC 2806 [29]. - tel-url [9] OCTET STRING, - -- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. - modem-url [10] OCTET STRING, - -- see format defined in RFC 2806 [29]. - sip-uri [11] OCTET STRING, - -- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. - sips-uri [12] OCTET STRING, - -- see format defined in RFC 3261 [32]. - nai [13] OCTET STRING - -- Network Access Identity of the party, encoded in the same format as used EPS - -- domain in TS 133.108 [5] and defined in RFC 4282 [33]. -} - -IP-Address-And-Port ::= SEQUENCE -{ - ip-address [0] IPAddress, - -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] - port-number [1] INTEGER, - -- port-number is defined by IETF RFC 6533 [35] - ... -} - -Messaging-Party-Validity ::= ENUMERATED -{ - unknown(0), - trusted(1), - untrusted(2), - ... -} - -Messaging-Copy-Qualifier ::= ENUMERATED -{ - unknown(0), - none(1), - cc(2), - bcc(3), - ... -} - - -Messaging-Trigger ::= ENUMERATED -{ - unknown(0), - user(1), - user-agent(2), - system(3), - system-operator(4), - ... -} - -Messaging-Property ::= CHOICE -{ - pincode [0] OCTET STRING (SIZE (1..32)), - ..., - priority [1] Messaging-Property-Priority, - greeting-type [2] Messaging-Property-Greeting-Type, - notification-type [3] Messaging-Property-Notification-Type, - language [4] OCTET STRING, - -- Language according to RFC 3066 [24] - message-identifier [5] OCTET STRING, - subject [6] UTF8String, - user-agent [7] UTF8String, - password [8] OCTET STRING, - message-status [9] Messaging-Property-Message-Status, - requested-reports [10] Messaging-Property-Requested-Reports, - expires [11] GeneralizedTime, - message-date [12] GeneralizedTime -} - -Messaging-Property-Priority ::= ENUMERATED -{ - low(1), - medium(2), - high(3), - private(4), - ... -} - -Messaging-Property-Greeting-Type ::= ENUMERATED -{ - general(1), - name(2), - personal(3), - absence(4), - number(5), - ... -} - -Messaging-Property-Notification-Type ::= ENUMERATED -{ - empty-call(1), - lost-call(2), - ..., - message-to-email(3), - read-report(4), - delivery-report(5), - allow-delivery-report(6), - deny-delivery-report(7), - message-wait-indication(8), - voice-to-text(9) - -} - -Messaging-Property-Message-Status ::= ENUMERATED -{ - indeterminate(0), - expired(1), - retrieved(2), - rejected(3), - deferred(4), - forwarded(5), - unrecognized(6), - unreachable(7), - read(8), - deleted-without-being-read(9), - delivery-condition-not-met(10), - ... -} - -Messaging-Property-Requested-Reports ::= ENUMERATED -{ - none(0), - delivery(1), - read(2), - delivery-and-read(3), - ... -} - -END -- end of EmailPDU diff --git a/102232-2/portal/EmailPDU,ver15.txt b/102232-2/portal/EmailPDU,ver15.txt new file mode 100644 index 0000000..70496e0 --- /dev/null +++ b/102232-2/portal/EmailPDU,ver15.txt @@ -0,0 +1,530 @@ +EmailPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version15(15)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + + -- from TS 101 671 [4] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + + -- from TS 102 232-5 [38] + IPMMCC + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)}; + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingMMCC(5)} + + -- definitions are relative to + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} + + +-- ============================= +-- Email Communications Contents +-- ============================= + +EmailCC ::= SEQUENCE + -- EmailCC is the PDU sent for each "piece" of E-mail captured content +{ + emailCCObjId [0] RELATIVE-OID, + email-Format [1] Email-Format, + content [2] OCTET STRING + -- Network byte order +} + +Email-Format ::= ENUMERATED +{ + ip-packet(1), + -- When this is the email format, the content will contain the bytes of the IP packet from + -- the IP header through to the end of the IP packet + -- Meets requirement E.2.7 + application(2) + -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) + -- Meets requirement E.2.8 +} + +-- ======================================= +-- Intercept-related information for Email +-- ======================================= + +EmailIRI ::= SEQUENCE + -- EmailIRI is the PDU sent for each "piece" of E-mail IRI +{ + emailIRIObjId [0] RELATIVE-OID, + eventType [1] E-mail-Event, + client-Address [2] IPAddress OPTIONAL, + -- Provided if available + server-Address [3] IPAddress OPTIONAL, + -- Provided if available + client-Port [4] INTEGER OPTIONAL, + -- Provided if available + server-Port [5] INTEGER OPTIONAL, + -- Provided if available + server-Octets-Sent [6] INTEGER, + client-Octets-Sent [7] INTEGER, + protocol-ID [8] E-mail-Protocol, + e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, + -- Not available in some cases; if a value is available, it must be provided + e-mail-Recipients [10] E-mail-Address-List OPTIONAL, + -- Not available in some cases; if a value is available, it must be provided + status [11] E-mail-Status, + total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, + message-ID [13] OCTET STRING OPTIONAL, + -- Network byte order + nationalParameter [14] OCTET STRING OPTIONAL, + -- Completely defined on a national basis, including byte ordering + ..., + national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, + -- Completely defined on a national basis + aAAInformation [16] AAAInformation OPTIONAL, + e-mail-Sender-Validity [17] ENUMERATED + { + validated(0), + -- The operator has assured the e-mail-sender + nonvalidated(1), + -- The operator does not assure the e-mail-sender + ... + } OPTIONAL +} + +E-mail-Status ::= ENUMERATED +{ + status-unknown(1), + operation-failed(2), + operation-succeeded(3) +} + +E-mail-Event ::= ENUMERATED +{ + e-mail-send(1), + e-mail-receive(2), + e-mail-download(3), + ..., + e-mail-logon-attempt(4), + e-mail-logon(5), + e-mail-logon-failure(6), + e-mail-logoff(7), + e-mail-partial-download(8), + e-mail-upload(9) +} + +E-mail-Protocol ::= ENUMERATED +{ + smtp(1), + pop3(2), + imap4(3), + webmail(4), + -- See Annex H for more information + undefined(255), + -- The protocol is not known or not representable by the current enumeration + ... +} + +E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) + +National-EM-ASN1parameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [12], + -- the country to which the parameters inserted after the extension marker apply + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...) +} + +AAAInformation ::= CHOICE + -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information +{ + pOP3AAAInformation [0] POP3AAAInformation, + aSMTPAAAInformation [1] ASMTPAAAInformation, + ..., + iMAPAAAInformation [2] IMAPAAAInformation +} + +POP3AAAInformation ::= SEQUENCE + -- The POP3AAAInformation field contains the POP3 username & optionally the password +{ + username [0] UTF8String (SIZE (0..64)), + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + aAAResult [2] AAAResult OPTIONAL, + ... +} + +ASMTPAAAInformation ::= SEQUENCE + -- The ASMTPAAAInformation field contains the SMTP username and + -- optionally the authentication fields +{ + username [0] UTF8String (SIZE (0..64)), + authMethod [1] AAAauthMethod OPTIONAL, + -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc + challenge [2] OCTET STRING OPTIONAL, + -- A BASE64 encoded challenge send by the SMTP server + response [3] OCTET STRING OPTIONAL, + -- A BASE64 encoded hashed response returned by the client + aAAResult [4] AAAResult OPTIONAL, + ... +} + +IMAPAAAInformation ::= SEQUENCE + -- The iMAPAAAInformation field contains the IMAP username & optionally the password +{ + username [0] UTF8String (SIZE (0..64)), + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + aAAResult [2] AAAResult OPTIONAL, + ... +} + +AAAResult ::= ENUMERATED +{ + resultUnknown(1), + aAAFailed(2), + aAASucceeded(3), + ... +} + +AAAauthMethod ::= ENUMERATED +{ + undefinedAuthMethod(1), + cramMD5(2), + digestMD5(3), + ... +} + +-- ================================= +-- Messaging Communications Contents +-- ================================= + +MessagingCC ::= SEQUENCE + -- MessagingCC is the PDU sent for the captured content +{ + messaging-cc-obj-id [0] RELATIVE-OID, + event-identifier [1] INTEGER (0..4294967295), + -- Used to correlate to MessagingIRI within the same CIN + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + sequence-number [3] INTEGER (0..4294967295) OPTIONAL, + end-of-sequence [4] BOOLEAN DEFAULT FALSE, + content-type [5] OCTET STRING, + -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA + content [6] OCTET STRING, + ..., + content-transfer-encoding [7] OCTET STRING OPTIONAL + -- MIME Content-Transfer-Encoding mechanism. + -- Refer to IETF RFC 2045 [20] +} + +MessagingMMCC ::= SEQUENCE + -- MessagingMMCC is the PDU sent for the captured IPMMCC content +{ + messaging-mm-cc-obj-id [0] RELATIVE-OID, + event-identifier [1] INTEGER (0..4294967295), + -- Used to correlate to MessagingIRI within the same CIN + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + content [3] IPMMCC, + ... +} + + +-- =========================================== +-- Intercept-related information for Messaging +-- =========================================== + +MessagingIRI ::= SEQUENCE +{ + messaging-iri-obj-id [0] RELATIVE-OID, + system-type [1] Messaging-System-Type, + system-identifier [2] OCTET STRING OPTIONAL, + -- Identifier up to national agreement, uniquely identifies a certain messaging system + category [3] Messaging-Event-Category OPTIONAL, + status [4] Messaging-Status, + party-information [5] SET OF Messaging-Party-Information OPTIONAL, + trigger [6] Messaging-Trigger, + properties [7] SEQUENCE OF Messaging-Property OPTIONAL, + event-identifier [8] INTEGER (0..4294967295) OPTIONAL, + -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent + original-message [9] OCTET STRING OPTIONAL, + ..., + box-identifier [10] OCTET STRING OPTIONAL +} + +Messaging-System-Type ::= ENUMERATED +{ + unified-messaging(1), + ... +} + +Messaging-Event-Category ::= CHOICE +{ + message [0] Messaging-Event, + message-box [1] Messaging-Box-Event, + message-notification [2] Messaging-Notification-Event, + call [3] Messaging-Call-Event, + ... +} + +Messaging-Event ::= ENUMERATED +{ + deposit(1), + retrieve(2), + delete(3), + save(4), + slamdown(5), + ..., + calendar(6), + contact(7) +} + +Messaging-Box-Event ::= ENUMERATED +{ + login(1), + logout(2), + lock(3), + unlock(4), + activate(5), + deactivate(6), + delete(7), + pin-change(8), + greeting-record(9), + greeting-change(10), + greeting-delete(11), + greeting-enable(12), + greeting-disable(13), + notification-enable(14), + notification-disable(15), + disconnect(16), + connect(17), + ..., + unknown(0), + + greeting-play(18), + language-change(19), + pin-security-enable(20), + pin-security-disable(21), + personal-operator-add(22), + personal-operator-change(23), + personal-operator-remove(24), + additional-destination-add(25), + additional-destination-change(26), + additional-destination-remove(27) +} + +Messaging-Notification-Event ::= ENUMERATED +{ + sms(1), + sms-deposit(2), + sms-slamdown(3), + sms-pin-reminder(4), + email(5), + fax-to-email(6), + ..., + mms(7), + generic(8) +} + +Messaging-Call-Event ::= ENUMERATED +{ + callout(1), + ... +} + +Messaging-Status ::= ENUMERATED +{ + unknown(0), + not-applicable(1), + operation-failed(2), + operation-succeeded(3), + operation-cancelled(4), + operation-started(5), + ..., + operation-lost(6) +} + +Messaging-Party-Information ::= SEQUENCE +{ + party-qualifier [0] Messaging-Party-Qualifier, + party-identity [1] Messaging-Party-Identity, + ..., + party-validity [2] Messaging-Party-Validity OPTIONAL, + copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL +} + +Messaging-Party-Qualifier ::= ENUMERATED +{ + unknown-party(0), + -- In this case the party cannot be classified as either originating or terminating + originating-party(1), + -- In this case, the partyInformation parameter provides the identities related to + -- the originating party and all information provided by this party. + terminating-party(2), + -- In this case, the partyInformation parameter provides the identities related to + -- the terminating party and all information provided by this party. + ..., + associated-party(3) + -- In this case, the partyInformation parameter provides the identites related to + -- an associated party and all information provided by this party +} + +Messaging-Party-Identity ::= CHOICE +{ + msisdn [0] OCTET STRING (SIZE (1..9)), + -- MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. + e164-format [1] OCTET STRING (SIZE (1..25)), + -- E.164 address of the node in international format. Coded in the same format as + -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) + email-address [2] E-mail-Address-List, + ..., + ip-address [3] IPAddress, + --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + alphanumeric [4] UTF8String, + ip-address-and-port [5] IP-Address-And-Port, + imsi [6] OCTET STRING (SIZE (3..8)), + -- International Mobile Subscriber Identity of the target, encoded in the same format as the + -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. + -- It is described in 3GPP TS 23.003 [37] clause 2.2. + imei [7] OCTET STRING (SIZE (8)), + -- International Mobile Equipment Identity of the target, encoded in the same format as the + -- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6 + fax-url [8] OCTET STRING, + -- see format defined in RFC 2806 [29]. + tel-url [9] OCTET STRING, + -- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. + modem-url [10] OCTET STRING, + -- see format defined in RFC 2806 [29]. + sip-uri [11] OCTET STRING, + -- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. + sips-uri [12] OCTET STRING, + -- see format defined in RFC 3261 [32]. + nai [13] OCTET STRING + -- Network Access Identity of the party, encoded in the same format as used EPS + -- domain in TS 133.108 [5] and defined in RFC 4282 [33]. +} + +IP-Address-And-Port ::= SEQUENCE +{ + ip-address [0] IPAddress, + -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + port-number [1] INTEGER, + -- port-number is defined by IETF RFC 6533 [35] + ... +} + +Messaging-Party-Validity ::= ENUMERATED +{ + unknown(0), + trusted(1), + untrusted(2), + ... +} + +Messaging-Copy-Qualifier ::= ENUMERATED +{ + unknown(0), + none(1), + cc(2), + bcc(3), + ... +} + + +Messaging-Trigger ::= ENUMERATED +{ + unknown(0), + user(1), + user-agent(2), + system(3), + system-operator(4), + ... +} + +Messaging-Property ::= CHOICE +{ + pincode [0] OCTET STRING (SIZE (1..32)), + ..., + priority [1] Messaging-Property-Priority, + greeting-type [2] Messaging-Property-Greeting-Type, + notification-type [3] Messaging-Property-Notification-Type, + language [4] OCTET STRING, + -- Language according to RFC 3066 [24] + message-identifier [5] OCTET STRING, + subject [6] UTF8String, + user-agent [7] UTF8String, + password [8] OCTET STRING, + message-status [9] Messaging-Property-Message-Status, + requested-reports [10] Messaging-Property-Requested-Reports, + expires [11] GeneralizedTime, + message-date [12] GeneralizedTime +} + +Messaging-Property-Priority ::= ENUMERATED +{ + low(1), + medium(2), + high(3), + private(4), + ... +} + +Messaging-Property-Greeting-Type ::= ENUMERATED +{ + general(1), + name(2), + personal(3), + absence(4), + number(5), + ... +} + +Messaging-Property-Notification-Type ::= ENUMERATED +{ + empty-call(1), + lost-call(2), + ..., + message-to-email(3), + read-report(4), + delivery-report(5), + allow-delivery-report(6), + deny-delivery-report(7), + message-wait-indication(8), + voice-to-text(9) + +} + +Messaging-Property-Message-Status ::= ENUMERATED +{ + indeterminate(0), + expired(1), + retrieved(2), + rejected(3), + deferred(4), + forwarded(5), + unrecognized(6), + unreachable(7), + read(8), + deleted-without-being-read(9), + delivery-condition-not-met(10), + ... +} + +Messaging-Property-Requested-Reports ::= ENUMERATED +{ + none(0), + delivery(1), + read(2), + delivery-and-read(3), + ... +} + +END -- end of EmailPDU -- GitLab From a2809144f36ed97bdbe0e268b31592cbba89b85b Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:48 +0100 Subject: [PATCH 097/208] TS 102 232-1 v3.11.1 (2016-03-18) agreed at LI#41 (Sophia-Antipolis, 2016-02-10) --- 102232-1/LI-PS-PDU.asn | 102 +++++++++++++++--- ...I-PS-PDU,ver22.txt => LI-PS-PDU,ver23.txt} | 102 +++++++++++++++--- 2 files changed, 180 insertions(+), 24 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver22.txt => LI-PS-PDU,ver23.txt} (82%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 6607e34..757b94f 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version22(22)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version23(23)} DEFINITIONS IMPLICIT TAGS ::= @@ -28,7 +28,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version14(14)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version15(15)} -- from TS 102 232-03 [6] IPCC, @@ -63,7 +63,7 @@ IMPORTS Location FROM UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] @@ -71,7 +71,7 @@ IMPORTS UmtsCS-IRIsContent FROM UmtsCS-HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] @@ -80,28 +80,73 @@ IMPORTS EPSLocation FROM EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] + IRI-Parameters, + ConfIRIsContent + 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. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + ProSeIRIsContent + FROM ProSeHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + GCSEIRIsContent + FROM GCSEHI2Operations + {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 UMTS release and version number) + -- 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 UMTS release and version number) + -- 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. + + -- 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. + + -- 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 release and version number) + -- 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. @@ -142,7 +187,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version22(22)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version23(23)} -- ==================== -- Top-level definition @@ -269,8 +314,11 @@ CCContents ::= CHOICE messagingCC [14] 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] 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 } MicroSecondTimeStamp ::= SEQUENCE @@ -333,7 +381,10 @@ IRIContents ::= CHOICE lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI + ePSIRI [15] EPSIRI, + confIRI [16] ConfIRI, + proseIRI [17] ProSeIRI, + gcseIRI [18] GcseIRI } UMTSIRI ::= CHOICE @@ -362,6 +413,33 @@ EPSIRI ::= CHOICE ... } +ConfIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, + confIRIsContent [1] ConfIRIsContent, + ... +} + + +ProSeIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, + proseIRIsContent [1] ProSeIRIsContent, + ... +} + + +GcseIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, + gcseIRIsContent [1] GCSEIRIsContent, + ... +} + + -- =========================== -- Definitions for TRI Payload -- =========================== diff --git a/102232-1/portal/LI-PS-PDU,ver22.txt b/102232-1/portal/LI-PS-PDU,ver23.txt similarity index 82% rename from 102232-1/portal/LI-PS-PDU,ver22.txt rename to 102232-1/portal/LI-PS-PDU,ver23.txt index 6607e34..757b94f 100644 --- a/102232-1/portal/LI-PS-PDU,ver22.txt +++ b/102232-1/portal/LI-PS-PDU,ver23.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version22(22)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version23(23)} DEFINITIONS IMPLICIT TAGS ::= @@ -28,7 +28,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version14(14)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version15(15)} -- from TS 102 232-03 [6] IPCC, @@ -63,7 +63,7 @@ IMPORTS Location FROM UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] @@ -71,7 +71,7 @@ IMPORTS UmtsCS-IRIsContent FROM UmtsCS-HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] @@ -80,28 +80,73 @@ IMPORTS EPSLocation FROM EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] + IRI-Parameters, + ConfIRIsContent + 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. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + ProSeIRIsContent + FROM ProSeHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + GCSEIRIsContent + FROM GCSEHI2Operations + {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 UMTS release and version number) + -- 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 UMTS release and version number) + -- 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. + + -- 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. + + -- 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 release and version number) + -- 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. @@ -142,7 +187,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version22(22)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version23(23)} -- ==================== -- Top-level definition @@ -269,8 +314,11 @@ CCContents ::= CHOICE messagingCC [14] 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] 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 } MicroSecondTimeStamp ::= SEQUENCE @@ -333,7 +381,10 @@ IRIContents ::= CHOICE lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI + ePSIRI [15] EPSIRI, + confIRI [16] ConfIRI, + proseIRI [17] ProSeIRI, + gcseIRI [18] GcseIRI } UMTSIRI ::= CHOICE @@ -362,6 +413,33 @@ EPSIRI ::= CHOICE ... } +ConfIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, + confIRIsContent [1] ConfIRIsContent, + ... +} + + +ProSeIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, + proseIRIsContent [1] ProSeIRIsContent, + ... +} + + +GcseIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, + gcseIRIsContent [1] GCSEIRIsContent, + ... +} + + -- =========================== -- Definitions for TRI Payload -- =========================== -- GitLab From 26c5aa235fa6b5f4d751dfba055863364c7d7d5d Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:54 +0100 Subject: [PATCH 098/208] TS 103 280 v1.2.1 (2016-08-10) agreed at LI#42 (Malaga, 2016-06-28) --- 103280/TS_103_280.asn1 | 14 ++++++++++++++ 103280/{TS_103_280_v111.xsd => TS_103_280.xsd} | 0 ...{TS_103_280_v111.xsd => TS_103_280_v010101.xsd} | 0 103280/portal/TS_103_280_v010201.asn1 | 14 ++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 103280/TS_103_280.asn1 rename 103280/{TS_103_280_v111.xsd => TS_103_280.xsd} (100%) rename 103280/portal/{TS_103_280_v111.xsd => TS_103_280_v010101.xsd} (100%) create mode 100644 103280/portal/TS_103_280_v010201.asn1 diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1 new file mode 100644 index 0000000..406dc28 --- /dev/null +++ b/103280/TS_103_280.asn1 @@ -0,0 +1,14 @@ +Common-Parameters +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} + +DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN + +-- Object Identifier definitions + +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} + +-- Common Parameter: LIID (as defined in clause 6) + +LIID ::= OCTET STRING (SIZE (1..25)) + +END diff --git a/103280/TS_103_280_v111.xsd b/103280/TS_103_280.xsd similarity index 100% rename from 103280/TS_103_280_v111.xsd rename to 103280/TS_103_280.xsd diff --git a/103280/portal/TS_103_280_v111.xsd b/103280/portal/TS_103_280_v010101.xsd similarity index 100% rename from 103280/portal/TS_103_280_v111.xsd rename to 103280/portal/TS_103_280_v010101.xsd diff --git a/103280/portal/TS_103_280_v010201.asn1 b/103280/portal/TS_103_280_v010201.asn1 new file mode 100644 index 0000000..406dc28 --- /dev/null +++ b/103280/portal/TS_103_280_v010201.asn1 @@ -0,0 +1,14 @@ +Common-Parameters +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} + +DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN + +-- Object Identifier definitions + +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} + +-- Common Parameter: LIID (as defined in clause 6) + +LIID ::= OCTET STRING (SIZE (1..25)) + +END -- GitLab From c094c06ee7d3349f1fd13eb422bc0ba8ce3f7119 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:31:58 +0100 Subject: [PATCH 099/208] TS 102 232-5 v3.6.1 (2016-08-10) agreed at LI#42 (Malaga, 2016-06-28) --- 102232-5/IPMultimediaPDU.asn | 14 +++++++------- ...imediaPDU,ver7.txt => IPMultimediaPDU,ver8.txt} | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) rename 102232-5/portal/{IPMultimediaPDU,ver7.txt => IPMultimediaPDU,ver8.txt} (89%) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 8b87164..ee0dc94 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,5 +1,5 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version7(7)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,12 +8,12 @@ IMPORTS -- from TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- from TS 102 232-1 [2] Location FROM LI-PS-PDU - {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version19(19)}; + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; @@ -21,8 +21,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version7(7) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version7(7) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version8(8) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version8(8) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -106,9 +106,9 @@ IPIRIContents ::= CHOICE h323Message [2] H323Message, -- Copy of the H.323 content and the source and destination IP address ..., - nationalIPMMIRIParameters [3] NationalIPMMIRIParameters + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, -- This parameter is used according to national regulations - -- This parameter shall be delivered as an IRI-Report-record + -- This parameter shall be delivered as an IRI-Report-record xCAPMessage [4] OCTET STRING -- Copy of the XCAP message including all HTTP headers and contents } SIPMessage ::= SEQUENCE diff --git a/102232-5/portal/IPMultimediaPDU,ver7.txt b/102232-5/portal/IPMultimediaPDU,ver8.txt similarity index 89% rename from 102232-5/portal/IPMultimediaPDU,ver7.txt rename to 102232-5/portal/IPMultimediaPDU,ver8.txt index 8b87164..ee0dc94 100644 --- a/102232-5/portal/IPMultimediaPDU,ver7.txt +++ b/102232-5/portal/IPMultimediaPDU,ver8.txt @@ -1,5 +1,5 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version7(7)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,12 +8,12 @@ IMPORTS -- from TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version16(16)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- from TS 102 232-1 [2] Location FROM LI-PS-PDU - {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version19(19)}; + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; @@ -21,8 +21,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version7(7) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version7(7) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version8(8) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version8(8) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -106,9 +106,9 @@ IPIRIContents ::= CHOICE h323Message [2] H323Message, -- Copy of the H.323 content and the source and destination IP address ..., - nationalIPMMIRIParameters [3] NationalIPMMIRIParameters + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, -- This parameter is used according to national regulations - -- This parameter shall be delivered as an IRI-Report-record + -- This parameter shall be delivered as an IRI-Report-record xCAPMessage [4] OCTET STRING -- Copy of the XCAP message including all HTTP headers and contents } SIPMessage ::= SEQUENCE -- GitLab From 1fa76066e24b1edc5285991c1d6d4e195b155fe2 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:32:01 +0100 Subject: [PATCH 100/208] TS 102 232-2 v3.10.1 (2016-08-16) agreed at LI#42 (Malaga, 2016-06-28) --- 102232-2/EmailPDU.asn | 19 +++++++++---------- ...{EmailPDU,ver15.txt => EmailPDU,ver16.txt} | 19 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) rename 102232-2/portal/{EmailPDU,ver15.txt => EmailPDU,ver16.txt} (91%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index 70496e0..c106e37 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version15(15)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version16(16)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -14,18 +14,18 @@ IMPORTS -- from TS 102 232-5 [38] IPMMCC FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingMMCC(5)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -317,7 +317,7 @@ Messaging-Box-Event ::= ENUMERATED personal-operator-remove(24), additional-destination-add(25), additional-destination-change(26), - additional-destination-remove(27) + additional-destination-remove(27), auto-play-enable(28), auto-play-disable(29), header-play-enable(30), header-play-disable(31) } Messaging-Notification-Event ::= ENUMERATED @@ -498,8 +498,7 @@ Messaging-Property-Notification-Type ::= ENUMERATED allow-delivery-report(6), deny-delivery-report(7), message-wait-indication(8), - voice-to-text(9) - + voice-to-text(9), new-message-sms(10), new-message-outcall(11), new-message-reminder(12) } Messaging-Property-Message-Status ::= ENUMERATED diff --git a/102232-2/portal/EmailPDU,ver15.txt b/102232-2/portal/EmailPDU,ver16.txt similarity index 91% rename from 102232-2/portal/EmailPDU,ver15.txt rename to 102232-2/portal/EmailPDU,ver16.txt index 70496e0..c106e37 100644 --- a/102232-2/portal/EmailPDU,ver15.txt +++ b/102232-2/portal/EmailPDU,ver16.txt @@ -1,5 +1,5 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version15(15)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version16(16)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -14,18 +14,18 @@ IMPORTS -- from TS 102 232-5 [38] IPMMCC FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version6(6)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)}; -- ============================ -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version15(15) messagingMMCC(5)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -317,7 +317,7 @@ Messaging-Box-Event ::= ENUMERATED personal-operator-remove(24), additional-destination-add(25), additional-destination-change(26), - additional-destination-remove(27) + additional-destination-remove(27), auto-play-enable(28), auto-play-disable(29), header-play-enable(30), header-play-disable(31) } Messaging-Notification-Event ::= ENUMERATED @@ -498,8 +498,7 @@ Messaging-Property-Notification-Type ::= ENUMERATED allow-delivery-report(6), deny-delivery-report(7), message-wait-indication(8), - voice-to-text(9) - + voice-to-text(9), new-message-sms(10), new-message-outcall(11), new-message-reminder(12) } Messaging-Property-Message-Status ::= ENUMERATED -- GitLab From e16417ece9896347f90faaf35d68fa481240426d Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:32:05 +0100 Subject: [PATCH 101/208] TS 102 232-1 v3.12.1 (2016-08-04) agreed at LI#42 (Malaga, 2016-06-28) --- 102232-1/LI-PS-PDU.asn | 10 +++++----- .../{LI-PS-PDU,ver23.txt => LI-PS-PDU,ver24.txt} | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver23.txt => LI-PS-PDU,ver24.txt} (98%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 757b94f..3562e50 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version23(23)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)} DEFINITIONS IMPLICIT TAGS ::= @@ -28,14 +28,14 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version15(15)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version16(16)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version11(11)} -- from TS 102 232-04 [32] L2CC, @@ -48,7 +48,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version7(7)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)} -- from TS 102 232-06 [36] PstnIsdnCC, @@ -187,7 +187,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version23(23)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version24(24)} -- ==================== -- Top-level definition diff --git a/102232-1/portal/LI-PS-PDU,ver23.txt b/102232-1/portal/LI-PS-PDU,ver24.txt similarity index 98% rename from 102232-1/portal/LI-PS-PDU,ver23.txt rename to 102232-1/portal/LI-PS-PDU,ver24.txt index 757b94f..3562e50 100644 --- a/102232-1/portal/LI-PS-PDU,ver23.txt +++ b/102232-1/portal/LI-PS-PDU,ver24.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version23(23)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)} DEFINITIONS IMPLICIT TAGS ::= @@ -28,14 +28,14 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version15(15)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version16(16)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version11(11)} -- from TS 102 232-04 [32] L2CC, @@ -48,7 +48,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version7(7)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)} -- from TS 102 232-06 [36] PstnIsdnCC, @@ -187,7 +187,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version23(23)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version24(24)} -- ==================== -- Top-level definition -- GitLab From 21011c6fc2ec066ae2f9c7fdf1efd09c1634824e Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:32:11 +0100 Subject: [PATCH 102/208] TS 102 232-3 v3.4.1 (2016-09-27) agreed at LI#43 (Sorrento, 2016-09-19) --- 102232-3/IPAccessPDU.asn | 22 ++++++++++++++----- ...essPDU,ver10.txt => IPAccessPDU,ver11.txt} | 22 ++++++++++++++----- 2 files changed, 32 insertions(+), 12 deletions(-) rename 102232-3/portal/{IPAccessPDU,ver10.txt => IPAccessPDU,ver11.txt} (94%) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index cc72e9e..af4fc5e 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version10(10)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version11(11)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,15 +8,21 @@ IMPORTS -- from ETSI TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + + -- from ETSI TS 102 232-1 [2] + Location + FROM LI-PS-PDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; + -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -66,6 +72,7 @@ IPIRIContents ::= SEQUENCE targetLocation [7] UTF8String (SIZE (1..64)) OPTIONAL, -- When internetAccessType is Wireless LAN, this field should contain a string which -- uniquely identifies the wireless accesspoint within the SvP domain + -- New implementations are encouraged to use the location [24] parameter where possible. pOPPortNumber [8] INTEGER (0..4294967295) OPTIONAL, -- The POP port number used by the target callBackNumber [9] UTF8String (SIZE (1..20)) OPTIONAL, @@ -99,10 +106,13 @@ IPIRIContents ::= SEQUENCE -- Use of this field is fully described in section 6.2.1 authenticationType [22] AuthenticationType OPTIONAL, -- Field used to identify the authentication type to assist with LEMF data validation - otherTargetIdentifiers [23] SEQUENCE OF OtherTargetIdentifiers OPTIONAL + otherTargetIdentifiers [23] SEQUENCE OF OtherTargetIdentifiers OPTIONAL, -- This parameter will carry the second and subsequent IPv4 or IPv6 target IP addresses -- It is used when multiple subnet/prefix ranges are assigned to a target service. -- Use of this field is fully described in section 6.2.1 + location [24] Location OPTIONAL + -- The location associated with the target + } AccessEventType ::= ENUMERATED diff --git a/102232-3/portal/IPAccessPDU,ver10.txt b/102232-3/portal/IPAccessPDU,ver11.txt similarity index 94% rename from 102232-3/portal/IPAccessPDU,ver10.txt rename to 102232-3/portal/IPAccessPDU,ver11.txt index cc72e9e..af4fc5e 100644 --- a/102232-3/portal/IPAccessPDU,ver10.txt +++ b/102232-3/portal/IPAccessPDU,ver11.txt @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version10(10)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version11(11)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -8,15 +8,21 @@ IMPORTS -- from ETSI TS 101 671 [1] IPAddress FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + + -- from ETSI TS 102 232-1 [2] + Location + FROM LI-PS-PDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; + -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version10(10) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -66,6 +72,7 @@ IPIRIContents ::= SEQUENCE targetLocation [7] UTF8String (SIZE (1..64)) OPTIONAL, -- When internetAccessType is Wireless LAN, this field should contain a string which -- uniquely identifies the wireless accesspoint within the SvP domain + -- New implementations are encouraged to use the location [24] parameter where possible. pOPPortNumber [8] INTEGER (0..4294967295) OPTIONAL, -- The POP port number used by the target callBackNumber [9] UTF8String (SIZE (1..20)) OPTIONAL, @@ -99,10 +106,13 @@ IPIRIContents ::= SEQUENCE -- Use of this field is fully described in section 6.2.1 authenticationType [22] AuthenticationType OPTIONAL, -- Field used to identify the authentication type to assist with LEMF data validation - otherTargetIdentifiers [23] SEQUENCE OF OtherTargetIdentifiers OPTIONAL + otherTargetIdentifiers [23] SEQUENCE OF OtherTargetIdentifiers OPTIONAL, -- This parameter will carry the second and subsequent IPv4 or IPv6 target IP addresses -- It is used when multiple subnet/prefix ranges are assigned to a target service. -- Use of this field is fully described in section 6.2.1 + location [24] Location OPTIONAL + -- The location associated with the target + } AccessEventType ::= ENUMERATED -- GitLab From 4acfb7ba4fda7b4a7eb4e18519f4373d381e496b Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:32:16 +0100 Subject: [PATCH 103/208] TS 102 657 v1.18.1 (2017-04-11) agreed at LI#44 (Sophia-Antipolis, 2017-01-30) --- 102657/RDMessage.asn | 94 +- 102657/RDMessage.xsd | 5645 ++++++++--------- 102657/portal/RDMessagever17.xsd | 2900 --------- ...{RDMessagever17.txt => RDMessagever18.txt} | 94 +- 102657/portal/RDMessagever18.xsd | 2767 ++++++++ 5 files changed, 5693 insertions(+), 5807 deletions(-) delete mode 100644 102657/portal/RDMessagever17.xsd rename 102657/portal/{RDMessagever17.txt => RDMessagever18.txt} (95%) create mode 100644 102657/portal/RDMessagever18.xsd diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 2d4e982..4b2d31b 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version17(17)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version18(18)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version17(17)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version18(18)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -20,7 +20,7 @@ rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version17(17) RetainedDataMessage ::= SEQUENCE { - rdHeaderId [0] OBJECT IDENTIFIER, + rdHeaderId [0] OBJECT IDENTIFIER, retainedDataHeader [1] RetainedDataHeader, retainedDataPayload [2] RetainedDataPayload, retainedDataDigest [3] OCTET STRING OPTIONAL, @@ -39,12 +39,16 @@ RetainedDataHeader ::= SEQUENCE cSPID [2] CSPID, timeStamp [3] GeneralizedTime, thirdPartyCSPID [4] CSPID OPTIONAL, - ... + ... , + requestType [5] RequestType OPTIONAL } CSPID ::= UTF8String -- Unique identifier for the CSP that issued the request +RequestType ::= UTF8String +-- Description or reference of the type of Retained Data request + RequestID ::= SEQUENCE { countryCode [1] CountryCode, @@ -101,6 +105,7 @@ RequestMessage ::= SEQUENCE -- Maximum number of records to be returned. -- On a national basis maximum numbers could be considered -- In case of maxHit a responseFailed message is sent and no data is sent + -- This parameter shall not be used simultaneously with the numberOfRecordsLimit parameter. -- (see clause 6.3.3.2) nationalRequestParameters [5] NationalRequestParameters OPTIONAL, -- To be defined on a national basis @@ -110,9 +115,13 @@ RequestMessage ::= SEQUENCE maxRecordsPerBatch [6] INTEGER OPTIONAL, -- Indicates that multi-part delivery shall be used and each ResponseMessage shall not -- contain more records than specified. (see clause 6.3.3.3) - requestedData [7] SEQUENCE OF UTF8String OPTIONAL + requestedData [7] SEQUENCE OF UTF8String OPTIONAL, -- only to use in case of selective requests, it contains -- the path to the selected parameter in XPATH notation + numberOfRecordsLimit [8] INTEGER OPTIONAL + -- Indicates the upper limit on the number of records to be provided by the CSP. + -- This parameter shall not be used simultaneously with the maxHits parameter. + -- (see clause 6.3.3.4) } DeliveryPointHIB ::= UTF8String @@ -165,8 +174,12 @@ ResponseMessage ::= SEQUENCE -- to be defined on a national basis -- only to be used in case the present document cannot fulfil the national requirements ..., - responseNumber [4] INTEGER OPTIONAL + responseNumber [4] INTEGER OPTIONAL, -- number to identify partial results within parallel multi-part delivery + numberOfRecordsFound [5] INTEGER OPTIONAL + -- Indicates the total number of records found by the CSP when the value set in the + -- numberOfRecordsLimit has been reached or exceeded. + -- (see clause 6.3.3.4) } ResponseStatus ::= CHOICE @@ -1231,9 +1244,16 @@ Location ::= SEQUENCE tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, -- Only applicable to the CS traffic cases, such as SMS over SGs, according to -- 3GPP TS 23.272 [35] - eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL + eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL, -- Only applicable to the CS traffic cases, such as SMS over SGs, according to -- 3GPP TS 23.272 [35] + maritimeTransport [13] MaritimeTransport OPTIONAL, + -- Information about the mobile cells embarked on ships using + -- satellite transponder backhaul + airTransport [14] AirTransport OPTIONAL + -- Information about the mobile cells embarked on aircraft using + -- satellite transponder backhaul + } GSMLocation ::= CHOICE @@ -1428,6 +1448,35 @@ Route ::= SEQUENCE HorizontalExtent ::= INTEGER -- metres +MaritimeTransport ::= SEQUENCE +{ + shipName [1] UTF8String OPTIONAL, + -- Registered ship name + imoNumber [2] IA5String (SIZE(10)) OPTIONAL, + -- International Maritime Organization (IMO) ship number: + -- IMO prefix with 7-digit number, e.g. IMO7812345 + ... +} + +AirTransport ::= SEQUENCE +{ + iATAAirlineCode [1] IA5String (SIZE(2)) OPTIONAL, + -- Two-character designation code assigned to the airline + -- by the International Air Transport Association (IATA) + iCAOOperatorCode [2] IA5String (SIZE(3)) OPTIONAL, + -- Three-letter designation code assigned to the aircraft operator agency + -- by the International Civil Aviation Organization (ICAO). + -- The iCAOOperatorCode should be used only when the aircraft operator does not have + -- an assigned IATA airline code. + aircraftRegistration [3] UTF8String OPTIONAL, + -- Aircraft identification as in the aircraft's certificate of registration + -- e.g. G-IABC, N99999, F-OAAA + flightNumber [4] IA5String OPTIONAL, + -- Flight number assigned by the airline operating the aircraft + ... +} + + -- =================== -- General definitions -- =================== @@ -1792,7 +1841,9 @@ MultimediaPartyInformation ::= SEQUENCE userAgent [14] UTF8String OPTIONAL, -- e.g. SIP User-Agent field (see RFC 3261 [26]) octetsUploaded [15] INTEGER OPTIONAL, - octetsDownloaded [16] INTEGER OPTIONAL + octetsDownloaded [16] INTEGER OPTIONAL, + accessNetworkInformation [17] SEQUENCE OF AccessNetworkInfo OPTIONAL + } MultimediaCallID ::= UTF8String @@ -1872,6 +1923,29 @@ MediaComponent ::= SEQUENCE ... } +AccessNetworkInfo ::= CHOICE +{ + paniHeaderInfo [1] PaniHeaderInfo, + ... +} + +PaniHeaderInfo ::= SEQUENCE +{ + accessType [1] OCTET STRING OPTIONAL, + -- ASCII string '3GPP-E-UTRAN-TDD', ' IEEE-802.11'... : see ETSI TS 124 229 [xx] clause 7.2A.4 + accessClass [2] OCTET STRING OPTIONAL, + -- ASCII string '3GPP-UTRAN', '3GPP-E-UTRAN',... : see ETSI TS 124 229 [xx] clause 7.2A.4 + networkProvided [3] NULL OPTIONAL, + -- present if provided by the network + paniLocation [4] Location OPTIONAL, + -- Cell-ID and location information if available + paniTime [5] GeneralizedTime OPTIONAL, + -- indicates the time when the location was reported at the start of the session, + -- or during or at the end of the session if the location is retained for the event + ... +} + + -- ============================== -- Definitions of Billing Data -- ============================== @@ -2050,8 +2124,10 @@ NAServiceSubscription ::= SEQUENCE deliveryAddress [16] AddressInformation OPTIONAL, resellerAddress [17] AddressInformation OPTIONAL, otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL, - allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL + allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL, -- If present, contains device details for all elements from allocatedDeviceIDs + mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL + } NationalNASubscription ::= SEQUENCE diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 0c02a69..b337537 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,2900 +1,2767 @@ - - - - - - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.17.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A country code as per ISO 3166-1 [xx] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.18.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A country code as per ISO 3166-1 [xx] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/102657/portal/RDMessagever17.xsd b/102657/portal/RDMessagever17.xsd deleted file mode 100644 index 0c02a69..0000000 --- a/102657/portal/RDMessagever17.xsd +++ /dev/null @@ -1,2900 +0,0 @@ - - - - - - - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.17.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A country code as per ISO 3166-1 [xx] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/102657/portal/RDMessagever17.txt b/102657/portal/RDMessagever18.txt similarity index 95% rename from 102657/portal/RDMessagever17.txt rename to 102657/portal/RDMessagever18.txt index 2d4e982..4b2d31b 100644 --- a/102657/portal/RDMessagever17.txt +++ b/102657/portal/RDMessagever18.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version17(17)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version18(18)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version17(17)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version18(18)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -20,7 +20,7 @@ rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version17(17) RetainedDataMessage ::= SEQUENCE { - rdHeaderId [0] OBJECT IDENTIFIER, + rdHeaderId [0] OBJECT IDENTIFIER, retainedDataHeader [1] RetainedDataHeader, retainedDataPayload [2] RetainedDataPayload, retainedDataDigest [3] OCTET STRING OPTIONAL, @@ -39,12 +39,16 @@ RetainedDataHeader ::= SEQUENCE cSPID [2] CSPID, timeStamp [3] GeneralizedTime, thirdPartyCSPID [4] CSPID OPTIONAL, - ... + ... , + requestType [5] RequestType OPTIONAL } CSPID ::= UTF8String -- Unique identifier for the CSP that issued the request +RequestType ::= UTF8String +-- Description or reference of the type of Retained Data request + RequestID ::= SEQUENCE { countryCode [1] CountryCode, @@ -101,6 +105,7 @@ RequestMessage ::= SEQUENCE -- Maximum number of records to be returned. -- On a national basis maximum numbers could be considered -- In case of maxHit a responseFailed message is sent and no data is sent + -- This parameter shall not be used simultaneously with the numberOfRecordsLimit parameter. -- (see clause 6.3.3.2) nationalRequestParameters [5] NationalRequestParameters OPTIONAL, -- To be defined on a national basis @@ -110,9 +115,13 @@ RequestMessage ::= SEQUENCE maxRecordsPerBatch [6] INTEGER OPTIONAL, -- Indicates that multi-part delivery shall be used and each ResponseMessage shall not -- contain more records than specified. (see clause 6.3.3.3) - requestedData [7] SEQUENCE OF UTF8String OPTIONAL + requestedData [7] SEQUENCE OF UTF8String OPTIONAL, -- only to use in case of selective requests, it contains -- the path to the selected parameter in XPATH notation + numberOfRecordsLimit [8] INTEGER OPTIONAL + -- Indicates the upper limit on the number of records to be provided by the CSP. + -- This parameter shall not be used simultaneously with the maxHits parameter. + -- (see clause 6.3.3.4) } DeliveryPointHIB ::= UTF8String @@ -165,8 +174,12 @@ ResponseMessage ::= SEQUENCE -- to be defined on a national basis -- only to be used in case the present document cannot fulfil the national requirements ..., - responseNumber [4] INTEGER OPTIONAL + responseNumber [4] INTEGER OPTIONAL, -- number to identify partial results within parallel multi-part delivery + numberOfRecordsFound [5] INTEGER OPTIONAL + -- Indicates the total number of records found by the CSP when the value set in the + -- numberOfRecordsLimit has been reached or exceeded. + -- (see clause 6.3.3.4) } ResponseStatus ::= CHOICE @@ -1231,9 +1244,16 @@ Location ::= SEQUENCE tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, -- Only applicable to the CS traffic cases, such as SMS over SGs, according to -- 3GPP TS 23.272 [35] - eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL + eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL, -- Only applicable to the CS traffic cases, such as SMS over SGs, according to -- 3GPP TS 23.272 [35] + maritimeTransport [13] MaritimeTransport OPTIONAL, + -- Information about the mobile cells embarked on ships using + -- satellite transponder backhaul + airTransport [14] AirTransport OPTIONAL + -- Information about the mobile cells embarked on aircraft using + -- satellite transponder backhaul + } GSMLocation ::= CHOICE @@ -1428,6 +1448,35 @@ Route ::= SEQUENCE HorizontalExtent ::= INTEGER -- metres +MaritimeTransport ::= SEQUENCE +{ + shipName [1] UTF8String OPTIONAL, + -- Registered ship name + imoNumber [2] IA5String (SIZE(10)) OPTIONAL, + -- International Maritime Organization (IMO) ship number: + -- IMO prefix with 7-digit number, e.g. IMO7812345 + ... +} + +AirTransport ::= SEQUENCE +{ + iATAAirlineCode [1] IA5String (SIZE(2)) OPTIONAL, + -- Two-character designation code assigned to the airline + -- by the International Air Transport Association (IATA) + iCAOOperatorCode [2] IA5String (SIZE(3)) OPTIONAL, + -- Three-letter designation code assigned to the aircraft operator agency + -- by the International Civil Aviation Organization (ICAO). + -- The iCAOOperatorCode should be used only when the aircraft operator does not have + -- an assigned IATA airline code. + aircraftRegistration [3] UTF8String OPTIONAL, + -- Aircraft identification as in the aircraft's certificate of registration + -- e.g. G-IABC, N99999, F-OAAA + flightNumber [4] IA5String OPTIONAL, + -- Flight number assigned by the airline operating the aircraft + ... +} + + -- =================== -- General definitions -- =================== @@ -1792,7 +1841,9 @@ MultimediaPartyInformation ::= SEQUENCE userAgent [14] UTF8String OPTIONAL, -- e.g. SIP User-Agent field (see RFC 3261 [26]) octetsUploaded [15] INTEGER OPTIONAL, - octetsDownloaded [16] INTEGER OPTIONAL + octetsDownloaded [16] INTEGER OPTIONAL, + accessNetworkInformation [17] SEQUENCE OF AccessNetworkInfo OPTIONAL + } MultimediaCallID ::= UTF8String @@ -1872,6 +1923,29 @@ MediaComponent ::= SEQUENCE ... } +AccessNetworkInfo ::= CHOICE +{ + paniHeaderInfo [1] PaniHeaderInfo, + ... +} + +PaniHeaderInfo ::= SEQUENCE +{ + accessType [1] OCTET STRING OPTIONAL, + -- ASCII string '3GPP-E-UTRAN-TDD', ' IEEE-802.11'... : see ETSI TS 124 229 [xx] clause 7.2A.4 + accessClass [2] OCTET STRING OPTIONAL, + -- ASCII string '3GPP-UTRAN', '3GPP-E-UTRAN',... : see ETSI TS 124 229 [xx] clause 7.2A.4 + networkProvided [3] NULL OPTIONAL, + -- present if provided by the network + paniLocation [4] Location OPTIONAL, + -- Cell-ID and location information if available + paniTime [5] GeneralizedTime OPTIONAL, + -- indicates the time when the location was reported at the start of the session, + -- or during or at the end of the session if the location is retained for the event + ... +} + + -- ============================== -- Definitions of Billing Data -- ============================== @@ -2050,8 +2124,10 @@ NAServiceSubscription ::= SEQUENCE deliveryAddress [16] AddressInformation OPTIONAL, resellerAddress [17] AddressInformation OPTIONAL, otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL, - allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL + allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL, -- If present, contains device details for all elements from allocatedDeviceIDs + mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL + } NationalNASubscription ::= SEQUENCE diff --git a/102657/portal/RDMessagever18.xsd b/102657/portal/RDMessagever18.xsd new file mode 100644 index 0000000..b337537 --- /dev/null +++ b/102657/portal/RDMessagever18.xsd @@ -0,0 +1,2767 @@ + + + + + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.18.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A country code as per ISO 3166-1 [xx] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 52318cba17a32c286ec555bee99178a4c7428864 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:32:20 +0100 Subject: [PATCH 104/208] TS 102 232-5 v3.7.1 (2017-03-21) agreed at LI#44 (Sophia-Antipolis, 2017-01-30) --- 102232-5/IPMultimediaPDU.asn | 318 ++++++++++++----------- 102232-5/portal/IPMultimediaPDU,ver8.txt | 154 ----------- 102232-5/portal/IPMultimediaPDU,ver9.txt | 164 ++++++++++++ 3 files changed, 328 insertions(+), 308 deletions(-) delete mode 100644 102232-5/portal/IPMultimediaPDU,ver8.txt create mode 100644 102232-5/portal/IPMultimediaPDU,ver9.txt diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index ee0dc94..2a4507f 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,154 +1,164 @@ -IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - -- from TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - - -- from TS 102 232-1 [2] - Location - FROM LI-PS-PDU - {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; - - - --- ============================ --- Object Identifier Definition --- ============================ - -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version8(8) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version8(8) cC(2)} - -- both definitions relative to: - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - --- ===================================== --- IP Multimedia Communications Contents --- ===================================== - -IPMMCC ::= SEQUENCE -{ - iPMMCCObjId [0] RELATIVE-OID, - mMCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets - -- Each IPMMCC shall contain one intercepted packet - -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter - -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. - ..., - frameType [2] FrameType OPTIONAL, - -- The availability of header information shall be signalled with the frameType parameter - -- The module is defined as OPTIONAL because of backwards compatibility reasons - -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 - streamIdentifier [3] OCTET STRING OPTIONAL, - -- Used to identify the media stream within the current CIN, typically in case of - -- multiple media streams communications - -- May be used to correlate each media stream with the relevant SDP media description of IRI - -- May contain c= and m= lines extracts for instance - mMCCprotocol [4] MMCCprotocol OPTIONAL - -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) - -- Absence means mMCCContents contains RTP/RTCP packets -} - -FrameType ::= ENUMERATED -{ - ipFrame(0), - -- All headers are present - udpFrame(1), - -- IP header is missing - rtpFrame(2), - -- UDP and IP headers are missing - audioFrame(3), - -- All headers are missing - ..., - tcpFrame(4), - -- IP header is missing - artificialRtpFrame(5), - -- UDP and IP headers are missing, artificial RTP frame has been added - udptlFrame(6) - -- UDP and IP headers are missing -} - -MMCCprotocol ::= ENUMERATED -{ - rTP(0), - -- mMCCContents parameter contains RTP/RTCP packets - mSRP(1), - -- mMCCContents parameter contains MSRP packets - ..., - uDPTL(2) - -- mMCCContents parameter contains UDPTL packets -} - --- ======================================================== --- Intercept-related information for IP Multimedia sessions --- ======================================================== - -IPMMIRI ::= SEQUENCE -{ - iPMMIRIObjId [0] RELATIVE-OID, - iPMMIRIContents [1] IPIRIContents, - ..., - targetLocation [2] Location OPTIONAL - -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 - -} - -IPIRIContents ::= CHOICE -{ - originalIPMMMessage [0] OCTET STRING, - -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers - sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address - h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address - ..., - nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, - -- This parameter is used according to national regulations - -- This parameter shall be delivered as an IRI-Report-record xCAPMessage [4] OCTET STRING -- Copy of the XCAP message including all HTTP headers and contents -} - -SIPMessage ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - sIPContent [2] OCTET STRING, - ... -} - -H323Message ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - h323Content [2] H323MessageContent, - ... -} - -H323MessageContent ::= CHOICE -{ - h225CSMessageContent [0] OCTET STRING, - h225RASMessageContent [1] OCTET STRING, - h245MessageContent [2] OCTET STRING, - genericMessageContent [3] OCTET STRING, - ... -} - -NationalIPMMIRIParameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [16], - -- the country to which the parameters inserted after the extension marker apply. - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...). - -- It is recommended that "version parameter" and "vendor identification parameter" are - -- included in the national parameters definition. Vendor identifications can be - -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended - -- to avoid using tags from 240 to 255 in a formal type definition. -} - -END -- end of IP Multimedia PDU +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version9(9)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + -- from TS 101 671 [1] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + + -- from TS 102 232-1 [2] + Location + FROM LI-PS-PDU + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; + + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version9(9) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version9(9) cC(2)} + -- both definitions relative to: + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- ===================================== +-- IP Multimedia Communications Contents +-- ===================================== + +IPMMCC ::= SEQUENCE +{ + iPMMCCObjId [0] RELATIVE-OID, + mMCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets + -- Each IPMMCC shall contain one intercepted packet + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. + ..., + frameType [2] FrameType OPTIONAL, + -- The availability of header information shall be signalled with the frameType parameter + -- The module is defined as OPTIONAL because of backwards compatibility reasons + -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 + streamIdentifier [3] OCTET STRING OPTIONAL, + -- Used to identify the media stream within the current CIN, typically in case of + -- multiple media streams communications + -- May be used to correlate each media stream with the relevant SDP media description of IRI + -- May contain c= and m= lines extracts for instance + mMCCprotocol [4] MMCCprotocol OPTIONAL + -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) + -- Absence means mMCCContents contains RTP/RTCP packets +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ..., + tcpFrame(4), + -- IP header is missing + artificialRtpFrame(5), + -- UDP and IP headers are missing, artificial RTP frame has been added + udptlFrame(6) + -- UDP and IP headers are missing +} + +MMCCprotocol ::= ENUMERATED +{ + rTP(0), + -- mMCCContents parameter contains RTP/RTCP packets + mSRP(1), + -- mMCCContents parameter contains MSRP packets + ..., + uDPTL(2) + -- mMCCContents parameter contains UDPTL packets +} + +-- ======================================================== +-- Intercept-related information for IP Multimedia sessions +-- ======================================================== + +IPMMIRI ::= SEQUENCE +{ + iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIContents [1] IPIRIContents, + ..., + targetLocation [2] Location OPTIONAL, + -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 + additionalSignalling [3] SEQUENCE OF AdditionalSignalling OPTIONAL + -- The use of this parameter is defined in clause 5.2.5 +} + +IPIRIContents ::= CHOICE +{ + originalIPMMMessage [0] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + sIPMessage [1] SIPMessage, + -- Copy of the SIP content and the source and destination IP address + h323Message [2] H323Message, + -- Copy of the H.323 content and the source and destination IP address + ..., + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, + -- This parameter is used according to national regulations + -- This parameter shall be delivered as an IRI-Report-record + xCAPMessage [4] OCTET STRING + -- Copy of the XCAP message including all HTTP headers and contents +} + +SIPMessage ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + sIPContent [2] OCTET STRING, + ... +} + +H323Message ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + h323Content [2] H323MessageContent, + ... +} + +H323MessageContent ::= CHOICE +{ + h225CSMessageContent [0] OCTET STRING, + h225RASMessageContent [1] OCTET STRING, + h245MessageContent [2] OCTET STRING, + genericMessageContent [3] OCTET STRING, + ... +} + +NationalIPMMIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [16], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} + +AdditionalSignalling ::= CHOICE +{ + sipHeaderLine [0] OCTET STRING, + -- A SIP header line, eg: “Contact: tel:+123456789”. + ... +} + +END -- end of IP Multimedia PDU \ No newline at end of file diff --git a/102232-5/portal/IPMultimediaPDU,ver8.txt b/102232-5/portal/IPMultimediaPDU,ver8.txt deleted file mode 100644 index ee0dc94..0000000 --- a/102232-5/portal/IPMultimediaPDU,ver8.txt +++ /dev/null @@ -1,154 +0,0 @@ -IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - -- from TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - - -- from TS 102 232-1 [2] - Location - FROM LI-PS-PDU - {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; - - - --- ============================ --- Object Identifier Definition --- ============================ - -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version8(8) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version8(8) cC(2)} - -- both definitions relative to: - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - --- ===================================== --- IP Multimedia Communications Contents --- ===================================== - -IPMMCC ::= SEQUENCE -{ - iPMMCCObjId [0] RELATIVE-OID, - mMCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets - -- Each IPMMCC shall contain one intercepted packet - -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter - -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. - ..., - frameType [2] FrameType OPTIONAL, - -- The availability of header information shall be signalled with the frameType parameter - -- The module is defined as OPTIONAL because of backwards compatibility reasons - -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 - streamIdentifier [3] OCTET STRING OPTIONAL, - -- Used to identify the media stream within the current CIN, typically in case of - -- multiple media streams communications - -- May be used to correlate each media stream with the relevant SDP media description of IRI - -- May contain c= and m= lines extracts for instance - mMCCprotocol [4] MMCCprotocol OPTIONAL - -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) - -- Absence means mMCCContents contains RTP/RTCP packets -} - -FrameType ::= ENUMERATED -{ - ipFrame(0), - -- All headers are present - udpFrame(1), - -- IP header is missing - rtpFrame(2), - -- UDP and IP headers are missing - audioFrame(3), - -- All headers are missing - ..., - tcpFrame(4), - -- IP header is missing - artificialRtpFrame(5), - -- UDP and IP headers are missing, artificial RTP frame has been added - udptlFrame(6) - -- UDP and IP headers are missing -} - -MMCCprotocol ::= ENUMERATED -{ - rTP(0), - -- mMCCContents parameter contains RTP/RTCP packets - mSRP(1), - -- mMCCContents parameter contains MSRP packets - ..., - uDPTL(2) - -- mMCCContents parameter contains UDPTL packets -} - --- ======================================================== --- Intercept-related information for IP Multimedia sessions --- ======================================================== - -IPMMIRI ::= SEQUENCE -{ - iPMMIRIObjId [0] RELATIVE-OID, - iPMMIRIContents [1] IPIRIContents, - ..., - targetLocation [2] Location OPTIONAL - -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 - -} - -IPIRIContents ::= CHOICE -{ - originalIPMMMessage [0] OCTET STRING, - -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers - sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address - h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address - ..., - nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, - -- This parameter is used according to national regulations - -- This parameter shall be delivered as an IRI-Report-record xCAPMessage [4] OCTET STRING -- Copy of the XCAP message including all HTTP headers and contents -} - -SIPMessage ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - sIPContent [2] OCTET STRING, - ... -} - -H323Message ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - h323Content [2] H323MessageContent, - ... -} - -H323MessageContent ::= CHOICE -{ - h225CSMessageContent [0] OCTET STRING, - h225RASMessageContent [1] OCTET STRING, - h245MessageContent [2] OCTET STRING, - genericMessageContent [3] OCTET STRING, - ... -} - -NationalIPMMIRIParameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [16], - -- the country to which the parameters inserted after the extension marker apply. - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...). - -- It is recommended that "version parameter" and "vendor identification parameter" are - -- included in the national parameters definition. Vendor identifications can be - -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended - -- to avoid using tags from 240 to 255 in a formal type definition. -} - -END -- end of IP Multimedia PDU diff --git a/102232-5/portal/IPMultimediaPDU,ver9.txt b/102232-5/portal/IPMultimediaPDU,ver9.txt new file mode 100644 index 0000000..2a4507f --- /dev/null +++ b/102232-5/portal/IPMultimediaPDU,ver9.txt @@ -0,0 +1,164 @@ +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version9(9)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + -- from TS 101 671 [1] + IPAddress + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + + -- from TS 102 232-1 [2] + Location + FROM LI-PS-PDU + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; + + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version9(9) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version9(9) cC(2)} + -- both definitions relative to: + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- ===================================== +-- IP Multimedia Communications Contents +-- ===================================== + +IPMMCC ::= SEQUENCE +{ + iPMMCCObjId [0] RELATIVE-OID, + mMCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets + -- Each IPMMCC shall contain one intercepted packet + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. + ..., + frameType [2] FrameType OPTIONAL, + -- The availability of header information shall be signalled with the frameType parameter + -- The module is defined as OPTIONAL because of backwards compatibility reasons + -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 + streamIdentifier [3] OCTET STRING OPTIONAL, + -- Used to identify the media stream within the current CIN, typically in case of + -- multiple media streams communications + -- May be used to correlate each media stream with the relevant SDP media description of IRI + -- May contain c= and m= lines extracts for instance + mMCCprotocol [4] MMCCprotocol OPTIONAL + -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) + -- Absence means mMCCContents contains RTP/RTCP packets +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ..., + tcpFrame(4), + -- IP header is missing + artificialRtpFrame(5), + -- UDP and IP headers are missing, artificial RTP frame has been added + udptlFrame(6) + -- UDP and IP headers are missing +} + +MMCCprotocol ::= ENUMERATED +{ + rTP(0), + -- mMCCContents parameter contains RTP/RTCP packets + mSRP(1), + -- mMCCContents parameter contains MSRP packets + ..., + uDPTL(2) + -- mMCCContents parameter contains UDPTL packets +} + +-- ======================================================== +-- Intercept-related information for IP Multimedia sessions +-- ======================================================== + +IPMMIRI ::= SEQUENCE +{ + iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIContents [1] IPIRIContents, + ..., + targetLocation [2] Location OPTIONAL, + -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 + additionalSignalling [3] SEQUENCE OF AdditionalSignalling OPTIONAL + -- The use of this parameter is defined in clause 5.2.5 +} + +IPIRIContents ::= CHOICE +{ + originalIPMMMessage [0] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + sIPMessage [1] SIPMessage, + -- Copy of the SIP content and the source and destination IP address + h323Message [2] H323Message, + -- Copy of the H.323 content and the source and destination IP address + ..., + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, + -- This parameter is used according to national regulations + -- This parameter shall be delivered as an IRI-Report-record + xCAPMessage [4] OCTET STRING + -- Copy of the XCAP message including all HTTP headers and contents +} + +SIPMessage ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + sIPContent [2] OCTET STRING, + ... +} + +H323Message ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + h323Content [2] H323MessageContent, + ... +} + +H323MessageContent ::= CHOICE +{ + h225CSMessageContent [0] OCTET STRING, + h225RASMessageContent [1] OCTET STRING, + h245MessageContent [2] OCTET STRING, + genericMessageContent [3] OCTET STRING, + ... +} + +NationalIPMMIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [16], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} + +AdditionalSignalling ::= CHOICE +{ + sipHeaderLine [0] OCTET STRING, + -- A SIP header line, eg: “Contact: tel:+123456789”. + ... +} + +END -- end of IP Multimedia PDU \ No newline at end of file -- GitLab From dc066c866d9a6d70539f33081aa6eeda66476909 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:32:24 +0100 Subject: [PATCH 105/208] TS 102 232-4 v3.3.1 (2017-03-22) agreed at LI#44 (Sophia-Antipolis, 2017-01-30) --- 102232-4/L2AccessPDU.asn | 2 +- 102232-4/portal/L2AccessPDU,ver7.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/102232-4/L2AccessPDU.asn b/102232-4/L2AccessPDU.asn index b17f3de..df562af 100644 --- a/102232-4/L2AccessPDU.asn +++ b/102232-4/L2AccessPDU.asn @@ -94,7 +94,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The Access_attempt timed-out or failed otherwise + -- The accessAttempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4). sessionEnd(5), diff --git a/102232-4/portal/L2AccessPDU,ver7.txt b/102232-4/portal/L2AccessPDU,ver7.txt index b17f3de..df562af 100644 --- a/102232-4/portal/L2AccessPDU,ver7.txt +++ b/102232-4/portal/L2AccessPDU,ver7.txt @@ -94,7 +94,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The Access_attempt timed-out or failed otherwise + -- The accessAttempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4). sessionEnd(5), -- GitLab From f835c49beae0441533bcca399e49f62113c803b8 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:32:48 +0100 Subject: [PATCH 107/208] TS 102 232-1 v3.13.1 (2017-03-22) agreed at LI#44 (Sophia-Antipolis, 2017-01-30) --- 102232-1/LI-PS-PDU.asn | 111 ++++++++++-------- ...I-PS-PDU,ver24.txt => LI-PS-PDU,ver25.txt} | 111 ++++++++++-------- 2 files changed, 126 insertions(+), 96 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver24.txt => LI-PS-PDU,ver25.txt} (89%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 3562e50..240f206 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version25(25)} DEFINITIONS IMPLICIT TAGS ::= @@ -14,7 +14,7 @@ IMPORTS IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} -- from TS 101 671 [4] HI1-Operation @@ -55,7 +55,6 @@ IMPORTS PstnIsdnIRI FROM PstnIsdnPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsIRIsContent, @@ -80,16 +79,16 @@ IMPORTS EPSLocation FROM EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the 3GPP release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - + -- from 3GPP TS 33.108 [9] IRI-Parameters, ConfIRIsContent 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, @@ -101,7 +100,7 @@ IMPORTS -- from 3GPP TS 33.108 [9] IRI-Parameters, - GCSEIRIsContent + GcseIRIsContent FROM GCSEHI2Operations {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 @@ -110,15 +109,15 @@ IMPORTS -- 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) + {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) + {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] @@ -142,17 +141,16 @@ IMPORTS -- 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 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. + -- 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. - -- 3GPP HI1 may be used with other services/networks than 3GPPs one. - + -- The implementation depends of national regulations or LEA/CSP negotiations. + -- 3GPP HI1 may be used with other services/networks than 3GPP's one. -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -170,13 +168,13 @@ IMPORTS -- from J-STD-025-B [39] LAESProtocol - FROM Laesp-j-std-025-b + FROM Laesp-j-std-025-b {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} CDMA2000LAESMessage - FROM CDMA2000CIIModule + FROM CDMA2000CIIModule {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} CCIPPacketHeader - FROM CDMA2000CCModule + FROM CDMA2000CCModule {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}; -- end of IMPORTS @@ -187,7 +185,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version24(24)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version25(25)} -- ==================== -- Top-level definition @@ -205,7 +203,7 @@ PSHeader ::= SEQUENCE lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, 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 @@ -227,7 +225,6 @@ Payload ::= CHOICE encryptionContainer [4] EncryptionContainer, threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation -- This structure may be functionally redundant with hI1-Operation from TS 101 671 - } TimeStampQualifier ::= ENUMERATED @@ -248,7 +245,7 @@ CommunicationIdentifier ::= SEQUENCE networkIdentifier [0] NetworkIdentifier, communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, -- in case of transport of HI1 messages not required - -- Mandatory for CC and IRI, with certain exceptions (see 5.2.4) + -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.4 ..., @@ -314,7 +311,7 @@ CCContents ::= CHOICE messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, messagingMMCC [18] MessagingMMCC, confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, @@ -335,24 +332,23 @@ MicroSecondTimeStamp ::= SEQUENCE IRIPayload ::= SEQUENCE { - iRIType [0] IRIType OPTIONAL, + iRIType [0] IRIType OPTIONAL, -- See clause 5.2.10 - timeStamp [1] GeneralizedTime OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, -- For aggregated payloads (see clause 6.2.3) - iRIContents [2] IRIContents, + iRIContents [2] IRIContents, ..., microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, -- 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 + 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 -- 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 + 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 -- relevant service-specific details - } IRIType ::= ENUMERATED @@ -426,7 +422,7 @@ ProSeIRI ::= CHOICE -- This structure may be commented out if not used { iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, - proseIRIsContent [1] ProSeIRIsContent, + proseIRIsContent [1] ProSeIRIsContent, ... } @@ -435,7 +431,7 @@ GcseIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, - gcseIRIsContent [1] GCSEIRIsContent, + gcseIRIsContent [1] GcseIRIsContent, ... } @@ -474,14 +470,19 @@ IntegrityCheck ::= SEQUENCE -- (see clause 7.2.3) checkValue [3] OCTET STRING, -- Network byte order - -- In case of a DSA/DSS signature, the r and s values shall be concatenated - ... + -- 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 + -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. + ..., + hashAlgorithm [4] HashAlgorithm OPTIONAL + -- Clarifies the hash function if checkType is hash(1). + -- If used, it shall be present for each checkType hash(1). } CheckType ::= ENUMERATED { hash(1), - -- SHA-1 hash value + -- hash value signature(2), -- DSS/DSA signature ... @@ -494,6 +495,20 @@ DataType ::= ENUMERATED ... } + +HashAlgorithm ::= ENUMERATED +{ + sHA-1(1), + -- Included for legacy/migration purposes only, not to be used for new implementations + sHA-256(2), + sHA-384(3), + sHA-512(4), + ... +} + + + + Option ::= CHOICE { pDUAcknowledgement [0] NULL, @@ -604,26 +619,26 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is TS 102 232 part 1 (the present document) } --- ================== +-- =================================== -- Common Parameters --- ================== +-- =================================== Location ::= SEQUENCE -- This is a common parameter, the use of this parameter is described in clause 4.5 { - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL - } 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 ... -} +} + END --end of LI-PS-PDU diff --git a/102232-1/portal/LI-PS-PDU,ver24.txt b/102232-1/portal/LI-PS-PDU,ver25.txt similarity index 89% rename from 102232-1/portal/LI-PS-PDU,ver24.txt rename to 102232-1/portal/LI-PS-PDU,ver25.txt index 3562e50..240f206 100644 --- a/102232-1/portal/LI-PS-PDU,ver24.txt +++ b/102232-1/portal/LI-PS-PDU,ver25.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version25(25)} DEFINITIONS IMPLICIT TAGS ::= @@ -14,7 +14,7 @@ IMPORTS IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} -- from TS 101 671 [4] HI1-Operation @@ -55,7 +55,6 @@ IMPORTS PstnIsdnIRI FROM PstnIsdnPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsIRIsContent, @@ -80,16 +79,16 @@ IMPORTS EPSLocation FROM EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the 3GPP release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - + -- from 3GPP TS 33.108 [9] IRI-Parameters, ConfIRIsContent 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, @@ -101,7 +100,7 @@ IMPORTS -- from 3GPP TS 33.108 [9] IRI-Parameters, - GCSEIRIsContent + GcseIRIsContent FROM GCSEHI2Operations {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 @@ -110,15 +109,15 @@ IMPORTS -- 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) + {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) + {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] @@ -142,17 +141,16 @@ IMPORTS -- 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 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. + -- 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. - -- 3GPP HI1 may be used with other services/networks than 3GPPs one. - + -- The implementation depends of national regulations or LEA/CSP negotiations. + -- 3GPP HI1 may be used with other services/networks than 3GPP's one. -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -170,13 +168,13 @@ IMPORTS -- from J-STD-025-B [39] LAESProtocol - FROM Laesp-j-std-025-b + FROM Laesp-j-std-025-b {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} CDMA2000LAESMessage - FROM CDMA2000CIIModule + FROM CDMA2000CIIModule {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} CCIPPacketHeader - FROM CDMA2000CCModule + FROM CDMA2000CCModule {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}; -- end of IMPORTS @@ -187,7 +185,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version24(24)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version25(25)} -- ==================== -- Top-level definition @@ -205,7 +203,7 @@ PSHeader ::= SEQUENCE lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, 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 @@ -227,7 +225,6 @@ Payload ::= CHOICE encryptionContainer [4] EncryptionContainer, threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation -- This structure may be functionally redundant with hI1-Operation from TS 101 671 - } TimeStampQualifier ::= ENUMERATED @@ -248,7 +245,7 @@ CommunicationIdentifier ::= SEQUENCE networkIdentifier [0] NetworkIdentifier, communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, -- in case of transport of HI1 messages not required - -- Mandatory for CC and IRI, with certain exceptions (see 5.2.4) + -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.4 ..., @@ -314,7 +311,7 @@ CCContents ::= CHOICE messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, messagingMMCC [18] MessagingMMCC, confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, @@ -335,24 +332,23 @@ MicroSecondTimeStamp ::= SEQUENCE IRIPayload ::= SEQUENCE { - iRIType [0] IRIType OPTIONAL, + iRIType [0] IRIType OPTIONAL, -- See clause 5.2.10 - timeStamp [1] GeneralizedTime OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, -- For aggregated payloads (see clause 6.2.3) - iRIContents [2] IRIContents, + iRIContents [2] IRIContents, ..., microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, -- 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 + 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 -- 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 + 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 -- relevant service-specific details - } IRIType ::= ENUMERATED @@ -426,7 +422,7 @@ ProSeIRI ::= CHOICE -- This structure may be commented out if not used { iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, - proseIRIsContent [1] ProSeIRIsContent, + proseIRIsContent [1] ProSeIRIsContent, ... } @@ -435,7 +431,7 @@ GcseIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, - gcseIRIsContent [1] GCSEIRIsContent, + gcseIRIsContent [1] GcseIRIsContent, ... } @@ -474,14 +470,19 @@ IntegrityCheck ::= SEQUENCE -- (see clause 7.2.3) checkValue [3] OCTET STRING, -- Network byte order - -- In case of a DSA/DSS signature, the r and s values shall be concatenated - ... + -- 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 + -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. + ..., + hashAlgorithm [4] HashAlgorithm OPTIONAL + -- Clarifies the hash function if checkType is hash(1). + -- If used, it shall be present for each checkType hash(1). } CheckType ::= ENUMERATED { hash(1), - -- SHA-1 hash value + -- hash value signature(2), -- DSS/DSA signature ... @@ -494,6 +495,20 @@ DataType ::= ENUMERATED ... } + +HashAlgorithm ::= ENUMERATED +{ + sHA-1(1), + -- Included for legacy/migration purposes only, not to be used for new implementations + sHA-256(2), + sHA-384(3), + sHA-512(4), + ... +} + + + + Option ::= CHOICE { pDUAcknowledgement [0] NULL, @@ -604,26 +619,26 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is TS 102 232 part 1 (the present document) } --- ================== +-- =================================== -- Common Parameters --- ================== +-- =================================== Location ::= SEQUENCE -- This is a common parameter, the use of this parameter is described in clause 4.5 { - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL - } 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 ... -} +} + END --end of LI-PS-PDU -- GitLab From 60d9a1048e5a5947f4a776166f86163f4cf00aa0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:32:56 +0100 Subject: [PATCH 108/208] TS 103 280 v2.1.1 (2017-08-04) agreed at LI#45 (Tallinn, 2017-06-20) --- 103280/TS_103_280.asn1 | 44 ++++++++++++++- 103280/TS_103_280.xsd | 26 ++++++--- 103280/portal/TS_103_280_v010201.asn1 | 14 ----- 103280/portal/TS_103_280_v020101.asn1 | 54 +++++++++++++++++++ ...280_v010101.xsd => TS_103_280_v020101.xsd} | 26 ++++++--- 5 files changed, 132 insertions(+), 32 deletions(-) delete mode 100644 103280/portal/TS_103_280_v010201.asn1 create mode 100644 103280/portal/TS_103_280_v020101.asn1 rename 103280/portal/{TS_103_280_v010101.xsd => TS_103_280_v020101.xsd} (89%) diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1 index 406dc28..e1d9936 100644 --- a/103280/TS_103_280.asn1 +++ b/103280/TS_103_280.asn1 @@ -1,14 +1,54 @@ Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -- Object Identifier definitions -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} -- Common Parameter: LIID (as defined in clause 6) LIID ::= OCTET STRING (SIZE (1..25)) +-- Common Parameter: TCPPort (as defined in clause 6) + +TCPPort ::= INTEGER (1..65535) + +-- Common Parameter: TCPPortRange (as defined in clause 6) + +TCPPortRange ::= SEQUENCE +{ + start [0] TCPPort, + end [1] TCPPort +} + +-- Common Parameter: UDPPort (as defined in clause 6) + +UDPPort ::= INTEGER (0..65535) + +-- Common Parameter: UDPPortRange (as defined in clause 6) + +UDPPortRange ::= SEQUENCE +{ + start [0] UDPPort, + end [1] UDPPort +} + +-- Common Parameter: Port (as defined in clause 6) + +Port ::= CHOICE +{ + tCPPort [0] TCPPort, + uDPPort [1] UDPPort +} + +-- Common Parameter: PortRange (as defined clause 6) + +PortRange ::= CHOICE +{ + tCPPortRange [0] TCPPortRange, + uDPPortRange [1] UDPPortRange +} + END diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index a99f0b0..23d5c12 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -1,5 +1,5 @@ - + @@ -42,7 +42,7 @@ - + @@ -80,13 +80,13 @@ - + - + @@ -116,25 +116,25 @@ - + - + - + - + @@ -155,4 +155,14 @@ + + + + + + + + + + diff --git a/103280/portal/TS_103_280_v010201.asn1 b/103280/portal/TS_103_280_v010201.asn1 deleted file mode 100644 index 406dc28..0000000 --- a/103280/portal/TS_103_280_v010201.asn1 +++ /dev/null @@ -1,14 +0,0 @@ -Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} - -DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN - --- Object Identifier definitions - -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version121(121)} - --- Common Parameter: LIID (as defined in clause 6) - -LIID ::= OCTET STRING (SIZE (1..25)) - -END diff --git a/103280/portal/TS_103_280_v020101.asn1 b/103280/portal/TS_103_280_v020101.asn1 new file mode 100644 index 0000000..e1d9936 --- /dev/null +++ b/103280/portal/TS_103_280_v020101.asn1 @@ -0,0 +1,54 @@ +Common-Parameters +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + +DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN + +-- Object Identifier definitions + +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + +-- Common Parameter: LIID (as defined in clause 6) + +LIID ::= OCTET STRING (SIZE (1..25)) + +-- Common Parameter: TCPPort (as defined in clause 6) + +TCPPort ::= INTEGER (1..65535) + +-- Common Parameter: TCPPortRange (as defined in clause 6) + +TCPPortRange ::= SEQUENCE +{ + start [0] TCPPort, + end [1] TCPPort +} + +-- Common Parameter: UDPPort (as defined in clause 6) + +UDPPort ::= INTEGER (0..65535) + +-- Common Parameter: UDPPortRange (as defined in clause 6) + +UDPPortRange ::= SEQUENCE +{ + start [0] UDPPort, + end [1] UDPPort +} + +-- Common Parameter: Port (as defined in clause 6) + +Port ::= CHOICE +{ + tCPPort [0] TCPPort, + uDPPort [1] UDPPort +} + +-- Common Parameter: PortRange (as defined clause 6) + +PortRange ::= CHOICE +{ + tCPPortRange [0] TCPPortRange, + uDPPortRange [1] UDPPortRange +} + +END diff --git a/103280/portal/TS_103_280_v010101.xsd b/103280/portal/TS_103_280_v020101.xsd similarity index 89% rename from 103280/portal/TS_103_280_v010101.xsd rename to 103280/portal/TS_103_280_v020101.xsd index a99f0b0..23d5c12 100644 --- a/103280/portal/TS_103_280_v010101.xsd +++ b/103280/portal/TS_103_280_v020101.xsd @@ -1,5 +1,5 @@ - + @@ -42,7 +42,7 @@ - + @@ -80,13 +80,13 @@ - + - + @@ -116,25 +116,25 @@ - + - + - + - + @@ -155,4 +155,14 @@ + + + + + + + + + + -- GitLab From 50741f26213ccb2c66fe1c32487964b506bcdefb Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:33:00 +0100 Subject: [PATCH 109/208] TS 102 657 v1.19.1 (2017-08-10) agreed at LI#45 (Tallinn, 2017-06-20) --- 102657/RDMessage.asn | 8 +++++--- 102657/RDMessage.xsd | 5 +++-- 102657/portal/{RDMessagever18.txt => RDMessagever19.txt} | 8 +++++--- 102657/portal/{RDMessagever18.xsd => RDMessagever19.xsd} | 5 +++-- 4 files changed, 16 insertions(+), 10 deletions(-) rename 102657/portal/{RDMessagever18.txt => RDMessagever19.txt} (99%) rename 102657/portal/{RDMessagever18.xsd => RDMessagever19.xsd} (99%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 4b2d31b..6b386cf 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version18(18)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version19(19)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version18(18)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version19(19)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -1942,7 +1942,9 @@ PaniHeaderInfo ::= SEQUENCE paniTime [5] GeneralizedTime OPTIONAL, -- indicates the time when the location was reported at the start of the session, -- or during or at the end of the session if the location is retained for the event - ... + ..., + paniHeaderContent [6] OCTET STRING OPTIONAL + -- Complete content of the P-Access-Network-Info header field } diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index b337537..f46fb92 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.18.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.19.1 @@ -2755,6 +2755,7 @@ + diff --git a/102657/portal/RDMessagever18.txt b/102657/portal/RDMessagever19.txt similarity index 99% rename from 102657/portal/RDMessagever18.txt rename to 102657/portal/RDMessagever19.txt index 4b2d31b..6b386cf 100644 --- a/102657/portal/RDMessagever18.txt +++ b/102657/portal/RDMessagever19.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version18(18)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version19(19)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version18(18)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version19(19)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -1942,7 +1942,9 @@ PaniHeaderInfo ::= SEQUENCE paniTime [5] GeneralizedTime OPTIONAL, -- indicates the time when the location was reported at the start of the session, -- or during or at the end of the session if the location is retained for the event - ... + ..., + paniHeaderContent [6] OCTET STRING OPTIONAL + -- Complete content of the P-Access-Network-Info header field } diff --git a/102657/portal/RDMessagever18.xsd b/102657/portal/RDMessagever19.xsd similarity index 99% rename from 102657/portal/RDMessagever18.xsd rename to 102657/portal/RDMessagever19.xsd index b337537..f46fb92 100644 --- a/102657/portal/RDMessagever18.xsd +++ b/102657/portal/RDMessagever19.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.18.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.19.1 @@ -2755,6 +2755,7 @@ + -- GitLab From 519226ee7c6f62e5fbc7cc89c17a327765d9a1b2 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:33:07 +0100 Subject: [PATCH 111/208] TS 102 232-3 v3.6.1 (2017-08-02) agreed at LI#45 (Tallinn, 2017-06-20) --- 102232-3/IPAccessPDU.asn | 10 +++++----- .../{IPAccessPDU,ver11.txt => IPAccessPDU,ver12.txt} | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) rename 102232-3/portal/{IPAccessPDU,ver11.txt => IPAccessPDU,ver12.txt} (97%) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index af4fc5e..4b6ce37 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version11(11)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version12(12)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -20,9 +20,9 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -124,7 +124,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The Access_attempt timed-out or failed otherwise + -- The accessAttempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4) sessionEnd(5), diff --git a/102232-3/portal/IPAccessPDU,ver11.txt b/102232-3/portal/IPAccessPDU,ver12.txt similarity index 97% rename from 102232-3/portal/IPAccessPDU,ver11.txt rename to 102232-3/portal/IPAccessPDU,ver12.txt index af4fc5e..4b6ce37 100644 --- a/102232-3/portal/IPAccessPDU,ver11.txt +++ b/102232-3/portal/IPAccessPDU,ver12.txt @@ -1,5 +1,5 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version11(11)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version12(12)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -20,9 +20,9 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version11(11) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -124,7 +124,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The Access_attempt timed-out or failed otherwise + -- The accessAttempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4) sessionEnd(5), -- GitLab From f3980d323984d5c544e9aee5750d0b96d87444dd Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:33:20 +0100 Subject: [PATCH 113/208] TS 103 221-1 v1.1.1 (2017-10-26) agreed at LI#46 (Rotterdam, 2017-10-03) --- 103221-1/TS_103_221_01.xsd | 825 ++++++++++++++++++ .../examples/ActivateTaskRequest_example.xml | 22 + .../examples/ActivateTaskResponse_example.xml | 11 + .../CreateDestinationRequest_example.xml | 24 + .../CreateDestinationResponse_example.xml | 11 + .../DeactivateTaskRequest_example.xml | 11 + .../DeactivateTaskResponse_example.xml | 11 + .../examples/GetAllDetailsRequest_example.xml | 10 + .../GetAllDetailsResponse_example.xml | 56 ++ .../GetDestinationDetailsRequest_example.xml | 11 + .../GetDestinationDetailsResponse_example.xml | 30 + .../examples/GetNEStatusRequest_example.xml | 10 + .../examples/GetNEStatusResponse_example.xml | 14 + .../GetTaskDetailsRequest_example.xml | 11 + .../GetTaskDetailsResponse_example.xml | 28 + .../examples/KeepaliveRequest_example.xml | 10 + .../examples/KeepaliveResponse_example.xml | 11 + .../ListAllDetailsRequest_example.xml | 10 + .../ListAllDetailsResponse_example.xml | 16 + .../examples/ModifyTaskRequest_example.xml | 22 + .../examples/ModifyTaskResponse_example.xml | 11 + 103221-1/examples/PingRequest_example.xml | 10 + 103221-1/examples/PingResponse_example.xml | 11 + .../RemoveAllDestinationsRequest_example.xml | 10 + .../RemoveAllDestinationsResponse_example.xml | 11 + .../RemoveDestinationRequest_example.xml | 11 + .../RemoveDestinationResponse_example.xml | 11 + .../ReportDestinationIssueRequest_example.xml | 13 + ...ReportDestinationIssueResponse_example.xml | 11 + .../examples/ReportNEIssueRequest_example.xml | 12 + .../ReportNEIssueResponse_example.xml | 11 + .../ReportTaskIssueRequest_example.xml | 13 + .../ReportTaskIssueResponse_example.xml | 11 + 103221-1/portal/TS_103_221_01_v010101.xsd | 825 ++++++++++++++++++ .../output/ActivateTaskRequest_example.xml | 22 + .../output/ActivateTaskResponse_example.xml | 11 + .../CreateDestinationRequest_example.xml | 24 + .../CreateDestinationResponse_example.xml | 11 + .../output/DeactivateTaskRequest_example.xml | 11 + .../output/DeactivateTaskResponse_example.xml | 11 + .../output/GetAllDetailsRequest_example.xml | 10 + .../output/GetAllDetailsResponse_example.xml | 56 ++ .../GetDestinationDetailsRequest_example.xml | 11 + .../GetDestinationDetailsResponse_example.xml | 30 + .../output/GetNEStatusRequest_example.xml | 10 + .../output/GetNEStatusResponse_example.xml | 14 + .../output/GetTaskDetailsRequest_example.xml | 11 + .../output/GetTaskDetailsResponse_example.xml | 28 + .../output/KeepaliveRequest_example.xml | 10 + .../output/KeepaliveResponse_example.xml | 11 + .../output/ListAllDetailsRequest_example.xml | 10 + .../output/ListAllDetailsResponse_example.xml | 16 + .../output/ModifyTaskRequest_example.xml | 22 + .../output/ModifyTaskResponse_example.xml | 11 + .../portal/output/PingRequest_example.xml | 10 + .../portal/output/PingResponse_example.xml | 11 + .../RemoveAllDestinationsRequest_example.xml | 10 + .../RemoveAllDestinationsResponse_example.xml | 11 + .../RemoveDestinationRequest_example.xml | 11 + .../RemoveDestinationResponse_example.xml | 11 + .../ReportDestinationIssueRequest_example.xml | 13 + ...ReportDestinationIssueResponse_example.xml | 11 + .../output/ReportNEIssueRequest_example.xml | 12 + .../output/ReportNEIssueResponse_example.xml | 11 + .../output/ReportTaskIssueRequest_example.xml | 13 + .../ReportTaskIssueResponse_example.xml | 11 + 66 files changed, 2600 insertions(+) create mode 100644 103221-1/TS_103_221_01.xsd create mode 100644 103221-1/examples/ActivateTaskRequest_example.xml create mode 100644 103221-1/examples/ActivateTaskResponse_example.xml create mode 100644 103221-1/examples/CreateDestinationRequest_example.xml create mode 100644 103221-1/examples/CreateDestinationResponse_example.xml create mode 100644 103221-1/examples/DeactivateTaskRequest_example.xml create mode 100644 103221-1/examples/DeactivateTaskResponse_example.xml create mode 100644 103221-1/examples/GetAllDetailsRequest_example.xml create mode 100644 103221-1/examples/GetAllDetailsResponse_example.xml create mode 100644 103221-1/examples/GetDestinationDetailsRequest_example.xml create mode 100644 103221-1/examples/GetDestinationDetailsResponse_example.xml create mode 100644 103221-1/examples/GetNEStatusRequest_example.xml create mode 100644 103221-1/examples/GetNEStatusResponse_example.xml create mode 100644 103221-1/examples/GetTaskDetailsRequest_example.xml create mode 100644 103221-1/examples/GetTaskDetailsResponse_example.xml create mode 100644 103221-1/examples/KeepaliveRequest_example.xml create mode 100644 103221-1/examples/KeepaliveResponse_example.xml create mode 100644 103221-1/examples/ListAllDetailsRequest_example.xml create mode 100644 103221-1/examples/ListAllDetailsResponse_example.xml create mode 100644 103221-1/examples/ModifyTaskRequest_example.xml create mode 100644 103221-1/examples/ModifyTaskResponse_example.xml create mode 100644 103221-1/examples/PingRequest_example.xml create mode 100644 103221-1/examples/PingResponse_example.xml create mode 100644 103221-1/examples/RemoveAllDestinationsRequest_example.xml create mode 100644 103221-1/examples/RemoveAllDestinationsResponse_example.xml create mode 100644 103221-1/examples/RemoveDestinationRequest_example.xml create mode 100644 103221-1/examples/RemoveDestinationResponse_example.xml create mode 100644 103221-1/examples/ReportDestinationIssueRequest_example.xml create mode 100644 103221-1/examples/ReportDestinationIssueResponse_example.xml create mode 100644 103221-1/examples/ReportNEIssueRequest_example.xml create mode 100644 103221-1/examples/ReportNEIssueResponse_example.xml create mode 100644 103221-1/examples/ReportTaskIssueRequest_example.xml create mode 100644 103221-1/examples/ReportTaskIssueResponse_example.xml create mode 100644 103221-1/portal/TS_103_221_01_v010101.xsd create mode 100644 103221-1/portal/output/ActivateTaskRequest_example.xml create mode 100644 103221-1/portal/output/ActivateTaskResponse_example.xml create mode 100644 103221-1/portal/output/CreateDestinationRequest_example.xml create mode 100644 103221-1/portal/output/CreateDestinationResponse_example.xml create mode 100644 103221-1/portal/output/DeactivateTaskRequest_example.xml create mode 100644 103221-1/portal/output/DeactivateTaskResponse_example.xml create mode 100644 103221-1/portal/output/GetAllDetailsRequest_example.xml create mode 100644 103221-1/portal/output/GetAllDetailsResponse_example.xml create mode 100644 103221-1/portal/output/GetDestinationDetailsRequest_example.xml create mode 100644 103221-1/portal/output/GetDestinationDetailsResponse_example.xml create mode 100644 103221-1/portal/output/GetNEStatusRequest_example.xml create mode 100644 103221-1/portal/output/GetNEStatusResponse_example.xml create mode 100644 103221-1/portal/output/GetTaskDetailsRequest_example.xml create mode 100644 103221-1/portal/output/GetTaskDetailsResponse_example.xml create mode 100644 103221-1/portal/output/KeepaliveRequest_example.xml create mode 100644 103221-1/portal/output/KeepaliveResponse_example.xml create mode 100644 103221-1/portal/output/ListAllDetailsRequest_example.xml create mode 100644 103221-1/portal/output/ListAllDetailsResponse_example.xml create mode 100644 103221-1/portal/output/ModifyTaskRequest_example.xml create mode 100644 103221-1/portal/output/ModifyTaskResponse_example.xml create mode 100644 103221-1/portal/output/PingRequest_example.xml create mode 100644 103221-1/portal/output/PingResponse_example.xml create mode 100644 103221-1/portal/output/RemoveAllDestinationsRequest_example.xml create mode 100644 103221-1/portal/output/RemoveAllDestinationsResponse_example.xml create mode 100644 103221-1/portal/output/RemoveDestinationRequest_example.xml create mode 100644 103221-1/portal/output/RemoveDestinationResponse_example.xml create mode 100644 103221-1/portal/output/ReportDestinationIssueRequest_example.xml create mode 100644 103221-1/portal/output/ReportDestinationIssueResponse_example.xml create mode 100644 103221-1/portal/output/ReportNEIssueRequest_example.xml create mode 100644 103221-1/portal/output/ReportNEIssueResponse_example.xml create mode 100644 103221-1/portal/output/ReportTaskIssueRequest_example.xml create mode 100644 103221-1/portal/output/ReportTaskIssueResponse_example.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd new file mode 100644 index 0000000..a0bb30b --- /dev/null +++ b/103221-1/TS_103_221_01.xsd @@ -0,0 +1,825 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/ActivateTaskRequest_example.xml b/103221-1/examples/ActivateTaskRequest_example.xml new file mode 100644 index 0000000..934993e --- /dev/null +++ b/103221-1/examples/ActivateTaskRequest_example.xml @@ -0,0 +1,22 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.1.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + 447700900000 + + + X2andX3 + + 19867c20-8c94-473e-b9cd-8b72b7b05fd4 + + + + diff --git a/103221-1/examples/ActivateTaskResponse_example.xml b/103221-1/examples/ActivateTaskResponse_example.xml new file mode 100644 index 0000000..9d4aa09 --- /dev/null +++ b/103221-1/examples/ActivateTaskResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.401571Z + v1.1.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + AcknowledgedAndCompleted + + diff --git a/103221-1/examples/CreateDestinationRequest_example.xml b/103221-1/examples/CreateDestinationRequest_example.xml new file mode 100644 index 0000000..6579d01 --- /dev/null +++ b/103221-1/examples/CreateDestinationRequest_example.xml @@ -0,0 +1,24 @@ + + + + admfID + neID + 2017-10-06T18:46:21.446605Z + v1.1.1 + 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + X2andX3 + + + + 192.0.2.2 + + + 12345 + + + + + + diff --git a/103221-1/examples/CreateDestinationResponse_example.xml b/103221-1/examples/CreateDestinationResponse_example.xml new file mode 100644 index 0000000..0000489 --- /dev/null +++ b/103221-1/examples/CreateDestinationResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.446605Z + v1.1.1 + 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 + AcknowledgedAndCompleted + + diff --git a/103221-1/examples/DeactivateTaskRequest_example.xml b/103221-1/examples/DeactivateTaskRequest_example.xml new file mode 100644 index 0000000..c9e759f --- /dev/null +++ b/103221-1/examples/DeactivateTaskRequest_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.429594Z + v1.1.1 + 3da0df97-7bd5-4413-936d-74bebd7512fe + 29f28e1c-f230-486a-a860-f5a784ab9172 + + diff --git a/103221-1/examples/DeactivateTaskResponse_example.xml b/103221-1/examples/DeactivateTaskResponse_example.xml new file mode 100644 index 0000000..5a377d1 --- /dev/null +++ b/103221-1/examples/DeactivateTaskResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.430594Z + v1.1.1 + 3da0df97-7bd5-4413-936d-74bebd7512fe + AcknowledgedAndCompleted + + diff --git a/103221-1/examples/GetAllDetailsRequest_example.xml b/103221-1/examples/GetAllDetailsRequest_example.xml new file mode 100644 index 0000000..99e585a --- /dev/null +++ b/103221-1/examples/GetAllDetailsRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.496243Z + v1.1.1 + bfd0c982-b7d6-4a8e-80a0-89dab964aafd + + diff --git a/103221-1/examples/GetAllDetailsResponse_example.xml b/103221-1/examples/GetAllDetailsResponse_example.xml new file mode 100644 index 0000000..93663ce --- /dev/null +++ b/103221-1/examples/GetAllDetailsResponse_example.xml @@ -0,0 +1,56 @@ + + + + admfID + neID + 2017-10-06T18:46:21.496743Z + v1.1.1 + bfd0c982-b7d6-4a8e-80a0-89dab964aafd + + OK + + + + + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + 447700900000 + + + X2andX3 + + 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9 + + + + complete + + + + + + + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + X2andX3 + + + + 192.0.2.2 + + + 12345 + + + + + + activeAndWorking + + + + + + diff --git a/103221-1/examples/GetDestinationDetailsRequest_example.xml b/103221-1/examples/GetDestinationDetailsRequest_example.xml new file mode 100644 index 0000000..cc183c3 --- /dev/null +++ b/103221-1/examples/GetDestinationDetailsRequest_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.462616Z + v1.1.1 + 7de5709c-8269-417f-a123-7087d3971f8c + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + + diff --git a/103221-1/examples/GetDestinationDetailsResponse_example.xml b/103221-1/examples/GetDestinationDetailsResponse_example.xml new file mode 100644 index 0000000..080274d --- /dev/null +++ b/103221-1/examples/GetDestinationDetailsResponse_example.xml @@ -0,0 +1,30 @@ + + + + admfID + neID + 2017-10-06T18:46:21.462616Z + v1.1.1 + 7de5709c-8269-417f-a123-7087d3971f8c + + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + X2andX3 + + + + 192.0.2.2 + + + 12345 + + + + + + activeAndWorking + + + + + diff --git a/103221-1/examples/GetNEStatusRequest_example.xml b/103221-1/examples/GetNEStatusRequest_example.xml new file mode 100644 index 0000000..556e7f0 --- /dev/null +++ b/103221-1/examples/GetNEStatusRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.487158Z + v1.1.1 + 93d571cb-3793-4385-8b59-2c14097ed743 + + diff --git a/103221-1/examples/GetNEStatusResponse_example.xml b/103221-1/examples/GetNEStatusResponse_example.xml new file mode 100644 index 0000000..8dc6247 --- /dev/null +++ b/103221-1/examples/GetNEStatusResponse_example.xml @@ -0,0 +1,14 @@ + + + + admfID + neID + 2017-10-06T18:46:21.488659Z + v1.1.1 + 93d571cb-3793-4385-8b59-2c14097ed743 + + OK + + + + diff --git a/103221-1/examples/GetTaskDetailsRequest_example.xml b/103221-1/examples/GetTaskDetailsRequest_example.xml new file mode 100644 index 0000000..0185b1a --- /dev/null +++ b/103221-1/examples/GetTaskDetailsRequest_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.418584Z + v1.1.1 + 609dcabd-5ab1-4c95-9681-a24681f105ac + 29f28e1c-f230-486a-a860-f5a784ab9172 + + diff --git a/103221-1/examples/GetTaskDetailsResponse_example.xml b/103221-1/examples/GetTaskDetailsResponse_example.xml new file mode 100644 index 0000000..b80bd03 --- /dev/null +++ b/103221-1/examples/GetTaskDetailsResponse_example.xml @@ -0,0 +1,28 @@ + + + + admfID + neID + 2017-10-06T18:46:21.420587Z + v1.1.1 + 609dcabd-5ab1-4c95-9681-a24681f105ac + + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + 447700900000 + + + X2andX3 + + 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9 + + + + complete + + + + + diff --git a/103221-1/examples/KeepaliveRequest_example.xml b/103221-1/examples/KeepaliveRequest_example.xml new file mode 100644 index 0000000..1bdbdc3 --- /dev/null +++ b/103221-1/examples/KeepaliveRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.541784Z + v1.1.1 + 6420aa0f-e5e6-4a32-9dff-15b836589257 + + diff --git a/103221-1/examples/KeepaliveResponse_example.xml b/103221-1/examples/KeepaliveResponse_example.xml new file mode 100644 index 0000000..5ed4d81 --- /dev/null +++ b/103221-1/examples/KeepaliveResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.542783Z + v1.1.1 + 6420aa0f-e5e6-4a32-9dff-15b836589257 + AcknowledgedAndCompleted + + diff --git a/103221-1/examples/ListAllDetailsRequest_example.xml b/103221-1/examples/ListAllDetailsRequest_example.xml new file mode 100644 index 0000000..229a918 --- /dev/null +++ b/103221-1/examples/ListAllDetailsRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.50833Z + v1.1.1 + 09529160-2e44-49c6-bf54-204ca5edcfab + + diff --git a/103221-1/examples/ListAllDetailsResponse_example.xml b/103221-1/examples/ListAllDetailsResponse_example.xml new file mode 100644 index 0000000..a1173f8 --- /dev/null +++ b/103221-1/examples/ListAllDetailsResponse_example.xml @@ -0,0 +1,16 @@ + + + + admfID + neID + 2017-10-06T18:46:21.50833Z + v1.1.1 + 09529160-2e44-49c6-bf54-204ca5edcfab + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + + + diff --git a/103221-1/examples/ModifyTaskRequest_example.xml b/103221-1/examples/ModifyTaskRequest_example.xml new file mode 100644 index 0000000..1db578f --- /dev/null +++ b/103221-1/examples/ModifyTaskRequest_example.xml @@ -0,0 +1,22 @@ + + + + admfID + neID + 2017-10-06T18:46:21.411587Z + v1.1.1 + fcfc97de-1c77-413d-9925-d1630acbf763 + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + 447700900000 + + + X2andX3 + + 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9 + + + + diff --git a/103221-1/examples/ModifyTaskResponse_example.xml b/103221-1/examples/ModifyTaskResponse_example.xml new file mode 100644 index 0000000..105124b --- /dev/null +++ b/103221-1/examples/ModifyTaskResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.411587Z + v1.1.1 + fcfc97de-1c77-413d-9925-d1630acbf763 + AcknowledgedAndCompleted + + diff --git a/103221-1/examples/PingRequest_example.xml b/103221-1/examples/PingRequest_example.xml new file mode 100644 index 0000000..6697d38 --- /dev/null +++ b/103221-1/examples/PingRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.547786Z + v1.1.1 + 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 + + diff --git a/103221-1/examples/PingResponse_example.xml b/103221-1/examples/PingResponse_example.xml new file mode 100644 index 0000000..fd927da --- /dev/null +++ b/103221-1/examples/PingResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.547786Z + v1.1.1 + 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 + AcknowledgedAndCompleted + + diff --git a/103221-1/examples/RemoveAllDestinationsRequest_example.xml b/103221-1/examples/RemoveAllDestinationsRequest_example.xml new file mode 100644 index 0000000..1a5c185 --- /dev/null +++ b/103221-1/examples/RemoveAllDestinationsRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.480627Z + v1.1.1 + 88611050-d8e2-4ada-96fc-626b5dbd9cdf + + diff --git a/103221-1/examples/RemoveAllDestinationsResponse_example.xml b/103221-1/examples/RemoveAllDestinationsResponse_example.xml new file mode 100644 index 0000000..ab392cc --- /dev/null +++ b/103221-1/examples/RemoveAllDestinationsResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.481629Z + v1.1.1 + 88611050-d8e2-4ada-96fc-626b5dbd9cdf + AcknowledgedAndCompleted + + diff --git a/103221-1/examples/RemoveDestinationRequest_example.xml b/103221-1/examples/RemoveDestinationRequest_example.xml new file mode 100644 index 0000000..66277d9 --- /dev/null +++ b/103221-1/examples/RemoveDestinationRequest_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.47363Z + v1.1.1 + 8c229735-9acf-43ed-8d72-71602625b349 + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + + diff --git a/103221-1/examples/RemoveDestinationResponse_example.xml b/103221-1/examples/RemoveDestinationResponse_example.xml new file mode 100644 index 0000000..b42246b --- /dev/null +++ b/103221-1/examples/RemoveDestinationResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.474625Z + v1.1.1 + 8c229735-9acf-43ed-8d72-71602625b349 + AcknowledgedAndCompleted + + diff --git a/103221-1/examples/ReportDestinationIssueRequest_example.xml b/103221-1/examples/ReportDestinationIssueRequest_example.xml new file mode 100644 index 0000000..52ba369 --- /dev/null +++ b/103221-1/examples/ReportDestinationIssueRequest_example.xml @@ -0,0 +1,13 @@ + + + + admfID + neID + 2017-10-06T18:46:21.526329Z + v1.1.1 + 7e3ff959-55b0-47bd-a417-0d0383252150 + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + NonTerminatingFault + Example destination issue + + diff --git a/103221-1/examples/ReportDestinationIssueResponse_example.xml b/103221-1/examples/ReportDestinationIssueResponse_example.xml new file mode 100644 index 0000000..f6f54a0 --- /dev/null +++ b/103221-1/examples/ReportDestinationIssueResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.526329Z + v1.1.1 + 7e3ff959-55b0-47bd-a417-0d0383252150 + AcknowledgedAndCompleted + + diff --git a/103221-1/examples/ReportNEIssueRequest_example.xml b/103221-1/examples/ReportNEIssueRequest_example.xml new file mode 100644 index 0000000..4f3a8a8 --- /dev/null +++ b/103221-1/examples/ReportNEIssueRequest_example.xml @@ -0,0 +1,12 @@ + + + + admfID + neID + 2017-10-06T18:46:21.531784Z + v1.1.1 + c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b + Warning + Example NE issue + + diff --git a/103221-1/examples/ReportNEIssueResponse_example.xml b/103221-1/examples/ReportNEIssueResponse_example.xml new file mode 100644 index 0000000..d234f89 --- /dev/null +++ b/103221-1/examples/ReportNEIssueResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.531784Z + v1.1.1 + c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b + AcknowledgedAndCompleted + + diff --git a/103221-1/examples/ReportTaskIssueRequest_example.xml b/103221-1/examples/ReportTaskIssueRequest_example.xml new file mode 100644 index 0000000..fe3fd82 --- /dev/null +++ b/103221-1/examples/ReportTaskIssueRequest_example.xml @@ -0,0 +1,13 @@ + + + + admfID + neID + 2017-10-06T18:46:21.516321Z + v1.1.1 + 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 + 29f28e1c-f230-486a-a860-f5a784ab9172 + NonTerminatingFault + Example task issue + + diff --git a/103221-1/examples/ReportTaskIssueResponse_example.xml b/103221-1/examples/ReportTaskIssueResponse_example.xml new file mode 100644 index 0000000..263a904 --- /dev/null +++ b/103221-1/examples/ReportTaskIssueResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.517323Z + v1.1.1 + 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/TS_103_221_01_v010101.xsd b/103221-1/portal/TS_103_221_01_v010101.xsd new file mode 100644 index 0000000..a0bb30b --- /dev/null +++ b/103221-1/portal/TS_103_221_01_v010101.xsd @@ -0,0 +1,825 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/portal/output/ActivateTaskRequest_example.xml b/103221-1/portal/output/ActivateTaskRequest_example.xml new file mode 100644 index 0000000..934993e --- /dev/null +++ b/103221-1/portal/output/ActivateTaskRequest_example.xml @@ -0,0 +1,22 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.1.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + 447700900000 + + + X2andX3 + + 19867c20-8c94-473e-b9cd-8b72b7b05fd4 + + + + diff --git a/103221-1/portal/output/ActivateTaskResponse_example.xml b/103221-1/portal/output/ActivateTaskResponse_example.xml new file mode 100644 index 0000000..9d4aa09 --- /dev/null +++ b/103221-1/portal/output/ActivateTaskResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.401571Z + v1.1.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/output/CreateDestinationRequest_example.xml b/103221-1/portal/output/CreateDestinationRequest_example.xml new file mode 100644 index 0000000..6579d01 --- /dev/null +++ b/103221-1/portal/output/CreateDestinationRequest_example.xml @@ -0,0 +1,24 @@ + + + + admfID + neID + 2017-10-06T18:46:21.446605Z + v1.1.1 + 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + X2andX3 + + + + 192.0.2.2 + + + 12345 + + + + + + diff --git a/103221-1/portal/output/CreateDestinationResponse_example.xml b/103221-1/portal/output/CreateDestinationResponse_example.xml new file mode 100644 index 0000000..0000489 --- /dev/null +++ b/103221-1/portal/output/CreateDestinationResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.446605Z + v1.1.1 + 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/output/DeactivateTaskRequest_example.xml b/103221-1/portal/output/DeactivateTaskRequest_example.xml new file mode 100644 index 0000000..c9e759f --- /dev/null +++ b/103221-1/portal/output/DeactivateTaskRequest_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.429594Z + v1.1.1 + 3da0df97-7bd5-4413-936d-74bebd7512fe + 29f28e1c-f230-486a-a860-f5a784ab9172 + + diff --git a/103221-1/portal/output/DeactivateTaskResponse_example.xml b/103221-1/portal/output/DeactivateTaskResponse_example.xml new file mode 100644 index 0000000..5a377d1 --- /dev/null +++ b/103221-1/portal/output/DeactivateTaskResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.430594Z + v1.1.1 + 3da0df97-7bd5-4413-936d-74bebd7512fe + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/output/GetAllDetailsRequest_example.xml b/103221-1/portal/output/GetAllDetailsRequest_example.xml new file mode 100644 index 0000000..99e585a --- /dev/null +++ b/103221-1/portal/output/GetAllDetailsRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.496243Z + v1.1.1 + bfd0c982-b7d6-4a8e-80a0-89dab964aafd + + diff --git a/103221-1/portal/output/GetAllDetailsResponse_example.xml b/103221-1/portal/output/GetAllDetailsResponse_example.xml new file mode 100644 index 0000000..93663ce --- /dev/null +++ b/103221-1/portal/output/GetAllDetailsResponse_example.xml @@ -0,0 +1,56 @@ + + + + admfID + neID + 2017-10-06T18:46:21.496743Z + v1.1.1 + bfd0c982-b7d6-4a8e-80a0-89dab964aafd + + OK + + + + + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + 447700900000 + + + X2andX3 + + 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9 + + + + complete + + + + + + + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + X2andX3 + + + + 192.0.2.2 + + + 12345 + + + + + + activeAndWorking + + + + + + diff --git a/103221-1/portal/output/GetDestinationDetailsRequest_example.xml b/103221-1/portal/output/GetDestinationDetailsRequest_example.xml new file mode 100644 index 0000000..cc183c3 --- /dev/null +++ b/103221-1/portal/output/GetDestinationDetailsRequest_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.462616Z + v1.1.1 + 7de5709c-8269-417f-a123-7087d3971f8c + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + + diff --git a/103221-1/portal/output/GetDestinationDetailsResponse_example.xml b/103221-1/portal/output/GetDestinationDetailsResponse_example.xml new file mode 100644 index 0000000..080274d --- /dev/null +++ b/103221-1/portal/output/GetDestinationDetailsResponse_example.xml @@ -0,0 +1,30 @@ + + + + admfID + neID + 2017-10-06T18:46:21.462616Z + v1.1.1 + 7de5709c-8269-417f-a123-7087d3971f8c + + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + X2andX3 + + + + 192.0.2.2 + + + 12345 + + + + + + activeAndWorking + + + + + diff --git a/103221-1/portal/output/GetNEStatusRequest_example.xml b/103221-1/portal/output/GetNEStatusRequest_example.xml new file mode 100644 index 0000000..556e7f0 --- /dev/null +++ b/103221-1/portal/output/GetNEStatusRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.487158Z + v1.1.1 + 93d571cb-3793-4385-8b59-2c14097ed743 + + diff --git a/103221-1/portal/output/GetNEStatusResponse_example.xml b/103221-1/portal/output/GetNEStatusResponse_example.xml new file mode 100644 index 0000000..8dc6247 --- /dev/null +++ b/103221-1/portal/output/GetNEStatusResponse_example.xml @@ -0,0 +1,14 @@ + + + + admfID + neID + 2017-10-06T18:46:21.488659Z + v1.1.1 + 93d571cb-3793-4385-8b59-2c14097ed743 + + OK + + + + diff --git a/103221-1/portal/output/GetTaskDetailsRequest_example.xml b/103221-1/portal/output/GetTaskDetailsRequest_example.xml new file mode 100644 index 0000000..0185b1a --- /dev/null +++ b/103221-1/portal/output/GetTaskDetailsRequest_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.418584Z + v1.1.1 + 609dcabd-5ab1-4c95-9681-a24681f105ac + 29f28e1c-f230-486a-a860-f5a784ab9172 + + diff --git a/103221-1/portal/output/GetTaskDetailsResponse_example.xml b/103221-1/portal/output/GetTaskDetailsResponse_example.xml new file mode 100644 index 0000000..b80bd03 --- /dev/null +++ b/103221-1/portal/output/GetTaskDetailsResponse_example.xml @@ -0,0 +1,28 @@ + + + + admfID + neID + 2017-10-06T18:46:21.420587Z + v1.1.1 + 609dcabd-5ab1-4c95-9681-a24681f105ac + + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + 447700900000 + + + X2andX3 + + 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9 + + + + complete + + + + + diff --git a/103221-1/portal/output/KeepaliveRequest_example.xml b/103221-1/portal/output/KeepaliveRequest_example.xml new file mode 100644 index 0000000..1bdbdc3 --- /dev/null +++ b/103221-1/portal/output/KeepaliveRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.541784Z + v1.1.1 + 6420aa0f-e5e6-4a32-9dff-15b836589257 + + diff --git a/103221-1/portal/output/KeepaliveResponse_example.xml b/103221-1/portal/output/KeepaliveResponse_example.xml new file mode 100644 index 0000000..5ed4d81 --- /dev/null +++ b/103221-1/portal/output/KeepaliveResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.542783Z + v1.1.1 + 6420aa0f-e5e6-4a32-9dff-15b836589257 + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/output/ListAllDetailsRequest_example.xml b/103221-1/portal/output/ListAllDetailsRequest_example.xml new file mode 100644 index 0000000..229a918 --- /dev/null +++ b/103221-1/portal/output/ListAllDetailsRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.50833Z + v1.1.1 + 09529160-2e44-49c6-bf54-204ca5edcfab + + diff --git a/103221-1/portal/output/ListAllDetailsResponse_example.xml b/103221-1/portal/output/ListAllDetailsResponse_example.xml new file mode 100644 index 0000000..a1173f8 --- /dev/null +++ b/103221-1/portal/output/ListAllDetailsResponse_example.xml @@ -0,0 +1,16 @@ + + + + admfID + neID + 2017-10-06T18:46:21.50833Z + v1.1.1 + 09529160-2e44-49c6-bf54-204ca5edcfab + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + + + diff --git a/103221-1/portal/output/ModifyTaskRequest_example.xml b/103221-1/portal/output/ModifyTaskRequest_example.xml new file mode 100644 index 0000000..1db578f --- /dev/null +++ b/103221-1/portal/output/ModifyTaskRequest_example.xml @@ -0,0 +1,22 @@ + + + + admfID + neID + 2017-10-06T18:46:21.411587Z + v1.1.1 + fcfc97de-1c77-413d-9925-d1630acbf763 + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + 447700900000 + + + X2andX3 + + 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9 + + + + diff --git a/103221-1/portal/output/ModifyTaskResponse_example.xml b/103221-1/portal/output/ModifyTaskResponse_example.xml new file mode 100644 index 0000000..105124b --- /dev/null +++ b/103221-1/portal/output/ModifyTaskResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.411587Z + v1.1.1 + fcfc97de-1c77-413d-9925-d1630acbf763 + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/output/PingRequest_example.xml b/103221-1/portal/output/PingRequest_example.xml new file mode 100644 index 0000000..6697d38 --- /dev/null +++ b/103221-1/portal/output/PingRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.547786Z + v1.1.1 + 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 + + diff --git a/103221-1/portal/output/PingResponse_example.xml b/103221-1/portal/output/PingResponse_example.xml new file mode 100644 index 0000000..fd927da --- /dev/null +++ b/103221-1/portal/output/PingResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.547786Z + v1.1.1 + 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/output/RemoveAllDestinationsRequest_example.xml b/103221-1/portal/output/RemoveAllDestinationsRequest_example.xml new file mode 100644 index 0000000..1a5c185 --- /dev/null +++ b/103221-1/portal/output/RemoveAllDestinationsRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2017-10-06T18:46:21.480627Z + v1.1.1 + 88611050-d8e2-4ada-96fc-626b5dbd9cdf + + diff --git a/103221-1/portal/output/RemoveAllDestinationsResponse_example.xml b/103221-1/portal/output/RemoveAllDestinationsResponse_example.xml new file mode 100644 index 0000000..ab392cc --- /dev/null +++ b/103221-1/portal/output/RemoveAllDestinationsResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.481629Z + v1.1.1 + 88611050-d8e2-4ada-96fc-626b5dbd9cdf + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/output/RemoveDestinationRequest_example.xml b/103221-1/portal/output/RemoveDestinationRequest_example.xml new file mode 100644 index 0000000..66277d9 --- /dev/null +++ b/103221-1/portal/output/RemoveDestinationRequest_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.47363Z + v1.1.1 + 8c229735-9acf-43ed-8d72-71602625b349 + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + + diff --git a/103221-1/portal/output/RemoveDestinationResponse_example.xml b/103221-1/portal/output/RemoveDestinationResponse_example.xml new file mode 100644 index 0000000..b42246b --- /dev/null +++ b/103221-1/portal/output/RemoveDestinationResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.474625Z + v1.1.1 + 8c229735-9acf-43ed-8d72-71602625b349 + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/output/ReportDestinationIssueRequest_example.xml b/103221-1/portal/output/ReportDestinationIssueRequest_example.xml new file mode 100644 index 0000000..52ba369 --- /dev/null +++ b/103221-1/portal/output/ReportDestinationIssueRequest_example.xml @@ -0,0 +1,13 @@ + + + + admfID + neID + 2017-10-06T18:46:21.526329Z + v1.1.1 + 7e3ff959-55b0-47bd-a417-0d0383252150 + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + NonTerminatingFault + Example destination issue + + diff --git a/103221-1/portal/output/ReportDestinationIssueResponse_example.xml b/103221-1/portal/output/ReportDestinationIssueResponse_example.xml new file mode 100644 index 0000000..f6f54a0 --- /dev/null +++ b/103221-1/portal/output/ReportDestinationIssueResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.526329Z + v1.1.1 + 7e3ff959-55b0-47bd-a417-0d0383252150 + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/output/ReportNEIssueRequest_example.xml b/103221-1/portal/output/ReportNEIssueRequest_example.xml new file mode 100644 index 0000000..4f3a8a8 --- /dev/null +++ b/103221-1/portal/output/ReportNEIssueRequest_example.xml @@ -0,0 +1,12 @@ + + + + admfID + neID + 2017-10-06T18:46:21.531784Z + v1.1.1 + c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b + Warning + Example NE issue + + diff --git a/103221-1/portal/output/ReportNEIssueResponse_example.xml b/103221-1/portal/output/ReportNEIssueResponse_example.xml new file mode 100644 index 0000000..d234f89 --- /dev/null +++ b/103221-1/portal/output/ReportNEIssueResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.531784Z + v1.1.1 + c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b + AcknowledgedAndCompleted + + diff --git a/103221-1/portal/output/ReportTaskIssueRequest_example.xml b/103221-1/portal/output/ReportTaskIssueRequest_example.xml new file mode 100644 index 0000000..fe3fd82 --- /dev/null +++ b/103221-1/portal/output/ReportTaskIssueRequest_example.xml @@ -0,0 +1,13 @@ + + + + admfID + neID + 2017-10-06T18:46:21.516321Z + v1.1.1 + 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 + 29f28e1c-f230-486a-a860-f5a784ab9172 + NonTerminatingFault + Example task issue + + diff --git a/103221-1/portal/output/ReportTaskIssueResponse_example.xml b/103221-1/portal/output/ReportTaskIssueResponse_example.xml new file mode 100644 index 0000000..263a904 --- /dev/null +++ b/103221-1/portal/output/ReportTaskIssueResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.517323Z + v1.1.1 + 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 + AcknowledgedAndCompleted + + -- GitLab From 62bb58241d3edd07bd0cef8b3d7e75cbafa1809c Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:33:32 +0100 Subject: [PATCH 115/208] TS 102 232-5 v3.8.1 (2017-11-23) agreed at LI#46 (Rotterdam, 2017-10-03) --- 102232-5/IPMultimediaPDU.asn | 18 +++++++----------- ...aPDU,ver9.txt => IPMultimediaPDU,ver10.txt} | 18 +++++++----------- 2 files changed, 14 insertions(+), 22 deletions(-) rename 102232-5/portal/{IPMultimediaPDU,ver9.txt => IPMultimediaPDU,ver10.txt} (92%) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 2a4507f..a14834a 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,19 +1,15 @@ -IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version9(9)} +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - -- from TS 102 232-1 [2] + IPAddress, Location FROM LI-PS-PDU - {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; @@ -21,8 +17,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version9(9) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version9(9) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version10(10) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version10(10) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -157,7 +153,7 @@ NationalIPMMIRIParameters ::= SEQUENCE AdditionalSignalling ::= CHOICE { sipHeaderLine [0] OCTET STRING, - -- A SIP header line, eg: “Contact: tel:+123456789”. + -- A SIP header line, eg: "Contact: tel:+123456789". ... } diff --git a/102232-5/portal/IPMultimediaPDU,ver9.txt b/102232-5/portal/IPMultimediaPDU,ver10.txt similarity index 92% rename from 102232-5/portal/IPMultimediaPDU,ver9.txt rename to 102232-5/portal/IPMultimediaPDU,ver10.txt index 2a4507f..a14834a 100644 --- a/102232-5/portal/IPMultimediaPDU,ver9.txt +++ b/102232-5/portal/IPMultimediaPDU,ver10.txt @@ -1,19 +1,15 @@ -IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version9(9)} +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - -- from TS 102 232-1 [2] + IPAddress, Location FROM LI-PS-PDU - {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; @@ -21,8 +17,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version9(9) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version9(9) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version10(10) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version10(10) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -157,7 +153,7 @@ NationalIPMMIRIParameters ::= SEQUENCE AdditionalSignalling ::= CHOICE { sipHeaderLine [0] OCTET STRING, - -- A SIP header line, eg: “Contact: tel:+123456789”. + -- A SIP header line, eg: "Contact: tel:+123456789". ... } -- GitLab From c89ca560b97a185cfdf1b99d7cfa6973dae8bd28 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:33:36 +0100 Subject: [PATCH 116/208] TS 102 232-3 v3.7.1 (2017-11-23) agreed at LI#46 (Rotterdam, 2017-10-03) --- 102232-3/IPAccessPDU.asn | 39 +++++++++++++------ ...essPDU,ver12.txt => IPAccessPDU,ver13.txt} | 39 +++++++++++++------ 2 files changed, 54 insertions(+), 24 deletions(-) rename 102232-3/portal/{IPAccessPDU,ver12.txt => IPAccessPDU,ver13.txt} (90%) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 4b6ce37..e4813de 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,28 +1,24 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version12(12)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from ETSI TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - -- from ETSI TS 102 232-1 [2] + IPAddress Location FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -110,8 +106,14 @@ IPIRIContents ::= SEQUENCE -- This parameter will carry the second and subsequent IPv4 or IPv6 target IP addresses -- It is used when multiple subnet/prefix ranges are assigned to a target service. -- Use of this field is fully described in section 6.2.1 - location [24] Location OPTIONAL + location [24] Location OPTIONAL, -- The location associated with the target + pOPPortID [25] OCTET STRING OPTIONAL, + -- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]: + -- This parameter shall be populated with the RADIUS value. + framedRoutes [26] SEQUENCE OF FramedRoute OPTIONAL + -- It is used to list all the available Framed Route and Framed IPv6 Route information + } @@ -124,7 +126,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The accessAttempt timed-out or failed otherwise + -- The Access_attempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4) sessionEnd(5), @@ -245,6 +247,19 @@ OtherTargetIdentifiers ::= CHOICE ... } +FramedRoute ::= CHOICE +{ + -- Additional Framed Route prefix information associated with the target service + + framedRoute [0] OCTET STRING, + -- This could contain an IPv4 as well as IPv6 FramedRoute information + -- including additional information such Gateway address and + -- one or more metrics in texual format. + -- This parameter shall be populated with the RADIUS value. + ... +} + + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== diff --git a/102232-3/portal/IPAccessPDU,ver12.txt b/102232-3/portal/IPAccessPDU,ver13.txt similarity index 90% rename from 102232-3/portal/IPAccessPDU,ver12.txt rename to 102232-3/portal/IPAccessPDU,ver13.txt index 4b6ce37..e4813de 100644 --- a/102232-3/portal/IPAccessPDU,ver12.txt +++ b/102232-3/portal/IPAccessPDU,ver13.txt @@ -1,28 +1,24 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version12(12)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from ETSI TS 101 671 [1] - IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - -- from ETSI TS 102 232-1 [2] + IPAddress Location FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version24(24)}; + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; -- ============================ -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version12(12) iRIOnly(3)} +iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRI(1)} +iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRIOnly(3)} -- all three definitions relative to {itu-t(0) identified-organization(4) -- etsi(0) securityDomain(2) lawfulintercept(2)} @@ -110,8 +106,14 @@ IPIRIContents ::= SEQUENCE -- This parameter will carry the second and subsequent IPv4 or IPv6 target IP addresses -- It is used when multiple subnet/prefix ranges are assigned to a target service. -- Use of this field is fully described in section 6.2.1 - location [24] Location OPTIONAL + location [24] Location OPTIONAL, -- The location associated with the target + pOPPortID [25] OCTET STRING OPTIONAL, + -- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]: + -- This parameter shall be populated with the RADIUS value. + framedRoutes [26] SEQUENCE OF FramedRoute OPTIONAL + -- It is used to list all the available Framed Route and Framed IPv6 Route information + } @@ -124,7 +126,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The accessAttempt timed-out or failed otherwise + -- The Access_attempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4) sessionEnd(5), @@ -245,6 +247,19 @@ OtherTargetIdentifiers ::= CHOICE ... } +FramedRoute ::= CHOICE +{ + -- Additional Framed Route prefix information associated with the target service + + framedRoute [0] OCTET STRING, + -- This could contain an IPv4 as well as IPv6 FramedRoute information + -- including additional information such Gateway address and + -- one or more metrics in texual format. + -- This parameter shall be populated with the RADIUS value. + ... +} + + -- ===================================================== -- Intercept-related information for IRI-Only intercepts -- ===================================================== -- GitLab From 52adf3be2d99338991927e4257d3ea6bd66e85d7 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:33:40 +0100 Subject: [PATCH 117/208] TS 102 232-2 v3.11.1 (2017-11-23) agreed at LI#46 (Rotterdam, 2017-10-03) --- 102232-2/EmailPDU.asn | 18 +++++++++--------- .../{EmailPDU,ver16.txt => EmailPDU,ver17.txt} | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) rename 102232-2/portal/{EmailPDU,ver16.txt => EmailPDU,ver17.txt} (93%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index c106e37..881e769 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,15 +1,15 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version16(16)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from TS 101 671 [4] + -- from TS 102 232-1 [3] IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + FROM LI-PS-PDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} -- from TS 102 232-5 [38] IPMMCC @@ -21,11 +21,11 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingMMCC(5)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} diff --git a/102232-2/portal/EmailPDU,ver16.txt b/102232-2/portal/EmailPDU,ver17.txt similarity index 93% rename from 102232-2/portal/EmailPDU,ver16.txt rename to 102232-2/portal/EmailPDU,ver17.txt index c106e37..881e769 100644 --- a/102232-2/portal/EmailPDU,ver16.txt +++ b/102232-2/portal/EmailPDU,ver17.txt @@ -1,15 +1,15 @@ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version16(16)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from TS 101 671 [4] + -- from TS 102 232-1 [3] IPAddress - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + FROM LI-PS-PDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} -- from TS 102 232-5 [38] IPMMCC @@ -21,11 +21,11 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version16(16) messagingMMCC(5)} +emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) iRI(1)} +emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) cC(2)} +messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -- GitLab From bcd8fe371425de62e700a59e82a1132aea035bf0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:33:44 +0100 Subject: [PATCH 118/208] TS 102 232-1 v3.15.1 (2017-11-23) agreed at LI#46 (Rotterdam, 2017-10-03) --- 102232-1/LI-PS-PDU.asn | 73 +++++++++++++++++-- ...I-PS-PDU,ver25.txt => LI-PS-PDU,ver26.txt} | 73 +++++++++++++++++-- 2 files changed, 134 insertions(+), 12 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver25.txt => LI-PS-PDU,ver26.txt} (87%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 240f206..e102b02 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version25(25)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} DEFINITIONS IMPLICIT TAGS ::= @@ -8,8 +8,12 @@ BEGIN IMPORTS -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + -- from TS 103 280 [44] + LIID + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + -- from TS 101 671 [4] - LawfulInterceptionIdentifier, IRI-Parameters, IRIsContent, Network-Element-Identifier @@ -28,14 +32,14 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version16(16)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version11(11)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} -- from TS 102 232-04 [32] L2CC, @@ -48,7 +52,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} -- from TS 102 232-06 [36] PstnIsdnCC, @@ -185,7 +189,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version25(25)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version26(26)} -- ==================== -- Top-level definition @@ -201,6 +205,7 @@ PSHeader ::= SEQUENCE { li-psDomainId [0] OBJECT IDENTIFIER, lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- As of ASN.1 version 26 this parameter is included from TS 103 280 [44] authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.3 communicationIdentifier [3] CommunicationIdentifier, @@ -640,5 +645,61 @@ WlanLocationAttributes ::= SEQUENCE } +IPAddress ::= SEQUENCE + -- This parameter was previously imported from TS 101 671 [4] but has been copied + -- to TS 102 232-1. It is not recommended to use this parameter in future + -- change requests. Suggested approach is to use a parameter from TS 103 280 [42] + -- instead. +{ + iP-type [1] ENUMERATED + { + iPV4(0), + iPV6(1), + ... + }, + iP-value [2] IP-value, + iP-assignment [3] ENUMERATED + { + static(1), + -- The static coding shall be used to report a static address. + dynamic(2), + -- The dynamic coding shall be used to report a dynamically allocated address. + notKnown(3), + -- The notKnown coding shall be used to report other then static or dynamically + -- allocated IP addresses. + ... + } OPTIONAL, + ..., + iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, + -- Indicates the length of the prefix delegated by the CSP to the subscriber + -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" + -- Mandatory in case where the iP-value contains an IPv6 binary value + iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL + -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. + -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to + -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to + -- a /29 CIDR-format subnet mask +} + +IP-value ::= CHOICE +{ + iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), + -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" + -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" + iPTextAddress [2] IA5String (SIZE(7..45)), + -- In case of IPv6, the delivered iPTextAddress field could include a complete + -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. + -- In case of IPv4, the delivered iPTextAddress field could include a single + -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" + ... +} + +LawfulInterceptionIdentifier ::= LIID + -- LIID is a common parameter imported from TS 103 280 [44]. + -- It is redefined as LawfulInterceptionIdentifier in this + -- module to preserve the original type name during the + -- removal of imports from TS 101 671 [4]. + + END --end of LI-PS-PDU diff --git a/102232-1/portal/LI-PS-PDU,ver25.txt b/102232-1/portal/LI-PS-PDU,ver26.txt similarity index 87% rename from 102232-1/portal/LI-PS-PDU,ver25.txt rename to 102232-1/portal/LI-PS-PDU,ver26.txt index 240f206..e102b02 100644 --- a/102232-1/portal/LI-PS-PDU,ver25.txt +++ b/102232-1/portal/LI-PS-PDU,ver26.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version25(25)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} DEFINITIONS IMPLICIT TAGS ::= @@ -8,8 +8,12 @@ BEGIN IMPORTS -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + -- from TS 103 280 [44] + LIID + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + -- from TS 101 671 [4] - LawfulInterceptionIdentifier, IRI-Parameters, IRIsContent, Network-Element-Identifier @@ -28,14 +32,14 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version16(16)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} -- from TS 102 232-03 [6] IPCC, IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version11(11)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} -- from TS 102 232-04 [32] L2CC, @@ -48,7 +52,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} -- from TS 102 232-06 [36] PstnIsdnCC, @@ -185,7 +189,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version25(25)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version26(26)} -- ==================== -- Top-level definition @@ -201,6 +205,7 @@ PSHeader ::= SEQUENCE { li-psDomainId [0] OBJECT IDENTIFIER, lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- As of ASN.1 version 26 this parameter is included from TS 103 280 [44] authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.3 communicationIdentifier [3] CommunicationIdentifier, @@ -640,5 +645,61 @@ WlanLocationAttributes ::= SEQUENCE } +IPAddress ::= SEQUENCE + -- This parameter was previously imported from TS 101 671 [4] but has been copied + -- to TS 102 232-1. It is not recommended to use this parameter in future + -- change requests. Suggested approach is to use a parameter from TS 103 280 [42] + -- instead. +{ + iP-type [1] ENUMERATED + { + iPV4(0), + iPV6(1), + ... + }, + iP-value [2] IP-value, + iP-assignment [3] ENUMERATED + { + static(1), + -- The static coding shall be used to report a static address. + dynamic(2), + -- The dynamic coding shall be used to report a dynamically allocated address. + notKnown(3), + -- The notKnown coding shall be used to report other then static or dynamically + -- allocated IP addresses. + ... + } OPTIONAL, + ..., + iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, + -- Indicates the length of the prefix delegated by the CSP to the subscriber + -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" + -- Mandatory in case where the iP-value contains an IPv6 binary value + iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL + -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. + -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to + -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to + -- a /29 CIDR-format subnet mask +} + +IP-value ::= CHOICE +{ + iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), + -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" + -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" + iPTextAddress [2] IA5String (SIZE(7..45)), + -- In case of IPv6, the delivered iPTextAddress field could include a complete + -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. + -- In case of IPv4, the delivered iPTextAddress field could include a single + -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" + ... +} + +LawfulInterceptionIdentifier ::= LIID + -- LIID is a common parameter imported from TS 103 280 [44]. + -- It is redefined as LawfulInterceptionIdentifier in this + -- module to preserve the original type name during the + -- removal of imports from TS 101 671 [4]. + + END --end of LI-PS-PDU -- GitLab From 4e874f1b6a2aaf7239eec5e756843c40432b49e7 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:33:53 +0100 Subject: [PATCH 120/208] TS 102 657 v1.21.1 (2018-04-04) agreed at LI#47 (New Delhi, 2018-02-05) --- 102657/RDMessage.asn | 2 +- 102657/portal/{RDMessagever19.txt => RDMessagever19.1.txt} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename 102657/portal/{RDMessagever19.txt => RDMessagever19.1.txt} (99%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 6b386cf..4731541 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1726,7 +1726,7 @@ MultimediaServiceRegistrationInfo ::= SEQUENCE accountCreationTime [3] GeneralizedTime OPTIONAL, -- start time of account accountCreationIP [4] IPAddress OPTIONAL, -- subscriber IP at creation accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, - -- subscriber country as specified in ISO 3166-2 + -- subscriber country as specified in ISO 3166-1 clientPlatformType [6] UTF8String OPTIONAL, -- subscriber platform clientVersion [7] UTF8String OPTIONAL, -- subscriber platform version ... diff --git a/102657/portal/RDMessagever19.txt b/102657/portal/RDMessagever19.1.txt similarity index 99% rename from 102657/portal/RDMessagever19.txt rename to 102657/portal/RDMessagever19.1.txt index 6b386cf..4731541 100644 --- a/102657/portal/RDMessagever19.txt +++ b/102657/portal/RDMessagever19.1.txt @@ -1726,7 +1726,7 @@ MultimediaServiceRegistrationInfo ::= SEQUENCE accountCreationTime [3] GeneralizedTime OPTIONAL, -- start time of account accountCreationIP [4] IPAddress OPTIONAL, -- subscriber IP at creation accountCreationCountry [5] UTF8String (SIZE (2)) OPTIONAL, - -- subscriber country as specified in ISO 3166-2 + -- subscriber country as specified in ISO 3166-1 clientPlatformType [6] UTF8String OPTIONAL, -- subscriber platform clientVersion [7] UTF8String OPTIONAL, -- subscriber platform version ... -- GitLab From 6ad655a5b5e4ec06b55497d099afc1d795069a9c Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:33:58 +0100 Subject: [PATCH 121/208] TS 102 232-1 v3.16.1 (2018-03-16) agreed at LI#47 (New Delhi, 2018-02-05) --- 102232-1/LI-PS-PDU.asn | 14 ++++++++++++-- .../{LI-PS-PDU,ver26.txt => LI-PS-PDU,ver27.txt} | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver26.txt => LI-PS-PDU,ver27.txt} (97%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index e102b02..5b0e18a 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version27(27)} DEFINITIONS IMPLICIT TAGS ::= @@ -111,6 +111,7 @@ IMPORTS -- 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)} @@ -155,6 +156,14 @@ IMPORTS -- corresponding to different implementations and exclusive usage each other. -- 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 TS 33.108 [9]. -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -320,7 +329,8 @@ CCContents ::= CHOICE messagingMMCC [18] 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 + gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU } MicroSecondTimeStamp ::= SEQUENCE diff --git a/102232-1/portal/LI-PS-PDU,ver26.txt b/102232-1/portal/LI-PS-PDU,ver27.txt similarity index 97% rename from 102232-1/portal/LI-PS-PDU,ver26.txt rename to 102232-1/portal/LI-PS-PDU,ver27.txt index e102b02..5b0e18a 100644 --- a/102232-1/portal/LI-PS-PDU,ver26.txt +++ b/102232-1/portal/LI-PS-PDU,ver27.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version27(27)} DEFINITIONS IMPLICIT TAGS ::= @@ -111,6 +111,7 @@ IMPORTS -- 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)} @@ -155,6 +156,14 @@ IMPORTS -- corresponding to different implementations and exclusive usage each other. -- 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 TS 33.108 [9]. -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -320,7 +329,8 @@ CCContents ::= CHOICE messagingMMCC [18] 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 + gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU } MicroSecondTimeStamp ::= SEQUENCE -- GitLab From 26ee34dc493997639377d4b4afbacfb8f50b6146 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:34:06 +0100 Subject: [PATCH 122/208] TS 103 462 v1.1.1 (2018-07-05) agreed at LI#48 (Bergen, 2018-06-26) --- 103462/ILHIPDU.asn | 122 +++++++++++++++++++++++++++++++++ 103462/portal/ILHIPDU,ver1.txt | 122 +++++++++++++++++++++++++++++++++ 2 files changed, 244 insertions(+) create mode 100644 103462/ILHIPDU.asn create mode 100644 103462/portal/ILHIPDU,ver1.txt diff --git a/103462/ILHIPDU.asn b/103462/ILHIPDU.asn new file mode 100644 index 0000000..5e59e9f --- /dev/null +++ b/103462/ILHIPDU.asn @@ -0,0 +1,122 @@ +ILHIPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + + +IMPORTS + + -- from ETSI TS 102 232-1 [6] + TimeStampQualifier, + MicroSecondTimeStamp, + Location + FROM LI-PS-PDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader (1) version28(28)} + + -- from ETSI TS 103 280 [2] + QualifiedDateTime, + QualifiedMicrosecondDateTime, + WGS84CoordinateDecimal, + WGS84CoordinateAngular + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} +; + +-- end of IMPORTS + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iLHIDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0)} + +iLHIObjId OBJECT IDENTIFIER ::= { iLHIDomainId ilhiPdu(0) version1(1)} + +preagreedObjId OBJECT IDENTIFIER ::= { iLHIDomainId identifiers(1) preagreed(0)} + +-- ============================ +-- Inter LEMF Handover Elements +-- ============================ + +ILHIPayload ::= SEQUENCE + -- This Payload sends additional ILHI specific parameters, the resPayload and + -- the originalPayload. +{ + iLHIObjId [0] OBJECT IDENTIFIER, + resPayload [1] EncapsulationPayload, + mappingInfo [2] MappingInfo OPTIONAL, + -- output from the MapF + originalPayload [3] EncapsulationPayload OPTIONAL, + ... +} + +EncapsulationPayload ::= SEQUENCE +{ + identifier [0] OBJECT IDENTIFIER, + -- see clause 8.1 + contents [1] OCTET STRING, + ... +} + +MappingInfo ::= SEQUENCE +{ + timestampMapping [0] SEQUENCE OF TimestampMapping OPTIONAL, + locationMapping [1] SEQUENCE OF LocationMapping OPTIONAL, + ... +} + +TimestampMapping ::= SEQUENCE +{ + originalTimestamp [0] OriginalTimestamp, + normalizedTimestamp [1] ILHITimestamp, + timeStampQualifier [2] LI-PS-PDU.TimeStampQualifier OPTIONAL, + ... +} + +ILHITimestamp ::= CHOICE +{ + qualifiedDateTime [1] Common-Parameters.QualifiedDateTime, + qualifiedMicrosecondDateTime [2] Common-Parameters.QualifiedMicrosecondDateTime, + ... +} + +OriginalTimestamp ::= CHOICE +{ + timeStamp [1] GeneralizedTime, + microSecondTimeStamp [2] LI-PS-PDU.MicroSecondTimeStamp, + ... +} + +LocationMapping ::= SEQUENCE +{ + originalLocation [0] LI-PS-PDU.Location, + normalizedLocation [1] NormalizedLocationData, + ... +} + +NormalizedLocationData ::= SEQUENCE +{ + geocodedLocationData [0] GeocodedLocationData, + supplementaryLocationData [1] SupplementaryLocationData OPTIONAL, + -- any additional information for an improved presentation of location + -- (e.g. details of the network elements like transmitter details) should + -- be inserted into this parameter + ... +} + +GeocodedLocationData ::= CHOICE +{ + wGS84CoordinateDecimal [1] Common-Parameters.WGS84CoordinateDecimal, + wGS84CoordinateAngular [2] Common-Parameters.WGS84CoordinateAngular, + ... +} + +SupplementaryLocationData ::= SEQUENCE +{ + azimuth [0] INTEGER (0..359) OPTIONAL, + -- The azimuth is the bearing, relative to true north + ... +} + +END --end of ILHIPDU diff --git a/103462/portal/ILHIPDU,ver1.txt b/103462/portal/ILHIPDU,ver1.txt new file mode 100644 index 0000000..5e59e9f --- /dev/null +++ b/103462/portal/ILHIPDU,ver1.txt @@ -0,0 +1,122 @@ +ILHIPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + + +IMPORTS + + -- from ETSI TS 102 232-1 [6] + TimeStampQualifier, + MicroSecondTimeStamp, + Location + FROM LI-PS-PDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader (1) version28(28)} + + -- from ETSI TS 103 280 [2] + QualifiedDateTime, + QualifiedMicrosecondDateTime, + WGS84CoordinateDecimal, + WGS84CoordinateAngular + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} +; + +-- end of IMPORTS + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iLHIDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0)} + +iLHIObjId OBJECT IDENTIFIER ::= { iLHIDomainId ilhiPdu(0) version1(1)} + +preagreedObjId OBJECT IDENTIFIER ::= { iLHIDomainId identifiers(1) preagreed(0)} + +-- ============================ +-- Inter LEMF Handover Elements +-- ============================ + +ILHIPayload ::= SEQUENCE + -- This Payload sends additional ILHI specific parameters, the resPayload and + -- the originalPayload. +{ + iLHIObjId [0] OBJECT IDENTIFIER, + resPayload [1] EncapsulationPayload, + mappingInfo [2] MappingInfo OPTIONAL, + -- output from the MapF + originalPayload [3] EncapsulationPayload OPTIONAL, + ... +} + +EncapsulationPayload ::= SEQUENCE +{ + identifier [0] OBJECT IDENTIFIER, + -- see clause 8.1 + contents [1] OCTET STRING, + ... +} + +MappingInfo ::= SEQUENCE +{ + timestampMapping [0] SEQUENCE OF TimestampMapping OPTIONAL, + locationMapping [1] SEQUENCE OF LocationMapping OPTIONAL, + ... +} + +TimestampMapping ::= SEQUENCE +{ + originalTimestamp [0] OriginalTimestamp, + normalizedTimestamp [1] ILHITimestamp, + timeStampQualifier [2] LI-PS-PDU.TimeStampQualifier OPTIONAL, + ... +} + +ILHITimestamp ::= CHOICE +{ + qualifiedDateTime [1] Common-Parameters.QualifiedDateTime, + qualifiedMicrosecondDateTime [2] Common-Parameters.QualifiedMicrosecondDateTime, + ... +} + +OriginalTimestamp ::= CHOICE +{ + timeStamp [1] GeneralizedTime, + microSecondTimeStamp [2] LI-PS-PDU.MicroSecondTimeStamp, + ... +} + +LocationMapping ::= SEQUENCE +{ + originalLocation [0] LI-PS-PDU.Location, + normalizedLocation [1] NormalizedLocationData, + ... +} + +NormalizedLocationData ::= SEQUENCE +{ + geocodedLocationData [0] GeocodedLocationData, + supplementaryLocationData [1] SupplementaryLocationData OPTIONAL, + -- any additional information for an improved presentation of location + -- (e.g. details of the network elements like transmitter details) should + -- be inserted into this parameter + ... +} + +GeocodedLocationData ::= CHOICE +{ + wGS84CoordinateDecimal [1] Common-Parameters.WGS84CoordinateDecimal, + wGS84CoordinateAngular [2] Common-Parameters.WGS84CoordinateAngular, + ... +} + +SupplementaryLocationData ::= SEQUENCE +{ + azimuth [0] INTEGER (0..359) OPTIONAL, + -- The azimuth is the bearing, relative to true north + ... +} + +END --end of ILHIPDU -- GitLab From 28809372017987073807b8a86264a630b49bfbc8 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:34:10 +0100 Subject: [PATCH 123/208] TS 103 280 v2.2.1 (2018-09-07) agreed at LI#48 (Bergen, 2018-06-26) --- 103280/TS_103_280.asn1 | 44 ++++++++- 103280/TS_103_280.xsd | 46 +++++++-- 103280/portal/TS_103_280_v020101.asn1 | 54 ----------- 103280/portal/TS_103_280_v020201.asn1 | 94 +++++++++++++++++++ ...280_v020101.xsd => TS_103_280_v020201.xsd} | 46 +++++++-- 5 files changed, 214 insertions(+), 70 deletions(-) delete mode 100644 103280/portal/TS_103_280_v020101.asn1 create mode 100644 103280/portal/TS_103_280_v020201.asn1 rename 103280/portal/{TS_103_280_v020101.xsd => TS_103_280_v020201.xsd} (81%) diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1 index e1d9936..0e186a9 100644 --- a/103280/TS_103_280.asn1 +++ b/103280/TS_103_280.asn1 @@ -1,11 +1,11 @@ Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -- Object Identifier definitions -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} -- Common Parameter: LIID (as defined in clause 6) @@ -51,4 +51,44 @@ PortRange ::= CHOICE uDPPortRange [1] UDPPortRange } +-- Common Parameter: QualifiedDateTime (as defined in clause 6) + +QualifiedDateTime ::= GeneralizedTime + +-- Common Parameter: QualifiedMicrosecondDateTime (as defined in clause 6) + +QualifiedMicrosecondDateTime ::= GeneralizedTime + +-- Common Parameter: WGS84CoordinateDecimal (as defined in clause 6) + +WGS84CoordinateDecimal ::= SEQUENCE +{ + latitude [0] WGS84LatitudeDecimal, + longitude [1] WGS84LongitudeDecimal +} + +-- Common Parameter: WGS84LatitudeDecimal (as defined in clause 6) + +WGS84LatitudeDecimal ::= OCTET STRING (SIZE (10)) + +-- Common Parameter: WGS84LongitudeDecimal (as defined in clause 6) + +WGS84LongitudeDecimal ::= OCTET STRING (SIZE (11)) + +-- Common Parameter: WGS84CoordinateAngular (as defined in clause 6) + +WGS84CoordinateAngular ::= SEQUENCE +{ + latitude [0] WGS84LatitudeAngular, + longitude [1] WGS84LongitudeAngular +} + +-- Common Parameter: WGS84LatitudeAngular (as defined in clause 6) + +WGS84LatitudeAngular ::= OCTET STRING (SIZE (10)) + +-- Common Parameter: WGS8LongitudeAngular (as defined in clause 6) + +WGS84LongitudeAngular ::= OCTET STRING (SIZE (11)) + END diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index 23d5c12..3313fa3 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -1,5 +1,5 @@ - + @@ -70,7 +70,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -116,25 +116,25 @@ - + - + - + - + @@ -165,4 +165,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103280/portal/TS_103_280_v020101.asn1 b/103280/portal/TS_103_280_v020101.asn1 deleted file mode 100644 index e1d9936..0000000 --- a/103280/portal/TS_103_280_v020101.asn1 +++ /dev/null @@ -1,54 +0,0 @@ -Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} - -DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN - --- Object Identifier definitions - -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} - --- Common Parameter: LIID (as defined in clause 6) - -LIID ::= OCTET STRING (SIZE (1..25)) - --- Common Parameter: TCPPort (as defined in clause 6) - -TCPPort ::= INTEGER (1..65535) - --- Common Parameter: TCPPortRange (as defined in clause 6) - -TCPPortRange ::= SEQUENCE -{ - start [0] TCPPort, - end [1] TCPPort -} - --- Common Parameter: UDPPort (as defined in clause 6) - -UDPPort ::= INTEGER (0..65535) - --- Common Parameter: UDPPortRange (as defined in clause 6) - -UDPPortRange ::= SEQUENCE -{ - start [0] UDPPort, - end [1] UDPPort -} - --- Common Parameter: Port (as defined in clause 6) - -Port ::= CHOICE -{ - tCPPort [0] TCPPort, - uDPPort [1] UDPPort -} - --- Common Parameter: PortRange (as defined clause 6) - -PortRange ::= CHOICE -{ - tCPPortRange [0] TCPPortRange, - uDPPortRange [1] UDPPortRange -} - -END diff --git a/103280/portal/TS_103_280_v020201.asn1 b/103280/portal/TS_103_280_v020201.asn1 new file mode 100644 index 0000000..0e186a9 --- /dev/null +++ b/103280/portal/TS_103_280_v020201.asn1 @@ -0,0 +1,94 @@ +Common-Parameters +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} + +DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN + +-- Object Identifier definitions + +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} + +-- Common Parameter: LIID (as defined in clause 6) + +LIID ::= OCTET STRING (SIZE (1..25)) + +-- Common Parameter: TCPPort (as defined in clause 6) + +TCPPort ::= INTEGER (1..65535) + +-- Common Parameter: TCPPortRange (as defined in clause 6) + +TCPPortRange ::= SEQUENCE +{ + start [0] TCPPort, + end [1] TCPPort +} + +-- Common Parameter: UDPPort (as defined in clause 6) + +UDPPort ::= INTEGER (0..65535) + +-- Common Parameter: UDPPortRange (as defined in clause 6) + +UDPPortRange ::= SEQUENCE +{ + start [0] UDPPort, + end [1] UDPPort +} + +-- Common Parameter: Port (as defined in clause 6) + +Port ::= CHOICE +{ + tCPPort [0] TCPPort, + uDPPort [1] UDPPort +} + +-- Common Parameter: PortRange (as defined clause 6) + +PortRange ::= CHOICE +{ + tCPPortRange [0] TCPPortRange, + uDPPortRange [1] UDPPortRange +} + +-- Common Parameter: QualifiedDateTime (as defined in clause 6) + +QualifiedDateTime ::= GeneralizedTime + +-- Common Parameter: QualifiedMicrosecondDateTime (as defined in clause 6) + +QualifiedMicrosecondDateTime ::= GeneralizedTime + +-- Common Parameter: WGS84CoordinateDecimal (as defined in clause 6) + +WGS84CoordinateDecimal ::= SEQUENCE +{ + latitude [0] WGS84LatitudeDecimal, + longitude [1] WGS84LongitudeDecimal +} + +-- Common Parameter: WGS84LatitudeDecimal (as defined in clause 6) + +WGS84LatitudeDecimal ::= OCTET STRING (SIZE (10)) + +-- Common Parameter: WGS84LongitudeDecimal (as defined in clause 6) + +WGS84LongitudeDecimal ::= OCTET STRING (SIZE (11)) + +-- Common Parameter: WGS84CoordinateAngular (as defined in clause 6) + +WGS84CoordinateAngular ::= SEQUENCE +{ + latitude [0] WGS84LatitudeAngular, + longitude [1] WGS84LongitudeAngular +} + +-- Common Parameter: WGS84LatitudeAngular (as defined in clause 6) + +WGS84LatitudeAngular ::= OCTET STRING (SIZE (10)) + +-- Common Parameter: WGS8LongitudeAngular (as defined in clause 6) + +WGS84LongitudeAngular ::= OCTET STRING (SIZE (11)) + +END diff --git a/103280/portal/TS_103_280_v020101.xsd b/103280/portal/TS_103_280_v020201.xsd similarity index 81% rename from 103280/portal/TS_103_280_v020101.xsd rename to 103280/portal/TS_103_280_v020201.xsd index 23d5c12..3313fa3 100644 --- a/103280/portal/TS_103_280_v020101.xsd +++ b/103280/portal/TS_103_280_v020201.xsd @@ -1,5 +1,5 @@ - + @@ -70,7 +70,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -116,25 +116,25 @@ - + - + - + - + @@ -165,4 +165,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From fc189187806541684aa6d399d2e8f58d916c7a9d Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:34:18 +0100 Subject: [PATCH 125/208] TS 102 657 v1.22.1 (2018-09-20) agreed at LI#48 (Bergen, 2018-06-26) --- 102657/RDMessage.asn | 211 ++++++++++++------ 102657/RDMessage.xsd | 141 +++++++++++- ...DMessagever19.1.txt => RDMessagever20.txt} | 211 ++++++++++++------ ...{RDMessagever19.xsd => RDMessagever20.xsd} | 141 +++++++++++- 4 files changed, 572 insertions(+), 132 deletions(-) rename 102657/portal/{RDMessagever19.1.txt => RDMessagever20.txt} (93%) rename 102657/portal/{RDMessagever19.xsd => RDMessagever20.xsd} (95%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 4731541..e51ec5f 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version19(19)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version20(20)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version19(19)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -40,7 +40,10 @@ RetainedDataHeader ::= SEQUENCE timeStamp [3] GeneralizedTime, thirdPartyCSPID [4] CSPID OPTIONAL, ... , - requestType [5] RequestType OPTIONAL + requestType [5] RequestType OPTIONAL, + requestFlag [6] RequestFlag OPTIONAL + -- Optional parameter specifying additional information associated with the request. + } CSPID ::= UTF8String @@ -49,14 +52,19 @@ CSPID ::= UTF8String RequestType ::= UTF8String -- Description or reference of the type of Retained Data request +RequestFlag ::= UTF8String + -- Configuration information associated with the request + RequestID ::= SEQUENCE { - countryCode [1] CountryCode, - authorisedOrganisationID [2] AuthorisedOrganisationID, + countryCode [1] CountryCode, + authorisedOrganisationID [2] AuthorisedOrganisationID, requestNumber [3] RequestNumber OPTIONAL, -- all messages except GetStatusMessage and StatusMessage have a request number -- (see clause 6.1.2) - ... + ..., + externalIdentifier [4] ExternalIdentifier OPTIONAL + -- Optional identifier for the request, for correlation with warrant management systems. } CountryCode ::= UTF8String (SIZE(2)) @@ -68,6 +76,8 @@ AuthorisedOrganisationID::= UTF8String RequestNumber ::= UTF8String -- Unique within a given country and Authorized Organization +ExternalIdentifier ::= UTF8String + -- ================================================= -- Definitions for Retained Data payload information -- ================================================= @@ -516,18 +526,20 @@ OtherAddress ::= SEQUENCE AuthenticationInfo ::= SEQUENCE { authenticationType [1] UTF8String OPTIONAL, - -- the type of document used to authenticate, e.g. passport, driver's license - authenticationNumber [2] UTF8String OPTIONAL, - -- the number of the document used to authenticate - ... + authenticationNumber [2] UTF8String OPTIONAL, + ..., + issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL, + issuingOrganization [4] UTF8String OPTIONAL, + nationality [5] UTF8String OPTIONAL } PaymentDetails ::= SEQUENCE { - billingMethod [1] BillingMethod OPTIONAL, - bankAccount [2] BankAccount OPTIONAL, - billingAddress [3] ContactDetails OPTIONAL, - ... + billingMethod [1] BillingMethod OPTIONAL, + bankAccount [2] BankAccount OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + ..., + billingIdentifier [4] BillingIdentifier OPTIONAL } BankAccount ::= SEQUENCE @@ -563,10 +575,10 @@ BillingMethod ::= ENUMERATED TelephonyRecord ::= CHOICE { - telephonySubscriber [1] TelephonySubscriber, + telephonySubscriber [1] TelephonySubscriber, telephonyBillingDetails [2] TelephonyBillingDetails, telephonyServiceUsage [3] TelephonyServiceUsage, - telephonyDevice [4] TelephonyDevice, + telephonyDevice [4] TelephonyDevice, telephonyNetworkElement [5] TelephonyNetworkElement, ... } @@ -620,7 +632,12 @@ ICCIDInfo ::= SEQUENCE iCCID [1] UTF8String OPTIONAL, timeSpan [2] TimeSpan OPTIONAL, -- activation- and deactivation-date if applicable in which the ICCID was active - ... + ..., + pUK [3] UTF8String OPTIONAL, + -- PUK code associated with the ICCID + pUK2 [4] UTF8String OPTIONAL, + -- PUK2 code associated with the ICCID + iMSI [5] IMSI OPTIONAL } LoginInfo ::= SEQUENCE @@ -1250,10 +1267,11 @@ Location ::= SEQUENCE maritimeTransport [13] MaritimeTransport OPTIONAL, -- Information about the mobile cells embarked on ships using -- satellite transponder backhaul - airTransport [14] AirTransport OPTIONAL - -- Information about the mobile cells embarked on aircraft using + airTransport [14] AirTransport OPTIONAL, + -- Information about the mobile cells embarked on aircraft using -- satellite transponder backhaul - + bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL + -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID } GSMLocation ::= CHOICE @@ -1501,12 +1519,12 @@ MsgSubscriber ::= SEQUENCE -- asynchronous message services { validity [1] TimeSpan OPTIONAL, - subscriberID [2] MsgSubscriberID OPTIONAL, + subscriberID [2] MsgSubscriberID OPTIONAL, msgStores [3] SEQUENCE OF MsgStore OPTIONAL, -- message stores allocated to this subscriber subscriber [4] GenericSubscriberInfo OPTIONAL, ..., - paymentDetails [5] PaymentDetails OPTIONAL + paymentDetails [5] PaymentDetails OPTIONAL } MsgSubscriberID ::= OCTET STRING @@ -1516,12 +1534,14 @@ MsgStore ::= SEQUENCE -- Location into which messages are temporarily stored. All asynchronous message services by -- definition require some message store. E.g. in the case of e-mail this will be a mailbox { - validity [1] TimeSpan OPTIONAL, - msgStoreID [2] MsgStoreID OPTIONAL, - aliases [3] SEQUENCE OF MsgAddress OPTIONAL, + validity [1] TimeSpan OPTIONAL, + msgStoreID [2] MsgStoreID OPTIONAL, + aliases [3] SEQUENCE OF MsgAddress OPTIONAL, -- The complete list of all addresses that get delivered into this message store. - providerID [4] MsgProviderID OPTIONAL, - ... + providerID [4] MsgProviderID OPTIONAL, + ..., + msgForwardingAddresses [5] SEQUENCE OF MsgAddress OPTIONAL, + msgStoreSubscriberRelatedIDs [6] SEQUENCE OF ContactDetails OPTIONAL } MsgStoreID ::= OCTET STRING @@ -1687,7 +1707,8 @@ MultimediaRecord ::= CHOICE multimediaSubscriber [1] MultimediaSubscriber, multimediaBillingDetails [2] MultimediaBillingDetails, multimediaServiceUsage [3] MultimediaServiceUsage, - ... + ..., + multimediaDevice [4] MultimediaDevice } -- ============================== @@ -1763,10 +1784,14 @@ SubscribedMultimediaServices ::= SEQUENCE deliveryAddress [15] AddressInformation OPTIONAL, resellerAddress [16] AddressInformation OPTIONAL, otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL, - multimediaServiceType [18] UTF8String OPTIONAL, + multimediaServiceType [18] UTF8String OPTIONAL, -- Service name used by the service provider which may be proprietary - orderTime [19] GeneralizedTime OPTIONAL - -- Time when the subscribed service was ordered by the user + orderTime [19] GeneralizedTime OPTIONAL, + -- Time when the subscribed service was ordered by the user + iMEIs [20] SEQUENCE OF IMEI OPTIONAL, + registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, + privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL, + allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL } MultimediaServiceType ::= ENUMERATED @@ -1779,6 +1804,9 @@ MultimediaServiceType ::= ENUMERATED ... } +IMPI ::= UTF8String + -- Private User Identity of the IP Multimedia Subsystem subscription + -- ================================= -- Definitions of Service Usage Data -- ================================= @@ -1791,59 +1819,62 @@ MultimediaServiceUsage ::= SEQUENCE -- provided by the party communicationTime [2] TimeSpan OPTIONAL, -- Time and duration of the communication - reasonCause [3] INTEGER OPTIONAL, + reasonCause [3] INTEGER OPTIONAL, -- cause code for call termination e.g. SIP Reason code communicationType [4] MultimediaCommunicationType OPTIONAL, bearerService [5] MultimediaBearerService OPTIONAL, qualityOfService [6] QualityOfService OPTIONAL, ringDuration [7] INTEGER OPTIONAL, - callID [8] MultimediaCallID OPTIONAL, + callID [8] MultimediaCallID OPTIONAL, originalCallID [9] MultimediaCallID OPTIONAL, - callState [10] ENUMERATED + callState [10] ENUMERATED { bNotReached(1), bAlert(2), bAnswered(3), ... } OPTIONAL, - answerTime [11] GeneralizedTime OPTIONAL, - contentType [12] SEQUENCE OF UTF8String OPTIONAL, + answerTime [11] GeneralizedTime OPTIONAL, + contentType [12] SEQUENCE OF UTF8String OPTIONAL, mediaComponents [13] SEQUENCE OF MediaComponent OPTIONAL, imsInformation [14] ImsInformation OPTIONAL, - nationalMultimediaServiceUsage [15] NationalMultimediaServiceUsage OPTIONAL, - serviceID [16] UTF8String OPTIONAL, - providerID [17] UTF8String OPTIONAL, + nationalMultimediaServiceUsage [15] NationalMultimediaServiceUsage OPTIONAL, + serviceID [16] UTF8String OPTIONAL, + providerID [17] UTF8String OPTIONAL, ..., - cdrNumber [18] UTF8String OPTIONAL, -- as per CSP defined format - clientIP [19] IPAddress OPTIONAL, - relayIP [20] IPAddress OPTIONAL, - vmLength [21] INTEGER OPTIONAL, -- number of seconds - reason [22] UTF8String OPTIONAL + cdrNumber [18] UTF8String OPTIONAL, -- as per CSP defined format + clientIP [19] IPAddress OPTIONAL, + relayIP [20] IPAddress OPTIONAL, + vmLength [21] INTEGER OPTIONAL, -- number of seconds + reason [22] UTF8String OPTIONAL, + smsInformation [23] SmsInformation OPTIONAL, + mmsInformation [24] MmsInformation OPTIONAL } MultimediaPartyInformation ::= SEQUENCE { - partyRole [1] MultimediaPartyRole OPTIONAL, + partyRole [1] MultimediaPartyRole OPTIONAL, partyIdentity [2] PartyIdentity OPTIONAL, subscriberID [3] MultimediaSubscriberID OPTIONAL, communicationTime [4] TimeSpan OPTIONAL, -- Time and duration of the communication - iMSI [6] IMSI OPTIONAL, + iMSI [6] IMSI OPTIONAL, natureOfAddress [7] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" - uRI [8] UTF8String OPTIONAL, - partyNumber [9] PartyNumber OPTIONAL, + uRI [8] UTF8String OPTIONAL, + partyNumber [9] PartyNumber OPTIONAL, naAssignedAddress [10] NAAssignedAddress OPTIONAL, - forwardedTransferredIdentifier [11] PartyIdentity OPTIONAL, - terminatingTransferredIdentifier [12] PartyIdentity OPTIONAL, - nationalMultimediaPartyInformation [13] NationalMultimediaPartyInformation OPTIONAL, + forwardedTransferredIdentifier [11] PartyIdentity OPTIONAL, + terminatingTransferredIdentifier [12] PartyIdentity OPTIONAL, + nationalMultimediaPartyInformation [13] NationalMultimediaPartyInformation OPTIONAL, ..., - userAgent [14] UTF8String OPTIONAL, + userAgent [14] UTF8String OPTIONAL, -- e.g. SIP User-Agent field (see RFC 3261 [26]) octetsUploaded [15] INTEGER OPTIONAL, octetsDownloaded [16] INTEGER OPTIONAL, - accessNetworkInformation [17] SEQUENCE OF AccessNetworkInfo OPTIONAL - + accessNetworkInformation [17] SEQUENCE OF AccessNetworkInfo OPTIONAL, + privateUserIdentity [18] IMPI OPTIONAL, + iMEI [19] IMEI OPTIONAL } MultimediaCallID ::= UTF8String @@ -1853,7 +1884,11 @@ MultimediaCommunicationType ::= ENUMERATED multimediaFixed(0), multimediaWireless(1), multimediaNetworkIndependent(2), - ... + ..., + telephonyFixed(3), + telephonyWireless(4), + sMS(5), + mMS(6) } MultimediaPartyRole ::= ENUMERATED @@ -1869,7 +1904,21 @@ MultimediaPartyRole ::= ENUMERATED broadcastReceiver(8), broadcastSender(9), ..., - originalCalling(10) + originalCalling(10), + forwarded-to-Party(11), + connected(12), + userProvidedCalling(13), + roaming(14), + translated(15), + singlePersonalNumber(16), + smsOriginator(17), + smsRecipient(18), + smsOriginatorTrn(19), + smsRecipientTrn(20), + mmsOriginator(21), + mmsRecipient(22), + mmsOriginatorTrn(23), + mmsRecipientTrn(24) } MultimediaBearerService ::= ENUMERATED @@ -2059,6 +2108,42 @@ NationalMultimediaMediaComponent ::= SEQUENCE ... } +-- ======================= +-- Device Data definitions +-- ======================= + +MultimediaDevice ::= SEQUENCE +{ + deviceIDType [1] ENUMERATED + -- Type of identifier for telephony device + { + unknown(0), + imei(1), + macAddress(2), + ... + } OPTIONAL, + multimediaDeviceID [2] MultimediaDeviceID OPTIONAL, + -- Unique identifier for this device according to type of identifier + subscriberID [3] MultimediaSubscriberID OPTIONAL, + -- Identifier for a known user of this equipment. + -- Usage of this parameter is subject to national legislation. + nationalMultimediaDevice [4] NationalMultimediaDevice OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements + ... +} + +NationalMultimediaDevice ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +MultimediaDeviceID ::= OCTET STRING + -- A unique identifier for the multimedia device. For example, the IMEI number + -- of a mobile handset + NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -2100,19 +2185,19 @@ NASubscriber ::= SEQUENCE NAServiceSubscription ::= SEQUENCE -- Description of the subscription to a Network Access service { - validity [1] TimeSpan OPTIONAL, - naServiceID [2] UTF8String OPTIONAL, + validity [1] TimeSpan OPTIONAL, + naServiceID [2] UTF8String OPTIONAL, -- Identifier for the service, e.g. account plan name. naProviderID [3] NAProviderID OPTIONAL, -- Unique identifier for the provider of the service, e.g. company name - naAuthID [4] NAAuthID OPTIONAL, + naAuthID [4] NAAuthID OPTIONAL, -- Unique identifier for this subscription, e.g. logon name - options [5] UTF8String OPTIONAL, + options [5] UTF8String OPTIONAL, -- Human readable text with restrictions or options to the subscription installationAddress [6] AddressInformation OPTIONAL, fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address - imsi [8] IMSI OPTIONAL, + imsi [8] IMSI OPTIONAL, ..., allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL, naServiceStatus [10] UTF8String OPTIONAL, @@ -2128,8 +2213,8 @@ NAServiceSubscription ::= SEQUENCE otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL, allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL, -- If present, contains device details for all elements from allocatedDeviceIDs - mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL - + mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL, + registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL } NationalNASubscription ::= SEQUENCE diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index f46fb92..19961bd 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.19.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.22.1 @@ -34,7 +34,7 @@ - A country code as per ISO 3166-1 [xx] + A country code as per ISO 3166-1 [4] @@ -401,6 +401,7 @@ + @@ -411,6 +412,7 @@ + @@ -514,6 +516,15 @@ + + + + + + + + + @@ -522,6 +533,7 @@ + @@ -595,6 +607,9 @@ + + + @@ -1027,6 +1042,23 @@ + + + + + + + + + + + + + + + + + @@ -1341,6 +1373,13 @@ + + + + + + + @@ -1507,6 +1546,20 @@ + + + + + + + + + + + + + + @@ -1745,6 +1798,13 @@ + + + + + + + @@ -2313,6 +2373,7 @@ + @@ -2392,6 +2453,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2456,6 +2545,8 @@ + + @@ -2483,6 +2574,8 @@ + + @@ -2494,6 +2587,10 @@ + + + + @@ -2510,6 +2607,20 @@ + + + + + + + + + + + + + + @@ -2765,4 +2876,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/102657/portal/RDMessagever19.1.txt b/102657/portal/RDMessagever20.txt similarity index 93% rename from 102657/portal/RDMessagever19.1.txt rename to 102657/portal/RDMessagever20.txt index 4731541..e51ec5f 100644 --- a/102657/portal/RDMessagever19.1.txt +++ b/102657/portal/RDMessagever20.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version19(19)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version20(20)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version19(19)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -40,7 +40,10 @@ RetainedDataHeader ::= SEQUENCE timeStamp [3] GeneralizedTime, thirdPartyCSPID [4] CSPID OPTIONAL, ... , - requestType [5] RequestType OPTIONAL + requestType [5] RequestType OPTIONAL, + requestFlag [6] RequestFlag OPTIONAL + -- Optional parameter specifying additional information associated with the request. + } CSPID ::= UTF8String @@ -49,14 +52,19 @@ CSPID ::= UTF8String RequestType ::= UTF8String -- Description or reference of the type of Retained Data request +RequestFlag ::= UTF8String + -- Configuration information associated with the request + RequestID ::= SEQUENCE { - countryCode [1] CountryCode, - authorisedOrganisationID [2] AuthorisedOrganisationID, + countryCode [1] CountryCode, + authorisedOrganisationID [2] AuthorisedOrganisationID, requestNumber [3] RequestNumber OPTIONAL, -- all messages except GetStatusMessage and StatusMessage have a request number -- (see clause 6.1.2) - ... + ..., + externalIdentifier [4] ExternalIdentifier OPTIONAL + -- Optional identifier for the request, for correlation with warrant management systems. } CountryCode ::= UTF8String (SIZE(2)) @@ -68,6 +76,8 @@ AuthorisedOrganisationID::= UTF8String RequestNumber ::= UTF8String -- Unique within a given country and Authorized Organization +ExternalIdentifier ::= UTF8String + -- ================================================= -- Definitions for Retained Data payload information -- ================================================= @@ -516,18 +526,20 @@ OtherAddress ::= SEQUENCE AuthenticationInfo ::= SEQUENCE { authenticationType [1] UTF8String OPTIONAL, - -- the type of document used to authenticate, e.g. passport, driver's license - authenticationNumber [2] UTF8String OPTIONAL, - -- the number of the document used to authenticate - ... + authenticationNumber [2] UTF8String OPTIONAL, + ..., + issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL, + issuingOrganization [4] UTF8String OPTIONAL, + nationality [5] UTF8String OPTIONAL } PaymentDetails ::= SEQUENCE { - billingMethod [1] BillingMethod OPTIONAL, - bankAccount [2] BankAccount OPTIONAL, - billingAddress [3] ContactDetails OPTIONAL, - ... + billingMethod [1] BillingMethod OPTIONAL, + bankAccount [2] BankAccount OPTIONAL, + billingAddress [3] ContactDetails OPTIONAL, + ..., + billingIdentifier [4] BillingIdentifier OPTIONAL } BankAccount ::= SEQUENCE @@ -563,10 +575,10 @@ BillingMethod ::= ENUMERATED TelephonyRecord ::= CHOICE { - telephonySubscriber [1] TelephonySubscriber, + telephonySubscriber [1] TelephonySubscriber, telephonyBillingDetails [2] TelephonyBillingDetails, telephonyServiceUsage [3] TelephonyServiceUsage, - telephonyDevice [4] TelephonyDevice, + telephonyDevice [4] TelephonyDevice, telephonyNetworkElement [5] TelephonyNetworkElement, ... } @@ -620,7 +632,12 @@ ICCIDInfo ::= SEQUENCE iCCID [1] UTF8String OPTIONAL, timeSpan [2] TimeSpan OPTIONAL, -- activation- and deactivation-date if applicable in which the ICCID was active - ... + ..., + pUK [3] UTF8String OPTIONAL, + -- PUK code associated with the ICCID + pUK2 [4] UTF8String OPTIONAL, + -- PUK2 code associated with the ICCID + iMSI [5] IMSI OPTIONAL } LoginInfo ::= SEQUENCE @@ -1250,10 +1267,11 @@ Location ::= SEQUENCE maritimeTransport [13] MaritimeTransport OPTIONAL, -- Information about the mobile cells embarked on ships using -- satellite transponder backhaul - airTransport [14] AirTransport OPTIONAL - -- Information about the mobile cells embarked on aircraft using + airTransport [14] AirTransport OPTIONAL, + -- Information about the mobile cells embarked on aircraft using -- satellite transponder backhaul - + bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL + -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID } GSMLocation ::= CHOICE @@ -1501,12 +1519,12 @@ MsgSubscriber ::= SEQUENCE -- asynchronous message services { validity [1] TimeSpan OPTIONAL, - subscriberID [2] MsgSubscriberID OPTIONAL, + subscriberID [2] MsgSubscriberID OPTIONAL, msgStores [3] SEQUENCE OF MsgStore OPTIONAL, -- message stores allocated to this subscriber subscriber [4] GenericSubscriberInfo OPTIONAL, ..., - paymentDetails [5] PaymentDetails OPTIONAL + paymentDetails [5] PaymentDetails OPTIONAL } MsgSubscriberID ::= OCTET STRING @@ -1516,12 +1534,14 @@ MsgStore ::= SEQUENCE -- Location into which messages are temporarily stored. All asynchronous message services by -- definition require some message store. E.g. in the case of e-mail this will be a mailbox { - validity [1] TimeSpan OPTIONAL, - msgStoreID [2] MsgStoreID OPTIONAL, - aliases [3] SEQUENCE OF MsgAddress OPTIONAL, + validity [1] TimeSpan OPTIONAL, + msgStoreID [2] MsgStoreID OPTIONAL, + aliases [3] SEQUENCE OF MsgAddress OPTIONAL, -- The complete list of all addresses that get delivered into this message store. - providerID [4] MsgProviderID OPTIONAL, - ... + providerID [4] MsgProviderID OPTIONAL, + ..., + msgForwardingAddresses [5] SEQUENCE OF MsgAddress OPTIONAL, + msgStoreSubscriberRelatedIDs [6] SEQUENCE OF ContactDetails OPTIONAL } MsgStoreID ::= OCTET STRING @@ -1687,7 +1707,8 @@ MultimediaRecord ::= CHOICE multimediaSubscriber [1] MultimediaSubscriber, multimediaBillingDetails [2] MultimediaBillingDetails, multimediaServiceUsage [3] MultimediaServiceUsage, - ... + ..., + multimediaDevice [4] MultimediaDevice } -- ============================== @@ -1763,10 +1784,14 @@ SubscribedMultimediaServices ::= SEQUENCE deliveryAddress [15] AddressInformation OPTIONAL, resellerAddress [16] AddressInformation OPTIONAL, otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL, - multimediaServiceType [18] UTF8String OPTIONAL, + multimediaServiceType [18] UTF8String OPTIONAL, -- Service name used by the service provider which may be proprietary - orderTime [19] GeneralizedTime OPTIONAL - -- Time when the subscribed service was ordered by the user + orderTime [19] GeneralizedTime OPTIONAL, + -- Time when the subscribed service was ordered by the user + iMEIs [20] SEQUENCE OF IMEI OPTIONAL, + registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, + privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL, + allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL } MultimediaServiceType ::= ENUMERATED @@ -1779,6 +1804,9 @@ MultimediaServiceType ::= ENUMERATED ... } +IMPI ::= UTF8String + -- Private User Identity of the IP Multimedia Subsystem subscription + -- ================================= -- Definitions of Service Usage Data -- ================================= @@ -1791,59 +1819,62 @@ MultimediaServiceUsage ::= SEQUENCE -- provided by the party communicationTime [2] TimeSpan OPTIONAL, -- Time and duration of the communication - reasonCause [3] INTEGER OPTIONAL, + reasonCause [3] INTEGER OPTIONAL, -- cause code for call termination e.g. SIP Reason code communicationType [4] MultimediaCommunicationType OPTIONAL, bearerService [5] MultimediaBearerService OPTIONAL, qualityOfService [6] QualityOfService OPTIONAL, ringDuration [7] INTEGER OPTIONAL, - callID [8] MultimediaCallID OPTIONAL, + callID [8] MultimediaCallID OPTIONAL, originalCallID [9] MultimediaCallID OPTIONAL, - callState [10] ENUMERATED + callState [10] ENUMERATED { bNotReached(1), bAlert(2), bAnswered(3), ... } OPTIONAL, - answerTime [11] GeneralizedTime OPTIONAL, - contentType [12] SEQUENCE OF UTF8String OPTIONAL, + answerTime [11] GeneralizedTime OPTIONAL, + contentType [12] SEQUENCE OF UTF8String OPTIONAL, mediaComponents [13] SEQUENCE OF MediaComponent OPTIONAL, imsInformation [14] ImsInformation OPTIONAL, - nationalMultimediaServiceUsage [15] NationalMultimediaServiceUsage OPTIONAL, - serviceID [16] UTF8String OPTIONAL, - providerID [17] UTF8String OPTIONAL, + nationalMultimediaServiceUsage [15] NationalMultimediaServiceUsage OPTIONAL, + serviceID [16] UTF8String OPTIONAL, + providerID [17] UTF8String OPTIONAL, ..., - cdrNumber [18] UTF8String OPTIONAL, -- as per CSP defined format - clientIP [19] IPAddress OPTIONAL, - relayIP [20] IPAddress OPTIONAL, - vmLength [21] INTEGER OPTIONAL, -- number of seconds - reason [22] UTF8String OPTIONAL + cdrNumber [18] UTF8String OPTIONAL, -- as per CSP defined format + clientIP [19] IPAddress OPTIONAL, + relayIP [20] IPAddress OPTIONAL, + vmLength [21] INTEGER OPTIONAL, -- number of seconds + reason [22] UTF8String OPTIONAL, + smsInformation [23] SmsInformation OPTIONAL, + mmsInformation [24] MmsInformation OPTIONAL } MultimediaPartyInformation ::= SEQUENCE { - partyRole [1] MultimediaPartyRole OPTIONAL, + partyRole [1] MultimediaPartyRole OPTIONAL, partyIdentity [2] PartyIdentity OPTIONAL, subscriberID [3] MultimediaSubscriberID OPTIONAL, communicationTime [4] TimeSpan OPTIONAL, -- Time and duration of the communication - iMSI [6] IMSI OPTIONAL, + iMSI [6] IMSI OPTIONAL, natureOfAddress [7] UTF8String OPTIONAL, -- Nature of address indicator, e.g. "National", "International" - uRI [8] UTF8String OPTIONAL, - partyNumber [9] PartyNumber OPTIONAL, + uRI [8] UTF8String OPTIONAL, + partyNumber [9] PartyNumber OPTIONAL, naAssignedAddress [10] NAAssignedAddress OPTIONAL, - forwardedTransferredIdentifier [11] PartyIdentity OPTIONAL, - terminatingTransferredIdentifier [12] PartyIdentity OPTIONAL, - nationalMultimediaPartyInformation [13] NationalMultimediaPartyInformation OPTIONAL, + forwardedTransferredIdentifier [11] PartyIdentity OPTIONAL, + terminatingTransferredIdentifier [12] PartyIdentity OPTIONAL, + nationalMultimediaPartyInformation [13] NationalMultimediaPartyInformation OPTIONAL, ..., - userAgent [14] UTF8String OPTIONAL, + userAgent [14] UTF8String OPTIONAL, -- e.g. SIP User-Agent field (see RFC 3261 [26]) octetsUploaded [15] INTEGER OPTIONAL, octetsDownloaded [16] INTEGER OPTIONAL, - accessNetworkInformation [17] SEQUENCE OF AccessNetworkInfo OPTIONAL - + accessNetworkInformation [17] SEQUENCE OF AccessNetworkInfo OPTIONAL, + privateUserIdentity [18] IMPI OPTIONAL, + iMEI [19] IMEI OPTIONAL } MultimediaCallID ::= UTF8String @@ -1853,7 +1884,11 @@ MultimediaCommunicationType ::= ENUMERATED multimediaFixed(0), multimediaWireless(1), multimediaNetworkIndependent(2), - ... + ..., + telephonyFixed(3), + telephonyWireless(4), + sMS(5), + mMS(6) } MultimediaPartyRole ::= ENUMERATED @@ -1869,7 +1904,21 @@ MultimediaPartyRole ::= ENUMERATED broadcastReceiver(8), broadcastSender(9), ..., - originalCalling(10) + originalCalling(10), + forwarded-to-Party(11), + connected(12), + userProvidedCalling(13), + roaming(14), + translated(15), + singlePersonalNumber(16), + smsOriginator(17), + smsRecipient(18), + smsOriginatorTrn(19), + smsRecipientTrn(20), + mmsOriginator(21), + mmsRecipient(22), + mmsOriginatorTrn(23), + mmsRecipientTrn(24) } MultimediaBearerService ::= ENUMERATED @@ -2059,6 +2108,42 @@ NationalMultimediaMediaComponent ::= SEQUENCE ... } +-- ======================= +-- Device Data definitions +-- ======================= + +MultimediaDevice ::= SEQUENCE +{ + deviceIDType [1] ENUMERATED + -- Type of identifier for telephony device + { + unknown(0), + imei(1), + macAddress(2), + ... + } OPTIONAL, + multimediaDeviceID [2] MultimediaDeviceID OPTIONAL, + -- Unique identifier for this device according to type of identifier + subscriberID [3] MultimediaSubscriberID OPTIONAL, + -- Identifier for a known user of this equipment. + -- Usage of this parameter is subject to national legislation. + nationalMultimediaDevice [4] NationalMultimediaDevice OPTIONAL, + -- To be defined on a national basis + -- Only to be used in case the present document cannot fulfil the national requirements + ... +} + +NationalMultimediaDevice ::= SEQUENCE +{ + countryCode [1] UTF8String (SIZE (2)), + -- see comment in NationalRequestParameters + ... +} + +MultimediaDeviceID ::= OCTET STRING + -- A unique identifier for the multimedia device. For example, the IMEI number + -- of a mobile handset + NetworkAccessRecord::= CHOICE { naSubscriber [1] NASubscriber, @@ -2100,19 +2185,19 @@ NASubscriber ::= SEQUENCE NAServiceSubscription ::= SEQUENCE -- Description of the subscription to a Network Access service { - validity [1] TimeSpan OPTIONAL, - naServiceID [2] UTF8String OPTIONAL, + validity [1] TimeSpan OPTIONAL, + naServiceID [2] UTF8String OPTIONAL, -- Identifier for the service, e.g. account plan name. naProviderID [3] NAProviderID OPTIONAL, -- Unique identifier for the provider of the service, e.g. company name - naAuthID [4] NAAuthID OPTIONAL, + naAuthID [4] NAAuthID OPTIONAL, -- Unique identifier for this subscription, e.g. logon name - options [5] UTF8String OPTIONAL, + options [5] UTF8String OPTIONAL, -- Human readable text with restrictions or options to the subscription installationAddress [6] AddressInformation OPTIONAL, fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address - imsi [8] IMSI OPTIONAL, + imsi [8] IMSI OPTIONAL, ..., allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL, naServiceStatus [10] UTF8String OPTIONAL, @@ -2128,8 +2213,8 @@ NAServiceSubscription ::= SEQUENCE otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL, allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL, -- If present, contains device details for all elements from allocatedDeviceIDs - mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL - + mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL, + registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL } NationalNASubscription ::= SEQUENCE diff --git a/102657/portal/RDMessagever19.xsd b/102657/portal/RDMessagever20.xsd similarity index 95% rename from 102657/portal/RDMessagever19.xsd rename to 102657/portal/RDMessagever20.xsd index f46fb92..19961bd 100644 --- a/102657/portal/RDMessagever19.xsd +++ b/102657/portal/RDMessagever20.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.19.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.22.1 @@ -34,7 +34,7 @@ - A country code as per ISO 3166-1 [xx] + A country code as per ISO 3166-1 [4] @@ -401,6 +401,7 @@ + @@ -411,6 +412,7 @@ + @@ -514,6 +516,15 @@ + + + + + + + + + @@ -522,6 +533,7 @@ + @@ -595,6 +607,9 @@ + + + @@ -1027,6 +1042,23 @@ + + + + + + + + + + + + + + + + + @@ -1341,6 +1373,13 @@ + + + + + + + @@ -1507,6 +1546,20 @@ + + + + + + + + + + + + + + @@ -1745,6 +1798,13 @@ + + + + + + + @@ -2313,6 +2373,7 @@ + @@ -2392,6 +2453,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2456,6 +2545,8 @@ + + @@ -2483,6 +2574,8 @@ + + @@ -2494,6 +2587,10 @@ + + + + @@ -2510,6 +2607,20 @@ + + + + + + + + + + + + + + @@ -2765,4 +2876,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 5487bc67531703ba965f4bdbc6e2c41a51456251 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:34:26 +0100 Subject: [PATCH 127/208] TS 102 232-1 v3.17.1 (2018-09-11) agreed at LI#48 (Bergen, 2018-06-26) --- 102232-1/LI-PS-PDU.asn | 28 +++++++++++++------ ...I-PS-PDU,ver27.txt => LI-PS-PDU,ver28.txt} | 28 +++++++++++++------ 2 files changed, 40 insertions(+), 16 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver27.txt => LI-PS-PDU,ver28.txt} (96%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 5b0e18a..891cfce 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version27(27)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version28(28)} DEFINITIONS IMPLICIT TAGS ::= @@ -16,6 +16,7 @@ IMPORTS -- from TS 101 671 [4] IRI-Parameters, IRIsContent, + Location, Network-Element-Identifier FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} @@ -188,7 +189,14 @@ IMPORTS {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} CCIPPacketHeader FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}; + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} + + -- from ETSI TS 103 462 [X] + ILHIPayload + FROM ILHIPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; + -- This import is only used for the handover between LEMFs. + -- end of IMPORTS @@ -198,7 +206,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version26(26)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version28(28)} -- ==================== -- Top-level definition @@ -237,8 +245,10 @@ Payload ::= CHOICE ..., hI1-Operation [3] HI1-Operation, encryptionContainer [4] EncryptionContainer, - threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, -- This structure may be functionally redundant with hI1-Operation from TS 101 671 + iLHIPayload [6] SEQUENCE OF ILHIPayload + -- For typical use cases see ETSI TS 103 462 [45] } TimeStampQualifier ::= ENUMERATED @@ -507,7 +517,8 @@ DataType ::= ENUMERATED { iRI(1), cC(2), - ... + ..., + iLHI(3) } @@ -644,7 +655,8 @@ Location ::= SEQUENCE umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL } WlanLocationAttributes ::= SEQUENCE @@ -657,8 +669,8 @@ WlanLocationAttributes ::= SEQUENCE IPAddress ::= SEQUENCE -- This parameter was previously imported from TS 101 671 [4] but has been copied - -- to TS 102 232-1. It is not recommended to use this parameter in future - -- change requests. Suggested approach is to use a parameter from TS 103 280 [42] + -- to TS 102 232-1. It is not recommended to use this parameter in + -- future change requests. Suggested approach is to use a parameter from TS 103 280 [42] -- instead. { iP-type [1] ENUMERATED diff --git a/102232-1/portal/LI-PS-PDU,ver27.txt b/102232-1/portal/LI-PS-PDU,ver28.txt similarity index 96% rename from 102232-1/portal/LI-PS-PDU,ver27.txt rename to 102232-1/portal/LI-PS-PDU,ver28.txt index 5b0e18a..891cfce 100644 --- a/102232-1/portal/LI-PS-PDU,ver27.txt +++ b/102232-1/portal/LI-PS-PDU,ver28.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version27(27)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version28(28)} DEFINITIONS IMPLICIT TAGS ::= @@ -16,6 +16,7 @@ IMPORTS -- from TS 101 671 [4] IRI-Parameters, IRIsContent, + Location, Network-Element-Identifier FROM HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} @@ -188,7 +189,14 @@ IMPORTS {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} CCIPPacketHeader FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}; + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} + + -- from ETSI TS 103 462 [X] + ILHIPayload + FROM ILHIPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; + -- This import is only used for the handover between LEMFs. + -- end of IMPORTS @@ -198,7 +206,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version26(26)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version28(28)} -- ==================== -- Top-level definition @@ -237,8 +245,10 @@ Payload ::= CHOICE ..., hI1-Operation [3] HI1-Operation, encryptionContainer [4] EncryptionContainer, - threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, -- This structure may be functionally redundant with hI1-Operation from TS 101 671 + iLHIPayload [6] SEQUENCE OF ILHIPayload + -- For typical use cases see ETSI TS 103 462 [45] } TimeStampQualifier ::= ENUMERATED @@ -507,7 +517,8 @@ DataType ::= ENUMERATED { iRI(1), cC(2), - ... + ..., + iLHI(3) } @@ -644,7 +655,8 @@ Location ::= SEQUENCE umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL } WlanLocationAttributes ::= SEQUENCE @@ -657,8 +669,8 @@ WlanLocationAttributes ::= SEQUENCE IPAddress ::= SEQUENCE -- This parameter was previously imported from TS 101 671 [4] but has been copied - -- to TS 102 232-1. It is not recommended to use this parameter in future - -- change requests. Suggested approach is to use a parameter from TS 103 280 [42] + -- to TS 102 232-1. It is not recommended to use this parameter in + -- future change requests. Suggested approach is to use a parameter from TS 103 280 [42] -- instead. { iP-type [1] ENUMERATED -- GitLab From c2ff3aee273ffbc37fe16383cecda2f1bd5701ee Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:34:34 +0100 Subject: [PATCH 128/208] TS 102 232-1 v3.18.1 (2018-10-25) agreed at LI#49 (Zagreb, 2018-09-25) --- 102232-1/LI-PS-PDU.asn | 727 ------------------------- 102232-1/lm_LI-PS-PDU.asn | 727 +++++++++++++++++++++++++ 102232-1/portal/LI-PS-PDU,ver28.txt | 727 ------------------------- 102232-1/portal/lm_LI-PS-PDU,ver28.txt | 727 +++++++++++++++++++++++++ 4 files changed, 1454 insertions(+), 1454 deletions(-) delete mode 100644 102232-1/LI-PS-PDU.asn create mode 100644 102232-1/lm_LI-PS-PDU.asn delete mode 100644 102232-1/portal/LI-PS-PDU,ver28.txt create mode 100644 102232-1/portal/lm_LI-PS-PDU,ver28.txt diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn deleted file mode 100644 index 891cfce..0000000 --- a/102232-1/LI-PS-PDU.asn +++ /dev/null @@ -1,727 +0,0 @@ -LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version28(28)} - -DEFINITIONS IMPLICIT TAGS ::= - -BEGIN - -IMPORTS - -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) - - -- from TS 103 280 [44] - LIID - FROM Common-Parameters - {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} - - -- from TS 101 671 [4] - IRI-Parameters, - IRIsContent, - Location, - Network-Element-Identifier - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} - - -- from TS 101 671 [4] - HI1-Operation - FROM HI1NotificationOperations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} - - -- from TS 102 232-02 [5] - EmailCC, - EmailIRI, - MessagingCC, - MessagingMMCC, - MessagingIRI - FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} - - -- from TS 102 232-03 [6] - IPCC, - IPIRI, - IPIRIOnly - FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} - - -- from TS 102 232-04 [32] - L2CC, - L2IRI, - L2IRIOnly - FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} - - -- from TS 102 232-05 [37] - IPMMCC, - IPMMIRI - FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} - - -- from TS 102 232-06 [36] - PstnIsdnCC, - PstnIsdnIRI - FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - UmtsIRIsContent, - CorrelationValues, - Location - FROM UmtsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - UmtsCS-IRIsContent - FROM UmtsCS-HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - EpsIRIsContent, - EPSLocation - FROM EpsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - ConfIRIsContent - 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. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - ProSeIRIsContent - FROM ProSeHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - GcseIRIsContent - FROM GCSEHI2Operations - {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. - - -- 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. - - -- 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. - - -- 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. - -- 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 TS 33.108 [9]. - - -- from TS 101 909-20-1 [33] - TARGETACTIVITYMONITOR-1, - TTRAFFIC, - CTTRAFFIC - FROM TS101909201 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} - - -- from TS 101 909-20-2 [34] - TARGETACTIVITYMONITOR, - TTRAFFIC, - CTTRAFFIC - FROM TS101909202 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} - - -- from J-STD-025-B [39] - LAESProtocol - FROM Laesp-j-std-025-b - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} - CDMA2000LAESMessage - FROM CDMA2000CIIModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} - CCIPPacketHeader - FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} - - -- from ETSI TS 103 462 [X] - ILHIPayload - FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; - -- This import is only used for the handover between LEMFs. - - --- end of IMPORTS - --- ============================= --- Object Identifier Definitions --- ============================= - -lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version28(28)} - --- ==================== --- Top-level definition --- ==================== - -PS-PDU ::= SEQUENCE -{ - pSHeader [1] PSHeader, - payload [2] Payload -} - -PSHeader ::= SEQUENCE -{ - li-psDomainId [0] OBJECT IDENTIFIER, - lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, - -- As of ASN.1 version 26 this parameter is included from TS 103 280 [44] - authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, - -- see clause 5.2.3 - communicationIdentifier [3] CommunicationIdentifier, - sequenceNumber [4] INTEGER (0..4294967295), - timeStamp [5] GeneralizedTime OPTIONAL, - -- see clause 5.2.6 - ..., - interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, - -- see clause 5.2.11 - microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, - timeStampQualifier [8] TimeStampQualifier OPTIONAL -} - -Payload ::= CHOICE -{ - iRIPayloadSequence [0] SEQUENCE OF IRIPayload, - cCPayloadSequence [1] SEQUENCE OF CCPayload, - -- Clause 6.2.3 explains how to include more than one payload in the same PDU - tRIPayload [2] TRIPayload, - ..., - hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer, - threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, - -- This structure may be functionally redundant with hI1-Operation from TS 101 671 - iLHIPayload [6] SEQUENCE OF ILHIPayload - -- For typical use cases see ETSI TS 103 462 [45] -} - -TimeStampQualifier ::= ENUMERATED -{ - unknown(0), - timeOfInterception(1), - timeOfMediation(2), - ..., - timeOfAggregation(3) -} - --- ==================================== --- Items contained within the PS-Header --- ==================================== - -CommunicationIdentifier ::= SEQUENCE -{ - networkIdentifier [0] NetworkIdentifier, - communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, - -- in case of transport of HI1 messages not required - -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) - deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, - -- see clause 5.2.4 - ..., - cINExtension [3] CorrelationValues OPTIONAL - -- To be used when a single INTEGER is not sufficient to identify - -- a particular session (see clause 5.2.4) -} - -NetworkIdentifier ::= SEQUENCE -{ - operatorIdentifier [0] OCTET STRING (SIZE(1..16)), - networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, - ..., - eTSI671NEID [2] Network-Element-Identifier OPTIONAL - -- For network element identifier, use either networkElementIdentifier or eTSI671NEID -} - --- ========================== --- Definitions for CC Payload --- ========================== - -CCPayload ::= SEQUENCE -{ - payloadDirection [0] PayloadDirection OPTIONAL, - timeStamp [1] GeneralizedTime OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - cCContents [2] CCContents, - ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - timeStampQualifier [4] TimeStampQualifier OPTIONAL -} - -PayloadDirection ::= ENUMERATED -{ - fromTarget(0), - toTarget(1), - ..., - indeterminate(2), - -- Indication that the direction was indeterminate - combined(3), - -- Indication applicable to some services that the traffic is actually a combination - -- of To and From - notapplicable(4) - -- Indication that direction of interceptable service does not make sense -} - -CCContents ::= CHOICE - -- Any of these choices may be commented out if they are not being used, see clause A.3 -{ - emailCC [1] EmailCC, - iPCC [2] IPCC, - uMTSCC [4] OCTET STRING, - ..., - l2CC [6] 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, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] 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, - 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, - cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU -} - -MicroSecondTimeStamp ::= SEQUENCE -{ - seconds [0] INTEGER (0..18446744073709551615), - -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch - microSeconds [1] INTEGER (0..999999), - ... -} - --- =========================== --- Definitions for IRI Payload --- =========================== - -IRIPayload ::= SEQUENCE -{ - iRIType [0] IRIType OPTIONAL, - -- See clause 5.2.10 - timeStamp [1] GeneralizedTime OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - iRIContents [2] IRIContents, - ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, - -- 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 - -- 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 - -- relevant service-specific details -} - -IRIType ::= ENUMERATED -{ - iRI-Begin(1), - iRI-End(2), - iRI-Continue(3), - iRI-Report(4) -} - -IRIContents ::= CHOICE - -- Any of these choices may be commented out if they are not being used (see clause A.3) -{ - emailIRI [1] EmailIRI, - iPIRI [2] IPIRI, - iPIRIOnly [3] IPIRIOnly, - uMTSIRI [4] UMTSIRI, - eTSI671IRI [5] ETSI671IRI, - ..., - l2IRI [6] L2IRI, - l2IRIOnly [7] L2IRIOnly, - tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, - tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, - pstnIsdnIRI [10] PstnIsdnIRI, - iPMMIRI [11] IPMMIRI, - lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, - cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, - messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI, - confIRI [16] ConfIRI, - proseIRI [17] ProSeIRI, - gcseIRI [18] GcseIRI -} - -UMTSIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, - umtsIRIsContent [1] UmtsIRIsContent, - ..., - iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, - umtsCS-IRIsContent [3] UmtsCS-IRIsContent -} - -ETSI671IRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Parameters [0] HI2Operations.IRI-Parameters, - iRIsContent [1] IRIsContent, - ... -} - -EPSIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, - epsIRIsContent [1] EpsIRIsContent, - ... -} - -ConfIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, - confIRIsContent [1] ConfIRIsContent, - ... -} - - -ProSeIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, - proseIRIsContent [1] ProSeIRIsContent, - ... -} - - -GcseIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, - gcseIRIsContent [1] GcseIRIsContent, - ... -} - - --- =========================== --- Definitions for TRI Payload --- =========================== - -TRIPayload ::= CHOICE -{ - integrityCheck [0] IntegrityCheck, - testPDU [1] NULL, - paddingPDU [2] OCTET STRING, - -- Undefined contents (will be discarded) - keep-alive [3] NULL, - keep-aliveResponse [4] NULL, - firstSegmentFlag [5] NULL, - lastSegmentFlag [6] NULL, - ..., - cINReset [7] NULL, - operatorLeaMessage [8] OperatorLeaMessage, - optionRequest [9] OptionRequest, - optionResponse [10] OptionResponse, - optionComplete [11] NULL, - pDUAcknowledgementRequest [12] NULL, - pDUAcknowledgementResponse [13] NULL -} - -IntegrityCheck ::= SEQUENCE -{ - includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), - -- gives the order the PDUs were processed - checkType [1] CheckType, - dataType [2] DataType OPTIONAL, - -- From version5(5) the dataType is mandatory for hashes and for signatures - -- (see clause 7.2.3) - 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 - -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. - ..., - hashAlgorithm [4] HashAlgorithm OPTIONAL - -- Clarifies the hash function if checkType is hash(1). - -- If used, it shall be present for each checkType hash(1). -} - -CheckType ::= ENUMERATED -{ - hash(1), - -- hash value - signature(2), - -- DSS/DSA signature - ... -} - -DataType ::= ENUMERATED -{ - iRI(1), - cC(2), - ..., - iLHI(3) -} - - -HashAlgorithm ::= ENUMERATED -{ - sHA-1(1), - -- Included for legacy/migration purposes only, not to be used for new implementations - sHA-256(2), - sHA-384(3), - sHA-512(4), - ... -} - - - - -Option ::= CHOICE -{ - pDUAcknowledgement [0] NULL, - ... -} - -OptionRequest ::= SEQUENCE -{ - requestedOptions [0] SEQUENCE OF Option, - ... -} - -OptionResponse ::= SEQUENCE -{ - acceptedOptions [0] SEQUENCE OF Option, - declinedOptions [1] SEQUENCE OF Option, - ... -} - --- ================================== --- Definitions for OperatorLeaMessage --- ================================== - -OperatorLeaMessage ::= SEQUENCE -{ - messagePriority [0] OperatorLeaMessagePriority, - message [1] OCTET STRING (SIZE(1..255)), - ... -} - -OperatorLeaMessagePriority ::= ENUMERATED -{ - error(1), - -- reporting of error conditions that have impact on the quality of the - -- intercepted data - informational(2), - -- reporting of conditions that will not have direct impact on the quality of - -- the intercepted data - ... -} - --- =================================== --- Definitions for EncryptionContainer --- =================================== - -EncryptionContainer ::= SEQUENCE -{ - encryptionType [0] EncryptionType, - encryptedPayload [1] OCTET STRING, - -- once decrypted, it can be interpreted as EncryptedPayload - ..., - encryptedPayloadType [2] EncryptedPayloadType OPTIONAL -} - -EncryptionType ::= ENUMERATED -{ - none(1), - -- No encryption is applied. - national-option(2), - -- Use this option when an encryption scheme is negotiated on a national level - aES-192-CBC(3), - -- The Advanced Encryption Standard using a 192 bit key in CBC mode - aES-256-CBC(4), - -- The Advanced Encryption Standard using a 256 bit key in CBC mode - blowfish-192-CBC(5), - -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode - blowfish-256-CBC(6), - -- Blowfish using a 256 bit key in CBC mode - threedes-cbc(7), - -- Triple-DES using a 192 bit key in CBC mode - ... -} - -EncryptedPayload ::= SEQUENCE -{ - byteCounter [0] INTEGER (0..18446744073709551615), - -- The sum of the sizes of all PDUs before this PDU. - -- It is initialized with the unixTime (number of seconds since 01-01-1970) - -- 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 - payload [1] Payload, - ... -} - -EncryptedPayloadType ::= ENUMERATED -{ - unknown(1), - part2(2), - -- encrypted payload is TS 102 232 part 2 [5] - part3(3), - -- encrypted payload is TS 102 232 part 3 [6] - part4(4), - -- encrypted payload is TS 102 232 part 4 [32] - part5(5), - -- encrypted payload is TS 102 232 part 5 [37] - part6(6), - -- encrypted payload is TS 102 232 part 6 [36] - part7(7), - -- encrypted payload is TS 102 232 part 7 [38] - ..., - part1(8) - -- encrypted payload is TS 102 232 part 1 (the present document) -} - --- =================================== --- Common Parameters --- =================================== - -Location ::= SEQUENCE - -- This is a common parameter, the use of this parameter is described in clause 4.5 -{ - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, - ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, - eTSI671HI2Location [3] HI2Operations.Location OPTIONAL -} - -WlanLocationAttributes ::= SEQUENCE -{ - 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 TS 101 671 [4] but has been copied - -- to TS 102 232-1. It is not recommended to use this parameter in - -- future change requests. Suggested approach is to use a parameter from TS 103 280 [42] - -- instead. -{ - iP-type [1] ENUMERATED - { - iPV4(0), - iPV6(1), - ... - }, - iP-value [2] IP-value, - iP-assignment [3] ENUMERATED - { - static(1), - -- The static coding shall be used to report a static address. - dynamic(2), - -- The dynamic coding shall be used to report a dynamically allocated address. - notKnown(3), - -- The notKnown coding shall be used to report other then static or dynamically - -- allocated IP addresses. - ... - } OPTIONAL, - ..., - iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, - -- Indicates the length of the prefix delegated by the CSP to the subscriber - -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" - -- Mandatory in case where the iP-value contains an IPv6 binary value - iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL - -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. - -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to - -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to - -- a /29 CIDR-format subnet mask -} - -IP-value ::= CHOICE -{ - iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), - -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" - -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" - iPTextAddress [2] IA5String (SIZE(7..45)), - -- In case of IPv6, the delivered iPTextAddress field could include a complete - -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. - -- In case of IPv4, the delivered iPTextAddress field could include a single - -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" - ... -} - -LawfulInterceptionIdentifier ::= LIID - -- LIID is a common parameter imported from TS 103 280 [44]. - -- It is redefined as LawfulInterceptionIdentifier in this - -- module to preserve the original type name during the - -- removal of imports from TS 101 671 [4]. - - - -END --end of LI-PS-PDU diff --git a/102232-1/lm_LI-PS-PDU.asn b/102232-1/lm_LI-PS-PDU.asn new file mode 100644 index 0000000..eb62cde --- /dev/null +++ b/102232-1/lm_LI-PS-PDU.asn @@ -0,0 +1,727 @@ +LI-PS-PDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version28(28)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + + -- from ETSI TS 103 280 [44] + LIID + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + + -- from ETSI TS 101 671 [4] + IRI-Parameters, + IRIsContent, + Location, + Network-Element-Identifier + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + + -- from ETSI TS 101 671 [4] + HI1-Operation + FROM HI1NotificationOperations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} + + -- from ETSI TS 102 232-2 [5] + EmailCC, + EmailIRI, + MessagingCC, + MessagingMMCC, + MessagingIRI + FROM EmailPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} + + -- from ETSI TS 102 232-3 [6] + IPCC, + IPIRI, + IPIRIOnly + FROM IPAccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} + + -- from ETSI TS 102 232-4 [32] + L2CC, + L2IRI, + L2IRIOnly + FROM L2AccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} + + -- from ETSI TS 102 232-5 [37] + IPMMCC, + IPMMIRI + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} + + -- from ETSI TS 102 232-6 [36] + PstnIsdnCC, + PstnIsdnIRI + FROM PstnIsdnPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + UmtsIRIsContent, + CorrelationValues, + Location + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + UmtsCS-IRIsContent + FROM UmtsCS-HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + EpsIRIsContent, + EPSLocation + FROM EpsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + ConfIRIsContent + 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. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + ProSeIRIsContent + FROM ProSeHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + GcseIRIsContent + FROM GCSEHI2Operations + {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 ETSI TS 133 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 ETSI TS 133 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. + + -- from ETSI TS 133 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. + + -- from ETSI TS 133 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. + + -- from ETSI TS 133 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 ETSI TS 133 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. + -- 3GPP HI1 may be used with other services/networks than 3GPP's one. + + -- from ETSI TS 133 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 ETSI TS 133 108 [9]. + + -- from ETSI TS 101 909-20-1 [33] + TARGETACTIVITYMONITOR-1, + TTRAFFIC, + CTTRAFFIC + FROM TS101909201 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} + + -- from ETSI TS 101 909-20-2 [34] + TARGETACTIVITYMONITOR, + TTRAFFIC, + CTTRAFFIC + FROM TS101909202 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} + + -- from J-STD-025-B [39] + LAESProtocol + FROM Laesp-j-std-025-b + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} + CDMA2000LAESMessage + FROM CDMA2000CIIModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} + CCIPPacketHeader + FROM CDMA2000CCModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} + + -- from ETSI TS 103 462 [45] + ILHIPayload + FROM ILHIPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; + -- This import is only used for the handover between LEMFs. + + +-- end of IMPORTS + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version28(28)} + +-- ==================== +-- Top-level definition +-- ==================== + +PS-PDU ::= SEQUENCE +{ + pSHeader [1] PSHeader, + payload [2] Payload +} + +PSHeader ::= SEQUENCE +{ + li-psDomainId [0] OBJECT IDENTIFIER, + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- 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, + sequenceNumber [4] INTEGER (0..4294967295), + timeStamp [5] GeneralizedTime OPTIONAL, + -- see clause 5.2.6 + ..., + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + -- see clause 5.2.11 + microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, + timeStampQualifier [8] TimeStampQualifier OPTIONAL +} + +Payload ::= CHOICE +{ + iRIPayloadSequence [0] SEQUENCE OF IRIPayload, + cCPayloadSequence [1] SEQUENCE OF CCPayload, + -- Clause 6.2.3 explains how to include more than one payload in the same PDU + tRIPayload [2] TRIPayload, + ..., + hI1-Operation [3] HI1-Operation, + encryptionContainer [4] EncryptionContainer, + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, + -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] + iLHIPayload [6] SEQUENCE OF ILHIPayload + -- For typical use cases see ETSI TS 103 462 [45] +} + +TimeStampQualifier ::= ENUMERATED +{ + unknown(0), + timeOfInterception(1), + timeOfMediation(2), + ..., + timeOfAggregation(3) +} + +-- ==================================== +-- Items contained within the PS-Header +-- ==================================== + +CommunicationIdentifier ::= SEQUENCE +{ + networkIdentifier [0] NetworkIdentifier, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + -- in case of transport of HI1 messages not required + -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + -- see clause 5.2.4 + ..., + cINExtension [3] CorrelationValues OPTIONAL + -- To be used when a single INTEGER is not sufficient to identify + -- a particular session (see clause 5.2.4) +} + +NetworkIdentifier ::= SEQUENCE +{ + operatorIdentifier [0] OCTET STRING (SIZE(1..16)), + networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, + ..., + eTSI671NEID [2] Network-Element-Identifier OPTIONAL + -- For network element identifier, use either networkElementIdentifier or eTSI671NEID +} + +-- ========================== +-- Definitions for CC Payload +-- ========================== + +CCPayload ::= SEQUENCE +{ + payloadDirection [0] PayloadDirection OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + cCContents [2] CCContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + timeStampQualifier [4] TimeStampQualifier OPTIONAL +} + +PayloadDirection ::= ENUMERATED +{ + fromTarget(0), + toTarget(1), + ..., + indeterminate(2), + -- Indication that the direction was indeterminate + combined(3), + -- Indication applicable to some services that the traffic is actually a combination + -- of To and From + notapplicable(4) + -- Indication that direction of interceptable service does not make sense +} + +CCContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used, see clause A.3 +{ + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, + ..., + l2CC [6] 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, + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + messagingCC [14] 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, + 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, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU +} + +MicroSecondTimeStamp ::= SEQUENCE +{ + seconds [0] INTEGER (0..18446744073709551615), + -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch + microSeconds [1] INTEGER (0..999999), + ... +} + +-- =========================== +-- Definitions for IRI Payload +-- =========================== + +IRIPayload ::= SEQUENCE +{ + iRIType [0] IRIType OPTIONAL, + -- See clause 5.2.10 + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + iRIContents [2] IRIContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- 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 + -- 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 + -- relevant service-specific details +} + +IRIType ::= ENUMERATED +{ + iRI-Begin(1), + iRI-End(2), + iRI-Continue(3), + iRI-Report(4) +} + +IRIContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used (see clause A.3) +{ + emailIRI [1] EmailIRI, + iPIRI [2] IPIRI, + iPIRIOnly [3] IPIRIOnly, + uMTSIRI [4] UMTSIRI, + eTSI671IRI [5] ETSI671IRI, + ..., + l2IRI [6] L2IRI, + l2IRIOnly [7] L2IRIOnly, + tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, + tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, + pstnIsdnIRI [10] PstnIsdnIRI, + iPMMIRI [11] IPMMIRI, + lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, + cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, + messagingIRI [14] MessagingIRI, + ePSIRI [15] EPSIRI, + confIRI [16] ConfIRI, + proseIRI [17] ProSeIRI, + gcseIRI [18] GcseIRI +} + +UMTSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, + umtsIRIsContent [1] UmtsIRIsContent, + ..., + iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, + umtsCS-IRIsContent [3] UmtsCS-IRIsContent +} + +ETSI671IRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] HI2Operations.IRI-Parameters, + iRIsContent [1] IRIsContent, + ... +} + +EPSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, + ... +} + +ConfIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, + confIRIsContent [1] ConfIRIsContent, + ... +} + + +ProSeIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, + proseIRIsContent [1] ProSeIRIsContent, + ... +} + + +GcseIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, + gcseIRIsContent [1] GcseIRIsContent, + ... +} + + +-- =========================== +-- Definitions for TRI Payload +-- =========================== + +TRIPayload ::= CHOICE +{ + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, + -- Undefined contents (will be discarded) + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, + ..., + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage, + optionRequest [9] OptionRequest, + optionResponse [10] OptionResponse, + optionComplete [11] NULL, + pDUAcknowledgementRequest [12] NULL, + pDUAcknowledgementResponse [13] NULL +} + +IntegrityCheck ::= SEQUENCE +{ + includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), + -- gives the order the PDUs were processed + checkType [1] CheckType, + dataType [2] DataType OPTIONAL, + -- From version5(5) the dataType is mandatory for hashes and for signatures + -- (see clause 7.2.3) + 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 + -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. + ..., + hashAlgorithm [4] HashAlgorithm OPTIONAL + -- Clarifies the hash function if checkType is hash(1). + -- If used, it shall be present for each checkType hash(1). +} + +CheckType ::= ENUMERATED +{ + hash(1), + -- hash value + signature(2), + -- DSS/DSA signature + ... +} + +DataType ::= ENUMERATED +{ + iRI(1), + cC(2), + ..., + iLHI(3) +} + + +HashAlgorithm ::= ENUMERATED +{ + sHA-1(1), + -- Included for legacy/migration purposes only, not to be used for new implementations + sHA-256(2), + sHA-384(3), + sHA-512(4), + ... +} + + + + +Option ::= CHOICE +{ + pDUAcknowledgement [0] NULL, + ... +} + +OptionRequest ::= SEQUENCE +{ + requestedOptions [0] SEQUENCE OF Option, + ... +} + +OptionResponse ::= SEQUENCE +{ + acceptedOptions [0] SEQUENCE OF Option, + declinedOptions [1] SEQUENCE OF Option, + ... +} + +-- ================================== +-- Definitions for OperatorLeaMessage +-- ================================== + +OperatorLeaMessage ::= SEQUENCE +{ + messagePriority [0] OperatorLeaMessagePriority, + message [1] OCTET STRING (SIZE(1..255)), + ... +} + +OperatorLeaMessagePriority ::= ENUMERATED +{ + error(1), + -- reporting of error conditions that have impact on the quality of the + -- intercepted data + informational(2), + -- reporting of conditions that will not have direct impact on the quality of + -- the intercepted data + ... +} + +-- =================================== +-- Definitions for EncryptionContainer +-- =================================== + +EncryptionContainer ::= SEQUENCE +{ + encryptionType [0] EncryptionType, + encryptedPayload [1] OCTET STRING, + -- once decrypted, it can be interpreted as EncryptedPayload + ..., + encryptedPayloadType [2] EncryptedPayloadType OPTIONAL +} + +EncryptionType ::= ENUMERATED +{ + none(1), + -- No encryption is applied. + national-option(2), + -- Use this option when an encryption scheme is negotiated on a national level + aES-192-CBC(3), + -- The Advanced Encryption Standard using a 192 bit key in CBC mode + aES-256-CBC(4), + -- The Advanced Encryption Standard using a 256 bit key in CBC mode + blowfish-192-CBC(5), + -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode + blowfish-256-CBC(6), + -- Blowfish using a 256 bit key in CBC mode + threedes-cbc(7), + -- Triple-DES using a 192 bit key in CBC mode + ... +} + +EncryptedPayload ::= SEQUENCE +{ + byteCounter [0] INTEGER (0..18446744073709551615), + -- The sum of the sizes of all PDUs before this PDU. + -- It is initialized with the unixTime (number of seconds since 01-01-1970) + -- 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 + payload [1] Payload, + ... +} + +EncryptedPayloadType ::= ENUMERATED +{ + unknown(1), + part2(2), + -- encrypted payload is ETSI TS 102 232-2 [5] + part3(3), + -- encrypted payload is ETSI TS 102 232-3 [6] + part4(4), + -- encrypted payload is ETSI TS 102 232-4 [32] + part5(5), + -- encrypted payload is ETSI TS 102 232-5 [37] + part6(6), + -- encrypted payload is ETSI TS 102 232-6 [36] + part7(7), + -- encrypted payload is ETSI TS 102 232-7 [38] + ..., + part1(8) + -- encrypted payload is ETSI TS 102 232-1 (the present document) +} + +-- =================================== +-- Common Parameters +-- =================================== + +Location ::= SEQUENCE + -- This is a common parameter, the use of this parameter is described in clause 4.5 +{ + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + ..., + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL +} + +WlanLocationAttributes ::= SEQUENCE +{ + 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. +{ + iP-type [1] ENUMERATED + { + iPV4(0), + iPV6(1), + ... + }, + iP-value [2] IP-value, + iP-assignment [3] ENUMERATED + { + static(1), + -- The static coding shall be used to report a static address. + dynamic(2), + -- The dynamic coding shall be used to report a dynamically allocated address. + notKnown(3), + -- The notKnown coding shall be used to report other than static or dynamically + -- allocated IP addresses. + ... + } OPTIONAL, + ..., + iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, + -- Indicates the length of the prefix delegated by the CSP to the subscriber + -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" + -- Mandatory in case where the iP-value contains an IPv6 binary value + iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL + -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. + -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to + -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to + -- a /29 CIDR-format subnet mask +} + +IP-value ::= CHOICE +{ + iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), + -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" + -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" + iPTextAddress [2] IA5String (SIZE(7..45)), + -- In case of IPv6, the delivered iPTextAddress field could include a complete + -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. + -- In case of IPv4, the delivered iPTextAddress field could include a single + -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" + ... +} + +LawfulInterceptionIdentifier ::= 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 diff --git a/102232-1/portal/LI-PS-PDU,ver28.txt b/102232-1/portal/LI-PS-PDU,ver28.txt deleted file mode 100644 index 891cfce..0000000 --- a/102232-1/portal/LI-PS-PDU,ver28.txt +++ /dev/null @@ -1,727 +0,0 @@ -LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version28(28)} - -DEFINITIONS IMPLICIT TAGS ::= - -BEGIN - -IMPORTS - -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) - - -- from TS 103 280 [44] - LIID - FROM Common-Parameters - {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} - - -- from TS 101 671 [4] - IRI-Parameters, - IRIsContent, - Location, - Network-Element-Identifier - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} - - -- from TS 101 671 [4] - HI1-Operation - FROM HI1NotificationOperations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} - - -- from TS 102 232-02 [5] - EmailCC, - EmailIRI, - MessagingCC, - MessagingMMCC, - MessagingIRI - FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} - - -- from TS 102 232-03 [6] - IPCC, - IPIRI, - IPIRIOnly - FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} - - -- from TS 102 232-04 [32] - L2CC, - L2IRI, - L2IRIOnly - FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} - - -- from TS 102 232-05 [37] - IPMMCC, - IPMMIRI - FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} - - -- from TS 102 232-06 [36] - PstnIsdnCC, - PstnIsdnIRI - FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - UmtsIRIsContent, - CorrelationValues, - Location - FROM UmtsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - UmtsCS-IRIsContent - FROM UmtsCS-HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - EpsIRIsContent, - EPSLocation - FROM EpsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - ConfIRIsContent - 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. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - ProSeIRIsContent - FROM ProSeHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - GcseIRIsContent - FROM GCSEHI2Operations - {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. - - -- 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. - - -- 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. - - -- 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. - -- 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 TS 33.108 [9]. - - -- from TS 101 909-20-1 [33] - TARGETACTIVITYMONITOR-1, - TTRAFFIC, - CTTRAFFIC - FROM TS101909201 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} - - -- from TS 101 909-20-2 [34] - TARGETACTIVITYMONITOR, - TTRAFFIC, - CTTRAFFIC - FROM TS101909202 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} - - -- from J-STD-025-B [39] - LAESProtocol - FROM Laesp-j-std-025-b - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} - CDMA2000LAESMessage - FROM CDMA2000CIIModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} - CCIPPacketHeader - FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} - - -- from ETSI TS 103 462 [X] - ILHIPayload - FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; - -- This import is only used for the handover between LEMFs. - - --- end of IMPORTS - --- ============================= --- Object Identifier Definitions --- ============================= - -lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version28(28)} - --- ==================== --- Top-level definition --- ==================== - -PS-PDU ::= SEQUENCE -{ - pSHeader [1] PSHeader, - payload [2] Payload -} - -PSHeader ::= SEQUENCE -{ - li-psDomainId [0] OBJECT IDENTIFIER, - lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, - -- As of ASN.1 version 26 this parameter is included from TS 103 280 [44] - authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, - -- see clause 5.2.3 - communicationIdentifier [3] CommunicationIdentifier, - sequenceNumber [4] INTEGER (0..4294967295), - timeStamp [5] GeneralizedTime OPTIONAL, - -- see clause 5.2.6 - ..., - interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, - -- see clause 5.2.11 - microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, - timeStampQualifier [8] TimeStampQualifier OPTIONAL -} - -Payload ::= CHOICE -{ - iRIPayloadSequence [0] SEQUENCE OF IRIPayload, - cCPayloadSequence [1] SEQUENCE OF CCPayload, - -- Clause 6.2.3 explains how to include more than one payload in the same PDU - tRIPayload [2] TRIPayload, - ..., - hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer, - threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, - -- This structure may be functionally redundant with hI1-Operation from TS 101 671 - iLHIPayload [6] SEQUENCE OF ILHIPayload - -- For typical use cases see ETSI TS 103 462 [45] -} - -TimeStampQualifier ::= ENUMERATED -{ - unknown(0), - timeOfInterception(1), - timeOfMediation(2), - ..., - timeOfAggregation(3) -} - --- ==================================== --- Items contained within the PS-Header --- ==================================== - -CommunicationIdentifier ::= SEQUENCE -{ - networkIdentifier [0] NetworkIdentifier, - communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, - -- in case of transport of HI1 messages not required - -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) - deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, - -- see clause 5.2.4 - ..., - cINExtension [3] CorrelationValues OPTIONAL - -- To be used when a single INTEGER is not sufficient to identify - -- a particular session (see clause 5.2.4) -} - -NetworkIdentifier ::= SEQUENCE -{ - operatorIdentifier [0] OCTET STRING (SIZE(1..16)), - networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, - ..., - eTSI671NEID [2] Network-Element-Identifier OPTIONAL - -- For network element identifier, use either networkElementIdentifier or eTSI671NEID -} - --- ========================== --- Definitions for CC Payload --- ========================== - -CCPayload ::= SEQUENCE -{ - payloadDirection [0] PayloadDirection OPTIONAL, - timeStamp [1] GeneralizedTime OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - cCContents [2] CCContents, - ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - timeStampQualifier [4] TimeStampQualifier OPTIONAL -} - -PayloadDirection ::= ENUMERATED -{ - fromTarget(0), - toTarget(1), - ..., - indeterminate(2), - -- Indication that the direction was indeterminate - combined(3), - -- Indication applicable to some services that the traffic is actually a combination - -- of To and From - notapplicable(4) - -- Indication that direction of interceptable service does not make sense -} - -CCContents ::= CHOICE - -- Any of these choices may be commented out if they are not being used, see clause A.3 -{ - emailCC [1] EmailCC, - iPCC [2] IPCC, - uMTSCC [4] OCTET STRING, - ..., - l2CC [6] 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, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] 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, - 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, - cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU -} - -MicroSecondTimeStamp ::= SEQUENCE -{ - seconds [0] INTEGER (0..18446744073709551615), - -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch - microSeconds [1] INTEGER (0..999999), - ... -} - --- =========================== --- Definitions for IRI Payload --- =========================== - -IRIPayload ::= SEQUENCE -{ - iRIType [0] IRIType OPTIONAL, - -- See clause 5.2.10 - timeStamp [1] GeneralizedTime OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - iRIContents [2] IRIContents, - ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, - -- 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 - -- 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 - -- relevant service-specific details -} - -IRIType ::= ENUMERATED -{ - iRI-Begin(1), - iRI-End(2), - iRI-Continue(3), - iRI-Report(4) -} - -IRIContents ::= CHOICE - -- Any of these choices may be commented out if they are not being used (see clause A.3) -{ - emailIRI [1] EmailIRI, - iPIRI [2] IPIRI, - iPIRIOnly [3] IPIRIOnly, - uMTSIRI [4] UMTSIRI, - eTSI671IRI [5] ETSI671IRI, - ..., - l2IRI [6] L2IRI, - l2IRIOnly [7] L2IRIOnly, - tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, - tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, - pstnIsdnIRI [10] PstnIsdnIRI, - iPMMIRI [11] IPMMIRI, - lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, - cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, - messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI, - confIRI [16] ConfIRI, - proseIRI [17] ProSeIRI, - gcseIRI [18] GcseIRI -} - -UMTSIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, - umtsIRIsContent [1] UmtsIRIsContent, - ..., - iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, - umtsCS-IRIsContent [3] UmtsCS-IRIsContent -} - -ETSI671IRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Parameters [0] HI2Operations.IRI-Parameters, - iRIsContent [1] IRIsContent, - ... -} - -EPSIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, - epsIRIsContent [1] EpsIRIsContent, - ... -} - -ConfIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, - confIRIsContent [1] ConfIRIsContent, - ... -} - - -ProSeIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, - proseIRIsContent [1] ProSeIRIsContent, - ... -} - - -GcseIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, - gcseIRIsContent [1] GcseIRIsContent, - ... -} - - --- =========================== --- Definitions for TRI Payload --- =========================== - -TRIPayload ::= CHOICE -{ - integrityCheck [0] IntegrityCheck, - testPDU [1] NULL, - paddingPDU [2] OCTET STRING, - -- Undefined contents (will be discarded) - keep-alive [3] NULL, - keep-aliveResponse [4] NULL, - firstSegmentFlag [5] NULL, - lastSegmentFlag [6] NULL, - ..., - cINReset [7] NULL, - operatorLeaMessage [8] OperatorLeaMessage, - optionRequest [9] OptionRequest, - optionResponse [10] OptionResponse, - optionComplete [11] NULL, - pDUAcknowledgementRequest [12] NULL, - pDUAcknowledgementResponse [13] NULL -} - -IntegrityCheck ::= SEQUENCE -{ - includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), - -- gives the order the PDUs were processed - checkType [1] CheckType, - dataType [2] DataType OPTIONAL, - -- From version5(5) the dataType is mandatory for hashes and for signatures - -- (see clause 7.2.3) - 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 - -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. - ..., - hashAlgorithm [4] HashAlgorithm OPTIONAL - -- Clarifies the hash function if checkType is hash(1). - -- If used, it shall be present for each checkType hash(1). -} - -CheckType ::= ENUMERATED -{ - hash(1), - -- hash value - signature(2), - -- DSS/DSA signature - ... -} - -DataType ::= ENUMERATED -{ - iRI(1), - cC(2), - ..., - iLHI(3) -} - - -HashAlgorithm ::= ENUMERATED -{ - sHA-1(1), - -- Included for legacy/migration purposes only, not to be used for new implementations - sHA-256(2), - sHA-384(3), - sHA-512(4), - ... -} - - - - -Option ::= CHOICE -{ - pDUAcknowledgement [0] NULL, - ... -} - -OptionRequest ::= SEQUENCE -{ - requestedOptions [0] SEQUENCE OF Option, - ... -} - -OptionResponse ::= SEQUENCE -{ - acceptedOptions [0] SEQUENCE OF Option, - declinedOptions [1] SEQUENCE OF Option, - ... -} - --- ================================== --- Definitions for OperatorLeaMessage --- ================================== - -OperatorLeaMessage ::= SEQUENCE -{ - messagePriority [0] OperatorLeaMessagePriority, - message [1] OCTET STRING (SIZE(1..255)), - ... -} - -OperatorLeaMessagePriority ::= ENUMERATED -{ - error(1), - -- reporting of error conditions that have impact on the quality of the - -- intercepted data - informational(2), - -- reporting of conditions that will not have direct impact on the quality of - -- the intercepted data - ... -} - --- =================================== --- Definitions for EncryptionContainer --- =================================== - -EncryptionContainer ::= SEQUENCE -{ - encryptionType [0] EncryptionType, - encryptedPayload [1] OCTET STRING, - -- once decrypted, it can be interpreted as EncryptedPayload - ..., - encryptedPayloadType [2] EncryptedPayloadType OPTIONAL -} - -EncryptionType ::= ENUMERATED -{ - none(1), - -- No encryption is applied. - national-option(2), - -- Use this option when an encryption scheme is negotiated on a national level - aES-192-CBC(3), - -- The Advanced Encryption Standard using a 192 bit key in CBC mode - aES-256-CBC(4), - -- The Advanced Encryption Standard using a 256 bit key in CBC mode - blowfish-192-CBC(5), - -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode - blowfish-256-CBC(6), - -- Blowfish using a 256 bit key in CBC mode - threedes-cbc(7), - -- Triple-DES using a 192 bit key in CBC mode - ... -} - -EncryptedPayload ::= SEQUENCE -{ - byteCounter [0] INTEGER (0..18446744073709551615), - -- The sum of the sizes of all PDUs before this PDU. - -- It is initialized with the unixTime (number of seconds since 01-01-1970) - -- 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 - payload [1] Payload, - ... -} - -EncryptedPayloadType ::= ENUMERATED -{ - unknown(1), - part2(2), - -- encrypted payload is TS 102 232 part 2 [5] - part3(3), - -- encrypted payload is TS 102 232 part 3 [6] - part4(4), - -- encrypted payload is TS 102 232 part 4 [32] - part5(5), - -- encrypted payload is TS 102 232 part 5 [37] - part6(6), - -- encrypted payload is TS 102 232 part 6 [36] - part7(7), - -- encrypted payload is TS 102 232 part 7 [38] - ..., - part1(8) - -- encrypted payload is TS 102 232 part 1 (the present document) -} - --- =================================== --- Common Parameters --- =================================== - -Location ::= SEQUENCE - -- This is a common parameter, the use of this parameter is described in clause 4.5 -{ - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, - ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, - eTSI671HI2Location [3] HI2Operations.Location OPTIONAL -} - -WlanLocationAttributes ::= SEQUENCE -{ - 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 TS 101 671 [4] but has been copied - -- to TS 102 232-1. It is not recommended to use this parameter in - -- future change requests. Suggested approach is to use a parameter from TS 103 280 [42] - -- instead. -{ - iP-type [1] ENUMERATED - { - iPV4(0), - iPV6(1), - ... - }, - iP-value [2] IP-value, - iP-assignment [3] ENUMERATED - { - static(1), - -- The static coding shall be used to report a static address. - dynamic(2), - -- The dynamic coding shall be used to report a dynamically allocated address. - notKnown(3), - -- The notKnown coding shall be used to report other then static or dynamically - -- allocated IP addresses. - ... - } OPTIONAL, - ..., - iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, - -- Indicates the length of the prefix delegated by the CSP to the subscriber - -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" - -- Mandatory in case where the iP-value contains an IPv6 binary value - iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL - -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. - -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to - -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to - -- a /29 CIDR-format subnet mask -} - -IP-value ::= CHOICE -{ - iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), - -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" - -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" - iPTextAddress [2] IA5String (SIZE(7..45)), - -- In case of IPv6, the delivered iPTextAddress field could include a complete - -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. - -- In case of IPv4, the delivered iPTextAddress field could include a single - -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" - ... -} - -LawfulInterceptionIdentifier ::= LIID - -- LIID is a common parameter imported from TS 103 280 [44]. - -- It is redefined as LawfulInterceptionIdentifier in this - -- module to preserve the original type name during the - -- removal of imports from TS 101 671 [4]. - - - -END --end of LI-PS-PDU diff --git a/102232-1/portal/lm_LI-PS-PDU,ver28.txt b/102232-1/portal/lm_LI-PS-PDU,ver28.txt new file mode 100644 index 0000000..eb62cde --- /dev/null +++ b/102232-1/portal/lm_LI-PS-PDU,ver28.txt @@ -0,0 +1,727 @@ +LI-PS-PDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version28(28)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + + -- from ETSI TS 103 280 [44] + LIID + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + + -- from ETSI TS 101 671 [4] + IRI-Parameters, + IRIsContent, + Location, + Network-Element-Identifier + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + + -- from ETSI TS 101 671 [4] + HI1-Operation + FROM HI1NotificationOperations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} + + -- from ETSI TS 102 232-2 [5] + EmailCC, + EmailIRI, + MessagingCC, + MessagingMMCC, + MessagingIRI + FROM EmailPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} + + -- from ETSI TS 102 232-3 [6] + IPCC, + IPIRI, + IPIRIOnly + FROM IPAccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} + + -- from ETSI TS 102 232-4 [32] + L2CC, + L2IRI, + L2IRIOnly + FROM L2AccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} + + -- from ETSI TS 102 232-5 [37] + IPMMCC, + IPMMIRI + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} + + -- from ETSI TS 102 232-6 [36] + PstnIsdnCC, + PstnIsdnIRI + FROM PstnIsdnPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + UmtsIRIsContent, + CorrelationValues, + Location + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + UmtsCS-IRIsContent + FROM UmtsCS-HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + EpsIRIsContent, + EPSLocation + FROM EpsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + ConfIRIsContent + 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. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + ProSeIRIsContent + FROM ProSeHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + GcseIRIsContent + FROM GCSEHI2Operations + {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 ETSI TS 133 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 ETSI TS 133 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. + + -- from ETSI TS 133 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. + + -- from ETSI TS 133 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. + + -- from ETSI TS 133 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 ETSI TS 133 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. + -- 3GPP HI1 may be used with other services/networks than 3GPP's one. + + -- from ETSI TS 133 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 ETSI TS 133 108 [9]. + + -- from ETSI TS 101 909-20-1 [33] + TARGETACTIVITYMONITOR-1, + TTRAFFIC, + CTTRAFFIC + FROM TS101909201 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} + + -- from ETSI TS 101 909-20-2 [34] + TARGETACTIVITYMONITOR, + TTRAFFIC, + CTTRAFFIC + FROM TS101909202 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} + + -- from J-STD-025-B [39] + LAESProtocol + FROM Laesp-j-std-025-b + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} + CDMA2000LAESMessage + FROM CDMA2000CIIModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} + CCIPPacketHeader + FROM CDMA2000CCModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} + + -- from ETSI TS 103 462 [45] + ILHIPayload + FROM ILHIPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; + -- This import is only used for the handover between LEMFs. + + +-- end of IMPORTS + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version28(28)} + +-- ==================== +-- Top-level definition +-- ==================== + +PS-PDU ::= SEQUENCE +{ + pSHeader [1] PSHeader, + payload [2] Payload +} + +PSHeader ::= SEQUENCE +{ + li-psDomainId [0] OBJECT IDENTIFIER, + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- 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, + sequenceNumber [4] INTEGER (0..4294967295), + timeStamp [5] GeneralizedTime OPTIONAL, + -- see clause 5.2.6 + ..., + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + -- see clause 5.2.11 + microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, + timeStampQualifier [8] TimeStampQualifier OPTIONAL +} + +Payload ::= CHOICE +{ + iRIPayloadSequence [0] SEQUENCE OF IRIPayload, + cCPayloadSequence [1] SEQUENCE OF CCPayload, + -- Clause 6.2.3 explains how to include more than one payload in the same PDU + tRIPayload [2] TRIPayload, + ..., + hI1-Operation [3] HI1-Operation, + encryptionContainer [4] EncryptionContainer, + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, + -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] + iLHIPayload [6] SEQUENCE OF ILHIPayload + -- For typical use cases see ETSI TS 103 462 [45] +} + +TimeStampQualifier ::= ENUMERATED +{ + unknown(0), + timeOfInterception(1), + timeOfMediation(2), + ..., + timeOfAggregation(3) +} + +-- ==================================== +-- Items contained within the PS-Header +-- ==================================== + +CommunicationIdentifier ::= SEQUENCE +{ + networkIdentifier [0] NetworkIdentifier, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + -- in case of transport of HI1 messages not required + -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + -- see clause 5.2.4 + ..., + cINExtension [3] CorrelationValues OPTIONAL + -- To be used when a single INTEGER is not sufficient to identify + -- a particular session (see clause 5.2.4) +} + +NetworkIdentifier ::= SEQUENCE +{ + operatorIdentifier [0] OCTET STRING (SIZE(1..16)), + networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, + ..., + eTSI671NEID [2] Network-Element-Identifier OPTIONAL + -- For network element identifier, use either networkElementIdentifier or eTSI671NEID +} + +-- ========================== +-- Definitions for CC Payload +-- ========================== + +CCPayload ::= SEQUENCE +{ + payloadDirection [0] PayloadDirection OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + cCContents [2] CCContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + timeStampQualifier [4] TimeStampQualifier OPTIONAL +} + +PayloadDirection ::= ENUMERATED +{ + fromTarget(0), + toTarget(1), + ..., + indeterminate(2), + -- Indication that the direction was indeterminate + combined(3), + -- Indication applicable to some services that the traffic is actually a combination + -- of To and From + notapplicable(4) + -- Indication that direction of interceptable service does not make sense +} + +CCContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used, see clause A.3 +{ + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, + ..., + l2CC [6] 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, + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + messagingCC [14] 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, + 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, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU +} + +MicroSecondTimeStamp ::= SEQUENCE +{ + seconds [0] INTEGER (0..18446744073709551615), + -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch + microSeconds [1] INTEGER (0..999999), + ... +} + +-- =========================== +-- Definitions for IRI Payload +-- =========================== + +IRIPayload ::= SEQUENCE +{ + iRIType [0] IRIType OPTIONAL, + -- See clause 5.2.10 + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + iRIContents [2] IRIContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- 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 + -- 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 + -- relevant service-specific details +} + +IRIType ::= ENUMERATED +{ + iRI-Begin(1), + iRI-End(2), + iRI-Continue(3), + iRI-Report(4) +} + +IRIContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used (see clause A.3) +{ + emailIRI [1] EmailIRI, + iPIRI [2] IPIRI, + iPIRIOnly [3] IPIRIOnly, + uMTSIRI [4] UMTSIRI, + eTSI671IRI [5] ETSI671IRI, + ..., + l2IRI [6] L2IRI, + l2IRIOnly [7] L2IRIOnly, + tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, + tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, + pstnIsdnIRI [10] PstnIsdnIRI, + iPMMIRI [11] IPMMIRI, + lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, + cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, + messagingIRI [14] MessagingIRI, + ePSIRI [15] EPSIRI, + confIRI [16] ConfIRI, + proseIRI [17] ProSeIRI, + gcseIRI [18] GcseIRI +} + +UMTSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, + umtsIRIsContent [1] UmtsIRIsContent, + ..., + iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, + umtsCS-IRIsContent [3] UmtsCS-IRIsContent +} + +ETSI671IRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] HI2Operations.IRI-Parameters, + iRIsContent [1] IRIsContent, + ... +} + +EPSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, + ... +} + +ConfIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, + confIRIsContent [1] ConfIRIsContent, + ... +} + + +ProSeIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, + proseIRIsContent [1] ProSeIRIsContent, + ... +} + + +GcseIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, + gcseIRIsContent [1] GcseIRIsContent, + ... +} + + +-- =========================== +-- Definitions for TRI Payload +-- =========================== + +TRIPayload ::= CHOICE +{ + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, + -- Undefined contents (will be discarded) + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, + ..., + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage, + optionRequest [9] OptionRequest, + optionResponse [10] OptionResponse, + optionComplete [11] NULL, + pDUAcknowledgementRequest [12] NULL, + pDUAcknowledgementResponse [13] NULL +} + +IntegrityCheck ::= SEQUENCE +{ + includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), + -- gives the order the PDUs were processed + checkType [1] CheckType, + dataType [2] DataType OPTIONAL, + -- From version5(5) the dataType is mandatory for hashes and for signatures + -- (see clause 7.2.3) + 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 + -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. + ..., + hashAlgorithm [4] HashAlgorithm OPTIONAL + -- Clarifies the hash function if checkType is hash(1). + -- If used, it shall be present for each checkType hash(1). +} + +CheckType ::= ENUMERATED +{ + hash(1), + -- hash value + signature(2), + -- DSS/DSA signature + ... +} + +DataType ::= ENUMERATED +{ + iRI(1), + cC(2), + ..., + iLHI(3) +} + + +HashAlgorithm ::= ENUMERATED +{ + sHA-1(1), + -- Included for legacy/migration purposes only, not to be used for new implementations + sHA-256(2), + sHA-384(3), + sHA-512(4), + ... +} + + + + +Option ::= CHOICE +{ + pDUAcknowledgement [0] NULL, + ... +} + +OptionRequest ::= SEQUENCE +{ + requestedOptions [0] SEQUENCE OF Option, + ... +} + +OptionResponse ::= SEQUENCE +{ + acceptedOptions [0] SEQUENCE OF Option, + declinedOptions [1] SEQUENCE OF Option, + ... +} + +-- ================================== +-- Definitions for OperatorLeaMessage +-- ================================== + +OperatorLeaMessage ::= SEQUENCE +{ + messagePriority [0] OperatorLeaMessagePriority, + message [1] OCTET STRING (SIZE(1..255)), + ... +} + +OperatorLeaMessagePriority ::= ENUMERATED +{ + error(1), + -- reporting of error conditions that have impact on the quality of the + -- intercepted data + informational(2), + -- reporting of conditions that will not have direct impact on the quality of + -- the intercepted data + ... +} + +-- =================================== +-- Definitions for EncryptionContainer +-- =================================== + +EncryptionContainer ::= SEQUENCE +{ + encryptionType [0] EncryptionType, + encryptedPayload [1] OCTET STRING, + -- once decrypted, it can be interpreted as EncryptedPayload + ..., + encryptedPayloadType [2] EncryptedPayloadType OPTIONAL +} + +EncryptionType ::= ENUMERATED +{ + none(1), + -- No encryption is applied. + national-option(2), + -- Use this option when an encryption scheme is negotiated on a national level + aES-192-CBC(3), + -- The Advanced Encryption Standard using a 192 bit key in CBC mode + aES-256-CBC(4), + -- The Advanced Encryption Standard using a 256 bit key in CBC mode + blowfish-192-CBC(5), + -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode + blowfish-256-CBC(6), + -- Blowfish using a 256 bit key in CBC mode + threedes-cbc(7), + -- Triple-DES using a 192 bit key in CBC mode + ... +} + +EncryptedPayload ::= SEQUENCE +{ + byteCounter [0] INTEGER (0..18446744073709551615), + -- The sum of the sizes of all PDUs before this PDU. + -- It is initialized with the unixTime (number of seconds since 01-01-1970) + -- 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 + payload [1] Payload, + ... +} + +EncryptedPayloadType ::= ENUMERATED +{ + unknown(1), + part2(2), + -- encrypted payload is ETSI TS 102 232-2 [5] + part3(3), + -- encrypted payload is ETSI TS 102 232-3 [6] + part4(4), + -- encrypted payload is ETSI TS 102 232-4 [32] + part5(5), + -- encrypted payload is ETSI TS 102 232-5 [37] + part6(6), + -- encrypted payload is ETSI TS 102 232-6 [36] + part7(7), + -- encrypted payload is ETSI TS 102 232-7 [38] + ..., + part1(8) + -- encrypted payload is ETSI TS 102 232-1 (the present document) +} + +-- =================================== +-- Common Parameters +-- =================================== + +Location ::= SEQUENCE + -- This is a common parameter, the use of this parameter is described in clause 4.5 +{ + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + ..., + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL +} + +WlanLocationAttributes ::= SEQUENCE +{ + 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. +{ + iP-type [1] ENUMERATED + { + iPV4(0), + iPV6(1), + ... + }, + iP-value [2] IP-value, + iP-assignment [3] ENUMERATED + { + static(1), + -- The static coding shall be used to report a static address. + dynamic(2), + -- The dynamic coding shall be used to report a dynamically allocated address. + notKnown(3), + -- The notKnown coding shall be used to report other than static or dynamically + -- allocated IP addresses. + ... + } OPTIONAL, + ..., + iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, + -- Indicates the length of the prefix delegated by the CSP to the subscriber + -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" + -- Mandatory in case where the iP-value contains an IPv6 binary value + iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL + -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. + -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to + -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to + -- a /29 CIDR-format subnet mask +} + +IP-value ::= CHOICE +{ + iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), + -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" + -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" + iPTextAddress [2] IA5String (SIZE(7..45)), + -- In case of IPv6, the delivered iPTextAddress field could include a complete + -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. + -- In case of IPv4, the delivered iPTextAddress field could include a single + -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" + ... +} + +LawfulInterceptionIdentifier ::= 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 -- GitLab From b39ebcb1fed44cf768e0710f78fb7012606f1b96 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:34:43 +0100 Subject: [PATCH 129/208] TS 103 280 v2.3.1 (2019-04-04) agreed at LI#50 (Dubai, 2019-02-05) --- 103280/TS_103_280.asn1 | 62 +++++++++---------- 103280/TS_103_280.xsd | 48 +++++++++++--- ...0_v020201.asn1 => TS_103_280_v020301.asn1} | 62 +++++++++---------- ...280_v020201.xsd => TS_103_280_v020301.xsd} | 48 +++++++++++--- 4 files changed, 144 insertions(+), 76 deletions(-) rename 103280/portal/{TS_103_280_v020201.asn1 => TS_103_280_v020301.asn1} (54%) rename 103280/portal/{TS_103_280_v020201.xsd => TS_103_280_v020301.xsd} (85%) diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1 index 0e186a9..68cfe54 100644 --- a/103280/TS_103_280.asn1 +++ b/103280/TS_103_280.asn1 @@ -1,94 +1,94 @@ Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -- Object Identifier definitions -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} --- Common Parameter: LIID (as defined in clause 6) +-- Common Parameters (below are as defined in clause 6) LIID ::= OCTET STRING (SIZE (1..25)) --- Common Parameter: TCPPort (as defined in clause 6) - TCPPort ::= INTEGER (1..65535) --- Common Parameter: TCPPortRange (as defined in clause 6) - TCPPortRange ::= SEQUENCE { start [0] TCPPort, end [1] TCPPort } --- Common Parameter: UDPPort (as defined in clause 6) - UDPPort ::= INTEGER (0..65535) --- Common Parameter: UDPPortRange (as defined in clause 6) - UDPPortRange ::= SEQUENCE { start [0] UDPPort, end [1] UDPPort } --- Common Parameter: Port (as defined in clause 6) - Port ::= CHOICE { tCPPort [0] TCPPort, uDPPort [1] UDPPort } --- Common Parameter: PortRange (as defined clause 6) - PortRange ::= CHOICE { tCPPortRange [0] TCPPortRange, uDPPortRange [1] UDPPortRange } --- Common Parameter: QualifiedDateTime (as defined in clause 6) - QualifiedDateTime ::= GeneralizedTime --- Common Parameter: QualifiedMicrosecondDateTime (as defined in clause 6) - QualifiedMicrosecondDateTime ::= GeneralizedTime --- Common Parameter: WGS84CoordinateDecimal (as defined in clause 6) - WGS84CoordinateDecimal ::= SEQUENCE { latitude [0] WGS84LatitudeDecimal, longitude [1] WGS84LongitudeDecimal } --- Common Parameter: WGS84LatitudeDecimal (as defined in clause 6) - WGS84LatitudeDecimal ::= OCTET STRING (SIZE (10)) --- Common Parameter: WGS84LongitudeDecimal (as defined in clause 6) - WGS84LongitudeDecimal ::= OCTET STRING (SIZE (11)) --- Common Parameter: WGS84CoordinateAngular (as defined in clause 6) - WGS84CoordinateAngular ::= SEQUENCE { latitude [0] WGS84LatitudeAngular, longitude [1] WGS84LongitudeAngular } --- Common Parameter: WGS84LatitudeAngular (as defined in clause 6) - WGS84LatitudeAngular ::= OCTET STRING (SIZE (10)) --- Common Parameter: WGS8LongitudeAngular (as defined in clause 6) - WGS84LongitudeAngular ::= OCTET STRING (SIZE (11)) +InternationalE164 ::= NumericString (SIZE(1..15)) + +IMSI ::= NumericString (SIZE(6..15)) + +IMEI ::= NumericString (SIZE(14)) + +IMEICheckDigit ::= NumericString (SIZE(15)) + +IMEISV ::= NumericString (SIZE(16)) + +SUPIIMSI ::= IMSI + +SUPINAI ::= NAI + +SUCI ::= OCTET STRING + +PEIIMEI ::= IMEI + +PEIIMEICheckDigit ::= IMEICheckDigit + +PEIIMEISV ::= IMEISV + +GPSIMSISDN ::= NumericString (SIZE(1..15)) + +GPSINAI ::= NAI + +NAI ::= UTF8String + END diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index 3313fa3..09ac93a 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -1,5 +1,5 @@ - + @@ -55,6 +55,11 @@ + + + + + @@ -86,7 +91,7 @@ - + @@ -116,25 +121,25 @@ - + - + - + - + @@ -165,7 +170,7 @@ - + @@ -197,4 +202,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103280/portal/TS_103_280_v020201.asn1 b/103280/portal/TS_103_280_v020301.asn1 similarity index 54% rename from 103280/portal/TS_103_280_v020201.asn1 rename to 103280/portal/TS_103_280_v020301.asn1 index 0e186a9..68cfe54 100644 --- a/103280/portal/TS_103_280_v020201.asn1 +++ b/103280/portal/TS_103_280_v020301.asn1 @@ -1,94 +1,94 @@ Common-Parameters -{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} +{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -- Object Identifier definitions -commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version221(221)} +commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} --- Common Parameter: LIID (as defined in clause 6) +-- Common Parameters (below are as defined in clause 6) LIID ::= OCTET STRING (SIZE (1..25)) --- Common Parameter: TCPPort (as defined in clause 6) - TCPPort ::= INTEGER (1..65535) --- Common Parameter: TCPPortRange (as defined in clause 6) - TCPPortRange ::= SEQUENCE { start [0] TCPPort, end [1] TCPPort } --- Common Parameter: UDPPort (as defined in clause 6) - UDPPort ::= INTEGER (0..65535) --- Common Parameter: UDPPortRange (as defined in clause 6) - UDPPortRange ::= SEQUENCE { start [0] UDPPort, end [1] UDPPort } --- Common Parameter: Port (as defined in clause 6) - Port ::= CHOICE { tCPPort [0] TCPPort, uDPPort [1] UDPPort } --- Common Parameter: PortRange (as defined clause 6) - PortRange ::= CHOICE { tCPPortRange [0] TCPPortRange, uDPPortRange [1] UDPPortRange } --- Common Parameter: QualifiedDateTime (as defined in clause 6) - QualifiedDateTime ::= GeneralizedTime --- Common Parameter: QualifiedMicrosecondDateTime (as defined in clause 6) - QualifiedMicrosecondDateTime ::= GeneralizedTime --- Common Parameter: WGS84CoordinateDecimal (as defined in clause 6) - WGS84CoordinateDecimal ::= SEQUENCE { latitude [0] WGS84LatitudeDecimal, longitude [1] WGS84LongitudeDecimal } --- Common Parameter: WGS84LatitudeDecimal (as defined in clause 6) - WGS84LatitudeDecimal ::= OCTET STRING (SIZE (10)) --- Common Parameter: WGS84LongitudeDecimal (as defined in clause 6) - WGS84LongitudeDecimal ::= OCTET STRING (SIZE (11)) --- Common Parameter: WGS84CoordinateAngular (as defined in clause 6) - WGS84CoordinateAngular ::= SEQUENCE { latitude [0] WGS84LatitudeAngular, longitude [1] WGS84LongitudeAngular } --- Common Parameter: WGS84LatitudeAngular (as defined in clause 6) - WGS84LatitudeAngular ::= OCTET STRING (SIZE (10)) --- Common Parameter: WGS8LongitudeAngular (as defined in clause 6) - WGS84LongitudeAngular ::= OCTET STRING (SIZE (11)) +InternationalE164 ::= NumericString (SIZE(1..15)) + +IMSI ::= NumericString (SIZE(6..15)) + +IMEI ::= NumericString (SIZE(14)) + +IMEICheckDigit ::= NumericString (SIZE(15)) + +IMEISV ::= NumericString (SIZE(16)) + +SUPIIMSI ::= IMSI + +SUPINAI ::= NAI + +SUCI ::= OCTET STRING + +PEIIMEI ::= IMEI + +PEIIMEICheckDigit ::= IMEICheckDigit + +PEIIMEISV ::= IMEISV + +GPSIMSISDN ::= NumericString (SIZE(1..15)) + +GPSINAI ::= NAI + +NAI ::= UTF8String + END diff --git a/103280/portal/TS_103_280_v020201.xsd b/103280/portal/TS_103_280_v020301.xsd similarity index 85% rename from 103280/portal/TS_103_280_v020201.xsd rename to 103280/portal/TS_103_280_v020301.xsd index 3313fa3..09ac93a 100644 --- a/103280/portal/TS_103_280_v020201.xsd +++ b/103280/portal/TS_103_280_v020301.xsd @@ -1,5 +1,5 @@ - + @@ -55,6 +55,11 @@ + + + + + @@ -86,7 +91,7 @@ - + @@ -116,25 +121,25 @@ - + - + - + - + @@ -165,7 +170,7 @@ - + @@ -197,4 +202,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 3191cfa682e91f042c306a2a6c6927f8d48fad79 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:34:47 +0100 Subject: [PATCH 130/208] TS 103 221-1 v1.4.1 (2019-04-04) agreed at LI#50 (Dubai, 2019-02-05) --- 103221-1/TS_103_221_01.xsd | 56 +++++++++++++++---- ..._v010101.xsd => TS_103_221_01_v010401.xsd} | 56 +++++++++++++++---- 2 files changed, 92 insertions(+), 20 deletions(-) rename 103221-1/portal/{TS_103_221_01_v010101.xsd => TS_103_221_01_v010401.xsd} (92%) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index a0bb30b..ef56282 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,6 +1,6 @@ - - + + @@ -72,7 +72,7 @@ - + @@ -151,6 +151,9 @@ + + + @@ -181,12 +184,20 @@ - + + + + + + + + + @@ -209,12 +220,6 @@ - - - - - - @@ -243,6 +248,16 @@ + + + + + + + + + + @@ -252,18 +267,38 @@ + + + + + + + + + + + + + + + + + + + + @@ -699,6 +734,7 @@ + diff --git a/103221-1/portal/TS_103_221_01_v010101.xsd b/103221-1/portal/TS_103_221_01_v010401.xsd similarity index 92% rename from 103221-1/portal/TS_103_221_01_v010101.xsd rename to 103221-1/portal/TS_103_221_01_v010401.xsd index a0bb30b..ef56282 100644 --- a/103221-1/portal/TS_103_221_01_v010101.xsd +++ b/103221-1/portal/TS_103_221_01_v010401.xsd @@ -1,6 +1,6 @@ - - + + @@ -72,7 +72,7 @@ - + @@ -151,6 +151,9 @@ + + + @@ -181,12 +184,20 @@ - + + + + + + + + + @@ -209,12 +220,6 @@ - - - - - - @@ -243,6 +248,16 @@ + + + + + + + + + + @@ -252,18 +267,38 @@ + + + + + + + + + + + + + + + + + + + + @@ -699,6 +734,7 @@ + -- GitLab From cbcd8db30284a498c57610018249a98233cabd6b Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:34:56 +0100 Subject: [PATCH 132/208] TS 102 232-5 v3.10.1 (2019-04-04) agreed at LI#50 (Dubai, 2019-02-05) --- 102232-5/IPMultimediaPDU.asn | 328 +++++++++++----------- 102232-5/portal/IPMultimediaPDU,ver10.txt | 160 ----------- 102232-5/portal/IPMultimediaPDU,ver11.txt | 168 +++++++++++ 3 files changed, 336 insertions(+), 320 deletions(-) delete mode 100644 102232-5/portal/IPMultimediaPDU,ver10.txt create mode 100644 102232-5/portal/IPMultimediaPDU,ver11.txt diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index a14834a..b1e9abf 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,160 +1,168 @@ -IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - -- from TS 102 232-1 [2] - IPAddress, - Location - FROM LI-PS-PDU - {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; - - - --- ============================ --- Object Identifier Definition --- ============================ - -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version10(10) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version10(10) cC(2)} - -- both definitions relative to: - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - --- ===================================== --- IP Multimedia Communications Contents --- ===================================== - -IPMMCC ::= SEQUENCE -{ - iPMMCCObjId [0] RELATIVE-OID, - mMCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets - -- Each IPMMCC shall contain one intercepted packet - -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter - -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. - ..., - frameType [2] FrameType OPTIONAL, - -- The availability of header information shall be signalled with the frameType parameter - -- The module is defined as OPTIONAL because of backwards compatibility reasons - -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 - streamIdentifier [3] OCTET STRING OPTIONAL, - -- Used to identify the media stream within the current CIN, typically in case of - -- multiple media streams communications - -- May be used to correlate each media stream with the relevant SDP media description of IRI - -- May contain c= and m= lines extracts for instance - mMCCprotocol [4] MMCCprotocol OPTIONAL - -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) - -- Absence means mMCCContents contains RTP/RTCP packets -} - -FrameType ::= ENUMERATED -{ - ipFrame(0), - -- All headers are present - udpFrame(1), - -- IP header is missing - rtpFrame(2), - -- UDP and IP headers are missing - audioFrame(3), - -- All headers are missing - ..., - tcpFrame(4), - -- IP header is missing - artificialRtpFrame(5), - -- UDP and IP headers are missing, artificial RTP frame has been added - udptlFrame(6) - -- UDP and IP headers are missing -} - -MMCCprotocol ::= ENUMERATED -{ - rTP(0), - -- mMCCContents parameter contains RTP/RTCP packets - mSRP(1), - -- mMCCContents parameter contains MSRP packets - ..., - uDPTL(2) - -- mMCCContents parameter contains UDPTL packets -} - --- ======================================================== --- Intercept-related information for IP Multimedia sessions --- ======================================================== - -IPMMIRI ::= SEQUENCE -{ - iPMMIRIObjId [0] RELATIVE-OID, - iPMMIRIContents [1] IPIRIContents, - ..., - targetLocation [2] Location OPTIONAL, - -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 - additionalSignalling [3] SEQUENCE OF AdditionalSignalling OPTIONAL - -- The use of this parameter is defined in clause 5.2.5 -} - -IPIRIContents ::= CHOICE -{ - originalIPMMMessage [0] OCTET STRING, - -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers - sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address - h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address - ..., - nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, - -- This parameter is used according to national regulations - -- This parameter shall be delivered as an IRI-Report-record - xCAPMessage [4] OCTET STRING - -- Copy of the XCAP message including all HTTP headers and contents -} - -SIPMessage ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - sIPContent [2] OCTET STRING, - ... -} - -H323Message ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - h323Content [2] H323MessageContent, - ... -} - -H323MessageContent ::= CHOICE -{ - h225CSMessageContent [0] OCTET STRING, - h225RASMessageContent [1] OCTET STRING, - h245MessageContent [2] OCTET STRING, - genericMessageContent [3] OCTET STRING, - ... -} - -NationalIPMMIRIParameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [16], - -- the country to which the parameters inserted after the extension marker apply. - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...). - -- It is recommended that "version parameter" and "vendor identification parameter" are - -- included in the national parameters definition. Vendor identifications can be - -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended - -- to avoid using tags from 240 to 255 in a formal type definition. -} - -AdditionalSignalling ::= CHOICE -{ - sipHeaderLine [0] OCTET STRING, - -- A SIP header line, eg: "Contact: tel:+123456789". - ... -} - -END -- end of IP Multimedia PDU \ No newline at end of file +-- ==================================== +-- Description of the IP Multimedia PDU +-- ==================================== + + +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version11(11)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + -- from ETSI TS 102 232-1 [2] + IPAddress, + Location + FROM LI-PS-PDU + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; + + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version11(11) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version11(11) cC(2)} + -- both definitions relative to: + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- ===================================== +-- IP Multimedia Communications Contents +-- ===================================== + +IPMMCC ::= SEQUENCE +{ + iPMMCCObjId [0] RELATIVE-OID, + mMCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets + -- Each IPMMCC shall contain one intercepted packet + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. + ..., + frameType [2] FrameType OPTIONAL, + -- The availability of header information shall be signalled with the frameType parameter + -- The module is defined as OPTIONAL because of backwards compatibility reasons + -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 + streamIdentifier [3] OCTET STRING OPTIONAL, + -- Used to identify the media stream within the current CIN, typically in case of + -- multiple media streams communications + -- May be used to correlate each media stream with the relevant SDP media description of IRI + -- May contain c= and m= lines extracts for instance + mMCCprotocol [4] MMCCprotocol OPTIONAL + -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) + -- Absence means mMCCContents contains RTP/RTCP packets +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ..., + tcpFrame(4), + -- IP header is missing + artificialRtpFrame(5), + -- UDP and IP headers are missing, artificial RTP frame has been added + udptlFrame(6), + -- UDP and IP headers are missing + msrpFrame(7) + -- TCP and IP headers are missing + +} + +MMCCprotocol ::= ENUMERATED +{ + rTP(0), + -- mMCCContents parameter contains RTP/RTCP packets + mSRP(1), + -- mMCCContents parameter contains MSRP packets + ..., + uDPTL(2) + -- mMCCContents parameter contains UDPTL packets +} + +-- ======================================================== +-- Intercept-related information for IP Multimedia sessions +-- ======================================================== + +IPMMIRI ::= SEQUENCE +{ + iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIContents [1] IPIRIContents, + ..., + targetLocation [2] Location OPTIONAL, + -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 + additionalSignalling [3] SEQUENCE OF AdditionalSignalling OPTIONAL + -- The use of this parameter is defined in clause 5.2.5 +} + +IPIRIContents ::= CHOICE +{ + originalIPMMMessage [0] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + sIPMessage [1] SIPMessage, + -- Copy of the SIP content and the source and destination IP address + h323Message [2] H323Message, + -- Copy of the H.323 content and the source and destination IP address + ..., + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, + -- This parameter is used according to national regulations + -- This parameter shall be delivered as an IRI-Report-record + xCAPMessage [4] OCTET STRING + -- Copy of the XCAP message including all HTTP headers and contents +} + +SIPMessage ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + sIPContent [2] OCTET STRING, + ... +} + +H323Message ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + h323Content [2] H323MessageContent, + ... +} + +H323MessageContent ::= CHOICE +{ + h225CSMessageContent [0] OCTET STRING, + h225RASMessageContent [1] OCTET STRING, + h245MessageContent [2] OCTET STRING, + genericMessageContent [3] OCTET STRING, + ... +} + +NationalIPMMIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [16], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} + +AdditionalSignalling ::= CHOICE +{ + sipHeaderLine [0] OCTET STRING, + -- A SIP header line, eg: "Contact: tel:+123456789". + ... +} + +END -- end of IPMultimediaPDU diff --git a/102232-5/portal/IPMultimediaPDU,ver10.txt b/102232-5/portal/IPMultimediaPDU,ver10.txt deleted file mode 100644 index a14834a..0000000 --- a/102232-5/portal/IPMultimediaPDU,ver10.txt +++ /dev/null @@ -1,160 +0,0 @@ -IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - -- from TS 102 232-1 [2] - IPAddress, - Location - FROM LI-PS-PDU - {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; - - - --- ============================ --- Object Identifier Definition --- ============================ - -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version10(10) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version10(10) cC(2)} - -- both definitions relative to: - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - --- ===================================== --- IP Multimedia Communications Contents --- ===================================== - -IPMMCC ::= SEQUENCE -{ - iPMMCCObjId [0] RELATIVE-OID, - mMCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets - -- Each IPMMCC shall contain one intercepted packet - -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter - -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. - ..., - frameType [2] FrameType OPTIONAL, - -- The availability of header information shall be signalled with the frameType parameter - -- The module is defined as OPTIONAL because of backwards compatibility reasons - -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 - streamIdentifier [3] OCTET STRING OPTIONAL, - -- Used to identify the media stream within the current CIN, typically in case of - -- multiple media streams communications - -- May be used to correlate each media stream with the relevant SDP media description of IRI - -- May contain c= and m= lines extracts for instance - mMCCprotocol [4] MMCCprotocol OPTIONAL - -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) - -- Absence means mMCCContents contains RTP/RTCP packets -} - -FrameType ::= ENUMERATED -{ - ipFrame(0), - -- All headers are present - udpFrame(1), - -- IP header is missing - rtpFrame(2), - -- UDP and IP headers are missing - audioFrame(3), - -- All headers are missing - ..., - tcpFrame(4), - -- IP header is missing - artificialRtpFrame(5), - -- UDP and IP headers are missing, artificial RTP frame has been added - udptlFrame(6) - -- UDP and IP headers are missing -} - -MMCCprotocol ::= ENUMERATED -{ - rTP(0), - -- mMCCContents parameter contains RTP/RTCP packets - mSRP(1), - -- mMCCContents parameter contains MSRP packets - ..., - uDPTL(2) - -- mMCCContents parameter contains UDPTL packets -} - --- ======================================================== --- Intercept-related information for IP Multimedia sessions --- ======================================================== - -IPMMIRI ::= SEQUENCE -{ - iPMMIRIObjId [0] RELATIVE-OID, - iPMMIRIContents [1] IPIRIContents, - ..., - targetLocation [2] Location OPTIONAL, - -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 - additionalSignalling [3] SEQUENCE OF AdditionalSignalling OPTIONAL - -- The use of this parameter is defined in clause 5.2.5 -} - -IPIRIContents ::= CHOICE -{ - originalIPMMMessage [0] OCTET STRING, - -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers - sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address - h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address - ..., - nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, - -- This parameter is used according to national regulations - -- This parameter shall be delivered as an IRI-Report-record - xCAPMessage [4] OCTET STRING - -- Copy of the XCAP message including all HTTP headers and contents -} - -SIPMessage ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - sIPContent [2] OCTET STRING, - ... -} - -H323Message ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - h323Content [2] H323MessageContent, - ... -} - -H323MessageContent ::= CHOICE -{ - h225CSMessageContent [0] OCTET STRING, - h225RASMessageContent [1] OCTET STRING, - h245MessageContent [2] OCTET STRING, - genericMessageContent [3] OCTET STRING, - ... -} - -NationalIPMMIRIParameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [16], - -- the country to which the parameters inserted after the extension marker apply. - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...). - -- It is recommended that "version parameter" and "vendor identification parameter" are - -- included in the national parameters definition. Vendor identifications can be - -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended - -- to avoid using tags from 240 to 255 in a formal type definition. -} - -AdditionalSignalling ::= CHOICE -{ - sipHeaderLine [0] OCTET STRING, - -- A SIP header line, eg: "Contact: tel:+123456789". - ... -} - -END -- end of IP Multimedia PDU \ No newline at end of file diff --git a/102232-5/portal/IPMultimediaPDU,ver11.txt b/102232-5/portal/IPMultimediaPDU,ver11.txt new file mode 100644 index 0000000..b1e9abf --- /dev/null +++ b/102232-5/portal/IPMultimediaPDU,ver11.txt @@ -0,0 +1,168 @@ +-- ==================================== +-- Description of the IP Multimedia PDU +-- ==================================== + + +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version11(11)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + -- from ETSI TS 102 232-1 [2] + IPAddress, + Location + FROM LI-PS-PDU + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; + + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version11(11) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version11(11) cC(2)} + -- both definitions relative to: + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- ===================================== +-- IP Multimedia Communications Contents +-- ===================================== + +IPMMCC ::= SEQUENCE +{ + iPMMCCObjId [0] RELATIVE-OID, + mMCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets + -- Each IPMMCC shall contain one intercepted packet + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. + ..., + frameType [2] FrameType OPTIONAL, + -- The availability of header information shall be signalled with the frameType parameter + -- The module is defined as OPTIONAL because of backwards compatibility reasons + -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 + streamIdentifier [3] OCTET STRING OPTIONAL, + -- Used to identify the media stream within the current CIN, typically in case of + -- multiple media streams communications + -- May be used to correlate each media stream with the relevant SDP media description of IRI + -- May contain c= and m= lines extracts for instance + mMCCprotocol [4] MMCCprotocol OPTIONAL + -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) + -- Absence means mMCCContents contains RTP/RTCP packets +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ..., + tcpFrame(4), + -- IP header is missing + artificialRtpFrame(5), + -- UDP and IP headers are missing, artificial RTP frame has been added + udptlFrame(6), + -- UDP and IP headers are missing + msrpFrame(7) + -- TCP and IP headers are missing + +} + +MMCCprotocol ::= ENUMERATED +{ + rTP(0), + -- mMCCContents parameter contains RTP/RTCP packets + mSRP(1), + -- mMCCContents parameter contains MSRP packets + ..., + uDPTL(2) + -- mMCCContents parameter contains UDPTL packets +} + +-- ======================================================== +-- Intercept-related information for IP Multimedia sessions +-- ======================================================== + +IPMMIRI ::= SEQUENCE +{ + iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIContents [1] IPIRIContents, + ..., + targetLocation [2] Location OPTIONAL, + -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 + additionalSignalling [3] SEQUENCE OF AdditionalSignalling OPTIONAL + -- The use of this parameter is defined in clause 5.2.5 +} + +IPIRIContents ::= CHOICE +{ + originalIPMMMessage [0] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + sIPMessage [1] SIPMessage, + -- Copy of the SIP content and the source and destination IP address + h323Message [2] H323Message, + -- Copy of the H.323 content and the source and destination IP address + ..., + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, + -- This parameter is used according to national regulations + -- This parameter shall be delivered as an IRI-Report-record + xCAPMessage [4] OCTET STRING + -- Copy of the XCAP message including all HTTP headers and contents +} + +SIPMessage ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + sIPContent [2] OCTET STRING, + ... +} + +H323Message ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + h323Content [2] H323MessageContent, + ... +} + +H323MessageContent ::= CHOICE +{ + h225CSMessageContent [0] OCTET STRING, + h225RASMessageContent [1] OCTET STRING, + h245MessageContent [2] OCTET STRING, + genericMessageContent [3] OCTET STRING, + ... +} + +NationalIPMMIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [16], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} + +AdditionalSignalling ::= CHOICE +{ + sipHeaderLine [0] OCTET STRING, + -- A SIP header line, eg: "Contact: tel:+123456789". + ... +} + +END -- end of IPMultimediaPDU -- GitLab From 1f0978c1abdafd4cefaf808e7befe0cc1f4267b4 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:35:00 +0100 Subject: [PATCH 133/208] TS 102 232-1 v3.19.1 (2019-05-22) agreed at LI#50 (Dubai, 2019-02-05) --- 102232-1/LI-PS-PDU.asn | 722 ++++++++++++++++++++++++ 102232-1/lm_LI-PS-PDU.asn | 727 ------------------------- 102232-1/portal/LI-PS-PDU,ver29.txt | 722 ++++++++++++++++++++++++ 102232-1/portal/lm_LI-PS-PDU,ver28.txt | 727 ------------------------- 4 files changed, 1444 insertions(+), 1454 deletions(-) create mode 100644 102232-1/LI-PS-PDU.asn delete mode 100644 102232-1/lm_LI-PS-PDU.asn create mode 100644 102232-1/portal/LI-PS-PDU,ver29.txt delete mode 100644 102232-1/portal/lm_LI-PS-PDU,ver28.txt diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn new file mode 100644 index 0000000..b1e38ab --- /dev/null +++ b/102232-1/LI-PS-PDU.asn @@ -0,0 +1,722 @@ +LI-PS-PDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version29(29)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + + -- from ETSI TS 103 280 [44] + LIID + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + + + -- from ETSI TS 101 671 [4] + IRI-Parameters, + IRIsContent, + Location, + Network-Element-Identifier + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + + -- from ETSI TS 101 671 [4] + HI1-Operation + FROM HI1NotificationOperations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} + + -- from ETSI TS 102 232-2 [5] + EmailCC, + EmailIRI, + MessagingCC, + MessagingMMCC, + MessagingIRI + FROM EmailPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} + + -- from ETSI TS 102 232-3 [6] + IPCC, + IPIRI, + IPIRIOnly + FROM IPAccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} + + -- from ETSI TS 102 232-4 [32] + L2CC, + L2IRI, + L2IRIOnly + FROM L2AccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} + + -- from ETSI TS 102 232-5 [37] + IPMMCC, + IPMMIRI + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} + + -- from ETSI TS 102 232-6 [36] + PstnIsdnCC, + PstnIsdnIRI + FROM PstnIsdnPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + UmtsIRIsContent, + CorrelationValues, + Location + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + UmtsCS-IRIsContent + FROM UmtsCS-HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + EpsIRIsContent, + EPSLocation + FROM EpsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + ConfIRIsContent + 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. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + ProSeIRIsContent + FROM ProSeHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + GcseIRIsContent + FROM GCSEHI2Operations + {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 ETSI TS 133 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 ETSI TS 133 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. + + -- from ETSI TS 133 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. + + -- from ETSI TS 133 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. + + -- from ETSI TS 133 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 ETSI TS 133 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. + -- 3GPP HI1 may be used with other services/networks than 3GPP's one. + + -- from ETSI TS 133 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 ETSI TS 133 108 [9]. + + -- from ETSI TS 101 909-20-1 [33] + TARGETACTIVITYMONITOR-1, + TTRAFFIC, + CTTRAFFIC + FROM TS101909201 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} + + -- from ETSI TS 101 909-20-2 [34] + TARGETACTIVITYMONITOR, + TTRAFFIC, + CTTRAFFIC + FROM TS101909202 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} + + -- from J-STD-025-B [39] + LAESProtocol + FROM Laesp-j-std-025-b + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} + CDMA2000LAESMessage + FROM CDMA2000CIIModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} + CCIPPacketHeader + FROM CDMA2000CCModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} + + -- from ETSI TS 103 462 [45] + ILHIPayload + FROM ILHIPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; + + -- This import is only used for the handover between LEMFs. + + +-- end of IMPORTS + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version29(29)} + +-- ==================== +-- Top-level definition +-- ==================== + +PS-PDU ::= SEQUENCE +{ + pSHeader [1] PSHeader, + payload [2] Payload +} + +PSHeader ::= SEQUENCE +{ + li-psDomainId [0] OBJECT IDENTIFIER, + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- 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, + sequenceNumber [4] INTEGER (0..4294967295), + timeStamp [5] GeneralizedTime OPTIONAL, + -- see clause 5.2.6 + ..., + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + -- see clause 5.2.11 + microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, + timeStampQualifier [8] TimeStampQualifier OPTIONAL +} + +Payload ::= CHOICE +{ + iRIPayloadSequence [0] SEQUENCE OF IRIPayload, + cCPayloadSequence [1] SEQUENCE OF CCPayload, + -- Clause 6.2.3 explains how to include more than one payload in the same PDU + tRIPayload [2] TRIPayload, + ..., + hI1-Operation [3] HI1-Operation, + encryptionContainer [4] EncryptionContainer, + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, + -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] + iLHIPayload [6] SEQUENCE OF ILHIPayload + -- For typical use cases see ETSI TS 103 462 [45] +} + +TimeStampQualifier ::= ENUMERATED +{ + unknown(0), + timeOfInterception(1), + timeOfMediation(2), + ..., + timeOfAggregation(3) +} + +-- ==================================== +-- Items contained within the PS-Header +-- ==================================== + +CommunicationIdentifier ::= SEQUENCE +{ + networkIdentifier [0] NetworkIdentifier, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + -- in case of transport of HI1 messages not required + -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + -- see clause 5.2.4 + ..., + cINExtension [3] CorrelationValues OPTIONAL + -- To be used when a single INTEGER is not sufficient to identify + -- a particular session (see clause 5.2.4) +} + +NetworkIdentifier ::= SEQUENCE +{ + operatorIdentifier [0] OCTET STRING (SIZE(1..16)), + networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, + ..., + eTSI671NEID [2] Network-Element-Identifier OPTIONAL + -- For network element identifier, use either networkElementIdentifier or eTSI671NEID +} + +-- ========================== +-- Definitions for CC Payload +-- ========================== + +CCPayload ::= SEQUENCE +{ + payloadDirection [0] PayloadDirection OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + cCContents [2] CCContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + timeStampQualifier [4] TimeStampQualifier OPTIONAL +} + +PayloadDirection ::= ENUMERATED +{ + fromTarget(0), + toTarget(1), + ..., + indeterminate(2), + -- Indication that the direction was indeterminate + combined(3), + -- Indication applicable to some services that the traffic is actually a combination + -- of To and From + notapplicable(4) + -- Indication that direction of interceptable service does not make sense +} + +CCContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used, see clause A.3 +{ + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, + ..., + l2CC [6] 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, + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + messagingCC [14] 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, + 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, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, + threeGPP33128DefinedCC [23] OCTET STRING } + +MicroSecondTimeStamp ::= SEQUENCE +{ + seconds [0] INTEGER (0..18446744073709551615), + -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch + microSeconds [1] INTEGER (0..999999), + ... +} + +-- =========================== +-- Definitions for IRI Payload +-- =========================== + +IRIPayload ::= SEQUENCE +{ + iRIType [0] IRIType OPTIONAL, + -- See clause 5.2.10 + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + iRIContents [2] IRIContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- 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 + -- 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 + -- relevant service-specific details +} + +IRIType ::= ENUMERATED +{ + iRI-Begin(1), + iRI-End(2), + iRI-Continue(3), + iRI-Report(4) +} + +IRIContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used (see clause A.3) +{ + emailIRI [1] EmailIRI, + iPIRI [2] IPIRI, + iPIRIOnly [3] IPIRIOnly, + uMTSIRI [4] UMTSIRI, + eTSI671IRI [5] ETSI671IRI, + ..., + l2IRI [6] L2IRI, + l2IRIOnly [7] L2IRIOnly, + tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, + tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, + pstnIsdnIRI [10] PstnIsdnIRI, + iPMMIRI [11] IPMMIRI, + lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, + cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, + messagingIRI [14] MessagingIRI, + ePSIRI [15] EPSIRI, + confIRI [16] ConfIRI, + proseIRI [17] ProSeIRI, + gcseIRI [18] GcseIRI, + threeGPP33128DefinedIRI [19] OCTET STRING} + +UMTSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, + umtsIRIsContent [1] UmtsIRIsContent, + ..., + iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, + umtsCS-IRIsContent [3] UmtsCS-IRIsContent +} + +ETSI671IRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] HI2Operations.IRI-Parameters, + iRIsContent [1] IRIsContent, + ... +} + +EPSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, + ... +} + +ConfIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, + confIRIsContent [1] ConfIRIsContent, + ... +} + + +ProSeIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, + proseIRIsContent [1] ProSeIRIsContent, + ... +} + + +GcseIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, + gcseIRIsContent [1] GcseIRIsContent, + ... +} + + +-- =========================== +-- Definitions for TRI Payload +-- =========================== + +TRIPayload ::= CHOICE +{ + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, + -- Undefined contents (will be discarded) + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, + ..., + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage, + optionRequest [9] OptionRequest, + optionResponse [10] OptionResponse, + optionComplete [11] NULL, + pDUAcknowledgementRequest [12] NULL, + pDUAcknowledgementResponse [13] NULL +} + +IntegrityCheck ::= SEQUENCE +{ + includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), + -- gives the order the PDUs were processed + checkType [1] CheckType, + dataType [2] DataType OPTIONAL, + -- From version5(5) the dataType is mandatory for hashes and for signatures + -- (see clause 7.2.3) + 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 + -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. + ..., + hashAlgorithm [4] HashAlgorithm OPTIONAL + -- Clarifies the hash function if checkType is hash(1). + -- If used, it shall be present for each checkType hash(1). +} + +CheckType ::= ENUMERATED +{ + hash(1), + -- hash value + signature(2), + -- DSS/DSA signature + ... +} + +DataType ::= ENUMERATED +{ + iRI(1), + cC(2), + ..., + iLHI(3) +} + +HashAlgorithm ::= ENUMERATED +{ + sHA-1(1), + -- Included for legacy/migration purposes only, not to be used for new implementations + sHA-256(2), + sHA-384(3), + sHA-512(4), + ... +} + +Option ::= CHOICE +{ + pDUAcknowledgement [0] NULL, + ... +} + +OptionRequest ::= SEQUENCE +{ + requestedOptions [0] SEQUENCE OF Option, + ... +} + +OptionResponse ::= SEQUENCE +{ + acceptedOptions [0] SEQUENCE OF Option, + declinedOptions [1] SEQUENCE OF Option, + ... +} + +-- ================================== +-- Definitions for OperatorLeaMessage +-- ================================== + +OperatorLeaMessage ::= SEQUENCE +{ + messagePriority [0] OperatorLeaMessagePriority, + message [1] OCTET STRING (SIZE(1..255)), + ... +} + +OperatorLeaMessagePriority ::= ENUMERATED +{ + error(1), + -- reporting of error conditions that have impact on the quality of the + -- intercepted data + informational(2), + -- reporting of conditions that will not have direct impact on the quality of + -- the intercepted data + ... +} + +-- =================================== +-- Definitions for EncryptionContainer +-- =================================== + +EncryptionContainer ::= SEQUENCE +{ + encryptionType [0] EncryptionType, + encryptedPayload [1] OCTET STRING, + -- once decrypted, it can be interpreted as EncryptedPayload + ..., + encryptedPayloadType [2] EncryptedPayloadType OPTIONAL +} + +EncryptionType ::= ENUMERATED +{ + none(1), + -- No encryption is applied. + national-option(2), + -- Use this option when an encryption scheme is negotiated on a national level + aES-192-CBC(3), + -- The Advanced Encryption Standard using a 192 bit key in CBC mode + aES-256-CBC(4), + -- The Advanced Encryption Standard using a 256 bit key in CBC mode + blowfish-192-CBC(5), + -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode + blowfish-256-CBC(6), + -- Blowfish using a 256 bit key in CBC mode + threedes-cbc(7), + -- Triple-DES using a 192 bit key in CBC mode + ... +} + +EncryptedPayload ::= SEQUENCE +{ + byteCounter [0] INTEGER (0..18446744073709551615), + -- The sum of the sizes of all PDUs before this PDU. + -- It is initialized with the unixTime (number of seconds since 01-01-1970) + -- 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 + payload [1] Payload, + ... +} + +EncryptedPayloadType ::= ENUMERATED +{ + unknown(1), + part2(2), + -- encrypted payload is ETSI TS 102 232-2 [5] + part3(3), + -- encrypted payload is ETSI TS 102 232-3 [6] + part4(4), + -- encrypted payload is ETSI TS 102 232-4 [32] + part5(5), + -- encrypted payload is ETSI TS 102 232-5 [37] + part6(6), + -- encrypted payload is ETSI TS 102 232-6 [36] + part7(7), + -- encrypted payload is ETSI TS 102 232-7 [38] + ..., + part1(8) + -- encrypted payload is ETSI TS 102 232-1 (the present document) +} + +-- =================================== +-- Common Parameters +-- =================================== + +Location ::= SEQUENCE + -- This is a common parameter, the use of this parameter is described in clause 4.5 +{ + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + ..., + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL +} + +WlanLocationAttributes ::= SEQUENCE +{ + 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. +{ + iP-type [1] ENUMERATED + { + iPV4(0), + iPV6(1), + ... + }, + iP-value [2] IP-value, + iP-assignment [3] ENUMERATED + { + static(1), + -- The static coding shall be used to report a static address. + dynamic(2), + -- The dynamic coding shall be used to report a dynamically allocated address. + notKnown(3), + -- The notKnown coding shall be used to report other than static or dynamically + -- allocated IP addresses. + ... + } OPTIONAL, + ..., + iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, + -- Indicates the length of the prefix delegated by the CSP to the subscriber + -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" + -- Mandatory in case where the iP-value contains an IPv6 binary value + iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL + -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. + -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to + -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to + -- a /29 CIDR-format subnet mask +} + +IP-value ::= CHOICE +{ + iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), + -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" + -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" + iPTextAddress [2] IA5String (SIZE(7..45)), + -- In case of IPv6, the delivered iPTextAddress field could include a complete + -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. + -- In case of IPv4, the delivered iPTextAddress field could include a single + -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" + ... +} + +LawfulInterceptionIdentifier ::= 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 diff --git a/102232-1/lm_LI-PS-PDU.asn b/102232-1/lm_LI-PS-PDU.asn deleted file mode 100644 index eb62cde..0000000 --- a/102232-1/lm_LI-PS-PDU.asn +++ /dev/null @@ -1,727 +0,0 @@ -LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version28(28)} - -DEFINITIONS IMPLICIT TAGS ::= - -BEGIN - -IMPORTS - -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) - - -- from ETSI TS 103 280 [44] - LIID - FROM Common-Parameters - {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} - - -- from ETSI TS 101 671 [4] - IRI-Parameters, - IRIsContent, - Location, - Network-Element-Identifier - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} - - -- from ETSI TS 101 671 [4] - HI1-Operation - FROM HI1NotificationOperations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} - - -- from ETSI TS 102 232-2 [5] - EmailCC, - EmailIRI, - MessagingCC, - MessagingMMCC, - MessagingIRI - FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} - - -- from ETSI TS 102 232-3 [6] - IPCC, - IPIRI, - IPIRIOnly - FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} - - -- from ETSI TS 102 232-4 [32] - L2CC, - L2IRI, - L2IRIOnly - FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} - - -- from ETSI TS 102 232-5 [37] - IPMMCC, - IPMMIRI - FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} - - -- from ETSI TS 102 232-6 [36] - PstnIsdnCC, - PstnIsdnIRI - FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - UmtsIRIsContent, - CorrelationValues, - Location - FROM UmtsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - UmtsCS-IRIsContent - FROM UmtsCS-HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - EpsIRIsContent, - EPSLocation - FROM EpsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - ConfIRIsContent - 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. - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - ProSeIRIsContent - FROM ProSeHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - GcseIRIsContent - FROM GCSEHI2Operations - {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 ETSI TS 133 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 ETSI TS 133 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. - - -- from ETSI TS 133 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. - - -- from ETSI TS 133 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. - - -- from ETSI TS 133 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 ETSI TS 133 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. - -- 3GPP HI1 may be used with other services/networks than 3GPP's one. - - -- from ETSI TS 133 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 ETSI TS 133 108 [9]. - - -- from ETSI TS 101 909-20-1 [33] - TARGETACTIVITYMONITOR-1, - TTRAFFIC, - CTTRAFFIC - FROM TS101909201 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} - - -- from ETSI TS 101 909-20-2 [34] - TARGETACTIVITYMONITOR, - TTRAFFIC, - CTTRAFFIC - FROM TS101909202 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} - - -- from J-STD-025-B [39] - LAESProtocol - FROM Laesp-j-std-025-b - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} - CDMA2000LAESMessage - FROM CDMA2000CIIModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} - CCIPPacketHeader - FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} - - -- from ETSI TS 103 462 [45] - ILHIPayload - FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; - -- This import is only used for the handover between LEMFs. - - --- end of IMPORTS - --- ============================= --- Object Identifier Definitions --- ============================= - -lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version28(28)} - --- ==================== --- Top-level definition --- ==================== - -PS-PDU ::= SEQUENCE -{ - pSHeader [1] PSHeader, - payload [2] Payload -} - -PSHeader ::= SEQUENCE -{ - li-psDomainId [0] OBJECT IDENTIFIER, - lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, - -- 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, - sequenceNumber [4] INTEGER (0..4294967295), - timeStamp [5] GeneralizedTime OPTIONAL, - -- see clause 5.2.6 - ..., - interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, - -- see clause 5.2.11 - microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, - timeStampQualifier [8] TimeStampQualifier OPTIONAL -} - -Payload ::= CHOICE -{ - iRIPayloadSequence [0] SEQUENCE OF IRIPayload, - cCPayloadSequence [1] SEQUENCE OF CCPayload, - -- Clause 6.2.3 explains how to include more than one payload in the same PDU - tRIPayload [2] TRIPayload, - ..., - hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer, - threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, - -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] - iLHIPayload [6] SEQUENCE OF ILHIPayload - -- For typical use cases see ETSI TS 103 462 [45] -} - -TimeStampQualifier ::= ENUMERATED -{ - unknown(0), - timeOfInterception(1), - timeOfMediation(2), - ..., - timeOfAggregation(3) -} - --- ==================================== --- Items contained within the PS-Header --- ==================================== - -CommunicationIdentifier ::= SEQUENCE -{ - networkIdentifier [0] NetworkIdentifier, - communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, - -- in case of transport of HI1 messages not required - -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) - deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, - -- see clause 5.2.4 - ..., - cINExtension [3] CorrelationValues OPTIONAL - -- To be used when a single INTEGER is not sufficient to identify - -- a particular session (see clause 5.2.4) -} - -NetworkIdentifier ::= SEQUENCE -{ - operatorIdentifier [0] OCTET STRING (SIZE(1..16)), - networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, - ..., - eTSI671NEID [2] Network-Element-Identifier OPTIONAL - -- For network element identifier, use either networkElementIdentifier or eTSI671NEID -} - --- ========================== --- Definitions for CC Payload --- ========================== - -CCPayload ::= SEQUENCE -{ - payloadDirection [0] PayloadDirection OPTIONAL, - timeStamp [1] GeneralizedTime OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - cCContents [2] CCContents, - ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - timeStampQualifier [4] TimeStampQualifier OPTIONAL -} - -PayloadDirection ::= ENUMERATED -{ - fromTarget(0), - toTarget(1), - ..., - indeterminate(2), - -- Indication that the direction was indeterminate - combined(3), - -- Indication applicable to some services that the traffic is actually a combination - -- of To and From - notapplicable(4) - -- Indication that direction of interceptable service does not make sense -} - -CCContents ::= CHOICE - -- Any of these choices may be commented out if they are not being used, see clause A.3 -{ - emailCC [1] EmailCC, - iPCC [2] IPCC, - uMTSCC [4] OCTET STRING, - ..., - l2CC [6] 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, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] 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, - 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, - cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU -} - -MicroSecondTimeStamp ::= SEQUENCE -{ - seconds [0] INTEGER (0..18446744073709551615), - -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch - microSeconds [1] INTEGER (0..999999), - ... -} - --- =========================== --- Definitions for IRI Payload --- =========================== - -IRIPayload ::= SEQUENCE -{ - iRIType [0] IRIType OPTIONAL, - -- See clause 5.2.10 - timeStamp [1] GeneralizedTime OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - iRIContents [2] IRIContents, - ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, - -- 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 - -- 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 - -- relevant service-specific details -} - -IRIType ::= ENUMERATED -{ - iRI-Begin(1), - iRI-End(2), - iRI-Continue(3), - iRI-Report(4) -} - -IRIContents ::= CHOICE - -- Any of these choices may be commented out if they are not being used (see clause A.3) -{ - emailIRI [1] EmailIRI, - iPIRI [2] IPIRI, - iPIRIOnly [3] IPIRIOnly, - uMTSIRI [4] UMTSIRI, - eTSI671IRI [5] ETSI671IRI, - ..., - l2IRI [6] L2IRI, - l2IRIOnly [7] L2IRIOnly, - tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, - tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, - pstnIsdnIRI [10] PstnIsdnIRI, - iPMMIRI [11] IPMMIRI, - lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, - cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, - messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI, - confIRI [16] ConfIRI, - proseIRI [17] ProSeIRI, - gcseIRI [18] GcseIRI -} - -UMTSIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, - umtsIRIsContent [1] UmtsIRIsContent, - ..., - iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, - umtsCS-IRIsContent [3] UmtsCS-IRIsContent -} - -ETSI671IRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Parameters [0] HI2Operations.IRI-Parameters, - iRIsContent [1] IRIsContent, - ... -} - -EPSIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, - epsIRIsContent [1] EpsIRIsContent, - ... -} - -ConfIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, - confIRIsContent [1] ConfIRIsContent, - ... -} - - -ProSeIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, - proseIRIsContent [1] ProSeIRIsContent, - ... -} - - -GcseIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, - gcseIRIsContent [1] GcseIRIsContent, - ... -} - - --- =========================== --- Definitions for TRI Payload --- =========================== - -TRIPayload ::= CHOICE -{ - integrityCheck [0] IntegrityCheck, - testPDU [1] NULL, - paddingPDU [2] OCTET STRING, - -- Undefined contents (will be discarded) - keep-alive [3] NULL, - keep-aliveResponse [4] NULL, - firstSegmentFlag [5] NULL, - lastSegmentFlag [6] NULL, - ..., - cINReset [7] NULL, - operatorLeaMessage [8] OperatorLeaMessage, - optionRequest [9] OptionRequest, - optionResponse [10] OptionResponse, - optionComplete [11] NULL, - pDUAcknowledgementRequest [12] NULL, - pDUAcknowledgementResponse [13] NULL -} - -IntegrityCheck ::= SEQUENCE -{ - includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), - -- gives the order the PDUs were processed - checkType [1] CheckType, - dataType [2] DataType OPTIONAL, - -- From version5(5) the dataType is mandatory for hashes and for signatures - -- (see clause 7.2.3) - 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 - -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. - ..., - hashAlgorithm [4] HashAlgorithm OPTIONAL - -- Clarifies the hash function if checkType is hash(1). - -- If used, it shall be present for each checkType hash(1). -} - -CheckType ::= ENUMERATED -{ - hash(1), - -- hash value - signature(2), - -- DSS/DSA signature - ... -} - -DataType ::= ENUMERATED -{ - iRI(1), - cC(2), - ..., - iLHI(3) -} - - -HashAlgorithm ::= ENUMERATED -{ - sHA-1(1), - -- Included for legacy/migration purposes only, not to be used for new implementations - sHA-256(2), - sHA-384(3), - sHA-512(4), - ... -} - - - - -Option ::= CHOICE -{ - pDUAcknowledgement [0] NULL, - ... -} - -OptionRequest ::= SEQUENCE -{ - requestedOptions [0] SEQUENCE OF Option, - ... -} - -OptionResponse ::= SEQUENCE -{ - acceptedOptions [0] SEQUENCE OF Option, - declinedOptions [1] SEQUENCE OF Option, - ... -} - --- ================================== --- Definitions for OperatorLeaMessage --- ================================== - -OperatorLeaMessage ::= SEQUENCE -{ - messagePriority [0] OperatorLeaMessagePriority, - message [1] OCTET STRING (SIZE(1..255)), - ... -} - -OperatorLeaMessagePriority ::= ENUMERATED -{ - error(1), - -- reporting of error conditions that have impact on the quality of the - -- intercepted data - informational(2), - -- reporting of conditions that will not have direct impact on the quality of - -- the intercepted data - ... -} - --- =================================== --- Definitions for EncryptionContainer --- =================================== - -EncryptionContainer ::= SEQUENCE -{ - encryptionType [0] EncryptionType, - encryptedPayload [1] OCTET STRING, - -- once decrypted, it can be interpreted as EncryptedPayload - ..., - encryptedPayloadType [2] EncryptedPayloadType OPTIONAL -} - -EncryptionType ::= ENUMERATED -{ - none(1), - -- No encryption is applied. - national-option(2), - -- Use this option when an encryption scheme is negotiated on a national level - aES-192-CBC(3), - -- The Advanced Encryption Standard using a 192 bit key in CBC mode - aES-256-CBC(4), - -- The Advanced Encryption Standard using a 256 bit key in CBC mode - blowfish-192-CBC(5), - -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode - blowfish-256-CBC(6), - -- Blowfish using a 256 bit key in CBC mode - threedes-cbc(7), - -- Triple-DES using a 192 bit key in CBC mode - ... -} - -EncryptedPayload ::= SEQUENCE -{ - byteCounter [0] INTEGER (0..18446744073709551615), - -- The sum of the sizes of all PDUs before this PDU. - -- It is initialized with the unixTime (number of seconds since 01-01-1970) - -- 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 - payload [1] Payload, - ... -} - -EncryptedPayloadType ::= ENUMERATED -{ - unknown(1), - part2(2), - -- encrypted payload is ETSI TS 102 232-2 [5] - part3(3), - -- encrypted payload is ETSI TS 102 232-3 [6] - part4(4), - -- encrypted payload is ETSI TS 102 232-4 [32] - part5(5), - -- encrypted payload is ETSI TS 102 232-5 [37] - part6(6), - -- encrypted payload is ETSI TS 102 232-6 [36] - part7(7), - -- encrypted payload is ETSI TS 102 232-7 [38] - ..., - part1(8) - -- encrypted payload is ETSI TS 102 232-1 (the present document) -} - --- =================================== --- Common Parameters --- =================================== - -Location ::= SEQUENCE - -- This is a common parameter, the use of this parameter is described in clause 4.5 -{ - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, - ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, - eTSI671HI2Location [3] HI2Operations.Location OPTIONAL -} - -WlanLocationAttributes ::= SEQUENCE -{ - 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. -{ - iP-type [1] ENUMERATED - { - iPV4(0), - iPV6(1), - ... - }, - iP-value [2] IP-value, - iP-assignment [3] ENUMERATED - { - static(1), - -- The static coding shall be used to report a static address. - dynamic(2), - -- The dynamic coding shall be used to report a dynamically allocated address. - notKnown(3), - -- The notKnown coding shall be used to report other than static or dynamically - -- allocated IP addresses. - ... - } OPTIONAL, - ..., - iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, - -- Indicates the length of the prefix delegated by the CSP to the subscriber - -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" - -- Mandatory in case where the iP-value contains an IPv6 binary value - iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL - -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. - -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to - -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to - -- a /29 CIDR-format subnet mask -} - -IP-value ::= CHOICE -{ - iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), - -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" - -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" - iPTextAddress [2] IA5String (SIZE(7..45)), - -- In case of IPv6, the delivered iPTextAddress field could include a complete - -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. - -- In case of IPv4, the delivered iPTextAddress field could include a single - -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" - ... -} - -LawfulInterceptionIdentifier ::= 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 diff --git a/102232-1/portal/LI-PS-PDU,ver29.txt b/102232-1/portal/LI-PS-PDU,ver29.txt new file mode 100644 index 0000000..b1e38ab --- /dev/null +++ b/102232-1/portal/LI-PS-PDU,ver29.txt @@ -0,0 +1,722 @@ +LI-PS-PDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version29(29)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + + -- from ETSI TS 103 280 [44] + LIID + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + + + -- from ETSI TS 101 671 [4] + IRI-Parameters, + IRIsContent, + Location, + Network-Element-Identifier + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + + -- from ETSI TS 101 671 [4] + HI1-Operation + FROM HI1NotificationOperations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} + + -- from ETSI TS 102 232-2 [5] + EmailCC, + EmailIRI, + MessagingCC, + MessagingMMCC, + MessagingIRI + FROM EmailPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} + + -- from ETSI TS 102 232-3 [6] + IPCC, + IPIRI, + IPIRIOnly + FROM IPAccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} + + -- from ETSI TS 102 232-4 [32] + L2CC, + L2IRI, + L2IRIOnly + FROM L2AccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} + + -- from ETSI TS 102 232-5 [37] + IPMMCC, + IPMMIRI + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} + + -- from ETSI TS 102 232-6 [36] + PstnIsdnCC, + PstnIsdnIRI + FROM PstnIsdnPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + UmtsIRIsContent, + CorrelationValues, + Location + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + UmtsCS-IRIsContent + FROM UmtsCS-HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + EpsIRIsContent, + EPSLocation + FROM EpsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + ConfIRIsContent + 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. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + ProSeIRIsContent + FROM ProSeHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from ETSI TS 133 108 [9] + IRI-Parameters, + GcseIRIsContent + FROM GCSEHI2Operations + {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 ETSI TS 133 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 ETSI TS 133 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. + + -- from ETSI TS 133 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. + + -- from ETSI TS 133 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. + + -- from ETSI TS 133 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 ETSI TS 133 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. + -- 3GPP HI1 may be used with other services/networks than 3GPP's one. + + -- from ETSI TS 133 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 ETSI TS 133 108 [9]. + + -- from ETSI TS 101 909-20-1 [33] + TARGETACTIVITYMONITOR-1, + TTRAFFIC, + CTTRAFFIC + FROM TS101909201 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} + + -- from ETSI TS 101 909-20-2 [34] + TARGETACTIVITYMONITOR, + TTRAFFIC, + CTTRAFFIC + FROM TS101909202 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} + + -- from J-STD-025-B [39] + LAESProtocol + FROM Laesp-j-std-025-b + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} + CDMA2000LAESMessage + FROM CDMA2000CIIModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} + CCIPPacketHeader + FROM CDMA2000CCModule + {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} + + -- from ETSI TS 103 462 [45] + ILHIPayload + FROM ILHIPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; + + -- This import is only used for the handover between LEMFs. + + +-- end of IMPORTS + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version29(29)} + +-- ==================== +-- Top-level definition +-- ==================== + +PS-PDU ::= SEQUENCE +{ + pSHeader [1] PSHeader, + payload [2] Payload +} + +PSHeader ::= SEQUENCE +{ + li-psDomainId [0] OBJECT IDENTIFIER, + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- 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, + sequenceNumber [4] INTEGER (0..4294967295), + timeStamp [5] GeneralizedTime OPTIONAL, + -- see clause 5.2.6 + ..., + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + -- see clause 5.2.11 + microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, + timeStampQualifier [8] TimeStampQualifier OPTIONAL +} + +Payload ::= CHOICE +{ + iRIPayloadSequence [0] SEQUENCE OF IRIPayload, + cCPayloadSequence [1] SEQUENCE OF CCPayload, + -- Clause 6.2.3 explains how to include more than one payload in the same PDU + tRIPayload [2] TRIPayload, + ..., + hI1-Operation [3] HI1-Operation, + encryptionContainer [4] EncryptionContainer, + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, + -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] + iLHIPayload [6] SEQUENCE OF ILHIPayload + -- For typical use cases see ETSI TS 103 462 [45] +} + +TimeStampQualifier ::= ENUMERATED +{ + unknown(0), + timeOfInterception(1), + timeOfMediation(2), + ..., + timeOfAggregation(3) +} + +-- ==================================== +-- Items contained within the PS-Header +-- ==================================== + +CommunicationIdentifier ::= SEQUENCE +{ + networkIdentifier [0] NetworkIdentifier, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + -- in case of transport of HI1 messages not required + -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + -- see clause 5.2.4 + ..., + cINExtension [3] CorrelationValues OPTIONAL + -- To be used when a single INTEGER is not sufficient to identify + -- a particular session (see clause 5.2.4) +} + +NetworkIdentifier ::= SEQUENCE +{ + operatorIdentifier [0] OCTET STRING (SIZE(1..16)), + networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, + ..., + eTSI671NEID [2] Network-Element-Identifier OPTIONAL + -- For network element identifier, use either networkElementIdentifier or eTSI671NEID +} + +-- ========================== +-- Definitions for CC Payload +-- ========================== + +CCPayload ::= SEQUENCE +{ + payloadDirection [0] PayloadDirection OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + cCContents [2] CCContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + timeStampQualifier [4] TimeStampQualifier OPTIONAL +} + +PayloadDirection ::= ENUMERATED +{ + fromTarget(0), + toTarget(1), + ..., + indeterminate(2), + -- Indication that the direction was indeterminate + combined(3), + -- Indication applicable to some services that the traffic is actually a combination + -- of To and From + notapplicable(4) + -- Indication that direction of interceptable service does not make sense +} + +CCContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used, see clause A.3 +{ + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, + ..., + l2CC [6] 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, + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + messagingCC [14] 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, + 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, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, + threeGPP33128DefinedCC [23] OCTET STRING } + +MicroSecondTimeStamp ::= SEQUENCE +{ + seconds [0] INTEGER (0..18446744073709551615), + -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch + microSeconds [1] INTEGER (0..999999), + ... +} + +-- =========================== +-- Definitions for IRI Payload +-- =========================== + +IRIPayload ::= SEQUENCE +{ + iRIType [0] IRIType OPTIONAL, + -- See clause 5.2.10 + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + iRIContents [2] IRIContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- 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 + -- 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 + -- relevant service-specific details +} + +IRIType ::= ENUMERATED +{ + iRI-Begin(1), + iRI-End(2), + iRI-Continue(3), + iRI-Report(4) +} + +IRIContents ::= CHOICE + -- Any of these choices may be commented out if they are not being used (see clause A.3) +{ + emailIRI [1] EmailIRI, + iPIRI [2] IPIRI, + iPIRIOnly [3] IPIRIOnly, + uMTSIRI [4] UMTSIRI, + eTSI671IRI [5] ETSI671IRI, + ..., + l2IRI [6] L2IRI, + l2IRIOnly [7] L2IRIOnly, + tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, + tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, + pstnIsdnIRI [10] PstnIsdnIRI, + iPMMIRI [11] IPMMIRI, + lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, + cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, + messagingIRI [14] MessagingIRI, + ePSIRI [15] EPSIRI, + confIRI [16] ConfIRI, + proseIRI [17] ProSeIRI, + gcseIRI [18] GcseIRI, + threeGPP33128DefinedIRI [19] OCTET STRING} + +UMTSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, + umtsIRIsContent [1] UmtsIRIsContent, + ..., + iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, + umtsCS-IRIsContent [3] UmtsCS-IRIsContent +} + +ETSI671IRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] HI2Operations.IRI-Parameters, + iRIsContent [1] IRIsContent, + ... +} + +EPSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, + ... +} + +ConfIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, + confIRIsContent [1] ConfIRIsContent, + ... +} + + +ProSeIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, + proseIRIsContent [1] ProSeIRIsContent, + ... +} + + +GcseIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, + gcseIRIsContent [1] GcseIRIsContent, + ... +} + + +-- =========================== +-- Definitions for TRI Payload +-- =========================== + +TRIPayload ::= CHOICE +{ + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, + -- Undefined contents (will be discarded) + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, + ..., + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage, + optionRequest [9] OptionRequest, + optionResponse [10] OptionResponse, + optionComplete [11] NULL, + pDUAcknowledgementRequest [12] NULL, + pDUAcknowledgementResponse [13] NULL +} + +IntegrityCheck ::= SEQUENCE +{ + includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), + -- gives the order the PDUs were processed + checkType [1] CheckType, + dataType [2] DataType OPTIONAL, + -- From version5(5) the dataType is mandatory for hashes and for signatures + -- (see clause 7.2.3) + 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 + -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. + ..., + hashAlgorithm [4] HashAlgorithm OPTIONAL + -- Clarifies the hash function if checkType is hash(1). + -- If used, it shall be present for each checkType hash(1). +} + +CheckType ::= ENUMERATED +{ + hash(1), + -- hash value + signature(2), + -- DSS/DSA signature + ... +} + +DataType ::= ENUMERATED +{ + iRI(1), + cC(2), + ..., + iLHI(3) +} + +HashAlgorithm ::= ENUMERATED +{ + sHA-1(1), + -- Included for legacy/migration purposes only, not to be used for new implementations + sHA-256(2), + sHA-384(3), + sHA-512(4), + ... +} + +Option ::= CHOICE +{ + pDUAcknowledgement [0] NULL, + ... +} + +OptionRequest ::= SEQUENCE +{ + requestedOptions [0] SEQUENCE OF Option, + ... +} + +OptionResponse ::= SEQUENCE +{ + acceptedOptions [0] SEQUENCE OF Option, + declinedOptions [1] SEQUENCE OF Option, + ... +} + +-- ================================== +-- Definitions for OperatorLeaMessage +-- ================================== + +OperatorLeaMessage ::= SEQUENCE +{ + messagePriority [0] OperatorLeaMessagePriority, + message [1] OCTET STRING (SIZE(1..255)), + ... +} + +OperatorLeaMessagePriority ::= ENUMERATED +{ + error(1), + -- reporting of error conditions that have impact on the quality of the + -- intercepted data + informational(2), + -- reporting of conditions that will not have direct impact on the quality of + -- the intercepted data + ... +} + +-- =================================== +-- Definitions for EncryptionContainer +-- =================================== + +EncryptionContainer ::= SEQUENCE +{ + encryptionType [0] EncryptionType, + encryptedPayload [1] OCTET STRING, + -- once decrypted, it can be interpreted as EncryptedPayload + ..., + encryptedPayloadType [2] EncryptedPayloadType OPTIONAL +} + +EncryptionType ::= ENUMERATED +{ + none(1), + -- No encryption is applied. + national-option(2), + -- Use this option when an encryption scheme is negotiated on a national level + aES-192-CBC(3), + -- The Advanced Encryption Standard using a 192 bit key in CBC mode + aES-256-CBC(4), + -- The Advanced Encryption Standard using a 256 bit key in CBC mode + blowfish-192-CBC(5), + -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode + blowfish-256-CBC(6), + -- Blowfish using a 256 bit key in CBC mode + threedes-cbc(7), + -- Triple-DES using a 192 bit key in CBC mode + ... +} + +EncryptedPayload ::= SEQUENCE +{ + byteCounter [0] INTEGER (0..18446744073709551615), + -- The sum of the sizes of all PDUs before this PDU. + -- It is initialized with the unixTime (number of seconds since 01-01-1970) + -- 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 + payload [1] Payload, + ... +} + +EncryptedPayloadType ::= ENUMERATED +{ + unknown(1), + part2(2), + -- encrypted payload is ETSI TS 102 232-2 [5] + part3(3), + -- encrypted payload is ETSI TS 102 232-3 [6] + part4(4), + -- encrypted payload is ETSI TS 102 232-4 [32] + part5(5), + -- encrypted payload is ETSI TS 102 232-5 [37] + part6(6), + -- encrypted payload is ETSI TS 102 232-6 [36] + part7(7), + -- encrypted payload is ETSI TS 102 232-7 [38] + ..., + part1(8) + -- encrypted payload is ETSI TS 102 232-1 (the present document) +} + +-- =================================== +-- Common Parameters +-- =================================== + +Location ::= SEQUENCE + -- This is a common parameter, the use of this parameter is described in clause 4.5 +{ + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + ..., + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL +} + +WlanLocationAttributes ::= SEQUENCE +{ + 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. +{ + iP-type [1] ENUMERATED + { + iPV4(0), + iPV6(1), + ... + }, + iP-value [2] IP-value, + iP-assignment [3] ENUMERATED + { + static(1), + -- The static coding shall be used to report a static address. + dynamic(2), + -- The dynamic coding shall be used to report a dynamically allocated address. + notKnown(3), + -- The notKnown coding shall be used to report other than static or dynamically + -- allocated IP addresses. + ... + } OPTIONAL, + ..., + iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, + -- Indicates the length of the prefix delegated by the CSP to the subscriber + -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" + -- Mandatory in case where the iP-value contains an IPv6 binary value + iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL + -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. + -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to + -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to + -- a /29 CIDR-format subnet mask +} + +IP-value ::= CHOICE +{ + iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), + -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" + -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" + iPTextAddress [2] IA5String (SIZE(7..45)), + -- In case of IPv6, the delivered iPTextAddress field could include a complete + -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. + -- In case of IPv4, the delivered iPTextAddress field could include a single + -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" + ... +} + +LawfulInterceptionIdentifier ::= 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 diff --git a/102232-1/portal/lm_LI-PS-PDU,ver28.txt b/102232-1/portal/lm_LI-PS-PDU,ver28.txt deleted file mode 100644 index eb62cde..0000000 --- a/102232-1/portal/lm_LI-PS-PDU,ver28.txt +++ /dev/null @@ -1,727 +0,0 @@ -LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version28(28)} - -DEFINITIONS IMPLICIT TAGS ::= - -BEGIN - -IMPORTS - -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) - - -- from ETSI TS 103 280 [44] - LIID - FROM Common-Parameters - {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} - - -- from ETSI TS 101 671 [4] - IRI-Parameters, - IRIsContent, - Location, - Network-Element-Identifier - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} - - -- from ETSI TS 101 671 [4] - HI1-Operation - FROM HI1NotificationOperations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} - - -- from ETSI TS 102 232-2 [5] - EmailCC, - EmailIRI, - MessagingCC, - MessagingMMCC, - MessagingIRI - FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} - - -- from ETSI TS 102 232-3 [6] - IPCC, - IPIRI, - IPIRIOnly - FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} - - -- from ETSI TS 102 232-4 [32] - L2CC, - L2IRI, - L2IRIOnly - FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} - - -- from ETSI TS 102 232-5 [37] - IPMMCC, - IPMMIRI - FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} - - -- from ETSI TS 102 232-6 [36] - PstnIsdnCC, - PstnIsdnIRI - FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - UmtsIRIsContent, - CorrelationValues, - Location - FROM UmtsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - UmtsCS-IRIsContent - FROM UmtsCS-HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - EpsIRIsContent, - EPSLocation - FROM EpsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - ConfIRIsContent - 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. - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - ProSeIRIsContent - FROM ProSeHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from ETSI TS 133 108 [9] - IRI-Parameters, - GcseIRIsContent - FROM GCSEHI2Operations - {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 ETSI TS 133 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 ETSI TS 133 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. - - -- from ETSI TS 133 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. - - -- from ETSI TS 133 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. - - -- from ETSI TS 133 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 ETSI TS 133 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. - -- 3GPP HI1 may be used with other services/networks than 3GPP's one. - - -- from ETSI TS 133 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 ETSI TS 133 108 [9]. - - -- from ETSI TS 101 909-20-1 [33] - TARGETACTIVITYMONITOR-1, - TTRAFFIC, - CTTRAFFIC - FROM TS101909201 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} - - -- from ETSI TS 101 909-20-2 [34] - TARGETACTIVITYMONITOR, - TTRAFFIC, - CTTRAFFIC - FROM TS101909202 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} - - -- from J-STD-025-B [39] - LAESProtocol - FROM Laesp-j-std-025-b - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} - CDMA2000LAESMessage - FROM CDMA2000CIIModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} - CCIPPacketHeader - FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} - - -- from ETSI TS 103 462 [45] - ILHIPayload - FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; - -- This import is only used for the handover between LEMFs. - - --- end of IMPORTS - --- ============================= --- Object Identifier Definitions --- ============================= - -lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version28(28)} - --- ==================== --- Top-level definition --- ==================== - -PS-PDU ::= SEQUENCE -{ - pSHeader [1] PSHeader, - payload [2] Payload -} - -PSHeader ::= SEQUENCE -{ - li-psDomainId [0] OBJECT IDENTIFIER, - lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, - -- 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, - sequenceNumber [4] INTEGER (0..4294967295), - timeStamp [5] GeneralizedTime OPTIONAL, - -- see clause 5.2.6 - ..., - interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, - -- see clause 5.2.11 - microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, - timeStampQualifier [8] TimeStampQualifier OPTIONAL -} - -Payload ::= CHOICE -{ - iRIPayloadSequence [0] SEQUENCE OF IRIPayload, - cCPayloadSequence [1] SEQUENCE OF CCPayload, - -- Clause 6.2.3 explains how to include more than one payload in the same PDU - tRIPayload [2] TRIPayload, - ..., - hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer, - threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, - -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] - iLHIPayload [6] SEQUENCE OF ILHIPayload - -- For typical use cases see ETSI TS 103 462 [45] -} - -TimeStampQualifier ::= ENUMERATED -{ - unknown(0), - timeOfInterception(1), - timeOfMediation(2), - ..., - timeOfAggregation(3) -} - --- ==================================== --- Items contained within the PS-Header --- ==================================== - -CommunicationIdentifier ::= SEQUENCE -{ - networkIdentifier [0] NetworkIdentifier, - communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, - -- in case of transport of HI1 messages not required - -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) - deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, - -- see clause 5.2.4 - ..., - cINExtension [3] CorrelationValues OPTIONAL - -- To be used when a single INTEGER is not sufficient to identify - -- a particular session (see clause 5.2.4) -} - -NetworkIdentifier ::= SEQUENCE -{ - operatorIdentifier [0] OCTET STRING (SIZE(1..16)), - networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, - ..., - eTSI671NEID [2] Network-Element-Identifier OPTIONAL - -- For network element identifier, use either networkElementIdentifier or eTSI671NEID -} - --- ========================== --- Definitions for CC Payload --- ========================== - -CCPayload ::= SEQUENCE -{ - payloadDirection [0] PayloadDirection OPTIONAL, - timeStamp [1] GeneralizedTime OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - cCContents [2] CCContents, - ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - timeStampQualifier [4] TimeStampQualifier OPTIONAL -} - -PayloadDirection ::= ENUMERATED -{ - fromTarget(0), - toTarget(1), - ..., - indeterminate(2), - -- Indication that the direction was indeterminate - combined(3), - -- Indication applicable to some services that the traffic is actually a combination - -- of To and From - notapplicable(4) - -- Indication that direction of interceptable service does not make sense -} - -CCContents ::= CHOICE - -- Any of these choices may be commented out if they are not being used, see clause A.3 -{ - emailCC [1] EmailCC, - iPCC [2] IPCC, - uMTSCC [4] OCTET STRING, - ..., - l2CC [6] 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, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] 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, - 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, - cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU -} - -MicroSecondTimeStamp ::= SEQUENCE -{ - seconds [0] INTEGER (0..18446744073709551615), - -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch - microSeconds [1] INTEGER (0..999999), - ... -} - --- =========================== --- Definitions for IRI Payload --- =========================== - -IRIPayload ::= SEQUENCE -{ - iRIType [0] IRIType OPTIONAL, - -- See clause 5.2.10 - timeStamp [1] GeneralizedTime OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - iRIContents [2] IRIContents, - ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, - -- 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 - -- 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 - -- relevant service-specific details -} - -IRIType ::= ENUMERATED -{ - iRI-Begin(1), - iRI-End(2), - iRI-Continue(3), - iRI-Report(4) -} - -IRIContents ::= CHOICE - -- Any of these choices may be commented out if they are not being used (see clause A.3) -{ - emailIRI [1] EmailIRI, - iPIRI [2] IPIRI, - iPIRIOnly [3] IPIRIOnly, - uMTSIRI [4] UMTSIRI, - eTSI671IRI [5] ETSI671IRI, - ..., - l2IRI [6] L2IRI, - l2IRIOnly [7] L2IRIOnly, - tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, - tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, - pstnIsdnIRI [10] PstnIsdnIRI, - iPMMIRI [11] IPMMIRI, - lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, - cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, - messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI, - confIRI [16] ConfIRI, - proseIRI [17] ProSeIRI, - gcseIRI [18] GcseIRI -} - -UMTSIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, - umtsIRIsContent [1] UmtsIRIsContent, - ..., - iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, - umtsCS-IRIsContent [3] UmtsCS-IRIsContent -} - -ETSI671IRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Parameters [0] HI2Operations.IRI-Parameters, - iRIsContent [1] IRIsContent, - ... -} - -EPSIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, - epsIRIsContent [1] EpsIRIsContent, - ... -} - -ConfIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, - confIRIsContent [1] ConfIRIsContent, - ... -} - - -ProSeIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, - proseIRIsContent [1] ProSeIRIsContent, - ... -} - - -GcseIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, - gcseIRIsContent [1] GcseIRIsContent, - ... -} - - --- =========================== --- Definitions for TRI Payload --- =========================== - -TRIPayload ::= CHOICE -{ - integrityCheck [0] IntegrityCheck, - testPDU [1] NULL, - paddingPDU [2] OCTET STRING, - -- Undefined contents (will be discarded) - keep-alive [3] NULL, - keep-aliveResponse [4] NULL, - firstSegmentFlag [5] NULL, - lastSegmentFlag [6] NULL, - ..., - cINReset [7] NULL, - operatorLeaMessage [8] OperatorLeaMessage, - optionRequest [9] OptionRequest, - optionResponse [10] OptionResponse, - optionComplete [11] NULL, - pDUAcknowledgementRequest [12] NULL, - pDUAcknowledgementResponse [13] NULL -} - -IntegrityCheck ::= SEQUENCE -{ - includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), - -- gives the order the PDUs were processed - checkType [1] CheckType, - dataType [2] DataType OPTIONAL, - -- From version5(5) the dataType is mandatory for hashes and for signatures - -- (see clause 7.2.3) - 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 - -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. - ..., - hashAlgorithm [4] HashAlgorithm OPTIONAL - -- Clarifies the hash function if checkType is hash(1). - -- If used, it shall be present for each checkType hash(1). -} - -CheckType ::= ENUMERATED -{ - hash(1), - -- hash value - signature(2), - -- DSS/DSA signature - ... -} - -DataType ::= ENUMERATED -{ - iRI(1), - cC(2), - ..., - iLHI(3) -} - - -HashAlgorithm ::= ENUMERATED -{ - sHA-1(1), - -- Included for legacy/migration purposes only, not to be used for new implementations - sHA-256(2), - sHA-384(3), - sHA-512(4), - ... -} - - - - -Option ::= CHOICE -{ - pDUAcknowledgement [0] NULL, - ... -} - -OptionRequest ::= SEQUENCE -{ - requestedOptions [0] SEQUENCE OF Option, - ... -} - -OptionResponse ::= SEQUENCE -{ - acceptedOptions [0] SEQUENCE OF Option, - declinedOptions [1] SEQUENCE OF Option, - ... -} - --- ================================== --- Definitions for OperatorLeaMessage --- ================================== - -OperatorLeaMessage ::= SEQUENCE -{ - messagePriority [0] OperatorLeaMessagePriority, - message [1] OCTET STRING (SIZE(1..255)), - ... -} - -OperatorLeaMessagePriority ::= ENUMERATED -{ - error(1), - -- reporting of error conditions that have impact on the quality of the - -- intercepted data - informational(2), - -- reporting of conditions that will not have direct impact on the quality of - -- the intercepted data - ... -} - --- =================================== --- Definitions for EncryptionContainer --- =================================== - -EncryptionContainer ::= SEQUENCE -{ - encryptionType [0] EncryptionType, - encryptedPayload [1] OCTET STRING, - -- once decrypted, it can be interpreted as EncryptedPayload - ..., - encryptedPayloadType [2] EncryptedPayloadType OPTIONAL -} - -EncryptionType ::= ENUMERATED -{ - none(1), - -- No encryption is applied. - national-option(2), - -- Use this option when an encryption scheme is negotiated on a national level - aES-192-CBC(3), - -- The Advanced Encryption Standard using a 192 bit key in CBC mode - aES-256-CBC(4), - -- The Advanced Encryption Standard using a 256 bit key in CBC mode - blowfish-192-CBC(5), - -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode - blowfish-256-CBC(6), - -- Blowfish using a 256 bit key in CBC mode - threedes-cbc(7), - -- Triple-DES using a 192 bit key in CBC mode - ... -} - -EncryptedPayload ::= SEQUENCE -{ - byteCounter [0] INTEGER (0..18446744073709551615), - -- The sum of the sizes of all PDUs before this PDU. - -- It is initialized with the unixTime (number of seconds since 01-01-1970) - -- 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 - payload [1] Payload, - ... -} - -EncryptedPayloadType ::= ENUMERATED -{ - unknown(1), - part2(2), - -- encrypted payload is ETSI TS 102 232-2 [5] - part3(3), - -- encrypted payload is ETSI TS 102 232-3 [6] - part4(4), - -- encrypted payload is ETSI TS 102 232-4 [32] - part5(5), - -- encrypted payload is ETSI TS 102 232-5 [37] - part6(6), - -- encrypted payload is ETSI TS 102 232-6 [36] - part7(7), - -- encrypted payload is ETSI TS 102 232-7 [38] - ..., - part1(8) - -- encrypted payload is ETSI TS 102 232-1 (the present document) -} - --- =================================== --- Common Parameters --- =================================== - -Location ::= SEQUENCE - -- This is a common parameter, the use of this parameter is described in clause 4.5 -{ - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, - ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, - eTSI671HI2Location [3] HI2Operations.Location OPTIONAL -} - -WlanLocationAttributes ::= SEQUENCE -{ - 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. -{ - iP-type [1] ENUMERATED - { - iPV4(0), - iPV6(1), - ... - }, - iP-value [2] IP-value, - iP-assignment [3] ENUMERATED - { - static(1), - -- The static coding shall be used to report a static address. - dynamic(2), - -- The dynamic coding shall be used to report a dynamically allocated address. - notKnown(3), - -- The notKnown coding shall be used to report other than static or dynamically - -- allocated IP addresses. - ... - } OPTIONAL, - ..., - iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, - -- Indicates the length of the prefix delegated by the CSP to the subscriber - -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" - -- Mandatory in case where the iP-value contains an IPv6 binary value - iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL - -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. - -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to - -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to - -- a /29 CIDR-format subnet mask -} - -IP-value ::= CHOICE -{ - iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), - -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" - -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" - iPTextAddress [2] IA5String (SIZE(7..45)), - -- In case of IPv6, the delivered iPTextAddress field could include a complete - -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. - -- In case of IPv4, the delivered iPTextAddress field could include a single - -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" - ... -} - -LawfulInterceptionIdentifier ::= 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 -- GitLab From 3f90a2968d9f463567dd794856bfaff3c42d184a Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:35:07 +0100 Subject: [PATCH 134/208] TS 103 221-1 v1.5.1 (2019-07-30) agreed at LI#51 (Texel, 2019-06-11) --- 103221-1/TS_103_221_01.xsd | 1646 ++++++++--------- .../examples/ActivateTaskRequest_example.xml | 2 +- .../examples/ActivateTaskResponse_example.xml | 2 +- .../CreateDestinationRequest_example.xml | 2 +- .../CreateDestinationResponse_example.xml | 2 +- .../DeactivateTaskRequest_example.xml | 2 +- .../DeactivateTaskResponse_example.xml | 2 +- .../examples/GetAllDetailsRequest_example.xml | 2 +- .../GetAllDetailsResponse_example.xml | 2 +- .../GetDestinationDetailsRequest_example.xml | 2 +- .../GetDestinationDetailsResponse_example.xml | 2 +- .../examples/GetNEStatusRequest_example.xml | 2 +- .../examples/GetNEStatusResponse_example.xml | 2 +- .../GetTaskDetailsRequest_example.xml | 2 +- .../GetTaskDetailsResponse_example.xml | 2 +- .../examples/KeepaliveRequest_example.xml | 2 +- .../examples/KeepaliveResponse_example.xml | 2 +- .../ListAllDetailsRequest_example.xml | 4 +- .../ListAllDetailsResponse_example.xml | 4 +- .../examples/ModifyTaskRequest_example.xml | 2 +- .../examples/ModifyTaskResponse_example.xml | 2 +- 103221-1/examples/PingRequest_example.xml | 2 +- 103221-1/examples/PingResponse_example.xml | 2 +- .../RemoveAllDestinationsRequest_example.xml | 2 +- .../RemoveAllDestinationsResponse_example.xml | 2 +- .../RemoveDestinationRequest_example.xml | 4 +- .../RemoveDestinationResponse_example.xml | 2 +- .../ReportDestinationIssueRequest_example.xml | 2 +- ...ReportDestinationIssueResponse_example.xml | 2 +- .../examples/ReportNEIssueRequest_example.xml | 2 +- .../ReportNEIssueResponse_example.xml | 2 +- .../ReportTaskIssueRequest_example.xml | 2 +- .../ReportTaskIssueResponse_example.xml | 2 +- 103221-1/examples/validate_examples.py | 93 + .../ActivateTaskRequest_example.xml | 2 +- .../ActivateTaskResponse_example.xml | 2 +- .../CreateDestinationRequest_example.xml | 2 +- .../CreateDestinationResponse_example.xml | 2 +- .../DeactivateTaskRequest_example.xml | 2 +- .../DeactivateTaskResponse_example.xml | 2 +- .../GetAllDetailsRequest_example.xml | 2 +- .../GetAllDetailsResponse_example.xml | 2 +- .../GetDestinationDetailsRequest_example.xml | 2 +- .../GetDestinationDetailsResponse_example.xml | 2 +- .../GetNEStatusRequest_example.xml | 2 +- .../GetNEStatusResponse_example.xml | 2 +- .../GetTaskDetailsRequest_example.xml | 2 +- .../GetTaskDetailsResponse_example.xml | 2 +- .../{output => }/KeepaliveRequest_example.xml | 2 +- .../KeepaliveResponse_example.xml | 2 +- .../ListAllDetailsRequest_example.xml | 4 +- .../ListAllDetailsResponse_example.xml | 4 +- .../ModifyTaskRequest_example.xml | 2 +- .../ModifyTaskResponse_example.xml | 2 +- .../{output => }/PingRequest_example.xml | 2 +- .../{output => }/PingResponse_example.xml | 2 +- .../RemoveAllDestinationsRequest_example.xml | 2 +- .../RemoveAllDestinationsResponse_example.xml | 2 +- .../RemoveDestinationRequest_example.xml | 4 +- .../RemoveDestinationResponse_example.xml | 2 +- .../ReportDestinationIssueRequest_example.xml | 2 +- ...ReportDestinationIssueResponse_example.xml | 2 +- .../ReportNEIssueRequest_example.xml | 2 +- .../ReportNEIssueResponse_example.xml | 2 +- .../ReportTaskIssueRequest_example.xml | 2 +- .../ReportTaskIssueResponse_example.xml | 2 +- 103221-1/portal/TS_103_221_01_v010401.xsd | 861 --------- 103221-1/portal/TS_103_221_01_v010501.xsd | 789 ++++++++ 103221-1/portal/validate_examples.py | 93 + 69 files changed, 1832 insertions(+), 1790 deletions(-) create mode 100644 103221-1/examples/validate_examples.py rename 103221-1/portal/{output => }/ActivateTaskRequest_example.xml (96%) rename 103221-1/portal/{output => }/ActivateTaskResponse_example.xml (93%) rename 103221-1/portal/{output => }/CreateDestinationRequest_example.xml (96%) rename 103221-1/portal/{output => }/CreateDestinationResponse_example.xml (93%) rename 103221-1/portal/{output => }/DeactivateTaskRequest_example.xml (93%) rename 103221-1/portal/{output => }/DeactivateTaskResponse_example.xml (93%) rename 103221-1/portal/{output => }/GetAllDetailsRequest_example.xml (93%) rename 103221-1/portal/{output => }/GetAllDetailsResponse_example.xml (98%) rename 103221-1/portal/{output => }/GetDestinationDetailsRequest_example.xml (93%) rename 103221-1/portal/{output => }/GetDestinationDetailsResponse_example.xml (97%) rename 103221-1/portal/{output => }/GetNEStatusRequest_example.xml (92%) rename 103221-1/portal/{output => }/GetNEStatusResponse_example.xml (94%) rename 103221-1/portal/{output => }/GetTaskDetailsRequest_example.xml (93%) rename 103221-1/portal/{output => }/GetTaskDetailsResponse_example.xml (96%) rename 103221-1/portal/{output => }/KeepaliveRequest_example.xml (92%) rename 103221-1/portal/{output => }/KeepaliveResponse_example.xml (93%) rename 103221-1/portal/{output => }/ListAllDetailsRequest_example.xml (78%) rename 103221-1/portal/{output => }/ListAllDetailsResponse_example.xml (84%) rename 103221-1/portal/{output => }/ModifyTaskRequest_example.xml (96%) rename 103221-1/portal/{output => }/ModifyTaskResponse_example.xml (93%) rename 103221-1/portal/{output => }/PingRequest_example.xml (92%) rename 103221-1/portal/{output => }/PingResponse_example.xml (93%) rename 103221-1/portal/{output => }/RemoveAllDestinationsRequest_example.xml (93%) rename 103221-1/portal/{output => }/RemoveAllDestinationsResponse_example.xml (93%) rename 103221-1/portal/{output => }/RemoveDestinationRequest_example.xml (81%) rename 103221-1/portal/{output => }/RemoveDestinationResponse_example.xml (93%) rename 103221-1/portal/{output => }/ReportDestinationIssueRequest_example.xml (95%) rename 103221-1/portal/{output => }/ReportDestinationIssueResponse_example.xml (93%) rename 103221-1/portal/{output => }/ReportNEIssueRequest_example.xml (94%) rename 103221-1/portal/{output => }/ReportNEIssueResponse_example.xml (93%) rename 103221-1/portal/{output => }/ReportTaskIssueRequest_example.xml (94%) rename 103221-1/portal/{output => }/ReportTaskIssueResponse_example.xml (93%) delete mode 100644 103221-1/portal/TS_103_221_01_v010401.xsd create mode 100644 103221-1/portal/TS_103_221_01_v010501.xsd create mode 100644 103221-1/portal/validate_examples.py diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index ef56282..cb1ebf0 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,861 +1,789 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/ActivateTaskRequest_example.xml b/103221-1/examples/ActivateTaskRequest_example.xml index 934993e..76f510b 100644 --- a/103221-1/examples/ActivateTaskRequest_example.xml +++ b/103221-1/examples/ActivateTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.1.1 + v1.5.1 3741800e-971b-4aa9-85f4-466d2b1adc7f 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/ActivateTaskResponse_example.xml b/103221-1/examples/ActivateTaskResponse_example.xml index 9d4aa09..9a04c2a 100644 --- a/103221-1/examples/ActivateTaskResponse_example.xml +++ b/103221-1/examples/ActivateTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.401571Z - v1.1.1 + v1.5.1 3741800e-971b-4aa9-85f4-466d2b1adc7f AcknowledgedAndCompleted diff --git a/103221-1/examples/CreateDestinationRequest_example.xml b/103221-1/examples/CreateDestinationRequest_example.xml index 6579d01..89b1a37 100644 --- a/103221-1/examples/CreateDestinationRequest_example.xml +++ b/103221-1/examples/CreateDestinationRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.446605Z - v1.1.1 + v1.5.1 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/examples/CreateDestinationResponse_example.xml b/103221-1/examples/CreateDestinationResponse_example.xml index 0000489..8eae1de 100644 --- a/103221-1/examples/CreateDestinationResponse_example.xml +++ b/103221-1/examples/CreateDestinationResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.446605Z - v1.1.1 + v1.5.1 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 AcknowledgedAndCompleted diff --git a/103221-1/examples/DeactivateTaskRequest_example.xml b/103221-1/examples/DeactivateTaskRequest_example.xml index c9e759f..10797cf 100644 --- a/103221-1/examples/DeactivateTaskRequest_example.xml +++ b/103221-1/examples/DeactivateTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.429594Z - v1.1.1 + v1.5.1 3da0df97-7bd5-4413-936d-74bebd7512fe 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/DeactivateTaskResponse_example.xml b/103221-1/examples/DeactivateTaskResponse_example.xml index 5a377d1..c34ec56 100644 --- a/103221-1/examples/DeactivateTaskResponse_example.xml +++ b/103221-1/examples/DeactivateTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.430594Z - v1.1.1 + v1.5.1 3da0df97-7bd5-4413-936d-74bebd7512fe AcknowledgedAndCompleted diff --git a/103221-1/examples/GetAllDetailsRequest_example.xml b/103221-1/examples/GetAllDetailsRequest_example.xml index 99e585a..cdbb8ee 100644 --- a/103221-1/examples/GetAllDetailsRequest_example.xml +++ b/103221-1/examples/GetAllDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.496243Z - v1.1.1 + v1.5.1 bfd0c982-b7d6-4a8e-80a0-89dab964aafd diff --git a/103221-1/examples/GetAllDetailsResponse_example.xml b/103221-1/examples/GetAllDetailsResponse_example.xml index 93663ce..287296e 100644 --- a/103221-1/examples/GetAllDetailsResponse_example.xml +++ b/103221-1/examples/GetAllDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.496743Z - v1.1.1 + v1.5.1 bfd0c982-b7d6-4a8e-80a0-89dab964aafd OK diff --git a/103221-1/examples/GetDestinationDetailsRequest_example.xml b/103221-1/examples/GetDestinationDetailsRequest_example.xml index cc183c3..bc1ffa7 100644 --- a/103221-1/examples/GetDestinationDetailsRequest_example.xml +++ b/103221-1/examples/GetDestinationDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.462616Z - v1.1.1 + v1.5.1 7de5709c-8269-417f-a123-7087d3971f8c b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/examples/GetDestinationDetailsResponse_example.xml b/103221-1/examples/GetDestinationDetailsResponse_example.xml index 080274d..bbd6b9c 100644 --- a/103221-1/examples/GetDestinationDetailsResponse_example.xml +++ b/103221-1/examples/GetDestinationDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.462616Z - v1.1.1 + v1.5.1 7de5709c-8269-417f-a123-7087d3971f8c diff --git a/103221-1/examples/GetNEStatusRequest_example.xml b/103221-1/examples/GetNEStatusRequest_example.xml index 556e7f0..29c15b6 100644 --- a/103221-1/examples/GetNEStatusRequest_example.xml +++ b/103221-1/examples/GetNEStatusRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.487158Z - v1.1.1 + v1.5.1 93d571cb-3793-4385-8b59-2c14097ed743 diff --git a/103221-1/examples/GetNEStatusResponse_example.xml b/103221-1/examples/GetNEStatusResponse_example.xml index 8dc6247..ba19ff3 100644 --- a/103221-1/examples/GetNEStatusResponse_example.xml +++ b/103221-1/examples/GetNEStatusResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.488659Z - v1.1.1 + v1.5.1 93d571cb-3793-4385-8b59-2c14097ed743 OK diff --git a/103221-1/examples/GetTaskDetailsRequest_example.xml b/103221-1/examples/GetTaskDetailsRequest_example.xml index 0185b1a..491c90e 100644 --- a/103221-1/examples/GetTaskDetailsRequest_example.xml +++ b/103221-1/examples/GetTaskDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.418584Z - v1.1.1 + v1.5.1 609dcabd-5ab1-4c95-9681-a24681f105ac 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/GetTaskDetailsResponse_example.xml b/103221-1/examples/GetTaskDetailsResponse_example.xml index b80bd03..5115b76 100644 --- a/103221-1/examples/GetTaskDetailsResponse_example.xml +++ b/103221-1/examples/GetTaskDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.420587Z - v1.1.1 + v1.5.1 609dcabd-5ab1-4c95-9681-a24681f105ac diff --git a/103221-1/examples/KeepaliveRequest_example.xml b/103221-1/examples/KeepaliveRequest_example.xml index 1bdbdc3..330e8db 100644 --- a/103221-1/examples/KeepaliveRequest_example.xml +++ b/103221-1/examples/KeepaliveRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.541784Z - v1.1.1 + v1.5.1 6420aa0f-e5e6-4a32-9dff-15b836589257 diff --git a/103221-1/examples/KeepaliveResponse_example.xml b/103221-1/examples/KeepaliveResponse_example.xml index 5ed4d81..923bbaa 100644 --- a/103221-1/examples/KeepaliveResponse_example.xml +++ b/103221-1/examples/KeepaliveResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.542783Z - v1.1.1 + v1.5.1 6420aa0f-e5e6-4a32-9dff-15b836589257 AcknowledgedAndCompleted diff --git a/103221-1/examples/ListAllDetailsRequest_example.xml b/103221-1/examples/ListAllDetailsRequest_example.xml index 229a918..b3f70b3 100644 --- a/103221-1/examples/ListAllDetailsRequest_example.xml +++ b/103221-1/examples/ListAllDetailsRequest_example.xml @@ -3,8 +3,8 @@ admfID neID - 2017-10-06T18:46:21.50833Z - v1.1.1 + 2017-10-06T18:46:21.508330Z + v1.5.1 09529160-2e44-49c6-bf54-204ca5edcfab diff --git a/103221-1/examples/ListAllDetailsResponse_example.xml b/103221-1/examples/ListAllDetailsResponse_example.xml index a1173f8..d762e08 100644 --- a/103221-1/examples/ListAllDetailsResponse_example.xml +++ b/103221-1/examples/ListAllDetailsResponse_example.xml @@ -3,8 +3,8 @@ admfID neID - 2017-10-06T18:46:21.50833Z - v1.1.1 + 2017-10-06T18:46:21.508330Z + v1.5.1 09529160-2e44-49c6-bf54-204ca5edcfab 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/ModifyTaskRequest_example.xml b/103221-1/examples/ModifyTaskRequest_example.xml index 1db578f..bb48bac 100644 --- a/103221-1/examples/ModifyTaskRequest_example.xml +++ b/103221-1/examples/ModifyTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.411587Z - v1.1.1 + v1.5.1 fcfc97de-1c77-413d-9925-d1630acbf763 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/ModifyTaskResponse_example.xml b/103221-1/examples/ModifyTaskResponse_example.xml index 105124b..adfa3b5 100644 --- a/103221-1/examples/ModifyTaskResponse_example.xml +++ b/103221-1/examples/ModifyTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.411587Z - v1.1.1 + v1.5.1 fcfc97de-1c77-413d-9925-d1630acbf763 AcknowledgedAndCompleted diff --git a/103221-1/examples/PingRequest_example.xml b/103221-1/examples/PingRequest_example.xml index 6697d38..d9687b6 100644 --- a/103221-1/examples/PingRequest_example.xml +++ b/103221-1/examples/PingRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.547786Z - v1.1.1 + v1.5.1 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 diff --git a/103221-1/examples/PingResponse_example.xml b/103221-1/examples/PingResponse_example.xml index fd927da..9e4dadb 100644 --- a/103221-1/examples/PingResponse_example.xml +++ b/103221-1/examples/PingResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.547786Z - v1.1.1 + v1.5.1 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 AcknowledgedAndCompleted diff --git a/103221-1/examples/RemoveAllDestinationsRequest_example.xml b/103221-1/examples/RemoveAllDestinationsRequest_example.xml index 1a5c185..6b27365 100644 --- a/103221-1/examples/RemoveAllDestinationsRequest_example.xml +++ b/103221-1/examples/RemoveAllDestinationsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.480627Z - v1.1.1 + v1.5.1 88611050-d8e2-4ada-96fc-626b5dbd9cdf diff --git a/103221-1/examples/RemoveAllDestinationsResponse_example.xml b/103221-1/examples/RemoveAllDestinationsResponse_example.xml index ab392cc..a057bc2 100644 --- a/103221-1/examples/RemoveAllDestinationsResponse_example.xml +++ b/103221-1/examples/RemoveAllDestinationsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.481629Z - v1.1.1 + v1.5.1 88611050-d8e2-4ada-96fc-626b5dbd9cdf AcknowledgedAndCompleted diff --git a/103221-1/examples/RemoveDestinationRequest_example.xml b/103221-1/examples/RemoveDestinationRequest_example.xml index 66277d9..a5d3ce1 100644 --- a/103221-1/examples/RemoveDestinationRequest_example.xml +++ b/103221-1/examples/RemoveDestinationRequest_example.xml @@ -3,8 +3,8 @@ admfID neID - 2017-10-06T18:46:21.47363Z - v1.1.1 + 2017-10-06T18:46:21.473630Z + v1.5.1 8c229735-9acf-43ed-8d72-71602625b349 b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/examples/RemoveDestinationResponse_example.xml b/103221-1/examples/RemoveDestinationResponse_example.xml index b42246b..ec910e3 100644 --- a/103221-1/examples/RemoveDestinationResponse_example.xml +++ b/103221-1/examples/RemoveDestinationResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.474625Z - v1.1.1 + v1.5.1 8c229735-9acf-43ed-8d72-71602625b349 AcknowledgedAndCompleted diff --git a/103221-1/examples/ReportDestinationIssueRequest_example.xml b/103221-1/examples/ReportDestinationIssueRequest_example.xml index 52ba369..0f33e2b 100644 --- a/103221-1/examples/ReportDestinationIssueRequest_example.xml +++ b/103221-1/examples/ReportDestinationIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.526329Z - v1.1.1 + v1.5.1 7e3ff959-55b0-47bd-a417-0d0383252150 b0ce308c-aa17-42bd-a27b-287bcb5b3468 NonTerminatingFault diff --git a/103221-1/examples/ReportDestinationIssueResponse_example.xml b/103221-1/examples/ReportDestinationIssueResponse_example.xml index f6f54a0..44f3381 100644 --- a/103221-1/examples/ReportDestinationIssueResponse_example.xml +++ b/103221-1/examples/ReportDestinationIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.526329Z - v1.1.1 + v1.5.1 7e3ff959-55b0-47bd-a417-0d0383252150 AcknowledgedAndCompleted diff --git a/103221-1/examples/ReportNEIssueRequest_example.xml b/103221-1/examples/ReportNEIssueRequest_example.xml index 4f3a8a8..b06c969 100644 --- a/103221-1/examples/ReportNEIssueRequest_example.xml +++ b/103221-1/examples/ReportNEIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.531784Z - v1.1.1 + v1.5.1 c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b Warning Example NE issue diff --git a/103221-1/examples/ReportNEIssueResponse_example.xml b/103221-1/examples/ReportNEIssueResponse_example.xml index d234f89..ab2a6b8 100644 --- a/103221-1/examples/ReportNEIssueResponse_example.xml +++ b/103221-1/examples/ReportNEIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.531784Z - v1.1.1 + v1.5.1 c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b AcknowledgedAndCompleted diff --git a/103221-1/examples/ReportTaskIssueRequest_example.xml b/103221-1/examples/ReportTaskIssueRequest_example.xml index fe3fd82..ddbe803 100644 --- a/103221-1/examples/ReportTaskIssueRequest_example.xml +++ b/103221-1/examples/ReportTaskIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.516321Z - v1.1.1 + v1.5.1 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 29f28e1c-f230-486a-a860-f5a784ab9172 NonTerminatingFault diff --git a/103221-1/examples/ReportTaskIssueResponse_example.xml b/103221-1/examples/ReportTaskIssueResponse_example.xml index 263a904..eac2979 100644 --- a/103221-1/examples/ReportTaskIssueResponse_example.xml +++ b/103221-1/examples/ReportTaskIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.517323Z - v1.1.1 + v1.5.1 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 AcknowledgedAndCompleted diff --git a/103221-1/examples/validate_examples.py b/103221-1/examples/validate_examples.py new file mode 100644 index 0000000..0faa18a --- /dev/null +++ b/103221-1/examples/validate_examples.py @@ -0,0 +1,93 @@ +import glob +import sys + + +XS = 'http://www.w3.org/2001/XMLSchema' + + +def validate_example(example, schema): + + print('Validating example {}'.format(example)) + + xml = open(example) + doc = etree.parse(xml) + schema.assertValid(doc) + + print('Validated example {}'.format(example)) + + +def validate_examples(schema): + + examples = glob.glob('./examples/*.xml') + + if not examples: + sys.exit('ERROR: No examples found in ./examples/ directory') + + for example in examples: + validate_example(example, schema) + + +def load_schema(xsd): + + xsd_file = open(xsd) + + xsd_doc = etree.parse(xsd_file) + + # Set schemaLocation of TS 103 280 XSD + + common_xsd = glob.glob('./TS_103_280_*.xsd') + + if not common_xsd: + sys.exit('ERROR: Please copy a TS 103 280 XSD into this directory') + + if len(common_xsd) > 1: + sys.exit('ERROR: Too many TS 103 280 XSDs in current directory') + + imports = xsd_doc.xpath('//*/xs:import', namespaces={'xs': XS}) + + for xsd_import in imports: + xsd_import.attrib['schemaLocation'] = common_xsd[0] + + # Load TS 103 221-1 XSD as a schema + + return etree.XMLSchema(xsd_doc) + + +def validate_xsd(xsd): + + print('Validating XSD {}'.format(xsd)) + + schema = load_schema(xsd) + + print('Validated XSD {}'.format(xsd)) + print('') + + validate_examples(schema) + + print('') + print('Validated all examples for XSD {}'.format(xsd)) + print('') + + +def validate_xsds(): + + xsds = glob.glob('./TS_103_221_01_*.xsd') + + if not xsds: + sys.exit('ERROR: No TS 103 221-1 XSDs found in current directory') + + for xsd in xsds: + validate_xsd(xsd) + + +if __name__ == '__main__': + + if sys.version_info <= (3, 5): + sys.exit('ERROR: You need at least Python 3.5 to run this tool') + + try: + from lxml import etree + except ImportError: + sys.exit('ERROR: You need to install the Python lxml library') + + validate_xsds() diff --git a/103221-1/portal/output/ActivateTaskRequest_example.xml b/103221-1/portal/ActivateTaskRequest_example.xml similarity index 96% rename from 103221-1/portal/output/ActivateTaskRequest_example.xml rename to 103221-1/portal/ActivateTaskRequest_example.xml index 934993e..76f510b 100644 --- a/103221-1/portal/output/ActivateTaskRequest_example.xml +++ b/103221-1/portal/ActivateTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.1.1 + v1.5.1 3741800e-971b-4aa9-85f4-466d2b1adc7f 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/portal/output/ActivateTaskResponse_example.xml b/103221-1/portal/ActivateTaskResponse_example.xml similarity index 93% rename from 103221-1/portal/output/ActivateTaskResponse_example.xml rename to 103221-1/portal/ActivateTaskResponse_example.xml index 9d4aa09..9a04c2a 100644 --- a/103221-1/portal/output/ActivateTaskResponse_example.xml +++ b/103221-1/portal/ActivateTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.401571Z - v1.1.1 + v1.5.1 3741800e-971b-4aa9-85f4-466d2b1adc7f AcknowledgedAndCompleted diff --git a/103221-1/portal/output/CreateDestinationRequest_example.xml b/103221-1/portal/CreateDestinationRequest_example.xml similarity index 96% rename from 103221-1/portal/output/CreateDestinationRequest_example.xml rename to 103221-1/portal/CreateDestinationRequest_example.xml index 6579d01..89b1a37 100644 --- a/103221-1/portal/output/CreateDestinationRequest_example.xml +++ b/103221-1/portal/CreateDestinationRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.446605Z - v1.1.1 + v1.5.1 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/portal/output/CreateDestinationResponse_example.xml b/103221-1/portal/CreateDestinationResponse_example.xml similarity index 93% rename from 103221-1/portal/output/CreateDestinationResponse_example.xml rename to 103221-1/portal/CreateDestinationResponse_example.xml index 0000489..8eae1de 100644 --- a/103221-1/portal/output/CreateDestinationResponse_example.xml +++ b/103221-1/portal/CreateDestinationResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.446605Z - v1.1.1 + v1.5.1 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 AcknowledgedAndCompleted diff --git a/103221-1/portal/output/DeactivateTaskRequest_example.xml b/103221-1/portal/DeactivateTaskRequest_example.xml similarity index 93% rename from 103221-1/portal/output/DeactivateTaskRequest_example.xml rename to 103221-1/portal/DeactivateTaskRequest_example.xml index c9e759f..10797cf 100644 --- a/103221-1/portal/output/DeactivateTaskRequest_example.xml +++ b/103221-1/portal/DeactivateTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.429594Z - v1.1.1 + v1.5.1 3da0df97-7bd5-4413-936d-74bebd7512fe 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/portal/output/DeactivateTaskResponse_example.xml b/103221-1/portal/DeactivateTaskResponse_example.xml similarity index 93% rename from 103221-1/portal/output/DeactivateTaskResponse_example.xml rename to 103221-1/portal/DeactivateTaskResponse_example.xml index 5a377d1..c34ec56 100644 --- a/103221-1/portal/output/DeactivateTaskResponse_example.xml +++ b/103221-1/portal/DeactivateTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.430594Z - v1.1.1 + v1.5.1 3da0df97-7bd5-4413-936d-74bebd7512fe AcknowledgedAndCompleted diff --git a/103221-1/portal/output/GetAllDetailsRequest_example.xml b/103221-1/portal/GetAllDetailsRequest_example.xml similarity index 93% rename from 103221-1/portal/output/GetAllDetailsRequest_example.xml rename to 103221-1/portal/GetAllDetailsRequest_example.xml index 99e585a..cdbb8ee 100644 --- a/103221-1/portal/output/GetAllDetailsRequest_example.xml +++ b/103221-1/portal/GetAllDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.496243Z - v1.1.1 + v1.5.1 bfd0c982-b7d6-4a8e-80a0-89dab964aafd diff --git a/103221-1/portal/output/GetAllDetailsResponse_example.xml b/103221-1/portal/GetAllDetailsResponse_example.xml similarity index 98% rename from 103221-1/portal/output/GetAllDetailsResponse_example.xml rename to 103221-1/portal/GetAllDetailsResponse_example.xml index 93663ce..287296e 100644 --- a/103221-1/portal/output/GetAllDetailsResponse_example.xml +++ b/103221-1/portal/GetAllDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.496743Z - v1.1.1 + v1.5.1 bfd0c982-b7d6-4a8e-80a0-89dab964aafd OK diff --git a/103221-1/portal/output/GetDestinationDetailsRequest_example.xml b/103221-1/portal/GetDestinationDetailsRequest_example.xml similarity index 93% rename from 103221-1/portal/output/GetDestinationDetailsRequest_example.xml rename to 103221-1/portal/GetDestinationDetailsRequest_example.xml index cc183c3..bc1ffa7 100644 --- a/103221-1/portal/output/GetDestinationDetailsRequest_example.xml +++ b/103221-1/portal/GetDestinationDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.462616Z - v1.1.1 + v1.5.1 7de5709c-8269-417f-a123-7087d3971f8c b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/portal/output/GetDestinationDetailsResponse_example.xml b/103221-1/portal/GetDestinationDetailsResponse_example.xml similarity index 97% rename from 103221-1/portal/output/GetDestinationDetailsResponse_example.xml rename to 103221-1/portal/GetDestinationDetailsResponse_example.xml index 080274d..bbd6b9c 100644 --- a/103221-1/portal/output/GetDestinationDetailsResponse_example.xml +++ b/103221-1/portal/GetDestinationDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.462616Z - v1.1.1 + v1.5.1 7de5709c-8269-417f-a123-7087d3971f8c diff --git a/103221-1/portal/output/GetNEStatusRequest_example.xml b/103221-1/portal/GetNEStatusRequest_example.xml similarity index 92% rename from 103221-1/portal/output/GetNEStatusRequest_example.xml rename to 103221-1/portal/GetNEStatusRequest_example.xml index 556e7f0..29c15b6 100644 --- a/103221-1/portal/output/GetNEStatusRequest_example.xml +++ b/103221-1/portal/GetNEStatusRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.487158Z - v1.1.1 + v1.5.1 93d571cb-3793-4385-8b59-2c14097ed743 diff --git a/103221-1/portal/output/GetNEStatusResponse_example.xml b/103221-1/portal/GetNEStatusResponse_example.xml similarity index 94% rename from 103221-1/portal/output/GetNEStatusResponse_example.xml rename to 103221-1/portal/GetNEStatusResponse_example.xml index 8dc6247..ba19ff3 100644 --- a/103221-1/portal/output/GetNEStatusResponse_example.xml +++ b/103221-1/portal/GetNEStatusResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.488659Z - v1.1.1 + v1.5.1 93d571cb-3793-4385-8b59-2c14097ed743 OK diff --git a/103221-1/portal/output/GetTaskDetailsRequest_example.xml b/103221-1/portal/GetTaskDetailsRequest_example.xml similarity index 93% rename from 103221-1/portal/output/GetTaskDetailsRequest_example.xml rename to 103221-1/portal/GetTaskDetailsRequest_example.xml index 0185b1a..491c90e 100644 --- a/103221-1/portal/output/GetTaskDetailsRequest_example.xml +++ b/103221-1/portal/GetTaskDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.418584Z - v1.1.1 + v1.5.1 609dcabd-5ab1-4c95-9681-a24681f105ac 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/portal/output/GetTaskDetailsResponse_example.xml b/103221-1/portal/GetTaskDetailsResponse_example.xml similarity index 96% rename from 103221-1/portal/output/GetTaskDetailsResponse_example.xml rename to 103221-1/portal/GetTaskDetailsResponse_example.xml index b80bd03..5115b76 100644 --- a/103221-1/portal/output/GetTaskDetailsResponse_example.xml +++ b/103221-1/portal/GetTaskDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.420587Z - v1.1.1 + v1.5.1 609dcabd-5ab1-4c95-9681-a24681f105ac diff --git a/103221-1/portal/output/KeepaliveRequest_example.xml b/103221-1/portal/KeepaliveRequest_example.xml similarity index 92% rename from 103221-1/portal/output/KeepaliveRequest_example.xml rename to 103221-1/portal/KeepaliveRequest_example.xml index 1bdbdc3..330e8db 100644 --- a/103221-1/portal/output/KeepaliveRequest_example.xml +++ b/103221-1/portal/KeepaliveRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.541784Z - v1.1.1 + v1.5.1 6420aa0f-e5e6-4a32-9dff-15b836589257 diff --git a/103221-1/portal/output/KeepaliveResponse_example.xml b/103221-1/portal/KeepaliveResponse_example.xml similarity index 93% rename from 103221-1/portal/output/KeepaliveResponse_example.xml rename to 103221-1/portal/KeepaliveResponse_example.xml index 5ed4d81..923bbaa 100644 --- a/103221-1/portal/output/KeepaliveResponse_example.xml +++ b/103221-1/portal/KeepaliveResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.542783Z - v1.1.1 + v1.5.1 6420aa0f-e5e6-4a32-9dff-15b836589257 AcknowledgedAndCompleted diff --git a/103221-1/portal/output/ListAllDetailsRequest_example.xml b/103221-1/portal/ListAllDetailsRequest_example.xml similarity index 78% rename from 103221-1/portal/output/ListAllDetailsRequest_example.xml rename to 103221-1/portal/ListAllDetailsRequest_example.xml index 229a918..b3f70b3 100644 --- a/103221-1/portal/output/ListAllDetailsRequest_example.xml +++ b/103221-1/portal/ListAllDetailsRequest_example.xml @@ -3,8 +3,8 @@ admfID neID - 2017-10-06T18:46:21.50833Z - v1.1.1 + 2017-10-06T18:46:21.508330Z + v1.5.1 09529160-2e44-49c6-bf54-204ca5edcfab diff --git a/103221-1/portal/output/ListAllDetailsResponse_example.xml b/103221-1/portal/ListAllDetailsResponse_example.xml similarity index 84% rename from 103221-1/portal/output/ListAllDetailsResponse_example.xml rename to 103221-1/portal/ListAllDetailsResponse_example.xml index a1173f8..d762e08 100644 --- a/103221-1/portal/output/ListAllDetailsResponse_example.xml +++ b/103221-1/portal/ListAllDetailsResponse_example.xml @@ -3,8 +3,8 @@ admfID neID - 2017-10-06T18:46:21.50833Z - v1.1.1 + 2017-10-06T18:46:21.508330Z + v1.5.1 09529160-2e44-49c6-bf54-204ca5edcfab 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/portal/output/ModifyTaskRequest_example.xml b/103221-1/portal/ModifyTaskRequest_example.xml similarity index 96% rename from 103221-1/portal/output/ModifyTaskRequest_example.xml rename to 103221-1/portal/ModifyTaskRequest_example.xml index 1db578f..bb48bac 100644 --- a/103221-1/portal/output/ModifyTaskRequest_example.xml +++ b/103221-1/portal/ModifyTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.411587Z - v1.1.1 + v1.5.1 fcfc97de-1c77-413d-9925-d1630acbf763 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/portal/output/ModifyTaskResponse_example.xml b/103221-1/portal/ModifyTaskResponse_example.xml similarity index 93% rename from 103221-1/portal/output/ModifyTaskResponse_example.xml rename to 103221-1/portal/ModifyTaskResponse_example.xml index 105124b..adfa3b5 100644 --- a/103221-1/portal/output/ModifyTaskResponse_example.xml +++ b/103221-1/portal/ModifyTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.411587Z - v1.1.1 + v1.5.1 fcfc97de-1c77-413d-9925-d1630acbf763 AcknowledgedAndCompleted diff --git a/103221-1/portal/output/PingRequest_example.xml b/103221-1/portal/PingRequest_example.xml similarity index 92% rename from 103221-1/portal/output/PingRequest_example.xml rename to 103221-1/portal/PingRequest_example.xml index 6697d38..d9687b6 100644 --- a/103221-1/portal/output/PingRequest_example.xml +++ b/103221-1/portal/PingRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.547786Z - v1.1.1 + v1.5.1 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 diff --git a/103221-1/portal/output/PingResponse_example.xml b/103221-1/portal/PingResponse_example.xml similarity index 93% rename from 103221-1/portal/output/PingResponse_example.xml rename to 103221-1/portal/PingResponse_example.xml index fd927da..9e4dadb 100644 --- a/103221-1/portal/output/PingResponse_example.xml +++ b/103221-1/portal/PingResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.547786Z - v1.1.1 + v1.5.1 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 AcknowledgedAndCompleted diff --git a/103221-1/portal/output/RemoveAllDestinationsRequest_example.xml b/103221-1/portal/RemoveAllDestinationsRequest_example.xml similarity index 93% rename from 103221-1/portal/output/RemoveAllDestinationsRequest_example.xml rename to 103221-1/portal/RemoveAllDestinationsRequest_example.xml index 1a5c185..6b27365 100644 --- a/103221-1/portal/output/RemoveAllDestinationsRequest_example.xml +++ b/103221-1/portal/RemoveAllDestinationsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.480627Z - v1.1.1 + v1.5.1 88611050-d8e2-4ada-96fc-626b5dbd9cdf diff --git a/103221-1/portal/output/RemoveAllDestinationsResponse_example.xml b/103221-1/portal/RemoveAllDestinationsResponse_example.xml similarity index 93% rename from 103221-1/portal/output/RemoveAllDestinationsResponse_example.xml rename to 103221-1/portal/RemoveAllDestinationsResponse_example.xml index ab392cc..a057bc2 100644 --- a/103221-1/portal/output/RemoveAllDestinationsResponse_example.xml +++ b/103221-1/portal/RemoveAllDestinationsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.481629Z - v1.1.1 + v1.5.1 88611050-d8e2-4ada-96fc-626b5dbd9cdf AcknowledgedAndCompleted diff --git a/103221-1/portal/output/RemoveDestinationRequest_example.xml b/103221-1/portal/RemoveDestinationRequest_example.xml similarity index 81% rename from 103221-1/portal/output/RemoveDestinationRequest_example.xml rename to 103221-1/portal/RemoveDestinationRequest_example.xml index 66277d9..a5d3ce1 100644 --- a/103221-1/portal/output/RemoveDestinationRequest_example.xml +++ b/103221-1/portal/RemoveDestinationRequest_example.xml @@ -3,8 +3,8 @@ admfID neID - 2017-10-06T18:46:21.47363Z - v1.1.1 + 2017-10-06T18:46:21.473630Z + v1.5.1 8c229735-9acf-43ed-8d72-71602625b349 b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/portal/output/RemoveDestinationResponse_example.xml b/103221-1/portal/RemoveDestinationResponse_example.xml similarity index 93% rename from 103221-1/portal/output/RemoveDestinationResponse_example.xml rename to 103221-1/portal/RemoveDestinationResponse_example.xml index b42246b..ec910e3 100644 --- a/103221-1/portal/output/RemoveDestinationResponse_example.xml +++ b/103221-1/portal/RemoveDestinationResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.474625Z - v1.1.1 + v1.5.1 8c229735-9acf-43ed-8d72-71602625b349 AcknowledgedAndCompleted diff --git a/103221-1/portal/output/ReportDestinationIssueRequest_example.xml b/103221-1/portal/ReportDestinationIssueRequest_example.xml similarity index 95% rename from 103221-1/portal/output/ReportDestinationIssueRequest_example.xml rename to 103221-1/portal/ReportDestinationIssueRequest_example.xml index 52ba369..0f33e2b 100644 --- a/103221-1/portal/output/ReportDestinationIssueRequest_example.xml +++ b/103221-1/portal/ReportDestinationIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.526329Z - v1.1.1 + v1.5.1 7e3ff959-55b0-47bd-a417-0d0383252150 b0ce308c-aa17-42bd-a27b-287bcb5b3468 NonTerminatingFault diff --git a/103221-1/portal/output/ReportDestinationIssueResponse_example.xml b/103221-1/portal/ReportDestinationIssueResponse_example.xml similarity index 93% rename from 103221-1/portal/output/ReportDestinationIssueResponse_example.xml rename to 103221-1/portal/ReportDestinationIssueResponse_example.xml index f6f54a0..44f3381 100644 --- a/103221-1/portal/output/ReportDestinationIssueResponse_example.xml +++ b/103221-1/portal/ReportDestinationIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.526329Z - v1.1.1 + v1.5.1 7e3ff959-55b0-47bd-a417-0d0383252150 AcknowledgedAndCompleted diff --git a/103221-1/portal/output/ReportNEIssueRequest_example.xml b/103221-1/portal/ReportNEIssueRequest_example.xml similarity index 94% rename from 103221-1/portal/output/ReportNEIssueRequest_example.xml rename to 103221-1/portal/ReportNEIssueRequest_example.xml index 4f3a8a8..b06c969 100644 --- a/103221-1/portal/output/ReportNEIssueRequest_example.xml +++ b/103221-1/portal/ReportNEIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.531784Z - v1.1.1 + v1.5.1 c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b Warning Example NE issue diff --git a/103221-1/portal/output/ReportNEIssueResponse_example.xml b/103221-1/portal/ReportNEIssueResponse_example.xml similarity index 93% rename from 103221-1/portal/output/ReportNEIssueResponse_example.xml rename to 103221-1/portal/ReportNEIssueResponse_example.xml index d234f89..ab2a6b8 100644 --- a/103221-1/portal/output/ReportNEIssueResponse_example.xml +++ b/103221-1/portal/ReportNEIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.531784Z - v1.1.1 + v1.5.1 c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b AcknowledgedAndCompleted diff --git a/103221-1/portal/output/ReportTaskIssueRequest_example.xml b/103221-1/portal/ReportTaskIssueRequest_example.xml similarity index 94% rename from 103221-1/portal/output/ReportTaskIssueRequest_example.xml rename to 103221-1/portal/ReportTaskIssueRequest_example.xml index fe3fd82..ddbe803 100644 --- a/103221-1/portal/output/ReportTaskIssueRequest_example.xml +++ b/103221-1/portal/ReportTaskIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.516321Z - v1.1.1 + v1.5.1 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 29f28e1c-f230-486a-a860-f5a784ab9172 NonTerminatingFault diff --git a/103221-1/portal/output/ReportTaskIssueResponse_example.xml b/103221-1/portal/ReportTaskIssueResponse_example.xml similarity index 93% rename from 103221-1/portal/output/ReportTaskIssueResponse_example.xml rename to 103221-1/portal/ReportTaskIssueResponse_example.xml index 263a904..eac2979 100644 --- a/103221-1/portal/output/ReportTaskIssueResponse_example.xml +++ b/103221-1/portal/ReportTaskIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.517323Z - v1.1.1 + v1.5.1 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 AcknowledgedAndCompleted diff --git a/103221-1/portal/TS_103_221_01_v010401.xsd b/103221-1/portal/TS_103_221_01_v010401.xsd deleted file mode 100644 index ef56282..0000000 --- a/103221-1/portal/TS_103_221_01_v010401.xsd +++ /dev/null @@ -1,861 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/103221-1/portal/TS_103_221_01_v010501.xsd b/103221-1/portal/TS_103_221_01_v010501.xsd new file mode 100644 index 0000000..cb1ebf0 --- /dev/null +++ b/103221-1/portal/TS_103_221_01_v010501.xsd @@ -0,0 +1,789 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/portal/validate_examples.py b/103221-1/portal/validate_examples.py new file mode 100644 index 0000000..0faa18a --- /dev/null +++ b/103221-1/portal/validate_examples.py @@ -0,0 +1,93 @@ +import glob +import sys + + +XS = 'http://www.w3.org/2001/XMLSchema' + + +def validate_example(example, schema): + + print('Validating example {}'.format(example)) + + xml = open(example) + doc = etree.parse(xml) + schema.assertValid(doc) + + print('Validated example {}'.format(example)) + + +def validate_examples(schema): + + examples = glob.glob('./examples/*.xml') + + if not examples: + sys.exit('ERROR: No examples found in ./examples/ directory') + + for example in examples: + validate_example(example, schema) + + +def load_schema(xsd): + + xsd_file = open(xsd) + + xsd_doc = etree.parse(xsd_file) + + # Set schemaLocation of TS 103 280 XSD + + common_xsd = glob.glob('./TS_103_280_*.xsd') + + if not common_xsd: + sys.exit('ERROR: Please copy a TS 103 280 XSD into this directory') + + if len(common_xsd) > 1: + sys.exit('ERROR: Too many TS 103 280 XSDs in current directory') + + imports = xsd_doc.xpath('//*/xs:import', namespaces={'xs': XS}) + + for xsd_import in imports: + xsd_import.attrib['schemaLocation'] = common_xsd[0] + + # Load TS 103 221-1 XSD as a schema + + return etree.XMLSchema(xsd_doc) + + +def validate_xsd(xsd): + + print('Validating XSD {}'.format(xsd)) + + schema = load_schema(xsd) + + print('Validated XSD {}'.format(xsd)) + print('') + + validate_examples(schema) + + print('') + print('Validated all examples for XSD {}'.format(xsd)) + print('') + + +def validate_xsds(): + + xsds = glob.glob('./TS_103_221_01_*.xsd') + + if not xsds: + sys.exit('ERROR: No TS 103 221-1 XSDs found in current directory') + + for xsd in xsds: + validate_xsd(xsd) + + +if __name__ == '__main__': + + if sys.version_info <= (3, 5): + sys.exit('ERROR: You need at least Python 3.5 to run this tool') + + try: + from lxml import etree + except ImportError: + sys.exit('ERROR: You need to install the Python lxml library') + + validate_xsds() -- GitLab From b90173fde3653608a5953b3cddec33009989bcd2 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:35:11 +0100 Subject: [PATCH 135/208] TS 102 657 v1.23.1 (2019-08-20) agreed at LI#51 (Texel, 2019-06-11) --- 102657/RDMessage.asn | 413 +- 102657/RDMessage.xsd | 6068 +++++++++-------- 102657/portal/RDMessagever20.xsd | 2903 -------- ...{RDMessagever20.txt => RDMessagever21.txt} | 413 +- 102657/portal/RDMessagever21.xsd | 3175 +++++++++ 5 files changed, 6925 insertions(+), 6047 deletions(-) delete mode 100644 102657/portal/RDMessagever20.xsd rename 102657/portal/{RDMessagever20.txt => RDMessagever21.txt} (87%) create mode 100644 102657/portal/RDMessagever21.xsd diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index e51ec5f..b7f660b 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version20(20)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version21(21)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version21(21)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -20,7 +20,7 @@ rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20) RetainedDataMessage ::= SEQUENCE { - rdHeaderId [0] OBJECT IDENTIFIER, + rdHeaderId [0] OBJECT IDENTIFIER, retainedDataHeader [1] RetainedDataHeader, retainedDataPayload [2] RetainedDataPayload, retainedDataDigest [3] OCTET STRING OPTIONAL, @@ -57,8 +57,8 @@ RequestFlag ::= UTF8String RequestID ::= SEQUENCE { - countryCode [1] CountryCode, - authorisedOrganisationID [2] AuthorisedOrganisationID, + countryCode [1] CountryCode, + authorisedOrganisationID [2] AuthorisedOrganisationID, requestNumber [3] RequestNumber OPTIONAL, -- all messages except GetStatusMessage and StatusMessage have a request number -- (see clause 6.1.2) @@ -396,6 +396,16 @@ TimeSpan ::= SEQUENCE -- duration in seconds } +File ::= SEQUENCE +{ + mediaType [1] UTF8String, + -- Media type of the file, e.g. image/jpeg, application/pdf + -- Media types (formerly known as MIME types) are assigned and listed by the IANA + content [2] OCTET STRING, + -- Content of the file + ... +} + -- ============================================== -- Definitions for Generic Subscriber Information -- ============================================== @@ -525,14 +535,19 @@ OtherAddress ::= SEQUENCE AuthenticationInfo ::= SEQUENCE { - authenticationType [1] UTF8String OPTIONAL, - authenticationNumber [2] UTF8String OPTIONAL, + authenticationType [1] UTF8String OPTIONAL, + + authenticationNumber [2] UTF8String OPTIONAL, + ..., - issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL, - issuingOrganization [4] UTF8String OPTIONAL, - nationality [5] UTF8String OPTIONAL + issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL, + issuingOrganization [4] UTF8String OPTIONAL, + nationality [5] UTF8String OPTIONAL, + authenticationDocument [6] SEQUENCE OF File OPTIONAL + } + PaymentDetails ::= SEQUENCE { billingMethod [1] BillingMethod OPTIONAL, @@ -637,9 +652,12 @@ ICCIDInfo ::= SEQUENCE -- PUK code associated with the ICCID pUK2 [4] UTF8String OPTIONAL, -- PUK2 code associated with the ICCID - iMSI [5] IMSI OPTIONAL + iMSI [5] IMSI OPTIONAL, + sUPI [6] SUPI OPTIONAL, + gPSI [7] GPSI OPTIONAL } + LoginInfo ::= SEQUENCE { login [1] UTF8String OPTIONAL, @@ -663,41 +681,43 @@ SubscribedTelephonyServices ::= SEQUENCE -- Unique identifier for the service provider timeSpan [3] TimeSpan OPTIONAL, -- Start and end data, if applicable, of the subscription - registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, + registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, -- The set of telephone numbers registered for this service - registeredICCID [5] UTF8String OPTIONAL, + registeredICCID [5] UTF8String OPTIONAL, serviceType [6] TelephonyServiceType OPTIONAL, - installationAddress [7] AddressInformation OPTIONAL, + installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address - connectionDate [8] GeneralizedTime OPTIONAL, + connectionDate [8] GeneralizedTime OPTIONAL, -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, - carrierPreselect [10] BOOLEAN OPTIONAL, + carrierPreselect [10] BOOLEAN OPTIONAL, lineStatus [11] UTF8String OPTIONAL, -- CSP-specific description of current line status, e.g. "Active", "Ceased", etc. ..., - allocatedDeviceIDs [12] SEQUENCE OF TelephonyDeviceID OPTIONAL, + allocatedDeviceIDs [12] SEQUENCE OF TelephonyDeviceID OPTIONAL, pUKCode [13] UTF8String OPTIONAL, pUK2Code [14] UTF8String OPTIONAL, iMEI [15] SEQUENCE OF IMEI OPTIONAL, - nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, + nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - paymentDetails [17] PaymentDetails OPTIONAL, - subscriptionType [18] SubscriptionType OPTIONAL, + paymentDetails [17] PaymentDetails OPTIONAL, + subscriptionType [18] SubscriptionType OPTIONAL, -- Describes the nature of the subscription - deliveryAddress [19] AddressInformation OPTIONAL, - resellerAddress [20] AddressInformation OPTIONAL, - otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL, - registeredNumbersInfo [22] SEQUENCE OF PartyNumberInfo OPTIONAL, + deliveryAddress [19] AddressInformation OPTIONAL, + resellerAddress [20] AddressInformation OPTIONAL, + otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL, + registeredNumbersInfo [22] SEQUENCE OF PartyNumberInfo OPTIONAL, -- information about timespan of the active number and deactivation events - registeredICCIDs [23] SEQUENCE OF ICCIDInfo OPTIONAL, + registeredICCIDs [23] SEQUENCE OF ICCIDInfo OPTIONAL, -- in cases of MultiSIM card contracts - loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL + loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL, -- e.g. login information according a VMS/UMS account + paymentTransactions [25] SEQUENCE OF BillingRecords OPTIONAL } + SubscriptionType ::= ENUMERATED { unknown(0), @@ -749,17 +769,19 @@ BillingRecords ::= SEQUENCE method [5] UTF8String OPTIONAL, -- i.e. credit card, etc. ..., - nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL, + nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - transactionID [7] UTF8String OPTIONAL, + transactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis - transactionStatus [8] UTF8String OPTIONAL + transactionStatus [8] UTF8String OPTIONAL, -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national bases + copyOfBill [9] SEQUENCE OF File OPTIONAL } + NationalTelephonyBillingRecords ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1232,48 +1254,60 @@ NationalTransmitterDetails ::= SEQUENCE Location ::= SEQUENCE { - e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, + e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, -- Coded in the same format as the ISUP location number (parameter field) - -- of the ISUP (see EN 300 356 [7]) - globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, - -- See MAP format (see 3GPP TS 09.02 [8]) + -- of the ISUP (see ETSI EN 300 356 [7]) + globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, + -- See MAP format (see ETSI TS 100 974 [8]) rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with - -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the + -- ETSI TS 124 008 [9] without the Routing Area Identification IEI (only the -- last 6 octets are used) - gsmLocation [4] GSMLocation OPTIONAL, - umtsLocation [5] UMTSLocation OPTIONAL, + gsmLocation [4] GSMLocation OPTIONAL, + umtsLocation [5] UMTSLocation OPTIONAL, sAI [6] OCTET STRING (SIZE (7)) OPTIONAL, -- format: PLMN-ID 3 octets (no. 1-3) -- LAC 2 octets (no. 4-5) -- SAC 2 octets (no. 6-7) - -- (according to 3GPP TS 25.413 [31]) - oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, + -- (according to ETSI TS 125 413 [31]) + oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with - -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI + -- ETSI TS 124 008 [9] without the Routing Area Identification IEI -- (only the last 6 octets are used) - -- This parameter is duplicated from 3GPP TS 33.108 [11] + -- This parameter is duplicated from ETSI TS 133 108 [11] ..., - postalLocation [8] AddressInformation OPTIONAL, - extendedLocation [9] ExtendedLocation OPTIONAL, - userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL, - -- coded according to 3GPP TS 29.274 [32]; the type IE is not included + postalLocation [8] AddressInformation OPTIONAL, + extendedLocation [9] ExtendedLocation OPTIONAL, + userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL, + -- coded according to ETSI TS 129 274 [32]; the type IE is not included tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, - -- Only applicable to the CS traffic cases, such as SMS over SGs, according to - -- 3GPP TS 23.272 [35] - eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL, - -- Only applicable to the CS traffic cases, such as SMS over SGs, according to - -- 3GPP TS 23.272 [35] - maritimeTransport [13] MaritimeTransport OPTIONAL, - -- Information about the mobile cells embarked on ships using + eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL, + maritimeTransport [13] MaritimeTransport OPTIONAL, + -- Information about the mobile cells embarked on ships using -- satellite transponder backhaul - airTransport [14] AirTransport OPTIONAL, + airTransport [14] AirTransport OPTIONAL, -- Information about the mobile cells embarked on aircraft using -- satellite transponder backhaul - bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL + bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL, -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID + nCGI [16] NCGI OPTIONAL, + -- format as specified in 3GPP TS 38.413 [42]. + n3gaLocation [17] OCTET STRING (SIZE (4)) OPTIONAL, + -- format as specified in 3GPP TS 29.571 [43] + trackingAreaIdentifier [18] OCTET STRING (SIZE (5..6)) OPTIONAL + -- where: MCC+MNC = 3 octets, TAC (4G) = 2 octets or + -- TAC (5G) = 3 octets and without length indicator +} + +NCGI ::= SEQUENCE +{ + pLMNID [1] PLMNID, + nRCellID [2] NRCellID } +NRCellID ::= BIT STRING (SIZE(36)) +-- TS 38.413 [23], clause 9.3.1.7 + GSMLocation ::= CHOICE { geoCoordinates [1] SEQUENCE @@ -1378,10 +1412,13 @@ MapDatum ::= ENUMERATED iTM(12), -- Irish Transverse Mercator ..., - cH1903(13) + cH1903(13), -- Swiss reference system + cH1903Plus(14) + -- New Swiss reference system } + UMTSLocation ::= CHOICE { point [1] GA-Point, @@ -1653,16 +1690,18 @@ MessageID ::= UTF8String MsgBillingDetails ::= SEQUENCE { subscriberID [1] MsgSubscriberID OPTIONAL, - serviceID [2] UTF8String OPTIONAL, + serviceID [2] UTF8String OPTIONAL, billingAddress [3] ContactDetails OPTIONAL, billingIdentifier [4] MsgBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MsgBillingRecords OPTIONAL, - nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL, + nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - ... + ..., + copyOfBill [7] SEQUENCE OF File OPTIONAL } + NationalMsgBillingDetails ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1761,39 +1800,41 @@ SubscribedMultimediaServices ::= SEQUENCE -- Unique identifier for the service provider timeSpan [3] TimeSpan OPTIONAL, -- Start and end data, if applicable, of the subscription - registeredIdentifiers [4] SEQUENCE OF PartyIdentity OPTIONAL, + registeredIdentifiers [4] SEQUENCE OF PartyIdentity OPTIONAL, -- The set of identifiers registered for this service - registeredICCID [5] UTF8String OPTIONAL, + registeredICCID [5] UTF8String OPTIONAL, serviceType [6] MultimediaServiceType OPTIONAL, - installationAddress [7] AddressInformation OPTIONAL, + installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address - connectionDate [8] GeneralizedTime OPTIONAL, + connectionDate [8] GeneralizedTime OPTIONAL, -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, - carrierPreselect [10] BOOLEAN OPTIONAL, + carrierPreselect [10] BOOLEAN OPTIONAL, lineStatus [11] UTF8String OPTIONAL, -- CSP-specific description of current line status, -- e.g. "Active", "Ceased", etc. - nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL, + nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL, -- national extension ..., - paymentDetails [13] PaymentDetails OPTIONAL, - subscriptionType [14] SubscriptionType OPTIONAL, + paymentDetails [13] PaymentDetails OPTIONAL, + subscriptionType [14] SubscriptionType OPTIONAL, -- Describes the nature of the subscription - deliveryAddress [15] AddressInformation OPTIONAL, - resellerAddress [16] AddressInformation OPTIONAL, - otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL, - multimediaServiceType [18] UTF8String OPTIONAL, + deliveryAddress [15] AddressInformation OPTIONAL, + resellerAddress [16] AddressInformation OPTIONAL, + otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL, + multimediaServiceType [18] UTF8String OPTIONAL, -- Service name used by the service provider which may be proprietary - orderTime [19] GeneralizedTime OPTIONAL, - -- Time when the subscribed service was ordered by the user - iMEIs [20] SEQUENCE OF IMEI OPTIONAL, - registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, - privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL, - allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL + orderTime [19] GeneralizedTime OPTIONAL, + -- Time when the subscribed service was ordered by the user + iMEIs [20] SEQUENCE OF IMEI OPTIONAL, + registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, + privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL, + allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL, + paymentTransactions [24] SEQUENCE OF MultimediaBillingRecords OPTIONAL } + MultimediaServiceType ::= ENUMERATED { private(0), @@ -2004,17 +2045,19 @@ PaniHeaderInfo ::= SEQUENCE MultimediaBillingDetails ::= SEQUENCE { subscriberID [1] MultimediaSubscriberID OPTIONAL, - serviceID [2] UTF8String OPTIONAL, + serviceID [2] UTF8String OPTIONAL, billingAddress [3] ContactDetails OPTIONAL, billingIdentifier [4] MultimediaBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MultimediaBillingRecords OPTIONAL, - nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, + nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ..., - multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL + multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL, + copyOfBill [8] SEQUENCE OF File OPTIONAL } + MultimediaBillingAddress ::= SEQUENCE { addressSuppliedTime [1] GeneralizedTime OPTIONAL, @@ -2185,38 +2228,42 @@ NASubscriber ::= SEQUENCE NAServiceSubscription ::= SEQUENCE -- Description of the subscription to a Network Access service { - validity [1] TimeSpan OPTIONAL, - naServiceID [2] UTF8String OPTIONAL, + validity [1] TimeSpan OPTIONAL, + naServiceID [2] UTF8String OPTIONAL, -- Identifier for the service, e.g. account plan name. - naProviderID [3] NAProviderID OPTIONAL, + naProviderID [3] NAProviderID OPTIONAL, -- Unique identifier for the provider of the service, e.g. company name - naAuthID [4] NAAuthID OPTIONAL, + naAuthID [4] NAAuthID OPTIONAL, -- Unique identifier for this subscription, e.g. logon name - options [5] UTF8String OPTIONAL, + options [5] UTF8String OPTIONAL, -- Human readable text with restrictions or options to the subscription - installationAddress [6] AddressInformation OPTIONAL, - fixIpAddress [7] IPAddress OPTIONAL, + installationAddress [6] AddressInformation OPTIONAL, + fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address - imsi [8] IMSI OPTIONAL, + imsi [8] IMSI OPTIONAL, ..., - allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL, - naServiceStatus [10] UTF8String OPTIONAL, + allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL, + naServiceStatus [10] UTF8String OPTIONAL, -- CSP-specific description of current service status, e.g. "Active", "Ceased", etc. - registeredICCID [11] UTF8String OPTIONAL, - nationalNASubscription [12] NationalNASubscription OPTIONAL, - paymentDetails [13] PaymentDetails OPTIONAL, - additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL, - subscriptionType [15] SubscriptionType OPTIONAL, + registeredICCID [11] UTF8String OPTIONAL, + nationalNASubscription [12] NationalNASubscription OPTIONAL, + paymentDetails [13] PaymentDetails OPTIONAL, + additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL, + subscriptionType [15] SubscriptionType OPTIONAL, -- Describes the nature of the subscription - deliveryAddress [16] AddressInformation OPTIONAL, - resellerAddress [17] AddressInformation OPTIONAL, - otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL, - allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL, + deliveryAddress [16] AddressInformation OPTIONAL, + resellerAddress [17] AddressInformation OPTIONAL, + otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL, + allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL, -- If present, contains device details for all elements from allocatedDeviceIDs - mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL, - registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL + mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL, + registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, + paymentTransactions [22] SEQUENCE OF BillingRecords OPTIONAL, + sUPI [23] SUPI OPTIONAL, + gPSI [24] GPSI OPTIONAL } + NationalNASubscription ::= SEQUENCE -- Description of the subscription to a Network Access service { @@ -2231,11 +2278,11 @@ NationalNASubscription ::= SEQUENCE NAServiceUsage ::= SEQUENCE { - naAccessTime [1] GeneralizedTime OPTIONAL, + naAccessTime [1] GeneralizedTime OPTIONAL, -- Time of connection to the NAS naAuthID [2] NAAuthID OPTIONAL, -- Username used to obtain network access - nwAccessType [3] NwAccessType OPTIONAL, + nwAccessType [3] NwAccessType OPTIONAL, -- Type of network access attempted. If not undefined(0), this should be one of the types -- supported by the NAS (identified below by naNwElementID) naStatus [4] ENUMERATED @@ -2253,32 +2300,36 @@ NAServiceUsage ::= SEQUENCE -- Start time and end time (duration) of network access. naDeviceId [6] NADeviceId OPTIONAL, -- Device used to access the service - naNwElementID [7] NANwElementID OPTIONAL, + naNwElementID [7] NANwElementID OPTIONAL, -- Network element (NAS) onto which the naDevice is connected - naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL, + naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL, -- IP address assigned by the network access service. May be fixed or dynamic location [9] Location OPTIONAL, -- Location of the access (for e.g. GPRS handsets) - dialUpInformation [10] DialUpInformation OPTIONAL, - gprsInformation [11] GprsInformation OPTIONAL, + dialUpInformation [10] DialUpInformation OPTIONAL, + gprsInformation [11] GprsInformation OPTIONAL, ..., - octetsDownloaded [12] INTEGER OPTIONAL, - octetsUploaded [13] INTEGER OPTIONAL, + octetsDownloaded [12] INTEGER OPTIONAL, + octetsUploaded [13] INTEGER OPTIONAL, endReason [14] NAEndReason OPTIONAL, - subscriberID [15] NaSubscriberID OPTIONAL, + subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access - ePSInformation [16] EPSInformation OPTIONAL, - wifiInformation [17] WifiInformation OPTIONAL, - addressTranslationRecords [18] SEQUENCE OF AddressTranslationRecord OPTIONAL, + ePSInformation [16] EPSInformation OPTIONAL, + wifiInformation [17] WifiInformation OPTIONAL, + addressTranslationRecords [18] SEQUENCE OF AddressTranslationRecord OPTIONAL, -- contains extended information about the NAT or PAT operations carried out within this -- service usage session naDevice [19] NADevice OPTIONAL, -- If present, contains the device details for the device referenced in naDeviceID - additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL + additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL, -- List of additional locations and optional access time during the network access service -- usage + sNSSAI [21] OCTET STRING (SIZE(4)) OPTIONAL, + notifyUri [22] OCTET STRING (SIZE(3..8)) OPTIONAL, + fiveGSInformation [23] FIVEGSInformation OPTIONAL } + TimedLocation ::= SEQUENCE { location [1] Location, @@ -2476,29 +2527,31 @@ GPRSEvent ::= ENUMERATED EPSInformation ::= SEQUENCE { iMSI [1] IMSI OPTIONAL, - iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, + iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, mSISDN [3] PartyNumber OPTIONAL, iMEISV [4] IMEI OPTIONAL, s-GWAddress [5] IPAddress OPTIONAL, p-GWAddress [6] IPAddress OPTIONAL, - p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL, - aPNNetworkID [8] AccessPointNameNI OPTIONAL, + p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL, + aPNNetworkID [8] AccessPointNameNI OPTIONAL, pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL, - -- PDN/PDP Type number as defined in 3GPP TS 29.274 [32] clause 8.34 - pDP-PDNAddress [10] IPAddress OPTIONAL, + -- PDN/PDP Type number as defined in ETSI TS 129 274 [32] clause 8.34 + pDP-PDNAddress [10] IPAddress OPTIONAL, -- IP address allocated to the PDP context / PDN connection -- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix -- when PDP/PDN Type is IPv6 or IPv4v6. - pDP-PDNAddressExtension [11] IPAddress OPTIONAL, + pDP-PDNAddressExtension [11] IPAddress OPTIONAL, -- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6 - dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL, - dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, - rATType [14] INTEGER (0..255), - -- RAT Type coding according to 3GPP TS 29.274 [32] clause 8.17 + dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL, + dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, + rATType [14] INTEGER (0..255) OPTIONAL, + -- RAT Type coding according to ETSI TS 129 274 [32] clause 8.17 + -- NOTE - as of v1.23.1 of the present document, this field has changed to optional ePSEvent [15] EPSEvent OPTIONAL, ... } + IMSIUnauthenticatedFlag ::= BOOLEAN -- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI @@ -2538,6 +2591,61 @@ EPSEvent ::= ENUMERATED ... } +FIVEGSInformation ::= SEQUENCE +{ + sUPI [1] SUPI OPTIONAL, + dNN [2] UTF8String OPTIONAL, + gPSI [3] GPSI OPTIONAL, + pEI [4] PEI OPTIONAL, + pDUSessionID [6] INTEGER (0..255) OPTIONAL, + sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL, + pDUIpv4Address [8] IPAddress OPTIONAL, + pDUIpv6Address [9] IPAddress OPTIONAL, + pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL, + rFSPIndex [11] INTEGER (1..255) OPTIONAL, + applicationId [12] UTF8String OPTIONAL, + applicationServiceProviderIdentity [13] UTF8String OPTIONAL, + serviceId [14] INTEGER OPTIONAL, + chargingId [15] UTF8String OPTIONAL, + pDUType [16] PDUSessionType OPTIONAL, + sSCMode [17] SSCMode OPTIONAL, + vPLMNId [18] PLMNID OPTIONAL, + hPLMNId [19] PLMNID OPTIONAL, + chargingCharacteristics [20] UTF8String OPTIONAL, + chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL, + pDUSessionStartTime [22] GeneralizedTime OPTIONAL, + pDUSessionStopTime [23] GeneralizedTime OPTIONAL, + lowPriorityIndicator [24] BOOLEAN OPTIONAL, + dataOffStatus [25] BOOLEAN OPTIONAL, + diagnostics [26] INTEGER OPTIONAL, + uETimeZone [27] UTF8String OPTIONAL, + uPFAddress [28] IPAddress OPTIONAL, + aMFAddress [29] IPAddress OPTIONAL, + uDMAddress [30] IPAddress OPTIONAL, + sMFAddress [31] IPAddress OPTIONAL, + uPFId [32] UUID OPTIONAL, + aMFIdentifier [33] AMFID OPTIONAL, + uDMIdentifier [34] UUID OPTIONAL, + sMFIdentifier [35] UUID OPTIONAL, + uPFPDNAddress [36] IPAddress OPTIONAL, + uPFPDNAddressExtension [37] IPAddress OPTIONAL, + dynamicAddressFlag [38] BOOLEAN OPTIONAL, + dynamicAddressFlagExt [39] BOOLEAN OPTIONAL, + rAT5Type [40] RAT5Type OPTIONAL, + flowQosInfo [41] OCTET STRING OPTIONAL, + serviceID [42] INTEGER OPTIONAL + +} + +PDUSessionType ::= ENUMERATED +{ + iPv4(1), + iPv6(2), + iPv4v6(3), + unstructured(4), + ethernet(5) +} + -- ==================================== -- Definitions of Network Access Device -- ==================================== @@ -2559,14 +2667,38 @@ NADevice ::= SEQUENCE subscriberID [7] NaSubscriberID OPTIONAL } +SUPI ::= CHOICE +{ + iMSI [1] IMSI, + nAI [2] NAI, + ... +} + +GPSI ::= CHOICE +{ + mSISDN [1] PartyNumber, + nAI [2] NAI, + ... +} + +PEI ::= CHOICE +{ + iMEI [1] IMEI, + iMEISV [2] IMEISV +} + IMEI ::= OCTET STRING (SIZE(8)) -- format as per 3GPP TS 09.02 [8] -- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even -- if the checksum or software version digits are different or not present. +IMEISV ::= NumericString (SIZE(16)) + IMSI ::= OCTET STRING (SIZE(3..8)) -- format as per 3GPP TS 09.02 [8] +NAI ::= UTF8String + -- ====================================== -- Definitions of Message Network element -- ====================================== @@ -2641,7 +2773,7 @@ IPMask ::= SEQUENCE NABillingDetails ::= SEQUENCE { subscriberID [1] NaSubscriberID OPTIONAL, - serviceID [2] UTF8String OPTIONAL, + serviceID [2] UTF8String OPTIONAL, billingAddress [3] ContactDetails OPTIONAL, billingIdentifier [4] BillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, @@ -2654,5 +2786,40 @@ NABillingDetails ::= SEQUENCE -- Details to be defined on a national basis } +SSCMode ::= ENUMERATED +{ + sSCMode1(1), + sSCMode2(2), + sSCMode3MultiPDUSession(3), + sSCMode3Multihome(4), + ... +} + +PLMNID ::= OCTET STRING (SIZE(3)) + +UUID ::= OCTET STRING (SIZE(16)) + +RAT5Type ::= ENUMERATED +{ + nr(1), + eutra(2), + wlan(3), + virtual(4), + ... +} + +AMFID ::= SEQUENCE +{ + aMFRegionID [1] AMFRegionID, + aMFSetID [2] AMFSetID, + aMFPointer [3] AMFPointer +} + +AMFRegionID ::= INTEGER (0..255) + +AMFSetID ::= INTEGER (0..63) + +AMFPointer ::= INTEGER (0..1023) + END -- end of RDMessage diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 19961bd..98b86bf 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,2903 +1,3175 @@ - - - - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.22.1 + + + + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.23.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A country code as per ISO 3166-1 [4] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/102657/portal/RDMessagever20.xsd b/102657/portal/RDMessagever20.xsd deleted file mode 100644 index 19961bd..0000000 --- a/102657/portal/RDMessagever20.xsd +++ /dev/null @@ -1,2903 +0,0 @@ - - - - - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.22.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A country code as per ISO 3166-1 [4] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/102657/portal/RDMessagever20.txt b/102657/portal/RDMessagever21.txt similarity index 87% rename from 102657/portal/RDMessagever20.txt rename to 102657/portal/RDMessagever21.txt index e51ec5f..b7f660b 100644 --- a/102657/portal/RDMessagever20.txt +++ b/102657/portal/RDMessagever21.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version20(20)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version21(21)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version21(21)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -20,7 +20,7 @@ rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version20(20) RetainedDataMessage ::= SEQUENCE { - rdHeaderId [0] OBJECT IDENTIFIER, + rdHeaderId [0] OBJECT IDENTIFIER, retainedDataHeader [1] RetainedDataHeader, retainedDataPayload [2] RetainedDataPayload, retainedDataDigest [3] OCTET STRING OPTIONAL, @@ -57,8 +57,8 @@ RequestFlag ::= UTF8String RequestID ::= SEQUENCE { - countryCode [1] CountryCode, - authorisedOrganisationID [2] AuthorisedOrganisationID, + countryCode [1] CountryCode, + authorisedOrganisationID [2] AuthorisedOrganisationID, requestNumber [3] RequestNumber OPTIONAL, -- all messages except GetStatusMessage and StatusMessage have a request number -- (see clause 6.1.2) @@ -396,6 +396,16 @@ TimeSpan ::= SEQUENCE -- duration in seconds } +File ::= SEQUENCE +{ + mediaType [1] UTF8String, + -- Media type of the file, e.g. image/jpeg, application/pdf + -- Media types (formerly known as MIME types) are assigned and listed by the IANA + content [2] OCTET STRING, + -- Content of the file + ... +} + -- ============================================== -- Definitions for Generic Subscriber Information -- ============================================== @@ -525,14 +535,19 @@ OtherAddress ::= SEQUENCE AuthenticationInfo ::= SEQUENCE { - authenticationType [1] UTF8String OPTIONAL, - authenticationNumber [2] UTF8String OPTIONAL, + authenticationType [1] UTF8String OPTIONAL, + + authenticationNumber [2] UTF8String OPTIONAL, + ..., - issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL, - issuingOrganization [4] UTF8String OPTIONAL, - nationality [5] UTF8String OPTIONAL + issuingCountry [3] UTF8String (SIZE (2)) OPTIONAL, + issuingOrganization [4] UTF8String OPTIONAL, + nationality [5] UTF8String OPTIONAL, + authenticationDocument [6] SEQUENCE OF File OPTIONAL + } + PaymentDetails ::= SEQUENCE { billingMethod [1] BillingMethod OPTIONAL, @@ -637,9 +652,12 @@ ICCIDInfo ::= SEQUENCE -- PUK code associated with the ICCID pUK2 [4] UTF8String OPTIONAL, -- PUK2 code associated with the ICCID - iMSI [5] IMSI OPTIONAL + iMSI [5] IMSI OPTIONAL, + sUPI [6] SUPI OPTIONAL, + gPSI [7] GPSI OPTIONAL } + LoginInfo ::= SEQUENCE { login [1] UTF8String OPTIONAL, @@ -663,41 +681,43 @@ SubscribedTelephonyServices ::= SEQUENCE -- Unique identifier for the service provider timeSpan [3] TimeSpan OPTIONAL, -- Start and end data, if applicable, of the subscription - registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, + registeredNumbers [4] SEQUENCE OF PartyNumber OPTIONAL, -- The set of telephone numbers registered for this service - registeredICCID [5] UTF8String OPTIONAL, + registeredICCID [5] UTF8String OPTIONAL, serviceType [6] TelephonyServiceType OPTIONAL, - installationAddress [7] AddressInformation OPTIONAL, + installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address - connectionDate [8] GeneralizedTime OPTIONAL, + connectionDate [8] GeneralizedTime OPTIONAL, -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, - carrierPreselect [10] BOOLEAN OPTIONAL, + carrierPreselect [10] BOOLEAN OPTIONAL, lineStatus [11] UTF8String OPTIONAL, -- CSP-specific description of current line status, e.g. "Active", "Ceased", etc. ..., - allocatedDeviceIDs [12] SEQUENCE OF TelephonyDeviceID OPTIONAL, + allocatedDeviceIDs [12] SEQUENCE OF TelephonyDeviceID OPTIONAL, pUKCode [13] UTF8String OPTIONAL, pUK2Code [14] UTF8String OPTIONAL, iMEI [15] SEQUENCE OF IMEI OPTIONAL, - nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, + nationalTelephonySubscriptionInfo [16] NationalTelephonySubscriptionInfo OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - paymentDetails [17] PaymentDetails OPTIONAL, - subscriptionType [18] SubscriptionType OPTIONAL, + paymentDetails [17] PaymentDetails OPTIONAL, + subscriptionType [18] SubscriptionType OPTIONAL, -- Describes the nature of the subscription - deliveryAddress [19] AddressInformation OPTIONAL, - resellerAddress [20] AddressInformation OPTIONAL, - otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL, - registeredNumbersInfo [22] SEQUENCE OF PartyNumberInfo OPTIONAL, + deliveryAddress [19] AddressInformation OPTIONAL, + resellerAddress [20] AddressInformation OPTIONAL, + otherAddresses [21] SEQUENCE OF OtherAddress OPTIONAL, + registeredNumbersInfo [22] SEQUENCE OF PartyNumberInfo OPTIONAL, -- information about timespan of the active number and deactivation events - registeredICCIDs [23] SEQUENCE OF ICCIDInfo OPTIONAL, + registeredICCIDs [23] SEQUENCE OF ICCIDInfo OPTIONAL, -- in cases of MultiSIM card contracts - loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL + loginInfos [24] SEQUENCE OF LoginInfo OPTIONAL, -- e.g. login information according a VMS/UMS account + paymentTransactions [25] SEQUENCE OF BillingRecords OPTIONAL } + SubscriptionType ::= ENUMERATED { unknown(0), @@ -749,17 +769,19 @@ BillingRecords ::= SEQUENCE method [5] UTF8String OPTIONAL, -- i.e. credit card, etc. ..., - nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL, + nationalTelephonyBillingRecords [6] NationalTelephonyBillingRecords OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - transactionID [7] UTF8String OPTIONAL, + transactionID [7] UTF8String OPTIONAL, -- Unique reference for this transaction/billing record -- Details to be defined on a national basis - transactionStatus [8] UTF8String OPTIONAL + transactionStatus [8] UTF8String OPTIONAL, -- Status of the transaction (i.e. "declined", "succeeded", etc.) -- Details to be defined on a national bases + copyOfBill [9] SEQUENCE OF File OPTIONAL } + NationalTelephonyBillingRecords ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1232,48 +1254,60 @@ NationalTransmitterDetails ::= SEQUENCE Location ::= SEQUENCE { - e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, + e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, -- Coded in the same format as the ISUP location number (parameter field) - -- of the ISUP (see EN 300 356 [7]) - globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, - -- See MAP format (see 3GPP TS 09.02 [8]) + -- of the ISUP (see ETSI EN 300 356 [7]) + globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, + -- See MAP format (see ETSI TS 100 974 [8]) rAI [3] OCTET STRING (SIZE (6)) OPTIONAL, -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with - -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI (only the + -- ETSI TS 124 008 [9] without the Routing Area Identification IEI (only the -- last 6 octets are used) - gsmLocation [4] GSMLocation OPTIONAL, - umtsLocation [5] UMTSLocation OPTIONAL, + gsmLocation [4] GSMLocation OPTIONAL, + umtsLocation [5] UMTSLocation OPTIONAL, sAI [6] OCTET STRING (SIZE (7)) OPTIONAL, -- format: PLMN-ID 3 octets (no. 1-3) -- LAC 2 octets (no. 4-5) -- SAC 2 octets (no. 6-7) - -- (according to 3GPP TS 25.413 [31]) - oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, + -- (according to ETSI TS 125 413 [31]) + oldRAI [7] OCTET STRING (SIZE (6)) OPTIONAL, -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with - -- 3GPP TS 24.008 [9] without the Routing Area Identification IEI + -- ETSI TS 124 008 [9] without the Routing Area Identification IEI -- (only the last 6 octets are used) - -- This parameter is duplicated from 3GPP TS 33.108 [11] + -- This parameter is duplicated from ETSI TS 133 108 [11] ..., - postalLocation [8] AddressInformation OPTIONAL, - extendedLocation [9] ExtendedLocation OPTIONAL, - userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL, - -- coded according to 3GPP TS 29.274 [32]; the type IE is not included + postalLocation [8] AddressInformation OPTIONAL, + extendedLocation [9] ExtendedLocation OPTIONAL, + userLocationInformation [10] OCTET STRING (SIZE(1..35)) OPTIONAL, + -- coded according to ETSI TS 129 274 [32]; the type IE is not included tAI [11] OCTET STRING (SIZE (6)) OPTIONAL, - -- Only applicable to the CS traffic cases, such as SMS over SGs, according to - -- 3GPP TS 23.272 [35] - eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL, - -- Only applicable to the CS traffic cases, such as SMS over SGs, according to - -- 3GPP TS 23.272 [35] - maritimeTransport [13] MaritimeTransport OPTIONAL, - -- Information about the mobile cells embarked on ships using + eCGI [12] OCTET STRING (SIZE (8)) OPTIONAL, + maritimeTransport [13] MaritimeTransport OPTIONAL, + -- Information about the mobile cells embarked on ships using -- satellite transponder backhaul - airTransport [14] AirTransport OPTIONAL, + airTransport [14] AirTransport OPTIONAL, -- Information about the mobile cells embarked on aircraft using -- satellite transponder backhaul - bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL + bSSID [15] OCTET STRING (SIZE (6)) OPTIONAL, -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID + nCGI [16] NCGI OPTIONAL, + -- format as specified in 3GPP TS 38.413 [42]. + n3gaLocation [17] OCTET STRING (SIZE (4)) OPTIONAL, + -- format as specified in 3GPP TS 29.571 [43] + trackingAreaIdentifier [18] OCTET STRING (SIZE (5..6)) OPTIONAL + -- where: MCC+MNC = 3 octets, TAC (4G) = 2 octets or + -- TAC (5G) = 3 octets and without length indicator +} + +NCGI ::= SEQUENCE +{ + pLMNID [1] PLMNID, + nRCellID [2] NRCellID } +NRCellID ::= BIT STRING (SIZE(36)) +-- TS 38.413 [23], clause 9.3.1.7 + GSMLocation ::= CHOICE { geoCoordinates [1] SEQUENCE @@ -1378,10 +1412,13 @@ MapDatum ::= ENUMERATED iTM(12), -- Irish Transverse Mercator ..., - cH1903(13) + cH1903(13), -- Swiss reference system + cH1903Plus(14) + -- New Swiss reference system } + UMTSLocation ::= CHOICE { point [1] GA-Point, @@ -1653,16 +1690,18 @@ MessageID ::= UTF8String MsgBillingDetails ::= SEQUENCE { subscriberID [1] MsgSubscriberID OPTIONAL, - serviceID [2] UTF8String OPTIONAL, + serviceID [2] UTF8String OPTIONAL, billingAddress [3] ContactDetails OPTIONAL, billingIdentifier [4] MsgBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MsgBillingRecords OPTIONAL, - nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL, + nationalMsgBillingDetails [6] NationalMsgBillingDetails OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - ... + ..., + copyOfBill [7] SEQUENCE OF File OPTIONAL } + NationalMsgBillingDetails ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1761,39 +1800,41 @@ SubscribedMultimediaServices ::= SEQUENCE -- Unique identifier for the service provider timeSpan [3] TimeSpan OPTIONAL, -- Start and end data, if applicable, of the subscription - registeredIdentifiers [4] SEQUENCE OF PartyIdentity OPTIONAL, + registeredIdentifiers [4] SEQUENCE OF PartyIdentity OPTIONAL, -- The set of identifiers registered for this service - registeredICCID [5] UTF8String OPTIONAL, + registeredICCID [5] UTF8String OPTIONAL, serviceType [6] MultimediaServiceType OPTIONAL, - installationAddress [7] AddressInformation OPTIONAL, + installationAddress [7] AddressInformation OPTIONAL, -- installation address, if different from the registered address - connectionDate [8] GeneralizedTime OPTIONAL, + connectionDate [8] GeneralizedTime OPTIONAL, -- Date the subscriber was actually connected -- (May differ from the start of subscription) iMSI [9] IMSI OPTIONAL, - carrierPreselect [10] BOOLEAN OPTIONAL, + carrierPreselect [10] BOOLEAN OPTIONAL, lineStatus [11] UTF8String OPTIONAL, -- CSP-specific description of current line status, -- e.g. "Active", "Ceased", etc. - nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL, + nationalMultimediaServices [12] NationalMultimediaServices OPTIONAL, -- national extension ..., - paymentDetails [13] PaymentDetails OPTIONAL, - subscriptionType [14] SubscriptionType OPTIONAL, + paymentDetails [13] PaymentDetails OPTIONAL, + subscriptionType [14] SubscriptionType OPTIONAL, -- Describes the nature of the subscription - deliveryAddress [15] AddressInformation OPTIONAL, - resellerAddress [16] AddressInformation OPTIONAL, - otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL, - multimediaServiceType [18] UTF8String OPTIONAL, + deliveryAddress [15] AddressInformation OPTIONAL, + resellerAddress [16] AddressInformation OPTIONAL, + otherAddresses [17] SEQUENCE OF OtherAddress OPTIONAL, + multimediaServiceType [18] UTF8String OPTIONAL, -- Service name used by the service provider which may be proprietary - orderTime [19] GeneralizedTime OPTIONAL, - -- Time when the subscribed service was ordered by the user - iMEIs [20] SEQUENCE OF IMEI OPTIONAL, - registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, - privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL, - allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL + orderTime [19] GeneralizedTime OPTIONAL, + -- Time when the subscribed service was ordered by the user + iMEIs [20] SEQUENCE OF IMEI OPTIONAL, + registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, + privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL, + allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL, + paymentTransactions [24] SEQUENCE OF MultimediaBillingRecords OPTIONAL } + MultimediaServiceType ::= ENUMERATED { private(0), @@ -2004,17 +2045,19 @@ PaniHeaderInfo ::= SEQUENCE MultimediaBillingDetails ::= SEQUENCE { subscriberID [1] MultimediaSubscriberID OPTIONAL, - serviceID [2] UTF8String OPTIONAL, + serviceID [2] UTF8String OPTIONAL, billingAddress [3] ContactDetails OPTIONAL, billingIdentifier [4] MultimediaBillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF MultimediaBillingRecords OPTIONAL, - nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, + nationalMultimediaBillingDetails [6] NationalMultimediaBillingDetails OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements ..., - multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL + multimediaBillingAddress [7] MultimediaBillingAddress OPTIONAL, + copyOfBill [8] SEQUENCE OF File OPTIONAL } + MultimediaBillingAddress ::= SEQUENCE { addressSuppliedTime [1] GeneralizedTime OPTIONAL, @@ -2185,38 +2228,42 @@ NASubscriber ::= SEQUENCE NAServiceSubscription ::= SEQUENCE -- Description of the subscription to a Network Access service { - validity [1] TimeSpan OPTIONAL, - naServiceID [2] UTF8String OPTIONAL, + validity [1] TimeSpan OPTIONAL, + naServiceID [2] UTF8String OPTIONAL, -- Identifier for the service, e.g. account plan name. - naProviderID [3] NAProviderID OPTIONAL, + naProviderID [3] NAProviderID OPTIONAL, -- Unique identifier for the provider of the service, e.g. company name - naAuthID [4] NAAuthID OPTIONAL, + naAuthID [4] NAAuthID OPTIONAL, -- Unique identifier for this subscription, e.g. logon name - options [5] UTF8String OPTIONAL, + options [5] UTF8String OPTIONAL, -- Human readable text with restrictions or options to the subscription - installationAddress [6] AddressInformation OPTIONAL, - fixIpAddress [7] IPAddress OPTIONAL, + installationAddress [6] AddressInformation OPTIONAL, + fixIpAddress [7] IPAddress OPTIONAL, -- fix assigned IP address - imsi [8] IMSI OPTIONAL, + imsi [8] IMSI OPTIONAL, ..., - allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL, - naServiceStatus [10] UTF8String OPTIONAL, + allocatedDeviceIDs [9] SEQUENCE OF NADeviceId OPTIONAL, + naServiceStatus [10] UTF8String OPTIONAL, -- CSP-specific description of current service status, e.g. "Active", "Ceased", etc. - registeredICCID [11] UTF8String OPTIONAL, - nationalNASubscription [12] NationalNASubscription OPTIONAL, - paymentDetails [13] PaymentDetails OPTIONAL, - additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL, - subscriptionType [15] SubscriptionType OPTIONAL, + registeredICCID [11] UTF8String OPTIONAL, + nationalNASubscription [12] NationalNASubscription OPTIONAL, + paymentDetails [13] PaymentDetails OPTIONAL, + additionalIPAddresses [14] SEQUENCE OF IPAddressSetOrRangeOrMask OPTIONAL, + subscriptionType [15] SubscriptionType OPTIONAL, -- Describes the nature of the subscription - deliveryAddress [16] AddressInformation OPTIONAL, - resellerAddress [17] AddressInformation OPTIONAL, - otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL, - allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL, + deliveryAddress [16] AddressInformation OPTIONAL, + resellerAddress [17] AddressInformation OPTIONAL, + otherAddresses [18] SEQUENCE OF OtherAddress OPTIONAL, + allocatedDevices [19] SEQUENCE OF NADevice OPTIONAL, -- If present, contains device details for all elements from allocatedDeviceIDs - mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL, - registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL + mSISDNs [20] SEQUENCE OF PartyNumber OPTIONAL, + registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, + paymentTransactions [22] SEQUENCE OF BillingRecords OPTIONAL, + sUPI [23] SUPI OPTIONAL, + gPSI [24] GPSI OPTIONAL } + NationalNASubscription ::= SEQUENCE -- Description of the subscription to a Network Access service { @@ -2231,11 +2278,11 @@ NationalNASubscription ::= SEQUENCE NAServiceUsage ::= SEQUENCE { - naAccessTime [1] GeneralizedTime OPTIONAL, + naAccessTime [1] GeneralizedTime OPTIONAL, -- Time of connection to the NAS naAuthID [2] NAAuthID OPTIONAL, -- Username used to obtain network access - nwAccessType [3] NwAccessType OPTIONAL, + nwAccessType [3] NwAccessType OPTIONAL, -- Type of network access attempted. If not undefined(0), this should be one of the types -- supported by the NAS (identified below by naNwElementID) naStatus [4] ENUMERATED @@ -2253,32 +2300,36 @@ NAServiceUsage ::= SEQUENCE -- Start time and end time (duration) of network access. naDeviceId [6] NADeviceId OPTIONAL, -- Device used to access the service - naNwElementID [7] NANwElementID OPTIONAL, + naNwElementID [7] NANwElementID OPTIONAL, -- Network element (NAS) onto which the naDevice is connected - naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL, + naAssignedAddress [8] SEQUENCE OF NAAssignedAddress OPTIONAL, -- IP address assigned by the network access service. May be fixed or dynamic location [9] Location OPTIONAL, -- Location of the access (for e.g. GPRS handsets) - dialUpInformation [10] DialUpInformation OPTIONAL, - gprsInformation [11] GprsInformation OPTIONAL, + dialUpInformation [10] DialUpInformation OPTIONAL, + gprsInformation [11] GprsInformation OPTIONAL, ..., - octetsDownloaded [12] INTEGER OPTIONAL, - octetsUploaded [13] INTEGER OPTIONAL, + octetsDownloaded [12] INTEGER OPTIONAL, + octetsUploaded [13] INTEGER OPTIONAL, endReason [14] NAEndReason OPTIONAL, - subscriberID [15] NaSubscriberID OPTIONAL, + subscriberID [15] NaSubscriberID OPTIONAL, -- Identifier for a known user of this network access - ePSInformation [16] EPSInformation OPTIONAL, - wifiInformation [17] WifiInformation OPTIONAL, - addressTranslationRecords [18] SEQUENCE OF AddressTranslationRecord OPTIONAL, + ePSInformation [16] EPSInformation OPTIONAL, + wifiInformation [17] WifiInformation OPTIONAL, + addressTranslationRecords [18] SEQUENCE OF AddressTranslationRecord OPTIONAL, -- contains extended information about the NAT or PAT operations carried out within this -- service usage session naDevice [19] NADevice OPTIONAL, -- If present, contains the device details for the device referenced in naDeviceID - additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL + additionalLocations [20] SEQUENCE OF TimedLocation OPTIONAL, -- List of additional locations and optional access time during the network access service -- usage + sNSSAI [21] OCTET STRING (SIZE(4)) OPTIONAL, + notifyUri [22] OCTET STRING (SIZE(3..8)) OPTIONAL, + fiveGSInformation [23] FIVEGSInformation OPTIONAL } + TimedLocation ::= SEQUENCE { location [1] Location, @@ -2476,29 +2527,31 @@ GPRSEvent ::= ENUMERATED EPSInformation ::= SEQUENCE { iMSI [1] IMSI OPTIONAL, - iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, + iMSIUnauthenticatedFlag [2] IMSIUnauthenticatedFlag OPTIONAL, mSISDN [3] PartyNumber OPTIONAL, iMEISV [4] IMEI OPTIONAL, s-GWAddress [5] IPAddress OPTIONAL, p-GWAddress [6] IPAddress OPTIONAL, - p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL, - aPNNetworkID [8] AccessPointNameNI OPTIONAL, + p-GWPLMNIdentifier [7] P-GWPLMN-ID OPTIONAL, + aPNNetworkID [8] AccessPointNameNI OPTIONAL, pDP-PDNType [9] OCTET STRING (SIZE (1))OPTIONAL, - -- PDN/PDP Type number as defined in 3GPP TS 29.274 [32] clause 8.34 - pDP-PDNAddress [10] IPAddress OPTIONAL, + -- PDN/PDP Type number as defined in ETSI TS 129 274 [32] clause 8.34 + pDP-PDNAddress [10] IPAddress OPTIONAL, -- IP address allocated to the PDP context / PDN connection -- i.e. IPv4 address when PDP/PDN Type is IPv4 or IPv6 prefix -- when PDP/PDN Type is IPv6 or IPv4v6. - pDP-PDNAddressExtension [11] IPAddress OPTIONAL, + pDP-PDNAddressExtension [11] IPAddress OPTIONAL, -- IPv4 address of the served IMSI when PDP/PDN type is IPv4v6 - dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL, - dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, - rATType [14] INTEGER (0..255), - -- RAT Type coding according to 3GPP TS 29.274 [32] clause 8.17 + dynamicAddressFlag [12] DynamicAddressFlag OPTIONAL, + dynamicAddressFlagExt [13] DynamicAddressFlagExt OPTIONAL, + rATType [14] INTEGER (0..255) OPTIONAL, + -- RAT Type coding according to ETSI TS 129 274 [32] clause 8.17 + -- NOTE - as of v1.23.1 of the present document, this field has changed to optional ePSEvent [15] EPSEvent OPTIONAL, ... } + IMSIUnauthenticatedFlag ::= BOOLEAN -- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI @@ -2538,6 +2591,61 @@ EPSEvent ::= ENUMERATED ... } +FIVEGSInformation ::= SEQUENCE +{ + sUPI [1] SUPI OPTIONAL, + dNN [2] UTF8String OPTIONAL, + gPSI [3] GPSI OPTIONAL, + pEI [4] PEI OPTIONAL, + pDUSessionID [6] INTEGER (0..255) OPTIONAL, + sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL, + pDUIpv4Address [8] IPAddress OPTIONAL, + pDUIpv6Address [9] IPAddress OPTIONAL, + pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL, + rFSPIndex [11] INTEGER (1..255) OPTIONAL, + applicationId [12] UTF8String OPTIONAL, + applicationServiceProviderIdentity [13] UTF8String OPTIONAL, + serviceId [14] INTEGER OPTIONAL, + chargingId [15] UTF8String OPTIONAL, + pDUType [16] PDUSessionType OPTIONAL, + sSCMode [17] SSCMode OPTIONAL, + vPLMNId [18] PLMNID OPTIONAL, + hPLMNId [19] PLMNID OPTIONAL, + chargingCharacteristics [20] UTF8String OPTIONAL, + chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL, + pDUSessionStartTime [22] GeneralizedTime OPTIONAL, + pDUSessionStopTime [23] GeneralizedTime OPTIONAL, + lowPriorityIndicator [24] BOOLEAN OPTIONAL, + dataOffStatus [25] BOOLEAN OPTIONAL, + diagnostics [26] INTEGER OPTIONAL, + uETimeZone [27] UTF8String OPTIONAL, + uPFAddress [28] IPAddress OPTIONAL, + aMFAddress [29] IPAddress OPTIONAL, + uDMAddress [30] IPAddress OPTIONAL, + sMFAddress [31] IPAddress OPTIONAL, + uPFId [32] UUID OPTIONAL, + aMFIdentifier [33] AMFID OPTIONAL, + uDMIdentifier [34] UUID OPTIONAL, + sMFIdentifier [35] UUID OPTIONAL, + uPFPDNAddress [36] IPAddress OPTIONAL, + uPFPDNAddressExtension [37] IPAddress OPTIONAL, + dynamicAddressFlag [38] BOOLEAN OPTIONAL, + dynamicAddressFlagExt [39] BOOLEAN OPTIONAL, + rAT5Type [40] RAT5Type OPTIONAL, + flowQosInfo [41] OCTET STRING OPTIONAL, + serviceID [42] INTEGER OPTIONAL + +} + +PDUSessionType ::= ENUMERATED +{ + iPv4(1), + iPv6(2), + iPv4v6(3), + unstructured(4), + ethernet(5) +} + -- ==================================== -- Definitions of Network Access Device -- ==================================== @@ -2559,14 +2667,38 @@ NADevice ::= SEQUENCE subscriberID [7] NaSubscriberID OPTIONAL } +SUPI ::= CHOICE +{ + iMSI [1] IMSI, + nAI [2] NAI, + ... +} + +GPSI ::= CHOICE +{ + mSISDN [1] PartyNumber, + nAI [2] NAI, + ... +} + +PEI ::= CHOICE +{ + iMEI [1] IMEI, + iMEISV [2] IMEISV +} + IMEI ::= OCTET STRING (SIZE(8)) -- format as per 3GPP TS 09.02 [8] -- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even -- if the checksum or software version digits are different or not present. +IMEISV ::= NumericString (SIZE(16)) + IMSI ::= OCTET STRING (SIZE(3..8)) -- format as per 3GPP TS 09.02 [8] +NAI ::= UTF8String + -- ====================================== -- Definitions of Message Network element -- ====================================== @@ -2641,7 +2773,7 @@ IPMask ::= SEQUENCE NABillingDetails ::= SEQUENCE { subscriberID [1] NaSubscriberID OPTIONAL, - serviceID [2] UTF8String OPTIONAL, + serviceID [2] UTF8String OPTIONAL, billingAddress [3] ContactDetails OPTIONAL, billingIdentifier [4] BillingIdentifier OPTIONAL, billingRecords [5] SEQUENCE OF BillingRecords OPTIONAL, @@ -2654,5 +2786,40 @@ NABillingDetails ::= SEQUENCE -- Details to be defined on a national basis } +SSCMode ::= ENUMERATED +{ + sSCMode1(1), + sSCMode2(2), + sSCMode3MultiPDUSession(3), + sSCMode3Multihome(4), + ... +} + +PLMNID ::= OCTET STRING (SIZE(3)) + +UUID ::= OCTET STRING (SIZE(16)) + +RAT5Type ::= ENUMERATED +{ + nr(1), + eutra(2), + wlan(3), + virtual(4), + ... +} + +AMFID ::= SEQUENCE +{ + aMFRegionID [1] AMFRegionID, + aMFSetID [2] AMFSetID, + aMFPointer [3] AMFPointer +} + +AMFRegionID ::= INTEGER (0..255) + +AMFSetID ::= INTEGER (0..63) + +AMFPointer ::= INTEGER (0..1023) + END -- end of RDMessage diff --git a/102657/portal/RDMessagever21.xsd b/102657/portal/RDMessagever21.xsd new file mode 100644 index 0000000..98b86bf --- /dev/null +++ b/102657/portal/RDMessagever21.xsd @@ -0,0 +1,3175 @@ + + + + + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.23.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A country code as per ISO 3166-1 [4] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From ede019ffdf03196d67d6310911e170cab17682a0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:35:15 +0100 Subject: [PATCH 136/208] TS 102 232-5 v3.11.1 (2019-08-02) agreed at LI#51 (Texel, 2019-06-11) --- 102232-5/IPMultimediaPDU.asn | 342 +++++++++++----------- 102232-5/portal/IPMultimediaPDU,ver11.txt | 168 ----------- 102232-5/portal/IPMultimediaPDU,ver12.txt | 174 +++++++++++ 3 files changed, 348 insertions(+), 336 deletions(-) delete mode 100644 102232-5/portal/IPMultimediaPDU,ver11.txt create mode 100644 102232-5/portal/IPMultimediaPDU,ver12.txt diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index b1e9abf..67e9fbe 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,168 +1,174 @@ --- ==================================== --- Description of the IP Multimedia PDU --- ==================================== - - -IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version11(11)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - -- from ETSI TS 102 232-1 [2] - IPAddress, - Location - FROM LI-PS-PDU - {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; - - - --- ============================ --- Object Identifier Definition --- ============================ - -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version11(11) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version11(11) cC(2)} - -- both definitions relative to: - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - --- ===================================== --- IP Multimedia Communications Contents --- ===================================== - -IPMMCC ::= SEQUENCE -{ - iPMMCCObjId [0] RELATIVE-OID, - mMCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets - -- Each IPMMCC shall contain one intercepted packet - -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter - -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. - ..., - frameType [2] FrameType OPTIONAL, - -- The availability of header information shall be signalled with the frameType parameter - -- The module is defined as OPTIONAL because of backwards compatibility reasons - -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 - streamIdentifier [3] OCTET STRING OPTIONAL, - -- Used to identify the media stream within the current CIN, typically in case of - -- multiple media streams communications - -- May be used to correlate each media stream with the relevant SDP media description of IRI - -- May contain c= and m= lines extracts for instance - mMCCprotocol [4] MMCCprotocol OPTIONAL - -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) - -- Absence means mMCCContents contains RTP/RTCP packets -} - -FrameType ::= ENUMERATED -{ - ipFrame(0), - -- All headers are present - udpFrame(1), - -- IP header is missing - rtpFrame(2), - -- UDP and IP headers are missing - audioFrame(3), - -- All headers are missing - ..., - tcpFrame(4), - -- IP header is missing - artificialRtpFrame(5), - -- UDP and IP headers are missing, artificial RTP frame has been added - udptlFrame(6), - -- UDP and IP headers are missing - msrpFrame(7) - -- TCP and IP headers are missing - -} - -MMCCprotocol ::= ENUMERATED -{ - rTP(0), - -- mMCCContents parameter contains RTP/RTCP packets - mSRP(1), - -- mMCCContents parameter contains MSRP packets - ..., - uDPTL(2) - -- mMCCContents parameter contains UDPTL packets -} - --- ======================================================== --- Intercept-related information for IP Multimedia sessions --- ======================================================== - -IPMMIRI ::= SEQUENCE -{ - iPMMIRIObjId [0] RELATIVE-OID, - iPMMIRIContents [1] IPIRIContents, - ..., - targetLocation [2] Location OPTIONAL, - -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 - additionalSignalling [3] SEQUENCE OF AdditionalSignalling OPTIONAL - -- The use of this parameter is defined in clause 5.2.5 -} - -IPIRIContents ::= CHOICE -{ - originalIPMMMessage [0] OCTET STRING, - -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers - sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address - h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address - ..., - nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, - -- This parameter is used according to national regulations - -- This parameter shall be delivered as an IRI-Report-record - xCAPMessage [4] OCTET STRING - -- Copy of the XCAP message including all HTTP headers and contents -} - -SIPMessage ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - sIPContent [2] OCTET STRING, - ... -} - -H323Message ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - h323Content [2] H323MessageContent, - ... -} - -H323MessageContent ::= CHOICE -{ - h225CSMessageContent [0] OCTET STRING, - h225RASMessageContent [1] OCTET STRING, - h245MessageContent [2] OCTET STRING, - genericMessageContent [3] OCTET STRING, - ... -} - -NationalIPMMIRIParameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [16], - -- the country to which the parameters inserted after the extension marker apply. - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...). - -- It is recommended that "version parameter" and "vendor identification parameter" are - -- included in the national parameters definition. Vendor identifications can be - -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended - -- to avoid using tags from 240 to 255 in a formal type definition. -} - -AdditionalSignalling ::= CHOICE -{ - sipHeaderLine [0] OCTET STRING, - -- A SIP header line, eg: "Contact: tel:+123456789". - ... -} - -END -- end of IPMultimediaPDU +-- ==================================== +-- Description of the IP Multimedia PDU +-- ==================================== + + +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS +-- from ETSI TS 102 232-1 [2] + IPAddress, + Location + FROM LI-PS-PDU + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)}; + + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) cC(2)} + -- both definitions relative to: + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- ===================================== +-- IP Multimedia Communications Contents +-- ===================================== + +IPMMCC ::= SEQUENCE +{ + iPMMCCObjId [0] RELATIVE-OID, + mMCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets + -- Each IPMMCC shall contain one intercepted packet + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. + ..., + frameType [2] FrameType OPTIONAL, + -- The availability of header information shall be signalled with the frameType parameter + -- The module is defined as OPTIONAL because of backwards compatibility reasons + -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 + streamIdentifier [3] OCTET STRING OPTIONAL, + -- Used to identify the media stream within the current CIN, typically in case of + -- multiple media streams communications + -- May be used to correlate each media stream with the relevant SDP media description of IRI + -- May contain c= and m= lines extracts for instance + mMCCprotocol [4] MMCCprotocol OPTIONAL + -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) + -- Absence means mMCCContents contains RTP/RTCP packets +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ..., + tcpFrame(4), + -- IP header is missing + artificialRtpFrame(5), + -- UDP and IP headers are missing; artificial RTP frame has been added + udptlFrame(6), + -- UDP and IP headers are missing + msrpFrame(7) + -- TCP and IP headers are missing + +} + +MMCCprotocol ::= ENUMERATED +{ + rTP(0), + -- mMCCContents parameter contains RTP/RTCP packets + mSRP(1), + -- mMCCContents parameter contains MSRP packets + ..., + uDPTL(2) + -- mMCCContents parameter contains UDPTL packets +} + +-- ======================================================== +-- Intercept-related information for IP Multimedia sessions +-- ======================================================== + +IPMMIRI ::= SEQUENCE +{ + iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIContents [1] IPIRIContents, + ..., + targetLocation [2] Location OPTIONAL, + -- This common parameter is defined in ETSI TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 + additionalSignalling [3] SEQUENCE OF AdditionalSignalling OPTIONAL + -- The use of this parameter is defined in clause 5.2.5 +} + +IPIRIContents ::= CHOICE +{ + originalIPMMMessage [0] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + sIPMessage [1] SIPMessage, + -- Copy of the SIP content and the source and destination IP address + h323Message [2] H323Message, + -- Copy of the H.323 content and the source and destination IP address + ..., + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, + -- This parameter is used according to national regulations + -- This parameter shall be delivered as an IRI-Report-record + xCAPMessage [4] OCTET STRING, + -- Copy of the XCAP message including all HTTP headers and contents + iRIOnlyOriginalIPMMMessage [5] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + -- see clause 5.2.6. + iRIOnlySIPMessage [6] SIPMessage + -- Copy of the SIP content and the source and destination IP address + -- see clause 5.2.6. +} + +SIPMessage ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + sIPContent [2] OCTET STRING, + ... +} + +H323Message ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + h323Content [2] H323MessageContent, + ... +} + +H323MessageContent ::= CHOICE +{ + h225CSMessageContent [0] OCTET STRING, + h225RASMessageContent [1] OCTET STRING, + h245MessageContent [2] OCTET STRING, + genericMessageContent [3] OCTET STRING, + ... +} + +NationalIPMMIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [20], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site. Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} + +AdditionalSignalling ::= CHOICE +{ + sipHeaderLine [0] OCTET STRING, + -- A SIP header line, eg: "Contact: tel:+123456789". + ... +} + +END -- end of IPMultimediaPDU diff --git a/102232-5/portal/IPMultimediaPDU,ver11.txt b/102232-5/portal/IPMultimediaPDU,ver11.txt deleted file mode 100644 index b1e9abf..0000000 --- a/102232-5/portal/IPMultimediaPDU,ver11.txt +++ /dev/null @@ -1,168 +0,0 @@ --- ==================================== --- Description of the IP Multimedia PDU --- ==================================== - - -IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version11(11)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - -- from ETSI TS 102 232-1 [2] - IPAddress, - Location - FROM LI-PS-PDU - {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; - - - --- ============================ --- Object Identifier Definition --- ============================ - -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version11(11) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version11(11) cC(2)} - -- both definitions relative to: - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - --- ===================================== --- IP Multimedia Communications Contents --- ===================================== - -IPMMCC ::= SEQUENCE -{ - iPMMCCObjId [0] RELATIVE-OID, - mMCCContents [1] OCTET STRING, - -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets - -- Each IPMMCC shall contain one intercepted packet - -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter - -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. - ..., - frameType [2] FrameType OPTIONAL, - -- The availability of header information shall be signalled with the frameType parameter - -- The module is defined as OPTIONAL because of backwards compatibility reasons - -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 - streamIdentifier [3] OCTET STRING OPTIONAL, - -- Used to identify the media stream within the current CIN, typically in case of - -- multiple media streams communications - -- May be used to correlate each media stream with the relevant SDP media description of IRI - -- May contain c= and m= lines extracts for instance - mMCCprotocol [4] MMCCprotocol OPTIONAL - -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) - -- Absence means mMCCContents contains RTP/RTCP packets -} - -FrameType ::= ENUMERATED -{ - ipFrame(0), - -- All headers are present - udpFrame(1), - -- IP header is missing - rtpFrame(2), - -- UDP and IP headers are missing - audioFrame(3), - -- All headers are missing - ..., - tcpFrame(4), - -- IP header is missing - artificialRtpFrame(5), - -- UDP and IP headers are missing, artificial RTP frame has been added - udptlFrame(6), - -- UDP and IP headers are missing - msrpFrame(7) - -- TCP and IP headers are missing - -} - -MMCCprotocol ::= ENUMERATED -{ - rTP(0), - -- mMCCContents parameter contains RTP/RTCP packets - mSRP(1), - -- mMCCContents parameter contains MSRP packets - ..., - uDPTL(2) - -- mMCCContents parameter contains UDPTL packets -} - --- ======================================================== --- Intercept-related information for IP Multimedia sessions --- ======================================================== - -IPMMIRI ::= SEQUENCE -{ - iPMMIRIObjId [0] RELATIVE-OID, - iPMMIRIContents [1] IPIRIContents, - ..., - targetLocation [2] Location OPTIONAL, - -- This common parameter is defined in TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 - additionalSignalling [3] SEQUENCE OF AdditionalSignalling OPTIONAL - -- The use of this parameter is defined in clause 5.2.5 -} - -IPIRIContents ::= CHOICE -{ - originalIPMMMessage [0] OCTET STRING, - -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers - sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address - h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address - ..., - nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, - -- This parameter is used according to national regulations - -- This parameter shall be delivered as an IRI-Report-record - xCAPMessage [4] OCTET STRING - -- Copy of the XCAP message including all HTTP headers and contents -} - -SIPMessage ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - sIPContent [2] OCTET STRING, - ... -} - -H323Message ::= SEQUENCE -{ - iPSourceAddress [0] IPAddress, - iPDestinationAddress [1] IPAddress, - h323Content [2] H323MessageContent, - ... -} - -H323MessageContent ::= CHOICE -{ - h225CSMessageContent [0] OCTET STRING, - h225RASMessageContent [1] OCTET STRING, - h245MessageContent [2] OCTET STRING, - genericMessageContent [3] OCTET STRING, - ... -} - -NationalIPMMIRIParameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [16], - -- the country to which the parameters inserted after the extension marker apply. - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...). - -- It is recommended that "version parameter" and "vendor identification parameter" are - -- included in the national parameters definition. Vendor identifications can be - -- retrieved from the IANA web site (see Annex E Bibliography). Besides, it is recommended - -- to avoid using tags from 240 to 255 in a formal type definition. -} - -AdditionalSignalling ::= CHOICE -{ - sipHeaderLine [0] OCTET STRING, - -- A SIP header line, eg: "Contact: tel:+123456789". - ... -} - -END -- end of IPMultimediaPDU diff --git a/102232-5/portal/IPMultimediaPDU,ver12.txt b/102232-5/portal/IPMultimediaPDU,ver12.txt new file mode 100644 index 0000000..67e9fbe --- /dev/null +++ b/102232-5/portal/IPMultimediaPDU,ver12.txt @@ -0,0 +1,174 @@ +-- ==================================== +-- Description of the IP Multimedia PDU +-- ==================================== + + +IPMultimediaPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS +-- from ETSI TS 102 232-1 [2] + IPAddress, + Location + FROM LI-PS-PDU + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)}; + + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) cC(2)} + -- both definitions relative to: + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- ===================================== +-- IP Multimedia Communications Contents +-- ===================================== + +IPMMCC ::= SEQUENCE +{ + iPMMCCObjId [0] RELATIVE-OID, + mMCCContents [1] OCTET STRING, + -- Copy of the multimediastream, i.e. all related RTP/RTCP, UDPTL or MSRP packets + -- Each IPMMCC shall contain one intercepted packet + -- Protocol of the multimedia packets is indicated by means of mMCCprotocol parameter + -- mMCCContents was called rTPCCContents in earlier versions until v2.3.2. + ..., + frameType [2] FrameType OPTIONAL, + -- The availability of header information shall be signalled with the frameType parameter + -- The module is defined as OPTIONAL because of backwards compatibility reasons + -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 + streamIdentifier [3] OCTET STRING OPTIONAL, + -- Used to identify the media stream within the current CIN, typically in case of + -- multiple media streams communications + -- May be used to correlate each media stream with the relevant SDP media description of IRI + -- May contain c= and m= lines extracts for instance + mMCCprotocol [4] MMCCprotocol OPTIONAL + -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) + -- Absence means mMCCContents contains RTP/RTCP packets +} + +FrameType ::= ENUMERATED +{ + ipFrame(0), + -- All headers are present + udpFrame(1), + -- IP header is missing + rtpFrame(2), + -- UDP and IP headers are missing + audioFrame(3), + -- All headers are missing + ..., + tcpFrame(4), + -- IP header is missing + artificialRtpFrame(5), + -- UDP and IP headers are missing; artificial RTP frame has been added + udptlFrame(6), + -- UDP and IP headers are missing + msrpFrame(7) + -- TCP and IP headers are missing + +} + +MMCCprotocol ::= ENUMERATED +{ + rTP(0), + -- mMCCContents parameter contains RTP/RTCP packets + mSRP(1), + -- mMCCContents parameter contains MSRP packets + ..., + uDPTL(2) + -- mMCCContents parameter contains UDPTL packets +} + +-- ======================================================== +-- Intercept-related information for IP Multimedia sessions +-- ======================================================== + +IPMMIRI ::= SEQUENCE +{ + iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIContents [1] IPIRIContents, + ..., + targetLocation [2] Location OPTIONAL, + -- This common parameter is defined in ETSI TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3 + additionalSignalling [3] SEQUENCE OF AdditionalSignalling OPTIONAL + -- The use of this parameter is defined in clause 5.2.5 +} + +IPIRIContents ::= CHOICE +{ + originalIPMMMessage [0] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + sIPMessage [1] SIPMessage, + -- Copy of the SIP content and the source and destination IP address + h323Message [2] H323Message, + -- Copy of the H.323 content and the source and destination IP address + ..., + nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, + -- This parameter is used according to national regulations + -- This parameter shall be delivered as an IRI-Report-record + xCAPMessage [4] OCTET STRING, + -- Copy of the XCAP message including all HTTP headers and contents + iRIOnlyOriginalIPMMMessage [5] OCTET STRING, + -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers + -- see clause 5.2.6. + iRIOnlySIPMessage [6] SIPMessage + -- Copy of the SIP content and the source and destination IP address + -- see clause 5.2.6. +} + +SIPMessage ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + sIPContent [2] OCTET STRING, + ... +} + +H323Message ::= SEQUENCE +{ + iPSourceAddress [0] IPAddress, + iPDestinationAddress [1] IPAddress, + h323Content [2] H323MessageContent, + ... +} + +H323MessageContent ::= CHOICE +{ + h225CSMessageContent [0] OCTET STRING, + h225RASMessageContent [1] OCTET STRING, + h245MessageContent [2] OCTET STRING, + genericMessageContent [3] OCTET STRING, + ... +} + +NationalIPMMIRIParameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [20], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site. Besides, it is recommended + -- to avoid using tags from 240 to 255 in a formal type definition. +} + +AdditionalSignalling ::= CHOICE +{ + sipHeaderLine [0] OCTET STRING, + -- A SIP header line, eg: "Contact: tel:+123456789". + ... +} + +END -- end of IPMultimediaPDU -- GitLab From 82c539a4b96e9c09e07011a7df2a823a09bb9bd1 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:35:19 +0100 Subject: [PATCH 137/208] TS 102 232-1 v3.20.1 (2019-08-20) agreed at LI#51 (Texel, 2019-06-11) --- 102232-1/LI-PS-PDU.asn | 22 ++++++++++++++----- ...I-PS-PDU,ver29.txt => LI-PS-PDU,ver30.txt} | 22 ++++++++++++++----- 2 files changed, 34 insertions(+), 10 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver29.txt => LI-PS-PDU,ver30.txt} (97%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index b1e38ab..6def9ef 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version29(29)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)} DEFINITIONS IMPLICIT TAGS ::= @@ -195,10 +195,15 @@ IMPORTS -- from ETSI TS 103 462 [45] ILHIPayload FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; - + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} -- This import is only used for the handover between LEMFs. + -- from 3GPP TS 33.128 [46] + LINotificationPayload + FROM TS33128Payloads + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. -- end of IMPORTS @@ -208,7 +213,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version29(29)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version30(30)} -- ==================== -- Top-level definition @@ -249,8 +254,9 @@ Payload ::= CHOICE encryptionContainer [4] EncryptionContainer, threeGPP-HI1-Operation [5] 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 ILHIPayload, -- For typical use cases see ETSI TS 103 462 [45] + hI4Payload [7] SEQUENCE OF HI4Payload } TimeStampQualifier ::= ENUMERATED @@ -262,6 +268,12 @@ TimeStampQualifier ::= ENUMERATED timeOfAggregation(3) } +HI4Payload ::= CHOICE +{ + threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload, + ... +} + -- ==================================== -- Items contained within the PS-Header -- ==================================== diff --git a/102232-1/portal/LI-PS-PDU,ver29.txt b/102232-1/portal/LI-PS-PDU,ver30.txt similarity index 97% rename from 102232-1/portal/LI-PS-PDU,ver29.txt rename to 102232-1/portal/LI-PS-PDU,ver30.txt index b1e38ab..6def9ef 100644 --- a/102232-1/portal/LI-PS-PDU,ver29.txt +++ b/102232-1/portal/LI-PS-PDU,ver30.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version29(29)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)} DEFINITIONS IMPLICIT TAGS ::= @@ -195,10 +195,15 @@ IMPORTS -- from ETSI TS 103 462 [45] ILHIPayload FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)}; - + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} -- This import is only used for the handover between LEMFs. + -- from 3GPP TS 33.128 [46] + LINotificationPayload + FROM TS33128Payloads + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. -- end of IMPORTS @@ -208,7 +213,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version29(29)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version30(30)} -- ==================== -- Top-level definition @@ -249,8 +254,9 @@ Payload ::= CHOICE encryptionContainer [4] EncryptionContainer, threeGPP-HI1-Operation [5] 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 ILHIPayload, -- For typical use cases see ETSI TS 103 462 [45] + hI4Payload [7] SEQUENCE OF HI4Payload } TimeStampQualifier ::= ENUMERATED @@ -262,6 +268,12 @@ TimeStampQualifier ::= ENUMERATED timeOfAggregation(3) } +HI4Payload ::= CHOICE +{ + threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload, + ... +} + -- ==================================== -- Items contained within the PS-Header -- ==================================== -- GitLab From be1c6bba5e6b67b17cf4dbc95d27d238fb904d5b Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:35:26 +0100 Subject: [PATCH 138/208] TS 103 462 v1.2.1 (2019-12-17) agreed at LI#52 (Turin, 2019-10-15) --- 103462/ILHIPDU.asn | 26 ++++++++++++------- .../{ILHIPDU,ver1.txt => ILHIPDUver2.txt} | 26 ++++++++++++------- 2 files changed, 32 insertions(+), 20 deletions(-) rename 103462/portal/{ILHIPDU,ver1.txt => ILHIPDUver2.txt} (77%) diff --git a/103462/ILHIPDU.asn b/103462/ILHIPDU.asn index 5e59e9f..6fa7d83 100644 --- a/103462/ILHIPDU.asn +++ b/103462/ILHIPDU.asn @@ -1,5 +1,5 @@ ILHIPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version2(2)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -31,7 +31,7 @@ IMPORTS iLHIDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0)} -iLHIObjId OBJECT IDENTIFIER ::= { iLHIDomainId ilhiPdu(0) version1(1)} +iLHIObjId OBJECT IDENTIFIER ::= { iLHIDomainId ilhiPdu(0) version2(2)} preagreedObjId OBJECT IDENTIFIER ::= { iLHIDomainId identifiers(1) preagreed(0)} @@ -43,9 +43,9 @@ ILHIPayload ::= SEQUENCE -- This Payload sends additional ILHI specific parameters, the resPayload and -- the originalPayload. { - iLHIObjId [0] OBJECT IDENTIFIER, - resPayload [1] EncapsulationPayload, - mappingInfo [2] MappingInfo OPTIONAL, + iLHIObjId [0] OBJECT IDENTIFIER, + resPayload [1] EncapsulationPayload, + mappingInfo [2] MappingInfo OPTIONAL, -- output from the MapF originalPayload [3] EncapsulationPayload OPTIONAL, ... @@ -76,16 +76,22 @@ TimestampMapping ::= SEQUENCE ILHITimestamp ::= CHOICE { - qualifiedDateTime [1] Common-Parameters.QualifiedDateTime, + qualifiedDateTime [1] Common-Parameters.QualifiedDateTime, qualifiedMicrosecondDateTime [2] Common-Parameters.QualifiedMicrosecondDateTime, - ... + ..., + unqualifiedDateTime [3] NULL + -- The unqualifiedDateTime choice is used if the timestamp is not mappable with + -- the Mapping function because e.g. the timezone information is missing } OriginalTimestamp ::= CHOICE { - timeStamp [1] GeneralizedTime, - microSecondTimeStamp [2] LI-PS-PDU.MicroSecondTimeStamp, - ... + timeStamp [1] GeneralizedTime, + microSecondTimeStamp [2] LI-PS-PDU.MicroSecondTimeStamp, + ..., + otherTimeStamp [3] UTF8String + -- The otherTimeStamp choice contains a value if for any reason the received timestamp + -- is not mappable into the fields timeStamp or the microSecondTimeStamp } LocationMapping ::= SEQUENCE diff --git a/103462/portal/ILHIPDU,ver1.txt b/103462/portal/ILHIPDUver2.txt similarity index 77% rename from 103462/portal/ILHIPDU,ver1.txt rename to 103462/portal/ILHIPDUver2.txt index 5e59e9f..6fa7d83 100644 --- a/103462/portal/ILHIPDU,ver1.txt +++ b/103462/portal/ILHIPDUver2.txt @@ -1,5 +1,5 @@ ILHIPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version2(2)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -31,7 +31,7 @@ IMPORTS iLHIDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0)} -iLHIObjId OBJECT IDENTIFIER ::= { iLHIDomainId ilhiPdu(0) version1(1)} +iLHIObjId OBJECT IDENTIFIER ::= { iLHIDomainId ilhiPdu(0) version2(2)} preagreedObjId OBJECT IDENTIFIER ::= { iLHIDomainId identifiers(1) preagreed(0)} @@ -43,9 +43,9 @@ ILHIPayload ::= SEQUENCE -- This Payload sends additional ILHI specific parameters, the resPayload and -- the originalPayload. { - iLHIObjId [0] OBJECT IDENTIFIER, - resPayload [1] EncapsulationPayload, - mappingInfo [2] MappingInfo OPTIONAL, + iLHIObjId [0] OBJECT IDENTIFIER, + resPayload [1] EncapsulationPayload, + mappingInfo [2] MappingInfo OPTIONAL, -- output from the MapF originalPayload [3] EncapsulationPayload OPTIONAL, ... @@ -76,16 +76,22 @@ TimestampMapping ::= SEQUENCE ILHITimestamp ::= CHOICE { - qualifiedDateTime [1] Common-Parameters.QualifiedDateTime, + qualifiedDateTime [1] Common-Parameters.QualifiedDateTime, qualifiedMicrosecondDateTime [2] Common-Parameters.QualifiedMicrosecondDateTime, - ... + ..., + unqualifiedDateTime [3] NULL + -- The unqualifiedDateTime choice is used if the timestamp is not mappable with + -- the Mapping function because e.g. the timezone information is missing } OriginalTimestamp ::= CHOICE { - timeStamp [1] GeneralizedTime, - microSecondTimeStamp [2] LI-PS-PDU.MicroSecondTimeStamp, - ... + timeStamp [1] GeneralizedTime, + microSecondTimeStamp [2] LI-PS-PDU.MicroSecondTimeStamp, + ..., + otherTimeStamp [3] UTF8String + -- The otherTimeStamp choice contains a value if for any reason the received timestamp + -- is not mappable into the fields timeStamp or the microSecondTimeStamp } LocationMapping ::= SEQUENCE -- GitLab From 5ea2915eac0c7a2cab90b71d8b2999d6e09cbbbe Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:35:30 +0100 Subject: [PATCH 139/208] TS 103 280 v2.4.1 (2019-12-18) agreed at LI#52 (Turin, 2019-10-15) --- 103280/TS_103_280.xsd | 7 ++++++- .../{TS_103_280_v020301.xsd => TS_103_280_v020401.xsd} | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) rename 103280/portal/{TS_103_280_v020301.xsd => TS_103_280_v020401.xsd} (97%) diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index 09ac93a..e5c0bde 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -1,5 +1,5 @@ - + @@ -231,4 +231,9 @@ + + + + + diff --git a/103280/portal/TS_103_280_v020301.xsd b/103280/portal/TS_103_280_v020401.xsd similarity index 97% rename from 103280/portal/TS_103_280_v020301.xsd rename to 103280/portal/TS_103_280_v020401.xsd index 09ac93a..e5c0bde 100644 --- a/103280/portal/TS_103_280_v020301.xsd +++ b/103280/portal/TS_103_280_v020401.xsd @@ -1,5 +1,5 @@ - + @@ -231,4 +231,9 @@ + + + + + -- GitLab From 52c94f0672c2bf3f284d89252383d950a2ab9eba Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:35:34 +0100 Subject: [PATCH 140/208] TS 103 221-1 v1.6.1 (2019-12-04) agreed at LI#52 (Turin, 2019-10-15) --- 103221-1/TS_103_221_01.xsd | 9 +++++---- 103221-1/examples/ActivateTaskRequest_example.xml | 2 +- .../examples/ActivateTaskResponse_example.xml | 2 +- .../examples/CreateDestinationRequest_example.xml | 2 +- .../CreateDestinationResponse_example.xml | 2 +- .../examples/DeactivateTaskRequest_example.xml | 2 +- .../examples/DeactivateTaskResponse_example.xml | 2 +- .../examples/GetAllDetailsRequest_example.xml | 2 +- .../examples/GetAllDetailsResponse_example.xml | 2 +- .../GetDestinationDetailsRequest_example.xml | 2 +- .../GetDestinationDetailsResponse_example.xml | 2 +- 103221-1/examples/GetNEStatusRequest_example.xml | 2 +- 103221-1/examples/GetNEStatusResponse_example.xml | 2 +- .../examples/GetTaskDetailsRequest_example.xml | 2 +- .../examples/GetTaskDetailsResponse_example.xml | 2 +- 103221-1/examples/KeepaliveRequest_example.xml | 2 +- 103221-1/examples/KeepaliveResponse_example.xml | 2 +- .../examples/ListAllDetailsRequest_example.xml | 2 +- .../examples/ListAllDetailsResponse_example.xml | 2 +- 103221-1/examples/ModifyTaskRequest_example.xml | 2 +- 103221-1/examples/ModifyTaskResponse_example.xml | 2 +- 103221-1/examples/PingRequest_example.xml | 2 +- 103221-1/examples/PingResponse_example.xml | 2 +- .../RemoveAllDestinationsRequest_example.xml | 2 +- .../RemoveAllDestinationsResponse_example.xml | 2 +- .../examples/RemoveDestinationRequest_example.xml | 2 +- .../RemoveDestinationResponse_example.xml | 2 +- .../ReportDestinationIssueRequest_example.xml | 2 +- .../ReportDestinationIssueResponse_example.xml | 2 +- .../examples/ReportNEIssueRequest_example.xml | 2 +- .../examples/ReportNEIssueResponse_example.xml | 2 +- .../examples/ReportTaskIssueRequest_example.xml | 2 +- .../examples/ReportTaskIssueResponse_example.xml | 2 +- 103221-1/examples/validate_examples.py | 4 +++- ...1_01_v010501.xsd => TS_103_221_01_v010601.xsd} | 9 +++++---- .../ActivateTaskRequest_example.xml | 2 +- .../ActivateTaskResponse_example.xml | 2 +- .../CreateDestinationRequest_example.xml | 2 +- .../CreateDestinationResponse_example.xml | 2 +- .../DeactivateTaskRequest_example.xml | 2 +- .../DeactivateTaskResponse_example.xml | 2 +- .../GetAllDetailsRequest_example.xml | 2 +- .../GetAllDetailsResponse_example.xml | 2 +- .../GetDestinationDetailsRequest_example.xml | 2 +- .../GetDestinationDetailsResponse_example.xml | 2 +- .../{ => examples}/GetNEStatusRequest_example.xml | 2 +- .../GetNEStatusResponse_example.xml | 2 +- .../GetTaskDetailsRequest_example.xml | 2 +- .../GetTaskDetailsResponse_example.xml | 2 +- .../{ => examples}/KeepaliveRequest_example.xml | 2 +- .../{ => examples}/KeepaliveResponse_example.xml | 2 +- .../ListAllDetailsRequest_example.xml | 2 +- .../ListAllDetailsResponse_example.xml | 2 +- .../{ => examples}/ModifyTaskRequest_example.xml | 2 +- .../{ => examples}/ModifyTaskResponse_example.xml | 2 +- .../portal/{ => examples}/PingRequest_example.xml | 2 +- .../{ => examples}/PingResponse_example.xml | 2 +- .../RemoveAllDestinationsRequest_example.xml | 2 +- .../RemoveAllDestinationsResponse_example.xml | 2 +- .../RemoveDestinationRequest_example.xml | 2 +- .../RemoveDestinationResponse_example.xml | 2 +- .../ReportDestinationIssueRequest_example.xml | 2 +- .../ReportDestinationIssueResponse_example.xml | 2 +- .../ReportNEIssueRequest_example.xml | 2 +- .../ReportNEIssueResponse_example.xml | 2 +- .../ReportTaskIssueRequest_example.xml | 2 +- .../ReportTaskIssueResponse_example.xml | 2 +- 103221-1/portal/examples/desktop.ini | Bin 0 -> 246 bytes 103221-1/portal/validate_examples.py | 4 +++- 69 files changed, 80 insertions(+), 74 deletions(-) rename 103221-1/portal/{TS_103_221_01_v010501.xsd => TS_103_221_01_v010601.xsd} (99%) rename 103221-1/portal/{ => examples}/ActivateTaskRequest_example.xml (96%) rename 103221-1/portal/{ => examples}/ActivateTaskResponse_example.xml (93%) rename 103221-1/portal/{ => examples}/CreateDestinationRequest_example.xml (96%) rename 103221-1/portal/{ => examples}/CreateDestinationResponse_example.xml (93%) rename 103221-1/portal/{ => examples}/DeactivateTaskRequest_example.xml (93%) rename 103221-1/portal/{ => examples}/DeactivateTaskResponse_example.xml (93%) rename 103221-1/portal/{ => examples}/GetAllDetailsRequest_example.xml (93%) rename 103221-1/portal/{ => examples}/GetAllDetailsResponse_example.xml (98%) rename 103221-1/portal/{ => examples}/GetDestinationDetailsRequest_example.xml (93%) rename 103221-1/portal/{ => examples}/GetDestinationDetailsResponse_example.xml (97%) rename 103221-1/portal/{ => examples}/GetNEStatusRequest_example.xml (92%) rename 103221-1/portal/{ => examples}/GetNEStatusResponse_example.xml (94%) rename 103221-1/portal/{ => examples}/GetTaskDetailsRequest_example.xml (93%) rename 103221-1/portal/{ => examples}/GetTaskDetailsResponse_example.xml (96%) rename 103221-1/portal/{ => examples}/KeepaliveRequest_example.xml (92%) rename 103221-1/portal/{ => examples}/KeepaliveResponse_example.xml (93%) rename 103221-1/portal/{ => examples}/ListAllDetailsRequest_example.xml (93%) rename 103221-1/portal/{ => examples}/ListAllDetailsResponse_example.xml (94%) rename 103221-1/portal/{ => examples}/ModifyTaskRequest_example.xml (96%) rename 103221-1/portal/{ => examples}/ModifyTaskResponse_example.xml (93%) rename 103221-1/portal/{ => examples}/PingRequest_example.xml (92%) rename 103221-1/portal/{ => examples}/PingResponse_example.xml (93%) rename 103221-1/portal/{ => examples}/RemoveAllDestinationsRequest_example.xml (93%) rename 103221-1/portal/{ => examples}/RemoveAllDestinationsResponse_example.xml (93%) rename 103221-1/portal/{ => examples}/RemoveDestinationRequest_example.xml (93%) rename 103221-1/portal/{ => examples}/RemoveDestinationResponse_example.xml (93%) rename 103221-1/portal/{ => examples}/ReportDestinationIssueRequest_example.xml (95%) rename 103221-1/portal/{ => examples}/ReportDestinationIssueResponse_example.xml (93%) rename 103221-1/portal/{ => examples}/ReportNEIssueRequest_example.xml (94%) rename 103221-1/portal/{ => examples}/ReportNEIssueResponse_example.xml (93%) rename 103221-1/portal/{ => examples}/ReportTaskIssueRequest_example.xml (94%) rename 103221-1/portal/{ => examples}/ReportTaskIssueResponse_example.xml (93%) create mode 100644 103221-1/portal/examples/desktop.ini diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index cb1ebf0..73a0380 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,5 +1,5 @@ - + @@ -58,7 +58,7 @@ - + @@ -130,6 +130,7 @@ + @@ -230,7 +231,7 @@ - + @@ -258,7 +259,7 @@ - + diff --git a/103221-1/examples/ActivateTaskRequest_example.xml b/103221-1/examples/ActivateTaskRequest_example.xml index 76f510b..42df4fd 100644 --- a/103221-1/examples/ActivateTaskRequest_example.xml +++ b/103221-1/examples/ActivateTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.5.1 + v1.6.1 3741800e-971b-4aa9-85f4-466d2b1adc7f 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/ActivateTaskResponse_example.xml b/103221-1/examples/ActivateTaskResponse_example.xml index 9a04c2a..38d9805 100644 --- a/103221-1/examples/ActivateTaskResponse_example.xml +++ b/103221-1/examples/ActivateTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.401571Z - v1.5.1 + v1.6.1 3741800e-971b-4aa9-85f4-466d2b1adc7f AcknowledgedAndCompleted diff --git a/103221-1/examples/CreateDestinationRequest_example.xml b/103221-1/examples/CreateDestinationRequest_example.xml index 89b1a37..6203866 100644 --- a/103221-1/examples/CreateDestinationRequest_example.xml +++ b/103221-1/examples/CreateDestinationRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.446605Z - v1.5.1 + v1.6.1 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/examples/CreateDestinationResponse_example.xml b/103221-1/examples/CreateDestinationResponse_example.xml index 8eae1de..b16339c 100644 --- a/103221-1/examples/CreateDestinationResponse_example.xml +++ b/103221-1/examples/CreateDestinationResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.446605Z - v1.5.1 + v1.6.1 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 AcknowledgedAndCompleted diff --git a/103221-1/examples/DeactivateTaskRequest_example.xml b/103221-1/examples/DeactivateTaskRequest_example.xml index 10797cf..38be7e4 100644 --- a/103221-1/examples/DeactivateTaskRequest_example.xml +++ b/103221-1/examples/DeactivateTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.429594Z - v1.5.1 + v1.6.1 3da0df97-7bd5-4413-936d-74bebd7512fe 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/DeactivateTaskResponse_example.xml b/103221-1/examples/DeactivateTaskResponse_example.xml index c34ec56..82bbff8 100644 --- a/103221-1/examples/DeactivateTaskResponse_example.xml +++ b/103221-1/examples/DeactivateTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.430594Z - v1.5.1 + v1.6.1 3da0df97-7bd5-4413-936d-74bebd7512fe AcknowledgedAndCompleted diff --git a/103221-1/examples/GetAllDetailsRequest_example.xml b/103221-1/examples/GetAllDetailsRequest_example.xml index cdbb8ee..31e8e73 100644 --- a/103221-1/examples/GetAllDetailsRequest_example.xml +++ b/103221-1/examples/GetAllDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.496243Z - v1.5.1 + v1.6.1 bfd0c982-b7d6-4a8e-80a0-89dab964aafd diff --git a/103221-1/examples/GetAllDetailsResponse_example.xml b/103221-1/examples/GetAllDetailsResponse_example.xml index 287296e..5bb7998 100644 --- a/103221-1/examples/GetAllDetailsResponse_example.xml +++ b/103221-1/examples/GetAllDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.496743Z - v1.5.1 + v1.6.1 bfd0c982-b7d6-4a8e-80a0-89dab964aafd OK diff --git a/103221-1/examples/GetDestinationDetailsRequest_example.xml b/103221-1/examples/GetDestinationDetailsRequest_example.xml index bc1ffa7..7719ac5 100644 --- a/103221-1/examples/GetDestinationDetailsRequest_example.xml +++ b/103221-1/examples/GetDestinationDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.462616Z - v1.5.1 + v1.6.1 7de5709c-8269-417f-a123-7087d3971f8c b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/examples/GetDestinationDetailsResponse_example.xml b/103221-1/examples/GetDestinationDetailsResponse_example.xml index bbd6b9c..aa0de43 100644 --- a/103221-1/examples/GetDestinationDetailsResponse_example.xml +++ b/103221-1/examples/GetDestinationDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.462616Z - v1.5.1 + v1.6.1 7de5709c-8269-417f-a123-7087d3971f8c diff --git a/103221-1/examples/GetNEStatusRequest_example.xml b/103221-1/examples/GetNEStatusRequest_example.xml index 29c15b6..807ec7e 100644 --- a/103221-1/examples/GetNEStatusRequest_example.xml +++ b/103221-1/examples/GetNEStatusRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.487158Z - v1.5.1 + v1.6.1 93d571cb-3793-4385-8b59-2c14097ed743 diff --git a/103221-1/examples/GetNEStatusResponse_example.xml b/103221-1/examples/GetNEStatusResponse_example.xml index ba19ff3..ade1b67 100644 --- a/103221-1/examples/GetNEStatusResponse_example.xml +++ b/103221-1/examples/GetNEStatusResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.488659Z - v1.5.1 + v1.6.1 93d571cb-3793-4385-8b59-2c14097ed743 OK diff --git a/103221-1/examples/GetTaskDetailsRequest_example.xml b/103221-1/examples/GetTaskDetailsRequest_example.xml index 491c90e..ec9d12b 100644 --- a/103221-1/examples/GetTaskDetailsRequest_example.xml +++ b/103221-1/examples/GetTaskDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.418584Z - v1.5.1 + v1.6.1 609dcabd-5ab1-4c95-9681-a24681f105ac 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/GetTaskDetailsResponse_example.xml b/103221-1/examples/GetTaskDetailsResponse_example.xml index 5115b76..63a66f5 100644 --- a/103221-1/examples/GetTaskDetailsResponse_example.xml +++ b/103221-1/examples/GetTaskDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.420587Z - v1.5.1 + v1.6.1 609dcabd-5ab1-4c95-9681-a24681f105ac diff --git a/103221-1/examples/KeepaliveRequest_example.xml b/103221-1/examples/KeepaliveRequest_example.xml index 330e8db..47650f1 100644 --- a/103221-1/examples/KeepaliveRequest_example.xml +++ b/103221-1/examples/KeepaliveRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.541784Z - v1.5.1 + v1.6.1 6420aa0f-e5e6-4a32-9dff-15b836589257 diff --git a/103221-1/examples/KeepaliveResponse_example.xml b/103221-1/examples/KeepaliveResponse_example.xml index 923bbaa..995fed3 100644 --- a/103221-1/examples/KeepaliveResponse_example.xml +++ b/103221-1/examples/KeepaliveResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.542783Z - v1.5.1 + v1.6.1 6420aa0f-e5e6-4a32-9dff-15b836589257 AcknowledgedAndCompleted diff --git a/103221-1/examples/ListAllDetailsRequest_example.xml b/103221-1/examples/ListAllDetailsRequest_example.xml index b3f70b3..82c7e8d 100644 --- a/103221-1/examples/ListAllDetailsRequest_example.xml +++ b/103221-1/examples/ListAllDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.508330Z - v1.5.1 + v1.6.1 09529160-2e44-49c6-bf54-204ca5edcfab diff --git a/103221-1/examples/ListAllDetailsResponse_example.xml b/103221-1/examples/ListAllDetailsResponse_example.xml index d762e08..e5e9096 100644 --- a/103221-1/examples/ListAllDetailsResponse_example.xml +++ b/103221-1/examples/ListAllDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.508330Z - v1.5.1 + v1.6.1 09529160-2e44-49c6-bf54-204ca5edcfab 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/ModifyTaskRequest_example.xml b/103221-1/examples/ModifyTaskRequest_example.xml index bb48bac..3aa287f 100644 --- a/103221-1/examples/ModifyTaskRequest_example.xml +++ b/103221-1/examples/ModifyTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.411587Z - v1.5.1 + v1.6.1 fcfc97de-1c77-413d-9925-d1630acbf763 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/ModifyTaskResponse_example.xml b/103221-1/examples/ModifyTaskResponse_example.xml index adfa3b5..35a9696 100644 --- a/103221-1/examples/ModifyTaskResponse_example.xml +++ b/103221-1/examples/ModifyTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.411587Z - v1.5.1 + v1.6.1 fcfc97de-1c77-413d-9925-d1630acbf763 AcknowledgedAndCompleted diff --git a/103221-1/examples/PingRequest_example.xml b/103221-1/examples/PingRequest_example.xml index d9687b6..5eda3b5 100644 --- a/103221-1/examples/PingRequest_example.xml +++ b/103221-1/examples/PingRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.547786Z - v1.5.1 + v1.6.1 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 diff --git a/103221-1/examples/PingResponse_example.xml b/103221-1/examples/PingResponse_example.xml index 9e4dadb..7a916eb 100644 --- a/103221-1/examples/PingResponse_example.xml +++ b/103221-1/examples/PingResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.547786Z - v1.5.1 + v1.6.1 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 AcknowledgedAndCompleted diff --git a/103221-1/examples/RemoveAllDestinationsRequest_example.xml b/103221-1/examples/RemoveAllDestinationsRequest_example.xml index 6b27365..8971c0f 100644 --- a/103221-1/examples/RemoveAllDestinationsRequest_example.xml +++ b/103221-1/examples/RemoveAllDestinationsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.480627Z - v1.5.1 + v1.6.1 88611050-d8e2-4ada-96fc-626b5dbd9cdf diff --git a/103221-1/examples/RemoveAllDestinationsResponse_example.xml b/103221-1/examples/RemoveAllDestinationsResponse_example.xml index a057bc2..a9fb41f 100644 --- a/103221-1/examples/RemoveAllDestinationsResponse_example.xml +++ b/103221-1/examples/RemoveAllDestinationsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.481629Z - v1.5.1 + v1.6.1 88611050-d8e2-4ada-96fc-626b5dbd9cdf AcknowledgedAndCompleted diff --git a/103221-1/examples/RemoveDestinationRequest_example.xml b/103221-1/examples/RemoveDestinationRequest_example.xml index a5d3ce1..655195f 100644 --- a/103221-1/examples/RemoveDestinationRequest_example.xml +++ b/103221-1/examples/RemoveDestinationRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.473630Z - v1.5.1 + v1.6.1 8c229735-9acf-43ed-8d72-71602625b349 b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/examples/RemoveDestinationResponse_example.xml b/103221-1/examples/RemoveDestinationResponse_example.xml index ec910e3..81d74ca 100644 --- a/103221-1/examples/RemoveDestinationResponse_example.xml +++ b/103221-1/examples/RemoveDestinationResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.474625Z - v1.5.1 + v1.6.1 8c229735-9acf-43ed-8d72-71602625b349 AcknowledgedAndCompleted diff --git a/103221-1/examples/ReportDestinationIssueRequest_example.xml b/103221-1/examples/ReportDestinationIssueRequest_example.xml index 0f33e2b..3b8418c 100644 --- a/103221-1/examples/ReportDestinationIssueRequest_example.xml +++ b/103221-1/examples/ReportDestinationIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.526329Z - v1.5.1 + v1.6.1 7e3ff959-55b0-47bd-a417-0d0383252150 b0ce308c-aa17-42bd-a27b-287bcb5b3468 NonTerminatingFault diff --git a/103221-1/examples/ReportDestinationIssueResponse_example.xml b/103221-1/examples/ReportDestinationIssueResponse_example.xml index 44f3381..ec35dfb 100644 --- a/103221-1/examples/ReportDestinationIssueResponse_example.xml +++ b/103221-1/examples/ReportDestinationIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.526329Z - v1.5.1 + v1.6.1 7e3ff959-55b0-47bd-a417-0d0383252150 AcknowledgedAndCompleted diff --git a/103221-1/examples/ReportNEIssueRequest_example.xml b/103221-1/examples/ReportNEIssueRequest_example.xml index b06c969..5df53cb 100644 --- a/103221-1/examples/ReportNEIssueRequest_example.xml +++ b/103221-1/examples/ReportNEIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.531784Z - v1.5.1 + v1.6.1 c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b Warning Example NE issue diff --git a/103221-1/examples/ReportNEIssueResponse_example.xml b/103221-1/examples/ReportNEIssueResponse_example.xml index ab2a6b8..d18e281 100644 --- a/103221-1/examples/ReportNEIssueResponse_example.xml +++ b/103221-1/examples/ReportNEIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.531784Z - v1.5.1 + v1.6.1 c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b AcknowledgedAndCompleted diff --git a/103221-1/examples/ReportTaskIssueRequest_example.xml b/103221-1/examples/ReportTaskIssueRequest_example.xml index ddbe803..162bd25 100644 --- a/103221-1/examples/ReportTaskIssueRequest_example.xml +++ b/103221-1/examples/ReportTaskIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.516321Z - v1.5.1 + v1.6.1 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 29f28e1c-f230-486a-a860-f5a784ab9172 NonTerminatingFault diff --git a/103221-1/examples/ReportTaskIssueResponse_example.xml b/103221-1/examples/ReportTaskIssueResponse_example.xml index eac2979..a46017f 100644 --- a/103221-1/examples/ReportTaskIssueResponse_example.xml +++ b/103221-1/examples/ReportTaskIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.517323Z - v1.5.1 + v1.6.1 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 AcknowledgedAndCompleted diff --git a/103221-1/examples/validate_examples.py b/103221-1/examples/validate_examples.py index 0faa18a..a22c986 100644 --- a/103221-1/examples/validate_examples.py +++ b/103221-1/examples/validate_examples.py @@ -1,5 +1,6 @@ import glob import sys +from pathlib import Path XS = 'http://www.w3.org/2001/XMLSchema' @@ -46,7 +47,8 @@ def load_schema(xsd): imports = xsd_doc.xpath('//*/xs:import', namespaces={'xs': XS}) for xsd_import in imports: - xsd_import.attrib['schemaLocation'] = common_xsd[0] + xsd_import.attrib['schemaLocation'] = str(Path(common_xsd[0])) + print (xsd_import.attrib) # Load TS 103 221-1 XSD as a schema diff --git a/103221-1/portal/TS_103_221_01_v010501.xsd b/103221-1/portal/TS_103_221_01_v010601.xsd similarity index 99% rename from 103221-1/portal/TS_103_221_01_v010501.xsd rename to 103221-1/portal/TS_103_221_01_v010601.xsd index cb1ebf0..73a0380 100644 --- a/103221-1/portal/TS_103_221_01_v010501.xsd +++ b/103221-1/portal/TS_103_221_01_v010601.xsd @@ -1,5 +1,5 @@ - + @@ -58,7 +58,7 @@ - + @@ -130,6 +130,7 @@ + @@ -230,7 +231,7 @@ - + @@ -258,7 +259,7 @@ - + diff --git a/103221-1/portal/ActivateTaskRequest_example.xml b/103221-1/portal/examples/ActivateTaskRequest_example.xml similarity index 96% rename from 103221-1/portal/ActivateTaskRequest_example.xml rename to 103221-1/portal/examples/ActivateTaskRequest_example.xml index 76f510b..42df4fd 100644 --- a/103221-1/portal/ActivateTaskRequest_example.xml +++ b/103221-1/portal/examples/ActivateTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.5.1 + v1.6.1 3741800e-971b-4aa9-85f4-466d2b1adc7f 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/portal/ActivateTaskResponse_example.xml b/103221-1/portal/examples/ActivateTaskResponse_example.xml similarity index 93% rename from 103221-1/portal/ActivateTaskResponse_example.xml rename to 103221-1/portal/examples/ActivateTaskResponse_example.xml index 9a04c2a..38d9805 100644 --- a/103221-1/portal/ActivateTaskResponse_example.xml +++ b/103221-1/portal/examples/ActivateTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.401571Z - v1.5.1 + v1.6.1 3741800e-971b-4aa9-85f4-466d2b1adc7f AcknowledgedAndCompleted diff --git a/103221-1/portal/CreateDestinationRequest_example.xml b/103221-1/portal/examples/CreateDestinationRequest_example.xml similarity index 96% rename from 103221-1/portal/CreateDestinationRequest_example.xml rename to 103221-1/portal/examples/CreateDestinationRequest_example.xml index 89b1a37..6203866 100644 --- a/103221-1/portal/CreateDestinationRequest_example.xml +++ b/103221-1/portal/examples/CreateDestinationRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.446605Z - v1.5.1 + v1.6.1 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/portal/CreateDestinationResponse_example.xml b/103221-1/portal/examples/CreateDestinationResponse_example.xml similarity index 93% rename from 103221-1/portal/CreateDestinationResponse_example.xml rename to 103221-1/portal/examples/CreateDestinationResponse_example.xml index 8eae1de..b16339c 100644 --- a/103221-1/portal/CreateDestinationResponse_example.xml +++ b/103221-1/portal/examples/CreateDestinationResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.446605Z - v1.5.1 + v1.6.1 8e8ca539-e4dd-41f3-b1cb-acc2a5edece0 AcknowledgedAndCompleted diff --git a/103221-1/portal/DeactivateTaskRequest_example.xml b/103221-1/portal/examples/DeactivateTaskRequest_example.xml similarity index 93% rename from 103221-1/portal/DeactivateTaskRequest_example.xml rename to 103221-1/portal/examples/DeactivateTaskRequest_example.xml index 10797cf..38be7e4 100644 --- a/103221-1/portal/DeactivateTaskRequest_example.xml +++ b/103221-1/portal/examples/DeactivateTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.429594Z - v1.5.1 + v1.6.1 3da0df97-7bd5-4413-936d-74bebd7512fe 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/portal/DeactivateTaskResponse_example.xml b/103221-1/portal/examples/DeactivateTaskResponse_example.xml similarity index 93% rename from 103221-1/portal/DeactivateTaskResponse_example.xml rename to 103221-1/portal/examples/DeactivateTaskResponse_example.xml index c34ec56..82bbff8 100644 --- a/103221-1/portal/DeactivateTaskResponse_example.xml +++ b/103221-1/portal/examples/DeactivateTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.430594Z - v1.5.1 + v1.6.1 3da0df97-7bd5-4413-936d-74bebd7512fe AcknowledgedAndCompleted diff --git a/103221-1/portal/GetAllDetailsRequest_example.xml b/103221-1/portal/examples/GetAllDetailsRequest_example.xml similarity index 93% rename from 103221-1/portal/GetAllDetailsRequest_example.xml rename to 103221-1/portal/examples/GetAllDetailsRequest_example.xml index cdbb8ee..31e8e73 100644 --- a/103221-1/portal/GetAllDetailsRequest_example.xml +++ b/103221-1/portal/examples/GetAllDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.496243Z - v1.5.1 + v1.6.1 bfd0c982-b7d6-4a8e-80a0-89dab964aafd diff --git a/103221-1/portal/GetAllDetailsResponse_example.xml b/103221-1/portal/examples/GetAllDetailsResponse_example.xml similarity index 98% rename from 103221-1/portal/GetAllDetailsResponse_example.xml rename to 103221-1/portal/examples/GetAllDetailsResponse_example.xml index 287296e..5bb7998 100644 --- a/103221-1/portal/GetAllDetailsResponse_example.xml +++ b/103221-1/portal/examples/GetAllDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.496743Z - v1.5.1 + v1.6.1 bfd0c982-b7d6-4a8e-80a0-89dab964aafd OK diff --git a/103221-1/portal/GetDestinationDetailsRequest_example.xml b/103221-1/portal/examples/GetDestinationDetailsRequest_example.xml similarity index 93% rename from 103221-1/portal/GetDestinationDetailsRequest_example.xml rename to 103221-1/portal/examples/GetDestinationDetailsRequest_example.xml index bc1ffa7..7719ac5 100644 --- a/103221-1/portal/GetDestinationDetailsRequest_example.xml +++ b/103221-1/portal/examples/GetDestinationDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.462616Z - v1.5.1 + v1.6.1 7de5709c-8269-417f-a123-7087d3971f8c b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/portal/GetDestinationDetailsResponse_example.xml b/103221-1/portal/examples/GetDestinationDetailsResponse_example.xml similarity index 97% rename from 103221-1/portal/GetDestinationDetailsResponse_example.xml rename to 103221-1/portal/examples/GetDestinationDetailsResponse_example.xml index bbd6b9c..aa0de43 100644 --- a/103221-1/portal/GetDestinationDetailsResponse_example.xml +++ b/103221-1/portal/examples/GetDestinationDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.462616Z - v1.5.1 + v1.6.1 7de5709c-8269-417f-a123-7087d3971f8c diff --git a/103221-1/portal/GetNEStatusRequest_example.xml b/103221-1/portal/examples/GetNEStatusRequest_example.xml similarity index 92% rename from 103221-1/portal/GetNEStatusRequest_example.xml rename to 103221-1/portal/examples/GetNEStatusRequest_example.xml index 29c15b6..807ec7e 100644 --- a/103221-1/portal/GetNEStatusRequest_example.xml +++ b/103221-1/portal/examples/GetNEStatusRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.487158Z - v1.5.1 + v1.6.1 93d571cb-3793-4385-8b59-2c14097ed743 diff --git a/103221-1/portal/GetNEStatusResponse_example.xml b/103221-1/portal/examples/GetNEStatusResponse_example.xml similarity index 94% rename from 103221-1/portal/GetNEStatusResponse_example.xml rename to 103221-1/portal/examples/GetNEStatusResponse_example.xml index ba19ff3..ade1b67 100644 --- a/103221-1/portal/GetNEStatusResponse_example.xml +++ b/103221-1/portal/examples/GetNEStatusResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.488659Z - v1.5.1 + v1.6.1 93d571cb-3793-4385-8b59-2c14097ed743 OK diff --git a/103221-1/portal/GetTaskDetailsRequest_example.xml b/103221-1/portal/examples/GetTaskDetailsRequest_example.xml similarity index 93% rename from 103221-1/portal/GetTaskDetailsRequest_example.xml rename to 103221-1/portal/examples/GetTaskDetailsRequest_example.xml index 491c90e..ec9d12b 100644 --- a/103221-1/portal/GetTaskDetailsRequest_example.xml +++ b/103221-1/portal/examples/GetTaskDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.418584Z - v1.5.1 + v1.6.1 609dcabd-5ab1-4c95-9681-a24681f105ac 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/portal/GetTaskDetailsResponse_example.xml b/103221-1/portal/examples/GetTaskDetailsResponse_example.xml similarity index 96% rename from 103221-1/portal/GetTaskDetailsResponse_example.xml rename to 103221-1/portal/examples/GetTaskDetailsResponse_example.xml index 5115b76..63a66f5 100644 --- a/103221-1/portal/GetTaskDetailsResponse_example.xml +++ b/103221-1/portal/examples/GetTaskDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.420587Z - v1.5.1 + v1.6.1 609dcabd-5ab1-4c95-9681-a24681f105ac diff --git a/103221-1/portal/KeepaliveRequest_example.xml b/103221-1/portal/examples/KeepaliveRequest_example.xml similarity index 92% rename from 103221-1/portal/KeepaliveRequest_example.xml rename to 103221-1/portal/examples/KeepaliveRequest_example.xml index 330e8db..47650f1 100644 --- a/103221-1/portal/KeepaliveRequest_example.xml +++ b/103221-1/portal/examples/KeepaliveRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.541784Z - v1.5.1 + v1.6.1 6420aa0f-e5e6-4a32-9dff-15b836589257 diff --git a/103221-1/portal/KeepaliveResponse_example.xml b/103221-1/portal/examples/KeepaliveResponse_example.xml similarity index 93% rename from 103221-1/portal/KeepaliveResponse_example.xml rename to 103221-1/portal/examples/KeepaliveResponse_example.xml index 923bbaa..995fed3 100644 --- a/103221-1/portal/KeepaliveResponse_example.xml +++ b/103221-1/portal/examples/KeepaliveResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.542783Z - v1.5.1 + v1.6.1 6420aa0f-e5e6-4a32-9dff-15b836589257 AcknowledgedAndCompleted diff --git a/103221-1/portal/ListAllDetailsRequest_example.xml b/103221-1/portal/examples/ListAllDetailsRequest_example.xml similarity index 93% rename from 103221-1/portal/ListAllDetailsRequest_example.xml rename to 103221-1/portal/examples/ListAllDetailsRequest_example.xml index b3f70b3..82c7e8d 100644 --- a/103221-1/portal/ListAllDetailsRequest_example.xml +++ b/103221-1/portal/examples/ListAllDetailsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.508330Z - v1.5.1 + v1.6.1 09529160-2e44-49c6-bf54-204ca5edcfab diff --git a/103221-1/portal/ListAllDetailsResponse_example.xml b/103221-1/portal/examples/ListAllDetailsResponse_example.xml similarity index 94% rename from 103221-1/portal/ListAllDetailsResponse_example.xml rename to 103221-1/portal/examples/ListAllDetailsResponse_example.xml index d762e08..e5e9096 100644 --- a/103221-1/portal/ListAllDetailsResponse_example.xml +++ b/103221-1/portal/examples/ListAllDetailsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.508330Z - v1.5.1 + v1.6.1 09529160-2e44-49c6-bf54-204ca5edcfab 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/portal/ModifyTaskRequest_example.xml b/103221-1/portal/examples/ModifyTaskRequest_example.xml similarity index 96% rename from 103221-1/portal/ModifyTaskRequest_example.xml rename to 103221-1/portal/examples/ModifyTaskRequest_example.xml index bb48bac..3aa287f 100644 --- a/103221-1/portal/ModifyTaskRequest_example.xml +++ b/103221-1/portal/examples/ModifyTaskRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.411587Z - v1.5.1 + v1.6.1 fcfc97de-1c77-413d-9925-d1630acbf763 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/portal/ModifyTaskResponse_example.xml b/103221-1/portal/examples/ModifyTaskResponse_example.xml similarity index 93% rename from 103221-1/portal/ModifyTaskResponse_example.xml rename to 103221-1/portal/examples/ModifyTaskResponse_example.xml index adfa3b5..35a9696 100644 --- a/103221-1/portal/ModifyTaskResponse_example.xml +++ b/103221-1/portal/examples/ModifyTaskResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.411587Z - v1.5.1 + v1.6.1 fcfc97de-1c77-413d-9925-d1630acbf763 AcknowledgedAndCompleted diff --git a/103221-1/portal/PingRequest_example.xml b/103221-1/portal/examples/PingRequest_example.xml similarity index 92% rename from 103221-1/portal/PingRequest_example.xml rename to 103221-1/portal/examples/PingRequest_example.xml index d9687b6..5eda3b5 100644 --- a/103221-1/portal/PingRequest_example.xml +++ b/103221-1/portal/examples/PingRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.547786Z - v1.5.1 + v1.6.1 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 diff --git a/103221-1/portal/PingResponse_example.xml b/103221-1/portal/examples/PingResponse_example.xml similarity index 93% rename from 103221-1/portal/PingResponse_example.xml rename to 103221-1/portal/examples/PingResponse_example.xml index 9e4dadb..7a916eb 100644 --- a/103221-1/portal/PingResponse_example.xml +++ b/103221-1/portal/examples/PingResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.547786Z - v1.5.1 + v1.6.1 8f9fc2c5-923a-4a75-b70c-9e0c058bba45 AcknowledgedAndCompleted diff --git a/103221-1/portal/RemoveAllDestinationsRequest_example.xml b/103221-1/portal/examples/RemoveAllDestinationsRequest_example.xml similarity index 93% rename from 103221-1/portal/RemoveAllDestinationsRequest_example.xml rename to 103221-1/portal/examples/RemoveAllDestinationsRequest_example.xml index 6b27365..8971c0f 100644 --- a/103221-1/portal/RemoveAllDestinationsRequest_example.xml +++ b/103221-1/portal/examples/RemoveAllDestinationsRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.480627Z - v1.5.1 + v1.6.1 88611050-d8e2-4ada-96fc-626b5dbd9cdf diff --git a/103221-1/portal/RemoveAllDestinationsResponse_example.xml b/103221-1/portal/examples/RemoveAllDestinationsResponse_example.xml similarity index 93% rename from 103221-1/portal/RemoveAllDestinationsResponse_example.xml rename to 103221-1/portal/examples/RemoveAllDestinationsResponse_example.xml index a057bc2..a9fb41f 100644 --- a/103221-1/portal/RemoveAllDestinationsResponse_example.xml +++ b/103221-1/portal/examples/RemoveAllDestinationsResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.481629Z - v1.5.1 + v1.6.1 88611050-d8e2-4ada-96fc-626b5dbd9cdf AcknowledgedAndCompleted diff --git a/103221-1/portal/RemoveDestinationRequest_example.xml b/103221-1/portal/examples/RemoveDestinationRequest_example.xml similarity index 93% rename from 103221-1/portal/RemoveDestinationRequest_example.xml rename to 103221-1/portal/examples/RemoveDestinationRequest_example.xml index a5d3ce1..655195f 100644 --- a/103221-1/portal/RemoveDestinationRequest_example.xml +++ b/103221-1/portal/examples/RemoveDestinationRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.473630Z - v1.5.1 + v1.6.1 8c229735-9acf-43ed-8d72-71602625b349 b0ce308c-aa17-42bd-a27b-287bcb5b3468 diff --git a/103221-1/portal/RemoveDestinationResponse_example.xml b/103221-1/portal/examples/RemoveDestinationResponse_example.xml similarity index 93% rename from 103221-1/portal/RemoveDestinationResponse_example.xml rename to 103221-1/portal/examples/RemoveDestinationResponse_example.xml index ec910e3..81d74ca 100644 --- a/103221-1/portal/RemoveDestinationResponse_example.xml +++ b/103221-1/portal/examples/RemoveDestinationResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.474625Z - v1.5.1 + v1.6.1 8c229735-9acf-43ed-8d72-71602625b349 AcknowledgedAndCompleted diff --git a/103221-1/portal/ReportDestinationIssueRequest_example.xml b/103221-1/portal/examples/ReportDestinationIssueRequest_example.xml similarity index 95% rename from 103221-1/portal/ReportDestinationIssueRequest_example.xml rename to 103221-1/portal/examples/ReportDestinationIssueRequest_example.xml index 0f33e2b..3b8418c 100644 --- a/103221-1/portal/ReportDestinationIssueRequest_example.xml +++ b/103221-1/portal/examples/ReportDestinationIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.526329Z - v1.5.1 + v1.6.1 7e3ff959-55b0-47bd-a417-0d0383252150 b0ce308c-aa17-42bd-a27b-287bcb5b3468 NonTerminatingFault diff --git a/103221-1/portal/ReportDestinationIssueResponse_example.xml b/103221-1/portal/examples/ReportDestinationIssueResponse_example.xml similarity index 93% rename from 103221-1/portal/ReportDestinationIssueResponse_example.xml rename to 103221-1/portal/examples/ReportDestinationIssueResponse_example.xml index 44f3381..ec35dfb 100644 --- a/103221-1/portal/ReportDestinationIssueResponse_example.xml +++ b/103221-1/portal/examples/ReportDestinationIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.526329Z - v1.5.1 + v1.6.1 7e3ff959-55b0-47bd-a417-0d0383252150 AcknowledgedAndCompleted diff --git a/103221-1/portal/ReportNEIssueRequest_example.xml b/103221-1/portal/examples/ReportNEIssueRequest_example.xml similarity index 94% rename from 103221-1/portal/ReportNEIssueRequest_example.xml rename to 103221-1/portal/examples/ReportNEIssueRequest_example.xml index b06c969..5df53cb 100644 --- a/103221-1/portal/ReportNEIssueRequest_example.xml +++ b/103221-1/portal/examples/ReportNEIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.531784Z - v1.5.1 + v1.6.1 c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b Warning Example NE issue diff --git a/103221-1/portal/ReportNEIssueResponse_example.xml b/103221-1/portal/examples/ReportNEIssueResponse_example.xml similarity index 93% rename from 103221-1/portal/ReportNEIssueResponse_example.xml rename to 103221-1/portal/examples/ReportNEIssueResponse_example.xml index ab2a6b8..d18e281 100644 --- a/103221-1/portal/ReportNEIssueResponse_example.xml +++ b/103221-1/portal/examples/ReportNEIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.531784Z - v1.5.1 + v1.6.1 c4cbb148-d3ee-46a9-8e1e-7446d6f91e3b AcknowledgedAndCompleted diff --git a/103221-1/portal/ReportTaskIssueRequest_example.xml b/103221-1/portal/examples/ReportTaskIssueRequest_example.xml similarity index 94% rename from 103221-1/portal/ReportTaskIssueRequest_example.xml rename to 103221-1/portal/examples/ReportTaskIssueRequest_example.xml index ddbe803..162bd25 100644 --- a/103221-1/portal/ReportTaskIssueRequest_example.xml +++ b/103221-1/portal/examples/ReportTaskIssueRequest_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.516321Z - v1.5.1 + v1.6.1 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 29f28e1c-f230-486a-a860-f5a784ab9172 NonTerminatingFault diff --git a/103221-1/portal/ReportTaskIssueResponse_example.xml b/103221-1/portal/examples/ReportTaskIssueResponse_example.xml similarity index 93% rename from 103221-1/portal/ReportTaskIssueResponse_example.xml rename to 103221-1/portal/examples/ReportTaskIssueResponse_example.xml index eac2979..a46017f 100644 --- a/103221-1/portal/ReportTaskIssueResponse_example.xml +++ b/103221-1/portal/examples/ReportTaskIssueResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.517323Z - v1.5.1 + v1.6.1 5f5ae0e4-58fe-4e4f-a949-3bb0d7b09295 AcknowledgedAndCompleted diff --git a/103221-1/portal/examples/desktop.ini b/103221-1/portal/examples/desktop.ini new file mode 100644 index 0000000000000000000000000000000000000000..8b699c692d358fa29d7ac0976e524fe25c5da053 GIT binary patch literal 246 zcmY+9%?iRW5QM+8;5+mIB=`d!gr1a2Pl_Imhf<;jsu82&<2%X0BEyE+-I+;pz_90n zqZ5{@hA7nBI1xB9WT1J-z30J|3NM{w!<~|GR@Agvv(r3^y`*f#OL-Sqw(0|CosANT zUq;k!txejcOv_3d&s)4#6?)@SbC=zgnP7CYVZuDK|CBzXlGDidQH_{NpZ@a&#q=qQ literal 0 HcmV?d00001 diff --git a/103221-1/portal/validate_examples.py b/103221-1/portal/validate_examples.py index 0faa18a..a22c986 100644 --- a/103221-1/portal/validate_examples.py +++ b/103221-1/portal/validate_examples.py @@ -1,5 +1,6 @@ import glob import sys +from pathlib import Path XS = 'http://www.w3.org/2001/XMLSchema' @@ -46,7 +47,8 @@ def load_schema(xsd): imports = xsd_doc.xpath('//*/xs:import', namespaces={'xs': XS}) for xsd_import in imports: - xsd_import.attrib['schemaLocation'] = common_xsd[0] + xsd_import.attrib['schemaLocation'] = str(Path(common_xsd[0])) + print (xsd_import.attrib) # Load TS 103 221-1 XSD as a schema -- GitLab From 0d7dc951be9ecfae679354a3dd217c34b4524135 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:35:40 +0100 Subject: [PATCH 141/208] TS 103 120 v1.4.1 (2019-12-20) agreed at LI#52 (Turin, 2019-10-15) --- .../dictionaries/ts_103120_Dictionaries.xsd | 56 +- .../ts_103120_ETSIDictionaryDefinitions.xml | 731 +++++++++--------- 103120/examples/request1.xml | 82 ++ 103120/examples/request2.xml | 38 + 103120/examples/request3.xml | 63 ++ 103120/examples/request4.xml | 79 ++ 103120/examples/response1.xml | 38 + 103120/examples/response2.xml | 104 +++ 103120/examples/response3.xml | 58 ++ 103120/examples/response4-delivery.xml | 55 ++ 103120/examples/response4.xml | 38 + .../ts_103120v010401p0_Dictionaries.xsd | 32 + ...120v010401p0_ETSIDictionaryDefinitions.xml | 366 +++++++++ 103120/portal/examples/request1.xml | 82 ++ 103120/portal/examples/request2.xml | 38 + 103120/portal/examples/request3.xml | 63 ++ 103120/portal/examples/request4.xml | 79 ++ 103120/portal/examples/response1.xml | 38 + 103120/portal/examples/response2.xml | 104 +++ 103120/portal/examples/response3.xml | 58 ++ 103120/portal/examples/response4-delivery.xml | 55 ++ 103120/portal/examples/response4.xml | 38 + 103120/portal/schema/TS_103_280_v020401.xsd | 239 ++++++ .../ts_103120v010401p0_Authorisation.xsd | 59 ++ .../ts_103120v010401p0_Common.xsd} | 46 +- .../ts_103120v010401p0_Core.xsd} | 28 +- .../schema/ts_103120v010401p0_Delivery.xsd | 52 ++ .../schema/ts_103120v010401p0_Document.xsd | 63 ++ .../ts_103120v010401p0_Notification.xsd | 33 + .../ts_103120v010401p0_Task.xsd} | 99 ++- .../ts_103120v010201p0_Authorisation.xsd | 59 -- .../ts_103120v010201p0_Dictionaries.xsd | 28 - 103120/portal/ts_103120v010201p0_Document.xsd | 65 -- ...120v010201p0_ETSIDictionaryDefinitions.xml | 367 --------- .../ts_103120v010201p0_Notification.xsd | 34 - 103120/schema/ts_103120_Authorisation.xsd | 98 +-- 103120/schema/ts_103120_Common.xsd | 46 +- 103120/schema/ts_103120_Core.xsd | 28 +- 103120/schema/ts_103120_Delivery.xsd | 52 ++ 103120/schema/ts_103120_Document.xsd | 108 ++- 103120/schema/ts_103120_Notification.xsd | 47 +- ...s_103120_LITask.xsd => ts_103120_Task.xsd} | 99 ++- 42 files changed, 2768 insertions(+), 1177 deletions(-) create mode 100644 103120/examples/request1.xml create mode 100644 103120/examples/request2.xml create mode 100644 103120/examples/request3.xml create mode 100644 103120/examples/request4.xml create mode 100644 103120/examples/response1.xml create mode 100644 103120/examples/response2.xml create mode 100644 103120/examples/response3.xml create mode 100644 103120/examples/response4-delivery.xml create mode 100644 103120/examples/response4.xml create mode 100644 103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd create mode 100644 103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml create mode 100644 103120/portal/examples/request1.xml create mode 100644 103120/portal/examples/request2.xml create mode 100644 103120/portal/examples/request3.xml create mode 100644 103120/portal/examples/request4.xml create mode 100644 103120/portal/examples/response1.xml create mode 100644 103120/portal/examples/response2.xml create mode 100644 103120/portal/examples/response3.xml create mode 100644 103120/portal/examples/response4-delivery.xml create mode 100644 103120/portal/examples/response4.xml create mode 100644 103120/portal/schema/TS_103_280_v020401.xsd create mode 100644 103120/portal/schema/ts_103120v010401p0_Authorisation.xsd rename 103120/portal/{ts_103120v010201p0_Common.xsd => schema/ts_103120v010401p0_Common.xsd} (72%) rename 103120/portal/{ts_103120v010201p0_Core.xsd => schema/ts_103120v010401p0_Core.xsd} (89%) create mode 100644 103120/portal/schema/ts_103120v010401p0_Delivery.xsd create mode 100644 103120/portal/schema/ts_103120v010401p0_Document.xsd create mode 100644 103120/portal/schema/ts_103120v010401p0_Notification.xsd rename 103120/portal/{ts_103120v010201p0_LITask.xsd => schema/ts_103120v010401p0_Task.xsd} (55%) delete mode 100644 103120/portal/ts_103120v010201p0_Authorisation.xsd delete mode 100644 103120/portal/ts_103120v010201p0_Dictionaries.xsd delete mode 100644 103120/portal/ts_103120v010201p0_Document.xsd delete mode 100644 103120/portal/ts_103120v010201p0_ETSIDictionaryDefinitions.xml delete mode 100644 103120/portal/ts_103120v010201p0_Notification.xsd create mode 100644 103120/schema/ts_103120_Delivery.xsd rename 103120/schema/{ts_103120_LITask.xsd => ts_103120_Task.xsd} (55%) diff --git a/103120/dictionaries/ts_103120_Dictionaries.xsd b/103120/dictionaries/ts_103120_Dictionaries.xsd index 0d3801e..a5e9b66 100644 --- a/103120/dictionaries/ts_103120_Dictionaries.xsd +++ b/103120/dictionaries/ts_103120_Dictionaries.xsd @@ -1,28 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 3d9af00..477914c 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -1,367 +1,366 @@ - - - - ETSI - ObjectType - - - Authorisation - An Authorisation Object as defined in section 7.2 - - - Document - A Document Object as defined in section 7.3 - - - Notification - A Notification Object as defined in section 7.4 - - - Task - A Task Object as defined in section 8.2 - - - - - ETSI - AuthorisationLegalType - - - Manual - The implementation should consult the AuthorisationManualInformation field for details on the type of legal Authorisation - - - - - ETSI - AuthorisationPriority - - - High - An Authorisation has high priority - - - Routine - The Authorisation has a routine priority - - - - - ETSI - AuthorisationStatus - - - AwaitingApproval - Authorisation is still waiting approval from one or more relevant authorities - - - EmergencyApproval - The Authorisation has been approved under emergency procedures - - - Approved - The Authorisation has been approved by the relevant authorities - - - Rejected - The Authorisation has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Authorisation has been suspended temporarily - - - Cancelled - The Authorisation has been permanently cancelled - - - Expired - The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. - - - Invalid - The Authorisation is not active due to a problem with the current information populated in the Authorisation Object. - - - - - ETSI - AuthorisationDesiredStatus - - - AwaitingApproval - Authorisation is still waiting approval from one or more relevant authorities - - - EmergencyApproval - The Authorisation has been approved under emergency procedures - - - Approved - The Authorisation has been approved by the relevant authorities - - - Rejected - The Authorisation has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Authorisation has been suspended temporarily - - - Cancelled - The Authorisation has been permanently cancelled - - - Expired - The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. - - - - - ETSI - AuthorisationFlag - - - IsEmergency - Indicates if the authorisation was issued under nationally-defined emergency procedures (e.g. orally). The circumstances and consequences for setting the field shall be defined by the relevant national profile - - - IsConsensual - Indicates that the current authorisation is for consensual interception. This may alter the process or documentation accompanying the authorisation - - - IsTest - Indicates that the current authorisation is given for test purposes. This may alter the process or documentation accompanying the authorisation - - - - - ETSI - DocumentStatus - - - AwaitingApproval - The Document is still waiting approval from one or more relevant authorities - - - Approved - The Document has been approved by the relevant authorities - - - Rejected - The Document has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Document has been suspended temporarily - - - Cancelled - The Document has been permanently cancelled - - - Expired - The expiry date for this Document has passed. - - - Invalid - The Document is invalid due to a problem with the current information populated in the Document Object. - - - - - ETSI - DocumentDesiredStatus - - - AwaitingApproval - The Document is still waiting approval from one or more relevant authorities - - - Approved - The Document has been approved by the relevant authorities - - - Rejected - The Document has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Document has been suspended temporarily - - - Cancelled - The Document has been permanently cancelled - - - Expired - The expiry date for this Document has passed. - - - - - ETSI - DocumentType - - - Warrant - This Document represents a legal Warrant - - - - - ETSI - NotificationType - - - General - A general notification that a change has occurred with the specified Objects - - - - - ETSI - TaskStatus - - - AwaitingApproval - The Task is still waiting approval from one or more relevant authorities - - - AwaitingProvisioning - The Task is approved, but is not yet provisioned in the LI system - - - Active - The Task is active and can produce LI traffic - - - Rejected - The Task has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Task has been suspended temporarily - - - Cancelled - The Task has been permanently cancelled - - - Expired - The Task date for this Document has passed, meaning that the Task has lapsed - - - Error - The Task is not active due to a problem with the underlying LI system - - - Invalid - The Task is not active due to a problem with the current information populated in the Task Object - - - - - ETSI - TaskDesiredStatus - - - AwaitingApproval - The Task is still waiting approval from one or more relevant authorities - - - AwaitingProvisioning - The Task is approved, but is not yet provisioned in the LI system - - - Active - The Task is active and can produce LI traffic - - - Rejected - The Task has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Task has been suspended temporarily - - - Cancelled - The Task has been permanently cancelled - - - Expired - The Task date for this Document has passed, meaning that the Task has lapsed - - - - - ETSI - TaskServiceType - - - - ETSI - TaskDeliveryType - - - IRIOnly - Only IRI is delivered - - - CCOnly - Only CC is delivered - - - IRIandCC - Both IRI and CC is delivered - - - - - ETSI - HandoverFormat - - - TS102232-2 - Handed over in TS 102 232 part 2 format - - - TS102232-3 - Handed over in TS 102 232 part 3 format - - - TS102232-4 - Handed over in TS 102 232 part 4 format - - - TS102232-5 - Handed over in TS 102 232 part 5 format - - - TS102232-6 - Handed over in TS 102 232 part 6 format - - - TS102232-7 - Handed over in TS 102 232 part 7 format - - - - - ETSI - TaskFlag - - - IsTest - Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation - - - IsEmergency - Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) - - - + + + + ETSI + ObjectType + + + Authorisation + An Authorisation Object as defined in section 7.2 + + + Document + A Document Object as defined in section 7.3 + + + Notification + A Notification Object as defined in section 7.4 + + + Task + A Task Object as defined in section 8.2 + + + + + ETSI + AuthorisationLegalType + + + Manual + The implementation should consult the AuthorisationManualInformation field for details on the type of legal Authorisation + + + + + ETSI + AuthorisationPriority + + + High + An Authorisation has high priority + + + Routine + The Authorisation has a routine priority + + + + + ETSI + AuthorisationStatus + + + AwaitingApproval + Authorisation is still waiting approval from one or more relevant authorities + + + EmergencyApproval + The Authorisation has been approved under emergency procedures + + + Approved + The Authorisation has been approved by the relevant authorities + + + Rejected + The Authorisation has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Authorisation has been suspended temporarily + + + Cancelled + The Authorisation has been permanently cancelled + + + Expired + The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. + + + Invalid + The Authorisation is not active due to a problem with the current information populated in the Authorisation Object. + + + + + ETSI + AuthorisationDesiredStatus + + + AwaitingApproval + Authorisation is still waiting approval from one or more relevant authorities + + + EmergencyApproval + The Authorisation has been approved under emergency procedures + + + Approved + The Authorisation has been approved by the relevant authorities + + + Rejected + The Authorisation has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Authorisation has been suspended temporarily + + + Cancelled + The Authorisation has been permanently cancelled + + + Expired + The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. + + + + + ETSI + AuthorisationFlag + + + IsEmergency + Indicates if the authorisation was issued under nationally-defined emergency procedures (e.g. orally). The circumstances and consequences for setting the field shall be defined by the relevant national profile + + + IsConsensual + Indicates that the current authorisation is for consensual interception. This may alter the process or documentation accompanying the authorisation + + + IsTest + Indicates that the current authorisation is given for test purposes. This may alter the process or documentation accompanying the authorisation + + + + + ETSI + DocumentStatus + + + AwaitingApproval + The Document is still waiting approval from one or more relevant authorities + + + Approved + The Document has been approved by the relevant authorities + + + Rejected + The Document has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Document has been suspended temporarily + + + Cancelled + The Document has been permanently cancelled + + + Expired + The expiry date for this Document has passed. + + + Invalid + The Document is invalid due to a problem with the current information populated in the Document Object. + + + + + ETSI + DocumentDesiredStatus + + + AwaitingApproval + The Document is still waiting approval from one or more relevant authorities + + + Approved + The Document has been approved by the relevant authorities + + + Rejected + The Document has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Document has been suspended temporarily + + + Cancelled + The Document has been permanently cancelled + + + Expired + The expiry date for this Document has passed. + + + + + ETSI + DocumentType + + + Warrant + This Document represents a legal Warrant + + + + + ETSI + NotificationType + + + General + A general notification that a change has occurred with the specified Objects + + + + + ETSI + TaskStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingProvisioning + The Task is approved, but is not yet provisioned in the LI system + + + Active + The Task is active and can produce LI traffic + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Task has been suspended temporarily + + + Cancelled + The Task has been permanently cancelled + + + Expired + The Task date for this Document has passed, meaning that the Task has lapsed + + + Error + The Task is not active due to a problem with the underlying LI system + + + Invalid + The Task is not active due to a problem with the current information populated in the Task Object + + + + + ETSI + TaskDesiredStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingProvisioning + The Task is approved, but is not yet provisioned in the LI system + + + Active + The Task is active and can produce LI traffic + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Task has been suspended temporarily + + + Cancelled + The Task has been permanently cancelled + + + Expired + The Task date for this Document has passed, meaning that the Task has lapsed + + + + + ETSI + TaskServiceType + + + + ETSI + TaskDeliveryType + + + IRIOnly + Only IRI is delivered + + + CCOnly + Only CC is delivered + + + IRIandCC + Both IRI and CC is delivered + + + + + ETSI + HandoverFormat + + + TS102232-2 + Handed over in TS 102 232 part 2 format + + + TS102232-3 + Handed over in TS 102 232 part 3 format + + + TS102232-4 + Handed over in TS 102 232 part 4 format + + + TS102232-5 + Handed over in TS 102 232 part 5 format + + + TS102232-6 + Handed over in TS 102 232 part 6 format + + + TS102232-7 + Handed over in TS 102 232 part 7 format + + + + + ETSI + TaskFlag + + + IsTest + Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + + IsEmergency + Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + + - diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml new file mode 100644 index 0000000..710f0f9 --- /dev/null +++ b/103120/examples/request1.xml @@ -0,0 +1,82 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2e + 2015-09-01T12:00:00.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + XX + SENDER01 + W000001 + + 2015-09-01T12:00:00Z + 2015-12-01T12:00:00Z + + + + + + 1 + + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + XX + SENDER01 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + LIID1 + + + + + ETSI + InternationalE164 + + +447700900000 + + + + + ETSI + TaskDeliveryType + IRIandCC + + + + + 192.0.2.0 + + + + + XX + RECVER01 + + + + + + + + diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml new file mode 100644 index 0000000..4f7ee5c --- /dev/null +++ b/103120/examples/request2.xml @@ -0,0 +1,38 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + 45002c1e-dc4a-470a-9152-8e752638c86c + 2015-09-01T12:01:00.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + + 1 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + + + + + diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml new file mode 100644 index 0000000..f7d67d5 --- /dev/null +++ b/103120/examples/request3.xml @@ -0,0 +1,63 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + 69353ac0-9582-4c71-b162-86259c99de20 + 2015-09-01T12:02:00.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + + 4193f541-5e19-468e-b4a3-1c636ce115e9 + XX + SENDER01 + W000001 + + 2015-09-01T12:00:00Z + 2015-12-01T12:00:00Z + + + ETSI + DocumentType + Warrant + + + + Approver + + 2015-09-01T12:00:00Z + + + + + + 1 + + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + 4193f541-5e19-468e-b4a3-1c636ce115e9 + + + + + + + + diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml new file mode 100644 index 0000000..5de3a81 --- /dev/null +++ b/103120/examples/request4.xml @@ -0,0 +1,79 @@ + + +
+ + XX + SENDER01 + + + XX + RECEIVER01 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2e + 2019-09-30T13:37:00.000000Z + + V1.3.1 + XX + v1.0 + +
+ + + + + 0 + + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + XX + SENDER01 + W000001 + + 2019-09-30T12:00:00Z + 2019-12-01T12:00:00Z + + + + + + 1 + + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + XX + SENDER01 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + XX-SENDER01-1234 + + 2019-09-30T12:00:00Z + 2019-12-30T12:00:00Z + + + + ETSI + InternationalE164 + + +31701234567 + + + + + + + 192.0.2.0 + + + + + XX + RECEIVER01 + + + + + + + + diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml new file mode 100644 index 0000000..e34e9e4 --- /dev/null +++ b/103120/examples/response1.xml @@ -0,0 +1,38 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2e + 2015-09-01T12:00:01.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + + + 1 + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + + + + diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml new file mode 100644 index 0000000..37a3571 --- /dev/null +++ b/103120/examples/response2.xml @@ -0,0 +1,104 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + 45002c1e-dc4a-470a-9152-8e752638c86c + 2015-09-01T12:01:00.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + XX + SENDER01 + 1 + 2015-09-01T12:00:00Z + W000001 + + ETSI + AuthorisationStatus + Invalid + + + 2015-09-01T12:00:00Z + 2015-12-01T12:00:00Z + + + 3000 + The Authorisation is not associated with a valid Warrant Document Object + + + + + + 0 + + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + XX + SENDER01 + 1 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + 2015-09-01T12:00:00Z + LIID1 + + ETSI + TaskStatus + Invalid + + + + + + ETSI + InternationalE164 + + +447700900000 + + + + + ETSI + TaskDeliveryType + IRIandCC + + + + + 192.0.2.0 + + + + + XX + RECVER01 + + + 3000 + The associated Authorisation is in an Invalid state + + + + + + + + diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml new file mode 100644 index 0000000..59c09aa --- /dev/null +++ b/103120/examples/response3.xml @@ -0,0 +1,58 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + 69353ac0-9582-4c71-b162-86259c99de20 + 2015-09-01T12:02:00.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + 4193f541-5e19-468e-b4a3-1c636ce115e9 + + + + 1 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + XX + SENDER01 + 2 + + 4193f541-5e19-468e-b4a3-1c636ce115e9 + + 2015-09-01T12:02:00Z + W000001 + + ETSI + AuthorisationStatus + Active + + + 2015-09-01T12:00:00Z + 2015-12-01T12:00:00Z + + + + + + + + diff --git a/103120/examples/response4-delivery.xml b/103120/examples/response4-delivery.xml new file mode 100644 index 0000000..2f4136b --- /dev/null +++ b/103120/examples/response4-delivery.xml @@ -0,0 +1,55 @@ + + +
+ + XX + SENDER01 + + + XX + RECEIVER01 + + 8854cfad-44ac-43b8-99ae-530b690b43da + 2019-09-30T13:37:37.000000Z + + V1.3.1 + XX + v1.0 + +
+ + + + + 0 + + + 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + XX-SENDER01-12345 + + d1079830-8e9a-4731-8fb7-36b9b961eb72 + 1 + true + + + ETSI + ManifestSpecification + TS102657-XML + + + + PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4= + text/xml + d8ecb368c8dd3b353b775d5cd2cca7a621e9956ec3b150f445ce4d4d48a4dff3 + + + + + + + + diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml new file mode 100644 index 0000000..d367d69 --- /dev/null +++ b/103120/examples/response4.xml @@ -0,0 +1,38 @@ + + +
+ + XX + SENDER01 + + + XX + RECEIVER01 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2e + 2019-09-30T13:37:01.000000Z + + V1.3.1 + XX + v1.0 + +
+ + + + + 0 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + + + 1 + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + + + + diff --git a/103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd b/103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd new file mode 100644 index 0000000..a5e9b66 --- /dev/null +++ b/103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml b/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml new file mode 100644 index 0000000..477914c --- /dev/null +++ b/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml @@ -0,0 +1,366 @@ + + + + ETSI + ObjectType + + + Authorisation + An Authorisation Object as defined in section 7.2 + + + Document + A Document Object as defined in section 7.3 + + + Notification + A Notification Object as defined in section 7.4 + + + Task + A Task Object as defined in section 8.2 + + + + + ETSI + AuthorisationLegalType + + + Manual + The implementation should consult the AuthorisationManualInformation field for details on the type of legal Authorisation + + + + + ETSI + AuthorisationPriority + + + High + An Authorisation has high priority + + + Routine + The Authorisation has a routine priority + + + + + ETSI + AuthorisationStatus + + + AwaitingApproval + Authorisation is still waiting approval from one or more relevant authorities + + + EmergencyApproval + The Authorisation has been approved under emergency procedures + + + Approved + The Authorisation has been approved by the relevant authorities + + + Rejected + The Authorisation has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Authorisation has been suspended temporarily + + + Cancelled + The Authorisation has been permanently cancelled + + + Expired + The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. + + + Invalid + The Authorisation is not active due to a problem with the current information populated in the Authorisation Object. + + + + + ETSI + AuthorisationDesiredStatus + + + AwaitingApproval + Authorisation is still waiting approval from one or more relevant authorities + + + EmergencyApproval + The Authorisation has been approved under emergency procedures + + + Approved + The Authorisation has been approved by the relevant authorities + + + Rejected + The Authorisation has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Authorisation has been suspended temporarily + + + Cancelled + The Authorisation has been permanently cancelled + + + Expired + The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. + + + + + ETSI + AuthorisationFlag + + + IsEmergency + Indicates if the authorisation was issued under nationally-defined emergency procedures (e.g. orally). The circumstances and consequences for setting the field shall be defined by the relevant national profile + + + IsConsensual + Indicates that the current authorisation is for consensual interception. This may alter the process or documentation accompanying the authorisation + + + IsTest + Indicates that the current authorisation is given for test purposes. This may alter the process or documentation accompanying the authorisation + + + + + ETSI + DocumentStatus + + + AwaitingApproval + The Document is still waiting approval from one or more relevant authorities + + + Approved + The Document has been approved by the relevant authorities + + + Rejected + The Document has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Document has been suspended temporarily + + + Cancelled + The Document has been permanently cancelled + + + Expired + The expiry date for this Document has passed. + + + Invalid + The Document is invalid due to a problem with the current information populated in the Document Object. + + + + + ETSI + DocumentDesiredStatus + + + AwaitingApproval + The Document is still waiting approval from one or more relevant authorities + + + Approved + The Document has been approved by the relevant authorities + + + Rejected + The Document has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Document has been suspended temporarily + + + Cancelled + The Document has been permanently cancelled + + + Expired + The expiry date for this Document has passed. + + + + + ETSI + DocumentType + + + Warrant + This Document represents a legal Warrant + + + + + ETSI + NotificationType + + + General + A general notification that a change has occurred with the specified Objects + + + + + ETSI + TaskStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingProvisioning + The Task is approved, but is not yet provisioned in the LI system + + + Active + The Task is active and can produce LI traffic + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Task has been suspended temporarily + + + Cancelled + The Task has been permanently cancelled + + + Expired + The Task date for this Document has passed, meaning that the Task has lapsed + + + Error + The Task is not active due to a problem with the underlying LI system + + + Invalid + The Task is not active due to a problem with the current information populated in the Task Object + + + + + ETSI + TaskDesiredStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingProvisioning + The Task is approved, but is not yet provisioned in the LI system + + + Active + The Task is active and can produce LI traffic + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities + + + Suspended + The Task has been suspended temporarily + + + Cancelled + The Task has been permanently cancelled + + + Expired + The Task date for this Document has passed, meaning that the Task has lapsed + + + + + ETSI + TaskServiceType + + + + ETSI + TaskDeliveryType + + + IRIOnly + Only IRI is delivered + + + CCOnly + Only CC is delivered + + + IRIandCC + Both IRI and CC is delivered + + + + + ETSI + HandoverFormat + + + TS102232-2 + Handed over in TS 102 232 part 2 format + + + TS102232-3 + Handed over in TS 102 232 part 3 format + + + TS102232-4 + Handed over in TS 102 232 part 4 format + + + TS102232-5 + Handed over in TS 102 232 part 5 format + + + TS102232-6 + Handed over in TS 102 232 part 6 format + + + TS102232-7 + Handed over in TS 102 232 part 7 format + + + + + ETSI + TaskFlag + + + IsTest + Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + + IsEmergency + Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + + + diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml new file mode 100644 index 0000000..710f0f9 --- /dev/null +++ b/103120/portal/examples/request1.xml @@ -0,0 +1,82 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2e + 2015-09-01T12:00:00.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + XX + SENDER01 + W000001 + + 2015-09-01T12:00:00Z + 2015-12-01T12:00:00Z + + + + + + 1 + + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + XX + SENDER01 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + LIID1 + + + + + ETSI + InternationalE164 + + +447700900000 + + + + + ETSI + TaskDeliveryType + IRIandCC + + + + + 192.0.2.0 + + + + + XX + RECVER01 + + + + + + + + diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml new file mode 100644 index 0000000..4f7ee5c --- /dev/null +++ b/103120/portal/examples/request2.xml @@ -0,0 +1,38 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + 45002c1e-dc4a-470a-9152-8e752638c86c + 2015-09-01T12:01:00.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + + 1 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + + + + + diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml new file mode 100644 index 0000000..f7d67d5 --- /dev/null +++ b/103120/portal/examples/request3.xml @@ -0,0 +1,63 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + 69353ac0-9582-4c71-b162-86259c99de20 + 2015-09-01T12:02:00.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + + 4193f541-5e19-468e-b4a3-1c636ce115e9 + XX + SENDER01 + W000001 + + 2015-09-01T12:00:00Z + 2015-12-01T12:00:00Z + + + ETSI + DocumentType + Warrant + + + + Approver + + 2015-09-01T12:00:00Z + + + + + + 1 + + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + 4193f541-5e19-468e-b4a3-1c636ce115e9 + + + + + + + + diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml new file mode 100644 index 0000000..5de3a81 --- /dev/null +++ b/103120/portal/examples/request4.xml @@ -0,0 +1,79 @@ + + +
+ + XX + SENDER01 + + + XX + RECEIVER01 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2e + 2019-09-30T13:37:00.000000Z + + V1.3.1 + XX + v1.0 + +
+ + + + + 0 + + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + XX + SENDER01 + W000001 + + 2019-09-30T12:00:00Z + 2019-12-01T12:00:00Z + + + + + + 1 + + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + XX + SENDER01 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + XX-SENDER01-1234 + + 2019-09-30T12:00:00Z + 2019-12-30T12:00:00Z + + + + ETSI + InternationalE164 + + +31701234567 + + + + + + + 192.0.2.0 + + + + + XX + RECEIVER01 + + + + + + + + diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml new file mode 100644 index 0000000..e34e9e4 --- /dev/null +++ b/103120/portal/examples/response1.xml @@ -0,0 +1,38 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2e + 2015-09-01T12:00:01.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + + + 1 + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + + + + diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml new file mode 100644 index 0000000..37a3571 --- /dev/null +++ b/103120/portal/examples/response2.xml @@ -0,0 +1,104 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + 45002c1e-dc4a-470a-9152-8e752638c86c + 2015-09-01T12:01:00.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + XX + SENDER01 + 1 + 2015-09-01T12:00:00Z + W000001 + + ETSI + AuthorisationStatus + Invalid + + + 2015-09-01T12:00:00Z + 2015-12-01T12:00:00Z + + + 3000 + The Authorisation is not associated with a valid Warrant Document Object + + + + + + 0 + + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + XX + SENDER01 + 1 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + 2015-09-01T12:00:00Z + LIID1 + + ETSI + TaskStatus + Invalid + + + + + + ETSI + InternationalE164 + + +447700900000 + + + + + ETSI + TaskDeliveryType + IRIandCC + + + + + 192.0.2.0 + + + + + XX + RECVER01 + + + 3000 + The associated Authorisation is in an Invalid state + + + + + + + + diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml new file mode 100644 index 0000000..59c09aa --- /dev/null +++ b/103120/portal/examples/response3.xml @@ -0,0 +1,58 @@ + + +
+ + XX + SENDER01 + + + XX + RECVER01 + + 69353ac0-9582-4c71-b162-86259c99de20 + 2015-09-01T12:02:00.000000Z + + V1.2.1 + XX + v1.0 + +
+ + + + + 0 + + 4193f541-5e19-468e-b4a3-1c636ce115e9 + + + + 1 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + XX + SENDER01 + 2 + + 4193f541-5e19-468e-b4a3-1c636ce115e9 + + 2015-09-01T12:02:00Z + W000001 + + ETSI + AuthorisationStatus + Active + + + 2015-09-01T12:00:00Z + 2015-12-01T12:00:00Z + + + + + + + + diff --git a/103120/portal/examples/response4-delivery.xml b/103120/portal/examples/response4-delivery.xml new file mode 100644 index 0000000..2f4136b --- /dev/null +++ b/103120/portal/examples/response4-delivery.xml @@ -0,0 +1,55 @@ + + +
+ + XX + SENDER01 + + + XX + RECEIVER01 + + 8854cfad-44ac-43b8-99ae-530b690b43da + 2019-09-30T13:37:37.000000Z + + V1.3.1 + XX + v1.0 + +
+ + + + + 0 + + + 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + XX-SENDER01-12345 + + d1079830-8e9a-4731-8fb7-36b9b961eb72 + 1 + true + + + ETSI + ManifestSpecification + TS102657-XML + + + + PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4= + text/xml + d8ecb368c8dd3b353b775d5cd2cca7a621e9956ec3b150f445ce4d4d48a4dff3 + + + + + + + + diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml new file mode 100644 index 0000000..d367d69 --- /dev/null +++ b/103120/portal/examples/response4.xml @@ -0,0 +1,38 @@ + + +
+ + XX + SENDER01 + + + XX + RECEIVER01 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2e + 2019-09-30T13:37:01.000000Z + + V1.3.1 + XX + v1.0 + +
+ + + + + 0 + + 7dbbc880-8750-4d3c-abe7-ea4a17646045 + + + + 1 + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + + + + diff --git a/103120/portal/schema/TS_103_280_v020401.xsd b/103120/portal/schema/TS_103_280_v020401.xsd new file mode 100644 index 0000000..1f32155 --- /dev/null +++ b/103120/portal/schema/TS_103_280_v020401.xsd @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/103120/portal/schema/ts_103120v010401p0_Authorisation.xsd b/103120/portal/schema/ts_103120v010401p0_Authorisation.xsd new file mode 100644 index 0000000..2f1dd90 --- /dev/null +++ b/103120/portal/schema/ts_103120v010401p0_Authorisation.xsd @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/ts_103120v010201p0_Common.xsd b/103120/portal/schema/ts_103120v010401p0_Common.xsd similarity index 72% rename from 103120/portal/ts_103120v010201p0_Common.xsd rename to 103120/portal/schema/ts_103120v010401p0_Common.xsd index d5d315c..6d023f2 100644 --- a/103120/portal/ts_103120v010201p0_Common.xsd +++ b/103120/portal/schema/ts_103120v010401p0_Common.xsd @@ -1,13 +1,13 @@ - - - + + + @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -39,16 +39,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -59,9 +59,9 @@ - - - - - + + + + + diff --git a/103120/portal/ts_103120v010201p0_Core.xsd b/103120/portal/schema/ts_103120v010401p0_Core.xsd similarity index 89% rename from 103120/portal/ts_103120v010201p0_Core.xsd rename to 103120/portal/schema/ts_103120v010401p0_Core.xsd index 9aa2c89..3dd81bc 100644 --- a/103120/portal/ts_103120v010201p0_Core.xsd +++ b/103120/portal/schema/ts_103120v010401p0_Core.xsd @@ -1,15 +1,15 @@ - - - - + + + @@ -87,6 +87,7 @@ + @@ -125,7 +126,7 @@ - + @@ -150,8 +151,13 @@ + + + + + - + diff --git a/103120/portal/schema/ts_103120v010401p0_Delivery.xsd b/103120/portal/schema/ts_103120v010401p0_Delivery.xsd new file mode 100644 index 0000000..2ef9d7b --- /dev/null +++ b/103120/portal/schema/ts_103120v010401p0_Delivery.xsd @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/schema/ts_103120v010401p0_Document.xsd b/103120/portal/schema/ts_103120v010401p0_Document.xsd new file mode 100644 index 0000000..d1de856 --- /dev/null +++ b/103120/portal/schema/ts_103120v010401p0_Document.xsd @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/schema/ts_103120v010401p0_Notification.xsd b/103120/portal/schema/ts_103120v010401p0_Notification.xsd new file mode 100644 index 0000000..40681ad --- /dev/null +++ b/103120/portal/schema/ts_103120v010401p0_Notification.xsd @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/ts_103120v010201p0_LITask.xsd b/103120/portal/schema/ts_103120v010401p0_Task.xsd similarity index 55% rename from 103120/portal/ts_103120v010201p0_LITask.xsd rename to 103120/portal/schema/ts_103120v010401p0_Task.xsd index d7b0d01..d5b190f 100644 --- a/103120/portal/ts_103120v010201p0_LITask.xsd +++ b/103120/portal/schema/ts_103120v010401p0_Task.xsd @@ -1,17 +1,17 @@ - - - - + + + + @@ -93,11 +93,11 @@ - - - - - + + + + + @@ -108,9 +108,72 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/portal/ts_103120v010201p0_Authorisation.xsd b/103120/portal/ts_103120v010201p0_Authorisation.xsd deleted file mode 100644 index 5cfd5b4..0000000 --- a/103120/portal/ts_103120v010201p0_Authorisation.xsd +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/103120/portal/ts_103120v010201p0_Dictionaries.xsd b/103120/portal/ts_103120v010201p0_Dictionaries.xsd deleted file mode 100644 index 0d3801e..0000000 --- a/103120/portal/ts_103120v010201p0_Dictionaries.xsd +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/103120/portal/ts_103120v010201p0_Document.xsd b/103120/portal/ts_103120v010201p0_Document.xsd deleted file mode 100644 index d51d545..0000000 --- a/103120/portal/ts_103120v010201p0_Document.xsd +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/103120/portal/ts_103120v010201p0_ETSIDictionaryDefinitions.xml b/103120/portal/ts_103120v010201p0_ETSIDictionaryDefinitions.xml deleted file mode 100644 index 3d9af00..0000000 --- a/103120/portal/ts_103120v010201p0_ETSIDictionaryDefinitions.xml +++ /dev/null @@ -1,367 +0,0 @@ - - - - ETSI - ObjectType - - - Authorisation - An Authorisation Object as defined in section 7.2 - - - Document - A Document Object as defined in section 7.3 - - - Notification - A Notification Object as defined in section 7.4 - - - Task - A Task Object as defined in section 8.2 - - - - - ETSI - AuthorisationLegalType - - - Manual - The implementation should consult the AuthorisationManualInformation field for details on the type of legal Authorisation - - - - - ETSI - AuthorisationPriority - - - High - An Authorisation has high priority - - - Routine - The Authorisation has a routine priority - - - - - ETSI - AuthorisationStatus - - - AwaitingApproval - Authorisation is still waiting approval from one or more relevant authorities - - - EmergencyApproval - The Authorisation has been approved under emergency procedures - - - Approved - The Authorisation has been approved by the relevant authorities - - - Rejected - The Authorisation has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Authorisation has been suspended temporarily - - - Cancelled - The Authorisation has been permanently cancelled - - - Expired - The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. - - - Invalid - The Authorisation is not active due to a problem with the current information populated in the Authorisation Object. - - - - - ETSI - AuthorisationDesiredStatus - - - AwaitingApproval - Authorisation is still waiting approval from one or more relevant authorities - - - EmergencyApproval - The Authorisation has been approved under emergency procedures - - - Approved - The Authorisation has been approved by the relevant authorities - - - Rejected - The Authorisation has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Authorisation has been suspended temporarily - - - Cancelled - The Authorisation has been permanently cancelled - - - Expired - The expiry date for this Authorisation has passed, meaning that the Authorisation has lapsed. - - - - - ETSI - AuthorisationFlag - - - IsEmergency - Indicates if the authorisation was issued under nationally-defined emergency procedures (e.g. orally). The circumstances and consequences for setting the field shall be defined by the relevant national profile - - - IsConsensual - Indicates that the current authorisation is for consensual interception. This may alter the process or documentation accompanying the authorisation - - - IsTest - Indicates that the current authorisation is given for test purposes. This may alter the process or documentation accompanying the authorisation - - - - - ETSI - DocumentStatus - - - AwaitingApproval - The Document is still waiting approval from one or more relevant authorities - - - Approved - The Document has been approved by the relevant authorities - - - Rejected - The Document has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Document has been suspended temporarily - - - Cancelled - The Document has been permanently cancelled - - - Expired - The expiry date for this Document has passed. - - - Invalid - The Document is invalid due to a problem with the current information populated in the Document Object. - - - - - ETSI - DocumentDesiredStatus - - - AwaitingApproval - The Document is still waiting approval from one or more relevant authorities - - - Approved - The Document has been approved by the relevant authorities - - - Rejected - The Document has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Document has been suspended temporarily - - - Cancelled - The Document has been permanently cancelled - - - Expired - The expiry date for this Document has passed. - - - - - ETSI - DocumentType - - - Warrant - This Document represents a legal Warrant - - - - - ETSI - NotificationType - - - General - A general notification that a change has occurred with the specified Objects - - - - - ETSI - TaskStatus - - - AwaitingApproval - The Task is still waiting approval from one or more relevant authorities - - - AwaitingProvisioning - The Task is approved, but is not yet provisioned in the LI system - - - Active - The Task is active and can produce LI traffic - - - Rejected - The Task has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Task has been suspended temporarily - - - Cancelled - The Task has been permanently cancelled - - - Expired - The Task date for this Document has passed, meaning that the Task has lapsed - - - Error - The Task is not active due to a problem with the underlying LI system - - - Invalid - The Task is not active due to a problem with the current information populated in the Task Object - - - - - ETSI - TaskDesiredStatus - - - AwaitingApproval - The Task is still waiting approval from one or more relevant authorities - - - AwaitingProvisioning - The Task is approved, but is not yet provisioned in the LI system - - - Active - The Task is active and can produce LI traffic - - - Rejected - The Task has been explicitly denied or rejected by one or more relevant authorities - - - Suspended - The Task has been suspended temporarily - - - Cancelled - The Task has been permanently cancelled - - - Expired - The Task date for this Document has passed, meaning that the Task has lapsed - - - - - ETSI - TaskServiceType - - - - ETSI - TaskDeliveryType - - - IRIOnly - Only IRI is delivered - - - CCOnly - Only CC is delivered - - - IRIandCC - Both IRI and CC is delivered - - - - - ETSI - HandoverFormat - - - TS102232-2 - Handed over in TS 102 232 part 2 format - - - TS102232-3 - Handed over in TS 102 232 part 3 format - - - TS102232-4 - Handed over in TS 102 232 part 4 format - - - TS102232-5 - Handed over in TS 102 232 part 5 format - - - TS102232-6 - Handed over in TS 102 232 part 6 format - - - TS102232-7 - Handed over in TS 102 232 part 7 format - - - - - ETSI - TaskFlag - - - IsTest - Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation - - - IsEmergency - Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) - - - - - diff --git a/103120/portal/ts_103120v010201p0_Notification.xsd b/103120/portal/ts_103120v010201p0_Notification.xsd deleted file mode 100644 index eeb86a1..0000000 --- a/103120/portal/ts_103120v010201p0_Notification.xsd +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/103120/schema/ts_103120_Authorisation.xsd b/103120/schema/ts_103120_Authorisation.xsd index 5cfd5b4..2f1dd90 100644 --- a/103120/schema/ts_103120_Authorisation.xsd +++ b/103120/schema/ts_103120_Authorisation.xsd @@ -1,59 +1,59 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/ts_103120_Common.xsd b/103120/schema/ts_103120_Common.xsd index d5d315c..6d023f2 100644 --- a/103120/schema/ts_103120_Common.xsd +++ b/103120/schema/ts_103120_Common.xsd @@ -1,13 +1,13 @@ - - - + + + @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -39,16 +39,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -59,9 +59,9 @@ - - - - - + + + + + diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index 9aa2c89..3dd81bc 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -1,15 +1,15 @@ - - - - + + + @@ -87,6 +87,7 @@ + @@ -125,7 +126,7 @@ - + @@ -150,8 +151,13 @@ + + + + + - + diff --git a/103120/schema/ts_103120_Delivery.xsd b/103120/schema/ts_103120_Delivery.xsd new file mode 100644 index 0000000..2ef9d7b --- /dev/null +++ b/103120/schema/ts_103120_Delivery.xsd @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/ts_103120_Document.xsd b/103120/schema/ts_103120_Document.xsd index d51d545..d1de856 100644 --- a/103120/schema/ts_103120_Document.xsd +++ b/103120/schema/ts_103120_Document.xsd @@ -1,65 +1,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/ts_103120_Notification.xsd b/103120/schema/ts_103120_Notification.xsd index eeb86a1..40681ad 100644 --- a/103120/schema/ts_103120_Notification.xsd +++ b/103120/schema/ts_103120_Notification.xsd @@ -1,34 +1,33 @@ - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/103120/schema/ts_103120_LITask.xsd b/103120/schema/ts_103120_Task.xsd similarity index 55% rename from 103120/schema/ts_103120_LITask.xsd rename to 103120/schema/ts_103120_Task.xsd index d7b0d01..d5b190f 100644 --- a/103120/schema/ts_103120_LITask.xsd +++ b/103120/schema/ts_103120_Task.xsd @@ -1,17 +1,17 @@ - - - - + + + + @@ -93,11 +93,11 @@ - - - - - + + + + + @@ -108,9 +108,72 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 599f56e9161c9731e78196a080fed76ee8bf575b Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:36:52 +0100 Subject: [PATCH 142/208] TS 102 657 v1.24.1 (2020-01-08) agreed at LI#52 (Turin, 2019-10-15) --- 102657/RDMessage.asn | 48 ++++++++++++--- 102657/RDMessage.xsd | 58 +++++++++++++++++-- ...{RDMessagever21.txt => RDMessagever22.txt} | 48 ++++++++++++--- ...{RDMessagever21.xsd => RDMessagever22.xsd} | 58 +++++++++++++++++-- 4 files changed, 186 insertions(+), 26 deletions(-) rename 102657/portal/{RDMessagever21.txt => RDMessagever22.txt} (98%) rename 102657/portal/{RDMessagever21.xsd => RDMessagever22.xsd} (98%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index b7f660b..ed3f2f7 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version21(21)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version22(22)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version21(21)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version22(22)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -414,7 +414,8 @@ GenericSubscriberInfo ::= SEQUENCE { organizationInfo [1] OrganizationInfo OPTIONAL, individualInfo [2] IndividualInfo OPTIONAL, - ... + ..., + contracts [3] SEQUENCE OF ContractInformation OPTIONAL } OrganizationInfo ::= SEQUENCE @@ -467,6 +468,16 @@ IndividualInfo ::= SEQUENCE -- time that subscriber account was created } +ContractInformation ::= SEQUENCE +{ + contractDesignation [1] UTF8String OPTIONAL, + contractNumber [2] UTF8String OPTIONAL, + otherInformation [3] UTF8String OPTIONAL, + timeSpan [4] TimeSpan OPTIONAL, + contractDocuments [5] SEQUENCE OF File OPTIONAL, + ... +} + PersonName ::= SEQUENCE { salutation [1] UTF8String OPTIONAL, @@ -1293,10 +1304,15 @@ Location ::= SEQUENCE nCGI [16] NCGI OPTIONAL, -- format as specified in 3GPP TS 38.413 [42]. n3gaLocation [17] OCTET STRING (SIZE (4)) OPTIONAL, - -- format as specified in 3GPP TS 29.571 [43] - trackingAreaIdentifier [18] OCTET STRING (SIZE (5..6)) OPTIONAL + -- The use of this parameter is not recommended, as it is not aligned + -- with the format specified in ETSI TS 129 571 [43] + -- The parameter n3gppaLocation should be used instead. + trackingAreaIdentifier [18] OCTET STRING (SIZE (5..6)) OPTIONAL, -- where: MCC+MNC = 3 octets, TAC (4G) = 2 octets or -- TAC (5G) = 3 octets and without length indicator + locationInformationSource [19] UTF8String OPTIONAL, + n3gppaLocation [20] N3gppaLocation OPTIONAL + -- format as specified in ETSI TS 129 571 [43] } NCGI ::= SEQUENCE @@ -1305,6 +1321,18 @@ NCGI ::= SEQUENCE nRCellID [2] NRCellID } +N3gppaLocation ::= SEQUENCE +{ + n3gppTai [1] OCTET STRING (SIZE (5..6)) OPTIONAL, + n3IwfId [2] OCTET STRING (SIZE (5)) OPTIONAL, + -- Composed of the PLMN-ID (3 octets) and the N3IWF ID (2 + -- octets) according to ETSI TS 138 413 clause 9.3.1.57. + ueIpv4Addr [3] IPAddress OPTIONAL, + ueIpv6Addr [4] IPAddress OPTIONAL, + portNumber [5] INTEGER OPTIONAL, + ... +} + NRCellID ::= BIT STRING (SIZE(36)) -- TS 38.413 [23], clause 9.3.1.7 @@ -1831,10 +1859,11 @@ SubscribedMultimediaServices ::= SEQUENCE registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL, allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL, - paymentTransactions [24] SEQUENCE OF MultimediaBillingRecords OPTIONAL + paymentTransactions [24] SEQUENCE OF MultimediaBillingRecords OPTIONAL, + sUPI [25] SUPI OPTIONAL, + gPSI [26] GPSI OPTIONAL } - MultimediaServiceType ::= ENUMERATED { private(0), @@ -2817,9 +2846,10 @@ AMFID ::= SEQUENCE AMFRegionID ::= INTEGER (0..255) -AMFSetID ::= INTEGER (0..63) +AMFSetID ::= INTEGER (0..1023) -AMFPointer ::= INTEGER (0..1023) +AMFPointer ::= INTEGER (0..63) END -- end of RDMessage + diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 98b86bf..da9edf3 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.23.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.24.1 @@ -612,10 +612,33 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -1435,6 +1458,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2335,13 +2383,13 @@ - + - + @@ -2707,6 +2755,8 @@ + + diff --git a/102657/portal/RDMessagever21.txt b/102657/portal/RDMessagever22.txt similarity index 98% rename from 102657/portal/RDMessagever21.txt rename to 102657/portal/RDMessagever22.txt index b7f660b..ed3f2f7 100644 --- a/102657/portal/RDMessagever21.txt +++ b/102657/portal/RDMessagever22.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version21(21)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version22(22)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version21(21)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version22(22)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -414,7 +414,8 @@ GenericSubscriberInfo ::= SEQUENCE { organizationInfo [1] OrganizationInfo OPTIONAL, individualInfo [2] IndividualInfo OPTIONAL, - ... + ..., + contracts [3] SEQUENCE OF ContractInformation OPTIONAL } OrganizationInfo ::= SEQUENCE @@ -467,6 +468,16 @@ IndividualInfo ::= SEQUENCE -- time that subscriber account was created } +ContractInformation ::= SEQUENCE +{ + contractDesignation [1] UTF8String OPTIONAL, + contractNumber [2] UTF8String OPTIONAL, + otherInformation [3] UTF8String OPTIONAL, + timeSpan [4] TimeSpan OPTIONAL, + contractDocuments [5] SEQUENCE OF File OPTIONAL, + ... +} + PersonName ::= SEQUENCE { salutation [1] UTF8String OPTIONAL, @@ -1293,10 +1304,15 @@ Location ::= SEQUENCE nCGI [16] NCGI OPTIONAL, -- format as specified in 3GPP TS 38.413 [42]. n3gaLocation [17] OCTET STRING (SIZE (4)) OPTIONAL, - -- format as specified in 3GPP TS 29.571 [43] - trackingAreaIdentifier [18] OCTET STRING (SIZE (5..6)) OPTIONAL + -- The use of this parameter is not recommended, as it is not aligned + -- with the format specified in ETSI TS 129 571 [43] + -- The parameter n3gppaLocation should be used instead. + trackingAreaIdentifier [18] OCTET STRING (SIZE (5..6)) OPTIONAL, -- where: MCC+MNC = 3 octets, TAC (4G) = 2 octets or -- TAC (5G) = 3 octets and without length indicator + locationInformationSource [19] UTF8String OPTIONAL, + n3gppaLocation [20] N3gppaLocation OPTIONAL + -- format as specified in ETSI TS 129 571 [43] } NCGI ::= SEQUENCE @@ -1305,6 +1321,18 @@ NCGI ::= SEQUENCE nRCellID [2] NRCellID } +N3gppaLocation ::= SEQUENCE +{ + n3gppTai [1] OCTET STRING (SIZE (5..6)) OPTIONAL, + n3IwfId [2] OCTET STRING (SIZE (5)) OPTIONAL, + -- Composed of the PLMN-ID (3 octets) and the N3IWF ID (2 + -- octets) according to ETSI TS 138 413 clause 9.3.1.57. + ueIpv4Addr [3] IPAddress OPTIONAL, + ueIpv6Addr [4] IPAddress OPTIONAL, + portNumber [5] INTEGER OPTIONAL, + ... +} + NRCellID ::= BIT STRING (SIZE(36)) -- TS 38.413 [23], clause 9.3.1.7 @@ -1831,10 +1859,11 @@ SubscribedMultimediaServices ::= SEQUENCE registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, privateUserIdentities [22] SEQUENCE OF IMPI OPTIONAL, allocatedDeviceIDs [23] SEQUENCE OF MultimediaDeviceID OPTIONAL, - paymentTransactions [24] SEQUENCE OF MultimediaBillingRecords OPTIONAL + paymentTransactions [24] SEQUENCE OF MultimediaBillingRecords OPTIONAL, + sUPI [25] SUPI OPTIONAL, + gPSI [26] GPSI OPTIONAL } - MultimediaServiceType ::= ENUMERATED { private(0), @@ -2817,9 +2846,10 @@ AMFID ::= SEQUENCE AMFRegionID ::= INTEGER (0..255) -AMFSetID ::= INTEGER (0..63) +AMFSetID ::= INTEGER (0..1023) -AMFPointer ::= INTEGER (0..1023) +AMFPointer ::= INTEGER (0..63) END -- end of RDMessage + diff --git a/102657/portal/RDMessagever21.xsd b/102657/portal/RDMessagever22.xsd similarity index 98% rename from 102657/portal/RDMessagever21.xsd rename to 102657/portal/RDMessagever22.xsd index 98b86bf..da9edf3 100644 --- a/102657/portal/RDMessagever21.xsd +++ b/102657/portal/RDMessagever22.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.23.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.24.1 @@ -612,10 +612,33 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -1435,6 +1458,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2335,13 +2383,13 @@ - + - + @@ -2707,6 +2755,8 @@ + + -- GitLab From 8b8ccec01c9bdcdff11de2b895148a0b4b215889 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:37:08 +0100 Subject: [PATCH 144/208] TS 103 707 v1.1.1 (2020-03-23) agreed at LI#53 (Sophia-Antipolis, 2020-02-04) --- 103707/TS_103_707_v010101.xsd | 172 ++++++++++++++++++ 103707/examples/FooServiceSchema.xsd | 27 +++ 103707/examples/example_binaryObject.xml | 48 +++++ 103707/examples/example_extended.xml | 69 +++++++ 103707/examples/example_simple.xml | 37 ++++ 103707/portal/TS_103_707_v010101.xsd | 172 ++++++++++++++++++ 103707/portal/examples/FooServiceSchema.xsd | 27 +++ .../portal/examples/example_binaryObject.xml | 48 +++++ 103707/portal/examples/example_extended.xml | 69 +++++++ 103707/portal/examples/example_simple.xml | 37 ++++ 103707/portal/testing/validate_examples.py | 46 +++++ 103707/testing/validate_examples.py | 46 +++++ 12 files changed, 798 insertions(+) create mode 100644 103707/TS_103_707_v010101.xsd create mode 100644 103707/examples/FooServiceSchema.xsd create mode 100644 103707/examples/example_binaryObject.xml create mode 100644 103707/examples/example_extended.xml create mode 100644 103707/examples/example_simple.xml create mode 100644 103707/portal/TS_103_707_v010101.xsd create mode 100644 103707/portal/examples/FooServiceSchema.xsd create mode 100644 103707/portal/examples/example_binaryObject.xml create mode 100644 103707/portal/examples/example_extended.xml create mode 100644 103707/portal/examples/example_simple.xml create mode 100644 103707/portal/testing/validate_examples.py create mode 100644 103707/testing/validate_examples.py diff --git a/103707/TS_103_707_v010101.xsd b/103707/TS_103_707_v010101.xsd new file mode 100644 index 0000000..7d857df --- /dev/null +++ b/103707/TS_103_707_v010101.xsd @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/103707/examples/FooServiceSchema.xsd b/103707/examples/FooServiceSchema.xsd new file mode 100644 index 0000000..59e2ff1 --- /dev/null +++ b/103707/examples/FooServiceSchema.xsd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/103707/examples/example_binaryObject.xml b/103707/examples/example_binaryObject.xml new file mode 100644 index 0000000..54655c5 --- /dev/null +++ b/103707/examples/example_binaryObject.xml @@ -0,0 +1,48 @@ + + + +
+ + + + + target@example.com + + true + + + + + someoneelse@example.com + + + + 2019-10-17T06:42:23.000000+01:00 + + + https://example.com/binaryData/e71d2da5-774a-4bca-8748-2a00b2e17892 + 1024 + image/jpeg + 2019-10-17T06:42:53.000000+01:00 + 8b7df143d91c716ecfa5fc1730022f6b421b05cedee8fd52b1fc65a96030ad52 + cat.jpeg + e71d2da5-774a-4bca-8748-2a00b2e17892 + + + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + Foo + Bar + Baz + + + + + + \ No newline at end of file diff --git a/103707/examples/example_extended.xml b/103707/examples/example_extended.xml new file mode 100644 index 0000000..194190e --- /dev/null +++ b/103707/examples/example_extended.xml @@ -0,0 +1,69 @@ + + + +
+ + 123 + 456 + +
+ + + + + someone@example.com + + + + + + someone-else-alias1@example.com + someone-else-alias2@example.com + someone-else-alias3@example.com + + + + + target@example.com + + true + + + 2019-10-17T06:42:23.000000+01:00 + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + + + + + + + + + + + + + + + + + + + + Foo + Bar + Baz + + + + + + \ No newline at end of file diff --git a/103707/examples/example_simple.xml b/103707/examples/example_simple.xml new file mode 100644 index 0000000..5281630 --- /dev/null +++ b/103707/examples/example_simple.xml @@ -0,0 +1,37 @@ + + + +
+ + + + + target@example.com + + true + + + + + someoneelse@example.com + + + + 2019-10-17T06:42:23.000000+01:00 + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + Foo + Bar + Baz + + + + + + \ No newline at end of file diff --git a/103707/portal/TS_103_707_v010101.xsd b/103707/portal/TS_103_707_v010101.xsd new file mode 100644 index 0000000..7d857df --- /dev/null +++ b/103707/portal/TS_103_707_v010101.xsd @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/103707/portal/examples/FooServiceSchema.xsd b/103707/portal/examples/FooServiceSchema.xsd new file mode 100644 index 0000000..59e2ff1 --- /dev/null +++ b/103707/portal/examples/FooServiceSchema.xsd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/103707/portal/examples/example_binaryObject.xml b/103707/portal/examples/example_binaryObject.xml new file mode 100644 index 0000000..54655c5 --- /dev/null +++ b/103707/portal/examples/example_binaryObject.xml @@ -0,0 +1,48 @@ + + + +
+ + + + + target@example.com + + true + + + + + someoneelse@example.com + + + + 2019-10-17T06:42:23.000000+01:00 + + + https://example.com/binaryData/e71d2da5-774a-4bca-8748-2a00b2e17892 + 1024 + image/jpeg + 2019-10-17T06:42:53.000000+01:00 + 8b7df143d91c716ecfa5fc1730022f6b421b05cedee8fd52b1fc65a96030ad52 + cat.jpeg + e71d2da5-774a-4bca-8748-2a00b2e17892 + + + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + Foo + Bar + Baz + + + + + + \ No newline at end of file diff --git a/103707/portal/examples/example_extended.xml b/103707/portal/examples/example_extended.xml new file mode 100644 index 0000000..194190e --- /dev/null +++ b/103707/portal/examples/example_extended.xml @@ -0,0 +1,69 @@ + + + +
+ + 123 + 456 + +
+ + + + + someone@example.com + + + + + + someone-else-alias1@example.com + someone-else-alias2@example.com + someone-else-alias3@example.com + + + + + target@example.com + + true + + + 2019-10-17T06:42:23.000000+01:00 + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + + + + + + + + + + + + + + + + + + + + Foo + Bar + Baz + + + + + + \ No newline at end of file diff --git a/103707/portal/examples/example_simple.xml b/103707/portal/examples/example_simple.xml new file mode 100644 index 0000000..5281630 --- /dev/null +++ b/103707/portal/examples/example_simple.xml @@ -0,0 +1,37 @@ + + + +
+ + + + + target@example.com + + true + + + + + someoneelse@example.com + + + + 2019-10-17T06:42:23.000000+01:00 + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + Foo + Bar + Baz + + + + + + \ No newline at end of file diff --git a/103707/portal/testing/validate_examples.py b/103707/portal/testing/validate_examples.py new file mode 100644 index 0000000..915de84 --- /dev/null +++ b/103707/portal/testing/validate_examples.py @@ -0,0 +1,46 @@ +import glob +import sys +from pathlib import Path +from pprint import pprint + +if __name__ == '__main__': + + if sys.version_info <= (3, 5): + sys.exit('ERROR: You need at least Python 3.5 to run this tool') + + try: + from lxml import etree + except ImportError: + sys.exit('ERROR: You need to install the Python lxml library') + + try: + import xmlschema + except ImportError: + sys.exit('ERROR: You need to install the xml schema library') + + + extraSchemas = [ + 'examples/FooServiceSchema.xsd', + 'TS_103_280_v020301.xsd' + ] + + locations = [] + for schemaFile in extraSchemas: + xs = xmlschema.XMLSchema(schemaFile, validation='skip') + locations.append((xs.default_namespace, str(Path(schemaFile)))) + + coreSchema = xmlschema.XMLSchema('TS_103_707_v010101.xsd', locations=locations) + + for schema in extraSchemas: + newSchema = xmlschema.XMLSchema(schema) + coreSchema.import_schema(newSchema.default_namespace, schema) + + examples = glob.glob('examples/*.xml') + for example in examples: + try: + coreSchema.validate(example) + print ("{0} passed validation".format(example)) + except Exception as ex: + print ("{0} failed validation: {1}".format(example, ex)) + + print ('Done') \ No newline at end of file diff --git a/103707/testing/validate_examples.py b/103707/testing/validate_examples.py new file mode 100644 index 0000000..915de84 --- /dev/null +++ b/103707/testing/validate_examples.py @@ -0,0 +1,46 @@ +import glob +import sys +from pathlib import Path +from pprint import pprint + +if __name__ == '__main__': + + if sys.version_info <= (3, 5): + sys.exit('ERROR: You need at least Python 3.5 to run this tool') + + try: + from lxml import etree + except ImportError: + sys.exit('ERROR: You need to install the Python lxml library') + + try: + import xmlschema + except ImportError: + sys.exit('ERROR: You need to install the xml schema library') + + + extraSchemas = [ + 'examples/FooServiceSchema.xsd', + 'TS_103_280_v020301.xsd' + ] + + locations = [] + for schemaFile in extraSchemas: + xs = xmlschema.XMLSchema(schemaFile, validation='skip') + locations.append((xs.default_namespace, str(Path(schemaFile)))) + + coreSchema = xmlschema.XMLSchema('TS_103_707_v010101.xsd', locations=locations) + + for schema in extraSchemas: + newSchema = xmlschema.XMLSchema(schema) + coreSchema.import_schema(newSchema.default_namespace, schema) + + examples = glob.glob('examples/*.xml') + for example in examples: + try: + coreSchema.validate(example) + print ("{0} passed validation".format(example)) + except Exception as ex: + print ("{0} failed validation: {1}".format(example, ex)) + + print ('Done') \ No newline at end of file -- GitLab From f37dd5be66e4988586c256be6e0bb169e5a43896 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:37:12 +0100 Subject: [PATCH 145/208] TS 103 120 v1.5.1 (2020-03-20) agreed at LI#53 (Sophia-Antipolis, 2020-02-04) --- 103120/examples/request1.xml | 2 +- 103120/examples/request2.xml | 2 +- 103120/examples/request3.xml | 2 +- 103120/examples/request4.xml | 2 +- ...ivery.xml => request5-Binary-Delivery.xml} | 27 +++--- 103120/examples/request5-XML-Delivery.xml | 82 +++++++++++++++++++ 103120/examples/response1.xml | 2 +- 103120/examples/response2.xml | 2 +- 103120/examples/response3.xml | 2 +- 103120/examples/response4.xml | 2 +- 103120/examples/response5.xml | 37 +++++++++ 103120/portal/examples/request1.xml | 2 +- 103120/portal/examples/request2.xml | 2 +- 103120/portal/examples/request3.xml | 2 +- 103120/portal/examples/request4.xml | 2 +- ...ivery.xml => request5-Binary-Delivery.xml} | 27 +++--- .../portal/examples/request5-XML-Delivery.xml | 82 +++++++++++++++++++ 103120/portal/examples/response1.xml | 2 +- 103120/portal/examples/response2.xml | 2 +- 103120/portal/examples/response3.xml | 2 +- 103120/portal/examples/response4.xml | 2 +- 103120/portal/examples/response5.xml | 37 +++++++++ ...d => ts_103120v010501p0_Authorisation.xsd} | 6 +- ...mmon.xsd => ts_103120v010501p0_Common.xsd} | 2 +- ...0_Core.xsd => ts_103120v010501p0_Core.xsd} | 13 ++- ...ry.xsd => ts_103120v010501p0_Delivery.xsd} | 50 +++++++++-- ...nt.xsd => ts_103120v010501p0_Document.xsd} | 6 +- ...sd => ts_103120v010501p0_Notification.xsd} | 6 +- ...0_Task.xsd => ts_103120v010501p0_Task.xsd} | 6 +- 103120/portal/validate_examples.py | 42 ++++++++++ 103120/schema/ts_103120_Authorisation.xsd | 6 +- 103120/schema/ts_103120_Common.xsd | 2 +- 103120/schema/ts_103120_Core.xsd | 13 ++- 103120/schema/ts_103120_Delivery.xsd | 50 +++++++++-- 103120/schema/ts_103120_Document.xsd | 6 +- 103120/schema/ts_103120_Notification.xsd | 6 +- 103120/schema/ts_103120_Task.xsd | 6 +- 103120/validate_examples.py | 42 ++++++++++ 38 files changed, 496 insertions(+), 90 deletions(-) rename 103120/examples/{response4-delivery.xml => request5-Binary-Delivery.xml} (76%) create mode 100644 103120/examples/request5-XML-Delivery.xml create mode 100644 103120/examples/response5.xml rename 103120/portal/examples/{response4-delivery.xml => request5-Binary-Delivery.xml} (76%) create mode 100644 103120/portal/examples/request5-XML-Delivery.xml create mode 100644 103120/portal/examples/response5.xml rename 103120/portal/schema/{ts_103120v010401p0_Authorisation.xsd => ts_103120v010501p0_Authorisation.xsd} (95%) rename 103120/portal/schema/{ts_103120v010401p0_Common.xsd => ts_103120v010501p0_Common.xsd} (98%) rename 103120/portal/schema/{ts_103120v010401p0_Core.xsd => ts_103120v010501p0_Core.xsd} (96%) rename 103120/portal/schema/{ts_103120v010401p0_Delivery.xsd => ts_103120v010501p0_Delivery.xsd} (62%) rename 103120/portal/schema/{ts_103120v010401p0_Document.xsd => ts_103120v010501p0_Document.xsd} (95%) rename 103120/portal/schema/{ts_103120v010401p0_Notification.xsd => ts_103120v010501p0_Notification.xsd} (91%) rename 103120/portal/schema/{ts_103120v010401p0_Task.xsd => ts_103120v010501p0_Task.xsd} (98%) create mode 100644 103120/portal/validate_examples.py create mode 100644 103120/validate_examples.py diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index 710f0f9..d6d9aba 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index 4f7ee5c..af4346d 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index f7d67d5..fb97577 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index 5de3a81..daa4b57 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.3.1 + V1.5.1 XX v1.0 diff --git a/103120/examples/response4-delivery.xml b/103120/examples/request5-Binary-Delivery.xml similarity index 76% rename from 103120/examples/response4-delivery.xml rename to 103120/examples/request5-Binary-Delivery.xml index 2f4136b..285d5e1 100644 --- a/103120/examples/response4-delivery.xml +++ b/103120/examples/request5-Binary-Delivery.xml @@ -12,17 +12,18 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.3.1 + V1.5.1 XX v1.0
- - - + + + 0 - + + 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e @@ -42,14 +43,16 @@ - PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4= - text/xml - d8ecb368c8dd3b353b775d5cd2cca7a621e9956ec3b150f445ce4d4d48a4dff3 + + VGhpcyBpc24ndCBhY3R1YWxseSBhbiBpbWFnZS4= + image/jpeg + 98ecb6a08c34a97f6edc0e97ddcd32cb139e2253825186a817ddb24997ccd68f + - - - - + + + + diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml new file mode 100644 index 0000000..989165e --- /dev/null +++ b/103120/examples/request5-XML-Delivery.xml @@ -0,0 +1,82 @@ + + +
+ + XX + SENDER01 + + + XX + RECEIVER01 + + 8854cfad-44ac-43b8-99ae-530b690b43da + 2019-09-30T13:37:37.000000Z + + V1.5.1 + XX + v1.0 + +
+ + + + + 0 + + 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e + + 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + ExampleLIID + + d1079830-8e9a-4731-8fb7-36b9b961eb72 + 1 + true + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + + + + + + + + + + + + + + + + + + + + + + + + Foo + Bar + Baz + + + + + + + + + + diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index e34e9e4..cc99dbc 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 37a3571..2f867c9 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index 59c09aa..3e48fb7 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index d367d69..ff14ab0 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.3.1 + V1.5.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml new file mode 100644 index 0000000..a4c69c9 --- /dev/null +++ b/103120/examples/response5.xml @@ -0,0 +1,37 @@ + + +
+ + XX + SENDER01 + + + XX + RECEIVER01 + + 8854cfad-44ac-43b8-99ae-530b690b43da + 2019-09-30T13:37:37.000000Z + + V1.5.1 + XX + v1.0 + +
+ + + + + 0 + + 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e + + + + + + diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml index 710f0f9..d6d9aba 100644 --- a/103120/portal/examples/request1.xml +++ b/103120/portal/examples/request1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml index 4f7ee5c..af4346d 100644 --- a/103120/portal/examples/request2.xml +++ b/103120/portal/examples/request2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml index f7d67d5..fb97577 100644 --- a/103120/portal/examples/request3.xml +++ b/103120/portal/examples/request3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml index 5de3a81..daa4b57 100644 --- a/103120/portal/examples/request4.xml +++ b/103120/portal/examples/request4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.3.1 + V1.5.1 XX v1.0 diff --git a/103120/portal/examples/response4-delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml similarity index 76% rename from 103120/portal/examples/response4-delivery.xml rename to 103120/portal/examples/request5-Binary-Delivery.xml index 2f4136b..285d5e1 100644 --- a/103120/portal/examples/response4-delivery.xml +++ b/103120/portal/examples/request5-Binary-Delivery.xml @@ -12,17 +12,18 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.3.1 + V1.5.1 XX v1.0
- - - + + + 0 - + + 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e @@ -42,14 +43,16 @@ - PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4= - text/xml - d8ecb368c8dd3b353b775d5cd2cca7a621e9956ec3b150f445ce4d4d48a4dff3 + + VGhpcyBpc24ndCBhY3R1YWxseSBhbiBpbWFnZS4= + image/jpeg + 98ecb6a08c34a97f6edc0e97ddcd32cb139e2253825186a817ddb24997ccd68f + - - - - + + + + diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml new file mode 100644 index 0000000..989165e --- /dev/null +++ b/103120/portal/examples/request5-XML-Delivery.xml @@ -0,0 +1,82 @@ + + +
+ + XX + SENDER01 + + + XX + RECEIVER01 + + 8854cfad-44ac-43b8-99ae-530b690b43da + 2019-09-30T13:37:37.000000Z + + V1.5.1 + XX + v1.0 + +
+ + + + + 0 + + 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e + + 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e + + 2b36a78b-b628-416d-bd22-404e68a0cd36 + + + ExampleLIID + + d1079830-8e9a-4731-8fb7-36b9b961eb72 + 1 + true + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + + + + + + + + + + + + + + + + + + + + + + + + Foo + Bar + Baz + + + + + + + + + + diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml index e34e9e4..cc99dbc 100644 --- a/103120/portal/examples/response1.xml +++ b/103120/portal/examples/response1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml index 37a3571..2f867c9 100644 --- a/103120/portal/examples/response2.xml +++ b/103120/portal/examples/response2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml index 59c09aa..3e48fb7 100644 --- a/103120/portal/examples/response3.xml +++ b/103120/portal/examples/response3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.2.1 + V1.5.1 XX v1.0 diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml index d367d69..ff14ab0 100644 --- a/103120/portal/examples/response4.xml +++ b/103120/portal/examples/response4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.3.1 + V1.5.1 XX v1.0 diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml new file mode 100644 index 0000000..a4c69c9 --- /dev/null +++ b/103120/portal/examples/response5.xml @@ -0,0 +1,37 @@ + + +
+ + XX + SENDER01 + + + XX + RECEIVER01 + + 8854cfad-44ac-43b8-99ae-530b690b43da + 2019-09-30T13:37:37.000000Z + + V1.5.1 + XX + v1.0 + +
+ + + + + 0 + + 71ff52ca-bcea-4fa3-b34e-1b89dcfb0d9e + + + + + + diff --git a/103120/portal/schema/ts_103120v010401p0_Authorisation.xsd b/103120/portal/schema/ts_103120v010501p0_Authorisation.xsd similarity index 95% rename from 103120/portal/schema/ts_103120v010401p0_Authorisation.xsd rename to 103120/portal/schema/ts_103120v010501p0_Authorisation.xsd index 2f1dd90..14b50d7 100644 --- a/103120/portal/schema/ts_103120v010401p0_Authorisation.xsd +++ b/103120/portal/schema/ts_103120v010501p0_Authorisation.xsd @@ -8,9 +8,9 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - - + + + diff --git a/103120/portal/schema/ts_103120v010401p0_Common.xsd b/103120/portal/schema/ts_103120v010501p0_Common.xsd similarity index 98% rename from 103120/portal/schema/ts_103120v010401p0_Common.xsd rename to 103120/portal/schema/ts_103120v010501p0_Common.xsd index 6d023f2..6ebf340 100644 --- a/103120/portal/schema/ts_103120v010401p0_Common.xsd +++ b/103120/portal/schema/ts_103120v010501p0_Common.xsd @@ -6,7 +6,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - + diff --git a/103120/portal/schema/ts_103120v010401p0_Core.xsd b/103120/portal/schema/ts_103120v010501p0_Core.xsd similarity index 96% rename from 103120/portal/schema/ts_103120v010401p0_Core.xsd rename to 103120/portal/schema/ts_103120v010501p0_Core.xsd index 3dd81bc..da3bc56 100644 --- a/103120/portal/schema/ts_103120v010401p0_Core.xsd +++ b/103120/portal/schema/ts_103120v010501p0_Core.xsd @@ -7,8 +7,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + @@ -75,6 +75,7 @@ + @@ -151,11 +152,17 @@ - + + + + + + + diff --git a/103120/portal/schema/ts_103120v010401p0_Delivery.xsd b/103120/portal/schema/ts_103120v010501p0_Delivery.xsd similarity index 62% rename from 103120/portal/schema/ts_103120v010401p0_Delivery.xsd rename to 103120/portal/schema/ts_103120v010501p0_Delivery.xsd index 2ef9d7b..5fb2536 100644 --- a/103120/portal/schema/ts_103120v010401p0_Delivery.xsd +++ b/103120/portal/schema/ts_103120v010501p0_Delivery.xsd @@ -8,9 +8,9 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - - + + + @@ -27,26 +27,58 @@ - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + diff --git a/103120/portal/schema/ts_103120v010401p0_Document.xsd b/103120/portal/schema/ts_103120v010501p0_Document.xsd similarity index 95% rename from 103120/portal/schema/ts_103120v010401p0_Document.xsd rename to 103120/portal/schema/ts_103120v010501p0_Document.xsd index d1de856..86b7192 100644 --- a/103120/portal/schema/ts_103120v010401p0_Document.xsd +++ b/103120/portal/schema/ts_103120v010501p0_Document.xsd @@ -8,9 +8,9 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - - + + + diff --git a/103120/portal/schema/ts_103120v010401p0_Notification.xsd b/103120/portal/schema/ts_103120v010501p0_Notification.xsd similarity index 91% rename from 103120/portal/schema/ts_103120v010401p0_Notification.xsd rename to 103120/portal/schema/ts_103120v010501p0_Notification.xsd index 40681ad..f52a502 100644 --- a/103120/portal/schema/ts_103120v010401p0_Notification.xsd +++ b/103120/portal/schema/ts_103120v010501p0_Notification.xsd @@ -8,9 +8,9 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - - + + + diff --git a/103120/portal/schema/ts_103120v010401p0_Task.xsd b/103120/portal/schema/ts_103120v010501p0_Task.xsd similarity index 98% rename from 103120/portal/schema/ts_103120v010401p0_Task.xsd rename to 103120/portal/schema/ts_103120v010501p0_Task.xsd index d5b190f..ed8974e 100644 --- a/103120/portal/schema/ts_103120v010401p0_Task.xsd +++ b/103120/portal/schema/ts_103120v010501p0_Task.xsd @@ -8,9 +8,9 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - - + + + diff --git a/103120/portal/validate_examples.py b/103120/portal/validate_examples.py new file mode 100644 index 0000000..60c611c --- /dev/null +++ b/103120/portal/validate_examples.py @@ -0,0 +1,42 @@ +import glob +import sys +from pathlib import Path +from pprint import pprint + +if __name__ == '__main__': + + if sys.version_info <= (3, 5): + sys.exit('ERROR: You need at least Python 3.5 to run this tool') + + try: + from lxml import etree + except ImportError: + sys.exit('ERROR: You need to install the Python lxml library') + + try: + import xmlschema + except ImportError: + sys.exit('ERROR: You need to install the xml schema library') + + + locations = [] + schemaFiles = glob.glob('schema/*.xsd') + for schemaFile in schemaFiles: + xs = xmlschema.XMLSchema(schemaFile, validation='skip') + locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) + + coreSchema = xmlschema.XMLSchema('schema/ts_103120v010501p0_Core.xsd', locations=locations) + + for schema in schemaFiles: + newSchema = xmlschema.XMLSchema(schema, locations=locations) + coreSchema.import_schema(newSchema.default_namespace, schema) + + examples = glob.glob('examples/*.xml') + for example in examples: + try: + coreSchema.validate(example) + print ("{0} passed validation".format(example)) + except Exception as ex: + print ("{0} failed validation: {1}".format(example, ex)) + + print ('Done') \ No newline at end of file diff --git a/103120/schema/ts_103120_Authorisation.xsd b/103120/schema/ts_103120_Authorisation.xsd index 2f1dd90..14b50d7 100644 --- a/103120/schema/ts_103120_Authorisation.xsd +++ b/103120/schema/ts_103120_Authorisation.xsd @@ -8,9 +8,9 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - - + + + diff --git a/103120/schema/ts_103120_Common.xsd b/103120/schema/ts_103120_Common.xsd index 6d023f2..6ebf340 100644 --- a/103120/schema/ts_103120_Common.xsd +++ b/103120/schema/ts_103120_Common.xsd @@ -6,7 +6,7 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - + diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index 3dd81bc..da3bc56 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -7,8 +7,8 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - + + @@ -75,6 +75,7 @@ + @@ -151,11 +152,17 @@ - + + + + + + + diff --git a/103120/schema/ts_103120_Delivery.xsd b/103120/schema/ts_103120_Delivery.xsd index 2ef9d7b..5fb2536 100644 --- a/103120/schema/ts_103120_Delivery.xsd +++ b/103120/schema/ts_103120_Delivery.xsd @@ -8,9 +8,9 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - - + + + @@ -27,26 +27,58 @@ - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + diff --git a/103120/schema/ts_103120_Document.xsd b/103120/schema/ts_103120_Document.xsd index d1de856..86b7192 100644 --- a/103120/schema/ts_103120_Document.xsd +++ b/103120/schema/ts_103120_Document.xsd @@ -8,9 +8,9 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - - + + + diff --git a/103120/schema/ts_103120_Notification.xsd b/103120/schema/ts_103120_Notification.xsd index 40681ad..f52a502 100644 --- a/103120/schema/ts_103120_Notification.xsd +++ b/103120/schema/ts_103120_Notification.xsd @@ -8,9 +8,9 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - - + + + diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd index d5b190f..ed8974e 100644 --- a/103120/schema/ts_103120_Task.xsd +++ b/103120/schema/ts_103120_Task.xsd @@ -8,9 +8,9 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> - - - + + + diff --git a/103120/validate_examples.py b/103120/validate_examples.py new file mode 100644 index 0000000..60c611c --- /dev/null +++ b/103120/validate_examples.py @@ -0,0 +1,42 @@ +import glob +import sys +from pathlib import Path +from pprint import pprint + +if __name__ == '__main__': + + if sys.version_info <= (3, 5): + sys.exit('ERROR: You need at least Python 3.5 to run this tool') + + try: + from lxml import etree + except ImportError: + sys.exit('ERROR: You need to install the Python lxml library') + + try: + import xmlschema + except ImportError: + sys.exit('ERROR: You need to install the xml schema library') + + + locations = [] + schemaFiles = glob.glob('schema/*.xsd') + for schemaFile in schemaFiles: + xs = xmlschema.XMLSchema(schemaFile, validation='skip') + locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) + + coreSchema = xmlschema.XMLSchema('schema/ts_103120v010501p0_Core.xsd', locations=locations) + + for schema in schemaFiles: + newSchema = xmlschema.XMLSchema(schema, locations=locations) + coreSchema.import_schema(newSchema.default_namespace, schema) + + examples = glob.glob('examples/*.xml') + for example in examples: + try: + coreSchema.validate(example) + print ("{0} passed validation".format(example)) + except Exception as ex: + print ("{0} failed validation: {1}".format(example, ex)) + + print ('Done') \ No newline at end of file -- GitLab From 98f74ed30da21494ed33ecbfa5c1ba5140bd0e26 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:37:16 +0100 Subject: [PATCH 146/208] TS 102 657 v1.25.1 (2020-03-17) agreed at LI#53 (Sophia-Antipolis, 2020-02-04) --- 102657/RDMessage.asn | 35 +++++++++++++------ 102657/RDMessage.xsd | 24 +++++++++++-- ...{RDMessagever22.txt => RDMessagever23.txt} | 35 +++++++++++++------ ...{RDMessagever22.xsd => RDMessagever23.xsd} | 24 +++++++++++-- 4 files changed, 92 insertions(+), 26 deletions(-) rename 102657/portal/{RDMessagever22.txt => RDMessagever23.txt} (99%) rename 102657/portal/{RDMessagever22.xsd => RDMessagever23.xsd} (99%) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index ed3f2f7..e806118 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version22(22)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version23(23)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version22(22)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version23(23)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -1240,18 +1240,22 @@ TransmitterDetails ::= SEQUENCE TransmitterTechnology ::= ENUMERATED { - gen2G(0), -- This corresponds to GERAN in 3GPP TS 29.274 [32] - gen3G(1), -- This corresponds to UTRAN in 3GPP TS 29.274 [32] + gen2G(0), -- This corresponds to GERAN in ETSI TS 129 274 [32] + gen3G(1), -- This corresponds to UTRAN in ETSI TS 129 274 [32] ..., eUTRAN(2), wLAN(3), hSPAEvolution(4), gAN(5), - vIRTUAL(6) - -- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the - -- enumeration values (0 to 6) are not. + vIRTUAL(6), + eUTRANNBIoT(7), + lTEM(8), + nR(9) + -- Note that the labels are taken from ETSI TS 129 274 [32] v15.9.0 clause 8.17, though the + -- enumeration values (0 to 9) are not. } + NationalTransmitterDetails ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1311,8 +1315,9 @@ Location ::= SEQUENCE -- where: MCC+MNC = 3 octets, TAC (4G) = 2 octets or -- TAC (5G) = 3 octets and without length indicator locationInformationSource [19] UTF8String OPTIONAL, - n3gppaLocation [20] N3gppaLocation OPTIONAL - -- format as specified in ETSI TS 129 571 [43] + n3gppaLocation [20] N3gppaLocation OPTIONAL, + -- format as specified in ETSI TS 129 571 [43] + transmitterDetails [21] TransmitterDetails OPTIONAL } NCGI ::= SEQUENCE @@ -2289,7 +2294,8 @@ NAServiceSubscription ::= SEQUENCE registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, paymentTransactions [22] SEQUENCE OF BillingRecords OPTIONAL, sUPI [23] SUPI OPTIONAL, - gPSI [24] GPSI OPTIONAL + gPSI [24] GPSI OPTIONAL, + timedIPAddresses [25] SEQUENCE OF TimedIPAddress OPTIONAL } @@ -2799,6 +2805,15 @@ IPMask ::= SEQUENCE mask [1] IPAddress } +TimedIPAddress ::= SEQUENCE +{ + iPAddressSetOrRangeOrMask [0] IPAddressSetOrRangeOrMask, + validity [1] TimeSpan, + -- Time period during which the information given in this structure is or was valid. + ... + +} + NABillingDetails ::= SEQUENCE { subscriberID [1] NaSubscriberID OPTIONAL, diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index da9edf3..0f6a4b5 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.24.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.25.1 @@ -380,6 +380,13 @@ + + + + + + + @@ -1460,6 +1467,7 @@ + @@ -1476,7 +1484,7 @@ - + @@ -1607,6 +1615,9 @@ + + + @@ -1931,6 +1942,13 @@ + + + + + + + diff --git a/102657/portal/RDMessagever22.txt b/102657/portal/RDMessagever23.txt similarity index 99% rename from 102657/portal/RDMessagever22.txt rename to 102657/portal/RDMessagever23.txt index ed3f2f7..e806118 100644 --- a/102657/portal/RDMessagever22.txt +++ b/102657/portal/RDMessagever23.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version22(22)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version23(23)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version22(22)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version23(23)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -1240,18 +1240,22 @@ TransmitterDetails ::= SEQUENCE TransmitterTechnology ::= ENUMERATED { - gen2G(0), -- This corresponds to GERAN in 3GPP TS 29.274 [32] - gen3G(1), -- This corresponds to UTRAN in 3GPP TS 29.274 [32] + gen2G(0), -- This corresponds to GERAN in ETSI TS 129 274 [32] + gen3G(1), -- This corresponds to UTRAN in ETSI TS 129 274 [32] ..., eUTRAN(2), wLAN(3), hSPAEvolution(4), gAN(5), - vIRTUAL(6) - -- Note that the labels are taken from 3GPP TS 29.274 [32] v12.3.0 clause 8.17, though the - -- enumeration values (0 to 6) are not. + vIRTUAL(6), + eUTRANNBIoT(7), + lTEM(8), + nR(9) + -- Note that the labels are taken from ETSI TS 129 274 [32] v15.9.0 clause 8.17, though the + -- enumeration values (0 to 9) are not. } + NationalTransmitterDetails ::= SEQUENCE { countryCode [1] UTF8String (SIZE (2)), @@ -1311,8 +1315,9 @@ Location ::= SEQUENCE -- where: MCC+MNC = 3 octets, TAC (4G) = 2 octets or -- TAC (5G) = 3 octets and without length indicator locationInformationSource [19] UTF8String OPTIONAL, - n3gppaLocation [20] N3gppaLocation OPTIONAL - -- format as specified in ETSI TS 129 571 [43] + n3gppaLocation [20] N3gppaLocation OPTIONAL, + -- format as specified in ETSI TS 129 571 [43] + transmitterDetails [21] TransmitterDetails OPTIONAL } NCGI ::= SEQUENCE @@ -2289,7 +2294,8 @@ NAServiceSubscription ::= SEQUENCE registeredICCIDs [21] SEQUENCE OF ICCIDInfo OPTIONAL, paymentTransactions [22] SEQUENCE OF BillingRecords OPTIONAL, sUPI [23] SUPI OPTIONAL, - gPSI [24] GPSI OPTIONAL + gPSI [24] GPSI OPTIONAL, + timedIPAddresses [25] SEQUENCE OF TimedIPAddress OPTIONAL } @@ -2799,6 +2805,15 @@ IPMask ::= SEQUENCE mask [1] IPAddress } +TimedIPAddress ::= SEQUENCE +{ + iPAddressSetOrRangeOrMask [0] IPAddressSetOrRangeOrMask, + validity [1] TimeSpan, + -- Time period during which the information given in this structure is or was valid. + ... + +} + NABillingDetails ::= SEQUENCE { subscriberID [1] NaSubscriberID OPTIONAL, diff --git a/102657/portal/RDMessagever22.xsd b/102657/portal/RDMessagever23.xsd similarity index 99% rename from 102657/portal/RDMessagever22.xsd rename to 102657/portal/RDMessagever23.xsd index da9edf3..0f6a4b5 100644 --- a/102657/portal/RDMessagever22.xsd +++ b/102657/portal/RDMessagever23.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.24.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.25.1 @@ -380,6 +380,13 @@ + + + + + + + @@ -1460,6 +1467,7 @@ + @@ -1476,7 +1484,7 @@ - + @@ -1607,6 +1615,9 @@ + + + @@ -1931,6 +1942,13 @@ + + + + + + + -- GitLab From d09bb6cdbd492d40ed41c6d47d34127ef6be1315 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 16 Sep 2020 14:21:30 +0200 Subject: [PATCH 147/208] Merge branch 'cr/ts_103120/009' into 'meeting/LI#54e' Update ts_103120_ETSIDictionaryDefinitions.xml See merge request li/trial!11 --- 102232-3/IPAccessPDU.asn | 8 +- 102657/RDMessage.asn | 121 ++++++++++++------ 102657/RDMessage.xsd | 38 +++++- .../ts_103120_ETSIDictionaryDefinitions.xml | 42 +++++- 103120/validate_examples.py | 2 +- 5 files changed, 159 insertions(+), 52 deletions(-) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index e4813de..5c84c65 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -6,7 +6,7 @@ BEGIN IMPORTS -- from ETSI TS 102 232-1 [2] - IPAddress + IPAddress, Location FROM LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; @@ -53,7 +53,7 @@ IPIRIContents ::= SEQUENCE { accessEventType [0] AccessEventType, targetUsername [1] OCTET STRING, - -- in ASCIIcharacters + -- in ASCII-characters internetAccessType [2] InternetAccessType, iPVersion [3] IPVersion, targetIPAddress [4] IPAddress OPTIONAL, @@ -126,7 +126,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The Access_attempt timed-out or failed otherwise + -- The accessAttempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4) sessionEnd(5), @@ -241,7 +241,7 @@ OtherTargetIdentifiers ::= CHOICE -- This list is extensible to accommodate other target identifiers which -- may be required in future. iPAddress [0] IPAddress, - -- IPAddress imported from TS 101 671 [1]. + -- IPAddress imported from TS 102 232 [2]. -- This can be an IPv4 address (with or without a subnet range defined) or -- an IPv6 address (with or without a prefix range defined). ... diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index e806118..9f4ff32 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version23(23)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version24(24)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version23(23)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version24(24)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -665,10 +665,13 @@ ICCIDInfo ::= SEQUENCE -- PUK2 code associated with the ICCID iMSI [5] IMSI OPTIONAL, sUPI [6] SUPI OPTIONAL, - gPSI [7] GPSI OPTIONAL + gPSI [7] GPSI OPTIONAL, + eID [8] NumericString (SIZE (32)) OPTIONAL + -- Identifier of the eUICC according to GSMA SGP.02, clause 2.2.2 [53] } + LoginInfo ::= SEQUENCE { login [1] UTF8String OPTIONAL, @@ -1322,10 +1325,12 @@ Location ::= SEQUENCE NCGI ::= SEQUENCE { - pLMNID [1] PLMNID, - nRCellID [2] NRCellID + pLMNID [1] PLMNID, + nRCellID [2] NRCellID, + ... } + N3gppaLocation ::= SEQUENCE { n3gppTai [1] OCTET STRING (SIZE (5..6)) OPTIONAL, @@ -2517,9 +2522,13 @@ NwAccessType ::= ENUMERATED wimax(6), mobilePacketData(7), -- Network access over GSM/3GPP GPRS, UMTS, etc. - ... + ..., + gPON(8) + -- Gigabit capable Passive Optical Network access, based on Optical Line Terminal, + -- see ITU-T G.984-1 [54] } + DialUpInformation ::= SEQUENCE { diallingNumber [1] PartyNumber OPTIONAL, @@ -2583,10 +2592,12 @@ EPSInformation ::= SEQUENCE -- RAT Type coding according to ETSI TS 129 274 [32] clause 8.17 -- NOTE - as of v1.23.1 of the present document, this field has changed to optional ePSEvent [15] EPSEvent OPTIONAL, - ... + ..., + uERadioCapID [16] UERadioCapID OPTIONAL } + IMSIUnauthenticatedFlag ::= BOOLEAN -- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI @@ -2628,59 +2639,65 @@ EPSEvent ::= ENUMERATED FIVEGSInformation ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - dNN [2] UTF8String OPTIONAL, - gPSI [3] GPSI OPTIONAL, - pEI [4] PEI OPTIONAL, + sUPI [1] SUPI OPTIONAL, + dNN [2] UTF8String OPTIONAL, + gPSI [3] GPSI OPTIONAL, + pEI [4] PEI OPTIONAL, pDUSessionID [6] INTEGER (0..255) OPTIONAL, - sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL, + sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL, pDUIpv4Address [8] IPAddress OPTIONAL, pDUIpv6Address [9] IPAddress OPTIONAL, - pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL, - rFSPIndex [11] INTEGER (1..255) OPTIONAL, + pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL, + rFSPIndex [11] INTEGER (1..255) OPTIONAL, applicationId [12] UTF8String OPTIONAL, - applicationServiceProviderIdentity [13] UTF8String OPTIONAL, - serviceId [14] INTEGER OPTIONAL, - chargingId [15] UTF8String OPTIONAL, - pDUType [16] PDUSessionType OPTIONAL, - sSCMode [17] SSCMode OPTIONAL, - vPLMNId [18] PLMNID OPTIONAL, - hPLMNId [19] PLMNID OPTIONAL, - chargingCharacteristics [20] UTF8String OPTIONAL, - chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL, + applicationServiceProviderIdentity [13] UTF8String OPTIONAL, + serviceId [14] INTEGER OPTIONAL, + chargingId [15] UTF8String OPTIONAL, + pDUType [16] PDUSessionType OPTIONAL, + sSCMode [17] SSCMode OPTIONAL, + vPLMNId [18] PLMNID OPTIONAL, + hPLMNId [19] PLMNID OPTIONAL, + chargingCharacteristics [20] UTF8String OPTIONAL, + chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL, pDUSessionStartTime [22] GeneralizedTime OPTIONAL, pDUSessionStopTime [23] GeneralizedTime OPTIONAL, - lowPriorityIndicator [24] BOOLEAN OPTIONAL, + lowPriorityIndicator [24] BOOLEAN OPTIONAL, dataOffStatus [25] BOOLEAN OPTIONAL, - diagnostics [26] INTEGER OPTIONAL, - uETimeZone [27] UTF8String OPTIONAL, - uPFAddress [28] IPAddress OPTIONAL, - aMFAddress [29] IPAddress OPTIONAL, - uDMAddress [30] IPAddress OPTIONAL, - sMFAddress [31] IPAddress OPTIONAL, - uPFId [32] UUID OPTIONAL, + diagnostics [26] INTEGER OPTIONAL, + uETimeZone [27] UTF8String OPTIONAL, + uPFAddress [28] IPAddress OPTIONAL, + aMFAddress [29] IPAddress OPTIONAL, + uDMAddress [30] IPAddress OPTIONAL, + sMFAddress [31] IPAddress OPTIONAL, + uPFId [32] UUID OPTIONAL, aMFIdentifier [33] AMFID OPTIONAL, uDMIdentifier [34] UUID OPTIONAL, sMFIdentifier [35] UUID OPTIONAL, uPFPDNAddress [36] IPAddress OPTIONAL, - uPFPDNAddressExtension [37] IPAddress OPTIONAL, + uPFPDNAddressExtension [37] IPAddress OPTIONAL, dynamicAddressFlag [38] BOOLEAN OPTIONAL, - dynamicAddressFlagExt [39] BOOLEAN OPTIONAL, - rAT5Type [40] RAT5Type OPTIONAL, - flowQosInfo [41] OCTET STRING OPTIONAL, - serviceID [42] INTEGER OPTIONAL - + dynamicAddressFlagExt [39] BOOLEAN OPTIONAL, + rAT5Type [40] RAT5Type OPTIONAL, + flowQosInfo [41] OCTET STRING OPTIONAL, + serviceID [42] INTEGER OPTIONAL, + ..., + uERadioCapID [43] UERadioCapID OPTIONAL, + rANSecondaryRATType [44] RAT5Type OPTIONAL } + + PDUSessionType ::= ENUMERATED { iPv4(1), iPv6(2), iPv4v6(3), unstructured(4), - ethernet(5) + ethernet(5), + ... } + -- ==================================== -- Definitions of Network Access Device -- ==================================== @@ -2699,9 +2716,11 @@ NADevice ::= SEQUENCE dslID [5] UTF8String OPTIONAL, imei [6] IMEI OPTIONAL, ..., - subscriberID [7] NaSubscriberID OPTIONAL + subscriberID [7] NaSubscriberID OPTIONAL, + uERadioCapID [8] UERadioCapID OPTIONAL } + SUPI ::= CHOICE { iMSI [1] IMSI, @@ -2719,9 +2738,11 @@ GPSI ::= CHOICE PEI ::= CHOICE { iMEI [1] IMEI, - iMEISV [2] IMEISV + iMEISV [2] IMEISV, + ... } + IMEI ::= OCTET STRING (SIZE(8)) -- format as per 3GPP TS 09.02 [8] -- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even @@ -2734,6 +2755,9 @@ IMSI ::= OCTET STRING (SIZE(3..8)) NAI ::= UTF8String +UERadioCapID ::= UTF8String (SIZE(12..22)) + -- format as per ETSI TS 123 003 [41] clause 29.2 + -- ====================================== -- Definitions of Message Network element -- ====================================== @@ -2849,14 +2873,27 @@ RAT5Type ::= ENUMERATED eutra(2), wlan(3), virtual(4), - ... + ..., + nBIoT(5), + wireline(6), + wirelineCable(7), + wirelineDSL(8), + wirelinePON(9), + lTEM(10), + nRU(11), + eUTRAU(12), + trustedN3GA(13), + trustedWLAN(14), + uTRA(15), + gERA(16) } AMFID ::= SEQUENCE { aMFRegionID [1] AMFRegionID, aMFSetID [2] AMFSetID, - aMFPointer [3] AMFPointer + aMFPointer [3] AMFPointer, + ... } AMFRegionID ::= INTEGER (0..255) diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index 0f6a4b5..f075f34 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.25.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.26.1 @@ -282,6 +282,7 @@ + @@ -665,6 +666,14 @@ + + + + + + + + @@ -1498,7 +1507,7 @@ - + @@ -2251,6 +2260,7 @@ + @@ -2354,6 +2364,9 @@ + + + @@ -2381,6 +2394,18 @@ + + + + + + + + + + + + @@ -2435,6 +2460,7 @@ + @@ -3240,4 +3266,10 @@ + + + + + + diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 477914c..1a463ac 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -18,8 +18,16 @@ Task - A Task Object as defined in section 8.2 - + An LI Task Object as defined in section 8.2 + + + LDTask + An LD Task Object as defined in section 8.3 + + + Delivery + A Delivery Object as defined in section 10 + @@ -361,6 +369,36 @@ IsEmergency Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + IsNonLocal + Indicates that the current Task shall be intercepted as a non-local identity. + + + IsLocal + Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed. + + + ETSI + LDHandoverFormat + + + TS102657 + Handed over in ETSI TS 102 657 format, using HI-B + + + EncapsulatedTS102657 + Handed over as ETSI TS 102 657 format using the DeliveryObject as described in clause 10 + + + TS103120 + Handed over using the DeliveryObject as described in clause 10 + + + TS103707 + Handed over as ETSI TS 103 707, using the DeliveryObject as described in clause 10 + + + diff --git a/103120/validate_examples.py b/103120/validate_examples.py index 60c611c..7aae339 100644 --- a/103120/validate_examples.py +++ b/103120/validate_examples.py @@ -25,7 +25,7 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - coreSchema = xmlschema.XMLSchema('schema/ts_103120v010501p0_Core.xsd', locations=locations) + coreSchema = xmlschema.XMLSchema('schema/ts_103120v010601p0_Core.xsd', locations=locations) for schema in schemaFiles: newSchema = xmlschema.XMLSchema(schema, locations=locations) -- GitLab From 762d82393132de0a7e36ce6d3db325eeb6523354 Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 28 Sep 2020 13:42:52 +0200 Subject: [PATCH 148/208] Merge branch 'cr/ts_102232-3/038' into 'meeting/LI#55e' Update IPAccessPDU.asn as per LI(20)P55006r1 See merge request li/trial!17 --- 102232-1/LI-PS-PDU.asn | 18 +++--- 102232-3/IPAccessPDU.asn | 56 +++++++++++++------ .../mutliple-auth-example-request.xml | 51 +++++++++++++++++ 103120/examples/request1.xml | 4 +- 103120/examples/request2.xml | 4 +- 103120/examples/request3.xml | 4 +- 103120/examples/request4.xml | 4 +- 103120/examples/request5-Binary-Delivery.xml | 4 +- 103120/examples/request5-XML-Delivery.xml | 4 +- 103120/examples/response1.xml | 4 +- 103120/examples/response2.xml | 4 +- 103120/examples/response3.xml | 4 +- 103120/examples/response4.xml | 4 +- 103120/examples/response5.xml | 4 +- 103120/portal/examples/request1.xml | 4 +- 103120/portal/examples/request2.xml | 4 +- 103120/portal/examples/request3.xml | 4 +- 103120/portal/examples/request4.xml | 4 +- .../examples/request5-Binary-Delivery.xml | 4 +- .../portal/examples/request5-XML-Delivery.xml | 4 +- 103120/portal/examples/response1.xml | 4 +- 103120/portal/examples/response2.xml | 4 +- 103120/portal/examples/response3.xml | 4 +- 103120/portal/examples/response4.xml | 4 +- 103120/portal/examples/response5.xml | 4 +- 103120/schema/ts_103120_Authorisation.xsd | 6 +- 103120/schema/ts_103120_Document.xsd | 6 +- 103120/schema/ts_103120_Task.xsd | 8 +-- 103120/validate_examples.py | 9 ++- 29 files changed, 164 insertions(+), 78 deletions(-) create mode 100644 103120/examples/mutliple-auth-example-request.xml diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 6def9ef..e8b6eed 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)} DEFINITIONS IMPLICIT TAGS ::= @@ -54,7 +54,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)} -- from ETSI TS 102 232-6 [36] PstnIsdnCC, @@ -199,7 +199,9 @@ IMPORTS -- This import is only used for the handover between LEMFs. -- from 3GPP TS 33.128 [46] - LINotificationPayload + LINotificationPayload, + IRIPayload, + CCPayload FROM TS33128Payloads {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; -- The relevant module (including the 3GPP release and version number) @@ -213,7 +215,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version30(30)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version31(31)} -- ==================== -- Top-level definition @@ -270,7 +272,7 @@ TimeStampQualifier ::= ENUMERATED HI4Payload ::= CHOICE { - threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload, + threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload, ... } @@ -355,7 +357,8 @@ CCContents ::= CHOICE voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU, cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, - threeGPP33128DefinedCC [23] OCTET STRING } + threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload) +} MicroSecondTimeStamp ::= SEQUENCE { @@ -420,7 +423,8 @@ IRIContents ::= CHOICE confIRI [16] ConfIRI, proseIRI [17] ProSeIRI, gcseIRI [18] GcseIRI, - threeGPP33128DefinedIRI [19] OCTET STRING} + threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) +} UMTSIRI ::= CHOICE -- This structure may be commented out if not used diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 5c84c65..2461f42 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,12 +1,13 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS + -- from ETSI TS 102 232-1 [2] - IPAddress, + IPAddress, Location FROM LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; @@ -16,11 +17,12 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRIOnly(3)} - -- all three definitions relative to {itu-t(0) identified-organization(4) - -- etsi(0) securityDomain(2) lawfulintercept(2)} +iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14)} +iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} +iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} + -- all four definitions relative to {itu-t(0) identified-organization(4) + -- etsi(0) securityDomain(2) lawfulintercept(2)} -- ========================== -- IP Communications Contents @@ -53,12 +55,12 @@ IPIRIContents ::= SEQUENCE { accessEventType [0] AccessEventType, targetUsername [1] OCTET STRING, - -- in ASCII-characters + -- in ASCII characters internetAccessType [2] InternetAccessType, iPVersion [3] IPVersion, targetIPAddress [4] IPAddress OPTIONAL, -- IP address may not be available in case of failed logon attempts. - -- If it is available, it must be sent. + -- If it is available, it shall be sent. -- This field will carry the first IPv4 or IPv6 target IP address with or without -- subnet. Use of this field is fully described in section 6.2.1. targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, @@ -112,9 +114,7 @@ IPIRIContents ::= SEQUENCE -- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]: -- This parameter shall be populated with the RADIUS value. framedRoutes [26] SEQUENCE OF FramedRoute OPTIONAL - -- It is used to list all the available Framed Route and Framed IPv6 Route information - - + -- It is used to list all the available Framed Route and Framed IPv6 Route informationX } AccessEventType ::= ENUMERATED @@ -141,6 +141,7 @@ AccessEventType ::= ENUMERATED endOfInterceptionWithSessionActive(9), -- LI is ended on a target who still has an active session unknown(10) + } InternetAccessType ::= ENUMERATED @@ -199,7 +200,7 @@ IPIRIIDType ::= CHOICE printableIDType [0] UTF8String (SIZE (1..128)), -- For printable userIDs, such as the Radius username, phonenumbers macAddressType [1] OCTET STRING (SIZE (6)), - -- For MAC address types, raw binary format as in RFC 2132 [15] + -- For MAC address types, raw binary format as in IETF RFC 2132 [15] ipAddressType [2] IPAddress, -- For IP address types ... @@ -241,12 +242,13 @@ OtherTargetIdentifiers ::= CHOICE -- This list is extensible to accommodate other target identifiers which -- may be required in future. iPAddress [0] IPAddress, - -- IPAddress imported from TS 102 232 [2]. + -- IPAddress imported from ETSI TS 102 232 [2]. -- This can be an IPv4 address (with or without a subnet range defined) or -- an IPv6 address (with or without a prefix range defined). ... } + FramedRoute ::= CHOICE { -- Additional Framed Route prefix information associated with the target service @@ -268,9 +270,10 @@ IPIRIOnly ::= SEQUENCE { iPIRIOnlyObjId [0] RELATIVE-OID, iPInformation [1] IPInformation, - protocolInformation [2] ProtocolInformation, + protocolInformation [2] ProtocolInformation, iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL, iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL, + pDSRInformation [5] PDSRInformation OPTIONAL, ... } @@ -339,5 +342,26 @@ UDPInformation ::= SEQUENCE checkSum [3] OCTET STRING (SIZE (2))OPTIONAL } -END -- end of IPAccessPDU +PDSRInformation::= SEQUENCE +{ + summaryTrigger [0] PDSRSummaryTrigger, + firstPacketTimestamp [1] GeneralizedTime, + lastPacketTimestamp [2] GeneralizedTime, + packetCount [3] INTEGER, + byteCount [4] INTEGER, + ... +} + +PDSRSummaryTrigger ::= ENUMERATED +{ + startOfFlow(0), + timerExpiry(1), + packetCount(2), + byteCount(3), + endOfFlow(4), + ... +} + + +END -- end of IPAccessPDU diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml new file mode 100644 index 0000000..198e00a --- /dev/null +++ b/103120/examples/mutliple-auth-example-request.xml @@ -0,0 +1,51 @@ + + +
+ + XX + Sender + + + XX + Receiver + + d442c58c-d5e1-4fd9-90ec-9c228ad947f1 + 2020-09-22T08:06:17.025833Z + + V1.7.1 + XX + v1.1.1 + +
+ + + + + 1 + + + cd3994b1-e5f3-4b59-a852-5fecd02bd247 + + Single Approval + + + + + + 2 + + + 64e8681a-a4de-4dea-9686-4a2a15e54786 + + First of two approvals + + + Second of two approvals + + + + + + + + \ No newline at end of file diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index d6d9aba..34ecaed 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index af4346d..81476ba 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index fb97577..59d4621 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index daa4b57..c4e750d 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Delivery.xml index 285d5e1..048837e 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml index 989165e..f663660 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index cc99dbc..aca92d1 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 2f867c9..1980184 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index 3e48fb7..6487a8d 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index ff14ab0..4a5e16c 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index a4c69c9..030867e 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -2,7 +2,7 @@
@@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml index d6d9aba..94e2680 100644 --- a/103120/portal/examples/request1.xml +++ b/103120/portal/examples/request1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml index af4346d..4841ccf 100644 --- a/103120/portal/examples/request2.xml +++ b/103120/portal/examples/request2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml index fb97577..4de508d 100644 --- a/103120/portal/examples/request3.xml +++ b/103120/portal/examples/request3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml index daa4b57..d3a0da0 100644 --- a/103120/portal/examples/request4.xml +++ b/103120/portal/examples/request4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request5-Binary-Delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml index 285d5e1..ae0caca 100644 --- a/103120/portal/examples/request5-Binary-Delivery.xml +++ b/103120/portal/examples/request5-Binary-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml index 989165e..b70a8f7 100644 --- a/103120/portal/examples/request5-XML-Delivery.xml +++ b/103120/portal/examples/request5-XML-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml index cc99dbc..5378b8e 100644 --- a/103120/portal/examples/response1.xml +++ b/103120/portal/examples/response1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml index 2f867c9..73da83e 100644 --- a/103120/portal/examples/response2.xml +++ b/103120/portal/examples/response2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml index 3e48fb7..44ba51e 100644 --- a/103120/portal/examples/response3.xml +++ b/103120/portal/examples/response3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml index ff14ab0..39c27e6 100644 --- a/103120/portal/examples/response4.xml +++ b/103120/portal/examples/response4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml index a4c69c9..e135903 100644 --- a/103120/portal/examples/response5.xml +++ b/103120/portal/examples/response5.xml @@ -2,7 +2,7 @@
@@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/schema/ts_103120_Authorisation.xsd b/103120/schema/ts_103120_Authorisation.xsd index 14b50d7..72e87c0 100644 --- a/103120/schema/ts_103120_Authorisation.xsd +++ b/103120/schema/ts_103120_Authorisation.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2016/02/Authorisation" - targetNamespace="http://uri.etsi.org/03120/common/2016/02/Authorisation" + xmlns="http://uri.etsi.org/03120/common/2020/09/Authorisation" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Authorisation" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -26,7 +26,7 @@ - + diff --git a/103120/schema/ts_103120_Document.xsd b/103120/schema/ts_103120_Document.xsd index 86b7192..af6f139 100644 --- a/103120/schema/ts_103120_Document.xsd +++ b/103120/schema/ts_103120_Document.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2016/02/Document" - targetNamespace="http://uri.etsi.org/03120/common/2016/02/Document" + xmlns="http://uri.etsi.org/03120/common/2020/09/Document" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Document" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -24,7 +24,7 @@ - + diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd index ed8974e..ae3e65e 100644 --- a/103120/schema/ts_103120_Task.xsd +++ b/103120/schema/ts_103120_Task.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2019/10/Task" - targetNamespace="http://uri.etsi.org/03120/common/2019/10/Task" + xmlns="http://uri.etsi.org/03120/common/2020/09/Task" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Task" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -23,7 +23,7 @@ - + @@ -123,7 +123,7 @@ - + diff --git a/103120/validate_examples.py b/103120/validate_examples.py index 7aae339..133bad9 100644 --- a/103120/validate_examples.py +++ b/103120/validate_examples.py @@ -25,7 +25,14 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - coreSchema = xmlschema.XMLSchema('schema/ts_103120v010601p0_Core.xsd', locations=locations) + etsiSchema = str(Path('../103280/TS_103_280.xsd')) + xs = xmlschema.XMLSchema(etsiSchema, validation='skip') + locations.append((xs.default_namespace, str(Path("../" + etsiSchema)))) + + for location in locations: + print (location) + + coreSchema = xmlschema.XMLSchema('schema/ts_103120_Core.xsd', locations=locations) for schema in schemaFiles: newSchema = xmlschema.XMLSchema(schema, locations=locations) -- GitLab From afb8d52700b52fc15db5577633cac09ab406865b Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 28 Sep 2020 13:44:55 +0200 Subject: [PATCH 149/208] Adding XSD testing --- testing/check_xsd.py | 155 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 testing/check_xsd.py diff --git a/testing/check_xsd.py b/testing/check_xsd.py new file mode 100644 index 0000000..db4ee8c --- /dev/null +++ b/testing/check_xsd.py @@ -0,0 +1,155 @@ +import logging + +import glob +import sys +import argparse +from pathlib import Path +from pprint import pprint +import os + +from lxml import etree +from xml.etree.ElementTree import ParseError +from xmlschema import XMLSchema, XMLSchemaParseError + + +def BuildSchemaDictonary (fileList): + if len(fileList) == 0: + logging.info("No schema files provided") + return [] + + logging.info("Schema locations:") + schemaLocations = [] + for schemaFile in fileList: + try: + xs = XMLSchema(schemaFile, validation='skip') + schemaLocations.append((xs.default_namespace, str(Path(schemaFile).resolve()))) + logging.info(" [ {0} -> {1} ]".format(xs.default_namespace, schemaFile)) + except ParseError as ex: + logging.warning (" [ {0} failed to parse: {1} ]".format(schemaFile, ex)) + return schemaLocations + + +def BuildSchema (coreFile, fileList = None): + schemaLocations = [] + if fileList and len(fileList) > 0: + schemaLocations = BuildSchemaDictonary(fileList) + + coreSchema = XMLSchema(str(Path(coreFile)), locations=schemaLocations) + return coreSchema + +def ValidateSingleFile (schemaFile): + try: + xs = XMLSchema(schemaFile, validation='skip') + except ParseError as ex: + logging.warning (" [ {0} failed to parse: {1} ]".format(schemaFile, ex)) + return ex + return None + + +def ValidateXSDFiles (fileList): + if len(fileList) == 0: + logging.info("No schema files provided") + return {} + + schemaLocations = BuildSchemaDictonary(fileList) + errors = {} + + logging.info("Schema validation:") + for schemaFile in fileList: + try: + schema = XMLSchema(schemaFile, locations = schemaLocations) + logging.info(schemaFile + ": OK") + errors[schemaFile] = [] + except XMLSchemaParseError as ex: + if (ex.schema_url) and (ex.schema_url != ex.origin_url): + logging.info(" Error {1} comes from {0}, suppressing".format(ex.schema_url, ex.message)) + errors[schemaFile] = [] + else: + logging.warning(schemaFile + ": Failed validation ({0})".format(ex)) + errors[schemaFile] = [ex.message] + return errors + + +def ValidateInstanceDocuments (coreFile, supportingSchemas, instanceDocs): + if (instanceDocs is None) or len(instanceDocs) == 0: + logging.warning ("No instance documents provided") + return [] + + schema = BuildSchema(coreFile, supportingSchemas) + errors = [] + for instanceDoc in instanceDocs: + try: + schema.validate(instanceDoc) + logging.info ("{0} passed validation".format(instanceDoc)) + except Exception as ex: + logging.error ("{0} failed validation: {1}".format(instanceDoc, ex)) + return errors + + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument("-v", "--verbosity", help="verbosity level", action="count", default=0) + parser.add_argument("input", help="include a directory or file", action="append", nargs="+") + args = parser.parse_args() + + logging.getLogger().setLevel(logging.WARNING) + if (args.verbosity >= 1): + logging.getLogger().setLevel(logging.INFO) + if (args.verbosity >= 2): + logging.getLogger().setLevel(logging.DEBUG) + logging.debug("Very verbose selected") + + logging.debug(f"Path: {args.input}") + includeFileList = [] + for path in args.input[0]: + p = Path(path) + if not p.exists(): + logging.error(f"Include path {path} not found") + exit(1) + if p.is_dir(): + logging.debug(f"Expanding directory") + for g in glob.glob(os.path.join(str(p), "*.xsd")): + logging.info(f">Including {g}") + includeFileList.append(g) + else: + logging.info(f"Including {p.absolute()}") + includeFileList.append(p.absolute()) + + syntaxErrors = 0 + + print ("XSD syntax checks:") + print ("-----------------------------") + for file in includeFileList: + error = ValidateSingleFile(file) + if (error): + print (f" {file} : Syntax error [{error}]") + syntaxErrors += 1 + else: + print (f" {file} : OK") + + print ("-----------------------------") + if (syntaxErrors > 0): + print (f"{syntaxErrors} syntax errors detected") + exit(syntaxErrors) + + results = ValidateXSDFiles(includeFileList) + + print ("XSD build checks:") + print ("-----------------------------") + errorCount = 0 + for fileName, errors in results.items(): + if len(errors) > 0: + errorCount += len(errors) + print (f" {fileName}: {len(errors)} errors") + for error in errors: + if isinstance(error, XMLSchemaParseError): + print (error.msg) + else: + print (f" {str(error.strip())}") + else: + print (f" {fileName}: OK") + + print ("-----------------------------") + print (f"{errorCount} build errors detected") + exit(errorCount) \ No newline at end of file -- GitLab From f548e21e206a90f4c99051e8a3f8ed5ac23dd044 Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 28 Sep 2020 14:13:39 +0200 Subject: [PATCH 150/208] Merge branch 'master' into 'updating_asn_testing' # Conflicts: # 102232-1/LI-PS-PDU.asn --- testing/check_asn1.py | 71 +- testing/compile_asn.py | 136 ++ .../101671/HI1NotificationOperations,ver7.asn | 106 ++ testing/deps/101671/HI2Operations,ver18.asn | 1014 ++++++++++++ testing/deps/101909/PCESP.asn | 428 +++++ testing/deps/101909/TS101909201.asn | 65 + testing/deps/101909/TS101909202.asn | 61 + testing/deps/301040/06132v203_C01.asn | 269 +++ testing/deps/33108/CSVoiceHI3IP.asn | 64 + testing/deps/33108/ConfHI2Operations.asn | 222 +++ testing/deps/33108/ConfHI3IMS.asn | 90 + testing/deps/33108/EpsHI2Operations.asn | 1448 +++++++++++++++++ testing/deps/33108/EpsHI3PS.asn | 85 + testing/deps/33108/GCSEHI2Operations.asn | 233 +++ testing/deps/33108/GCSEHI3.asn | 78 + testing/deps/33108/ProSeHI2Operations.asn | 135 ++ .../deps/33108/Three3gppHI1Notifications.asn | 180 ++ testing/deps/33108/UMTSCSHI2Operations.asn | 254 +++ testing/deps/33108/UMTSHI2Operations.asn | 1208 ++++++++++++++ testing/deps/33108/UMTSHI3PS.asn | 95 ++ testing/deps/33108/VoipHI3IMS.asn | 110 ++ testing/deps/33128/TS33128Payloads.asn | 1340 +++++++++++++++ testing/deps/stubs/CDMA2000CCModule.asn | 10 + testing/deps/stubs/CDMA2000CIIModule.asn | 10 + testing/deps/stubs/Laesp-j-std-025-b.asn | 10 + 25 files changed, 7653 insertions(+), 69 deletions(-) create mode 100644 testing/compile_asn.py create mode 100644 testing/deps/101671/HI1NotificationOperations,ver7.asn create mode 100644 testing/deps/101671/HI2Operations,ver18.asn create mode 100644 testing/deps/101909/PCESP.asn create mode 100644 testing/deps/101909/TS101909201.asn create mode 100644 testing/deps/101909/TS101909202.asn create mode 100644 testing/deps/301040/06132v203_C01.asn create mode 100644 testing/deps/33108/CSVoiceHI3IP.asn create mode 100644 testing/deps/33108/ConfHI2Operations.asn create mode 100644 testing/deps/33108/ConfHI3IMS.asn create mode 100644 testing/deps/33108/EpsHI2Operations.asn create mode 100644 testing/deps/33108/EpsHI3PS.asn create mode 100644 testing/deps/33108/GCSEHI2Operations.asn create mode 100644 testing/deps/33108/GCSEHI3.asn create mode 100644 testing/deps/33108/ProSeHI2Operations.asn create mode 100644 testing/deps/33108/Three3gppHI1Notifications.asn create mode 100644 testing/deps/33108/UMTSCSHI2Operations.asn create mode 100644 testing/deps/33108/UMTSHI2Operations.asn create mode 100644 testing/deps/33108/UMTSHI3PS.asn create mode 100644 testing/deps/33108/VoipHI3IMS.asn create mode 100644 testing/deps/33128/TS33128Payloads.asn create mode 100644 testing/deps/stubs/CDMA2000CCModule.asn create mode 100644 testing/deps/stubs/CDMA2000CIIModule.asn create mode 100644 testing/deps/stubs/Laesp-j-std-025-b.asn diff --git a/testing/check_asn1.py b/testing/check_asn1.py index 494737c..df9771c 100644 --- a/testing/check_asn1.py +++ b/testing/check_asn1.py @@ -1,76 +1,9 @@ import logging - -from asn1tools import parse_files, compile_dict, ParseError, CompileError -from glob import glob -from pathlib import Path - -from pprint import pprint - - -def parseASN1File (asnFile): - try: - parse_files(asnFile) - except ParseError as ex: - return [ex] - return [] - - -def parseASN1Files (fileList): - if len(fileList) == 0: - logging.warning ("No files specified") - return {} - errors = {} - logging.info("Parsing files...") - for f in fileList: - ex = parseASN1File(f) - if ex: - logging.info (f" {f}: Failed - {ex!r}") - else: - logging.info (f" {f}: OK") - errors[f] = ex - return errors - - -def compileASN1Files (fileList): - logging.info("Compiling files...") - errors = [] - try: - d = parse_files(fileList) - for modulename, module in d.items(): - # Weird fix because the compiler doesn't like RELATIVE-OID as a type - # Not sure if the on-the-wire encoding would be affected or not - # but for most checking purposes this doesn't matter - module['types']["RELATIVE-OID"] = {'type' : 'OBJECT IDENTIFIER'} - c = compile_dict(d) - except CompileError as ex: - logging.info (f"Compiler error: {ex}") - errors.append(ex) - except ParseError as ex: - logging.info (f"Parse error: {ex}") - errors.append(ex) - logging.info ("Compiled OK") - return errors - - -def validateASN1Files (fileList): - parseErrors = parseASN1Files(fileList) -# if len(parseErrors > 0): -# logging.info ("Abandonding compile due to parse errors") -# compileErrors = compileASN1Files(fileList) -# leave this for now - TBD - compileErrors = [] - return parseErrors, compileErrors - - -def validateAllASN1FilesInPath (path): - p = Path(path) - fileGlob = [str(f) for f in p.rglob('*.asn')] - fileGlob += [str(f) for f in p.rglob('*.asn1')] - return validateASN1Files(fileGlob) +from compile_asn import * if __name__ == '__main__': - parseErrors, compileErrors = validateAllASN1FilesInPath("./") + parseErrors, compileErrors, parser = validateAllASN1FilesInPath("./") parseErrorCount = 0 print ("ASN.1 Parser checks:") print ("-----------------------------") diff --git a/testing/compile_asn.py b/testing/compile_asn.py new file mode 100644 index 0000000..a7a531a --- /dev/null +++ b/testing/compile_asn.py @@ -0,0 +1,136 @@ +import logging +import copy +from asn1tools import parse_files, compile_dict, ParseError, CompileError +from glob import glob +from pathlib import Path +from pprint import pprint + +def parseASN1File (asnFile): + try: + parse_files(asnFile) + except ParseError as ex: + return [ex] + return [] + + +def parseASN1Files (fileList): + if len(fileList) == 0: + logging.warning ("No files specified") + return {} + errors = {} + logging.info("Parsing files...") + for f in fileList: + ex = parseASN1File(f) + if ex: + logging.info (f" {f}: Failed - {ex!r}") + else: + logging.info (f" {f}: OK") + errors[f] = ex + return errors + +def fixDottedReference (dict, importingModule, importingType, importingMember, importedModule, importedType): + newName = importedModule + "_" + importedType + dict[importedModule]['types'][newName] = copy.deepcopy(dict[importedModule]['types'][importedType]) + dict[importingModule]['imports'][importedModule].append(newName) + member = [x for x in dict[importingModule]['types'][importingType]['members'] if x is not None and x['name'] == importingMember][0] + member['type'] = newName + +def compileASN1Files (fileList): + logging.info("Compiling files...") + errors = [] + imports = {} + + #p = re.compile(r"]\s+\S+\.\S+") + #for f in fileList: + # with open(f) as fh: + # s = fh.read() + # for match in p.findall(s): + # print (f"In {f}: {match}") + #exit() + + try: + dr = parse_files(fileList) + for modulename, module in dr.items(): + # Weird fix because the compiler doesn't like RELATIVE-OID as a type + # Not sure if the on-the-wire encoding would be affected or not + # but for most checking purposes this doesn't matter + module['types']["RELATIVE-OID"] = {'type' : 'OBJECT IDENTIFIER'} + for k,v in module['imports'].items(): + if not k in imports: + imports[k] = [] + imports[k].append({ + "in" : modulename, + "types" : v + }) + for k,v in imports.items(): + if not k in dr.keys(): + importers = [i['in'] for i in v] + errors.append(f"Unsatisfied import [{k}] for {importers}") + + fixDottedReference(dr, 'LI-PS-PDU', 'Location', 'umtsHI2Location', 'UmtsHI2Operations', 'Location') + fixDottedReference(dr, 'LI-PS-PDU', 'Location', 'epsLocation', 'EpsHI2Operations', 'Location') + fixDottedReference(dr, 'LI-PS-PDU', 'Location', 'eTSI671HI2Location', 'HI2Operations', 'Location') + + fixDottedReference(dr, 'LI-PS-PDU', 'UMTSIRI', 'iRI-Parameters', 'UmtsHI2Operations', 'IRI-Parameters') + fixDottedReference(dr, 'LI-PS-PDU', 'UMTSIRI', 'iRI-CS-Parameters', 'UmtsCS-HI2Operations', 'IRI-Parameters') + fixDottedReference(dr, 'LI-PS-PDU', 'ETSI671IRI', 'iRI-Parameters', 'HI2Operations', 'IRI-Parameters') + fixDottedReference(dr, 'LI-PS-PDU', 'EPSIRI', 'iRI-EPS-Parameters', 'EpsHI2Operations', 'IRI-Parameters') + fixDottedReference(dr, 'LI-PS-PDU', 'ConfIRI', 'iRI-Conf-Parameters', 'CONFHI2Operations', 'IRI-Parameters') + fixDottedReference(dr, 'LI-PS-PDU', 'ProSeIRI', 'iRI-ProSe-Parameters', 'ProSeHI2Operations', 'IRI-Parameters') + fixDottedReference(dr, 'LI-PS-PDU', 'GcseIRI', 'iRI-Gcse-Parameters', 'GCSEHI2Operations', 'IRI-Parameters') + + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'tTRAFFIC-1', 'TS101909201', 'TTRAFFIC') + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cTTRAFFIC-1', 'TS101909201', 'CTTRAFFIC') + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'tTRAFFIC-2', 'TS101909202', 'TTRAFFIC') + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cTTRAFFIC-2', 'TS101909202', 'CTTRAFFIC') + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cCIPPacketHeader', 'CDMA2000CCModule', 'CCIPPacketHeader') + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'uMTSCC-CC-PDU', 'Umts-HI3-PS', 'CC-PDU') + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'ePSCC-CC-PDU', 'Eps-HI3-PS', 'CC-PDU') + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'confCC-CC-PDU', 'CONF-HI3-IMS', 'Conf-CC-PDU') + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'voipCC-CC-PDU', 'VoIP-HI3-IMS', 'Voip-CC-PDU') + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'gcseCC-CC-PDU', 'GCSE-HI3', 'Gcse-CC-PDU') + fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cSvoice-CC-PDU', 'CSvoice-HI3-IP', 'CSvoice-CC-PDU') + + fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'tARGETACTIVITYMONITOR-1', 'TS101909201', 'TARGETACTIVITYMONITOR-1') + fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'tARGETACTIVITYMONITOR-2', 'TS101909202', 'TARGETACTIVITYMONITOR') + fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'lAESProtocol', 'Laesp-j-std-025-b', 'LAESProtocol') + fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'cDMA2000LAESMessage', 'CDMA2000CIIModule', 'CDMA2000LAESMessage') + + fixDottedReference(dr, 'LI-PS-PDU', 'HI4Payload', 'threeGPP-LI-Notification', 'TS33128Payloads', 'LINotificationPayload') + + fixDottedReference(dr, 'ILHIPDU', 'TimestampMapping', 'timeStampQualifier', 'LI-PS-PDU', 'TimeStampQualifier') + + fixDottedReference(dr, 'ILHIPDU', 'ILHITimestamp', 'qualifiedDateTime', 'Common-Parameters', 'QualifiedDateTime') + fixDottedReference(dr, 'ILHIPDU', 'ILHITimestamp', 'qualifiedMicrosecondDateTime', 'Common-Parameters', 'QualifiedMicrosecondDateTime') + + fixDottedReference(dr, 'ILHIPDU', 'OriginalTimestamp', 'microSecondTimeStamp', 'LI-PS-PDU', 'MicroSecondTimeStamp') + + fixDottedReference(dr, 'ILHIPDU', 'LocationMapping', 'originalLocation', 'LI-PS-PDU', 'Location') + + fixDottedReference(dr, 'ILHIPDU', 'GeocodedLocationData', 'wGS84CoordinateDecimal', 'Common-Parameters', 'WGS84CoordinateDecimal') + fixDottedReference(dr, 'ILHIPDU', 'GeocodedLocationData', 'wGS84CoordinateAngular', 'Common-Parameters', 'WGS84CoordinateAngular') + + c = compile_dict(dr) + except CompileError as ex: + logging.info (f"Compiler error: {ex}") + errors.append(ex) + except ParseError as ex: + logging.info (f"Parse error: {ex}") + errors.append(ex) + logging.info ("Compiled OK") + return errors, c + + +def validateASN1Files (fileList): + parseErrors = parseASN1Files(fileList) + if len(parseErrors) > 0: + logging.info ("Abandonding compile due to parse errors") + compileErrors, parser = compileASN1Files(fileList) + return parseErrors, compileErrors, parser + + +def validateAllASN1FilesInPath (path): + p = Path(path) + fileGlob = [str(f) for f in p.rglob('*.asn')] + fileGlob += [str(f) for f in p.rglob('*.asn1')] + return validateASN1Files(fileGlob) \ No newline at end of file diff --git a/testing/deps/101671/HI1NotificationOperations,ver7.asn b/testing/deps/101671/HI1NotificationOperations,ver7.asn new file mode 100644 index 0000000..65ef068 --- /dev/null +++ b/testing/deps/101671/HI1NotificationOperations,ver7.asn @@ -0,0 +1,106 @@ +HI1NotificationOperations +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + + -- from clause�D.5 + CommunicationIdentifier, + TimeStamp, + LawfulInterceptionIdentifier + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)}; + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +-- LawfulIntercept DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- hi1 Domain +hi1NotificationOperationsId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId hi1(0) notificationOperations(1)} +hi1OperationId OBJECT IDENTIFIER ::= {hi1NotificationOperationsId version6(6)} + +-- Class 2 operation. The timer shall be set to a value between 3s and 240s. +-- The timer default value is 60s. +-- NOTE: The value for this timer is to be set on the equipment waiting for the returned message; +-- its value shall be agreed between the NWO/AP/SvP and the LEA, depending on their equipment +-- properties. + + +HI1-Operation ::= CHOICE +{ + liActivated [1] Notification, + liDeactivated [2] Notification, + liModified [3] Notification, + alarms-indicator [4] Alarm-Indicator, + ..., + national-HI1-ASN1parameters [5] National-HI1-ASN1parameters +} + +-- ================== +-- PARAMETERS FORMATS +-- ================== + +Notification ::= SEQUENCE +{ + domainID [0] OBJECT IDENTIFIER (hi1OperationId) OPTIONAL, + -- Once using FTP delivery mechanism + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- This identifier is the LIID identity provided with the lawful authorization + -- for each target. + communicationIdentifier [2] CommunicationIdentifier OPTIONAL, + -- Only the NWO/PA/SvPIdentifier is provided (the one provided with the Lawful + -- authorization). + -- Called "callIdentifier" in V1.1.1 of ES 201 671 + timeStamp [3] TimeStamp, + -- date and time of the report. + ..., + national-HI1-ASN1parameters [5] National-HI1-ASN1parameters OPTIONAL, + target-Information [6] OCTET STRING (SIZE (1..256)) OPTIONAL + -- provides information about the number or the characteristic of the target + -- (e.g. E-mail address, E.164 number), ASCII format +} + +Alarm-Indicator ::= SEQUENCE +{ + domainID [0] OBJECT IDENTIFIER (hi1OperationId) OPTIONAL, + -- Once using FTP delivery mechanism + communicationIdentifier [1] CommunicationIdentifier OPTIONAL, + -- Only the NWO/PA/SvPIdentifier is provided (the one provided with the + -- Lawful authorization) + timeStamp [2] TimeStamp, + -- date and time of the report. + alarm-information [3] OCTET STRING (SIZE (1..256)), + -- Provides information about alarms (free format). + -- Until ASN.1 version 6 (document version v3.12.1) the octet string + -- was limited to a size of 25 + ..., + lawfulInterceptionIdentifier [4] LawfulInterceptionIdentifier OPTIONAL, + -- This identifier is the LIID identity provided with the lawful authorization + -- for each target in according to national law. + national-HI1-ASN1parameters [5] National-HI1-ASN1parameters OPTIONAL +} + +National-HI1-ASN1parameters ::= SEQUENCE +{ + domainID [0] OBJECT IDENTIFIER (hi1OperationId) OPTIONAL, + -- Once using FTP delivery mechanism. + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [67], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from IANA web site (see�annex�K). Besides, it is recommended to avoid + -- using tags from 240 to 255 in a formal type definition. +} + +END -- end of HI1NotificationOperations + diff --git a/testing/deps/101671/HI2Operations,ver18.asn b/testing/deps/101671/HI2Operations,ver18.asn new file mode 100644 index 0000000..71ad535 --- /dev/null +++ b/testing/deps/101671/HI2Operations,ver18.asn @@ -0,0 +1,1014 @@ +HI2Operations +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(18)} + + -- It is advised not to use version11(11) of this ASN.1 module since it contains a syntax error. + -- Version11(11) of HI2Operations is only defined in TS 101 671 v3.5.1 [81]. + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + + -- from 3GPP TS 33.108 [61] + UmtsQos, + IMSevent, + LDIevent, + CorrelationValues + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r11(11) version-0(0)} + + -- from TS 101 909-20-01 [69] + TARGETACTIVITYMONITOR-1 + FROM TS101909201 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} + + -- from EN 301 040 [72] + TARGETACTIVITYMONITORind, + TARGETCOMMSMONITORind, + TTRAFFICind, + CTTRAFFICind + FROM EN301040 + {itu-t(0) identified-organization(4) etsi(0) en301040 (1040) interceptVersion (0)}; + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +-- LawfulIntercept DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +hi2DomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId hi2(1)} +hi2OperationId OBJECT IDENTIFIER ::= {hi2DomainId version18(18)} + +-- Class 2 operation. The timer shall be set to a value between 3s and 240s. +-- The timer default value is 60s. +-- NOTE: The same note as for HI management operation applies. + +IRIsContent ::= CHOICE +{ + iRIContent IRIContent, + iRISequence IRISequence +} + +IRISequence ::= SEQUENCE OF IRIContent + -- Aggregation of IRIContent is an optional feature. + -- It may be applied in cases when at a given point in time several IRI records are + -- available for delivery to the same LEA destination. + -- As a general rule, records created at any event shall be sent immediately and shall + -- not held in the DF or MF in order to apply aggregation. + -- When aggregation is not to be applied, IRIContent needs to be chosen. + +IRIContent ::= CHOICE +{ + iRI-Begin-record [1] IRI-Parameters, + -- At least one optional parameter must be included within the iRI-Begin-Record. + iRI-End-record [2] IRI-Parameters, + iRI-Continue-record [3] IRI-Parameters, + -- At least one optional parameter must be included within the iRI-Continue-Record. + iRI-Report-record [4] IRI-Parameters, + -- At least one optional parameter must be included within the iRI-Report-Record. + ... +} + +-- These values may be sent by the LEMF, when an operation or a parameter is misunderstood. + +IRI-Parameters ::= SEQUENCE +{ + domainID [0] OBJECT IDENTIFIER (hi2OperationId) OPTIONAL, + -- for the sending entity the inclusion of the Object Identifier is mandatory + iRIversion [23] ENUMERATED + { + version2(2), + ..., + version3(3), + version4(4), + version5(5), + version6(6), + version7(7), + lastVersion(8) + } OPTIONAL, + -- Optional parameter "iRIversion" (tag 23) is redundant starting + -- from TS 101 671 v2.5.1 [81] + -- where to the object identifier "domainID" was introduced into IRI-Parameters. + -- In order to keep backward compatibility, even when the version of the "domainID" + -- parameter will be incremented it is recommended to always send to LEMF the same: + -- enumeration value "lastVersion(8)". + -- if not present, it means version 1 is handled + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- This identifier is associated to the target. + communicationIdentifier [2] CommunicationIdentifier, + -- used to uniquely identify an intercepted call. + -- Called "callIdentifier" in v1.1.1 of ES 201 671 [i.5]. + timeStamp [3] TimeStamp, + -- date and time of the event triggering the report. + intercepted-Call-Direct [4] ENUMERATED + { + not-Available(0), + originating-Target(1), + -- In case of GPRS, this indicates that the PDP context activation, modification + -- or deactivation is MS requested. + terminating-Target(2), + -- In case of GPRS, this indicates that the PDP context activation, modification + -- or deactivation is network initiated. + ... + } OPTIONAL, + intercepted-Call-State [5] Intercepted-Call-State OPTIONAL, + ringingDuration [6] OCTET STRING (SIZE (3)) OPTIONAL, + -- Duration in seconds. BCD coded: HHMMSS + conversationDuration [7] OCTET STRING (SIZE (3)) OPTIONAL, + -- Duration in seconds. BCD coded: HHMMSS + locationOfTheTarget [8] Location OPTIONAL, + -- location of the target subscriber + partyInformation [9] SET SIZE (1..10) OF PartyInformation OPTIONAL, + -- This parameter provides the concerned party (Originating, Terminating or forwarded + -- party), the identity(ies) of the party and all the information provided by the party. + callContentLinkInformation [10] SEQUENCE + { + cCLink1Characteristics [1] CallContentLinkCharacteristics OPTIONAL, + -- Information concerning the Content of Communication Link Tx channel established + -- toward the LEMF (or the sum signal channel, in case of mono mode). + cCLink2Characteristics [2] CallContentLinkCharacteristics OPTIONAL, + -- Information concerning the Content of Communication Link Rx channel established + -- toward the LEMF. + ... + } OPTIONAL, + release-Reason-Of-Intercepted-Call [11] OCTET STRING (SIZE (2)) OPTIONAL, + -- Release cause coded in ITU-T Q.850 [31] format. + -- This parameter indicates the reason why the intercepted call cannot be established or + -- why the intercepted call has been released after the active phase. + nature-Of-The-intercepted-call [12] ENUMERATED + { + -- Nature of the intercepted "call": + gSM-ISDN-PSTN-circuit-call(0), + -- the possible UUS content is sent through the HI2 or HI3 "data" interface + -- the possible call content call is established through the HI3 "circuit" interface + gSM-SMS-Message(1), + -- the SMS content is sent through the HI2 or HI3 "data" interface + uUS4-Messages(2), + -- the UUS content is sent through the HI2 or HI3 "data" interface + tETRA-circuit-call(3), + -- the possible call content call is established through the HI3 "circuit" interface + -- the possible data are sent through the HI3 "data" interface + teTRA-Packet-Data(4), + -- the data are sent through the HI3 "data" interface + gPRS-Packet-Data(5), + -- the data are sent through the HI3 "data" interface + ..., + uMTS-circuit-call(6), + -- the possible call content call is established through the HI3 "circuit" interface + -- the possible data are sent through the HI3 "data" interface + lTE-SMS-Message(7), + -- indicator for SMS from LTE handset + -- the SMS content is sent through the HI2 or HI3 "data" interface + lTE-circuit-call(8) + -- indicator for CS call from LTE handset +} OPTIONAL, + serverCenterAddress [13] PartyInformation OPTIONAL, + -- e.g. in case of SMS message this parameter provides the address of the relevant + -- server within the calling (if server is originating) or called + -- (if server is terminating) party address parameters + sMS [14] SMS-report OPTIONAL, + -- this parameter provides the SMS content and associated information + cC-Link-Identifier [15] CC-Link-Identifier OPTIONAL, + -- Depending on a network option, this parameter may be used to identify a CC link + -- in case of multiparty calls. + national-Parameters [16] National-Parameters OPTIONAL, + gPRSCorrelationNumber [18] GPRSCorrelationNumber OPTIONAL, + gPRSevent [20] GPRSEvent OPTIONAL, + -- This information is used to provide particular action of the target + -- such as attach/detach + sgsnAddress [21] DataNodeAddress OPTIONAL, + gPRSOperationErrorCode [22] GPRSOperationErrorCode OPTIONAL, + ..., + ggsnAddress [24] DataNodeAddress OPTIONAL, + qOS [25] UmtsQos OPTIONAL, + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + networkIdentifier [26] Network-Identifier OPTIONAL, + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + sMSOriginatingAddress [27] DataNodeAddress OPTIONAL, + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + sMSTerminatingAddress [28] DataNodeAddress OPTIONAL, + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + iMSevent [29] IMSevent OPTIONAL, + sIPMessage [30] OCTET STRING OPTIONAL, + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + servingSGSN-number [31] OCTET STRING (SIZE (1..20)) OPTIONAL, + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + servingSGSN-address [32] OCTET STRING (SIZE (5..17)) OPTIONAL, + -- Octets are coded according to 3GPP TS 23.003 [76] + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + tARGETACTIVITYMONITOR [33] TARGETACTIVITYMONITOR-1 OPTIONAL, + -- Parameter is used in TS 101 909-20-1 [69] + ldiEvent [34] LDIevent OPTIONAL, + -- The "Location Dependent Interception" parameter is duplicated from 3GPP TS 33.108 [61] + correlation [35] CorrelationValues OPTIONAL, + -- This parameter is duplicated from 3GPP TS 33.108 [61] + tARGETACTIVITYMONITORind [36] TARGETACTIVITYMONITORind OPTIONAL, + -- Parameter is used in EN 301 040 [72] + tARGETCOMMSMONITORind [37] TARGETCOMMSMONITORind OPTIONAL, + -- Parameter is used in EN 301 040 [72] + tTRAFFICind [38] TTRAFFICind OPTIONAL, + -- Parameter is used in EN 301 040 [72] + cTTRAFFICind [39] CTTRAFFICind OPTIONAL, + -- Parameter is used in EN 301 040 [72] + servingSystem [40] Network-Element-Identifier OPTIONAL, + -- Parameter identifies the visited network element + national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL +} + +-- ================== +-- PARAMETERS FORMATS +-- ================== + +CommunicationIdentifier ::= SEQUENCE +{ + communication-Identity-Number [0] OCTET STRING (SIZE (1..8)) OPTIONAL, + -- Temporary Identifier of an intercepted call to uniquely identify an intercepted call + -- within the node. This parameter is mandatory if there is associated + -- information sent over HI3interface (CClink, data,..) or when + -- CommunicationIdentifier is used for IRI other than IRI-Report-record + -- This parameter was called "call-Identity-Number" in V1.1.1 of ES 201 671 [i.5] + -- The individual digits of the communication-Identity-Number shall be represented in + -- ASCII format, e.g. "12345678" = 8 octets 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38. + -- For subaddress option only "0"..."9" shall be used. + network-Identifier [1] Network-Identifier, + ... +} +-- NOTE: The same "CommunicationIdentifier" value is sent: +-- with the HI3 information for correlation purpose between the IRI and the information sent +-- on the HI3 interfaces (CCLink, data, ..) with each IRI associated to a same intercepted +-- call for correlation purpose between the different IRI. + +Network-Identifier ::= SEQUENCE +{ + operator-Identifier [0] OCTET STRING (SIZE (1..5)), + -- It is a notification of the NWO/AP/SvP in ASCII- characters. + -- For subaddress option only "0"..."9" shall be used. + -- The parameter is mandatory. + network-Element-Identifier [1] Network-Element-Identifier OPTIONAL, + ... +} + +Network-Element-Identifier ::= CHOICE +{ + e164-Format [1] OCTET STRING (SIZE (1..25)), + -- E164 address of the node in international format. Coded in the same format as the + -- calling party number parameter of the ISUP (parameter part: EN 300 356 [5]). + x25-Format [2] OCTET STRING (SIZE (1..25)), + -- X25 address + iP-Format [3] OCTET STRING (SIZE (1..25)), + -- IP address + dNS-Format [4] OCTET STRING (SIZE (1..25)), + -- DNS address + ..., + iP-Address [5] IPAddress +} + +CC-Link-Identifier ::= OCTET STRING (SIZE (1..8)) + -- Depending on a network option, this parameter may be used to identify a CClink + -- in case of multiparty calls. + -- The individual digits of the CC-Link-Identifier shall be represented in + -- ASCII format, e.g. "12345678" = 8 octets 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38. + -- For subaddress option only "0"..."9" shall be used. + +TimeStamp ::= CHOICE +{ +-- The minimum resolution required is one second. +-- "Resolution" is the smallest incremental change that can be measured for time and +-- is expressed with a definite number of decimal digits or bits. + localTime [0] LocalTimeStamp, + utcTime [1] UTCTime +} + +LocalTimeStamp ::= SEQUENCE +{ + generalizedTime [0] GeneralizedTime, + -- The minimum resolution required is one second. + -- "Resolution" is the smallest incremental change that can be measured for time and + -- is expressed with a definite number of decimal digits or bits. + winterSummerIndication [1] ENUMERATED + { + notProvided(0), + winterTime(1), + summerTime(2), + ... + } +} + +PartyInformation ::= SEQUENCE +{ + party-Qualifier [0] ENUMERATED + { + originating-Party(0), + -- In this case, the partyInformation parameter provides the identities related to + -- the originating party and all information provided by this party. + -- This parameter provides also all the information concerning the redirecting + -- party when a forwarded call reaches a target. + terminating-Party(1), + -- In this case, the partyInformation parameter provides the identities related to + -- the terminating party and all information provided by this party. + forwarded-to-Party(2), + -- In this case, the partyInformation parameter provides the identities related to + -- the forwarded to party and parties beyond this one and all information + -- provided by this parties, including the call forwarding reason. + gPRS-Target(3), + ... + }, + partyIdentity [1] SEQUENCE + { + imei [1] OCTET STRING (SIZE (8)) OPTIONAL, + -- See MAP format TS GSM 09.02 [32] + tei [2] OCTET STRING (SIZE (1..15)) OPTIONAL, + -- ISDN-based Terminal Equipment Identity + imsi [3] OCTET STRING (SIZE (3..8)) OPTIONAL, + -- See MAP format TS GSM 09.02 [32] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + callingPartyNumber [4] CallingPartyNumber OPTIONAL, + -- The calling party format is used to transmit the identity of a calling party + calledPartyNumber [5] CalledPartyNumber OPTIONAL, + -- The called party format is used to transmit the identity of a called party or + -- a forwarded to party. + msISDN [6] OCTET STRING (SIZE (1..9)) OPTIONAL, + -- MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format TS GSM 09.02 [32] + ..., + e164-Format [7] OCTET STRING (SIZE (1..25)) OPTIONAL, + -- E164 address of the node in international format. Coded in the same format as + -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [5]) + sip-uri [8] OCTET STRING OPTIONAL, + -- Session Initiation Protocol - Uniform Resource Identifier. See RFC 3261 [59]. + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + tel-url [9] OCTET STRING OPTIONAL, + -- See "URLs for Telephone Calls", RFC 3966 [68]. + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + party-Validity [10] ENUMERATED + { + trusted(0), + -- The operator has assured the party identity + untrusted(1), + -- The operator does not assure the party identity + operator-added(2), + -- The party identity is added by the operator, e.g. the roaming number + ... + } OPTIONAL, + alphanumeric [11] UTF8String OPTIONAL + -- see clause A.3.3 on usage of this parameter + }, + services-Information [2] Services-Information OPTIONAL, + -- This parameter is used to transmit all the information concerning the + -- complementary information associated to the basic call + supplementary-Services-Information [3] Supplementary-Services OPTIONAL, + -- This parameter is used to transmit all the information concerning the + -- activation/invocation of supplementary services during a call or out-of call not + -- provided by the previous parameters. + services-Data-Information [4] Services-Data-Information OPTIONAL, + -- This parameter is used to transmit all the information concerning the complementary + -- information associated to the basic data call. + ... +} + +CallingPartyNumber ::= CHOICE +{ + iSUP-Format [1] OCTET STRING (SIZE (1..25)), + -- Encoded in the same format as the calling party number (parameter field) + -- of the ISUP (see EN 300 356 [5]). + dSS1-Format [2] OCTET STRING (SIZE (1..25)), + -- Encoded in the format defined for the value part of the Calling party number + -- information element of DSS1 protocol EN 300 403-1 [6]. + -- The DSS1 Information element identifier and the DSS1 length are not included. + ..., + mAP-Format [3] OCTET STRING (SIZE (1..25)) + -- Encoded as AddressString of the MAP protocol TS GSM 09.02 [32]. +} + +CalledPartyNumber ::= CHOICE +{ + iSUP-Format [1] OCTET STRING (SIZE (1..25)), + -- Encoded in the same format as the called party number (parameter field) + -- of the ISUP (see�EN 300 356 [5]). + mAP-Format [2] OCTET STRING (SIZE (1..25)), + -- Encoded as AddressString of the MAP protocol TS GSM 09.02 [32]. + dSS1-Format [3] OCTET STRING (SIZE (1..25)), + -- Encoded in the format defined for the value part of the Called party number information + -- element of DSS1 protocol EN 300 403-1 [6]. + -- The DSS1 Information element identifier and the DSS1 length are not included. + ... +} + +Location ::= SEQUENCE +{ + e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, + -- Coded in the same format as the ISUP location number (parameter field) + -- of the ISUP (see EN 300 356 [5]). + globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, + -- See MAP format (see TS GSM 09.02 [32]). + tetraLocation [3] TetraLocation OPTIONAL, + -- This optional parameter is not in use anymore, but is kept for backwards compatibility. + rAI [4] OCTET STRING (SIZE (6)) OPTIONAL, + -- The Routeing Area Identifier (RAI) in the current SGSN is coded in accordance with + -- 3GPP TS 24.008 [41] without the Routing Area Identification IEI (only the + -- last 6 octets are used). + gsmLocation [5] GSMLocation OPTIONAL, + umtsLocation [6] UMTSLocation OPTIONAL, + sAI [7] OCTET STRING (SIZE (7)) OPTIONAL, + -- format: PLMN-ID 3 octets (no. 1-3), + -- LAC 2 octets (no. 4-5), + -- SAC 2 octets (no. 6-7) + -- (according to 3GPP 25.413 [82]). + ..., + oldRAI [8] OCTET STRING (SIZE (6)) OPTIONAL, + -- the "Routeing Area Identifier" in the old SGSN is coded in accordance with + -- 3GPP TS 24.008 [41] without the Routing Area Identification IEI + -- (only the last 6 octets are used). + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + tAI [9] OCTET STRING (SIZE (6)) OPTIONAL, + -- The "Tracking Area Identity" (TAI) is coded in accordance with 3GPP TS 29.118 [83] + -- without the TAI IEI. + -- The tAI parameter is applicable only to the CS traffic cases where the available + -- location information is the one received from the Mobility Management Entity (MME). + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + eCGI [10] OCTET STRING (SIZE (8)) OPTIONAL + -- the "E-UTRAN Cell Global Identity" (E-CGI) is coded in accordance with + -- 3GPP TS 29.118 [83] without the E-CGI IEI. + -- The eCGI parameter is applicable only to the CS traffic cases where + -- the available location information is the one received from the MME. + -- This parameter is duplicated from 3GPP TS 33.108 [61]. +} + +TetraLocation ::= CHOICE + -- This optional parameter is not in use anymore, but is kept for backwards compatibility. +{ + ms-Loc [1] SEQUENCE + { + mcc [1] INTEGER (0..1023), + -- 10 bits EN 300 392-1 [40] + mnc [2] INTEGER (0..16383), + -- 14 bits EN 300 392-1 [40] + lai [3] INTEGER (0..65535), + -- 14 bits EN 300 392-1 [40] + ci [4] INTEGER OPTIONAL + }, + ls-Loc [2] INTEGER +} + +GSMLocation ::= CHOICE +{ + geoCoordinates [1] SEQUENCE + { + latitude [1] PrintableString (SIZE(7..10)), + -- format: XDDMMSS.SS + longitude [2] PrintableString (SIZE(8..11)), + -- format: XDDDMMSS.SS + mapDatum [3] MapDatum DEFAULT wGS84, + ..., + azimuth [4] INTEGER (0..359) OPTIONAL + -- The azimuth is the bearing, relative to true north + }, + -- format: XDDDMMSS.SS + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- MM : minutes (numeric characters) + -- SS.SS : seconds, the second part (.SS) is optional + -- Example: + -- latitude short form N502312 + -- longitude long form E1122312.18 + + utmCoordinates [2] SEQUENCE + { + utm-East [1] PrintableString (SIZE(10)), + utm-North [2] PrintableString (SIZE(7)), + -- Universal Transverse Mercator + -- example utm-East 32U0439955 + -- utm-North 5540736 + mapDatum [3] MapDatum DEFAULT wGS84, + ..., + azimuth [4] INTEGER (0..359) OPTIONAL + -- The azimuth is the bearing, relative to true north + }, + + utmRefCoordinates [3] SEQUENCE + { + utmref-string PrintableString (SIZE(13)), + mapDatum MapDatum DEFAULT wGS84, + ... + }, + -- example 32UPU91294045 + + wGS84Coordinates [4] OCTET STRING + -- format is as defined in 3GPP TS 03.32 [57] +} + +MapDatum ::= ENUMERATED +{ + wGS84, + -- World Geodetic System 1984 + wGS72, + eD50, + -- European Datum 50 + ... +} + +UMTSLocation ::= CHOICE +{ + point [1] GA-Point, + pointWithUnCertainty [2] GA-PointWithUnCertainty, + polygon [3] GA-Polygon, + ... +} + +GeographicalCoordinates ::= SEQUENCE +{ + latitudeSign ENUMERATED + { + north, + south + }, + latitude INTEGER (0..8388607), + longitude INTEGER (-8388608..8388607), + ... +} + +GA-Point ::= SEQUENCE +{ + geographicalCoordinates GeographicalCoordinates, + ... +} + +GA-PointWithUnCertainty ::=SEQUENCE +{ + geographicalCoordinates GeographicalCoordinates, + uncertaintyCode INTEGER (0..127) +} + +maxNrOfPoints INTEGER ::= 15 + +GA-Polygon ::= SEQUENCE (SIZE (1..maxNrOfPoints)) OF + SEQUENCE + { + geographicalCoordinates GeographicalCoordinates, + ... + } + +CallContentLinkCharacteristics ::= SEQUENCE +{ + cCLink-State [1] CCLink-State OPTIONAL, + -- current state of the CCLink + release-Time [2] TimeStamp OPTIONAL, + -- date and time of the release of the Call Content Link. + release-Reason [3] OCTET STRING (SIZE(2)) OPTIONAL, + -- Release cause coded in Q.850 [31] format + lEMF-Address [4] CalledPartyNumber OPTIONAL, + -- Directory number used to route the call toward the LEMF + ... +} + +CCLink-State ::= ENUMERATED +{ + setUpInProcess(1), + -- The set-up of the call is in process + callActive(2), + callReleased(3), + lack-of-resource(4), + -- The lack-of-resource state is sent when a CC Link cannot + -- be established because of lack of resource at the MF level. + ... +} + +Intercepted-Call-State ::= ENUMERATED +{ + idle(1), + -- When the intercept call is released, the state is IDLE and the reason is provided + -- by the release-Reason-Of-Intercepted-Call parameter. + setUpInProcess(2), + -- The set-up of the call is in process + connected(3), + -- The answer has been received + ... +} + +Services-Information ::= SEQUENCE +{ + iSUP-parameters [1] ISUP-parameters OPTIONAL, + dSS1-parameters-codeset-0 [2] DSS1-parameters-codeset-0 OPTIONAL, + ..., + mAP-parameters [3] MAP-parameters OPTIONAL +} + +ISUP-parameters ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- Each "OCTET STRING" contains one additional ISUP parameter TLV coded not already defined in + -- the previous parameters. The Tag value is the one given in EN 300 356 [5]. + + -- In version 1 of the present document "iSUP-parameters" is defined as mandatory. + -- It might occur that no ISUP parameter is available. In that case in a version 1 + -- implementation the value "zero" may be included in the first octet string of the SET. + + -- The Length and the Value are coded in accordance with the parameter definition in + -- EN 300 356 [5]. Hereafter are listed the main parameters. + -- However other parameters may be added: + + -- Transmission medium requirement: format defined in EN 300 356 [5]. + -- This parameter can be provided with the "Party Information" of the "calling party". + + -- Transmission medium requirement prime: format defined in EN 300 356 [5]. + -- This parameter can be provided with the "Party Information" of the "calling party". + +DSS1-parameters-codeset-0 ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- Each "OCTET STRING" contains one DSS1 parameter of the codeset-0. The parameter is coded as + -- described in EN 300 403-1 [6] (The DSS1 Information element identifier and the DSS1 length + -- are included). Hereafter are listed the main parameters. + -- However other parameters may be added: + + -- Bearer capability: this parameter may be repeated. Format defined in EN 300 403-1 [6]. + -- This parameter can be provided with the "Party Information" of the "calling party", + -- "called party" or "forwarded to party". + + -- High Layer Compatibility: this parameter may be repeated. Format defined in EN 300 403-1 [6] + -- This parameter can be provided with the "Party Information" of the "calling party", + -- "called party" or "forwarded to party". + + -- Low Layer capability: this parameter may be repeated. Format defined in EN 300 403-1 [6]. + -- This parameter can be provided with the "Party Information" of the "calling party", + -- "called party" or "forwarded to party". + +MAP-parameters ::= SET SIZE (1..256) OF OCTET STRING (SIZE(1..256)) + -- Each "OCTET STRING" contains one MAP parameter. The parameter is coded as described in + -- TS GSM 09.02 [32] (The map-TS-Code is included). + +Supplementary-Services ::= SEQUENCE +{ + standard-Supplementary-Services [1] Standard-Supplementary-Services OPTIONAL, + non-Standard-Supplementary-Services [2] Non-Standard-Supplementary-Services OPTIONAL, + other-Services [3] Other-Services OPTIONAL, + ... +} + +Standard-Supplementary-Services ::= SEQUENCE +{ + iSUP-SS-parameters [1] ISUP-SS-parameters OPTIONAL, + dSS1-SS-parameters-codeset-0 [2] DSS1-SS-parameters-codeset-0 OPTIONAL, + dSS1-SS-parameters-codeset-4 [3] DSS1-SS-parameters-codeset-4 OPTIONAL, + dSS1-SS-parameters-codeset-5 [4] DSS1-SS-parameters-codeset-5 OPTIONAL, + dSS1-SS-parameters-codeset-6 [5] DSS1-SS-parameters-codeset-6 OPTIONAL, + dSS1-SS-parameters-codeset-7 [6] DSS1-SS-parameters-codeset-7 OPTIONAL, + dSS1-SS-Invoke-components [7] DSS1-SS-Invoke-Components OPTIONAL, + mAP-SS-Parameters [8] MAP-SS-Parameters OPTIONAL, + mAP-SS-Invoke-Components [9] MAP-SS-Invoke-Components OPTIONAL, + ... +} + +Non-Standard-Supplementary-Services ::= SET SIZE (1..20) OF CHOICE +{ + simpleIndication [1] SimpleIndication, + sciData [2] SciDataMode, + ... +} + +Other-Services ::= SET SIZE (1..50) OF OCTET STRING (SIZE (1..256)) + -- Reference manufacturer manuals. + +ISUP-SS-parameters ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- It must be noticed this parameter is retained for compatibility reasons. + -- It is recommended not to use it in new work but to use ISUP-parameters parameter. + + -- Each "OCTET STRING" contains one additional ISUP parameter TLV coded not already defined in + -- the previous parameters. The Tag value is the one given in EN 300 356 [5]. + -- The Length and the Value are coded in accordance with the parameter definition in + -- EN 300 356 [5]. Hereafter are listed the main parameters. + -- However other parameters may be added: + + -- Connected Number: format defined in EN 300 356 [5]. + -- This parameter can be provided with the "Party Information" of the + -- "called party" or "forwarded to party". + + -- RedirectingNumber: format defined in EN 300 356 [5]. + -- This parameter can be provided with the "Party Information" of the "originating party" + -- or/and of the �terminating party�. + + -- Original Called Party Number: format defined in EN 300 356 [5]. + -- This parameter can be provided with the "Party Information" of the "originating party". + + -- Redirection information: format defined in EN 300 356 [5]. + -- This parameter can be provided with the "Party Information" of the + -- "originating party", "forwarded to party" or/and "Terminating party". + + -- Redirection Number: format defined in EN 300 356 [5]. + -- This parameter can be provided with the "Party Information" of the + -- "forwarded to party" or "Terminating party". + + -- Call diversion information: format defined in EN 300 356 [5]. + -- This parameter can be provided with the "Party Information" of the + -- "forwarded to party" or "Terminating party". + + -- Generic Number: format defined in EN 300 356 [5]. + -- This parameter can be provided with the "Party Information" of the + -- "calling party", "called party" or "forwarded to party". + -- This parameters are used to transmit additional identities (additional, calling party + -- number, additional called number, etc.). + + -- Generic Notification: format defined in EN 300 356 [5]. + -- This parameter may be provided with the "Party Information" of the + -- "calling party", "called party" or "forwarded to party". + -- This parameters transmit the notification to the other part of the call of the supplementary + -- services activated or invoked by a subscriber during the call. + + -- CUG Interlock Code: format defined in EN 300 356 [5]. + -- This parameter can be provided with the "Party Information" of the "calling party". + +DSS1-SS-parameters-codeset-0 ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- Each "OCTET STRING" contains one DSS1 parameter of the codeset-0. The parameter is coded as + -- described in EN 300 403-1 [6] (The DSS1 Information element identifier and the DSS1 length + -- are included). Hereafter are listed the main parameters. + -- However other parameters may be added: + + -- Calling Party Subaddress: format defined in EN 300 403-1 [6]. + -- This parameter can be provided with the "Party Information" of the "calling party". + + -- Called Party Subaddress: format defined in EN 300 403-1 [6]. + -- This parameter can be provided with the "Party Information" of the "calling party". + + -- Connected Subaddress: format defined in recommendation (see�EN 300 097-1 [14]). + -- This parameter can be provided with the "Party Information" of the + -- "called party" or "forwarded to party". + + -- Connected Number: format defined in recommendation (see�EN 300 097-1 [14]). + -- This parameter can be provided with the "Party Information" of the + -- "called party" or "forwarded to party". + + -- Keypad facility: format defined in EN 300 403-1 [6]. + -- This parameter can be provided with the "Party Information" of the + -- "calling party", "called party" or "forwarded to party". + + -- Called Party Number: format defined in EN 300 403-1 [6]. + -- This parameter could be provided with the "Party Information" of the "calling party" + -- when target is the originating party; it contains the dialled digits before modification + -- at network level (e.g. IN interaction, translation, etc �). + + -- User-user: format defined in EN 300 286-1 [23]). + -- This parameter can be provided with the "Party Information" of the + -- "calling party", "called party" or "forwarded to party". + +DSS1-SS-parameters-codeset-4 ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- Each "OCTET STRING" contains one DSS1 parameter of the codeset-4. The parameter is coded as + -- described in the relevant recommendation. + +DSS1-SS-parameters-codeset-5 ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- Each "OCTET STRING" contains one DSS1 parameter of the codeset-5. The parameter is coded as + -- described in the relevant national recommendation. + +DSS1-SS-parameters-codeset-6 ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- Each "OCTET STRING" contains one DSS1 parameter of the codeset-6. The parameter is coded as + -- described in the relevant local network recommendation. + +DSS1-SS-parameters-codeset-7 ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- Each "octet string" contains one DSS1 parameter of the codeset-7. The parameter is coded as + -- described in the relevant user specific recommendation. + +DSS1-SS-Invoke-Components ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- Each "octet string" contains one DSS1 Invoke or Return Result component. + -- The invoke or return result component is coded as + -- described in the relevant DSS1 supplementary service recommendation. + + -- Invoke or Return Result component (BeginCONF): EN 300 185-1 [19] + -- Invoke or Return Result component (AddCONF): EN 300 185-1 [19] + -- Invoke or Return Result component (SplitCONF): EN 300 185-1 [19] + -- Invoke or Return Result component (DropCONF): EN 300 185-1 [19] + -- Invoke or Return Result component (IsolateCONF): EN 300 185-1 [19] + -- Invoke or Return Result component (ReattachCONF): EN 300 185-1 [19] + -- Invoke or Return Result component (PartyDISC): EN 300 185-1 [19] + -- Invoke or Return Result component (MCIDRequest): EN 300 130-1 [16] + -- Invoke or Return Result component (Begin3PTY): EN 300 188-1 [20] + -- Invoke or Return Result component (End3PTY): EN 300 188-1 [20] + -- Invoke or Return Result component (ECTExecute): EN 300 369-1 [25] + -- Invoke or Return Result component (ECTInform): EN 300 369-1 [25] + -- Invoke or Return Result component (ECTLinkIdRequest): EN 300 369-1 [25] + -- Invoke or Return Result component (ECTLoopTest): EN 300 369-1 [25] + -- Invoke or Return Result component (ExplicitECTExecute): EN 300 369-1 [25] + -- Invoke or Return Result component (ECT: RequestSubaddress): EN 300 369-1 [25] + -- Invoke or Return Result component (ECT: SubaddressTransfer): EN 300 369-1 [25] + -- Invoke or Return Result component (CF: ActivationDiversion): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: DeactivationDiversion): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: ActivationStatusNotification): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: DeactivationStatusNotification): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: InterrogationDiversion): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: InterrogationServedUserNumber): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: DiversionInformation): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: CallDeflection): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: CallRerouteing): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: DivertingLegInformation1): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: DivertingLegInformation2): EN 300 207-1 [21] + -- Invoke or Return Result component (CF: DivertingLegInformation3): EN 300 207-1 [21] + -- other invoke or return result components ... + +MAP-SS-Invoke-Components ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- Each "octet string" contains one MAP Invoke or Return Result component. + -- The invoke or return result component is coded as + -- described in the relevant MAP supplementary service recommendation. + +MAP-SS-Parameters ::= SET SIZE (1..256) OF OCTET STRING (SIZE (1..256)) + -- Each "octet string" contains one MAP Parameter. The parameter is coded as + -- described in the relevant MAP supplementary service recommendation. + +SimpleIndication ::= ENUMERATED +{ + call-Waiting-Indication(0), + -- The target has received a call waiting indication for this call + add-conf-Indication(1), + -- this call has been added to a conference + call-on-hold-Indication(2), + -- indication that this call is on hold + retrieve-Indication(3), + -- indication that this call has been retrieved + suspend-Indication(4), + -- indication that this call has been suspended + resume-Indication(5), + -- indication that this call has been resumed + answer-Indication(6), + -- indication that this call has been answered + ... +} + +SciDataMode ::= OCTET STRING (SIZE (1..256)) + +SMS-report ::= SEQUENCE +{ + communicationIdentifier [1] CommunicationIdentifier, + -- used to uniquely identify an intercepted call: the same used for the + -- relevant IRI + -- Called "callIdentifier" in V1.1.1 of ES 201 671 [i.5] + timeStamp [2] TimeStamp, + -- date and time of the report. The format is + -- the one defined in case a) of the ASN.1 ITU-T Recommendation X.680 [33]. + -- (year month day hour minutes seconds) + sMS-Contents [3] SEQUENCE + { + initiator [1] ENUMERATED + { + -- party which sent the SMS + target(0), + server(1), + undefined-party(2), + ... + }, + transfer-status [2] ENUMERATED + { + succeed-transfer(0), + --the transfer of the SMS message succeeds + not-succeed-transfer(1), + undefined(2), + ... + } OPTIONAL, + other-message [3] ENUMERATED + { + -- In case of terminating call, indicates if the server will send other SMS. + yes(0), + no(1), + undefined(2), + ... + } OPTIONAL, + content [4] OCTET STRING (SIZE (1..270)) OPTIONAL, + -- Encoded in the format defined for the SMS mobile. + -- The content and enhancedContent fields are mutually exclusive. + -- The content field is dedicated for 3GPP purposes. + ..., + enhancedContent [5] SEQUENCE + { + content [1] OCTET STRING, + -- The character encoding used in the content field is specified in the + -- character-encoding field. + character-encoding [2] ENUMERATED + { + gsm-7-bit-ascii(0), + eight-bit-ascii(1), + eight-bit-binary(2), + ucs-2(3), + utf-8(4), + utf-16(5), + other(6), + ... + } + } OPTIONAL + } +} + +LawfulInterceptionIdentifier ::= OCTET STRING (SIZE (1..25)) + -- It is recommended to use ASCII characters in "a"�"z", "A"�"Z", "-", "_", ".", and "0"�"9". + -- For subaddress option only "0"..."9" shall be used. + +National-Parameters ::= SET SIZE (1..40) OF OCTET STRING (SIZE (1..256)) + -- Content defined by national law. + +GPRSCorrelationNumber ::= OCTET STRING (SIZE(8..20)) + +GPRSEvent ::= ENUMERATED + -- see 3GPP TS 03.33 [42] +{ + pDPContextActivation(1), + startOfInterceptionWithPDPContextActive(2), + pDPContextDeactivation(4), + gPRSAttach(5), + gPRSDetach(6), + cellOrRAUpdate(10), + sMS(11), + ..., + pDPContextModification(13), + endOfInterceptionWithPDPContextActive(14) +} + +Services-Data-Information ::= SEQUENCE +{ + gPRS-parameters [1] GPRS-parameters OPTIONAL, + ... +} + +GPRS-parameters ::= SEQUENCE +{ + pDP-address-allocated-to-the-target [1] DataNodeAddress OPTIONAL, + aPN [2] OCTET STRING (SIZE(1..100)) OPTIONAL, + -- The Access Point Name (APN) is coded in accordance with + -- 3GPP TS 24.008 [41] without the APN IEI (only the last 100 octets are used). + -- Octets are coded according to 3GPP TS 23.003 [76]. + -- This parameter is duplicated from 3GPP TS 33.108 [61]. + pDP-type [3] OCTET STRING (SIZE(2)) OPTIONAL, + -- when PDP-type is IPv4 or IPv6, the IP address is carried by parameter + -- pDP-address-allocated-to-the-target when PDP-type is IPv4v6, + -- the additional IP address is carried by parameter additionalIPaddress + ..., + nSAPI [4] OCTET STRING (SIZE (1)) OPTIONAL, + additionalIPaddress [5] DataNodeAddress OPTIONAL +} + +GPRSOperationErrorCode ::= OCTET STRING (SIZE(2)) + -- Refer to 3GPP TS 24.008 [41] for values (GMM cause or SM cause parameter). + +DataNodeAddress ::= CHOICE +{ + ipAddress [1] IPAddress, + x25Address [2] X25Address, + ... +} + +IPAddress ::= SEQUENCE +{ + iP-type [1] ENUMERATED + { + iPV4(0), + iPV6(1), + ... + }, + iP-value [2] IP-value, + iP-assignment [3] ENUMERATED + { + static(1), + -- The static coding shall be used to report a static address. + dynamic(2), + -- The dynamic coding shall be used to report a dynamically allocated address. + notKnown(3), + -- The notKnown coding shall be used to report other then static or dynamically + -- allocated IP addresses. + ... + } OPTIONAL, + ..., + iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, + -- Indicates the length of the prefix delegated by the CSP to the subscriber + -- example: 60 if IP address is �2001:db8:0:85a3::ac1f:8001/60� + -- Mandatory in case where the iP-value contains an IPv6 binary value + iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL + -- For IPv4 addresses, this indicates the subnetmask to be applied to the iP-value field. + -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to + -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to + -- a /29 CIDR-format subnet mask +} + +IP-value ::= CHOICE +{ + iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), + -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" + -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" + iPTextAddress [2] IA5String (SIZE(7..45)), + -- In case of IPv6, the delivered iPTextAddress field could include a complete + -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. + -- In case of IPv4, the delivered iPTextAddress field could include a single + -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" + ... +} + +X25Address ::= OCTET STRING (SIZE(1..25)) + +National-HI2-ASN1parameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [67], + -- the country to which the parameters inserted after the extension marker apply. + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from the IANA web site (see annex K). Besides, it is recommended to avoid + -- using tags from 240 to 255 in a formal type definition. +} + +END -- end of HI2Operations diff --git a/testing/deps/101909/PCESP.asn b/testing/deps/101909/PCESP.asn new file mode 100644 index 0000000..df89e26 --- /dev/null +++ b/testing/deps/101909/PCESP.asn @@ -0,0 +1,428 @@ +PCESP {iso(1) identified-organization(3) dod(6) internet(1) private(4) + enterprise(1) cable-Television-Laboratories-Inc(4491) clabProject(2) + clabProjPacketCable(2) pktcLawfulIntercept(5) pcesp(1) version-4(4)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +ProtocolVersion ::= ENUMERATED +{ + -- Versions IO1 and IO2 do not support protocol versioning. + v3(3), -- Version supporting PacketCable Electronic Surveillance + -- Specification I03 + v4(4), -- Version supporting PacketCable Electronic Surveillance + -- Specification I04 +... +} + +CdcPdu ::= SEQUENCE +{ + protocolVersion [0] ProtocolVersion, + message [1] Message, + ... +} + +Message ::= CHOICE +{ + answer [1] Answer, + ccclose [2] CCClose, + ccopen [3] CCOpen, + reserved0 [4] NULL, -- Reserved + origination [5] Origination, + reserved1 [6] NULL, -- Reserved + redirection [7] Redirection, + release [8] Release, + reserved2 [9] NULL, -- Reserved + terminationattempt [10] TerminationAttempt, + reserved [11] NULL, -- Reserved + ccchange [12] CCChange, + reserved3 [13] NULL, -- Reserved + reserved4 [14] NULL, -- Reserved + dialeddigitextraction [15] DialedDigitExtraction, + networksignal [16] NetworkSignal, + subjectsignal [17] SubjectSignal, + mediareport [18] MediaReport, + serviceinstance [19] ServiceInstance, + confpartychange [20] ConferencePartyChange, + ... +} + +Answer ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId, + answering [4] PartyId OPTIONAL, + ... +} + +CCChange ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId, + cCCId [4] EXPLICIT CCCId, + subject [5] SDP OPTIONAL, + associate [6] SDP OPTIONAL, + flowDirection [7] FlowDirection, + resourceState [8] ResourceState OPTIONAL, + ... +} + +CCClose ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + cCCId [3] EXPLICIT CCCId, + flowDirection [4] FlowDirection, + ... +} + +CCOpen ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + ccOpenOption CHOICE + { + ccOpenTime [3] SEQUENCE OF CallId, + reserved0 [4] NULL, -- Reserved + ... + }, + cCCId [5] EXPLICIT CCCId, + subject [6] SDP OPTIONAL, + associate [7] SDP OPTIONAL, + flowDirection [8] FlowDirection, + ... +} + +ConferencePartyChange ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId, + communicating [4] SEQUENCE OF SEQUENCE + { + -- include to identify parties participating in the + -- communication. + partyId [0] SEQUENCE OF PartyId OPTIONAL, + -- identifies communicating party identities. + cCCId [1] EXPLICIT CCCId OPTIONAL, + -- included when the content of the resulting call is + -- delivered to identify the associated CCC(s). + ... + } OPTIONAL, + removed [5] SEQUENCE OF SEQUENCE + { + -- include to identify parties removed (e.g., hold + -- service) from the communication. + partyId [0] SEQUENCE OF PartyId OPTIONAL, + -- identifies removed party identity(ies). + cCCId [1] EXPLICIT CCCId OPTIONAL, + -- included when the content of the resulting call is + -- delivered to identify the associated CCC(s). + ... + } OPTIONAL, + joined [6] SEQUENCE OF SEQUENCE + { + -- include to identify parties newly added to the + -- communication. + partyId [0] SEQUENCE OF PartyId OPTIONAL, + -- identifies newly added party identity(ies) to an existing + -- communication. + cCCId [1] EXPLICIT CCCId OPTIONAL, + -- included when the content of the resulting call is + -- delivered to identify the associated CCC(s). + ... + } OPTIONAL, + ... +} +DialedDigitExtraction ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId, + digits [4] VisibleString (SIZE (1..32, ...)), + -- string consisting of digits representing + -- Dual Tone Multi Frequency (DTMF) tones + -- having values from the following numbers, + -- letters, and symbols: + -- '0", '1", '2", '3", '4", '5", '6", '7", + -- '8", '9", '#", '*", 'A", 'B", 'C", 'D". + -- Example: '123AB" or '*66" or '345#" + ... +} +MediaReport ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId, + subject [4] SDP OPTIONAL, + associate [5] SDP OPTIONAL, + ... +} +NetworkSignal ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId, + -- Signal + -- The following four parameters are used to report + -- information regarding network-generated signals. + -- Include at least one of the following four + -- parameters to identify the network-generated signal + -- being reported. + alertingSignal [4] AlertingSignal OPTIONAL, + subjectAudibleSignal [5] AudibleSignal OPTIONAL, + terminalDisplayInfo [6] TerminalDisplayInfo OPTIONAL, + other [7] VisibleString (SIZE (1..128, ...)) OPTIONAL, + -- Can be used to report undefined network signals +signaledToPartyId [8] PartyId, + ... +} +Origination ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId, + calling [4] PartyId, + called [5] PartyId OPTIONAL, + input CHOICE { + userinput [6] VisibleString (SIZE (1..32, ...)), + translationinput [7] VisibleString (SIZE (1..32, ...)), + ... + }, + reserved0 [8] NULL, -- Reserved + transitCarrierId [9] TransitCarrierId OPTIONAL, + ... +} +Redirection ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + old [3] CallId, + redirectedto [4] PartyId, + transitCarrierId [5] TransitCarrierId OPTIONAL, + reserved0 [6] NULL, -- Reserved + reserved1 [7] NULL, -- Reserved + new [8] CallId OPTIONAL, + redirectedfrom [9] PartyId OPTIONAL, + ... +} +Release ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId, + ... +} +ServiceInstance ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId, + relatedCallId [4] CallId OPTIONAL, + serviceName [5] VisibleString (SIZE (1..128, ...)), + firstCallCalling [6] PartyId OPTIONAL, + secondCallCalling [7] PartyId OPTIONAL, + called [8] PartyId OPTIONAL, + calling [9] PartyId OPTIONAL, + ... +} +SubjectSignal ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId OPTIONAL, + signal [4] SEQUENCE { + -- The following four parameters are used to report + -- information regarding subject-initiated dialing and + -- signaling. Include at least one of the following four + -- parameters to identify the subject- initiated dialing + -- and signaling information being reported. + switchhookFlash [0] VisibleString (SIZE (1..128, ...)) OPTIONAL, + dialedDigits [1] VisibleString (SIZE (1..128, ...)) OPTIONAL, + featureKey [2] VisibleString (SIZE (1..128, ...)) OPTIONAL, + otherSignalingInformation [3] VisibleString (SIZE (1..128, ...)) OPTIONAL, + -- Can be used to report undefined subject signals + ... + }, + signaledFromPartyId [5] PartyId, + ... +} +TerminationAttempt ::= SEQUENCE +{ + caseId [0] CaseId, + accessingElementId [1] AccessingElementId, + eventTime [2] EventTime, + callId [3] CallId, + calling [4] PartyId OPTIONAL, + called [5] PartyId OPTIONAL, + reserved0 [6] NULL, -- Reserved + redirectedFromInfo [7] RedirectedFromInfo OPTIONAL, + ... +} +AccessingElementId ::= VisibleString (SIZE(1..15, ...)) + -- Statically configured element number +AlertingSignal ::= ENUMERATED +{ + notUsed (0), -- Reserved + alertingPattern0 (1), -- normal ringing + alertingPattern1 (2), -- distinctive ringing: intergroup + alertingPattern2 (3), -- distinctive ringing: special/priority + alertingPattern3 (4), -- distinctive ringing: electronic key + -- telephone srvc + alertingPattern4 (5), -- ringsplash, reminder ring + callWaitingPattern1 (6), -- normal call waiting tone + callWaitingPattern2 (7), -- incoming additional call waiting tone + callWaitingPattern3 (8), -- priority additional call waiting tone + callWaitingPattern4 (9), -- distinctive call waiting tone + bargeInTone (10), -- barge-in tone (e.g. for operator barge-in) + alertingPattern5 (11), -- distinctive ringing: solution specific + alertingPattern6 (12), -- distinctive ringing: solution specific + alertingPattern7 (13), -- distinctive ringing: solution specific + alertingPattern8 (14), -- distinctive ringing: solution specific + alertingPattern9 (15), -- distinctive ringing: solution specific + ... +} +-- This parameter identifies the type of alerting (ringing) signal that is +-- applied toward the surveillance subject. See GR-506-CORE, LSSGR: Signaling +-- for Analog Interfaces (A Module of the LATA Switching Systems Generic +-- Requirements [LSSGR], FR-64). +AudibleSignal ::= ENUMERATED +{ + notUsed (0), -- Reserved + dialTone (1), + recallDialTone (2), -- recall dial tone, stutter dial tone + ringbackTone (3), -- tone indicates ringing at called party + -- end + reorderTone (4), -- reorder tone, congestion tone + busyTone (5), + confirmationTone (6), -- tone confirms receipt and processing of + -- request + expensiveRouteTone (7), -- tone indicates outgoing route is + -- expensive + messageWaitingTone (8), + receiverOffHookTone (9), -- receiver off-hook tone, off-hook warning + -- tone + specialInfoTone (10), -- tone indicates call sent to announcement + denialTone (11), -- tone indicates denial of feature request + interceptTone (12), -- wireless intercept/mobile reorder tone + answerTone (13), -- wireless service tone + tonesOff (14), -- wireless service tone + pipTone (15), -- wireless service tone + abbreviatedIntercept (16), -- wireless service tone + abbreviatedCongestion (17), -- wireless service tone + warningTone (18), -- wireless service tone + dialToneBurst (19), -- wireless service tone + numberUnObtainableTone (20), -- wireless service tone + authenticationFailureTone (21), -- wireless service tone + ... +} +-- This parameter identifies the type of audible tone that is applied toward +-- the surveillance subject. See GR-506-CORE, LSSGR: Signaling for Analog +-- Interfaces (A Module of the LATA Switching Systems Generic Requirements +-- [LSSGR], FR-64), ANSI/TIA/EIA-41-D, Cellular Radiotelecommunications +-- Intersystem Operations, and GSM 02.40, Digital cellular telecommunications +-- system (Phase 2+); Procedure for call progress indications. +CallId ::= SEQUENCE +{ + sequencenumber [0] VisibleString (SIZE(1..25, ...)), + systemidentity [1] VisibleString (SIZE(1..15, ...)), + ... +} +-- The Delivery Function generates this structure from the +-- Billing-Correlation-ID (contained in the Event Messages). +-- The sequencenumber is generated by converting the +-- Timestamp (32 bits) and Event-Counter (32 bits) into +-- ASCII strings, separating them with a comma. +-- The systemidentity field is copied from the Element-ID field +CaseId ::= VisibleString (SIZE(1..25, ...)) +CCCId ::= CHOICE +{ + combCCC [0] VisibleString (SIZE(1..20, ...)), + sepCCCpair [1] SEQUENCE{ + sepXmitCCC [0] VisibleString (SIZE(1..20, ...)), + sepRecvCCC [1] VisibleString (SIZE(1..20, ...)), + ... + }, + ... +} +-- The Delivery Function MUST generate this structure +-- from the CCC-Identifier used for the corresponding +-- Call Content packet stream by converting the 32-bit +-- value into an 8-character (hex-encoded) ASCII string +-- consisting of digits 0-9 and letters A-F. +EventTime ::= GeneralizedTime +FlowDirection ::= ENUMERATED +{ + downstream (1), + upstream (2), + downstream-and-upstream (3), + ... +} +PartyId ::= SEQUENCE +{ + reserved0 [0] NULL OPTIONAL, -- Reserved + reserved1 [1] NULL OPTIONAL, -- Reserved + reserved2 [2] NULL OPTIONAL, -- Reserved + reserved3 [3] NULL OPTIONAL, -- Reserved + reserved4 [4] NULL OPTIONAL, -- Reserved + reserved5 [5] NULL OPTIONAL, -- Reserved + dn [6] VisibleString (SIZE(1..15, ...)) OPTIONAL, + userProvided [7] VisibleString (SIZE(1..15, ...)) OPTIONAL, + reserved6 [8] NULL OPTIONAL, -- Reserved + reserved7 [9] NULL OPTIONAL, -- Reserved + ipAddress [10] VisibleString (SIZE(1..32, ...)) OPTIONAL, + reserved8 [11] NULL OPTIONAL, -- Reserved + trunkId [12] VisibleString (SIZE(1..32, ...)) OPTIONAL, + reserved9 [13] NULL OPTIONAL, -- Reserved + genericAddress [14] VisibleString (SIZE(1..32, ...)) OPTIONAL, + genericDigits [15] VisibleString (SIZE(1..32, ...)) OPTIONAL, + genericName [16] VisibleString (SIZE(1..48, ...)) OPTIONAL, + port [17] VisibleString (SIZE(1..32, ...)) OPTIONAL, + context [18] VisibleString (SIZE(1..32, ...)) OPTIONAL, + ... +} +RedirectedFromInfo ::= SEQUENCE +{ + lastRedirecting [0] PartyId OPTIONAL, + originalCalled [1] PartyId OPTIONAL, + numRedirections [2] INTEGER (1..100, ...) OPTIONAL, + ... +} +ResourceState ::= ENUMERATED {reserved(1), committed(2), ...} +SDP ::= UTF8String +-- The format and syntax of this field are defined in [8]. +TerminalDisplayInfo ::= SEQUENCE { + generalDisplay [0] VisibleString (SIZE (1..80, ...)) OPTIONAL, + -- Can be used to report display-related + -- network signals not addressed by + -- other parameters. + calledNumber [1] VisibleString (SIZE (1..40, ...)) OPTIONAL, + callingNumber [2] VisibleString (SIZE (1..40, ...)) OPTIONAL, + callingName [3] VisibleString (SIZE (1..40, ...)) OPTIONAL, + originalCalledNumber [4] VisibleString (SIZE (1..40, ...)) OPTIONAL, + lastRedirectingNumber [5] VisibleString (SIZE (1..40, ...)) OPTIONAL, + redirectingName [6] VisibleString (SIZE (1..40, ...)) OPTIONAL, + redirectingReason [7] VisibleString (SIZE (1..40, ...)) OPTIONAL, + messageWaitingNotif [8] VisibleString (SIZE (1..40, ...)) OPTIONAL, + ... +} +-- This parameter reports information that is displayed on the surveillance +-- subject's terminal. See GR-506-CORE, LSSGR: Signaling for Analog +-- Interfaces (A Module of the LATA Switching Systems Generic Requirements [LSSGR], FR-64). +TransitCarrierId ::= VisibleString (SIZE(3..7, ...)) +END -- PCESP diff --git a/testing/deps/101909/TS101909201.asn b/testing/deps/101909/TS101909201.asn new file mode 100644 index 0000000..14adc5b --- /dev/null +++ b/testing/deps/101909/TS101909201.asn @@ -0,0 +1,65 @@ +TS101909201 {itu-t (0) identified-organization (4) etsi (0) ts101909 (1909) part20 (20) subpart1(1) interceptVersion (0)} +DEFINITIONS AUTOMATIC TAGS ::= +BEGIN +IMPORTS + CdcPdu FROM + PCESP {iso(1) identified-organization(3) dod(6) internet(1) private(4) + enterprise(1) cable-Television-Laboratories-Inc(4491) clabProject(2) + clabProjPacketCable(2) pktcLawfulIntercept(5) pcesp(1) version-4(4)}; + +TARGETACTIVITYMONITOR-1 ::= SEQUENCE +{ + version INTEGER DEFAULT 1, -- header, version - + lIInstanceid LIIDType, -- header, who - + timestamp UTCTime, -- header, when - + targetLocation LocationType, -- header, where - + direction DirectionType, + iRITransaction IRITransactionType DEFAULT iRIreport, + iRITransactionNumber INTEGER, + userSignal UserSignalType, -- Either copy or interpreted signalling + cryptoCheckSum BIT STRING OPTIONAL +} +TTRAFFIC ::= SEQUENCE +{ + version INTEGER DEFAULT 1, -- header, version - + lIInstanceid LIIDType, + iRITransactionNumber INTEGER, + trafficPacket BIT STRING, + cryptoChecksum BIT STRING OPTIONAL +} +CTTRAFFIC ::= SEQUENCE +{ + version INTEGER DEFAULT 1, -- header, version - + lIInstanceid LIIDType, + correspondentCount INTEGER, + iRITransactionNumber INTEGER, + trafficPacket BIT STRING, + cryptoChecksum BIT STRING OPTIONAL +} +DirectionType ::= ENUMERATED +{ + toTarget, + fromTarget, + unknown +} +UserSignalType ::= CHOICE +{ + copySignal BIT STRING, + interpretedSignal INTEGER, + cdcPdu CdcPdu +} +IRITransactionType ::= ENUMERATED +{ + iRIbegin, + iRIcontinue, + iRIend, + iRIreport +} +LocationType ::= CHOICE +{ + geodeticData BIT STRING, + nameAddress PrintableString (SIZE (1..100)) +} +LIIDType ::= INTEGER (0..65535) +-- 16 bit integer to identify interception +END diff --git a/testing/deps/101909/TS101909202.asn b/testing/deps/101909/TS101909202.asn new file mode 100644 index 0000000..e4a79d1 --- /dev/null +++ b/testing/deps/101909/TS101909202.asn @@ -0,0 +1,61 @@ +TS101909202 {itu-t (0) identified-organization (4) etsi (0) ts101909 (1909) part20 (20) subpart2(2) interceptVersion (0)} + +DEFINITIONS AUTOMATIC TAGS ::= +BEGIN + +TARGETACTIVITYMONITOR ::= SEQUENCE +{ +version INTEGER DEFAULT 1, -- header, version - + lIInstanceid LIIdType, -- header, who - + timestamp UTCTime, -- header, when - + targetLocation LocationType, -- header, where - + direction DirectionType, + iRITransaction IRITransactionType DEFAULT iRIreport, + iRITransactionNumber INTEGER, + userSignal UserSignalType, -- Either copy or interpreted signalling + cryptoCheckSum BIT STRING OPTIONAL +} +TTRAFFIC ::= SEQUENCE +{ + version INTEGER DEFAULT 1, -- header, version - + lIInstanceid LIIdType, + iRITransactionNumber INTEGER, + trafficPacket BIT STRING, + cryptoChecksum BIT STRING OPTIONAL +} +CTTRAFFIC ::= SEQUENCE +{ + version INTEGER DEFAULT 1, -- header, version - + lIInstanceid LIIdType, + correspondentCount INTEGER, + iRITransactionNumber INTEGER, + trafficPacket BIT STRING, + cryptoChecksum BIT STRING OPTIONAL +} +DirectionType ::= ENUMERATED +{ + toTarget, + fromTarget, + unknown +} +UserSignalType ::= CHOICE +{ + copySignal BIT STRING, + copyCharSignal PrintableString, + interpretedSignal INTEGER + -- Place holder +} +IRITransactionType ::= ENUMERATED +{ + iRIbegin, + iRIcontinue, + iRIend, + iRIreport +} +LocationType ::= CHOICE +{ + geodeticData BIT STRING, + nameAddress PrintableString (SIZE (1..100)) +} +LIIdType ::= INTEGER (0..65535) -- 16 bit integer to identify interception +END diff --git a/testing/deps/301040/06132v203_C01.asn b/testing/deps/301040/06132v203_C01.asn new file mode 100644 index 0000000..56305a2 --- /dev/null +++ b/testing/deps/301040/06132v203_C01.asn @@ -0,0 +1,269 @@ +EN301040 {itu-t (0) identified-organization (4) etsi (0) en301040 (1040) interceptVersion (0)} + +DEFINITIONS AUTOMATIC TAGS ::= + +BEGIN + +LIACTIVATEreq ::= SEQUENCE +{ + timeStamp UTCTime, + invokeId INTEGER, + targetAddress AddressType, + expiryDateTime UTCTime, + targetname VisibleString OPTIONAL, + additionaltargetdata VisibleString OPTIONAL, + monitorServiceList SEQUENCE OF ActivityType +} + +LIACTIVATEconf ::= SEQUENCE +{ + timeStamp UTCTime, + invokeId INTEGER, + result BOOLEAN, + tLIInstanceid TLIIdType OPTIONAL -- Conditional on value of Result -- +} + +LIMODIFYreq ::= SEQUENCE +{ + tLIInstanceid TLIIdType, + timestamp UTCTime, + modificationNumber INTEGER, + modificationType CHOICE + { + halt BOOLEAN, + reset BOOLEAN, + expiryDateTime UTCTime, + targetname VisibleString, + additionaltargetdata VisibleString, + monitorServiceList SEQUENCE OF ActivityType + } +} + +LIMODIFYconf ::= SEQUENCE +{ + tLIInstanceid TLIIdType, + timestamp UTCTime, + modificationNumber INTEGER, + result BOOLEAN +} + +LISTATUSind ::= SEQUENCE +{ + tLIInstanceid TLIIdType, + timestamp UTCTime, + tETRASysStatus StatusType +} + +TARGETACTIVITYMONITORind ::= SEQUENCE +{ + tLIInstanceid TLIIdType, -- header, who + timestamp UTCTime, -- header, when + targetLocation LocationType, -- header, where + targetAction ActivityType, + supplementaryTargetaddress AddressType OPTIONAL, + cotargetaddress SEQUENCE OF AddressType OPTIONAL, + cotargetlocation SEQUENCE OF LocationType OPTIONAL +} + +TARGETCOMMSMONITORind ::= SEQUENCE +{ + tLIInstanceid TLIIdType, + timestamp UTCTime, + targetlocation LocationType, + supplementaryTargetaddress AddressType OPTIONAL, + targetcommsid CircuitIdType, + cotargetaddress SEQUENCE OF AddressType OPTIONAL, + cotargetcommsid SEQUENCE OF CircuitIdType OPTIONAL +} + +TTRAFFICind ::= SEQUENCE +{ + tLIInstanceid TLIIdType, + trafficPacket BIT STRING +} + +CTTRAFFICind ::= SEQUENCE +{ + tLIInstanceid TLIIdType, + trafficPacket BIT STRING +} + + +ActivityClassType ::= ENUMERATED +{ + allServices, + tETRASpeech, + singleSlotData24, + singleSlotData48, + singleSlotData72, + multiSlotData224, + multiSlotData248, + multiSlotData272, + multiSlotData324, + multiSlotData348, + multiSlotData372, + multiSlotData424, + multiSlotData448, + multiSlotData472, + sDSType1, + sDSType2, + sDSType3, + sDSType4, + status, + sDSACKType1, + sDSACKType2, + sDSACKType3, + sDSACKType4, + statusack, + sDSAcknowledgementsuccess, + sDSAcknowledgementfail, + sCLNSPacketData, + cONSPacketData, + internetProtocol, + swMIauthenticationsuccess, + swMIauthenticationfail, + iTSIauthenticationsuccess, + iTSIauthenticationfail, + oTARSCKsuccess, + oTARSCKfail, + oTARGCKsuccess, + oTARGCKfail, + oTARCCKsuccess, + oTARCCKfail, + tARGETSUSCRIPTIONDISABLEDT, + tARGETEQUIPMENTDISABLEDT, + tARGETSUSCRIPTIONDISABLEDP, + tARGETEQUIPEMENTDISABLEDP, + tARGETSUBSCRIPTIONENABLED, + tARGETEQUIPMENTENABLED, + sessionregistration, + sessionderegistration, + mIGRATION, + rOAMING, + supplementaryService +} + +ActivityType::= SEQUENCE +{ + cctivity ActivityClassType, + callRelation ENUMERATED + { + begin, + end, + continue, + report + }, + direction ENUMERATED + { + toTarget, + fromTarget + } OPTIONAL, + scope ENUMERATED + { + point2Point, + point2MultiPoint, + broadcast + } OPTIONAL, + cPlaneData BIT STRING OPTIONAL, + sStype SSType OPTIONAL +} + +AddressType ::= SEQUENCE +{ + tSI TSIType, + supplementaryAddress SEQUENCE OF TETRAAddressType OPTIONAL +} + +TETRAAddressType ::= CHOICE +{ + tETRAaddress TSIType, + pISNaddress NumericString (SIZE (20)), + iP4address BIT STRING (SIZE (32)), -- 32 bits + iP6address BIT STRING (SIZE (128)), -- 128 bits + e164address NumericString (SIZE (20)), + tEI TEIType +} + + +CellIdType ::= BIT STRING (SIZE (16)) -- 16 bits + +LocationAreaType ::= BIT STRING (SIZE (14)) -- 14 bits, as defined in ETS 300 392-2 + +LocationType ::= CHOICE +{ + mSLoc TETRACGIType, + lSLoc TETRAAddressType +} + + +MCCType ::= BIT STRING (SIZE (10)) -- 10 bits, as defined in ETS 300 392-1 + +MNCType ::= BIT STRING (SIZE (14)) -- 14 bits, as defined in ETS 300 392-1 + +SSIType ::= BIT STRING (SIZE (24)) -- 24 bits, as defined in ETS 300 392-1 + +CircuitIdType ::= NumericString (SIZE (20)) + +SSType ::= ENUMERATED +{ + ambienceListening, + adviceofCharge, + accessPriority, + areaSelection, + barringofIncomingCalls, + barringofOutgoingCalls, + callAuthorizedbyDispatcher, + callCompletiontoBusySubscriber, + callCompletiononNoReply, + callForwardingonBusy, + callForwardingonNoReply, + callForwardingonNotReachable, + callForwardingUnconditional, + callingLineIdentificationPresentation, + callingConnectedLineIdentificationRestriction, + connectedLineIdentificationPresentation, + callReport, + callRetention, + callWaiting, + dynamicGroupNumberAssignment, + discreetListening, + callHold, + includeCall, + lateEntry, + listSearchCall, + priorityCall, + preemptivePriorityCall, + shortNumberAddressing, + transferofControl, + talkingPartyIdentification +} + +StatusType ::= ENUMERATED +{ + networkFullyAvailable, + networkErrorsAffectingIntercept, + reconfigurationInProgress, + sessionExpired, + gatewayServicesUnavailable +} + +TETRACGIType ::= SEQUENCE +{ + mcc MCCType, + mnc MNCType, + lai LocationAreaType, + cI CellIdType OPTIONAL +} + +TLIIdType ::= BIT STRING (SIZE (16)) -- 16 bits + +TSIType ::= SEQUENCE +{ + mcc MCCType, + mnc MNCType, + ssi SSIType +} + +TEIType ::= BIT STRING (SIZE (60)) -- 60 bits, as defined in ETS 300 392-1 + +END diff --git a/testing/deps/33108/CSVoiceHI3IP.asn b/testing/deps/33108/CSVoiceHI3IP.asn new file mode 100644 index 0000000..86d6123 --- /dev/null +++ b/testing/deps/33108/CSVoiceHI3IP.asn @@ -0,0 +1,64 @@ +CSvoice-HI3-IP {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18) r14 (14) version-0 (0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + + +IMPORTS + + -- from ETSI HI2Operations TS 101 671, version 3.12.1 + CC-Link-Identifier, + CommunicationIdentifier, + LawfulInterceptionIdentifier, + TimeStamp + 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 + 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 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)}; + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi3CSvoiceDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3CSvoice(18) r14(14) version-0 (0)} + +CSvoice-CC-PDU ::= SEQUENCE +{ + cSvoiceLIC-header [0] CSvoiceLIC-header, + payload [1] OCTET STRING, + ... +} + +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. + timeStamp [4] TimeStamp OPTIONAL, + sequence-number [5] INTEGER (0..65535), + t-PDU-direction [6] TPDU-direction, + national-HI3-ASN1parameters [7] National-HI3-ASN1parameters OPTIONAL, + -- encoded per national requirements + payload-description [8] Payload-description, + -- used to provide the codec information of the CC (as RTP payload) delivered over HI3 + ... +} + + +END -- OF CSvoice-HI3-IP diff --git a/testing/deps/33108/ConfHI2Operations.asn b/testing/deps/33108/ConfHI2Operations.asn new file mode 100644 index 0000000..2ed285c --- /dev/null +++ b/testing/deps/33108/ConfHI2Operations.asn @@ -0,0 +1,222 @@ +CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2conf(10) r16 (16) version-0 (0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + + + LawfulInterceptionIdentifier, + TimeStamp, + Network-Identifier, + National-Parameters, + National-HI2-ASN1parameters + + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulIntercept(2) hi2(1) version18 (18)} -- Imported from TS 101 671, version 3.12.1 + + + CorrelationValues, + IMS-VoIP-Correlation + + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulIntercept(2) threeGPP(4) hi2(1) r16 (16) version-1(1)}; -- Imported from PS + -- ASN.1 Portion of this standard + + + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi2confDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2conf(10) r16 (16) version-0 (0)} + +ConfIRIsContent ::= CHOICE +{ + confiRIContent ConfIRIContent, + confIRISequence ConfIRISequence +} + +ConfIRISequence ::= SEQUENCE OF ConfIRIContent + +-- Aggregation of ConfIRIContent is an optional feature. +-- It may be applied in cases when at a given point in time +-- several IRI records are available for delivery to the same LEA destination. +-- As a general rule, records created at any event shall be sent +-- immediately and not withheld in the DF or MF in order to +-- apply aggragation. +-- When aggregation is not to be applied, +-- ConfIRIContent needs to be chosen. +ConfIRIContent ::= CHOICE +{ + iRI-Begin-record [1] IRI-Parameters, -- include at least one optional parameter + iRI-End-record [2] IRI-Parameters, + iRI-Continue-record [3] IRI-Parameters, -- include at least one optional parameter + iRI-Report-record [4] IRI-Parameters, -- include at least one optional parameter + ... +} + +IRI-Parameters ::= SEQUENCE +{ + hi2confDomainId [0] OBJECT IDENTIFIER, -- 3GPP HI2 Conf domain + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- This identifier is associated to the target. + timeStamp [2] TimeStamp, + -- date and time of the event triggering the report. + + partyInformation [3] SET SIZE (1..10) OF PartyIdentity OPTIONAL, + -- This is the identity of the target. + -- The sender shall only use one instance of PartyIdentity, the "SET SIZE" structure is + -- kept for ASN.1 backward compatibility reasons only. + + national-Parameters [4] National-Parameters OPTIONAL, + networkIdentifier [5] Network-Identifier OPTIONAL, + confEvent [6] ConfEvent, + correlation [7] ConfCorrelation OPTIONAL, + confID [8] IMSIdentity OPTIONAL, + tempConfID [9] IMSIdentity OPTIONAL, + listOfPotConferees [10] SET OF PartyIdentity OPTIONAL, + listOfConferees [11] SET OF ConfPartyInformation OPTIONAL, + joinPartyID [12] ConfPartyInformation OPTIONAL, + leavePartyID [13] ConfPartyInformation OPTIONAL, + listOfBearerAffectedParties [14] SET OF ConfPartyInformation OPTIONAL, + confEventInitiator [15] ConfEventInitiator OPTIONAL, + confEventFailureReason [16] ConfEventFailureReason OPTIONAL, + confEndReason [17] Reason OPTIONAL, + potConfStartInfo [18] TimeStamp OPTIONAL, + potConfEndInfo [19] TimeStamp OPTIONAL, + recurrenceInfo [20] RecurrenceInfo OPTIONAL, + confControllerIDs [21] SET OF PartyIdentity OPTIONAL, + mediamodification [23] MediaModification OPTIONAL, + bearerModifyPartyID [24] ConfPartyInformation OPTIONAL, + listOfWaitConferees [25] SET OF ConfPartyInformation OPTIONAL, + +... + +} + + +-- PARAMETERS FORMATS + +ConfEvent ::= ENUMERATED +{ + confStartSuccessfull (1), + confStartUnsuccessfull (2), + startOfInterceptionConferenceActive (3), + confPartyJoinSuccessfull (4), + confPartyJoinUnsuccessfull (5), + confPartyLeaveSuccessfull (6), + confPartyLeaveUnsuccessfull (7), + confPartyBearerModifySuccessfull (8), + confPartyBearerModifyUnsuccessfull (9), + confEndSuccessfull (10), + confEndUnsuccessfull (11), + confServCreation (12), + confServUpdate (13), + ... +} + +ConfPartyInformation ::= SEQUENCE +{ + partyIdentity [1] PartyIdentity OPTIONAL, + + supportedmedia [2] SupportedMedia OPTIONAL, + + ... +} + +ConfCorrelation ::= CHOICE + +{ + correlationValues [1] CorrelationValues, + correlationNumber [2] OCTET STRING, + imsVoIP [3] IMS-VoIP-Correlation, + ... +} + +PartyIdentity ::= SEQUENCE +{ + + iMPU [3] SET OF IMSIdentity OPTIONAL, + + iMPI [4] SET OF IMSIdentity OPTIONAL, + + ... +} + +IMSIdentity ::= SEQUENCE +{ + sip-uri [1] OCTET STRING OPTIONAL, + -- See [REF 26 of 33.108] + + tel-uri [2] OCTET STRING OPTIONAL, + -- See [REF 67 of 33.108] + + ... +} + +SupportedMedia ::= SEQUENCE +{ + confServerSideSDP [1] OCTET STRING OPTIONAL, -- include SDP information + -- describing Conf Server Side characteristics. + + confUserSideSDP [2] OCTET STRING OPTIONAL, -- include SDP information + -- describing Conf User Side characteristics + + ... +} + +MediaModification ::= ENUMERATED +{ + add (1), + remove (2), + change (3), + unknown (4), + ... +} + +ConfEventFailureReason ::= CHOICE +{ + failedConfStartReason [1] Reason, + + failedPartyJoinReason [2] Reason, + + failedPartyLeaveReason [3] Reason, + + failedBearerModifyReason [4] Reason, + + failedConfEndReason [5] Reason, + + ... +} + +ConfEventInitiator ::= CHOICE +{ + confServer [1] NULL, + + confTargetID [2] PartyIdentity, + + confPartyID [3] PartyIdentity, + ... +} + +RecurrenceInfo ::= SEQUENCE +{ + recurrenceStartDateAndTime [1] TimeStamp OPTIONAL, + recurrenceEndDateAndTime [2] TimeStamp OPTIONAL, + recurrencePattern [3] UTF8String OPTIONAL, -- includes a description of + -- the recurrence pattern, for example, "Yearly, on Jan 23" or "Weekly, on Monday" + + ... +} + +Reason ::= OCTET STRING + +END -- OF ConfHI2Operations diff --git a/testing/deps/33108/ConfHI3IMS.asn b/testing/deps/33108/ConfHI3IMS.asn new file mode 100644 index 0000000..462cafb --- /dev/null +++ b/testing/deps/33108/ConfHI3IMS.asn @@ -0,0 +1,90 @@ +CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3conf(11) r13 (13) version-0 (0)} + +DEFINITIONS IMPLICIT TAGS ::= + +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 + +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)} + -- 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)}; +-- Imported form EPS HI3 part of this standard + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi3confDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3conf(11) r13 (13) version-0 (0)} + +Conf-CC-PDU ::= SEQUENCE +{ + confLIC-header [1] ConfLIC-header, + payload [2] OCTET STRING +} + +ConfLIC-header ::= SEQUENCE +{ + hi3DomainId [0] OBJECT IDENTIFIER, -- 3GPP HI3 Domain + lIID [2] LawfulInterceptionIdentifier OPTIONAL, + correlation [3] ConfCorrelation, + timeStamp [4] TimeStamp OPTIONAL, + sequence-number [5] INTEGER (0..65535), + t-PDU-direction [6] TPDU-direction, + national-HI3-ASN1parameters [7] National-HI3-ASN1parameters OPTIONAL, + -- encoded per national requirements + mediaID [9] MediaID OPTIONAL, + -- Identifies the media being exchanged by parties on the conference. +... + +} + +MediaID ::= SEQUENCE +{ + sourceUserID [1] ConfPartyInformation OPTIONAL, -- include SDP information + -- describing Conf Server Side characteristics. + + streamID [2] OCTET STRING OPTIONAL, -- include streamID from SDP information. + + ... +} + +TPDU-direction ::= ENUMERATED +{ + from-target (1), + to-target (2), + unknown (3), + conftarget (4), + -- When the conference is the target (4) is used to denote there is no + -- directionality. + from-mixer (5), + -- Indicates the stream sent from the conference server towards the conference party. + to-mixer (6), + -- Indicates the stream sent from the conference party towards the conference party server. + combined (7) + -- Indicates that combined CC delivery is used. + +} + +END -- OF conf-HI3-IMS diff --git a/testing/deps/33108/EpsHI2Operations.asn b/testing/deps/33108/EpsHI2Operations.asn new file mode 100644 index 0000000..35bfaf2 --- /dev/null +++ b/testing/deps/33108/EpsHI2Operations.asn @@ -0,0 +1,1448 @@ +EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r16 (16) version-0 (0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + + + LawfulInterceptionIdentifier, + TimeStamp, + Network-Identifier, + National-Parameters, + National-HI2-ASN1parameters, + DataNodeAddress, + IPAddress, + IP-value, + X25Address + + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulIntercept(2) hi2(1) version18(18)} -- Imported from TS 101 671 v3.14.1 + + CivicAddress, + ExtendedLocParameters, + LocationErrorCode + + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulintercept(2) threeGPP(4) hi2(1) r16 (16) version-0 (0)}; + -- Imported from 3GPP TS 33.108, UMTS PS HI2 + + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r16(16) version-0 (0)} + +EpsIRIsContent ::= CHOICE +{ + epsiRIContent EpsIRIContent, + epsIRISequence EpsIRISequence +} + +EpsIRISequence ::= SEQUENCE OF EpsIRIContent + +-- Aggregation of EpsIRIContent is an optional feature. +-- It may be applied in cases when at a given point in time +-- several IRI records are available for delivery to the same LEA destination. +-- As a general rule, records created at any event shall be sent +-- immediately and not withheld in the DF or MF in order to +-- apply aggragation. +-- When aggregation is not to be applied, +-- EpsIRIContent needs to be chosen. +-- EpsIRIContent includes events that correspond to EPS and UMTS/GPRS. + + +EpsIRIContent ::= CHOICE +{ + iRI-Begin-record [1] IRI-Parameters, -- include at least one optional parameter + iRI-End-record [2] IRI-Parameters, + iRI-Continue-record [3] IRI-Parameters, -- include at least one optional parameter + iRI-Report-record [4] IRI-Parameters -- include at least one optional parameter +} +-- the EpsIRIContent may provide events that correspond to UMTS/GPRS as well. + +-- Parameters having the same tag numbers have to be identical in Rel-5 and onwards modules. +IRI-Parameters ::= SEQUENCE +{ + hi2epsDomainId [0] OBJECT IDENTIFIER, -- 3GPP HI2 EPS domain + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- This identifier is associated to the target. + timeStamp [3] TimeStamp, + -- date and time of the event triggering the report.) + initiator [4] ENUMERATED + { + not-Available (0), + originating-Target (1), + -- in case of GPRS, this indicates that the PDP context activation, modification + -- or deactivation is MS requested + -- in case of EPS, this indicated that the EPS detach, bearer activation, modification + -- or deactivation is UE requested + terminating-Target (2), + -- in case of GPRS, this indicates that the PDP context activation, modification or + -- deactivation is network initiated + -- in case of EPS, this indicated that the EPS detach, bearer activation, modification + -- or deactivation is network initiated + ... + } OPTIONAL, + + locationOfTheTarget [8] Location OPTIONAL, + -- location of the target + -- or cell site location + partyInformation [9] SET SIZE (1..10) OF PartyInformation OPTIONAL, + -- This parameter provides the concerned party, the identiy(ies) of the party + --)and all the information provided by the party. + + serviceCenterAddress [13] PartyInformation OPTIONAL, + -- e.g. in case of SMS message this parameter provides the address of the relevant + -- server + sMS [14] SMS-report OPTIONAL, + -- this parameter provides the SMS content and associated information + + national-Parameters [16] National-Parameters OPTIONAL, + ePSCorrelationNumber [18] EPSCorrelationNumber OPTIONAL, + -- this parameter provides GPRS Correlation number when the event corresponds to UMTS/GPRS. + ePSevent [20] EPSEvent OPTIONAL, + -- This information is used to provide particular action of the target + -- such as attach/detach + sgsnAddress [21] DataNodeAddress OPTIONAL, + gPRSOperationErrorCode [22] GPRSOperationErrorCode OPTIONAL, + ggsnAddress [24] DataNodeAddress OPTIONAL, + qOS [25] UmtsQos OPTIONAL, + networkIdentifier [26] Network-Identifier OPTIONAL, + sMSOriginatingAddress [27] DataNodeAddress OPTIONAL, + sMSTerminatingAddress [28] DataNodeAddress OPTIONAL, + iMSevent [29] IMSevent OPTIONAL, + sIPMessage [30] OCTET STRING OPTIONAL, + servingSGSN-number [31] OCTET STRING (SIZE (1..20)) OPTIONAL, + servingSGSN-address [32] OCTET STRING (SIZE (5..17)) OPTIONAL, + -- Octets are coded according to 3GPP TS 23.003 [25] + ..., + -- Tag [33] was taken into use by ETSI module in TS 101 671v2.13.1 + ldiEvent [34] LDIevent OPTIONAL, + correlation [35] CorrelationValues OPTIONAL, + ePS-GTPV2-specificParameters [36] EPS-GTPV2-SpecificParameters OPTIONAL, + -- contains parameters to be used in case of GTPV2 based intercepted messages + ePS-PMIP-specificParameters [37] EPS-PMIP-SpecificParameters OPTIONAL, + -- contains parameters to be used in case of PMIP based intercepted messages + ePS-DSMIP-SpecificParameters [38] EPS-DSMIP-SpecificParameters OPTIONAL, + -- contains parameters to be used in case of DSMIP based intercepted messages + ePS-MIP-SpecificParameters [39] EPS-MIP-SpecificParameters OPTIONAL, + -- contains parameters to be used in case of MIP based intercepted messages + servingNodeAddress [40] OCTET STRING OPTIONAL, + -- this parameter is kept for backward compatibility only and should not be used + -- as it has been superseeded by parameter visitedNetworkId + visitedNetworkId [41] UTF8String OPTIONAL, + -- contains the visited network identifier inside the Serving System Update for + -- non 3GPP access and IMS, coded according to [53] and 3GPP TS 29.229 [96] + + mediaDecryption-info [42] MediaDecryption-info OPTIONAL, + servingS4-SGSN-address [43] OCTET STRING OPTIONAL, + -- Diameter Origin-Host and Origin-Realm of the S4-SGSN based on the TS 29.272 [59]. + -- Only the data fields from the Diameter AVPs are provided concatenated + -- with a semicolon to populate this field. + + sipMessageHeaderOffer [44] OCTET STRING OPTIONAL, + sipMessageHeaderAnswer [45] OCTET STRING OPTIONAL, + sdpOffer [46] OCTET STRING OPTIONAL, + sdpAnswer [47] OCTET STRING OPTIONAL, + uLITimestamp [48] OCTET STRING (SIZE (8)) OPTIONAL, + -- Coded according to 3GPP TS 29.060 [17]; Only the ULI Timestamp value is reported. + packetDataHeaderInformation [49] PacketDataHeaderInformation OPTIONAL, + mediaSecFailureIndication [50] MediaSecFailureIndication OPTIONAL, + csgIdentity [51] OCTET STRING (SIZE (4)) OPTIONAL, -- Octets are coded + -- according to 3GPP TS 23.003 [25]. The 27 bits specified in TS 23.003 shall be encoded as. + -- follows The most significant bit of the CSG Identity shall be encoded in the most + -- significant bit of the first octet of the octet string and the least significant bit coded + -- in bit 6 of octet 4. + heNBIdentity [52] OCTET STRING OPTIONAL, + -- 4 or 6 octets are coded with the HNBUnique Identity + -- as specified in 3GPP TS 23.003 [25], Clause 4.10. + heNBiPAddress [53] IPAddress OPTIONAL, + heNBLocation [54] HeNBLocation OPTIONAL, + tunnelProtocol [55] TunnelProtocol OPTIONAL, + pANI-Header-Info [56] SEQUENCE OF PANI-Header-Info OPTIONAL, + -- information extracted from P-Access-Network-Info headers of SIP message; + -- described in TS 24.229 §7.2A.4 [76] + imsVoIP [57] IMS-VoIP-Correlation OPTIONAL, + xCAPmessage [58] OCTET STRING OPTIONAL, + -- The HTTP message (HTPP header and any XCAP body) of any of the target's IMS supplementary + -- service setting management or manipulation XCAP messages occuring through the Ut interface + -- defined in the 3GPP TS 24 623 [77]. + logicalFunctionInformation [59] DataNodeIdentifier OPTIONAL, + ccUnavailableReason [60] PrintableString OPTIONAL, + carrierSpecificData [61] OCTET STRING OPTIONAL, + -- Copy of raw data specified by the CSP or his vendor related to HSS. + current-previous-systems [62] Current-Previous-Systems OPTIONAL, + change-Of-Target-Identity [63] Change-Of-Target-Identity OPTIONAL, + requesting-Network-Identifier [64] OCTET STRING OPTIONAL, + -- the requesting network identifier PLMN id (Mobile Country Code and Mobile Network Country, + -- defined in E212 [87]). + requesting-Node-Type [65] Requesting-Node-Type OPTIONAL, + serving-System-Identifier [66] OCTET STRING OPTIONAL, + -- the serving network identifier PLMN id (MNC, Mobile Country Code and MNC,Mobile Network + -- Country, defined in E212 [87]) and 3GPP TR 21.905 [38], that may be included in the Diameter + -- AVP to and from the HSS. + + proSeTargetType [67] ProSeTargetType OPTIONAL, + proSeRelayMSISDN [68] OCTET STRING (SIZE (1..9)) OPTIONAL, + -- coded according to 3GPP TS 29.274 [46] + + proSeRelayIMSI [69] OCTET STRING (SIZE (3..8)) OPTIONAL, + -- coded according to 3GPP TS 29.274 [46] + + proSeRelayIMEI [70] OCTET STRING (SIZE (8)) OPTIONAL, + -- coded according to 3GPP TS 29.274 [46] + + extendedLocParameters [71] ExtendedLocParameters OPTIONAL, -- LALS extended parameters + locationErrorCode [72] LocationErrorCode OPTIONAL, -- LALS error code + + otherIdentities [73] SEQUENCE OF PartyInformation OPTIONAL, + deregistrationReason [74] DeregistrationReason OPTIONAL, + requesting-Node-Identifier [75] OCTET STRING OPTIONAL, + roamingIndication [76] VoIPRoamingIndication OPTIONAL, + -- used for IMS events in the VPLMN. + cSREvent [77] CSREvent OPTIONAL, + ptc [78] PTC OPTIONAL, -- PTC Events + ptcEncryption [79] PTCEncryptionInfo OPTIONAL, + -- PTC Encryption Information + additionalCellIDs [80] SEQUENCE OF AdditionalCellID OPTIONAL, + scefID [81] UTF8String OPTIONAL, + -- SCEF-ID FQDN as defined by TS 29.336 [101], clause 8.4.5 and RFC 3588 [102] section 4.3 + national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL +} + -- Parameters having the same tag numbers have to be identical in Rel-5 and onwards modules + +-- PARAMETERS FORMATS + +DataNodeIdentifier ::= SEQUENCE +{ + dataNodeAddress [1] DataNodeAddress OPTIONAL, + logicalFunctionType [2] LogicalFunctionType OPTIONAL, + dataNodeName [3] PrintableString(SIZE(7..25)) OPTIONAL, + --Unique identifier of a Data Node within the CSP domain. Could be a name/number combination. +... +} + +LogicalFunctionType ::= ENUMERATED +{ + pDNGW (0), + mME (1), + sGW (2), + ePDG (3), + hSS (4), +... +} + +PANI-Header-Info ::= SEQUENCE +{ + access-Type [1] OCTET STRING OPTIONAL, + -- ASCII chain '3GPP-UTRAN-TDD', '3GPP-E-UTRAN-TDD',... : see TS 24.229 §7.2A.4 [76] + access-Class [2] OCTET STRING OPTIONAL, + -- ASCII chain '3GPP-UTRAN', '3GPP-E-UTRAN',... : see TS 24.229 §7.2A.4 [76] + network-Provided [3] NULL OPTIONAL, + -- present if provided by the network + pANI-Location [4] PANI-Location OPTIONAL, + ... +} + +PANI-Location ::= SEQUENCE +{ + raw-Location [1] OCTET STRING OPTIONAL, + -- raw copy of the location string from the P-Access-Network-Info header + location [2] Location OPTIONAL, + ePSLocation [3] EPSLocation OPTIONAL, + ... +} + +PartyInformation ::= SEQUENCE +{ + party-Qualifier [0] ENUMERATED + { + gPRSorEPS-Target(3), + ... + }, + partyIdentity [1] SEQUENCE + { + imei [1] OCTET STRING (SIZE (8)) OPTIONAL, + -- See MAP format [4] + + imsi [3] OCTET STRING (SIZE (3..8)) OPTIONAL, + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + + msISDN [6] OCTET STRING (SIZE (1..9)) OPTIONAL, + -- MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format document TS 29.002 [4] + + e164-Format [7] OCTET STRING (SIZE (1 .. 25)) OPTIONAL, + -- E164 address of the node in international format. Coded in the same format as + -- the calling party number parameter of the ISUP (parameter part:[29]) + + sip-uri [8] OCTET STRING OPTIONAL, + -- See [26] + + ..., + tel-uri [9] OCTET STRING OPTIONAL, + -- See [67] + nai [10] OCTET STRING OPTIONAL, + -- NAI of the target, encoded in the same format as defined by [EPS stage 3 specs] + x-3GPP-Asserted-Identity [11] OCTET STRING OPTIONAL, + -- X-3GPP-Asserted-Identity header (3GPP TS 24.109 [79]) of the target, used in + -- some XCAP transactions as a complement information to SIP URI or Tel URI. + xUI [12] OCTET STRING OPTIONAL, + -- XCAP User Identifier (XUI)is a string, valid as a path element in an XCAP URI, that is + -- may be associated with each user served by a XCAP resource server. Defined in IETF RFC + -- 4825[80] as a complement information to SIP URI or Tel URI + iMPI [13] OCTET STRING OPTIONAL, + -- Private User Identity as defined in 3GPP TS 23.003 [25] + extID [14] UTF8String OPTIONAL + -- RFC 4282 [102] compliant string as per TS 23.003 [25], clause 19.7.2 + + }, + + services-Data-Information [4] Services-Data-Information OPTIONAL, + -- This parameter is used to transmit all the information concerning the + -- complementary information associated to the basic data call + ... +} + +Location ::= SEQUENCE +{ + e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, + -- Coded in the same format as the ISUP location number (parameter + -- field) of the ISUP (see EN 300 356 [30]). + globalCellID [2] GlobalCellID OPTIONAL, + --see MAP format (see [4]) + rAI [4] Rai OPTIONAL, + -- the Routeing Area Identifier in the current SGSN is coded in accordance with the + -- § 10.5.5.15 of document [9] without the Routing Area Identification IEI + -- (only the last 6 octets are used) + gsmLocation [5] GSMLocation OPTIONAL, + umtsLocation [6] UMTSLocation OPTIONAL, + sAI [7] Sai OPTIONAL, + -- format: PLMN-ID 3 octets (no. 1 - 3) + -- LAC 2 octets (no. 4 - 5) + -- SAC 2 octets (no. 6 - 7) + -- (according to 3GPP TS 25.413 [62]) + ..., + oldRAI [8] Rai OPTIONAL, + -- the Routeing Area Identifier in the old SGSN is coded in accordance with the + -- § 10.5.5.15 of document [9] without the Routing Area Identification IEI + -- (only the last 6 octets are used). + civicAddress [9] CivicAddress OPTIONAL, + operatorSpecificInfo [10] OCTET STRING OPTIONAL, + -- other CSP specific information. + uELocationTimestamp [11] CHOICE + { + timestamp [0] TimeStamp, + timestampUnknown [1] NULL, + ... + } OPTIONAL + -- Date/time of the UE location +} + +GlobalCellID ::= OCTET STRING (SIZE (5..7)) +Rai ::= OCTET STRING (SIZE (6)) +Sai ::= OCTET STRING (SIZE (7)) + + +AdditionalCellID ::= SEQUENCE +{ + nCGI [1] NCGI, + gsmLocation [2] GSMLocation OPTIONAL, + umtsLocation [3] UMTSLocation OPTIONAL, + timeOfLocation [4] GeneralizedTime OPTIONAL, + ... +} + +MCC ::= NumericString (SIZE(3)) + +MNC ::= NumericString (SIZE(2..3)) + +PLMNID ::= SEQUENCE +{ + mCC [1] MCC, + mNC [2] MNC, + ... +} + +-- TS 36.413 [100], clause 9.2.1.142 +NRCellID ::= BIT STRING (SIZE(36)) + +NCGI ::= SEQUENCE +{ + pLMNID [1] PLMNID, + nRCellID [2] NRCellID, + ... +} + +GSMLocation ::= CHOICE +{ + geoCoordinates [1] SEQUENCE + { + latitude [1] PrintableString (SIZE(7..10)), + -- format : XDDMMSS.SS + longitude [2] PrintableString (SIZE(8..11)), + -- format : XDDDMMSS.SS + mapDatum [3] MapDatum DEFAULT wGS84, + ..., + azimuth [4] INTEGER (0..359) OPTIONAL + -- The azimuth is the bearing, relative to true north. + }, + -- format : XDDDMMSS.SS + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- MM : minutes (numeric characters) + -- SS.SS : seconds, the second part (.SS) is optionnal + -- Example : + -- latitude short form N502312 + -- longitude long form E1122312.18 + + utmCoordinates [2] SEQUENCE + { + utm-East [1] PrintableString (SIZE(10)), + utm-North [2] PrintableString (SIZE(7)), + -- example utm-East 32U0439955 + -- utm-North 5540736 + mapDatum [3] MapDatum DEFAULT wGS84, + ..., + azimuth [4] INTEGER (0..359) OPTIONAL + -- The azimuth is the bearing, relative to true north. + }, + + utmRefCoordinates [3] SEQUENCE + { + utmref-string PrintableString (SIZE(13)), + mapDatum MapDatum DEFAULT wGS84, + ... + }, + -- example 32UPU91294045 + + wGS84Coordinates [4] OCTET STRING + -- format is as defined in [37]. +} + +MapDatum ::= ENUMERATED +{ + wGS84, + wGS72, + eD50, -- European Datum 50 + ... +} + +UMTSLocation ::= CHOICE { + point [1] GA-Point, + pointWithUnCertainty [2] GA-PointWithUnCertainty, + polygon [3] GA-Polygon +} + +GeographicalCoordinates ::= SEQUENCE { + latitudeSign ENUMERATED { north, south }, + latitude INTEGER (0..8388607), + longitude INTEGER (-8388608..8388607), + ... +} + +GA-Point ::= SEQUENCE { + geographicalCoordinates GeographicalCoordinates, + ... +} + +GA-PointWithUnCertainty ::=SEQUENCE { + geographicalCoordinates GeographicalCoordinates, + uncertaintyCode INTEGER (0..127) +} + +maxNrOfPoints INTEGER ::= 15 + +GA-Polygon ::= SEQUENCE (SIZE (1..maxNrOfPoints)) OF + SEQUENCE { + geographicalCoordinates GeographicalCoordinates, + ... + } + +SMS-report ::= SEQUENCE +{ + sMS-Contents [3] SEQUENCE + { + sms-initiator [1] ENUMERATED -- party which sent the SMS + { + target (0), + server (1), + undefined-party (2), + ... + }, + transfer-status [2] ENUMERATED + { + succeed-transfer (0), -- the transfer of the SMS message succeeds + not-succeed-transfer(1), + undefined (2), + ... + } OPTIONAL, + other-message [3] ENUMERATED -- in case of terminating call, indicates if + -- the server will send other SMS + { + yes (0), + no (1), + undefined (2), + ... + } OPTIONAL, + content [4] OCTET STRING (SIZE (1 .. 270)) OPTIONAL, + -- Encoded in the format defined for the SMS mobile + ... + } +} + +EPSCorrelationNumber ::= OCTET STRING + -- In case of PS interception, the size will be in the range (8..20) +CorrelationValues ::= CHOICE { + + iri-to-CC [0] IRI-to-CC-Correlation, -- correlates IRI to Content(s) + iri-to-iri [1] IRI-to-IRI-Correlation, -- correlates IRI to IRI + both-IRI-CC [2] SEQUENCE { -- correlates IRI to IRI and IRI to Content(s) + iri-CC [0] IRI-to-CC-Correlation, + iri-IRI [1] IRI-to-IRI-Correlation} +} + + +IMS-VoIP-Correlation ::= SET OF SEQUENCE { + ims-iri [0] IRI-to-IRI-Correlation, + ims-cc [1] IRI-to-CC-Correlation OPTIONAL +} + +IRI-to-CC-Correlation ::= SEQUENCE { -- correlates IRI to Content + cc [0] SET OF OCTET STRING,-- correlates IRI to multiple CCs + iri [1] OCTET STRING OPTIONAL + -- correlates IRI to CC with signaling +} +IRI-to-IRI-Correlation ::= OCTET STRING -- correlates IRI to IRI + + +EPSEvent ::= ENUMERATED +{ + pDPContextActivation (1), + startOfInterceptionWithPDPContextActive (2), + pDPContextDeactivation (4), + gPRSAttach (5), + gPRSDetach (6), + locationInfoUpdate (10), + sMS (11), + pDPContextModification (13), + servingSystem (14), + ... , + startOfInterceptionWithMSAttached (15), + e-UTRANAttach (16), + e-UTRANDetach (17), + bearerActivation (18), + startOfInterceptionWithActiveBearer (19), + bearerModification (20), + bearerDeactivation (21), + uERequestedBearerResourceModification (22), + uERequestedPDNConnectivity (23), + uERequestedPDNDisconnection (24), + trackingAreaEpsLocationUpdate (25), + servingEvolvedPacketSystem (26), + pMIPAttachTunnelActivation (27), + pMIPDetachTunnelDeactivation (28), + startOfInterceptWithActivePMIPTunnel (29), + pMIPPdnGwInitiatedPdnDisconnection (30), + mIPRegistrationTunnelActivation (31), + mIPDeregistrationTunnelDeactivation (32), + startOfInterceptWithActiveMIPTunnel (33), + dSMIPRegistrationTunnelActivation (34), + dSMIPDeregistrationTunnelDeactivation (35), + startOfInterceptWithActiveDsmipTunnel (36), + dSMipHaSwitch (37), + pMIPResourceAllocationDeactivation (38), + mIPResourceAllocationDeactivation (39), + pMIPsessionModification (40), + startOfInterceptWithEUTRANAttachedUE (41), + dSMIPSessionModification (42), + packetDataHeaderInformation (43), + hSS-Subscriber-Record-Change (44), + registration-Termination (45), + -- FFS + location-Up-Date (46), + -- FFS + cancel-Location (47), + register-Location (48), + location-Information-Request (49), + proSeRemoteUEReport (50), + proSeRemoteUEStartOfCommunication (51), + proSeRemoteUEEndOfCommunication (52), + startOfLIwithProSeRemoteUEOngoingComm (53), + startOfLIforProSeUEtoNWRelay (54), + scefRequestednonIPPDNDisconnection (55) +} +-- see [19] + +CSREvent ::= ENUMERATED +{ + cSREventMessage (1), + ... +} + +IMSevent ::= ENUMERATED +{ + unfilteredSIPmessage (1), + -- This value indicates to LEMF that the whole SIP message is sent , i.e. without filtering + -- CC; location information is removed by the DF2/MF if not required to be sent. + + ..., + sIPheaderOnly (2), + -- If warrant requires only IRI then specific content in a 'sIPMessage' + -- (e.g. 'Message', etc.) has been deleted before sending it to LEMF. + + decryptionKeysAvailable (3), + -- This value indicates to LEMF that the IRI carries CC decryption keys for the session + -- under interception. + + startOfInterceptionForIMSEstablishedSession (4), + -- This value indicates to LEMF that the IRI carries information related to + -- interception started on an already established IMS session. + xCAPRequest (5), + -- This value indicates to LEMF that the XCAP request is sent. + xCAPResponse (6) , + -- This value indicates to LEMF that the XCAP response is sent. + ccUnavailable (7), + -- This value indicates to LEMF that the media is not available for interception for intercept + -- orders that require media interception. + sMSOverIMS (8), + -- This value indicates to LEMF that the SMS utilized by SMS over IP (using IMS) is + -- being reported. + servingSystem(9), + -- Applicable to HSS interception + subscriberRecordChange(10), + -- Applicable to HSS interception + registrationTermination(11), + -- Applicable to HSS interception + locationInformationRequest(12) + -- Applicable to HSS interception +} + +Services-Data-Information ::= SEQUENCE +{ + gPRS-parameters [1] GPRS-parameters OPTIONAL, + ... +} + +GPRS-parameters ::= SEQUENCE +{ + pDP-address-allocated-to-the-target [1] DataNodeAddress OPTIONAL, + aPN [2] OCTET STRING (SIZE(1..100)) OPTIONAL, + -- The Access Point Name (APN) is coded in accordance with + -- 3GPP TS 24.008 [9] without the APN IEI (only the last 100 octets are used). + -- Octets are coded according to 3GPP TS 23.003 [25]. + + pDP-type [3] OCTET STRING (SIZE(2)) OPTIONAL, + -- Include either Octets 3 and 4 of the Packet Data Protocol Address information element + -- of 3GPP TS 24.008 [9] or Octets 4 and 5 of the End User Address IE of 3GPP TS 29.060 [17]. + -- when PDP-type is IPv4 or IPv6, the IP address is carried by parameter + -- pDP-address-allocated-to-the-target + -- when PDP-type is IPv4v6, the additional IP address is carried by parameter + -- additionalIPaddress + ..., + nSAPI [4] OCTET STRING (SIZE (1)) OPTIONAL, + -- Include either Octet 2 of the NSAPI IE of 3GPP TS 24.008 [9] + -- or Octet 2 of the NSAPI IE of 3GPP TS 29.060 [17]. + additionalIPaddress [5] DataNodeAddress OPTIONAL +} + +GPRSOperationErrorCode ::= OCTET STRING +-- The parameter shall carry the GMM cause value or the SM cause value, as defined in the +-- standard [9], without the IEI. + + +LDIevent ::= ENUMERATED +{ + targetEntersIA (1), + targetLeavesIA (2), + ... +} + +UmtsQos ::= CHOICE +{ + qosMobileRadio [1] OCTET STRING, + -- The qosMobileRadio parameter shall be coded in accordance with the § 10.5.6.5 of + -- document [9] without the Quality of service IEI and Length of + -- quality of service IE (. That is, first + -- two octets carrying 'Quality of service IEI' and 'Length of quality of service + -- IE' shall be excluded). + qosGn [2] OCTET STRING + -- qosGn parameter shall be coded in accordance with § 7.7.34 of document [17] +} + + +EPS-GTPV2-SpecificParameters ::= SEQUENCE +{ + pDNAddressAllocation [1] OCTET STRING OPTIONAL, + aPN [2] OCTET STRING (SIZE (1..100)) OPTIONAL, + protConfigOptions [3] ProtConfigOptions OPTIONAL, + attachType [4] OCTET STRING (SIZE (1)) OPTIONAL, + -- coded according to TS 24.301 [47] + ePSBearerIdentity [5] OCTET STRING OPTIONAL, + detachType [6] OCTET STRING (SIZE (1)) OPTIONAL, + -- coded according to TS 24.301 [47], includes switch off indicator + rATType [7] OCTET STRING (SIZE (1)) OPTIONAL, + failedBearerActivationReason [8] OCTET STRING (SIZE (1)) OPTIONAL, + ePSBearerQoS [9] OCTET STRING OPTIONAL, + bearerActivationType [10] TypeOfBearer OPTIONAL, + aPN-AMBR [11] OCTET STRING OPTIONAL, + -- see 3GPP TS 29.274 [46] parameters coding rules defined for EPS-GTPV2-SpecificParameters. + procedureTransactionId [12] OCTET STRING OPTIONAL, + linkedEPSBearerId [13] OCTET STRING OPTIONAL, + --The Linked EPS Bearer Identity shall be included and coded according to 3GPP TS 29.274 [46]. + tFT [14] OCTET STRING OPTIONAL, + -- Only octets 3 onwards of TFT IE from 3GPP TS 24.008 [9] shall be included. + handoverIndication [15] NULL OPTIONAL, + failedBearerModReason [16] OCTET STRING (SIZE (1)) OPTIONAL, + trafficAggregateDescription [17] OCTET STRING OPTIONAL, + failedTAUReason [18] OCTET STRING (SIZE (1)) OPTIONAL, + -- coded according to TS 24.301 [47] + failedEUTRANAttachReason [19] OCTET STRING (SIZE (1)) OPTIONAL, + -- coded according to TS 24.301 [47] + servingMMEaddress [20] OCTET STRING OPTIONAL, + -- Contains the data fields from the Diameter Origin-Host and Origin-Realm AVPs + -- as received in the HSS from the MME according to the TS 29.272 [59]. + -- Only the data fields from the Diameter AVPs are provided concatenated + -- with a semicolon to populate this field. + bearerDeactivationType [21] TypeOfBearer OPTIONAL, + bearerDeactivationCause [22] OCTET STRING (SIZE (1)) OPTIONAL, + ePSlocationOfTheTarget [23] EPSLocation OPTIONAL, + -- the use of ePSLocationOfTheTarget is mutually exclusive with the use of locationOfTheTarget + -- ePSlocationOfTheTarget allows using the coding of the parameter according to SAE stage 3. + -- location of the target + -- or cell site location + ..., + pDNType [24] OCTET STRING (SIZE (1)) OPTIONAL, + -- coded according to TS 24.301 [47] + + requestType [25] OCTET STRING (SIZE (1)) OPTIONAL, + -- coded according to TS 24.301 [47] + uEReqPDNConnFailReason [26] OCTET STRING (SIZE (1)) OPTIONAL, + -- coded according to TS 24.301 [47] + extendedHandoverIndication [27] OCTET STRING (SIZE (1)) OPTIONAL, + -- This parameter with value 1 indicates handover based on the flags in the TS 29.274 [46]. + -- Otherwise set to the value 0. + -- The use of extendedHandoverIndication and handoverIndication parameters is + -- mutually exclusive and depends on the actual ASN.1 encoding method. + + uLITimestamp [28] OCTET STRING (SIZE (8)) OPTIONAL, + uELocalIPAddress [29] OCTET STRING OPTIONAL, + uEUdpPort [30] OCTET STRING (SIZE (2)) OPTIONAL, + tWANIdentifier [31] OCTET STRING OPTIONAL, + tWANIdentifierTimestamp [32] OCTET STRING (SIZE (4)) OPTIONAL, + proSeRemoteUeContextConnected [33] RemoteUeContextConnected OPTIONAL, + proSeRemoteUeContextDisconnected [34] RemoteUeContextDisconnected OPTIONAL, + secondaryRATUsageIndication [35] NULL OPTIONAL + } + + -- All the parameters within EPS-GTPV2-SpecificParameters are coded as the corresponding IEs + -- without the octets containing type and length. Unless differently stated, they are coded + -- according to 3GPP TS 29.274 [46]; in this case the octet containing the instance + -- shall also be not included. + + + +TypeOfBearer ::= ENUMERATED +{ + defaultBearer (1), + dedicatedBearer (2), + ... +} + + + + + +EPSLocation ::= SEQUENCE +{ + + userLocationInfo [1] OCTET STRING (SIZE (1..39)) OPTIONAL, + -- see 3GPP TS 29.274 [46] parameters coding rules defined for EPS-GTPV2-SpecificParameters. + gsmLocation [2] GSMLocation OPTIONAL, + umtsLocation [3] UMTSLocation OPTIONAL, + olduserLocationInfo [4] OCTET STRING (SIZE (1..39)) OPTIONAL, + -- coded in the same way as userLocationInfo + lastVisitedTAI [5] OCTET STRING (SIZE (1..5)) OPTIONAL, + -- the Tracking Area Identity is coded in accordance with the TAI field in 3GPP TS 29.274 + -- [46]. + tAIlist [6] OCTET STRING (SIZE (7..97)) OPTIONAL, + -- the TAI List is coded acording to 3GPP TS 24.301 [47], without the TAI list IEI + ..., + threeGPP2Bsid [7] OCTET STRING (SIZE (1..12)) OPTIONAL, + -- contains only the payload from the 3GPP2-BSID AVP described in the 3GPP TS 29.212 [56]. + civicAddress [8] CivicAddress OPTIONAL, + operatorSpecificInfo [9] OCTET STRING OPTIONAL, + -- other CSP specific information. + uELocationTimestamp [10] CHOICE + { + timestamp [0] TimeStamp, + timestampUnknown [1] NULL, + ... + } OPTIONAL + -- Date/time of the UE location +} + +ProtConfigOptions ::= SEQUENCE +{ + ueToNetwork [1] OCTET STRING (SIZE(1..251)) OPTIONAL, + -- This shall be coded with octet 3 onwards of the Protocol Configuration Options IE in + -- accordance with 3GPP TS 24.008 [9]. + networkToUe [2] OCTET STRING (SIZE(1..251)) OPTIONAL, + -- This shall be coded with octet 3 onwards of the Protocol Configuration Options IE in + -- accordance with 3GPP TS 24.008 [9]. +... +} + +RemoteUeContextConnected ::= SEQUENCE OF RemoteUEContext + +RemoteUEContext ::= SEQUENCE + +{ + remoteUserID [1] RemoteUserID, + remoteUEIPInformation [2] RemoteUEIPInformation, +... + +} + +RemoteUserID ::= OCTET STRING + +RemoteUEIPInformation ::= OCTET STRING + +RemoteUeContextDisconnected ::= RemoteUserID + +EPS-PMIP-SpecificParameters ::= SEQUENCE +{ + lifetime [1] INTEGER (0..65535) OPTIONAL, + accessTechnologyType [2] OCTET STRING (SIZE (4)) OPTIONAL, + aPN [3] OCTET STRING (SIZE (1..100)) OPTIONAL, + iPv6HomeNetworkPrefix [4] OCTET STRING (SIZE (20)) OPTIONAL, + protConfigurationOption [5] OCTET STRING OPTIONAL, + handoverIndication [6] OCTET STRING (SIZE (4)) OPTIONAL, + status [7] INTEGER (0..255) OPTIONAL, + revocationTrigger [8] INTEGER (0..255) OPTIONAL, + iPv4HomeAddress [9] OCTET STRING (SIZE (4)) OPTIONAL, + iPv6careOfAddress [10] OCTET STRING OPTIONAL, + iPv4careOfAddress [11] OCTET STRING OPTIONAL, + ..., + servingNetwork [12] OCTET STRING (SIZE (3)) OPTIONAL, + dHCPv4AddressAllocationInd [13] OCTET STRING (SIZE (1)) OPTIONAL, + ePSlocationOfTheTarget [14] EPSLocation OPTIONAL + + -- parameters coded according to 3GPP TS 29.275 [48] and RFCs specifically + -- referenced in it. +} + + +EPS-DSMIP-SpecificParameters ::= SEQUENCE +{ + lifetime [1] INTEGER (0..65535) OPTIONAL, + requestedIPv6HomePrefix [2] OCTET STRING (SIZE (25)) OPTIONAL, + -- coded according to RFC 5026 + homeAddress [3] OCTET STRING (SIZE (8)) OPTIONAL, + iPv4careOfAddress [4] OCTET STRING (SIZE (8)) OPTIONAL, + iPv6careOfAddress [5] OCTET STRING (SIZE(16)) OPTIONAL, + aPN [6] OCTET STRING (SIZE (1..100)) OPTIONAL, + status [7] INTEGER (0..255) OPTIONAL, + hSS-AAA-address [8] OCTET STRING OPTIONAL, + targetPDN-GW-Address [9] OCTET STRING OPTIONAL, + ... + -- parameters coded according to 3GPP TS 24.303 [49] and RFCs specifically + -- referenced in it. +} + +EPS-MIP-SpecificParameters ::= SEQUENCE +{ + lifetime [1] INTEGER (0.. 65535) OPTIONAL, + homeAddress [2] OCTET STRING (SIZE (4)) OPTIONAL, + careOfAddress [3] OCTET STRING (SIZE (4)) OPTIONAL, + homeAgentAddress [4] OCTET STRING (SIZE (4)) OPTIONAL, + code [5] INTEGER (0..255) OPTIONAL, + foreignDomainAddress [7] OCTET STRING (SIZE (4)) OPTIONAL, + ... + -- parameters coded according to 3GPP TS 29.279 [63] and RFCs specifically + -- referenced in it. +} + +MediaDecryption-info ::= SEQUENCE OF CCKeyInfo + -- One or more key can be available for decryption, one for each media streams of the + -- intercepted session. + +CCKeyInfo ::= SEQUENCE +{ + cCCSID [1] OCTET STRING, + -- the parameter uniquely mapping the key to the encrypted stream. + cCDecKey [2] OCTET STRING, + cCSalt [3] OCTET STRING OPTIONAL, + -- The field reports the value from the CS_ID field in the ticket exchange headers as + -- defined in IETF RFC 6043 [61]. + ... +} + +MediaSecFailureIndication ::= ENUMERATED +{ + genericFailure (0), + ... +} + + +PacketDataHeaderInformation ::= CHOICE +{ + + packetDataHeader [1] PacketDataHeaderReport, + packetDataSummary [2] PacketDataSummaryReport, +... +} + +PacketDataHeaderReport ::= CHOICE +{ + + packetDataHeaderMapped [1] PacketDataHeaderMapped, + packetDataHeaderCopy [2] PacketDataHeaderCopy, +... +} + +PacketDataHeaderMapped ::= SEQUENCE +{ + sourceIPAddress [1] IPAddress, + sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, + destinationIPAddress [3] IPAddress, + destinationPortNumber [4] INTEGER (0..65535) OPTIONAL, + transportProtocol [5] INTEGER, + -- For IPv4, report the "Protocol" field and for IPv6 report "Next Header" field. + -- Assigned Internet Protocol Numbers can be found at + -- http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml + packetsize [6] INTEGER OPTIONAL, + flowLabel [7] INTEGER OPTIONAL, + packetCount [8] INTEGER OPTIONAL, + direction [9] TPDU-direction, +... +} + +TPDU-direction ::= ENUMERATED +{ + from-target (1), + to-target (2), + unknown (3) +} + + +PacketDataHeaderCopy ::= SEQUENCE +{ + direction [1] TPDU-direction, + headerCopy [2] OCTET STRING, -- includes a copy of the packet header at the IP + -- network layer and above including extension headers, but excluding contents. +... +} + +PacketDataSummaryReport ::= SEQUENCE OF PacketFlowSummary + +PacketFlowSummary ::= SEQUENCE +{ + + sourceIPAddress [1] IPAddress, + sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, + destinationIPAddress [3] IPAddress, + destinationPortNumber [4] INTEGER (0..65535) OPTIONAL, + transportProtocol [5] INTEGER, + -- For IPv4, report the "Protocol" field and for IPv6 report "Next Header" field. + -- Assigned Internet Protocol Numbers can be found at + -- http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml + flowLabel [6] INTEGER OPTIONAL, + summaryPeriod [7] ReportInterval, + packetCount [8] INTEGER, + sumOfPacketSizes [9] INTEGER, + packetDataSummaryReason [10] ReportReason, +... +} + + +ReportReason ::= ENUMERATED +{ + timerExpired (0), + countThresholdHit (1), + pDPComtextDeactivated (2), + pDPContextModification (3), + otherOrUnknown (4), + ... +} + +ReportInterval ::= SEQUENCE +{ + firstPacketTimeStamp [0] TimeStamp, + lastPacketTimeStamp [1] TimeStamp, + ... +} + + +TunnelProtocol ::= CHOICE +{ + + rfc2868ValueField [0] OCTET STRING, -- coded to indicate the type of tunnel established between + -- the HeNB and the SeGW as specified in TS 33.320. The actual coding is provided in 3 octets + -- with the Value field of the Tunnel Type RADIUS attribute as specified in IETF RFC 2868. + -- This corresponds to the outer layer tunnel between the HeNB and the SeGW as viewed by the + -- SeGW + nativeIPSec [1] NULL, -- if native IPSec is required by TS 33.320 between HeNB and SeGW +... +} +HeNBLocation ::= EPSLocation + + +Requesting-Node-Type ::= ENUMERATED +{ + mSC (1), + sMS-Centre (2), + gMLC (3), + mME (4), + sGSN (5), + ... +} + +Change-Of-Target-Identity ::= SEQUENCE +{ + new-MSISDN [1] PartyInformation OPTIONAL, + -- new MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format document TS 29.002 [4] + new-A-MSISDN [2] PartyInformation OPTIONAL, + -- new A-MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in TS 23.003 [25] + old-MSISDN [3] PartyInformation OPTIONAL, + -- old MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format document TS 29.002 [4] + old-A-MSISDN [4] PartyInformation OPTIONAL, + -- old A-MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in TS 23.003 [25] + new-IMSI [5] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + old-IMSI [6] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + new-IMEI [7] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Equipement Identity defined in MAP format document TS 29.002 [4] + old-IMEI [8] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Equipement Identity defined in MAP format document TS 29.002 [4] + +..., + new-IMPI [9] PartyInformation OPTIONAL, + old-IMPI [10] PartyInformation OPTIONAL, + new-SIP-URI [11] PartyInformation OPTIONAL, + old-SIP-URI [12] PartyInformation OPTIONAL, + new-TEL-URI [13] PartyInformation OPTIONAL, + old-TEL-URI [14] PartyInformation OPTIONAL +} + +Current-Previous-Systems ::= SEQUENCE +{ + serving-System-Identifier [1] OCTET STRING OPTIONAL, + -- VPLMN id (Mobile Country Code and Mobile Network Country, E. 212 number [87]). + current-Serving-MME-Address [2] DataNodeIdentifier OPTIONAL, + -- The IP address of the current serving MME or its the Diameter Origin-Host and Origin-Realm. + previous-Serving-System-Identifier [3] OCTET STRING OPTIONAL, + -- VPLMN id (Mobile Country Code and Mobile Network Country, defined in E212 [87]). + previous-Serving-MME-Address [4] DataNodeIdentifier OPTIONAL, + -- The IP address of the previous serving MME or its Diameter Origin-Host and Origin-Realm. +... +} + +ProSeTargetType ::= ENUMERATED +{ + pRoSeRemoteUE (1), + pRoSeUEtoNwRelay (2), + ... +} + +VoIPRoamingIndication ::= ENUMERATED { + roamingLBO (1), -- used in IMS events sent by VPLMN with LBO as roaming + roamingS8HR (2), -- used in IMS events sent by VPLMN with S8HR as roaming + ... +} + +DeregistrationReason ::= CHOICE +{ + reason-CodeAVP [1] INTEGER, + server-AssignmentType [2] INTEGER, + -- Coded according to 3GPP TS 29.229 [96] + ... +} + +PTCEncryptionInfo ::= SEQUENCE { + cipher [1] UTF8String, + cryptoContext [2] UTF8String OPTIONAL, + key [3] UTF8String, + keyEncoding [4] UTF8String, + salt [5] UTF8String OPTIONAL, + pTCOther [6] UTF8String OPTIONAL, + ... +} + +PTC ::= SEQUENCE { + abandonCause [1] UTF8String OPTIONAL, + accessPolicyFailure [2] UTF8String OPTIONAL, + accessPolicyType [3] AccessPolicyType OPTIONAL, + alertIndicator [5] AlertIndicator OPTIONAL, + associatePresenceStatus [6] AssociatePresenceStatus OPTIONAL, + bearer-capability [7] UTF8String OPTIONAL, + -- identifies the Bearer capability information element (value part) + broadcastIndicator [8] BOOLEAN OPTIONAL, + -- default False, true indicates this is a braodcast to a group + contactID [9] UTF8String OPTIONAL, + emergency [10] Emergency OPTIONAL, + emergencyGroupState [11] EmergencyGroupState OPTIONAL, + timeStamp [12] TimeStamp, + pTCType [13] PTCType OPTIONAL, + failureCode [14] UTF8String OPTIONAL, + floorActivity [15] FloorActivity OPTIONAL, + floorSpeakerID [16] PTCAddress OPTIONAL, + groupAdSender [17] UTF8String OPTIONAL, + -- Identifies the group administrator who was the originator of the group call. + -- tag [18] was used in r15 (15) version-4 (4) + groupAuthRule [19] GroupAuthRule OPTIONAL, + groupCharacteristics [20] UTF8String OPTIONAL, + holdRetrieveInd [21] BOOLEAN OPTIONAL, + -- true indicates target is placed on hold, false indicates target was retrived from hold. + -- tag [22] was used in r15 (15) version-4 (4) + imminentPerilInd [23] ImminentPerilInd OPTIONAL, + implicitFloorReq [24] ImplicitFloorReq OPTIONAL, + initiationCause [25] InitiationCause OPTIONAL, + invitationCause [26] UTF8String OPTIONAL, + iPAPartyID [27] UTF8String OPTIONAL, + iPADirection [28] IPADirection OPTIONAL, + listManagementAction [29] ListManagementAction OPTIONAL, + listManagementFailure [30] UTF8String OPTIONAL, + listManagementType [31] ListManagementType OPTIONAL, + maxTBTime [32] UTF8String OPTIONAL, -- defined in seconds. + mCPTTGroupID [33] UTF8String OPTIONAL, + mCPTTID [34] UTF8String OPTIONAL, + mCPTTInd [35] BOOLEAN OPTIONAL, + -- default False indicates to associate from target, true indicates to the target. + location [36] Location OPTIONAL, + mCPTTOrganizationName [37] UTF8String OPTIONAL, + mediaStreamAvail [38] BOOLEAN OPTIONAL, + -- True indicates available for media, false indicates not able to accept media. + priority-Level [40] Priority-Level OPTIONAL, + preEstSessionID [41] UTF8String OPTIONAL, + preEstStatus [42] PreEstStatus OPTIONAL, + pTCGroupID [43] UTF8String OPTIONAL, + pTCIDList [44] UTF8String OPTIONAL, + pTCMediaCapability [45] UTF8String OPTIONAL, + pTCOriginatingId [46] UTF8String OPTIONAL, + pTCOther [47] UTF8String OPTIONAL, + pTCParticipants [48] UTF8String OPTIONAL, + pTCParty [49] UTF8String OPTIONAL, + pTCPartyDrop [50] UTF8String OPTIONAL, + pTCSessionInfo [51] UTF8String OPTIONAL, + pTCServerURI [52] UTF8String OPTIONAL, + pTCUserAccessPolicy [53] UTF8String OPTIONAL, + pTCAddress [54] PTCAddress OPTIONAL, + queuedFloorControl [55] BOOLEAN OPTIONAL, + --Default FALSE,send TRUE if Queued floor control is used. + queuedPosition [56] UTF8String OPTIONAL, + -- indicates the queued position of the Speaker (Target or associate) who has the + -- right to speak. + registrationRequest [57] RegistrationRequest OPTIONAL, + registrationOutcome [58] RegistrationOutcome OPTIONAL, + retrieveID [59] UTF8String OPTIONAL, + rTPSetting [60] RTPSetting OPTIONAL, + talkBurstPriority [61] Priority-Level OPTIONAL, + talkBurstReason [62] Talk-burst-reason-code OPTIONAL, + -- Talk-burst-reason-code Defined according to the rules and procedures + -- in (OMA-PoC-AD [97]) + talkburstControlSetting [63] TalkburstControlSetting OPTIONAL, + targetPresenceStatus [64] UTF8String OPTIONAL, + port-Number [65] INTEGER (0..65535) OPTIONAL, + ... +} + +AccessPolicyType ::= SEQUENCE +{ + userAccessPolicyAttempt [1] BOOLEAN, + -- default False, true indicates Target has accessed. + groupAuthorizationRulesAttempt [2] BOOLEAN, + -- default False, true indicates Target has accessed. + userAccessPolicyQuery [3] BOOLEAN, + -- default False, true indicates Target has accessed. + groupAuthorizationRulesQuery [4] BOOLEAN, + -- default False, true indicates Target has accessed. + userAccessPolicyResult [5] UTF8String, + groupAuthorizationRulesResult [6] UTF8String, + ... +} + +AlertIndicator ::= ENUMERATED +{ + -- indicates the group call alert condition. + sent (1), + received (2), + cancelled (3), + ... + } + +AssociatePresenceStatus ::= SEQUENCE +{ + presenceID [1] UTF8String, + -- identity of PTC Client(s)or the PTC group + presenceType [2] PresenceType, + presenceStatus [3] BOOLEAN, + -- default false, true indicates connected. +... +} + +PresenceType ::= ENUMERATED +{ + pTCClient (1), + pTCGroup (2), + -- identifies the type of presenceID given [PTC Client(s) or PTC group]. + ... +} + +Emergency ::= ENUMERATED +{ + -- MCPTT services indication of peril condition. + imminent (1), + peril (2), + cancel (3), + ... +} + +EmergencyGroupState ::= SEQUENCE +{ + -- indicates the state of the call, at least one of these information + -- elements shall be present. + clientEmergencyState [1] ENUMERATED +{ + -- in case of MCPTT call, indicates the response for the client + inform (1), + response (2), + cancelInform (3), + cancelResponse (4), + ... +} OPTIONAL, + groupEmergencyState [2] ENUMERATED +{ + -- in case of MCPTT group call, indicates if there is a group emergency or + -- a response from the Target to indicate current Client state of emergency. + inForm (1), + reSponse (2), + cancelInform (3), + cancelResponse (4), +... + }, +... +} + + +PTCType ::= ENUMERATED +{ + pTCStartofInterception (1), + pTCServinSystem (2), + pTCSessionInitiation (3), + pTCSessionAbandonEndRecord (4), + pTCSessionStartContinueRecord (5), + pTCSessionEndRecord (6), + pTCPre-EstablishedSessionSessionRecord (7), + pTCInstantPersonalAlert (8), + pTCPartyJoin (9), + pTCPartyDrop (10), + pTCPartyHold-RetrieveRecord (11), + pTCMediaModification (12), + pTCGroupAdvertizement (13), + pTCFloorConttrol (14), + pTCTargetPressence (15), + pTCAssociatePressence (16), + pTCListManagementEvents (17), + pTCAccessPolicyEvents (18), + pTCMediaTypeNotification (19), + pTCGroupCallRequest (20), + pTCGroupCallCancel (21), + pTCGroupCallResponse (22), + pTCGroupCallInterrogate (23), + pTCMCPTTImminentGroupCall (24), + pTCCC (25), + pTCRegistration (26), + pTCEncryption (27), +... +} + +FloorActivity ::= SEQUENCE +{ + tBCP-Request [1] BOOLEAN, + -- default False, true indicates Granted. + tBCP-Granted [2] BOOLEAN, + -- default False, true indicates Granted permission to talk. + tBCP-Deny [3] BOOLEAN, + -- default True, False indicates permission granted. + tBCP-Queued [4] BOOLEAN, + -- default False, true indicates the request to talk is in queue. + tBCP-Release [5] BOOLEAN, + -- default True, true indicates the Request to talk is completed, + -- False indicates PTC Client has the request to talk. + tBCP-Revoke [6] BOOLEAN, + -- default False, true indicates the privilege to talk is canceld from the + -- PTC server. + tBCP-Taken [7] BOOLEAN, + -- default True, false indicates another PTC Client has the permission to talk. + tBCP-Idle [8] BOOLEAN, + -- default True, False indicates the Talk Burst Protocol is taken. +... +} + +GroupAuthRule ::= ENUMERATED +{ + allow-Initiating-PtcSession (0), + block-Initiating-PtcSession (1), + allow-Joining-PtcSession (2), + block-Joining-PtcSession (3), + allow-Add-Participants (4), + block-Add-Participants (5), + allow-Subscription-PtcSession-State (6), + block-Subscription-PtcSession-State (7), + allow-Anonymity (8), + forbid-Anonymity (9), +... +} + +ImminentPerilInd ::= ENUMERATED +{ + request (1), + response (2), + cancel (3), + -- when the MCPTT Imminent Peril Group Call Request, Response or Cancel is detected +... +} + +ImplicitFloorReq ::= ENUMERATED +{ + join (1), + rejoin (2), + release (3), + -- group Call request to join, rejoin, or release of the group call +... +} + +InitiationCause ::= ENUMERATED +{ + requests (1), + received (2), + pTCOriginatingId (3), + -- requests or receives a session initiation from the network or another + -- party to initiate a PTC session. Identify the originating PTC party, if known. +... +} + +IPADirection ::= ENUMERATED +{ + toTarget (0), + fromTarget (1), +... +} + +ListManagementAction ::= ENUMERATED +{ + create (1), + modify (2), + retrieve (3), + delete (4), + notify (5), +... +} + + +ListManagementType ::= ENUMERATED +{ + contactListManagementAttempt (1), + groupListManagementAttempt (2), + contactListManagementResult (3), + groupListManagementResult (4), + requestSuccessful (5), +... +} + +Priority-Level ::= ENUMERATED +{ + pre-emptive (0), + high-priority (1), + normal-priority (2), + listen-only (3), +... +} + +PreEstStatus ::= ENUMERATED +{ + established (1), + modify (2), + released (3), +... +} + +PTCAddress ::= SEQUENCE +{ + uri [0] UTF8String, + -- The set of URIs defined in [RFC3261] and related SIP RFCs. + privacy-setting [1] BOOLEAN, + -- Default FALSE, send TRUE if privacy is used. + privacy-alias [2] VisibleString OPTIONAL, + -- if privacy is used, the PTC Server creates an anonymous PTC Address of the form + -- . In addition to anonymity, the anonymous PTC + -- Addresses SHALL be unique within a PTC Session. In case more than one anonymous + -- PTC Addresses are used in the same PTC Session, for the second Anonymous PTC + -- Session and thereafter, the PTC Server SHOULD use the form + -- sip:anonymous-n@anonymous.invalid where n is an integer number. + nickname [3] UTF8String OPTIONAL, +... +} + + +RegistrationRequest ::= ENUMERATED +{ + register (1), + re-register (2), + de-register (3), +... +} + +RegistrationOutcome ::= ENUMERATED +{ + success (0), + failure (1), +... +} + +RTPSetting ::= SEQUENCE +{ + ip-address [0] IPAddress, + port-number [1] Port-Number, + -- the IP address and port number at the PTC Server for the RTP Session +... +} + +Port-Number ::= INTEGER (0..65535) + + +TalkburstControlSetting ::= SEQUENCE +{ + talk-BurstControlProtocol [1] UTF8String, + talk-Burst-parameters [2] SET OF VisibleString, + -- selected by the PTC Server from those contained in the original SDP offer in the + -- incoming SIP INVITE request from the PTC Client + tBCP-PortNumber [3] INTEGER (0..65535), + -- PTC Server's port number to be used for the Talk Burst Control Protocol +... +} + +Talk-burst-reason-code ::= VisibleString + + +END -- OF EpsHI2Operations diff --git a/testing/deps/33108/EpsHI3PS.asn b/testing/deps/33108/EpsHI3PS.asn new file mode 100644 index 0000000..9ccdfd3 --- /dev/null +++ b/testing/deps/33108/EpsHI3PS.asn @@ -0,0 +1,85 @@ +Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9) r12(12) 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 + +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 + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi3DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3eps(9) r12(12) version-0(0)} + +CC-PDU ::= SEQUENCE +{ + uLIC-header [1] ULIC-header, + payload [2] OCTET STRING +} + +ULIC-header ::= SEQUENCE +{ + hi3DomainId [0] OBJECT IDENTIFIER, -- 3GPP HI3 Domain + lIID [2] LawfulInterceptionIdentifier OPTIONAL, + correlation-Number [3] EPSCorrelationNumber, + timeStamp [4] TimeStamp OPTIONAL, + sequence-number [5] INTEGER (0..65535), + t-PDU-direction [6] TPDU-direction, + ..., + national-HI3-ASN1parameters [7] National-HI3-ASN1parameters OPTIONAL, + -- encoded per national requirements + ice-type [8] ICE-type OPTIONAL + -- The ICE-type indicates the applicable Intercepting Control Element(see ref [19]) in which + -- the T-PDU is intercepted. +} + + +TPDU-direction ::= ENUMERATED +{ + from-target (1), + to-target (2), + unknown (3) +} + +National-HI3-ASN1parameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [39], + -- the country to which the parameters inserted after the extension marker apply + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from IANA web site. It is recommended to avoid + -- using tags from 240 to 255 in a formal type definition. +} + +ICE-type ::= ENUMERATED +{ + sgsn (1), + ggsn (2), + ..., + s-GW (3), + pDN-GW (4), + colocated-SAE-GWs (5) , + ePDG (6) +} + +END -- OF Eps-HI3-PS diff --git a/testing/deps/33108/GCSEHI2Operations.asn b/testing/deps/33108/GCSEHI2Operations.asn new file mode 100644 index 0000000..53e72eb --- /dev/null +++ b/testing/deps/33108/GCSEHI2Operations.asn @@ -0,0 +1,233 @@ +GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2gcse(13) r16 (16) version-0 (0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + + + LawfulInterceptionIdentifier, + TimeStamp, + Network-Identifier, + National-Parameters, + National-HI2-ASN1parameters, + IPAddress + + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulIntercept(2) hi2(1) version18 (18)} -- Imported from TS 101 671 + + + + EPSLocation + + FROM EpsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulIntercept(2) threeGPP(4) hi2eps(8) r16 (16) version-0(0)}; + -- Imported from EPS ASN.1 Portion of this standard + + + + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi2gcseDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2gcse(13) r16 (16) version-0(0)} + +GcseIRIsContent ::= CHOICE +{ + gcseiRIContent GcseIRIContent, + gcseIRISequence GcseIRISequence +} + +GcseIRISequence ::= SEQUENCE OF GcseIRIContent + +-- Aggregation of GCSEIRIContent is an optional feature. +-- It may be applied in cases when at a given point in time +-- several IRI records are available for delivery to the same LEA destination. +-- As a general rule, records created at any event shall be sent +-- immediately and not withheld in the DF or MF in order to +-- apply aggragation. +-- When aggregation is not to be applied, +-- GCSEIRIContent needs to be chosen. +GcseIRIContent ::= CHOICE +{ + iRI-Begin-record [1] IRI-Parameters, -- include at least one optional parameter + iRI-End-record [2] IRI-Parameters, + iRI-Continue-record [3] IRI-Parameters, -- include at least one optional parameter + iRI-Report-record [4] IRI-Parameters, -- include at least one optional parameter + ... +} + +IRI-Parameters ::= SEQUENCE +{ + hi2gcseDomainId [0] OBJECT IDENTIFIER, -- 3GPP HI2 GCSE domain + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- This identifier is associated with the target. + timeStamp [2] TimeStamp, + -- date and time of the event triggering the report. + + partyInformation [3] SET OF GcsePartyIdentity, + -- This is the identity of the target. + + national-Parameters [4] National-Parameters OPTIONAL, + networkIdentifier [5] Network-Identifier, + gcseEvent [6] GcseEvent, + correlation [7] GcseCorrelation OPTIONAL, + targetConnectionMethod [8] TargetConnectionMethod OPTIONAL, + gcseGroupMembers [9] GcseGroup OPTIONAL, + gcseGroupParticipants [10] GcseGroup OPTIONAL, + gcseGroupID [11] GcseGroupID OPTIONAL, + gcseGroupCharacteristics[12] GcseGroupCharacteristics OPTIONAL, + reservedTMGI [13] ReservedTMGI OPTIONAL, + tMGIReservationDuration [14] TMGIReservationDuration OPTIONAL, + visitedNetworkID [15] VisitedNetworkID OPTIONAL, + addedUserID [16] GcsePartyIdentity OPTIONAL, + droppedUserID [17] GcsePartyIdentity OPTIONAL, + reasonForCommsEnd [18] Reason OPTIONAL, + gcseLocationOfTheTarget [19] EPSLocation OPTIONAL, + + + +... + +} + + +-- PARAMETERS FORMATS + +GcseEvent ::= ENUMERATED +{ + activationOfGcseGroupComms (1), + startOfInterceptionGcseGroupComms (2), + userAdded (3), + userDropped (4), + targetConnectionModification (5), + targetdropped (6), + deactivationOfGcseGroupComms (7), + ... +} + +GcseCorrelation ::= OCTET STRING + + +GcsePartyIdentity ::= SEQUENCE +{ + imei [1] OCTET STRING (SIZE (8)) OPTIONAL, + -- See MAP format [4] + + imsi [2] OCTET STRING (SIZE (3..8)) OPTIONAL, + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + + iMPU [3] SET OF IMSIdentity OPTIONAL, + + iMPI [4] SET OF IMSIdentity OPTIONAL, + + proseUEID [6] SET OF ProSeUEID OPTIONAL, + + otherID [7] OtherIdentity OPTIONAL, + + ... +} + +IMSIdentity ::= SEQUENCE +{ + sip-uri [1] OCTET STRING OPTIONAL, + -- See [REF 26 of 33.108] + + tel-uri [2] OCTET STRING OPTIONAL, + -- See [REF 67 of 33.108] + + ... +} + +OtherIdentity ::= SEQUENCE +{ + otherIdentityEncoding [1] UTF8String OPTIONAL, -- Specifies the encoding format of + -- the contents included within the parameter otherIDInfo. + + otherIDInfo [2] OCTET STRING OPTIONAL, + ... +} + +GcseGroup ::= SEQUENCE OF GcsePartyIdentity + +GcseGroupID ::= GcsePartyIdentity + + +ProSeUEID ::= OCTET STRING --coded with the 3 octets corresponding to the Source L2 ID of the MAC + --PDU in TS 25.321[85]. + + +GcseGroupCharacteristics ::= SEQUENCE +{ + characteristicsEncoding [1] UTF8String OPTIONAL, -- Specifies the encoding format of + -- the contents included within the parameter characteristics. + + characteristics [2] OCTET STRING OPTIONAL, + ... +} + + +TargetConnectionMethod ::= SEQUENCE +{ + connectionStatus [1] BOOLEAN, -- True indicates connected, false indicates not connected. + upstream [2] Upstream OPTIONAL, -- Specifies the encoding format of + downstream [3] Downstream OPTIONAL, -- Specifies the encoding format of + -- upstream and downstream parameters are omitted if connectionStatus indicates false. + ... +} + + +Upstream ::= SEQUENCE +{ + accessType [1] AccessType, + accessId [2] AccessID, + ... +} + + +Downstream ::= SEQUENCE +{ + accessType [1] AccessType, + accessId [2] AccessID, + ... +} -- it may be possible for the UE to receive in multiple ways (e.g. via normal EPS as well + -- as mulitcast. + +AccessType ::= ENUMERATED +{ + ePS-Unicast (1), + ePS-Multicast (2), + ... +} + + +AccessID ::= CHOICE +{ + tMGI [1] ReservedTMGI, + uEIPAddress [2] IPAddress, + ... +} -- it may be possible for the UE to receive in multiple ways (e.g. via normal EPS as well + -- as mulitcast. + +VisitedNetworkID ::= UTF8String -- contains the PLMN ID of the PLMN serving the UE, cooded + -- according to [53] + + +ReservedTMGI ::= OCTET STRING -- Shall be coded with the MBMS-Session-Duration attribute + -- specified in TS 29.468. + +TMGIReservationDuration ::= OCTET STRING -- Shall be coded with the TMGI attribute specified + -- in TS 29.468. + +Reason ::= UTF8String + +END -- OF GCSEHI2Operations diff --git a/testing/deps/33108/GCSEHI3.asn b/testing/deps/33108/GCSEHI3.asn new file mode 100644 index 0000000..7030609 --- /dev/null +++ b/testing/deps/33108/GCSEHI3.asn @@ -0,0 +1,78 @@ +GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3gcse(14) r13(13) version-0(0)} + +DEFINITIONS IMPLICIT TAGS ::= + +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)} + -- 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)}; + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi3gcseDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3gcse(14) r13(13) version-0(0)} + +Gcse-CC-PDU ::= SEQUENCE +{ + gcseLIC-header [1] GcseLIC-header, + payload [2] OCTET STRING +} + +GcseLIC-header ::= SEQUENCE +{ + hi3gcseDomainId [1] OBJECT IDENTIFIER, -- 3GPP HI3 gcse Domain ID + lIID [2] LawfulInterceptionIdentifier OPTIONAL, + correlation [3] GcseCorrelation, + timeStamp [4] TimeStamp OPTIONAL, + sequence-number [5] INTEGER (0..65535), + t-PDU-direction [6] TPDU-direction, + national-HI3-ASN1parameters [7] National-HI3-ASN1parameters OPTIONAL, + -- encoded per national requirements + mediaID [8] MediaID OPTIONAL, + -- Identifies the media being exchanged by parties on the GCSE group communications. +... + +} + +MediaID ::= SEQUENCE +{ + sourceUserID [1] GcsePartyIdentity OPTIONAL, -- include SDP information + -- describing GCSE Server Side characteristics. + + streamID [2] OCTET STRING OPTIONAL, -- include streamID from SDP information. + + ... +} + +TPDU-direction ::= ENUMERATED +{ + from-target (1), + to-target (2), + unknown (3), +... +} + +END -- OF GCSE-HI3 diff --git a/testing/deps/33108/ProSeHI2Operations.asn b/testing/deps/33108/ProSeHI2Operations.asn new file mode 100644 index 0000000..b483d61 --- /dev/null +++ b/testing/deps/33108/ProSeHI2Operations.asn @@ -0,0 +1,135 @@ +ProSeHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2prose(15) r16 (16) version0(0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + + + LawfulInterceptionIdentifier, + TimeStamp, + Network-Identifier, + National-Parameters, + National-HI2-ASN1parameters, + IPAddress + + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulIntercept(2) hi2(1) version18(18)}; -- Imported from TS 101 671 + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi2ProSeDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2prose(15) r16 (16) version0(0)} + +ProSeIRIsContent ::= CHOICE +{ + proseIRIContent [1] ProSeIRIContent, + proseIRISequence [2] ProSeIRISequence +} + +ProSeIRISequence ::= SEQUENCE OF ProSeIRIContent + +-- Aggregation of ProSeIRIContent is an optional feature. +-- It may be applied in cases when at a given point in time +-- several IRI records are available for delivery to the same LEA destination. +-- As a general rule, records created at any event shall be sent +-- immediately and not withheld in the DF or MF in order to +-- apply aggregation. +-- When aggregation is not to be applied, +-- ProSeIRIContent needs to be chosen. + +ProSeIRIContent ::= CHOICE +{ + iRI-Report-record [1] IRI-Parameters, + ... +} + + +IRI-Parameters ::= SEQUENCE +{ + hi2ProSeDomainId [0] OBJECT IDENTIFIER, -- 3GPP HI2 ProSe domain + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- This identifier is associated with the target. + timeStamp [2] TimeStamp, + -- date and time of the event triggering the report. + networkIdentifier [3] Network-Identifier, + proseEventData [4] ProSeEventData, + national-Parameters [5] National-Parameters OPTIONAL, + national-HI2-ASN1parameters [6] National-HI2-ASN1parameters OPTIONAL, +... +} + +-- PARAMETERS FORMATS + +ProSeEventData ::= CHOICE +{ + proseDirectDiscovery [0] ProSeDirectDiscovery, + + ... + +} + +ProSeDirectDiscovery ::= SEQUENCE +{ + proseDirectDiscoveryEvent [0] ProSeDirectDiscoveryEvent, + targetImsi [1] OCTET STRING (SIZE (3..8)), + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + targetRole [2] TargetRole, + directDiscoveryData [3] DirectDiscoveryData, + metadata [4] UTF8String OPTIONAL, + otherUeImsi [5] OCTET STRING (SIZE (3..8)) OPTIONAL, + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + + ... + + +} + +ProSeDirectDiscoveryEvent ::= ENUMERATED +{ + proseDiscoveryRequest (1), + proseMatchReport (2), + + ... +} + +TargetRole ::= ENUMERATED +{ + announcingUE (1), + monitoringUE (2), + ... +} + +DirectDiscoveryData::= SEQUENCE +{ + discoveryPLMNID [1] UTF8String, + proseAppIdName [2] UTF8String, + proseAppCode [3] OCTET STRING (SIZE (23)), + -- See format in TS 23.003 [25] + proseAppMask [4] ProSeAppMask OPTIONAL, + timer [5] INTEGER, + + ... +} + +ProSeAppMask ::= CHOICE +{ + proseMask [1] OCTET STRING (SIZE (23)), + -- formatted like the proseappcode; used in conjuction with the corresponding + -- proseappcode bitstring to form a filter. + proseMaskSequence [2] ProSeMaskSequence +} + +ProSeMaskSequence ::= SEQUENCE OF OCTET STRING (SIZE (23)) +-- There can be multiple masks for a ProSe App code at the monitoring UE + +END -- OF ProSeHI2Operations diff --git a/testing/deps/33108/Three3gppHI1Notifications.asn b/testing/deps/33108/Three3gppHI1Notifications.asn new file mode 100644 index 0000000..2cc84bf --- /dev/null +++ b/testing/deps/33108/Three3gppHI1Notifications.asn @@ -0,0 +1,180 @@ +ThreeGPP-HI1NotificationOperations +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1) r16 (16) version-0(0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + + LawfulInterceptionIdentifier, + TimeStamp, + CommunicationIdentifier, + Network-Identifier, + CalledPartyNumber, + IPAddress + + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulIntercept(2) hi2(1) version18(18)}; -- Imported from TS 101 671v3.12.1 + + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +-- LawfulIntercept DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +-- hi1 Domain +threeGPP-hi1NotificationOperationsId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi1(0) notificationOperations(1)} +threeGPP-hi1OperationId OBJECT IDENTIFIER ::= {threeGPP-hi1NotificationOperationsId r16 (16) version-0(0)} + + +ThreeGPP-HI1-Operation ::= CHOICE +{ + liActivated [1] Notification, + liDeactivated [2] Notification, + liModified [3] Notification, + alarms-indicator [4] Alarm-Indicator, + threeGPP-National-HI1-ASN1parameters [5] ThreeGPP-National-HI1-ASN1parameters, +...} + +-- ================== +-- PARAMETERS FORMATS +-- ================== + +Notification ::= SEQUENCE +{ + domainID [0] OBJECT IDENTIFIER OPTIONAL, + -- Once using FTP delivery mechanism + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- This identifier is the LIID identity provided with the lawful authorization for each + -- target. + communicationIdentifier [2] CommunicationIdentifier OPTIONAL, + -- Only the NO/AP/SP Identifier is provided (the one provided with the Lawful + -- authorization) in CS domain. + timeStamp [3] TimeStamp, + -- date and time of the report. + threeGPP-National-HI1-ASN1parameters [5] ThreeGPP-National-HI1-ASN1parameters OPTIONAL, + target-Information [6] Target-Information OPTIONAL, + network-Identifier [7] Network-Identifier OPTIONAL, + -- Same definition of annexes B3, B8, B9, B.11.1. It is recommended to use the same value + -- than those decided by the CSP and the LEA as the NWO/PA/SvPIdentifier of + -- communicationIdentifier used in CS domain. + broadcastStatus [8] BroadcastStatus OPTIONAL, +...} + +Alarm-Indicator ::= SEQUENCE +{ + domainID [0] OBJECT IDENTIFIER OPTIONAL, + -- Once using FTP delivery mechanism + communicationIdentifier [1] CommunicationIdentifier OPTIONAL, + -- Only the NO/AP/SP Identifier is provided (the one provided with the + -- Lawful authorization) + timeStamp [2] TimeStamp, + -- date and time of the report. + alarm-information [3] OCTET STRING (SIZE (1..25)), + -- Provides information about alarms (free format). + lawfulInterceptionIdentifier [4] LawfulInterceptionIdentifier OPTIONAL, + -- This identifier is the LIID identity provided with the lawful authorization + -- for each target in according to national law + threeGPP-National-HI1-ASN1parameters [5] ThreeGPP-National-HI1-ASN1parameters OPTIONAL, + target-Information [6] Target-Information OPTIONAL, + network-Identifier [7] Network-Identifier OPTIONAL, + -- the NO/AP/SP Identifier, + -- Same definition as annexes B3, B8, B9, B.11.1 + network-Element-Information [8] OCTET STRING (SIZE (1..256)) OPTIONAL, + -- This identifier may be a network element identifier such an IP address with its IP value, + -- that may not work properly. To be defined between the CSP and the LEA. +...} + +ThreeGPP-National-HI1-ASN1parameters ::= SEQUENCE +{ + domainID [0] OBJECT IDENTIFIER OPTIONAL, + -- Once using FTP delivery mechanism. + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [39], + -- the country to which the parameters inserted after the extension marker apply. + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from IANA web site. Besides, it is recommended to avoid + -- using tags from 240 to 255 in a formal type definition. +...} + +Target-Information ::= SEQUENCE +{ + communicationIdentifier [0] CommunicationIdentifier OPTIONAL, + -- Only the NO/AP/SP Identifier is provided (the one provided with the + -- Lawful authorization) + network-Identifier [1] Network-Identifier OPTIONAL, + -- the NO/PA/SPIdentifier, + -- Same definition of annexes B3, B8, B9, B.11.1 + broadcastArea [2] OCTET STRING (SIZE (1..256)) OPTIONAL, + -- A Broadcast Area is used to select the group of NEs (network elements) which an + -- interception applies to. This group may be built on the basis of network type, technology + -- type or geographic details to fit national regulation and jurisdiction. The pre-defined + -- values may be decided by the CSP and the LEA to determinate the specific part of the + -- network or plateform on which the target identity(ies) has to be activated or + -- desactivated. + targetType [3] TargetType OPTIONAL, + deliveryInformation [4] DeliveryInformation OPTIONAL, + liActivatedTime [5] TimeStamp OPTIONAL, + liDeactivatedTime [6] TimeStamp OPTIONAL, + liModificationTime [7] TimeStamp OPTIONAL, + interceptionType [8] InterceptionType OPTIONAL, +..., + liSetUpTime [9] TimeStamp OPTIONAL + -- date and time when the warrant is entered into the ADMF +} + +TargetType ::= ENUMERATED +{ + mSISDN(0), + iMSI(1), + iMEI(2), + e164-Format(3), + nAI(4), + sip-URI(5), + tel-URI(6), + iMPU (7), + iMPI (8), +... +} + +DeliveryInformation ::= SEQUENCE +{ + hi2DeliveryNumber [0] CalledPartyNumber OPTIONAL, + -- Circuit switch IRI delivery E164 number + hi3DeliveryNumber [1] CalledPartyNumber OPTIONAL, + -- Circuit switch voice content delivery E164 number + hi2DeliveryIpAddress [2] IPAddress OPTIONAL, + -- HI2 address of the LEMF. + hi3DeliveryIpAddress [3] IPAddress OPTIONAL, + -- HI3 address of the LEMF. +...} + +InterceptionType ::= ENUMERATED +{ + voiceIriCc(0), + voiceIriOnly(1), + dataIriCc(2), + dataIriOnly(3), + voiceAndDataIriCc(4), + voiceAndDataIriOnly(5), +...} + +BroadcastStatus ::= ENUMERATED +{ + succesfull(0), + -- Example of usage: following a broadcasted command at least the target list of one node with a LI function has + -- been modified or confirm to include the target id requested by the LEA. + unsuccesfull(1), + -- case of usage: such information could be provided to the LEMF following the impossibility to get a positive confirmation from at least one node with an LI function on the broadcasted command made by the operator's mediation or the management of mediation. +...} + +END -- end of ThreeGPP-HI1NotificationOperations diff --git a/testing/deps/33108/UMTSCSHI2Operations.asn b/testing/deps/33108/UMTSCSHI2Operations.asn new file mode 100644 index 0000000..15be638 --- /dev/null +++ b/testing/deps/33108/UMTSCSHI2Operations.asn @@ -0,0 +1,254 @@ +UmtsCS-HI2Operations {itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3) r16 (16) version-0 (0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + + + LawfulInterceptionIdentifier, + TimeStamp, + Intercepted-Call-State, + PartyInformation, + CallContentLinkCharacteristics, + CommunicationIdentifier, + CC-Link-Identifier, + National-Parameters, + National-HI2-ASN1parameters + + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulIntercept(2) hi2(1) version9(9)} -- Imported from TS 101 671 v2.13.1 + + Location, + SMS-report, + ExtendedLocParameters, + LocationErrorCode + + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulintercept(2) threeGPP(4) hi2(1) r16 (16) version-0(0)}; + + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi2CSDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2CS(3) r16 (16) version-0 (0)} + + +UmtsCS-IRIsContent ::= CHOICE +{ + iRIContent UmtsCS-IRIContent, + iRISequence UmtsCS-IRISequence +} + +UmtsCS-IRISequence ::= SEQUENCE OF UmtsCS-IRIContent + -- Aggregation of UmtsCS-IRIContent is an optional feature. + -- It may be applied in cases when at a given point in time several IRI records are + -- available for delivery to the same LEA destination. + -- As a general rule, records created at any event shall be sent immediately and shall + -- not held in the DF or MF in order to apply aggregation. +-- When aggregation is not to be applied, UmtsCS-IRIContent needs to be chosen. + +UmtsCS-IRIContent ::= CHOICE +{ + iRI-Begin-record [1] IRI-Parameters, + --at least one optional parameter has to be included within the iRI-Begin-Record + iRI-End-record [2] IRI-Parameters, + iRI-Continue-record [3] IRI-Parameters, + --at least one optional parameter has to be included within the iRI-Continue-Record + iRI-Report-record [4] IRI-Parameters, + --at least one optional parameter has to be included within the iRI-Report-Record + ... +} + +IRI-Parameters ::= SEQUENCE +{ + hi2CSDomainId [0] OBJECT IDENTIFIER, -- 3GPP HI2 CS domain + + iRIversion [23] ENUMERATED + { + version1(1), + ..., + version2(2), + version3(3), + -- versions 4-7 were ommited to align with UmtsHI2Operations. + lastVersion(8) + } OPTIONAL, + -- Optional parameter "iRIversion" (tag 23) was always redundant in 33.108, because + -- the object identifier "hi2CSDomainId" was introduced into "IRI Parameters" with the + -- initial HI2 CS domain module in 33.108v6.1.0. In order to keep backward compatibility, + -- even when the version of the "hi2CSDomainId" parameter will be incremented it is + -- recommended to always send to LEMF the same: enumeration value "lastVersion(8)". + -- if not present, it means version 1 is handled + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- This identifier is associated to the target. + communicationIdentifier [2] CommunicationIdentifier, + -- used to uniquely identify an intercepted call. + + timeStamp [3] TimeStamp, + -- date and time of the event triggering the report. + intercepted-Call-Direct [4] ENUMERATED + { + not-Available(0), + originating-Target(1), + terminating-Target(2), + ... + } OPTIONAL, + intercepted-Call-State [5] Intercepted-Call-State OPTIONAL, + -- Not required for UMTS. May be included for backwards compatibility to GSM + ringingDuration [6] OCTET STRING (SIZE (3)) OPTIONAL, + -- Duration in seconds. BCD coded : HHMMSS + -- Not required for UMTS. May be included for backwards compatibility to GSM + conversationDuration [7] OCTET STRING (SIZE (3)) OPTIONAL, + -- Duration in seconds. BCD coded : HHMMSS + -- Not required for UMTS. May be included for backwards compatibility to GSM + locationOfTheTarget [8] Location OPTIONAL, + -- location of the target + partyInformation [9] SET SIZE (1..10) OF PartyInformation OPTIONAL, + -- This parameter provides the concerned party (Originating, Terminating or forwarded + -- party), the identity(ies) of the party and all the information provided by the party. + callContentLinkInformation [10] SEQUENCE + { + cCLink1Characteristics [1] CallContentLinkCharacteristics OPTIONAL, + -- information concerning the Content of Communication Link Tx channel established + -- toward the LEMF (or the sum signal channel, in case of mono mode). + cCLink2Characteristics [2] CallContentLinkCharacteristics OPTIONAL, + -- information concerning the Content of Communication Link Rx channel established + -- toward the LEMF. + ... + } OPTIONAL, + release-Reason-Of-Intercepted-Call [11] OCTET STRING (SIZE (2)) OPTIONAL, + -- Release cause coded in [31] format. + -- This parameter indicates the reason why the + -- intercepted call cannot be established or why the intercepted call has been + -- released after the active phase. + nature-Of-The-intercepted-call [12] ENUMERATED + { + --Not required for UMTS. May be included for backwards compatibility to GSM + --Nature of the intercepted "call": + gSM-ISDN-PSTN-circuit-call(0), + -- the possible UUS content is sent through the HI2 or HI3 "data" interface + -- the possible call content call is established through the HI3 „circuit„ interface + gSM-SMS-Message(1), + -- the SMS content is sent through the HI2 or HI3 "data" interface + uUS4-Messages(2), + -- the UUS content is sent through the HI2 or HI3 "data" interface + tETRA-circuit-call(3), + -- the possible call content call is established through the HI3 "circuit" interface + -- the possible data are sent through the HI3 "data" interface + teTRA-Packet-Data(4), + -- the data are sent through the HI3 "data" interface + gPRS-Packet-Data(5), + -- the data are sent through the HI3 "data" interface + ... + } OPTIONAL, + serviceCenterAddress [13] PartyInformation OPTIONAL, + -- e.g. in case of SMS message this parameter provides the address of the relevant + -- server within the calling (if server is originating) or called + -- (if server is terminating) party address parameters + sMS [14] SMS-report OPTIONAL, + -- this parameter provides the SMS content and associated information + cC-Link-Identifier [15] CC-Link-Identifier OPTIONAL, + -- Depending on a network option, this parameter may be used to identify a CC link + -- in case of multiparty calls. + national-Parameters [16] National-Parameters OPTIONAL, + ..., + umts-Cs-Event [33] Umts-Cs-Event OPTIONAL, + -- Care should be taken to ensure additional parameter numbering does not conflict with + -- ETSI TS 101 671 or Annex B.3 of this document (PS HI2). + serving-System-Identifier [34] OCTET STRING OPTIONAL, + -- the serving network identifier PLMN id (MNC, Mobile Country Code and MNC, Mobile Network + + -- Country, defined in E212 [87]) and 3GPP TR 21.905 [38]. + carrierSpecificData [35] OCTET STRING OPTIONAL, + -- Copy of raw data specified by the CSP or his vendor related to HLR. + current-Previous-Systems [36] Current-Previous-Systems OPTIONAL, + change-Of-Target-Identity [37] Change-Of-Target-Identity OPTIONAL, + requesting-Network-Identifier [38] OCTET STRING OPTIONAL, + -- the requesting network identifier PLMN id (Mobile Country Code and Mobile Network Country, + -- defined in E212 [87]). + requesting-Node-Type [39] Requesting-Node-Type OPTIONAL, + extendedLocParameters [40] ExtendedLocParameters OPTIONAL, -- LALS extended parameters + locationErrorCode [41] LocationErrorCode OPTIONAL, -- LALS error code + national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL + +} + +Umts-Cs-Event ::= ENUMERATED +{ + call-establishment (1), + answer (2), + supplementary-Service (3), + handover (4), + release (5), + sMS (6), + location-update (7), + subscriber-Controlled-Input (8), + ..., + hLR-Subscriber-Record-Change (9), + serving-System (10), + cancel-Location (11), + register-Location (12), + location-Information-Request (13) +} + +Requesting-Node-Type ::= ENUMERATED +{ + mSC (1), + sMS-Centre (2), + gMLC (3), + mME (4), + sGSN (5), + ... +} + +Change-Of-Target-Identity ::= SEQUENCE +{ + new-MSISDN [1] PartyInformation OPTIONAL, + -- new MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format document TS 29.002 [4] + old-MSISDN [2] PartyInformation OPTIONAL, + -- new MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format document TS 29.002 [4] + new-IMSI [3] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + old-IMSI [4] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + + ..., + new-IMEI [5] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Equipement Identity defined in MAP format document TS 29.002 [4] + old-IMEI [6] PartyInformation OPTIONAL + -- See MAP format [4] International Mobile + -- Equipement Identity defined in MAP format document TS 29.002 [4] +} + +Current-Previous-Systems ::= SEQUENCE +{ + current-Serving-System-Identifier [1] OCTET STRING OPTIONAL, + -- VPLMN id (Mobile Country Code and Mobile Network Country, E. 212 number [87]). + current-Serving-MSC-Number [2] OCTET STRING OPTIONAL, + -- E.164 number of the serving MSC. + current-Serving-MSC-Address [3] OCTET STRING OPTIONAL, + -- The IP address of the serving MSC or its Diameter Origin-Host and Origin-Realm. previous- + previous-Serving-System-Identifier [4] OCTET STRING OPTIONAL, + -- VPLMN id (Mobile Country Code and Mobile Network Country, defined in E212 [87]). + previous-Serving-MSC-Number [5] OCTET STRING OPTIONAL, + -- The E.164 number of the previous serving MSC. + previous-Serving-MSC-Address [6] OCTET STRING OPTIONAL, + -- The IP address of the previous serving MSC or its Diameter Origin-Host and Origin-Realm. +... +} + + +END -- OF UmtsCS-HI2Operations diff --git a/testing/deps/33108/UMTSHI2Operations.asn b/testing/deps/33108/UMTSHI2Operations.asn new file mode 100644 index 0000000..edd5f22 --- /dev/null +++ b/testing/deps/33108/UMTSHI2Operations.asn @@ -0,0 +1,1208 @@ +UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r16 (16) version-0 (0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + LawfulInterceptionIdentifier, + TimeStamp, + Network-Identifier, + National-Parameters, + National-HI2-ASN1parameters, + DataNodeAddress, + IPAddress, + IP-value, + X25Address + + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) + lawfulIntercept(2) hi2(1) version18(18)}; -- Imported from TS 101 671 v3.14.1 + + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r16 (16) version-0 (0)} + +UmtsIRIsContent ::= CHOICE +{ + umtsiRIContent UmtsIRIContent, + umtsIRISequence UmtsIRISequence +} + +UmtsIRISequence ::= SEQUENCE OF UmtsIRIContent + +-- Aggregation of UmtsIRIContent is an optional feature. +-- It may be applied in cases when at a given point in time +-- several IRI records are available for delivery to the same LEA destination. +-- As a general rule, records created at any event shall be sent +-- immediately and not withheld in the DF or MF in order to +-- apply aggragation. +-- When aggregation is not to be applied, +-- UmtsIRIContent needs to be chosen. + + +UmtsIRIContent ::= CHOICE +{ + iRI-Begin-record [1] IRI-Parameters, -- include at least one optional parameter + iRI-End-record [2] IRI-Parameters, + iRI-Continue-record [3] IRI-Parameters, -- include at least one optional parameter + iRI-Report-record [4] IRI-Parameters -- include at least one optional parameter +} + +-- Parameters having the same tag numbers have to be identical in Rel-5 and onwards modules. +IRI-Parameters ::= SEQUENCE +{ + hi2DomainId [0] OBJECT IDENTIFIER, -- 3GPP HI2 domain + iRIversion [23] ENUMERATED + { + version2 (2), + ..., + version3 (3), + version4 (4), + -- note that version5 (5) cannot be used as it was missed in the version 5 of this + -- ASN.1 module. + version6 (6), + -- vesion7(7) was ommited to align with ETSI TS 101 671. + lastVersion (8) } OPTIONAL, + -- Optional parameter "iRIversion" (tag 23) was always redundant in 33.108, because + -- the object identifier "hi2DomainId" was introduced into "IRI Parameters" in the + -- initial version of 33.108v5.0.0. In order to keep backward compatibility, even when + -- the version of the "hi2DomainId" parameter will be incremented it is recommended + -- to always send to LEMF the same: enumeration value "lastVersion(8)". + -- if not present, it means version 1 is handled + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- This identifier is associated to the target. + timeStamp [3] TimeStamp, + -- date and time of the event triggering the report.) + initiator [4] ENUMERATED + { + not-Available (0), + originating-Target (1), + -- in case of GPRS, this indicates that the PDP context activation, modification + -- or deactivation is MS requested + terminating-Target (2), + -- in case of GPRS, this indicates that the PDP context activation, modification or + -- deactivation is network initiated + ... + } OPTIONAL, + + locationOfTheTarget [8] Location OPTIONAL, + -- location of the target + -- or cell site location + partyInformation [9] SET SIZE (1..10) OF PartyInformation OPTIONAL, + -- This parameter provides the concerned party, the identiy(ies) of the party + --)and all the information provided by the party. + + serviceCenterAddress [13] PartyInformation OPTIONAL, + -- e.g. in case of SMS message this parameter provides the address of the relevant + -- server + sMS [14] SMS-report OPTIONAL, + -- this parameter provides the SMS content and associated information + + national-Parameters [16] National-Parameters OPTIONAL, + gPRSCorrelationNumber [18] GPRSCorrelationNumber OPTIONAL, + gPRSevent [20] GPRSEvent OPTIONAL, + -- This information is used to provide particular action of the target + -- such as attach/detach + sgsnAddress [21] DataNodeAddress OPTIONAL, + gPRSOperationErrorCode [22] GPRSOperationErrorCode OPTIONAL, + ggsnAddress [24] DataNodeAddress OPTIONAL, + qOS [25] UmtsQos OPTIONAL, + networkIdentifier [26] Network-Identifier OPTIONAL, + sMSOriginatingAddress [27] DataNodeAddress OPTIONAL, + sMSTerminatingAddress [28] DataNodeAddress OPTIONAL, + iMSevent [29] IMSevent OPTIONAL, + sIPMessage [30] OCTET STRING OPTIONAL, + servingSGSN-number [31] OCTET STRING (SIZE (1..20)) OPTIONAL, + -- Coded according to 3GPP TS 29.002 [4] and 3GPP TS 23.003 25]. + servingSGSN-address [32] OCTET STRING (SIZE (5..17)) OPTIONAL, + -- Octets are coded according to 3GPP TS 23.003 [25] + ..., + -- Tag [33] was taken into use by ETSI module in TS 101 671v2.13.1 + ldiEvent [34] LDIevent OPTIONAL, + correlation [35] CorrelationValues OPTIONAL, + mediaDecryption-info [36] MediaDecryption-info OPTIONAL, + servingS4-SGSN-address [37] OCTET STRING OPTIONAL, + -- Diameter Origin-Host and Origin-Realm of the S4-SGSN based on the TS 29.272 [59]. + -- Only the data fields from the Diameter AVPs are provided concatenated + -- with a semicolon to populate this field. + sipMessageHeaderOffer [38] OCTET STRING OPTIONAL, + sipMessageHeaderAnswer [39] OCTET STRING OPTIONAL, + sdpOffer [40] OCTET STRING OPTIONAL, + sdpAnswer [41] OCTET STRING OPTIONAL, + uLITimestamp [42] OCTET STRING (SIZE (8)) OPTIONAL, + -- Coded according to 3GPP TS 29.060 [17]; Only the ULI Timestamp value is reported. + packetDataHeaderInformation [43] PacketDataHeaderInformation OPTIONAL, + mediaSecFailureIndication [44] MediaSecFailureIndication OPTIONAL, + pANI-Header-Info [45] SEQUENCE OF PANI-Header-Info OPTIONAL, + -- information extracted from P-Access-Network-Info headers of SIP message; + -- described in TS 24.229 §7.2A.4 [76] + imsVoIP [46] IMS-VoIP-Correlation OPTIONAL, + xCAPmessage [47] OCTET STRING OPTIONAL, + -- The entire HTTP contents of any of the target's IMS supplementary service setting + -- management or manipulation XCAP messages, mainly made through the Ut + -- interface defined in the 3GPP TS 24 623 [77]. + ccUnavailableReason [48] PrintableString OPTIONAL, + carrierSpecificData [49] OCTET STRING OPTIONAL, + -- Copy of raw data specified by the CSP or his vendor related to HSS. + current-Previous-Systems [50] Current-Previous-Systems OPTIONAL, + change-Of-Target-Identity [51] Change-Of-Target-Identity OPTIONAL, + requesting-Network-Identifier [52] OCTET STRING OPTIONAL, + -- the requesting network identifier PLMN id (Mobile Country Code and Mobile Network Country, + -- defined in E212 [87]). + requesting-Node-Type [53] Requesting-Node-Type OPTIONAL, + serving-System-Identifier [54] OCTET STRING OPTIONAL, + -- the requesting network identifier (Mobile Country Code and Mobile Network Country, + -- defined in E212 [87]). + extendedLocParameters [55] ExtendedLocParameters OPTIONAL, -- LALS extended parameters + locationErrorCode [56] LocationErrorCode OPTIONAL, -- LALS error code + cSREvent [57] CSREvent OPTIONAL, + ptc [58] PTC OPTIONAL, -- PTC Events + ptcEncryption [59] PTCEncryptionInfo OPTIONAL, + -- PTC Security Information + + national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL +} +-- Parameters having the same tag numbers have to be identical in Rel-5 and onwards modules + +-- PARAMETERS FORMATS + +PANI-Header-Info::= SEQUENCE +{ + access-Type [1] OCTET STRING OPTIONAL, + -- ASCII chain '3GPP-GERAN',... : see TS 24.229 §7.2A.4 [76] + access-Class [2] OCTET STRING OPTIONAL, + -- ASCII chain'3GPP-GERAN',... : see TS 24.229 §7.2A.4 [76] + network-Provided [3] NULL OPTIONAL, + -- present if provided by the network + pANI-Location [4] PANI-Location OPTIONAL, + ... +} + +PANI-Location ::= SEQUENCE +{ + raw-Location [1] OCTET STRING OPTIONAL, + -- raw copy of the location string from the P-Access-Network-Info header + location [2] Location OPTIONAL, + + ... +} + + +PartyInformation ::= SEQUENCE +{ + party-Qualifier [0] ENUMERATED + { + gPRS-Target(3), + ... + }, + partyIdentity [1] SEQUENCE + { + imei [1] OCTET STRING (SIZE (8)) OPTIONAL, + -- See MAP format [4] + + imsi [3] OCTET STRING (SIZE (3..8)) OPTIONAL, + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + + msISDN [6] OCTET STRING (SIZE (1..9)) OPTIONAL, + -- MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format document TS 29.002 [4] + + e164-Format [7] OCTET STRING (SIZE (1 .. 25)) OPTIONAL, + -- E164 address of the node in international format. Coded in the same format as + -- the calling party number parameter of the ISUP (parameter part:[29]) + + sip-uri [8] OCTET STRING OPTIONAL, + -- See [26] + + ..., + tel-uri [9] OCTET STRING OPTIONAL, + -- See [67] + x-3GPP-Asserted-Identity [10] OCTET STRING OPTIONAL, + -- X-3GPP-Asserted-Identity header (3GPP TS 24.109 [79]) of the target, used in + -- some XCAP transactions. This information complement SIP URI or Tel URI of the target. + xUI [11] OCTET STRING OPTIONAL + -- XCAP User Identifier (XUI)is a string, valid as a path element in an XCAP URI, that + -- may be associated with each user served by a XCAP resource server. Defined in IETF + -- RFC 4825[80]. This information may complement SIP URI or Tel URI of the target. + + }, + services-Data-Information [4] Services-Data-Information OPTIONAL, + -- This parameter is used to transmit all the information concerning the + -- complementary information associated to the basic data call + ... +} + +Location ::= SEQUENCE +{ + e164-Number [1] OCTET STRING (SIZE (1..25)) OPTIONAL, + -- Coded in the same format as the ISUP location number (parameter + -- field) of the ISUP (see EN 300 356 [30]). + globalCellID [2] GlobalCellID OPTIONAL, + --see MAP format (see [4]) + rAI [4] Rai OPTIONAL, + -- the Routeing Area Identifier in the current SGSN is coded in accordance with the + -- § 10.5.5.15 of document [9] without the Routing Area Identification IEI + -- (only the last 6 octets are used) + gsmLocation [5] GSMLocation OPTIONAL, + umtsLocation [6] UMTSLocation OPTIONAL, + sAI [7] Sai OPTIONAL, + -- format: PLMN-ID 3 octets (no. 1 - 3) + -- LAC 2 octets (no. 4 - 5) + -- SAC 2 octets (no. 6 - 7) + -- (according to 3GPP TS 25.413 [62]) + ..., + oldRAI [8] Rai OPTIONAL, + -- the Routeing Area Identifier in the old SGSN is coded in accordance with the + -- § 10.5.5.15 of document [9] without the Routing Area Identification IEI + -- (only the last 6 octets are used). + tAI [9] OCTET STRING (SIZE (6)) OPTIONAL, + -- The TAI is coded according to the TS 29.118 [64] without the TAI IEI. + -- The tAI parameter is applicable only to the CS traffic cases where + -- the available location information is the one received from the the MME. + eCGI [10] OCTET STRING (SIZE (8)) OPTIONAL, + -- the ECGI is coded according to the TS 29.118 [64] without the ECGI IEI. + -- The eCGI parameter is applicable only to the CS traffic cases where + -- the available location information is the one received from the the MME. + civicAddress [11] CivicAddress OPTIONAL, + -- Every elements that describe civicAddress are based on IETF RFC 4776 or IETF + -- 5139, ISO.3166-1 and -2, ISO 639-1, UPU SB42-4 ([71]to [75]) Such element is to + -- enrich IRI + -- Messages to LEMF by civic elements on the location of a H(e)NodeB or a WLAN hotspot, + -- instead of geographical location of the target or any geo-coordinates. Please, look + -- at the §5.11 location information of TS 33.106 and §4 functional architecture of TS + -- 33.107 on how such element can be used. + operatorSpecificInfo [12] OCTET STRING OPTIONAL, + -- other CSP specific information. + uELocationTimestamp [13] CHOICE + { + timestamp [0] TimeStamp, + timestampUnknown [1] NULL, + ... + } OPTIONAL + -- Date/time of the UE location +} + +GlobalCellID ::= OCTET STRING (SIZE (5..7)) +Rai ::= OCTET STRING (SIZE (6)) +Sai ::= OCTET STRING (SIZE (7)) + +GSMLocation ::= CHOICE +{ + geoCoordinates [1] SEQUENCE + { + latitude [1] PrintableString (SIZE(7..10)), + -- format : XDDMMSS.SS + longitude [2] PrintableString (SIZE(8..11)), + -- format : XDDDMMSS.SS + mapDatum [3] MapDatum DEFAULT wGS84, + ..., + azimuth [4] INTEGER (0..359) OPTIONAL + -- The azimuth is the bearing, relative to true north. + }, + -- format : XDDDMMSS.SS + -- X : N(orth), S(outh), E(ast), W(est) + -- DD or DDD : degrees (numeric characters) + -- MM : minutes (numeric characters) + -- SS.SS : seconds, the second part (.SS) is optionnal + -- Example : + -- latitude short form N502312 + -- longitude long form E1122312.18 + + utmCoordinates [2] SEQUENCE + { + utm-East [1] PrintableString (SIZE(10)), + utm-North [2] PrintableString (SIZE(7)), + -- example utm-East 32U0439955 + -- utm-North 5540736 + mapDatum [3] MapDatum DEFAULT wGS84, + ..., + azimuth [4] INTEGER (0..359) OPTIONAL + -- The azimuth is the bearing, relative to true north. + }, + + utmRefCoordinates [3] SEQUENCE + { + utmref-string PrintableString (SIZE(13)), + mapDatum MapDatum DEFAULT wGS84, + ... + }, + -- example 32UPU91294045 + + wGS84Coordinates [4] OCTET STRING + -- format is as defined in [37]. +} + +MapDatum ::= ENUMERATED +{ + wGS84, + wGS72, + eD50, -- European Datum 50 + ... +} + +UMTSLocation ::= CHOICE { + point [1] GA-Point, + pointWithUnCertainty [2] GA-PointWithUnCertainty, + polygon [3] GA-Polygon +} + +GeographicalCoordinates ::= SEQUENCE { + latitudeSign ENUMERATED { north, south }, + latitude INTEGER (0..8388607), + longitude INTEGER (-8388608..8388607), + ... +} + +GA-Point ::= SEQUENCE { + geographicalCoordinates GeographicalCoordinates, + ... +} + +GA-PointWithUnCertainty ::=SEQUENCE { + geographicalCoordinates GeographicalCoordinates, + uncertaintyCode INTEGER (0..127) +} + +maxNrOfPoints INTEGER ::= 15 + +GA-Polygon ::= SEQUENCE (SIZE (1..maxNrOfPoints)) OF + SEQUENCE { + geographicalCoordinates GeographicalCoordinates, + ... + } + +CivicAddress ::= CHOICE { + detailedCivicAddress SET OF DetailedCivicAddress, + xmlCivicAddress XmlCivicAddress, + ... +} + +XmlCivicAddress ::= UTF8String + -- Must conform to the February 2008 version of the XML format on the representation of + -- civic location described in IETF RFC 5139[72]. + +DetailedCivicAddress ::= SEQUENCE { + building [1] UTF8String OPTIONAL, + -- Building (structure), for example Hope Theatre + room [2] UTF8String OPTIONAL, + -- Unit (apartment, suite), for example 12a + placeType [3] UTF8String OPTIONAL, + -- Place-type, for example office + postalCommunityName [4] UTF8String OPTIONAL, + -- Postal Community Name, for example Leonia + additionalCode [5] UTF8String OPTIONAL, + -- Additional Code, for example 13203000003 + seat [6] UTF8String OPTIONAL, + -- Seat, desk, or cubicle, workstation, for example WS 181 + primaryRoad [7] UTF8String OPTIONAL, + -- RD is the primary road name, for example Broadway + primaryRoadDirection [8] UTF8String OPTIONAL, + -- PRD is the leading road direction, for example N or North + trailingStreetSuffix [9] UTF8String OPTIONAL, + -- POD or trailing street suffix, for example SW or South West + streetSuffix [10] UTF8String OPTIONAL, + -- Street suffix or type, for example Avenue or Platz or Road + houseNumber [11] UTF8String OPTIONAL, + -- House number, for example 123 + houseNumberSuffix [12] UTF8String OPTIONAL, + -- House number suffix, for example A or Ter + landmarkAddress [13] UTF8String OPTIONAL, + -- Landmark or vanity address, for example Columbia University + additionalLocation [114] UTF8String OPTIONAL, + -- Additional location, for example South Wing + name [15] UTF8String OPTIONAL, + -- Residence and office occupant, for example Joe's Barbershop + floor [16] UTF8String OPTIONAL, + -- Floor, for example 4th floor + primaryStreet [17] UTF8String OPTIONAL, + -- Primary street name, for example Broadway + primaryStreetDirection [18] UTF8String OPTIONAL, + -- PSD is the leading street direction, for example N or North + roadSection [19] UTF8String OPTIONAL, + -- Road section, for example 14 + roadBranch [20] UTF8String OPTIONAL, + -- Road branch, for example Lane 7 + roadSubBranch [21] UTF8String OPTIONAL, + -- Road sub-branch, for example Alley 8 + roadPreModifier [22] UTF8String OPTIONAL, + -- Road pre-modifier, for example Old + roadPostModifier [23] UTF8String OPTIONAL, + -- Road post-modifier, for example Extended + postalCode [24]UTF8String OPTIONAL, + -- Postal/zip code, for example 10027-1234 + town [25] UTF8String OPTIONAL, + county [26] UTF8String OPTIONAL, + -- An administrative sub-section, often defined in ISO.3166-2[74] International + -- Organization for Standardization, "Codes for the representation of names of + -- countries and their subdivisions - Part 2: Country subdivision code" + country [27] UTF8String, + -- Defined in ISO.3166-1 [39] International Organization for Standardization, "Codes for + -- the representation of names of countries and their subdivisions - Part 1: Country + -- codes". Such definition is not optional in case of civic address. It is the + -- minimum information needed to qualify and describe a civic address, when a + -- regulation of a specific country requires such information + language [28] UTF8String, + -- Language defined in the IANA registry according to the assignments found + -- in the standard ISO 639 Part 1, "ISO 639-1:2002[75], Codes for the representation of + -- names of languages - Part 1: Alpha-2 code" or using assignments subsequently made + -- by the ISO 639 Part 1 maintenance agency + ... +} + +SMS-report ::= SEQUENCE +{ + sMS-Contents [3] SEQUENCE + { + sms-initiator [1] ENUMERATED -- party which sent the SMS + { + target (0), + server (1), + undefined-party (2), + ... + }, + transfer-status [2] ENUMERATED + { + succeed-transfer (0), -- the transfer of the SMS message succeeds + not-succeed-transfer(1), + undefined (2), + ... + } OPTIONAL, + other-message [3] ENUMERATED -- in case of terminating call, indicates if + -- the server will send other SMS + { + yes (0), + no (1), + undefined (2), + ... + } OPTIONAL, + content [4] OCTET STRING (SIZE (1 .. 270)) OPTIONAL, + -- Encoded in the format defined for the SMS mobile + ... + } +} + +GPRSCorrelationNumber ::= OCTET STRING (SIZE(8..20)) +CorrelationValues ::= CHOICE { + + iri-to-CC [0] IRI-to-CC-Correlation, -- correlates IRI to Content(s) + iri-to-iri [1] IRI-to-IRI-Correlation, -- correlates IRI to IRI + both-IRI-CC [2] SEQUENCE { -- correlates IRI to IRI and IRI to Content(s) + iri-CC [0] IRI-to-CC-Correlation, + iri-IRI [1] IRI-to-IRI-Correlation} +} + + +IMS-VoIP-Correlation ::= SET OF SEQUENCE { + ims-iri [0] IRI-to-IRI-Correlation, + ims-cc [1] IRI-to-CC-Correlation OPTIONAL +} + +IRI-to-CC-Correlation ::= SEQUENCE { -- correlates IRI to Content + cc [0] SET OF OCTET STRING,-- correlates IRI to multiple CCs + iri [1] OCTET STRING OPTIONAL + -- correlates IRI to CC with signaling +} +IRI-to-IRI-Correlation ::= OCTET STRING -- correlates IRI to IRI + + +GPRSEvent ::= ENUMERATED +{ + pDPContextActivation (1), + startOfInterceptionWithPDPContextActive (2), + pDPContextDeactivation (4), + gPRSAttach (5), + gPRSDetach (6), + locationInfoUpdate (10), + sMS (11), + pDPContextModification (13), + servingSystem (14), + ... , + startOfInterceptionWithMSAttached (15), + packetDataHeaderInformation (16) , hSS-Subscriber-Record-Change (17), + registration-Termination (18), + -- FFS + location-Up-Date (19), + -- FFS + cancel-Location (20), + register-Location (21), + location-Information-Request (22) + +} +-- see [19] + +CSREvent ::= ENUMERATED +{ + cSREventMessage (1), +... +} + +IMSevent ::= ENUMERATED +{ + unfilteredSIPmessage (1), + -- This value indicates to LEMF that the whole SIP message is sent , i.e. without filtering + -- CC; location information is removed by the DF2/MF if not required to be sent. + + ..., + sIPheaderOnly (2), + -- If warrant requires only IRI then specific content in a 'sIPMessage' + -- (e.g. 'Message', etc.) has been deleted before sending it to LEMF. + + decryptionKeysAvailable (3) , + -- This value indicates to LEMF that the IRI carries CC decryption keys for the session + -- under interception. + + startOfInterceptionForIMSEstablishedSession (4) , + -- This value indicates to LEMF that the IRI carries information related to + -- interception started on an already established IMS session. + xCAPRequest (5), + -- This value indicates to LEMF that the XCAP request is sent. + xCAPResponse (6) , + -- This value indicates to LEMF that the XCAP response is sent. + ccUnavailable (7) + -- This value indicates to LEMF that the media is not available for interception for intercept + -- orders that requires media interception. +} + +Current-Previous-Systems ::= SEQUENCE +{ + serving-System-Identifier [1] OCTET STRING OPTIONAL, + -- VPLMN id (Mobile Country Code and Mobile Network Country, E. 212 number [87]). + current-Serving-SGSN-Number [2] OCTET STRING OPTIONAL, + -- E.164 number of the current serving SGSN. + current-Serving-SGSN-Address [3] OCTET STRING OPTIONAL, + -- The IP address of the current serving SGSN or its Diameter Origin-Host and Origin-Realm. + current-Serving-S4-SGSN-Address [4]OCTET STRING OPTIONAL, + -- The Diameter Origin-Host and Origin-Realm of the current serving S4 SGSN. + previous-Serving-System-Identifier [5] OCTET STRING OPTIONAL, + -- VPLMN id (Mobile Country Code and Mobile Network Country, defined in E212 [87]). + previous-Serving-SGSN-Number [6] OCTET STRING OPTIONAL, + -- The E.164 number of the previous serving SGCN. + previous-Serving-SGSN-Address [7] OCTET STRING OPTIONAL, + -- The IP address of the previous serving SGCN or its Diameter Origin-Host and Origin-Realm. + previous-Serving-S4-SGSN-Address [8]OCTET STRING OPTIONAL, + -- The Diameter Origin-Host and Origin-Realm of the previous serving S4 SGSN. +... +} + +Change-Of-Target-Identity ::= SEQUENCE +{ + new-MSISDN [1] PartyInformation OPTIONAL, + -- new MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format document TS 29.002 [4] + old-MSISDN [2] PartyInformation OPTIONAL, + -- new MSISDN of the target, encoded in the same format as the AddressString + -- parameters defined in MAP format document TS 29.002 [4] + new-IMSI [3] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + old-IMSI [4] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Station Identity E.212 number beginning with Mobile Country Code + new-IMEI [5] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Equipement Identity defined in MAP format document TS 29.002 [4] + old-IMEI [6] PartyInformation OPTIONAL, + -- See MAP format [4] International Mobile + -- Equipement Identity defined in MAP format document TS 29.002 [4] +..., + new-IMPI [7] PartyInformation OPTIONAL, + old-IMPI [8] PartyInformation OPTIONAL, + new-SIP-URI [9] PartyInformation OPTIONAL, + old-SIP-URI [10] PartyInformation OPTIONAL, + new-TEL-URI [11] PartyInformation OPTIONAL, + old-TEL-URI [12] PartyInformation OPTIONAL +} + +Requesting-Node-Type ::= ENUMERATED +{ + mSC (1), + sMS-Centre (2), + gMLC (3), + mME (4), + sGSN (5), + ... +} + +Services-Data-Information ::= SEQUENCE +{ + gPRS-parameters [1] GPRS-parameters OPTIONAL, + ... +} + +GPRS-parameters ::= SEQUENCE +{ + pDP-address-allocated-to-the-target [1] DataNodeAddress OPTIONAL, + aPN [2] OCTET STRING (SIZE(1..100)) OPTIONAL, + -- The Access Point Name (APN) is coded in accordance with + -- 3GPP TS 24.008 [9] without the APN IEI (only the last 100 octets are used). + -- Octets are coded according to 3GPP TS 23.003 [25]. + pDP-type [3] OCTET STRING (SIZE(2)) OPTIONAL, + -- Include either Octets 3 and 4 of the Packet Data Protocol Address information element of + -- 3GPP TS 24.008 [9]or Octets 4 and 5 of the End User Address IE of 3GPP TS 29.060 [17]. + + -- when PDP-type is IPv4 or IPv6, the IP address is carried by parameter + -- pDP-address-allocated-to-the-target + -- when PDP-type is IPv4v6, the additional IP address is carried by parameter + -- additionalIPaddress + ..., + nSAPI [4] OCTET STRING (SIZE (1)) OPTIONAL, + -- Include either Octet 2 of the NSAPI IE of 3GPP TS 24.008 [9] or Octet 2 of the NSAPI IE of + -- 3GPP TS 29.060 [17]. + additionalIPaddress [5] DataNodeAddress OPTIONAL +} + +GPRSOperationErrorCode ::= OCTET STRING +-- The parameter shall carry the GMM cause value or the SM cause value, as defined in the +-- standard [9], without the IEI. + + +LDIevent ::= ENUMERATED +{ + targetEntersIA (1), + targetLeavesIA (2), + ... +} + +UmtsQos ::= CHOICE +{ + qosMobileRadio [1] OCTET STRING, + -- The qosMobileRadio parameter shall be coded in accordance with the § 10.5.6.5 of + -- document [9] without the Quality of service IEI and Length of + -- quality of service IE (. That is, first + -- two octets carrying 'Quality of service IEI' and 'Length of quality of service + -- IE' shall be excluded). + qosGn [2] OCTET STRING + -- qosGn parameter shall be coded in accordance with § 7.7.34 of document [17] +} + +MediaDecryption-info ::= SEQUENCE OF CCKeyInfo + -- One or more key can be available for decryption, one for each media streams of the + -- intercepted session. + +CCKeyInfo ::= SEQUENCE +{ + cCCSID [1] OCTET STRING, + -- the parameter uniquely mapping the key to the encrypted stream. + cCDecKey [2] OCTET STRING, + cCSalt [3] OCTET STRING OPTIONAL, + -- The field reports the value from the CS_ID field in the ticket exchange headers as + -- defined in IETF RFC 6043 [61]. + ... +} + +MediaSecFailureIndication ::= ENUMERATED +{ + genericFailure (0), + ... +} + +PacketDataHeaderInformation ::= CHOICE +{ + + packetDataHeader [1] PacketDataHeaderReport, + packetDataSummary [2] PacketDataSummaryReport, +... +} + +PacketDataHeaderReport ::= CHOICE +{ + + packetDataHeaderMapped [1] PacketDataHeaderMapped, + packetDataHeaderCopy [2] PacketDataHeaderCopy, +... +} + +PacketDataHeaderMapped ::= SEQUENCE +{ + sourceIPAddress [1] IPAddress, + sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, + destinationIPAddress [3] IPAddress, + destinationPortNumber [4] INTEGER (0..65535) OPTIONAL, + transportProtocol [5] INTEGER, + -- For IPv4, report the "Protocol" field and for IPv6 report "Next Header" field. + -- Assigned Internet Protocol Numbers can be found at + -- http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml + packetsize [6] INTEGER OPTIONAL, + flowLabel [7] INTEGER OPTIONAL, + packetCount [8] INTEGER OPTIONAL, + direction [9] TPDU-direction, +... +} + + +TPDU-direction ::= ENUMERATED +{ + from-target (1), + to-target (2), + unknown (3) +} + +PacketDataHeaderCopy ::= SEQUENCE +{ + direction [1] TPDU-direction, + headerCopy [2] OCTET STRING, -- includes a copy of the packet header at the IP + -- network layer and above including extension headers, but excluding contents. +... +} + + +PacketDataSummaryReport ::= SEQUENCE OF PacketFlowSummary + +PacketFlowSummary ::= SEQUENCE +{ + + sourceIPAddress [1] IPAddress, + sourcePortNumber [2] INTEGER (0..65535) OPTIONAL, + destinationIPAddress [3] IPAddress, + destinationPortNumber [4] INTEGER (0..65535) OPTIONAL, + transportProtocol [5] INTEGER, + -- For IPv4, report the "Protocol" field and for IPv6 report "Next Header" field. + -- Assigned Internet Protocol Numbers can be found at + -- http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml + flowLabel [6] INTEGER OPTIONAL, + summaryPeriod [7] ReportInterval, + packetCount [8] INTEGER, + sumOfPacketSizes [9] INTEGER, + packetDataSummaryReason [10] ReportReason, +... +} + +ReportReason ::= ENUMERATED +{ + timerExpired (0), + countThresholdHit (1), + pDPComtextDeactivated (2), + pDPContextModification (3), + otherOrUnknown (4), + ... +} + +ReportInterval ::= SEQUENCE +{ + firstPacketTimeStamp [0] TimeStamp, + lastPacketTimeStamp [1] TimeStamp, + ... +} + +-- LALS extended location parameters are mapped from the MLP pos element parameters +-- and attributes defined in [88], version 3.4. For details see specific [88] clauses refered below. +ExtendedLocParameters ::= SEQUENCE +{ + posMethod [0] PrintableString OPTIONAL, -- clause 5.3.72.1 + mapData [1] -- clause 5.2.2.3 + CHOICE {base64Map [0] PrintableString, -- clause 5.3.11 + url [1] PrintableString -- clause 5.3.135 + } OPTIONAL, + altitude [2] + SEQUENCE {alt PrintableString, -- clause 5.3.4 + alt-uncertainty PrintableString OPTIONAL -- clause 5.3.6 + } OPTIONAL, + speed [3] PrintableString OPTIONAL, -- clause 5.3.116 + direction [4] PrintableString OPTIONAL, -- clause 5.3.25 + level-conf [5] PrintableString OPTIONAL, -- clause 5.3.51 + qOS-not-met [6] BOOLEAN OPTIONAL, -- clause 5.3.94 + motionStateList [7] -- clause 5.2.2.3 + SEQUENCE {primaryMotionState [0] PrintableString, -- clause 5.3.23 + secondaryMotionState [1] SEQUENCE OF PrintableString OPTIONAL, + confidence [2] PrintableString -- clause 5.3.68 + } OPTIONAL, + floor [8] + SEQUENCE {floor-number PrintableString, -- clause 5.3.38 + floor-number-uncertainty PrintableString OPTIONAL + -- clause 5.3.39 + } OPTIONAL, + additional-info [9] PrintableString OPTIONAL, -- clause 5.3.1 + +-- The following parameter contains a copy of the unparsed XML code of +-- MLP response message, i.e. the entire XML document containing +-- a (described in [88], clause 5.2.3.2.2) or +-- a (described in [88], clause 5.2.3.2.3) MLP message. +-- This parameter is present when the LI-LCS client cannot fully map +-- the MLP response message into an ASN.1 Location object. + + lALS-rawMLPPosData [10] UTF8String OPTIONAL, + + ... +} + +LocationErrorCode ::= INTEGER (1..699) +-- LALS location error codes are the OMA MLP result identifiers defined in [88], Clause 5.4 + +PTCEncryptionInfo ::= SEQUENCE { + + cipher [1] UTF8String, + cryptoContext [2] UTF8String OPTIONAL, + key [3] UTF8String, + keyEncoding [4] UTF8String, + salt [5] UTF8String OPTIONAL, + pTCOther [6] UTF8String OPTIONAL, + ... +} + +PTC ::= SEQUENCE { + abandonCause [1] UTF8String OPTIONAL, + accessPolicyFailure [2] UTF8String OPTIONAL, + accessPolicyType [3] AccessPolicyType OPTIONAL, + alertIndicator [5] AlertIndicator OPTIONAL, + associatePresenceStatus [6] AssociatePresenceStatus OPTIONAL, + bearer-capability [7] UTF8String OPTIONAL, + -- identifies the Bearer capability information element (value part) + broadcastIndicator [8] BOOLEAN OPTIONAL, + -- default False, true indicates this is a braodcast to a group + contactID [9] UTF8String OPTIONAL, + emergency [10] Emergency OPTIONAL, + emergencyGroupState [11] EmergencyGroupState OPTIONAL, + timeStamp [12] TimeStamp, + pTCType [13] PTCType OPTIONAL, + failureCode [14] UTF8String OPTIONAL, + floorActivity [15] FloorActivity OPTIONAL, + floorSpeakerID [16] PTCAddress OPTIONAL, + groupAdSender [17] UTF8String OPTIONAL, + -- Identifies the group administrator who was the originator of the group call. + -- tag [18] was used in r15 (15) version-4 (4) + groupAuthRule [19] GroupAuthRule OPTIONAL, + groupCharacteristics [20] UTF8String OPTIONAL, + holdRetrieveInd [21] BOOLEAN OPTIONAL, + -- true indicates target is placed on hold, false indicates target was retrived from hold. + -- tag [22] was used in r15 (15) version-4 (4) + imminentPerilInd [23] ImminentPerilInd OPTIONAL, + implicitFloorReq [24] ImplicitFloorReq OPTIONAL, + initiationCause [25] InitiationCause OPTIONAL, + invitationCause [26] UTF8String OPTIONAL, + iPAPartyID [27] UTF8String OPTIONAL, + iPADirection [28] IPADirection OPTIONAL, + listManagementAction [29] ListManagementAction OPTIONAL, + listManagementFailure [30] UTF8String OPTIONAL, + listManagementType [31] ListManagementType OPTIONAL, + maxTBTime [32] UTF8String OPTIONAL, -- defined in seconds. + mCPTTGroupID [33] UTF8String OPTIONAL, + mCPTTID [34] UTF8String OPTIONAL, + mCPTTInd [35] BOOLEAN OPTIONAL, + -- default False indicates to associate from target, true indicates to the target. + location [36] Location OPTIONAL, + mCPTTOrganizationName [37] UTF8String OPTIONAL, + mediaStreamAvail [38] BOOLEAN OPTIONAL, + -- True indicates available for media, false indicates not able to accept media. + priority-Level [40] Priority-Level OPTIONAL, + preEstSessionID [41] UTF8String OPTIONAL, + preEstStatus [42] PreEstStatus OPTIONAL, + pTCGroupID [43] UTF8String OPTIONAL, + pTCIDList [44] UTF8String OPTIONAL, + pTCMediaCapability [45] UTF8String OPTIONAL, + pTCOriginatingId [46] UTF8String OPTIONAL, + pTCOther [47] UTF8String OPTIONAL, + pTCParticipants [48] UTF8String OPTIONAL, + pTCParty [49] UTF8String OPTIONAL, + pTCPartyDrop [50] UTF8String OPTIONAL, + pTCSessionInfo [51] UTF8String OPTIONAL, + pTCServerURI [52] UTF8String OPTIONAL, + pTCUserAccessPolicy [53] UTF8String OPTIONAL, + pTCAddress [54] PTCAddress OPTIONAL, + queuedFloorControl [55] BOOLEAN OPTIONAL, + --Default FALSE,send TRUE if Queued floor control is used. + queuedPosition [56] UTF8String OPTIONAL, + -- indicates the queued position of the Speaker (Target or associate) who has the + -- right to speak. + registrationRequest [57] RegistrationRequest OPTIONAL, + registrationOutcome [58] RegistrationOutcome OPTIONAL, + retrieveID [59] UTF8String OPTIONAL, + rTPSetting [60] RTPSetting OPTIONAL, + talkBurstPriority [61] Priority-Level OPTIONAL, + talkBurstReason [62] Talk-burst-reason-code OPTIONAL, + -- Talk-burst-reason-code Defined according to the rules and procedures + -- in (OMA-PoC-AD [97]) + talkburstControlSetting [63] TalkburstControlSetting OPTIONAL, + targetPresenceStatus [64] UTF8String OPTIONAL, + port-Number [65] INTEGER (0..65535) OPTIONAL, + ... +} + +AccessPolicyType ::= SEQUENCE +{ + userAccessPolicyAttempt [1] BOOLEAN, + -- default False, true indicates Target has accessed. + groupAuthorizationRulesAttempt [2] BOOLEAN, + -- default False, true indicates Target has accessed. + userAccessPolicyQuery [3] BOOLEAN, + -- default False, true indicates Target has accessed. + groupAuthorizationRulesQuery [4] BOOLEAN, + -- default False, true indicates Target has accessed. + userAccessPolicyResult [5] UTF8String, + groupAuthorizationRulesResult [6] UTF8String, + ... +} + +AlertIndicator ::= ENUMERATED +{ + -- indicates the group call alert condition. + sent (1), + received (2), + cancelled (3), + ... + } + +AssociatePresenceStatus ::= SEQUENCE +{ + presenceID [1] UTF8String, + -- identity of PTC Client(s)or the PTC group + presenceType [2] PresenceType, + presenceStatus [3] BOOLEAN, + -- default false, true indicates connected. +... +} + +PresenceType ::= ENUMERATED +{ + pTCClient (1), + pTCGroup (2), + -- identifies the type of presenceID given [PTC Client(s) or PTC group]. + ... +} + +Emergency ::= ENUMERATED +{ + -- MCPTT services indication of peril condition. + imminent (1), + peril (2), + cancel (3), + ... +} + +EmergencyGroupState ::= SEQUENCE +{ + -- indicates the state of the call, at least one of these information + -- elements shall be present. + clientEmergencyState [1] ENUMERATED +{ + -- in case of MCPTT call, indicates the response for the client + inform (1), + response (2), + cancelInform (3), + cancelResponse (4), + ... +} OPTIONAL, + groupEmergencyState [2] ENUMERATED +{ + -- in case of MCPTT group call, indicates if there is a group emergency or + -- a response from the Target to indicate current Client state of emergency. + inForm (1), + reSponse (2), + cancelInform (3), + cancelResponse (4), + ... + }, + ... +} + + +PTCType ::= ENUMERATED +{ + pTCStartofInterception (1), + pTCServinSystem (2), + pTCSessionInitiation (3), + pTCSessionAbandonEndRecord (4), + pTCSessionStartContinueRecord (5), + pTCSessionEndRecord (6), + pTCPre-EstablishedSessionSessionRecord (7), + pTCInstantPersonalAlert (8), + pTCPartyJoin (9), + pTCPartyDrop (10), + pTCPartyHold-RetrieveRecord (11), + pTCMediaModification (12), + pTCGroupAdvertizement (13), + pTCFloorConttrol (14), + pTCTargetPressence (15), + pTCAssociatePressence (16), + pTCListManagementEvents (17), + pTCAccessPolicyEvents (18), + pTCMediaTypeNotification (19), + pTCGroupCallRequest (20), + pTCGroupCallCancel (21), + pTCGroupCallResponse (22), + pTCGroupCallInterrogate (23), + pTCMCPTTImminentGroupCall (24), + pTCCC (25), + pTCRegistration (26), + pTCEncryption (27), + ... +} + +FloorActivity ::= SEQUENCE +{ + tBCP-Request [1] BOOLEAN, + -- default False, true indicates Granted. + tBCP-Granted [2] BOOLEAN, + -- default False, true indicates Granted permission to talk. + tBCP-Deny [3] BOOLEAN, + -- default True, False indicates permission granted. + tBCP-Queued [4] BOOLEAN, + -- default False, true indicates the request to talk is in queue. + tBCP-Release [5] BOOLEAN, + -- default True, true indicates the Request to talk is completed, + -- False indicates PTC Client has the request to talk. + tBCP-Revoke [6] BOOLEAN, + -- default False, true indicates the privilege to talk is canceld from the + -- PTC server. + tBCP-Taken [7] BOOLEAN, + -- default True, false indicates another PTC Client has the permission to talk. + tBCP-Idle [8] BOOLEAN, + -- default True, False indicates the Talk Burst Protocol is taken. +... +} + +GroupAuthRule ::= ENUMERATED +{ + allow-Initiating-PtcSession (0), + block-Initiating-PtcSession (1), + allow-Joining-PtcSession (2), + block-Joining-PtcSession (3), + allow-Add-Participants (4), + block-Add-Participants (5), + allow-Subscription-PtcSession-State (6), + block-Subscription-PtcSession-State (7), + allow-Anonymity (8), + forbid-Anonymity (9), +... +} + +ImminentPerilInd ::= ENUMERATED +{ + request (1), + response (2), + cancel (3), + -- when the MCPTT Imminent Peril Group Call Request, Response or Cancel is detected +... +} + +ImplicitFloorReq ::= ENUMERATED +{ + join (1), + rejoin (2), + release (3), + -- group Call request to join, rejoin, or release of the group call +... +} + +InitiationCause ::= ENUMERATED +{ + requests (1), + received (2), + pTCOriginatingId (3), + -- requests or receives a session initiation from the network or another + -- party to initiate a PTC session. Identify the originating PTC party, if known. +... +} + +IPADirection ::= ENUMERATED +{ + toTarget (0), + fromTarget (1), +... +} + +ListManagementAction ::= ENUMERATED +{ + create (1), + modify (2), + retrieve (3), + delete (4), + notify (5), +... +} + + +ListManagementType ::= ENUMERATED +{ + contactListManagementAttempt (1), + groupListManagementAttempt (2), + contactListManagementResult (3), + groupListManagementResult (4), + requestSuccessful (5), +... +} + +Priority-Level ::= ENUMERATED +{ + pre-emptive (0), + high-priority (1), + normal-priority (2), + listen-only (3), +... +} + +PreEstStatus ::= ENUMERATED +{ + established (1), + modify (2), + released (3), +... +} + +PTCAddress ::= SEQUENCE +{ + uri [0] UTF8String, + -- The set of URIs defined in [RFC3261] and related SIP RFCs. + privacy-setting [1] BOOLEAN, + -- Default FALSE, send TRUE if privacy is used. + privacy-alias [2] VisibleString OPTIONAL, + -- if privacy is used, the PTC Server creates an anonymous PTC Address of the form + -- . In addition to anonymity, the anonymous PTC + -- Addresses SHALL be unique within a PTC Session. In case more than one anonymous + -- PTC Addresses are used in the same PTC Session, for the second Anonymous PTC + -- Session and thereafter, the PTC Server SHOULD use the form + -- sip:anonymous-n@anonymous.invalid where n is an integer number. + nickname [3] UTF8String OPTIONAL, +... +} + + +RegistrationRequest ::= ENUMERATED +{ + register (1), + re-register (2), + de-register (3), +... +} + +RegistrationOutcome ::= ENUMERATED +{ + success (0), + failure (1), +... +} + +RTPSetting ::= SEQUENCE +{ + ip-address [0] IPAddress, + port-number [1] Port-Number, + -- the IP address and port number at the PTC Server for the RTP Session +... +} + +Port-Number ::= INTEGER (0..65535) + + +TalkburstControlSetting ::= SEQUENCE +{ + talk-BurstControlProtocol [1] UTF8String, + talk-Burst-parameters [2] SET OF VisibleString, + -- selected by the PTC Server from those contained in the original SDP offer in the + -- incoming SIP INVITE request from the PTC Client + tBCP-PortNumber [3] INTEGER (0..65535), + -- PTC Server's port number to be used for the Talk Burst Control Protocol + ... +} + +Talk-burst-reason-code ::= VisibleString + + +END -- OF UmtsHI2Operations diff --git a/testing/deps/33108/UMTSHI3PS.asn b/testing/deps/33108/UMTSHI3PS.asn new file mode 100644 index 0000000..d3859bb --- /dev/null +++ b/testing/deps/33108/UMTSHI3PS.asn @@ -0,0 +1,95 @@ +Umts-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2) r7(7) version-0(0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + +GPRSCorrelationNumber + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r7(7) version-2(2)} -- Imported from TS 33.108v7.2.0 + +LawfulInterceptionIdentifier, + +TimeStamp + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version9(9)}; -- from ETSI HI2Operations TS 101 671v2.13.1 + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi3DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3(2) r7(7) version-0(0)} + +CC-PDU ::= SEQUENCE +{ + uLIC-header [1] ULIC-header, + payload [2] OCTET STRING +} + +ULIC-header ::= SEQUENCE +{ + hi3DomainId [0] OBJECT IDENTIFIER, -- 3GPP HI3 Domain + version [1] Version, + lIID [2] LawfulInterceptionIdentifier OPTIONAL, + correlation-Number [3] GPRSCorrelationNumber, + timeStamp [4] TimeStamp OPTIONAL, + sequence-number [5] INTEGER (0..65535), + t-PDU-direction [6] TPDU-direction, + ..., + national-HI3-ASN1parameters [7] National-HI3-ASN1parameters OPTIONAL, + -- encoded per national requirements + ice-type [8] ICE-type OPTIONAL + -- The ICE-type indicates the applicable Intercepting Control Element(see ref [19]) in which + -- the T-PDU is intercepted. +} + +Version ::= ENUMERATED +{ + version1(1), + ..., + version3(3) , + -- versions 4-7 were omitted to align with UmtsHI2Operations. + lastVersion(8) + -- Mandatory parameter "version" (tag 1) was always redundant in 33.108, because + -- the object identifier "hi3DomainId" was introduced into "ULIC-headerV in the initial + -- version of 33.108v5.0.0 In order to keep backward compatibility, even when the + -- version of the "hi3DomainId" parameter will be incremented it is recommended to + -- always send to LEMF the same: enumeration value "lastVersion(8)". +} + +TPDU-direction ::= ENUMERATED +{ + from-target (1), + to-target (2), + unknown (3) +} + +National-HI3-ASN1parameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [39], + -- the country to which the parameters inserted after the extension marker apply + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...). + -- It is recommended that "version parameter" and "vendor identification parameter" are + -- included in the national parameters definition. Vendor identifications can be + -- retrieved from IANA web site. It is recommended to avoid + -- using tags from 240 to 255 in a formal type definition. +} + +ICE-type ::= ENUMERATED +{ + sgsn (1), + ggsn (2), + ... +} + +END -- OF Umts-HI3-PS diff --git a/testing/deps/33108/VoipHI3IMS.asn b/testing/deps/33108/VoipHI3IMS.asn new file mode 100644 index 0000000..caccd99 --- /dev/null +++ b/testing/deps/33108/VoipHI3IMS.asn @@ -0,0 +1,110 @@ +VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r15 (15) version-1 (1)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + +LawfulInterceptionIdentifier, +TimeStamp, +Network-Identifier + 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 + + +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)}; + + +-- Object Identifier Definitions + +-- Security DomainId +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) +securityDomain(2) lawfulIntercept(2)} + +-- Security Subdomains +threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)} +hi3voipDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3voip(12) r15 (15) version-1 (1)} + +Voip-CC-PDU ::= SEQUENCE +{ + voipLIC-header [1] VoipLIC-header, + payload [2] OCTET STRING +} + +VoipLIC-header ::= SEQUENCE +{ + hi3voipDomainId [0] OBJECT IDENTIFIER, -- 3GPP VoIP HI3 Domain + lIID [2] LawfulInterceptionIdentifier OPTIONAL, + 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 + -- IRI [HI2]; For PTC, contains the same contents as the cc parameter + -- contained within an IRI-to-CC-Correlation parameter which is + -- contained in the CorrelationValues parameter in the IRI [HI2] + + timeStamp [4] TimeStamp OPTIONAL, + sequence-number [5] INTEGER (0..65535), + t-PDU-direction [6] TPDU-direction, + national-HI3-ASN1parameters [7] National-HI3-ASN1parameters OPTIONAL, + -- encoded per national requirements + ice-type [8] ICE-type OPTIONAL, + -- The ICE-type indicates the applicable Intercepting Control Element in which + -- the VoIP CC is intercepted. + ..., + payload-description [9] Payload-description OPTIONAL, + -- 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, + -- Mandatory when used for PTC + -- Identifies the network element that is reporting the CC + pTCSessionInfo [11] UTF8String OPTIONAL + -- Mandatory when used for PTC + -- Identifies the PTC Session. Together with the 'voipCorrelationNumber', uniquely + -- identifies a specific PTC talk burst. +} + +VoipCorrelationNumber ::= OCTET STRING + +TPDU-direction ::= ENUMERATED +{ + from-target (1), + to-target (2), + combined (3), -- Indicates that combined CC (i.e., from/to-target)delivery is used. + unknown (4) +} + +ICE-type ::= ENUMERATED { + ggsn (1), + pDN-GW (2), + aGW (3), + trGW (4), + mGW (5), + other (6), + 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 + mediaAttributes [3] OCTET STRING OPTIONAL + -- as defined in RFC 4566 [94] + -- used with IP-based delivery for CS + +} + +END -- OF VoIP-HI3-IMS diff --git a/testing/deps/33128/TS33128Payloads.asn b/testing/deps/33128/TS33128Payloads.asn new file mode 100644 index 0000000..5867cdf --- /dev/null +++ b/testing/deps/33128/TS33128Payloads.asn @@ -0,0 +1,1340 @@ +TS33128Payloads +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version2(2)} + +DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= + +BEGIN + +-- ============= +-- Relative OIDs +-- ============= + +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version2(2)} + +xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} +xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} +iRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID iRI(3)} +cCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID cC(4)} +lINotificationPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID lINotification(5)} + +-- =============== +-- X2 xIRI payload +-- =============== + +XIRIPayload ::= SEQUENCE +{ + xIRIPayloadOID [1] RELATIVE-OID, + event [2] XIRIEvent +} + +XIRIEvent ::= CHOICE +{ + -- Access and mobility related events, see clause 6.2.2 + registration [1] AMFRegistration, + deregistration [2] AMFDeregistration, + locationUpdate [3] AMFLocationUpdate, + startOfInterceptionWithRegisteredUE [4] AMFStartOfInterceptionWithRegisteredUE, + unsuccessfulAMProcedure [5] AMFUnsuccessfulProcedure, + + -- PDU session-related events, see clause 6.2.3 + pDUSessionEstablishment [6] SMFPDUSessionEstablishment, + pDUSessionModification [7] SMFPDUSessionModification, + pDUSessionRelease [8] SMFPDUSessionRelease, + startOfInterceptionWithEstablishedPDUSession [9] SMFStartOfInterceptionWithEstablishedPDUSession, + unsuccessfulSMProcedure [10] SMFUnsuccessfulProcedure, + + -- Subscriber-management related events, see clause 7.2.2 + servingSystemMessage [11] UDMServingSystemMessage, + + -- SMS-related events, see clause 6.2.5 + sMSMessage [12] SMSMessage, + + -- LALS-related events, see clause 7.3.3 + lALSReport [13] LALSReport, + + -- PDHR/PDSR-related events, see clause 6.2.3.4.1 + pDHeaderReport [14] PDHeaderReport, + pDSummaryReport [15] PDSummaryReport +} + +-- ============== +-- X3 xCC payload +-- ============== + +-- No explicit payload required in release 15, see clause 6.2.3.5 + +-- =============== +-- HI2 IRI payload +-- =============== + +IRIPayload ::= SEQUENCE +{ + iRIPayloadOID [1] RELATIVE-OID, + event [2] IRIEvent, + targetIdentifiers [3] SEQUENCE OF IRITargetIdentifier OPTIONAL +} + +IRIEvent ::= CHOICE +{ + -- Registration-related events, see clause 6.2.2 + registration [1] AMFRegistration, + deregistration [2] AMFDeregistration, + locationUpdate [3] AMFLocationUpdate, + startOfInterceptionWithRegisteredUE [4] AMFStartOfInterceptionWithRegisteredUE, + unsuccessfulRegistrationProcedure [5] AMFUnsuccessfulProcedure, + + -- PDU session-related events, see clause 6.2.3 + pDUSessionEstablishment [6] SMFPDUSessionEstablishment, + pDUSessionModification [7] SMFPDUSessionModification, + pDUSessionRelease [8] SMFPDUSessionRelease, + startOfInterceptionWithEstablishedPDUSession [9] SMFStartOfInterceptionWithEstablishedPDUSession, + unsuccessfulSessionProcedure [10] SMFUnsuccessfulProcedure, + + -- Subscriber-management related events, see clause 7.2.2 + servingSystemMessage [11] UDMServingSystemMessage, + + -- SMS-related events, see clause 6.2.5 + sMSMessage [12] SMSMessage, + + -- LALS-related events, see clause 7.3.3 + lALSReport [13] LALSReport, + + -- PDHR/PDSR-related events, see clause 6.2.3.4.1 + pDHeaderReport [14] PDHeaderReport, + pDSummaryReport [15] PDSummaryReport, + + -- MDF-related events, see clause 7.3.4 + mDFCellSiteReport [16] MDFCellSiteReport +} + +IRITargetIdentifier ::= SEQUENCE +{ + identifier [1] TargetIdentifier, + provenance [2] TargetIdentifierProvenance OPTIONAL +} + +-- ============== +-- HI3 CC payload +-- ============== + +CCPayload ::= SEQUENCE +{ + cCPayloadOID [1] RELATIVE-OID, + pDU [2] CCPDU +} + +CCPDU ::= CHOICE +{ + uPFCCPDU [1] UPFCCPDU +} + +-- =========================== +-- HI4 LI notification payload +-- =========================== + +LINotificationPayload ::= SEQUENCE +{ + lINotificationPayloadOID [1] RELATIVE-OID, + notification [2] LINotificationMessage +} + +LINotificationMessage ::= CHOICE +{ + lINotification [1] LINotification +} + +-- ================== +-- 5G AMF definitions +-- ================== + +-- See clause 6.2.2.2.2 for details of this structure +AMFRegistration ::= SEQUENCE +{ + registrationType [1] AMFRegistrationType, + registrationResult [2] AMFRegistrationResult, + slice [3] Slice OPTIONAL, + sUPI [4] SUPI, + sUCI [5] SUCI OPTIONAL, + pEI [6] PEI OPTIONAL, + gPSI [7] GPSI OPTIONAL, + gUTI [8] FiveGGUTI, + location [9] Location OPTIONAL, + non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL +} + +-- See clause 6.2.2.2.3 for details of this structure +AMFDeregistration ::= SEQUENCE +{ + deregistrationDirection [1] AMFDirection, + accessType [2] AccessType, + sUPI [3] SUPI OPTIONAL, + sUCI [4] SUCI OPTIONAL, + pEI [5] PEI OPTIONAL, + gPSI [6] GPSI OPTIONAL, + gUTI [7] FiveGGUTI OPTIONAL, + cause [8] FiveGMMCause OPTIONAL, + location [9] Location OPTIONAL +} + +-- See clause 6.2.2.2.4 for details of this structure +AMFLocationUpdate ::= SEQUENCE +{ + sUPI [1] SUPI, + sUCI [2] SUCI OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + gUTI [5] FiveGGUTI OPTIONAL, + location [6] Location +} + +-- See clause 6.2.2.2.5 for details of this structure +AMFStartOfInterceptionWithRegisteredUE ::= SEQUENCE +{ + registrationResult [1] AMFRegistrationResult, + registrationType [2] AMFRegistrationType OPTIONAL, + slice [3] Slice OPTIONAL, + sUPI [4] SUPI, + sUCI [5] SUCI OPTIONAL, + pEI [6] PEI OPTIONAL, + gPSI [7] GPSI OPTIONAL, + gUTI [8] FiveGGUTI, + location [9] Location OPTIONAL, + non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, + timeOfRegistration [11] Timestamp OPTIONAL +} + +-- See clause 6.2.2.2.6 for details of this structure +AMFUnsuccessfulProcedure ::= SEQUENCE +{ + failedProcedureType [1] AMFFailedProcedureType, + failureCause [2] AMFFailureCause, + requestedSlice [3] NSSAI OPTIONAL, + sUPI [4] SUPI OPTIONAL, + sUCI [5] SUCI OPTIONAL, + pEI [6] PEI OPTIONAL, + gPSI [7] GPSI OPTIONAL, + gUTI [8] FiveGGUTI OPTIONAL, + location [9] Location OPTIONAL +} + +-- ================= +-- 5G AMF parameters +-- ================= + +AMFID ::= SEQUENCE +{ + aMFRegionID [1] AMFRegionID, + aMFSetID [2] AMFSetID, + aMFPointer [3] AMFPointer +} + +AMFDirection ::= ENUMERATED +{ + networkInitiated(1), + uEInitiated(2) +} + +AMFFailedProcedureType ::= ENUMERATED +{ + registration(1), + sMS(2), + pDUSessionEstablishment(3) +} + +AMFFailureCause ::= CHOICE +{ + fiveGMMCause [1] FiveGMMCause, + fiveGSMCause [2] FiveGSMCause +} + +AMFPointer ::= INTEGER (0..63) + +AMFRegistrationResult ::= ENUMERATED +{ + threeGPPAccess(1), + nonThreeGPPAccess(2), + threeGPPAndNonThreeGPPAccess(3) +} + +AMFRegionID ::= INTEGER (0..255) + +AMFRegistrationType ::= ENUMERATED +{ + initial(1), + mobility(2), + periodic(3), + emergency(4) +} + +AMFSetID ::= INTEGER (0..1023) + +-- ================== +-- 5G SMF definitions +-- ================== + +-- See clause 6.2.3.2.2 for details of this structure +SMFPDUSessionEstablishment ::= SEQUENCE +{ + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + gTPTunnelID [6] FTEID, + pDUSessionType [7] PDUSessionType, + sNSSAI [8] SNSSAI OPTIONAL, + uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, + non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, + location [11] Location OPTIONAL, + dNN [12] DNN, + aMFID [13] AMFID OPTIONAL, + hSMFURI [14] HSMFURI OPTIONAL, + requestType [15] FiveGSMRequestType, + accessType [16] AccessType OPTIONAL, + rATType [17] RATType OPTIONAL, + sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL +} + +-- See clause 6.2.3.2.3 for details of this structure +SMFPDUSessionModification ::= SEQUENCE +{ + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + sNSSAI [5] SNSSAI OPTIONAL, + non3GPPAccessEndpoint [6] UEEndpointAddress OPTIONAL, + location [7] Location OPTIONAL, + requestType [8] FiveGSMRequestType, + accessType [9] AccessType OPTIONAL, + rATType [10] RATType OPTIONAL +} + +-- See clause 6.2.3.2.4 for details of this structure +SMFPDUSessionRelease ::= SEQUENCE +{ + sUPI [1] SUPI, + pEI [2] PEI OPTIONAL, + gPSI [3] GPSI OPTIONAL, + pDUSessionID [4] PDUSessionID, + timeOfFirstPacket [5] Timestamp OPTIONAL, + timeOfLastPacket [6] Timestamp OPTIONAL, + uplinkVolume [7] INTEGER OPTIONAL, + downlinkVolume [8] INTEGER OPTIONAL, + location [9] Location OPTIONAL +} + +-- See clause 6.2.3.2.5 for details of this structure +SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE +{ + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + gTPTunnelID [6] FTEID, + pDUSessionType [7] PDUSessionType, + sNSSAI [8] SNSSAI OPTIONAL, + uEEndpoint [9] SEQUENCE OF UEEndpointAddress, + non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, + location [11] Location OPTIONAL, + dNN [12] DNN, + aMFID [13] AMFID OPTIONAL, + hSMFURI [14] HSMFURI OPTIONAL, + requestType [15] FiveGSMRequestType, + accessType [16] AccessType OPTIONAL, + rATType [17] RATType OPTIONAL, + sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL +} + +-- See clause 6.2.3.2.6 for details of this structure +SMFUnsuccessfulProcedure ::= SEQUENCE +{ + failedProcedureType [1] SMFFailedProcedureType, + failureCause [2] FiveGSMCause, + initiator [3] Initiator, + requestedSlice [4] NSSAI OPTIONAL, + sUPI [5] SUPI OPTIONAL, + sUPIUnauthenticated [6] SUPIUnauthenticatedIndication OPTIONAL, + pEI [7] PEI OPTIONAL, + gPSI [8] GPSI OPTIONAL, + pDUSessionID [9] PDUSessionID OPTIONAL, + uEEndpoint [10] SEQUENCE OF UEEndpointAddress OPTIONAL, + non3GPPAccessEndpoint [11] UEEndpointAddress OPTIONAL, + dNN [12] DNN OPTIONAL, + aMFID [13] AMFID OPTIONAL, + hSMFURI [14] HSMFURI OPTIONAL, + requestType [15] FiveGSMRequestType OPTIONAL, + accessType [16] AccessType OPTIONAL, + rATType [17] RATType OPTIONAL, + sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, + location [19] Location OPTIONAL +} + +-- ================= +-- 5G SMF parameters +-- ================= + +SMFFailedProcedureType ::= ENUMERATED +{ + pDUSessionEstablishment(1), + pDUSessionModification(2), + pDUSessionRelease(3) +} + +-- ================= +-- 5G UPF parameters +-- ================= + +UPFCCPDU ::= OCTET STRING + +-- ================== +-- 5G UDM definitions +-- ================== + +UDMServingSystemMessage ::= SEQUENCE +{ + sUPI [1] SUPI, + pEI [2] PEI OPTIONAL, + gPSI [3] GPSI OPTIONAL, + gUAMI [4] GUAMI OPTIONAL, + gUMMEI [5] GUMMEI OPTIONAL, + pLMNID [6] PLMNID OPTIONAL, + servingSystemMethod [7] UDMServingSystemMethod +} + +-- ================= +-- 5G UDM parameters +-- ================= + +UDMServingSystemMethod ::= ENUMERATED +{ + amf3GPPAccessRegistration(0), + amfNon3GPPAccessRegistration(1), + unknown(2) +} + +-- =================== +-- 5G SMSF definitions +-- =================== + +-- See clause 6.2.5.3 for details of this structure +SMSMessage ::= SEQUENCE +{ + originatingSMSParty [1] SMSParty, + terminatingSMSParty [2] SMSParty, + direction [3] Direction, + transferStatus [4] SMSTransferStatus, + otherMessage [5] SMSOtherMessageIndication OPTIONAL, + location [6] Location OPTIONAL, + peerNFAddress [7] SMSNFAddress OPTIONAL, + peerNFType [8] SMSNFType OPTIONAL, + sMSTPDUData [9] SMSTPDUData OPTIONAL +} + +-- ================== +-- 5G SMSF parameters +-- ================== + +SMSParty ::= SEQUENCE +{ + sUPI [1] SUPI OPTIONAL, + pEI [2] PEI OPTIONAL, + gPSI [3] GPSI OPTIONAL +} + + +SMSTransferStatus ::= ENUMERATED +{ + transferSucceeded(1), + transferFailed(2), + undefined(3) +} + +SMSOtherMessageIndication ::= BOOLEAN + +SMSNFAddress ::= CHOICE +{ + iPAddress [1] IPAddress, + e164Number [2] E164Number +} + +SMSNFType ::= ENUMERATED +{ + sMSGMSC(1), + iWMSC(2), + sMSRouter(3) +} + +SMSTPDUData ::= CHOICE +{ + sMSTPDU [1] SMSTPDU +} + +SMSTPDU ::= OCTET STRING (SIZE(1..270)) + +-- =================== +-- 5G LALS definitions +-- =================== + +LALSReport ::= SEQUENCE +{ + sUPI [1] SUPI OPTIONAL, + pEI [2] PEI OPTIONAL, + gPSI [3] GPSI OPTIONAL, + location [4] Location OPTIONAL +} + +-- ===================== +-- PDHR/PDSR definitions +-- ===================== + +PDHeaderReport ::= SEQUENCE +{ + pDUSessionID [1] PDUSessionID, + sourceIPAddress [2] IPAddress, + sourcePort [3] PortNumber OPTIONAL, + destinationIPAddress [4] IPAddress, + destinationPort [5] PortNumber OPTIONAL, + nextLayerProtocol [6] NextLayerProtocol, + iPv6flowLabel [7] IPv6FlowLabel OPTIONAL, + direction [8] Direction, + packetSize [9] INTEGER +} + +PDSummaryReport ::= SEQUENCE +{ + pDUSessionID [1] PDUSessionID, + sourceIPAddress [2] IPAddress, + sourcePort [3] PortNumber OPTIONAL, + destinationIPAddress [4] IPAddress, + destinationPort [5] PortNumber OPTIONAL, + nextLayerProtocol [6] NextLayerProtocol, + iPv6flowLabel [7] IPv6FlowLabel OPTIONAL, + direction [8] Direction, + pDSRSummaryTrigger [9] PDSRSummaryTrigger, + firstPacketTimestamp [10] Timestamp, + lastPacketTimestamp [11] Timestamp, + packetCount [12] INTEGER, + byteCount [13] INTEGER +} + +-- ==================== +-- PDHR/PDSR parameters +-- ==================== + +PDSRSummaryTrigger ::= ENUMERATED +{ + timerExpiry(1), + packetCount(2), + byteCount(3) +} + +-- =========================== +-- LI Notification definitions +-- =========================== + +LINotification ::= SEQUENCE +{ + notificationType [1] LINotificationType, + appliedTargetID [2] TargetIdentifier OPTIONAL, + appliedDeliveryInformation [3] SEQUENCE OF LIAppliedDeliveryInformation OPTIONAL, + appliedStartTime [4] Timestamp OPTIONAL, + appliedEndTime [5] Timestamp OPTIONAL +} + +-- ========================== +-- LI Notification parameters +-- ========================== + +LINotificationType ::= ENUMERATED +{ + activation(1), + deactivation(2), + modification(3) +} + +LIAppliedDeliveryInformation ::= SEQUENCE +{ + hI2DeliveryIPAddress [1] IPAddress OPTIONAL, + hI2DeliveryPortNumber [2] PortNumber OPTIONAL, + hI3DeliveryIPAddress [3] IPAddress OPTIONAL, + hI3DeliveryPortNumber [4] PortNumber OPTIONAL +} + +-- =============== +-- MDF definitions +-- =============== + +MDFCellSiteReport ::= SEQUENCE OF CellInformation + +-- ================= +-- Common Parameters +-- ================= + +AccessType ::= ENUMERATED +{ + threeGPPAccess(1), + nonThreeGPPAccess(2), + threeGPPandNonThreeGPPAccess(3) +} + +Direction ::= ENUMERATED +{ + fromTarget(1), + toTarget(2) +} + +DNN ::= UTF8String + +E164Number ::= NumericString (SIZE(1..15)) + +FiveGGUTI ::= SEQUENCE +{ + mCC [1] MCC, + mNC [2] MNC, + aMFRegionID [3] AMFRegionID, + aMFSetID [4] AMFSetID, + aMFPointer [5] AMFPointer, + fiveGTMSI [6] FiveGTMSI +} + +FiveGMMCause ::= INTEGER (0..255) + +FiveGSMRequestType ::= ENUMERATED +{ + initialRequest(1), + existingPDUSession(2), + initialEmergencyRequest(3), + existingEmergencyPDUSession(4), + modificationRequest(5), + reserved(6), + mAPDURequest(7) +} + +FiveGSMCause ::= INTEGER (0..255) + +FiveGTMSI ::= INTEGER (0..4294967295) + +FTEID ::= SEQUENCE +{ + tEID [1] INTEGER (0.. 4294967295), + iPv4Address [2] IPv4Address OPTIONAL, + iPv6Address [3] IPv6Address OPTIONAL +} + +GPSI ::= CHOICE +{ + mSISDN [1] MSISDN, + nAI [2] NAI +} + +GUAMI ::= SEQUENCE +{ + aMFID [1] AMFID, + pLMNID [2] PLMNID +} + +GUMMEI ::= SEQUENCE +{ + mMEID [1] MMEID, + mCC [2] MCC, + mNC [3] MNC +} + +HomeNetworkPublicKeyID ::= OCTET STRING + +HSMFURI ::= UTF8String + +IMEI ::= NumericString (SIZE(14)) + +IMEISV ::= NumericString (SIZE(16)) + +IMSI ::= NumericString (SIZE(6..15)) + +Initiator ::= ENUMERATED +{ + uE(1), + network(2), + unknown(3) +} + +IPAddress ::= CHOICE +{ + iPv4Address [1] IPv4Address, + iPv6Address [2] IPv6Address +} + +IPv4Address ::= OCTET STRING (SIZE(4)) + +IPv6Address ::= OCTET STRING (SIZE(16)) + +IPv6FlowLabel ::= INTEGER(0..1048575) + +MACAddress ::= OCTET STRING (SIZE(6)) + +MCC ::= NumericString (SIZE(3)) + +MNC ::= NumericString (SIZE(2..3)) + +MMEID ::= SEQUENCE +{ + mMEGI [1] MMEGI, + mMEC [2] MMEC +} + +MMEC ::= NumericString + +MMEGI ::= NumericString + +MSISDN ::= NumericString (SIZE(1..15)) + +NAI ::= UTF8String + +NextLayerProtocol ::= INTEGER(0..255) + +NSSAI ::= SEQUENCE OF SNSSAI + +PLMNID ::= SEQUENCE +{ + mCC [1] MCC, + mNC [2] MNC +} + +PDUSessionID ::= INTEGER (0..255) + +PDUSessionType ::= ENUMERATED +{ + iPv4(1), + iPv6(2), + iPv4v6(3), + unstructured(4), + ethernet(5) +} + +PEI ::= CHOICE +{ + iMEI [1] IMEI, + iMEISV [2] IMEISV +} + +PortNumber ::= INTEGER(0..65535) + +ProtectionSchemeID ::= INTEGER (0..15) + +RATType ::= ENUMERATED +{ + nR(1), + eUTRA(2), + wLAN(3), + virtual(4) +} + +RejectedNSSAI ::= SEQUENCE OF RejectedSNSSAI + +RejectedSNSSAI ::= SEQUENCE +{ + causeValue [1] RejectedSliceCauseValue, + sNSSAI [2] SNSSAI +} + +RejectedSliceCauseValue ::= INTEGER (0..255) + +RoutingIndicator ::= INTEGER (0..9999) + +SchemeOutput ::= OCTET STRING + +Slice ::= SEQUENCE +{ + allowedNSSAI [1] NSSAI OPTIONAL, + configuredNSSAI [2] NSSAI OPTIONAL, + rejectedNSSAI [3] RejectedNSSAI OPTIONAL +} + +SMPDUDNRequest ::= OCTET STRING + +SNSSAI ::= SEQUENCE +{ + sliceServiceType [1] INTEGER (0..255), + sliceDifferentiator [2] OCTET STRING (SIZE(3)) OPTIONAL +} + +SUCI ::= SEQUENCE +{ + mCC [1] MCC, + mNC [2] MNC, + routingIndicator [3] RoutingIndicator, + protectionSchemeID [4] ProtectionSchemeID, + homeNetworkPublicKeyID [5] HomeNetworkPublicKeyID, + schemeOutput [6] SchemeOutput +} + +SUPI ::= CHOICE +{ + iMSI [1] IMSI, + nAI [2] NAI +} + +SUPIUnauthenticatedIndication ::= BOOLEAN + +TargetIdentifier ::= CHOICE +{ + sUPI [1] SUPI, + iMSI [2] IMSI, + pEI [3] PEI, + iMEI [4] IMEI, + gPSI [5] GPSI, + mISDN [6] MSISDN, + nAI [7] NAI, + iPv4Address [8] IPv4Address, + iPv6Address [9] IPv6Address, + ethernetAddress [10] MACAddress +} + +TargetIdentifierProvenance ::= ENUMERATED +{ + lEAProvided(1), + observed(2), + matchedOn(3), + other(4) +} + +Timestamp ::= GeneralizedTime + +UEEndpointAddress ::= CHOICE +{ + iPv4Address [1] IPv4Address, + iPv6Address [2] IPv6Address, + ethernetAddress [3] MACAddress +} + +-- =================== +-- Location parameters +-- =================== + +Location ::= SEQUENCE +{ + locationInfo [1] LocationInfo OPTIONAL, + positioningInfo [2] PositioningInfo OPTIONAL, + locationPresenceReport [3] LocationPresenceReport OPTIONAL +} + +CellSiteInformation ::= SEQUENCE +{ + geographicalCoordinates [1] GeographicalCoordinates, + azimuth [2] INTEGER (0..359) OPTIONAL, + operatorSpecificInformation [3] UTF8String OPTIONAL +} + +-- TS 29.518 [22], clause 6.4.6.2.6 +LocationInfo ::= SEQUENCE +{ + userLocation [1] UserLocation OPTIONAL, + currentLoc [2] BOOLEAN OPTIONAL, + geoInfo [3] GeographicArea OPTIONAL, + rATType [4] RATType OPTIONAL, + timeZone [5] TimeZone OPTIONAL, + additionalCellIDs [6] SEQUENCE OF CellInformation OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.4.7 +UserLocation ::= SEQUENCE +{ + eUTRALocation [1] EUTRALocation OPTIONAL, + nRLocation [2] NRLocation OPTIONAL, + n3GALocation [3] N3GALocation OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.4.8 +EUTRALocation ::= SEQUENCE +{ + tAI [1] TAI, + eCGI [2] ECGI, + ageOfLocatonInfo [3] INTEGER OPTIONAL, + uELocationTimestamp [4] Timestamp OPTIONAL, + geographicalInformation [5] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, + globalNGENbID [7] GlobalRANNodeID OPTIONAL, + cellSiteInformation [8] CellSiteInformation OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.4.9 +NRLocation ::= SEQUENCE +{ + tAI [1] TAI, + nCGI [2] NCGI, + ageOfLocatonInfo [3] INTEGER OPTIONAL, + uELocationTimestamp [4] Timestamp OPTIONAL, + geographicalInformation [5] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, + globalGNbID [7] GlobalRANNodeID OPTIONAL, + cellSiteInformation [8] CellSiteInformation OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.4.10 +N3GALocation ::= SEQUENCE +{ + tAI [1] TAI OPTIONAL, + n3IWFID [2] N3IWFIDNGAP OPTIONAL, + uEIPAddr [3] IPAddr OPTIONAL, + portNumber [4] INTEGER OPTIONAL +} + +-- TS 38.413 [23], clause 9.3.2.4 +IPAddr ::= SEQUENCE +{ + iPv4Addr [1] IPv4Address OPTIONAL, + iPv6Addr [2] IPv6Address OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.4.28 +GlobalRANNodeID ::= SEQUENCE +{ + pLMNID [1] PLMNID, + aNNodeID [2] ANNodeID +} + +ANNodeID ::= CHOICE +{ + n3IWFID [1] N3IWFIDSBI, + gNbID [2] GNbID, + nGENbID [3] NGENbID +} + +-- TS 38.413 [23], clause 9.3.1.6 +GNbID ::= BIT STRING(SIZE(22..32)) + +-- TS 29.571 [17], clause 5.4.4.4 +TAI ::= SEQUENCE +{ + pLMNID [1] PLMNID, + tAC [2] TAC +} + +-- TS 29.571 [17], clause 5.4.4.5 +ECGI ::= SEQUENCE +{ + pLMNID [1] PLMNID, + eUTRACellID [2] EUTRACellID +} + +-- TS 29.571 [17], clause 5.4.4.6 +NCGI ::= SEQUENCE +{ + pLMNID [1] PLMNID, + nRCellID [2] NRCellID +} + +RANCGI ::= CHOICE +{ + eCGI [1] ECGI, + nCGI [2] NCGI +} + +CellInformation ::= SEQUENCE +{ + rANCGI [1] RANCGI, + cellSiteinformation [2] CellSiteInformation OPTIONAL, + timeOfLocation [3] Timestamp OPTIONAL +} + +-- TS 38.413 [23], clause 9.3.1.57 +N3IWFIDNGAP ::= BIT STRING (SIZE(16)) + +-- TS 29.571 [17], clause 5.4.4.28 +N3IWFIDSBI ::= UTF8String + +-- TS 29.571 [17], table 5.4.2-1 +TAC ::= OCTET STRING (SIZE(2..3)) + +-- TS 38.413 [23], clause 9.3.1.9 +EUTRACellID ::= BIT STRING (SIZE(28)) + +-- TS 38.413 [23], clause 9.3.1.7 +NRCellID ::= BIT STRING (SIZE(36)) + +-- TS 38.413 [23], clause 9.3.1.8 +NGENbID ::= CHOICE +{ + macroNGENbID [1] BIT STRING (SIZE(20)), + shortMacroNGENbID [2] BIT STRING (SIZE(18)), + longMacroNGENbID [3] BIT STRING (SIZE(21)) +} + +-- TS 29.518 [22], clause 6.4.6.2.3 +PositioningInfo ::= SEQUENCE +{ + positionInfo [1] LocationData OPTIONAL, + rawMLPResponse [2] RawMLPResponse OPTIONAL +} + +RawMLPResponse ::= CHOICE +{ + -- The following parameter contains a copy of unparsed XML code of the + -- MLP response message, i.e. the entire XML document containing + -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.2) or + -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.3) MLP message. + mLPPositionData [1] UTF8String, + -- OMA MLP result id, defined in OMA-TS-MLP-V3_5-20181211-C [20], Clause 5.4 + mLPErrorCode [2] INTEGER (1..699) +} + +-- TS 29.572 [24], clause 6.1.6.2.3 +LocationData ::= SEQUENCE +{ + locationEstimate [1] GeographicArea, + accuracyFulfilmentIndicator [2] AccuracyFulfilmentIndicator OPTIONAL, + ageOfLocationEstimate [3] AgeOfLocationEstimate OPTIONAL, + velocityEstimate [4] VelocityEstimate OPTIONAL, + civicAddress [5] CivicAddress OPTIONAL, + positioningDataList [6] SET OF PositioningMethodAndUsage OPTIONAL, + gNSSPositioningDataList [7] SET OF GNSSPositioningMethodAndUsage OPTIONAL, + eCGI [8] ECGI OPTIONAL, + nCGI [9] NCGI OPTIONAL, + altitude [10] Altitude OPTIONAL, + barometricPressure [11] BarometricPressure OPTIONAL +} + +-- TS 29.518 [22], clause 6.2.6.2.5 +LocationPresenceReport ::= SEQUENCE +{ + type [1] AMFEventType, + timestamp [2] Timestamp, + areaList [3] SET OF AMFEventArea OPTIONAL, + timeZone [4] TimeZone OPTIONAL, + accessTypes [5] SET OF AccessType OPTIONAL, + rMInfoList [6] SET OF RMInfo OPTIONAL, + cMInfoList [7] SET OF CMInfo OPTIONAL, + reachability [8] UEReachability OPTIONAL, + location [9] UserLocation OPTIONAL, + additionalCellIDs [10] SEQUENCE OF CellInformation OPTIONAL +} + +-- TS 29.518 [22], clause 6.2.6.3.3 +AMFEventType ::= ENUMERATED +{ + locationReport(1), + presenceInAOIReport(2) +} + +-- TS 29.518 [22], clause 6.2.6.2.16 +AMFEventArea ::= SEQUENCE +{ + presenceInfo [1] PresenceInfo OPTIONAL, + lADNInfo [2] LADNInfo OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.4.27 +PresenceInfo ::= SEQUENCE +{ + presenceState [1] PresenceState OPTIONAL, + trackingAreaList [2] SET OF TAI OPTIONAL, + eCGIList [3] SET OF ECGI OPTIONAL, + nCGIList [4] SET OF NCGI OPTIONAL, + globalRANNodeIDList [5] SET OF GlobalRANNodeID OPTIONAL +} + +-- TS 29.518 [22], clause 6.2.6.2.17 +LADNInfo ::= SEQUENCE +{ + lADN [1] UTF8String, + presence [2] PresenceState OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.3.20 +PresenceState ::= ENUMERATED +{ + inArea(1), + outOfArea(2), + unknown(3), + inactive(4) +} + +-- TS 29.518 [22], clause 6.2.6.2.8 +RMInfo ::= SEQUENCE +{ + rMState [1] RMState, + accessType [2] AccessType +} + +-- TS 29.518 [22], clause 6.2.6.2.9 +CMInfo ::= SEQUENCE +{ + cMState [1] CMState, + accessType [2] AccessType +} + +-- TS 29.518 [22], clause 6.2.6.3.7 +UEReachability ::= ENUMERATED +{ + unreachable(1), + reachable(2), + regulatoryOnly(3) +} + +-- TS 29.518 [22], clause 6.2.6.3.9 +RMState ::= ENUMERATED +{ + registered(1), + deregistered(2) +} + +-- TS 29.518 [22], clause 6.2.6.3.10 +CMState ::= ENUMERATED +{ + idle(1), + connected(2) +} + +-- TS 29.572 [24], clause 6.1.6.2.5 +GeographicArea ::= CHOICE +{ + point [1] Point, + pointUncertaintyCircle [2] PointUncertaintyCircle, + pointUncertaintyEllipse [3] PointUncertaintyEllipse, + polygon [4] Polygon, + pointAltitude [5] PointAltitude, + pointAltitudeUncertainty [6] PointAltitudeUncertainty, + ellipsoidArc [7] EllipsoidArc +} + +-- TS 29.572 [24], clause 6.1.6.3.12 +AccuracyFulfilmentIndicator ::= ENUMERATED +{ + requestedAccuracyFulfilled(1), + requestedAccuracyNotFulfilled(2) +} + +-- TS 29.572 [24], clause +VelocityEstimate ::= CHOICE +{ + horVelocity [1] HorizontalVelocity, + horWithVertVelocity [2] HorizontalWithVerticalVelocity, + horVelocityWithUncertainty [3] HorizontalVelocityWithUncertainty, + horWithVertVelocityAndUncertainty [4] HorizontalWithVerticalVelocityAndUncertainty +} + +-- TS 29.572 [24], clause 6.1.6.2.14 +CivicAddress ::= SEQUENCE +{ + country [1] UTF8String, + a1 [2] UTF8String OPTIONAL, + a2 [3] UTF8String OPTIONAL, + a3 [4] UTF8String OPTIONAL, + a4 [5] UTF8String OPTIONAL, + a5 [6] UTF8String OPTIONAL, + a6 [7] UTF8String OPTIONAL, + prd [8] UTF8String OPTIONAL, + pod [9] UTF8String OPTIONAL, + sts [10] UTF8String OPTIONAL, + hno [11] UTF8String OPTIONAL, + hns [12] UTF8String OPTIONAL, + lmk [13] UTF8String OPTIONAL, + loc [14] UTF8String OPTIONAL, + nam [15] UTF8String OPTIONAL, + pc [16] UTF8String OPTIONAL, + bld [17] UTF8String OPTIONAL, + unit [18] UTF8String OPTIONAL, + flr [19] UTF8String OPTIONAL, + room [20] UTF8String OPTIONAL, + plc [21] UTF8String OPTIONAL, + pcn [22] UTF8String OPTIONAL, + pobox [23] UTF8String OPTIONAL, + addcode [24] UTF8String OPTIONAL, + seat [25] UTF8String OPTIONAL, + rd [26] UTF8String OPTIONAL, + rdsec [27] UTF8String OPTIONAL, + rdbr [28] UTF8String OPTIONAL, + rdsubbr [29] UTF8String OPTIONAL +} + +-- TS 29.572 [24], clause 6.1.6.2.15 +PositioningMethodAndUsage ::= SEQUENCE +{ + method [1] PositioningMethod, + mode [2] PositioningMode, + usage [3] Usage +} + +-- TS 29.572 [24], clause 6.1.6.2.16 +GNSSPositioningMethodAndUsage ::= SEQUENCE +{ + mode [1] PositioningMode, + gNSS [2] GNSSID, + usage [3] Usage +} + +-- TS 29.572 [24], clause 6.1.6.2.6 +Point ::= SEQUENCE +{ + geographicalCoordinates [1] GeographicalCoordinates +} + +-- TS 29.572 [24], clause 6.1.6.2.7 +PointUncertaintyCircle ::= SEQUENCE +{ + geographicalCoordinates [1] GeographicalCoordinates, + uncertainty [2] Uncertainty +} + +-- TS 29.572 [24], clause 6.1.6.2.8 +PointUncertaintyEllipse ::= SEQUENCE +{ + geographicalCoordinates [1] GeographicalCoordinates, + uncertainty [2] UncertaintyEllipse, + confidence [3] Confidence +} + +-- TS 29.572 [24], clause 6.1.6.2.9 +Polygon ::= SEQUENCE +{ + pointList [1] SET SIZE (3..15) OF GeographicalCoordinates +} + +-- TS 29.572 [24], clause 6.1.6.2.10 +PointAltitude ::= SEQUENCE +{ + point [1] GeographicalCoordinates, + altitude [2] Altitude +} + +-- TS 29.572 [24], clause 6.1.6.2.11 +PointAltitudeUncertainty ::= SEQUENCE +{ + point [1] GeographicalCoordinates, + altitude [2] Altitude, + uncertaintyEllipse [3] UncertaintyEllipse, + uncertaintyAltitude [4] Uncertainty, + confidence [5] Confidence +} + +-- TS 29.572 [24], clause 6.1.6.2.12 +EllipsoidArc ::= SEQUENCE +{ + point [1] GeographicalCoordinates, + innerRadius [2] InnerRadius, + uncertaintyRadius [3] Uncertainty, + offsetAngle [4] Angle, + includedAngle [5] Angle, + confidence [6] Confidence +} + +-- TS 29.572 [24], clause 6.1.6.2.4 +GeographicalCoordinates ::= SEQUENCE +{ + latitude [1] UTF8String, + longitude [2] UTF8String, + mapDatumInformation [3] OGCURN OPTIONAL +} + +-- TS 29.572 [24], clause 6.1.6.2.22 +UncertaintyEllipse ::= SEQUENCE +{ + semiMajor [1] Uncertainty, + semiMinor [2] Uncertainty, + orientationMajor [3] Orientation +} + +-- TS 29.572 [24], clause 6.1.6.2.18 +HorizontalVelocity ::= SEQUENCE +{ + hSpeed [1] HorizontalSpeed, + bearing [2] Angle +} + +-- TS 29.572 [24], clause 6.1.6.2.19 +HorizontalWithVerticalVelocity ::= SEQUENCE +{ + hSpeed [1] HorizontalSpeed, + bearing [2] Angle, + vSpeed [3] VerticalSpeed, + vDirection [4] VerticalDirection +} + +-- TS 29.572 [24], clause 6.1.6.2.20 +HorizontalVelocityWithUncertainty ::= SEQUENCE +{ + hSpeed [1] HorizontalSpeed, + bearing [2] Angle, + uncertainty [3] SpeedUncertainty +} + +-- TS 29.572 [24], clause 6.1.6.2.21 +HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE +{ + hspeed [1] HorizontalSpeed, + bearing [2] Angle, + vSpeed [3] VerticalSpeed, + vDirection [4] VerticalDirection, + hUncertainty [5] SpeedUncertainty, + vUncertainty [6] SpeedUncertainty +} + +-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 +Altitude ::= UTF8String +Angle ::= INTEGER (0..360) +Uncertainty ::= INTEGER (0..127) +Orientation ::= INTEGER (0..180) +Confidence ::= INTEGER (0..100) +InnerRadius ::= INTEGER (0..65535) +AgeOfLocationEstimate ::= INTEGER (0..32767) +HorizontalSpeed ::= UTF8String +VerticalSpeed ::= UTF8String +SpeedUncertainty ::= UTF8String +BarometricPressure ::= INTEGER (30000..155000) + +-- TS 29.572 [24], clause 6.1.6.3.13 +VerticalDirection ::= ENUMERATED +{ + upward(1), + downward(2) +} + +-- TS 29.572 [24], clause 6.1.6.3.6 +PositioningMethod ::= ENUMERATED +{ + cellID(1), + eCID(2), + oTDOA(3), + barometricPresure(4), + wLAN(5), + bluetooth(6), + mBS(7) +} + +-- TS 29.572 [24], clause 6.1.6.3.7 +PositioningMode ::= ENUMERATED +{ + uEBased(1), + uEAssisted(2), + conventional(3) +} + +-- TS 29.572 [24], clause 6.1.6.3.8 +GNSSID ::= ENUMERATED +{ + gPS(1), + galileo(2), + sBAS(3), + modernizedGPS(4), + qZSS(5), + gLONASS(6) +} + +-- TS 29.572 [24], clause 6.1.6.3.9 +Usage ::= ENUMERATED +{ + unsuccess(1), + successResultsNotUsed(2), + successResultsUsedToVerifyLocation(3), + successResultsUsedToGenerateLocation(4), + successMethodNotDetermined(5) +} + +-- TS 29.571 [17], table 5.2.2-1 +TimeZone ::= UTF8String + +-- Open Geospatial Consortium URN [35] +OGCURN ::= UTF8String + +END diff --git a/testing/deps/stubs/CDMA2000CCModule.asn b/testing/deps/stubs/CDMA2000CCModule.asn new file mode 100644 index 0000000..00789f9 --- /dev/null +++ b/testing/deps/stubs/CDMA2000CCModule.asn @@ -0,0 +1,10 @@ +CDMA2000CCModule +{iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +CCIPPacketHeader ::= NULL + +END \ No newline at end of file diff --git a/testing/deps/stubs/CDMA2000CIIModule.asn b/testing/deps/stubs/CDMA2000CIIModule.asn new file mode 100644 index 0000000..5daddf7 --- /dev/null +++ b/testing/deps/stubs/CDMA2000CIIModule.asn @@ -0,0 +1,10 @@ +CDMA2000CIIModule +{iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +CDMA2000LAESMessage ::= NULL + +END \ No newline at end of file diff --git a/testing/deps/stubs/Laesp-j-std-025-b.asn b/testing/deps/stubs/Laesp-j-std-025-b.asn new file mode 100644 index 0000000..6e10535 --- /dev/null +++ b/testing/deps/stubs/Laesp-j-std-025-b.asn @@ -0,0 +1,10 @@ +Laesp-j-std-025-b +{iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +LAESProtocol ::= NULL + +END \ No newline at end of file -- GitLab From e325dc36e4c3956098a1e677b6bc1a306fd5ca96 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 2 Oct 2020 13:19:28 +0200 Subject: [PATCH 151/208] Update testing --- testing/check_asn1.py | 2 ++ testing/compile_asn.py | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/testing/check_asn1.py b/testing/check_asn1.py index df9771c..c87a226 100644 --- a/testing/check_asn1.py +++ b/testing/check_asn1.py @@ -3,6 +3,8 @@ from compile_asn import * if __name__ == '__main__': + log = logging.getLogger() + log.setLevel(logging.INFO) parseErrors, compileErrors, parser = validateAllASN1FilesInPath("./") parseErrorCount = 0 print ("ASN.1 Parser checks:") diff --git a/testing/compile_asn.py b/testing/compile_asn.py index a7a531a..33fea50 100644 --- a/testing/compile_asn.py +++ b/testing/compile_asn.py @@ -114,17 +114,21 @@ def compileASN1Files (fileList): except CompileError as ex: logging.info (f"Compiler error: {ex}") errors.append(ex) + return errors, None except ParseError as ex: logging.info (f"Parse error: {ex}") errors.append(ex) + return errors, None logging.info ("Compiled OK") return errors, c def validateASN1Files (fileList): parseErrors = parseASN1Files(fileList) - if len(parseErrors) > 0: - logging.info ("Abandonding compile due to parse errors") + errorCount = sum([len(v) for k,v in parseErrors.items()]) + if errorCount > 0: + logging.info ("Abandoning compile due to parse errors") + return parseErrors, [], None compileErrors, parser = compileASN1Files(fileList) return parseErrors, compileErrors, parser -- GitLab From 09560aafc12bdce8e6ac3268a95990d521d178fb Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 29 Mar 2021 00:00:00 +0000 Subject: [PATCH 152/208] TS 103 707 v1.2.1 (2021-03-29) agreed at LI#56-e (Online, 2021-02-15) --- 103707/{TS_103_707_v010101.xsd => TS_103_707.xsd} | 8 ++++---- .../{TS_103_707_v010101.xsd => TS_103_707_v010201.xsd} | 8 ++++---- 103707/portal/testing/validate_examples.py | 2 +- 103707/testing/validate_examples.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename 103707/{TS_103_707_v010101.xsd => TS_103_707.xsd} (97%) rename 103707/portal/{TS_103_707_v010101.xsd => TS_103_707_v010201.xsd} (97%) diff --git a/103707/TS_103_707_v010101.xsd b/103707/TS_103_707.xsd similarity index 97% rename from 103707/TS_103_707_v010101.xsd rename to 103707/TS_103_707.xsd index 7d857df..2f33c56 100644 --- a/103707/TS_103_707_v010101.xsd +++ b/103707/TS_103_707.xsd @@ -9,7 +9,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/103707/portal/TS_103_707_v010101.xsd b/103707/portal/TS_103_707_v010201.xsd similarity index 97% rename from 103707/portal/TS_103_707_v010101.xsd rename to 103707/portal/TS_103_707_v010201.xsd index 7d857df..2f33c56 100644 --- a/103707/portal/TS_103_707_v010101.xsd +++ b/103707/portal/TS_103_707_v010201.xsd @@ -9,7 +9,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/103707/portal/testing/validate_examples.py b/103707/portal/testing/validate_examples.py index 915de84..fbcf21f 100644 --- a/103707/portal/testing/validate_examples.py +++ b/103707/portal/testing/validate_examples.py @@ -29,7 +29,7 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile)))) - coreSchema = xmlschema.XMLSchema('TS_103_707_v010101.xsd', locations=locations) + coreSchema = xmlschema.XMLSchema('TS_103_707_v010201.xsd', locations=locations) for schema in extraSchemas: newSchema = xmlschema.XMLSchema(schema) diff --git a/103707/testing/validate_examples.py b/103707/testing/validate_examples.py index 915de84..fbcf21f 100644 --- a/103707/testing/validate_examples.py +++ b/103707/testing/validate_examples.py @@ -29,7 +29,7 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile)))) - coreSchema = xmlschema.XMLSchema('TS_103_707_v010101.xsd', locations=locations) + coreSchema = xmlschema.XMLSchema('TS_103_707_v010201.xsd', locations=locations) for schema in extraSchemas: newSchema = xmlschema.XMLSchema(schema) -- GitLab From dfdd6a61254344a86b8bbfa4e359bc5201f8b302 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 23 Jul 2021 11:00:48 +0100 Subject: [PATCH 153/208] Generic object mechanism and examples --- 103221-1/TS_103_221_01.xsd | 153 +++++++++++++++++- 103221-1/examples/CreateObject_example.xml | 14 ++ .../examples/GetObjectResponse_example.xml | 13 ++ 103221-1/examples/GetObject_example.xml | 11 ++ .../examples/ListObjectResponse_example.xml | 13 ++ 103221-1/examples/ListObject_example.xml | 11 ++ 6 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 103221-1/examples/CreateObject_example.xml create mode 100644 103221-1/examples/GetObjectResponse_example.xml create mode 100644 103221-1/examples/GetObject_example.xml create mode 100644 103221-1/examples/ListObjectResponse_example.xml create mode 100644 103221-1/examples/ListObject_example.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 2cf5206..76ca9c6 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -101,7 +101,12 @@ - + + + + + + @@ -787,4 +792,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml new file mode 100644 index 0000000..2544ee1 --- /dev/null +++ b/103221-1/examples/CreateObject_example.xml @@ -0,0 +1,14 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.6.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + 1 + + + diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml new file mode 100644 index 0000000..e51badd --- /dev/null +++ b/103221-1/examples/GetObjectResponse_example.xml @@ -0,0 +1,13 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.6.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + + + diff --git a/103221-1/examples/GetObject_example.xml b/103221-1/examples/GetObject_example.xml new file mode 100644 index 0000000..fa1b356 --- /dev/null +++ b/103221-1/examples/GetObject_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.6.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + 3741800e-971b-4aa9-85f4-466d2b1adc7e + + diff --git a/103221-1/examples/ListObjectResponse_example.xml b/103221-1/examples/ListObjectResponse_example.xml new file mode 100644 index 0000000..8b79d9f --- /dev/null +++ b/103221-1/examples/ListObjectResponse_example.xml @@ -0,0 +1,13 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.6.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + + + diff --git a/103221-1/examples/ListObject_example.xml b/103221-1/examples/ListObject_example.xml new file mode 100644 index 0000000..8876a1f --- /dev/null +++ b/103221-1/examples/ListObject_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.6.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + FooObject + + -- GitLab From e6fc58ea3edaf92ecfac5e02ae0d5ffd02a23d7c Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 28 Jul 2021 11:30:12 +0100 Subject: [PATCH 154/208] Updating to match first draft of CR --- 103221-1/TS_103_221_01.xsd | 16 +++++++++------- 103221-1/examples/CreateObject_example.xml | 2 +- 103221-1/examples/GetObjectResponse_example.xml | 1 + 103221-1/examples/ListObject_example.xml | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 76ca9c6..0dab420 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -798,7 +798,9 @@ - + + + @@ -828,7 +830,7 @@ - + @@ -849,11 +851,11 @@ - + - + @@ -870,7 +872,7 @@ - + @@ -891,7 +893,7 @@ - + @@ -912,7 +914,7 @@ - + diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml index 2544ee1..d64190e 100644 --- a/103221-1/examples/CreateObject_example.xml +++ b/103221-1/examples/CreateObject_example.xml @@ -1,6 +1,6 @@ - + admfID neID 2017-10-06T18:46:21.247432Z diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml index e51badd..a39e67b 100644 --- a/103221-1/examples/GetObjectResponse_example.xml +++ b/103221-1/examples/GetObjectResponse_example.xml @@ -8,6 +8,7 @@ 3741800e-971b-4aa9-85f4-466d2b1adc7f 3741800e-971b-4aa9-85f4-466d2b1adc7e + 1 diff --git a/103221-1/examples/ListObject_example.xml b/103221-1/examples/ListObject_example.xml index 8876a1f..6e6187b 100644 --- a/103221-1/examples/ListObject_example.xml +++ b/103221-1/examples/ListObject_example.xml @@ -1,11 +1,11 @@ - + admfID neID 2017-10-06T18:46:21.247432Z v1.6.1 3741800e-971b-4aa9-85f4-466d2b1adc7f - FooObject + Q{http://uri.etsi.org/03221/X1/2017/10}Foo -- GitLab From 4ab6bd4e70c5621e88a37c5851b6152dd81c2ecf Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Sep 2021 08:44:27 +0100 Subject: [PATCH 155/208] Updating after rap meeting --- 103221-1/TS_103_221_01.xsd | 72 +++++++++---------- 103221-1/examples/CreateObject_example.xml | 10 +-- 103221-1/examples/ExampleGenericObjects.xsd | 38 ++++++++++ .../GetAllDetailsResponse_example2.xml | 67 +++++++++++++++++ .../examples/GetObjectResponse_example.xml | 12 ++-- 103221-1/examples/GetObject_example.xml | 2 +- .../ListAllDetailsResponse_example2.xml | 19 +++++ 7 files changed, 171 insertions(+), 49 deletions(-) create mode 100644 103221-1/examples/ExampleGenericObjects.xsd create mode 100644 103221-1/examples/GetAllDetailsResponse_example2.xml create mode 100644 103221-1/examples/ListAllDetailsResponse_example2.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 0dab420..5ea96ac 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -631,6 +631,7 @@ + @@ -660,6 +661,7 @@ + @@ -793,48 +795,27 @@ - + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - + @@ -850,12 +831,11 @@ - - + @@ -870,13 +850,12 @@ - - + @@ -886,18 +865,34 @@ - + - + + + + + + + + + + + + + + + + + - + @@ -912,13 +907,12 @@ - - + @@ -928,15 +922,15 @@ - + - + - + diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml index d64190e..514a182 100644 --- a/103221-1/examples/CreateObject_example.xml +++ b/103221-1/examples/CreateObject_example.xml @@ -1,14 +1,16 @@ - + admfID neID 2017-10-06T18:46:21.247432Z - v1.6.1 + v1.9.1 3741800e-971b-4aa9-85f4-466d2b1adc7f - + 3741800e-971b-4aa9-85f4-466d2b1adc7e - 1 + 1 diff --git a/103221-1/examples/ExampleGenericObjects.xsd b/103221-1/examples/ExampleGenericObjects.xsd new file mode 100644 index 0000000..8b20e5f --- /dev/null +++ b/103221-1/examples/ExampleGenericObjects.xsd @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/103221-1/examples/GetAllDetailsResponse_example2.xml b/103221-1/examples/GetAllDetailsResponse_example2.xml new file mode 100644 index 0000000..0810429 --- /dev/null +++ b/103221-1/examples/GetAllDetailsResponse_example2.xml @@ -0,0 +1,67 @@ + + + + admfID + neID + 2017-10-06T18:46:21.496743Z + v1.9.1 + bfd0c982-b7d6-4a8e-80a0-89dab964aafd + + OK + + + + + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + 447700900000 + + + X2andX3 + + 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9 + + + + complete + + + + + + + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + X2andX3 + + + + 192.0.2.2 + + + 12345 + + + + + + activeAndWorking + + + + + + + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + 1 + + + OK + + + + + diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml index a39e67b..4892d37 100644 --- a/103221-1/examples/GetObjectResponse_example.xml +++ b/103221-1/examples/GetObjectResponse_example.xml @@ -1,14 +1,16 @@ - + admfID neID 2017-10-06T18:46:21.247432Z v1.6.1 3741800e-971b-4aa9-85f4-466d2b1adc7f - - 3741800e-971b-4aa9-85f4-466d2b1adc7e - 1 - + + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + 1 + + diff --git a/103221-1/examples/GetObject_example.xml b/103221-1/examples/GetObject_example.xml index fa1b356..8a47ff2 100644 --- a/103221-1/examples/GetObject_example.xml +++ b/103221-1/examples/GetObject_example.xml @@ -1,6 +1,6 @@ - + admfID neID 2017-10-06T18:46:21.247432Z diff --git a/103221-1/examples/ListAllDetailsResponse_example2.xml b/103221-1/examples/ListAllDetailsResponse_example2.xml new file mode 100644 index 0000000..d694b12 --- /dev/null +++ b/103221-1/examples/ListAllDetailsResponse_example2.xml @@ -0,0 +1,19 @@ + + + + admfID + neID + 2017-10-06T18:46:21.508330Z + v1.6.1 + 09529160-2e44-49c6-bf54-204ca5edcfab + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + + + -- GitLab From 82730b76838a8d3d3ea5268f46af78d2f2f72c41 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 20 Sep 2021 08:28:17 +0100 Subject: [PATCH 156/208] TS 103 280 v2.6.1 --- 103280/TS_103_280.asn1 | 2 +- 103280/TS_103_280.xsd | 9 +++++++-- .../{TS_103_280_v020401.xsd => TS_103_280_v020601.xsd} | 7 ++++++- 3 files changed, 14 insertions(+), 4 deletions(-) rename 103280/portal/{TS_103_280_v020401.xsd => TS_103_280_v020601.xsd} (97%) diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1 index 68cfe54..c7b31a6 100644 --- a/103280/TS_103_280.asn1 +++ b/103280/TS_103_280.asn1 @@ -91,4 +91,4 @@ GPSINAI ::= NAI NAI ::= UTF8String -END +END \ No newline at end of file diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index e5c0bde..ce66ea6 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -1,5 +1,5 @@ - + @@ -236,4 +236,9 @@ - + + + + + + \ No newline at end of file diff --git a/103280/portal/TS_103_280_v020401.xsd b/103280/portal/TS_103_280_v020601.xsd similarity index 97% rename from 103280/portal/TS_103_280_v020401.xsd rename to 103280/portal/TS_103_280_v020601.xsd index e5c0bde..e780660 100644 --- a/103280/portal/TS_103_280_v020401.xsd +++ b/103280/portal/TS_103_280_v020601.xsd @@ -1,5 +1,5 @@ - + @@ -236,4 +236,9 @@ + + + + + -- GitLab From f1cbc8c839bba8dba52bcfe40887e722fb9d558f Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 20 Sep 2021 08:31:35 +0100 Subject: [PATCH 157/208] TS 102 232-1 v3.24.1 --- 102232-1/LI-PS-PDU.asn | 47 +++++++++---------- ...I-PS-PDU,ver31.txt => LI-PS-PDU,ver32.txt} | 45 +++++++++--------- 2 files changed, 43 insertions(+), 49 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver31.txt => LI-PS-PDU,ver32.txt} (95%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index c857808..25f72fc 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)} DEFINITIONS IMPLICIT TAGS ::= @@ -11,7 +11,7 @@ IMPORTS -- from ETSI TS 103 280 [44] LIID FROM Common-Parameters - {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} -- from ETSI TS 101 671 [4] @@ -20,12 +20,12 @@ IMPORTS Location, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- from ETSI TS 101 671 [4] HI1-Operation FROM HI1NotificationOperations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)} -- from ETSI TS 102 232-2 [5] EmailCC, @@ -34,7 +34,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} -- from ETSI TS 102 232-3 [6] IPCC, @@ -181,21 +181,10 @@ IMPORTS FROM TS101909202 {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} - -- from J-STD-025-B [39] - LAESProtocol - FROM Laesp-j-std-025-b - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} - CDMA2000LAESMessage - FROM CDMA2000CIIModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} - CCIPPacketHeader - FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} - -- from ETSI TS 103 462 [45] ILHIPayload FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version2(2)} -- This import is only used for the handover between LEMFs. -- from 3GPP TS 33.128 [46] @@ -215,7 +204,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version31(31)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)} -- ==================== -- Top-level definition @@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, -- see clause 5.2.11 microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, - timeStampQualifier [8] TimeStampQualifier OPTIONAL + timeStampQualifier [8] TimeStampQualifier OPTIONAL, + extendedInterceptionPointID [9] OCTET STRING (SIZE (1..65535)) OPTIONAL, + -- see clause 5.2.13 + networkFunctionIdentifier [10] OCTET STRING (SIZE (1..65535)) OPTIONAL + -- see clause 5.2.14 } Payload ::= CHOICE @@ -283,10 +276,10 @@ HI4Payload ::= CHOICE CommunicationIdentifier ::= SEQUENCE { networkIdentifier [0] NetworkIdentifier, - communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, -- in case of transport of HI1 messages not required -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) - deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.4 ..., cINExtension [3] CorrelationValues OPTIONAL @@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED 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, + -- 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, tTRAFFIC-1 [7] TS101909201.TTRAFFIC, cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, @@ -347,7 +343,7 @@ CCContents ::= CHOICE cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, @@ -404,6 +400,7 @@ IRIType ::= ENUMERATED 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, @@ -416,8 +413,8 @@ IRIContents ::= CHOICE tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, pstnIsdnIRI [10] PstnIsdnIRI, iPMMIRI [11] IPMMIRI, - lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, - cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, + -- 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, ePSIRI [15] EPSIRI, confIRI [16] ConfIRI, @@ -735,4 +732,4 @@ LawfulInterceptionIdentifier ::= LIID -- 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 \ No newline at end of file diff --git a/102232-1/portal/LI-PS-PDU,ver31.txt b/102232-1/portal/LI-PS-PDU,ver32.txt similarity index 95% rename from 102232-1/portal/LI-PS-PDU,ver31.txt rename to 102232-1/portal/LI-PS-PDU,ver32.txt index c857808..3db7298 100644 --- a/102232-1/portal/LI-PS-PDU,ver31.txt +++ b/102232-1/portal/LI-PS-PDU,ver32.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)} DEFINITIONS IMPLICIT TAGS ::= @@ -11,7 +11,7 @@ IMPORTS -- from ETSI TS 103 280 [44] LIID FROM Common-Parameters - {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version211(211)} + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} -- from ETSI TS 101 671 [4] @@ -20,12 +20,12 @@ IMPORTS Location, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- from ETSI TS 101 671 [4] HI1-Operation FROM HI1NotificationOperations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)} -- from ETSI TS 102 232-2 [5] EmailCC, @@ -34,7 +34,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} -- from ETSI TS 102 232-3 [6] IPCC, @@ -181,21 +181,10 @@ IMPORTS FROM TS101909202 {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} - -- from J-STD-025-B [39] - LAESProtocol - FROM Laesp-j-std-025-b - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} - CDMA2000LAESMessage - FROM CDMA2000CIIModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} - CCIPPacketHeader - FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} - -- from ETSI TS 103 462 [45] ILHIPayload FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version2(2)} -- This import is only used for the handover between LEMFs. -- from 3GPP TS 33.128 [46] @@ -215,7 +204,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version31(31)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)} -- ==================== -- Top-level definition @@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, -- see clause 5.2.11 microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, - timeStampQualifier [8] TimeStampQualifier OPTIONAL + timeStampQualifier [8] TimeStampQualifier OPTIONAL, + extendedInterceptionPointID [9] OCTET STRING (SIZE (1..65535)) OPTIONAL, + -- see clause 5.2.13 + networkFunctionIdentifier [10] OCTET STRING (SIZE (1..65535)) OPTIONAL + -- see clause 5.2.14 } Payload ::= CHOICE @@ -283,10 +276,10 @@ HI4Payload ::= CHOICE CommunicationIdentifier ::= SEQUENCE { networkIdentifier [0] NetworkIdentifier, - communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, -- in case of transport of HI1 messages not required -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) - deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.4 ..., cINExtension [3] CorrelationValues OPTIONAL @@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED 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, + -- 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, tTRAFFIC-1 [7] TS101909201.TTRAFFIC, cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, @@ -347,7 +343,7 @@ CCContents ::= CHOICE cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, @@ -404,6 +400,7 @@ IRIType ::= ENUMERATED 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, @@ -416,8 +413,8 @@ IRIContents ::= CHOICE tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, pstnIsdnIRI [10] PstnIsdnIRI, iPMMIRI [11] IPMMIRI, - lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, - cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, + -- 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, ePSIRI [15] EPSIRI, confIRI [16] ConfIRI, -- GitLab From 45f7e27b296a02a1a9c7df388a4baf8bd52914e0 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 20 Sep 2021 08:34:20 +0100 Subject: [PATCH 158/208] TS 102 232-2 v3.13.1 --- 102232-2/EmailPDU.asn | 1616 +++++++++++------ ...{EmailPDU,ver17.txt => EmailPDU,ver18.txt} | 103 +- 2 files changed, 1146 insertions(+), 573 deletions(-) rename 102232-2/portal/{EmailPDU,ver17.txt => EmailPDU,ver18.txt} (79%) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index 881e769..651bd6c 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,529 +1,1087 @@ -EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - - -- from TS 102 232-1 [3] - IPAddress - FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} - - -- from TS 102 232-5 [38] - IPMMCC - FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)}; - - --- ============================ --- Object Identifier Definition --- ============================ - -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingMMCC(5)} - - -- definitions are relative to - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} - - --- ============================= --- Email Communications Contents --- ============================= - -EmailCC ::= SEQUENCE - -- EmailCC is the PDU sent for each "piece" of E-mail captured content -{ - emailCCObjId [0] RELATIVE-OID, - email-Format [1] Email-Format, - content [2] OCTET STRING - -- Network byte order -} - -Email-Format ::= ENUMERATED -{ - ip-packet(1), - -- When this is the email format, the content will contain the bytes of the IP packet from - -- the IP header through to the end of the IP packet - -- Meets requirement E.2.7 - application(2) - -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) - -- Meets requirement E.2.8 -} - --- ======================================= --- Intercept-related information for Email --- ======================================= - -EmailIRI ::= SEQUENCE - -- EmailIRI is the PDU sent for each "piece" of E-mail IRI -{ - emailIRIObjId [0] RELATIVE-OID, - eventType [1] E-mail-Event, - client-Address [2] IPAddress OPTIONAL, - -- Provided if available - server-Address [3] IPAddress OPTIONAL, - -- Provided if available - client-Port [4] INTEGER OPTIONAL, - -- Provided if available - server-Port [5] INTEGER OPTIONAL, - -- Provided if available - server-Octets-Sent [6] INTEGER, - client-Octets-Sent [7] INTEGER, - protocol-ID [8] E-mail-Protocol, - e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, - -- Not available in some cases; if a value is available, it must be provided - e-mail-Recipients [10] E-mail-Address-List OPTIONAL, - -- Not available in some cases; if a value is available, it must be provided - status [11] E-mail-Status, - total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, - message-ID [13] OCTET STRING OPTIONAL, - -- Network byte order - nationalParameter [14] OCTET STRING OPTIONAL, - -- Completely defined on a national basis, including byte ordering - ..., - national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, - -- Completely defined on a national basis - aAAInformation [16] AAAInformation OPTIONAL, - e-mail-Sender-Validity [17] ENUMERATED - { - validated(0), - -- The operator has assured the e-mail-sender - nonvalidated(1), - -- The operator does not assure the e-mail-sender - ... - } OPTIONAL -} - -E-mail-Status ::= ENUMERATED -{ - status-unknown(1), - operation-failed(2), - operation-succeeded(3) -} - -E-mail-Event ::= ENUMERATED -{ - e-mail-send(1), - e-mail-receive(2), - e-mail-download(3), - ..., - e-mail-logon-attempt(4), - e-mail-logon(5), - e-mail-logon-failure(6), - e-mail-logoff(7), - e-mail-partial-download(8), - e-mail-upload(9) -} - -E-mail-Protocol ::= ENUMERATED -{ - smtp(1), - pop3(2), - imap4(3), - webmail(4), - -- See Annex H for more information - undefined(255), - -- The protocol is not known or not representable by the current enumeration - ... -} - -E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) - -National-EM-ASN1parameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [12], - -- the country to which the parameters inserted after the extension marker apply - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...) -} - -AAAInformation ::= CHOICE - -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information -{ - pOP3AAAInformation [0] POP3AAAInformation, - aSMTPAAAInformation [1] ASMTPAAAInformation, - ..., - iMAPAAAInformation [2] IMAPAAAInformation -} - -POP3AAAInformation ::= SEQUENCE - -- The POP3AAAInformation field contains the POP3 username & optionally the password -{ - username [0] UTF8String (SIZE (0..64)), - password [1] UTF8String (SIZE (0..64)) OPTIONAL, - aAAResult [2] AAAResult OPTIONAL, - ... -} - -ASMTPAAAInformation ::= SEQUENCE - -- The ASMTPAAAInformation field contains the SMTP username and - -- optionally the authentication fields -{ - username [0] UTF8String (SIZE (0..64)), - authMethod [1] AAAauthMethod OPTIONAL, - -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc - challenge [2] OCTET STRING OPTIONAL, - -- A BASE64 encoded challenge send by the SMTP server - response [3] OCTET STRING OPTIONAL, - -- A BASE64 encoded hashed response returned by the client - aAAResult [4] AAAResult OPTIONAL, - ... -} - -IMAPAAAInformation ::= SEQUENCE - -- The iMAPAAAInformation field contains the IMAP username & optionally the password -{ - username [0] UTF8String (SIZE (0..64)), - password [1] UTF8String (SIZE (0..64)) OPTIONAL, - aAAResult [2] AAAResult OPTIONAL, - ... -} - -AAAResult ::= ENUMERATED -{ - resultUnknown(1), - aAAFailed(2), - aAASucceeded(3), - ... -} - -AAAauthMethod ::= ENUMERATED -{ - undefinedAuthMethod(1), - cramMD5(2), - digestMD5(3), - ... -} - --- ================================= --- Messaging Communications Contents --- ================================= - -MessagingCC ::= SEQUENCE - -- MessagingCC is the PDU sent for the captured content -{ - messaging-cc-obj-id [0] RELATIVE-OID, - event-identifier [1] INTEGER (0..4294967295), - -- Used to correlate to MessagingIRI within the same CIN - content-identifier [2] INTEGER (0..4294967295) OPTIONAL, - sequence-number [3] INTEGER (0..4294967295) OPTIONAL, - end-of-sequence [4] BOOLEAN DEFAULT FALSE, - content-type [5] OCTET STRING, - -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA - content [6] OCTET STRING, - ..., - content-transfer-encoding [7] OCTET STRING OPTIONAL - -- MIME Content-Transfer-Encoding mechanism. - -- Refer to IETF RFC 2045 [20] -} - -MessagingMMCC ::= SEQUENCE - -- MessagingMMCC is the PDU sent for the captured IPMMCC content -{ - messaging-mm-cc-obj-id [0] RELATIVE-OID, - event-identifier [1] INTEGER (0..4294967295), - -- Used to correlate to MessagingIRI within the same CIN - content-identifier [2] INTEGER (0..4294967295) OPTIONAL, - content [3] IPMMCC, - ... -} - - --- =========================================== --- Intercept-related information for Messaging --- =========================================== - -MessagingIRI ::= SEQUENCE -{ - messaging-iri-obj-id [0] RELATIVE-OID, - system-type [1] Messaging-System-Type, - system-identifier [2] OCTET STRING OPTIONAL, - -- Identifier up to national agreement, uniquely identifies a certain messaging system - category [3] Messaging-Event-Category OPTIONAL, - status [4] Messaging-Status, - party-information [5] SET OF Messaging-Party-Information OPTIONAL, - trigger [6] Messaging-Trigger, - properties [7] SEQUENCE OF Messaging-Property OPTIONAL, - event-identifier [8] INTEGER (0..4294967295) OPTIONAL, - -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent - original-message [9] OCTET STRING OPTIONAL, - ..., - box-identifier [10] OCTET STRING OPTIONAL -} - -Messaging-System-Type ::= ENUMERATED -{ - unified-messaging(1), - ... -} - -Messaging-Event-Category ::= CHOICE -{ - message [0] Messaging-Event, - message-box [1] Messaging-Box-Event, - message-notification [2] Messaging-Notification-Event, - call [3] Messaging-Call-Event, - ... -} - -Messaging-Event ::= ENUMERATED -{ - deposit(1), - retrieve(2), - delete(3), - save(4), - slamdown(5), - ..., - calendar(6), - contact(7) -} - -Messaging-Box-Event ::= ENUMERATED -{ - login(1), - logout(2), - lock(3), - unlock(4), - activate(5), - deactivate(6), - delete(7), - pin-change(8), - greeting-record(9), - greeting-change(10), - greeting-delete(11), - greeting-enable(12), - greeting-disable(13), - notification-enable(14), - notification-disable(15), - disconnect(16), - connect(17), - ..., - unknown(0), - - greeting-play(18), - language-change(19), - pin-security-enable(20), - pin-security-disable(21), - personal-operator-add(22), - personal-operator-change(23), - personal-operator-remove(24), - additional-destination-add(25), - additional-destination-change(26), - additional-destination-remove(27), auto-play-enable(28), auto-play-disable(29), header-play-enable(30), header-play-disable(31) -} - -Messaging-Notification-Event ::= ENUMERATED -{ - sms(1), - sms-deposit(2), - sms-slamdown(3), - sms-pin-reminder(4), - email(5), - fax-to-email(6), - ..., - mms(7), - generic(8) -} - -Messaging-Call-Event ::= ENUMERATED -{ - callout(1), - ... -} - -Messaging-Status ::= ENUMERATED -{ - unknown(0), - not-applicable(1), - operation-failed(2), - operation-succeeded(3), - operation-cancelled(4), - operation-started(5), - ..., - operation-lost(6) -} - -Messaging-Party-Information ::= SEQUENCE -{ - party-qualifier [0] Messaging-Party-Qualifier, - party-identity [1] Messaging-Party-Identity, - ..., - party-validity [2] Messaging-Party-Validity OPTIONAL, - copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL -} - -Messaging-Party-Qualifier ::= ENUMERATED -{ - unknown-party(0), - -- In this case the party cannot be classified as either originating or terminating - originating-party(1), - -- In this case, the partyInformation parameter provides the identities related to - -- the originating party and all information provided by this party. - terminating-party(2), - -- In this case, the partyInformation parameter provides the identities related to - -- the terminating party and all information provided by this party. - ..., - associated-party(3) - -- In this case, the partyInformation parameter provides the identites related to - -- an associated party and all information provided by this party -} - -Messaging-Party-Identity ::= CHOICE -{ - msisdn [0] OCTET STRING (SIZE (1..9)), - -- MSISDN of the target, encoded in the same format as the AddressString - -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. - e164-format [1] OCTET STRING (SIZE (1..25)), - -- E.164 address of the node in international format. Coded in the same format as - -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) - email-address [2] E-mail-Address-List, - ..., - ip-address [3] IPAddress, - --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] - alphanumeric [4] UTF8String, - ip-address-and-port [5] IP-Address-And-Port, - imsi [6] OCTET STRING (SIZE (3..8)), - -- International Mobile Subscriber Identity of the target, encoded in the same format as the - -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. - -- It is described in 3GPP TS 23.003 [37] clause 2.2. - imei [7] OCTET STRING (SIZE (8)), - -- International Mobile Equipment Identity of the target, encoded in the same format as the - -- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6 - fax-url [8] OCTET STRING, - -- see format defined in RFC 2806 [29]. - tel-url [9] OCTET STRING, - -- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. - modem-url [10] OCTET STRING, - -- see format defined in RFC 2806 [29]. - sip-uri [11] OCTET STRING, - -- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. - sips-uri [12] OCTET STRING, - -- see format defined in RFC 3261 [32]. - nai [13] OCTET STRING - -- Network Access Identity of the party, encoded in the same format as used EPS - -- domain in TS 133.108 [5] and defined in RFC 4282 [33]. -} - -IP-Address-And-Port ::= SEQUENCE -{ - ip-address [0] IPAddress, - -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] - port-number [1] INTEGER, - -- port-number is defined by IETF RFC 6533 [35] - ... -} - -Messaging-Party-Validity ::= ENUMERATED -{ - unknown(0), - trusted(1), - untrusted(2), - ... -} - -Messaging-Copy-Qualifier ::= ENUMERATED -{ - unknown(0), - none(1), - cc(2), - bcc(3), - ... -} - - -Messaging-Trigger ::= ENUMERATED -{ - unknown(0), - user(1), - user-agent(2), - system(3), - system-operator(4), - ... -} - -Messaging-Property ::= CHOICE -{ - pincode [0] OCTET STRING (SIZE (1..32)), - ..., - priority [1] Messaging-Property-Priority, - greeting-type [2] Messaging-Property-Greeting-Type, - notification-type [3] Messaging-Property-Notification-Type, - language [4] OCTET STRING, - -- Language according to RFC 3066 [24] - message-identifier [5] OCTET STRING, - subject [6] UTF8String, - user-agent [7] UTF8String, - password [8] OCTET STRING, - message-status [9] Messaging-Property-Message-Status, - requested-reports [10] Messaging-Property-Requested-Reports, - expires [11] GeneralizedTime, - message-date [12] GeneralizedTime -} - -Messaging-Property-Priority ::= ENUMERATED -{ - low(1), - medium(2), - high(3), - private(4), - ... -} - -Messaging-Property-Greeting-Type ::= ENUMERATED -{ - general(1), - name(2), - personal(3), - absence(4), - number(5), - ... -} - -Messaging-Property-Notification-Type ::= ENUMERATED -{ - empty-call(1), - lost-call(2), - ..., - message-to-email(3), - read-report(4), - delivery-report(5), - allow-delivery-report(6), - deny-delivery-report(7), - message-wait-indication(8), - voice-to-text(9), new-message-sms(10), new-message-outcall(11), new-message-reminder(12) -} - -Messaging-Property-Message-Status ::= ENUMERATED -{ - indeterminate(0), - expired(1), - retrieved(2), - rejected(3), - deferred(4), - forwarded(5), - unrecognized(6), - unreachable(7), - read(8), - deleted-without-being-read(9), - delivery-condition-not-met(10), - ... -} - -Messaging-Property-Requested-Reports ::= ENUMERATED -{ - none(0), - delivery(1), - read(2), - delivery-and-read(3), - ... -} - -END -- end of EmailPDU +-- ============================ + +-- Description of the Email PDU + +-- ============================ + + + +EmailPDU + +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} + + + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + + + +IMPORTS + + + + -- from ETSI TS 102 232-1 [3] + + IPAddress + + FROM LI-PS-PDU + + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} + + + + -- from ETSI TS 102 232-5 [38] + + IPMMCC + + FROM IPMultimediaPDU + + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)}; + + + + + +-- ============================ + +-- Object Identifier Definition + +-- ============================ + + + +emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version18(18)} + +emailIRIObjId RELATIVE-OID ::= {emailPDUObjId iRI(1)} + +emailCCObjId RELATIVE-OID ::= {emailPDUObjId cC(2)} + +messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)} + +messagingCCObjId RELATIVE-OID ::= {emailPDUObjId messagingCC(4)} + +messagingMMCCObjId RELATIVE-OID ::= {emailPDUObjId messagingMMCC(5)} + + + + -- definitions are relative to + + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} + + + + + +-- ============================= + +-- Email Communications Contents + +-- ============================= + + + +EmailCC ::= SEQUENCE + + -- EmailCC is the PDU sent for each "piece" of E-mail captured content + +{ + + emailCCObjId [0] RELATIVE-OID, + + email-Format [1] Email-Format, + + content [2] OCTET STRING + + -- Network byte order + +} + + + +Email-Format ::= ENUMERATED + +{ + + ip-packet(1), + + -- When this is the email format, the content will contain the bytes of the IP packet from + + -- the IP header through to the end of the IP packet + + -- Meets requirement E.2.7 + + application(2) + + -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) + + -- Meets requirement E.2.8 + +} + + + +-- ======================================= + +-- Intercept-related information for Email + +-- ======================================= + + + +EmailIRI ::= SEQUENCE + + -- EmailIRI is the PDU sent for each "piece" of E-mail IRI + +{ + + emailIRIObjId [0] RELATIVE-OID, + + eventType [1] E-mail-Event, + + client-Address [2] IPAddress OPTIONAL, + + -- Provided if available + + server-Address [3] IPAddress OPTIONAL, + + -- Provided if available + + client-Port [4] INTEGER OPTIONAL, + + -- Provided if available + + server-Port [5] INTEGER OPTIONAL, + + -- Provided if available + + server-Octets-Sent [6] INTEGER, + + client-Octets-Sent [7] INTEGER, + + protocol-ID [8] E-mail-Protocol, + + e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, + + -- Not available in some cases; if a value is available, it shall be provided. + + -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. + + e-mail-Recipients [10] E-mail-Address-List OPTIONAL, + + -- Not available in some cases; if a value is available, it shall be provided + + -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. + + status [11] E-mail-Status, + + total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, + + message-ID [13] OCTET STRING OPTIONAL, + + -- Network byte order + + nationalParameter [14] OCTET STRING OPTIONAL, + + -- Completely defined on a national basis, including byte ordering + + ..., + + national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, + + -- Completely defined on a national basis + + aAAInformation [16] AAAInformation OPTIONAL, + + e-mail-Sender-Validity [17] ENUMERATED + + { + + validated(0), + + -- The operator has assured the e-mail-sender + + nonvalidated(1), + + -- The operator does not assure the e-mail-sender + + ... + + } OPTIONAL + +} + + + +E-mail-Status ::= ENUMERATED + +{ + + status-unknown(1), + + operation-failed(2), + + operation-succeeded(3) + +} + + + +E-mail-Event ::= ENUMERATED + +{ + + e-mail-send(1), + + e-mail-receive(2), + + e-mail-download(3), + + ..., + + e-mail-logon-attempt(4), + + e-mail-logon(5), + + e-mail-logon-failure(6), + + e-mail-logoff(7), + + e-mail-partial-download(8), + + e-mail-upload(9) + +} + + + +E-mail-Protocol ::= ENUMERATED + +{ + + smtp(1), + + pop3(2), + + imap4(3), + + webmail(4), + + -- See Annex H for more information + + undefined(255), + + -- The protocol is not known or not representable by the current enumeration + + ... + +} + + + +E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) + + + +National-EM-ASN1parameters ::= SEQUENCE + +{ + + countryCode [1] PrintableString (SIZE (2)), + + -- Country Code according to ISO 3166-1 [12], + + -- the country to which the parameters inserted after the extension marker apply + + ... + + -- In case a given country wants to use additional national parameters according to its law, + + -- these national parameters should be defined using the ASN.1 syntax and added after the + + -- extension marker (...) + +} + + + +AAAInformation ::= CHOICE + + -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information + +{ + + pOP3AAAInformation [0] POP3AAAInformation, + + aSMTPAAAInformation [1] ASMTPAAAInformation, + + ..., + + iMAPAAAInformation [2] IMAPAAAInformation + +} + + + +POP3AAAInformation ::= SEQUENCE + + -- The POP3AAAInformation field contains the POP3 username & optionally the password + +{ + + username [0] UTF8String (SIZE (0..64)), + + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + + aAAResult [2] AAAResult OPTIONAL, + + ... + +} + + + +ASMTPAAAInformation ::= SEQUENCE + + -- The ASMTPAAAInformation field contains the SMTP username and + + -- optionally the authentication fields + +{ + + username [0] UTF8String (SIZE (0..64)), + + authMethod [1] AAAauthMethod OPTIONAL, + + -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc + + challenge [2] OCTET STRING OPTIONAL, + + -- A BASE64 encoded challenge send by the SMTP server + + response [3] OCTET STRING OPTIONAL, + + -- A BASE64 encoded hashed response returned by the client + + aAAResult [4] AAAResult OPTIONAL, + + ... + +} + + + +IMAPAAAInformation ::= SEQUENCE + + -- The iMAPAAAInformation field contains the IMAP username & optionally the password + +{ + + username [0] UTF8String (SIZE (0..64)), + + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + + aAAResult [2] AAAResult OPTIONAL, + + ... + +} + + + +AAAResult ::= ENUMERATED + +{ + + resultUnknown(1), + + aAAFailed(2), + + aAASucceeded(3), + + ... + +} + + + +AAAauthMethod ::= ENUMERATED + +{ + + undefinedAuthMethod(1), + + cramMD5(2), + + digestMD5(3), + + ... + +} + + + +-- ================================= + +-- Messaging Communications Contents + +-- ================================= + + + +MessagingCC ::= SEQUENCE + + -- MessagingCC is the PDU sent for the captured content + +{ + + messaging-cc-obj-id [0] RELATIVE-OID, + + event-identifier [1] INTEGER (0..4294967295), + + -- Used to correlate to MessagingIRI within the same CIN + + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + + sequence-number [3] INTEGER (0..4294967295) OPTIONAL, + + end-of-sequence [4] BOOLEAN DEFAULT FALSE, + + content-type [5] OCTET STRING, + + -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA + + content [6] OCTET STRING, + + ..., + + content-transfer-encoding [7] OCTET STRING OPTIONAL + + -- MIME Content-Transfer-Encoding mechanism. + + -- Refer to IETF RFC 2045 [20] + +} + + + + + +MessagingMMCC ::= SEQUENCE + + -- MessagingMMCC is the PDU sent for the captured IPMMCC content + +{ + + messaging-mm-cc-obj-id [0] RELATIVE-OID, + + event-identifier [1] INTEGER (0..4294967295), + + -- Used to correlate to MessagingIRI within the same CIN + + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + + content [3] IPMMCC, + + ... + +} + + + + + +-- =========================================== + +-- Intercept-related information for Messaging + +-- =========================================== + + + +MessagingIRI ::= SEQUENCE + +{ + + messaging-iri-obj-id [0] RELATIVE-OID, + + system-type [1] Messaging-System-Type, + + system-identifier [2] OCTET STRING OPTIONAL, + + -- Identifier up to national agreement, uniquely identifies a certain messaging system + + category [3] Messaging-Event-Category OPTIONAL, + + status [4] Messaging-Status, + + party-information [5] SET OF Messaging-Party-Information OPTIONAL, + + trigger [6] Messaging-Trigger, + + properties [7] SEQUENCE OF Messaging-Property OPTIONAL, + + event-identifier [8] INTEGER (0..4294967295) OPTIONAL, + + -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent + + original-message [9] OCTET STRING OPTIONAL, + + ..., + + box-identifier [10] OCTET STRING OPTIONAL + +} + + + +Messaging-System-Type ::= ENUMERATED + +{ + + unified-messaging(1), + + ... + +} + + + +Messaging-Event-Category ::= CHOICE + +{ + + message [0] Messaging-Event, + + message-box [1] Messaging-Box-Event, + + message-notification [2] Messaging-Notification-Event, + + call [3] Messaging-Call-Event, + + ... + +} + + + +Messaging-Event ::= ENUMERATED + +{ + + deposit(1), + + retrieve(2), + + delete(3), + + save(4), + + slamdown(5), + + ..., + + calendar(6), + + contact(7) + +} + + + +Messaging-Box-Event ::= ENUMERATED + +{ + + login(1), + + logout(2), + + lock(3), + + unlock(4), + + activate(5), + + deactivate(6), + + delete(7), + + pin-change(8), + + greeting-record(9), + + greeting-change(10), + + greeting-delete(11), + + greeting-enable(12), + + greeting-disable(13), + + notification-enable(14), + + notification-disable(15), + + disconnect(16), + + connect(17), + + ..., + + unknown(0), + + greeting-play(18), + + language-change(19), + + pin-security-enable(20), + + pin-security-disable(21), + + personal-operator-add(22), + + personal-operator-change(23), + + personal-operator-remove(24), + + additional-destination-add(25), + + additional-destination-change(26), + + additional-destination-remove(27), + + auto-play-enable(28), + + auto-play-disable(29), + + header-play-enable(30), + + header-play-disable(31) + +} + + + +Messaging-Notification-Event ::= ENUMERATED + +{ + + sms(1), + + sms-deposit(2), + + sms-slamdown(3), + + sms-pin-reminder(4), + + email(5), + + fax-to-email(6), + + ..., + + mms(7), + + generic(8) + +} + + + +Messaging-Call-Event ::= ENUMERATED + +{ + + callout(1), + + ... + +} + + + +Messaging-Status ::= ENUMERATED + +{ + + unknown(0), + + not-applicable(1), + + operation-failed(2), + + operation-succeeded(3), + + operation-cancelled(4), + + operation-started(5), + + ..., + + operation-lost(6) + +} + + + +Messaging-Party-Information ::= SEQUENCE + +{ + + party-qualifier [0] Messaging-Party-Qualifier, + + party-identity [1] Messaging-Party-Identity, + + ..., + + party-validity [2] Messaging-Party-Validity OPTIONAL, + + copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL + +} + + + +Messaging-Party-Qualifier ::= ENUMERATED + +{ + + unknown-party(0), + + -- In this case the party cannot be classified as either originating or terminating + + originating-party(1), + + -- In this case, the partyInformation parameter provides the identities related to + + -- the originating party and all information provided by this party. + + terminating-party(2), + + -- In this case, the partyInformation parameter provides the identities related to + + -- the terminating party and all information provided by this party. + + ..., + + associated-party(3) + + -- In this case, the partyInformation parameter provides the identities related to + + -- an associated party and all information provided by this party. + +} + + + +Messaging-Party-Identity ::= CHOICE + +{ + + msisdn [0] OCTET STRING (SIZE (1..9)), + + -- MSISDN of the target, encoded in the same format as the AddressString + + -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. + + e164-format [1] OCTET STRING (SIZE (1..25)), + + -- E.164 address of the node in international format. Coded in the same format as + + -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) + + email-address [2] E-mail-Address-List, + + -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. + + ..., + + ip-address [3] IPAddress, + + –-IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] + + alphanumeric [4] UTF8String, + + ip-address-and-port [5] IP-Address-And-Port, + + imsi [6] OCTET STRING (SIZE (3..8)), + + -- International Mobile Subscriber Identity of the target, encoded in the same format as the + + -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. + + -- It is described in 3GPP TS 23.003 [37] clause 2.2. + + imei [7] OCTET STRING (SIZE (8)), + + -- International Mobile Equipment Identity of the target, encoded in the same format as the + + -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. + + –- It is defined in 3GPP TS 23.003 [37] clause 6. + + fax-url [8] OCTET STRING, + + -- see format defined in RFC 2806 [29]. + + tel-url [9] OCTET STRING, + + -- see format used in 3GPP TS 33.108 [5], 3GPP TS 24.229 [30] and defined in RFC 2806 [29]. + + modem-url [10] OCTET STRING, + + -- see format defined in RFC 2806 [29]. + + sip-uri [11] OCTET STRING, + + -- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32]. + + sips-uri [12] OCTET STRING, + + -- see format defined in RFC 3261 [32]. + + nai [13] OCTET STRING + + -- Network Access Identity of the party, encoded in the same format as used EPS + + –- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33]. + +} + + + +IP-Address-And-Port ::= SEQUENCE + +{ + + ip-address [0] IPAddress, + + –- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] + + port-number [1] INTEGER, + + –- port-number is defined by IETF RFC 6335 [35] + + ... + +} + + + +Messaging-Party-Validity ::= ENUMERATED + +{ + + unknown(0), + + trusted(1), + + untrusted(2), + + ... + +} + + + +Messaging-Copy-Qualifier ::= ENUMERATED + +{ + + unknown(0), + + none(1), + + cc(2), + + bcc(3), + + ... + +} + + + +Messaging-Trigger ::= ENUMERATED + +{ + + unknown(0), + + user(1), + + user-agent(2), + + system(3), + + system-operator(4), + + ... + +} + + + +Messaging-Property ::= CHOICE + +{ + + pincode [0] OCTET STRING (SIZE (1..32)), + + ..., + + priority [1] Messaging-Property-Priority, + + greeting-type [2] Messaging-Property-Greeting-Type, + + notification-type [3] Messaging-Property-Notification-Type, + + language [4] OCTET STRING, + + -- Language according to RFC 4646 [24] + + message-identifier [5] OCTET STRING, + + subject [6] UTF8String, + + user-agent [7] UTF8String, + + password [8] OCTET STRING, + + message-status [9] Messaging-Property-Message-Status, + + requested-reports [10] Messaging-Property-Requested-Reports, + + expires [11] GeneralizedTime, + + message-date [12] GeneralizedTime + +} + + + +Messaging-Property-Priority ::= ENUMERATED + +{ + + low(1), + + medium(2), + + high(3), + + private(4), + + ... + +} + + + +Messaging-Property-Greeting-Type ::= ENUMERATED + +{ + + general(1), + + name(2), + + personal(3), + + absence(4), + + number(5), + + ... + +} + + + +Messaging-Property-Notification-Type ::= ENUMERATED + +{ + + empty-call(1), + + lost-call(2), + + ..., + + message-to-email(3), + + read-report(4), + + delivery-report(5), + + allow-delivery-report(6), + + deny-delivery-report(7), + + message-wait-indication(8), + + voice-to-text(9), + + new-message-sms(10), + + new-message-outcall(11), + + new-message-reminder(12) + +} + + + +Messaging-Property-Message-Status ::= ENUMERATED + +{ + + indeterminate(0), + + expired(1), + + retrieved(2), + + rejected(3), + + deferred(4), + + forwarded(5), + + unrecognized(6), + + unreachable(7), + + read(8), + + deleted-without-being-read(9), + + delivery-condition-not-met(10), + + ... + +} + + + +Messaging-Property-Requested-Reports ::= ENUMERATED + +{ + + none(0), + + delivery(1), + + read(2), + + delivery-and-read(3), + + ... + +} + + + +END -- end of EmailPDU \ No newline at end of file diff --git a/102232-2/portal/EmailPDU,ver17.txt b/102232-2/portal/EmailPDU,ver18.txt similarity index 79% rename from 102232-2/portal/EmailPDU,ver17.txt rename to 102232-2/portal/EmailPDU,ver18.txt index 881e769..3487f53 100644 --- a/102232-2/portal/EmailPDU,ver17.txt +++ b/102232-2/portal/EmailPDU,ver18.txt @@ -1,17 +1,21 @@ +-- ============================ +-- Description of the Email PDU +-- ============================ + EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from TS 102 232-1 [3] + -- from ETSI TS 102 232-1 [3] IPAddress FROM LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} - -- from TS 102 232-5 [38] + -- from ETSI TS 102 232-5 [38] IPMMCC FROM IPMultimediaPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)}; @@ -21,11 +25,12 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingMMCC(5)} +emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version18(18)} +emailIRIObjId RELATIVE-OID ::= {emailPDUObjId iRI(1)} +emailCCObjId RELATIVE-OID ::= {emailPDUObjId cC(2)} +messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {emailPDUObjId messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {emailPDUObjId messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -76,9 +81,11 @@ EmailIRI ::= SEQUENCE client-Octets-Sent [7] INTEGER, protocol-ID [8] E-mail-Protocol, e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, - -- Not available in some cases; if a value is available, it must be provided + -- Not available in some cases; if a value is available, it shall be provided. + -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. e-mail-Recipients [10] E-mail-Address-List OPTIONAL, - -- Not available in some cases; if a value is available, it must be provided + -- Not available in some cases; if a value is available, it shall be provided + -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. status [11] E-mail-Status, total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, message-ID [13] OCTET STRING OPTIONAL, @@ -149,7 +156,7 @@ AAAInformation ::= CHOICE -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information { pOP3AAAInformation [0] POP3AAAInformation, - aSMTPAAAInformation [1] ASMTPAAAInformation, + aSMTPAAAInformation [1] ASMTPAAAInformation, ..., iMAPAAAInformation [2] IMAPAAAInformation } @@ -210,7 +217,7 @@ AAAauthMethod ::= ENUMERATED MessagingCC ::= SEQUENCE -- MessagingCC is the PDU sent for the captured content { - messaging-cc-obj-id [0] RELATIVE-OID, + messaging-cc-obj-id [0] RELATIVE-OID, event-identifier [1] INTEGER (0..4294967295), -- Used to correlate to MessagingIRI within the same CIN content-identifier [2] INTEGER (0..4294967295) OPTIONAL, @@ -225,6 +232,7 @@ MessagingCC ::= SEQUENCE -- Refer to IETF RFC 2045 [20] } + MessagingMMCC ::= SEQUENCE -- MessagingMMCC is the PDU sent for the captured IPMMCC content { @@ -306,8 +314,7 @@ Messaging-Box-Event ::= ENUMERATED disconnect(16), connect(17), ..., - unknown(0), - + unknown(0), greeting-play(18), language-change(19), pin-security-enable(20), @@ -317,7 +324,11 @@ Messaging-Box-Event ::= ENUMERATED personal-operator-remove(24), additional-destination-add(25), additional-destination-change(26), - additional-destination-remove(27), auto-play-enable(28), auto-play-disable(29), header-play-enable(30), header-play-disable(31) + additional-destination-remove(27), + auto-play-enable(28), + auto-play-disable(29), + header-play-enable(30), + header-play-disable(31) } Messaging-Notification-Event ::= ENUMERATED @@ -357,7 +368,7 @@ Messaging-Party-Information ::= SEQUENCE party-identity [1] Messaging-Party-Identity, ..., party-validity [2] Messaging-Party-Validity OPTIONAL, - copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL + copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL } Messaging-Party-Qualifier ::= ENUMERATED @@ -372,52 +383,54 @@ Messaging-Party-Qualifier ::= ENUMERATED -- the terminating party and all information provided by this party. ..., associated-party(3) - -- In this case, the partyInformation parameter provides the identites related to - -- an associated party and all information provided by this party + -- In this case, the partyInformation parameter provides the identities related to + -- an associated party and all information provided by this party. } Messaging-Party-Identity ::= CHOICE { - msisdn [0] OCTET STRING (SIZE (1..9)), + msisdn [0] OCTET STRING (SIZE (1..9)), -- MSISDN of the target, encoded in the same format as the AddressString -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. - e164-format [1] OCTET STRING (SIZE (1..25)), + e164-format [1] OCTET STRING (SIZE (1..25)), -- E.164 address of the node in international format. Coded in the same format as -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) - email-address [2] E-mail-Address-List, + email-address [2] E-mail-Address-List, + -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. ..., - ip-address [3] IPAddress, - --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] - alphanumeric [4] UTF8String, - ip-address-and-port [5] IP-Address-And-Port, - imsi [6] OCTET STRING (SIZE (3..8)), + ip-address [3] IPAddress, + –-IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] + alphanumeric [4] UTF8String, + ip-address-and-port [5] IP-Address-And-Port, + imsi [6] OCTET STRING (SIZE (3..8)), -- International Mobile Subscriber Identity of the target, encoded in the same format as the -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. -- It is described in 3GPP TS 23.003 [37] clause 2.2. - imei [7] OCTET STRING (SIZE (8)), + imei [7] OCTET STRING (SIZE (8)), -- International Mobile Equipment Identity of the target, encoded in the same format as the - -- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6 - fax-url [8] OCTET STRING, + -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. + –- It is defined in 3GPP TS 23.003 [37] clause 6. + fax-url [8] OCTET STRING, -- see format defined in RFC 2806 [29]. - tel-url [9] OCTET STRING, - -- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. - modem-url [10] OCTET STRING, + tel-url [9] OCTET STRING, + -- see format used in 3GPP TS 33.108 [5], 3GPP TS 24.229 [30] and defined in RFC 2806 [29]. + modem-url [10] OCTET STRING, -- see format defined in RFC 2806 [29]. - sip-uri [11] OCTET STRING, - -- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. - sips-uri [12] OCTET STRING, + sip-uri [11] OCTET STRING, + -- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32]. + sips-uri [12] OCTET STRING, -- see format defined in RFC 3261 [32]. - nai [13] OCTET STRING + nai [13] OCTET STRING -- Network Access Identity of the party, encoded in the same format as used EPS - -- domain in TS 133.108 [5] and defined in RFC 4282 [33]. + –- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33]. } IP-Address-And-Port ::= SEQUENCE { ip-address [0] IPAddress, - -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] + –- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] port-number [1] INTEGER, - -- port-number is defined by IETF RFC 6533 [35] + –- port-number is defined by IETF RFC 6335 [35] ... } @@ -438,7 +451,6 @@ Messaging-Copy-Qualifier ::= ENUMERATED ... } - Messaging-Trigger ::= ENUMERATED { unknown(0), @@ -457,9 +469,9 @@ Messaging-Property ::= CHOICE greeting-type [2] Messaging-Property-Greeting-Type, notification-type [3] Messaging-Property-Notification-Type, language [4] OCTET STRING, - -- Language according to RFC 3066 [24] - message-identifier [5] OCTET STRING, - subject [6] UTF8String, + -- Language according to RFC 4646 [24] + message-identifier [5] OCTET STRING, + subject [6] UTF8String, user-agent [7] UTF8String, password [8] OCTET STRING, message-status [9] Messaging-Property-Message-Status, @@ -498,7 +510,10 @@ Messaging-Property-Notification-Type ::= ENUMERATED allow-delivery-report(6), deny-delivery-report(7), message-wait-indication(8), - voice-to-text(9), new-message-sms(10), new-message-outcall(11), new-message-reminder(12) + voice-to-text(9), + new-message-sms(10), + new-message-outcall(11), + new-message-reminder(12) } Messaging-Property-Message-Status ::= ENUMERATED -- GitLab From a651520f2549370ce75bfd667e5c8a0b924b8568 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 20 Sep 2021 08:37:44 +0100 Subject: [PATCH 159/208] TS 103 221-1 v1.9.1 --- 103221-1/TS_103_221_01.xsd | 4 +++- .../{TS_103_221_01_v010801.xsd => TS_103_221_01_v010901.xsd} | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) rename 103221-1/portal/{TS_103_221_01_v010801.xsd => TS_103_221_01_v010901.xsd} (99%) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 2cf5206..d06eb9f 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -154,6 +154,7 @@ + @@ -251,6 +252,7 @@ + @@ -787,4 +789,4 @@ - + \ No newline at end of file diff --git a/103221-1/portal/TS_103_221_01_v010801.xsd b/103221-1/portal/TS_103_221_01_v010901.xsd similarity index 99% rename from 103221-1/portal/TS_103_221_01_v010801.xsd rename to 103221-1/portal/TS_103_221_01_v010901.xsd index 2cf5206..4fc4676 100644 --- a/103221-1/portal/TS_103_221_01_v010801.xsd +++ b/103221-1/portal/TS_103_221_01_v010901.xsd @@ -154,6 +154,7 @@ + @@ -251,6 +252,7 @@ + -- GitLab From 5b86d671c24c9d881491ec3e8262a8bdaa24d99f Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 20 Sep 2021 08:41:43 +0100 Subject: [PATCH 160/208] TS 103 120 v1.9.1 --- .../dictionaries/ts_103120_Dictionaries.xsd | 1 - ...sd => ts_103120v010901p0_Dictionaries.xsd} | 0 ...20v010901p0_ETSIDictionaryDefinitions.xml} | 0 103120/portal/examples/example.key | 28 +++++ 103120/portal/examples/example.pem | 19 +++ .../mutliple-auth-example-request.xml | 2 +- 103120/portal/examples/request1.xml | 2 +- 103120/portal/examples/request2.xml | 2 +- 103120/portal/examples/request3.xml | 2 +- 103120/portal/examples/request4.xml | 2 +- .../examples/request5-Binary-Delivery.xml | 2 +- .../portal/examples/request5-XML-Delivery.xml | 2 +- 103120/portal/examples/request6.xml | 82 ++++++++++++ 103120/portal/examples/request6_signed.xml | 118 ++++++++++++++++++ 103120/portal/examples/response1.xml | 2 +- 103120/portal/examples/response2.xml | 2 +- 103120/portal/examples/response3.xml | 2 +- 103120/portal/examples/response4.xml | 2 +- 103120/portal/examples/response5.xml | 2 +- 103120/portal/examples/response6.xml | 38 ++++++ ...d => ts_103120v010901p0_Authorisation.xsd} | 0 ...mmon.xsd => ts_103120v010901p0_Common.xsd} | 0 ...0_Core.xsd => ts_103120v010901p0_Core.xsd} | 4 + ...ry.xsd => ts_103120v010901p0_Delivery.xsd} | 0 ...nt.xsd => ts_103120v010901p0_Document.xsd} | 0 ...sd => ts_103120v010901p0_Notification.xsd} | 0 ...0_Task.xsd => ts_103120v010901p0_Task.xsd} | 0 103120/schema/ts_103120_Core.xsd | 4 + 28 files changed, 305 insertions(+), 13 deletions(-) rename 103120/portal/dictionaries/{ts_103120v010801p0_Dictionaries.xsd => ts_103120v010901p0_Dictionaries.xsd} (100%) rename 103120/portal/dictionaries/{ts_103120v010801p0_ETSIDictionaryDefinitions.xml => ts_103120v010901p0_ETSIDictionaryDefinitions.xml} (100%) create mode 100644 103120/portal/examples/example.key create mode 100644 103120/portal/examples/example.pem create mode 100644 103120/portal/examples/request6.xml create mode 100644 103120/portal/examples/request6_signed.xml create mode 100644 103120/portal/examples/response6.xml rename 103120/portal/schema/{ts_103120v010801p0_Authorisation.xsd => ts_103120v010901p0_Authorisation.xsd} (100%) rename 103120/portal/schema/{ts_103120v010801p0_Common.xsd => ts_103120v010901p0_Common.xsd} (100%) rename 103120/portal/schema/{ts_103120v010801p0_Core.xsd => ts_103120v010901p0_Core.xsd} (96%) rename 103120/portal/schema/{ts_103120v010801p0_Delivery.xsd => ts_103120v010901p0_Delivery.xsd} (100%) rename 103120/portal/schema/{ts_103120v010801p0_Document.xsd => ts_103120v010901p0_Document.xsd} (100%) rename 103120/portal/schema/{ts_103120v010801p0_Notification.xsd => ts_103120v010901p0_Notification.xsd} (100%) rename 103120/portal/schema/{ts_103120v010801p0_Task.xsd => ts_103120v010901p0_Task.xsd} (100%) diff --git a/103120/dictionaries/ts_103120_Dictionaries.xsd b/103120/dictionaries/ts_103120_Dictionaries.xsd index a5e9b66..5d307ce 100644 --- a/103120/dictionaries/ts_103120_Dictionaries.xsd +++ b/103120/dictionaries/ts_103120_Dictionaries.xsd @@ -29,4 +29,3 @@ - diff --git a/103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd b/103120/portal/dictionaries/ts_103120v010901p0_Dictionaries.xsd similarity index 100% rename from 103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd rename to 103120/portal/dictionaries/ts_103120v010901p0_Dictionaries.xsd diff --git a/103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml b/103120/portal/dictionaries/ts_103120v010901p0_ETSIDictionaryDefinitions.xml similarity index 100% rename from 103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml rename to 103120/portal/dictionaries/ts_103120v010901p0_ETSIDictionaryDefinitions.xml diff --git a/103120/portal/examples/example.key b/103120/portal/examples/example.key new file mode 100644 index 0000000..b5959e7 --- /dev/null +++ b/103120/portal/examples/example.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDc9UQSsRmchhOC +ixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvMOyvBCHq4c3M8hBxt9zKD +mV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3Jpyx3b4r8IVoUDXai2sjX +8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8FJfRl2ttWlSFMA2252ak +OwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAafTFV1eM/dTOSEKYCHVCN0 +cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eTPunYJGanai6PLLr5zNWX +lvcj/YbZAgMBAAECggEAbm1BPRo3U4uKWpaNmFPdrU3VdlYK9CUCgU8X2PPF4HRN +TAiBZG6smGqocIQt5MYJFv/T2q2ny6lcHHrdT0BHxpoRRYMqIsZ26bk+o7DxheqU +LiPdGtiyaX+6CZq71WDwk/tTGmx0GwW+lHXdv9h+iLQxGD4nVXoxWAPgxdEGnONY +gSYbOhXz+MEFZaW8HnVPfoA+RR9Hg59gnmBCZlhbahqf3WnjAwgS0nsbSUN57wVi +FcWHWLyzv94bQHcTgalXqVakQv5+ymJKF4ImiYUP2rLPQ8ubqwmdQ6xI8Gp3AGCr +FY5koP3JT2mMY+aZJEEGWE3U4JRDyrkOpI34No8iEQKBgQD6niFOopCjE2k7eIFr +c+s5Khp3ITmcgV4tycxngXOQw8GnPEzzZUW7xodTiMPLYz/8lFbJvCAWCeQpmVWX +U8OX9anzY0U0ILbolXpdpGdZkBHbKWtAVBNOZ/lY0SAmt6/ZWf/EcqpMm/fH+iph +aqafwQuX4qhy9HlwY2qwyj5y5QKBgQDhtBH9/9Hy0X2HI+uzNRaU0y1BqvuqjHOf +1v57DM5uYF0MAp1SAfAJcx+jUXdf28Nr4GlxBIvQumq6rsvfKhqBINsKgJf/4+PA +Lv+fofeUEEqrGHuecB4NbdHP5XIIiuyyuOtRhGq/sclOQSZAa1kxajGvDI1AVHL4 +LCwcy9HA5QKBgQDIq+2HhWvC6DwOvoMCgyMJ9siSMyxqQLwkdb0R8/mRJO3e9s22 +5pRbsq+RF6WPKb2GhVCo39XhT7I+DOUX8p5fAvo+RHKZNsi+m1ILwSRv9ogVsKiM +LcX3thFWKL1RwysvIn1F03rBNPHGUm206yzYJj8eMwMmaNMERtabEJXIcQKBgHct +Kvbwlr5daafrCrDkzlilLVdoXlzOrtrung8BUxsrHNaTptg/l6yVslX9VUgzdXvH +0kVP/jenx2VtmM7sn3Qhkid4gUon3gGDj4yN7HmtJJA1bEjbsLKsk0XwRIdIO/We ++PphLjCsQrxkYDtRs5YJGdTxjsAyF0b9pAlMgiQVAoGBAK/NGV5+IPDHEmz0CNJN +ApaA2jG8KrsIPWNpgOC3CxPMT3kWYK601y0CLw8ZpUnVTMfPkKMSOVsqaOpHV6eP +Oecq3bP1CiNunro+j3EOIDIST2ttrlNuKIBaiz63ZMNDbs/DyaGL8Zf688OJCXsb +yCWSJh8NbrNblNfI0jaMoTGw +-----END PRIVATE KEY----- diff --git a/103120/portal/examples/example.pem b/103120/portal/examples/example.pem new file mode 100644 index 0000000..2aa1eac --- /dev/null +++ b/103120/portal/examples/example.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIC/zCCAeegAwIBAgIUUOGdj0hEfnnW9gqIOCTJ9EUocnMwDQYJKoZIhvcNAQEL +BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTA2MjUwNzIyMDlaFw0yNDAzMjEwNzIy +MDlaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQDc9UQSsRmchhOCixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvM +OyvBCHq4c3M8hBxt9zKDmV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3J +pyx3b4r8IVoUDXai2sjX8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8 +FJfRl2ttWlSFMA2252akOwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAaf +TFV1eM/dTOSEKYCHVCN0cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eT +PunYJGanai6PLLr5zNWXlvcj/YbZAgMBAAGjUzBRMB0GA1UdDgQWBBSFT3NqexF1 +LcYkjqUr9MMTIFp/ATAfBgNVHSMEGDAWgBSFT3NqexF1LcYkjqUr9MMTIFp/ATAP +BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCzwydpNgq680qWmd0D +4ya9fHUopeX7LBSYOU7NU3CagjXnUMwaCmSpokkH0Wvn1UtXDUF+slA9bEeXkfZm +70YW8msIEt1mljDi4CBI+MvaJ40OJkXwkQUE3dhj9LJl5Nv0UBEyv7k/a/6+eO9K +OQoHIVqXwrWs9JHTW6T4diN1w7xcgvSXhlcOySHjfNzFzferqx8i0/Wz6jD/7YSC +FOEaUrXbeFS3asRoZRLW6uXgfDJ7qfCmUZZ853OF3MN63OwWjPGxtFmeZAqMS/K0 +FKgwMCrmZlVq6Fx87E+sc3eppXIceCau/+CHG91mRvMSha6jQD7jLMT9xjND5Dob +/scV +-----END CERTIFICATE----- diff --git a/103120/portal/examples/mutliple-auth-example-request.xml b/103120/portal/examples/mutliple-auth-example-request.xml index 5e5f226..2b8ec47 100644 --- a/103120/portal/examples/mutliple-auth-example-request.xml +++ b/103120/portal/examples/mutliple-auth-example-request.xml @@ -12,7 +12,7 @@ d442c58c-d5e1-4fd9-90ec-9c228ad947f1 2020-09-22T08:06:17.025833Z - V1.8.1 + V1.9.1 XX v1.1.1 diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml index e8b6a5f..84ad5c9 100644 --- a/103120/portal/examples/request1.xml +++ b/103120/portal/examples/request1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml index 67cbefd..7daae44 100644 --- a/103120/portal/examples/request2.xml +++ b/103120/portal/examples/request2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml index 5da0df3..714741b 100644 --- a/103120/portal/examples/request3.xml +++ b/103120/portal/examples/request3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml index 555974f..48cb79d 100644 --- a/103120/portal/examples/request4.xml +++ b/103120/portal/examples/request4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request5-Binary-Delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml index 7d51707..49b3ef3 100644 --- a/103120/portal/examples/request5-Binary-Delivery.xml +++ b/103120/portal/examples/request5-Binary-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml index f9314cd..afefbec 100644 --- a/103120/portal/examples/request5-XML-Delivery.xml +++ b/103120/portal/examples/request5-XML-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request6.xml b/103120/portal/examples/request6.xml new file mode 100644 index 0000000..7fb4018 --- /dev/null +++ b/103120/portal/examples/request6.xml @@ -0,0 +1,82 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + 9964584e-c1a5-4ffa-b949-d9da504c4efb + 2021-06-25T12:00:00.000000Z + + V1.9.1 + XX + v1.0 + +
+ + + + + 0 + + + 68c78910-c922-45f2-aeb3-017eb958bb05 + XX + ACTOR01 + W000001 + + 2021-06-25T12:00:00Z + 2021-09-01T12:00:00Z + + + + + + 1 + + + 4d8127db-e8bc-4a69-9378-457f0424ec2c + XX + ACTOR01 + + 68c78910-c922-45f2-aeb3-017eb958bb05 + + LIID1 + + + + + ETSI + InternationalizedEmailAddress + + Όνομα.παραδείγματος@example.com + + + + + ETSI + TaskDeliveryType + IRIandCC + + + + + 192.0.2.0 + + + + + XX + RECVER01 + + + + + + + + diff --git a/103120/portal/examples/request6_signed.xml b/103120/portal/examples/request6_signed.xml new file mode 100644 index 0000000..2bc0404 --- /dev/null +++ b/103120/portal/examples/request6_signed.xml @@ -0,0 +1,118 @@ + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + 9964584e-c1a5-4ffa-b949-d9da504c4efb + 2021-06-25T12:00:00.000000Z + + V1.9.1 + XX + v1.0 + +
+ + + + + 0 + + + 68c78910-c922-45f2-aeb3-017eb958bb05 + XX + ACTOR01 + W000001 + + 2021-06-25T12:00:00Z + 2021-09-01T12:00:00Z + + + + + + 1 + + + 4d8127db-e8bc-4a69-9378-457f0424ec2c + XX + ACTOR01 + + 68c78910-c922-45f2-aeb3-017eb958bb05 + + LIID1 + + + + + ETSI + InternationalizedEmailAddress + + Όνομα.παραδείγματος@example.com + + + + + ETSI + TaskDeliveryType + IRIandCC + + + + + 192.0.2.0 + + + + + XX + RECVER01 + + + + + + + + + + + + + + + + + + kARbaz+wH6oJWSvmy6Fk4vTQ7t4m3Y16IiNNdDO08/I= + + + DdT9ie03Z9O47sN8ad9gsfuhZhchtNhtvTyNhtiHKuqgNCt696tDH2c68tVqr+iJ3WpCn0gWJHKnYeniTwVPj6fxDh2RbCqk5SVHvdggZjCv3BInNH0ZfOrlvuArJS3UP/gifYXlT5s59Seze1nSjZDNeC25o9WRxNy0krGrhbqIFjxTHDilR40cmKq2SI1540yM3rsc+5D3hgsxGu7ly2dg7qtiFGQIQaFJi8twrViQUnOyDZ63yJHhWeLVU+2FvIuBZh3orDc3VipKsbqrjrDqdfi8qfYEHHPp25DfTpHXnCuhD/3hOwcxvhVJ4+47R8ysO9qMTvGRCUNptgskhQ== + + + MIIC/zCCAeegAwIBAgIUUOGdj0hEfnnW9gqIOCTJ9EUocnMwDQYJKoZIhvcNAQEL +BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTA2MjUwNzIyMDlaFw0yNDAzMjEwNzIy +MDlaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQDc9UQSsRmchhOCixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvM +OyvBCHq4c3M8hBxt9zKDmV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3J +pyx3b4r8IVoUDXai2sjX8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8 +FJfRl2ttWlSFMA2252akOwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAaf +TFV1eM/dTOSEKYCHVCN0cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eT +PunYJGanai6PLLr5zNWXlvcj/YbZAgMBAAGjUzBRMB0GA1UdDgQWBBSFT3NqexF1 +LcYkjqUr9MMTIFp/ATAfBgNVHSMEGDAWgBSFT3NqexF1LcYkjqUr9MMTIFp/ATAP +BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCzwydpNgq680qWmd0D +4ya9fHUopeX7LBSYOU7NU3CagjXnUMwaCmSpokkH0Wvn1UtXDUF+slA9bEeXkfZm +70YW8msIEt1mljDi4CBI+MvaJ40OJkXwkQUE3dhj9LJl5Nv0UBEyv7k/a/6+eO9K +OQoHIVqXwrWs9JHTW6T4diN1w7xcgvSXhlcOySHjfNzFzferqx8i0/Wz6jD/7YSC +FOEaUrXbeFS3asRoZRLW6uXgfDJ7qfCmUZZ853OF3MN63OwWjPGxtFmeZAqMS/K0 +FKgwMCrmZlVq6Fx87E+sc3eppXIceCau/+CHG91mRvMSha6jQD7jLMT9xjND5Dob +/scV + + + + + \ No newline at end of file diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml index 25aa22c..e4faf00 100644 --- a/103120/portal/examples/response1.xml +++ b/103120/portal/examples/response1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml index 9ae5d35..0675cb2 100644 --- a/103120/portal/examples/response2.xml +++ b/103120/portal/examples/response2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml index e3b1537..2412b18 100644 --- a/103120/portal/examples/response3.xml +++ b/103120/portal/examples/response3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml index a8dc811..a7f9e94 100644 --- a/103120/portal/examples/response4.xml +++ b/103120/portal/examples/response4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml index e210444..336c29f 100644 --- a/103120/portal/examples/response5.xml +++ b/103120/portal/examples/response5.xml @@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/response6.xml b/103120/portal/examples/response6.xml new file mode 100644 index 0000000..3656eeb --- /dev/null +++ b/103120/portal/examples/response6.xml @@ -0,0 +1,38 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + 9964584e-c1a5-4ffa-b949-d9da504c4efb + 2021-06-25T12:00:01.000000Z + + V1.9.1 + XX + v1.0 + +
+ + + + + 0 + + 68c78910-c922-45f2-aeb3-017eb958bb05 + + + + 1 + + 4d8127db-e8bc-4a69-9378-457f0424ec2c + + + + + + diff --git a/103120/portal/schema/ts_103120v010801p0_Authorisation.xsd b/103120/portal/schema/ts_103120v010901p0_Authorisation.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Authorisation.xsd rename to 103120/portal/schema/ts_103120v010901p0_Authorisation.xsd diff --git a/103120/portal/schema/ts_103120v010801p0_Common.xsd b/103120/portal/schema/ts_103120v010901p0_Common.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Common.xsd rename to 103120/portal/schema/ts_103120v010901p0_Common.xsd diff --git a/103120/portal/schema/ts_103120v010801p0_Core.xsd b/103120/portal/schema/ts_103120v010901p0_Core.xsd similarity index 96% rename from 103120/portal/schema/ts_103120v010801p0_Core.xsd rename to 103120/portal/schema/ts_103120v010901p0_Core.xsd index da3bc56..af1674d 100644 --- a/103120/portal/schema/ts_103120v010801p0_Core.xsd +++ b/103120/portal/schema/ts_103120v010901p0_Core.xsd @@ -2,6 +2,7 @@ + @@ -16,6 +18,8 @@ + + diff --git a/103120/portal/schema/ts_103120v010801p0_Delivery.xsd b/103120/portal/schema/ts_103120v010901p0_Delivery.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Delivery.xsd rename to 103120/portal/schema/ts_103120v010901p0_Delivery.xsd diff --git a/103120/portal/schema/ts_103120v010801p0_Document.xsd b/103120/portal/schema/ts_103120v010901p0_Document.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Document.xsd rename to 103120/portal/schema/ts_103120v010901p0_Document.xsd diff --git a/103120/portal/schema/ts_103120v010801p0_Notification.xsd b/103120/portal/schema/ts_103120v010901p0_Notification.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Notification.xsd rename to 103120/portal/schema/ts_103120v010901p0_Notification.xsd diff --git a/103120/portal/schema/ts_103120v010801p0_Task.xsd b/103120/portal/schema/ts_103120v010901p0_Task.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Task.xsd rename to 103120/portal/schema/ts_103120v010901p0_Task.xsd diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index da3bc56..af1674d 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -2,6 +2,7 @@ + @@ -16,6 +18,8 @@ + + -- GitLab From cf6a40bd76b3429c06f682b34afcecd88b8b8237 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 20 Sep 2021 08:43:02 +0100 Subject: [PATCH 161/208] TS 103 707 v1.3.1 --- 103707/TS_103_707.xsd | 11 ++- ...707_v010201.xsd => TS_103_707_v010301.xsd} | 11 ++- .../examples/example_multiple_items.xml | 75 +++++++++++++++++++ 103707/portal/testing/validate_examples.py | 5 +- 4 files changed, 96 insertions(+), 6 deletions(-) rename 103707/portal/{TS_103_707_v010201.xsd => TS_103_707_v010301.xsd} (95%) create mode 100644 103707/portal/examples/example_multiple_items.xml diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd index 2f33c56..b503368 100644 --- a/103707/TS_103_707.xsd +++ b/103707/TS_103_707.xsd @@ -3,7 +3,7 @@ xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" - version="1.1.1" + version="1.3.1" elementFormDefault="qualified"> @@ -13,13 +13,20 @@ - + + + + + + + + diff --git a/103707/portal/TS_103_707_v010201.xsd b/103707/portal/TS_103_707_v010301.xsd similarity index 95% rename from 103707/portal/TS_103_707_v010201.xsd rename to 103707/portal/TS_103_707_v010301.xsd index 2f33c56..b503368 100644 --- a/103707/portal/TS_103_707_v010201.xsd +++ b/103707/portal/TS_103_707_v010301.xsd @@ -3,7 +3,7 @@ xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" - version="1.1.1" + version="1.3.1" elementFormDefault="qualified"> @@ -13,13 +13,20 @@ - + + + + + + + + diff --git a/103707/portal/examples/example_multiple_items.xml b/103707/portal/examples/example_multiple_items.xml new file mode 100644 index 0000000..6913c2b --- /dev/null +++ b/103707/portal/examples/example_multiple_items.xml @@ -0,0 +1,75 @@ + + + + +
+ + + + + target@example.com + + true + + + + + someoneelse@example.com + + + + 2021-06-17T06:42:23.000000+01:00 + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + Foo + Bar + Baz + + + + + + + +
+ + + + + someoneelse@example.com + + + + + + target@example.com + + true + + + 2021-06-18T06:42:23.000000+01:00 + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + Foo + Bar + Baz + + + + + + + + diff --git a/103707/portal/testing/validate_examples.py b/103707/portal/testing/validate_examples.py index fbcf21f..82d6df7 100644 --- a/103707/portal/testing/validate_examples.py +++ b/103707/portal/testing/validate_examples.py @@ -1,5 +1,6 @@ import glob import sys +import argparse from pathlib import Path from pprint import pprint @@ -21,7 +22,7 @@ if __name__ == '__main__': extraSchemas = [ 'examples/FooServiceSchema.xsd', - 'TS_103_280_v020301.xsd' + 'TS_103_280_v020401.xsd' ] locations = [] @@ -29,7 +30,7 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile)))) - coreSchema = xmlschema.XMLSchema('TS_103_707_v010201.xsd', locations=locations) + coreSchema = xmlschema.XMLSchema('TS_103_707_v010301.xsd', locations=locations) for schema in extraSchemas: newSchema = xmlschema.XMLSchema(schema) -- GitLab From f733cdb93105bda3fde87f9dec50b242ff3286ad Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 20 Sep 2021 08:49:24 +0100 Subject: [PATCH 162/208] Correcting hyphens and double carriage returns --- 102232-2/EmailPDU.asn | 553 +----------------------------------------- 1 file changed, 5 insertions(+), 548 deletions(-) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index 651bd6c..ee361be 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,1087 +1,544 @@ -- ============================ - -- Description of the Email PDU - -- ============================ - - EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} - - DEFINITIONS IMPLICIT TAGS ::= - BEGIN - - IMPORTS - - -- from ETSI TS 102 232-1 [3] - IPAddress - FROM LI-PS-PDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} - - -- from ETSI TS 102 232-5 [38] - IPMMCC - FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)}; - - - -- ============================ - -- Object Identifier Definition - -- ============================ - - emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version18(18)} - emailIRIObjId RELATIVE-OID ::= {emailPDUObjId iRI(1)} - emailCCObjId RELATIVE-OID ::= {emailPDUObjId cC(2)} - messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)} - messagingCCObjId RELATIVE-OID ::= {emailPDUObjId messagingCC(4)} - messagingMMCCObjId RELATIVE-OID ::= {emailPDUObjId messagingMMCC(5)} - - -- definitions are relative to - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} - - - -- ============================= - -- Email Communications Contents - -- ============================= - - EmailCC ::= SEQUENCE - -- EmailCC is the PDU sent for each "piece" of E-mail captured content - { - emailCCObjId [0] RELATIVE-OID, - email-Format [1] Email-Format, - content [2] OCTET STRING - -- Network byte order - } - - Email-Format ::= ENUMERATED - { - ip-packet(1), - -- When this is the email format, the content will contain the bytes of the IP packet from - -- the IP header through to the end of the IP packet - -- Meets requirement E.2.7 - application(2) - -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) - -- Meets requirement E.2.8 - } - - -- ======================================= - -- Intercept-related information for Email - -- ======================================= - - EmailIRI ::= SEQUENCE - -- EmailIRI is the PDU sent for each "piece" of E-mail IRI - { - emailIRIObjId [0] RELATIVE-OID, - eventType [1] E-mail-Event, - client-Address [2] IPAddress OPTIONAL, - -- Provided if available - server-Address [3] IPAddress OPTIONAL, - -- Provided if available - client-Port [4] INTEGER OPTIONAL, - -- Provided if available - server-Port [5] INTEGER OPTIONAL, - -- Provided if available - server-Octets-Sent [6] INTEGER, - client-Octets-Sent [7] INTEGER, - protocol-ID [8] E-mail-Protocol, - e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, - -- Not available in some cases; if a value is available, it shall be provided. - -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. - e-mail-Recipients [10] E-mail-Address-List OPTIONAL, - -- Not available in some cases; if a value is available, it shall be provided - -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. - status [11] E-mail-Status, - total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, - message-ID [13] OCTET STRING OPTIONAL, - -- Network byte order - nationalParameter [14] OCTET STRING OPTIONAL, - -- Completely defined on a national basis, including byte ordering - ..., - national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, - -- Completely defined on a national basis - aAAInformation [16] AAAInformation OPTIONAL, - e-mail-Sender-Validity [17] ENUMERATED - { - validated(0), - -- The operator has assured the e-mail-sender - nonvalidated(1), - -- The operator does not assure the e-mail-sender - ... - } OPTIONAL - } - - E-mail-Status ::= ENUMERATED - { - status-unknown(1), - operation-failed(2), - operation-succeeded(3) - } - - E-mail-Event ::= ENUMERATED - { - e-mail-send(1), - e-mail-receive(2), - e-mail-download(3), - ..., - e-mail-logon-attempt(4), - e-mail-logon(5), - e-mail-logon-failure(6), - e-mail-logoff(7), - e-mail-partial-download(8), - e-mail-upload(9) - } - - E-mail-Protocol ::= ENUMERATED - { - smtp(1), - pop3(2), - imap4(3), - webmail(4), - -- See Annex H for more information - undefined(255), - -- The protocol is not known or not representable by the current enumeration - ... - } - - E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) - - National-EM-ASN1parameters ::= SEQUENCE - { - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [12], - -- the country to which the parameters inserted after the extension marker apply - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...) - } - - AAAInformation ::= CHOICE - -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information - { - pOP3AAAInformation [0] POP3AAAInformation, - aSMTPAAAInformation [1] ASMTPAAAInformation, - ..., - iMAPAAAInformation [2] IMAPAAAInformation - } - - POP3AAAInformation ::= SEQUENCE - -- The POP3AAAInformation field contains the POP3 username & optionally the password - { - username [0] UTF8String (SIZE (0..64)), - password [1] UTF8String (SIZE (0..64)) OPTIONAL, - aAAResult [2] AAAResult OPTIONAL, - ... - } - - ASMTPAAAInformation ::= SEQUENCE - -- The ASMTPAAAInformation field contains the SMTP username and - -- optionally the authentication fields - { - username [0] UTF8String (SIZE (0..64)), - authMethod [1] AAAauthMethod OPTIONAL, - -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc - challenge [2] OCTET STRING OPTIONAL, - -- A BASE64 encoded challenge send by the SMTP server - response [3] OCTET STRING OPTIONAL, - -- A BASE64 encoded hashed response returned by the client - aAAResult [4] AAAResult OPTIONAL, - ... - } - - IMAPAAAInformation ::= SEQUENCE - -- The iMAPAAAInformation field contains the IMAP username & optionally the password - { - username [0] UTF8String (SIZE (0..64)), - password [1] UTF8String (SIZE (0..64)) OPTIONAL, - aAAResult [2] AAAResult OPTIONAL, - ... - } - - AAAResult ::= ENUMERATED - { - resultUnknown(1), - aAAFailed(2), - aAASucceeded(3), - ... - } - - AAAauthMethod ::= ENUMERATED - { - undefinedAuthMethod(1), - cramMD5(2), - digestMD5(3), - ... - } - - -- ================================= - -- Messaging Communications Contents - -- ================================= - - MessagingCC ::= SEQUENCE - -- MessagingCC is the PDU sent for the captured content - { - messaging-cc-obj-id [0] RELATIVE-OID, - event-identifier [1] INTEGER (0..4294967295), - -- Used to correlate to MessagingIRI within the same CIN - content-identifier [2] INTEGER (0..4294967295) OPTIONAL, - sequence-number [3] INTEGER (0..4294967295) OPTIONAL, - end-of-sequence [4] BOOLEAN DEFAULT FALSE, - content-type [5] OCTET STRING, - -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA - content [6] OCTET STRING, - ..., - content-transfer-encoding [7] OCTET STRING OPTIONAL - -- MIME Content-Transfer-Encoding mechanism. - -- Refer to IETF RFC 2045 [20] - } - - - MessagingMMCC ::= SEQUENCE - -- MessagingMMCC is the PDU sent for the captured IPMMCC content - { - messaging-mm-cc-obj-id [0] RELATIVE-OID, - event-identifier [1] INTEGER (0..4294967295), - -- Used to correlate to MessagingIRI within the same CIN - content-identifier [2] INTEGER (0..4294967295) OPTIONAL, - content [3] IPMMCC, - ... - } - - - -- =========================================== - -- Intercept-related information for Messaging - -- =========================================== - - MessagingIRI ::= SEQUENCE - { - messaging-iri-obj-id [0] RELATIVE-OID, - system-type [1] Messaging-System-Type, - system-identifier [2] OCTET STRING OPTIONAL, - -- Identifier up to national agreement, uniquely identifies a certain messaging system - category [3] Messaging-Event-Category OPTIONAL, - status [4] Messaging-Status, - party-information [5] SET OF Messaging-Party-Information OPTIONAL, - trigger [6] Messaging-Trigger, - properties [7] SEQUENCE OF Messaging-Property OPTIONAL, - event-identifier [8] INTEGER (0..4294967295) OPTIONAL, - -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent - original-message [9] OCTET STRING OPTIONAL, - ..., - box-identifier [10] OCTET STRING OPTIONAL - } - - Messaging-System-Type ::= ENUMERATED - { - unified-messaging(1), - ... - } - - Messaging-Event-Category ::= CHOICE - { - message [0] Messaging-Event, - message-box [1] Messaging-Box-Event, - message-notification [2] Messaging-Notification-Event, - call [3] Messaging-Call-Event, - ... - } - - Messaging-Event ::= ENUMERATED - { - deposit(1), - retrieve(2), - delete(3), - save(4), - slamdown(5), - ..., - calendar(6), - contact(7) - } - - Messaging-Box-Event ::= ENUMERATED - { - login(1), - logout(2), - lock(3), - unlock(4), - activate(5), - deactivate(6), - delete(7), - pin-change(8), - greeting-record(9), - greeting-change(10), - greeting-delete(11), - greeting-enable(12), - greeting-disable(13), - notification-enable(14), - notification-disable(15), - disconnect(16), - connect(17), - ..., - unknown(0), - greeting-play(18), - language-change(19), - pin-security-enable(20), - pin-security-disable(21), - personal-operator-add(22), - personal-operator-change(23), - personal-operator-remove(24), - additional-destination-add(25), - additional-destination-change(26), - additional-destination-remove(27), - auto-play-enable(28), - auto-play-disable(29), - header-play-enable(30), - header-play-disable(31) - } - - Messaging-Notification-Event ::= ENUMERATED - { - sms(1), - sms-deposit(2), - sms-slamdown(3), - sms-pin-reminder(4), - email(5), - fax-to-email(6), - ..., - mms(7), - generic(8) - } - - Messaging-Call-Event ::= ENUMERATED - { - callout(1), - ... - } - - Messaging-Status ::= ENUMERATED - { - unknown(0), - not-applicable(1), - operation-failed(2), - operation-succeeded(3), - operation-cancelled(4), - operation-started(5), - ..., - operation-lost(6) - } - - Messaging-Party-Information ::= SEQUENCE - { - party-qualifier [0] Messaging-Party-Qualifier, - party-identity [1] Messaging-Party-Identity, - ..., - party-validity [2] Messaging-Party-Validity OPTIONAL, - copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL - } - - Messaging-Party-Qualifier ::= ENUMERATED - { - unknown-party(0), - -- In this case the party cannot be classified as either originating or terminating - originating-party(1), - -- In this case, the partyInformation parameter provides the identities related to - -- the originating party and all information provided by this party. - terminating-party(2), - -- In this case, the partyInformation parameter provides the identities related to - -- the terminating party and all information provided by this party. - ..., - associated-party(3) - -- In this case, the partyInformation parameter provides the identities related to - -- an associated party and all information provided by this party. - } - - Messaging-Party-Identity ::= CHOICE - { - msisdn [0] OCTET STRING (SIZE (1..9)), - -- MSISDN of the target, encoded in the same format as the AddressString - -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. - e164-format [1] OCTET STRING (SIZE (1..25)), - -- E.164 address of the node in international format. Coded in the same format as - -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) - email-address [2] E-mail-Address-List, - -- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses. - ..., - ip-address [3] IPAddress, - - –-IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] - + -- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] alphanumeric [4] UTF8String, - ip-address-and-port [5] IP-Address-And-Port, - imsi [6] OCTET STRING (SIZE (3..8)), - -- International Mobile Subscriber Identity of the target, encoded in the same format as the - -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. - -- It is described in 3GPP TS 23.003 [37] clause 2.2. - imei [7] OCTET STRING (SIZE (8)), - -- International Mobile Equipment Identity of the target, encoded in the same format as the - -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. - - –- It is defined in 3GPP TS 23.003 [37] clause 6. - + -- It is defined in 3GPP TS 23.003 [37] clause 6. fax-url [8] OCTET STRING, - -- see format defined in RFC 2806 [29]. - tel-url [9] OCTET STRING, - -- see format used in 3GPP TS 33.108 [5], 3GPP TS 24.229 [30] and defined in RFC 2806 [29]. - modem-url [10] OCTET STRING, - -- see format defined in RFC 2806 [29]. - sip-uri [11] OCTET STRING, - -- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32]. - sips-uri [12] OCTET STRING, - -- see format defined in RFC 3261 [32]. - nai [13] OCTET STRING - -- Network Access Identity of the party, encoded in the same format as used EPS - - –- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33]. - + -- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33]. } - - IP-Address-And-Port ::= SEQUENCE - { - ip-address [0] IPAddress, - - –- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] - + -- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] port-number [1] INTEGER, - - –- port-number is defined by IETF RFC 6335 [35] - + -- port-number is defined by IETF RFC 6335 [35] ... - } - - Messaging-Party-Validity ::= ENUMERATED - { - unknown(0), - trusted(1), - untrusted(2), - ... - } - - Messaging-Copy-Qualifier ::= ENUMERATED - { - unknown(0), - none(1), - cc(2), - bcc(3), - ... - } - - Messaging-Trigger ::= ENUMERATED - { - unknown(0), - user(1), - user-agent(2), - system(3), - system-operator(4), - ... - } - - Messaging-Property ::= CHOICE - { - pincode [0] OCTET STRING (SIZE (1..32)), - ..., - priority [1] Messaging-Property-Priority, - greeting-type [2] Messaging-Property-Greeting-Type, - notification-type [3] Messaging-Property-Notification-Type, - language [4] OCTET STRING, - -- Language according to RFC 4646 [24] - message-identifier [5] OCTET STRING, - subject [6] UTF8String, - user-agent [7] UTF8String, - password [8] OCTET STRING, - message-status [9] Messaging-Property-Message-Status, - requested-reports [10] Messaging-Property-Requested-Reports, - expires [11] GeneralizedTime, - message-date [12] GeneralizedTime - } - - Messaging-Property-Priority ::= ENUMERATED - { - low(1), - medium(2), - high(3), - private(4), - ... - } - - Messaging-Property-Greeting-Type ::= ENUMERATED - { - general(1), - name(2), - personal(3), - absence(4), - number(5), - ... - } - - Messaging-Property-Notification-Type ::= ENUMERATED - { - empty-call(1), - lost-call(2), - ..., - message-to-email(3), - read-report(4), - delivery-report(5), - allow-delivery-report(6), - deny-delivery-report(7), - message-wait-indication(8), - voice-to-text(9), - new-message-sms(10), - new-message-outcall(11), - new-message-reminder(12) - } - - Messaging-Property-Message-Status ::= ENUMERATED - { - indeterminate(0), - expired(1), - retrieved(2), - rejected(3), - deferred(4), - forwarded(5), - unrecognized(6), - unreachable(7), - read(8), - deleted-without-being-read(9), - delivery-condition-not-met(10), - ... - } - - Messaging-Property-Requested-Reports ::= ENUMERATED - { - none(0), - delivery(1), - read(2), - delivery-and-read(3), - ... - } - - END -- end of EmailPDU \ No newline at end of file -- GitLab From 58e059ae5e60546e257651668b7288377e263e1f Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 20 Sep 2021 08:52:09 +0100 Subject: [PATCH 163/208] Correcting ASN.1 test --- testing/compile_asn.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/compile_asn.py b/testing/compile_asn.py index 33fea50..e291e42 100644 --- a/testing/compile_asn.py +++ b/testing/compile_asn.py @@ -83,7 +83,7 @@ def compileASN1Files (fileList): fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cTTRAFFIC-1', 'TS101909201', 'CTTRAFFIC') fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'tTRAFFIC-2', 'TS101909202', 'TTRAFFIC') fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cTTRAFFIC-2', 'TS101909202', 'CTTRAFFIC') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cCIPPacketHeader', 'CDMA2000CCModule', 'CCIPPacketHeader') + #fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cCIPPacketHeader', 'CDMA2000CCModule', 'CCIPPacketHeader') fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'uMTSCC-CC-PDU', 'Umts-HI3-PS', 'CC-PDU') fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'ePSCC-CC-PDU', 'Eps-HI3-PS', 'CC-PDU') fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'confCC-CC-PDU', 'CONF-HI3-IMS', 'Conf-CC-PDU') @@ -93,8 +93,8 @@ def compileASN1Files (fileList): fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'tARGETACTIVITYMONITOR-1', 'TS101909201', 'TARGETACTIVITYMONITOR-1') fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'tARGETACTIVITYMONITOR-2', 'TS101909202', 'TARGETACTIVITYMONITOR') - fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'lAESProtocol', 'Laesp-j-std-025-b', 'LAESProtocol') - fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'cDMA2000LAESMessage', 'CDMA2000CIIModule', 'CDMA2000LAESMessage') + #fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'lAESProtocol', 'Laesp-j-std-025-b', 'LAESProtocol') + #fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'cDMA2000LAESMessage', 'CDMA2000CIIModule', 'CDMA2000LAESMessage') fixDottedReference(dr, 'LI-PS-PDU', 'HI4Payload', 'threeGPP-LI-Notification', 'TS33128Payloads', 'LINotificationPayload') -- GitLab From 2191fef17c29702f8531a1d9349a8d03264892e0 Mon Sep 17 00:00:00 2001 From: markc Date: Tue, 21 Sep 2021 13:48:08 +0200 Subject: [PATCH 164/208] Updating OIDs for v3.12.2 --- 102232-2/EmailPDU.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index ee361be..afedfc6 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -3,7 +3,7 @@ -- ============================ EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version19(19)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -25,7 +25,7 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version18(18)} +emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version19(19)} emailIRIObjId RELATIVE-OID ::= {emailPDUObjId iRI(1)} emailCCObjId RELATIVE-OID ::= {emailPDUObjId cC(2)} messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)} -- GitLab From 0e1835b9f53e329aff71d55856888570581553c4 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 11 Oct 2021 08:02:16 +0100 Subject: [PATCH 165/208] Changing indentation --- 103221-1/TS_103_221_01.xsd | 270 ++++++++++++++++++------------------- 1 file changed, 135 insertions(+), 135 deletions(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index ca39859..c253a0e 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -101,12 +101,12 @@ - - - - - - + + + + + + @@ -633,7 +633,7 @@ - + @@ -663,7 +663,7 @@ - + @@ -797,143 +797,143 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + -- GitLab From be980bb549fb2253cee76e908ff87b84a34a0e06 Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Mon, 11 Oct 2021 08:05:21 +0200 Subject: [PATCH 166/208] Rename ts_103120_Deli.xsd to ts_103120_Delivery.xsd --- 103120/schema/{ts_103120_Deli.xsd => ts_103120_Delivery.xsd} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 103120/schema/{ts_103120_Deli.xsd => ts_103120_Delivery.xsd} (100%) diff --git a/103120/schema/ts_103120_Deli.xsd b/103120/schema/ts_103120_Delivery.xsd similarity index 100% rename from 103120/schema/ts_103120_Deli.xsd rename to 103120/schema/ts_103120_Delivery.xsd -- GitLab From 0565790aaa7629d66d5cf4d15ec6b8d0428d73c1 Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Mon, 11 Oct 2021 08:07:24 +0200 Subject: [PATCH 167/208] More renaming of Deli into Delivery --- .../{request5-Binary-Deli.xml => request5-Binary-Delivery.xml} | 0 .../examples/{request5-XML-Deli.xml => request5-XML-Delivery.xml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename 103120/examples/{request5-Binary-Deli.xml => request5-Binary-Delivery.xml} (100%) rename 103120/examples/{request5-XML-Deli.xml => request5-XML-Delivery.xml} (100%) diff --git a/103120/examples/request5-Binary-Deli.xml b/103120/examples/request5-Binary-Delivery.xml similarity index 100% rename from 103120/examples/request5-Binary-Deli.xml rename to 103120/examples/request5-Binary-Delivery.xml diff --git a/103120/examples/request5-XML-Deli.xml b/103120/examples/request5-XML-Delivery.xml similarity index 100% rename from 103120/examples/request5-XML-Deli.xml rename to 103120/examples/request5-XML-Delivery.xml -- GitLab From b7fc3e0ea866d024829f92e0acddb03b5cea560c Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Mon, 11 Oct 2021 08:14:34 +0200 Subject: [PATCH 168/208] Correct phone number format in examples --- 103120/examples/request1.xml | 2 +- 103120/examples/request4.xml | 2 +- 103120/examples/response2.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index e8b6a5f..d0b64ee 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -53,7 +53,7 @@ ETSI InternationalE164 - +447700900000 + 442079460223 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index 555974f..6296da5 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -55,7 +55,7 @@ ETSI InternationalE164 - +31701234567 + 442079460223 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 9ae5d35..3f3e550 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -71,7 +71,7 @@ ETSI InternationalE164 - +447700900000 + 442079460223 @@ -94,11 +94,11 @@ 3000 The associated Authorisation is in an Invalid state - + - + -- GitLab From d0f6b40b19343e42bfd7d3dd3b13d850eddc2168 Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Mon, 11 Oct 2021 08:20:48 +0200 Subject: [PATCH 169/208] Update RequestDetails and add applicable example --- 103120/examples/request6.xml | 80 ++++++++++++++++++++++++++++++++ 103120/examples/response6.xml | 38 +++++++++++++++ 103120/schema/ts_103120_Task.xsd | 1 + 3 files changed, 119 insertions(+) create mode 100644 103120/examples/request6.xml create mode 100644 103120/examples/response6.xml diff --git a/103120/examples/request6.xml b/103120/examples/request6.xml new file mode 100644 index 0000000..15a2bf1 --- /dev/null +++ b/103120/examples/request6.xml @@ -0,0 +1,80 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2f + 2021-10-11T13:37:00.000000Z + + V1.10.1 + XX + v1.0 + +
+ + + + + 0 + + + 7dbbc880-8750-4d3c-abe7-ea4a1764604f + XX + ACTOR01 + W000001 + + 2021-10-11T12:00:00Z + 2021-12-01T12:00:00Z + + + + + + 1 + + + 2b36a78b-b628-416d-bd22-404e68a0cd3f + XX + ACTOR01 + + 7dbbc880-8750-4d3c-abe7-ea4a1764604f + + XX-ACTOR01-1234 + + 2021-10-03T12:32:12Z + 2021-10-03T12:35:34Z + 2021-10-03T13:37:00Z + + + + ETSI + IPv4Address + + 192.0.2.23 + + + + + + + 192.0.2.0 + + + + + XX + ACTOR02 + + + + + + + + diff --git a/103120/examples/response6.xml b/103120/examples/response6.xml new file mode 100644 index 0000000..99b0ddc --- /dev/null +++ b/103120/examples/response6.xml @@ -0,0 +1,38 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2f + 2021-10-11T13:37:01.000000Z + + V1.10.1 + XX + v1.0 + +
+ + + + + 0 + + 7dbbc880-8750-4d3c-abe7-ea4a1764604f + + + + 1 + + 2b36a78b-b628-416d-bd22-404e68a0cd3f + + + + + + diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd index ae3e65e..4459cf9 100644 --- a/103120/schema/ts_103120_Task.xsd +++ b/103120/schema/ts_103120_Task.xsd @@ -138,6 +138,7 @@ + -- GitLab From 479fec4e5739b0f704029fb3404dc70e4a6e2a80 Mon Sep 17 00:00:00 2001 From: markc Date: Wed, 20 Oct 2021 08:51:22 +0200 Subject: [PATCH 170/208] Changing "UpdateObjectResponse" to "ModifyObjectResponse" --- 103221-1/TS_103_221_01.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index c253a0e..241256b 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -843,7 +843,7 @@ - + -- GitLab From 6ec63f83089c64b1ee7e02c39ba06a7af4929ed6 Mon Sep 17 00:00:00 2001 From: markc Date: Wed, 20 Oct 2021 08:52:00 +0200 Subject: [PATCH 171/208] Correcting RequestMessageType --- 103221-1/TS_103_221_01.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 241256b..82e0492 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -102,7 +102,7 @@ - + -- GitLab From 8cfd466e653716e1daa4e88a7a793acce095baa2 Mon Sep 17 00:00:00 2001 From: rengasamis Date: Wed, 20 Oct 2021 20:32:26 +0200 Subject: [PATCH 172/208] Added EUI64 in TargetIdentifier --- 103221-1/TS_103_221_01.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index d06eb9f..17e920d 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -174,6 +174,7 @@ + -- GitLab From 8f6d59355cf4c620807418ef353ec3b723fad449 Mon Sep 17 00:00:00 2001 From: rengasamis Date: Thu, 21 Oct 2021 15:09:58 +0200 Subject: [PATCH 173/208] Addition of listOfServiceTypes to TaskDetails. --- 103221-1/TS_103_221_01.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index d06eb9f..dad0e39 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -131,6 +131,7 @@ + -- GitLab From 186019fcc7837fb0b7e7264a7cac48adb949c8bb Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Fri, 22 Oct 2021 12:46:25 +0200 Subject: [PATCH 174/208] - Update Common to change ApproverEmailAddress/ApproverPhoneNumber into ApproverContactDetails - Update examples/request3.xml to use multiple ApproverContactDetails - Remove whitespace from examples --- 103120/examples/request3.xml | 11 ++++++++++- 103120/examples/response2.xml | 4 ++-- 103120/examples/response5.xml | 10 +++++----- 103120/schema/ts_103120_Common.xsd | 9 +++++++++ 103120/schema/ts_103120_Core.xsd | 2 +- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index 5da0df3..c93bb7a 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -39,7 +39,16 @@ - Approver + John Doe + + john.doe@example.com + 442079460223 + + + Jane Doe + jane.doe@example.com + 442079461110 + 2015-09-01T12:00:00Z diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 9ae5d35..2aa59c8 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -94,11 +94,11 @@ 3000 The associated Authorisation is in an Invalid state - + - + diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index e210444..32bfcd1 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -1,9 +1,9 @@ -
diff --git a/103120/schema/ts_103120_Common.xsd b/103120/schema/ts_103120_Common.xsd index 6ebf340..abaf323 100644 --- a/103120/schema/ts_103120_Common.xsd +++ b/103120/schema/ts_103120_Common.xsd @@ -37,6 +37,7 @@ + @@ -44,6 +45,14 @@ + + + + + + + + diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index af1674d..1105f2c 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -2,7 +2,7 @@ Date: Fri, 22 Oct 2021 13:20:15 +0200 Subject: [PATCH 175/208] Added EUI64 definition --- 103280/TS_103_280.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index ce66ea6..a6ec077 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -241,4 +241,9 @@ + + + + + \ No newline at end of file -- GitLab From dae58f69aa0f35755940f7d6560a60ea762e5301 Mon Sep 17 00:00:00 2001 From: Christoph Marthy Date: Fri, 22 Oct 2021 13:20:49 +0200 Subject: [PATCH 176/208] Cr/ts 102657/137 138 139 140 --- 102657/RDMessage.asn | 65 ++++++++++++++++++++++++++++++++++++++------ 102657/RDMessage.xsd | 48 ++++++++++++++++++++++++++++++-- 2 files changed, 102 insertions(+), 11 deletions(-) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index ea717ef..f3d98eb 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version25(25)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version26(26)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version25(25)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version26(26)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -837,9 +837,11 @@ TelephonyServiceUsage ::= SEQUENCE nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - operatorSpecificCallDetails [11] UTF8String OPTIONAL + operatorSpecificCallDetails [11] UTF8String OPTIONAL, -- CSP specific value which indicates the nature of a call -- (e.g. "CallIndicator: GPR, CallActionCode: 2") + trunkGroupIDs [12] TrunkGroupIDs OPTIONAL, + interOperatorIDs [13] InterOperatorIDs OPTIONAL } NationalTelephonyServiceUsage ::= SEQUENCE @@ -1157,6 +1159,26 @@ TelephonyPartyRole ::= ENUMERATED mmsRecipientTrn(17) } +TrunkGroupIDs ::= SEQUENCE +{ + incomingTrunkGroupID [1] UTF8String OPTIONAL, + -- identifies the incoming PSTN leg. Format as defined by the CSP. + outgoingTrunkGroupID [2] UTF8String OPTIONAL, + -- identifies the outgoing PSTN leg. Format as defined by the CSP. + ... +} + +InterOperatorIDs ::= SEQUENCE +{ + originatingInterOperatorID [1] UTF8String OPTIONAL, + -- orig-ioi formated as defined in IETF RFC 7315 [55]. + terminatingInterOperatorID [2] UTF8String OPTIONAL, + -- term-ioi, formated as defined in IETF RFC 7315 [55]. + transitInterOperatorIDList [3] UTF8String OPTIONAL, + -- transit-ioi-list, formated as defined in IETF RFC 7315 [55]. + ... +} + -- ======================= -- Device Data definitions -- ======================= @@ -1678,7 +1700,9 @@ MsgTransmission ::= SEQUENCE ..., messageID [10] MessageID OPTIONAL, sourceServerName [11] UTF8String OPTIONAL, - destinationServerName [12] UTF8String OPTIONAL + destinationServerName [12] UTF8String OPTIONAL, + clientPort [13] PortNumber OPTIONAL, + serverPort [14] PortNumber OPTIONAL } MsgStoreOperation ::= SEQUENCE @@ -1700,7 +1724,11 @@ MsgStoreOperation ::= SEQUENCE addMsg(5), -- E.g. the APPEND command in IMAP ..., - editMsg(6) + editMsg(6), + sendMsg(7), + -- Only applicable to webmail solutions + forwardMsg(8) + -- Only applicable to webmail solutions } OPTIONAL, senderAddress [5] MsgAddress OPTIONAL, -- For Internet email, use the From address in the mail headers @@ -1716,7 +1744,9 @@ MsgStoreOperation ::= SEQUENCE clientID [8] IPAddress OPTIONAL, serverID [9] IPAddress OPTIONAL, ..., - messageID [10] MessageID OPTIONAL + messageID [10] MessageID OPTIONAL, + clientPort [11] PortNumber OPTIONAL, + serverPort [12] PortNumber OPTIONAL } MessageID ::= UTF8String @@ -1928,8 +1958,10 @@ MultimediaServiceUsage ::= SEQUENCE relayIP [20] IPAddress OPTIONAL, vmLength [21] INTEGER OPTIONAL, -- number of seconds reason [22] UTF8String OPTIONAL, - smsInformation [23] SmsInformation OPTIONAL, - mmsInformation [24] MmsInformation OPTIONAL + smsInformation [23] SmsInformation OPTIONAL, + mmsInformation [24] MmsInformation OPTIONAL, + trunkGroupIDs [25] TrunkGroupIDs OPTIONAL, + interOperatorIDs [26] InterOperatorIDs OPTIONAL } MultimediaPartyInformation ::= SEQUENCE @@ -2403,9 +2435,13 @@ WifiInformation ::= SEQUENCE accessPointAdditionalDescriptions [8] SEQUENCE OF UTF8String OPTIONAL, -- Informal description of location, category or type of access point, -- or a name of the network to which the access point belongs. - accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL + accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL, -- For WiFi, there may be other parties involved in hosting or owning the -- Access Points, e.g. access point provider or partner providers + cSPDefinedName [10] UTF8String OPTIONAL + -- CSP-defined label or name assigned to the access point. + -- The access points of a CSP within a venue or geographical location + -- typically share this name. } AuthenticationType ::= ENUMERATED @@ -2787,6 +2823,17 @@ IPAddress ::= CHOICE ... } +PortNumber ::= CHOICE +{ + tCPPort [0] TCPPort, + uDPPort [1] UDPPort, + ... +} + +TCPPort ::= INTEGER (1..65535) + +UDPPort ::= INTEGER (0..65535) + NAAssignedAddress ::= SEQUENCE { addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index e74c0c2..39e5551 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.27.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.28.1 @@ -223,6 +223,21 @@ + + + + + + + + + + + + + + + @@ -349,6 +364,24 @@ + + + + + + + + + + + + + + + + + + @@ -1089,6 +1122,8 @@ + + @@ -1755,6 +1790,8 @@ + + @@ -1773,6 +1810,8 @@ + + @@ -1796,6 +1835,8 @@ + + @@ -2157,6 +2198,7 @@ + @@ -2868,6 +2910,8 @@ + + -- GitLab From 9c55a97c5e1a9e89442a954d447bc0fd41d879ed Mon Sep 17 00:00:00 2001 From: markc Date: Fri, 22 Oct 2021 14:16:39 +0200 Subject: [PATCH 177/208] TS 103 221-1 CR028 - Hashed Identifiers --- 103221-1/TS_103_221_01.xsd | 11 ++++- 103221-1/TS_103_221_01_HashedID.xsd | 45 ++++++++++++++++++++ 103221-1/examples/CreateHashedID_example.xml | 38 +++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 103221-1/TS_103_221_01_HashedID.xsd create mode 100644 103221-1/examples/CreateHashedID_example.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 82e0492..3752f66 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,6 +1,14 @@ - + + + @@ -179,6 +187,7 @@ + diff --git a/103221-1/TS_103_221_01_HashedID.xsd b/103221-1/TS_103_221_01_HashedID.xsd new file mode 100644 index 0000000..90f961d --- /dev/null +++ b/103221-1/TS_103_221_01_HashedID.xsd @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/CreateHashedID_example.xml b/103221-1/examples/CreateHashedID_example.xml new file mode 100644 index 0000000..89dea20 --- /dev/null +++ b/103221-1/examples/CreateHashedID_example.xml @@ -0,0 +1,38 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.9.1 + f9138c05-f82e-4cf4-a1ae-ae92fed2d564 + + 30fbde5e-3195-4a22-b3e9-15e1d60d0528 + sha-256 + 4241792fc4d3d097 + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.9.1 + f9138c05-f82e-4cf4-a1ae-ae92fed2d565 + + 30fbde5e-3195-4a22-b3e9-15e1d60d0529 + + + + 30fbde5e-3195-4a22-b3e9-15e1d60d0528 + InternationalE164 + 303e57c6968f308a6a7df0ef48c0e21580bc29ae2ed1bd8e5466eb42e72cc39a + + + + X2andX3 + + + + -- GitLab From 52d74c4c201efe95fe059b5ee8a4b2ebff943826 Mon Sep 17 00:00:00 2001 From: markc Date: Fri, 22 Oct 2021 15:27:47 +0200 Subject: [PATCH 178/208] Merge branch 'cr/TS103221-1/029' into 'master' Added EUI64 in TargetIdentifier See merge request li/trial!49 --- 103221-1/TS_103_221_01.xsd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 3752f66..d018f8f 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -187,7 +187,8 @@ - + + -- GitLab From 22cff36007ccfbce3365203434478cfc15e5b8f0 Mon Sep 17 00:00:00 2001 From: markc Date: Fri, 22 Oct 2021 15:37:32 +0200 Subject: [PATCH 179/208] Revert "Addition of listOfServiceTypes to TaskDetails." This reverts commit 8f6d59355cf4c620807418ef353ec3b723fad449 --- 103221-1/TS_103_221_01.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 1346757..17e920d 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -131,7 +131,6 @@ - -- GitLab From 557d050aa51cc7f40a5c8770d4fe0f8dc5439bad Mon Sep 17 00:00:00 2001 From: markc Date: Fri, 22 Oct 2021 15:37:43 +0200 Subject: [PATCH 180/208] Revert "Added EUI64 in TargetIdentifier" This reverts commit 8cfd466e653716e1daa4e88a7a793acce095baa2 --- 103221-1/TS_103_221_01.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 17e920d..d06eb9f 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -174,7 +174,6 @@ - -- GitLab From f09ba7fbd8d7c5fcc122e3eb3124f66b5effc32a Mon Sep 17 00:00:00 2001 From: markc Date: Fri, 22 Oct 2021 15:41:05 +0200 Subject: [PATCH 181/208] Addition of listOfServiceTypes to TaskDetails. --- 103221-1/TS_103_221_01.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index d018f8f..a4b3d6c 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -144,6 +144,7 @@ + -- GitLab From ba3461c650a5228da6f9a4113ba4e796effbcf14 Mon Sep 17 00:00:00 2001 From: markc Date: Fri, 22 Oct 2021 16:24:58 +0200 Subject: [PATCH 182/208] Cleanup/ts103120 --- 103120/examples/FooServiceSchema.xsd | 27 ++ 103120/examples/example.key | 28 ++ 103120/examples/example.pem | 19 ++ .../mutliple-auth-example-request.xml | 2 +- 103120/examples/request1.xml | 2 +- 103120/examples/request2.xml | 2 +- 103120/examples/request3.xml | 2 +- 103120/examples/request4.xml | 2 +- 103120/examples/request5-Binary-Delivery.xml | 2 +- 103120/examples/request5-XML-Delivery.xml | 2 +- 103120/examples/request6_signed.xml | 118 +++++++ 103120/examples/response1.xml | 2 +- 103120/examples/response2.xml | 2 +- 103120/examples/response3.xml | 2 +- 103120/examples/response4.xml | 2 +- 103120/examples/response5.xml | 2 +- testing/check_xsd.py | 53 ++- testing/deps/xmldsig/xmldsig-core-schema.xsd | 318 ++++++++++++++++++ 18 files changed, 568 insertions(+), 19 deletions(-) create mode 100644 103120/examples/FooServiceSchema.xsd create mode 100644 103120/examples/example.key create mode 100644 103120/examples/example.pem create mode 100644 103120/examples/request6_signed.xml create mode 100644 testing/deps/xmldsig/xmldsig-core-schema.xsd diff --git a/103120/examples/FooServiceSchema.xsd b/103120/examples/FooServiceSchema.xsd new file mode 100644 index 0000000..5657394 --- /dev/null +++ b/103120/examples/FooServiceSchema.xsd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/examples/example.key b/103120/examples/example.key new file mode 100644 index 0000000..b5959e7 --- /dev/null +++ b/103120/examples/example.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDc9UQSsRmchhOC +ixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvMOyvBCHq4c3M8hBxt9zKD +mV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3Jpyx3b4r8IVoUDXai2sjX +8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8FJfRl2ttWlSFMA2252ak +OwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAafTFV1eM/dTOSEKYCHVCN0 +cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eTPunYJGanai6PLLr5zNWX +lvcj/YbZAgMBAAECggEAbm1BPRo3U4uKWpaNmFPdrU3VdlYK9CUCgU8X2PPF4HRN +TAiBZG6smGqocIQt5MYJFv/T2q2ny6lcHHrdT0BHxpoRRYMqIsZ26bk+o7DxheqU +LiPdGtiyaX+6CZq71WDwk/tTGmx0GwW+lHXdv9h+iLQxGD4nVXoxWAPgxdEGnONY +gSYbOhXz+MEFZaW8HnVPfoA+RR9Hg59gnmBCZlhbahqf3WnjAwgS0nsbSUN57wVi +FcWHWLyzv94bQHcTgalXqVakQv5+ymJKF4ImiYUP2rLPQ8ubqwmdQ6xI8Gp3AGCr +FY5koP3JT2mMY+aZJEEGWE3U4JRDyrkOpI34No8iEQKBgQD6niFOopCjE2k7eIFr +c+s5Khp3ITmcgV4tycxngXOQw8GnPEzzZUW7xodTiMPLYz/8lFbJvCAWCeQpmVWX +U8OX9anzY0U0ILbolXpdpGdZkBHbKWtAVBNOZ/lY0SAmt6/ZWf/EcqpMm/fH+iph +aqafwQuX4qhy9HlwY2qwyj5y5QKBgQDhtBH9/9Hy0X2HI+uzNRaU0y1BqvuqjHOf +1v57DM5uYF0MAp1SAfAJcx+jUXdf28Nr4GlxBIvQumq6rsvfKhqBINsKgJf/4+PA +Lv+fofeUEEqrGHuecB4NbdHP5XIIiuyyuOtRhGq/sclOQSZAa1kxajGvDI1AVHL4 +LCwcy9HA5QKBgQDIq+2HhWvC6DwOvoMCgyMJ9siSMyxqQLwkdb0R8/mRJO3e9s22 +5pRbsq+RF6WPKb2GhVCo39XhT7I+DOUX8p5fAvo+RHKZNsi+m1ILwSRv9ogVsKiM +LcX3thFWKL1RwysvIn1F03rBNPHGUm206yzYJj8eMwMmaNMERtabEJXIcQKBgHct +Kvbwlr5daafrCrDkzlilLVdoXlzOrtrung8BUxsrHNaTptg/l6yVslX9VUgzdXvH +0kVP/jenx2VtmM7sn3Qhkid4gUon3gGDj4yN7HmtJJA1bEjbsLKsk0XwRIdIO/We ++PphLjCsQrxkYDtRs5YJGdTxjsAyF0b9pAlMgiQVAoGBAK/NGV5+IPDHEmz0CNJN +ApaA2jG8KrsIPWNpgOC3CxPMT3kWYK601y0CLw8ZpUnVTMfPkKMSOVsqaOpHV6eP +Oecq3bP1CiNunro+j3EOIDIST2ttrlNuKIBaiz63ZMNDbs/DyaGL8Zf688OJCXsb +yCWSJh8NbrNblNfI0jaMoTGw +-----END PRIVATE KEY----- diff --git a/103120/examples/example.pem b/103120/examples/example.pem new file mode 100644 index 0000000..2aa1eac --- /dev/null +++ b/103120/examples/example.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIC/zCCAeegAwIBAgIUUOGdj0hEfnnW9gqIOCTJ9EUocnMwDQYJKoZIhvcNAQEL +BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTA2MjUwNzIyMDlaFw0yNDAzMjEwNzIy +MDlaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQDc9UQSsRmchhOCixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvM +OyvBCHq4c3M8hBxt9zKDmV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3J +pyx3b4r8IVoUDXai2sjX8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8 +FJfRl2ttWlSFMA2252akOwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAaf +TFV1eM/dTOSEKYCHVCN0cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eT +PunYJGanai6PLLr5zNWXlvcj/YbZAgMBAAGjUzBRMB0GA1UdDgQWBBSFT3NqexF1 +LcYkjqUr9MMTIFp/ATAfBgNVHSMEGDAWgBSFT3NqexF1LcYkjqUr9MMTIFp/ATAP +BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCzwydpNgq680qWmd0D +4ya9fHUopeX7LBSYOU7NU3CagjXnUMwaCmSpokkH0Wvn1UtXDUF+slA9bEeXkfZm +70YW8msIEt1mljDi4CBI+MvaJ40OJkXwkQUE3dhj9LJl5Nv0UBEyv7k/a/6+eO9K +OQoHIVqXwrWs9JHTW6T4diN1w7xcgvSXhlcOySHjfNzFzferqx8i0/Wz6jD/7YSC +FOEaUrXbeFS3asRoZRLW6uXgfDJ7qfCmUZZ853OF3MN63OwWjPGxtFmeZAqMS/K0 +FKgwMCrmZlVq6Fx87E+sc3eppXIceCau/+CHG91mRvMSha6jQD7jLMT9xjND5Dob +/scV +-----END CERTIFICATE----- diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml index 5e5f226..8fd893c 100644 --- a/103120/examples/mutliple-auth-example-request.xml +++ b/103120/examples/mutliple-auth-example-request.xml @@ -12,7 +12,7 @@ d442c58c-d5e1-4fd9-90ec-9c228ad947f1 2020-09-22T08:06:17.025833Z - V1.8.1 + V1.10.1 XX v1.1.1 diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index d0b64ee..a5e40d6 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index 67cbefd..2b1d012 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index c93bb7a..dce6620 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index 6296da5..73d6c07 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Delivery.xml index 7d51707..2a13dfb 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml index f9314cd..c345dbb 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request6_signed.xml b/103120/examples/request6_signed.xml new file mode 100644 index 0000000..2bc0404 --- /dev/null +++ b/103120/examples/request6_signed.xml @@ -0,0 +1,118 @@ + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + 9964584e-c1a5-4ffa-b949-d9da504c4efb + 2021-06-25T12:00:00.000000Z + + V1.9.1 + XX + v1.0 + +
+ + + + + 0 + + + 68c78910-c922-45f2-aeb3-017eb958bb05 + XX + ACTOR01 + W000001 + + 2021-06-25T12:00:00Z + 2021-09-01T12:00:00Z + + + + + + 1 + + + 4d8127db-e8bc-4a69-9378-457f0424ec2c + XX + ACTOR01 + + 68c78910-c922-45f2-aeb3-017eb958bb05 + + LIID1 + + + + + ETSI + InternationalizedEmailAddress + + Όνομα.παραδείγματος@example.com + + + + + ETSI + TaskDeliveryType + IRIandCC + + + + + 192.0.2.0 + + + + + XX + RECVER01 + + + + + + + + + + + + + + + + + + kARbaz+wH6oJWSvmy6Fk4vTQ7t4m3Y16IiNNdDO08/I= + + + DdT9ie03Z9O47sN8ad9gsfuhZhchtNhtvTyNhtiHKuqgNCt696tDH2c68tVqr+iJ3WpCn0gWJHKnYeniTwVPj6fxDh2RbCqk5SVHvdggZjCv3BInNH0ZfOrlvuArJS3UP/gifYXlT5s59Seze1nSjZDNeC25o9WRxNy0krGrhbqIFjxTHDilR40cmKq2SI1540yM3rsc+5D3hgsxGu7ly2dg7qtiFGQIQaFJi8twrViQUnOyDZ63yJHhWeLVU+2FvIuBZh3orDc3VipKsbqrjrDqdfi8qfYEHHPp25DfTpHXnCuhD/3hOwcxvhVJ4+47R8ysO9qMTvGRCUNptgskhQ== + + + MIIC/zCCAeegAwIBAgIUUOGdj0hEfnnW9gqIOCTJ9EUocnMwDQYJKoZIhvcNAQEL +BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTA2MjUwNzIyMDlaFw0yNDAzMjEwNzIy +MDlaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQDc9UQSsRmchhOCixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvM +OyvBCHq4c3M8hBxt9zKDmV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3J +pyx3b4r8IVoUDXai2sjX8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8 +FJfRl2ttWlSFMA2252akOwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAaf +TFV1eM/dTOSEKYCHVCN0cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eT +PunYJGanai6PLLr5zNWXlvcj/YbZAgMBAAGjUzBRMB0GA1UdDgQWBBSFT3NqexF1 +LcYkjqUr9MMTIFp/ATAfBgNVHSMEGDAWgBSFT3NqexF1LcYkjqUr9MMTIFp/ATAP +BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCzwydpNgq680qWmd0D +4ya9fHUopeX7LBSYOU7NU3CagjXnUMwaCmSpokkH0Wvn1UtXDUF+slA9bEeXkfZm +70YW8msIEt1mljDi4CBI+MvaJ40OJkXwkQUE3dhj9LJl5Nv0UBEyv7k/a/6+eO9K +OQoHIVqXwrWs9JHTW6T4diN1w7xcgvSXhlcOySHjfNzFzferqx8i0/Wz6jD/7YSC +FOEaUrXbeFS3asRoZRLW6uXgfDJ7qfCmUZZ853OF3MN63OwWjPGxtFmeZAqMS/K0 +FKgwMCrmZlVq6Fx87E+sc3eppXIceCau/+CHG91mRvMSha6jQD7jLMT9xjND5Dob +/scV + + + + + \ No newline at end of file diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index 25aa22c..54fad1c 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 3f3e550..104a76f 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index e3b1537..445187d 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index a8dc811..3ca45c2 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index 32bfcd1..d02dff5 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/testing/check_xsd.py b/testing/check_xsd.py index db4ee8c..816e389 100644 --- a/testing/check_xsd.py +++ b/testing/check_xsd.py @@ -11,7 +11,6 @@ from lxml import etree from xml.etree.ElementTree import ParseError from xmlschema import XMLSchema, XMLSchemaParseError - def BuildSchemaDictonary (fileList): if len(fileList) == 0: logging.info("No schema files provided") @@ -22,7 +21,7 @@ def BuildSchemaDictonary (fileList): for schemaFile in fileList: try: xs = XMLSchema(schemaFile, validation='skip') - schemaLocations.append((xs.default_namespace, str(Path(schemaFile).resolve()))) + schemaLocations.append((xs.target_namespace, str(Path(schemaFile).resolve()))) logging.info(" [ {0} -> {1} ]".format(xs.default_namespace, schemaFile)) except ParseError as ex: logging.warning (" [ {0} failed to parse: {1} ]".format(schemaFile, ex)) @@ -53,6 +52,7 @@ def ValidateXSDFiles (fileList): schemaLocations = BuildSchemaDictonary(fileList) errors = {} + schemaDictionary = {} logging.info("Schema validation:") for schemaFile in fileList: @@ -60,6 +60,7 @@ def ValidateXSDFiles (fileList): schema = XMLSchema(schemaFile, locations = schemaLocations) logging.info(schemaFile + ": OK") errors[schemaFile] = [] + schemaDictionary[schema.target_namespace] = schema except XMLSchemaParseError as ex: if (ex.schema_url) and (ex.schema_url != ex.origin_url): logging.info(" Error {1} comes from {0}, suppressing".format(ex.schema_url, ex.message)) @@ -67,7 +68,7 @@ def ValidateXSDFiles (fileList): else: logging.warning(schemaFile + ": Failed validation ({0})".format(ex)) errors[schemaFile] = [ex.message] - return errors + return errors, schemaDictionary def ValidateInstanceDocuments (coreFile, supportingSchemas, instanceDocs): @@ -91,6 +92,7 @@ if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument("-v", "--verbosity", help="verbosity level", action="count", default=0) parser.add_argument("input", help="include a directory or file", action="append", nargs="+") + parser.add_argument("-p", "--primaryNamespace", help="Primary schema namespace for instance doc validation") args = parser.parse_args() logging.getLogger().setLevel(logging.WARNING) @@ -100,8 +102,10 @@ if __name__ == '__main__': logging.getLogger().setLevel(logging.DEBUG) logging.debug("Very verbose selected") + logging.debug(f"Path: {args.input}") includeFileList = [] + includeInstanceDocList = [] for path in args.input[0]: p = Path(path) if not p.exists(): @@ -112,12 +116,25 @@ if __name__ == '__main__': for g in glob.glob(os.path.join(str(p), "*.xsd")): logging.info(f">Including {g}") includeFileList.append(g) + for g in glob.glob(os.path.join(str(p), "*.xml")): + logging.info(f">Including instance doc {g}") + includeInstanceDocList.append(g) else: - logging.info(f"Including {p.absolute()}") - includeFileList.append(p.absolute()) + logging.info(f">Including {p.absolute()}") + if str(p.absolute()).endswith('.xml'): + includeInstanceDocList.append(str(p.absolute())) + elif str(p.absolute()).endswith('.xsd'): + includeFileList.append(str(p.absolute())) + else: + logging.warning(f'Ignoring file {p.absolute()}') + if len(includeInstanceDocList) and (args.primaryNamespace is None): + print("Cannot validate instance documents without specifying a primary namespace (use -h for usage guidelines)") + exit(-1) + syntaxErrors = 0 + print ("=============================") print ("XSD syntax checks:") print ("-----------------------------") for file in includeFileList: @@ -132,9 +149,12 @@ if __name__ == '__main__': if (syntaxErrors > 0): print (f"{syntaxErrors} syntax errors detected") exit(syntaxErrors) + else: + print ("0 syntax errors detected") - results = ValidateXSDFiles(includeFileList) + results, schemaDict = ValidateXSDFiles(includeFileList) + print ("=============================") print ("XSD build checks:") print ("-----------------------------") errorCount = 0 @@ -152,4 +172,23 @@ if __name__ == '__main__': print ("-----------------------------") print (f"{errorCount} build errors detected") - exit(errorCount) \ No newline at end of file + if (errorCount > 0): + exit(errorCount) + + print ("=============================") + print ("Instance document checks") + print ("-----------------------------") + errorCount = 0 + + primarySchema = schemaDict[args.primaryNamespace] + for instanceDoc in includeInstanceDocList: + try: + results = primarySchema.validate(instanceDoc) + print (f" {instanceDoc} : OK") + except Exception as ex: + errorCount += 1 + print (f" {instanceDoc} : {str(ex)}") + print ("-----------------------------") + print (f"{errorCount} instance doc errors detected") + print ("=============================") + exit(errorCount) diff --git a/testing/deps/xmldsig/xmldsig-core-schema.xsd b/testing/deps/xmldsig/xmldsig-core-schema.xsd new file mode 100644 index 0000000..df126b3 --- /dev/null +++ b/testing/deps/xmldsig/xmldsig-core-schema.xsd @@ -0,0 +1,318 @@ + + + + + + ]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 91534e4fc74ccd52714e0da85c65b994eec20ea7 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 12 Jan 2022 14:08:56 +0000 Subject: [PATCH 183/208] Post-publication updates --- 103221-1/TS_103_221_01.xsd | 67 +++++----------- 103221-1/TS_103_221_01_HashedID.xsd | 76 ++++++++----------- 103221-1/examples/CreateObject_example.xml | 2 +- .../GetAllDetailsResponse_example2.xml | 2 +- .../examples/GetObjectResponse_example.xml | 2 +- 103221-1/examples/GetObject_example.xml | 2 +- .../ListAllDetailsResponse_example2.xml | 2 +- 103221-1/examples/ListObject_example.xml | 2 +- 103280/TS_103_280.asn1 | 2 +- 103280/TS_103_280.xsd | 6 +- 103707/TS_103_707.xsd | 2 +- 11 files changed, 65 insertions(+), 100 deletions(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index a4b3d6c..490e9c4 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,14 +1,7 @@ - - + - + @@ -188,8 +181,8 @@ - - + + @@ -674,7 +667,7 @@ - + @@ -807,33 +800,28 @@ - - + - - + - - - + + - - + - @@ -843,17 +831,15 @@ - - + - @@ -863,54 +849,47 @@ - - + - - + - - - + + - - + - - + - - + - @@ -920,31 +899,27 @@ - - + - - + - - + - diff --git a/103221-1/TS_103_221_01_HashedID.xsd b/103221-1/TS_103_221_01_HashedID.xsd index 90f961d..f5e735d 100644 --- a/103221-1/TS_103_221_01_HashedID.xsd +++ b/103221-1/TS_103_221_01_HashedID.xsd @@ -1,45 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml index 514a182..3b0e3e9 100644 --- a/103221-1/examples/CreateObject_example.xml +++ b/103221-1/examples/CreateObject_example.xml @@ -6,7 +6,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.9.1 + v1.10.1 3741800e-971b-4aa9-85f4-466d2b1adc7f 3741800e-971b-4aa9-85f4-466d2b1adc7e diff --git a/103221-1/examples/GetAllDetailsResponse_example2.xml b/103221-1/examples/GetAllDetailsResponse_example2.xml index 0810429..61ac922 100644 --- a/103221-1/examples/GetAllDetailsResponse_example2.xml +++ b/103221-1/examples/GetAllDetailsResponse_example2.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.496743Z - v1.9.1 + v1.10.1 bfd0c982-b7d6-4a8e-80a0-89dab964aafd OK diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml index 4892d37..b7f58e7 100644 --- a/103221-1/examples/GetObjectResponse_example.xml +++ b/103221-1/examples/GetObjectResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.6.1 + v1.10.1 3741800e-971b-4aa9-85f4-466d2b1adc7f diff --git a/103221-1/examples/GetObject_example.xml b/103221-1/examples/GetObject_example.xml index 8a47ff2..8ffc3fa 100644 --- a/103221-1/examples/GetObject_example.xml +++ b/103221-1/examples/GetObject_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.6.1 + v1.10.1 3741800e-971b-4aa9-85f4-466d2b1adc7f 3741800e-971b-4aa9-85f4-466d2b1adc7e diff --git a/103221-1/examples/ListAllDetailsResponse_example2.xml b/103221-1/examples/ListAllDetailsResponse_example2.xml index d694b12..7ca03d6 100644 --- a/103221-1/examples/ListAllDetailsResponse_example2.xml +++ b/103221-1/examples/ListAllDetailsResponse_example2.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.508330Z - v1.6.1 + v1.10.1 09529160-2e44-49c6-bf54-204ca5edcfab 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/ListObject_example.xml b/103221-1/examples/ListObject_example.xml index 6e6187b..26a1aad 100644 --- a/103221-1/examples/ListObject_example.xml +++ b/103221-1/examples/ListObject_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.6.1 + v1.10.1 3741800e-971b-4aa9-85f4-466d2b1adc7f Q{http://uri.etsi.org/03221/X1/2017/10}Foo diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1 index c7b31a6..68cfe54 100644 --- a/103280/TS_103_280.asn1 +++ b/103280/TS_103_280.asn1 @@ -91,4 +91,4 @@ GPSINAI ::= NAI NAI ::= UTF8String -END \ No newline at end of file +END diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index a6ec077..d6d91c5 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -1,5 +1,5 @@ - + @@ -241,9 +241,9 @@ - + - \ No newline at end of file + diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd index b503368..7bce63d 100644 --- a/103707/TS_103_707.xsd +++ b/103707/TS_103_707.xsd @@ -3,7 +3,7 @@ xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" - version="1.3.1" + version="1.4.1" elementFormDefault="qualified"> -- GitLab From c0b5ba0c858bd886302b7cb8649fddb639c914a6 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 20 Jan 2022 14:20:15 +0000 Subject: [PATCH 184/208] Adding DeleteAllObjects command --- 103221-1/TS_103_221_01.xsd | 18 ++++++++++++++++++ .../DeleteAllObjectsRequest_example.xml | 10 ++++++++++ .../DeleteAllObjectsResponse_example.xml | 11 +++++++++++ 3 files changed, 39 insertions(+) create mode 100644 103221-1/examples/DeleteAllObjectsRequest_example.xml create mode 100644 103221-1/examples/DeleteAllObjectsResponse_example.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 490e9c4..7f1c19f 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -107,6 +107,7 @@ + @@ -922,4 +923,21 @@ + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/DeleteAllObjectsRequest_example.xml b/103221-1/examples/DeleteAllObjectsRequest_example.xml new file mode 100644 index 0000000..29a2b33 --- /dev/null +++ b/103221-1/examples/DeleteAllObjectsRequest_example.xml @@ -0,0 +1,10 @@ + + + + admfID + neID + 2022-01-20T14:04:20.123456Z + v1.11.1 + 5775af53-a4a0-46ab-818a-86a406a335a + + diff --git a/103221-1/examples/DeleteAllObjectsResponse_example.xml b/103221-1/examples/DeleteAllObjectsResponse_example.xml new file mode 100644 index 0000000..596d518 --- /dev/null +++ b/103221-1/examples/DeleteAllObjectsResponse_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2022-01-20T14:04:20.123456Z + v1.11.1 + 5775af53-a4a0-46ab-818a-86a406a335ac + AcknowledgedAndCompleted + + -- GitLab From 2d473c71cf0e72f3350a27112a00c0fd6a933524 Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Thu, 17 Feb 2022 08:44:35 +0100 Subject: [PATCH 185/208] Include CGI, ECGI, NCGI and ICCID parameters --- 103280/TS_103_280.xsd | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index d6d91c5..8fd3317 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -1,5 +1,5 @@ - + @@ -246,4 +246,24 @@ + + + + + + + + + + + + + + + + + + + + -- GitLab From f2f479b3ab73fc75fc93ffb0437e3285b7c83e61 Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Thu, 17 Feb 2022 13:34:06 +0100 Subject: [PATCH 186/208] Added ChecksumType fields --- 103120/schema/ts_103120_Delivery.xsd | 9 +++++---- 103120/schema/ts_103120_Document.xsd | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/103120/schema/ts_103120_Delivery.xsd b/103120/schema/ts_103120_Delivery.xsd index 5fb2536..367f065 100644 --- a/103120/schema/ts_103120_Delivery.xsd +++ b/103120/schema/ts_103120_Delivery.xsd @@ -27,7 +27,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -73,6 +73,7 @@ + @@ -80,5 +81,5 @@ - + diff --git a/103120/schema/ts_103120_Document.xsd b/103120/schema/ts_103120_Document.xsd index af6f139..499e1cd 100644 --- a/103120/schema/ts_103120_Document.xsd +++ b/103120/schema/ts_103120_Document.xsd @@ -53,6 +53,7 @@ + -- GitLab From a188313afe9a40e85bf334e9ed0e08099956f42d Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Thu, 17 Feb 2022 15:46:42 +0100 Subject: [PATCH 187/208] Changed regexes of CGI, ECGI and NCGI parameters --- 103280/TS_103_280.xsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index 8fd3317..3ff4ae1 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -248,17 +248,17 @@ - + - + - + -- GitLab From ee453d6907545a622a3730bdfee0640b76e0a46b Mon Sep 17 00:00:00 2001 From: matthew meacham Date: Thu, 17 Feb 2022 15:37:28 +0000 Subject: [PATCH 188/208] 103221-1 CR032 DIDSet --- 103221-1/TS_103_221_01.xsd | 3 +- 103221-1/TS_103_221_01_DestinationSet.xsd | 40 +++++++++ .../examples/CreateDestinationSet_example.xml | 88 +++++++++++++++++++ 3 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 103221-1/TS_103_221_01_DestinationSet.xsd create mode 100644 103221-1/examples/CreateDestinationSet_example.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 490e9c4..3fb6cb9 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,5 +1,5 @@ - + @@ -299,6 +299,7 @@ + diff --git a/103221-1/TS_103_221_01_DestinationSet.xsd b/103221-1/TS_103_221_01_DestinationSet.xsd new file mode 100644 index 0000000..1bdcb98 --- /dev/null +++ b/103221-1/TS_103_221_01_DestinationSet.xsd @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/CreateDestinationSet_example.xml b/103221-1/examples/CreateDestinationSet_example.xml new file mode 100644 index 0000000..c1388b4 --- /dev/null +++ b/103221-1/examples/CreateDestinationSet_example.xml @@ -0,0 +1,88 @@ + + + + admfID + neID + 2022-02-16T18:46:21.247432Z + v1.11.1 + 7fa872e0-4bc7-4a98-a416-5f22b3de1dca + + 44b739c4-73f0-48d5-8d6a-3576ab100141 + X2andX3 + + +
+ 203.0.113.1 +
+ + 9999 + + + + + + + admfID + neID + 2022-02-16T18:46:21.247432Z + v1.11.1 + 8286e40c-0b4b-4d4c-94f0-1e7ab8489e44 + + 36adec69-e0f0-4a41-8e85-66bbe12c5a60 + X2andX3 + + +
+ 203.0.113.2 +
+ + 9999 + + + + + + + admfID + neID + 2022-02-16T18:46:21.247432Z + v1.11.1 + 7afbf8e3-7699-4008-ac1a-4475ed50c14b + + 30fbde5e-3195-4a22-b3e9-15e1d60d0528 + My First Destination Set + + + 44b739c4-73f0-48d5-8d6a-3576ab100141 + 1 + + + 36adec69-e0f0-4a41-8e85-66bbe12c5a60 + 2 + + + Redundant + + + + admfID + neID + 2022-02-16T18:46:21.247432Z + v1.11.1 + 4afef6be-5252-41cb-9275-123d308deb50 + + 1d7d7eb7-e0b9-4a5c-827a-bc3639d48124 + + + 6125550123 + + + X2andX3 + + 30fbde5e-3195-4a22-b3e9-15e1d60d0528 + + + + -- GitLab From 1884e59c7b8bf2261f5ce45ed9eb402868372bbd Mon Sep 17 00:00:00 2001 From: rengasamis Date: Thu, 17 Feb 2022 15:39:50 +0000 Subject: [PATCH 189/208] Update IPMultimediaPDU.asn to align usage of audioFrame coding with mMCCprotocol coding and usage. --- 102232-5/IPMultimediaPDU.asn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index d70768d..c54c461 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -51,7 +51,9 @@ IPMMCC ::= SEQUENCE -- May contain c= and m= lines extracts for instance mMCCprotocol [4] MMCCprotocol OPTIONAL -- Used to identify the protocol of packets sent in MMCCContent (RTP, UDPTL, MSRP, etc.) - -- Absence means mMCCContents contains RTP/RTCP packets + -- Absence means mMCCContents contains RTP/RTCP packets or audio frame as indicated by the + -- frameType parameter. + } FrameType ::= ENUMERATED -- GitLab From 95cde20b434ae325e5c17f94d2d6eb2a5c2b45de Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 17 Feb 2022 16:41:50 +0000 Subject: [PATCH 190/208] Updating version number in example files --- 103120/examples/mutliple-auth-example-request.xml | 2 +- 103120/examples/request1.xml | 2 +- 103120/examples/request2.xml | 2 +- 103120/examples/request3.xml | 2 +- 103120/examples/request4.xml | 2 +- 103120/examples/request5-Binary-Delivery.xml | 2 +- 103120/examples/request5-XML-Delivery.xml | 2 +- 103120/examples/request6.xml | 2 +- 103120/examples/request6_signed.xml | 2 +- 103120/examples/response1.xml | 2 +- 103120/examples/response2.xml | 2 +- 103120/examples/response3.xml | 2 +- 103120/examples/response4.xml | 2 +- 103120/examples/response5.xml | 2 +- 103120/examples/response6.xml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml index 8fd893c..ab1b79e 100644 --- a/103120/examples/mutliple-auth-example-request.xml +++ b/103120/examples/mutliple-auth-example-request.xml @@ -12,7 +12,7 @@ d442c58c-d5e1-4fd9-90ec-9c228ad947f1 2020-09-22T08:06:17.025833Z - V1.10.1 + V1.11.1 XX v1.1.1 diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index a5e40d6..2479534 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index 2b1d012..582bb6e 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index dce6620..7168d84 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index 73d6c07..9093778 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Delivery.xml index 2a13dfb..27b7f8a 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml index c345dbb..57b627c 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/request6.xml b/103120/examples/request6.xml index 15a2bf1..5ff9ed2 100644 --- a/103120/examples/request6.xml +++ b/103120/examples/request6.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2f 2021-10-11T13:37:00.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/request6_signed.xml b/103120/examples/request6_signed.xml index 2bc0404..61bbf43 100644 --- a/103120/examples/request6_signed.xml +++ b/103120/examples/request6_signed.xml @@ -11,7 +11,7 @@ 9964584e-c1a5-4ffa-b949-d9da504c4efb 2021-06-25T12:00:00.000000Z - V1.9.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index 54fad1c..7a989b9 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 104a76f..a08f8d6 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index 445187d..184967b 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index 3ca45c2..3c9f482 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index d02dff5..54572b3 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.10.1 + V1.11.1 XX v1.0 diff --git a/103120/examples/response6.xml b/103120/examples/response6.xml index 99b0ddc..f5ab209 100644 --- a/103120/examples/response6.xml +++ b/103120/examples/response6.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2f 2021-10-11T13:37:01.000000Z - V1.10.1 + V1.11.1 XX v1.0 -- GitLab From 63c5efb0aafe1125766a0d6d868344fef5739a37 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 18 Feb 2022 13:51:24 +0000 Subject: [PATCH 191/208] TS 103 221-1 CR032 - Destination Sets (correct target branch this time) --- 103221-1/TS_103_221_01.xsd | 3 +- 103221-1/TS_103_221_01_DestinationSet.xsd | 40 +++++++++ .../examples/CreateDestinationSet_example.xml | 88 +++++++++++++++++++ 3 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 103221-1/TS_103_221_01_DestinationSet.xsd create mode 100644 103221-1/examples/CreateDestinationSet_example.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 7f1c19f..fcf3742 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,5 +1,5 @@ - + @@ -300,6 +300,7 @@ + diff --git a/103221-1/TS_103_221_01_DestinationSet.xsd b/103221-1/TS_103_221_01_DestinationSet.xsd new file mode 100644 index 0000000..1bdcb98 --- /dev/null +++ b/103221-1/TS_103_221_01_DestinationSet.xsd @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/CreateDestinationSet_example.xml b/103221-1/examples/CreateDestinationSet_example.xml new file mode 100644 index 0000000..c1388b4 --- /dev/null +++ b/103221-1/examples/CreateDestinationSet_example.xml @@ -0,0 +1,88 @@ + + + + admfID + neID + 2022-02-16T18:46:21.247432Z + v1.11.1 + 7fa872e0-4bc7-4a98-a416-5f22b3de1dca + + 44b739c4-73f0-48d5-8d6a-3576ab100141 + X2andX3 + + +
+ 203.0.113.1 +
+ + 9999 + + + + + + + admfID + neID + 2022-02-16T18:46:21.247432Z + v1.11.1 + 8286e40c-0b4b-4d4c-94f0-1e7ab8489e44 + + 36adec69-e0f0-4a41-8e85-66bbe12c5a60 + X2andX3 + + +
+ 203.0.113.2 +
+ + 9999 + + + + + + + admfID + neID + 2022-02-16T18:46:21.247432Z + v1.11.1 + 7afbf8e3-7699-4008-ac1a-4475ed50c14b + + 30fbde5e-3195-4a22-b3e9-15e1d60d0528 + My First Destination Set + + + 44b739c4-73f0-48d5-8d6a-3576ab100141 + 1 + + + 36adec69-e0f0-4a41-8e85-66bbe12c5a60 + 2 + + + Redundant + + + + admfID + neID + 2022-02-16T18:46:21.247432Z + v1.11.1 + 4afef6be-5252-41cb-9275-123d308deb50 + + 1d7d7eb7-e0b9-4a5c-827a-bc3639d48124 + + + 6125550123 + + + X2andX3 + + 30fbde5e-3195-4a22-b3e9-15e1d60d0528 + + + + -- GitLab From 7864c18a8cc2229a0cd104542a218d4494ac56e5 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 18 Feb 2022 13:53:39 +0000 Subject: [PATCH 192/208] Revert "Merge branch 'cr/103221-1/032' into 'master'" This reverts merge request !60 --- 103221-1/TS_103_221_01.xsd | 3 +- 103221-1/TS_103_221_01_DestinationSet.xsd | 40 --------- .../examples/CreateDestinationSet_example.xml | 88 ------------------- 3 files changed, 1 insertion(+), 130 deletions(-) delete mode 100644 103221-1/TS_103_221_01_DestinationSet.xsd delete mode 100644 103221-1/examples/CreateDestinationSet_example.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 3fb6cb9..490e9c4 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,5 +1,5 @@ - + @@ -299,7 +299,6 @@ - diff --git a/103221-1/TS_103_221_01_DestinationSet.xsd b/103221-1/TS_103_221_01_DestinationSet.xsd deleted file mode 100644 index 1bdcb98..0000000 --- a/103221-1/TS_103_221_01_DestinationSet.xsd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/103221-1/examples/CreateDestinationSet_example.xml b/103221-1/examples/CreateDestinationSet_example.xml deleted file mode 100644 index c1388b4..0000000 --- a/103221-1/examples/CreateDestinationSet_example.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - admfID - neID - 2022-02-16T18:46:21.247432Z - v1.11.1 - 7fa872e0-4bc7-4a98-a416-5f22b3de1dca - - 44b739c4-73f0-48d5-8d6a-3576ab100141 - X2andX3 - - -
- 203.0.113.1 -
- - 9999 - - - - - - - admfID - neID - 2022-02-16T18:46:21.247432Z - v1.11.1 - 8286e40c-0b4b-4d4c-94f0-1e7ab8489e44 - - 36adec69-e0f0-4a41-8e85-66bbe12c5a60 - X2andX3 - - -
- 203.0.113.2 -
- - 9999 - - - - - - - admfID - neID - 2022-02-16T18:46:21.247432Z - v1.11.1 - 7afbf8e3-7699-4008-ac1a-4475ed50c14b - - 30fbde5e-3195-4a22-b3e9-15e1d60d0528 - My First Destination Set - - - 44b739c4-73f0-48d5-8d6a-3576ab100141 - 1 - - - 36adec69-e0f0-4a41-8e85-66bbe12c5a60 - 2 - - - Redundant - - - - admfID - neID - 2022-02-16T18:46:21.247432Z - v1.11.1 - 4afef6be-5252-41cb-9275-123d308deb50 - - 1d7d7eb7-e0b9-4a5c-827a-bc3639d48124 - - - 6125550123 - - - X2andX3 - - 30fbde5e-3195-4a22-b3e9-15e1d60d0528 - - - - -- GitLab From 6b3f32c8c7f31f99d5a85c01ec6fc687434c4ab0 Mon Sep 17 00:00:00 2001 From: Mark Lastdrager Date: Sun, 20 Feb 2022 17:29:38 +0100 Subject: [PATCH 193/208] Bump version number --- 102232-5/IPMultimediaPDU.asn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index c54c461..c9408c3 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -4,7 +4,7 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version14(14)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -22,8 +22,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -- GitLab From a6c3430bf7f4acaa9752b100fabddad511434bda Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 3 Mar 2022 09:47:09 +0000 Subject: [PATCH 194/208] Updating OIDs --- 102232-1/LI-PS-PDU.asn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 25f72fc..714ecf8 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version33(33)} DEFINITIONS IMPLICIT TAGS ::= @@ -34,7 +34,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version19(19)} -- from ETSI TS 102 232-3 [6] IPCC, @@ -54,7 +54,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version14(14)} -- from ETSI TS 102 232-6 [36] PstnIsdnCC, @@ -204,7 +204,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version33(33)} -- ==================== -- Top-level definition @@ -732,4 +732,4 @@ LawfulInterceptionIdentifier ::= LIID -- module to preserve the original type name during the -- removal of imports from ETSI TS 101 671 [4]. -END --end of LI-PS-PDU \ No newline at end of file +END --end of LI-PS-PDU -- GitLab From 2c7cea8fb6e3a876d05a30c5db99111c920d1958 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 28 Mar 2022 10:35:38 +0100 Subject: [PATCH 195/208] Bringing into line with SA3LI --- temp.asn | 735 +++++++++++++++++++++++++++++++ testing/asn_compile_targets.json | 33 ++ testing/asn_ignore.txt | 2 + testing/asn_ignore_lint.txt | 1 + testing/asn_process.py | 206 +++++++++ testing/check_asn1.py | 31 -- testing/check_xsd.py | 194 -------- testing/compile_asn.py | 140 ------ testing/dockerfile_asn | 11 + testing/dockerfile_xsd | 10 + testing/merge_test.py | 68 +++ testing/mod1.asn | 22 + testing/mod2.asn | 14 + testing/xsd_compile_targets.json | 7 + testing/xsd_ignore.txt | 3 + testing/xsd_process.py | 152 +++++++ 16 files changed, 1264 insertions(+), 365 deletions(-) create mode 100644 temp.asn create mode 100644 testing/asn_compile_targets.json create mode 100644 testing/asn_ignore.txt create mode 100644 testing/asn_ignore_lint.txt create mode 100644 testing/asn_process.py delete mode 100644 testing/check_asn1.py delete mode 100644 testing/check_xsd.py delete mode 100644 testing/compile_asn.py create mode 100644 testing/dockerfile_asn create mode 100644 testing/dockerfile_xsd create mode 100644 testing/merge_test.py create mode 100644 testing/mod1.asn create mode 100644 testing/mod2.asn create mode 100644 testing/xsd_compile_targets.json create mode 100644 testing/xsd_ignore.txt create mode 100644 testing/xsd_process.py diff --git a/temp.asn b/temp.asn new file mode 100644 index 0000000..6bcd0ce --- /dev/null +++ b/temp.asn @@ -0,0 +1,735 @@ +LI-PS-PDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)} + +DEFINITIONS IMPLICIT TAGS ::= + +BEGIN + +IMPORTS + -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) + + -- from ETSI TS 103 280 [44] + LIID + FROM Common-Parameters + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} + + + -- from ETSI TS 101 671 [4] + IRI-Parameters, + IRIsContent, + Location, + Network-Element-Identifier + FROM HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + + -- from ETSI TS 101 671 [4] + HI1-Operation + FROM HI1NotificationOperations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)} + + -- from ETSI TS 102 232-2 [5] + EmailCC, + EmailIRI, + MessagingCC, + MessagingMMCC, + MessagingIRI + FROM EmailPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} + + -- from ETSI TS 102 232-3 [6] + IPCC, + IPIRI, + IPIRIOnly + FROM IPAccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)} + + -- from ETSI TS 102 232-4 [32] + L2CC, + L2IRI, + L2IRIOnly + FROM L2AccessPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} + + -- from ETSI TS 102 232-5 [37] + IPMMCC, + IPMMIRI + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} + + -- from ETSI TS 102 232-6 [36] + PstnIsdnCC, + PstnIsdnIRI + FROM PstnIsdnPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + UmtsIRIsContent, + CorrelationValues, + Location + FROM UmtsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + UmtsCS-IRIsContent + FROM UmtsCS-HI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + EpsIRIsContent, + EPSLocation + FROM EpsHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + ConfIRIsContent + 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. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + ProSeIRIsContent + FROM ProSeHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + GcseIRIsContent + FROM GCSEHI2Operations + {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. + + -- 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. + + -- 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. + + -- 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. + -- 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 ETSI TS 101 909-20-1 [33] + TARGETACTIVITYMONITOR-1, + TTRAFFIC, + CTTRAFFIC + FROM TS101909201 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} + + -- from ETSI TS 101 909-20-2 [34] + TARGETACTIVITYMONITOR, + TTRAFFIC, + CTTRAFFIC + FROM TS101909202 + {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} + + -- from ETSI TS 103 462 [45] + ILHIPayload + FROM ILHIPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version2(2)} + -- This import is only used for the handover between LEMFs. + + -- from 3GPP TS 33.128 [46] + LINotificationPayload, + IRIPayload, + CCPayload + FROM TS33128Payloads + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + +-- end of IMPORTS + +-- ============================= +-- Object Identifier Definitions +-- ============================= + +lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} + +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)} + +-- ==================== +-- Top-level definition +-- ==================== + +PS-PDU ::= SEQUENCE +{ + pSHeader [1] PSHeader, + payload [2] Payload +} + +PSHeader ::= SEQUENCE +{ + li-psDomainId [0] OBJECT IDENTIFIER, + lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, + -- 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, + sequenceNumber [4] INTEGER (0..4294967295), + timeStamp [5] GeneralizedTime OPTIONAL, + -- see clause 5.2.6 + ..., + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + -- see clause 5.2.11 + microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, + timeStampQualifier [8] TimeStampQualifier OPTIONAL, + extendedInterceptionPointID [9] OCTET STRING (SIZE (1..65535)) OPTIONAL, + -- see clause 5.2.13 + networkFunctionIdentifier [10] OCTET STRING (SIZE (1..65535)) OPTIONAL + -- see clause 5.2.14 +} + +Payload ::= CHOICE +{ + iRIPayloadSequence [0] SEQUENCE OF NativeIRIPayload, + cCPayloadSequence [1] SEQUENCE OF NativeCCPayload, + -- Clause 6.2.3 explains how to include more than one payload in the same PDU + tRIPayload [2] TRIPayload, + ..., + hI1-Operation [3] HI1-Operation, + encryptionContainer [4] EncryptionContainer, + threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, + -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] + iLHIPayload [6] SEQUENCE OF ILHIPayload, + -- For typical use cases see ETSI TS 103 462 [45] + hI4Payload [7] SEQUENCE OF HI4Payload +} + +TimeStampQualifier ::= ENUMERATED +{ + unknown(0), + timeOfInterception(1), + timeOfMediation(2), + ..., + timeOfAggregation(3) +} + +HI4Payload ::= CHOICE +{ + threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload, + ... +} + +-- ==================================== +-- Items contained within the PS-Header +-- ==================================== + +CommunicationIdentifier ::= SEQUENCE +{ + networkIdentifier [0] NetworkIdentifier, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + -- in case of transport of HI1 messages not required + -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + -- see clause 5.2.4 + ..., + cINExtension [3] CorrelationValues OPTIONAL + -- To be used when a single INTEGER is not sufficient to identify + -- a particular session (see clause 5.2.4) +} + +NetworkIdentifier ::= SEQUENCE +{ + operatorIdentifier [0] OCTET STRING (SIZE(1..16)), + networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, + ..., + eTSI671NEID [2] Network-Element-Identifier OPTIONAL + -- For network element identifier, use either networkElementIdentifier or eTSI671NEID +} + +-- ========================== +-- Definitions for CC Payload +-- ========================== + +NativeCCPayload ::= SEQUENCE +{ + payloadDirection [0] PayloadDirection OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + cCContents [2] CCContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + timeStampQualifier [4] TimeStampQualifier OPTIONAL +} + +PayloadDirection ::= ENUMERATED +{ + fromTarget(0), + toTarget(1), + ..., + indeterminate(2), + -- Indication that the direction was indeterminate + combined(3), + -- Indication applicable to some services that the traffic is actually a combination + -- of To and From + notapplicable(4) + -- Indication that direction of interceptable service does not make sense +} + +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, + -- 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, + 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, + -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) + messagingCC [14] 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, + 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, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, + threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload) +} + +MicroSecondTimeStamp ::= SEQUENCE +{ + seconds [0] INTEGER (0..18446744073709551615), + -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch + microSeconds [1] INTEGER (0..999999), + ... +} + +-- =========================== +-- Definitions for IRI Payload +-- =========================== + +NativeIRIPayload ::= SEQUENCE +{ + iRIType [0] IRIType OPTIONAL, + -- See clause 5.2.10 + timeStamp [1] GeneralizedTime OPTIONAL, + -- For aggregated payloads (see clause 6.2.3) + iRIContents [2] IRIContents, + ..., + microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, + -- 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 + -- 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 + -- relevant service-specific details +} + +IRIType ::= ENUMERATED +{ + iRI-Begin(1), + iRI-End(2), + iRI-Continue(3), + iRI-Report(4) +} + +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, + uMTSIRI [4] UMTSIRI, + eTSI671IRI [5] ETSI671IRI, + ..., + l2IRI [6] L2IRI, + l2IRIOnly [7] L2IRIOnly, + tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, + tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, + pstnIsdnIRI [10] PstnIsdnIRI, + iPMMIRI [11] 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, + ePSIRI [15] EPSIRI, + confIRI [16] ConfIRI, + proseIRI [17] ProSeIRI, + gcseIRI [18] GcseIRI, + threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) +} + +UMTSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, + umtsIRIsContent [1] UmtsIRIsContent, + ..., + iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, + umtsCS-IRIsContent [3] UmtsCS-IRIsContent +} + +ETSI671IRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Parameters [0] HI2Operations.IRI-Parameters, + iRIsContent [1] IRIsContent, + ... +} + +EPSIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, + ... +} + +ConfIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, + confIRIsContent [1] ConfIRIsContent, + ... +} + + +ProSeIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, + proseIRIsContent [1] ProSeIRIsContent, + ... +} + + +GcseIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, + gcseIRIsContent [1] GcseIRIsContent, + ... +} + + +-- =========================== +-- Definitions for TRI Payload +-- =========================== + +TRIPayload ::= CHOICE +{ + integrityCheck [0] IntegrityCheck, + testPDU [1] NULL, + paddingPDU [2] OCTET STRING, + -- Undefined contents (will be discarded) + keep-alive [3] NULL, + keep-aliveResponse [4] NULL, + firstSegmentFlag [5] NULL, + lastSegmentFlag [6] NULL, + ..., + cINReset [7] NULL, + operatorLeaMessage [8] OperatorLeaMessage, + optionRequest [9] OptionRequest, + optionResponse [10] OptionResponse, + optionComplete [11] NULL, + pDUAcknowledgementRequest [12] NULL, + pDUAcknowledgementResponse [13] NULL +} + +IntegrityCheck ::= SEQUENCE +{ + includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), + -- gives the order the PDUs were processed + checkType [1] CheckType, + dataType [2] DataType OPTIONAL, + -- From version5(5) the dataType is mandatory for hashes and for signatures + -- (see clause 7.2.3) + 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 + -- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2. + ..., + hashAlgorithm [4] HashAlgorithm OPTIONAL + -- Clarifies the hash function if checkType is hash(1). + -- If used, it shall be present for each checkType hash(1). +} + +CheckType ::= ENUMERATED +{ + hash(1), + -- hash value + signature(2), + -- DSS/DSA signature + ... +} + +DataType ::= ENUMERATED +{ + iRI(1), + cC(2), + ..., + iLHI(3) +} + +HashAlgorithm ::= ENUMERATED +{ + sHA-1(1), + -- Included for legacy/migration purposes only, not to be used for new implementations + sHA-256(2), + sHA-384(3), + sHA-512(4), + ... +} + +Option ::= CHOICE +{ + pDUAcknowledgement [0] NULL, + ... +} + +OptionRequest ::= SEQUENCE +{ + requestedOptions [0] SEQUENCE OF Option, + ... +} + +OptionResponse ::= SEQUENCE +{ + acceptedOptions [0] SEQUENCE OF Option, + declinedOptions [1] SEQUENCE OF Option, + ... +} + +-- ================================== +-- Definitions for OperatorLeaMessage +-- ================================== + +OperatorLeaMessage ::= SEQUENCE +{ + messagePriority [0] OperatorLeaMessagePriority, + message [1] OCTET STRING (SIZE(1..255)), + ... +} + +OperatorLeaMessagePriority ::= ENUMERATED +{ + error(1), + -- reporting of error conditions that have impact on the quality of the + -- intercepted data + informational(2), + -- reporting of conditions that will not have direct impact on the quality of + -- the intercepted data + ... +} + +-- =================================== +-- Definitions for EncryptionContainer +-- =================================== + +EncryptionContainer ::= SEQUENCE +{ + encryptionType [0] EncryptionType, + encryptedPayload [1] OCTET STRING, + -- once decrypted, it can be interpreted as EncryptedPayload + ..., + encryptedPayloadType [2] EncryptedPayloadType OPTIONAL +} + +EncryptionType ::= ENUMERATED +{ + none(1), + -- No encryption is applied. + national-option(2), + -- Use this option when an encryption scheme is negotiated on a national level + aES-192-CBC(3), + -- The Advanced Encryption Standard using a 192 bit key in CBC mode + aES-256-CBC(4), + -- The Advanced Encryption Standard using a 256 bit key in CBC mode + blowfish-192-CBC(5), + -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode + blowfish-256-CBC(6), + -- Blowfish using a 256 bit key in CBC mode + threedes-cbc(7), + -- Triple-DES using a 192 bit key in CBC mode + ... +} + +EncryptedPayload ::= SEQUENCE +{ + byteCounter [0] INTEGER (0..18446744073709551615), + -- The sum of the sizes of all PDUs before this PDU. + -- It is initialized with the unixTime (number of seconds since 01-01-1970) + -- 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 + payload [1] Payload, + ... +} + +EncryptedPayloadType ::= ENUMERATED +{ + unknown(1), + part2(2), + -- encrypted payload is ETSI TS 102 232-2 [5] + part3(3), + -- encrypted payload is ETSI TS 102 232-3 [6] + part4(4), + -- encrypted payload is ETSI TS 102 232-4 [32] + part5(5), + -- encrypted payload is ETSI TS 102 232-5 [37] + part6(6), + -- encrypted payload is ETSI TS 102 232-6 [36] + part7(7), + -- encrypted payload is ETSI TS 102 232-7 [38] + ..., + part1(8) + -- encrypted payload is ETSI TS 102 232-1 (the present document) +} + +-- =================================== +-- Common Parameters +-- =================================== + +NativeLocation ::= SEQUENCE + -- This is a common parameter, the use of this parameter is described in clause 4.5 +{ + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + ..., + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL +} + +WlanLocationAttributes ::= SEQUENCE +{ + 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. +{ + iP-type [1] ENUMERATED + { + iPV4(0), + iPV6(1), + ... + }, + iP-value [2] IP-value, + iP-assignment [3] ENUMERATED + { + static(1), + -- The static coding shall be used to report a static address. + dynamic(2), + -- The dynamic coding shall be used to report a dynamically allocated address. + notKnown(3), + -- The notKnown coding shall be used to report other than static or dynamically + -- allocated IP addresses. + ... + } OPTIONAL, + ..., + iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, + -- Indicates the length of the prefix delegated by the CSP to the subscriber + -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" + -- Mandatory in case where the iP-value contains an IPv6 binary value + iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL + -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. + -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to + -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to + -- a /29 CIDR-format subnet mask +} + +IP-value ::= CHOICE +{ + iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), + -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" + -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" + iPTextAddress [2] IA5String (SIZE(7..45)), + -- In case of IPv6, the delivered iPTextAddress field could include a complete + -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. + -- In case of IPv4, the delivered iPTextAddress field could include a single + -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" + ... +} + +LawfulInterceptionIdentifier ::= 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 \ No newline at end of file diff --git a/testing/asn_compile_targets.json b/testing/asn_compile_targets.json new file mode 100644 index 0000000..e186add --- /dev/null +++ b/testing/asn_compile_targets.json @@ -0,0 +1,33 @@ +[ + [ + "./102232-1/LI-PS-PDU.asn", + "./103280/TS_103_280.asn1", + "./testing/deps/33128/TS33128Payloads.asn", + "./testing/deps/33108/Three3gppHI1Notifications.asn", + "./testing/deps/33108/UMTSHI2Operations.asn", + "./testing/deps/33108/UMTSHI3PS.asn", + "./testing/deps/33108/EpsHI3PS.asn", + "./testing/deps/33108/ConfHI3IMS.asn", + "./testing/deps/33108/VoipHI3IMS.asn", + "./testing/deps/33108/GCSEHI3.asn", + "./testing/deps/33108/CSVoiceHI3IP.asn", + "./testing/deps/33108/UMTSCSHI2Operations.asn", + "./testing/deps/33108/EpsHI2Operations.asn", + "./testing/deps/33108/ConfHI2Operations.asn", + "./testing/deps/33108/ProSeHI2Operations.asn", + "./testing/deps/33108/GCSEHI2Operations.asn", + "./testing/deps/101671/HI1NotificationOperations,ver7.asn", + "./testing/deps/101671/HI2Operations,ver18.asn", + "./testing/deps/101909/TS101909201.asn", + "./testing/deps/101909/TS101909202.asn", + "./testing/deps/101909/PCESP.asn", + "./testing/deps/301040/06132v203_C01.asn", + "./103462/ILHIPDU.asn", + "./102232-2/EmailPDU.asn", + "./102232-3/IPAccessPDU.asn", + "./102232-4/L2AccessPDU.asn", + "./102232-5/IPMultimediaPDU.asn", + "./102232-6/PstnIsdnPDU.asn" + ], + ["./102657/RDMessage.asn"] +] \ No newline at end of file diff --git a/testing/asn_ignore.txt b/testing/asn_ignore.txt new file mode 100644 index 0000000..2d81d20 --- /dev/null +++ b/testing/asn_ignore.txt @@ -0,0 +1,2 @@ +deps +temp \ No newline at end of file diff --git a/testing/asn_ignore_lint.txt b/testing/asn_ignore_lint.txt new file mode 100644 index 0000000..03e7f54 --- /dev/null +++ b/testing/asn_ignore_lint.txt @@ -0,0 +1 @@ +dependencies \ No newline at end of file diff --git a/testing/asn_process.py b/testing/asn_process.py new file mode 100644 index 0000000..aa0a0a6 --- /dev/null +++ b/testing/asn_process.py @@ -0,0 +1,206 @@ +import logging +import json +from pathlib import Path +from subprocess import run +from re import sub + +from pycrate_asn1c.asnproc import * + +def reconstrainInteger (filename): + Path('temp.asn').write_text(Path(filename).read_text().replace("18446744073709551615", "65536")) + return 'temp.asn' + +filesWithBigInts = [ + '102232-1/LI-PS-PDU.asn', + '102232-3/IPAccessPDU.asn', + '102232-4/L2AccessPDU.asn' +] + +def syntaxCheckASN (fileList): + """ + Performs ASN syntax checking on a list of filenames (or pathlib Paths) + + :param fileList: List of filenames (str or Pathlib Path) + :returns: Dict with result, return code and message for each filename + + Calls the open-source asn1c compiler with the "syntax only" option. + As a result, asn1c must be available to run. + """ + results = {} + for file in fileList: + try: + if file.as_posix() in filesWithBigInts: + newFile = reconstrainInteger(str(file)) + p = run(['asn1c', '-E', newFile], capture_output=True) + Path(newFile).unlink() + else: + p = run(['asn1c', '-E', str(file)], capture_output=True) + if (p.returncode != 0): + errorMessage = p.stderr.decode().splitlines()[0] + if errorMessage.startswith(' Value "18446744073709551615" at line'): + results[str(file)] = { 'ok' : True} + continue + results[str(file)] = { + 'ok' : False, + 'code' : p.returncode, + 'message' : p.stderr.decode().splitlines()[0] + } + else: + results[str(file)] = { + 'ok' : True + } + except Exception as ex: + results[str(file)] = { + 'ok' : False, + 'code' : -1, + 'message' : f"{ex!r}" + } + return results + + +duplicateObjects = { + '102232-1/LI-PS-PDU.asn' : [ + 'CCPayload', + 'IRIPayload', + 'Location' + ], + 'testing/mod1.asn' : [ + 'ClashField' + ] +} +def fixDuplicateObjects(filename): + stringContent = filename.read_text() + for object in duplicateObjects[filename.as_posix()]: + stringContent = stringContent.replace(f'{object} ::=', f'Native{object} ::=') + stringContent = stringContent.replace(f'SEQUENCE OF {object}', f'SEQUENCE OF Native{object}') + #stringContent = sub(f"]\\w{object}", f"] Native{object}", stringContent) + + Path('temp.asn').write_text(stringContent) + return 'temp.asn' + + +def compileAllTargets (compileTargets): + """ + Attempts to compile a set of compile targets using the pycrate ASN1 tools + + :param compileTargets: list of compile targets, each of which is a list of filenames + :returns: A dict of outcome against the first filename of each compile target. Return code and message are included for failures. + + For each compile target (list of filenames) the first filename is assumed + to be the "primary" file. This doesn't have any relavance to the compilation, + but will be used as the identifier when reporting any compile errors. + The compilation is performed by the pycrate ASN compile functions; errors + are caught as exceptions and rendered into a list. + + Unfortunately, the pycrate compiler doesn't report line numbers. + The asn1c compiler does, but doesn't properly handle identifiers with the + same name in different modules; as this occurs multiple times in TS 33.108, + we can't use it. + """ + results = {} + for target in compileTargets: + firstTarget = target[0] + logging.debug(f"Compiling {firstTarget}") + try: + fileTexts = [] + fileNames = [] + GLOBAL.clear() + for filename in target: + pFile = Path(filename) + if pFile.as_posix() in duplicateObjects: + tmpFile = Path(fixDuplicateObjects(pFile)) + fileTexts.append(tmpFile.read_text()) + #tmpFile.unlink() + else: + fileTexts.append(pFile.read_text()) + fileNames.append(filename) + logging.debug (f" Loading {filename}") + compile_text(fileTexts, filenames = fileNames) + results[str(firstTarget)] = { + 'ok' : True, + } + except Exception as ex: + results[str(firstTarget)] = { + 'ok' : False, + 'code' : -1, + 'message' : f"{ex!r}" + } + continue + return results + + + +def processResults (results, stageName): + """ + Counts the number of errors and writes out the output per filename + + :param results: List of filenames (str or Pathlib Path) + :param stageName: Name to decorate the output with + :returns: The number of files which had errors + """ + print("") + errorCount = sum([1 for r in results.values() if not r['ok']]) + logging.info(f"{errorCount} {stageName} errors encountered") + + print(f"{'-':-<60}") + print(f"{stageName} results:") + print(f"{'-':-<60}") + for filename, result in results.items(): + print(f" {filename:.<55}{'..OK' if result['ok'] else 'FAIL'}") + if not result['ok']: + if isinstance(result['message'], list): + for thing in result['message']: + print(f" {thing['message']}") + else: + print(f" {result['message']}") + + print(f"{'-':-<60}") + print(f"{stageName} errors: {errorCount}") + print(f"{'-':-<60}") + + return errorCount + + +if __name__ == '__main__': + logging.info('Searching for ASN.1 files') + fileList = list(Path(".").rglob("*.asn1")) + list(Path(".").rglob("*.asn")) + logging.info(f'{len(fileList)} ASN.1 files found') + for file in fileList: + logging.debug(f' {file}') + + ignoreList = Path('testing/asn_ignore.txt').read_text().splitlines() + ignoredFiles = [] + for ignore in ignoreList: + logging.debug(f'Ignoring pattern {ignore}') + for file in fileList: + if ignore in str(file): + ignoredFiles.append(file) + logging.debug(f" Ignoring {str(file)} as contains {ignore}") + ignoredFiles = list(set(ignoredFiles)) + logging.info(f'{len(ignoredFiles)} files ignored') + for file in ignoredFiles: + logging.debug(f' {file}') + + fileList = [file for file in fileList if file not in ignoredFiles] + logging.info(f'{len(fileList)} files to process') + for file in fileList: + logging.debug(f' {file}') + + if len(fileList) == 0: + logging.warning ("No files specified") + exit(0) + + logging.info("Parsing ASN1 files") + parseResults = syntaxCheckASN(fileList) + if processResults(parseResults, "Parsing") > 0: + exit(-1) + + logging.info ("Getting compile targets") + compileTargets = json.loads(Path('testing/asn_compile_targets.json').read_text()) + logging.info (f"{len(compileTargets)} compile targets found") + + compileResults = compileAllTargets(compileTargets) + if processResults(compileResults, "Compiling") > 0: + exit(-1) + + exit(0) diff --git a/testing/check_asn1.py b/testing/check_asn1.py deleted file mode 100644 index c87a226..0000000 --- a/testing/check_asn1.py +++ /dev/null @@ -1,31 +0,0 @@ -import logging -from compile_asn import * - - -if __name__ == '__main__': - log = logging.getLogger() - log.setLevel(logging.INFO) - parseErrors, compileErrors, parser = validateAllASN1FilesInPath("./") - parseErrorCount = 0 - print ("ASN.1 Parser checks:") - print ("-----------------------------") - for filename, errors in parseErrors.items(): - if len(errors) > 0: - parseErrorCount += len(errors) - print (f"{filename}: {len(errors)} errors") - for error in errors: - print (" " + str(error)) - else: - print (f"{filename}: OK") - print ("-----------------------------") - print ("ASN.1 Compilation:") - print ("-----------------------------") - if len(compileErrors) > 0: - for error in compileErrors: - print (" " + str(error)) - else: - print ("Compilation OK") - print ("-----------------------------") - print (f"{parseErrorCount} parse errors, {len(compileErrors)} compile errors") - exit (parseErrorCount + len(compileErrors)) - diff --git a/testing/check_xsd.py b/testing/check_xsd.py deleted file mode 100644 index 816e389..0000000 --- a/testing/check_xsd.py +++ /dev/null @@ -1,194 +0,0 @@ -import logging - -import glob -import sys -import argparse -from pathlib import Path -from pprint import pprint -import os - -from lxml import etree -from xml.etree.ElementTree import ParseError -from xmlschema import XMLSchema, XMLSchemaParseError - -def BuildSchemaDictonary (fileList): - if len(fileList) == 0: - logging.info("No schema files provided") - return [] - - logging.info("Schema locations:") - schemaLocations = [] - for schemaFile in fileList: - try: - xs = XMLSchema(schemaFile, validation='skip') - schemaLocations.append((xs.target_namespace, str(Path(schemaFile).resolve()))) - logging.info(" [ {0} -> {1} ]".format(xs.default_namespace, schemaFile)) - except ParseError as ex: - logging.warning (" [ {0} failed to parse: {1} ]".format(schemaFile, ex)) - return schemaLocations - - -def BuildSchema (coreFile, fileList = None): - schemaLocations = [] - if fileList and len(fileList) > 0: - schemaLocations = BuildSchemaDictonary(fileList) - - coreSchema = XMLSchema(str(Path(coreFile)), locations=schemaLocations) - return coreSchema - -def ValidateSingleFile (schemaFile): - try: - xs = XMLSchema(schemaFile, validation='skip') - except ParseError as ex: - logging.warning (" [ {0} failed to parse: {1} ]".format(schemaFile, ex)) - return ex - return None - - -def ValidateXSDFiles (fileList): - if len(fileList) == 0: - logging.info("No schema files provided") - return {} - - schemaLocations = BuildSchemaDictonary(fileList) - errors = {} - schemaDictionary = {} - - logging.info("Schema validation:") - for schemaFile in fileList: - try: - schema = XMLSchema(schemaFile, locations = schemaLocations) - logging.info(schemaFile + ": OK") - errors[schemaFile] = [] - schemaDictionary[schema.target_namespace] = schema - except XMLSchemaParseError as ex: - if (ex.schema_url) and (ex.schema_url != ex.origin_url): - logging.info(" Error {1} comes from {0}, suppressing".format(ex.schema_url, ex.message)) - errors[schemaFile] = [] - else: - logging.warning(schemaFile + ": Failed validation ({0})".format(ex)) - errors[schemaFile] = [ex.message] - return errors, schemaDictionary - - -def ValidateInstanceDocuments (coreFile, supportingSchemas, instanceDocs): - if (instanceDocs is None) or len(instanceDocs) == 0: - logging.warning ("No instance documents provided") - return [] - - schema = BuildSchema(coreFile, supportingSchemas) - errors = [] - for instanceDoc in instanceDocs: - try: - schema.validate(instanceDoc) - logging.info ("{0} passed validation".format(instanceDoc)) - except Exception as ex: - logging.error ("{0} failed validation: {1}".format(instanceDoc, ex)) - return errors - - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - parser.add_argument("-v", "--verbosity", help="verbosity level", action="count", default=0) - parser.add_argument("input", help="include a directory or file", action="append", nargs="+") - parser.add_argument("-p", "--primaryNamespace", help="Primary schema namespace for instance doc validation") - args = parser.parse_args() - - logging.getLogger().setLevel(logging.WARNING) - if (args.verbosity >= 1): - logging.getLogger().setLevel(logging.INFO) - if (args.verbosity >= 2): - logging.getLogger().setLevel(logging.DEBUG) - logging.debug("Very verbose selected") - - - logging.debug(f"Path: {args.input}") - includeFileList = [] - includeInstanceDocList = [] - for path in args.input[0]: - p = Path(path) - if not p.exists(): - logging.error(f"Include path {path} not found") - exit(1) - if p.is_dir(): - logging.debug(f"Expanding directory") - for g in glob.glob(os.path.join(str(p), "*.xsd")): - logging.info(f">Including {g}") - includeFileList.append(g) - for g in glob.glob(os.path.join(str(p), "*.xml")): - logging.info(f">Including instance doc {g}") - includeInstanceDocList.append(g) - else: - logging.info(f">Including {p.absolute()}") - if str(p.absolute()).endswith('.xml'): - includeInstanceDocList.append(str(p.absolute())) - elif str(p.absolute()).endswith('.xsd'): - includeFileList.append(str(p.absolute())) - else: - logging.warning(f'Ignoring file {p.absolute()}') - - if len(includeInstanceDocList) and (args.primaryNamespace is None): - print("Cannot validate instance documents without specifying a primary namespace (use -h for usage guidelines)") - exit(-1) - - syntaxErrors = 0 - - print ("=============================") - print ("XSD syntax checks:") - print ("-----------------------------") - for file in includeFileList: - error = ValidateSingleFile(file) - if (error): - print (f" {file} : Syntax error [{error}]") - syntaxErrors += 1 - else: - print (f" {file} : OK") - - print ("-----------------------------") - if (syntaxErrors > 0): - print (f"{syntaxErrors} syntax errors detected") - exit(syntaxErrors) - else: - print ("0 syntax errors detected") - - results, schemaDict = ValidateXSDFiles(includeFileList) - - print ("=============================") - print ("XSD build checks:") - print ("-----------------------------") - errorCount = 0 - for fileName, errors in results.items(): - if len(errors) > 0: - errorCount += len(errors) - print (f" {fileName}: {len(errors)} errors") - for error in errors: - if isinstance(error, XMLSchemaParseError): - print (error.msg) - else: - print (f" {str(error.strip())}") - else: - print (f" {fileName}: OK") - - print ("-----------------------------") - print (f"{errorCount} build errors detected") - if (errorCount > 0): - exit(errorCount) - - print ("=============================") - print ("Instance document checks") - print ("-----------------------------") - errorCount = 0 - - primarySchema = schemaDict[args.primaryNamespace] - for instanceDoc in includeInstanceDocList: - try: - results = primarySchema.validate(instanceDoc) - print (f" {instanceDoc} : OK") - except Exception as ex: - errorCount += 1 - print (f" {instanceDoc} : {str(ex)}") - print ("-----------------------------") - print (f"{errorCount} instance doc errors detected") - print ("=============================") - exit(errorCount) diff --git a/testing/compile_asn.py b/testing/compile_asn.py deleted file mode 100644 index e291e42..0000000 --- a/testing/compile_asn.py +++ /dev/null @@ -1,140 +0,0 @@ -import logging -import copy -from asn1tools import parse_files, compile_dict, ParseError, CompileError -from glob import glob -from pathlib import Path -from pprint import pprint - -def parseASN1File (asnFile): - try: - parse_files(asnFile) - except ParseError as ex: - return [ex] - return [] - - -def parseASN1Files (fileList): - if len(fileList) == 0: - logging.warning ("No files specified") - return {} - errors = {} - logging.info("Parsing files...") - for f in fileList: - ex = parseASN1File(f) - if ex: - logging.info (f" {f}: Failed - {ex!r}") - else: - logging.info (f" {f}: OK") - errors[f] = ex - return errors - -def fixDottedReference (dict, importingModule, importingType, importingMember, importedModule, importedType): - newName = importedModule + "_" + importedType - dict[importedModule]['types'][newName] = copy.deepcopy(dict[importedModule]['types'][importedType]) - dict[importingModule]['imports'][importedModule].append(newName) - member = [x for x in dict[importingModule]['types'][importingType]['members'] if x is not None and x['name'] == importingMember][0] - member['type'] = newName - -def compileASN1Files (fileList): - logging.info("Compiling files...") - errors = [] - imports = {} - - #p = re.compile(r"]\s+\S+\.\S+") - #for f in fileList: - # with open(f) as fh: - # s = fh.read() - # for match in p.findall(s): - # print (f"In {f}: {match}") - #exit() - - try: - dr = parse_files(fileList) - for modulename, module in dr.items(): - # Weird fix because the compiler doesn't like RELATIVE-OID as a type - # Not sure if the on-the-wire encoding would be affected or not - # but for most checking purposes this doesn't matter - module['types']["RELATIVE-OID"] = {'type' : 'OBJECT IDENTIFIER'} - for k,v in module['imports'].items(): - if not k in imports: - imports[k] = [] - imports[k].append({ - "in" : modulename, - "types" : v - }) - for k,v in imports.items(): - if not k in dr.keys(): - importers = [i['in'] for i in v] - errors.append(f"Unsatisfied import [{k}] for {importers}") - - fixDottedReference(dr, 'LI-PS-PDU', 'Location', 'umtsHI2Location', 'UmtsHI2Operations', 'Location') - fixDottedReference(dr, 'LI-PS-PDU', 'Location', 'epsLocation', 'EpsHI2Operations', 'Location') - fixDottedReference(dr, 'LI-PS-PDU', 'Location', 'eTSI671HI2Location', 'HI2Operations', 'Location') - - fixDottedReference(dr, 'LI-PS-PDU', 'UMTSIRI', 'iRI-Parameters', 'UmtsHI2Operations', 'IRI-Parameters') - fixDottedReference(dr, 'LI-PS-PDU', 'UMTSIRI', 'iRI-CS-Parameters', 'UmtsCS-HI2Operations', 'IRI-Parameters') - fixDottedReference(dr, 'LI-PS-PDU', 'ETSI671IRI', 'iRI-Parameters', 'HI2Operations', 'IRI-Parameters') - fixDottedReference(dr, 'LI-PS-PDU', 'EPSIRI', 'iRI-EPS-Parameters', 'EpsHI2Operations', 'IRI-Parameters') - fixDottedReference(dr, 'LI-PS-PDU', 'ConfIRI', 'iRI-Conf-Parameters', 'CONFHI2Operations', 'IRI-Parameters') - fixDottedReference(dr, 'LI-PS-PDU', 'ProSeIRI', 'iRI-ProSe-Parameters', 'ProSeHI2Operations', 'IRI-Parameters') - fixDottedReference(dr, 'LI-PS-PDU', 'GcseIRI', 'iRI-Gcse-Parameters', 'GCSEHI2Operations', 'IRI-Parameters') - - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'tTRAFFIC-1', 'TS101909201', 'TTRAFFIC') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cTTRAFFIC-1', 'TS101909201', 'CTTRAFFIC') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'tTRAFFIC-2', 'TS101909202', 'TTRAFFIC') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cTTRAFFIC-2', 'TS101909202', 'CTTRAFFIC') - #fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cCIPPacketHeader', 'CDMA2000CCModule', 'CCIPPacketHeader') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'uMTSCC-CC-PDU', 'Umts-HI3-PS', 'CC-PDU') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'ePSCC-CC-PDU', 'Eps-HI3-PS', 'CC-PDU') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'confCC-CC-PDU', 'CONF-HI3-IMS', 'Conf-CC-PDU') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'voipCC-CC-PDU', 'VoIP-HI3-IMS', 'Voip-CC-PDU') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'gcseCC-CC-PDU', 'GCSE-HI3', 'Gcse-CC-PDU') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cSvoice-CC-PDU', 'CSvoice-HI3-IP', 'CSvoice-CC-PDU') - - fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'tARGETACTIVITYMONITOR-1', 'TS101909201', 'TARGETACTIVITYMONITOR-1') - fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'tARGETACTIVITYMONITOR-2', 'TS101909202', 'TARGETACTIVITYMONITOR') - #fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'lAESProtocol', 'Laesp-j-std-025-b', 'LAESProtocol') - #fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'cDMA2000LAESMessage', 'CDMA2000CIIModule', 'CDMA2000LAESMessage') - - fixDottedReference(dr, 'LI-PS-PDU', 'HI4Payload', 'threeGPP-LI-Notification', 'TS33128Payloads', 'LINotificationPayload') - - fixDottedReference(dr, 'ILHIPDU', 'TimestampMapping', 'timeStampQualifier', 'LI-PS-PDU', 'TimeStampQualifier') - - fixDottedReference(dr, 'ILHIPDU', 'ILHITimestamp', 'qualifiedDateTime', 'Common-Parameters', 'QualifiedDateTime') - fixDottedReference(dr, 'ILHIPDU', 'ILHITimestamp', 'qualifiedMicrosecondDateTime', 'Common-Parameters', 'QualifiedMicrosecondDateTime') - - fixDottedReference(dr, 'ILHIPDU', 'OriginalTimestamp', 'microSecondTimeStamp', 'LI-PS-PDU', 'MicroSecondTimeStamp') - - fixDottedReference(dr, 'ILHIPDU', 'LocationMapping', 'originalLocation', 'LI-PS-PDU', 'Location') - - fixDottedReference(dr, 'ILHIPDU', 'GeocodedLocationData', 'wGS84CoordinateDecimal', 'Common-Parameters', 'WGS84CoordinateDecimal') - fixDottedReference(dr, 'ILHIPDU', 'GeocodedLocationData', 'wGS84CoordinateAngular', 'Common-Parameters', 'WGS84CoordinateAngular') - - c = compile_dict(dr) - except CompileError as ex: - logging.info (f"Compiler error: {ex}") - errors.append(ex) - return errors, None - except ParseError as ex: - logging.info (f"Parse error: {ex}") - errors.append(ex) - return errors, None - logging.info ("Compiled OK") - return errors, c - - -def validateASN1Files (fileList): - parseErrors = parseASN1Files(fileList) - errorCount = sum([len(v) for k,v in parseErrors.items()]) - if errorCount > 0: - logging.info ("Abandoning compile due to parse errors") - return parseErrors, [], None - compileErrors, parser = compileASN1Files(fileList) - return parseErrors, compileErrors, parser - - -def validateAllASN1FilesInPath (path): - p = Path(path) - fileGlob = [str(f) for f in p.rglob('*.asn')] - fileGlob += [str(f) for f in p.rglob('*.asn1')] - return validateASN1Files(fileGlob) \ No newline at end of file diff --git a/testing/dockerfile_asn b/testing/dockerfile_asn new file mode 100644 index 0000000..2a4198b --- /dev/null +++ b/testing/dockerfile_asn @@ -0,0 +1,11 @@ +# docker build -t mcanterb/asn1test +# docker push mcanterb/asn1test + +FROM python:3.9-slim-bullseye +RUN apt-get update -y && \ + apt-get install -y asn1c && \ + rm -rf /var/lib/apt/lists/* && \ + pip install --no-cache-dir asn1tools pycrate + + + diff --git a/testing/dockerfile_xsd b/testing/dockerfile_xsd new file mode 100644 index 0000000..9ceeee3 --- /dev/null +++ b/testing/dockerfile_xsd @@ -0,0 +1,10 @@ +# docker build -t mcanterb/xsdtest +# docker push mcanterb/xsdtest + +FROM python:3.9-slim-bullseye +RUN apt-get update -y && \ + rm -rf /var/lib/apt/lists/* && \ + pip install --no-cache-dir lxml xmlschema + + + diff --git a/testing/merge_test.py b/testing/merge_test.py new file mode 100644 index 0000000..b7a82b3 --- /dev/null +++ b/testing/merge_test.py @@ -0,0 +1,68 @@ +import os +import pprint +import requests +import json +import subprocess + +crCommitBranch = os.environ.get("CI_COMMIT_REF_NAME", "NOTFOUND") +apiUrl = os.environ.get("CI_API_V4_URL", "https://forge.3gpp.org/rep/api/v4") +projectId = os.environ.get("CI_PROJECT_ID", "13") + +def gapi (query): + url = f"{apiUrl}/projects/{projectId}/{query}" + r = requests.get(url) + return json.loads(r.text) + +def do (commandline): + #print (" Attempting: " + commandline) + completedProc = subprocess.run(commandline, capture_output=True, shell=True) + #print (" STDOUT > " + ("empty" if completedProc.stdout is None else completedProc.stdout.decode('utf-8'))) + #print (" STDERR > " + ("empty" if completedProc.stderr is None else completedProc.stderr.decode('utf-8'))) + #print (f" Completed with code {completedProc.returncode}") + return (completedProc.returncode == 0, completedProc.stdout.decode('utf-8')) + +print ("Searching for corresponding MR...") + +mrs = gapi(f"merge_requests?source_branch={crCommitBranch}&state=opened") +if len(mrs) == 0: + print ("No MR found... aborting") + exit() + +if len(mrs) > 1: + print (f"{len(mrs)} MRs found, 1 expected - aborting") + for m in mrs: + pprint.pprint(m) + exit(-1) + +mr = mrs[0] + +print (f"Found MR {mr['reference']} ({mr['title']})") +print (f"Target branch is {mr['target_branch']}") +print ("Searching for open MRs targeting same branch...") + +mrs = gapi(f"merge_requests?target_branch={mr['target_branch']}&state=opened") +mrs = [m for m in mrs if m['reference'] != mr['reference']] +print (f"{len(mrs)} MRs found") + +mergeConflicts = {} + +for mr in mrs: + source_branch = mr['source_branch'] + print (source_branch) + + try: + do(f"git fetch origin {source_branch}:{source_branch}") + success, errStr = do(f"git merge --no-commit {source_branch}") + if not success: + print ("Merge NOT OK") + mergeConflicts[source_branch] = errStr + else: + print ("Merge OK") + except Exception as ex: + mergeConflicts[source_branch] = str(ex) + raise + finally: + do("git merge --abort") + +print (f"Merge conflicts with following branches: {mergeConflicts}") +exit(len(mergeConflicts.keys())) \ No newline at end of file diff --git a/testing/mod1.asn b/testing/mod1.asn new file mode 100644 index 0000000..5d4853e --- /dev/null +++ b/testing/mod1.asn @@ -0,0 +1,22 @@ +Mod1 {itu-t(0) identified-organization(4) etsi(0)} + +DEFINITIONS ::= + +BEGIN + +IMPORTS + + ImportedField, + ClashField + FROM Mod2 {itu-t(0) identified-organization(4) etsi(1)}; + +TestPDU ::= SEQUENCE +{ + field1 [1] ClashField +} + +ClashField ::= BOOLEAN + +END + + diff --git a/testing/mod2.asn b/testing/mod2.asn new file mode 100644 index 0000000..cec89b0 --- /dev/null +++ b/testing/mod2.asn @@ -0,0 +1,14 @@ +Mod2 {itu-t(0) identified-organization(4) etsi(1)} + +DEFINITIONS ::= + +BEGIN + +ImportedField ::= SEQUENCE +{ + field2 [0] BOOLEAN +} + +ClashField ::= INTEGER + +END diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json new file mode 100644 index 0000000..fc6e235 --- /dev/null +++ b/testing/xsd_compile_targets.json @@ -0,0 +1,7 @@ +[ + { + "coreSchema" : "RDMessage.xsd", + "supportingSchemas" : [], + "exampleFiles" : [] + } +] \ No newline at end of file diff --git a/testing/xsd_ignore.txt b/testing/xsd_ignore.txt new file mode 100644 index 0000000..90bfe5d --- /dev/null +++ b/testing/xsd_ignore.txt @@ -0,0 +1,3 @@ +deps +portal +temp \ No newline at end of file diff --git a/testing/xsd_process.py b/testing/xsd_process.py new file mode 100644 index 0000000..864b70b --- /dev/null +++ b/testing/xsd_process.py @@ -0,0 +1,152 @@ +import logging +from pathlib import Path + +from xmlschema.etree import etree_tostring +from xmlschema import XMLSchema, XMLSchemaParseError + + +def BuildSchemaDictonary (fileList): + if len(fileList) == 0: + logging.info("No schema files provided") + return [] + + logging.info("Schema locations:") + schemaLocations = [] + for schemaFile in fileList: + try: + xs = XMLSchema(schemaFile, validation='skip') + schemaLocations.append((xs.default_namespace, str(Path(schemaFile).resolve()))) + logging.info(" [ {0} -> {1} ]".format(xs.default_namespace, schemaFile)) + except XMLSchemaParseError as ex: + logging.warning (" [ {0} failed to parse: {1} ]".format(schemaFile, ex)) + return schemaLocations + + +def BuildSchema (coreFile, fileList = None): + schemaLocations = [] + if fileList and len(fileList) > 0: + schemaLocations = BuildSchemaDictonary(fileList) + + coreSchema = XMLSchema(str(Path(coreFile)), locations=schemaLocations) + return coreSchema + + +def ValidateXSDFiles (fileList): + if len(fileList) == 0: + logging.info("No schema files provided") + return {} + + schemaLocations = BuildSchemaDictonary(fileList) + errors = {} + + logging.info("Schema validation:") + for schemaFile in fileList: + try: + schema = XMLSchema(schemaFile, locations = schemaLocations, validation="lax") + logging.info(schemaFile + ": OK") + errors[schemaFile] = [f"{etree_tostring(e.elem, e.namespaces, ' ', 20)} - {e.message}" for e in schema.all_errors] + except XMLSchemaParseError as ex: + logging.warning(schemaFile + ": Failed validation ({0})".format(ex.message)) + if (ex.schema_url) and (ex.schema_url != ex.origin_url): + logging.warning(" Error comes from {0}, suppressing".format(ex.schema_url)) + errors[schemaFile] = [] + else: + errors[schemaFile] = [ex] + return errors + + +def ValidateAllXSDFilesInPath (path): + schemaGlob = [str(f) for f in Path(path).rglob("*.xsd")] + return ValidateXSDFiles(schemaGlob) + + +def ValidateInstanceDocuments (coreFile, supportingSchemas, instanceDocs): + if (instanceDocs is None) or len(instanceDocs) == 0: + logging.warning ("No instance documents provided") + return [] + + schema = BuildSchema(coreFile, supportingSchemas) + errors = [] + for instanceDoc in instanceDocs: + try: + schema.validate(instanceDoc) + logging.info ("{0} passed validation".format(instanceDoc)) + except Exception as ex: + logging.error ("{0} failed validation: {1}".format(instanceDoc, ex)) + return errors + + +def processResults (results, stageName): + """ + Counts the number of errors and writes out the output per filename + + :param results: List of filenames (str or Pathlib Path) + :param stageName: Name to decorate the output with + :returns: The number of files which had errors + """ + print("") + errorCount = sum([1 for r in results.values() if not r['ok']]) + logging.info(f"{errorCount} {stageName} errors encountered") + + print(f"{'-':-<60}") + print(f"{stageName} results:") + print(f"{'-':-<60}") + for filename, result in results.items(): + print(f" {filename:.<55}{'..OK' if result['ok'] else 'FAIL'}") + if not result['ok']: + if isinstance(result['message'], list): + for thing in result['message']: + print(f" {thing['message']}") + else: + print(f" {result['message']}") + + print(f"{'-':-<60}") + print(f"{stageName} errors: {errorCount}") + print(f"{'-':-<60}") + + return errorCount + + +if __name__ == '__main__': + logging.basicConfig(level=logging.DEBUG) + + logging.info('Searching for XSD files') + fileList = list(Path(".").rglob("*.xsd")) + list(Path(".").rglob("*.xsd")) + logging.info(f'{len(fileList)} XSD files found') + for file in fileList: + logging.debug(f' {file}') + + ignoreList = Path('testing/xsd_ignore.txt').read_text().splitlines() + ignoredFiles = [] + for ignore in ignoreList: + logging.debug(f'Ignoring pattern {ignore}') + for file in fileList: + if ignore in str(file): + ignoredFiles.append(file) + logging.debug(f" Ignoring {str(file)} as contains {ignore}") + ignoredFiles = list(set(ignoredFiles)) + logging.info(f'{len(ignoredFiles)} files ignored') + for file in ignoredFiles: + logging.debug(f' {file}') + + fileList = [file for file in fileList if file not in ignoredFiles] + logging.info(f'{len(fileList)} files to process') + for file in fileList: + logging.debug(f' {file}') + + if len(fileList) == 0: + logging.warning ("No files specified") + exit(0) + + logging.info("Parsing ASN1 files") + parseResults = syntaxCheckXSD(fileList) + if processResults(parseResults, "Parsing") > 0: + exit(-1) + + logging.info ("Getting compile targets") + compileTargets = json.loads(Path('testing/asn_compile_targets.json').read_text()) + logging.info (f"{len(compileTargets)} compile targets found") + + compileResults = compileAllTargets(compileTargets) + if processResults(compileResults, "Compiling") > 0: + exit(-1) -- GitLab From 3d10ba4ac2b41298ff47c0333798590c0f73acaf Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 28 Mar 2022 10:49:47 +0100 Subject: [PATCH 196/208] Updating cd/cid yml tyo match SA3LI --- .gitlab-ci.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b43a20..b4e3df3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,17 @@ -image: "python:3.7" - -before_script: - - python3 --version - - pip3 install -q asn1tools lxml xmlschema - stages: - - Check Schemas + - check -checkASN1: - stage: Check Schemas +process_asn: + image: "mcanterb/asn1test:latest" + stage: check + interruptible: true script: - - python3 testing/check_asn1.py \ No newline at end of file + - python3 testing/asn_process.py + +process_xsd: + image: "mcanterb/xsdtest:latest" + stage: check + interruptible: true + script: + - python3 testing/xsd_process.py + -- GitLab From a9edda0e74817bf94cce877556b7773d4ae60f33 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 28 Mar 2022 11:57:51 +0100 Subject: [PATCH 197/208] Restructing XSD compilation --- .../GetTaskDetailsResponse_example.xml | 2 +- 103221-1/examples/desktop.ini | Bin 246 -> 0 bytes testing/xsd_compile_targets.json | 19 ++- testing/xsd_process.py | 141 +++++++++++++----- 4 files changed, 122 insertions(+), 40 deletions(-) delete mode 100644 103221-1/examples/desktop.ini diff --git a/103221-1/examples/GetTaskDetailsResponse_example.xml b/103221-1/examples/GetTaskDetailsResponse_example.xml index 63a66f5..0442556 100644 --- a/103221-1/examples/GetTaskDetailsResponse_example.xml +++ b/103221-1/examples/GetTaskDetailsResponse_example.xml @@ -16,7 +16,7 @@ X2andX3 - 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9 + 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9foooo diff --git a/103221-1/examples/desktop.ini b/103221-1/examples/desktop.ini deleted file mode 100644 index 8b699c692d358fa29d7ac0976e524fe25c5da053..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmY+9%?iRW5QM+8;5+mIB=`d!gr1a2Pl_Imhf<;jsu82&<2%X0BEyE+-I+;pz_90n zqZ5{@hA7nBI1xB9WT1J-z30J|3NM{w!<~|GR@Agvv(r3^y`*f#OL-Sqw(0|CosANT zUq;k!txejcOv_3d&s)4#6?)@SbC=zgnP7CYVZuDK|CBzXlGDidQH_{NpZ@a&#q=qQ diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json index fc6e235..f890299 100644 --- a/testing/xsd_compile_targets.json +++ b/testing/xsd_compile_targets.json @@ -1,7 +1,24 @@ [ { - "coreSchema" : "RDMessage.xsd", + "coreSchema" : "102657/RDMessage.xsd", "supportingSchemas" : [], "exampleFiles" : [] + }, + { + "coreSchema" : "103280/TS_103_280.xsd", + "supportingSchemas" : [], + "exampleFiles" : [] + }, + { + "coreSchema" : "103221-1/TS_103_221_01.xsd", + "supportingSchemas" : [ + "103221-1/TS_103_221_01.xsd", + "103221-1/TS_103_221_01_HashedID.xsd", + "103280/TS_103_280.xsd", + "103221-1/examples/ExampleGenericObjects.xsd" + ], + "exampleFiles" : [ + "103221-1/examples" + ] } ] \ No newline at end of file diff --git a/testing/xsd_process.py b/testing/xsd_process.py index 864b70b..20b54d3 100644 --- a/testing/xsd_process.py +++ b/testing/xsd_process.py @@ -1,3 +1,4 @@ +import json import logging from pathlib import Path @@ -107,46 +108,110 @@ def processResults (results, stageName): return errorCount -if __name__ == '__main__': - logging.basicConfig(level=logging.DEBUG) - - logging.info('Searching for XSD files') - fileList = list(Path(".").rglob("*.xsd")) + list(Path(".").rglob("*.xsd")) - logging.info(f'{len(fileList)} XSD files found') +def syntaxCheckXSD (fileList): + results = {} for file in fileList: - logging.debug(f' {file}') - - ignoreList = Path('testing/xsd_ignore.txt').read_text().splitlines() - ignoredFiles = [] - for ignore in ignoreList: - logging.debug(f'Ignoring pattern {ignore}') - for file in fileList: - if ignore in str(file): - ignoredFiles.append(file) - logging.debug(f" Ignoring {str(file)} as contains {ignore}") - ignoredFiles = list(set(ignoredFiles)) - logging.info(f'{len(ignoredFiles)} files ignored') - for file in ignoredFiles: - logging.debug(f' {file}') - - fileList = [file for file in fileList if file not in ignoredFiles] - logging.info(f'{len(fileList)} files to process') - for file in fileList: - logging.debug(f' {file}') + try: + logging.info(f"Syntax checking {str(file)}") - if len(fileList) == 0: - logging.warning ("No files specified") - exit(0) - - logging.info("Parsing ASN1 files") - parseResults = syntaxCheckXSD(fileList) - if processResults(parseResults, "Parsing") > 0: - exit(-1) + schema = XMLSchema(str(file), validation="skip") + results[str(file)] = { + 'ok' : len(schema.all_errors) == 0, + 'message' : None if len(schema.all_errors) == 0 else [{'message' : f"{etree_tostring(e.elem, e.namespaces, ' ', 20)} - {e.message}"} for e in schema.all_errors] + } + except XMLSchemaParseError as ex: + logging.warning(str(file) + ": Failed validation ({0})".format(ex.message)) + results[str(file)] = { + 'ok' : False, + 'message' : f"{ex!r}" + } + return results - logging.info ("Getting compile targets") - compileTargets = json.loads(Path('testing/asn_compile_targets.json').read_text()) - logging.info (f"{len(compileTargets)} compile targets found") - compileResults = compileAllTargets(compileTargets) - if processResults(compileResults, "Compiling") > 0: +if __name__ == '__main__': + #logging.basicConfig(level=logging.DEBUG) + + compileTargets = json.loads(Path('testing/xsd_compile_targets.json').read_text()) + results = {} + for target in compileTargets: + coreFile = target['coreSchema'] + logging.info(f"Attempting to compile {coreFile}") + schemaLocations = [] + for supportSchema in target['supportingSchemas']: + logging.debug(f"Adding supporting schema {supportSchema}") + try: + xs = XMLSchema(supportSchema, validation='skip') + schemaLocations.append((xs.default_namespace, str(Path(supportSchema).resolve()))) + logging.info(" [ {0} -> {1} ]".format(xs.default_namespace, supportSchema)) + except Exception as ex: + logging.warning (" [ {0} exception parsing: {1} ]".format(supportSchema, ex)) + results[coreFile] = { + 'ok' : False, + 'message' : f"{ex!r}" + } + break + try: + schema = XMLSchema(coreFile, locations = schemaLocations, validation="strict") + results[coreFile] = { + 'ok' : len(schema.all_errors) == 0, + 'message' : None if len(schema.all_errors) == 0 else [{'message' : f"{etree_tostring(e.elem, e.namespaces, ' ', 20)} - {e.message}"} for e in schema.all_errors] + } + target["schemaInstance"] = schema + except Exception as ex: + results[coreFile] = { + 'ok' : False, + 'message' : f"{ex!r}" + } + continue + + if (processResults(results, "Compile") > 0): exit(-1) + + results = {} + + for target in compileTargets: + schema = target["schemaInstance"] + testResults = {} + failureCount = 0 + logging.info (f"Validating example {len(target['exampleFiles'])} entries for {target['coreSchema']}") + for example in target["exampleFiles"]: + examplePath = Path(example) + if examplePath.is_dir: + logging.debug (f"Expanding {str(examplePath)}") + testFiles = list(examplePath.rglob("./*.xml")) + else: + testFiles = [examplePath] + logging.debug(f"Found {len(testFiles)} test files") + for test in testFiles: + logging.debug(f"Validating {str(test)} against schema") + try: + errors = list(schema.iter_errors(str(test))) + testResults[test] = [f"{etree_tostring(e.elem, e.namespaces, ' ', 20)} - {e.message}" for e in errors] + failureCount += len(errors) + except Exception as ex: + testResults[test] = [f"{ex!r}"] + failureCount += 1 + results[target['coreSchema']] = { + 'ok' : failureCount == 0, + 'testResults' : testResults, + 'failureCount' : failureCount + } + + print(f"{'-':-<75}") + print(f"Validation results:") + print(f"{'-':-<75}") + + totalErrors = 0 + for filename, result in results.items(): + print (f"{filename:.<70}{'..OK' if result['ok'] else 'FAIL'}") + totalErrors += result['failureCount'] + for testFile, testResult in result['testResults'].items(): + print(f" {str(testFile):.<65}{'..OK' if len(testResult) == 0 else 'FAIL'}") + for tr in testResult: + print(f" {tr}") + + print(f"{'-':-<75}") + print(f"Validation errors: {totalErrors}") + print(f"{'-':-<75}") + + exit(totalErrors > 0) -- GitLab From 3adbf765be8561bd4cd86e92131b9844a4763e2b Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 28 Mar 2022 12:12:26 +0100 Subject: [PATCH 198/208] Correcting validation --- .../GetTaskDetailsResponse_example.xml | 2 +- testing/mod1.asn | 22 ----------------- testing/mod2.asn | 14 ----------- testing/xsd_compile_targets.json | 24 +++++++++++++++++++ testing/xsd_process.py | 21 +++++++++------- 5 files changed, 38 insertions(+), 45 deletions(-) delete mode 100644 testing/mod1.asn delete mode 100644 testing/mod2.asn diff --git a/103221-1/examples/GetTaskDetailsResponse_example.xml b/103221-1/examples/GetTaskDetailsResponse_example.xml index 0442556..63a66f5 100644 --- a/103221-1/examples/GetTaskDetailsResponse_example.xml +++ b/103221-1/examples/GetTaskDetailsResponse_example.xml @@ -16,7 +16,7 @@ X2andX3 - 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9foooo + 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9 diff --git a/testing/mod1.asn b/testing/mod1.asn deleted file mode 100644 index 5d4853e..0000000 --- a/testing/mod1.asn +++ /dev/null @@ -1,22 +0,0 @@ -Mod1 {itu-t(0) identified-organization(4) etsi(0)} - -DEFINITIONS ::= - -BEGIN - -IMPORTS - - ImportedField, - ClashField - FROM Mod2 {itu-t(0) identified-organization(4) etsi(1)}; - -TestPDU ::= SEQUENCE -{ - field1 [1] ClashField -} - -ClashField ::= BOOLEAN - -END - - diff --git a/testing/mod2.asn b/testing/mod2.asn deleted file mode 100644 index cec89b0..0000000 --- a/testing/mod2.asn +++ /dev/null @@ -1,14 +0,0 @@ -Mod2 {itu-t(0) identified-organization(4) etsi(1)} - -DEFINITIONS ::= - -BEGIN - -ImportedField ::= SEQUENCE -{ - field2 [0] BOOLEAN -} - -ClashField ::= INTEGER - -END diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json index f890299..6fe2c68 100644 --- a/testing/xsd_compile_targets.json +++ b/testing/xsd_compile_targets.json @@ -20,5 +20,29 @@ "exampleFiles" : [ "103221-1/examples" ] + }, + { + "coreSchema" : "103120/dictionaries/ts_103120_Dictionaries.xsd", + "supportingSchemas" : [], + "exampleFiles" : [ + "103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml" + ] + }, + { + "coreSchema" : "103120/schema/ts_103120_Core.xsd", + "supportingSchemas" : [ + "103120/schema/ts_103120_Authorisation.xsd", + "103120/schema/ts_103120_Common.xsd", + "103120/schema/ts_103120_Delivery.xsd", + "103120/schema/ts_103120_Document.xsd", + "103120/schema/ts_103120_Notification.xsd", + "103120/schema/ts_103120_Task.xsd", + "103280/TS_103_280.xsd", + "testing/deps/xmldsig/xmldsig-core-schema.xsd", + "103120/examples/FooServiceSchema.xsd" + ], + "exampleFiles" : [ + "103120/examples" + ] } ] \ No newline at end of file diff --git a/testing/xsd_process.py b/testing/xsd_process.py index 20b54d3..a0efd07 100644 --- a/testing/xsd_process.py +++ b/testing/xsd_process.py @@ -141,7 +141,7 @@ if __name__ == '__main__': logging.debug(f"Adding supporting schema {supportSchema}") try: xs = XMLSchema(supportSchema, validation='skip') - schemaLocations.append((xs.default_namespace, str(Path(supportSchema).resolve()))) + schemaLocations.append((xs.target_namespace, str(Path(supportSchema).resolve()))) logging.info(" [ {0} -> {1} ]".format(xs.default_namespace, supportSchema)) except Exception as ex: logging.warning (" [ {0} exception parsing: {1} ]".format(supportSchema, ex)) @@ -176,7 +176,7 @@ if __name__ == '__main__': logging.info (f"Validating example {len(target['exampleFiles'])} entries for {target['coreSchema']}") for example in target["exampleFiles"]: examplePath = Path(example) - if examplePath.is_dir: + if examplePath.is_dir(): logging.debug (f"Expanding {str(examplePath)}") testFiles = list(examplePath.rglob("./*.xml")) else: @@ -203,12 +203,17 @@ if __name__ == '__main__': totalErrors = 0 for filename, result in results.items(): - print (f"{filename:.<70}{'..OK' if result['ok'] else 'FAIL'}") - totalErrors += result['failureCount'] - for testFile, testResult in result['testResults'].items(): - print(f" {str(testFile):.<65}{'..OK' if len(testResult) == 0 else 'FAIL'}") - for tr in testResult: - print(f" {tr}") + if len(result['testResults']) == 0: + print (f"{filename:.<70}SKIP (0)") + continue + else: + print (f"{filename:.<70}{'..OK' if result['ok'] else 'FAIL'} ({len(result['testResults'])})") + totalErrors += result['failureCount'] + if result['failureCount'] > 0: + for testFile, testResult in result['testResults'].items(): + print(f" {str(testFile):.<65}{'..OK' if len(testResult) == 0 else 'FAIL'}") + for tr in testResult: + print(f" {tr}") print(f"{'-':-<75}") print(f"Validation errors: {totalErrors}") -- GitLab From f0319f0c30e8751c9c647d81650bfb14354a8ca3 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 28 Mar 2022 12:13:11 +0100 Subject: [PATCH 199/208] Updating ASN --- 102232-4/L2AccessPDU.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/102232-4/L2AccessPDU.asn b/102232-4/L2AccessPDU.asn index df562af..f62d60d 100644 --- a/102232-4/L2AccessPDU.asn +++ b/102232-4/L2AccessPDU.asn @@ -38,7 +38,7 @@ L2CC ::= SEQUENCE l2ATM2684 [6] OCTET STRING, -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used l2FR2427 [7] OCTET STRING - -- The protocol RFC 2427 Multiprotocol Interconnect over Frame Relay [18] is used + -- The protocol RFC 2427 �Multiprotocol Interconnect over Frame Relay� [18] is used } } @@ -194,7 +194,7 @@ L2ProtocolInformation ::= ENUMERATED l2ProtocolATM2684(7), -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used l2ProtocolFR2427(8) - -- The protocol RFC2427 Multiprotocol Interconnect over Frame Relay [18] is used + -- The protocol RFC2427 �Multiprotocol Interconnect over Frame Relay� [18] is used } END -- end of L2AccessPDU -- GitLab From 7841313edb5ce4fb7ceb9ecec26f370bcb5693a3 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 28 Mar 2022 12:14:38 +0100 Subject: [PATCH 200/208] Strange Unicode bug --- testing/deps/301040/06132v203_C01.asn | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/testing/deps/301040/06132v203_C01.asn b/testing/deps/301040/06132v203_C01.asn index 56305a2..c507812 100644 --- a/testing/deps/301040/06132v203_C01.asn +++ b/testing/deps/301040/06132v203_C01.asn @@ -56,9 +56,9 @@ LISTATUSind ::= SEQUENCE TARGETACTIVITYMONITORind ::= SEQUENCE { - tLIInstanceid TLIIdType, -- header, who - timestamp UTCTime, -- header, when - targetLocation LocationType, -- header, where + tLIInstanceid TLIIdType, -- header, who � + timestamp UTCTime, -- header, when � + targetLocation LocationType, -- header, where � targetAction ActivityType, supplementaryTargetaddress AddressType OPTIONAL, cotargetaddress SEQUENCE OF AddressType OPTIONAL, @@ -178,16 +178,16 @@ TETRAAddressType ::= CHOICE { tETRAaddress TSIType, pISNaddress NumericString (SIZE (20)), - iP4address BIT STRING (SIZE (32)), -- 32 bits - iP6address BIT STRING (SIZE (128)), -- 128 bits + iP4address BIT STRING (SIZE (32)), -- 32 bits � + iP6address BIT STRING (SIZE (128)), -- 128 bits � e164address NumericString (SIZE (20)), tEI TEIType } -CellIdType ::= BIT STRING (SIZE (16)) -- 16 bits +CellIdType ::= BIT STRING (SIZE (16)) -- 16 bits � -LocationAreaType ::= BIT STRING (SIZE (14)) -- 14 bits, as defined in ETS 300 392-2 +LocationAreaType ::= BIT STRING (SIZE (14)) -- 14 bits, as defined in ETS 300 392-2 � LocationType ::= CHOICE { @@ -196,11 +196,11 @@ LocationType ::= CHOICE } -MCCType ::= BIT STRING (SIZE (10)) -- 10 bits, as defined in ETS 300 392-1 +MCCType ::= BIT STRING (SIZE (10)) -- 10 bits, as defined in ETS 300 392-1 � -MNCType ::= BIT STRING (SIZE (14)) -- 14 bits, as defined in ETS 300 392-1 +MNCType ::= BIT STRING (SIZE (14)) -- 14 bits, as defined in ETS 300 392-1 � -SSIType ::= BIT STRING (SIZE (24)) -- 24 bits, as defined in ETS 300 392-1 +SSIType ::= BIT STRING (SIZE (24)) -- 24 bits, as defined in ETS 300 392-1 � CircuitIdType ::= NumericString (SIZE (20)) @@ -255,7 +255,7 @@ TETRACGIType ::= SEQUENCE cI CellIdType OPTIONAL } -TLIIdType ::= BIT STRING (SIZE (16)) -- 16 bits +TLIIdType ::= BIT STRING (SIZE (16)) -- 16 bits � TSIType ::= SEQUENCE { @@ -264,6 +264,6 @@ TSIType ::= SEQUENCE ssi SSIType } -TEIType ::= BIT STRING (SIZE (60)) -- 60 bits, as defined in ETS 300 392-1 +TEIType ::= BIT STRING (SIZE (60)) -- 60 bits, as defined in ETS 300 392-1 � END -- GitLab From 16a7c383cc3f5839929e18d006b64cb21e202e9e Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 28 Mar 2022 12:19:29 +0100 Subject: [PATCH 201/208] Removing odd unicode characters --- 102232-4/L2AccessPDU.asn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/102232-4/L2AccessPDU.asn b/102232-4/L2AccessPDU.asn index f62d60d..7f18d89 100644 --- a/102232-4/L2AccessPDU.asn +++ b/102232-4/L2AccessPDU.asn @@ -36,9 +36,9 @@ L2CC ::= SEQUENCE -- The ethernet protocol is used ..., l2ATM2684 [6] OCTET STRING, - -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols` [16] is used + -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used l2FR2427 [7] OCTET STRING - -- The protocol RFC 2427 �Multiprotocol Interconnect over Frame Relay� [18] is used + -- The protocol RFC 2427 "Multiprotocol Interconnect over Frame Relay" [18] is used } } @@ -194,7 +194,7 @@ L2ProtocolInformation ::= ENUMERATED l2ProtocolATM2684(7), -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used l2ProtocolFR2427(8) - -- The protocol RFC2427 �Multiprotocol Interconnect over Frame Relay� [18] is used + -- The protocol RFC2427 "Multiprotocol Interconnect over Frame Relay" [18] is used } END -- end of L2AccessPDU -- GitLab From 6ed61b944524d85aa447b44728cbe5ffada78cb8 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 28 Mar 2022 12:20:24 +0100 Subject: [PATCH 202/208] Removing odd unicode characters --- testing/deps/301040/06132v203_C01.asn | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/testing/deps/301040/06132v203_C01.asn b/testing/deps/301040/06132v203_C01.asn index c507812..30c3212 100644 --- a/testing/deps/301040/06132v203_C01.asn +++ b/testing/deps/301040/06132v203_C01.asn @@ -56,9 +56,9 @@ LISTATUSind ::= SEQUENCE TARGETACTIVITYMONITORind ::= SEQUENCE { - tLIInstanceid TLIIdType, -- header, who � - timestamp UTCTime, -- header, when � - targetLocation LocationType, -- header, where � + tLIInstanceid TLIIdType, -- header, who + timestamp UTCTime, -- header, when + targetLocation LocationType, -- header, where targetAction ActivityType, supplementaryTargetaddress AddressType OPTIONAL, cotargetaddress SEQUENCE OF AddressType OPTIONAL, @@ -178,16 +178,16 @@ TETRAAddressType ::= CHOICE { tETRAaddress TSIType, pISNaddress NumericString (SIZE (20)), - iP4address BIT STRING (SIZE (32)), -- 32 bits � - iP6address BIT STRING (SIZE (128)), -- 128 bits � + iP4address BIT STRING (SIZE (32)), -- 32 bits + iP6address BIT STRING (SIZE (128)), -- 128 bits e164address NumericString (SIZE (20)), tEI TEIType } -CellIdType ::= BIT STRING (SIZE (16)) -- 16 bits � +CellIdType ::= BIT STRING (SIZE (16)) -- 16 bits -LocationAreaType ::= BIT STRING (SIZE (14)) -- 14 bits, as defined in ETS 300 392-2 � +LocationAreaType ::= BIT STRING (SIZE (14)) -- 14 bits, as defined in ETS 300 392-2 LocationType ::= CHOICE { @@ -196,11 +196,11 @@ LocationType ::= CHOICE } -MCCType ::= BIT STRING (SIZE (10)) -- 10 bits, as defined in ETS 300 392-1 � +MCCType ::= BIT STRING (SIZE (10)) -- 10 bits, as defined in ETS 300 392-1 -MNCType ::= BIT STRING (SIZE (14)) -- 14 bits, as defined in ETS 300 392-1 � +MNCType ::= BIT STRING (SIZE (14)) -- 14 bits, as defined in ETS 300 392-1 -SSIType ::= BIT STRING (SIZE (24)) -- 24 bits, as defined in ETS 300 392-1 � +SSIType ::= BIT STRING (SIZE (24)) -- 24 bits, as defined in ETS 300 392-1 CircuitIdType ::= NumericString (SIZE (20)) @@ -255,7 +255,7 @@ TETRACGIType ::= SEQUENCE cI CellIdType OPTIONAL } -TLIIdType ::= BIT STRING (SIZE (16)) -- 16 bits � +TLIIdType ::= BIT STRING (SIZE (16)) -- 16 bits TSIType ::= SEQUENCE { @@ -264,6 +264,6 @@ TSIType ::= SEQUENCE ssi SSIType } -TEIType ::= BIT STRING (SIZE (60)) -- 60 bits, as defined in ETS 300 392-1 � +TEIType ::= BIT STRING (SIZE (60)) -- 60 bits, as defined in ETS 300 392-1 END -- GitLab From a8ad8121bd8cef6b61f1a0be3efa54b5ade09ee4 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 28 Mar 2022 12:21:23 +0100 Subject: [PATCH 203/208] Removing temporary ASN file --- temp.asn | 735 ------------------------------------------------------- 1 file changed, 735 deletions(-) delete mode 100644 temp.asn diff --git a/temp.asn b/temp.asn deleted file mode 100644 index 6bcd0ce..0000000 --- a/temp.asn +++ /dev/null @@ -1,735 +0,0 @@ -LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)} - -DEFINITIONS IMPLICIT TAGS ::= - -BEGIN - -IMPORTS - -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) - - -- from ETSI TS 103 280 [44] - LIID - FROM Common-Parameters - {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} - - - -- from ETSI TS 101 671 [4] - IRI-Parameters, - IRIsContent, - Location, - Network-Element-Identifier - FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} - - -- from ETSI TS 101 671 [4] - HI1-Operation - FROM HI1NotificationOperations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)} - - -- from ETSI TS 102 232-2 [5] - EmailCC, - EmailIRI, - MessagingCC, - MessagingMMCC, - MessagingIRI - FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} - - -- from ETSI TS 102 232-3 [6] - IPCC, - IPIRI, - IPIRIOnly - FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)} - - -- from ETSI TS 102 232-4 [32] - L2CC, - L2IRI, - L2IRIOnly - FROM L2AccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)} - - -- from ETSI TS 102 232-5 [37] - IPMMCC, - IPMMIRI - FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} - - -- from ETSI TS 102 232-6 [36] - PstnIsdnCC, - PstnIsdnIRI - FROM PstnIsdnPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - UmtsIRIsContent, - CorrelationValues, - Location - FROM UmtsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - UmtsCS-IRIsContent - FROM UmtsCS-HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - EpsIRIsContent, - EPSLocation - FROM EpsHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - ConfIRIsContent - 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. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - ProSeIRIsContent - FROM ProSeHI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} - -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. - - -- from 3GPP TS 33.108 [9] - IRI-Parameters, - GcseIRIsContent - FROM GCSEHI2Operations - {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. - - -- 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. - - -- 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. - - -- 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. - -- 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 ETSI TS 101 909-20-1 [33] - TARGETACTIVITYMONITOR-1, - TTRAFFIC, - CTTRAFFIC - FROM TS101909201 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart1(1) interceptVersion(0)} - - -- from ETSI TS 101 909-20-2 [34] - TARGETACTIVITYMONITOR, - TTRAFFIC, - CTTRAFFIC - FROM TS101909202 - {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} - - -- from ETSI TS 103 462 [45] - ILHIPayload - FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version2(2)} - -- This import is only used for the handover between LEMFs. - - -- from 3GPP TS 33.128 [46] - LINotificationPayload, - IRIPayload, - CCPayload - FROM TS33128Payloads - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; - -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. - --- end of IMPORTS - --- ============================= --- Object Identifier Definitions --- ============================= - -lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} - -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)} - --- ==================== --- Top-level definition --- ==================== - -PS-PDU ::= SEQUENCE -{ - pSHeader [1] PSHeader, - payload [2] Payload -} - -PSHeader ::= SEQUENCE -{ - li-psDomainId [0] OBJECT IDENTIFIER, - lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, - -- 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, - sequenceNumber [4] INTEGER (0..4294967295), - timeStamp [5] GeneralizedTime OPTIONAL, - -- see clause 5.2.6 - ..., - interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, - -- see clause 5.2.11 - microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, - timeStampQualifier [8] TimeStampQualifier OPTIONAL, - extendedInterceptionPointID [9] OCTET STRING (SIZE (1..65535)) OPTIONAL, - -- see clause 5.2.13 - networkFunctionIdentifier [10] OCTET STRING (SIZE (1..65535)) OPTIONAL - -- see clause 5.2.14 -} - -Payload ::= CHOICE -{ - iRIPayloadSequence [0] SEQUENCE OF NativeIRIPayload, - cCPayloadSequence [1] SEQUENCE OF NativeCCPayload, - -- Clause 6.2.3 explains how to include more than one payload in the same PDU - tRIPayload [2] TRIPayload, - ..., - hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer, - threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, - -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] - iLHIPayload [6] SEQUENCE OF ILHIPayload, - -- For typical use cases see ETSI TS 103 462 [45] - hI4Payload [7] SEQUENCE OF HI4Payload -} - -TimeStampQualifier ::= ENUMERATED -{ - unknown(0), - timeOfInterception(1), - timeOfMediation(2), - ..., - timeOfAggregation(3) -} - -HI4Payload ::= CHOICE -{ - threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload, - ... -} - --- ==================================== --- Items contained within the PS-Header --- ==================================== - -CommunicationIdentifier ::= SEQUENCE -{ - networkIdentifier [0] NetworkIdentifier, - communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, - -- in case of transport of HI1 messages not required - -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) - deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, - -- see clause 5.2.4 - ..., - cINExtension [3] CorrelationValues OPTIONAL - -- To be used when a single INTEGER is not sufficient to identify - -- a particular session (see clause 5.2.4) -} - -NetworkIdentifier ::= SEQUENCE -{ - operatorIdentifier [0] OCTET STRING (SIZE(1..16)), - networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, - ..., - eTSI671NEID [2] Network-Element-Identifier OPTIONAL - -- For network element identifier, use either networkElementIdentifier or eTSI671NEID -} - --- ========================== --- Definitions for CC Payload --- ========================== - -NativeCCPayload ::= SEQUENCE -{ - payloadDirection [0] PayloadDirection OPTIONAL, - timeStamp [1] GeneralizedTime OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - cCContents [2] CCContents, - ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - timeStampQualifier [4] TimeStampQualifier OPTIONAL -} - -PayloadDirection ::= ENUMERATED -{ - fromTarget(0), - toTarget(1), - ..., - indeterminate(2), - -- Indication that the direction was indeterminate - combined(3), - -- Indication applicable to some services that the traffic is actually a combination - -- of To and From - notapplicable(4) - -- Indication that direction of interceptable service does not make sense -} - -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, - -- 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, - 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, - -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) - messagingCC [14] 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, - 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, - cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, - threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload) -} - -MicroSecondTimeStamp ::= SEQUENCE -{ - seconds [0] INTEGER (0..18446744073709551615), - -- number of seconds since 1970-1-1 00:00Z also known as unix time epoch - microSeconds [1] INTEGER (0..999999), - ... -} - --- =========================== --- Definitions for IRI Payload --- =========================== - -NativeIRIPayload ::= SEQUENCE -{ - iRIType [0] IRIType OPTIONAL, - -- See clause 5.2.10 - timeStamp [1] GeneralizedTime OPTIONAL, - -- For aggregated payloads (see clause 6.2.3) - iRIContents [2] IRIContents, - ..., - microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, - -- 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 - -- 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 - -- relevant service-specific details -} - -IRIType ::= ENUMERATED -{ - iRI-Begin(1), - iRI-End(2), - iRI-Continue(3), - iRI-Report(4) -} - -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, - uMTSIRI [4] UMTSIRI, - eTSI671IRI [5] ETSI671IRI, - ..., - l2IRI [6] L2IRI, - l2IRIOnly [7] L2IRIOnly, - tARGETACTIVITYMONITOR-1 [8] TS101909201.TARGETACTIVITYMONITOR-1, - tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, - pstnIsdnIRI [10] PstnIsdnIRI, - iPMMIRI [11] 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, - ePSIRI [15] EPSIRI, - confIRI [16] ConfIRI, - proseIRI [17] ProSeIRI, - gcseIRI [18] GcseIRI, - threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) -} - -UMTSIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, - umtsIRIsContent [1] UmtsIRIsContent, - ..., - iRI-CS-Parameters [2] UmtsCS-HI2Operations.IRI-Parameters, - umtsCS-IRIsContent [3] UmtsCS-IRIsContent -} - -ETSI671IRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Parameters [0] HI2Operations.IRI-Parameters, - iRIsContent [1] IRIsContent, - ... -} - -EPSIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, - epsIRIsContent [1] EpsIRIsContent, - ... -} - -ConfIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, - confIRIsContent [1] ConfIRIsContent, - ... -} - - -ProSeIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, - proseIRIsContent [1] ProSeIRIsContent, - ... -} - - -GcseIRI ::= CHOICE - -- This structure may be commented out if not used -{ - iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, - gcseIRIsContent [1] GcseIRIsContent, - ... -} - - --- =========================== --- Definitions for TRI Payload --- =========================== - -TRIPayload ::= CHOICE -{ - integrityCheck [0] IntegrityCheck, - testPDU [1] NULL, - paddingPDU [2] OCTET STRING, - -- Undefined contents (will be discarded) - keep-alive [3] NULL, - keep-aliveResponse [4] NULL, - firstSegmentFlag [5] NULL, - lastSegmentFlag [6] NULL, - ..., - cINReset [7] NULL, - operatorLeaMessage [8] OperatorLeaMessage, - optionRequest [9] OptionRequest, - optionResponse [10] OptionResponse, - optionComplete [11] NULL, - pDUAcknowledgementRequest [12] NULL, - pDUAcknowledgementResponse [13] NULL -} - -IntegrityCheck ::= SEQUENCE -{ - includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), - -- gives the order the PDUs were processed - checkType [1] CheckType, - dataType [2] DataType OPTIONAL, - -- From version5(5) the dataType is mandatory for hashes and for signatures - -- (see clause 7.2.3) - 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 - -- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2. - ..., - hashAlgorithm [4] HashAlgorithm OPTIONAL - -- Clarifies the hash function if checkType is hash(1). - -- If used, it shall be present for each checkType hash(1). -} - -CheckType ::= ENUMERATED -{ - hash(1), - -- hash value - signature(2), - -- DSS/DSA signature - ... -} - -DataType ::= ENUMERATED -{ - iRI(1), - cC(2), - ..., - iLHI(3) -} - -HashAlgorithm ::= ENUMERATED -{ - sHA-1(1), - -- Included for legacy/migration purposes only, not to be used for new implementations - sHA-256(2), - sHA-384(3), - sHA-512(4), - ... -} - -Option ::= CHOICE -{ - pDUAcknowledgement [0] NULL, - ... -} - -OptionRequest ::= SEQUENCE -{ - requestedOptions [0] SEQUENCE OF Option, - ... -} - -OptionResponse ::= SEQUENCE -{ - acceptedOptions [0] SEQUENCE OF Option, - declinedOptions [1] SEQUENCE OF Option, - ... -} - --- ================================== --- Definitions for OperatorLeaMessage --- ================================== - -OperatorLeaMessage ::= SEQUENCE -{ - messagePriority [0] OperatorLeaMessagePriority, - message [1] OCTET STRING (SIZE(1..255)), - ... -} - -OperatorLeaMessagePriority ::= ENUMERATED -{ - error(1), - -- reporting of error conditions that have impact on the quality of the - -- intercepted data - informational(2), - -- reporting of conditions that will not have direct impact on the quality of - -- the intercepted data - ... -} - --- =================================== --- Definitions for EncryptionContainer --- =================================== - -EncryptionContainer ::= SEQUENCE -{ - encryptionType [0] EncryptionType, - encryptedPayload [1] OCTET STRING, - -- once decrypted, it can be interpreted as EncryptedPayload - ..., - encryptedPayloadType [2] EncryptedPayloadType OPTIONAL -} - -EncryptionType ::= ENUMERATED -{ - none(1), - -- No encryption is applied. - national-option(2), - -- Use this option when an encryption scheme is negotiated on a national level - aES-192-CBC(3), - -- The Advanced Encryption Standard using a 192 bit key in CBC mode - aES-256-CBC(4), - -- The Advanced Encryption Standard using a 256 bit key in CBC mode - blowfish-192-CBC(5), - -- Blowfish (www.schneier.com/blowfish.html) using a 192 bit key in CBC mode - blowfish-256-CBC(6), - -- Blowfish using a 256 bit key in CBC mode - threedes-cbc(7), - -- Triple-DES using a 192 bit key in CBC mode - ... -} - -EncryptedPayload ::= SEQUENCE -{ - byteCounter [0] INTEGER (0..18446744073709551615), - -- The sum of the sizes of all PDUs before this PDU. - -- It is initialized with the unixTime (number of seconds since 01-01-1970) - -- 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 - payload [1] Payload, - ... -} - -EncryptedPayloadType ::= ENUMERATED -{ - unknown(1), - part2(2), - -- encrypted payload is ETSI TS 102 232-2 [5] - part3(3), - -- encrypted payload is ETSI TS 102 232-3 [6] - part4(4), - -- encrypted payload is ETSI TS 102 232-4 [32] - part5(5), - -- encrypted payload is ETSI TS 102 232-5 [37] - part6(6), - -- encrypted payload is ETSI TS 102 232-6 [36] - part7(7), - -- encrypted payload is ETSI TS 102 232-7 [38] - ..., - part1(8) - -- encrypted payload is ETSI TS 102 232-1 (the present document) -} - --- =================================== --- Common Parameters --- =================================== - -NativeLocation ::= SEQUENCE - -- This is a common parameter, the use of this parameter is described in clause 4.5 -{ - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, - ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, - eTSI671HI2Location [3] HI2Operations.Location OPTIONAL -} - -WlanLocationAttributes ::= SEQUENCE -{ - 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. -{ - iP-type [1] ENUMERATED - { - iPV4(0), - iPV6(1), - ... - }, - iP-value [2] IP-value, - iP-assignment [3] ENUMERATED - { - static(1), - -- The static coding shall be used to report a static address. - dynamic(2), - -- The dynamic coding shall be used to report a dynamically allocated address. - notKnown(3), - -- The notKnown coding shall be used to report other than static or dynamically - -- allocated IP addresses. - ... - } OPTIONAL, - ..., - iPv6PrefixLength [4] INTEGER (1..128) OPTIONAL, - -- Indicates the length of the prefix delegated by the CSP to the subscriber - -- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60" - -- Mandatory in case where the iP-value contains an IPv6 binary value - iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL - -- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field. - -- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to - -- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to - -- a /29 CIDR-format subnet mask -} - -IP-value ::= CHOICE -{ - iPBinaryAddress [1] OCTET STRING (SIZE(4..16)), - -- In case of IPv6, the Prefix Length is provided by the "iPv6PrefixLength" - -- In case of IPv4, the netmask is provided by the "iPv4SubnetMask" - iPTextAddress [2] IA5String (SIZE(7..45)), - -- In case of IPv6, the delivered iPTextAddress field could include a complete - -- single IPv6-Address or an IPv6-Prefix for a subnetwork on the target side. - -- In case of IPv4, the delivered iPTextAddress field could include a single - -- IPv4 address or an IPv4address/netmask, for example "192.168.1.1" or "192.168.1.1/24" - ... -} - -LawfulInterceptionIdentifier ::= 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 \ No newline at end of file -- GitLab From 8657880da2feeffa7b0e62891436ed911e7d5bf0 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 5 May 2022 13:11:13 +0100 Subject: [PATCH 204/208] Correcting XSD compile targets and UUID in examples --- 103221-1/examples/DeleteAllObjectsRequest_example.xml | 2 +- testing/xsd_compile_targets.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/103221-1/examples/DeleteAllObjectsRequest_example.xml b/103221-1/examples/DeleteAllObjectsRequest_example.xml index 29a2b33..86b1650 100644 --- a/103221-1/examples/DeleteAllObjectsRequest_example.xml +++ b/103221-1/examples/DeleteAllObjectsRequest_example.xml @@ -5,6 +5,6 @@ neID 2022-01-20T14:04:20.123456Z v1.11.1 - 5775af53-a4a0-46ab-818a-86a406a335a + 5775af53-a4a0-46ab-818a-86a406a335a1 diff --git a/testing/xsd_compile_targets.json b/testing/xsd_compile_targets.json index 6fe2c68..69ad1b5 100644 --- a/testing/xsd_compile_targets.json +++ b/testing/xsd_compile_targets.json @@ -14,6 +14,7 @@ "supportingSchemas" : [ "103221-1/TS_103_221_01.xsd", "103221-1/TS_103_221_01_HashedID.xsd", + "103221-1/TS_103_221_01_DestinationSet.xsd", "103280/TS_103_280.xsd", "103221-1/examples/ExampleGenericObjects.xsd" ], -- GitLab From 3779857aae8a6ed35646d20096689f3f1104ac90 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 5 May 2022 13:59:08 +0100 Subject: [PATCH 205/208] Updates to align with post-LI59 publication --- 102232-1/LI-PS-PDU.asn | 10 +-- 102232-2/EmailPDU.asn | 4 +- 102232-5/IPMultimediaPDU.asn | 6 +- 103707/TS_103_707.xsd | 2 +- 103707/examples/example_multiple_items.xml | 75 ++++++++++++++++++++++ 5 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 103707/examples/example_multiple_items.xml diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 25f72fc..714ecf8 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version33(33)} DEFINITIONS IMPLICIT TAGS ::= @@ -34,7 +34,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version19(19)} -- from ETSI TS 102 232-3 [6] IPCC, @@ -54,7 +54,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version14(14)} -- from ETSI TS 102 232-6 [36] PstnIsdnCC, @@ -204,7 +204,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version33(33)} -- ==================== -- Top-level definition @@ -732,4 +732,4 @@ LawfulInterceptionIdentifier ::= LIID -- module to preserve the original type name during the -- removal of imports from ETSI TS 101 671 [4]. -END --end of LI-PS-PDU \ No newline at end of file +END --end of LI-PS-PDU diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index afedfc6..6f8457e 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -391,7 +391,7 @@ Messaging-Party-Identity ::= CHOICE { msisdn [0] OCTET STRING (SIZE (1..9)), -- MSISDN of the target, encoded in the same format as the AddressString - -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. + -- parameters defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. e164-format [1] OCTET STRING (SIZE (1..25)), -- E.164 address of the node in international format. Coded in the same format as -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) @@ -541,4 +541,4 @@ Messaging-Property-Requested-Reports ::= ENUMERATED ... } -END -- end of EmailPDU \ No newline at end of file +END -- end of EmailPDU diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index c54c461..308b74c 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -4,7 +4,7 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version14(14)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -22,8 +22,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd index 7bce63d..f9e6da1 100644 --- a/103707/TS_103_707.xsd +++ b/103707/TS_103_707.xsd @@ -3,7 +3,7 @@ xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" - version="1.4.1" + version="1.5.1" elementFormDefault="qualified"> diff --git a/103707/examples/example_multiple_items.xml b/103707/examples/example_multiple_items.xml new file mode 100644 index 0000000..6913c2b --- /dev/null +++ b/103707/examples/example_multiple_items.xml @@ -0,0 +1,75 @@ + + + + +
+ + + + + target@example.com + + true + + + + + someoneelse@example.com + + + + 2021-06-17T06:42:23.000000+01:00 + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + Foo + Bar + Baz + + + + + + + +
+ + + + + someoneelse@example.com + + + + + + target@example.com + + true + + + 2021-06-18T06:42:23.000000+01:00 + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + Foo + Bar + Baz + + + + + + + + -- GitLab From ed1a25b2397089d658c9eac7b48e76ab413917f3 Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 9 May 2022 07:19:43 +0000 Subject: [PATCH 206/208] Post meeting rapporteur work for TS 103 707 --- 103707/TS_103_707.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd index 7bce63d..f9e6da1 100644 --- a/103707/TS_103_707.xsd +++ b/103707/TS_103_707.xsd @@ -3,7 +3,7 @@ xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" - version="1.4.1" + version="1.5.1" elementFormDefault="qualified"> -- GitLab From a5eac2be7b33d50b0025833dc20301cf63584501 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 9 May 2022 08:29:07 +0100 Subject: [PATCH 207/208] Correcting previous push --- 102232-5/IPMultimediaPDU.asn | 5 ----- 1 file changed, 5 deletions(-) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 8485116..c9408c3 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -22,13 +22,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -<<<<<<< HEAD -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(14) cC(2)} -======= iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) iRI(1)} iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) cC(2)} ->>>>>>> rap/102232-5 -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -- GitLab From 3e28b5b7187353be53e2d2f98ac10d1ade706ebf Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 23 May 2022 15:33:50 +0100 Subject: [PATCH 208/208] Transfer from Trial --- Readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Readme.md b/Readme.md index f40983a..7592485 100644 --- a/Readme.md +++ b/Readme.md @@ -1,6 +1,6 @@ -# TC Lawful Interception (LI) - Schema definitions +# TC Lawful Interface (LI) - Trial repository -Repository for schema definitions for the ETSI Lawful Interception Technical Committee. +Trial repository for the ETSI Lawful Interception Technical Committee. For more information, visit https://www.etsi.org/committee/li or contact `espsupport` at `etsi` dot `org`. -- GitLab