UMTS FP: Set missing sub-frame
HS-DSCH T2 dissection method did not set the 'subnum' field in the packet info which broke dissection in higher layers. Change-Id: Ib50e9d783b4abfed477479b7fbaa46d005431322 Reviewed-on: https://code.wireshark.org/review/22540 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>
This commit is contained in:
parent
993542685b
commit
a7a66a1890
1 changed files with 4 additions and 2 deletions
|
@ -891,14 +891,15 @@ dissect_macd_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
|
||||
/* Data bytes! */
|
||||
if (data_tree) {
|
||||
pinfo->fd->subnum = pdu; /* set subframe number to current TB */
|
||||
p_fp_info->cur_tb = pdu; /*Set TB (PDU) index correctly*/
|
||||
pdu_ti = proto_tree_add_item(data_tree, hf_fp_mac_d_pdu, tvb,
|
||||
offset + (bit_offset/8),
|
||||
((bit_offset % 8) + length + 7) / 8,
|
||||
ENC_NA);
|
||||
proto_item_set_text(pdu_ti, "MAC-d PDU (PDU %u)", pdu+1);
|
||||
}
|
||||
|
||||
pinfo->fd->subnum = pdu; /* set subframe number to current TB */
|
||||
p_fp_info->cur_tb = pdu; /*Set TB (PDU) index correctly*/
|
||||
if (preferences_call_mac_dissectors /*&& !rlc_is_ciphered(pinfo)*/) {
|
||||
tvbuff_t *next_tvb;
|
||||
next_tvb = tvb_new_subset_length_caplen(tvb, offset + bit_offset/8,
|
||||
|
@ -970,6 +971,7 @@ dissect_macd_pdu_data_type_2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
|
||||
|
||||
fpi->cur_tb = pdu; /*Set proper pdu index for MAC and higher layers*/
|
||||
pinfo->fd->subnum = pdu;
|
||||
call_dissector_with_data(mac_fdd_hsdsch_handle, next_tvb, pinfo, top_level_tree, data);
|
||||
dissected = TRUE;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue