Commit 34c910f9 authored by canterburym's avatar canterburym
Browse files

TS 33108 v15.6.0 (2019-09-28) agreed at SA#85

parent 65635b4a
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r15(15) version-4 (4)}
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r15(15) version-5 (5)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -43,7 +43,7 @@ securityDomain(2) lawfulIntercept(2)}
-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r15(15) version-4 (4)}
hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r15(15) version-5 (5)}
eps-sending-of-IRI OPERATION ::=
{
......@@ -1111,64 +1111,63 @@ PTCEncryptionInfo ::= SEQUENCE {
}
PTC ::= SEQUENCE {
abandonCause [1] UTF8String,
abandonCause [1] UTF8String OPTIONAL,
accessPolicyFailure [2] UTF8String OPTIONAL,
accessPolicyType [3] AccessPolicyType,
alertIndicator [5] AlertIndicator,
associatePresenceStatus [6] AssociatePresenceStatus,
accessPolicyType [3] AccessPolicyType OPTIONAL,
alertIndicator [5] AlertIndicator OPTIONAL,
associatePresenceStatus [6] AssociatePresenceStatus OPTIONAL,
bearer-capability [7] UTF8String OPTIONAL,
-- identifies the Bearer capability information element (value part)
broadcastIndicator [8] BOOLEAN OPTIONAL,
-- default False, true indicates this is a braodcast to a group
contactID [9] UTF8String,
contactID [9] UTF8String OPTIONAL,
emergency [10] Emergency OPTIONAL,
emergencyGroupState [11] EmergencyGroupState OPTIONAL,
timeStamp [12] TimeStamp,
pTCType [13] PTCType OPTIONAL,
failureCode [14] UTF8String OPTIONAL,
floorActivity [15] FloorActivity OPTIONAL,
floorSpeakerID [16] PTCAddress,
groupAdSender [17] UTF8String,
-- Identifies the group administrator who was the originator of the group call.
groupID [18] UTF8String,
floorSpeakerID [16] PTCAddress OPTIONAL,
groupAdSender [17] UTF8String OPTIONAL,
-- Identifies the group administrator who was the originator of the group call.
-- tag [18] was used in r15 (15) version-4 (4)
groupAuthRule [19] GroupAuthRule OPTIONAL,
groupCharacteristics [20] UTF8String,
holdRetrieveInd [21] BOOLEAN,
groupCharacteristics [20] UTF8String OPTIONAL,
holdRetrieveInd [21] BOOLEAN OPTIONAL,
-- true indicates target is placed on hold, false indicates target was retrived from hold.
holdRetUser [22] UTF8String,
-- the name of the associate who removes the target off hold.
-- tag [22] was used in r15 (15) version-4 (4)
imminentPerilInd [23] ImminentPerilInd OPTIONAL,
implicitFloorReq [24] ImplicitFloorReq OPTIONAL,
initiationCause [25] InitiationCause OPTIONAL,
invitationCause [26] UTF8String,
iPAPartyID [27] UTF8String,
invitationCause [26] UTF8String OPTIONAL,
iPAPartyID [27] UTF8String OPTIONAL,
iPADirection [28] IPADirection OPTIONAL,
listManagementAction [29] ListManagementAction OPTIONAL,
listManagementFailure [30] UTF8String,
listManagementFailure [30] UTF8String OPTIONAL,
listManagementType [31] ListManagementType OPTIONAL,
maxTBTime [32] UTF8String, -- defined in seconds.
mCPTTGroupID [33] UTF8String,
maxTBTime [32] UTF8String OPTIONAL, -- defined in seconds.
mCPTTGroupID [33] UTF8String OPTIONAL,
mCPTTID [34] UTF8String OPTIONAL,
mCPTTInd [35] BOOLEAN OPTIONAL,
-- default False indicates to associate from target, true indicates to the target.
-- default False indicates to associate from target, true indicates to the target.
location [36] Location OPTIONAL,
mCPTTOrganizationName [37] UTF8String,
mediaStreamAvail [38] BOOLEAN,
mCPTTOrganizationName [37] UTF8String OPTIONAL,
mediaStreamAvail [38] BOOLEAN OPTIONAL,
-- True indicates available for media, false indicates not able to accept media.
priority-Level [40] Priority-Level OPTIONAL,
preEstSessionID [41] UTF8String,
preEstSessionID [41] UTF8String OPTIONAL,
preEstStatus [42] PreEstStatus OPTIONAL,
pTCGroupID [43] UTF8String,
pTCGroupID [43] UTF8String OPTIONAL,
pTCIDList [44] UTF8String OPTIONAL,
pTCMediaCapability [45] UTF8String OPTIONAL,
pTCOriginatingId [46] UTF8String OPTIONAL,
pTCOther [47] UTF8String OPTIONAL,
pTCParticipants [48] UTF8String OPTIONAL,
pTCParty [49] UTF8String,
pTCPartyDrop [50] UTF8String,
pTCSessionInfo [51] UTF8String,
pTCServerURI [52] UTF8String,
pTCUserAccessPolicy [53] UTF8String,
pTCParty [49] UTF8String OPTIONAL,
pTCPartyDrop [50] UTF8String OPTIONAL,
pTCSessionInfo [51] UTF8String OPTIONAL,
pTCServerURI [52] UTF8String OPTIONAL,
pTCUserAccessPolicy [53] UTF8String OPTIONAL,
pTCAddress [54] PTCAddress OPTIONAL,
queuedFloorControl [55] BOOLEAN OPTIONAL,
--Default FALSE,send TRUE if Queued floor control is used.
......@@ -1177,15 +1176,15 @@ PTC ::= SEQUENCE {
-- right to speak.
registrationRequest [57] RegistrationRequest OPTIONAL,
registrationOutcome [58] RegistrationOutcome OPTIONAL,
retrieveID [59] UTF8String,
retrieveID [59] UTF8String OPTIONAL,
rTPSetting [60] RTPSetting OPTIONAL,
talkBurstPriority [61] Priority-Level OPTIONAL,
talkBurstReason [62] Talk-burst-reason-code OPTIONAL,
-- Talk-burst-reason-code Defined according to the rules and procedures
-- in (OMA-PoC-AD [97])
talkburstControlSetting [63] TalkburstControlSetting OPTIONAL,
targetPresenceStatus [64] UTF8String,
port-Number [65] INTEGER (0..65535),
targetPresenceStatus [64] UTF8String OPTIONAL,
port-Number [65] INTEGER (0..65535) OPTIONAL,
...
}
......@@ -1295,6 +1294,7 @@ PTCType ::= ENUMERATED
pTCMCPTTImminentGroupCall (24),
pTCCC (25),
pTCRegistration (26),
pTCEncryption (27),
...
}
......
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r15 (15) version-4 (4)}
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r15 (15) version-5 (5)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -34,7 +34,7 @@ securityDomain(2) lawfulIntercept(2)}
-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r15 (15) version-4 (4)}
hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r15 (15) version-5 (5)}
umts-sending-of-IRI OPERATION ::=
{
......@@ -879,64 +879,63 @@ PTCEncryptionInfo ::= SEQUENCE {
}
PTC ::= SEQUENCE {
abandonCause [1] UTF8String,
abandonCause [1] UTF8String OPTIONAL,
accessPolicyFailure [2] UTF8String OPTIONAL,
accessPolicyType [3] AccessPolicyType,
alertIndicator [5] AlertIndicator,
associatePresenceStatus [6] AssociatePresenceStatus,
accessPolicyType [3] AccessPolicyType OPTIONAL,
alertIndicator [5] AlertIndicator OPTIONAL,
associatePresenceStatus [6] AssociatePresenceStatus OPTIONAL,
bearer-capability [7] UTF8String OPTIONAL,
-- identifies the Bearer capability information element (value part)
broadcastIndicator [8] BOOLEAN OPTIONAL,
-- default False, true indicates this is a braodcast to a group
contactID [9] UTF8String,
contactID [9] UTF8String OPTIONAL,
emergency [10] Emergency OPTIONAL,
emergencyGroupState [11] EmergencyGroupState OPTIONAL,
timeStamp [12] TimeStamp,
pTCType [13] PTCType OPTIONAL,
failureCode [14] UTF8String OPTIONAL,
floorActivity [15] FloorActivity OPTIONAL,
floorSpeakerID [16] PTCAddress,
groupAdSender [17] UTF8String,
floorSpeakerID [16] PTCAddress OPTIONAL,
groupAdSender [17] UTF8String OPTIONAL,
-- Identifies the group administrator who was the originator of the group call.
groupID [18] UTF8String,
-- tag [18] was used in r15 (15) version-4 (4)
groupAuthRule [19] GroupAuthRule OPTIONAL,
groupCharacteristics [20] UTF8String,
holdRetrieveInd [21] BOOLEAN,
groupCharacteristics [20] UTF8String OPTIONAL,
holdRetrieveInd [21] BOOLEAN OPTIONAL,
-- true indicates target is placed on hold, false indicates target was retrived from hold.
holdRetUser [22] UTF8String,
-- the name of the associate who removes the target off hold.
-- tag [22] was used in r15 (15) version-4 (4)
imminentPerilInd [23] ImminentPerilInd OPTIONAL,
implicitFloorReq [24] ImplicitFloorReq OPTIONAL,
initiationCause [25] InitiationCause OPTIONAL,
invitationCause [26] UTF8String,
iPAPartyID [27] UTF8String,
invitationCause [26] UTF8String OPTIONAL,
iPAPartyID [27] UTF8String OPTIONAL,
iPADirection [28] IPADirection OPTIONAL,
listManagementAction [29] ListManagementAction OPTIONAL,
listManagementFailure [30] UTF8String,
listManagementFailure [30] UTF8String OPTIONAL,
listManagementType [31] ListManagementType OPTIONAL,
maxTBTime [32] UTF8String, -- defined in seconds.
mCPTTGroupID [33] UTF8String,
maxTBTime [32] UTF8String OPTIONAL, -- defined in seconds.
mCPTTGroupID [33] UTF8String OPTIONAL,
mCPTTID [34] UTF8String OPTIONAL,
mCPTTInd [35] BOOLEAN OPTIONAL,
-- default False indicates to associate from target, true indicates to the target.
-- default False indicates to associate from target, true indicates to the target.
location [36] Location OPTIONAL,
mCPTTOrganizationName [37] UTF8String,
mediaStreamAvail [38] BOOLEAN,
mCPTTOrganizationName [37] UTF8String OPTIONAL,
mediaStreamAvail [38] BOOLEAN OPTIONAL,
-- True indicates available for media, false indicates not able to accept media.
priority-Level [40] Priority-Level OPTIONAL,
preEstSessionID [41] UTF8String,
preEstSessionID [41] UTF8String OPTIONAL,
preEstStatus [42] PreEstStatus OPTIONAL,
pTCGroupID [43] UTF8String,
pTCGroupID [43] UTF8String OPTIONAL,
pTCIDList [44] UTF8String OPTIONAL,
pTCMediaCapability [45] UTF8String OPTIONAL,
pTCOriginatingId [46] UTF8String OPTIONAL,
pTCOther [47] UTF8String OPTIONAL,
pTCParticipants [48] UTF8String OPTIONAL,
pTCParty [49] UTF8String,
pTCPartyDrop [50] UTF8String,
pTCSessionInfo [51] UTF8String,
pTCServerURI [52] UTF8String,
pTCUserAccessPolicy [53] UTF8String,
pTCParty [49] UTF8String OPTIONAL,
pTCPartyDrop [50] UTF8String OPTIONAL,
pTCSessionInfo [51] UTF8String OPTIONAL,
pTCServerURI [52] UTF8String OPTIONAL,
pTCUserAccessPolicy [53] UTF8String OPTIONAL,
pTCAddress [54] PTCAddress OPTIONAL,
queuedFloorControl [55] BOOLEAN OPTIONAL,
--Default FALSE,send TRUE if Queued floor control is used.
......@@ -945,15 +944,15 @@ PTC ::= SEQUENCE {
-- right to speak.
registrationRequest [57] RegistrationRequest OPTIONAL,
registrationOutcome [58] RegistrationOutcome OPTIONAL,
retrieveID [59] UTF8String,
retrieveID [59] UTF8String OPTIONAL,
rTPSetting [60] RTPSetting OPTIONAL,
talkBurstPriority [61] Priority-Level OPTIONAL,
talkBurstReason [62] Talk-burst-reason-code OPTIONAL,
-- Talk-burst-reason-code Defined according to the rules and procedures
-- in (OMA-PoC-AD [97])
talkburstControlSetting [63] TalkburstControlSetting OPTIONAL,
targetPresenceStatus [64] UTF8String,
port-Number [65] INTEGER (0..65535),
targetPresenceStatus [64] UTF8String OPTIONAL,
port-Number [65] INTEGER (0..65535) OPTIONAL,
...
}
......@@ -1062,9 +1061,9 @@ PTCType ::= ENUMERATED
pTCGroupCallInterrogate (23),
pTCMCPTTImminentGroupCall (24),
pTCCC (25),
...,
pTCRegistration (26)
pTCRegistration (26),
pTCEncryption (27),
...
}
FloorActivity ::= SEQUENCE
......
VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r14 (14) version-0 (0)}
VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r15 (15) version-1 (1)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -7,7 +7,8 @@ BEGIN
IMPORTS
LawfulInterceptionIdentifier,
TimeStamp
TimeStamp,
Network-Identifier
FROM HI2Operations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}-- from ETSI HI2Operations TS 101 671, version 3.12.1
......@@ -25,7 +26,7 @@ securityDomain(2) lawfulIntercept(2)}
-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi3voipDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3voip(12) r14 (14) version-0 (0)}
hi3voipDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi3voip(12) r15 (15) version-1 (1)}
Voip-CC-PDU ::= SEQUENCE
{
......@@ -37,10 +38,14 @@ VoipLIC-header ::= SEQUENCE
{
hi3voipDomainId [0] OBJECT IDENTIFIER, -- 3GPP VoIP HI3 Domain
lIID [2] LawfulInterceptionIdentifier OPTIONAL,
voipCorrelationNumber [3] VoipCorrelationNumber, -- Contain s the same contents as the
voipCorrelationNumber [3] VoipCorrelationNumber,
-- For VoIP, contains the same contents as the
-- cc parameter contained within an IRI-to-CC-Correlation parameter
-- which is contained in the IMS-VoIP-Correlation parameter in the
-- IRI [HI2]
-- IRI [HI2]; For PTC, contains the same contents as the cc parameter
-- contained within an IRI-to-CC-Correlation parameter which is
-- contained in the CorrelationValues parameter in the IRI [HI2]
timeStamp [4] TimeStamp OPTIONAL,
sequence-number [5] INTEGER (0..65535),
t-PDU-direction [6] TPDU-direction,
......@@ -49,11 +54,18 @@ VoipLIC-header ::= SEQUENCE
ice-type [8] ICE-type OPTIONAL,
-- The ICE-type indicates the applicable Intercepting Control Element in which
-- the VoIP CC is intercepted.
... ,
payload-description [9] Payload-description OPTIONAL
...,
payload-description [9] Payload-description OPTIONAL,
-- When this option is implemented, shall be used to provide the RTP payload description
-- as soon as it is available at DF3 (initial one or each time the DF3 is notified of a
-- change)
networkIdentifier [10] Network-Identifier OPTIONAL,
-- Mandatory when used for PTC
-- Identifies the network element that is reporting the CC
pTCSessionInfo [11] UTF8String OPTIONAL
-- Mandatory when used for PTC
-- Identifies the PTC Session. Together with the 'voipCorrelationNumber', uniquely
-- identifies a specific PTC talk burst.
}
VoipCorrelationNumber ::= OCTET STRING
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment