From a2414d8909088ddb40c907886e725993e6baecb5 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 22 Mar 2013 23:59:54 +0000 Subject: 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 --- epan/stream.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'epan/stream.c') diff --git a/epan/stream.c b/epan/stream.c index 66ee51b763..3f24d25597 100644 --- a/epan/stream.c +++ b/epan/stream.c @@ -312,9 +312,8 @@ static stream_pdu_fragment_t *fragment_hash_insert( const stream_t *stream, guin /*****************************************************************************/ -/* fragmentation hash tables */ -static GHashTable *stream_fragment_table = NULL; -static GHashTable *stream_reassembled_table = NULL; +/* reassembly table */ +static reassembly_table stream_reassembly_table; /* Initialise a new stream. Call this when you first identify a distinct * stream. */ @@ -378,8 +377,8 @@ void stream_init( void ) init_fragment_hash(); stream_init_pdu_data(); - fragment_table_init(&stream_fragment_table); - reassembled_table_init(&stream_reassembled_table); + reassembly_table_init(&stream_reassembly_table, + &addresses_reassembly_table_functions); } /*****************************************************************************/ @@ -410,8 +409,8 @@ stream_pdu_fragment_t *stream_add_frag( stream_t *stream, guint32 framenum, guin } /* add it to the reassembly tables */ - fd_head = fragment_add_seq_next(tvb, 0, pinfo, pdu->id, - stream_fragment_table, stream_reassembled_table, + fd_head = fragment_add_seq_next(&stream_reassembly_table, + tvb, 0, pinfo, pdu->id, NULL, tvb_reported_length(tvb), more_frags); /* add it to our hash */ frag_data = fragment_hash_insert( stream, framenum, offset, tvb_reported_length(tvb)); -- cgit v1.2.1