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

diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c
index d428fe007d..1e47aacd60 100644
--- a/epan/dissectors/packet-dtn.c
+++ b/epan/dissectors/packet-dtn.c
@@ -61,8 +61,7 @@ static int add_dtn_time_to_tree(proto_tree *tree, tvbuff_t *tvb, int offset, con
 static int add_sdnv_time_to_tree(proto_tree *tree, tvbuff_t *tvb, int offset, const char *field_id);
 
 /* For Reassembling TCP Convergence Layer segments */
-static GHashTable *msg_fragment_table = NULL;
-static GHashTable *msg_reassembled_table = NULL;
+static reassembly_table msg_reassembly_table;
 
 static char magic[] = {'d', 't', 'n', '!'};
 
@@ -382,10 +381,10 @@ dissect_tcp_bundle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
              * Convergence layer header.
              */
 
-            frag_msg = fragment_add_seq_next(tvb, frame_offset + convergence_hdr_size,
-                                           pinfo, 0, msg_fragment_table,
-                                           msg_reassembled_table, segment_length,
-                                           more_frags);
+            frag_msg = fragment_add_seq_next(&msg_reassembly_table,
+                                             tvb, frame_offset + convergence_hdr_size,
+                                             pinfo, 0, NULL,
+                                             segment_length, more_frags);
             if(frag_msg && !more_frags) {
                 proto_item *ti;
 
@@ -2432,8 +2431,8 @@ add_sdnv_time_to_tree(proto_tree *tree, tvbuff_t *tvb, int offset, const char *f
 
 static void
 bundle_defragment_init(void) {
-    fragment_table_init(&msg_fragment_table);
-    reassembled_table_init(&msg_reassembled_table);
+    reassembly_table_init(&msg_reassembly_table,
+                          &addresses_reassembly_table_functions);
 }
 
 void