Commit da0d2fdc authored by canterburym's avatar canterburym
Browse files

Refactoring

parent 12a8c418

33128/r19/TS33128Payloads.asn

+83 −183
Original line number Diff line number Diff line
@@ -335,19 +335,14 @@ XIRIEvent ::= CHOICE 
    -- Charging data event records, see clause 7.19

    chargingDataEvent                                   [190] ChargingDataEvent,



    -- MCVideo events, see clause 7.X.2.2

    mCVideoSIPMessage                                   [191] MCVideoSIPMessage,

    mCVideoStartOfInterceptionWithRegisteredUE          [192] MCVideoStartOfInterceptionWithRegisteredUE,

    mCVideoStartOfInterceptionWithEstablishedSession    [193] MCVideoStartOfInterceptionWithEstablishedSession,

    mCVideoTransmissionControl                          [194] MCVideoTransmissionControl,

    mCVideoManagementMessage                            [195] MCVideoManagementMessage,



    -- MCData events, see clause 7.X.3.2

    mCDataSIPMessage                                    [196] MCDataSIPMessage,

    mCDataStartOfInterceptionWithRegisteredUE           [197] MCDataStartOfInterceptionWithRegisteredUE,

    mCDataStartOfInterceptionWithEstablishedSession     [198] MCDataStartOfInterceptionWithEstablishedSession,

    mCDataManagementMessage                             [199] MCDataManagementMessage,

    mCDataFileDistribution                              [200] MCDataFileDistribution

    -- MCX events, see clause 7.X.2.2

    mCXSIPMessage                                       [191] MCXSIPMessage,

    mCXInterceptionWithRegisteredUE                     [192] MCXStartOfInterceptionWithRegisteredUE,

    mCXInterceptionWithEstablishedSession               [193] MCXStartOfInterceptionWithEstablishedSession,

    mCXManagementMessage                                [194] MCXManagementMessage,

    mCVideoTransmissionControl                          [195] MCVideoTransmissionControl,

    mCDataFileDistribution                              [196] MCDataFileDistribution

}



-- ==============
@@ -666,19 +661,13 @@ IRIEvent ::= CHOICE 
    -- Charging data event records, see clause 7.19

    chargingDataEvent                                   [190] ChargingDataEvent,



    -- MCVideo events, see clause 7.X.2.3

    mCVideoSIPMessage                                   [191] MCVideoSIPMessage,

    mCVideoStartOfInterceptionWithRegisteredUE          [192] MCVideoStartOfInterceptionWithRegisteredUE,

    mCVideoStartOfInterceptionWithEstablishedSession    [193] MCVideoStartOfInterceptionWithEstablishedSession,

    mCVideoTransmissionControl                          [194] MCVideoTransmissionControl,

    mCVideoManagementMessage                            [195] MCVideoManagementMessage,



    -- MCData events, see clause 7.X.3.3

    mCDataSIPMessage                                    [196] MCDataSIPMessage,

    mCDataStartOfInterceptionWithRegisteredUE           [197] MCDataStartOfInterceptionWithRegisteredUE,

    mCDataStartOfInterceptionWithEstablishedSession     [198] MCDataStartOfInterceptionWithEstablishedSession,

    mCDataManagementMessage                             [199] MCDataManagementMessage,

    mCDataFileDistribution                              [200] MCDataFileDistribution

    -- MCX events, see clause 7.X.2.2

    mCXSIPMessage                                       [191] MCXSIPMessage,

    mCXInterceptionWithRegisteredUE                     [192] MCXStartOfInterceptionWithRegisteredUE,

    mCXInterceptionWithEstablishedSession               [193] MCXStartOfInterceptionWithEstablishedSession,

    mCXManagementMessage                                [194] MCXManagementMessage,

    mCVideoTransmissionControl                          [195] MCVideoTransmissionControl,

    mCDataFileDistribution                              [196] MCDataFileDistribution

}



IRITargetIdentifier ::= SEQUENCE
@@ -6102,23 +6091,23 @@ PINServerID ::= UTF8String 
PINClientProfile ::=XMLType

PINProfile ::= XMLType





-- ===================

-- MCVideo definitions

-- MCX definitions

-- ===================



-- See clause 7.X.2.2.1 for details of this structure

MCVideoSIPMessage ::= SEQUENCE

MCXSIPMessage ::= SEQUENCE

