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

diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c
index 642652d41a..810b449d4d 100644
--- a/epan/dissectors/packet-wai.c
+++ b/epan/dissectors/packet-wai.c
@@ -61,8 +61,7 @@
 #define FLAG_BIT6       0x40
 #define FLAG_BIT7       0x80
 
-static GHashTable *wai_fragment_table    = NULL;
-static GHashTable *wai_reassembled_table = NULL;
+static reassembly_table wai_reassembly_table;
 
 static int proto_wai = -1;
 
@@ -881,10 +880,11 @@ Figure 18 from [ref:1]
         proto_tree_add_item(wai_tree, hf_wai_flag,      tvb, 11, 1, ENC_BIG_ENDIAN);
     }
 
-    frag_msg =  fragment_add_seq_check (tvb, WAI_DATA_OFFSET, pinfo,
+    frag_msg =  fragment_add_seq_check (&wai_reassembly_table,
+                                        tvb, WAI_DATA_OFFSET,
+                                        pinfo,
                                         packet_num,
-                                        wai_fragment_table,
-                                        wai_reassembled_table,
+                                        NULL,
                                         fragment_num,
                                         length,
                                         flags);
@@ -926,8 +926,8 @@ Figure 18 from [ref:1]
 
 static void wai_reassemble_init (void)
 {
-    fragment_table_init(&wai_fragment_table);
-    reassembled_table_init(&wai_reassembled_table);
+    reassembly_table_init(&wai_reassembly_table,
+                          &addresses_reassembly_table_functions);
 }
 
 void