diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-11-27 07:13:32 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-11-27 07:13:32 +0000 |
| commit | f8783ef2faf90cd0a2d4c98608afc70ebd2b58ca (patch) | |
| tree | 21d265bf7402a2739905bd87227383ae0a9f78ab /epan/conversation.h | |
| parent | 5f90e47799c83f2e69f021af2622bebadaa37176 (diff) | |
Change "conversation_set_dissector()" to take a dissector handle, rather
than a pointer to a dissector function, as an argument.
This means that the conversation dissector is called through
"call_dissector()", so the dissector itself doesn't have to worry about
checking whether the protocol is enabled or setting
"pinfo->current_proto", so get rid of the code that does that in
conversation dissectors. Also, make the conversation dissectors static.
Get rid of some direct calls to dissectors; replace them with calls
through handles, and, again, get rid of code to check whether a protocol
is enabled and set "pinfo->current_proto" where that code isn't needed.
Make those dissectors static if they aren't already static.
Add a routine "create_dissector_handle()" to create a dissector handle
without registering it by name, if the dissector isn't used outside the
module in which it's defined.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4281 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/conversation.h')
| -rw-r--r-- | epan/conversation.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/conversation.h b/epan/conversation.h index bf4c6fb13f..517af05e8f 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.8 2001/11/04 03:55:52 guy Exp $ + * $Id: conversation.h,v 1.9 2001/11/27 07:13:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -57,7 +57,8 @@ 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 */ - dissector_t dissector; /* protocol dissector client can associate 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; @@ -76,7 +77,7 @@ 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_t dissector); + 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, |