ETSI CAT: add dissection of Network Measurement Results

Bug: 15665 Change-Id: Iaff2432bf87d1c9d237709b651005518c89bff18 Reviewed-on: https://code.wireshark.org/review/32707 Reviewed-by: Pascal Quantin <pascal@wireshark.org> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
author: Pascal Quantin <pascal@wireshark.org> 2019-04-03 23:27:18 +0200
committer: Anders Broman <a.broman58@gmail.com> 2019-04-04 10:59:12 +0000
commit: 24ef40990020d06884ee4164b723a345e9985907 (patch)
tree: 9b188f15e6d2a1a7a038360cecd236ff58516f43 /epan
parent: 67644354a13051bff3d93c5235902e29234aceee (diff)
7 files changed, 294 insertions, 189 deletions
diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
index 3ee07d72a2..19962ed52b 100644
--- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
+++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
@@ -45,6 +45,7 @@ WLAN-backhaulRate-r12
 HandoverCommand_PDU
 HandoverPreparationInformation_PDU
 HandoverPreparationInformation-NB_PDU
+MeasurementReport_PDU
 RLF-Report-r9_PDU
 RLF-Report-v9e0_PDU
 RRCConnectionReconfigurationComplete_PDU
@@ -61,6 +62,7 @@ VisitedCellInfoList-r12_PDU
 HandoverCommand
 HandoverPreparationInformation
 HandoverPreparationInformation-NB
+MeasurementReport
 RLF-Report-r9
 RLF-Report-v9e0
 RRCConnectionReconfiguration @rrc_conn_reconf
diff --git a/epan/dissectors/asn1/rrc/rrc.cnf b/epan/dissectors/asn1/rrc/rrc.cnf
index 74894f56d3..4acfc144b5 100644
--- a/epan/dissectors/asn1/rrc/rrc.cnf
+++ b/epan/dissectors/asn1/rrc/rrc.cnf
@@ -75,6 +75,7 @@ SysInfoType17_PDU
 SysInfoType18_PDU
 SysInfoType19_PDU
 MasterInformationBlock_PDU
+MeasurementReport_PDU
 
 #.OMIT_ASSIGNMENT
 # Omit System-Information-Container for now it messes up the
@@ -110,6 +111,7 @@ SystemInformation-BCH        @sysinfo
 SystemInformation2-BCH       @sysinfo2
 System-Information-Container @sysinfo.cont
 MasterInformationBlock       @si.mib
+MeasurementReport
 SysInfoType1                 @si.sib1
 SysInfoType2                 @si.sib2
 SysInfoType3                 @si.sib3
diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c
index af313f7b9e..a991c5ebb0 100644
--- a/epan/dissectors/packet-etsi_card_app_toolkit.c
+++ b/epan/dissectors/packet-etsi_card_app_toolkit.c
@@ -16,10 +16,13 @@
 
 #include <epan/packet.h>
 #include <epan/charsets.h>
+#include <epan/conversation.h>
 
 #include "packet-e212.h"
 #include "packet-gsm_a_common.h"
 #include "packet-gsm_sms.h"
+#include "packet-rrc.h"
+#include "packet-lte-rrc.h"
 
 void proto_register_card_app_toolkit(void);
 void proto_reg_handoff_card_app_toolkit(void);
@@ -254,7 +257,7 @@ static const value_string comp_tlv_tag_vals[] = {
 	{ 0x71, "Registry application data" },
 	{ 0x72, "3GPP PLMNwAcT List" },
 	{ 0x73, "3GPP Routing Area Information" },
-	{ 0x74, "3GPP Update/Attach Type" },
+	{ 0x74, "3GPP Update/Attach/Registration Type" },
 	{ 0x75, "3GPP Rejection Cause Code" },
 	{ 0x76, "3GPP Geographical Location Parameters / IARI" },
 	{ 0x77, "3GPP GAD Shapes / IMPU list" },
@@ -837,6 +840,7 @@ static const value_string utran_eutran_meas_qual_vals[] = {
 	{ 0x06, "E-UTRAN Inter-frequency measurements" },
 	{ 0x07, "E-UTRAN Inter-RAT (GERAN) measurements" },
 	{ 0x08, "E-UTRAN Inter-RAT (UTRAN) measurements" },
+	{ 0x09, "E-UTRAN Inter-RAT (NR) measurements" },
 	{ 0, NULL }
 };
 
@@ -870,6 +874,9 @@ static const value_string upd_attach_type_vals[] = {
 	{ 0x0C, "\"Combined TA/LA updating\" in the case of an EMM TRACKING AREA UPDATE REQUEST message" },
 	{ 0x0D, "\"Combined TA/LA updating with IMSI attach\" in the case of an EMM TRACKING AREA UPDATE REQUEST message" },
 	{ 0x0E, "\"Periodic updating\" in the case of an EMM TRACKING AREA UPDATE REQUEST message" },
+	{ 0x0F, "\"Initial Registration\" in the case of a 5GMM REGISTRATION REQUEST message" },
+	{ 0x10, "\"Mobility Registration updating\" in the case of a 5GMM REGISTRATION REQUEST message" },
+	{ 0x11, "\"Periodic Registration updating\" in the case of a 5GMM REGISTRATION REQUEST message" },
 	{ 0, NULL }
 };
 static value_string_ext upd_attach_type_vals_ext = VALUE_STRING_EXT_INIT(upd_attach_type_vals);
@@ -973,6 +980,23 @@ static const value_string aid_pix_app_code_3gpp2_vals[] = {
 	{ 0, NULL}
 };
 
+typedef struct {
+	wmem_tree_t *pdus;
+} cat_conv_info_t;
+
+typedef enum {
+	CAT_NMR_NONE,
+	CAT_NMR_GERAN,
+	CAT_NMR_UTRAN,
+	CAT_NMR_E_UTRAN
+} cat_nmr_type;
+
+typedef struct {
+	guint32 req_frame;
+	guint32 id;
+	cat_nmr_type nmr_type;
+} cat_transaction_t;
+
 static void
 dissect_cat_efadn_coding(tvbuff_t *tvb, proto_tree *tree, guint32 pos, guint32 len, int hf_entry)
 {
@@ -1070,12 +1094,25 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 	gboolean ims_event = FALSE, dns_server = FALSE;
 	guint length = tvb_reported_length(tvb);
 	gsm_sms_data_t sms_data = {0};
+	conversation_t *conversation;
+	cat_conv_info_t *cat_info;
+	cat_transaction_t *cat_trans = NULL;
+	wmem_tree_key_t key[3];
+
+
+	conversation = find_or_create_conversation(pinfo);
+	cat_info = (cat_conv_info_t*)conversation_get_proto_data(conversation, proto_cat);
+	if (!cat_info) {
+		cat_info = wmem_new(wmem_file_scope(), cat_conv_info_t);
+		cat_info->pdus = wmem_tree_new(wmem_file_scope());
+		conversation_add_proto_data(conversation, proto_cat, cat_info);
+	}
 
 	cat_ti = proto_tree_add_item(tree, proto_cat, tvb, 0, -1, ENC_NA);
 	cat_tree = proto_item_add_subtree(cat_ti, ett_cat);
 	while (pos < length) {
 		proto_item *ti;
-		guint8 g8;
+		guint32 g8, cmd_nr, cmd_qual;
 		guint16 tag;
 		guint32 len, i;
 		guint8 *ptr = NULL;
@@ -1118,37 +1155,59 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 		case 0x01:	/* command details */
 			if (len < 3)
 				break;
-			proto_tree_add_item(elem_tree, hf_ctlv_cmd_nr, tvb, pos, 1, ENC_BIG_ENDIAN);
-			if (tvb_get_guint8(tvb, pos) == 0x40) {
+			proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_cmd_nr, tvb, pos, 1, ENC_BIG_ENDIAN, &cmd_nr);
+			if (cmd_nr == 0x40) {
 				ims_event = TRUE;
 				dns_server = TRUE;
 			}
-			proto_tree_add_item(elem_tree, hf_ctlv_cmd_type, tvb, pos+1, 1, ENC_BIG_ENDIAN);
+			proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_cmd_type, tvb, pos+1, 1, ENC_BIG_ENDIAN, &g8);
 			/* append command type to INFO column */
-			g8 = tvb_get_guint8(tvb, pos+1);
 			col_append_fstr(pinfo->cinfo, COL_INFO, "%s ",
 					val_to_str_ext(g8, &cmd_type_vals_ext, "%02x "));
 			switch (g8) {
 			case 0x01:
-				proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_refresh, tvb, pos+2, 1, ENC_BIG_ENDIAN);
+				proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_cmd_qual_refresh, tvb, pos+2, 1, ENC_BIG_ENDIAN, &cmd_qual);
 				break;
 			case 0x13:
-				proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_send_short_msg, tvb, pos+2, 1, ENC_NA);
-				sms_data.stk_packing_required = tvb_get_guint8(tvb, pos+2) & 0x01 ? TRUE : FALSE;
+				proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_cmd_qual_send_short_msg, tvb, pos+2, 1, ENC_BIG_ENDIAN, &cmd_qual);
+				sms_data.stk_packing_required = cmd_qual & 0x01 ? TRUE : FALSE;
 				break;
 			case 0x26:
-				proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_loci, tvb, pos+2, 1, ENC_BIG_ENDIAN);
+				proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_cmd_qual_loci, tvb, pos+2, 1, ENC_BIG_ENDIAN, &cmd_qual);
 				break;
 			case 0x27:
-				proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_timer_mgmt, tvb, pos+2, 1, ENC_BIG_ENDIAN);
+				proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_cmd_qual_timer_mgmt, tvb, pos+2, 1, ENC_BIG_ENDIAN, &cmd_qual);
 				break;
 			case 0x43:
-				proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual_send_data, tvb, pos+2, 1, ENC_NA);
+				proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_cmd_qual_send_data, tvb, pos+2, 1, ENC_BIG_ENDIAN, &cmd_qual);
 				break;
 			default:
-				proto_tree_add_item(elem_tree, hf_ctlv_cmd_qual, tvb, pos+2, 1, ENC_BIG_ENDIAN);
+				proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_cmd_qual, tvb, pos+2, 1, ENC_BIG_ENDIAN, &cmd_qual);
 				break;
 			}
+			if (data) {
+				guint32 id = (cmd_nr << 16) | (g8 << 8) | cmd_qual;
+				key[0].length = 1;
+				key[0].key = &id;
+				key[1].length = 1;
+				key[1].key = &pinfo->num;
+				key[2].length = 0;
+				key[2].key = NULL;
+
+				if (GPOINTER_TO_INT(data) == 0xd0 && !PINFO_FD_VISITED(pinfo)) {
+					/* Proactive command */
+					cat_trans = wmem_new(wmem_file_scope(), cat_transaction_t);
+					cat_trans->req_frame = pinfo->num;
+					cat_trans->id = id;
+					cat_trans->nmr_type = ((id & 0x00ffff) == 0x2602) ? CAT_NMR_GERAN : CAT_NMR_NONE;
+					wmem_tree_insert32_array(cat_info->pdus, key, (void*)cat_trans);
+				} else if (GPOINTER_TO_INT(data) == 0x14) {
+					/* Terminal response */
+					cat_trans = (cat_transaction_t*)wmem_tree_lookup32_array_le(cat_info->pdus, key);
+					if (cat_trans && cat_trans->id != id)
+						cat_trans = NULL;
+				}
+			}
 			break;
 		case 0x02:	/* device identity */
 			if (len < 2)
@@ -1157,8 +1216,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 			proto_tree_add_item(elem_tree, hf_ctlv_devid_dst, tvb, pos+1, 1, ENC_BIG_ENDIAN);
 			break;
 		case 0x03:	/* Result */
