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

diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index bb87fbc61d..8967e09a9c 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -1067,8 +1067,7 @@ static gint ett_dnp3_al_obj_point = -1;
 static gint ett_dnp3_al_obj_point_perms = -1;
 
 /* Tables for reassembly of fragments. */
-static GHashTable *al_fragment_table     = NULL;
-static GHashTable *al_reassembled_table  = NULL;
+static reassembly_table al_reassembly_table;
 static GHashTable *dl_conversation_table = NULL;
 
 /* Data-Link-Layer Conversation Key Structure */
@@ -3069,9 +3068,8 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         * if it's done.
         */
 
-        frag_msg = fragment_add_seq_next(al_tvb, 0, pinfo, conv_seq_number,
-            al_fragment_table,
-            al_reassembled_table,
+        frag_msg = fragment_add_seq_next(&al_reassembly_table,
+            al_tvb, 0, pinfo, conv_seq_number, NULL,
             tvb_reported_length(al_tvb), /* As this is a constructed tvb, all of it is ok */
             !tr_fin);
 
@@ -3172,8 +3170,8 @@ dnp3_init(void)
   }
   dl_conversation_table = g_hash_table_new(dl_conversation_hash, dl_conversation_equal);
 
-  fragment_table_init(&al_fragment_table);
-  reassembled_table_init(&al_reassembled_table);
+  reassembly_table_init(&al_reassembly_table,
+                        &addresses_reassembly_table_functions);
 }
 
 /* Register the protocol with Wireshark */