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

diff --git a/epan/dissectors/packet-usb-audio.c b/epan/dissectors/packet-usb-audio.c
index 31d3ca8a3e..1d7d551796 100644
--- a/epan/dissectors/packet-usb-audio.c
+++ b/epan/dissectors/packet-usb-audio.c
@@ -36,8 +36,7 @@ static int hf_midi_cable_number = -1;
 static int hf_midi_code_index = -1;
 static int hf_midi_event = -1;
 
-static GHashTable *midi_data_segment_table = NULL;
-static GHashTable *midi_data_reassembled_table = NULL;
+static reassembly_table midi_data_reassembly_table;
 
 static gint ett_usb_audio = -1;
 
@@ -182,19 +181,21 @@ dissect_usb_midi_event(tvbuff_t *tvb, packet_info *pinfo,
 
         if (code == 0x04)
         {
-            frag_sysex_msg = fragment_add_seq_next(tvb, offset+1, pinfo,
+            frag_sysex_msg = fragment_add_seq_next(&midi_data_reassembly_table,
+                tvb, offset+1,
+                pinfo,
                 cable, /* ID for fragments belonging together */
-                midi_data_segment_table,
-                midi_data_reassembled_table,
+                NULL,
                 3,
                 TRUE);
         }
         else
         {
-            frag_sysex_msg = fragment_add_seq_next(tvb, offset+1, pinfo,
+            frag_sysex_msg = fragment_add_seq_next(&midi_data_reassembly_table,
+                tvb, offset+1,
+                pinfo,
                 cable, /* ID for fragments belonging together */
-                midi_data_segment_table,
-                midi_data_reassembled_table,
+                NULL,
                 (gint)(code - 4),
                 FALSE);
         }
@@ -265,8 +266,8 @@ dissect_usb_audio_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tre
 static void
 midi_data_reassemble_init(void)
 {
-    fragment_table_init(&midi_data_segment_table);
-    reassembled_table_init(&midi_data_reassembled_table);
+    reassembly_table_init(&midi_data_reassembly_table,
+                          &addresses_reassembly_table_functions);
 }
 
 void