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-reload.c b/epan/dissectors/packet-reload.c
index 509696450b..95f0ab21ef 100644
--- a/epan/dissectors/packet-reload.c
+++ b/epan/dissectors/packet-reload.c
@@ -1020,14 +1020,13 @@ static const value_string applicationids[] = {
 /*
  * defragmentation
  */
-static GHashTable *reload_fragment_table    = NULL;
-static GHashTable *reload_reassembled_table = NULL;
+static reassembly_table reload_reassembly_table;
 
 static void
 reload_defragment_init(void)
 {
-  fragment_table_init(&reload_fragment_table);
-  reassembled_table_init(&reload_reassembled_table);
+  reassembly_table_init(&reload_reassembly_table,
+                        &addresses_reassembly_table_functions);
 }
 
 
@@ -4119,10 +4118,10 @@ dissect_reload_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     reload_fd_head = NULL;
 
     if (tvb_bytes_exist(tvb, offset, msg_length - offset)) {
-      reload_fd_head = fragment_add_check(tvb, offset, pinfo,
+      reload_fd_head = fragment_add_check(&reload_reassembly_table, tvb, offset,
+                         pinfo,
                          transaction_id[0]^transaction_id[1],
-                         reload_fragment_table,
-                         reload_reassembled_table,
+                         NULL,
                          fragment,
                          msg_length - offset,
                          !last_fragment);