Commit 3779857a authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Updates to align with post-LI59 publication

parent 8657880d

102232-1/LI-PS-PDU.asn

+5 −5
Original line number Diff line number Diff line 
LI-PS-PDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version33(33)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -34,7 +34,7 @@ IMPORTS 
	MessagingMMCC,

	MessagingIRI

		FROM EmailPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)}

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version19(19)}



	-- from ETSI TS 102 232-3 [6]

	IPCC,
@@ -54,7 +54,7 @@ IMPORTS 
	IPMMCC,

	IPMMIRI

		FROM IPMultimediaPDU

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

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



	-- from ETSI TS 102 232-6 [36]

	PstnIsdnCC,
@@ -204,7 +204,7 @@ IMPORTS 


lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}



li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)}

li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version33(33)}



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

-- Top-level definition

102232-2/EmailPDU.asn

+2 −2
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ Messaging-Party-Identity ::= CHOICE 
{

	msisdn					[0] OCTET STRING (SIZE (1..9)),

		-- MSISDN of the target, encoded in the same format as the AddressString

		-- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8.

		-- parameters defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8.

	e164-format				[1] OCTET STRING (SIZE (1..25)),

		-- E.164 address of the node in international format. Coded in the same format as 

		-- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23])

102232-5/IPMultimediaPDU.asn

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 




IPMultimediaPDU 

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

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



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -22,8 +22,8 @@ IMPORTS 
-- Object Identifier Definition

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



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

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

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

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

	-- both definitions relative to: 

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

103707/TS_103_707.xsd

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
           xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"

           xmlns="http://uri.etsi.org/03707/2020/02"

           targetNamespace="http://uri.etsi.org/03707/2020/02"

           version="1.4.1"

           version="1.5.1"

           elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

103707/examples/example_multiple_items.xml

0 → 100644
+75 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<handoverItemCollection  xmlns="http://uri.etsi.org/03707/2020/02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

  <handoverItem>

    <header></header>

    <payload xsi:type="MessagingPayload">

      <coreParameters>

        <messageSender>

          <identifiers>

            <identifier>target@example.com</identifier>

          </identifiers>

          <isTargetedParty>true</isTargetedParty>

        </messageSender>

        <messageReceivers>

          <recipient>

            <identifiers>

              <identifier>someoneelse@example.com</identifier>

            </identifiers>

          </recipient>

        </messageReceivers>

        <timestamp>2021-06-17T06:42:23.000000+01:00</timestamp>

      </coreParameters>

      <cspDefinedParameters>

        <cspDefinedMetadata>

          <schemaDetails>

            <schemaIdentifier>http://FooServiceSchema.example.com/schema/v1.1.1/</schemaIdentifier>

          </schemaDetails>

          <xmlData>

            <fooServiceDefinedParameters xmlns="http://FooServiceSchema.example.com/schema/v1.1.1/">

              <item1>Foo</item1>

              <item2>Bar</item2>

              <item3>Baz</item3>

            </fooServiceDefinedParameters>

          </xmlData>

        </cspDefinedMetadata>

      </cspDefinedParameters>

    </payload>

  </handoverItem>

  <handoverItem>

    <header></header>

    <payload xsi:type="MessagingPayload">

      <coreParameters>

        <messageSender>

          <identifiers>

              <identifier>someoneelse@example.com</identifier>

          </identifiers>

        </messageSender>

        <messageReceivers>

          <recipient>

            <identifiers>

              <identifier>target@example.com</identifier>

            </identifiers>

            <isTargetedParty>true</isTargetedParty>

          </recipient>

        </messageReceivers>

        <timestamp>2021-06-18T06:42:23.000000+01:00</timestamp>

      </coreParameters>

      <cspDefinedParameters>

        <cspDefinedMetadata>

          <schemaDetails>

            <schemaIdentifier>http://FooServiceSchema.example.com/schema/v1.1.1/</schemaIdentifier>

          </schemaDetails>

          <xmlData>

            <fooServiceDefinedParameters xmlns="http://FooServiceSchema.example.com/schema/v1.1.1/">

              <item1>Foo</item1>

              <item2>Bar</item2>

              <item3>Baz</item3>

            </fooServiceDefinedParameters>

          </xmlData>

        </cspDefinedMetadata>

      </cspDefinedParameters>

    </payload>

  </handoverItem>

</handoverItemCollection>