diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-14 01:44:29 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-10-14 01:44:29 +0000 |
| commit | 057c7a0555f99d7800ec79b055983d174f470194 (patch) | |
| tree | 60195c4ef2c29595aa3eaa6038d95237baac510b /epan/dissectors/packet-scsi.c | |
| parent | caaecd93e31d3ed12c8e5afeaacacff0637854bc (diff) | |
let SCSI reassembly default to FALSE
put "reassembled in" in the summary line
put the fragment list at the top of the tree instead of down inside the SCSI expansion
svn path=/trunk/; revision=19523
Diffstat (limited to 'epan/dissectors/packet-scsi.c')
| -rw-r--r-- | epan/dissectors/packet-scsi.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index db5bcd46f1..ca9fdba5b9 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -375,7 +375,7 @@ static gint ett_scsi_fragment = -1; static int scsi_tap = -1; /* Defragment of SCSI DATA IN/OUT */ -static gboolean scsi_defragment = TRUE; +static gboolean scsi_defragment = FALSE; static GHashTable *scsi_fragment_table = NULL; static GHashTable *scsi_reassembled_table = NULL; @@ -7984,7 +7984,14 @@ dissect_scsi_payload (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, relative_offset, tvb_length_remaining(tvb, offset), (tvb_length_remaining(tvb,offset)+relative_offset)!=expected_length); - next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled SCSI DATA", ipfd_head, &scsi_frag_items, &update_col_info, scsi_tree); + next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled SCSI DATA", ipfd_head, &scsi_frag_items, &update_col_info, tree); + + if( ipfd_head && ipfd_head->reassembled_in != pinfo->fd->num ){ + if (check_col(pinfo->cinfo, COL_INFO)) { + col_prepend_fstr(pinfo->cinfo, COL_INFO, "[Reassembled in #%u] ", + ipfd_head->reassembled_in); + } + } dissect_the_payload: |