diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-10-31 05:59:20 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-10-31 05:59:20 +0000 |
| commit | dffa2a989aab61cb9470154a8f7239dcd936f851 (patch) | |
| tree | 05a769f92134e3ed2f93190d28016198fe31aa2f /epan/conversation.h | |
| parent | c132bad4238ba81b447f27e3bc578f0d5a5852f4 (diff) | |
| download | wireshark-dffa2a989aab61cb9470154a8f7239dcd936f851.tar.gz | |
Get rid of a bunch of stuff that was there to support non-tvbuffified
dissectors and that's no longer needed.
svn path=/trunk/; revision=4112
Diffstat (limited to 'epan/conversation.h')
| -rw-r--r-- | epan/conversation.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/epan/conversation.h b/epan/conversation.h index 4e27862762..c881eb1852 100644 --- a/epan/conversation.h +++ b/epan/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.6 2001/09/03 10:33:12 guy Exp $ + * $Id: conversation.h,v 1.7 2001/10/31 05:59:19 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -55,13 +55,9 @@ typedef struct conversation_key { typedef struct conversation { struct conversation *next; /* pointer to next conversation on hash chain */ - guint32 index; /* unique ID for conversation */ - GSList *data_list; /* list of data associated with 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_t dissector; /* protocol dissector client can associate with conversation */ guint options; /* wildcard flags */ conversation_key *key_ptr; /* pointer to the key for this conversation */ } conversation_t; @@ -79,8 +75,6 @@ void conversation_add_proto_data(conversation_t *conv, int proto, void *conversation_get_proto_data(conversation_t *conv, int proto); void conversation_delete_proto_data(conversation_t *conv, int proto); -void old_conversation_set_dissector(conversation_t *conversation, - old_dissector_t dissector); void conversation_set_dissector(conversation_t *conversation, dissector_t dissector); gboolean |