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

1 files changed, 7 insertions, 7 deletions

diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c
index 5b75b5feda..71239e2947 100644
--- a/epan/dissectors/packet-ses.c
+++ b/epan/dissectors/packet-ses.c
@@ -182,8 +182,7 @@ static int proto_clses          = -1;
 
 static dissector_handle_t pres_handle = NULL;
 
-static GHashTable *ses_fragment_table = NULL;
-static GHashTable *ses_reassembled_table = NULL;
+static reassembly_table ses_reassembly_table;
 
 static const fragment_items ses_frag_items = {
   /* Segment subtrees */
@@ -1148,9 +1147,10 @@ dissect_spdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
 		ti = proto_tree_add_item (ses_tree, hf_ses_segment_data, tvb, offset,
 					  fragment_len, ENC_NA);
 		proto_item_append_text (ti, " (%d byte%s)", fragment_len, plurality (fragment_len, "", "s"));
-		frag_msg = fragment_add_seq_next (tvb, offset, pinfo,
-						  ses_id, ses_fragment_table,
-						  ses_reassembled_table, fragment_len,
+		frag_msg = fragment_add_seq_next (&ses_reassembly_table,
+						  tvb, offset,
+						  pinfo, ses_id, NULL,
+						  fragment_len,
 						  (enclosure_item_flags & END_SPDU) ? FALSE : TRUE);
 		next_tvb = process_reassembled_data (tvb, offset, pinfo, "Reassembled SES",
 						     frag_msg, &ses_frag_items, NULL,
@@ -1221,8 +1221,8 @@ dissect_ses(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 static void ses_reassemble_init (void)
 {
-	fragment_table_init (&ses_fragment_table);
-	reassembled_table_init (&ses_reassembled_table);
+	reassembly_table_init (&ses_reassembly_table,
+		&addresses_reassembly_table_functions);
 }
 
 void