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-dcm.c b/epan/dissectors/packet-dcm.c
index 459ee91bd6..1dd89591f4 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -402,9 +402,8 @@ static const fragment_items dcm_pdv_fragment_items = {
     "Message fragments"
 };
 
-/* Structures to handle fragmented DICOM PDU packets */
-static GHashTable *dcm_pdv_fragment_table = NULL;
-static GHashTable *dcm_pdv_reassembled_table = NULL;
+/* Structure to handle fragmented DICOM PDU packets */
+static reassembly_table dcm_pdv_reassembly_table;
 
 typedef struct dcm_open_tag {
 
@@ -3976,8 +3975,8 @@ dcm_init(void)
     }
 
     /* Register processing of fragmented DICOM PDVs */
-    fragment_table_init(&dcm_pdv_fragment_table);
-    reassembled_table_init(&dcm_pdv_reassembled_table);
+    reassembly_table_init(&dcm_pdv_reassembly_table,
+                          &addresses_reassembly_table_functions);
 }
 
 static dcm_state_t *
@@ -6665,9 +6664,8 @@ dissect_dcm_pdv_fragmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	*/
 	reassembly_id = (((conv->index) & 0x00FFFFFF) << 8) + pdv->pctx_id;
 
-	head = fragment_add_seq_next(tvb, offset, pinfo, reassembly_id,
-				dcm_pdv_fragment_table,
-				dcm_pdv_reassembled_table,
+	head = fragment_add_seq_next(&dcm_pdv_reassembly_table,
+				tvb, offset, pinfo, reassembly_id, NULL,
 				pdv_body_len,
 				!(pdv->is_last_fragment));