Commit 1683905f authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/102232-5/0034' into 'meeting/LI62' 

TS 102 232-5 CR034 - Simplify OID versioning

See merge request !63
parents a56b279a 6b799e81

102232-5/IPMultimediaPDU.asn

+20 −23
Original line number Diff line number Diff line 
-- ====================================

-- Description of the IP Multimedia PDU

-- ====================================





IPMultimediaPDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version15(15)}
@@ -14,7 +9,7 @@ IMPORTS 
	IPAddress,

	Location

		FROM LI-PS-PDU

		{itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)};

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)};
@@ -22,9 +17,11 @@ IMPORTS 
-- Object Identifier Definition

-- ============================



iPMMIRIObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version15(15) iRI(1)}

iPMMCCObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version15(15) cC(2)}

	-- both definitions relative to: 

iPMultimediaPDUObjId RELATIVE-OID	::= {li-ps(5) iPMultimedia(5) version15(15)}

iPMMIRIObjId RELATIVE-OID			::= {iPMultimediaPDUObjId iRI(1)}

iPMMCCObjId RELATIVE-OID			::= {iPMultimediaPDUObjId cC(2)}



	-- definitions are relative to

	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}



-- =====================================
@@ -98,7 +95,7 @@ IPMMIRI ::= SEQUENCE 
	iPMMIRIObjId				[0] RELATIVE-OID,

	iPMMIRIContents				[1] IPIRIContents,

	...,

	targetLocation				[2] Location OPTIONAL,

	targetLocation				[2] LI-PS-PDU.Location OPTIONAL,

		-- This common parameter is defined in ETSI TS 102 232-1 [2], the use of this parameter is described in clause 5.2.3

	additionalSignalling		[3] SEQUENCE OF AdditionalSignalling OPTIONAL

		-- The use of this parameter is defined in clause 5.2.5
@@ -131,16 +128,16 @@ IPIRIContents ::= CHOICE 


SIPMessage ::= SEQUENCE

{

	iPSourceAddress				[0] IPAddress,

	iPDestinationAddress		[1] IPAddress,

	iPSourceAddress				[0] LI-PS-PDU.IPAddress,

	iPDestinationAddress		[1] LI-PS-PDU.IPAddress,

	sIPContent					[2] OCTET STRING,

	...

}



H323Message ::= SEQUENCE

{

	iPSourceAddress				[0] IPAddress,

	iPDestinationAddress		[1] IPAddress,

	iPSourceAddress				[0] LI-PS-PDU.IPAddress,

	iPDestinationAddress		[1] LI-PS-PDU.IPAddress,

	h323Content					[2] H323MessageContent,

	...

}