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

diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index 80b081d83b..c152aa20bb 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -43,8 +43,7 @@ static gboolean global_capwap_draft_8_cisco = FALSE;
 static gboolean global_capwap_reassemble = TRUE;
 static gboolean global_capwap_swap_frame_control = TRUE;
 
-static GHashTable *capwap_fragment_table = NULL;
-static GHashTable *capwap_reassembled_table = NULL;
+static reassembly_table capwap_reassembly_table;
 
 /* TODO LIST !
 * add decryption of DLTS Message
@@ -705,8 +704,8 @@ static const value_string last_failure_type_vals[] = {
 
 static void capwap_reassemble_init(void)
 {
-    fragment_table_init(&capwap_fragment_table);
-    reassembled_table_init(&capwap_reassembled_table);
+    reassembly_table_init(&capwap_reassembly_table,
+                          &addresses_reassembly_table_functions);
 }
 
 static void
@@ -1405,9 +1404,8 @@ dissect_capwap_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
 
         pinfo->fragmented = TRUE;
 
-        frag_msg = fragment_add_check(tvb, offset, pinfo,fragment_id,
-                                      capwap_fragment_table,
-                                      capwap_reassembled_table,
+        frag_msg = fragment_add_check(&capwap_reassembly_table,
+                                      tvb, offset, pinfo, fragment_id, NULL,
                                       fragment_offset,
                                       len_rem,
                                       fragment_more);
@@ -1493,9 +1491,8 @@ dissect_capwap_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
         pinfo->fragmented = TRUE;
 
-        frag_msg = fragment_add_check(tvb, offset, pinfo,fragment_id,
-                                      capwap_fragment_table,
-                                      capwap_reassembled_table,
+        frag_msg = fragment_add_check(&capwap_reassembly_table,
+                                      tvb, offset, pinfo, fragment_id, NULL,
                                       fragment_offset,
                                       len_rem,
                                       fragment_more);