/* conversation.c
* Routines for building lists of packets that are part of a "conversation"
*
- * $Id: conversation.c,v 1.9 2001/06/06 01:29:17 guy Exp $
+ * $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
#include <string.h>
#include <glib.h>
#include "packet.h"
+#include "emem.h"
#include "conversation.h"
/*
static GHashTable *conversation_hashtable_exact = NULL;
/*
- * Hash table for conversations with wildcard destination address.
+ * Hash table for conversations with one wildcard address.
*/
-static GHashTable *conversation_hashtable_no_dst_addr = NULL;
+static GHashTable *conversation_hashtable_no_addr2 = NULL;
/*
- * Hash table for conversations with wildcard destination port.
+ * Hash table for conversations with one wildcard port.
*/
-static GHashTable *conversation_hashtable_no_dst_port = NULL;
+static GHashTable *conversation_hashtable_no_port2 = NULL;
/*
- * Hash table for conversations with wildcard destination address and port.
+ * Hash table for conversations with one wildcard address and port.
*/
-static GHashTable *conversation_hashtable_no_dst = NULL;
+static GHashTable *conversation_hashtable_no_addr2_or_port2 = NULL;
-static GMemChunk *conversation_key_chunk = NULL;
-static GMemChunk *conversation_chunk = NULL;
-#ifdef __NOT_USED__
+#ifdef __NOT_USED__
typedef struct conversation_key {
struct conversation_key *next;
- address src;
- address dst;
+ address addr1;
+ address addr2;
port_type ptype;
- guint32 port_src;
- guint32 port_dst;
+ guint32 port1;
+ guint32 port2;
} conversation_key;
#endif
/*
static guint32 new_index;
-static int conversation_init_count = 200;
+/*
+ * Protocol-specific data attached to a conversation_t structure - protocol
+ * index and opaque pointer.
+ */
+typedef struct _conv_proto_data {
+ int proto;
+ void *proto_data;
+} conv_proto_data;
/*
- * Compute the hash value for a given set of source and destination
- * addresses and ports if the match is to be exact.
+ * Creates a new conversation with known endpoints based on a conversation
+ * created with the CONVERSATION_TEMPLATE option while keeping the
+ * conversation created with the CONVERSATION_TEMPLATE option so it can still
+ * match future connections.
+ *
+ * Passing a pointer to a conversation whose options mask does not include
+ * CONVERSATION_TEMPLATE or where the conversation's protocol type (ptype)
+ * indicates a non-connnection oriented protocol will return the conversation
+ * without changes.
+ *
+ * addr2 and port2 are used in the function if their respective conversation
+ * options bits are set (NO_ADDR2 and NO_PORT2).
*/
-static guint
+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;
+ }
+}
+
+/*
+ * Compute the hash value for two given address/port pairs if the match
+ * is to be exact.
+ */
+static guint
conversation_hash_exact(gconstpointer v)
{
- conversation_key *key = (conversation_key *)v;
+ const conversation_key *key = (const conversation_key *)v;
guint hash_val;
- int i;
hash_val = 0;
- for (i = 0; i < key->src.len; i++)
- hash_val += key->src.data[i];
-
- hash_val += key->port_src;
-
- for (i = 0; i < key->dst.len; i++)
- hash_val += key->dst.data[i];
-
- hash_val += key->port_dst;
+ ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+ hash_val += key->port1;
+ ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
+ hash_val += key->port2;
return hash_val;
}
static gint
conversation_match_exact(gconstpointer v, gconstpointer w)
{
- conversation_key *v1 = (conversation_key *)v;
- conversation_key *v2 = (conversation_key *)w;
+ const conversation_key *v1 = (const conversation_key *)v;
+ const conversation_key *v2 = (const conversation_key *)w;
if (v1->ptype != v2->ptype)
return 0; /* different types of port */
/*
- * Are the first and second source ports the same, the first and
- * second destination ports the same, the first and second source
- * addresses the same, and the first and second destination
- * addresses the same?
+ * Are the first and second port 1 values the same, the first and
+ * second port 2 values the same, the first and second address
+ * 1 values the same, and the first and second address 2 values
+ * the same?
*/
- if (v1->port_src == v2->port_src &&
- v1->port_dst == v2->port_dst &&
- ADDRESSES_EQUAL(&v1->src, &v2->src) &&
- ADDRESSES_EQUAL(&v1->dst, &v2->dst)) {
+ if (v1->port1 == v2->port1 &&
+ v1->port2 == v2->port2 &&
+ 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.
}
/*
- * Is the first destination port the same as the second source
- * port, the first source port the same as the second destination
- * port, the first destination address the same as the second
- * source address, and the first source address the same as the
- * second destination address?
+ * Is the first port 2 the same as the second port 1, the first
+ * port 1 the same as the second port 2, the first address 2
+ * the same as the second address 1, and the first address 1
+ * the same as the second address 2?
*/
- if (v1->port_dst == v2->port_src &&
- v1->port_src == v2->port_dst &&
- ADDRESSES_EQUAL(&v1->dst, &v2->src) &&
- ADDRESSES_EQUAL(&v1->src, &v2->dst)) {
+ if (v1->port2 == v2->port1 &&
+ v1->port1 == v2->port2 &&
+ 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.
/*
* The addresses or the ports don't match.
- */
+ */
return 0;
}
/*
- * Compute the hash value for a given set of source and destination
- * addresses and ports if the match has a wildcard destination address.
+ * Compute the hash value for two given address/port pairs if the match
+ * has a wildcard address 2.
*/
-static guint
-conversation_hash_no_dst_addr(gconstpointer v)
+static guint
+conversation_hash_no_addr2(gconstpointer v)
{
- conversation_key *key = (conversation_key *)v;
+ const conversation_key *key = (const conversation_key *)v;
guint hash_val;
- int i;
hash_val = 0;
- for (i = 0; i < key->src.len; i++)
- hash_val += key->src.data[i];
-
- hash_val += key->port_src;
-
- hash_val += key->port_dst;
+ ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+ hash_val += key->port1;
+ hash_val += key->port2;
return hash_val;
}
/*
- * Compare two conversation keys, except for the destination address.
+ * Compare two conversation keys, except for the address 2 value.
* We don't check both directions of the conversation - the routine
* doing the hash lookup has to do two searches, as the hash key
* will be different for the two directions.
*/
static gint
-conversation_match_no_dst_addr(gconstpointer v, gconstpointer w)
+conversation_match_no_addr2(gconstpointer v, gconstpointer w)
{
- conversation_key *v1 = (conversation_key *)v;
- conversation_key *v2 = (conversation_key *)w;
+ const conversation_key *v1 = (const conversation_key *)v;
+ const conversation_key *v2 = (const conversation_key *)w;
if (v1->ptype != v2->ptype)
return 0; /* different types of port */
/*
- * Are the first and second source ports the same, the first and
- * second destination ports the same, and the first and second
- * source addresses the same?
+ * Are the first and second port 1 values the same, the first and
+ * second port 2 valuess the same, and the first and second
+ * address 1 values the same?
*/
- if (v1->port_src == v2->port_src &&
- v1->port_dst == v2->port_dst &&
- ADDRESSES_EQUAL(&v1->src, &v2->src)) {
+ if (v1->port1 == v2->port1 &&
+ v1->port2 == v2->port2 &&
+ ADDRESSES_EQUAL(&v1->addr1, &v2->addr1)) {
/*
* Yes. It's the same conversation, and the two
* address/port pairs are going in the same direction.
/*
* The addresses or the ports don't match.
- */
+ */
return 0;
}
/*
- * Compute the hash value for a given set of source and destination
- * addresses and ports if the match has a wildcard destination port.
+ * Compute the hash value for two given address/port pairs if the match
+ * has a wildcard port 2.
*/
-static guint
-conversation_hash_no_dst_port(gconstpointer v)
+static guint
+conversation_hash_no_port2(gconstpointer v)
{
- conversation_key *key = (conversation_key *)v;
+ const conversation_key *key = (const conversation_key *)v;
guint hash_val;
- int i;
hash_val = 0;
- for (i = 0; i < key->src.len; i++)
- hash_val += key->src.data[i];
-
- hash_val += key->port_src;
-
- for (i = 0; i < key->dst.len; i++)
- hash_val += key->dst.data[i];
+ ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+ hash_val += key->port1;
+ ADD_ADDRESS_TO_HASH(hash_val, &key->addr2);
return hash_val;
}
/*
- * Compare two conversation keys, except for the destination port.
+ * Compare two conversation keys, except for the port 2 value.
* We don't check both directions of the conversation - the routine
* doing the hash lookup has to do two searches, as the hash key
* will be different for the two directions.
*/
static gint
-conversation_match_no_dst_port(gconstpointer v, gconstpointer w)
+conversation_match_no_port2(gconstpointer v, gconstpointer w)
{
- conversation_key *v1 = (conversation_key *)v;
- conversation_key *v2 = (conversation_key *)w;
+ const conversation_key *v1 = (const conversation_key *)v;
+ const conversation_key *v2 = (const conversation_key *)w;
if (v1->ptype != v2->ptype)
return 0; /* different types of port */
/*
- * Are the first and second source ports the same, the first and
- * second source addresses the same, and the first and second
- * destination addresses the same?
+ * Are the first and second port 1 values the same, the first and
+ * second address 1 values the same, and the first and second
+ * address 2 values the same?
*/
- if (v1->port_src == v2->port_src &&
- ADDRESSES_EQUAL(&v1->src, &v2->src) &&
- ADDRESSES_EQUAL(&v1->dst, &v2->dst)) {
+ if (v1->port1 == v2->port1 &&
+ 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.
/*
* The addresses or the ports don't match.
- */
+ */
return 0;
}
/*
- * Compute the hash value for a given set of source and destination
- * addresses and ports if the match has a wildcard destination.
+ * Compute the hash value for two given address/port pairs if the match
+ * has a wildcard address 2 and port 2.
*/
-static guint
-conversation_hash_no_dst(gconstpointer v)
+static guint
+conversation_hash_no_addr2_or_port2(gconstpointer v)
{
- conversation_key *key = (conversation_key *)v;
+ const conversation_key *key = (const conversation_key *)v;
guint hash_val;
- int i;
hash_val = 0;
- for (i = 0; i < key->src.len; i++)
- hash_val += key->src.data[i];
-
- hash_val += key->port_src;
+ ADD_ADDRESS_TO_HASH(hash_val, &key->addr1);
+ hash_val += key->port1;
return hash_val;
}
/*
- * Compare the source address and port in the two conversation keys.
+ * Compare the address 1 and port 1 in the two conversation keys.
* We don't check both directions of the conversation - the routine
* doing the hash lookup has to do two searches, as the hash key
* will be different for the two directions.
*/
static gint
-conversation_match_no_dst(gconstpointer v, gconstpointer w)
+conversation_match_no_addr2_or_port2(gconstpointer v, gconstpointer w)
{
- conversation_key *v1 = (conversation_key *)v;
- conversation_key *v2 = (conversation_key *)w;
+ const conversation_key *v1 = (const conversation_key *)v;
+ const conversation_key *v2 = (const conversation_key *)w;
if (v1->ptype != v2->ptype)
return 0; /* different types of port */
/*
- * Are the first and second source ports the same and the first
- * and second source addresses the same?
+ * Are the first and second port 1 values the same and the first
+ * and second address 1 values the same?
*/
- if (v1->port_src == v2->port_src &&
- ADDRESSES_EQUAL(&v1->src, &v2->src)) {
+ if (v1->port1 == v2->port1 &&
+ ADDRESSES_EQUAL(&v1->addr1, &v2->addr1)) {
/*
* Yes. It's the same conversation, and the two
* address/port pairs are going in the same direction.
/*
* The addresses or the ports don't match.
- */
+ */
return 0;
}
/*
- * Initialize some variables every time a file is loaded or re-loaded.
- * Destroy all existing conversations, and create a new hash table
- * for the conversations in the new file.
+ * Free the proto_data. The conversation itself is se_allocated.
*/
void
-conversation_init(void)
+free_data_list(gpointer key _U_, gpointer value, gpointer user_data _U_)
{
- conversation_key *key;
+ conversation_t *conv = value;
- /*
- * Free the addresses associated with the conversation keys.
+ /* 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.
*/
- for (key = conversation_keys; key != NULL; key = key->next) {
- /*
- * Grr. I guess the theory here is that freeing
- * something sure as heck modifies it, so you
- * want to ban attempts to free it, but, alas,
- * if we make the "data" field of an "address"
- * structure not a "const", the compiler whines if
- * we try to make it point into the data for a packet,
- * as that's a "const" array (and should be, as dissectors
- * shouldn't trash it).
- *
- * So we cast the complaint into oblivion, and rely on
- * the fact that these addresses are known to have had
- * their data mallocated, i.e. they don't point into,
- * say, the middle of the data for a packet.
- */
- g_free((gpointer)key->src.data);
- g_free((gpointer)key->dst.data);
- }
conversation_keys = NULL;
- if (conversation_hashtable_exact != 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_dst_addr != NULL)
- g_hash_table_destroy(conversation_hashtable_no_dst_addr);
- if (conversation_hashtable_no_dst_port != NULL)
- g_hash_table_destroy(conversation_hashtable_no_dst_port);
- if (conversation_hashtable_no_dst != NULL)
- g_hash_table_destroy(conversation_hashtable_no_dst);
- if (conversation_key_chunk != NULL)
- g_mem_chunk_destroy(conversation_key_chunk);
- if (conversation_chunk != NULL)
- g_mem_chunk_destroy(conversation_chunk);
+ }
+ 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.
+ */
+void
+conversation_init(void)
+{
+ /*
+ * Free up any space allocated for conversation protocol data
+ * areas.
+ *
+ * We can free the space, as the structures it contains are
+ * pointed to by conversation data structures that were freed
+ * above.
+ */
conversation_hashtable_exact =
g_hash_table_new(conversation_hash_exact,
conversation_match_exact);
- conversation_hashtable_no_dst_addr =
- g_hash_table_new(conversation_hash_no_dst_addr,
- conversation_match_no_dst_addr);
- conversation_hashtable_no_dst_port =
- g_hash_table_new(conversation_hash_no_dst_port,
- conversation_match_no_dst_port);
- conversation_hashtable_no_dst =
- g_hash_table_new(conversation_hash_no_dst,
- conversation_match_no_dst);
- conversation_key_chunk = g_mem_chunk_new("conversation_key_chunk",
- sizeof(conversation_key),
- conversation_init_count * sizeof(struct conversation_key),
- G_ALLOC_AND_FREE);
- conversation_chunk = g_mem_chunk_new("conversation_chunk",
- sizeof(conversation_t),
- conversation_init_count * sizeof(conversation_t),
- G_ALLOC_AND_FREE);
+ conversation_hashtable_no_addr2 =
+ g_hash_table_new(conversation_hash_no_addr2,
+ conversation_match_no_addr2);
+ conversation_hashtable_no_port2 =
+ g_hash_table_new(conversation_hash_no_port2,
+ conversation_match_no_port2);
+ conversation_hashtable_no_addr2_or_port2 =
+ g_hash_table_new(conversation_hash_no_addr2_or_port2,
+ conversation_match_no_addr2_or_port2);
/*
* Start the conversation indices over at 0.
}
/*
- * Given source and destination addresses and ports for a packet,
- * create a new conversation to contain packets between those address/port
- * pairs. The options field is used to flag the destination address/port
- * are not given and any value is acceptable.
+ * Given two address/port pairs for a packet, create a new conversation
+ * to contain packets between those address/port pairs.
+ *
+ * The options field is used to specify whether the address 2 value
+ * and/or port 2 value are not given and any value is acceptable
+ * when searching for this conversation.
*/
conversation_t *
-conversation_new(address *src, address *dst, port_type ptype,
- guint32 src_port, guint32 dst_port, void *data, guint options)
+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_t *conversation;
+/*
+ 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;
+ conversation_t *conversation=NULL, *prev=NULL;
+ conversation_key existing_key;
conversation_key *new_key;
+ guint conv_in_ht=0;
- new_key = g_mem_chunk_alloc(conversation_key_chunk);
+ if (options & NO_ADDR2) {
+ if (options & (NO_PORT2|NO_PORT2_FORCE)) {
+ hashtable = conversation_hashtable_no_addr2_or_port2;
+ } else {
+ hashtable = conversation_hashtable_no_addr2;
+ }
+ } else {
+ if (options & (NO_PORT2|NO_PORT2_FORCE)) {
+ hashtable = conversation_hashtable_no_port2;
+ } else {
+ hashtable = conversation_hashtable_exact;
+ }
+ }
+
+ existing_key.addr1 = *addr1;
+ existing_key.addr2 = *addr2;
+ existing_key.ptype = ptype;
+ existing_key.port1 = port1;
+ existing_key.port2 = port2;
+
+ conversation = g_hash_table_lookup(hashtable, &existing_key);
+ if(NULL!=conversation)
+ conv_in_ht=1;
+
+ new_key = se_alloc(sizeof(struct conversation_key));
new_key->next = conversation_keys;
conversation_keys = new_key;
- COPY_ADDRESS(&new_key->src, src);
- COPY_ADDRESS(&new_key->dst, dst);
+ SE_COPY_ADDRESS(&new_key->addr1, addr1);
+ SE_COPY_ADDRESS(&new_key->addr2, addr2);
new_key->ptype = ptype;
- new_key->port_src = src_port;
- new_key->port_dst = dst_port;
+ new_key->port1 = port1;
+ new_key->port2 = port2;
+
+ if (conversation) {
+ /* the list is ordered on setup_frame */
+ if(setup_frame>=conversation->last->setup_frame) {
+ /* add it to the end */
+ conversation->last->next=se_alloc(sizeof(conversation_t));
+ prev=conversation->last->next;
+ prev->next=NULL;
+ conversation->last=prev;
+ conversation = prev;
+ } else {
+ for (prev=NULL; (setup_frame>conversation->setup_frame) && conversation->next; prev=conversation, conversation = conversation->next)
+ ;
+ if(prev) {
+ prev->next = se_alloc(sizeof(conversation_t));
+ prev->next->next = conversation;
+ conversation = prev->next;
+ } else {
+ /* change the head of the list */
+ prev = se_alloc(sizeof(conversation_t));
+ prev->next = conversation;
+ prev->last = conversation->last;
+ conversation->last=NULL;
+ conversation = prev;
+ conv_in_ht=0;
+ }
+ }
+ } else {
+ conversation = se_alloc(sizeof(conversation_t));
+ conversation->next = NULL;
+ conversation->last = conversation;
+ }
- conversation = g_mem_chunk_alloc(conversation_chunk);
conversation->index = new_index;
- conversation->data = data;
+ conversation->setup_frame = setup_frame;
+ conversation->data_list = NULL;
-/* clear dissector pointer */
- conversation->dissector.new_d = NULL;
+ /* clear dissector handle */
+ conversation->dissector_handle = NULL;
-/* set the options and key pointer */
+ /* set the options and key pointer */
conversation->options = options;
conversation->key_ptr = new_key;
new_index++;
- if (options & NO_DST_ADDR) {
- if (options & NO_DST_PORT) {
- g_hash_table_insert(conversation_hashtable_no_dst,
- new_key, conversation);
- } else {
- g_hash_table_insert(conversation_hashtable_no_dst_addr,
- new_key, conversation);
- }
- } else {
- if (options & NO_DST_PORT) {
- g_hash_table_insert(conversation_hashtable_no_dst_port,
- new_key, conversation);
- } else {
- g_hash_table_insert(conversation_hashtable_exact,
- new_key, conversation);
- }
- }
+ /* only insert a hash table entry if this
+ * is the first conversation with this key */
+ if (!conv_in_ht)
+ g_hash_table_insert(hashtable, new_key, conversation);
+
return conversation;
}
-/* Set the destination port in a key. Remove the original from table,
- update the options and port values, insert the updated key.
-*/
-void conversation_set_port( conversation_t *conv, guint32 port){
+/*
+ * Set the port 2 value in a key. Remove the original from table,
+ * update the options and port values, insert the updated key.
+ */
+void
+conversation_set_port2(conversation_t *conv, const guint32 port)
+{
+ DISSECTOR_ASSERT(!(conv->options & CONVERSATION_TEMPLATE) &&
+ "Use the conversation_create_from_template function when the CONVERSATION_TEMPLATE bit is set in the options mask");
/*
- * If the destination port has already been set, don't set it
- * again.
+ * If the port 2 value is not wildcarded, don't set it.
*/
- if (!(conv->options & NO_DST_PORT))
+ if ((!(conv->options & NO_PORT2)) || (conv->options & NO_PORT2_FORCE))
return;
- if (conv->options & NO_DST_ADDR) {
- g_hash_table_remove(conversation_hashtable_no_dst,
+ if (conv->options & NO_ADDR2) {
+ g_hash_table_remove(conversation_hashtable_no_addr2_or_port2,
conv->key_ptr);
} else {
- g_hash_table_remove(conversation_hashtable_no_dst_port,
+ g_hash_table_remove(conversation_hashtable_no_port2,
conv->key_ptr);
}
- conv->options &= ~NO_DST_PORT;
- conv->key_ptr->port_dst = port;
- if (conv->options & NO_DST_ADDR) {
- g_hash_table_insert(conversation_hashtable_no_dst_addr,
+ conv->options &= ~NO_PORT2;
+ conv->key_ptr->port2 = port;
+ if (conv->options & NO_ADDR2) {
+ g_hash_table_insert(conversation_hashtable_no_addr2,
conv->key_ptr, conv);
} else {
g_hash_table_insert(conversation_hashtable_exact,
conv->key_ptr, conv);
}
-}
+}
-/* Set the destination address in a key. Remove the original from
- table, update the options and port values, insert the updated key.
-*/
-void conversation_set_addr( conversation_t *conv, address *addr){
+/*
+ * Set the address 2 value in a key. Remove the original from
+ * table, update the options and port values, insert the updated key.
+ */
+void
+conversation_set_addr2(conversation_t *conv, const address *addr)
+{
+ DISSECTOR_ASSERT(!(conv->options & CONVERSATION_TEMPLATE) &&
+ "Use the conversation_create_from_template function when the CONVERSATION_TEMPLATE bit is set in the options mask");
/*
- * If the destination address has already been set, don't set it
- * again.
+ * If the address 2 value is not wildcarded, don't set it.
*/
- if (!(conv->options & NO_DST_ADDR))
+ if (!(conv->options & NO_ADDR2))
return;
- if (conv->options & NO_DST_PORT) {
- g_hash_table_remove(conversation_hashtable_no_dst,
+ if (conv->options & NO_PORT2) {
+ g_hash_table_remove(conversation_hashtable_no_addr2_or_port2,
conv->key_ptr);
} else {
- g_hash_table_remove(conversation_hashtable_no_dst_addr,
+ g_hash_table_remove(conversation_hashtable_no_addr2,
conv->key_ptr);
}
- conv->options &= ~NO_DST_ADDR;
- COPY_ADDRESS(&conv->key_ptr->dst, addr);
- if (conv->options & NO_DST_PORT) {
- g_hash_table_insert(conversation_hashtable_no_dst_port,
+ conv->options &= ~NO_ADDR2;
+ SE_COPY_ADDRESS(&conv->key_ptr->addr2, addr);
+ if (conv->options & NO_PORT2) {
+ g_hash_table_insert(conversation_hashtable_no_port2,
conv->key_ptr, conv);
} else {
g_hash_table_insert(conversation_hashtable_exact,
}
}
+/*
+ * Search a particular hash table for a conversation with the specified
+ * {addr1, port1, addr2, port2} and set up before frame_num.
+ */
static conversation_t *
-conversation_match(GHashTable *hashtable, address *src, address *dst,
- port_type ptype, guint32 src_port, guint32 dst_port)
+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_t* conversation=NULL;
+ conversation_t* match=NULL;
conversation_key key;
+ guint found=0;
/*
* We don't make a copy of the address data, we just copy the
* pointer to it, as "key" disappears when we return.
*/
- key.src = *src;
- key.dst = *dst;
+ key.addr1 = *addr1;
+ key.addr2 = *addr2;
key.ptype = ptype;
- key.port_src = src_port;
- key.port_dst = dst_port;
- return g_hash_table_lookup(hashtable, &key);
+ key.port1 = port1;
+ key.port2 = port2;
+
+ match = g_hash_table_lookup(hashtable, &key);
+
+ if (match && (match->setup_frame > frame_num))
+ match = NULL;
+
+ if (match) {
+ if(match->last->setup_frame<=frame_num)
+ return match;
+ for (conversation = match->next; conversation; conversation = conversation->next) {
+ if ((conversation->setup_frame <= frame_num)
+ && (conversation->setup_frame > match->setup_frame)) {
+ match = conversation;
+ found=1;
+ } else if(conversation->setup_frame>frame_num)
+ /* we are past the frame_num */
+ break;
+ }
+ if(!found)
+ match=NULL;
+ }
+
+ return match;
}
-
+
+
/*
- * Given source and destination addresses and ports for a packet,
- * search for a conversation containing packets between those address/port
- * pairs. Returns NULL if not found. If the NO_DEST_ADDR and/or NO_DEST_PORT
- * flags are set in the conversation options field, that value will not
- * be used.
+ * Given two address/port pairs for a packet, search for a conversation
+ * containing packets between those address/port pairs. Returns NULL if
+ * not found.
+ *
+ * We try to find the most exact match that we can, and then proceed to
+ * try wildcard matches on the "addr_b" and/or "port_b" argument if a more
+ * exact match failed.
+ *
+ * Either or both of the "addr_b" and "port_b" arguments may be specified as
+ * a wildcard by setting the NO_ADDR_B or NO_PORT_B flags in the "options"
+ * argument. We do only wildcard matches on addresses and ports specified
+ * as wildcards.
+ *
+ * I.e.:
+ *
+ * if neither "addr_b" nor "port_b" were specified as wildcards, we
+ * do an exact match (addr_a/port_a and addr_b/port_b) and, if that
+ * succeeds, we return a pointer to the matched conversation;
+ *
+ * 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
+ * matched conversation;
+ *
+ * otherwise, if "addr_b" wasn't specified as a wildcard, we try to
+ * match any port 2 with the specified address 2 (addr_a/port_a and
+ * addr_b/{any}) and, if that succeeds, we return a pointer to the
+ * matched conversation;
+ *
+ * otherwise, we try to match any address 2 and any port 2
+ * (addr_a/port_a and {any}/{any}) and, if that succeeds, we return
+ * a pointer to the matched conversation;
+ *
+ * otherwise, we found no matching conversation, and return NULL.
*/
conversation_t *
-find_conversation(address *src, address *dst, port_type ptype,
- guint32 src_port, guint32 dst_port, guint options)
+find_conversation(const guint32 frame_num, const address *addr_a, const address *addr_b, const port_type ptype,
+ const guint32 port_a, const guint32 port_b, const guint options)
{
- conversation_t *conversation;
+ 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;
+}
- if (options & NO_DST_ADDR) {
- if (options & NO_DST_PORT) {
- /*
- * Wildcard the address and port - first try looking
- * for a conversation with the specified source
- * address and port, then try looking for one with a
- * source address and port that's the specified
- * *destination* address and port (this packet may be
- * going in the opposite direction from the first
- * packet in the conversation).
- */
- conversation =
- conversation_match(conversation_hashtable_no_dst,
- src, dst, ptype, src_port, dst_port);
- if (conversation != NULL)
- return conversation;
- return conversation_match(conversation_hashtable_no_dst,
- dst, src, ptype, dst_port, src_port);
- } else {
- /*
- * Wildcard the address - first try looking for a
- * conversation with the specified source address
- * and port and destination port, then try looking
- * for one with a source address and port that's
- * the specified *destination* address and port and
- * a destination port that's the specified *source*
- * port (this packet may be going in the opposite
- * direction from the first packet in the conversation).
- */
- conversation =
- conversation_match(conversation_hashtable_no_dst_addr,
- src, dst, ptype, src_port, dst_port);
- if (conversation != NULL)
- return conversation;
- return conversation_match(conversation_hashtable_no_dst_addr,
- dst, src, ptype, dst_port, src_port);
- }
- } else {
- if (options & NO_DST_PORT) {
- /*
- * Wildcard the port - first try looking for a
- * conversation with the specified source address
- * and port and destination address, then try looking
- * for one with a source address and port that's
- * the specified *destination* address and port and
- * a destination address that's the specified *source*
- * address (this packet may be going in the opposite
- * direction from the first packet in the conversation).
- */
- conversation =
- conversation_match(conversation_hashtable_no_dst_port,
- src, dst, ptype, src_port, dst_port);
- if (conversation != NULL)
- return conversation;
- return conversation_match(conversation_hashtable_no_dst_port,
- dst, src, ptype, dst_port, src_port);
- } else {
- /*
- * Search for an exact match. That search checks both
- * directions.
- */
- return conversation_match(conversation_hashtable_exact,
- src, dst, ptype, src_port, dst_port);
- }
+static gint
+p_compare(gconstpointer a, gconstpointer b)
+{
+ 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;
+}
+
+void
+conversation_add_proto_data(conversation_t *conv, const int proto, void *proto_data)
+{
+ conv_proto_data *p1 = se_alloc(sizeof(conv_proto_data));
+
+ p1->proto = proto;
+ p1->proto_data = proto_data;
+
+ /* Add it to the list of items for this conversation. */
+
+ conv->data_list = g_slist_insert_sorted(conv->data_list, (gpointer *)p1,
+ p_compare);
+}
+
+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;
}
+
+ return NULL;
}
-/*
- * Set the dissector for a conversation.
- */
void
-old_conversation_set_dissector(conversation_t *conversation,
- old_dissector_t dissector)
+conversation_delete_proto_data(conversation_t *conv, const int proto)
{
- conversation->is_old_dissector = TRUE;
- conversation->dissector.old_d = dissector;
+ 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);
+
+ while(item){
+ conv->data_list = g_slist_remove(conv->data_list, item->data);
+ item=item->next;
+ }
}
void
-conversation_set_dissector(conversation_t *conversation,
- dissector_t dissector)
+conversation_set_dissector(conversation_t *conversation, const dissector_handle_t handle)
{
- conversation->is_old_dissector = FALSE;
- conversation->dissector.new_d = dissector;
+ conversation->dissector_handle = handle;
}
/*
- * Given source and destination addresses and ports for a packet,
- * search for a conversational dissector.
- * If found, call it and return TRUE, otherwise return FALSE.
+ * Given two address/port pairs for a packet, search for a matching
+ * conversation and, if found and it has a conversation dissector,
+ * call that dissector and return TRUE, otherwise return FALSE.
*
- * Will search for a exact match (src & dst), then search for wild
- * card matches: try to match any destination address on the specified
- * destination first, then try to match any destination port at the
- * specified destination address, then try to match any destination
- * address and any destination port.
+ * 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
+ * this function returns FALSE.
*/
gboolean
-try_conversation_dissector(address *src, address *dst, port_type ptype,
- guint32 src_port, guint32 dst_port, tvbuff_t *tvb, packet_info *pinfo,
+try_conversation_dissector(const address *addr_a, const address *addr_b, const port_type ptype,
+ const guint32 port_a, const guint32 port_b, tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree)
{
conversation_t *conversation;
- const guint8 *pd;
- int offset;
-
- conversation = find_conversation(src, dst, ptype, src_port, dst_port,
- 0);
- if (conversation == NULL)
- conversation = find_conversation(src, dst, ptype, src_port,
- dst_port, NO_DST_ADDR);
+ conversation = find_conversation(pinfo->fd->num, addr_a, addr_b, ptype, port_a,
+ port_b, 0);
- if (conversation == NULL)
- conversation = find_conversation(src, dst, ptype, src_port,
- dst_port, NO_DST_PORT);
-
- if (conversation == NULL)
- conversation = find_conversation(src, dst, ptype, src_port,
- dst_port, NO_DST_PORT | NO_DST_ADDR);
-
if (conversation != NULL) {
- if (conversation->is_old_dissector) {
- if (conversation->dissector.old_d == NULL)
- return FALSE;
-
- /*
- * New dissector calling old dissector; use
- * "tvb_compat()" to remap.
- *
- * "is_old_dissector" won't be set unless
- * "dissector.old_d" is set.
+ int ret;
+ if (conversation->dissector_handle == NULL)
+ return FALSE;
+ ret=call_dissector_only(conversation->dissector_handle, tvb, pinfo,
+ tree);
+ if(!ret) {
+ /* this packet was rejected by the dissector
+ * so return FALSE in case our caller wants
+ * to do some cleaning up.
*/
- tvb_compat(tvb, &pd, &offset);
- (*conversation->dissector.old_d)(pd, offset, pinfo->fd,
- tree);
- } else {
- if (conversation->dissector.new_d == NULL)
- return FALSE;
- (*conversation->dissector.new_d)(tvb, pinfo, tree);
+ return FALSE;
}
return TRUE;
}
return FALSE;
}
+
+/* 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.
+ * No options are used, though we could extend this API to include an options
+ * parameter.
+ */
+conversation_t *
+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) {
+ /* No, this is a new conversation. */
+ conv = conversation_new(pinfo->fd->num, &pinfo->src,
+ &pinfo->dst, pinfo->ptype,
+ pinfo->srcport, pinfo->destport, 0);
+ }
+
+ return conv;
+}
git.samba.org / obnox / wireshark / wip.git / blobdiff