From 01cd4aa3b99c794f2262879c4731b6f1652885e5 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:28:24 +0100 Subject: [PATCH] TS 102 232-5 v3.2.1 (2012-06-28) agreed at LI#30 (Amsterdam, 2012-05-14) --- 102232-5/IPMultimediaPDU.asn | 30 +++++++++++-------- ...aPDU,ver5.txt => IPMultimediaPDU,ver6.txt} | 30 +++++++++++-------- 2 files changed, 36 insertions(+), 24 deletions(-) rename 102232-5/portal/{IPMultimediaPDU,ver5.txt => IPMultimediaPDU,ver6.txt} (87%) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 1ce9a63..09f834c 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,5 +1,5 @@ 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)} @@ -25,9 +25,9 @@ iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) cC(2)} IPMMCC ::= SEQUENCE { - iPMMCCObjId [0] RELATIVE-OID, + 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 } -- ======================================================== @@ -76,7 +82,7 @@ MMCCprotocol ::= ENUMERATED IPMMIRI ::= SEQUENCE { - iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIObjId [0] RELATIVE-OID, iPMMIRIContents [1] IPIRIContents, ... } @@ -97,7 +103,7 @@ IPIRIContents ::= CHOICE SIPMessage ::= SEQUENCE { - iPSourceAddress [0] IPAddress, + iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, sIPContent [2] OCTET STRING, ... @@ -105,7 +111,7 @@ SIPMessage ::= SEQUENCE H323Message ::= SEQUENCE { - iPSourceAddress [0] IPAddress, + iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, h323Content [2] H323MessageContent, ... diff --git a/102232-5/portal/IPMultimediaPDU,ver5.txt b/102232-5/portal/IPMultimediaPDU,ver6.txt similarity index 87% rename from 102232-5/portal/IPMultimediaPDU,ver5.txt rename to 102232-5/portal/IPMultimediaPDU,ver6.txt index 1ce9a63..09f834c 100644 --- a/102232-5/portal/IPMultimediaPDU,ver5.txt +++ b/102232-5/portal/IPMultimediaPDU,ver6.txt @@ -1,5 +1,5 @@ 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)} @@ -25,9 +25,9 @@ iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version5(5) cC(2)} IPMMCC ::= SEQUENCE { - iPMMCCObjId [0] RELATIVE-OID, + 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 } -- ======================================================== @@ -76,7 +82,7 @@ MMCCprotocol ::= ENUMERATED IPMMIRI ::= SEQUENCE { - iPMMIRIObjId [0] RELATIVE-OID, + iPMMIRIObjId [0] RELATIVE-OID, iPMMIRIContents [1] IPIRIContents, ... } @@ -97,7 +103,7 @@ IPIRIContents ::= CHOICE SIPMessage ::= SEQUENCE { - iPSourceAddress [0] IPAddress, + iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, sIPContent [2] OCTET STRING, ... @@ -105,7 +111,7 @@ SIPMessage ::= SEQUENCE H323Message ::= SEQUENCE { - iPSourceAddress [0] IPAddress, + iPSourceAddress [0] IPAddress, iPDestinationAddress [1] IPAddress, h323Content [2] H323MessageContent, ... -- GitLab