diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-01 23:45:10 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-01 23:45:10 +0000 |
| commit | b6484432aaa2eb6787cc54cc4a7b489ae70e57aa (patch) | |
| tree | 312e92ce94021141628bbb320d67281fdec75651 /epan/conversation.c | |
| parent | 7c20a9314ffd05eddeb7f0744ae4cf9151175f76 (diff) | |
Allow try_conversation_dissector() to pass data to subdissectors.
svn path=/trunk/; revision=53035
Diffstat (limited to 'epan/conversation.c')
| -rw-r--r-- | epan/conversation.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index 4a70470db2..848775b1a3 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -1254,7 +1254,7 @@ conversation_set_dissector(conversation_t *conversation, const dissector_handle_ gboolean 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) + proto_tree *tree, void* data) { conversation_t *conversation; @@ -1266,7 +1266,7 @@ try_conversation_dissector(const address *addr_a, const address *addr_b, const p if (conversation->dissector_handle == NULL) return FALSE; ret=call_dissector_only(conversation->dissector_handle, tvb, pinfo, - tree, NULL); + tree, data); if(!ret) { /* this packet was rejected by the dissector * so return FALSE in case our caller wants |