diff options
| author | Darien Spencer <cusneud@mail.com> | 2017-05-31 11:14:45 -0700 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-06-01 17:16:19 +0000 |
| commit | b2302d7a35e531e7e1de46117f8b475063e23a57 (patch) | |
| tree | 9d0b3a654e8af67421b788cfb706076ecd98008f /epan/dissectors/packet-umts_fp.c | |
| parent | 0a35c9539a7b8069754867d85b31e3248c978d9a (diff) | |
FP - Moved RLC info retrieval for E-DCH channels
Dissection method was receiving the RLC INFO struct as a paramter instead
of using p_get_proto_data like other channels' dissection methods.
Change-Id: Iaf44f71552526dcdf29b8a583b1d79012e2b24e3
Reviewed-on: https://code.wireshark.org/review/21874
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-umts_fp.c')
| -rw-r--r-- | epan/dissectors/packet-umts_fp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 21daf35bb6..d60b106a4e 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -627,7 +627,7 @@ static void dissect_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tr /* Dissect dedicated channels */ static void dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, struct fp_info *p_fp_info, - gboolean is_common, rlc_info *rlcinf, + gboolean is_common, void *data); static void dissect_e_dch_t2_or_common_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, @@ -2617,7 +2617,7 @@ dissect_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static void dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, struct fp_info *p_fp_info, - gboolean is_common, rlc_info *rlcinf, + gboolean is_common, void *data) { gboolean is_control_frame; @@ -2628,6 +2628,7 @@ dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 header_crc = 0; proto_item * header_crc_pi = NULL; guint header_length = 0; + rlc_info * rlcinf; if (p_fp_info->edch_type == 1) { col_append_str(pinfo->cinfo, COL_INFO, " (T2)"); @@ -2664,6 +2665,11 @@ dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint total_bits = 0; gboolean dissected = FALSE; + rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0); + if (!rlcinf) { + rlcinf = wmem_new0(wmem_packet_scope(), rlc_info); + } + header_crc_pi = proto_tree_add_uint_format(tree, hf_fp_edch_header_crc, tvb, offset, 2, header_crc, "%u%u%u%u %u%u%u. %u%u%u%u .... = E-DCH Header CRC: 0x%x", @@ -5327,7 +5333,6 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat proto_item *ti; gint offset = 0; struct fp_info *p_fp_info; - rlc_info *rlcinf; conversation_t *p_conv; umts_fp_conversation_info_t *p_conv_data = NULL; @@ -5402,11 +5407,6 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat return 1; } - rlcinf = (rlc_info *)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc, 0); - if (!rlcinf) { - rlcinf = wmem_new0(wmem_packet_scope(), rlc_info); - } - /* Show release information */ if (preferences_show_release_info) { proto_item *release_ti; @@ -5580,7 +5580,7 @@ dissect_fp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat case CHANNEL_EDCH_COMMON: dissect_e_dch_channel_info(tvb, pinfo, fp_tree, offset, p_fp_info, p_fp_info->channel == CHANNEL_EDCH_COMMON, - rlcinf, data); + data); break; default: |