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, 6 insertions, 8 deletions

diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index 10c94f3edd..ab7579a559 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -516,8 +516,7 @@ static gboolean reassemble_x25 = TRUE;
 
 /* Reassembly of X.25 */
 
-static GHashTable *x25_segment_table = NULL;
-static GHashTable *x25_reassembled_table = NULL;
+static reassembly_table x25_reassembly_table;
 
 static dissector_table_t x25_subdissector_table;
 static heur_dissector_list_t x25_heur_subdissector_list;
@@ -1941,10 +1940,9 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 		     */
 		    frag_key |= 0x10000;
 		}
-		fd_head = fragment_add_seq_next(tvb, localoffset,
-						pinfo, frag_key,
-						x25_segment_table,
-						x25_reassembled_table,
+		fd_head = fragment_add_seq_next(&x25_reassembly_table,
+						tvb, localoffset,
+						pinfo, frag_key, NULL,
 						payload_len, m_bit_set);
 		pinfo->fragmented = m_bit_set;
 
@@ -2127,8 +2125,8 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 static void
 x25_reassemble_init(void)
 {
-  fragment_table_init(&x25_segment_table);
-  reassembled_table_init(&x25_reassembled_table);
+  reassembly_table_init(&x25_reassembly_table,
+                        &addresses_reassembly_table_functions);
 }
 
 void