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-tds.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-tds.c')
-rw-r--r-- | epan/dissectors/packet-tds.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 72c584be47..7c86cf7066 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -549,8 +549,7 @@ static const fragment_items tds_frag_items = { }; /* Tables for reassembly of fragments. */ -static GHashTable *tds_fragment_table = NULL; -static GHashTable *tds_reassembled_table = NULL; +static reassembly_table tds_reassembly_table; /* defragmentation of multi-buffer TDS PDUs */ static gboolean tds_defragment = TRUE; @@ -2387,8 +2386,8 @@ dissect_netlib_buffer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * XXX - I've seen captures that start with a login * packet with a sequence number of 2. */ - fd_head = fragment_add_seq_check(tvb, offset, pinfo, channel, - tds_fragment_table, tds_reassembled_table, + fd_head = fragment_add_seq_check(&tds_reassembly_table, tvb, offset, + pinfo, channel, NULL, packet_number - 1, len, (status & STATUS_LAST_BUFFER) == 0); next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled TDS", fd_head, &tds_frag_items, NULL, @@ -2694,11 +2693,13 @@ static void tds_init(void) { /* - * Initialize the fragment and reassembly tables. + * Initialize the reassembly table. + * + * XXX - should fragments be reassembled across multiple TCP + * connections? */ - fragment_table_init(&tds_fragment_table); - reassembled_table_init(&tds_reassembled_table); - + reassembly_table_init(&tds_reassembly_table, + &addresses_ports_reassembly_table_functions); } /* Register the protocol with Wireshark */ |