diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-05-28 20:34:27 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-05-28 20:34:27 +0000 |
| commit | a891f540675481ec299f7d7708c76f0682206bf1 (patch) | |
| tree | 5b7df26064815739ff888495772553317d805d72 /epan/dissectors/packet-umts_fp.c | |
| parent | 091138dafe9107a8d31c48e3658c06eea1250d31 (diff) | |
Keep backward compatibility with UDP framing format for UMTS RLC dissector
Fix a few typo errors while we are at it
svn path=/trunk/; revision=42889
Diffstat (limited to 'epan/dissectors/packet-umts_fp.c')
| -rw-r--r-- | epan/dissectors/packet-umts_fp.c | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 3289911bf5..aef0e4dbfe 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -3155,17 +3155,31 @@ static fp_info *fp_set_per_packet_inf_from_conv(umts_fp_conversation_info_t *p_c fpi->hsdsch_entity = p_conv_data->hsdsch_entity; macinf = se_new0(umts_mac_info); macinf->content[0] = MAC_CONTENT_PS_DTCH; - p_add_proto_data(pinfo->fd, proto_umts_mac, macinf); + p_add_proto_data(pinfo->fd, proto_umts_mac, macinf); - rlcinf = se_new0(rlc_info); - /* Make configurable ?(avaliable in NBAP?) */ - /* urnti[MAX_RLC_CHANS] */ - rlcinf->mode[0] = p_conv_data->rlc_mode; - /* rbid[MAX_RLC_CHANS] */ - rlcinf->li_size[0] = RLC_LI_7BITS; - rlcinf->ciphered[0] = FALSE; - rlcinf->deciphered[0] = FALSE; - p_add_proto_data(pinfo->fd, proto_rlc, rlcinf); + rlcinf = se_new0(rlc_info); + /* Make configurable ?(available in NBAP?) */ + /* urnti[MAX_RLC_CHANS] */ + switch (p_conv_data->rlc_mode) { + case FP_RLC_TM: + rlcinf->mode[0] = RLC_TM; + break; + case FP_RLC_UM: + rlcinf->mode[0] = RLC_UM; + break; + case FP_RLC_AM: + rlcinf->mode[0] = RLC_AM; + break; + case FP_RLC_MODE_UNKNOWN: + default: + rlcinf->mode[0] = RLC_UNKNOWN_MODE; + break; + } + /* rbid[MAX_RLC_CHANS] */ + rlcinf->li_size[0] = RLC_LI_7BITS; + rlcinf->ciphered[0] = FALSE; + rlcinf->deciphered[0] = FALSE; + p_add_proto_data(pinfo->fd, proto_rlc, rlcinf); return fpi; @@ -3277,12 +3291,12 @@ static fp_info *fp_set_per_packet_inf_from_conv(umts_fp_conversation_info_t *p_c for (i=0; i<fpi->num_chans; i++) { tfi = tvb_get_guint8(tvb,offset); if (pinfo->link_dir==P2P_DIR_UL) { - fpi->chan_tf_size[i] = p_conv_data->fp_dch_chanel_info[i].ul_chan_tf_size[tfi]; - fpi->chan_num_tbs[i] = p_conv_data->fp_dch_chanel_info[i].ul_chan_num_tbs[tfi]; + fpi->chan_tf_size[i] = p_conv_data->fp_dch_channel_info[i].ul_chan_tf_size[tfi]; + fpi->chan_num_tbs[i] = p_conv_data->fp_dch_channel_info[i].ul_chan_num_tbs[tfi]; } else{ - fpi->chan_tf_size[i] = p_conv_data->fp_dch_chanel_info[i].dl_chan_tf_size[tfi]; - fpi->chan_num_tbs[i] = p_conv_data->fp_dch_chanel_info[i].dl_chan_num_tbs[tfi]; + fpi->chan_tf_size[i] = p_conv_data->fp_dch_channel_info[i].dl_chan_tf_size[tfi]; + fpi->chan_num_tbs[i] = p_conv_data->fp_dch_channel_info[i].dl_chan_num_tbs[tfi]; } offset++; } |