aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1/m2ap
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/asn1/m2ap')
-rw-r--r--epan/dissectors/asn1/m2ap/M2AP-CommonDataTypes.asn6
-rw-r--r--epan/dissectors/asn1/m2ap/M2AP-Constants.asn14
-rw-r--r--epan/dissectors/asn1/m2ap/M2AP-Containers.asn2
-rw-r--r--epan/dissectors/asn1/m2ap/M2AP-IEs.asn52
-rw-r--r--epan/dissectors/asn1/m2ap/M2AP-PDU-Contents.asn21
-rw-r--r--epan/dissectors/asn1/m2ap/M2AP-PDU-Descriptions.asn10
-rw-r--r--epan/dissectors/asn1/m2ap/m2ap.cnf8
-rw-r--r--epan/dissectors/asn1/m2ap/packet-m2ap-template.c18
8 files changed, 102 insertions, 29 deletions
diff --git a/epan/dissectors/asn1/m2ap/M2AP-CommonDataTypes.asn b/epan/dissectors/asn1/m2ap/M2AP-CommonDataTypes.asn
index a8ccf4e640..25f239bc59 100644
--- a/epan/dissectors/asn1/m2ap/M2AP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/m2ap/M2AP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.443 V15.0.0 (2018-09)
+-- 3GPP TS 36.443 V17.0.1 (2022-04)
-- **************************************************************
--
-- 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
diff --git a/epan/dissectors/asn1/m2ap/M2AP-Constants.asn b/epan/dissectors/asn1/m2ap/M2AP-Constants.asn
index a38cb9df89..a13990cccc 100644
--- a/epan/dissectors/asn1/m2ap/M2AP-Constants.asn
+++ b/epan/dissectors/asn1/m2ap/M2AP-Constants.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.443 V15.0.0 (2018-09)
+-- 3GPP TS 36.443 V17.0.1 (2022-04)
-- **************************************************************
--
-- 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
@@ -110,5 +110,9 @@ id-Repetition-PeriodExtended ProtocolIE-ID ::= 47
id-MCH-Scheduling-PeriodExtended2 ProtocolIE-ID ::= 48
id-Subcarrier-SpacingMBMS ProtocolIE-ID ::= 49
id-SubframeAllocationExtended ProtocolIE-ID ::= 50
+id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item ProtocolIE-ID ::= 51
+id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea ProtocolIE-ID ::= 52
+id-SubframeAllocationFurtherExtension ProtocolIE-ID ::= 53
+id-AdditionalConfigParameters ProtocolIE-ID ::= 54
END
diff --git a/epan/dissectors/asn1/m2ap/M2AP-Containers.asn b/epan/dissectors/asn1/m2ap/M2AP-Containers.asn
index 7c7740654a..1be565830e 100644
--- a/epan/dissectors/asn1/m2ap/M2AP-Containers.asn
+++ b/epan/dissectors/asn1/m2ap/M2AP-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.443 V15.0.0 (2018-09)
+-- 3GPP TS 36.443 V17.0.1 (2022-04)
-- **************************************************************
--
-- Container definitions
diff --git a/epan/dissectors/asn1/m2ap/M2AP-IEs.asn b/epan/dissectors/asn1/m2ap/M2AP-IEs.asn
index 85f25047c3..0996c14f8b 100644
--- a/epan/dissectors/asn1/m2ap/M2AP-IEs.asn
+++ b/epan/dissectors/asn1/m2ap/M2AP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.443 V15.0.0 (2018-09)
+-- 3GPP TS 36.443 V17.0.1 (2022-04)
-- **************************************************************
--
-- Information Element Definitions
@@ -21,6 +21,8 @@ IMPORTS
id-Repetition-PeriodExtended,
id-Subcarrier-SpacingMBMS,
id-SubframeAllocationExtended,
+ id-SubframeAllocationFurtherExtension,
+ id-AdditionalConfigParameters,
maxnoofMBSFNareas,
maxnoofPMCHsperMBSFNarea,
maxnoofCells,
@@ -45,6 +47,16 @@ FROM M2AP-Containers;
-- A
+AdditionalConfigParameters ::= SEQUENCE {
+ pmch-Bandwidth PMCH-Bandwidth,
+ iE-Extensions ProtocolExtensionContainer { {AdditionalConfigParameters-ExtIEs} } OPTIONAL
+}
+
+AdditionalConfigParameters-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
+ ...
+}
+
+
AllocatedSubframesEnd ::= INTEGER (0..1535)
AllocationAndRetentionPriority ::= SEQUENCE {
@@ -323,7 +335,8 @@ MBSFN-Subframe-Configuration ::= SEQUENCE {
}
MBSFN-Subframe-Configuration-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
- {ID id-SubframeAllocationExtended CRITICALITY reject EXTENSION SubframeAllocationExtended PRESENCE optional},
+ {ID id-SubframeAllocationExtended CRITICALITY reject EXTENSION SubframeAllocationExtended PRESENCE optional}|
+ {ID id-SubframeAllocationFurtherExtension CRITICALITY reject EXTENSION SubframeAllocationFurtherExtension PRESENCE optional},
...
}
@@ -351,6 +364,26 @@ MCCHrelatedBCCH-ConfigPerMBSFNArea-Item-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
...
}
+MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item ::= SEQUENCE {
+ mbsfnArea MBSFN-Area-ID,
+ repetitionPeriodExpanded ENUMERATED {rf1, rf2, rf4, rf8, rf16, rf32, rf64, rf128, rf256, ...},
+ offset INTEGER (0..10),
+ modificationPeriodExpanded ENUMERATED {rf1, rf2, rf4, rf8, rf16, rf32, rf64, rf128, rf256, rf512, rf1024, ...},
+ subframeAllocationInfoExpanded BIT STRING (SIZE(10)),
+ modulationAndCodingScheme ENUMERATED {n2, n7, n13, n19},
+ subcarrier-SpacingMBMSExpanded ENUMERATED {khz-7dot5, khz-2dot5, khz-1dot25, khz-0dot37, ..., kHz-15},
+ timeSeparation ENUMERATED {sl2, sl4, ...} OPTIONAL,
+ cellInformationList Cell-Information-List OPTIONAL,
+ iE-Extensions ProtocolExtensionContainer { { MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item-ExtIEs} } OPTIONAL,
+ ...
+}
+
+MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
+ -- Extension for Rel-17 to support PMCH Bandwidth values –-
+ {ID id-AdditionalConfigParameters CRITICALITY reject EXTENSION AdditionalConfigParameters PRESENCE optional},
+ ...
+}
+
MCE-ID ::= OCTET STRING (SIZE(2))
MCE-MBMS-M2AP-ID ::= INTEGER (0.. 16777215)
@@ -375,6 +408,8 @@ Modification-PeriodExtended ::= ENUMERATED {rf1, rf2, rf4, rf8, rf16, rf32, rf64
PLMN-Identity ::= OCTET STRING (SIZE(3))
+PMCH-Bandwidth ::= ENUMERATED {n40, n35, n30, ...}
+
PMCH-Configuration ::= SEQUENCE {
allocatedSubframesEnd AllocatedSubframesEnd,
dataMCS INTEGER (0..28),
@@ -444,6 +479,19 @@ SubframeAllocationExtended ::= CHOICE {
SubframeAllocationExtended-ExtIEs M2AP-PROTOCOL-IES ::= { ...
}
+SubframeAllocationFurtherExtension ::= CHOICE {
+ oneFrameFurtherExtension BIT STRING (SIZE(2)),
+ fourFrameFurtherExtension BIT STRING (SIZE(8)),
+ choice-extension ProtocolIE-Single-Container { { SubframeAllocationFurtherExtension-ExtIEs} },
+
+ ...
+}
+
+
+SubframeAllocationFurtherExtension-ExtIEs M2AP-PROTOCOL-IES ::= { ...
+}
+
+
-- T
TimeToWait ::= ENUMERATED {v1s, v2s, v5s, v10s, v20s, v60s, ...}
diff --git a/epan/dissectors/asn1/m2ap/M2AP-PDU-Contents.asn b/epan/dissectors/asn1/m2ap/M2AP-PDU-Contents.asn
index 7884b01034..05b5598797 100644
--- a/epan/dissectors/asn1/m2ap/M2AP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/m2ap/M2AP-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.443 V15.0.0 (2018-09)
+-- 3GPP TS 36.443 V17.0.1 (2022-04)
-- **************************************************************
--
-- PDU definitions for M2AP.
@@ -37,6 +37,7 @@ IMPORTS
MBSFN-Subframe-Configuration,
MCCH-Update-Time,
MCCHrelatedBCCH-ConfigPerMBSFNArea-Item,
+ MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item,
MCE-MBMS-M2AP-ID,
MCEname,
PMCH-Configuration,
@@ -87,6 +88,8 @@ FROM M2AP-Containers
id-MCEname,
id-MCCHrelatedBCCH-ConfigPerMBSFNArea,
id-MCCHrelatedBCCH-ConfigPerMBSFNArea-Item,
+ id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea,
+ id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item,
id-TimeToWait,
id-ENB-MBMS-Configuration-data-List-ConfigUpdate,
id-ENB-MBMS-Configuration-data-ConfigUpdate-Item,
@@ -398,7 +401,8 @@ 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 }|
- { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional },
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
+ { ID id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea CRITICALITY reject TYPE MCCHrelatedBCCH-ExtConfigPerMBSFNArea PRESENCE optional },
...
}
@@ -409,6 +413,13 @@ MCCHrelatedBCCH-ConfigPerMBSFNArea-ItemIEs M2AP-PROTOCOL-IES ::= {
...
}
+MCCHrelatedBCCH-ExtConfigPerMBSFNArea ::= SEQUENCE (SIZE(1.. maxnoofMBSFNareas)) OF ProtocolIE-Single-Container { { MCCHrelatedBCCH-ExtConfigPerMBSFNArea-ItemIEs } }
+
+MCCHrelatedBCCH-ExtConfigPerMBSFNArea-ItemIEs M2AP-PROTOCOL-IES ::= {
+ { ID id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item CRITICALITY reject TYPE MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item PRESENCE mandatory },
+ ...
+}
+
-- **************************************************************
--
-- M2 SETUP FAILURE
@@ -465,7 +476,8 @@ ENBConfigurationUpdateAcknowledge ::= SEQUENCE {
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 },
+ { ID id-CriticalityDiagnostics CRITICALITY ignore TYPE CriticalityDiagnostics PRESENCE optional }|
+ { ID id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea CRITICALITY reject TYPE MCCHrelatedBCCH-ExtConfigPerMBSFNArea PRESENCE optional },
...
}
@@ -504,7 +516,8 @@ MCEConfigurationUpdate ::= SEQUENCE {
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 },
+ { ID id-MCCHrelatedBCCH-ConfigPerMBSFNArea CRITICALITY reject TYPE MCCHrelatedBCCH-ConfigPerMBSFNArea PRESENCE optional }|
+ { ID id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea CRITICALITY reject TYPE MCCHrelatedBCCH-ExtConfigPerMBSFNArea PRESENCE optional },
...
}
diff --git a/epan/dissectors/asn1/m2ap/M2AP-PDU-Descriptions.asn b/epan/dissectors/asn1/m2ap/M2AP-PDU-Descriptions.asn
index f6c623caec..4cc9a50801 100644
--- a/epan/dissectors/asn1/m2ap/M2AP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/m2ap/M2AP-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.443 V15.0.0 (2018-09)
+-- 3GPP TS 36.443 V17.0.1 (2022-04)
-- **************************************************************
--
-- 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,
diff --git a/epan/dissectors/asn1/m2ap/m2ap.cnf b/epan/dissectors/asn1/m2ap/m2ap.cnf
index 76cc88dd16..f95a13576d 100644
--- a/epan/dissectors/asn1/m2ap/m2ap.cnf
+++ b/epan/dissectors/asn1/m2ap/m2ap.cnf
@@ -229,6 +229,10 @@ id-Repetition-PeriodExtended ProtocolIE-ID
id-MCH-Scheduling-PeriodExtended2 ProtocolIE-ID
id-Subcarrier-SpacingMBMS ProtocolIE-ID
id-SubframeAllocationExtended ProtocolIE-ID
+id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item ProtocolIE-ID
+id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea ProtocolIE-ID
+id-SubframeAllocationFurtherExtension ProtocolIE-ID
+id-AdditionalConfigParameters ProtocolIE-ID
#.REGISTER
@@ -274,6 +278,8 @@ Active-MBMS-Session-List N m2ap.ies id-Active-MBMS-
MBMS-Suspension-Notification-List N m2ap.ies id-MBMS-Suspension-Notification-List
MBMS-Suspension-Notification-Item N m2ap.ies id-MBMS-Suspension-Notification-Item
SC-PTM-Information N m2ap.ies id-SC-PTM-Information
+MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item N m2ap.ies id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea-Item
+MCCHrelatedBCCH-ExtConfigPerMBSFNArea N m2ap.ies id-MCCHrelatedBCCH-ExtConfigPerMBSFNArea
#M2AP-PROTOCOL-EXTENSION
Modulation-Coding-Scheme2 N m2ap.extension id-Modulation-Coding-Scheme2
@@ -283,6 +289,8 @@ Modification-PeriodExtended N m2ap.extension id-Modifi
MCH-Scheduling-PeriodExtended2 N m2ap.extension id-MCH-Scheduling-PeriodExtended2
SubframeAllocationExtended N m2ap.extension id-SubframeAllocationExtended
Subcarrier-SpacingMBMS N m2ap.extension id-Subcarrier-SpacingMBMS
+SubframeAllocationFurtherExtension N m2ap.extension id-SubframeAllocationFurtherExtension
+AdditionalConfigParameters N m2ap.extension id-AdditionalConfigParameters
#M2AP-ELEMENTARY-PROCEDURE
SessionStartRequest N m2ap.proc.imsg id-sessionStart
diff --git a/epan/dissectors/asn1/m2ap/packet-m2ap-template.c b/epan/dissectors/asn1/m2ap/packet-m2ap-template.c
index bad77e2534..82cf49e2d1 100644
--- a/epan/dissectors/asn1/m2ap/packet-m2ap-template.c
+++ b/epan/dissectors/asn1/m2ap/packet-m2ap-template.c
@@ -1,6 +1,6 @@
/* packet-m2ap.c
* Routines for M2 Application Protocol packet dissection
- * Copyright 2016, Pascal Quantin <pascal@wireshark.org>
+ * Copyright 2016-2023, Pascal Quantin <pascal@wireshark.org>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
- * Reference: 3GPP TS 36.443 v15.0.0
+ * Reference: 3GPP TS 36.443 v17.0.1
*/
#include "config.h"
@@ -35,19 +35,19 @@ void proto_reg_handoff_m2ap(void);
#include "packet-m2ap-val.h"
/* Initialize the protocol and registered fields */
-static int proto_m2ap = -1;
+static int proto_m2ap;
-static int hf_m2ap_IPAddress_v4 = -1;
-static int hf_m2ap_IPAddress_v6 = -1;
+static int hf_m2ap_IPAddress_v4;
+static int hf_m2ap_IPAddress_v6;
#include "packet-m2ap-hf.c"
/* Initialize the subtree pointers */
-static int ett_m2ap = -1;
-static int ett_m2ap_PLMN_Identity = -1;
-static int ett_m2ap_IPAddress = -1;
+static int ett_m2ap;
+static int ett_m2ap_PLMN_Identity;
+static int ett_m2ap_IPAddress;
#include "packet-m2ap-ett.c"
-static expert_field ei_m2ap_invalid_ip_address_len = EI_INIT;
+static expert_field ei_m2ap_invalid_ip_address_len;
struct m2ap_private_data {
e212_number_type_t number_type;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 23:14:43 +0000