{

    mCVideoIdentities   [1] SEQUENCE SIZE (1..MAX) OF MCVideoIdentity OPTIONAL,

    mCVideoGroupID      [2] MCVideoGroupID OPTIONAL,

    sIPMessage          [3] SIPMessage,

    sessionDirection    [4] Direction

    mCServiceIdentities [1] MCServiceOrGroupIDs,

    sIPMessage          [2] SIPMessage,

    sessionDirection    [3] Direction

}



-- See clause 7.X.2.2.2 for details of this structure

MCVideoStartOfInterceptionWithRegisteredUE ::= SEQUENCE

MCXStartOfInterceptionWithRegisteredUE ::= SEQUENCE

{

    mCVideoIdentities              [1] SEQUENCE SIZE (1..MAX) OF MCVideoIdentity,

    mCServiceIdentities            [1] MCServiceOrGroupIDs,

    userOnline                     [2] BOOLEAN,

    sIPRegistrationRequest         [3] SIPMessage,

    sIPRegistrationResponse        [4] SIPMessage,
@@ -6126,46 +6115,46 @@ MCVideoStartOfInterceptionWithRegisteredUE ::= SEQUENCE 
}



-- See clause 7.X.2.2.3 for details of this structure

MCVideoStartOfInterceptionWithEstablishedSession ::= SEQUENCE

{

    mCVideoIdentities           [1] SEQUENCE SIZE (1..MAX) OF MCVideoIdentity OPTIONAL,

    mCVideoGroupID              [2] MCVideoGroupID OPTIONAL,

    mCVideoDirection            [3] Direction,

    mCVideoOriginatingID        [4] MCVideoID,

    mCVideoSessionInfo          [5] MCXSessionInfo,

    mCVideoParticipants         [6] SEQUENCE SIZE (1..MAX) OF MCVideoID OPTIONAL,

    location                    [7] Location OPTIONAL,

    mCVideoMediaStreamAvailable [8] BOOLEAN OPTIONAL,

    mCVideoBearerCapability     [9] UTF8String OPTIONAL

MCXStartOfInterceptionWithEstablishedSession ::= SEQUENCE

{

    mCServiceIdentities         [1] MCServiceOrGroupIDs,

    mCDirection                 [2] Direction,

    mCXOriginatingID            [3] MCServiceID,

    mCXSessionInfo              [4] MCXSessionInfo,

    mCXParticipants             [5] MCServiceIdentities,

    location                    [6] Location OPTIONAL,

    mCXBearerCapability         [7] UTF8String OPTIONAL,

    mCVideoMediaStreamAvailable [8] BOOLEAN OPTIONAL

}



-- See clause 7.X.2.2.4 for details of this structure

MCVideoTransmissionControl ::= SEQUENCE

-- See clause 7.X.2.2.5 for details of this structure

MCXManagementMessage ::= CHOICE

{

    mCVideoID                           [1] MCVideoID OPTIONAL,

    mCVideoGroupID                      [2] MCVideoGroupID OPTIONAL,

    transmissionControlMessage          [3] OCTET STRING,

    transmissionControlMessageDirection [4] Direction

    mcXIdMMessage [1] MCXIdMMessage,

    mCXCMMessage  [2] MCXCMMessage,

    mCXGMMessage  [3] MCXGMMessage,

    mCXKMMessage  [4] MCXKMMessage,

    mCXLMMessage  [5] MCXLMMessage

}



-- See clause 7.X.2.2.5 for details of this structure

MCVideoManagementMessage ::= CHOICE



-- See clause 7.X.2.2.4 for details of this structure

MCVideoTransmissionControl ::= SEQUENCE

{

    mcVideoIdMMessage [1] MCVideoIdMMessage,

    mCVideoCMMessage  [2] MCVideoCMMessage,

    mCVideoGMMessage  [3] MCVideoGMMessage,

    mCVideoKMMessage  [4] MCVideoKMMessage,

    mCVideoLMMessage  [5] MCVideoLMMessage

    mCServiceOrGroupIDs                 [1] MCServiceOrGroupIDs,

    transmissionControlMessage          [2] OCTET STRING,

    transmissionControlMessageDirection [3] Direction

}





-- ==================

-- MCVideo parameters

-- MCX parameters

-- ==================



MCVideoIdMMessage ::= SEQUENCE

MCXIdMMessage ::= SEQUENCE

{

    mCID            [1] MCID,

    mCVideoD   [2] MCVideoID,

    mCServiceID     [2] MCServiceID,

    idMMessage      [3] IdMMessage

}
@@ -6175,24 +6164,23 @@ IdMMessage ::= SEQUENCE 
    idMResponse  [2] OCTET STRING

}



