diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 714ecf85b3130bd500dc922f76ddf0ffba14b2e3..002e2284effb6242b3805f18266179efad6be6e8 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version33(33)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)} DEFINITIONS IMPLICIT TAGS ::= @@ -190,7 +190,8 @@ IMPORTS -- from 3GPP TS 33.128 [46] LINotificationPayload, IRIPayload, - CCPayload + CCPayload, + UserLocation FROM TS33128Payloads {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; -- The relevant module (including the 3GPP release and version number) @@ -204,7 +205,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) version33(33)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version34(34)} -- ==================== -- Top-level definition @@ -663,11 +664,12 @@ EncryptedPayloadType ::= ENUMERATED Location ::= SEQUENCE -- This is a common parameter, the use of this parameter is described in clause 4.5 { - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., - wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, - eTSI671HI2Location [3] HI2Operations.Location OPTIONAL + wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL, + eTSI671HI2Location [3] HI2Operations.Location OPTIONAL, + threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL } WlanLocationAttributes ::= SEQUENCE diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index c9408c388c8ff7daea692ce018fd50d67a859397..66a4fa721ce8a2c5a769ab29e9e8011d66682909 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -4,7 +4,7 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version14(14)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version15(15)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -14,7 +14,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) version30(30)}; + {itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)}; @@ -22,8 +22,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version14(14) cC(2)} +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: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index fcf37429e6453e24f1b80306bfec941a67bd14cc..dbfa03cd459465018f9d519247fa397a6cb177c0 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,5 +1,5 @@ - + @@ -78,6 +78,7 @@ + @@ -108,6 +109,7 @@ + @@ -116,6 +118,17 @@ + + + + + + + + + + + @@ -744,6 +757,7 @@ + @@ -754,6 +768,7 @@ + diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd index f9e6da158f77ea324effb2a1b519d5e57f7b88ad..dd50e7c407c5b2b35516758bfa2f4404775560e7 100644 --- a/103707/TS_103_707.xsd +++ b/103707/TS_103_707.xsd @@ -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.5.1" + version="1.6.1" elementFormDefault="qualified">