Qt: Add copy from another profile in UAT dialogs
[metze/wireshark/wip.git] / epan / conversation.c
index 1164769c7914a17700272c077faaafcbd9788c08..fc94e3d65beaa44b99a3c34abbf3de9d1e2b071c 100644 (file)
@@ -1,84 +1,75 @@
 /* conversation.c
  * Routines for building lists of packets that are part of a "conversation"
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
 
-#include <stdio.h>
-
 #include <string.h>
 #include <glib.h>
 #include "packet.h"
-#include "emem.h"
+#include "to_str.h"
 #include "conversation.h"
 
+/* define DEBUG_CONVERSATION for pretty debug printing */
+/* #define DEBUG_CONVERSATION */
+#include "conversation_debug.h"
+
+#ifdef DEBUG_CONVERSATION
+int _debug_conversation_indent = 0;
+#endif
+
+struct endpoint {
+       address addr1;
+       address addr2;
+       endpoint_type etype;
+       guint32 port1;
+       guint32 port2;
+       guint options;
+};
+
+struct conversation_key {
+       struct conversation_key *next;
+       address addr1;
+       address addr2;
+       endpoint_type etype;
+       guint32 port1;
+       guint32 port2;
+};
+
 /*
  * Hash table for conversations with no wildcards.
  */
-static GHashTable *conversation_hashtable_exact = NULL;
+static wmem_map_t *conversation_hashtable_exact = NULL;
 
 /*
  * Hash table for conversations with one wildcard address.
  */
-static GHashTable *conversation_hashtable_no_addr2 = NULL;
+static wmem_map_t *conversation_hashtable_no_addr2 = NULL;
 
 /*
  * Hash table for conversations with one wildcard port.
  */
-static GHashTable *conversation_hashtable_no_port2 = NULL;
+static wmem_map_t *conversation_hashtable_no_port2 = NULL;
 
 /*
  * Hash table for conversations with one wildcard address and port.
  */
-static GHashTable *conversation_hashtable_no_addr2_or_port2 = NULL;
+static wmem_map_t *conversation_hashtable_no_addr2_or_port2 = NULL;
 
 
-#ifdef __NOT_USED__
-typedef struct conversation_key {
-       struct conversation_key *next;
-       address addr1;
-       address addr2;
-       port_type ptype;
-       guint32 port1;
-       guint32 port2;
-} conversation_key;
-#endif
-/*
- * Linked list of conversation keys, so we can, before freeing them all,
- * free the address data allocations associated with them.
- */
-static conversation_key *conversation_keys;
-
 static guint32 new_index;
 
 /*
- * Protocol-specific data attached to a conversation_t structure - protocol
- * index and opaque pointer.
+ * Placeholder for address-less conversations.
  */
-typedef struct _conv_proto_data {
-       int     proto;
-       void    *proto_data;
-} conv_proto_data;
+static address null_address_ = ADDRESS_INIT_NONE;
+
 
 /*
  * Creates a new conversation with known endpoints based on a conversation
@@ -97,100 +88,115 @@ typedef struct _conv_proto_data {
 static conversation_t *
 conversation_create_from_template(conversation_t *conversation, const address *addr2, const guint32 port2)
 {
-   /*
-    * Add a new conversation and keep the conversation template only if the
-    * CONVERSATION_TEMPLATE bit is set for a connection oriented protocol.
-    */
-   if(conversation->options & CONVERSATION_TEMPLATE &&
-      conversation->key_ptr->ptype != PT_UDP)
-   {
-      /*
-       * Set up a new options mask where the conversation template bit and the
-       * bits for absence of a second address and port pair have been removed.
-       */
-      conversation_t *new_conversation_from_template;
-      guint options = conversation->options & ~(CONVERSATION_TEMPLATE | NO_ADDR2 | NO_PORT2);
-
-      /*
-       * Are both the NO_ADDR2 and NO_PORT2 wildcards set in the options mask?
-       */
-      if(conversation->options & NO_ADDR2 &&
-         conversation->options & NO_PORT2)
-      {
-         /*
-          * The conversation template was created without knowledge of both
-          * the second address as well as the second port. Create a new
-          * conversation with new 2nd address and 2nd port.
-          */
-         new_conversation_from_template =
-            conversation_new(conversation->setup_frame,
-                             &conversation->key_ptr->addr1, addr2,
-                             conversation->key_ptr->ptype, conversation->key_ptr->port1,
-                             port2, options);
-      }
-      else if(conversation->options & NO_PORT2)
-      {
-         /*
-          * The conversation template was created without knowledge of port 2
-          * only. Create a new conversation with new 2nd port.
-          */
-         new_conversation_from_template =
-            conversation_new(conversation->setup_frame,
-                             &conversation->key_ptr->addr1, &conversation->key_ptr->addr2,
-                             conversation->key_ptr->ptype, conversation->key_ptr->port1,
-                             port2, options);
-      }
-      else if(conversation->options & NO_ADDR2)
-      {
-         /*
-          * The conversation template was created without knowledge of address
-          * 2. Create a new conversation with new 2nd address.
-          */
-         new_conversation_from_template =
-            conversation_new(conversation->setup_frame,
-                             &conversation->key_ptr->addr1, addr2,
-                             conversation->key_ptr->ptype, conversation->key_ptr->port1,
-                             conversation->key_ptr->port2, options);
-      }
-      else
-      {
-         /*
-          * The CONVERSATION_TEMPLATE bit was set, but no other bit that the
-          * CONVERSATION_TEMPLATE bit controls is active. Just return the old
-          * conversation.
-          */
-         return conversation;
-      }
-
-      /*
-       * Set the protocol dissector used for the template conversation as
-       * the handler of the new conversation as well.
-       */
-      new_conversation_from_template->dissector_handle = conversation->dissector_handle;
-
-      return new_conversation_from_template;
-   }
-   else
-   {
-      return conversation;
-   }
+       /*
+        * Add a new conversation and keep the conversation template only if the
+        * CONVERSATION_TEMPLATE bit is set for a connection oriented protocol.
+        */
+       if (conversation->options & CONVERSATION_TEMPLATE &&
+           conversation->key_ptr->etype != ENDPOINT_UDP)
+       {
+               /*
+                * Set up a new options mask where the conversation template bit and the
+                * bits for absence of a second address and port pair have been removed.
+                */
+               conversation_t *new_conversation_from_template;
+               guint options = conversation->options & ~(CONVERSATION_TEMPLATE | NO_ADDR2 | NO_PORT2);
+
+               /*
+                * Are both the NO_ADDR2 and NO_PORT2 wildcards set in the options mask?
+                */
+               if (conversation->options & NO_ADDR2 &&
+                   conversation->options & NO_PORT2)
+               {
+                       /*
+                        * The conversation template was created without knowledge of both
+                        * the second address as well as the second port. Create a new
+                        * conversation with new 2nd address and 2nd port.
+                        */
+                       new_conversation_from_template =
+                               conversation_new(conversation->setup_frame,
+                                                &conversation->key_ptr->addr1, addr2,
+                                                conversation->key_ptr->etype, conversation->key_ptr->port1,
+                                                port2, options);
+               }
+               else if (conversation->options & NO_PORT2)
+               {
+                       /*
+                        * The conversation template was created without knowledge of port 2
+                        * only. Create a new conversation with new 2nd port.
+                        */
+                       new_conversation_from_template =
+                               conversation_new(conversation->setup_frame,
+                                                &conversation->key_ptr->addr1, &conversation->key_ptr->addr2,
+                                                conversation->key_ptr->etype, conversation->key_ptr->port1,
+                                                port2, options);
+               }
+               else if (conversation->options & NO_ADDR2)
+               {
+                       /*
+                        * The conversation template was created without knowledge of address
+                        * 2. Create a new conversation with new 2nd address.
+                        */
+                       new_conversation_from_template =
+                               conversation_new(conversation->setup_frame,
+                                                &conversation->key_ptr->addr1, addr2,
+                                                conversation->key_ptr->etype, conversation->key_ptr->port1,
+                                                conversation->key_ptr->port2, options);
+               }
+               else
+               {
+                       /*
+                        * The CONVERSATION_TEMPLATE bit was set, but no other bit that the
+                        * CONVERSATION_TEMPLATE bit controls is active. Just return the old
+                        * conversation.
+                        */
+                       return conversation;
+               }
+
+               /*
+                * Set the protocol dissector used for the template conversation as
+                * the handler of the new conversation as well.
+                */
+               new_conversation_from_template->dissector_tree = conversation->dissector_tree;
+
+               return new_conversation_from_template;
+       }
+       else
+       {
+               return conversation;
+       }
 }
 
 /*
  * Compute the hash value for two given address/port pairs if the match
  * is to be exact.
  */
-static guint
+/* http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx#existing
+ * One-at-a-Time hash
+ */
+guint
 conversation_hash_exact(gconstpointer v)
 {
-       const conversation_key *key = (const conversation_key *)v;
+       const conversation_key_t key = (const conversation_key_t)v;
        guint hash_val;
+       address tmp_addr;
 
        hash_val = 0;
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
-       hash_val += key->port1;
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
-       hash_val += key->port2;
+       tmp_addr.len  = 4;
+
+       hash_val = add_address_to_hash(hash_val, &key->addr1);
+
+       tmp_addr.data = &key->port1;
+       hash_val = add_address_to_hash(hash_val, &tmp_addr);
+
+       hash_val = add_address_to_hash(hash_val, &key->addr2);
+
+       tmp_addr.data = &key->port2;
+       hash_val = add_address_to_hash(hash_val, &tmp_addr);
+
+       hash_val += ( hash_val << 3 );
+       hash_val ^= ( hash_val >> 11 );
+       hash_val += ( hash_val << 15 );
 
        return hash_val;
 }