MCVideoCMMessage ::= SEQUENCE

MCXCMMessage ::= SEQUENCE

{

    mCVideoIdentities           [1] SEQUENCE SIZE (1..MAX) OF MCVideoIdentity,

    mcVideoClient               [2] MCVideoID OPTIONAL,

    mCXIdentities               [1] MCServiceOrGroupIDs,

    mcXClient                   [2] MCServiceID OPTIONAL,

    hTTPMethod                  [3] CMHTTPMethod,

    requestURI                  [4] UTF8String,

    hTTPResponseCode            [5] CMHTTPResponseCode,

    mCVideoUEConfiguration      [6] XMLType OPTIONAL,

    mCVideoUEProfile            [7] XMLType OPTIONAL,

    mCVideoServiceConfiguraiton [8] XMLType OPTIONAL

    mCXUEConfiguration          [6] XMLType OPTIONAL,

    mCXUEProfile                [7] XMLType OPTIONAL,

    mCXServiceConfiguration     [8] XMLType OPTIONAL

}



MCVideoGMMessage ::= SEQUENCE

MCXGMMessage ::= SEQUENCE

{

    mCVideoIdentities           [1] SEQUENCE SIZE (1..MAX) OF MCVideoIdentity OPTIONAL,

    mCVideoGroupID              [2] MCVideoGroupID OPTIONAL,

    mCVideoClient               [3] MCVideoID OPTIONAL,

    gMMessage                   [4] GMMessage

    mCXIdentities               [1] MCServiceOrGroupIDs OPTIONAL,

    mcXClient                   [2] MCServiceID OPTIONAL,

    gMMessage                   [3] GMMessage

}



GMMessage ::= SEQUENCE
@@ -6201,9 +6189,9 @@ GMMessage ::= SEQUENCE 
    gMResponse  [2] OCTET STRING

}



MCVideoKMMessage ::= SEQUENCE

MCXKMMessage ::= SEQUENCE

{

    mCVideoID                   [1] MCVideoID,

    mCServiceID                 [1] MCServiceID,

    kMMessage                   [2] KMMessage

}
@@ -6216,9 +6204,9 @@ KMMessage ::= SEQUENCE 
    hTTPResponseCode            [5] UTF8String

}



MCVideoLMMessage ::= SEQUENCE

MCXLMMessage ::= SEQUENCE

{

    mCVideoID                   [1] MCVideoID,

    mCServiceID                 [1] MCServiceID,

    lMMessage                   [2] LMMessage

}
@@ -6228,17 +6216,24 @@ LMMessage ::= SEQUENCE 
    lMResponse  [2] OCTET STRING

}



MCVideoIdentity ::= CHOICE

MCServiceOrGroupIDs ::= CHOICE

{

    mCServiceIdentities [1] MCServiceIdentities,

    mCGroupID           [2] MCGroupID

}



MCServiceIdentities ::= SEQUENCE SIZE (1..MAX) OF MCServiceID



MCServiceID ::= CHOICE

{

    mCVideoID             [1] MCVideoID,

    mCServiceID           [1] MCServiceID,

    iMPU                  [2] IMPU,

    iMPI                  [3] IMPI,

    instanceIdentifierURN [4] InstanceIdentifierURN

}



MCID ::= UTF8String

MCVideoID ::= UTF8String

MCVideoGroupID ::= UTF8String

MCGroupID ::= UTF8String

InstanceIdentifierURN ::= UTF8String



MCXSessionInfo ::= SEQUENCE
@@ -6319,47 +6314,6 @@ KMSResponseBodyKRR ::= XMLType 
-- MCData definitions

-- ==================



-- See clause 7.Y.3.2.1 for details of this structure

MCDataSIPMessage ::= SEQUENCE

{

    mCDataIdentities   [1] SEQUENCE SIZE (1..MAX) OF MCDataIdentity OPTIONAL,

    mCDataGroupID      [2] MCDataGroupID OPTIONAL,

    sIPMessage         [3] SIPMessage,

    sessionDirection   [4] Direction

}



-- See clause 7.X.3.2.2 for details of this structure

MCDataStartOfInterceptionWithRegisteredUE ::= SEQUENCE

{

    mCDataIdentities              [1] SEQUENCE SIZE (1..MAX) OF MCDataIdentity,

    userOnline                    [2] BOOLEAN,

    sIPRegistrationRequest        [3] SIPMessage,

    sIPRegistrationResponse       [4] SIPMessage,

    location                      [5] Location OPTIONAL

}



