Commit 4765392f authored by Luke Mewburn's avatar Luke Mewburn
Browse files

Merge remote-tracking branch 'origin/meeting/SA110' into draft/lm-changelog

parents 1c48c170 e76e0272
Loading
Loading
Loading
Loading
+23 −8
Original line number Diff line number Diff line
TS33128Payloads
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r19(19) version4(4)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r19(19) version5(5)}

DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=

@@ -18,7 +18,7 @@ IMPORTS
-- Relative OIDs
-- =============

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r19(19) version4(4)}
tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r19(19) version5(5)}

xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -341,7 +341,8 @@ XIRIEvent ::= CHOICE
    mCXStartOfInterceptionWithEstablishedSession        [193] MCXStartOfInterceptionWithEstablishedSession,
    mCXManagementMessage                                [194] MCXManagementMessage,
    mCVideoTransmissionControlMessage                   [195] MCVideoTransmissionControlMessage,
    mCDataFileDistribution                              [196] MCDataFileDistribution
    mCDataFileDistribution                              [196] MCDataFileDistribution,
    mCPTTFloorControlMessage                            [197] MCPTTFloorControlMessage
}

-- ==============
@@ -666,7 +667,8 @@ IRIEvent ::= CHOICE
    mCXStartOfInterceptionWithEstablishedSession        [193] MCXStartOfInterceptionWithEstablishedSession,
    mCXManagementMessage                                [194] MCXManagementMessage,
    mCVideoTransmissionControlMessage                   [195] MCVideoTransmissionControlMessage,
    mCDataFileDistribution                              [196] MCDataFileDistribution
    mCDataFileDistribution                              [196] MCDataFileDistribution,
    mCPTTFloorControlMessage                            [197] MCPTTFloorControlMessage
}

IRITargetIdentifier ::= SEQUENCE
@@ -705,7 +707,8 @@ CCPDU ::= CHOICE
    iMSCCPDU            [6] IMSCCPDU,
    rCSCCPDU            [7] RCSCCPDU,
    mCVideoCCPDU        [8] MCVideoCCPDU,
    mCDataCCPDU         [9] MCDataCCPDU
    mCDataCCPDU         [9] MCDataCCPDU,
    mCPTTCCPDU          [10] MCPTTCCPDU
}

-- ===========================
@@ -4624,7 +4627,8 @@ PTCStartOfInterception ::= SEQUENCE
    pTCHost                       [6] PTCTargetInformation OPTIONAL,
    pTCParticipants               [7] SEQUENCE OF PTCTargetInformation OPTIONAL,
    pTCMediaStreamAvail           [8] BOOLEAN OPTIONAL,
    pTCBearerCapability           [9] UTF8String OPTIONAL
    pTCBearerCapability           [9] UTF8String OPTIONAL,
    location                      [10] Location OPTIONAL
}

PTCPreEstablishedSession  ::= SEQUENCE
@@ -4785,7 +4789,8 @@ PTCTargetInformation ::= SEQUENCE

PTCIdentifiers  ::= CHOICE
{
    mCPTTID                    [1] UTF8String,
    -- deprecatedMCPTT was deprecated in r19(19) version5(5)
    deprecatedMCPTTID          [1] UTF8String,
    instanceIdentifierURN      [2] UTF8String,
    pTCChatGroupID             [3] PTCChatGroupID,
    iMPU                       [4] IMPU,
@@ -6174,6 +6179,13 @@ MCDataFileDistribution ::= CHOICE
    mCDataFileDownload [2] MCDataFileDownload
}

-- See clause 7.20.2.7 for details of this structure
MCPTTFloorControlMessage ::= SEQUENCE
{
    mCServiceIDOrGroupID                [1] MCServiceIDOrGroupID,
    floorControlMessage                 [2] OCTET STRING
}

-- ====================
-- MCService parameters
-- ====================
@@ -6350,6 +6362,8 @@ MCDataCCPDU ::= CHOICE

MCVideoCCPDU ::= OCTET STRING

MCPTTCCPDU ::= OCTET STRING

-- ===================
-- 5G LALS definitions
-- ===================
@@ -7808,7 +7822,8 @@ TargetIdentifier ::= CHOICE
    emailAddress           [14] EmailAddress,
    mCPTTID                [15] UTF8String,
    instanceIdentifierURN  [16] UTF8String,
    pTCChatGroupID         [17] PTCChatGroupID
    pTCChatGroupID         [17] PTCChatGroupID,
    mCServiceIDOrGroupID   [18] MCServiceIDOrGroupID
}

TargetIdentifierProvenance ::= ENUMERATED