diff options
| author | Darien Spencer <cusneud@mail.com> | 2017-09-20 22:48:22 +0300 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-09-20 23:05:58 +0000 |
| commit | a8a2a8776be41563b5c063a23e39d1e9aca052a0 (patch) | |
| tree | 930c5db691a8c1bc86da52567685a6aea1448048 /epan/dissectors/packet-umts_fp.c | |
| parent | 6be572006e5618aae3c59cb1b9a56cdf6e1e49a1 (diff) | |
FP: Removed unused code
Removed old code which checked if frames are
ciphered and was '#if 0'ed.
Corresponding logic was implemented in the
RLC dissector in a previous commit.
Change-Id: Ie362771277b5c0b41e790c0297ded5ed91f813e2
Reviewed-on: https://code.wireshark.org/review/23645
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-umts_fp.c')
| -rw-r--r-- | epan/dissectors/packet-umts_fp.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index dcf17eef82..c61fc6934f 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -2931,14 +2931,6 @@ dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* rlcinf->mode[0] = RLC_AM;*/ rlcinf->li_size[macd_idx] = RLC_LI_7BITS; -#if 0 - /*If this entry exists, SECRUITY_MODE is completed*/ - if ( rrc_ciph_inf && g_tree_lookup(rrc_ciph_inf, GINT_TO_POINTER((gint)p_fp_info->com_context_id)) ) { - rlcinf->ciphered[macd_idx] = TRUE; - } else { - rlcinf->ciphered[macd_idx] = FALSE; - } -#endif rlcinf->ciphered[macd_idx] = FALSE; rlcinf->deciphered[macd_idx] = FALSE; p_fp_info->cur_tb = macd_idx; /*Set the transport block index (NOTE: This and not subnum is used in MAC dissector!)*/ @@ -5306,14 +5298,6 @@ fp_set_per_packet_inf_from_conv(conversation_t *p_conv, /* Set RLC data */ rlcinf->ueid[j + chan] = get_ue_id_from_conv(p_conv_data); rlcinf->li_size[j+chan] = RLC_LI_7BITS; -#if 0 - /*If this entry exists, SECRUITY_MODE is completed (signled by RRC)*/ - if ( rrc_ciph_inf && g_tree_lookup(rrc_ciph_inf, GINT_TO_POINTER((gint)p_conv_data->com_context_id)) != NULL ) { - rlcinf->ciphered[j+chan] = TRUE; - } else { - rlcinf->ciphered[j+chan] = FALSE; - } -#endif rlcinf->ciphered[j+chan] = FALSE; rlcinf->deciphered[j+chan] = FALSE; rlcinf->rbid[j+chan] = macinf->lchid[j+chan]; |