summaryrefslogtreecommitdiff
path: root/epan/circuit.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2013-10-27 15:00:11 +0000
committerMichael Mann <mmann78@netscape.net>2013-10-27 15:00:11 +0000
commit394f67c1b7ab65b6fb89610ce251be62b8509208 (patch)
treefa05f491785668d1599f3273cf09e03d13f66749 /epan/circuit.c
parent469fc864e6f949d57366076b05d2a9cad5418e82 (diff)
downloadwireshark-394f67c1b7ab65b6fb89610ce251be62b8509208.tar.gz
Allow "circuit dissectors" to pass data between dissectors. Not sure if this is immediately useful (ie remove need for packet_info (private_)data), but opens the possibility.
svn path=/trunk/; revision=52893
Diffstat (limited to 'epan/circuit.c')
-rw-r--r--epan/circuit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/circuit.c b/epan/circuit.c
index 4ea8fab477..9bdc76e2f3 100644
--- a/epan/circuit.c
+++ b/epan/circuit.c
@@ -293,7 +293,7 @@ circuit_get_dissector(circuit_t *circuit)
*/
gboolean
try_circuit_dissector(circuit_type ctype, guint32 circuit_id, guint32 frame,
- tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+ tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
{
circuit_t *circuit;
@@ -302,8 +302,8 @@ try_circuit_dissector(circuit_type ctype, guint32 circuit_id, guint32 frame,
if (circuit != NULL) {
if (circuit->dissector_handle == NULL)
return FALSE;
- call_dissector(circuit->dissector_handle, tvb, pinfo,
- tree);
+ call_dissector_with_data(circuit->dissector_handle, tvb, pinfo,
+ tree, data);
return TRUE;
}
return FALSE;