M2AP: upgrade dissector to v14.0.0

Change-Id: If564a2cffead403dd3d06c1a031b8985fcde7e4b
Reviewed-on: https://code.wireshark.org/review/22603
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

8 files changed, 37 insertions, 9 deletions

diff --git a/epan/dissectors/asn1/m2ap/M2AP-CommonDataTypes.asn b/epan/dissectors/asn1/m2ap/M2AP-CommonDataTypes.asn
index 8fe29280db..0cf53f5b44 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 V13.3.0 (2016-03)
+-- 3GPP TS 36.443 V14.0.0 (2017-03)
 -- **************************************************************
 --
 -- Common definitions
diff --git a/epan/dissectors/asn1/m2ap/M2AP-Constants.asn b/epan/dissectors/asn1/m2ap/M2AP-Constants.asn
index b2a1d793ea..eaa5f3538b 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 V13.3.0 (2016-03)
+-- 3GPP TS 36.443 V14.0.0 (2017-03)
 -- **************************************************************
 --
 -- Constant definitions
@@ -105,5 +105,8 @@ id-Active-MBMS-Session-List													ProtocolIE-ID ::= 42
 id-MBMS-Suspension-Notification-List 										ProtocolIE-ID ::= 43
 id-MBMS-Suspension-Notification-Item										ProtocolIE-ID ::= 44
 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
 
 END
diff --git a/epan/dissectors/asn1/m2ap/M2AP-Containers.asn b/epan/dissectors/asn1/m2ap/M2AP-Containers.asn
index 2097ff6df1..9d950788e0 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 V13.3.0 (2016-03)
+-- 3GPP TS 36.443 V14.0.0 (2017-03)
 -- **************************************************************
 --
 -- Container definitions
diff --git a/epan/dissectors/asn1/m2ap/M2AP-IEs.asn b/epan/dissectors/asn1/m2ap/M2AP-IEs.asn
index 17a39465df..0f67add46a 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 V13.3.0 (2016-03)
+-- 3GPP TS 36.443 V14.0.0 (2017-03)
 -- **************************************************************
 --
 -- Information Element Definitions
@@ -15,7 +15,10 @@ BEGIN
 
 IMPORTS
 	id-MCH-Scheduling-PeriodExtended,
+	id-MCH-Scheduling-PeriodExtended2,
+	id-Modification-PeriodExtended,
 	id-Modulation-Coding-Scheme2,
+	id-Repetition-PeriodExtended,
 	maxnoofMBSFNareas,
 	maxnoofPMCHsperMBSFNarea,
 	maxnoofCells,
@@ -169,7 +172,9 @@ ECGI-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
 
 ENB-ID ::= CHOICE {
 	macro-eNB-ID	BIT STRING (SIZE (20)),
-	...
+	... ,
+	short-Macro-eNB-ID		BIT STRING (SIZE(18)),
+	long-Macro-eNB-ID		BIT STRING (SIZE(21))
 }
 
 ENB-MBMS-Configuration-data-Item ::= SEQUENCE {
@@ -335,6 +340,10 @@ MCCHrelatedBCCH-ConfigPerMBSFNArea-Item ::= SEQUENCE {
 }
 
 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},
 	...
 }
 
@@ -349,8 +358,13 @@ MCH-Scheduling-Period ::= ENUMERATED {rf8, rf16, rf32, rf64, rf128, rf256, rf512
 
 MCH-Scheduling-PeriodExtended ::= ENUMERATED {rf4, ...}
 
+MCH-Scheduling-PeriodExtended2 ::= ENUMERATED {rf1, rf2, ...}
+
+
 Modulation-Coding-Scheme2 ::= INTEGER (0..27)
 
+Modification-PeriodExtended ::= ENUMERATED {rf1, rf2, rf4, rf8, rf16, rf32, rf64, rf128, rf256, ...}
+
 -- N
 -- O
 -- P
@@ -369,7 +383,9 @@ PMCH-Configuration-ExtIEs M2AP-PROTOCOL-EXTENSION ::= {
 -- 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 --
-	{ID id-MCH-Scheduling-PeriodExtended		CRITICALITY reject	EXTENSION MCH-Scheduling-PeriodExtended	PRESENCE optional},
+	{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},
 	...
 }
 
@@ -392,6 +408,9 @@ PriorityLevel ::= INTEGER { spare (0), highest (1), lowest (14), no-priority (15
 QCI ::= INTEGER (0..255)
 
 -- R
+
+Repetition-PeriodExtended ::= ENUMERATED {rf1, rf2, rf4, rf8, rf16, ...}
+
 -- S
 
 SC-PTM-Information ::= SEQUENCE {
diff --git a/epan/dissectors/asn1/m2ap/M2AP-PDU-Contents.asn b/epan/dissectors/asn1/m2ap/M2AP-PDU-Contents.asn
index fb6a57c04d..09bed3e675 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 V13.3.0 (2016-03)
+-- 3GPP TS 36.443 V14.0.0 (2017-03)
 -- **************************************************************
 --
 -- PDU definitions for M2AP.
diff --git a/epan/dissectors/asn1/m2ap/M2AP-PDU-Descriptions.asn b/epan/dissectors/asn1/m2ap/M2AP-PDU-Descriptions.asn
index d91be01722..2a8aefcfd8 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 V13.3.0 (2016-03)
+-- 3GPP TS 36.443 V14.0.0 (2017-03)
 -- **************************************************************
 --
 -- Elementary Procedure definitions
diff --git a/epan/dissectors/asn1/m2ap/m2ap.cnf b/epan/dissectors/asn1/m2ap/m2ap.cnf
index 4797843864..ad5f767f7c 100644
--- a/epan/dissectors/asn1/m2ap/m2ap.cnf
+++ b/epan/dissectors/asn1/m2ap/m2ap.cnf
@@ -216,6 +216,9 @@ id-Active-MBMS-Session-List                              ProtocolIE-ID
 id-MBMS-Suspension-Notification-List                     ProtocolIE-ID
 id-MBMS-Suspension-Notification-Item                     ProtocolIE-ID
 id-SC-PTM-Information                                    ProtocolIE-ID
+id-Modification-PeriodExtended                           ProtocolIE-ID
+id-Repetition-PeriodExtended                             ProtocolIE-ID
+id-MCH-Scheduling-PeriodExtended2                        ProtocolIE-ID
 
 #.REGISTER
 
@@ -265,6 +268,9 @@ SC-PTM-Information                                    N m2ap.ies id-SC-PTM-Infor
 #M2AP-PROTOCOL-EXTENSION
 Modulation-Coding-Scheme2                             N m2ap.extension id-Modulation-Coding-Scheme2
 MCH-Scheduling-PeriodExtended                         N m2ap.extension id-MCH-Scheduling-PeriodExtended
+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
 
 #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 06ef754dfe..afa9323d6e 100644
--- a/epan/dissectors/asn1/m2ap/packet-m2ap-template.c
+++ b/epan/dissectors/asn1/m2ap/packet-m2ap-template.c
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Reference: 3GPP TS 36.443 v13.3.0
+ * Reference: 3GPP TS 36.443 v14.0.0
  */
 
 #include "config.h"