Commit 49c4e45e authored by canterburym's avatar canterburym
Browse files

TS 33108 v15.2.0 (2018-09-20) agreed at SA#81

parent c0112bd2
......@@ -60,7 +60,6 @@ ConfLIC-header ::= SEQUENCE
}
MediaID ::= SEQUENCE
{
sourceUserID [1] ConfPartyInformation OPTIONAL, -- include SDP information
......@@ -71,7 +70,6 @@ MediaID ::= SEQUENCE
...
}
TPDU-direction ::= ENUMERATED
{
from-target (1),
......
......@@ -133,8 +133,6 @@ IRI-Parameters ::= SEQUENCE
-- PARAMETERS FORMATS
ConfEvent ::= ENUMERATED
{
confStartSuccessfull (1),
......@@ -162,7 +160,6 @@ ConfPartyInformation ::= SEQUENCE
...
}
ConfCorrelation ::= CHOICE
{
......@@ -172,7 +169,6 @@ ConfCorrelation ::= CHOICE
...
}
PartyIdentity ::= SEQUENCE
{
......
......@@ -24,7 +24,6 @@ IMPORTS
TPDU-direction
FROM VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3voip(12) r14(14) version-0(0)};
-- Object Identifier Definitions
-- Security DomainId
......@@ -62,5 +61,4 @@ CSvoiceLIC-header ::= SEQUENCE
}
END
\ No newline at end of file
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r15(15) version-0 (0)}
EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi2eps(8) r15(15) version-1 (1)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -31,7 +31,7 @@ IMPORTS
FROM UmtsHI2Operations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2)
lawfulintercept(2) threeGPP(4) hi2(1) r15 (15) version-0 (0)};
lawfulintercept(2) threeGPP(4) hi2(1) r15 (15) version-1 (1)};
-- Imported from 3GPP TS 33.108, UMTS PS HI2
......@@ -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-0 (0)}
hi2epsDomainId OBJECT IDENTIFIER ::= {threeGPPSUBDomainId hi2eps(8) r15(15) version-1 (1)}
eps-sending-of-IRI OPERATION ::=
{
......@@ -123,6 +123,7 @@ IRI-Parameters ::= SEQUENCE
locationOfTheTarget [8] Location OPTIONAL,
-- location of the target
-- or cell site location
partyInformation [9] SET SIZE (1..10) OF PartyInformation OPTIONAL,
-- This parameter provides the concerned party, the identiy(ies) of the party
--)and all the information provided by the party.
......@@ -236,6 +237,10 @@ IRI-Parameters ::= SEQUENCE
requesting-Node-Identifier [75] OCTET STRING OPTIONAL,
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 Encryption Information
national-HI2-ASN1parameters [255] National-HI2-ASN1parameters OPTIONAL
}
......@@ -245,9 +250,9 @@ IRI-Parameters ::= SEQUENCE
DataNodeIdentifier ::= SEQUENCE
{
dataNodeAddress [1] DataNodeAddress OPTIONAL,
dataNodeAddress [1] DataNodeAddress OPTIONAL,
logicalFunctionType [2] LogicalFunctionType OPTIONAL,
dataNodeName [3] PrintableString(SIZE(7..25)) OPTIONAL,
dataNodeName [3] PrintableString(SIZE(7..25)) OPTIONAL,
--Unique identifier of a Data Node within the CSP domain. Could be a name/number combination.
...
}
......@@ -356,12 +361,11 @@ Location ::= SEQUENCE
-- the Routeing Area Identifier in the old SGSN is coded in accordance with the
-- 10.5.5.15 of document [9] without the Routing Area Identification IEI
-- (only the last 6 octets are used).
civicAddress [9] CivicAddress OPTIONAL
civicAddress [9] CivicAddress OPTIONAL,
operatorSpecificInfo [10] OCTET STRING OPTIONAL
-- other CSP specific information.
}
GlobalCellID ::= OCTET STRING (SIZE (5..7))
Rai ::= OCTET STRING (SIZE (6))
Sai ::= OCTET STRING (SIZE (7))
......@@ -511,61 +515,67 @@ IRI-to-IRI-Correlation ::= OCTET STRING -- correlates IRI to IRI
EPSEvent ::= ENUMERATED
{
pDPContextActivation (1),
pDPContextActivation (1),
startOfInterceptionWithPDPContextActive (2),
pDPContextDeactivation (4),
gPRSAttach (5),
gPRSDetach (6),
pDPContextDeactivation (4),
gPRSAttach (5),
gPRSDetach (6),
locationInfoUpdate (10),
sMS (11),
pDPContextModification (13),
servingSystem (14),
sMS (11),
pDPContextModification (13),
servingSystem (14),
... ,
startOfInterceptionWithMSAttached (15),
e-UTRANAttach (16),
e-UTRANDetach (17),
bearerActivation (18),
startOfInterceptionWithActiveBearer (19),
bearerModification (20),
bearerDeactivation (21),
uERequestedBearerResourceModification (22),
uERequestedPDNConnectivity (23),
uERequestedPDNDisconnection (24),
trackingAreaEpsLocationUpdate (25),
servingEvolvedPacketSystem (26),
pMIPAttachTunnelActivation (27),
pMIPDetachTunnelDeactivation (28),
startOfInterceptWithActivePMIPTunnel (29),
pMIPPdnGwInitiatedPdnDisconnection (30),
mIPRegistrationTunnelActivation (31),
mIPDeregistrationTunnelDeactivation (32),
startOfInterceptWithActiveMIPTunnel (33),
dSMIPRegistrationTunnelActivation (34),
dSMIPDeregistrationTunnelDeactivation (35),
startOfInterceptWithActiveDsmipTunnel (36),
dSMipHaSwitch (37),
pMIPResourceAllocationDeactivation (38),
mIPResourceAllocationDeactivation (39),
pMIPsessionModification (40),
startOfInterceptWithEUTRANAttachedUE (41),
dSMIPSessionModification (42),
startOfInterceptionWithMSAttached (15),
e-UTRANAttach (16),
e-UTRANDetach (17),
bearerActivatio (18),
startOfInterceptionWithActiveBearer (19),
bearerModificatio (20),
bearerDeactivation (21),
uERequestedBearerResourceModification (22),
uERequestedPDNConnectivity (23),
uERequestedPDNDisconnection (24),
trackingAreaEpsLocationUpdate (25),
servingEvolvedPacketSystem (26),
pMIPAttachTunnelActivation (27),
pMIPDetachTunnelDeactivation (28),
startOfInterceptWithActivePMIPTunnel (29),
pMIPPdnGwInitiatedPdnDisconnection (30),
mIPRegistrationTunnelActivation (31),
mIPDeregistrationTunnelDeactivation (32),
startOfInterceptWithActiveMIPTunnel (33),
dSMIPRegistrationTunnelActivation (34),
dSMIPDeregistrationTunnelDeactivation (35),
startOfInterceptWithActiveDsmipTunnel (36),
dSMipHaSwitch (37),
pMIPResourceAllocationDeactivation (38),
mIPResourceAllocationDeactivation (39),
pMIPsessionModification (40),
startOfInterceptWithEUTRANAttachedUE (41),
dSMIPSessionModification (42),
packetDataHeaderInformation (43),
hSS-Subscriber-Record-Change (44),
registration-Termination (45),
hSS-Subscriber-Record-Change (44),
registration-Termination (45),
-- FFS
location-Up-Date (46),
location-Up-Date (46),
-- FFS
cancel-Location (47),
register-Location (48),
location-Information-Request (49),
proSeRemoteUEReport (50),
proSeRemoteUEStartOfCommunication (51),
proSeRemoteUEEndOfCommunication (52),
startOfLIwithProSeRemoteUEOngoingComm (53),
startOfLIforProSeUEtoNWRelay (54)
cancel-Location (47),
register-Location (48),
location-Information-Request (49),
proSeRemoteUEReport (50),
proSeRemoteUEStartOfCommunication (51),
proSeRemoteUEEndOfCommunication (52),
startOfLIwithProSeRemoteUEOngoingComm (53),
startOfLIforProSeUEtoNWRelay (54)
}
-- see [19]
CSREvent ::= ENUMERATED
{
cSREventMessage (1),
...
}
IMSevent ::= ENUMERATED
{
unfilteredSIPmessage (1),
......@@ -695,6 +705,8 @@ EPS-GTPV2-SpecificParameters ::= SEQUENCE
ePSlocationOfTheTarget [23] EPSLocation OPTIONAL,
-- the use of ePSLocationOfTheTarget is mutually exclusive with the use of locationOfTheTarget
-- ePSlocationOfTheTarget allows using the coding of the parameter according to SAE stage 3.
-- location of the target
-- or cell site location
...,
pDNType [24] OCTET STRING (SIZE (1)) OPTIONAL,
-- coded according to TS 24.301 [47]
......@@ -752,7 +764,10 @@ EPSLocation ::= SEQUENCE
...,
threeGPP2Bsid [7] OCTET STRING (SIZE (1..12)) OPTIONAL,
-- contains only the payload from the 3GPP2-BSID AVP described in the 3GPP TS 29.212 [56].
civicAddress [8] CivicAddress OPTIONAL
civicAddress [8] CivicAddress OPTIONAL,
operatorSpecificInfo [9] OCTET STRING OPTIONAL
-- other CSP specific information.
}
}
......@@ -786,7 +801,6 @@ RemoteUEIPInformation ::= OCTET STRING
RemoteUeContextDisconnected ::= RemoteUserID
EPS-PMIP-SpecificParameters ::= SEQUENCE
{
lifetime [1] INTEGER (0..65535) OPTIONAL,
......@@ -827,7 +841,6 @@ EPS-DSMIP-SpecificParameters ::= SEQUENCE
-- referenced in it.
}
EPS-MIP-SpecificParameters ::= SEQUENCE
{
lifetime [1] INTEGER (0.. 65535) OPTIONAL,
......@@ -841,7 +854,6 @@ EPS-MIP-SpecificParameters ::= SEQUENCE
-- referenced in it.
}
MediaDecryption-info ::= SEQUENCE OF CCKeyInfo
-- One or more key can be available for decryption, one for each media streams of the
-- intercepted session.
......@@ -897,7 +909,6 @@ PacketDataHeaderMapped ::= SEQUENCE
...
}
TPDU-direction ::= ENUMERATED
{
from-target (1),
......@@ -914,7 +925,6 @@ PacketDataHeaderCopy ::= SEQUENCE
...
}
PacketDataSummaryReport ::= SEQUENCE OF PacketFlowSummary
PacketFlowSummary ::= SEQUENCE
......@@ -1015,7 +1025,6 @@ Change-Of-Target-Identity ::= SEQUENCE
old-TEL-URI [14] PartyInformation OPTIONAL
}
Current-Previous-Systems ::= SEQUENCE
{
serving-System-Identifier [1] OCTET STRING OPTIONAL,
......@@ -1050,4 +1059,370 @@ DeregistrationReason ::= CHOICE
...
}
PTCEncryptionInfo ::= SEQUENCE {
cipher [1] UTF8String,
cryptoContext [2] UTF8String OPTIONAL,
key [3] UTF8String,
keyEncoding [4] UTF8String,
salt [5] UTF8String OPTIONAL,
pTCOther [6] UTF8String OPTIONAL,
...
}
PTC ::= SEQUENCE {
abandonCause [1] UTF8String,
accessPolicyFailure [2] UTF8String OPTIONAL,
accessPolicyType [3] AccessPolicyType,
alertIndicator [5] AlertIndicator,
associatePresenceStatus [6] AssociatePresenceStatus,
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,
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,
groupAuthRule [19] GroupAuthRule OPTIONAL,
groupCharacteristics [20] UTF8String,
holdRetrieveInd [21] BOOLEAN,
-- 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.
imminentPerilInd [23] ImminentPerilInd OPTIONAL,
implicitFloorReq [24] ImplicitFloorReq OPTIONAL,
initiationCause [25] InitiationCause OPTIONAL,
invitationCause [26] UTF8String,
iPAPartyID [27] UTF8String,
iPADirection [28] IPADirection OPTIONAL,
listManagementAction [29] ListManagementAction OPTIONAL,
listManagementFailure [30] UTF8String,
listManagementType [31] ListManagementType OPTIONAL,
maxTBTime [32] UTF8String, -- defined in seconds.
mCPTTGroupID [33] UTF8String,
mCPTTID [34] UTF8String OPTIONAL,
mCPTTInd [35] BOOLEAN OPTIONAL,
-- default False indicates to associate from target, true indicates to the target.
location [36] UTF8String OPTIONAL,
mCPTTOrganizationName [37] UTF8String,
mediaStreamAvail [38] BOOLEAN,
-- True indicates available for media, false indicates not able to accept media.
priority_Level [40] Priority_Level OPTIONAL,
preEstSessionID [41] UTF8String,
preEstStatus [42] PreEstStatus OPTIONAL,
pTCGroupID [43] UTF8String,
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,
pTCAddress [54] PTCAddress OPTIONAL,
queuedFloorControl [55] BOOLEAN OPTIONAL,
--Default FALSE,send TRUE if Queued floor control is used.
queuedPosition [56] UTF8String OPTIONAL,
-- indicates the queued position of the Speaker (Target or associate) who has the
-- right to speak.
registrationRequest [57] RegistrationRequest OPTIONAL,
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
-- in (OMA-PoC-AD [97])
talkburstControlSetting [63] TalkburstControlSetting OPTIONAL,
targetPresenceStatus [64] UTF8String,
port_Number [65] INTEGER (0..65535),
...
}
AccessPolicyType ::= SEQUENCE
{
userAccessPolicyAttempt [1] BOOLEAN,
-- default False, true indicates Target has accessed.
groupAuthorizationRulesAttempt [2] BOOLEAN,
-- default False, true indicates Target has accessed.
userAccessPolicyQuery [3] BOOLEAN,
-- default False, true indicates Target has accessed.
groupAuthorizationRulesQuery [4] BOOLEAN,
-- default False, true indicates Target has accessed.
userAccessPolicyResult [5] UTF8String,
groupAuthorizationRulesResult [6] UTF8String,
...
}
AlertIndicator ::= ENUMERATED
{
-- indicates the group call alert condition.
sent (1),
received (2),
cancelled (3),
...
}
AssociatePresenceStatus ::= SEQUENCE
{
presenceID [1] UTF8String,
-- identity of PTC Client(s)or the PTC group
presenceType [2] PresenceType,
presenceStatus [3] BOOLEAN,
-- default false, true indicates connected.
...
}
PresenceType ::= ENUMERATED
{
pTCClient (1),
pTCGroup (2),
-- identifies the type of presenceID given [PTC Client(s) or PTC group].
...
}
Emergency ::= ENUMERATED
{
-- MCPTT services indication of peril condition.
imminent (1),
peril (2),
cancel (3),
...
}
EmergencyGroupState ::= SEQUENCE
{
-- indicates the state of the call, at least one of these information
-- elements shall be present.
clientEmergencyState [1] ENUMERATED
{
-- in case of MCPTT call, indicates the response for the client
inform (1),
response (2),
cancelInform (3),
cancelResponse (4),
...
} OPTIONAL,
groupEmergencyState [2] ENUMERATED
{
-- in case of MCPTT group call, indicates if there is a group emergency or
-- a response from the Target to indicate current Client state of emergency.
inForm (1),
reSponse (2),
cancelInform (3),
cancelResponse (4),
...
},
...
}
PTCType ::= ENUMERATED
{
pTCStartofInterception (1),
pTCServinSystem (2),
pTCSessionInitiation (3),
pTCSessionAbandonEndRecord (4),
pTCSessionStartContinueRecord (5),
pTCSessionEndRecord (6),
pTCPre-EstablishedSessionSessionRecord (7),
pTCInstantPersonalAlert (8),
pTCPartyJoin (9),
pTCPartyDrop (10),
pTCPartyHold-RetrieveRecord (11),
pTCMediaModification (12),
pTCGroupAdvertizement (13),
pTCFloorConttrol (14),
pTCTargetPressence (15),
pTCAssociatePressence (16),
pTCListManagementEvents (17),
pTCAccessPolicyEvents (18),
pTCMediaTypeNotification (19),
pTCGroupCallRequest (20),
pTCGroupCallCancel (21),
pTCGroupCallResponse (22),
pTCGroupCallInterrogate (23),
pTCMCPTTImminentGroupCall (24),
pTCCC (25),
...
}
FloorActivity ::= SEQUENCE
{
tBCP_Request [1] BOOLEAN,
-- default False, true indicates Granted.
tBCP_Granted [2] BOOLEAN,
-- default False, true indicates Granted permission to talk.
tBCP_Deny [3] BOOLEAN,
-- default True, False indicates permission granted.
tBCP_Queued [4] BOOLEAN,
-- default False, true indicates the request to talk is in queue.
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,
-- default False, true indicates the privilege to talk is canceld from the
-- PTC server.
tBCP_Taken [7] BOOLEAN,
-- default True, false indicates another PTC Client has the permission to talk.
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),
...
}
ImminentPerilInd ::= ENUMERATED
{
request (1),
response (2),
cancel (3),
-- when the MCPTT Imminent Peril Group Call Request, Response or Cancel is detected
...
}
ImplicitFloorReq ::= ENUMERATED
{
join (1),
rejoin (2),
release (3),
-- group Call request to join, rejoin, or release of the group call
...
}
InitiationCause ::= ENUMERATED
{
requests (1),
received (2),
pTCOriginatingId (3),
-- requests or receives a session initiation from the network or another
-- party to initiate a PTC session. Identify the originating PTC party, if known.
...
}
IPADirection ::= ENUMERATED
{
toTarget (0),
fromTarget (1),
...
}
ListManagementAction ::= ENUMERATED
{
create (1),
modify (2),
retrieve (3),
delete (4),
notify (5),
...
}
ListManagementType ::= ENUMERATED
{
contactListManagementAttempt (1),
groupListManagementAttempt (2),
contactListManagementResult (3),
groupListManagementResult (4),
requestSuccessful (5),
...
}
Priority_Level ::= ENUMERATED
{
pre_emptive (0),
high_priority (1),
normal_priority (2),
listen_only (3),
...
}
PreEstStatus ::= ENUMERATED
{
established (1),
modify (2),
released (3),
...
}
PTCAddress ::= SEQUENCE
{
uri [0] UTF8String,
-- The set of URIs defined in [RFC3261] and related SIP RFCs.
privacy_setting [1] BOOLEAN,
-- Default FALSE, send TRUE if privacy is used.
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
-- PTC Addresses are used in the same PTC Session, for the second Anonymous PTC
-- Session and thereafter, the PTC Server SHOULD use the form
-- sip:anonymous-n@anonymous.invalid where n is an integer number.
nickname [3] UTF8String OPTIONAL,
...
}
RegistrationRequest ::= ENUMERATED
{
register (1),
re-register (2),
de-register (3),
...
}
RegistrationOutcome ::= ENUMERATED
{
success (0),
failure (1),
...
}