XnAP: upgrade dissector to v16.7.0

epan/dissectors/asn1/xnap/XnAP-CommonDataTypes.asn

@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V16.6.0 (2021-07)
+-- 3GPP TS 38.423 V16.7.0 (2021-10)
 -- 9.3.6	Common definitions
 -- **************************************************************
 --

epan/dissectors/asn1/xnap/XnAP-Constants.asn

@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V16.6.0 (2021-07)
+-- 3GPP TS 38.423 V16.7.0 (2021-10)
 -- 9.3.7	Constant definitions
 -- **************************************************************
 --
@@ -394,5 +394,7 @@ id-PagingeDRXInformation																			ProtocolIE-ID ::= 245
 id-CHO-MRDC-EarlyDataForwarding																		ProtocolIE-ID ::= 246
 id-SCGIndicator																						ProtocolIE-ID ::= 247
 id-UESpecificDRX																					ProtocolIE-ID ::= 248
+id-PDUSessionExpectedUEActivityBehaviour															ProtocolIE-ID ::= 249
+id-QoS-Mapping-Information																			ProtocolIE-ID ::= 250
 
 END

epan/dissectors/asn1/xnap/XnAP-Containers.asn

@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V16.6.0 (2021-07)
+-- 3GPP TS 38.423 V16.7.0 (2021-10)
 -- 9.3.8	Container definitions
 -- **************************************************************
 --

epan/dissectors/asn1/xnap/XnAP-IEs.asn

@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V16.6.0 (2021-07)
+-- 3GPP TS 38.423 V16.7.0 (2021-10)
 -- 9.3.5	Information Element definitions
 -- **************************************************************
 --
@@ -88,6 +88,7 @@ IMPORTS
 	id-DL-scheduling-PDCCH-CCE-usage,
 	id-UL-scheduling-PDCCH-CCE-usage,
 	id-SFN-Offset,
+	id-QoS-Mapping-Information,
 	maxEARFCN,
 	maxnoofAllowedAreas,
 	maxnoofAMFRegions,
@@ -189,6 +190,7 @@ Additional-UL-NG-U-TNLatUPF-Item ::= SEQUENCE {
 }
 
 Additional-UL-NG-U-TNLatUPF-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+{ ID id-PDUSessionCommonNetworkInstance		CRITICALITY ignore	EXTENSION PDUSessionCommonNetworkInstance		PRESENCE optional},
 	...
 }
 
@@ -3935,6 +3937,17 @@ QoSFlowwithCause-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
 	...
 }
 
+QoS-Mapping-Information ::= SEQUENCE {
+     dscp							BIT STRING (SIZE(6))			OPTIONAL,
+     flow-label						BIT STRING (SIZE(20))		OPTIONAL,
+     iE-Extensions					ProtocolExtensionContainer { {QoS-Mapping-Information-ExtIEs} }	OPTIONAL,
+     ...
+}
+
+QoS-Mapping-Information-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	...
+}
+
 QoSParaSetIndex ::= INTEGER (1..8,...)
 QoSParaSetNotifyIndex ::= INTEGER (0..8,...)
 
@@ -5468,6 +5481,7 @@ UPTransportParametersItem ::= SEQUENCE {
 }
 
 UPTransportParametersItem-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	{ID id-QoS-Mapping-Information	CRITICALITY reject	EXTENSION QoS-Mapping-Information	PRESENCE optional},
 	...
 }
 

epan/dissectors/asn1/xnap/XnAP-PDU-Contents.asn

@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V16.6.0 (2021-07)
+-- 3GPP TS 38.423 V16.7.0 (2021-10)
 -- 9.3.4	PDU Definitions
 -- **************************************************************
 --
@@ -57,6 +57,7 @@ IMPORTS
 	DRBsSubjectToStatusTransfer-List,
 	DRBToQoSFlowMapping-List,
 	E-UTRA-CGI,
+	ExpectedUEActivityBehaviour,
 	ExpectedUEBehaviour,
 	ExtendedUEIdentityIndexValue,
 	FiveGCMobilityRestrictionListContainer,
@@ -381,6 +382,7 @@ FROM XnAP-Containers
 	id-UERadioCapabilityID,
 	id-SCGIndicator,
 	id-UESpecificDRX,
+	id-PDUSessionExpectedUEActivityBehaviour,
 
 
 
@@ -1041,6 +1043,7 @@ PDUSessionsToBeAdded-SNModRequest-Item ::= SEQUENCE {
 }
 
 PDUSessionsToBeAdded-SNModRequest-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
