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

diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index ce5b4371a8..abaf5f80b7 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -188,9 +188,8 @@ static const value_string nb_name_type_vals[] = {
 	{0x00,	NULL}
 };
 
-/* Tables for reassembly of fragments. */
-static GHashTable *netbios_fragment_table = NULL;
-static GHashTable *netbios_reassembled_table = NULL;
+/* Table for reassembly of fragments. */
+static reassembly_table netbios_reassembly_table;
 
 /* defragmentation of NetBIOS Frame */
 static gboolean netbios_defragment = TRUE;
@@ -1169,10 +1168,9 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			len = tvb_reported_length_remaining(tvb, offset);
 			if (netbios_defragment &&
 			    tvb_bytes_exist(tvb, offset, len)) {
-				fd_head = fragment_add_seq_next(tvb, offset,
-				    pinfo, session_id,
-				    netbios_fragment_table,
-				    netbios_reassembled_table,
+				fd_head = fragment_add_seq_next(&netbios_reassembly_table,
+				    tvb, offset,
+				    pinfo, session_id, NULL,
 				    len, command == NB_DATA_FIRST_MIDDLE);
 				if (fd_head != NULL) {
 					if (fd_head->next != NULL) {
@@ -1232,10 +1230,10 @@ static void
 netbios_init(void)
 {
 	/*
-	 * Initialize the fragment and reassembly tables.
+	 * Initialize the reassembly table.
 	 */
-	fragment_table_init(&netbios_fragment_table);
-	reassembled_table_init(&netbios_reassembled_table);
+	reassembly_table_init(&netbios_reassembly_table,
+	    &addresses_reassembly_table_functions);
 }
 
 void proto_register_netbios(void)