Commit 01cd4aa3 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

TS 102 232-5 v3.2.1 (2012-06-28) agreed at LI#30 (Amsterdam, 2012-05-14)

parent 5af259d1
Loading
Loading
Loading
Loading
+18 −12
Original line number Diff line number Diff line
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)}

@@ -27,7 +27,7 @@ IPMMCC ::= SEQUENCE
{
	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
}

-- ========================================================
+18 −12
Original line number Diff line number Diff line
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)}

@@ -27,7 +27,7 @@ IPMMCC ::= SEQUENCE
{
	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
}

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