-- See clause 7.X.3.2.3 for details of this structure

MCDataStartOfInterceptionWithEstablishedSession ::= SEQUENCE

{

    mCDataIdentities            [1] SEQUENCE SIZE (1..MAX) OF MCDataIdentity OPTIONAL,

    mCDataGroupID               [2] MCDataGroupID OPTIONAL,

    mCDataDirection             [3] Direction,

    mCDataOriginatingID         [4] MCDataID,

    mCDataSessionInfo           [5] MCXSessionInfo,

    mCDataParticipants          [6] SEQUENCE SIZE (1..MAX) OF MCDataID OPTIONAL,

    location                    [7] Location OPTIONAL,

    mCDataBearerCapability      [8] UTF8String OPTIONAL

}



-- See clause 7.X.3.2.4 for details of this structure

MCDataManagementMessage ::= CHOICE

{

    mCDataIdMMessage [1] MCDataIdMMessage,

    mCDataCMMessage  [2] MCDataCMMessage,

    mCDataGMMessage  [3] MCDataGMMessage,

    mCDataKMMessage  [4] MCDataKMMessage,

    mCDataLMMessage  [5] MCDataLMMessage

}



-- See clause 7.X.3.2.5 for details of this structure

MCDataFileDistribution ::= CHOICE
@@ -6377,66 +6331,13 @@ MCDataCCPDU ::= CHOICE 
    encapsulatedMCDataPayload [1] EncapsulatedRCSPayload

}



MCDataIdMMessage ::= SEQUENCE

{

    mCID       [1] MCID,

    mCDataID   [2] MCDataID,

    idMMessage [3] IdMMessage

}





MCDataCMMessage ::= SEQUENCE

{

    mCDataIdentities           [1] SEQUENCE SIZE (1..MAX) OF MCDataIdentity,

    mCDataClient               [2] MCDataID OPTIONAL,

    hTTPMethod                 [3] CMHTTPMethod,

    requestURI                 [4] UTF8String,

    hTTPResponseCode           [5] CMHTTPResponseCode,

    mCDataUEConfiguration      [6] XMLType OPTIONAL,

    mCDataUEProfile            [7] XMLType OPTIONAL,

    mCDataServiceConfiguraiton [8] XMLType OPTIONAL

}



MCDataGMMessage ::= SEQUENCE

{

    mCDataIdentities      [1] SEQUENCE SIZE (1..MAX) OF MCDataIdentity OPTIONAL,

    mCDataGroupID         [2] MCDataGroupID OPTIONAL,

    mCDataClient          [3] MCDataID OPTIONAL,

    gMMessage             [4] GMMessage

}



MCDataKMMessage ::= SEQUENCE

{

    mCDataID        [1] MCDataID,

    kMMessage       [2] KMMessage

}





MCDataLMMessage ::= SEQUENCE

{

    mCDataID                [1] MCDataID,

    lMMessage               [2] LMMessage

}



MCDataIdentity ::= CHOICE

{

    mCDataID              [1] MCDataID,

    iMPU                  [2] IMPU,

    iMPI                  [3] IMPI,

    instanceIdentifierURN [4] InstanceIdentifierURN

}



MCDataID ::= UTF8String



MCDataGroupID ::= UTF8String



MCDataFileUpload ::= SEQUENCE

{

    mCDataID           [1] MCDataID,

    mCDataGroupID      [2] MCDataGroupID OPTIONAL,

    mcDatarequestType  [3] MCDataRequestType,

    mCDataFileURL      [4] UTF8String OPTIONAL,

    hTTPResponseCode   [5] UTF8String

    mCXIdentities      [1] MCServiceOrGroupIDs,

    mcDataRequestType  [2] MCDataRequestType,

    mCDataFileURL      [3] UTF8String OPTIONAL,

    hTTPResponseCode   [4] UTF8String

}



MCDataRequestType ::= ENUMERATED
@@ -6447,10 +6348,9 @@ MCDataRequestType ::= ENUMERATED 


MCDataFileDownload ::= SEQUENCE

{

    mCDataID           [1] MCDataID,

    mCDataGroupID      [2] MCDataGroupID OPTIONAL,

    mCDataFileURL      [3] UTF8String,

    hTTPResponseCode   [4] UTF8String

    mCServiceIdentities     [1] MCServiceOrGroupIDs,

    mCDataFileURL           [2] UTF8String,

    hTTPResponseCode        [3] UTF8String

}



-- ===================