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, driver’s 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 (see EN 300 356 [7]) + globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, + -- See MAP format (see TS 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, driver’s 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 (see EN 300 356 [7]) + globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, + -- See MAP format (see TS 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, driver’s 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, driver’s 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 (see EN 300 356 [7]) + -- field) of the ISUP (see EN 300 356 [7]) globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, - -- See MAP format (see TS 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 (see EN 300 356 [7]) + -- field) of the ISUP (see EN 300 356 [7]) globalCellID [2] OCTET STRING (SIZE (5..7)) OPTIONAL, - -- See MAP format (see TS 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 ETSI EN 300 356 [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 ETSI EN 300 356 [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 ETSI EN 300 356 [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. user’s 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 ETSI EN 300 356 [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. user’s 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 ETSI EN 300 356 [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 ETSI EN 300 356 [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) sec