diff options
Diffstat (limited to 'conversation.h')
| -rw-r--r-- | conversation.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/conversation.h b/conversation.h index 68acad1833..635e7ec903 100644 --- a/conversation.h +++ b/conversation.h @@ -1,7 +1,7 @@ /* conversation.h * Routines for building lists of packets that are part of a "conversation" * - * $Id: conversation.h,v 1.5 2000/04/12 22:53:14 guy Exp $ + * $Id: conversation.h,v 1.6 2000/08/07 03:20:20 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -34,8 +34,11 @@ 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 */ - dissector_t dissector; /* protocol dissector client can associate with conversation */ - + gboolean is_old_dissector; /* XXX - nuke when everybody tvbuffified */ + union { + old_dissector_t old; + dissector_t new; + } dissector; /* protocol dissector client can associate with conversation */ } conversation_t; extern void conversation_init(void); @@ -44,7 +47,13 @@ conversation_t *conversation_new(address *src, address *dst, port_type ptype, conversation_t *find_conversation(address *src, address *dst, port_type ptype, guint32 src_port, guint32 dst_port); -dissector_t find_conversation_dissector(address *src, address *dst, port_type ptype, - guint32 src_port, guint32 dst_port); +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, + proto_tree *tree); #endif /* conversation.h */ |