@@ -201,10 +207,10 @@ conversation_hash_exact(gconstpointer v)
 static gint
 conversation_match_exact(gconstpointer v, gconstpointer w)
 {
-       const conversation_key *v1 = (const conversation_key *)v;
-       const conversation_key *v2 = (const conversation_key *)w;
+       const conversation_key_t v1 = (const conversation_key_t)v;
+       const conversation_key_t v2 = (const conversation_key_t)w;
 
-       if (v1->ptype != v2->ptype)
+       if (v1->etype != v2->etype)
                return 0;       /* different types of port */
 
        /*
@@ -215,8 +221,8 @@ conversation_match_exact(gconstpointer v, gconstpointer w)
         */
        if (v1->port1 == v2->port1 &&
            v1->port2 == v2->port2 &&
-           ADDRESSES_EQUAL(&v1->addr1, &v2->addr1) &&
-           ADDRESSES_EQUAL(&v1->addr2, &v2->addr2)) {
+           addresses_equal(&v1->addr1, &v2->addr1) &&
+           addresses_equal(&v1->addr2, &v2->addr2)) {
                /*
                 * Yes.  It's the same conversation, and the two
                 * address/port pairs are going in the same direction.
@@ -232,8 +238,8 @@ conversation_match_exact(gconstpointer v, gconstpointer w)
         */
        if (v1->port2 == v2->port1 &&
            v1->port1 == v2->port2 &&
-           ADDRESSES_EQUAL(&v1->addr2, &v2->addr1) &&
-           ADDRESSES_EQUAL(&v1->addr1, &v2->addr2)) {
+           addresses_equal(&v1->addr2, &v2->addr1) &&
+           addresses_equal(&v1->addr1, &v2->addr2)) {
                /*
                 * Yes.  It's the same conversation, and the two
                 * address/port pairs are going in opposite directions.
@@ -254,13 +260,24 @@ conversation_match_exact(gconstpointer v, gconstpointer w)
 static guint
 conversation_hash_no_addr2(gconstpointer v)
 {
-       const conversation_key *key = (const conversation_key *)v;
+       const conversation_key_t key = (const conversation_key_t)v;
        guint hash_val;
+       address tmp_addr;
 
        hash_val = 0;
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
-       hash_val += key->port1;
-       hash_val += key->port2;
+       tmp_addr.len  = 4;
+
+       hash_val = add_address_to_hash(hash_val, &key->addr1);
+
+       tmp_addr.data = &key->port1;
+       hash_val = add_address_to_hash(hash_val, &tmp_addr);
+
+       tmp_addr.data = &key->port2;
+       hash_val = add_address_to_hash(hash_val, &tmp_addr);
+
+       hash_val += ( hash_val << 3 );
+       hash_val ^= ( hash_val >> 11 );
+       hash_val += ( hash_val << 15 );
 
        return hash_val;
 }
@@ -274,10 +291,10 @@ conversation_hash_no_addr2(gconstpointer v)
 static gint
 conversation_match_no_addr2(gconstpointer v, gconstpointer w)
 {
-       const conversation_key *v1 = (const conversation_key *)v;
-       const conversation_key *v2 = (const conversation_key *)w;
+       const conversation_key_t v1 = (const conversation_key_t)v;
+       const conversation_key_t v2 = (const conversation_key_t)w;
 
-       if (v1->ptype != v2->ptype)
+       if (v1->etype != v2->etype)
                return 0;       /* different types of port */
 
        /*
@@ -287,7 +304,7 @@ conversation_match_no_addr2(gconstpointer v, gconstpointer w)
         */
        if (v1->port1 == v2->port1 &&
            v1->port2 == v2->port2 &&
-           ADDRESSES_EQUAL(&v1->addr1, &v2->addr1)) {
+           addresses_equal(&v1->addr1, &v2->addr1)) {
                /*
                 * Yes.  It's the same conversation, and the two
                 * address/port pairs are going in the same direction.
@@ -308,13 +325,23 @@ conversation_match_no_addr2(gconstpointer v, gconstpointer w)
 static guint
 conversation_hash_no_port2(gconstpointer v)
 {
-       const conversation_key *key = (const conversation_key *)v;
+       const conversation_key_t key = (const conversation_key_t)v;
        guint hash_val;
+       address tmp_addr;
 
        hash_val = 0;
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
-       hash_val += key->port1;
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+       tmp_addr.len  = 4;
+
+       hash_val = add_address_to_hash(hash_val, &key->addr1);
+
+       tmp_addr.data = &key->port1;
+       hash_val = add_address_to_hash(hash_val, &tmp_addr);
+
+       hash_val = add_address_to_hash(hash_val, &key->addr2);
+
+       hash_val += ( hash_val << 3 );
+       hash_val ^= ( hash_val >> 11 );
+       hash_val += ( hash_val << 15 );
 
        return hash_val;
 }
@@ -328,10 +355,10 @@ conversation_hash_no_port2(gconstpointer v)
 static gint
 conversation_match_no_port2(gconstpointer v, gconstpointer w)
 {
-       const conversation_key *v1 = (const conversation_key *)v;
-       const conversation_key *v2 = (const conversation_key *)w;
+       const conversation_key_t v1 = (const conversation_key_t)v;
+       const conversation_key_t v2 = (const conversation_key_t)w;
 
-       if (v1->ptype != v2->ptype)
+       if (v1->etype != v2->etype)
                return 0;       /* different types of port */
 
        /*
@@ -340,8 +367,8 @@ conversation_match_no_port2(gconstpointer v, gconstpointer w)
         * address 2 values the same?
         */
        if (v1->port1 == v2->port1 &&
-           ADDRESSES_EQUAL(&v1->addr1, &v2->addr1) &&
-           ADDRESSES_EQUAL(&v1->addr2, &v2->addr2)) {
+           addresses_equal(&v1->addr1, &v2->addr1) &&
+           addresses_equal(&v1->addr2, &v2->addr2)) {
                /*
                 * Yes.  It's the same conversation, and the two
                 * address/port pairs are going in the same direction.
@@ -362,12 +389,21 @@ conversation_match_no_port2(gconstpointer v, gconstpointer w)
 static guint
 conversation_hash_no_addr2_or_port2(gconstpointer v)
 {
-       const conversation_key *key = (const conversation_key *)v;
+       const conversation_key_t key = (const conversation_key_t)v;
        guint hash_val;
+       address tmp_addr;
 
        hash_val = 0;
-       ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
-       hash_val += key->port1;
+       tmp_addr.len  = 4;
+
+       hash_val = add_address_to_hash(hash_val, &key->addr1);
+
+       tmp_addr.data = &key->port1;
+       hash_val = add_address_to_hash(hash_val, &tmp_addr);
+
+       hash_val += ( hash_val << 3 );
+       hash_val ^= ( hash_val >> 11 );
+       hash_val += ( hash_val << 15 );
 
        return hash_val;
 }
@@ -381,10 +417,10 @@ conversation_hash_no_addr2_or_port2(gconstpointer v)
 static gint
 conversation_match_no_addr2_or_port2(gconstpointer v, gconstpointer w)
 {
-       const conversation_key *v1 = (const conversation_key *)v;
-       const conversation_key *v2 = (const conversation_key *)w;
+       const conversation_key_t v1 = (const conversation_key_t)v;
+       const conversation_key_t v2 = (const conversation_key_t)w;
 
-       if (v1->ptype != v2->ptype)
+       if (v1->etype != v2->etype)
                return 0;       /* different types of port */
 
        /*
@@ -392,7 +428,7 @@ conversation_match_no_addr2_or_port2(gconstpointer v, gconstpointer w)
         * and second address 1 values the same?
         */
        if (v1->port1 == v2->port1 &&
-           ADDRESSES_EQUAL(&v1->addr1, &v2->addr1)) {
+           addresses_equal(&v1->addr1, &v2->addr1)) {
                /*
                 * Yes.  It's the same conversation, and the two
                 * address/port pairs are going in the same direction.
@@ -406,59 +442,8 @@ conversation_match_no_addr2_or_port2(gconstpointer v, gconstpointer w)
        return 0;
 }
 
-/*
- * Free the proto_data.  The conversation itself is se_allocated.
- */
-static void
-free_data_list(gpointer key _U_, gpointer value, gpointer user_data _U_)
-{
-       conversation_t *conv = (conversation_t *)value;
-
-       /* TODO: se_slist? */
-       g_slist_free(conv->data_list);
-
-       /* Not really necessary, but... */
-       conv->data_list = NULL;
-
-}
-
-/*
- * Destroy all existing conversations
- */
-void
-conversation_cleanup(void)
-{
-       /*  Clean up the hash tables, but only after freeing any proto_data
-        *  that may be hanging off the conversations.
-        *  The conversation keys are se_ allocated so we don't have to clean them up.
-        */
-       conversation_keys = NULL;
-       if (conversation_hashtable_exact != NULL) {
-               g_hash_table_foreach(conversation_hashtable_exact, free_data_list, NULL);
-               g_hash_table_destroy(conversation_hashtable_exact);
-       }
-       if (conversation_hashtable_no_addr2 != NULL) {
-               g_hash_table_foreach(conversation_hashtable_no_addr2, free_data_list, NULL);
-               g_hash_table_destroy(conversation_hashtable_no_addr2);
-       }
-       if (conversation_hashtable_no_port2 != NULL) {
-               g_hash_table_foreach(conversation_hashtable_no_port2, free_data_list, NULL);
-               g_hash_table_destroy(conversation_hashtable_no_port2);
-       }
-       if (conversation_hashtable_no_addr2_or_port2 != NULL) {
-               g_hash_table_foreach(conversation_hashtable_no_addr2_or_port2, free_data_list, NULL);
-               g_hash_table_destroy(conversation_hashtable_no_addr2_or_port2);
-       }
-
-       conversation_hashtable_exact = NULL;
-       conversation_hashtable_no_addr2 = NULL;
-       conversation_hashtable_no_port2 = NULL;
-       conversation_hashtable_no_addr2_or_port2 = NULL;
-}
-
-/*
- * Initialize some variables every time a file is loaded or re-loaded.
- * Create a new hash table for the conversations in the new file.
+/**
+ * Create a new hash tables for conversations.
  */
 void
 conversation_init(void)
@@ -472,18 +457,25 @@ conversation_init(void)
         * above.
         */
        conversation_hashtable_exact =
-           g_hash_table_new(conversation_hash_exact,
+           wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), conversation_hash_exact,
              conversation_match_exact);
        conversation_hashtable_no_addr2 =
-           g_hash_table_new(conversation_hash_no_addr2,
+           wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), conversation_hash_no_addr2,
              conversation_match_no_addr2);
        conversation_hashtable_no_port2 =
-           g_hash_table_new(conversation_hash_no_port2,
+           wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), conversation_hash_no_port2,
              conversation_match_no_port2);
        conversation_hashtable_no_addr2_or_port2 =
-           g_hash_table_new(conversation_hash_no_addr2_or_port2,
+           wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), conversation_hash_no_addr2_or_port2,
              conversation_match_no_addr2_or_port2);
 
+}
+
+/**
+ * Initialize some variables every time a file is loaded or re-loaded.
+ */
+void conversation_epan_reset(void)
+{
        /*
         * Start the conversation indices over at 0.
         */
@@ -496,25 +488,27 @@ conversation_init(void)
  *
  * Mostly adapted from the old conversation_new().
  */
-void
-conversation_insert_into_hashtable(GHashTable *hashtable, conversation_t *conv)
+static void
+conversation_insert_into_hashtable(wmem_map_t *hashtable, conversation_t *conv)
 {
        conversation_t *chain_head, *chain_tail, *cur, *prev;
 
-       chain_head = (conversation_t *)g_hash_table_lookup(hashtable, conv->key_ptr);
+       chain_head = (conversation_t *)wmem_map_lookup(hashtable, conv->key_ptr);
 
        if (NULL==chain_head) {
                /* New entry */
                conv->next = NULL;
                conv->last = conv;
-               g_hash_table_insert(hashtable, conv->key_ptr, conv);
+               wmem_map_insert(hashtable, conv->key_ptr, conv);
+               DPRINT(("created a new conversation chain"));
        }
        else {
                /* There's an existing chain for this key */
+               DPRINT(("there's an existing conversation chain"));
 
                chain_tail = chain_head->last;
 
-               if(conv->setup_frame >= chain_tail->setup_frame) {
+               if (conv->setup_frame >= chain_tail->setup_frame) {
                        /* This convo belongs at the end of the chain */
                        conv->next = NULL;
                        conv->last = NULL;
@@ -534,7 +528,7 @@ conversation_insert_into_hashtable(GHashTable *hashtable, conversation_t *conv)
                                conv->next = chain_head;
                                conv->last = chain_tail;
                                chain_head->last = NULL;
-                               g_hash_table_insert(hashtable, conv->key_ptr, conv);
+                               wmem_map_insert(hashtable, conv->key_ptr, conv);
                        }
                        else {
                                /* Inserting into the middle of the chain */
@@ -550,18 +544,21 @@ conversation_insert_into_hashtable(GHashTable *hashtable, conversation_t *conv)
  * Does the right thing when removing from one of the conversation hash tables,
  * taking into account ordering and hash chains and all that good stuff.
  */
-void
-conversation_remove_from_hashtable(GHashTable *hashtable, conversation_t *conv)
+static void
+conversation_remove_from_hashtable(wmem_map_t *hashtable, conversation_t *conv)
 {
        conversation_t *chain_head, *cur, *prev;
 
-       chain_head = (conversation_t *)g_hash_table_lookup(hashtable, conv->key_ptr);
+       chain_head = (conversation_t *)wmem_map_lookup(hashtable, conv->key_ptr);
 
        if (conv == chain_head) {
                /* We are currently the front of the chain */
                if (NULL == conv->next) {
-                       /* We are the only conversation in the chain */
-                       g_hash_table_remove(hashtable, conv->key_ptr);
+                       /* We are the only conversation in the chain, no need to
+                        * update next pointer, but do not call
+                        * wmem_map_remove() either because the conv data
+                        * will be re-inserted. */
+                       wmem_map_steal(hashtable, conv->key_ptr);
                }
                else {
                        /* Update the head of the chain */
@@ -573,7 +570,7 @@ conversation_remove_from_hashtable(GHashTable *hashtable, conversation_t *conv)
                        else
                                chain_head->latest_found = conv->latest_found;
 
-                       g_hash_table_insert(hashtable, chain_head->key_ptr, chain_head);
+                       wmem_map_insert(hashtable, chain_head->key_ptr, chain_head);
                }
        }
        else {
@@ -612,16 +609,104 @@ conversation_remove_from_hashtable(GHashTable *hashtable, conversation_t *conv)
  * when searching for this conversation.
  */
 conversation_t *
-conversation_new(const guint32 setup_frame, const address *addr1, const address *addr2, const port_type ptype,
-    const guint32 port1, const guint32 port2, const guint options)
+conversation_new(const guint32 setup_frame, const address *addr1, const address *addr2,
+    const endpoint_type etype, const guint32 port1, const guint32 port2, const guint options)
 {
 /*
        DISSECTOR_ASSERT(!(options | CONVERSATION_TEMPLATE) || ((options | (NO_ADDR2 | NO_PORT2 | NO_PORT2_FORCE))) &&
                                "A conversation template may not be constructed without wildcard options");
 */
-       GHashTable* hashtable;
+       wmem_map_t* hashtable;
        conversation_t *conversation=NULL;
-       conversation_key *new_key;
+       conversation_key_t new_key;
+
+#ifdef DEBUG_CONVERSATION
+       if (addr1 == NULL) {
+               /*
+                * No address 1.
+                */
+               if (options & NO_ADDR2) {
+                       /*
+                        * Neither address 1 nor address 2.
+                        */
+                       if (options & NO_PORT2) {
+                               /*
+                                * Port 1 but not port 2.
+                                */
+                               DPRINT(("creating conversation for frame #%u: ID %u (etype=%d)",
+                                           setup_frame, port1, etype));
+                       } else {
+                               /*
+                                * Ports 1 and 2.
+                                */
+                               DPRINT(("creating conversation for frame #%u: %u -> %u (etype=%d)",
+                                           setup_frame, port1, port2, etype));
+                       }
+               } else {
+                       /*
+                        * Address 2 but not address 1.
+                        */
+                       if (options & NO_PORT2) {
+                               /*
+                                * Port 1 but not port 2.
+                                */
+                               DPRINT(("creating conversation for frame #%u: ID %u, address %s (etype=%d)",
+                                           setup_frame, port1,
+                                           address_to_str(wmem_packet_scope(), addr2), etype));
+                       } else {
+                               /*
+                                * Ports 1 and 2.
+                                */
+                               DPRINT(("creating conversation for frame #%u: %u -> %s:%u (etype=%d)",
+                                           setup_frame, port1,
+                                           address_to_str(wmem_packet_scope(), addr2), port2, etype));
+                       }
+               }
+       } else {
+               /*
+                * Address 1.
+                */
+               if (options & NO_ADDR2) {
+                       /*
+                        * Address 1 but no address 2.
+                        */
+                       if (options & NO_PORT2) {
+                               /*
+                                * Port 1 but not port 2.
+                                */
+                               DPRINT(("creating conversation for frame #%u: %s:%u (etype=%d)",
+                                           setup_frame, address_to_str(wmem_packet_scope(), addr1), port1,
+                                           etype));
+                       } else {
+                               /*
+                                * Ports 1 and 2.
+                                */
+                               DPRINT(("creating conversation for frame #%u: %s:%u -> %u (etype=%d)",
+                                           setup_frame, address_to_str(wmem_packet_scope(), addr1), port1,
+                                           port2, etype));
+                       }
+               } else {
+                       /*
+                        * Addresses 1 and 2.
+                        */
+                       if (options & NO_PORT2) {
+                               /*
+                                * Port 1 but not port 2.
+                                */
+                               DPRINT(("creating conversation for frame #%u: %s:%u -> %s (etype=%d)",
+                                           setup_frame, address_to_str(wmem_packet_scope(), addr1), port1,
+                                           address_to_str(wmem_packet_scope(), addr2), etype));
+                       } else {
+                               /*
+                                * Ports 1 and 2.
+                                */
+                               DPRINT(("creating conversation for frame #%u: %s:%u -> %s:%u (etype=%d)",
+                                           setup_frame, address_to_str(wmem_packet_scope(), addr1), port1,
+                                           address_to_str(wmem_packet_scope(), addr2), port2, etype));
+                       }
+               }
+       }
+#endif
 
        if (options & NO_ADDR2) {
                if (options & (NO_PORT2|NO_PORT2_FORCE)) {
@@ -637,24 +722,29 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address
                }
        }
 
-       new_key = se_new(struct conversation_key);
-       new_key->next = conversation_keys;
-       conversation_keys = new_key;
-       SE_COPY_ADDRESS(&new_key->addr1, addr1);
-       SE_COPY_ADDRESS(&new_key->addr2, addr2);
-       new_key->ptype = ptype;
+       new_key = wmem_new(wmem_file_scope(), struct conversation_key);
+       if (addr1 != NULL) {
+               copy_address_wmem(wmem_file_scope(), &new_key->addr1, addr1);
+       } else {
+               clear_address(&new_key->addr1);
+       }
+       if (addr2 != NULL) {
+               copy_address_wmem(wmem_file_scope(), &new_key->addr2, addr2);
+       } else {
+               clear_address(&new_key->addr2);
+       }
+       new_key->etype = etype;
        new_key->port1 = port1;
        new_key->port2 = port2;
 
-       conversation = se_new(conversation_t); 
+       conversation = wmem_new(wmem_file_scope(), conversation_t);
        memset(conversation, 0, sizeof(conversation_t));
 
-       conversation->index = new_index;
-       conversation->setup_frame = setup_frame;
+       conversation->conv_index = new_index;
+       conversation->setup_frame = conversation->last_frame = setup_frame;
        conversation->data_list = NULL;
 
-       /* clear dissector handle */
-       conversation->dissector_handle = NULL;
+       conversation->dissector_tree = wmem_tree_new(wmem_file_scope());
 
        /* set the options and key pointer */
        conversation->options = options;
@@ -662,11 +752,19 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address
 
        new_index++;
 
+       DINDENT();
        conversation_insert_into_hashtable(hashtable, conversation);
+       DENDENT();
 
        return conversation;
 }
 
+conversation_t *conversation_new_by_id(const guint32 setup_frame, const endpoint_type etype, const guint32 id, const guint options)
+{
+       /* Force the lack of an address or port 2 */
+       return conversation_new(setup_frame, NULL, NULL, etype, id, 0, options | NO_ADDR2 | NO_PORT2);
+}
+
 /*
  * Set the port 2 value in a key.  Remove the original from table,
  * update the options and port values, insert the updated key.
@@ -674,8 +772,10 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address
 void
 conversation_set_port2(conversation_t *conv, const guint32 port)
 {
-   DISSECTOR_ASSERT_HINT(!(conv->options & CONVERSATION_TEMPLATE),
-            "Use the conversation_create_from_template function when the CONVERSATION_TEMPLATE bit is set in the options mask");
+       DISSECTOR_ASSERT_HINT(!(conv->options & CONVERSATION_TEMPLATE),
+           "Use the conversation_create_from_template function when the CONVERSATION_TEMPLATE bit is set in the options mask");
+
+       DPRINT(("called for port=%d", port));
 
        /*
         * If the port 2 value is not wildcarded, don't set it.
@@ -683,6 +783,7 @@ conversation_set_port2(conversation_t *conv, const guint32 port)
        if ((!(conv->options & NO_PORT2)) || (conv->options & NO_PORT2_FORCE))
                return;
 
+       DINDENT();
        if (conv->options & NO_ADDR2) {
                conversation_remove_from_hashtable(conversation_hashtable_no_addr2_or_port2, conv);
        } else {
@@ -695,6 +796,7 @@ conversation_set_port2(conversation_t *conv, const guint32 port)
        } else {
                conversation_insert_into_hashtable(conversation_hashtable_exact, conv);
        }
+       DENDENT();
 }
 
 /*
@@ -704,8 +806,13 @@ conversation_set_port2(conversation_t *conv, const guint32 port)
 void
 conversation_set_addr2(conversation_t *conv, const address *addr)
 {
-   DISSECTOR_ASSERT_HINT(!(conv->options & CONVERSATION_TEMPLATE),
-            "Use the conversation_create_from_template function when the CONVERSATION_TEMPLATE bit is set in the options mask");
+       char* addr_str;
+       DISSECTOR_ASSERT_HINT(!(conv->options & CONVERSATION_TEMPLATE),
+                       "Use the conversation_create_from_template function when the CONVERSATION_TEMPLATE bit is set in the options mask");
+
+       addr_str = address_to_str(NULL, addr);
+       DPRINT(("called for addr=%s", addr_str));
+       wmem_free(NULL, addr_str);
 
        /*
         * If the address 2 value is not wildcarded, don't set it.
@@ -713,18 +820,20 @@ conversation_set_addr2(conversation_t *conv, const address *addr)
        if (!(conv->options & NO_ADDR2))
                return;
 
+       DINDENT();
        if (conv->options & NO_PORT2) {
                conversation_remove_from_hashtable(conversation_hashtable_no_addr2_or_port2, conv);
        } else {
                conversation_remove_from_hashtable(conversation_hashtable_no_port2, conv);
        }
        conv->options &= ~NO_ADDR2;
-       SE_COPY_ADDRESS(&conv->key_ptr->addr2, addr);
+       copy_address_wmem(wmem_file_scope(), &conv->key_ptr->addr2, addr);
        if (conv->options & NO_PORT2) {
                conversation_insert_into_hashtable(conversation_hashtable_no_port2, conv);
        } else {
                conversation_insert_into_hashtable(conversation_hashtable_exact, conv);
        }
+       DENDENT();
 }
 
 /*
@@ -732,33 +841,41 @@ conversation_set_addr2(conversation_t *conv, const address *addr)
  * {addr1, port1, addr2, port2} and set up before frame_num.
  */
 static conversation_t *
-conversation_lookup_hashtable(GHashTable *hashtable, const guint32 frame_num, const address *addr1, const address *addr2,
-    const port_type ptype, const guint32 port1, const guint32 port2)
+conversation_lookup_hashtable(wmem_map_t *hashtable, const guint32 frame_num, const address *addr1, const address *addr2,
+    const endpoint_type etype, const guint32 port1, const guint32 port2)
 {
        conversation_t* convo=NULL;
        conversation_t* match=NULL;
        conversation_t* chain_head=NULL;
-       conversation_key key;
+       struct conversation_key key;
 
        /*
         * We don't make a copy of the address data, we just copy the
         * pointer to it, as "key" disappears when we return.
         */
-       key.addr1 = *addr1;
-       key.addr2 = *addr2;
-       key.ptype = ptype;
+       if (addr1 != NULL) {
+               key.addr1 = *addr1;
+       } else {
+               clear_address(&key.addr1);
+       }
+       if (addr2 != NULL) {
+               key.addr2 = *addr2;
+       } else {
+               clear_address(&key.addr2);
+       }
+       key.etype = etype;
        key.port1 = port1;
        key.port2 = port2;
 
-       chain_head = (conversation_t *)g_hash_table_lookup(hashtable, &key);
+       chain_head = (conversation_t *)wmem_map_lookup(hashtable, &key);
 
        if (chain_head && (chain_head->setup_frame <= frame_num)) {
                match = chain_head;
 
-               if((chain_head->last)&&(chain_head->last->setup_frame<=frame_num))
+               if ((chain_head->last)&&(chain_head->last->setup_frame<=frame_num))
                        return chain_head->last;
 
-               if((chain_head->latest_found)&&(chain_head->latest_found->setup_frame<=frame_num))
+               if ((chain_head->latest_found)&&(chain_head->latest_found->setup_frame<=frame_num))
                        match = chain_head->latest_found;
 
                for (convo = match; convo && convo->setup_frame <= frame_num; convo = convo->next) {
@@ -768,8 +885,8 @@ conversation_lookup_hashtable(GHashTable *hashtable, const guint32 frame_num, co
                }
        }
 
-    if (match)
-       chain_head->latest_found = match;
+       if (match)
+               chain_head->latest_found = match;
 
        return match;
 }
@@ -797,7 +914,7 @@ conversation_lookup_hashtable(GHashTable *hashtable, const guint32 frame_num, co
  *
  *     otherwise, if "port_b" wasn't specified as a wildcard, we try to
  *     match any address 2 with the specified port 2 (addr_a/port_a and
- *     {any}/addr_b) and, if that succeeds, we return a pointer to the
+ *     {any}/port_b) and, if that succeeds, we return a pointer to the
  *     matched conversation;
  *
  *     otherwise, if "addr_b" wasn't specified as a wildcard, we try to
@@ -812,382 +929,435 @@ conversation_lookup_hashtable(GHashTable *hashtable, const guint32 frame_num, co
  *     otherwise, we found no matching conversation, and return NULL.
  */
 conversation_t *
-find_conversation(const guint32 frame_num, const address *addr_a, const address *addr_b, const port_type ptype,
+find_conversation(const guint32 frame_num, const address *addr_a, const address *addr_b, const endpoint_type etype,
     const guint32 port_a, const guint32 port_b, const guint options)
 {
-   conversation_t *conversation;
-
-   /*
-    * First try an exact match, if we have two addresses and ports.
-    */
-   if (!(options & (NO_ADDR_B|NO_PORT_B))) {
-      /*
-       * Neither search address B nor search port B are wildcarded,
-       * start out with an exact match.
-       * Exact matches check both directions.
-       */
-      conversation =
-         conversation_lookup_hashtable(conversation_hashtable_exact,
-         frame_num, addr_a, addr_b, ptype,
-         port_a, port_b);
-      if ((conversation == NULL) && (addr_a->type == AT_FC)) {
-         /* In Fibre channel, OXID & RXID are never swapped as
-          * TCP/UDP ports are in TCP/IP.
-          */
-         conversation =
-            conversation_lookup_hashtable(conversation_hashtable_exact,
-            frame_num, addr_b, addr_a, ptype,
-            port_a, port_b);
-      }
-      if (conversation != NULL)
-         return conversation;
-   }
-
-   /*
-    * Well, that didn't find anything.  Try matches that wildcard
-    * one of the addresses, if we have two ports.
-    */
-   if (!(options & NO_PORT_B)) {
-      /*
-       * Search port B isn't wildcarded.
-       *
-       * First try looking for a conversation with the specified
-       * address A and port A as the first address and port, and
-       * with any address and the specified port B as the second
-       * address and port.
-       * ("addr_b" doesn't take part in this lookup.)
-       */
-      conversation =
-         conversation_lookup_hashtable(conversation_hashtable_no_addr2,
-         frame_num, addr_a, addr_b, ptype, port_a, port_b);
-      if ((conversation == NULL) && (addr_a->type == AT_FC)) {
-         /* In Fibre channel, OXID & RXID are never swapped as
-          * TCP/UDP ports are in TCP/IP.
-          */
-         conversation =
-            conversation_lookup_hashtable(conversation_hashtable_no_addr2,
-            frame_num, addr_b, addr_a, ptype,
-            port_a, port_b);
-      }
-      if (conversation != NULL) {
-         /*
-          * If search address B isn't wildcarded, and this is for a
-          * connection-oriented protocol, set the second address for this
-          * conversation to address B, as that's the address that matched the
-          * wildcarded second address for this conversation.
-          *
-          * (This assumes that, for all connection oriented protocols, the
-          * endpoints of a connection have only one address each, i.e. you
-          * don't get packets in a given direction coming from more than one
-          * address, unless the CONVERSATION_TEMPLATE option is set.)
-          */
-         if (!(conversation->options & NO_ADDR_B) && ptype != PT_UDP)
-         {
-            if(!(conversation->options & CONVERSATION_TEMPLATE))
-            {
-               conversation_set_addr2(conversation, addr_b);
-            }
-            else
-            {
-               conversation =
-                  conversation_create_from_template(conversation, addr_b, 0);
-            }
-         }
-         return conversation;
-      }
-
-      /*
-       * Well, that didn't find anything.
-       * If search address B was specified, try looking for a
-       * conversation with the specified address B and port B as
-       * the first address and port, and with any address and the
-       * specified port A as the second address and port (this
-       * packet may be going in the opposite direction from the
-       * first packet in the conversation).
-       * ("addr_a" doesn't take part in this lookup.)
-       */
-      if (!(options & NO_ADDR_B)) {
-         conversation =
-            conversation_lookup_hashtable(conversation_hashtable_no_addr2,
-            frame_num, addr_b, addr_a, ptype, port_b, port_a);
-         if (conversation != NULL) {
-            /*
-             * If this is for a connection-oriented
-             * protocol, set the second address for
-             * this conversation to address A, as
-             * that's the address that matched the
-             * wildcarded second address for this
-             * conversation.
-             */
-            if (ptype != PT_UDP) {
-               if(!(conversation->options & CONVERSATION_TEMPLATE))
-               {
-                  conversation_set_addr2(conversation, addr_a);
-               }
-               else
-               {
-                  conversation =
-                     conversation_create_from_template(conversation, addr_a, 0);
-               }
-            }
-            return conversation;
-         }
-      }
-   }
-
-   /*
-    * Well, that didn't find anything.  Try matches that wildcard
-    * one of the ports, if we have two addresses.
-   */
-   if (!(options & NO_ADDR_B)) {
-      /*
-       * Search address B isn't wildcarded.
-       *
-       * First try looking for a conversation with the specified
-       * address A and port A as the first address and port, and
-       * with the specified address B and any port as the second
-       * address and port.
-       * ("port_b" doesn't take part in this lookup.)
-       */
-      conversation =
-         conversation_lookup_hashtable(conversation_hashtable_no_port2,
-         frame_num, addr_a, addr_b, ptype, port_a, port_b);
-      if ((conversation == NULL) && (addr_a->type == AT_FC)) {
-         /* In Fibre channel, OXID & RXID are never swapped as
-          * TCP/UDP ports are in TCP/IP
-          */
-         conversation =
-            conversation_lookup_hashtable(conversation_hashtable_no_port2,
-            frame_num, addr_b, addr_a, ptype, port_a, port_b);
-      }
-      if (conversation != NULL) {
-         /*
-          * If search port B isn't wildcarded, and this is for a connection-
-          * oriented protocol, set the second port for this conversation to
-          * port B, as that's the port that matched the wildcarded second port
-          * for this conversation.
-          *
-          * (This assumes that, for all connection oriented protocols, the
-          * endpoints of a connection have only one port each, i.e. you don't
-          * get packets in a given direction coming from more than one port,
-          * unless the CONVERSATION_TEMPLATE option is set.)
-          */
-         if (!(conversation->options & NO_PORT_B) && ptype != PT_UDP)
-         {
-            if(!(conversation->options & CONVERSATION_TEMPLATE))
-            {
-               conversation_set_port2(conversation, port_b);
-            }
-            else
-            {
-               conversation =
-                  conversation_create_from_template(conversation, 0, port_b);
-            }
-         }
-         return conversation;
-      }
-
-      /*
-       * Well, that didn't find anything.
-       * If search port B was specified, try looking for a
-       * conversation with the specified address B and port B
-       * as the first address and port, and with the specified
-       * address A and any port as the second address and port
-       * (this packet may be going in the opposite direction
-       * from the first packet in the conversation).
-       * ("port_a" doesn't take part in this lookup.)
-       */
-      if (!(options & NO_PORT_B)) {
-         conversation =
-            conversation_lookup_hashtable(conversation_hashtable_no_port2,
-            frame_num, addr_b, addr_a, ptype, port_b, port_a);
-         if (conversation != NULL) {
-            /*
-             * If this is for a connection-oriented
-             * protocol, set the second port for
-             * this conversation to port A, as
-             * that's the address that matched the
-             * wildcarded second address for this
-             * conversation.
-             */
-            if (ptype != PT_UDP)
-            {
-               if(!(conversation->options & CONVERSATION_TEMPLATE))
-               {
-                  conversation_set_port2(conversation, port_a);
-               }
-               else
-               {
-                  conversation =
-                     conversation_create_from_template(conversation, 0, port_a);
-               }
-            }
-            return conversation;
-         }
-      }
-   }
-
-   /*
-    * Well, that didn't find anything.  Try matches that wildcard
-    * one address/port pair.
-    *
-    * First try looking for a conversation with the specified address A
-    * and port A as the first address and port.
-    * (Neither "addr_b" nor "port_b" take part in this lookup.)
-    */
-   conversation =
-      conversation_lookup_hashtable(conversation_hashtable_no_addr2_or_port2,
-      frame_num, addr_a, addr_b, ptype, port_a, port_b);
-   if (conversation != NULL) {
-      /*
-       * If this is for a connection-oriented protocol:
-       *
-       * if search address B isn't wildcarded, set the
-       * second address for this conversation to address
-       * B, as that's the address that matched the
-       * wildcarded second address for this conversation;
-       *
-       * if search port B isn't wildcarded, set the
-       * second port for this conversation to port B,
-       * as that's the port that matched the wildcarded
-       * second port for this conversation.
-       */
-      if (ptype != PT_UDP)
-      {
-         if(!(conversation->options & CONVERSATION_TEMPLATE))
-         {
-            if (!(conversation->options & NO_ADDR_B))
-               conversation_set_addr2(conversation, addr_b);
-            if (!(conversation->options & NO_PORT_B))
-               conversation_set_port2(conversation, port_b);
-         }
-         else
-         {
-            conversation =
-               conversation_create_from_template(conversation, addr_b, port_b);
-         }
-      }
-      return conversation;
-   }
-
-   /*
-    * Well, that didn't find anything.
-    * If search address and port B were specified, try looking for a
-    * conversation with the specified address B and port B as the
-    * first address and port, and with any second address and port
-    * (this packet may be going in the opposite direction from the
-    * first packet in the conversation).
-    * (Neither "addr_a" nor "port_a" take part in this lookup.)
-    */
-   if (addr_a->type == AT_FC)
-      conversation =
-      conversation_lookup_hashtable(conversation_hashtable_no_addr2_or_port2,
-      frame_num, addr_b, addr_a, ptype, port_a, port_b);
-   else
-      conversation =
-      conversation_lookup_hashtable(conversation_hashtable_no_addr2_or_port2,
-      frame_num, addr_b, addr_a, ptype, port_b, port_a);
-   if (conversation != NULL) {
-      /*
-       * If this is for a connection-oriented protocol, set the
-       * second address for this conversation to address A, as
-       * that's the address that matched the wildcarded second
-       * address for this conversation, and set the second port
-       * for this conversation to port A, as that's the port
-       * that matched the wildcarded second port for this
-       * conversation.
-       */
-      if (ptype != PT_UDP)
-      {
-         if(!(conversation->options & CONVERSATION_TEMPLATE))
-         {
-            conversation_set_addr2(conversation, addr_a);
-            conversation_set_port2(conversation, port_a);
-         }
-         else
-         {
-            conversation = conversation_create_from_template(conversation, addr_a, port_a);
-         }
-      }
-      return conversation;
-   }
-
-   /*
-    * We found no conversation.
-    */
-   return NULL;
+       conversation_t *conversation;
+
+       /*
+        * First try an exact match, if we have two addresses and ports.
+        */
+       if (!(options & (NO_ADDR_B|NO_PORT_B))) {
+               /*
+                * Neither search address B nor search port B are wildcarded,
+                * start out with an exact match.
+                */
+               DPRINT(("trying exact match: %s:%d -> %s:%d",
+                   address_to_str(wmem_packet_scope(), addr_a), port_a,
+                   address_to_str(wmem_packet_scope(), addr_b), port_b));
+               conversation =
+                   conversation_lookup_hashtable(conversation_hashtable_exact,
+                       frame_num, addr_a, addr_b, etype,
+                       port_a, port_b);
+               /* Didn't work, try the other direction */
+               if (conversation == NULL) {
+                       DPRINT(("trying exact match: %s:%d -> %s:%d",
+                           address_to_str(wmem_packet_scope(), addr_b), port_b,
+                           address_to_str(wmem_packet_scope(), addr_a), port_a));
+                       conversation =
+                           conversation_lookup_hashtable(conversation_hashtable_exact,
+                               frame_num, addr_b, addr_a, etype,
+                               port_b, port_a);
+               }
+               if ((conversation == NULL) && (addr_a->type == AT_FC)) {
+                       /* In Fibre channel, OXID & RXID are never swapped as
+                        * TCP/UDP ports are in TCP/IP.
+                        */
+                       DPRINT(("trying exact match: %s:%d -> %s:%d",
+                           address_to_str(wmem_packet_scope(), addr_b), port_a,
+                           address_to_str(wmem_packet_scope(), addr_a), port_b));
+                       conversation =
+                           conversation_lookup_hashtable(conversation_hashtable_exact,
+                               frame_num, addr_b, addr_a, etype,
+                               port_a, port_b);
+               }
+               DPRINT(("exact match %sfound",conversation?"":"not "));
+               if (conversation != NULL)
+                       return conversation;
+       }
+
+       /*
+        * Well, that didn't find anything.  Try matches that wildcard
+        * one of the addresses, if we have two ports.
+        */
+       if (!(options & NO_PORT_B)) {
+               /*
+                * Search port B isn't wildcarded.
+                *
+                * First try looking for a conversation with the specified
+                * address A and port A as the first address and port, and
+                * with any address and the specified port B as the second
+                * address and port.
+                * ("addr_b" doesn't take part in this lookup.)
+                */
+               DPRINT(("trying wildcarded match: %s:%d -> *:%d",
+                   address_to_str(wmem_packet_scope(), addr_a), port_a,
+                   port_b));
+               conversation =
+                   conversation_lookup_hashtable(conversation_hashtable_no_addr2,
+                       frame_num, addr_a, addr_b, etype, port_a, port_b);
+               if ((conversation == NULL) && (addr_a->type == AT_FC)) {
+                       /* In Fibre channel, OXID & RXID are never swapped as
+                        * TCP/UDP ports are in TCP/IP.
+                        */
+                       DPRINT(("trying wildcarded match: %s:%d -> *:%d",
+                           address_to_str(wmem_packet_scope(), addr_b), port_a,
+                           port_b));
+                       conversation =
+                           conversation_lookup_hashtable(conversation_hashtable_no_addr2,
+                               frame_num, addr_b, addr_a, etype,
+                               port_a, port_b);
+               }
+               if (conversation != NULL) {
+                       /*
+                        * If search address B isn't wildcarded, and this is for a
+                        * connection-oriented protocol, set the second address for this
+                        * conversation to address B, as that's the address that matched the
+                        * wildcarded second address for this conversation.
+                        *
+                        * (This assumes that, for all connection oriented protocols, the
+                        * endpoints of a connection have only one address each, i.e. you
+                        * don't get packets in a given direction coming from more than one
+                        * address, unless the CONVERSATION_TEMPLATE option is set.)
+                        */
+                       DPRINT(("wildcarded dest address match found"));
+                       if (!(conversation->options & NO_ADDR_B) && etype != ENDPOINT_UDP)
+                       {
+                               if (!(conversation->options & CONVERSATION_TEMPLATE))
+                               {
+                                       conversation_set_addr2(conversation, addr_b);
+                               }
+                               else
+                               {
+                                       conversation =
+                                               conversation_create_from_template(conversation, addr_b, 0);
+                               }
+                       }
+                       return conversation;
+               }
+
+               /*
+                * Well, that didn't find anything.
+                * If search address B was specified, try looking for a
+                * conversation with the specified address B and port B as
+                * the first address and port, and with any address and the
+                * specified port A as the second address and port (this
+                * packet may be going in the opposite direction from the
+                * first packet in the conversation).
+                * ("addr_a" doesn't take part in this lookup.)
+                */
+               if (!(options & NO_ADDR_B)) {
+                       DPRINT(("trying wildcarded match: %s:%d -> *:%d",
+                           address_to_str(wmem_packet_scope(), addr_b), port_b,
+                           port_a));
+                       conversation =
+                           conversation_lookup_hashtable(conversation_hashtable_no_addr2,
+                               frame_num, addr_b, addr_a, etype, port_b, port_a);
+                       if (conversation != NULL) {
+                               /*
+                                * If this is for a connection-oriented
+                                * protocol, set the second address for
+                                * this conversation to address A, as
+                                * that's the address that matched the
+                                * wildcarded second address for this
+                                * conversation.
+                                */
+                               DPRINT(("match found"));
+                               if (etype != ENDPOINT_UDP) {
+                                       if (!(conversation->options & CONVERSATION_TEMPLATE))
+                                       {
+                                               conversation_set_addr2(conversation, addr_a);
+                                       }
+                                       else
+                                       {
+                                               conversation =
+                                                   conversation_create_from_template(conversation, addr_a, 0);
+                                       }
+                               }
+                               return conversation;
+                       }
+               }
+       }
+
+       /*
+        * Well, that didn't find anything.  Try matches that wildcard
+        * one of the ports, if we have two addresses.
+       */
+       if (!(options & NO_ADDR_B)) {
+               /*
+                * Search address B isn't wildcarded.
+                *
+                * First try looking for a conversation with the specified
+                * address A and port A as the first address and port, and
+                * with the specified address B and any port as the second
+                * address and port.
+                * ("port_b" doesn't take part in this lookup.)
+                */
+               DPRINT(("trying wildcarded match: %s:%d -> %s:*",
+                   address_to_str(wmem_packet_scope(), addr_a), port_a,
+                   address_to_str(wmem_packet_scope(), addr_b)));
+               conversation =
+                   conversation_lookup_hashtable(conversation_hashtable_no_port2,
+                       frame_num, addr_a, addr_b, etype, port_a, port_b);
+               if ((conversation == NULL) && (addr_a->type == AT_FC)) {
+                       /* In Fibre channel, OXID & RXID are never swapped as
+                        * TCP/UDP ports are in TCP/IP
+                        */
+                       DPRINT(("trying wildcarded match: %s:%d -> %s:*",
+                           address_to_str(wmem_packet_scope(), addr_b), port_a,
+                           address_to_str(wmem_packet_scope(), addr_a)));
+                       conversation =
+                           conversation_lookup_hashtable(conversation_hashtable_no_port2,
+                               frame_num, addr_b, addr_a, etype, port_a, port_b);
+               }
+               if (conversation != NULL) {
+                       /*
+                        * If search port B isn't wildcarded, and this is for a connection-
+                        * oriented protocol, set the second port for this conversation to
+                        * port B, as that's the port that matched the wildcarded second port
+                        * for this conversation.
+                        *
+                        * (This assumes that, for all connection oriented protocols, the
+                        * endpoints of a connection have only one port each, i.e. you don't
+                        * get packets in a given direction coming from more than one port,
+                        * unless the CONVERSATION_TEMPLATE option is set.)
+                        */
+                       DPRINT(("match found"));
+                       if (!(conversation->options & NO_PORT_B) && etype != ENDPOINT_UDP)
+                       {
+                               if (!(conversation->options & CONVERSATION_TEMPLATE))
+                               {
+                                       conversation_set_port2(conversation, port_b);
+                               }
+                               else
+                               {
+                                       conversation =
+                                           conversation_create_from_template(conversation, 0, port_b);
+                               }
+                       }
+                       return conversation;
+               }
+
+               /*
+                * Well, that didn't find anything.
+                * If search port B was specified, try looking for a
+                * conversation with the specified address B and port B
+                * as the first address and port, and with the specified
+                * address A and any port as the second address and port
+                * (this packet may be going in the opposite direction
+                * from the first packet in the conversation).
+                * ("port_a" doesn't take part in this lookup.)
+                */
+               if (!(options & NO_PORT_B)) {
+                       DPRINT(("trying wildcarded match: %s:%d -> %s:*",
+                           address_to_str(wmem_packet_scope(), addr_b), port_b,
+                           address_to_str(wmem_packet_scope(), addr_a)));
+                       conversation =
+                           conversation_lookup_hashtable(conversation_hashtable_no_port2,
+                               frame_num, addr_b, addr_a, etype, port_b, port_a);
+                       if (conversation != NULL) {
+                               /*
+                                * If this is for a connection-oriented
+                                * protocol, set the second port for
+                                * this conversation to port A, as
+                                * that's the address that matched the
+                                * wildcarded second address for this
+                                * conversation.
+                                */
+                               DPRINT(("match found"));
+                               if (etype != ENDPOINT_UDP)
+                               {
+                                       if (!(conversation->options & CONVERSATION_TEMPLATE))
+                                       {
+                                               conversation_set_port2(conversation, port_a);
+                                       }
+                                       else
+                                       {
+                                               conversation =
+                                                   conversation_create_from_template(conversation, 0, port_a);
+                                       }
+                               }
+                               return conversation;
+                       }
+               }
+       }
+
+       /*
+        * Well, that didn't find anything.  Try matches that wildcard
+        * one address/port pair.
+        *
+        * First try looking for a conversation with the specified address A
+        * and port A as the first address and port.
+        * (Neither "addr_b" nor "port_b" take part in this lookup.)
+        */
+       DPRINT(("trying wildcarded match: %s:%d -> *:*",
+           address_to_str(wmem_packet_scope(), addr_a), port_a));
+       conversation =
+           conversation_lookup_hashtable(conversation_hashtable_no_addr2_or_port2,
+               frame_num, addr_a, addr_b, etype, port_a, port_b);
+       if (conversation != NULL) {
+               /*
+                * If this is for a connection-oriented protocol:
+                *
+                * if search address B isn't wildcarded, set the
+                * second address for this conversation to address
+                * B, as that's the address that matched the
+                * wildcarded second address for this conversation;
+                *
+                * if search port B isn't wildcarded, set the
+                * second port for this conversation to port B,
+                * as that's the port that matched the wildcarded
+                * second port for this conversation.
+                */
+               DPRINT(("match found"));
+               if (etype != ENDPOINT_UDP)
+               {
+                       if (!(conversation->options & CONVERSATION_TEMPLATE))
+                       {
+                               if (!(conversation->options & NO_ADDR_B))
+                                       conversation_set_addr2(conversation, addr_b);
+                               if (!(conversation->options & NO_PORT_B))
+                                       conversation_set_port2(conversation, port_b);
+                       }
+                       else
+                       {
+                               conversation =
+                                   conversation_create_from_template(conversation, addr_b, port_b);
+                       }
+               }
+               return conversation;
+       }
+       /* for Infiniband, don't try to look in addresses of reverse
+        * direction, because it could be another different
+        * valid conversation than what is being searched using
+        * addr_a, port_a.
+        */
+       if (etype != ENDPOINT_IBQP)
+       {
+
+               /*
+                * Well, that didn't find anything.
+                * If search address and port B were specified, try looking for a
+                * conversation with the specified address B and port B as the
+                * first address and port, and with any second address and port
+                * (this packet may be going in the opposite direction from the
+                * first packet in the conversation).
+                * (Neither "addr_a" nor "port_a" take part in this lookup.)
+                */
+               if ((addr_a != NULL) && (addr_a->type == AT_FC)) {
+                       DPRINT(("trying wildcarded match: %s:%d -> *:*",
+                           address_to_str(wmem_packet_scope(), addr_b), port_a));
+                       conversation =
+                           conversation_lookup_hashtable(conversation_hashtable_no_addr2_or_port2,
+                               frame_num, addr_b, addr_a, etype, port_a, port_b);
+               } else {
+                       DPRINT(("trying wildcarded match: %s:%d -> *:*",
+                           address_to_str(wmem_packet_scope(), addr_b), port_b));
+                       conversation =
+                           conversation_lookup_hashtable(conversation_hashtable_no_addr2_or_port2,
+                               frame_num, addr_b, addr_a, etype, port_b, port_a);
+               }
+               if (conversation != NULL) {
+                       /*
+                        * If this is for a connection-oriented protocol, set the
+                        * second address for this conversation to address A, as
+                        * that's the address that matched the wildcarded second
+                        * address for this conversation, and set the second port
+                        * for this conversation to port A, as that's the port
+                        * that matched the wildcarded second port for this
+                        * conversation.
+                        */
+                       DPRINT(("match found"));
+                       if (etype != ENDPOINT_UDP)
+                       {
+                               if (!(conversation->options & CONVERSATION_TEMPLATE))
+                               {
+                                       conversation_set_addr2(conversation, addr_a);
+                                       conversation_set_port2(conversation, port_a);
+                               }
+                               else
+                               {
+                                       conversation = conversation_create_from_template(conversation, addr_a, port_a);
+                               }
+                       }
+                       return conversation;
+               }
+       }
+       DPRINT(("no matches found"));
+
+       /*
+        * We found no conversation.
+        */
+       return NULL;
 }
 
-static gint
-p_compare(gconstpointer a, gconstpointer b)
+conversation_t *find_conversation_by_id(const guint32 frame, const endpoint_type etype, const guint32 id, const guint options)
 {
-       const conv_proto_data *ap = (const conv_proto_data *)a;
-       const conv_proto_data *bp = (const conv_proto_data *)b;
-
-       if (ap->proto > bp->proto)
-               return 1;
-       else if (ap->proto == bp->proto)
-               return 0;
-       else
-               return -1;
+       /* Force the lack of a address or port B */
+       return find_conversation(frame, &null_address_, &null_address_, etype, id, 0, options|NO_ADDR_B|NO_PORT_B);
 }
 
 void
 conversation_add_proto_data(conversation_t *conv, const int proto, void *proto_data)
 {
-       conv_proto_data *p1 = se_new(conv_proto_data);
-
-       p1->proto = proto;
-       p1->proto_data = proto_data;
-
        /* Add it to the list of items for this conversation. */
+       if (conv->data_list == NULL)
+               conv->data_list = wmem_tree_new(wmem_file_scope());
 
-       conv->data_list = g_slist_insert_sorted(conv->data_list, (gpointer *)p1,
-           p_compare);
+       wmem_tree_insert32(conv->data_list, proto, proto_data);
 }
 
 void *
 conversation_get_proto_data(const conversation_t *conv, const int proto)
 {
-       conv_proto_data temp, *p1;
-       GSList *item;
-
-       temp.proto = proto;
-       temp.proto_data = NULL;
-
-       item = g_slist_find_custom(conv->data_list, (gpointer *)&temp,
-           p_compare);
-
-       if (item != NULL) {
-               p1 = (conv_proto_data *)item->data;
-               return p1->proto_data;
-       }
+       /* No tree created yet */
+       if (conv->data_list == NULL)
+               return NULL;
 
-       return NULL;
+       return wmem_tree_lookup32(conv->data_list, proto);
 }
 
 void
 conversation_delete_proto_data(conversation_t *conv, const int proto)
 {
-       conv_proto_data temp;
-       GSList *item;
-
-       temp.proto = proto;
-       temp.proto_data = NULL;
-
-       item = g_slist_find_custom(conv->data_list, (gpointer *)&temp,
-           p_compare);
+       if (conv->data_list != NULL)
+               wmem_tree_remove32(conv->data_list, proto);
+}
 
-       while(item){
-               conv->data_list = g_slist_remove(conv->data_list, item->data);
-               item=item->next;
-       }
+void
+conversation_set_dissector_from_frame_number(conversation_t *conversation,
+       const guint32 starting_frame_num, const dissector_handle_t handle)
+{
+       wmem_tree_insert32(conversation->dissector_tree, starting_frame_num, (void *)handle);
 }
 
 void
 conversation_set_dissector(conversation_t *conversation, const dissector_handle_t handle)
 {
-       conversation->dissector_handle = handle;
+       conversation_set_dissector_from_frame_number(conversation, 0, handle);
+}
+
+dissector_handle_t
+conversation_get_dissector(conversation_t *conversation, const guint32 frame_num)
+{
+       return (dissector_handle_t)wmem_tree_lookup32_le(conversation->dissector_tree, frame_num);
+}
+
+static gboolean try_conversation_call_dissector_helper(conversation_t *conversation, gboolean* dissector_success,
+                                       tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
+{
+       int ret;
+       dissector_handle_t handle = (dissector_handle_t)wmem_tree_lookup32_le(
+                                       conversation->dissector_tree, pinfo->num);
+       if (handle == NULL)
+               return FALSE;
+
+       ret = call_dissector_only(handle, tvb, pinfo, tree, data);
+
+       /* Let the caller decide what to do with success or rejection */
+       (*dissector_success) = (ret != 0);
+
+       return TRUE;
 }
 
 /*
@@ -1197,26 +1367,68 @@ conversation_set_dissector(conversation_t *conversation, const dissector_handle_
  *
  * This helper uses call_dissector_only which will NOT call the default
  * "data" dissector if the packet was rejected.
- * Our caller is responsible to call the data dissector explicitely in case
+ * Our caller is responsible to call the data dissector explicitly in case
  * this function returns FALSE.
  */
 gboolean
-try_conversation_dissector(const address *addr_a, const address *addr_b, const port_type ptype,
+try_conversation_dissector(const address *addr_a, const address *addr_b, const endpoint_type etype,
     const guint32 port_a, const guint32 port_b, tvbuff_t *tvb, packet_info *pinfo,
-    proto_tree *tree)
+    proto_tree *tree, void* data, const guint options)
 {
        conversation_t *conversation;
+       gboolean dissector_success;
 
-       conversation = find_conversation(pinfo->fd->num, addr_a, addr_b, ptype, port_a,
-           port_b, 0);
+       /* Try each mode based on option flags */
+
+       conversation = find_conversation(pinfo->num, addr_a, addr_b, etype, port_a, port_b, 0);
+       if (conversation != NULL) {
+               if (try_conversation_call_dissector_helper(conversation, &dissector_success, tvb, pinfo, tree, data))
+                       return dissector_success;
+       }
+
+       if (options & NO_ADDR_B) {
+               conversation = find_conversation(pinfo->num, addr_a, addr_b, etype, port_a, port_b, NO_ADDR_B);
+               if (conversation != NULL) {
+                       if (try_conversation_call_dissector_helper(conversation, &dissector_success, tvb, pinfo, tree, data))
+                               return dissector_success;
+               }
+       }
+
+       if (options & NO_PORT_B) {
+               conversation = find_conversation(pinfo->num, addr_a, addr_b, etype, port_a, port_b, NO_PORT_B);
+               if (conversation != NULL) {
+                       if (try_conversation_call_dissector_helper(conversation, &dissector_success, tvb, pinfo, tree, data))
+                               return dissector_success;
+               }
+       }
+
+       if (options & (NO_ADDR_B|NO_PORT_B)) {
+               conversation = find_conversation(pinfo->num, addr_a, addr_b, etype, port_a, port_b, NO_ADDR_B|NO_PORT_B);
+               if (conversation != NULL) {
+                       if (try_conversation_call_dissector_helper(conversation, &dissector_success, tvb, pinfo, tree, data))
+                               return dissector_success;
+               }
+       }
+
+       return FALSE;
+}
+
+gboolean
+try_conversation_dissector_by_id(const endpoint_type etype, const guint32 id, tvbuff_t *tvb,
+    packet_info *pinfo, proto_tree *tree, void* data)
+{
+       conversation_t *conversation;
+
+       conversation = find_conversation_by_id(pinfo->num, etype, id, 0);
 
        if (conversation != NULL) {
                int ret;
-               if (conversation->dissector_handle == NULL)
+
+               dissector_handle_t handle = (dissector_handle_t)wmem_tree_lookup32_le(conversation->dissector_tree, pinfo->num);
+               if (handle == NULL)
                        return FALSE;
-               ret=call_dissector_only(conversation->dissector_handle, tvb, pinfo,
-                   tree, NULL);
-               if(!ret) {
+               ret = call_dissector_only(handle, tvb, pinfo, tree, data);
+               if (!ret) {
                        /* this packet was rejected by the dissector
                         * so return FALSE in case our caller wants
                         * to do some cleaning up.
@@ -1228,6 +1440,46 @@ try_conversation_dissector(const address *addr_a, const address *addr_b, const p
        return FALSE;
 }
 
+/**  A helper function that calls find_conversation() using data from pinfo
+ *  The frame number and addresses are taken from pinfo.
+ */
+conversation_t *
+find_conversation_pinfo(packet_info *pinfo, const guint options)
+{
+       conversation_t *conv=NULL;
+
+       DPRINT(("called for frame #%u: %s:%d -> %s:%d (ptype=%d)",
+               pinfo->num, address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport,
+               address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport, pinfo->ptype));
+       DINDENT();
+
+       /* Have we seen this conversation before? */
+       if (pinfo->use_endpoint) {
+               DISSECTOR_ASSERT(pinfo->conv_endpoint);
+               if ((conv = find_conversation(pinfo->num, &pinfo->conv_endpoint->addr1, &pinfo->conv_endpoint->addr2,
+                                             pinfo->conv_endpoint->etype, pinfo->conv_endpoint->port1,
+                                             pinfo->conv_endpoint->port2, pinfo->conv_endpoint->options)) != NULL) {
+                       DPRINT(("found previous conversation for frame #%u (last_frame=%d)",
+                                       pinfo->num, conv->last_frame));
+                       if (pinfo->num > conv->last_frame) {
+                               conv->last_frame = pinfo->num;
+                       }
+               }
+       } else {
+               if ((conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst,
+                                             conversation_pt_to_endpoint_type(pinfo->ptype), pinfo->srcport,
+                                             pinfo->destport, options)) != NULL) {
+                       DPRINT(("found previous conversation for frame #%u (last_frame=%d)",
+                                       pinfo->num, conv->last_frame));
+                       if (pinfo->num > conv->last_frame) {
+                               conv->last_frame = pinfo->num;
+                       }
+               }
+       }
+
+       return conv;
+}
+
 /*  A helper function that calls find_conversation() and, if a conversation is
  *  not found, calls conversation_new().
  *  The frame number and addresses are taken from pinfo.
@@ -1240,14 +1492,186 @@ find_or_create_conversation(packet_info *pinfo)
        conversation_t *conv=NULL;
 
        /* Have we seen this conversation before? */
-       if((conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
-                                    pinfo->ptype, pinfo->srcport,
-                                    pinfo->destport, 0)) == NULL) {
+       if ((conv = find_conversation_pinfo(pinfo, 0)) == NULL) {
                /* No, this is a new conversation. */
-               conv = conversation_new(pinfo->fd->num, &pinfo->src,
-                                       &pinfo->dst, pinfo->ptype,
+               DPRINT(("did not find previous conversation for frame #%u",
+                               pinfo->num));
+               DINDENT();
+               conv = conversation_new(pinfo->num, &pinfo->src,
+                                       &pinfo->dst, conversation_pt_to_endpoint_type(pinfo->ptype),
                                        pinfo->srcport, pinfo->destport, 0);
+               DENDENT();
        }
 
+       DENDENT();
+
        return conv;
 }
+
+conversation_t *
+find_or_create_conversation_by_id(packet_info *pinfo, const endpoint_type etype, const guint32 id)
+{
+       conversation_t *conv=NULL;
+
+       /* Have we seen this conversation before? */
+       if ((conv = find_conversation_by_id(pinfo->num, etype, id, 0)) == NULL) {
+               /* No, this is a new conversation. */
+               DPRINT(("did not find previous conversation for frame #%u",
+                               pinfo->num));
+               DINDENT();
+               conv = conversation_new_by_id(pinfo->num, etype, id, 0);
+               DENDENT();
+       }
+
+       DENDENT();
+
+       return conv;
+}
+
+void conversation_create_endpoint(struct _packet_info *pinfo, address* addr1, address* addr2,
+    endpoint_type etype, guint32 port1, guint32        port2, const guint options)
+{
+       pinfo->conv_endpoint = wmem_new0(pinfo->pool, struct endpoint);
+       pinfo->use_endpoint = TRUE;
+
+       if (addr1 != NULL)
+               copy_address_wmem(pinfo->pool, &pinfo->conv_endpoint->addr1, addr1);
+
+       if (addr2 != NULL)
+               copy_address_wmem(pinfo->pool, &pinfo->conv_endpoint->addr2, addr2);
+
+       pinfo->conv_endpoint->etype = etype;
+       pinfo->conv_endpoint->port1 = port1;
+       pinfo->conv_endpoint->port2 = port2;
+       pinfo->conv_endpoint->options = options;
+}
+
+void conversation_create_endpoint_by_id(struct _packet_info *pinfo,
+    endpoint_type etype, guint32 id, const guint options)
+{
+       /* Force the lack of a address or port B */
+       conversation_create_endpoint(pinfo, &null_address_, &null_address_, etype, id, 0, options|NO_ADDR_B|NO_PORT_B);
+}
+
+guint32 conversation_get_endpoint_by_id(struct _packet_info *pinfo, endpoint_type etype, const guint options)
+{
+       if (pinfo->conv_endpoint == NULL)
+               return 0;
+
+       if ((pinfo->conv_endpoint->etype != etype) &&
+           ((options & USE_LAST_ENDPOINT) != USE_LAST_ENDPOINT))
+               return 0;
+
+       return pinfo->conv_endpoint->port1;
+}
+
+wmem_map_t *
+get_conversation_hashtable_exact(void)
+{
+       return conversation_hashtable_exact;
+}
+
+wmem_map_t *
+get_conversation_hashtable_no_addr2(void)
+{
+       return conversation_hashtable_no_addr2;
+}
+
+wmem_map_t *
+get_conversation_hashtable_no_port2(void)
+{
+       return conversation_hashtable_no_port2;
+}
+
+wmem_map_t *
+get_conversation_hashtable_no_addr2_or_port2(void)
+{
+       return conversation_hashtable_no_addr2_or_port2;
+}
+
+address*
+conversation_key_addr1(const conversation_key_t key)
+{
+       return &key->addr1;
+}
+
+address*
+conversation_key_addr2(const conversation_key_t key)
+{
+       return &key->addr2;
+}
+
+guint32
+conversation_key_port1(const conversation_key_t key)
+{
+       return key->port1;
+}
+
+guint32
+conversation_key_port2(const conversation_key_t key)
+{
+       return key->port2;
+}
+
+WS_DLL_PUBLIC
+endpoint_type conversation_pt_to_endpoint_type(port_type pt)
+{
+       switch (pt)
+       {
+       case PT_NONE:
+               return ENDPOINT_NONE;
+       case PT_SCTP:
+               return ENDPOINT_SCTP;
+       case PT_TCP:
+               return ENDPOINT_TCP;
+       case PT_UDP:
+               return ENDPOINT_UDP;
+       case PT_DCCP:
+               return ENDPOINT_DCCP;
+       case PT_IPX:
+               return ENDPOINT_IPX;
+       case PT_DDP:
+               return ENDPOINT_DDP;
+       case PT_IDP:
+               return ENDPOINT_IDP;
+       case PT_USB:
+               return ENDPOINT_USB;
+       case PT_I2C:
+               return ENDPOINT_I2C;
+       case PT_IBQP:
+               return ENDPOINT_IBQP;
+       case PT_BLUETOOTH:
+               return ENDPOINT_BLUETOOTH;
+       }
+
+       DISSECTOR_ASSERT(FALSE);
+       return ENDPOINT_NONE;
+}
+
+gchar*
+conversation_get_html_hash(const conversation_key_t key)
+{
+       gchar *hash, *addr1, *addr2;
+
+       addr1 = address_to_str(NULL, &key->addr1);
+       addr2 = address_to_str(NULL, &key->addr2);
+       hash = wmem_strdup_printf(NULL, "<tr><td>%s</td><td>%d</td><td>%s</td><td>%d</td></tr>\n",
+                                 addr1, key->port1, addr2, key->port2);
+       wmem_free(NULL, addr1);
+       wmem_free(NULL, addr2);
+
+       return hash;
+}
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */