Clean up indentation.

[obnox/wireshark/wip.git] / epan / conversation.h

diff --git a/epan/conversation.h b/epan/conversation.h
index b8c066d0a53a44270f8af098fa0b53f306ce4485..517af05e8f5e883b710b9edd9051270f6e990961 100644 (file)
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -1,12 +1,11 @@
 /* conversation.h
  * Routines for building lists of packets that are part of a "conversation"
  *
- * $Id: conversation.h,v 1.1 2000/09/27 04:54:47 gram Exp $
+ * $Id: conversation.h,v 1.9 2001/11/27 07:13:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * 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
@@ -26,38 +25,67 @@
 #ifndef __CONVERSATION_H__
 #define __CONVERSATION_H__
 
+/* 
+ * Flags to pass to "conversation_new()" to indicate that the address 2
+ * and/or port 2 values for the conversation should be wildcards.
+ */
+#define NO_ADDR2 0x01
+#define NO_PORT2 0x02
+
+/* 
+ * Flags to pass to "find_conversation()" to indicate that the address B
+ * and/or port B search arguments are wildcards.
+ */
+#define NO_ADDR_B 0x01
+#define NO_PORT_B 0x02
+
 #include "packet.h"            /* for conversation dissector type */
+
 /*
  * Data structure representing a conversation.
  */
+typedef struct conversation_key {
+       struct conversation_key *next;
+       address addr1;
+       address addr2;
+       port_type ptype;
+       guint32 port1;
+       guint32 port2;
+} conversation_key;
+
 typedef struct conversation {
        struct conversation *next;      /* pointer to next conversation on hash chain */
-       guint32 index;  /* unique ID for conversation */
-       void    *data;  /* data our client can associate with a conversation */
-       gboolean is_old_dissector;      /* XXX - nuke when everybody tvbuffified */
-       union {
-               old_dissector_t old_d;
-               dissector_t     new_d;
-       } dissector;                    /* protocol dissector client can associate with conversation */
+       guint32 index;                  /* unique ID for conversation */
+       GSList *data_list;              /* list of data associated with conversation */
+       dissector_handle_t dissector_handle;
+                                       /* handle for protocol dissector client associated with conversation */
+       guint   options;                /* wildcard flags */
+       conversation_key *key_ptr;      /* pointer to the key for this conversation */
 } conversation_t;
 
 extern void conversation_init(void);
-conversation_t *conversation_new(address *src, address *dst, port_type ptype,
-    guint32 src_port, guint32 dst_port, void *data);
-conversation_t *find_conversation(address *src, address *dst, port_type ptype,
-    guint32 src_port, guint32 dst_port);
-
-void old_conversation_set_dissector(conversation_t *conversation,
-    old_dissector_t dissector);
-void conversation_set_dissector(conversation_t *conversation,
-    dissector_t dissector);
-gboolean
-old_try_conversation_dissector(address *src, address *dst, port_type ptype,
-    guint32 src_port, guint32 dst_port, const u_char *pd, int offset,
-    frame_data *fd, proto_tree *tree);
-gboolean
-try_conversation_dissector(address *src, address *dst, port_type ptype,
-    guint32 src_port, guint32 dst_port, tvbuff_t *tvb, packet_info *pinfo,
+
+extern conversation_t *conversation_new(address *addr1, address *addr2,
+    port_type ptype, guint32 port1, guint32 port2, guint options);
+
+extern conversation_t *find_conversation(address *addr_a, address *addr_b,
+    port_type ptype, guint32 port_a, guint32 port_b, guint options);
+
+extern void conversation_add_proto_data(conversation_t *conv, int proto,
+    void *proto_data);
+extern void *conversation_get_proto_data(conversation_t *conv, int proto);
+extern void conversation_delete_proto_data(conversation_t *conv, int proto);
+
+extern void conversation_set_dissector(conversation_t *conversation,
+    dissector_handle_t handle);
+extern gboolean
+try_conversation_dissector(address *addr_a, address *addr_b, port_type ptype,
+    guint32 port_a, guint32 port_b, tvbuff_t *tvb, packet_info *pinfo,
     proto_tree *tree);
 
+/* These routines are used to set undefined values for a conversation */
+
+extern void conversation_set_port2(conversation_t *conv, guint32 port);
+extern void conversation_set_addr2(conversation_t *conv, address *addr);
+
 #endif /* conversation.h */