From e6662f62230623db80e01473d49eb30a3f46bd62 Mon Sep 17 00:00:00 2001 From: Martin Mathieson Date: Fri, 20 Feb 2009 10:17:52 +0000 Subject: [PATCH] Set and use 'plane' more carefully. svn path=/trunk/; revision=27488 --- epan/dissectors/packet-catapult-dct2000.c | 3 +++ epan/dissectors/packet-pdcp-lte.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 8fe5262343..d4c910850d 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -1397,6 +1397,9 @@ static void attach_pdcp_lte_info(packet_info *pinfo) p_pdcp_lte_info->no_header_pdu = outhdr_values[i++]; p_pdcp_lte_info->plane = outhdr_values[i++]; + if (p_pdcp_lte_info->plane != USER_PLANE) { + p_pdcp_lte_info->plane = SIGNALING_PLANE; + } p_pdcp_lte_info->seqnum_length = outhdr_values[i++]; p_pdcp_lte_info->rohc_compression = outhdr_values[i++]; diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index 65000de007..dc38432bf0 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -1544,7 +1544,12 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } else { if (tvb_length_remaining(tvb, offset) > 0) { - proto_tree_add_item(pdcp_tree, hf_pdcp_lte_user_plane_data, tvb, offset, -1, FALSE); + if (p_pdcp_info->plane == USER_PLANE) { + proto_tree_add_item(pdcp_tree, hf_pdcp_lte_user_plane_data, tvb, offset, -1, FALSE); + } + else { + proto_tree_add_item(pdcp_tree, hf_pdcp_lte_signalling_data, tvb, offset, -1, FALSE); + } if (check_col(pinfo->cinfo, COL_INFO)) { col_append_fstr(pinfo->cinfo, COL_INFO, " (%u bytes data)",