-			g8 = tvb_get_guint8(tvb, pos);
-			proto_tree_add_item(elem_tree, hf_ctlv_result_gen, tvb, pos, 1, ENC_BIG_ENDIAN);
+			proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_result_gen, tvb, pos, 1, ENC_BIG_ENDIAN, &g8);
 			switch (g8) {
 			case 0x20:
 				proto_tree_add_item(elem_tree, hf_ctlv_result_term, tvb, pos+1, 1, ENC_BIG_ENDIAN);
@@ -1219,8 +1277,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 			if (len == 0)
 				break;
 			/* 1st byte: encoding */
-			proto_tree_add_item(elem_tree, hf_ctlv_text_string_enc, tvb, pos, 1, ENC_BIG_ENDIAN);
-			g8 = tvb_get_guint8(tvb, pos);
+			proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_text_string_enc, tvb, pos, 1, ENC_BIG_ENDIAN, &g8);
 			switch (g8 & 0xf0) {
 			case 0x00:
 				g8 &= 0x0c;
@@ -1274,6 +1331,25 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 		case 0x62:	/* IMEISV */
 			de_mid(tvb, elem_tree, pinfo, pos, len, NULL, 0);
 			break;
+		case 0x16:
+			if (cat_trans && ((cat_trans->id & 0x00ffff) == 0x2602)) {
+				switch (cat_trans->nmr_type) {
+				case CAT_NMR_GERAN:
+					de_rr_meas_res(tvb, elem_tree, pinfo, pos, len, NULL, 0);
+					break;
+				case CAT_NMR_UTRAN:
+					new_tvb = tvb_new_subset_length(tvb, pos, len);
+					dissect_rrc_MeasurementReport_PDU(new_tvb, pinfo, elem_tree, NULL);
+					break;
+				case CAT_NMR_E_UTRAN:
+					new_tvb = tvb_new_subset_length(tvb, pos, len);
+					dissect_lte_rrc_MeasurementReport_PDU(new_tvb, pinfo, elem_tree, NULL);
+					break;
+				default:
+					break;
+				}
+			}
+			break;
 		case 0x19:	/* event list */
 			for (i = 0; i < len; i++) {
 				guint8 event = tvb_get_guint8(tvb, pos+i);
@@ -1367,8 +1443,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 				proto_tree_add_item(elem_tree, hf_ctlv_bearer, tvb, pos+i, 1, ENC_BIG_ENDIAN);
 			break;
 		case 0x35:	/* bearer description */
-			g8 = tvb_get_guint8(tvb, pos);
-			proto_tree_add_uint(elem_tree, hf_ctlv_bearer_descr, tvb, pos, 1, g8);
+			proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_bearer_descr, tvb, pos, 1, ENC_BIG_ENDIAN, &g8);
 			switch (g8) {
 			case 0x01:
 				proto_tree_add_item(elem_tree, hf_ctlv_bearer_csd_data_rate, tvb, pos+1, 1, ENC_BIG_ENDIAN);
@@ -1421,8 +1496,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 			proto_tree_add_item(elem_tree, hf_ctlv_transport_port, tvb, pos+1, 2, ENC_BIG_ENDIAN);
 			break;
 		case 0x3e:	/* other address */
-			g8 = tvb_get_guint8(tvb, pos);
-			proto_tree_add_uint(elem_tree, hf_ctlv_other_address_coding, tvb, pos, 1, g8);
+			proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_other_address_coding, tvb, pos, 1, ENC_BIG_ENDIAN, &g8);
 			switch (g8) {
 			case 0x21:
 				proto_tree_add_item(elem_tree, hf_ctlv_other_address_ipv4, tvb, pos+1, 4, ENC_NA);
@@ -1440,8 +1514,7 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 			break;
 		case 0x40:	/* Display parameters / DNS server address */
 			if (dns_server) {
-				g8 = tvb_get_guint8(tvb, pos);
-				proto_tree_add_uint(elem_tree, hf_ctlv_dns_server_address_coding, tvb, pos, 1, g8);
+				proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_dns_server_address_coding, tvb, pos, 1, ENC_BIG_ENDIAN, &g8);
 				switch (g8) {
 				case 0x21:
 					proto_tree_add_item(elem_tree, hf_ctlv_dns_server_address_ipv4, tvb, pos+1, 4, ENC_NA);
@@ -1458,12 +1531,20 @@ dissect_cat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 			de_sm_apn(tvb, elem_tree, pinfo, pos, len, NULL, 0);
 			break;
 		case 0x69:	/* UTRAN EUTRAN measurement qualifier */
-			proto_tree_add_item(elem_tree, hf_ctlv_utran_eutran_meas_qual, tvb, pos, 1, ENC_BIG_ENDIAN);
+			proto_tree_add_item_ret_uint(elem_tree, hf_ctlv_utran_eutran_meas_qual, tvb, pos, 1, ENC_BIG_ENDIAN, &g8);
+			if (cat_trans && ((cat_trans->id & 0x00ffff) == 0x2602)) {
+				if (g8 >= 1 && g8 <= 4)
+					cat_trans->nmr_type = CAT_NMR_UTRAN;
+				else if (g8 >= 5 && g8 <= 9)
+					cat_trans->nmr_type = CAT_NMR_E_UTRAN;
+				else
+					cat_trans->nmr_type = CAT_NMR_NONE;
+			}
 			break;
 		case 0x73:	/* Routing Area Information */
 			de_gmm_rai(tvb, elem_tree, pinfo, pos, len, NULL, 0);
 			break;
-		case 0x74:	/* Update/Attach Type */
+		case 0x74:	/* Update/Attach/Registration Type */
 			proto_tree_add_item(elem_tree, hf_ctlv_upd_attach_type, tvb, pos, 1, ENC_BIG_ENDIAN);
 			break;
 		case 0x76:	/* Geographical Location Parameters / IARI */
@@ -1980,7 +2061,7 @@ proto_register_card_app_toolkit(void)
 			  NULL, HFILL },
 		},
 		{ &hf_ctlv_upd_attach_type,
-			{ "UTRAN/E-UTRAN Measurement Qualifier", "etsi_cat.comp_tlv.upd_attach_type",
+			{ "Update/Attach/Registration", "etsi_cat.comp_tlv.upd_attach_type",
 			  FT_UINT8, BASE_HEX | BASE_EXT_STRING, &upd_attach_type_vals_ext, 0,
 			  NULL, HFILL },
 		},
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 082868262b..95c20e19cd 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -319,6 +319,7 @@ static int hf_lte_rrc_DL_DCCH_Message_PDU = -1;   /* DL_DCCH_Message */
 static int hf_lte_rrc_UL_CCCH_Message_PDU = -1;   /* UL_CCCH_Message */
 static int hf_lte_rrc_UL_DCCH_Message_PDU = -1;   /* UL_DCCH_Message */
 static int hf_lte_rrc_SC_MCCH_Message_r13_PDU = -1;  /* SC_MCCH_Message_r13 */
+static int hf_lte_rrc_lte_rrc_MeasurementReport_PDU = -1;  /* MeasurementReport */
 static int hf_lte_rrc_RRCConnectionReconfiguration_PDU = -1;  /* RRCConnectionReconfiguration */
 static int hf_lte_rrc_lte_rrc_RRCConnectionReconfigurationComplete_PDU = -1;  /* RRCConnectionReconfigurationComplete */
 static int hf_lte_rrc_UECapabilityInformation_PDU = -1;  /* UECapabilityInformation */
@@ -72624,6 +72625,8 @@ static const per_sequence_t MeasurementReport_sequence[] = {
 
 static int
 dissect_lte_rrc_MeasurementReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+  proto_item_set_hidden(prot_ti);
 
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MeasurementReport");
 
@@ -109395,6 +109398,16 @@ static int dissect_SC_MCCH_Message_r13_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
   offset += 7; offset >>= 3;
   return offset;
 }
+int dissect_lte_rrc_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+  proto_item_set_hidden(prot_ti);
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
+  offset = dissect_lte_rrc_MeasurementReport(tvb, offset, &asn1_ctx, tree, hf_lte_rrc_lte_rrc_MeasurementReport_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_RRCConnectionReconfiguration_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   proto_item *prot_ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
   proto_item_set_hidden(prot_ti);
@@ -110342,6 +110355,10 @@ void proto_register_lte_rrc(void) {
       { "SC-MCCH-Message-r13", "lte-rrc.SC_MCCH_Message_r13_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_lte_rrc_lte_rrc_MeasurementReport_PDU,
+      { "MeasurementReport", "lte-rrc.MeasurementReport_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_lte_rrc_RRCConnectionReconfiguration_PDU,
       { "RRCConnectionReconfiguration", "lte-rrc.RRCConnectionReconfiguration_element",
         FT_NONE, BASE_NONE, NULL, 0,
diff --git a/epan/dissectors/packet-lte-rrc.h b/epan/dissectors/packet-lte-rrc.h
index 1727819506..97a5dfc714 100644
--- a/epan/dissectors/packet-lte-rrc.h
+++ b/epan/dissectors/packet-lte-rrc.h
@@ -29,6 +29,7 @@ int dissect_lte_rrc_HandoverPreparationInformation_PDU(tvbuff_t *tvb _U_, packet
 int dissect_lte_rrc_SCG_Config_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_lte_rrc_SCG_ConfigInfo_r12_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_lte_rrc_UEPagingCoverageInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
+int dissect_lte_rrc_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_lte_rrc_RRCConnectionReconfigurationComplete_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_lte_rrc_RLF_Report_r9_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_lte_rrc_RLF_Report_v9e0_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index e8209ba87f..ff91fe39e1 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -489,6 +489,7 @@ static int hf_rrc_MCCH_Message_PDU = -1;          /* MCCH_Message */
 static int hf_rrc_MSCH_Message_PDU = -1;          /* MSCH_Message */
 static int hf_rrc_rrc_HandoverToUTRANCommand_PDU = -1;  /* HandoverToUTRANCommand */
 static int hf_rrc_rrc_InterRATHandoverInfo_PDU = -1;  /* InterRATHandoverInfo */
+static int hf_rrc_rrc_MeasurementReport_PDU = -1;  /* MeasurementReport */
 static int hf_rrc_SystemInformation_BCH_PDU = -1;  /* SystemInformation_BCH */
 static int hf_rrc_SystemInformation2_BCH_PDU = -1;  /* SystemInformation2_BCH */
 static int hf_rrc_System_Information_Container_PDU = -1;  /* System_Information_Container */
@@ -557,7 +558,6 @@ static int hf_rrc_URAUpdate_r3_add_ext_IEs_PDU = -1;  /* URAUpdate_r3_add_ext_IE
 static int hf_rrc_SRNC_RelocationInfo_v3h0ext_IEs_PDU = -1;  /* SRNC_RelocationInfo_v3h0ext_IEs */
 static int hf_rrc_SRNC_RelocationInfo_r6_add_ext_IEs_PDU = -1;  /* SRNC_RelocationInfo_r6_add_ext_IEs */
 static int hf_rrc_SRNC_RelocationInfo_r7_add_ext_IEs_PDU = -1;  /* SRNC_RelocationInfo_r7_add_ext_IEs */
-static int hf_rrc_MeasurementReport_PDU = -1;     /* MeasurementReport */
 static int hf_rrc_integrityCheckInfo = -1;        /* IntegrityCheckInfo */
 static int hf_rrc_message = -1;                   /* DL_DCCH_MessageType */
 static int hf_rrc_activeSetUpdate = -1;           /* ActiveSetUpdate */
@@ -18463,7 +18463,6 @@ static int dissect_URAUpdate_r3_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *
 static int dissect_SRNC_RelocationInfo_v3h0ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 static int dissect_SRNC_RelocationInfo_r6_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 static int dissect_SRNC_RelocationInfo_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
-static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 
 
 
@@ -18689,7 +18688,7 @@ dissect_rrc_ActivationTime(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
 
 static int
 dissect_rrc_RB_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1424 "./asn1/rrc/rrc.cnf"
+#line 1426 "./asn1/rrc/rrc.cnf"
 guint32 rbid;
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             1U, 32U, &rbid, FALSE);
@@ -18706,7 +18705,7 @@ private_data_set_rbid(actx, rbid);
 
 static int
 dissect_rrc_RLC_SequenceNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1430 "./asn1/rrc/rrc.cnf"
+#line 1432 "./asn1/rrc/rrc.cnf"
 guint32 rlc_ciphering_sqn;
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, 4095U, &rlc_ciphering_sqn, FALSE);
@@ -18727,7 +18726,7 @@ static const per_sequence_t RB_ActivationTimeInfo_sequence[] = {
 
 static int
 dissect_rrc_RB_ActivationTimeInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1394 "./asn1/rrc/rrc.cnf"
+#line 1396 "./asn1/rrc/rrc.cnf"
   fp_info            *fpinf;
   rlc_info           *rlcinf;
   rrc_ciphering_info *ciphering_info;
@@ -18798,7 +18797,7 @@ dissect_rrc_CipheringModeInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 
 static int
 dissect_rrc_SRNC_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1108 "./asn1/rrc/rrc.cnf"
+#line 1110 "./asn1/rrc/rrc.cnf"
   tvbuff_t * s_rnc_id_tvb = NULL;
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
                                      12, 12, FALSE, &s_rnc_id_tvb, NULL);
@@ -18816,7 +18815,7 @@ dissect_rrc_SRNC_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 
 static int
 dissect_rrc_S_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1115 "./asn1/rrc/rrc.cnf"
+#line 1117 "./asn1/rrc/rrc.cnf"
   tvbuff_t * s_rnti_tvb  = NULL;
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
                                      20, 20, FALSE, &s_rnti_tvb, NULL);
@@ -18839,7 +18838,7 @@ static const per_sequence_t U_RNTI_sequence[] = {
 
 static int
 dissect_rrc_U_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1122 "./asn1/rrc/rrc.cnf"
+#line 1124 "./asn1/rrc/rrc.cnf"
   private_data_set_s_rnc_id(actx, 0);
   private_data_set_s_rnti(actx, 0);
   guint32 s_rnc_id;
@@ -18893,7 +18892,7 @@ dissect_rrc_U_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
 
 static int
 dissect_rrc_Digit(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 990 "./asn1/rrc/rrc.cnf"
+#line 992 "./asn1/rrc/rrc.cnf"
   guint32 digit;
   wmem_strbuf_t* digits_strbuf; /* The string of either an IMSI or a MCC-MNC pair */
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
@@ -18962,7 +18961,7 @@ static const per_sequence_t PLMN_Identity_sequence[] = {
 
 static int
 dissect_rrc_PLMN_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 897 "./asn1/rrc/rrc.cnf"
+#line 899 "./asn1/rrc/rrc.cnf"
   wmem_strbuf_t* mcc_mnc_strbuf;
   guint32 string_len;
   gchar* mcc_mnc_string;
@@ -19003,7 +19002,7 @@ dissect_rrc_PLMN_Identity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 
 static int
 dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1076 "./asn1/rrc/rrc.cnf"
+#line 1078 "./asn1/rrc/rrc.cnf"
   tvbuff_t *nas_sys_info_gsm_map_tvb = NULL;
   guint32 length;
   enum nas_sys_info_gsm_map cn_domain;
@@ -19046,7 +19045,7 @@ dissect_rrc_NAS_SystemInformationGSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1
 
 static int
 dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1060 "./asn1/rrc/rrc.cnf"
+#line 1062 "./asn1/rrc/rrc.cnf"
   private_data_set_cn_domain(actx, RRC_NAS_SYS_INFO_CN_COMMON);
   offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index);
 
@@ -19066,7 +19065,7 @@ static const value_string rrc_CN_DomainIdentity_vals[] = {
 
 static int
 dissect_rrc_CN_DomainIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1053 "./asn1/rrc/rrc.cnf"
+#line 1055 "./asn1/rrc/rrc.cnf"
   guint32 nas_sys_info;
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      2, &nas_sys_info, FALSE, 0, NULL);
@@ -22725,7 +22724,7 @@ dissect_rrc_SSDT_UL(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
 
 static int
 dissect_rrc_CellIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1248 "./asn1/rrc/rrc.cnf"
+#line 1250 "./asn1/rrc/rrc.cnf"
   tvbuff_t * cell_id_tvb = NULL;
   proto_item *temp_ti;
   proto_tree *cell_identity_tree;
@@ -22950,7 +22949,7 @@ dissect_rrc_T_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_
 
 static int
 dissect_rrc_H_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1336 "./asn1/rrc/rrc.cnf"
+#line 1338 "./asn1/rrc/rrc.cnf"
   tvbuff_t *hrnti_tvb;
   struct rrc_info *rrcinf;
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
@@ -22959,7 +22958,7 @@ dissect_rrc_H_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
 
 
 
-#line 1341 "./asn1/rrc/rrc.cnf"
+#line 1343 "./asn1/rrc/rrc.cnf"
   rrcinf = (struct rrc_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_rrc, 0);
   if (!rrcinf) {
     rrcinf = wmem_new0(wmem_file_scope(), struct rrc_info);
@@ -22985,7 +22984,7 @@ dissect_rrc_E_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, prot
 
 static int
 dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1064 "./asn1/rrc/rrc.cnf"
+#line 1066 "./asn1/rrc/rrc.cnf"
   private_data_set_cn_domain(actx, RRC_NAS_SYS_INFO_CN_COMMON);
   offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index);
 
@@ -28459,7 +28458,7 @@ dissect_rrc_ScramblingCodeType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 static int
 dissect_rrc_UL_ScramblingCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1235 "./asn1/rrc/rrc.cnf"
+#line 1237 "./asn1/rrc/rrc.cnf"
 guint32 scrambling_code;
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, 16777215U, &scrambling_code, FALSE);
@@ -33577,7 +33576,7 @@ static const per_choice_t ActiveSetUpdate_choice[] = {
 
 static int
 dissect_rrc_ActiveSetUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 197 "./asn1/rrc/rrc.cnf"
+#line 199 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdate");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_ActiveSetUpdate, ActiveSetUpdate_choice,
@@ -38772,7 +38771,7 @@ static const per_choice_t AssistanceDataDelivery_choice[] = {
 
 static int
 dissect_rrc_AssistanceDataDelivery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 209 "./asn1/rrc/rrc.cnf"
+#line 211 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "AssistanceDataDelivery");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_AssistanceDataDelivery, AssistanceDataDelivery_choice,
@@ -39013,7 +39012,7 @@ dissect_rrc_CellChangeOrderFromUTRAN_r3_IEs(tvbuff_t *tvb _U_, int offset _U_, a
 
 static int
 dissect_rrc_GERAN_SystemInfoBlock(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 806 "./asn1/rrc/rrc.cnf"
+#line 808 "./asn1/rrc/rrc.cnf"
   tvbuff_t *parameter_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -39188,7 +39187,7 @@ static const per_choice_t CellChangeOrderFromUTRAN_choice[] = {
 
 static int
 dissect_rrc_CellChangeOrderFromUTRAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 213 "./asn1/rrc/rrc.cnf"
+#line 215 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRAN");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_CellChangeOrderFromUTRAN, CellChangeOrderFromUTRAN_choice,
@@ -39204,7 +39203,7 @@ dissect_rrc_CellChangeOrderFromUTRAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 
 static int
 dissect_rrc_C_RNTI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1165 "./asn1/rrc/rrc.cnf"
+#line 1167 "./asn1/rrc/rrc.cnf"
   fp_info *fpinf = NULL;
   umts_mac_info *macinf = NULL;
   rlc_info *rlcinf = NULL;
@@ -39293,7 +39292,7 @@ static const value_string rrc_RRC_StateIndicator_vals[] = {
 
 static int
 dissect_rrc_RRC_StateIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1240 "./asn1/rrc/rrc.cnf"
+#line 1242 "./asn1/rrc/rrc.cnf"
 gint32 state_dec = -1;
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      4, &state_dec, FALSE, 0, NULL);
@@ -46322,7 +46321,7 @@ dissect_rrc_RLC_Info_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 static int
 dissect_rrc_MAC_d_FlowIdentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1333 "./asn1/rrc/rrc.cnf"
+#line 1335 "./asn1/rrc/rrc.cnf"
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, 7U, &flowd, FALSE);
 
@@ -46370,7 +46369,7 @@ static const per_choice_t DL_TransportChannelType_r5_choice[] = {
 
 static int
 dissect_rrc_DL_TransportChannelType_r5(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1262 "./asn1/rrc/rrc.cnf"
+#line 1264 "./asn1/rrc/rrc.cnf"
 /*Here we try to figure out which HS-DSCH channels are multiplexed*/
     guint *flowd_p;
     guint *cur_val=NULL;
@@ -49844,7 +49843,7 @@ static const per_choice_t DL_TransportChannelType_r7_choice[] = {
 
 static int
 dissect_rrc_DL_TransportChannelType_r7(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1297 "./asn1/rrc/rrc.cnf"
+#line 1299 "./asn1/rrc/rrc.cnf"
 /*Here we try to figure out which HS-DSCH channels are multiplexed*/
     guint *flowd_p;
     guint *cur_val=NULL;
@@ -63688,7 +63687,7 @@ static const per_choice_t CellUpdateConfirm_choice[] = {
 
 static int
 dissect_rrc_CellUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 253 "./asn1/rrc/rrc.cnf"
+#line 255 "./asn1/rrc/rrc.cnf"
   fp_info  *fpinf = NULL;
   rlc_info *rlcinf = NULL;
   guint32 u_rnti;
@@ -63861,7 +63860,7 @@ static const per_choice_t CounterCheck_choice[] = {
 
 static int
 dissect_rrc_CounterCheck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 277 "./asn1/rrc/rrc.cnf"
+#line 279 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_CounterCheck, CounterCheck_choice,
@@ -63877,7 +63876,7 @@ dissect_rrc_CounterCheck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 
 static int
 dissect_rrc_NAS_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 179 "./asn1/rrc/rrc.cnf"
+#line 181 "./asn1/rrc/rrc.cnf"
   tvbuff_t *nas_message_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -63994,7 +63993,7 @@ static const per_choice_t DownlinkDirectTransfer_choice[] = {
 
 static int
 dissect_rrc_DownlinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 285 "./asn1/rrc/rrc.cnf"
+#line 287 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "DownlinkDirectTransfer");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_DownlinkDirectTransfer, DownlinkDirectTransfer_choice,
@@ -64013,7 +64012,7 @@ static const per_sequence_t T_single_GSM_Message_r3_sequence[] = {
 
 static int
 dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 775 "./asn1/rrc/rrc.cnf"
+#line 777 "./asn1/rrc/rrc.cnf"
   tvbuff_t *gsm_message_tvb=NULL;
   guint bits_remaining, whole_octets_remaining;
 
@@ -64039,7 +64038,7 @@ dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 
 static int
 dissect_rrc_GSM_MessageList_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 767 "./asn1/rrc/rrc.cnf"
+#line 769 "./asn1/rrc/rrc.cnf"
   tvbuff_t *gsm_messagelist_tvb=NULL;
 
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
@@ -64299,7 +64298,7 @@ static const per_sequence_t T_single_GSM_Message_r6_sequence[] = {
 
 static int
 dissect_rrc_T_single_GSM_Message_r6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 790 "./asn1/rrc/rrc.cnf"
+#line 792 "./asn1/rrc/rrc.cnf"
   tvbuff_t *gsm_message_tvb=NULL;
   guint bits_remaining, whole_octets_remaining;
 
@@ -64507,7 +64506,7 @@ static const per_choice_t HandoverFromUTRANCommand_GSM_choice[] = {
 
 static int
 dissect_rrc_HandoverFromUTRANCommand_GSM(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 309 "./asn1/rrc/rrc.cnf"
+#line 311 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GSM");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_HandoverFromUTRANCommand_GSM, HandoverFromUTRANCommand_GSM_choice,
@@ -64661,7 +64660,7 @@ static const per_choice_t HandoverFromUTRANCommand_CDMA2000_choice[] = {
 
 static int
 dissect_rrc_HandoverFromUTRANCommand_CDMA2000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 313 "./asn1/rrc/rrc.cnf"
+#line 315 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-CDMA2000");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_HandoverFromUTRANCommand_CDMA2000, HandoverFromUTRANCommand_CDMA2000_choice,
@@ -78354,7 +78353,7 @@ static const per_choice_t MeasurementControl_choice[] = {
 
 static int
 dissect_rrc_MeasurementControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 361 "./asn1/rrc/rrc.cnf"
+#line 363 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControl");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_MeasurementControl, MeasurementControl_choice,
@@ -78446,7 +78445,7 @@ static const per_sequence_t PagingType2_sequence[] = {
 
 static int
 dissect_rrc_PagingType2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 377 "./asn1/rrc/rrc.cnf"
+#line 379 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType2");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_PagingType2, PagingType2_sequence);
@@ -80455,7 +80454,7 @@ static const per_choice_t PhysicalChannelReconfiguration_choice[] = {
 
 static int
 dissect_rrc_PhysicalChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 381 "./asn1/rrc/rrc.cnf"
+#line 383 "./asn1/rrc/rrc.cnf"
   fp_info  *fpinf = NULL;
   rlc_info *rlcinf = NULL;
   guint32 u_rnti;
@@ -81780,7 +81779,7 @@ static const per_choice_t PhysicalSharedChannelAllocation_choice[] = {
 
 static int
 dissect_rrc_PhysicalSharedChannelAllocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 414 "./asn1/rrc/rrc.cnf"
+#line 416 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalSharedChannelAllocation");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_PhysicalSharedChannelAllocation, PhysicalSharedChannelAllocation_choice,
@@ -85970,7 +85969,7 @@ static const per_choice_t RadioBearerReconfiguration_choice[] = {
 
 static int
 dissect_rrc_RadioBearerReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 422 "./asn1/rrc/rrc.cnf"
+#line 424 "./asn1/rrc/rrc.cnf"
   fp_info  *fpinf = NULL;
   rlc_info *rlcinf = NULL;
   guint32 u_rnti;
@@ -88223,7 +88222,7 @@ static const per_choice_t RadioBearerRelease_choice[] = {
 
 static int
 dissect_rrc_RadioBearerRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 455 "./asn1/rrc/rrc.cnf"
+#line 457 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerRelease");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RadioBearerRelease, RadioBearerRelease_choice,
@@ -91178,7 +91177,7 @@ static const per_choice_t RadioBearerSetup_choice[] = {
 
 static int
 dissect_rrc_RadioBearerSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 467 "./asn1/rrc/rrc.cnf"
+#line 469 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetup");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RadioBearerSetup, RadioBearerSetup_choice,
@@ -91216,7 +91215,7 @@ static const value_string rrc_ReleaseCause_vals[] = {
 
 static int
 dissect_rrc_ReleaseCause(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1452 "./asn1/rrc/rrc.cnf"
+#line 1454 "./asn1/rrc/rrc.cnf"
   guint32 value;
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      8, &value, FALSE, 0, NULL);
@@ -91946,7 +91945,7 @@ static const per_choice_t RRCConnectionRelease_choice[] = {
 
 static int
 dissect_rrc_RRCConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 483 "./asn1/rrc/rrc.cnf"
+#line 485 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RRCConnectionRelease, RRCConnectionRelease_choice,
@@ -91962,7 +91961,7 @@ dissect_rrc_RRCConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 
 static int
 dissect_rrc_T_cipheringAlgorithmCap(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 680 "./asn1/rrc/rrc.cnf"
+#line 682 "./asn1/rrc/rrc.cnf"
     tvbuff_t *cap_tvb=NULL;
     proto_tree *subtree;
 
@@ -92004,7 +92003,7 @@ dissect_rrc_T_cipheringAlgorithmCap(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 
 static int
 dissect_rrc_T_integrityProtectionAlgorithmCap(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 711 "./asn1/rrc/rrc.cnf"
+#line 713 "./asn1/rrc/rrc.cnf"
     tvbuff_t *cap_tvb=NULL;
     proto_tree *subtree;
 
@@ -92061,7 +92060,7 @@ dissect_rrc_SecurityCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 static int
 dissect_rrc_GsmSecurityCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 742 "./asn1/rrc/rrc.cnf"
+#line 744 "./asn1/rrc/rrc.cnf"
     tvbuff_t *cap_tvb=NULL;
     proto_tree *subtree;
 
@@ -92307,7 +92306,7 @@ static const per_choice_t SecurityModeCommand_choice[] = {
 
 static int
 dissect_rrc_SecurityModeCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 519 "./asn1/rrc/rrc.cnf"
+#line 521 "./asn1/rrc/rrc.cnf"
   fp_info            *fpinf;
   rlc_info           *rlcinf;
   rrc_ciphering_info *ciphering_info = NULL;
@@ -92466,7 +92465,7 @@ static const per_choice_t SignallingConnectionRelease_choice[] = {
 
 static int
 dissect_rrc_SignallingConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 567 "./asn1/rrc/rrc.cnf"
+#line 569 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionRelease");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_SignallingConnectionRelease, SignallingConnectionRelease_choice,
@@ -94573,7 +94572,7 @@ static const per_choice_t TransportChannelReconfiguration_choice[] = {
 
 static int
 dissect_rrc_TransportChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 587 "./asn1/rrc/rrc.cnf"
+#line 589 "./asn1/rrc/rrc.cnf"
   fp_info  *fpinf = NULL;
   rlc_info *rlcinf = NULL;
   guint32 u_rnti;
@@ -94739,7 +94738,7 @@ static const per_sequence_t TransportFormatCombinationControl_sequence[] = {
 
 static int
 dissect_rrc_TransportFormatCombinationControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 620 "./asn1/rrc/rrc.cnf"
+#line 622 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControl");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_TransportFormatCombinationControl, TransportFormatCombinationControl_sequence);
@@ -95172,7 +95171,7 @@ static const per_choice_t UECapabilityEnquiry_choice[] = {
 
 static int
 dissect_rrc_UECapabilityEnquiry(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 628 "./asn1/rrc/rrc.cnf"
+#line 630 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_UECapabilityEnquiry, UECapabilityEnquiry_choice,
@@ -95330,7 +95329,7 @@ static const per_choice_t UECapabilityInformationConfirm_choice[] = {
 
 static int
 dissect_rrc_UECapabilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 636 "./asn1/rrc/rrc.cnf"
+#line 638 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformationConfirm");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_UECapabilityInformationConfirm, UECapabilityInformationConfirm_choice,
@@ -96094,7 +96093,7 @@ static const per_choice_t UplinkPhysicalChannelControl_choice[] = {
 
 static int
 dissect_rrc_UplinkPhysicalChannelControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 652 "./asn1/rrc/rrc.cnf"
+#line 654 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkPhysicalChannelControl");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_UplinkPhysicalChannelControl, UplinkPhysicalChannelControl_choice,
@@ -96437,7 +96436,7 @@ static const per_choice_t URAUpdateConfirm_choice[] = {
 
 static int
 dissect_rrc_URAUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 660 "./asn1/rrc/rrc.cnf"
+#line 662 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_URAUpdateConfirm, URAUpdateConfirm_choice,
@@ -96900,7 +96899,7 @@ dissect_rrc_UE_ConnTimersAndConstants(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
 
 static int
 dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1068 "./asn1/rrc/rrc.cnf"
+#line 1070 "./asn1/rrc/rrc.cnf"
   private_data_set_cn_domain(actx, RRC_NAS_SYS_INFO_CN_COMMON);
   offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index);
 
@@ -98785,7 +98784,7 @@ static const per_choice_t UTRANMobilityInformation_choice[] = {
 
 static int
 dissect_rrc_UTRANMobilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 668 "./asn1/rrc/rrc.cnf"
+#line 670 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformation");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_UTRANMobilityInformation, UTRANMobilityInformation_choice,
@@ -98972,7 +98971,7 @@ static const per_sequence_t HandoverFromUTRANCommand_GERANIu_sequence[] = {
 
 static int
 dissect_rrc_HandoverFromUTRANCommand_GERANIu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 305 "./asn1/rrc/rrc.cnf"
+#line 307 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GERANIu");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_HandoverFromUTRANCommand_GERANIu, HandoverFromUTRANCommand_GERANIu_sequence);
@@ -99410,7 +99409,7 @@ static const per_sequence_t MBMSModifiedServicesInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSModifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 345 "./asn1/rrc/rrc.cnf"
+#line 347 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModifiedServicesInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSModifiedServicesInformation, MBMSModifiedServicesInformation_sequence);
@@ -99490,7 +99489,7 @@ static const per_sequence_t ETWSPrimaryNotificationWithSecurity_sequence[] = {
 
 static int
 dissect_rrc_ETWSPrimaryNotificationWithSecurity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 289 "./asn1/rrc/rrc.cnf"
+#line 291 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "ETWSPrimaryNotificationWithSecurity");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_ETWSPrimaryNotificationWithSecurity, ETWSPrimaryNotificationWithSecurity_sequence);
@@ -99505,7 +99504,7 @@ dissect_rrc_ETWSPrimaryNotificationWithSecurity(tvbuff_t *tvb _U_, int offset _U
 
 static int
 dissect_rrc_T_eutra_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 861 "./asn1/rrc/rrc.cnf"
+#line 863 "./asn1/rrc/rrc.cnf"
   tvbuff_t *eutra_message_tvb = NULL;
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        NO_BOUND, NO_BOUND, FALSE, &eutra_message_tvb);
@@ -99567,7 +99566,7 @@ dissect_rrc_T_r8_04(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
 
 static int
 dissect_rrc_T_ims_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1015 "./asn1/rrc/rrc.cnf"
+#line 1017 "./asn1/rrc/rrc.cnf"
   tvbuff_t *imsInformation_tvb=NULL;
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        1, 32, FALSE, &imsInformation_tvb);
@@ -99622,7 +99621,7 @@ dissect_rrc_RSR_VCC_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 
 static int
 dissect_rrc_T_eutra_Message_01(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 867 "./asn1/rrc/rrc.cnf"
+#line 869 "./asn1/rrc/rrc.cnf"
   tvbuff_t *eutra_message_tvb = NULL;
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        NO_BOUND, NO_BOUND, FALSE, &eutra_message_tvb);
@@ -99747,7 +99746,7 @@ static const per_sequence_t HandoverFromUTRANCommand_EUTRA_sequence[] = {
 
 static int
 dissect_rrc_HandoverFromUTRANCommand_EUTRA(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 301 "./asn1/rrc/rrc.cnf"
+#line 303 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-EUTRA");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_HandoverFromUTRANCommand_EUTRA, HandoverFromUTRANCommand_EUTRA_sequence);
@@ -99988,7 +99987,7 @@ static const per_sequence_t UEInformationRequest_sequence[] = {
 
 static int
 dissect_rrc_UEInformationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 640 "./asn1/rrc/rrc.cnf"
+#line 642 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UEInformationRequest");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UEInformationRequest, UEInformationRequest_sequence);
@@ -100669,7 +100668,7 @@ static const per_sequence_t LoggingMeasurementConfiguration_sequence[] = {
 
 static int
 dissect_rrc_LoggingMeasurementConfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 321 "./asn1/rrc/rrc.cnf"
+#line 323 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "LoggingMeasurementConfiguration");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_LoggingMeasurementConfiguration, LoggingMeasurementConfiguration_sequence);
@@ -100757,7 +100756,7 @@ static const per_choice_t DL_DCCH_MessageType_choice[] = {
 
 static int
 dissect_rrc_DL_DCCH_MessageType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1435 "./asn1/rrc/rrc.cnf"
+#line 1437 "./asn1/rrc/rrc.cnf"
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_DL_DCCH_MessageType, DL_DCCH_MessageType_choice,
                                  &msg_type);
@@ -100777,7 +100776,7 @@ static const per_sequence_t DL_DCCH_Message_sequence[] = {
 
 static int
 dissect_rrc_DL_DCCH_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1438 "./asn1/rrc/rrc.cnf"
+#line 1440 "./asn1/rrc/rrc.cnf"
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_DL_DCCH_Message, DL_DCCH_Message_sequence);
 
@@ -100791,7 +100790,7 @@ dissect_rrc_DL_DCCH_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 
 static int
 dissect_rrc_START_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1349 "./asn1/rrc/rrc.cnf"
+#line 1351 "./asn1/rrc/rrc.cnf"
   tvbuff_t * start_val;
   fp_info       *fpinf;
   rlc_info      *rlcinf;
@@ -100927,7 +100926,7 @@ static const per_sequence_t ActiveSetUpdateComplete_sequence[] = {
 
 static int
 dissect_rrc_ActiveSetUpdateComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 201 "./asn1/rrc/rrc.cnf"
+#line 203 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_ActiveSetUpdateComplete, ActiveSetUpdateComplete_sequence);
@@ -101098,7 +101097,7 @@ static const per_sequence_t ActiveSetUpdateFailure_sequence[] = {
 
 static int
 dissect_rrc_ActiveSetUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 205 "./asn1/rrc/rrc.cnf"
+#line 207 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_ActiveSetUpdateFailure, ActiveSetUpdateFailure_sequence);
@@ -101245,7 +101244,7 @@ static const per_choice_t CellChangeOrderFromUTRANFailure_choice[] = {
 
 static int
 dissect_rrc_CellChangeOrderFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 217 "./asn1/rrc/rrc.cnf"
+#line 219 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRANFailure");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_CellChangeOrderFromUTRANFailure, CellChangeOrderFromUTRANFailure_choice,
@@ -101335,7 +101334,7 @@ static const per_sequence_t CounterCheckResponse_sequence[] = {
 
 static int
 dissect_rrc_CounterCheckResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 281 "./asn1/rrc/rrc.cnf"
+#line 283 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_CounterCheckResponse, CounterCheckResponse_sequence);
@@ -101472,7 +101471,7 @@ static const per_sequence_t HandoverToUTRANComplete_sequence[] = {
 
 static int
 dissect_rrc_HandoverToUTRANComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 293 "./asn1/rrc/rrc.cnf"
+#line 295 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverToUTRANComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_HandoverToUTRANComplete, HandoverToUTRANComplete_sequence);
@@ -102571,7 +102570,7 @@ static const per_sequence_t InitialDirectTransfer_sequence[] = {
 
 static int
 dissect_rrc_InitialDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 297 "./asn1/rrc/rrc.cnf"
+#line 299 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "InitialDirectTransfer");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_InitialDirectTransfer, InitialDirectTransfer_sequence);
@@ -102700,7 +102699,7 @@ dissect_rrc_HandoverFromUtranFailure_v590ext_IEs(tvbuff_t *tvb _U_, int offset _
 
 static int
 dissect_rrc_T_eutra_Message_02(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 873 "./asn1/rrc/rrc.cnf"
+#line 875 "./asn1/rrc/rrc.cnf"
   tvbuff_t *eutra_message_tvb = NULL;
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        NO_BOUND, NO_BOUND, FALSE, &eutra_message_tvb);
@@ -102796,7 +102795,7 @@ static const per_sequence_t HandoverFromUTRANFailure_sequence[] = {
 
 static int
 dissect_rrc_HandoverFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 317 "./asn1/rrc/rrc.cnf"
+#line 319 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_HandoverFromUTRANFailure, HandoverFromUTRANFailure_sequence);
@@ -102903,7 +102902,7 @@ static const per_sequence_t MeasurementControlFailure_sequence[] = {
 
 static int
 dissect_rrc_MeasurementControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 365 "./asn1/rrc/rrc.cnf"
+#line 367 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControlFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MeasurementControlFailure, MeasurementControlFailure_sequence);
@@ -108704,7 +108703,9 @@ static const per_sequence_t MeasurementReport_sequence[] = {
 
 static int
 dissect_rrc_MeasurementReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 369 "./asn1/rrc/rrc.cnf"
+  proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA);
+  proto_item_set_hidden(prot_ti);
+#line 371 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MeasurementReport, MeasurementReport_sequence);
@@ -108802,7 +108803,7 @@ static const per_sequence_t PhysicalChannelReconfigurationComplete_sequence[] =
 
 static int
 dissect_rrc_PhysicalChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 406 "./asn1/rrc/rrc.cnf"
+#line 408 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_PhysicalChannelReconfigurationComplete, PhysicalChannelReconfigurationComplete_sequence);
@@ -108851,7 +108852,7 @@ static const per_sequence_t PhysicalChannelReconfigurationFailure_sequence[] = {
 
 static int
 dissect_rrc_PhysicalChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 410 "./asn1/rrc/rrc.cnf"
+#line 412 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_PhysicalChannelReconfigurationFailure, PhysicalChannelReconfigurationFailure_sequence);
@@ -108949,7 +108950,7 @@ static const per_sequence_t RadioBearerReconfigurationComplete_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 447 "./asn1/rrc/rrc.cnf"
+#line 449 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerReconfigurationComplete, RadioBearerReconfigurationComplete_sequence);
@@ -108999,7 +109000,7 @@ static const per_sequence_t RadioBearerReconfigurationFailure_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 451 "./asn1/rrc/rrc.cnf"
+#line 453 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerReconfigurationFailure, RadioBearerReconfigurationFailure_sequence);
@@ -109097,7 +109098,7 @@ static const per_sequence_t RadioBearerReleaseComplete_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 459 "./asn1/rrc/rrc.cnf"
+#line 461 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerReleaseComplete, RadioBearerReleaseComplete_sequence);
@@ -109147,7 +109148,7 @@ static const per_sequence_t RadioBearerReleaseFailure_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerReleaseFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 463 "./asn1/rrc/rrc.cnf"
+#line 465 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerReleaseFailure, RadioBearerReleaseFailure_sequence);
@@ -109246,7 +109247,7 @@ static const per_sequence_t RadioBearerSetupComplete_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 471 "./asn1/rrc/rrc.cnf"
+#line 473 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerSetupComplete, RadioBearerSetupComplete_sequence);
@@ -109296,7 +109297,7 @@ static const per_sequence_t RadioBearerSetupFailure_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 475 "./asn1/rrc/rrc.cnf"
+#line 477 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerSetupFailure, RadioBearerSetupFailure_sequence);
@@ -109345,7 +109346,7 @@ static const per_sequence_t RRCConnectionReleaseComplete_sequence[] = {
 
 static int
 dissect_rrc_RRCConnectionReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 491 "./asn1/rrc/rrc.cnf"
+#line 493 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReleaseComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RRCConnectionReleaseComplete, RRCConnectionReleaseComplete_sequence);
@@ -110360,7 +110361,7 @@ dissect_rrc_UE_RadioAccessCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 
 static int
 dissect_rrc_GSM_Classmark2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 823 "./asn1/rrc/rrc.cnf"
+#line 825 "./asn1/rrc/rrc.cnf"
   tvbuff_t *parameter_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -110379,7 +110380,7 @@ dissect_rrc_GSM_Classmark2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _
 
 static int
 dissect_rrc_GSM_Classmark3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 831 "./asn1/rrc/rrc.cnf"
+#line 833 "./asn1/rrc/rrc.cnf"
   tvbuff_t *parameter_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -111893,7 +111894,7 @@ static const per_sequence_t RRCConnectionSetupComplete_sequence[] = {
 
 static int
 dissect_rrc_RRCConnectionSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 511 "./asn1/rrc/rrc.cnf"
+#line 513 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RRCConnectionSetupComplete, RRCConnectionSetupComplete_sequence);
@@ -112074,7 +112075,7 @@ static const per_sequence_t RRCStatus_sequence[] = {
 
 static int
 dissect_rrc_RRCStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 515 "./asn1/rrc/rrc.cnf"
+#line 517 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCStatus");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RRCStatus, RRCStatus_sequence);
@@ -112124,7 +112125,7 @@ static const per_sequence_t SecurityModeComplete_sequence[] = {
 
 static int
 dissect_rrc_SecurityModeComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 540 "./asn1/rrc/rrc.cnf"
+#line 542 "./asn1/rrc/rrc.cnf"
   fp_info            *fpinf;
   rlc_info           *rlcinf;
   rrc_ciphering_info *ciphering_info = NULL;
@@ -112192,7 +112193,7 @@ static const per_sequence_t SecurityModeFailure_sequence[] = {
 
 static int
 dissect_rrc_SecurityModeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 563 "./asn1/rrc/rrc.cnf"
+#line 565 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SecurityModeFailure, SecurityModeFailure_sequence);
@@ -112285,7 +112286,7 @@ static const per_sequence_t SignallingConnectionReleaseIndication_sequence[] = {
 
 static int
 dissect_rrc_SignallingConnectionReleaseIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 571 "./asn1/rrc/rrc.cnf"
+#line 573 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionReleaseIndication");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SignallingConnectionReleaseIndication, SignallingConnectionReleaseIndication_sequence);
@@ -112383,7 +112384,7 @@ static const per_sequence_t TransportChannelReconfigurationComplete_sequence[] =
 
 static int
 dissect_rrc_TransportChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 612 "./asn1/rrc/rrc.cnf"
+#line 614 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_TransportChannelReconfigurationComplete, TransportChannelReconfigurationComplete_sequence);
@@ -112432,7 +112433,7 @@ static const per_sequence_t TransportChannelReconfigurationFailure_sequence[] =
 
 static int
 dissect_rrc_TransportChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 616 "./asn1/rrc/rrc.cnf"
+#line 618 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_TransportChannelReconfigurationFailure, TransportChannelReconfigurationFailure_sequence);
@@ -112481,7 +112482,7 @@ static const per_sequence_t TransportFormatCombinationControlFailure_sequence[]
 
 static int
 dissect_rrc_TransportFormatCombinationControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 624 "./asn1/rrc/rrc.cnf"
+#line 626 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControlFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_TransportFormatCombinationControlFailure, TransportFormatCombinationControlFailure_sequence);
@@ -112757,7 +112758,7 @@ static const per_sequence_t UECapabilityInformation_sequence[] = {
 
 static int
 dissect_rrc_UECapabilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 632 "./asn1/rrc/rrc.cnf"
+#line 634 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UECapabilityInformation, UECapabilityInformation_sequence);
@@ -112952,7 +112953,7 @@ static const per_sequence_t UplinkDirectTransfer_sequence[] = {
 
 static int
 dissect_rrc_UplinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 648 "./asn1/rrc/rrc.cnf"
+#line 650 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkDirectTransfer");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UplinkDirectTransfer, UplinkDirectTransfer_sequence);
@@ -113092,7 +113093,7 @@ static const per_sequence_t UTRANMobilityInformationConfirm_sequence[] = {
 
 static int
 dissect_rrc_UTRANMobilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 672 "./asn1/rrc/rrc.cnf"
+#line 674 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationConfirm");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UTRANMobilityInformationConfirm, UTRANMobilityInformationConfirm_sequence);
@@ -113141,7 +113142,7 @@ static const per_sequence_t UTRANMobilityInformationFailure_sequence[] = {
 
 static int
 dissect_rrc_UTRANMobilityInformationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 676 "./asn1/rrc/rrc.cnf"
+#line 678 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UTRANMobilityInformationFailure, UTRANMobilityInformationFailure_sequence);
@@ -113298,7 +113299,7 @@ static const per_sequence_t MBMSModificationRequest_sequence[] = {
 
 static int
 dissect_rrc_MBMSModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 341 "./asn1/rrc/rrc.cnf"
+#line 343 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModificationRequest");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSModificationRequest, MBMSModificationRequest_sequence);
@@ -114958,7 +114959,7 @@ static const per_sequence_t UEInformationResponse_sequence[] = {
 
 static int
 dissect_rrc_UEInformationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 644 "./asn1/rrc/rrc.cnf"
+#line 646 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UEInformationResponse");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UEInformationResponse, UEInformationResponse_sequence);
@@ -116010,7 +116011,7 @@ static const per_choice_t CellUpdateConfirm_CCCH_choice[] = {
 
 static int
 dissect_rrc_CellUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 229 "./asn1/rrc/rrc.cnf"
+#line 231 "./asn1/rrc/rrc.cnf"
   fp_info  *fpinf = NULL;
   rlc_info *rlcinf = NULL;
   guint32 u_rnti;
@@ -116049,7 +116050,7 @@ static const per_sequence_t IMSI_GSM_MAP_sequence_of[1] = {
 
 static int
 dissect_rrc_IMSI_GSM_MAP(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 961 "./asn1/rrc/rrc.cnf"
+#line 963 "./asn1/rrc/rrc.cnf"
   wmem_strbuf_t* imsi_strbuf;
   guint32 string_len;
   gchar* imsi_string;
@@ -116532,7 +116533,7 @@ static const per_choice_t RRCConnectionReject_choice[] = {
 
 static int
 dissect_rrc_RRCConnectionReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 479 "./asn1/rrc/rrc.cnf"
+#line 481 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RRCConnectionReject, RRCConnectionReject_choice,
@@ -117099,7 +117100,7 @@ static const per_choice_t RRCConnectionRelease_CCCH_choice[] = {
 
 static int
 dissect_rrc_RRCConnectionRelease_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 487 "./asn1/rrc/rrc.cnf"
+#line 489 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease-CCCH");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RRCConnectionRelease_CCCH, RRCConnectionRelease_CCCH_choice,
@@ -119378,7 +119379,7 @@ static const per_choice_t RRCConnectionSetup_choice[] = {
 
 static int
 dissect_rrc_RRCConnectionSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 499 "./asn1/rrc/rrc.cnf"
+#line 501 "./asn1/rrc/rrc.cnf"
   guint32 new_u_rnti;
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
@@ -119530,7 +119531,7 @@ static const per_choice_t URAUpdateConfirm_CCCH_choice[] = {
 
 static int
 dissect_rrc_URAUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 664 "./asn1/rrc/rrc.cnf"
+#line 666 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm-CCCH");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_URAUpdateConfirm_CCCH, URAUpdateConfirm_CCCH_choice,
@@ -120230,7 +120231,7 @@ static const per_sequence_t CellUpdate_sequence[] = {
 
 static int
 dissect_rrc_CellUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 221 "./asn1/rrc/rrc.cnf"
+#line 223 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdate");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_CellUpdate, CellUpdate_sequence);
@@ -121122,7 +121123,7 @@ static const per_sequence_t RRCConnectionRequest_sequence[] = {
 
 static int
 dissect_rrc_RRCConnectionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 495 "./asn1/rrc/rrc.cnf"
+#line 497 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RRCConnectionRequest, RRCConnectionRequest_sequence);
@@ -121433,7 +121434,7 @@ static const per_sequence_t URAUpdate_sequence[] = {
 
 static int
 dissect_rrc_URAUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 656 "./asn1/rrc/rrc.cnf"
+#line 658 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdate");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_URAUpdate, URAUpdate_sequence);
@@ -121818,7 +121819,7 @@ static const per_sequence_t CellUpdateFDD_r11_sequence[] = {
 
 static int
 dissect_rrc_CellUpdateFDD_r11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 225 "./asn1/rrc/rrc.cnf"
+#line 227 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateFDD-r11");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_CellUpdateFDD_r11, CellUpdateFDD_r11_sequence);
@@ -122331,7 +122332,7 @@ static const per_sequence_t PagingType1_sequence[] = {
 
 static int
 dissect_rrc_PagingType1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 373 "./asn1/rrc/rrc.cnf"
+#line 375 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType1");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_PagingType1, PagingType1_sequence);
@@ -122536,7 +122537,7 @@ static const per_sequence_t PUSCHCapacityRequest_sequence[] = {
 
 static int
 dissect_rrc_PUSCHCapacityRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 418 "./asn1/rrc/rrc.cnf"
+#line 420 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PUSCHCapacityRequest");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_PUSCHCapacityRequest, PUSCHCapacityRequest_sequence);
@@ -122914,7 +122915,7 @@ static const per_sequence_t SystemInformation_FACH_sequence[] = {
 
 static int
 dissect_rrc_SystemInformation_FACH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 579 "./asn1/rrc/rrc.cnf"
+#line 581 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-FACH");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SystemInformation_FACH, SystemInformation_FACH_sequence);
@@ -123020,7 +123021,7 @@ static const per_sequence_t SystemInformationChangeIndication_sequence[] = {
 
 static int
 dissect_rrc_SystemInformationChangeIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 583 "./asn1/rrc/rrc.cnf"
+#line 585 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationChangeIndication");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SystemInformationChangeIndication, SystemInformationChangeIndication_sequence);
@@ -123201,7 +123202,7 @@ static const per_sequence_t SystemInformation_BCH_sequence[] = {
 
 static int
 dissect_rrc_SystemInformation_BCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 575 "./asn1/rrc/rrc.cnf"
+#line 577 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-BCH");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SystemInformation_BCH, SystemInformation_BCH_sequence);
@@ -123716,7 +123717,7 @@ static const per_sequence_t MBMSAccessInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSAccessInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 325 "./asn1/rrc/rrc.cnf"
+#line 327 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSAccessInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSAccessInformation, MBMSAccessInformation_sequence);
@@ -124575,7 +124576,7 @@ static const per_sequence_t MBMSCommonPTMRBInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSCommonPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 329 "./asn1/rrc/rrc.cnf"
+#line 331 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCommonPTMRBInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSCommonPTMRBInformation, MBMSCommonPTMRBInformation_sequence);
@@ -124953,7 +124954,7 @@ static const per_sequence_t MBMSCurrentCellPTMRBInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSCurrentCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 333 "./asn1/rrc/rrc.cnf"
+#line 335 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSCurrentCellPTMRBInformation, MBMSCurrentCellPTMRBInformation_sequence);
@@ -125726,7 +125727,7 @@ static const per_sequence_t MBMSGeneralInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSGeneralInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 337 "./asn1/rrc/rrc.cnf"
+#line 339 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSGeneralInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSGeneralInformation, MBMSGeneralInformation_sequence);
@@ -126400,7 +126401,7 @@ static const per_sequence_t MBMSNeighbouringCellPTMRBInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSNeighbouringCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 349 "./asn1/rrc/rrc.cnf"
+#line 351 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSNeighbouringCellPTMRBInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSNeighbouringCellPTMRBInformation, MBMSNeighbouringCellPTMRBInformation_sequence);
@@ -126537,7 +126538,7 @@ static const per_sequence_t MBMSUnmodifiedServicesInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSUnmodifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 357 "./asn1/rrc/rrc.cnf"
+#line 359 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSUnmodifiedServicesInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSUnmodifiedServicesInformation, MBMSUnmodifiedServicesInformation_sequence);
@@ -126693,7 +126694,7 @@ static const per_sequence_t MBMSSchedulingInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSSchedulingInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 353 "./asn1/rrc/rrc.cnf"
+#line 355 "./asn1/rrc/rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSSchedulingInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSSchedulingInformation, MBMSSchedulingInformation_sequence);
@@ -130640,7 +130641,7 @@ static int
 dissect_rrc_HandoverToUTRANCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA);
   proto_item_set_hidden(prot_ti);
-#line 1441 "./asn1/rrc/rrc.cnf"
+#line 1443 "./asn1/rrc/rrc.cnf"
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_HandoverToUTRANCommand, HandoverToUTRANCommand_choice,
                                  NULL);
@@ -130781,7 +130782,7 @@ static const per_sequence_t UE_SecurityInformation_sequence[] = {
 
 static int
 dissect_rrc_UE_SecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1444 "./asn1/rrc/rrc.cnf"
+#line 1446 "./asn1/rrc/rrc.cnf"
   private_data_set_cn_domain(actx, RRC_NAS_SYS_INFO_CS);
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UE_SecurityInformation, UE_SecurityInformation_sequence);
@@ -130818,7 +130819,7 @@ dissect_rrc_T_uE_SecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 
 static int
 dissect_rrc_T_present(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 187 "./asn1/rrc/rrc.cnf"
+#line 189 "./asn1/rrc/rrc.cnf"
   tvbuff_t *ue_radio_access_cap_info_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -131184,7 +131185,7 @@ static const per_sequence_t UE_SecurityInformation2_sequence[] = {
 
 static int
 dissect_rrc_UE_SecurityInformation2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1448 "./asn1/rrc/rrc.cnf"
+#line 1450 "./asn1/rrc/rrc.cnf"
   private_data_set_cn_domain(actx, RRC_NAS_SYS_INFO_PS);
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UE_SecurityInformation2, UE_SecurityInformation2_sequence);
@@ -135721,7 +135722,7 @@ static const per_sequence_t PLMN_IdentityWithOptionalMCC_r6_sequence[] = {
 
 static int
 dissect_rrc_PLMN_IdentityWithOptionalMCC_r6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 927 "./asn1/rrc/rrc.cnf"
+#line 929 "./asn1/rrc/rrc.cnf"
   wmem_strbuf_t* mcc_mnc_strbuf;
   guint32 string_len;
   gchar* mcc_mnc_string;
@@ -138349,7 +138350,7 @@ dissect_rrc_T_supportOfInterRATHOToEUTRATDD(tvbuff_t *tvb _U_, int offset _U_, a
 
 static int
 dissect_rrc_T_eutraFeatureGroupIndicators(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 879 "./asn1/rrc/rrc.cnf"
+#line 881 "./asn1/rrc/rrc.cnf"
   tvbuff_t *eutraFeatureGroupIndicators_tvb=NULL;
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
                                      4, 4, FALSE, &eutraFeatureGroupIndicators_tvb, NULL);
@@ -139975,7 +139976,7 @@ dissect_rrc_T_supportOfInter_RAT_PS_Handover(tvbuff_t *tvb _U_, int offset _U_,
 
 static int
 dissect_rrc_GSM_MS_RadioAccessCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 839 "./asn1/rrc/rrc.cnf"
+#line 841 "./asn1/rrc/rrc.cnf"
   tvbuff_t *parameter_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -140288,7 +140289,7 @@ dissect_rrc_UE_RadioAccessCapability_v860ext_IEs(tvbuff_t *tvb _U_, int offset _
 
 static int
 dissect_rrc_T_ue_EUTRA_Capability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 855 "./asn1/rrc/rrc.cnf"
+#line 857 "./asn1/rrc/rrc.cnf"
   tvbuff_t *ue_eutra_cap_tvb = NULL;
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
                                        NO_BOUND, NO_BOUND, FALSE, &ue_eutra_cap_tvb);
@@ -152071,7 +152072,7 @@ dissect_rrc_ExtSIBTypeInfoSchedulingInfo_List3(tvbuff_t *tvb _U_, int offset _U_
 
 static int
 dissect_rrc_HNBName(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1047 "./asn1/rrc/rrc.cnf"
+#line 1049 "./asn1/rrc/rrc.cnf"
   tvbuff_t *hnbname_tvb = NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, -1,
@@ -152666,7 +152667,7 @@ dissect_rrc_SIB_ReferenceList2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 static int
 dissect_rrc_T_cn_CommonGSM_MAP_NAS_SysInfo_03(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 1072 "./asn1/rrc/rrc.cnf"
+#line 1074 "./asn1/rrc/rrc.cnf"
   private_data_set_cn_domain(actx, RRC_NAS_SYS_INFO_CN_COMMON);
   offset = dissect_rrc_NAS_SystemInformationGSM_MAP(tvb, offset, actx, tree, hf_index);
 
@@ -158034,7 +158035,7 @@ dissect_rrc_UE_HistoryInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 static int
 dissect_rrc_T_interRATHandoverInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 847 "./asn1/rrc/rrc.cnf"
+#line 849 "./asn1/rrc/rrc.cnf"
   tvbuff_t *parameter_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -161020,7 +161021,7 @@ dissect_rrc_OngoingMeasRepList_r6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int
 dissect_rrc_T_measurementReport(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_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                              NO_BOUND, NO_BOUND, FALSE, dissect_MeasurementReport_PDU);
+                                                              NO_BOUND, NO_BOUND, FALSE, dissect_rrc_MeasurementReport_PDU);
 
   return offset;
 }
@@ -161323,7 +161324,7 @@ dissect_rrc_OngoingMeasRepList_r7(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int
 dissect_rrc_T_measurementReport_01(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_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                              NO_BOUND, NO_BOUND, FALSE, dissect_MeasurementReport_PDU);
+                                                              NO_BOUND, NO_BOUND, FALSE, dissect_rrc_MeasurementReport_PDU);
 
   return offset;
 }
@@ -161622,7 +161623,7 @@ dissect_rrc_StoredCompressedModeInfo_r8(tvbuff_t *tvb _U_, int offset _U_, asn1_
 static int
 dissect_rrc_T_measurementReport_02(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_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                              NO_BOUND, NO_BOUND, FALSE, dissect_MeasurementReport_PDU);
+                                                              NO_BOUND, NO_BOUND, FALSE, dissect_rrc_MeasurementReport_PDU);
 
   return offset;
 }
@@ -161919,7 +161920,7 @@ dissect_rrc_E_RGCH_CombinationInfoList_r9(tvbuff_t *tvb _U_, int offset _U_, asn
 static int
 dissect_rrc_T_measurementReport_03(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_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                              NO_BOUND, NO_BOUND, FALSE, dissect_MeasurementReport_PDU);
+                                                              NO_BOUND, NO_BOUND, FALSE, dissect_rrc_MeasurementReport_PDU);
 
   return offset;
 }
@@ -162203,7 +162204,7 @@ dissect_rrc_OngoingMeasRepList_r10(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int
 dissect_rrc_T_measurementReport_04(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_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                              NO_BOUND, NO_BOUND, FALSE, dissect_MeasurementReport_PDU);
+                                                              NO_BOUND, NO_BOUND, FALSE, dissect_rrc_MeasurementReport_PDU);
 
   return offset;
 }
@@ -162425,7 +162426,7 @@ dissect_rrc_OngoingMeasRepList_r11(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int
 dissect_rrc_T_measurementReport_05(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_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                              NO_BOUND, NO_BOUND, FALSE, dissect_MeasurementReport_PDU);
+                                                              NO_BOUND, NO_BOUND, FALSE, dissect_rrc_MeasurementReport_PDU);
 
   return offset;
 }
@@ -162608,7 +162609,7 @@ dissect_rrc_OngoingMeasRepList_r12(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int
 dissect_rrc_T_measurementReport_06(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_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                              NO_BOUND, NO_BOUND, FALSE, dissect_MeasurementReport_PDU);
+                                                              NO_BOUND, NO_BOUND, FALSE, dissect_rrc_MeasurementReport_PDU);
 
   return offset;
 }
@@ -162797,7 +162798,7 @@ dissect_rrc_OngoingMeasRepList_r13(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int
 dissect_rrc_T_measurementReport_07(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_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                              NO_BOUND, NO_BOUND, FALSE, dissect_MeasurementReport_PDU);
+                                                              NO_BOUND, NO_BOUND, FALSE, dissect_rrc_MeasurementReport_PDU);
 
   return offset;
 }
@@ -162986,7 +162987,7 @@ dissect_rrc_OngoingMeasRepList_r14(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int
 dissect_rrc_T_measurementReport_08(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_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                              NO_BOUND, NO_BOUND, FALSE, dissect_MeasurementReport_PDU);
+                                                              NO_BOUND, NO_BOUND, FALSE, dissect_rrc_MeasurementReport_PDU);
 
   return offset;
 }
@@ -163175,7 +163176,7 @@ dissect_rrc_OngoingMeasRepList_r15(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 static int
 dissect_rrc_T_measurementReport_09(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_containing_pdu_new(tvb, offset, actx, tree, hf_index,
-                                                              NO_BOUND, NO_BOUND, FALSE, dissect_MeasurementReport_PDU);
+                                                              NO_BOUND, NO_BOUND, FALSE, dissect_rrc_MeasurementReport_PDU);
 
   return offset;
 }
@@ -163838,7 +163839,7 @@ dissect_rrc_ToTargetRNC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 static int
 dissect_rrc_T_dL_DCCHmessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 759 "./asn1/rrc/rrc.cnf"
+#line 761 "./asn1/rrc/rrc.cnf"
   tvbuff_t *dl_dcch_message_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -164143,6 +164144,16 @@ int dissect_rrc_InterRATHandoverInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
   offset += 7; offset >>= 3;
   return offset;
 }
+int dissect_rrc_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA);
+  proto_item_set_hidden(prot_ti);
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
+  offset = dissect_rrc_MeasurementReport(tvb, offset, &asn1_ctx, tree, hf_rrc_rrc_MeasurementReport_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_SystemInformation_BCH_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA);
   proto_item_set_hidden(prot_ti);
@@ -164823,16 +164834,6 @@ static int dissect_SRNC_RelocationInfo_r7_add_ext_IEs_PDU(tvbuff_t *tvb _U_, pac
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
-  proto_item *prot_ti = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, ENC_NA);
-  proto_item_set_hidden(prot_ti);
-  int offset = 0;
-  asn1_ctx_t asn1_ctx;
-  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo);
-  offset = dissect_rrc_MeasurementReport(tvb, offset, &asn1_ctx, tree, hf_rrc_MeasurementReport_PDU);
-  offset += 7; offset >>= 3;
-  return offset;
-}
 
 
 /*--- End of included file: packet-rrc-fn.c ---*/
@@ -164978,6 +164979,10 @@ void proto_register_rrc(void) {
       { "InterRATHandoverInfo", "rrc.InterRATHandoverInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_rrc_rrc_MeasurementReport_PDU,
+      { "MeasurementReport", "rrc.MeasurementReport_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_rrc_SystemInformation_BCH_PDU,
       { "SystemInformation-BCH", "rrc.SystemInformation_BCH_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -165250,10 +165255,6 @@ void proto_register_rrc(void) {
       { "SRNC-RelocationInfo-r7-add-ext-IEs", "rrc.SRNC_RelocationInfo_r7_add_ext_IEs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_rrc_MeasurementReport_PDU,
-      { "MeasurementReport", "rrc.MeasurementReport_element",
-        FT_NONE, BASE_NONE, NULL, 0,
-        NULL, HFILL }},
     { &hf_rrc_integrityCheckInfo,
       { "integrityCheckInfo", "rrc.integrityCheckInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
diff --git a/epan/dissectors/packet-rrc.h b/epan/dissectors/packet-rrc.h
index b595088893..d20656c235 100644
--- a/epan/dissectors/packet-rrc.h
+++ b/epan/dissectors/packet-rrc.h
@@ -28,6 +28,7 @@ extern int proto_rrc;
 int dissect_rrc_InterRATHandoverInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 int dissect_rrc_HandoverToUTRANCommand_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_rrc_InterRATHandoverInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
+int dissect_rrc_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_rrc_MasterInformationBlock_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_rrc_SysInfoType1_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
 int dissect_rrc_SysInfoType2_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
author	Pascal Quantin <pascal@wireshark.org>	2019-04-03 23:27:18 +0200
committer	Anders Broman <a.broman58@gmail.com>	2019-04-04 10:59:12 +0000
commit	24ef40990020d06884ee4164b723a345e9985907 (patch)
tree	9b188f15e6d2a1a7a038360cecd236ff58516f43 /epan
parent	67644354a13051bff3d93c5235902e29234aceee (diff)