osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Tell the user (via COL_INFO) when a frame is a fragment (reassembled later). 

See:

https://www.wireshark.org/lists/wireshark-users/201508/msg00023.html

(Also set a fence on COL_INFO so we can see each packet's contribution to
the column.)

Change-Id: I9a4b1f60c5ad7065c2f025bbcca1dd2d09fec9de
Reviewed-on: https://code.wireshark.org/review/10471
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Jeff Morriss 2015-09-10 13:27:45 -04:00 committed by Alexis La Goutte
parent e13576f7dc
commit b9001b0f90
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,6 +556,8 @@ mp2t_fragment_handle(tvbuff_t *tvb, guint offset, packet_info *pinfo,
if (new_tvb) {
/* ti = */ proto_tree_add_item(tree, hf_msg_ts_packet_reassembled, tvb, 0, 0, ENC_NA);
mp2t_dissect_packet(new_tvb, pload_type, pinfo, tree);
} else {
col_set_str(pinfo->cinfo, COL_INFO, "[MP2T fragment of a reassembled packet]");
}
pinfo->fragmented = save_fragmented;
@ -731,6 +733,10 @@ mp2t_process_fragmented_payload(tvbuff_t *tvb, gint offset, guint remaining_len,
}
while (remaining_len > 0) {
/* Don't like subsequent packets overwrite the Info column */
col_append_str(pinfo->cinfo, COL_INFO, " ");
col_set_fence(pinfo->cinfo, COL_INFO);
/* Skip stuff bytes */
stuff_len = 0;
while ((tvb_get_guint8(tvb, offset + stuff_len) == 0xFF)) {