S1AP: upgrade dissector to v14.4.0

Change-Id: I1124a691ec004507e6e144038b13f9d432d88c5f
Reviewed-on: https://code.wireshark.org/review/23857
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

9 files changed, 25 insertions, 15 deletions

diff --git a/epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn b/epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn
index d427777e97..9d151502c5 100644
--- a/epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.413 V14.3.0 (2017-06)
+-- 3GPP TS 36.413 V14.4.0 (2017-09)
 -- 9.3.5	Common Definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/s1ap/S1AP-Constants.asn b/epan/dissectors/asn1/s1ap/S1AP-Constants.asn
index 8a44ddd9bb..70118989fa 100644
--- a/epan/dissectors/asn1/s1ap/S1AP-Constants.asn
+++ b/epan/dissectors/asn1/s1ap/S1AP-Constants.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.413 V14.3.0 (2017-06)
+-- 3GPP TS 36.413 V14.4.0 (2017-09)
 -- 9.3.6	Constant Definitions
 -- **************************************************************
 --
@@ -249,6 +249,8 @@ id-Unknown-81										ProtocolIE-ID ::= 81
 id-Unknown-82										ProtocolIE-ID ::= 82
 id-cdma2000HOStatus									ProtocolIE-ID ::= 83
 id-cdma2000HORequiredIndication						ProtocolIE-ID ::= 84
+--WS extension
+id-Unknown-85										ProtocolIE-ID ::= 85
 id-E-UTRAN-Trace-ID									ProtocolIE-ID ::= 86
 id-RelativeMMECapacity								ProtocolIE-ID ::= 87
 id-SourceMME-UE-S1AP-ID								ProtocolIE-ID ::= 88
@@ -392,6 +394,8 @@ id-S1-Message										ProtocolIE-ID ::= 225
 id-CSGMembershipInfo								ProtocolIE-ID ::= 226
 id-Paging-eDRXInformation							ProtocolIE-ID ::= 227
 id-UE-RetentionInformation							ProtocolIE-ID ::= 228
+--WS extension
+id-Unknown-229										ProtocolIE-ID ::= 229
 id-UE-Usage-Type									ProtocolIE-ID ::= 230
 id-extended-UEIdentityIndexValue					ProtocolIE-ID ::= 231
 id-RAT-Type											ProtocolIE-ID ::= 232
diff --git a/epan/dissectors/asn1/s1ap/S1AP-Containers.asn b/epan/dissectors/asn1/s1ap/S1AP-Containers.asn
index b1960fc849..c994c97ed5 100644
--- a/epan/dissectors/asn1/s1ap/S1AP-Containers.asn
+++ b/epan/dissectors/asn1/s1ap/S1AP-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.413 V14.3.0 (2017-06)
+-- 3GPP TS 36.413 V14.4.0 (2017-09)
 -- 9.3.7	Container Definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/s1ap/S1AP-IEs.asn b/epan/dissectors/asn1/s1ap/S1AP-IEs.asn
index b0b928324a..859c43eb6e 100644
--- a/epan/dissectors/asn1/s1ap/S1AP-IEs.asn
+++ b/epan/dissectors/asn1/s1ap/S1AP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.413 V14.3.0 (2017-06)
+-- 3GPP TS 36.413 V14.4.0 (2017-09)
 -- 9.3.4	Information Element Definitions
 -- **************************************************************
 --
@@ -316,7 +316,8 @@ CauseRadioNetwork ::= ENUMERATED {
 	...,
 	redirection-towards-1xRTT,
 	not-supported-QCI-value,
-	invalid-CSG-Id
+	invalid-CSG-Id,
+	release-due-to-pre-emption
 
 }
 
@@ -1341,8 +1342,8 @@ OverloadAction ::= ENUMERATED {
 	...,
 	permit-high-priority-sessions-and-mobile-terminated-services-only,
 	reject-delay-tolerant-access,
-	not-accept-mo-data-or-delay-tolerant-access-from-CP-CIoT,
-	permit-high-priority-sessions-and-exception-reporting-and-mobile-terminated-services-only
+	permit-high-priority-sessions-and-exception-reporting-and-mobile-terminated-services-only,
+	not-accept-mo-data-or-delay-tolerant-access-from-CP-CIoT
 
 }
 
diff --git a/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn b/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn
index 5bc8cd6eb1..eb49702899 100644
--- a/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/s1ap/S1AP-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.413 V14.3.0 (2017-06)
+-- 3GPP TS 36.413 V14.4.0 (2017-09)
 -- 9.3.3	PDU Definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn b/epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn
index 49f8f8960b..af677ce9a7 100644
--- a/epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/s1ap/S1AP-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.413 V14.3.0 (2017-06)
+-- 3GPP TS 36.413 V14.4.0 (2017-09)
 -- 9.3.2	Elementary Procedure Definitions
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn b/epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn
index f64a1ff0a0..693510b059 100644
--- a/epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn
+++ b/epan/dissectors/asn1/s1ap/S1AP-SonTransfer-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.413 V14.3.0 (2017-06)
+-- 3GPP TS 36.413 V14.4.0 (2017-09)
 -- B.2	ASN.1 definition
 -- **************************************************************
 --
diff --git a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c
index b7de3d9815..54107edc9c 100644
--- a/epan/dissectors/asn1/s1ap/packet-s1ap-template.c
+++ b/epan/dissectors/asn1/s1ap/packet-s1ap-template.c
@@ -22,7 +22,7 @@
  *
  * Based on the RANAP dissector
  *
- * References: 3GPP TS 36.413 V14.3.0 (2017-06)
+ * References: 3GPP TS 36.413 V14.4.0 (2017-09)
  */
 
 #include "config.h"
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index e06a633cc4..2023a55972 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -30,7 +30,7 @@
  *
  * Based on the RANAP dissector
  *
- * References: 3GPP TS 36.413 V14.3.0 (2017-06)
+ * References: 3GPP TS 36.413 V14.4.0 (2017-09)
  */
 
 #include "config.h"
@@ -269,6 +269,7 @@ typedef enum _ProtocolIE_ID_enum {
   id_Unknown_82 =  82,
   id_cdma2000HOStatus =  83,
   id_cdma2000HORequiredIndication =  84,
+  id_Unknown_85 =  85,
   id_E_UTRAN_Trace_ID =  86,
   id_RelativeMMECapacity =  87,
   id_SourceMME_UE_S1AP_ID =  88,
@@ -412,6 +413,7 @@ typedef enum _ProtocolIE_ID_enum {
   id_CSGMembershipInfo = 226,
   id_Paging_eDRXInformation = 227,
   id_UE_RetentionInformation = 228,
+  id_Unknown_229 = 229,
   id_UE_Usage_Type = 230,
   id_extended_UEIdentityIndexValue = 231,
   id_RAT_Type  = 232,
@@ -2015,6 +2017,7 @@ static const value_string s1ap_ProtocolIE_ID_vals[] = {
   { id_Unknown_82, "id-Unknown-82" },
   { id_cdma2000HOStatus, "id-cdma2000HOStatus" },
   { id_cdma2000HORequiredIndication, "id-cdma2000HORequiredIndication" },
+  { id_Unknown_85, "id-Unknown-85" },
   { id_E_UTRAN_Trace_ID, "id-E-UTRAN-Trace-ID" },
   { id_RelativeMMECapacity, "id-RelativeMMECapacity" },
   { id_SourceMME_UE_S1AP_ID, "id-SourceMME-UE-S1AP-ID" },
@@ -2158,6 +2161,7 @@ static const value_string s1ap_ProtocolIE_ID_vals[] = {
   { id_CSGMembershipInfo, "id-CSGMembershipInfo" },
   { id_Paging_eDRXInformation, "id-Paging-eDRXInformation" },
   { id_UE_RetentionInformation, "id-UE-RetentionInformation" },
+  { id_Unknown_229, "id-Unknown-229" },
   { id_UE_Usage_Type, "id-UE-Usage-Type" },
   { id_extended_UEIdentityIndexValue, "id-extended-UEIdentityIndexValue" },
   { id_RAT_Type, "id-RAT-Type" },
@@ -3486,6 +3490,7 @@ const value_string s1ap_CauseRadioNetwork_vals[] = {
   {  36, "redirection-towards-1xRTT" },
   {  37, "not-supported-QCI-value" },
   {  38, "invalid-CSG-Id" },
+  {  39, "release-due-to-pre-emption" },
   { 0, NULL }
 };
 
@@ -3497,7 +3502,7 @@ dissect_s1ap_CauseRadioNetwork(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 #line 1984 "./asn1/s1ap/s1ap.cnf"
   guint32 value;
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
-                                     36, &value, TRUE, 3, NULL);
+                                     36, &value, TRUE, 4, NULL);
 
   col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [RadioNetwork-cause=%s]", val_to_str_const(value, s1ap_CauseRadioNetwork_vals, "Unknown"));
 
@@ -6516,8 +6521,8 @@ static const value_string s1ap_OverloadAction_vals[] = {
   {   2, "permit-emergency-sessions-and-mobile-terminated-services-only" },
   {   3, "permit-high-priority-sessions-and-mobile-terminated-services-only" },
   {   4, "reject-delay-tolerant-access" },
-  {   5, "not-accept-mo-data-or-delay-tolerant-access-from-CP-CIoT" },
-  {   6, "permit-high-priority-sessions-and-exception-reporting-and-mobile-terminated-services-only" },
+  {   5, "permit-high-priority-sessions-and-exception-reporting-and-mobile-terminated-services-only" },
+  {   6, "not-accept-mo-data-or-delay-tolerant-access-from-CP-CIoT" },
   { 0, NULL }
 };