stream: clean up reassembly table.

[metze/wireshark/wip.git] / epan / stream.c

diff --git a/epan/stream.c b/epan/stream.c
index 03ab54a332b9ce7e795faf00e8bfa490fc372c9f..3ac068c94741e62f359734b21145485973407ef4 100644 (file)
--- a/epan/stream.c
+++ b/epan/stream.c
@@ -92,7 +92,7 @@ static guint stream_hash_func(gconstpointer k)
     const stream_key_t *key = (const stream_key_t *)k;
 
     /* is_circuit is redundant to the circuit/conversation pointer */
-    return ((guint)(unsigned long)key->circ.circuit) ^ key->p2p_dir;
+    return (GPOINTER_TO_UINT(key->circ.circuit)) ^ key->p2p_dir;
 }
 
 /* compare func */
@@ -238,7 +238,7 @@ typedef struct fragment_key {
 static guint fragment_hash_func(gconstpointer k)
 {
     const fragment_key_t *key = (const fragment_key_t *)k;
-    return ((guint)(unsigned long)key->stream) + ((guint)key -> framenum) + ((guint)key->offset);
+    return (GPOINTER_TO_UINT(key->stream)) + ((guint)key -> framenum) + ((guint)key->offset);
 }
 
 /* compare func */
@@ -366,6 +366,7 @@ void stream_cleanup( void )
     cleanup_stream_hash();
     cleanup_fragment_hash();
     stream_cleanup_pdu_data();
+    reassembly_table_destroy(&stream_reassembly_table);
 }
 
 /* initialise the stream routines */