Commit 85603712 authored by canterburym's avatar canterburym
Browse files

TS 33108 v15.3.0 (2018-12-20) agreed at SA#82

parent 49c4e45e
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r15(15) version-1 (1)}
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r15(15) version-2 (2)}
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-1 (1)}
hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r15(15) version-2 (2)}
eps-sending-of-IRI OPERATION ::=
{
......@@ -238,8 +238,8 @@ IRI-Parameters ::= SEQUENCE
roamingIndication [76] VoIPRoamingIndication OPTIONAL,
-- used for IMS events in the VPLMN.
cSREvent [77] CSREvent OPTIONAL,
ptc [78] PTC, -- PTC Events
ptc [79] PTCEncryptionInfo OPTIONAL,
ptc [78] PTC OPTIONAL, -- PTC Events
ptcEncryption [79] PTCEncryptionInfo OPTIONAL,
-- PTC Encryption Information
national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL
......@@ -364,6 +364,13 @@ Location ::= SEQUENCE
civicAddress [9] CivicAddress OPTIONAL,
operatorSpecificInfo [10] OCTET STRING OPTIONAL
-- other CSP specific information.
uELocationTimestamp [11] CHOICE OPTIONAL
{
timestamp [0] TimeStamp,
timestampUnknown [1] NULL,
...
}
-- Date/time of the UE location
}
GlobalCellID ::= OCTET STRING (SIZE (5..7))
......@@ -767,13 +774,16 @@ EPSLocation ::= SEQUENCE
civicAddress [8] CivicAddress OPTIONAL,
operatorSpecificInfo [9] OCTET STRING OPTIONAL
-- other CSP specific information.
}
uELocationTimestamp [10] CHOICE OPTIONAL
{
timestamp [0] TimeStamp,
timestampUnknown [1] NULL,
...
}
-- Date/time of the UE location
}
ProtConfigOptions ::= SEQUENCE
{
ueToNetwork [1] OCTET STRING (SIZE(1..251)) OPTIONAL,
-- This shall be coded with octet 3 onwards of the Protocol Configuration Options IE in
......@@ -1082,7 +1092,7 @@ PTC ::= SEQUENCE {
contactID [9] UTF8String,
emergency [10] Emergency OPTIONAL,
emergencyGroupState [11] EmergencyGroupState OPTIONAL,
timeStamp [12] Timestamp,
timeStamp [12] TimeStamp,
pTCType [13] PTCType OPTIONAL,
failureCode [14] UTF8String OPTIONAL,
floorActivity [15] FloorActivity OPTIONAL,
......@@ -1114,7 +1124,7 @@ PTC ::= SEQUENCE {
mCPTTOrganizationName [37] UTF8String,
mediaStreamAvail [38] BOOLEAN,
-- True indicates available for media, false indicates not able to accept media.
priority_Level [40] Priority_Level OPTIONAL,
priority-Level [40] Priority-Level OPTIONAL,
preEstSessionID [41] UTF8String,
preEstStatus [42] PreEstStatus OPTIONAL,
pTCGroupID [43] UTF8String,
......@@ -1138,13 +1148,13 @@ PTC ::= SEQUENCE {
registrationOutcome [58] RegistrationOutcome OPTIONAL,
retrieveID [59] UTF8String,
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
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),
port-Number [65] INTEGER (0..65535),
...
}
......@@ -1258,39 +1268,39 @@ PTCType ::= ENUMERATED
FloorActivity ::= SEQUENCE
{
tBCP_Request [1] BOOLEAN,
tBCP-Request [1] BOOLEAN,
-- default False, true indicates Granted.
tBCP_Granted [2] BOOLEAN,
tBCP-Granted [2] BOOLEAN,
-- default False, true indicates Granted permission to talk.
tBCP_Deny [3] BOOLEAN,
tBCP-Deny [3] BOOLEAN,
-- default True, False indicates permission granted.
tBCP_Queued [4] BOOLEAN,
tBCP-Queued [4] BOOLEAN,
-- default False, true indicates the request to talk is in queue.
tBCP_Release [5] BOOLEAN,
tBCP-Release [5] BOOLEAN,
-- default True, true indicates the Request to talk is completed,
-- False indicates PTC Client has the request to talk.
tBCP_Revoke [6] BOOLEAN,
tBCP-Revoke [6] BOOLEAN,
-- default False, true indicates the privilege to talk is canceld from the
-- PTC server.
tBCP_Taken [7] BOOLEAN,
tBCP-Taken [7] BOOLEAN,
-- default True, false indicates another PTC Client has the permission to talk.
tBCP_Idle [8] BOOLEAN,
tBCP-Idle [8] BOOLEAN,
-- default True, False indicates the Talk Burst Protocol is taken.
...
}
GroupAuthRule ::= ENUMERATED
{
allow_Initiating_PtcSession (0),
block_Initiating_PtcSession (1),
allow_Joining_PtcSession (2),
block_Joining_PtcSession (3),
allow_Add_Participants (4),
block_Add_Participants (5),
allow_Subscription_PtcSession_State (6),
block_Subscription_PtcSession_State (7),
allow_Anonymity (8),
forbid_Anonymity (9),
allow-Initiating-PtcSession (0),
block-Initiating-PtcSession (1),
allow-Joining-PtcSession (2),
block-Joining-PtcSession (3),
allow-Add-Participants (4),
block-Add-Participants (5),
allow-Subscription-PtcSession-State (6),
block-Subscription-PtcSession-State (7),
allow-Anonymity (8),
forbid-Anonymity (9),
...
}
......@@ -1350,12 +1360,12 @@ ListManagementType ::= ENUMERATED
...
}
Priority_Level ::= ENUMERATED
Priority-Level ::= ENUMERATED
{
pre_emptive (0),
high_priority (1),
normal_priority (2),
listen_only (3),
pre-emptive (0),
high-priority (1),
normal-priority (2),
listen-only (3),
...
}
......@@ -1371,9 +1381,9 @@ PTCAddress ::= SEQUENCE
{
uri [0] UTF8String,
-- The set of URIs defined in [RFC3261] and related SIP RFCs.
privacy_setting [1] BOOLEAN,
privacy-setting [1] BOOLEAN,
-- Default FALSE, send TRUE if privacy is used.
privacy_alias [2] VisibleString OPTIONAL,
privacy-alias [2] VisibleString OPTIONAL,
-- if privacy is used, the PTC Server creates an anonymous PTC Address of the form
-- <sip:anonymous@anonymous.invalid>. In addition to anonymity, the anonymous PTC
-- Addresses SHALL be unique within a PTC Session. In case more than one anonymous
......@@ -1402,27 +1412,27 @@ RegistrationOutcome ::= ENUMERATED
RTPSetting ::= SEQUENCE
{
ip_address [0] IPAddress,
port_number [1] Port_Number,
ip-address [0] IPAddress,
port-number [1] Port-Number,
-- the IP address and port number at the PTC Server for the RTP Session
...
}
Port_Number ::= INTEGER (0..65535)
Port-Number ::= INTEGER (0..65535)
TalkburstControlSetting ::= SEQUENCE
{
talk_BurstControlProtocol [1] UTF8String,
talk_Burst_parameters [2] SET OF VisibleString,
talk-BurstControlProtocol [1] UTF8String,
talk-Burst-parameters [2] SET OF VisibleString,
-- selected by the PTC Server from those contained in the original SDP offer in the
-- incoming SIP INVITE request from the PTC Client
tBCP_PortNumber [3] INTEGER (0..65535),
tBCP-PortNumber [3] INTEGER (0..65535),
-- PTC Server's port number to be used for the Talk Burst Control Protocol
...
}
Talk_burst_reason_code ::= VisibleString
Talk-burst-reason-code ::= VisibleString
END
\ No newline at end of file
GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2gcse(13) r13 (13) version-0 (0)}
GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2gcse(13) r15 (15) version-0 (0)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -28,7 +28,7 @@ IMPORTS
FROM EpsHI2Operations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
lawfulIntercept(2) threeGPP(4) hi2eps(8) r13(13) version-1(1)};
lawfulIntercept(2) threeGPP(4) hi2eps(8) r15(15) version-2(2)};
-- Imported from EPS ASN.1 Portion of this standard
......@@ -42,7 +42,7 @@ securityDomain(2) lawfulIntercept(2)}
-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2gcseDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2gcse(13) r13 (13) version-0(0)}
hi2gcseDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2gcse(13) r15 (15) version-0(0)}
gcse-sending-of-IRI OPERATION ::=
{
......
......@@ -34,7 +34,6 @@ Direction-Indication ::= ENUMERATED
...
}
Service-Information ::= SET
{
high-layer-capability [0] OCTET STRING (SIZE(1)) OPTIONAL,
......
MmsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2mms(16) r14(14) version-1 (1)}
MmsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2mms(16) r15(15) version-0 (0)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -28,7 +28,7 @@ IMPORTS
FROM UmtsHI2Operations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
lawfulintercept(2) threeGPP(4) hi2(1) r13 (13) version-0 (0)};
lawfulintercept(2) threeGPP(4) hi2(1) r15 (15) version-2 (2)};
-- Imported from 3GPP TS 33.108, UMTS PS HI2
-- Object Identifier Definitions
......@@ -40,7 +40,7 @@ securityDomain(2) lawfulIntercept(2)}
-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2mmsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2mms(16) r14(14) version-1 (1)}
hi2mmsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2mms(16) r15(15) version-0 (0)}
mms-sending-of-IRI OPERATION ::=
{
......
......@@ -23,8 +23,6 @@ IMPORTS
lawfulIntercept(2) hi2(1) version18(18)}; -- Imported from TS 101 671v3.12.1
-- =============================
-- Object Identifier Definitions
-- =============================
......@@ -62,7 +60,6 @@ Error-ThreeGPP-HI1Notifications ERROR ::=
erroneous-parameter
}
ThreeGPP-HI1-Operation ::= CHOICE
{
liActivated [1] Notification,
......@@ -97,7 +94,6 @@ Notification ::= SEQUENCE
broadcastStatus [8] BroadcastStatus OPTIONAL,
...}
Alarm-Indicator ::= SEQUENCE
{
domainID [0] OBJECT IDENTIFIER OPTIONAL,
......@@ -164,7 +160,6 @@ Target-Information ::= SEQUENCE
-- date and time when the warrant is entered into the ADMF
}
TargetType ::= ENUMERATED
{
mSISDN(0),
......@@ -201,7 +196,6 @@ InterceptionType ::= ENUMERATED
voiceAndDataIriOnly(5),
...}
BroadcastStatus ::= ENUMERATED
{
succesfull(0),
......@@ -211,5 +205,4 @@ BroadcastStatus ::= ENUMERATED
-- case of usage: such information could be provided to the LEMF following the impossibility to get a positive confirmation from at least one node with an LI function on the broadcasted command made by the operator's mediation or the management of mediation.
...}
END
\ No newline at end of file
UmtsCS-HI2Operations
{itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3) r15 (15) version-0 (0)}
{itu-t (0) identified-organization (4) etsi (0) securityDomain (2) lawfulIntercept (2) threeGPP(4) hi2CS (3) r15 (15) version-1 (1)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -31,7 +31,7 @@ IMPORTS OPERATION,
FROM UmtsHI2Operations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
lawfulintercept(2) threeGPP(4) hi2(1) r14(14) version-0(0)};
lawfulintercept(2) threeGPP(4) hi2(1) r15(15) version-0(0)};
-- Object Identifier Definitions
......@@ -42,7 +42,7 @@ securityDomain(2) lawfulIntercept(2)}
-- Security Subdomains
threeGPPSUBDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId threeGPP(4)}
hi2CSDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2CS(3) r15 (15) version-0 (0)}
hi2CSDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2CS(3) r15 (15) version-1 (1)}
umtsCS-sending-of-IRI OPERATION ::=
......
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r15 (15) version-1 (1)}
UmtsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2(1) r15 (15) version-2 (2)}
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-1 (1)}
hi2DomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2(1) r15 (15) version-2 (2)}
umts-sending-of-IRI OPERATION ::=
{
......@@ -194,8 +194,8 @@ IRI-Parameters ::= SEQUENCE
extendedLocParameters [55] ExtendedLocParameters OPTIONAL, -- LALS extended parameters
locationErrorCode [56] LocationErrorCode OPTIONAL, -- LALS error code
cSREvent [57] CSREvent OPTIONAL,
ptc [58] PTC, -- PTC Events
ptc [59] PTCEncryptionInfo OPTIONAL,
ptc [58] PTC OPTIONAL, -- PTC Events
ptcEncryption [59] PTCEncryptionInfo OPTIONAL,
-- PTC Security Information
national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL
......@@ -312,6 +312,13 @@ Location ::= SEQUENCE
-- 33.107 on how such element can be used.
operatorSpecificInfo [12] OCTET STRING OPTIONAL
-- other CSP specific information.
uELocationTimestamp [13] CHOICE OPTIONAL
{
timestamp [0] TimeStamp,
timestampUnknown [1] NULL,
...
}
-- Date/time of the UE location
}
GlobalCellID ::= OCTET STRING (SIZE (5..7))
......@@ -884,7 +891,7 @@ PTC ::= SEQUENCE {
contactID [9] UTF8String,
emergency [10] Emergency OPTIONAL,
emergencyGroupState [11] EmergencyGroupState OPTIONAL,
timeStamp [12] Timestamp,
timeStamp [12] TimeStamp,
pTCType [13] PTCType OPTIONAL,
failureCode [14] UTF8String OPTIONAL,
floorActivity [15] FloorActivity OPTIONAL,
......@@ -916,7 +923,7 @@ PTC ::= SEQUENCE {
mCPTTOrganizationName [37] UTF8String,
mediaStreamAvail [38] BOOLEAN,
-- True indicates available for media, false indicates not able to accept media.
priority_Level [40] Priority_Level OPTIONAL,
priority-Level [40] Priority-Level OPTIONAL,
preEstSessionID [41] UTF8String,
preEstStatus [42] PreEstStatus OPTIONAL,
pTCGroupID [43] UTF8String,
......@@ -940,13 +947,13 @@ PTC ::= SEQUENCE {
registrationOutcome [58] RegistrationOutcome OPTIONAL,
retrieveID [59] UTF8String,
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
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),
port-Number [65] INTEGER (0..65535),
...
}
......@@ -1060,39 +1067,39 @@ PTCType ::= ENUMERATED
FloorActivity ::= SEQUENCE
{
tBCP_Request [1] BOOLEAN,
tBCP-Request [1] BOOLEAN,
-- default False, true indicates Granted.
tBCP_Granted [2] BOOLEAN,
tBCP-Granted [2] BOOLEAN,
-- default False, true indicates Granted permission to talk.
tBCP_Deny [3] BOOLEAN,
tBCP-Deny [3] BOOLEAN,
-- default True, False indicates permission granted.
tBCP_Queued [4] BOOLEAN,
tBCP-Queued [4] BOOLEAN,
-- default False, true indicates the request to talk is in queue.
tBCP_Release [5] BOOLEAN,
tBCP-Release [5] BOOLEAN,
-- default True, true indicates the Request to talk is completed,
-- False indicates PTC Client has the request to talk.
tBCP_Revoke [6] BOOLEAN,
tBCP-Revoke [6] BOOLEAN,
-- default False, true indicates the privilege to talk is canceld from the
-- PTC server.
tBCP_Taken [7] BOOLEAN,
tBCP-Taken [7] BOOLEAN,
-- default True, false indicates another PTC Client has the permission to talk.
tBCP_Idle [8] BOOLEAN,
tBCP-Idle [8] BOOLEAN,
-- default True, False indicates the Talk Burst Protocol is taken.
...
}
GroupAuthRule ::= ENUMERATED
{
allow_Initiating_PtcSession (0),
block_Initiating_PtcSession (1),
allow_Joining_PtcSession (2),
block_Joining_PtcSession (3),
allow_Add_Participants (4),
block_Add_Participants (5),
allow_Subscription_PtcSession_State (6),
block_Subscription_PtcSession_State (7),
allow_Anonymity (8),
forbid_Anonymity (9),
allow-Initiating-PtcSession (0),
block-Initiating-PtcSession (1),
allow-Joining-PtcSession (2),
block-Joining-PtcSession (3),
allow-Add-Participants (4),
block-Add-Participants (5),
allow-Subscription-PtcSession-State (6),
block-Subscription-PtcSession-State (7),
allow-Anonymity (8),
forbid-Anonymity (9),
...
}
......@@ -1152,12 +1159,12 @@ ListManagementType ::= ENUMERATED
...
}
Priority_Level ::= ENUMERATED
Priority-Level ::= ENUMERATED
{
pre_emptive (0),
high_priority (1),
normal_priority (2),
listen_only (3),
pre-emptive (0),
high-priority (1),
normal-priority (2),
listen-only (3),
...
}
......@@ -1173,9 +1180,9 @@ PTCAddress ::= SEQUENCE
{
uri [0] UTF8String,
-- The set of URIs defined in [RFC3261] and related SIP RFCs.
privacy_setting [1] BOOLEAN,
privacy-setting [1] BOOLEAN,
-- Default FALSE, send TRUE if privacy is used.
privacy_alias [2] VisibleString OPTIONAL,
privacy-alias [2] VisibleString OPTIONAL,
-- if privacy is used, the PTC Server creates an anonymous PTC Address of the form
-- <sip:anonymous@anonymous.invalid>. In addition to anonymity, the anonymous PTC
-- Addresses SHALL be unique within a PTC Session. In case more than one anonymous
......@@ -1204,27 +1211,27 @@ RegistrationOutcome ::= ENUMERATED
RTPSetting ::= SEQUENCE
{
ip_address [0] IPAddress,
port_number [1] Port_Number,
ip-address [0] IPAddress,
port-number [1] Port_Number,
-- the IP address and port number at the PTC Server for the RTP Session
...
}
Port_Number ::= INTEGER (0..65535)
Port-Number ::= INTEGER (0..65535)
TalkburstControlSetting ::= SEQUENCE
{
talk_BurstControlProtocol [1] UTF8String,
talk_Burst_parameters [2] SET OF VisibleString,
talk----BurstControlProtocol [1] UTF8String,
talk-Burst_parameters [2] SET OF VisibleString,
-- selected by the PTC Server from those contained in the original SDP offer in the
-- incoming SIP INVITE request from the PTC Client
tBCP_PortNumber [3] INTEGER (0..65535),
tBCP-PortNumber [3] INTEGER (0..65535),
-- PTC Server's port number to be used for the Talk Burst Control Protocol
...
}
Talk_burst_reason_code ::= VisibleString
Talk-burst-reason-code ::= VisibleString
END
\ No newline at end of file
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