+	{ID id-PDUSessionExpectedUEActivityBehaviour		CRITICALITY ignore	EXTENSION ExpectedUEActivityBehaviour		PRESENCE optional},
 	...
 }
 
@@ -1059,7 +1062,8 @@ PDUSessionsToBeModified-SNModRequest-Item ::= SEQUENCE {
 }
 
 PDUSessionsToBeModified-SNModRequest-Item-ExtIEs XNAP-PROTOCOL-EXTENSION ::= {
-	{ID id-S-NSSAI		CRITICALITY reject	EXTENSION S-NSSAI		PRESENCE optional},
+	{ID id-S-NSSAI		CRITICALITY reject	EXTENSION S-NSSAI		PRESENCE optional}|
+	{ID id-PDUSessionExpectedUEActivityBehaviour		CRITICALITY ignore	EXTENSION ExpectedUEActivityBehaviour		PRESENCE optional},
 	...
 }
 

epan/dissectors/asn1/xnap/XnAP-PDU-Descriptions.asn

@@ -1,4 +1,4 @@
--- 3GPP TS 38.423 V16.6.0 (2021-07)
+-- 3GPP TS 38.423 V16.7.0 (2021-10)
 -- 9.3.3	Elementary Procedure Definitions
 -- **************************************************************
 --

epan/dissectors/asn1/xnap/packet-xnap-template.c

@@ -1,7 +1,7 @@
 /* packet-xnap.c
  * Routines for dissecting NG-RAN Xn application protocol (XnAP)
  * 3GPP TS 38.423 packet dissection
- * Copyright 2018-2019, Pascal Quantin <pascal@wireshark.org>
+ * Copyright 2018-2021, Pascal Quantin <pascal@wireshark.org>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 38.423 V16.6.0 (2021-07)
+ * 3GPP TS 38.423 V16.7.0 (2021-10)
  */
 
 #include "config.h"

epan/dissectors/asn1/xnap/xnap.cnf

@@ -1,6 +1,6 @@
 # xnap.cnf
 # xnap conformation file
-# Copyright 2018-2020 Pascal Quantin
+# Copyright 2018-2021 Pascal Quantin
 
 #.OPT
 PER
@@ -1216,6 +1216,8 @@ id-PagingeDRXInformation                          ProtocolIE-ID
 id-CHO-MRDC-EarlyDataForwarding                   ProtocolIE-ID
 id-SCGIndicator                                   ProtocolIE-ID
 id-UESpecificDRX                                  ProtocolIE-ID
+id-PDUSessionExpectedUEActivityBehaviour          ProtocolIE-ID
+id-QoS-Mapping-Information                        ProtocolIE-ID
 
 #.REGISTER
 
@@ -1473,6 +1475,8 @@ DL-scheduling-PDCCH-CCE-usage                     N xnap.extension id-DL-schedul
 UL-scheduling-PDCCH-CCE-usage                     N xnap.extension id-UL-scheduling-PDCCH-CCE-usage
 SFN-Offset                                        N xnap.extension id-SFN-Offset
 QoSMonitoringDisabled                             N xnap.extension id-QoSMonitoringDisabled
+ExpectedUEActivityBehaviour                       N xnap.extension id-PDUSessionExpectedUEActivityBehaviour
+QoS-Mapping-Information                           N xnap.extension id-QoS-Mapping-Information
 
 #XNAP-ELEMENTARY-PROCEDURE
 HandoverRequest                            N xnap.proc.imsg id-handoverPreparation

epan/dissectors/packet-xnap.c

@@ -9,7 +9,7 @@
 /* packet-xnap.c
  * Routines for dissecting NG-RAN Xn application protocol (XnAP)
  * 3GPP TS 38.423 packet dissection
- * Copyright 2018-2019, Pascal Quantin <pascal@wireshark.org>
+ * Copyright 2018-2021, Pascal Quantin <pascal@wireshark.org>
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref:
- * 3GPP TS 38.423 V16.6.0 (2021-07)
+ * 3GPP TS 38.423 V16.7.0 (2021-10)
  */
 
 #include "config.h"
