Commit c6b9fef6 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/102232-1/0102' into 'meeting/LI62' 

TS 102 232-1 CR102 - Session layer and ASN.1 fixes

See merge request !59
parents 25762e64 c58cb29d

102232-1/LI-PS-PDU.asn

+91 −91
Original line number Original line Diff line number Diff line
@@ -246,11 +246,11 @@ Payload ::= CHOICE 
		-- Clause 6.2.3 explains how to include more than one payload in the same PDU

		-- Clause 6.2.3 explains how to include more than one payload in the same PDU

	tRIPayload				[2] TRIPayload,

	tRIPayload				[2] TRIPayload,

	...,

	...,

	hI1-Operation			[3] HI1-Operation,

	hI1-Operation			[3] HI1NotificationOperations.HI1-Operation,

	encryptionContainer		[4] EncryptionContainer,

	encryptionContainer		[4] EncryptionContainer,

	threeGPP-HI1-Operation	[5] ThreeGPP-HI1-Operation,

	threeGPP-HI1-Operation	[5] ThreeGPP-HI1NotificationOperations.ThreeGPP-HI1-Operation,

		-- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4]

		-- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4]

	iLHIPayload				[6] SEQUENCE OF ILHIPayload,

	iLHIPayload				[6] SEQUENCE OF ILHIPDU.ILHIPayload,

		-- For typical use cases see ETSI TS 103 462 [45]

		-- For typical use cases see ETSI TS 103 462 [45]

	hI4Payload				[7] SEQUENCE OF HI4Payload

	hI4Payload				[7] SEQUENCE OF HI4Payload

}

}
@@ -283,7 +283,7 @@ CommunicationIdentifier ::= SEQUENCE 
	deliveryCountryCode				[2] PrintableString (SIZE (2)) OPTIONAL,

	deliveryCountryCode				[2] PrintableString (SIZE (2)) OPTIONAL,

		-- see clause 5.2.4

		-- see clause 5.2.4

	...,

	...,

	cINExtension					[3] CorrelationValues OPTIONAL

	cINExtension					[3] UmtsHI2Operations.CorrelationValues OPTIONAL

		-- To be used when a single INTEGER is not sufficient to identify

		-- To be used when a single INTEGER is not sufficient to identify

		-- a particular session (see clause 5.2.4)

		-- a particular session (see clause 5.2.4)

}

}
@@ -293,7 +293,7 @@ NetworkIdentifier ::= SEQUENCE 
	operatorIdentifier			[0] OCTET STRING (SIZE(1..16)),

	operatorIdentifier			[0] OCTET STRING (SIZE(1..16)),

	networkElementIdentifier	[1] OCTET STRING (SIZE(1..16)) OPTIONAL,

	networkElementIdentifier	[1] OCTET STRING (SIZE(1..16)) OPTIONAL,

	...,

	...,

	eTSI671NEID					[2] Network-Element-Identifier OPTIONAL

	eTSI671NEID					[2] HI2Operations.Network-Element-Identifier OPTIONAL

		-- For network element identifier, use either networkElementIdentifier or eTSI671NEID

		-- For network element identifier, use either networkElementIdentifier or eTSI671NEID

}

}
@@ -331,25 +331,25 @@ CCContents ::= CHOICE 
	-- Any of these choices may be commented out if they are not being used, see clause A.3

	-- Any of these choices may be commented out if they are not being used, see clause A.3

