osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

MP2T: Only call subdissectors on the last fragment 

When there is more than one TSP in a frame, the fragment at the
end of one TSP and the first fragment in the next have the same
layer number as well as frame number. So use other information
about whether we have the last fragment to avoid calling subdissectors
extra times (which can interfere with retrieving the packet analysis
proto data on the subsequent passes.)
This commit is contained in:
John Thacker 2022-02-27 21:08:48 -05:00 committed by A Wireshark GitLab Utility
parent 6105d652f3
commit 636c797627
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/dissectors/packet-mp2t.c
View File

@ -661,6 +661,7 @@ mp2t_fragment_handle(tvbuff_t *tvb, guint offset, packet_info *pinfo,
gboolean fragment_last, enum pid_payload_type pload_type)
{
fragment_head *frag_msg;
proto_item *ti;
tvbuff_t *new_tvb;
const char *save_proto;
mp2t_stream_key *stream;
@ -681,10 +682,25 @@ mp2t_fragment_handle(tvbuff_t *tvb, guint offset, packet_info *pinfo,
frag_len,
!fragment_last);
new_tvb = process_reassembled_data(tvb, offset, pinfo,
"Reassembled MP2T",
frag_msg, &mp2t_msg_frag_items,
NULL, tree);
/* We only want to call subdissectors on the last fragment.
* processed_reassembled_data checks the frame number and layer number,
* but when there is more than one TSP in a frame, the fragment at the
* end of one TSP and the first fragment of the next have the same layer
* number. So use our own information about whether this is the last
* fragment to avoid calling subdissectors early and often.
*/
if (fragment_last) {
new_tvb = process_reassembled_data(tvb, offset, pinfo,
"Reassembled MP2T",
frag_msg, &mp2t_msg_frag_items,
NULL, tree);
} else {
new_tvb = NULL;
if (frag_msg != NULL) {
ti = proto_tree_add_uint(tree, hf_msg_reassembled_in, tvb, 0, 0, frag_msg->reassembled_in);
proto_item_set_generated(ti);
}
}
if (new_tvb) {
proto_tree_add_item(tree, hf_msg_ts_packet_reassembled, tvb, 0, 0, ENC_NA);