@@ -415,7 +415,9 @@ typedef enum _ProtocolIE_ID_enum {
   id_PagingeDRXInformation = 245,
   id_CHO_MRDC_EarlyDataForwarding = 246,
   id_SCGIndicator = 247,
-  id_UESpecificDRX = 248
+  id_UESpecificDRX = 248,
+  id_PDUSessionExpectedUEActivityBehaviour = 249,
+  id_QoS_Mapping_Information = 250
 } ProtocolIE_ID_enum;
 
 typedef enum _GlobalNG_RANNode_ID_enum {
@@ -495,6 +497,7 @@ static int hf_xnap_DRB_Number_PDU = -1;           /* DRB_Number */
 static int hf_xnap_DRBsSubjectToStatusTransfer_List_PDU = -1;  /* DRBsSubjectToStatusTransfer_List */
 static int hf_xnap_DuplicationActivation_PDU = -1;  /* DuplicationActivation */
 static int hf_xnap_EndpointIPAddressAndPort_PDU = -1;  /* EndpointIPAddressAndPort */
+static int hf_xnap_ExpectedUEActivityBehaviour_PDU = -1;  /* ExpectedUEActivityBehaviour */
 static int hf_xnap_ExpectedUEBehaviour_PDU = -1;  /* ExpectedUEBehaviour */
 static int hf_xnap_ExtendedRATRestrictionInformation_PDU = -1;  /* ExtendedRATRestrictionInformation */
 static int hf_xnap_ExtendedPacketDelayBudget_PDU = -1;  /* ExtendedPacketDelayBudget */
@@ -562,6 +565,7 @@ static int hf_xnap_PDUSessionResourceSecondaryRATUsageList_PDU = -1;  /* PDUSess
 static int hf_xnap_PDUSessionCommonNetworkInstance_PDU = -1;  /* PDUSessionCommonNetworkInstance */
 static int hf_xnap_PLMN_Identity_PDU = -1;        /* PLMN_Identity */
 static int hf_xnap_QoSFlows_List_PDU = -1;        /* QoSFlows_List */
+static int hf_xnap_QoS_Mapping_Information_PDU = -1;  /* QoS_Mapping_Information */
 static int hf_xnap_QoSParaSetNotifyIndex_PDU = -1;  /* QoSParaSetNotifyIndex */
 static int hf_xnap_QosMonitoringRequest_PDU = -1;  /* QosMonitoringRequest */
 static int hf_xnap_QoSMonitoringDisabled_PDU = -1;  /* QoSMonitoringDisabled */
@@ -1307,6 +1311,8 @@ static int hf_xnap_QoSFlowNotificationControlIndicationInfo_item = -1;  /* QoSFl
 static int hf_xnap_notificationInformation = -1;  /* T_notificationInformation */
 static int hf_xnap_QoSFlows_List_item = -1;       /* QoSFlow_Item */
 static int hf_xnap_QoSFlows_List_withCause_item = -1;  /* QoSFlowwithCause_Item */
+static int hf_xnap_dscp = -1;                     /* BIT_STRING_SIZE_6 */
+static int hf_xnap_flow_label = -1;               /* BIT_STRING_SIZE_20 */
 static int hf_xnap_QoSFlowsAdmitted_List_item = -1;  /* QoSFlowsAdmitted_Item */
 static int hf_xnap_QoSFlowsToBeSetup_List_item = -1;  /* QoSFlowsToBeSetup_Item */
 static int hf_xnap_e_RAB_ID = -1;                 /* E_RAB_ID */
@@ -2034,6 +2040,7 @@ static gint ett_xnap_QoSFlows_List = -1;
 static gint ett_xnap_QoSFlow_Item = -1;
 static gint ett_xnap_QoSFlows_List_withCause = -1;
 static gint ett_xnap_QoSFlowwithCause_Item = -1;
+static gint ett_xnap_QoS_Mapping_Information = -1;
 static gint ett_xnap_QoSFlowsAdmitted_List = -1;
 static gint ett_xnap_QoSFlowsAdmitted_Item = -1;
 static gint ett_xnap_QoSFlowsToBeSetup_List = -1;
@@ -2837,6 +2844,8 @@ static const value_string xnap_ProtocolIE_ID_vals[] = {
   { id_CHO_MRDC_EarlyDataForwarding, "id-CHO-MRDC-EarlyDataForwarding" },
   { id_SCGIndicator, "id-SCGIndicator" },
   { id_UESpecificDRX, "id-UESpecificDRX" },
+  { id_PDUSessionExpectedUEActivityBehaviour, "id-PDUSessionExpectedUEActivityBehaviour" },
+  { id_QoS_Mapping_Information, "id-QoS-Mapping-Information" },
   { 0, NULL }
 };
 
@@ -13428,6 +13437,22 @@ dissect_xnap_QoSFlowNotificationControlIndicationInfo(tvbuff_t *tvb _U_, int off
 }
 
 
+static const per_sequence_t QoS_Mapping_Information_sequence[] = {
+  { &hf_xnap_dscp           , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_BIT_STRING_SIZE_6 },
+  { &hf_xnap_flow_label     , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_BIT_STRING_SIZE_20 },
+  { &hf_xnap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_xnap_ProtocolExtensionContainer },
+  { NULL, 0, 0, NULL }
+};
+
+static int
+dissect_xnap_QoS_Mapping_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
+                                   ett_xnap_QoS_Mapping_Information, QoS_Mapping_Information_sequence);
+
+  return offset;
+}
+
+
 
 static int
 dissect_xnap_QoSParaSetNotifyIndex(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -18441,6 +18466,14 @@ static int dissect_EndpointIPAddressAndPort_PDU(tvbuff_t *tvb _U_, packet_info *
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_ExpectedUEActivityBehaviour_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_xnap_ExpectedUEActivityBehaviour(tvb, offset, &asn1_ctx, tree, hf_xnap_ExpectedUEActivityBehaviour_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_ExpectedUEBehaviour_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -18977,6 +19010,14 @@ static int dissect_QoSFlows_List_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_QoS_Mapping_Information_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_xnap_QoS_Mapping_Information(tvb, offset, &asn1_ctx, tree, hf_xnap_QoS_Mapping_Information_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_QoSParaSetNotifyIndex_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -20709,6 +20750,10 @@ void proto_register_xnap(void) {
       { "EndpointIPAddressAndPort", "xnap.EndpointIPAddressAndPort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_ExpectedUEActivityBehaviour_PDU,
+      { "ExpectedUEActivityBehaviour", "xnap.ExpectedUEActivityBehaviour_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_ExpectedUEBehaviour_PDU,
       { "ExpectedUEBehaviour", "xnap.ExpectedUEBehaviour_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -20977,6 +21022,10 @@ void proto_register_xnap(void) {
       { "QoSFlows-List", "xnap.QoSFlows_List",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_QoS_Mapping_Information_PDU,
+      { "QoS-Mapping-Information", "xnap.QoS_Mapping_Information_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_xnap_QoSParaSetNotifyIndex_PDU,
       { "QoSParaSetNotifyIndex", "xnap.QoSParaSetNotifyIndex",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -23957,6 +24006,14 @@ void proto_register_xnap(void) {
       { "QoSFlowwithCause-Item", "xnap.QoSFlowwithCause_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_xnap_dscp,
+      { "dscp", "xnap.dscp",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_6", HFILL }},
+    { &hf_xnap_flow_label,
+      { "flow-label", "xnap.flow_label",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "BIT_STRING_SIZE_20", HFILL }},
     { &hf_xnap_QoSFlowsAdmitted_List_item,
       { "QoSFlowsAdmitted-Item", "xnap.QoSFlowsAdmitted_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -25759,6 +25816,7 @@ void proto_register_xnap(void) {
     &ett_xnap_QoSFlow_Item,
     &ett_xnap_QoSFlows_List_withCause,
     &ett_xnap_QoSFlowwithCause_Item,
+    &ett_xnap_QoS_Mapping_Information,
     &ett_xnap_QoSFlowsAdmitted_List,
     &ett_xnap_QoSFlowsAdmitted_Item,
     &ett_xnap_QoSFlowsToBeSetup_List,
@@ -26342,6 +26400,8 @@ proto_reg_handoff_xnap(void)
   dissector_add_uint("xnap.extension", id_UL_scheduling_PDCCH_CCE_usage, create_dissector_handle(dissect_UL_scheduling_PDCCH_CCE_usage_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_SFN_Offset, create_dissector_handle(dissect_SFN_Offset_PDU, proto_xnap));
   dissector_add_uint("xnap.extension", id_QoSMonitoringDisabled, create_dissector_handle(dissect_QoSMonitoringDisabled_PDU, proto_xnap));
+  dissector_add_uint("xnap.extension", id_PDUSessionExpectedUEActivityBehaviour, create_dissector_handle(dissect_ExpectedUEActivityBehaviour_PDU, proto_xnap));
+  dissector_add_uint("xnap.extension", id_QoS_Mapping_Information, create_dissector_handle(dissect_QoS_Mapping_Information_PDU, proto_xnap));
   dissector_add_uint("xnap.proc.imsg", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequest_PDU, proto_xnap));
   dissector_add_uint("xnap.proc.sout", id_handoverPreparation, create_dissector_handle(dissect_HandoverRequestAcknowledge_PDU, proto_xnap));
   dissector_add_uint("xnap.proc.uout", id_handoverPreparation, create_dissector_handle(dissect_HandoverPreparationFailure_PDU, proto_xnap));