From 1ffe246f99b3e7700a6a023ed79f390e7ee1bcfe Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Fri, 20 Jan 2023 10:55:39 +1100 Subject: [PATCH 1/2] 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. --- 102232-5/IPMultimediaPDU.asn | 41 +++++++++++++++++------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 66a4fa7..5203cd8 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -1,9 +1,4 @@ --- ==================================== --- 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)} DEFINITIONS IMPLICIT TAGS ::= @@ -11,7 +6,7 @@ BEGIN IMPORTS -- from ETSI TS 102 232-1 [2] - IPAddress, + 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)}; @@ -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)} -- ===================================== @@ -45,14 +42,14 @@ IPMMCC ::= SEQUENCE -- The module is defined as OPTIONAL because of backwards compatibility reasons -- For new implementations the module is MANDATORY to be used as defined in clause 5.5 streamIdentifier [3] OCTET STRING OPTIONAL, - -- Used to identify the media stream within the current CIN, typically in case of + -- Used to identify the media stream within the current CIN, typically in case of -- multiple media streams communications -- 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, UDPTL, MSRP, etc.) - -- Absence means mMCCContents contains RTP/RTCP packets or audio frame as indicated by the - -- frameType parameter. + -- Absence means mMCCContents contains RTP/RTCP packets or audio frame as indicated by the + -- frameType parameter. } @@ -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 @@ -109,11 +106,11 @@ IPIRIContents ::= CHOICE originalIPMMMessage [0] OCTET STRING, -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address of the intercepted - -- SIP message as transmitted on the network layer (see clause 5.2.7). + -- Copy of the SIP content and the source and destination IP address of the intercepted + -- SIP message as transmitted on the network layer (see clause 5.2.7). h323Message [2] H323Message, -- Copy of the H.323 content and the source and destination IP address of the intercepted - -- H.323 message as transmitted on the network layer (see clause 5.2.7). + -- H.323 message as transmitted on the network layer (see clause 5.2.7). ..., nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, -- This parameter is used according to national regulations @@ -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, ... } @@ -165,7 +162,7 @@ NationalIPMMIRIParameters ::= SEQUENCE -- extension marker (...). -- It is recommended that "version parameter" and "vendor identification parameter" are -- included in the national parameters definition. Vendor identifications can be - -- retrieved from the IANA web site. Besides, it is recommended + -- retrieved from the IANA web site. Besides, it is recommended -- to avoid using tags from 240 to 255 in a formal type definition. } -- GitLab From f9158c5ed134e1eb15645d16c6bc84604197f36c Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Tue, 31 Jan 2023 09:38:53 +0100 Subject: [PATCH 2/2] TS 102 232-5 CR 034: fix typo in import Use itu-t(0) not itu-u(0) in import of IPAddress and Location. Typo present since V3.3.1. --- 102232-5/IPMultimediaPDU.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 5203cd8..3e97af4 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -9,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)}; -- GitLab