diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 6607e34586576588ea9f8c013c66b9e83071be7a..757b94f521722cbbfb20f4c9697cae12120da094 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version22(22)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version23(23)} DEFINITIONS IMPLICIT TAGS ::= @@ -28,7 +28,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version14(14)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version15(15)} -- from TS 102 232-03 [6] IPCC, @@ -63,7 +63,7 @@ IMPORTS Location FROM UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] @@ -71,7 +71,7 @@ IMPORTS UmtsCS-IRIsContent FROM UmtsCS-HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] @@ -80,28 +80,73 @@ IMPORTS EPSLocation FROM EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] + IRI-Parameters, + ConfIRIsContent + FROM CONFHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2conf(10)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + ProSeIRIsContent + FROM ProSeHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + GCSEIRIsContent + FROM GCSEHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2gcse(13)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] CC-PDU FROM Umts-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3(2)} - -- The relevant module (including the UMTS release and version number) + -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] CC-PDU FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3eps(9)} - -- The relevant module (including the UMTS release and version number) + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + Conf-CC-PDU + FROM CONF-HI3-IMS + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + Voip-CC-PDU + FROM VoIP-HI3-IMS + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + Gcse-CC-PDU + FROM GCSE-HI3 + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)} + -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] ThreeGPP-HI1-Operation FROM ThreeGPP-HI1NotificationOperations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)} - -- The relevant module (including the release and version number) + -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. -- TS 101 671 HI1 and 3GPP HI1 are related to the same functionality but are -- corresponding to different implementations and exclusive usage each other. @@ -142,7 +187,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version22(22)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version23(23)} -- ==================== -- Top-level definition @@ -269,8 +314,11 @@ CCContents ::= CHOICE messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, - messagingMMCC [18] MessagingMMCC + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + messagingMMCC [18] MessagingMMCC, + confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, + voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, + gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU } MicroSecondTimeStamp ::= SEQUENCE @@ -333,7 +381,10 @@ IRIContents ::= CHOICE lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI + ePSIRI [15] EPSIRI, + confIRI [16] ConfIRI, + proseIRI [17] ProSeIRI, + gcseIRI [18] GcseIRI } UMTSIRI ::= CHOICE @@ -362,6 +413,33 @@ EPSIRI ::= CHOICE ... } +ConfIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, + confIRIsContent [1] ConfIRIsContent, + ... +} + + +ProSeIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, + proseIRIsContent [1] ProSeIRIsContent, + ... +} + + +GcseIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, + gcseIRIsContent [1] GCSEIRIsContent, + ... +} + + -- =========================== -- Definitions for TRI Payload -- =========================== diff --git a/102232-1/portal/LI-PS-PDU,ver22.txt b/102232-1/portal/LI-PS-PDU,ver23.txt similarity index 82% rename from 102232-1/portal/LI-PS-PDU,ver22.txt rename to 102232-1/portal/LI-PS-PDU,ver23.txt index 6607e34586576588ea9f8c013c66b9e83071be7a..757b94f521722cbbfb20f4c9697cae12120da094 100644 --- a/102232-1/portal/LI-PS-PDU,ver22.txt +++ b/102232-1/portal/LI-PS-PDU,ver23.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version22(22)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version23(23)} DEFINITIONS IMPLICIT TAGS ::= @@ -28,7 +28,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version14(14)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version15(15)} -- from TS 102 232-03 [6] IPCC, @@ -63,7 +63,7 @@ IMPORTS Location FROM UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2(1)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] @@ -71,7 +71,7 @@ IMPORTS UmtsCS-IRIsContent FROM UmtsCS-HI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2CS(3)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] @@ -80,28 +80,73 @@ IMPORTS EPSLocation FROM EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the UMTS release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] + IRI-Parameters, + ConfIRIsContent + FROM CONFHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2conf(10)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + ProSeIRIsContent + FROM ProSeHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2prose (15)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + IRI-Parameters, + GCSEIRIsContent + FROM GCSEHI2Operations + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2gcse(13)} + -- The relevant module (including the 3GPP release and version number) needs + -- to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] CC-PDU FROM Umts-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3(2)} - -- The relevant module (including the UMTS release and version number) + -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] CC-PDU FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3eps(9)} - -- The relevant module (including the UMTS release and version number) + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + Conf-CC-PDU + FROM CONF-HI3-IMS + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + Voip-CC-PDU + FROM VoIP-HI3-IMS + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)} + -- The relevant module (including the 3GPP release and version number) + -- needs to be chosen when compiling the application. + + -- from 3GPP TS 33.108 [9] + Gcse-CC-PDU + FROM GCSE-HI3 + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)} + -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] ThreeGPP-HI1-Operation FROM ThreeGPP-HI1NotificationOperations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)} - -- The relevant module (including the release and version number) + -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. -- TS 101 671 HI1 and 3GPP HI1 are related to the same functionality but are -- corresponding to different implementations and exclusive usage each other. @@ -142,7 +187,7 @@ IMPORTS lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} -li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version22(22)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version23(23)} -- ==================== -- Top-level definition @@ -269,8 +314,11 @@ CCContents ::= CHOICE messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, - messagingMMCC [18] MessagingMMCC + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + messagingMMCC [18] MessagingMMCC, + confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, + voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, + gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU } MicroSecondTimeStamp ::= SEQUENCE @@ -333,7 +381,10 @@ IRIContents ::= CHOICE lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI + ePSIRI [15] EPSIRI, + confIRI [16] ConfIRI, + proseIRI [17] ProSeIRI, + gcseIRI [18] GcseIRI } UMTSIRI ::= CHOICE @@ -362,6 +413,33 @@ EPSIRI ::= CHOICE ... } +ConfIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Conf-Parameters [0] CONFHI2Operations.IRI-Parameters, + confIRIsContent [1] ConfIRIsContent, + ... +} + + +ProSeIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, + proseIRIsContent [1] ProSeIRIsContent, + ... +} + + +GcseIRI ::= CHOICE + -- This structure may be commented out if not used +{ + iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, + gcseIRIsContent [1] GCSEIRIsContent, + ... +} + + -- =========================== -- Definitions for TRI Payload -- ===========================