diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-03-22 23:59:54 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-03-22 23:59:54 +0000 |
commit | a2414d8909088ddb40c907886e725993e6baecb5 (patch) | |
tree | 53f0ebac8baa171f4317c7eb502a354da8596c72 /epan/dissectors/packet-scsi.c | |
parent | 3295912210fa1a8d7d0b1a18aa7c100f27905ed1 (diff) |
Don't wire into the reassembly code the notion that reassemblies should
be done on flows from one address to another; reassembly for protocols
running atop TCP should be done on flows from one TCP endpoint to
another.
We do this by:
adding "reassembly table" as a data structure;
associating hash tables for both in-progress reassemblies and
completed reassemblies with that data structure (currently, not
all reassemblies use the latter; they might keep completed
reassemblies in the first table);
having functions to create and destroy keys in that table;
offering standard routines for doing address-based and
address-and-port-based flow processing, so that dissectors not
needing their own specialized flow processing can just use them.
This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where
the second YPALL response is processed as if it were a continuation of
a previous response between different endpoints, even though said
response is already reassembled), and also allows the DCE RPC-specific
stuff to be moved out of epan/reassembly.c into the DCE RPC dissector.
svn path=/trunk/; revision=48491
Diffstat (limited to 'epan/dissectors/packet-scsi.c')
-rw-r--r-- | epan/dissectors/packet-scsi.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index 7d81410f39..ed38aa76ad 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -353,8 +353,7 @@ static int scsi_tap = -1; /* Defragment of SCSI DATA IN/OUT */ static gboolean scsi_defragment = FALSE; -static GHashTable *scsi_fragment_table = NULL; -static GHashTable *scsi_reassembled_table = NULL; +static reassembly_table scsi_reassembly_table; /* * Required by all commands @@ -371,8 +370,8 @@ const int *cdb_control_fields[6] = { static void scsi_defragment_init(void) { - fragment_table_init(&scsi_fragment_table); - reassembled_table_init(&scsi_reassembled_table); + reassembly_table_init(&scsi_reassembly_table, + &addresses_reassembly_table_functions); } static const fragment_items scsi_frag_items = { @@ -5093,10 +5092,10 @@ dissect_scsi_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if ((tvb_length_remaining(tvb,offset) + relative_offset) != expected_length) { more_frags = TRUE; } - ipfd_head = fragment_add_check(tvb, offset, pinfo, + ipfd_head = fragment_add_check(&scsi_reassembly_table, tvb, offset, + pinfo, itlq->first_exchange_frame, /* key */ - scsi_fragment_table, - scsi_reassembled_table, + NULL, relative_offset, tvb_length_remaining(tvb, offset), more_frags); |