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

diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c
index d8078c0e09..a4871d5136 100644
--- a/epan/dissectors/packet-openvpn.c
+++ b/epan/dissectors/packet-openvpn.c
@@ -106,8 +106,7 @@ static const value_string openvpn_message_types[] =
 };
 
 /* everything used during the reassembly process */
-static GHashTable *msg_fragment_table = NULL;
-static GHashTable *msg_reassembled_table = NULL;
+static reassembly_table msg_reassembly_table;
 
 static gint ett_openvpn_fragment = -1;
 static gint ett_openvpn_fragments = -1;
@@ -148,8 +147,8 @@ static const fragment_items openvpn_frag_items = {
 static void
 openvpn_reassemble_init(void)
 {
-  fragment_table_init(&msg_fragment_table);
-  reassembled_table_init(&msg_reassembled_table);
+  reassembly_table_init(&msg_reassembly_table,
+                        &addresses_reassembly_table_functions);
 }
 
 /* we check the leading 4 byte of a suspected hmac for 0x00 bytes,
@@ -347,12 +346,12 @@ dissect_openvpn_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   pinfo->fragmented = TRUE;
 
   frag_msg = fragment_add_seq_next(
+    &msg_reassembly_table,
     tvb,
     offset,
     pinfo,
     msg_sessionid,         /* ID for fragments belonging together */
-    msg_fragment_table,    /* list of message fragments           */
-    msg_reassembled_table, /* list of reassembled messages        */
+    NULL,
     msg_length_remaining,  /* fragment length - to the end        */
     !(msg_lastframe));     /* More fragments ?                    */