Commit 1ffe246f authored by mewburn's avatar mewburn Committed by Mark Canterbury
Browse files

TS 102 232-5 CR 034: simplify OID versioning. fully qualify imports 

Add common iPMultimediaPDUObjId.

Fully qualify type names by prefixing with the module name
that they're imported from.

Remove leading comment block for consistency with
the other 102 232 ASN.1.

Remove trailing spaces and tabs.
Consistently use a 4 character tab instead of spaces.
Remove double spaces in comments.
parent a56b279a

102232-5/IPMultimediaPDU.asn

+19 −22
Original line number Original line Diff line number Diff line 
-- ====================================

-- Description of the IP Multimedia PDU

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





IPMultimediaPDU

IPMultimediaPDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version15(15)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version15(15)}
@@ -22,9 +17,11 @@ IMPORTS 
-- Object Identifier Definition

-- Object Identifier Definition

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

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





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

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

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

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

	-- both definitions relative to: 

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



	-- definitions are relative to

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

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





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

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

	iPMMIRIObjId				[0] RELATIVE-OID,

	iPMMIRIContents				[1] IPIRIContents,

	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

		-- 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

	additionalSignalling		[3] SEQUENCE OF AdditionalSignalling OPTIONAL

		-- The use of this parameter is defined in clause 5.2.5

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




SIPMessage ::= SEQUENCE

SIPMessage ::= SEQUENCE

{

{

	iPSourceAddress				[0] IPAddress,

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

	iPDestinationAddress		[1] IPAddress,

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

	sIPContent					[2] OCTET STRING,

	sIPContent					[2] OCTET STRING,

	...

	...

}

}





H323Message ::= SEQUENCE

H323Message ::= SEQUENCE

{

{

	iPSourceAddress				[0] IPAddress,

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

	iPDestinationAddress		[1] IPAddress,

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

	h323Content					[2] H323MessageContent,

	h323Content					[2] H323MessageContent,

	...

	...

}

}