forked from osmocom/wireshark
M2AP: upgrade dissector to v15.0.0
Change-Id: Id38154dff1abb5ce2c45337b95a76887a26c1970 Reviewed-on: https://code.wireshark.org/review/30345 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin
parent
0f084657d3
commit
4a7361abde
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.443 V14.0.0 (2017-03)
|
||||
-- 3GPP TS 36.443 V15.0.0 (2018-09)
|
||||
-- **************************************************************
|
||||
--
|
||||
-- Common definitions
|
||||
|
|
@ -6,10 +6,10 @@
|
|||
-- **************************************************************
|
||||
|
||||
M2AP-CommonDataTypes {
|
||||
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
|
||||
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
|
||||
eps-Access (21) modules (3) m2ap (4) version1 (1) m2ap-CommonDataTypes (3) }
|
||||
|
||||
DEFINITIONS AUTOMATIC TAGS ::=
|
||||
DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
BEGIN
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.443 V14.0.0 (2017-03)
|
||||
-- 3GPP TS 36.443 V15.0.0 (2018-09)
|
||||
-- **************************************************************
|
||||
--
|
||||
-- Constant definitions
|
||||
|
|
@ -6,10 +6,10 @@
|
|||
-- **************************************************************
|
||||
|
||||
M2AP-Constants {
|
||||
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
|
||||
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
|
||||
eps-Access (21) modules (3) m2ap (4) version1 (1) m2ap-Constants (4) }
|
||||
|
||||
DEFINITIONS AUTOMATIC TAGS ::=
|
||||
DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
BEGIN
|
||||
|
||||
|
|
@ -44,11 +44,11 @@ id-mbmsOverloadNotification ProcedureCode ::= 12
|
|||
--
|
||||
-- **************************************************************
|
||||
|
||||
maxnoofMBSFNareas INTEGER ::= 256
|
||||
maxnoofMBSFNareas INTEGER ::= 256
|
||||
maxnoofMBSFN-Allocations INTEGER ::= 8
|
||||
maxnoofPMCHsperMBSFNarea INTEGER ::= 15
|
||||
maxnoofCells INTEGER ::= 256
|
||||
maxnoofMBMSServiceAreasPerCell INTEGER ::= 256
|
||||
maxnoofMBMSServiceAreasPerCell INTEGER ::= 256
|
||||
maxnoofSessionsPerPMCH INTEGER ::= 29
|
||||
maxnooferrors INTEGER ::= 256
|
||||
maxNrOfIndividualM2ConnectionsToReset INTEGER ::= 256
|
||||
|
|
@ -58,7 +58,7 @@ maxnoofCellsforMBMS INTEGER ::= 4096
|
|||
|
||||
-- **************************************************************
|
||||
--
|
||||
-- IEs
|
||||
-- Ies
|
||||
--
|
||||
-- **************************************************************
|
||||
|
||||
|
|
@ -108,5 +108,7 @@ id-SC-PTM-Information ProtocolIE-ID ::= 45
|
|||
id-Modification-PeriodExtended ProtocolIE-ID ::= 46
|
||||
id-Repetition-PeriodExtended ProtocolIE-ID ::= 47
|
||||
id-MCH-Scheduling-PeriodExtended2 ProtocolIE-ID ::= 48
|
||||
id-Subcarrier-SpacingMBMS ProtocolIE-ID ::= 49
|
||||
id-SubframeAllocationExtended ProtocolIE-ID ::= 50
|
||||
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.443 V14.0.0 (2017-03)
|
||||
-- 3GPP TS 36.443 V15.0.0 (2018-09)
|
||||
-- **************************************************************
|
||||
--
|
||||
-- Container definitions
|
||||
|
|
@ -31,7 +31,7 @@ FROM M2AP-CommonDataTypes;
|
|||
|
||||
-- **************************************************************
|
||||
--
|
||||
-- Class Definition for Protocol IEs
|
||||
-- Class Definition for Protocol Ies
|
||||
--
|
||||
-- **************************************************************
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ WITH SYNTAX {
|
|||
|
||||
-- **************************************************************
|
||||
--
|
||||
-- Class Definition for Protocol IEs
|
||||
-- Class Definition for Protocol Ies
|
||||
--
|
||||
-- **************************************************************
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ WITH SYNTAX {
|
|||
|
||||
-- **************************************************************
|
||||
--
|
||||
-- Class Definition for Private IEs
|
||||
-- Class Definition for Private Ies
|
||||
--
|
||||
-- **************************************************************
|
||||
|
||||
|
|
@ -111,21 +111,21 @@ WITH SYNTAX {
|
|||
|
||||
-- **************************************************************
|
||||
--
|
||||
-- Container for Protocol IEs
|
||||
-- Container for Protocol Ies
|
||||
--
|
||||
-- **************************************************************
|
||||
|
||||
ProtocolIE-Container {M2AP-PROTOCOL-IES : IEsSetParam} ::=
|
||||
ProtocolIE-Container {M2AP-PROTOCOL-IES : IesSetParam} ::=
|
||||
SEQUENCE (SIZE (0..maxProtocolIEs)) OF
|
||||
ProtocolIE-Field {{IEsSetParam}}
|
||||
ProtocolIE-Field {{IesSetParam}}
|
||||
|
||||
ProtocolIE-Single-Container {M2AP-PROTOCOL-IES : IEsSetParam} ::=
|
||||
ProtocolIE-Field {{IEsSetParam}}
|
||||
ProtocolIE-Single-Container {M2AP-PROTOCOL-IES : IesSetParam} ::=
|
||||
ProtocolIE-Field {{IesSetParam}}
|
||||
|
||||
ProtocolIE-Field {M2AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
|
||||
id M2AP-PROTOCOL-IES.&id ({IEsSetParam}),
|
||||
criticality M2AP-PROTOCOL-IES.&criticality ({IEsSetParam}{@id}),
|
||||
value M2AP-PROTOCOL-IES.&Value ({IEsSetParam}{@id})
|
||||
ProtocolIE-Field {M2AP-PROTOCOL-IES : IesSetParam} ::= SEQUENCE {
|
||||
id M2AP-PROTOCOL-IES.&id ({IesSetParam}),
|
||||
criticality M2AP-PROTOCOL-IES.&criticality ({IesSetParam}{@id}),
|
||||
value M2AP-PROTOCOL-IES.&Value ({IesSetParam}{@id})
|
||||
}
|
||||
|
||||
-- **************************************************************
|
||||
|
|
@ -134,16 +134,16 @@ ProtocolIE-Field {M2AP-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE {
|
|||
--
|
||||
-- **************************************************************
|
||||
|
||||
ProtocolIE-ContainerPair {M2AP-PROTOCOL-IES-PAIR : IEsSetParam} ::=
|
||||
ProtocolIE-ContainerPair {M2AP-PROTOCOL-IES-PAIR : IesSetParam} ::=
|
||||
SEQUENCE (SIZE (0..maxProtocolIEs)) OF
|
||||
ProtocolIE-FieldPair {{IEsSetParam}}
|
||||
ProtocolIE-FieldPair {{IesSetParam}}
|
||||
|
||||
ProtocolIE-FieldPair {M2AP-PROTOCOL-IES-PAIR : IEsSetParam} ::= SEQUENCE {
|
||||
id M2AP-PROTOCOL-IES-PAIR.&id ({IEsSetParam}),
|
||||
firstCriticality M2AP-PROTOCOL-IES-PAIR.&firstCriticality ({IEsSetParam}{@id}),
|
||||
firstValue M2AP-PROTOCOL-IES-PAIR.&FirstValue ({IEsSetParam}{@id}),
|
||||
secondCriticality M2AP-PROTOCOL-IES-PAIR.&secondCriticality ({IEsSetParam}{@id}),
|
||||
secondValue M2AP-PROTOCOL-IES-PAIR.&SecondValue ({IEsSetParam}{@id})
|
||||
ProtocolIE-FieldPair {M2AP-PROTOCOL-IES-PAIR : IesSetParam} ::= SEQUENCE {
|
||||
id M2AP-PROTOCOL-IES-PAIR.&id ({IesSetParam}),
|
||||
firstCriticality M2AP-PROTOCOL-IES-PAIR.&firstCriticality ({IesSetParam}{@id}),
|
||||
firstValue M2AP-PROTOCOL-IES-PAIR.&FirstValue ({IesSetParam}{@id}),
|
||||
secondCriticality M2AP-PROTOCOL-IES-PAIR.&secondCriticality ({IesSetParam}{@id}),
|
||||
secondValue M2AP-PROTOCOL-IES-PAIR.&SecondValue ({IesSetParam}{@id})
|
||||
}
|
||||
|
||||
-- **************************************************************
|
||||
|
|
@ -152,13 +152,13 @@ ProtocolIE-FieldPair {M2AP-PROTOCOL-IES-PAIR : IEsSetParam} ::= SEQUENCE {
|
|||
--
|
||||
-- **************************************************************
|
||||
|
||||
ProtocolIE-ContainerList {INTEGER : lowerBound, INTEGER : upperBound, M2AP-PROTOCOL-IES : IEsSetParam} ::=
|
||||
ProtocolIE-ContainerList {INTEGER : lowerBound, INTEGER : upperBound, M2AP-PROTOCOL-IES : IesSetParam} ::=
|
||||
SEQUENCE (SIZE (lowerBound..upperBound)) OF
|
||||
ProtocolIE-Container {{IEsSetParam}}
|
||||
ProtocolIE-Container {{IesSetParam}}
|
||||
|
||||
ProtocolIE-ContainerPairList {INTEGER : lowerBound, INTEGER : upperBound, M2AP-PROTOCOL-IES-PAIR : IEsSetParam} ::=
|
||||
ProtocolIE-ContainerPairList {INTEGER : lowerBound, INTEGER : upperBound, M2AP-PROTOCOL-IES-PAIR : IesSetParam} ::=
|
||||
SEQUENCE (SIZE (lowerBound..upperBound)) OF
|
||||
ProtocolIE-ContainerPair {{IEsSetParam}}
|
||||
ProtocolIE-ContainerPair {{IesSetParam}}
|
||||
|
||||
-- **************************************************************
|
||||
--
|
||||
|
|
@ -178,18 +178,18 @@ ProtocolExtensionField {M2AP-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUENC
|
|||
|
||||
-- **************************************************************
|
||||
--
|
||||
-- Container for Private IEs
|
||||
-- Container for Private Ies
|
||||
--
|
||||
-- **************************************************************
|
||||
|
||||
PrivateIE-Container {M2AP-PRIVATE-IES : IEsSetParam} ::=
|
||||
PrivateIE-Container {M2AP-PRIVATE-IES : IesSetParam} ::=
|
||||
SEQUENCE (SIZE (1..maxPrivateIEs)) OF
|
||||
PrivateIE-Field {{IEsSetParam}}
|
||||
PrivateIE-Field {{IesSetParam}}
|
||||
|
||||
PrivateIE-Field {M2AP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
|
||||
id M2AP-PRIVATE-IES.&id ({IEsSetParam}),
|
||||
criticality M2AP-PRIVATE-IES.&criticality ({IEsSetParam}{@id}),
|
||||
value M2AP-PRIVATE-IES.&Value ({IEsSetParam}{@id})
|
||||
PrivateIE-Field {M2AP-PRIVATE-IES : IesSetParam} ::= SEQUENCE {
|
||||
id M2AP-PRIVATE-IES.&id ({IesSetParam}),
|
||||
criticality M2AP-PRIVATE-IES.&criticality ({IesSetParam}{@id}),
|
||||
value M2AP-PRIVATE-IES.&Value ({IesSetParam}{@id})
|
||||
}
|
||||
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
-- 3GPP TS 36.443 V14.0.0 (2017-03)
|
||||
-- 3GPP TS 36.443 V15.0.0 (2018-09)
|
||||
-- **************************************************************
|
||||
--
|
||||
-- Information Element Definitions
|
||||
--
|
||||
-- **************************************************************
|
||||
|
||||
M2AP-IEs {
|
||||
M2AP-Ies {
|
||||
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
|
||||
eps-Access (21) modules (3) m2ap (4) version1 (1) m2ap-IEs (2) }
|
||||
eps-Access (21) modules (3) m2ap (4) version1 (1) m2ap-Ies (2) }
|
||||
|
||||
DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
|
|
@ -19,6 +19,8 @@ IMPORTS
|
|||
id-Modification-PeriodExtended,
|
||||
id-Modulation-Coding-Scheme2,
|
||||
id-Repetition-PeriodExtended,
|
||||
id-Subcarrier-SpacingMBMS,
|
||||
id-SubframeAllocationExtended,
|
||||
maxnoofMBSFNareas,
|
||||
maxnoofPMCHsperMBSFNarea,
|
||||
maxnoofCells,
|
||||
|
|
@ -321,6 +323,7 @@ MBSFN-Subframe-Configuration ::= SEQUENCE {
|
|||
}
|
||||
|
||||
MBSFN-Subframe-Configuration-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
|
||||
{ID id-SubframeAllocationExtended CRITICALITY reject EXTENSION SubframeAllocationExtended PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
|
@ -343,7 +346,8 @@ MCCHrelatedBCCH-ConfigPerMBSFNArea-Item-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
|
|||
-- Extension for Rel-14 to support MCCH repetition period values –-
|
||||
{ID id-Repetition-PeriodExtended CRITICALITY reject EXTENSION Repetition-PeriodExtended PRESENCE optional}|
|
||||
-- Extension for Rel-14 to support MCCH modification period values –-
|
||||
{ID id-Modification-PeriodExtended CRITICALITY reject EXTENSION Modification-PeriodExtended PRESENCE optional},
|
||||
{ID id-Modification-PeriodExtended CRITICALITY reject EXTENSION Modification-PeriodExtended PRESENCE optional}|
|
||||
{ID id-Subcarrier-SpacingMBMS CRITICALITY reject EXTENSION Subcarrier-SpacingMBMS PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
||||
|
|
@ -380,9 +384,9 @@ PMCH-Configuration ::= SEQUENCE {
|
|||
}
|
||||
|
||||
PMCH-Configuration-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
|
||||
-- Extension for Rel-12 to support 256QAM for MTCH --
|
||||
-- Extension for Rel-12 to support 256QAM for MTCH –
|
||||
{ID id-Modulation-Coding-Scheme2 CRITICALITY reject EXTENSION Modulation-Coding-Scheme2 PRESENCE optional}|
|
||||
-- Extension for Rel-12 to support shorter MCH scheduling period --
|
||||
-- Extension for Rel-12 to support shorter MCH scheduling period –
|
||||
{ID id-MCH-Scheduling-PeriodExtended CRITICALITY reject EXTENSION MCH-Scheduling-PeriodExtended PRESENCE optional}|
|
||||
-- Extension for Rel-14 to support shorter MCH scheduling period values –
|
||||
{ID id-MCH-Scheduling-PeriodExtended2 CRITICALITY reject EXTENSION MCH-Scheduling-PeriodExtended2 PRESENCE optional},
|
||||
|
|
@ -426,6 +430,20 @@ SC-PTM-Information-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
|
|||
|
||||
SFN ::= INTEGER (0..1023)
|
||||
|
||||
Subcarrier-SpacingMBMS ::= ENUMERATED {khz-7dot5, khz-1dot25, ...}
|
||||
|
||||
SubframeAllocationExtended ::= CHOICE {
|
||||
oneFrameExtension BIT STRING (SIZE(2)),
|
||||
fourFrameExtension BIT STRING (SIZE(8)),
|
||||
choice-extension ProtocolIE-Single-Container { { SubframeAllocationExtended-ExtIEs} },
|
||||
|
||||
...
|
||||
}
|
||||
|
||||
|
||||
SubframeAllocationExtended-ExtIEs M2AP-PROTOCOL-IES ::= { ...
|
||||
}
|
||||
|
||||
-- T
|
||||
|
||||
TimeToWait ::= ENUMERATED {v1s, v2s, v5s, v10s, v20s, v60s, ...}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.443 V14.0.0 (2017-03)
|
||||
-- 3GPP TS 36.443 V15.0.0 (2018-09)
|
||||
-- **************************************************************
|
||||
--
|
||||
-- PDU definitions for M2AP.
|
||||
|
|
@ -48,7 +48,7 @@ IMPORTS
|
|||
MBMSsessionsToBeSuspendedListPerPMCH-Item,
|
||||
SC-PTM-Information
|
||||
|
||||
FROM M2AP-IEs
|
||||
FROM M2AP-Ies
|
||||
|
||||
PrivateIE-Container{},
|
||||
ProtocolExtensionContainer{},
|
||||
|
|
@ -123,11 +123,11 @@ FROM M2AP-Constants;
|
|||
-- **************************************************************
|
||||
|
||||
SessionStartRequest ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{SessionStartRequest-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{SessionStartRequest-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
SessionStartRequest-IEs M2AP-PROTOCOL-IES ::= {
|
||||
SessionStartRequest-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCE-MBMS-M2AP-ID CRITICALITY reject TYPE MCE-MBMS-M2AP-ID PRESENCE mandatory}|
|
||||
{ ID id-TMGI CRITICALITY reject TYPE TMGI PRESENCE mandatory}|
|
||||
{ ID id-MBMS-Session-ID CRITICALITY ignore TYPE MBMS-Session-ID PRESENCE optional}|
|
||||
|
|
@ -145,11 +145,11 @@ SessionStartRequest-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
SessionStartResponse ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ SessionStartResponse-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ SessionStartResponse-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
SessionStartResponse-IEs M2AP-PROTOCOL-IES ::= {
|
||||
SessionStartResponse-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCE-MBMS-M2AP-ID CRITICALITY ignore TYPE MCE-MBMS-M2AP-ID PRESENCE mandatory } |
|
||||
{ ID id-ENB-MBMS-M2AP-ID CRITICALITY ignore TYPE ENB-MBMS-M2AP-ID PRESENCE mandatory } |
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
|
||||
|
|
@ -164,11 +164,11 @@ SessionStartResponse-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
SessionStartFailure ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ SessionStartFailure-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ SessionStartFailure-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
SessionStartFailure-IEs M2AP-PROTOCOL-IES ::= {
|
||||
SessionStartFailure-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCE-MBMS-M2AP-ID CRITICALITY ignore TYPE MCE-MBMS-M2AP-ID PRESENCE mandatory } |
|
||||
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory } |
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
|
||||
|
|
@ -183,11 +183,11 @@ SessionStartFailure-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
SessionStopRequest ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{SessionStopRequest-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{SessionStopRequest-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
SessionStopRequest-IEs M2AP-PROTOCOL-IES ::= {
|
||||
SessionStopRequest-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCE-MBMS-M2AP-ID CRITICALITY reject TYPE MCE-MBMS-M2AP-ID PRESENCE mandatory } |
|
||||
{ ID id-ENB-MBMS-M2AP-ID CRITICALITY reject TYPE ENB-MBMS-M2AP-ID PRESENCE mandatory } ,
|
||||
...
|
||||
|
|
@ -200,11 +200,11 @@ SessionStopRequest-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
SessionStopResponse ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ SessionStopResponse-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ SessionStopResponse-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
SessionStopResponse-IEs M2AP-PROTOCOL-IES ::= {
|
||||
SessionStopResponse-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCE-MBMS-M2AP-ID CRITICALITY ignore TYPE MCE-MBMS-M2AP-ID PRESENCE mandatory } |
|
||||
{ ID id-ENB-MBMS-M2AP-ID CRITICALITY ignore TYPE ENB-MBMS-M2AP-ID PRESENCE mandatory } |
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional } ,
|
||||
|
|
@ -218,11 +218,11 @@ SessionStopResponse-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
SessionUpdateRequest ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{SessionUpdateRequest-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{SessionUpdateRequest-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
SessionUpdateRequest-IEs M2AP-PROTOCOL-IES ::= {
|
||||
SessionUpdateRequest-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCE-MBMS-M2AP-ID CRITICALITY reject TYPE MCE-MBMS-M2AP-ID PRESENCE mandatory}|
|
||||
{ ID id-ENB-MBMS-M2AP-ID CRITICALITY reject TYPE ENB-MBMS-M2AP-ID PRESENCE mandatory}|
|
||||
{ ID id-TMGI CRITICALITY reject TYPE TMGI PRESENCE mandatory}|
|
||||
|
|
@ -240,11 +240,11 @@ SessionUpdateRequest-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
SessionUpdateResponse ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ SessionUpdateResponse-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ SessionUpdateResponse-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
SessionUpdateResponse-IEs M2AP-PROTOCOL-IES ::= {
|
||||
SessionUpdateResponse-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCE-MBMS-M2AP-ID CRITICALITY ignore TYPE MCE-MBMS-M2AP-ID PRESENCE mandatory } |
|
||||
{ ID id-ENB-MBMS-M2AP-ID CRITICALITY ignore TYPE ENB-MBMS-M2AP-ID PRESENCE mandatory } |
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
|
||||
|
|
@ -257,11 +257,11 @@ SessionUpdateResponse-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
SessionUpdateFailure ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ SessionUpdateFailure-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ SessionUpdateFailure-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
SessionUpdateFailure-IEs M2AP-PROTOCOL-IES ::= {
|
||||
SessionUpdateFailure-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCE-MBMS-M2AP-ID CRITICALITY ignore TYPE MCE-MBMS-M2AP-ID PRESENCE mandatory } |
|
||||
{ ID id-ENB-MBMS-M2AP-ID CRITICALITY ignore TYPE ENB-MBMS-M2AP-ID PRESENCE mandatory } |
|
||||
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory } |
|
||||
|
|
@ -276,11 +276,11 @@ SessionUpdateFailure-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
MbmsSchedulingInformation ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ MbmsSchedulingInformation-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ MbmsSchedulingInformation-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
MbmsSchedulingInformation-IEs M2AP-PROTOCOL-IES ::= {
|
||||
MbmsSchedulingInformation-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCCH-Update-Time CRITICALITY reject TYPE MCCH-Update-Time PRESENCE mandatory }|
|
||||
{ ID id-MBSFN-Area-Configuration-List CRITICALITY reject TYPE MBSFN-Area-Configuration-List PRESENCE mandatory },
|
||||
...
|
||||
|
|
@ -347,11 +347,11 @@ MBMS-Suspension-Notification-ItemExtIEs M2AP-PROTOCOL-EXTENSION ::= {
|
|||
-- **************************************************************
|
||||
|
||||
MbmsSchedulingInformationResponse ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ MbmsSchedulingInformationResponse-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ MbmsSchedulingInformationResponse-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
MbmsSchedulingInformationResponse-IEs M2AP-PROTOCOL-IES ::= {
|
||||
MbmsSchedulingInformationResponse-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
|
||||
...
|
||||
}
|
||||
|
|
@ -364,11 +364,11 @@ MbmsSchedulingInformationResponse-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
M2SetupRequest ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{M2SetupRequest-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{M2SetupRequest-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
M2SetupRequest-IEs M2AP-PROTOCOL-IES ::= {
|
||||
M2SetupRequest-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-GlobalENB-ID CRITICALITY reject TYPE GlobalENB-ID PRESENCE mandatory}|
|
||||
{ ID id-ENBname CRITICALITY ignore TYPE ENBname PRESENCE optional}|
|
||||
{ ID id-ENB-MBMS-Configuration-data-List CRITICALITY reject TYPE ENB-MBMS-Configuration-data-List PRESENCE mandatory},
|
||||
|
|
@ -390,11 +390,11 @@ ENB-MBMS-Configuration-data-ItemIEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
M2SetupResponse ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ M2SetupResponse-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ M2SetupResponse-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
M2SetupResponse-IEs M2AP-PROTOCOL-IES ::= {
|
||||
M2SetupResponse-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-GlobalMCE-ID CRITICALITY reject TYPE GlobalMCE-ID PRESENCE mandatory }|
|
||||
{ ID id-MCEname CRITICALITY ignore TYPE MCEname PRESENCE optional }|
|
||||
{ ID id-MCCHrelatedBCCH-ConfigPerMBSFNArea CRITICALITY reject TYPE MCCHrelatedBCCH-ConfigPerMBSFNArea PRESENCE mandatory }|
|
||||
|
|
@ -416,11 +416,11 @@ MCCHrelatedBCCH-ConfigPerMBSFNArea-ItemIEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
M2SetupFailure ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ M2SetupFailure-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ M2SetupFailure-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
M2SetupFailure-IEs M2AP-PROTOCOL-IES ::= {
|
||||
M2SetupFailure-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
|
||||
{ ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional}|
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional},
|
||||
|
|
@ -435,11 +435,11 @@ M2SetupFailure-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
ENBConfigurationUpdate ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ENBConfigurationUpdate-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ENBConfigurationUpdate-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
ENBConfigurationUpdate-IEs M2AP-PROTOCOL-IES ::= {
|
||||
ENBConfigurationUpdate-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-GlobalENB-ID CRITICALITY reject TYPE GlobalENB-ID PRESENCE optional }|
|
||||
{ ID id-ENBname CRITICALITY ignore TYPE ENBname PRESENCE optional }|
|
||||
{ ID id-ENB-MBMS-Configuration-data-List-ConfigUpdate CRITICALITY reject TYPE ENB-MBMS-Configuration-data-List-ConfigUpdate PRESENCE optional },
|
||||
|
|
@ -459,11 +459,11 @@ ENB-MBMS-Configuration-data-ConfigUpdate-ItemIEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
ENBConfigurationUpdateAcknowledge ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ ENBConfigurationUpdateAcknowledge-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ ENBConfigurationUpdateAcknowledge-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
ENBConfigurationUpdateAcknowledge-IEs M2AP-PROTOCOL-IES ::= {
|
||||
ENBConfigurationUpdateAcknowledge-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCCHrelatedBCCH-ConfigPerMBSFNArea CRITICALITY reject TYPE MCCHrelatedBCCH-ConfigPerMBSFNArea PRESENCE optional }|
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
|
||||
...
|
||||
|
|
@ -477,11 +477,11 @@ ENBConfigurationUpdateAcknowledge-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
ENBConfigurationUpdateFailure ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ ENBConfigurationUpdateFailure-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ ENBConfigurationUpdateFailure-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
ENBConfigurationUpdateFailure-IEs M2AP-PROTOCOL-IES ::= {
|
||||
ENBConfigurationUpdateFailure-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
|
||||
{ ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional}|
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional},
|
||||
|
|
@ -497,11 +497,11 @@ ENBConfigurationUpdateFailure-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
MCEConfigurationUpdate ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{MCEConfigurationUpdate-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{MCEConfigurationUpdate-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
MCEConfigurationUpdate-IEs M2AP-PROTOCOL-IES ::= {
|
||||
MCEConfigurationUpdate-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-GlobalMCE-ID CRITICALITY reject TYPE GlobalMCE-ID PRESENCE optional }|
|
||||
{ ID id-MCEname CRITICALITY ignore TYPE MCEname PRESENCE optional }|
|
||||
{ ID id-MCCHrelatedBCCH-ConfigPerMBSFNArea CRITICALITY reject TYPE MCCHrelatedBCCH-ConfigPerMBSFNArea PRESENCE optional },
|
||||
|
|
@ -515,11 +515,11 @@ MCEConfigurationUpdate-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
MCEConfigurationUpdateAcknowledge ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ MCEConfigurationUpdateAcknowledge-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ MCEConfigurationUpdateAcknowledge-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
MCEConfigurationUpdateAcknowledge-IEs M2AP-PROTOCOL-IES ::= {
|
||||
MCEConfigurationUpdateAcknowledge-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional},
|
||||
...
|
||||
}
|
||||
|
|
@ -532,11 +532,11 @@ MCEConfigurationUpdateAcknowledge-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
MCEConfigurationUpdateFailure ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ MCEConfigurationUpdateFailure-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ MCEConfigurationUpdateFailure-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
MCEConfigurationUpdateFailure-IEs M2AP-PROTOCOL-IES ::= {
|
||||
MCEConfigurationUpdateFailure-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
|
||||
{ ID id-TimeToWait CRITICALITY ignore TYPE TimeToWait PRESENCE optional}|
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional},
|
||||
|
|
@ -552,11 +552,11 @@ MCEConfigurationUpdateFailure-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
ErrorIndication ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ErrorIndication-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ErrorIndication-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
ErrorIndication-IEs M2AP-PROTOCOL-IES ::= {
|
||||
ErrorIndication-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCE-MBMS-M2AP-ID CRITICALITY ignore TYPE MCE-MBMS-M2AP-ID PRESENCE optional}|
|
||||
{ ID id-ENB-MBMS-M2AP-ID CRITICALITY ignore TYPE ENB-MBMS-M2AP-ID PRESENCE optional}|
|
||||
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE optional}|
|
||||
|
|
@ -571,11 +571,11 @@ ErrorIndication-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
Reset ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{Reset-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{Reset-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
Reset-IEs M2AP-PROTOCOL-IES ::= {
|
||||
Reset-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
|
||||
{ ID id-ResetType CRITICALITY reject TYPE ResetType PRESENCE mandatory},
|
||||
...
|
||||
|
|
@ -606,11 +606,11 @@ MBMS-Service-associatedLogicalM2-ConnectionItemRes M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
ResetAcknowledge ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ResetAcknowledge-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ResetAcknowledge-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
ResetAcknowledge-IEs M2AP-PROTOCOL-IES ::= {
|
||||
ResetAcknowledge-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MBMS-Service-associatedLogicalM2-ConnectionListResAck CRITICALITY ignore TYPE MBMS-Service-associatedLogicalM2-ConnectionListResAck PRESENCE optional}|
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional},
|
||||
...
|
||||
|
|
@ -631,11 +631,11 @@ MBMS-Service-associatedLogicalM2-ConnectionItemResAck M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
PrivateMessage ::= SEQUENCE {
|
||||
privateIEs PrivateIE-Container {{PrivateMessage-IEs}},
|
||||
privateIEs PrivateIE-Container {{PrivateMessage-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
PrivateMessage-IEs M2AP-PRIVATE-IES ::= {
|
||||
PrivateMessage-Ies M2AP-PRIVATE-IES ::= {
|
||||
...
|
||||
}
|
||||
|
||||
|
|
@ -647,11 +647,11 @@ PrivateMessage-IEs M2AP-PRIVATE-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
MbmsServiceCountingRequest ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{MbmsServiceCountingRequest-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{MbmsServiceCountingRequest-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
MbmsServiceCountingRequest-IEs M2AP-PROTOCOL-IES ::= {
|
||||
MbmsServiceCountingRequest-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MCCH-Update-Time CRITICALITY reject TYPE MCCH-Update-Time PRESENCE mandatory }|
|
||||
{ ID id-MBSFN-Area-ID CRITICALITY reject TYPE MBSFN-Area-ID PRESENCE mandatory }|
|
||||
{ ID id-MBMS-Counting-Request-Session CRITICALITY reject TYPE MBMS-Counting-Request-Session PRESENCE mandatory },
|
||||
|
|
@ -682,11 +682,11 @@ MBMS-Counting-Request-SessionIE-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
|
|||
-- **************************************************************
|
||||
|
||||
MbmsServiceCountingResponse ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{MbmsServiceCountingResponse-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{MbmsServiceCountingResponse-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
MbmsServiceCountingResponse-IEs M2AP-PROTOCOL-IES ::= {
|
||||
MbmsServiceCountingResponse-Ies M2AP-PROTOCOL-IES ::= {
|
||||
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
|
||||
...
|
||||
|
|
@ -700,11 +700,11 @@ MbmsServiceCountingResponse-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
MbmsServiceCountingFailure ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ MbmsServiceCountingFailure-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ MbmsServiceCountingFailure-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
MbmsServiceCountingFailure-IEs M2AP-PROTOCOL-IES ::= {
|
||||
MbmsServiceCountingFailure-Ies M2AP-PROTOCOL-IES ::= {
|
||||
|
||||
{ ID id-Cause CRITICALITY ignore TYPE Cause PRESENCE mandatory}|
|
||||
{ ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional},
|
||||
|
|
@ -719,11 +719,11 @@ MbmsServiceCountingFailure-IEs M2AP-PROTOCOL-IES ::= {
|
|||
-- **************************************************************
|
||||
|
||||
MbmsServiceCountingResultsReport ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ MbmsServiceCountingResultsReport-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ MbmsServiceCountingResultsReport-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
MbmsServiceCountingResultsReport-IEs M2AP-PROTOCOL-IES ::= {
|
||||
MbmsServiceCountingResultsReport-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MBSFN-Area-ID CRITICALITY reject TYPE MBSFN-Area-ID PRESENCE mandatory}|
|
||||
{ ID id-MBMS-Counting-Result-List CRITICALITY reject TYPE MBMS-Counting-Result-List PRESENCE mandatory},
|
||||
...
|
||||
|
|
@ -756,11 +756,11 @@ CountingResult ::= INTEGER (0..1023)
|
|||
-- **************************************************************
|
||||
|
||||
MbmsOverloadNotification ::= SEQUENCE {
|
||||
protocolIEs ProtocolIE-Container {{ MbmsOverloadNotification-IEs}},
|
||||
protocolIEs ProtocolIE-Container {{ MbmsOverloadNotification-Ies}},
|
||||
...
|
||||
}
|
||||
|
||||
MbmsOverloadNotification-IEs M2AP-PROTOCOL-IES ::= {
|
||||
MbmsOverloadNotification-Ies M2AP-PROTOCOL-IES ::= {
|
||||
{ ID id-MBSFN-Area-ID CRITICALITY reject TYPE MBSFN-Area-ID PRESENCE mandatory}|
|
||||
{ ID id-Overload-Status-Per-PMCH-List CRITICALITY reject TYPE Overload-Status-Per-PMCH-List PRESENCE mandatory},
|
||||
...
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
-- 3GPP TS 36.443 V14.0.0 (2017-03)
|
||||
-- 3GPP TS 36.443 V15.0.0 (2018-09)
|
||||
-- **************************************************************
|
||||
--
|
||||
-- Elementary Procedure definitions
|
||||
|
|
@ -6,10 +6,10 @@
|
|||
-- **************************************************************
|
||||
|
||||
M2AP-PDU-Descriptions {
|
||||
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
|
||||
itu-t (0) identified-organization (4) etsi (0) mobileDomain (0)
|
||||
eps-Access (21) modules (3) m2ap (4) version1 (1) m2ap-PDU-Descriptions (0) }
|
||||
|
||||
DEFINITIONS AUTOMATIC TAGS ::=
|
||||
DEFINITIONS AUTOMATIC TAGS ::=
|
||||
|
||||
BEGIN
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ FROM M2AP-CommonDataTypes
|
|||
SessionStartResponse,
|
||||
SessionStartFailure,
|
||||
SessionStopRequest,
|
||||
SessionStopResponse,
|
||||
SessionStopResponse,
|
||||
SessionUpdateRequest,
|
||||
SessionUpdateResponse,
|
||||
SessionUpdateFailure,
|
||||
|
|
@ -56,7 +56,7 @@ FROM M2AP-CommonDataTypes
|
|||
FROM M2AP-PDU-Contents
|
||||
|
||||
id-sessionStart,
|
||||
id-sessionStop,
|
||||
id-sessionStop,
|
||||
id-sessionUpdate,
|
||||
id-mbmsServiceCounting,
|
||||
id-mbmsServiceCountingResultsReport,
|
||||
|
|
|
|||
|
|
@ -219,6 +219,8 @@ id-SC-PTM-Information ProtocolIE-ID
|
|||
id-Modification-PeriodExtended ProtocolIE-ID
|
||||
id-Repetition-PeriodExtended ProtocolIE-ID
|
||||
id-MCH-Scheduling-PeriodExtended2 ProtocolIE-ID
|
||||
id-Subcarrier-SpacingMBMS ProtocolIE-ID
|
||||
id-SubframeAllocationExtended ProtocolIE-ID
|
||||
|
||||
#.REGISTER
|
||||
|
||||
|
|
@ -271,6 +273,8 @@ MCH-Scheduling-PeriodExtended N m2ap.extension id-MCH-Sc
|
|||
Repetition-PeriodExtended N m2ap.extension id-Repetition-PeriodExtended
|
||||
Modification-PeriodExtended N m2ap.extension id-Modification-PeriodExtended
|
||||
MCH-Scheduling-PeriodExtended2 N m2ap.extension id-MCH-Scheduling-PeriodExtended2
|
||||
SubframeAllocationExtended N m2ap.extension id-SubframeAllocationExtended
|
||||
Subcarrier-SpacingMBMS N m2ap.extension id-Subcarrier-SpacingMBMS
|
||||
|
||||
#M2AP-ELEMENTARY-PROCEDURE
|
||||
SessionStartRequest N m2ap.proc.imsg id-sessionStart
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Reference: 3GPP TS 36.443 v14.0.0
|
||||
* Reference: 3GPP TS 36.443 v15.0.0
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Reference: 3GPP TS 36.443 v14.0.0
|
||||
* Reference: 3GPP TS 36.443 v15.0.0
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
@ -118,7 +118,9 @@ typedef enum _ProtocolIE_ID_enum {
|
|||
id_SC_PTM_Information = 45,
|
||||
id_Modification_PeriodExtended = 46,
|
||||
id_Repetition_PeriodExtended = 47,
|
||||
id_MCH_Scheduling_PeriodExtended2 = 48
|
||||
id_MCH_Scheduling_PeriodExtended2 = 48,
|
||||
id_Subcarrier_SpacingMBMS = 49,
|
||||
id_SubframeAllocationExtended = 50
|
||||
} ProtocolIE_ID_enum;
|
||||
|
||||
/*--- End of included file: packet-m2ap-val.h ---*/
|
||||
|
|
@ -156,6 +158,8 @@ static int hf_m2ap_Modification_PeriodExtended_PDU = -1; /* Modification_Period
|
|||
static int hf_m2ap_Common_Subframe_Allocation_Period_PDU = -1; /* Common_Subframe_Allocation_Period */
|
||||
static int hf_m2ap_Repetition_PeriodExtended_PDU = -1; /* Repetition_PeriodExtended */
|
||||
static int hf_m2ap_SC_PTM_Information_PDU = -1; /* SC_PTM_Information */
|
||||
static int hf_m2ap_Subcarrier_SpacingMBMS_PDU = -1; /* Subcarrier_SpacingMBMS */
|
||||
static int hf_m2ap_SubframeAllocationExtended_PDU = -1; /* SubframeAllocationExtended */
|
||||
static int hf_m2ap_TimeToWait_PDU = -1; /* TimeToWait */
|
||||
static int hf_m2ap_TMGI_PDU = -1; /* TMGI */
|
||||
static int hf_m2ap_TNL_Information_PDU = -1; /* TNL_Information */
|
||||
|
|
@ -279,6 +283,9 @@ static int hf_m2ap_dataMCS = -1; /* INTEGER_0_28 */
|
|||
static int hf_m2ap_mchSchedulingPeriod = -1; /* MCH_Scheduling_Period */
|
||||
static int hf_m2ap_mbmsCellList = -1; /* MBMS_Cell_List */
|
||||
static int hf_m2ap_mbms_E_RAB_QoS_Parameters = -1; /* MBMS_E_RAB_QoS_Parameters */
|
||||
static int hf_m2ap_oneFrameExtension = -1; /* BIT_STRING_SIZE_2 */
|
||||
static int hf_m2ap_fourFrameExtension = -1; /* BIT_STRING_SIZE_8 */
|
||||
static int hf_m2ap_choice_extension = -1; /* ProtocolIE_Single_Container */
|
||||
static int hf_m2ap_pLMNidentity = -1; /* PLMN_Identity */
|
||||
static int hf_m2ap_serviceID = -1; /* OCTET_STRING_SIZE_3 */
|
||||
static int hf_m2ap_iPMCAddress = -1; /* IPAddress */
|
||||
|
|
@ -357,6 +364,7 @@ static gint ett_m2ap_T_subframeAllocation = -1;
|
|||
static gint ett_m2ap_MCCHrelatedBCCH_ConfigPerMBSFNArea_Item = -1;
|
||||
static gint ett_m2ap_PMCH_Configuration = -1;
|
||||
static gint ett_m2ap_SC_PTM_Information = -1;
|
||||
static gint ett_m2ap_SubframeAllocationExtended = -1;
|
||||
static gint ett_m2ap_TMGI = -1;
|
||||
static gint ett_m2ap_TNL_Information = -1;
|
||||
static gint ett_m2ap_SessionStartRequest = -1;
|
||||
|
|
@ -578,6 +586,8 @@ static const value_string m2ap_ProtocolIE_ID_vals[] = {
|
|||
{ id_Modification_PeriodExtended, "id-Modification-PeriodExtended" },
|
||||
{ id_Repetition_PeriodExtended, "id-Repetition-PeriodExtended" },
|
||||
{ id_MCH_Scheduling_PeriodExtended2, "id-MCH-Scheduling-PeriodExtended2" },
|
||||
{ id_Subcarrier_SpacingMBMS, "id-Subcarrier-SpacingMBMS" },
|
||||
{ id_SubframeAllocationExtended, "id-SubframeAllocationExtended" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
|
@ -1918,6 +1928,66 @@ dissect_m2ap_SFN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_
|
|||
}
|
||||
|
||||
|
||||
static const value_string m2ap_Subcarrier_SpacingMBMS_vals[] = {
|
||||
{ 0, "khz-7dot5" },
|
||||
{ 1, "khz-1dot25" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
static int
|
||||
dissect_m2ap_Subcarrier_SpacingMBMS(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
|
||||
2, NULL, TRUE, 0, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_m2ap_BIT_STRING_SIZE_2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
|
||||
2, 2, FALSE, NULL, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_m2ap_BIT_STRING_SIZE_8(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
|
||||
8, 8, FALSE, NULL, NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const value_string m2ap_SubframeAllocationExtended_vals[] = {
|
||||
{ 0, "oneFrameExtension" },
|
||||
{ 1, "fourFrameExtension" },
|
||||
{ 2, "choice-extension" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const per_choice_t SubframeAllocationExtended_choice[] = {
|
||||
{ 0, &hf_m2ap_oneFrameExtension, ASN1_EXTENSION_ROOT , dissect_m2ap_BIT_STRING_SIZE_2 },
|
||||
{ 1, &hf_m2ap_fourFrameExtension, ASN1_EXTENSION_ROOT , dissect_m2ap_BIT_STRING_SIZE_8 },
|
||||
{ 2, &hf_m2ap_choice_extension, ASN1_EXTENSION_ROOT , dissect_m2ap_ProtocolIE_Single_Container },
|
||||
{ 0, NULL, 0, NULL }
|
||||
};
|
||||
|
||||
static int
|
||||
dissect_m2ap_SubframeAllocationExtended(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
|
||||
offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
|
||||
ett_m2ap_SubframeAllocationExtended, SubframeAllocationExtended_choice,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
static const value_string m2ap_TimeToWait_vals[] = {
|
||||
{ 0, "v1s" },
|
||||
{ 1, "v2s" },
|
||||
|
|
@ -3044,6 +3114,22 @@ static int dissect_SC_PTM_Information_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
|
|||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_Subcarrier_SpacingMBMS_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
|
||||
offset = dissect_m2ap_Subcarrier_SpacingMBMS(tvb, offset, &asn1_ctx, tree, hf_m2ap_Subcarrier_SpacingMBMS_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_SubframeAllocationExtended_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
|
||||
offset = dissect_m2ap_SubframeAllocationExtended(tvb, offset, &asn1_ctx, tree, hf_m2ap_SubframeAllocationExtended_PDU);
|
||||
offset += 7; offset >>= 3;
|
||||
return offset;
|
||||
}
|
||||
static int dissect_TimeToWait_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
|
||||
int offset = 0;
|
||||
asn1_ctx_t asn1_ctx;
|
||||
|
|
@ -3613,6 +3699,14 @@ proto_register_m2ap(void) {
|
|||
{ "SC-PTM-Information", "m2ap.SC_PTM_Information_element",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_m2ap_Subcarrier_SpacingMBMS_PDU,
|
||||
{ "Subcarrier-SpacingMBMS", "m2ap.Subcarrier_SpacingMBMS",
|
||||
FT_UINT32, BASE_DEC, VALS(m2ap_Subcarrier_SpacingMBMS_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_m2ap_SubframeAllocationExtended_PDU,
|
||||
{ "SubframeAllocationExtended", "m2ap.SubframeAllocationExtended",
|
||||
FT_UINT32, BASE_DEC, VALS(m2ap_SubframeAllocationExtended_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_m2ap_TimeToWait_PDU,
|
||||
{ "TimeToWait", "m2ap.TimeToWait",
|
||||
FT_UINT32, BASE_DEC, VALS(m2ap_TimeToWait_vals), 0,
|
||||
|
|
@ -4105,6 +4199,18 @@ proto_register_m2ap(void) {
|
|||
{ "mbms-E-RAB-QoS-Parameters", "m2ap.mbms_E_RAB_QoS_Parameters_element",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_m2ap_oneFrameExtension,
|
||||
{ "oneFrameExtension", "m2ap.oneFrameExtension",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"BIT_STRING_SIZE_2", HFILL }},
|
||||
{ &hf_m2ap_fourFrameExtension,
|
||||
{ "fourFrameExtension", "m2ap.fourFrameExtension",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
"BIT_STRING_SIZE_8", HFILL }},
|
||||
{ &hf_m2ap_choice_extension,
|
||||
{ "choice-extension", "m2ap.choice_extension_element",
|
||||
FT_NONE, BASE_NONE, NULL, 0,
|
||||
"ProtocolIE_Single_Container", HFILL }},
|
||||
{ &hf_m2ap_pLMNidentity,
|
||||
{ "pLMNidentity", "m2ap.pLMNidentity",
|
||||
FT_BYTES, BASE_NONE, NULL, 0,
|
||||
|
|
@ -4284,6 +4390,7 @@ proto_register_m2ap(void) {
|
|||
&ett_m2ap_MCCHrelatedBCCH_ConfigPerMBSFNArea_Item,
|
||||
&ett_m2ap_PMCH_Configuration,
|
||||
&ett_m2ap_SC_PTM_Information,
|
||||
&ett_m2ap_SubframeAllocationExtended,
|
||||
&ett_m2ap_TMGI,
|
||||
&ett_m2ap_TNL_Information,
|
||||
&ett_m2ap_SessionStartRequest,
|
||||
|
|
@ -4419,6 +4526,8 @@ proto_reg_handoff_m2ap(void)
|
|||
dissector_add_uint("m2ap.extension", id_Repetition_PeriodExtended, create_dissector_handle(dissect_Repetition_PeriodExtended_PDU, proto_m2ap));
|
||||
dissector_add_uint("m2ap.extension", id_Modification_PeriodExtended, create_dissector_handle(dissect_Modification_PeriodExtended_PDU, proto_m2ap));
|
||||
dissector_add_uint("m2ap.extension", id_MCH_Scheduling_PeriodExtended2, create_dissector_handle(dissect_MCH_Scheduling_PeriodExtended2_PDU, proto_m2ap));
|
||||
dissector_add_uint("m2ap.extension", id_SubframeAllocationExtended, create_dissector_handle(dissect_SubframeAllocationExtended_PDU, proto_m2ap));
|
||||
dissector_add_uint("m2ap.extension", id_Subcarrier_SpacingMBMS, create_dissector_handle(dissect_Subcarrier_SpacingMBMS_PDU, proto_m2ap));
|
||||
dissector_add_uint("m2ap.proc.imsg", id_sessionStart, create_dissector_handle(dissect_SessionStartRequest_PDU, proto_m2ap));
|
||||
dissector_add_uint("m2ap.proc.sout", id_sessionStart, create_dissector_handle(dissect_SessionStartResponse_PDU, proto_m2ap));
|
||||
dissector_add_uint("m2ap.proc.uout", id_sessionStart, create_dissector_handle(dissect_SessionStartFailure_PDU, proto_m2ap));
|
||||
|
|
|
|||
Loading…
Reference in New Issue