{

{

	-- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	-- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	emailCC						[1] EmailCC,

	emailCC						[1] EmailPDU.EmailCC,

	iPCC						[2] IPCC,

	iPCC						[2] IPAccessPDU.IPCC,

	-- tag [3] not used

	-- tag [3] not used

	uMTSCC						[4] OCTET STRING,

	uMTSCC						[4] OCTET STRING,

	...,

	...,

	-- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	-- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	l2CC						[6] L2CC,

	l2CC						[6] L2AccessPDU.L2CC,

	tTRAFFIC-1					[7] TS101909201.TTRAFFIC,

	tTRAFFIC-1					[7] TS101909201.TTRAFFIC,

	cTTRAFFIC-1					[8] TS101909201.CTTRAFFIC,

	cTTRAFFIC-1					[8] TS101909201.CTTRAFFIC,

	tTRAFFIC-2					[9] TS101909202.TTRAFFIC,

	tTRAFFIC-2					[9] TS101909202.TTRAFFIC,

	cTTRAFFIC-2					[10] TS101909202.CTTRAFFIC,

	cTTRAFFIC-2					[10] TS101909202.CTTRAFFIC,

	pstnIsdnCC					[11] PstnIsdnCC,

	pstnIsdnCC					[11] PstnIsdnPDU.PstnIsdnCC,

	iPMMCC						[12] IPMMCC,

	iPMMCC						[12] IPMultimediaPDU.IPMMCC,

	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	messagingCC					[14] MessagingCC,

	messagingCC					[14] EmailPDU.MessagingCC,

	ePSCC						[15] OCTET STRING,

	ePSCC						[15] OCTET STRING,

	uMTSCC-CC-PDU				[16] Umts-HI3-PS.CC-PDU,

	uMTSCC-CC-PDU				[16] Umts-HI3-PS.CC-PDU,

	ePSCC-CC-PDU				[17] Eps-HI3-PS.CC-PDU,

	ePSCC-CC-PDU				[17] Eps-HI3-PS.CC-PDU,

	messagingMMCC				[18] MessagingMMCC,

	messagingMMCC				[18] EmailPDU.MessagingMMCC,

	confCC-CC-PDU				[19] CONF-HI3-IMS.Conf-CC-PDU,

	confCC-CC-PDU				[19] CONF-HI3-IMS.Conf-CC-PDU,

	voipCC-CC-PDU				[20] VoIP-HI3-IMS.Voip-CC-PDU,

	voipCC-CC-PDU				[20] VoIP-HI3-IMS.Voip-CC-PDU,

	gcseCC-CC-PDU				[21] GCSE-HI3.Gcse-CC-PDU,

	gcseCC-CC-PDU				[21] GCSE-HI3.Gcse-CC-PDU,
@@ -402,21 +402,21 @@ IRIContents ::= CHOICE 
	-- Any of these choices may be commented out if they are not being used (see clause A.3)

	-- Any of these choices may be commented out if they are not being used (see clause A.3)

{

{

	-- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	-- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)

	emailIRI					[1] EmailIRI,

	emailIRI					[1] EmailPDU.EmailIRI,

	iPIRI						[2] IPIRI,

	iPIRI						[2] IPAccessPDU.IPIRI,

	iPIRIOnly					[3] IPIRIOnly,

	iPIRIOnly					[3] IPAccessPDU.IPIRIOnly,

	uMTSIRI						[4] UMTSIRI,

	uMTSIRI						[4] UMTSIRI,

	eTSI671IRI					[5] ETSI671IRI,

	eTSI671IRI					[5] ETSI671IRI,

	...,

	...,

	l2IRI						[6] L2IRI,

	l2IRI						[6] L2AccessPDU.L2IRI,

	l2IRIOnly					[7] L2IRIOnly,

	l2IRIOnly					[7] L2AccessPDU.L2IRIOnly,

	tARGETACTIVITYMONITOR-1		[8] TS101909201.TARGETACTIVITYMONITOR-1,

	tARGETACTIVITYMONITOR-1		[8] TS101909201.TARGETACTIVITYMONITOR-1,

	tARGETACTIVITYMONITOR-2		[9] TS101909202.TARGETACTIVITYMONITOR,

	tARGETACTIVITYMONITOR-2		[9] TS101909202.TARGETACTIVITYMONITOR,

	pstnIsdnIRI					[10] PstnIsdnIRI,

	pstnIsdnIRI					[10] PstnIsdnPDU.PstnIsdnIRI,

	iPMMIRI						[11] IPMMIRI,

	iPMMIRI						[11] IPMultimediaPDU.IPMMIRI,

	-- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	-- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	-- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)

	messagingIRI				[14] MessagingIRI,

	messagingIRI				[14] EmailPDU.MessagingIRI,

	ePSIRI						[15] EPSIRI,

	ePSIRI						[15] EPSIRI,

	confIRI						[16] ConfIRI,

	confIRI						[16] ConfIRI,

	proseIRI					[17] ProSeIRI,

	proseIRI					[17] ProSeIRI,
@@ -428,17 +428,17 @@ UMTSIRI ::= CHOICE 
	-- This structure may be commented out if not used

	-- This structure may be commented out if not used

{

{

	iRI-Parameters		[0] UmtsHI2Operations.IRI-Parameters,

	iRI-Parameters		[0] UmtsHI2Operations.IRI-Parameters,

	umtsIRIsContent		[1] UmtsIRIsContent,

	umtsIRIsContent		[1] UmtsHI2Operations.UmtsIRIsContent,

	...,

	...,

	iRI-CS-Parameters	[2] UmtsCS-HI2Operations.IRI-Parameters,

	iRI-CS-Parameters	[2] UmtsCS-HI2Operations.IRI-Parameters,

	umtsCS-IRIsContent	[3] UmtsCS-IRIsContent

	umtsCS-IRIsContent	[3] UmtsCS-HI2Operations.UmtsCS-IRIsContent

}

}





ETSI671IRI ::= CHOICE

ETSI671IRI ::= CHOICE

	-- This structure may be commented out if not used

	-- This structure may be commented out if not used

{

{

	iRI-Parameters	[0] HI2Operations.IRI-Parameters,

	iRI-Parameters	[0] HI2Operations.IRI-Parameters,

	iRIsContent		[1] IRIsContent,

	iRIsContent		[1] HI2Operations.IRIsContent,

	...

	...

}

}
@@ -446,7 +446,7 @@ EPSIRI ::= CHOICE 
	-- This structure may be commented out if not used

	-- This structure may be commented out if not used

{

{

	iRI-EPS-Parameters	[0] EpsHI2Operations.IRI-Parameters,

	iRI-EPS-Parameters	[0] EpsHI2Operations.IRI-Parameters,

	epsIRIsContent		[1] EpsIRIsContent,

	epsIRIsContent		[1] EpsHI2Operations.EpsIRIsContent,

	...

	...

}

}
@@ -454,7 +454,7 @@ ConfIRI ::= CHOICE 
	-- This structure may be commented out if not used

	-- This structure may be commented out if not used

{

{

	iRI-Conf-Parameters		[0] CONFHI2Operations.IRI-Parameters,

	iRI-Conf-Parameters		[0] CONFHI2Operations.IRI-Parameters,

	confIRIsContent			[1] ConfIRIsContent,

	confIRIsContent			[1] CONFHI2Operations.ConfIRIsContent,

	...

	...

}

}
@@ -463,7 +463,7 @@ ProSeIRI ::= CHOICE 
	-- This structure may be commented out if not used

	-- This structure may be commented out if not used

{

{

	iRI-ProSe-Parameters	[0] ProSeHI2Operations.IRI-Parameters,

	iRI-ProSe-Parameters	[0] ProSeHI2Operations.IRI-Parameters,

	proseIRIsContent		[1] ProSeIRIsContent,

	proseIRIsContent		[1] ProSeHI2Operations.ProSeIRIsContent,

	...

	...

}

}
@@ -472,7 +472,7 @@ GcseIRI ::= CHOICE 
	-- This structure may be commented out if not used

	-- This structure may be commented out if not used

{

{

	iRI-Gcse-Parameters		[0] GCSEHI2Operations.IRI-Parameters,

	iRI-Gcse-Parameters		[0] GCSEHI2Operations.IRI-Parameters,

	gcseIRIsContent			[1] GcseIRIsContent,

	gcseIRIsContent			[1] GCSEHI2Operations.GcseIRIsContent,

	...

	...

}

}
@@ -728,7 +728,7 @@ IP-value ::= CHOICE 
	...

	...

}

}





LawfulInterceptionIdentifier ::= LIID

LawfulInterceptionIdentifier ::= Common-Parameters.LIID

	-- LIID is a common parameter imported from ETSI TS 103 280 [44].

	-- LIID is a common parameter imported from ETSI TS 103 280 [44].

	-- It is redefined as LawfulInterceptionIdentifier in this

	-- It is redefined as LawfulInterceptionIdentifier in this

	-- module to preserve the original type name during the

	-- module to preserve the original type name during the