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, 7 deletions

diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c
index b8932bdb1e..35b272a3aa 100644
--- a/epan/dissectors/packet-lapdm.c
+++ b/epan/dissectors/packet-lapdm.c
@@ -103,8 +103,7 @@ static gint ett_lapdm_length = -1;
 static gint ett_lapdm_fragment = -1;
 static gint ett_lapdm_fragments = -1;
 
-static GHashTable *lapdm_fragment_table = NULL;
-static GHashTable *lapdm_reassembled_table = NULL;
+static reassembly_table lapdm_reassembly_table;
 
 static dissector_table_t lapdm_sapi_dissector_table;
 
@@ -205,8 +204,8 @@ static const fragment_items lapdm_frag_items = {
 static void
 lapdm_defragment_init (void)
 {
-    fragment_table_init (&lapdm_fragment_table);
-    reassembled_table_init(&lapdm_reassembled_table);
+    reassembly_table_init (&lapdm_reassembly_table,
+                           &addresses_reassembly_table_functions);
 }
 
 
@@ -301,10 +300,10 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                take N(S) into account, but N(S) isn't always 0 for
                the first fragment!
              */
-            fd_m = fragment_add_seq_next (payload, 0, pinfo,
+            fd_m = fragment_add_seq_next (&lapdm_reassembly_table, payload, 0,
+                                pinfo,
                                 fragment_id, /* guint32 ID for fragments belonging together */
-                                lapdm_fragment_table, /* list of message fragments */
-                                lapdm_reassembled_table, /* list of reassembled messages */
+                                NULL,
                                 /*n_s guint32 fragment sequence number */
                                 len, /* guint32 fragment length */
                                 m); /* More fragments? */