aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dtpt.c
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2012-09-10 21:40:21 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2012-09-10 21:40:21 +0000
commit5a8783f5b12e017967ce178bac3d1826630dea1a (patch)
tree72bd010e8f647ea2c4fbd0b8ace91952758f595e /epan/dissectors/packet-dtpt.c
parentf764eabb6725bf82f4f45ae12faa1f54860cf090 (diff)
Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
Diffstat (limited to 'epan/dissectors/packet-dtpt.c')
-rw-r--r--epan/dissectors/packet-dtpt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c
index ed3897ed3a..f075acac27 100644
--- a/epan/dissectors/packet-dtpt.c
+++ b/epan/dissectors/packet-dtpt.c
@@ -222,7 +222,7 @@ static const value_string names_protocol[] = {
static int
dissect_dtpt_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int
-dissect_dtpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
+dissect_dtpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_);
static int
@@ -407,12 +407,12 @@ dissect_dtpt_sockaddr(tvbuff_t *tvb, guint offset, proto_tree *tree, int hfindex
}
static int
-dissect_dtpt_conversation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_dtpt_conversation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
guint offset = 0;
/* First try to decode it as "normal" DTPT packets. */
- offset = dissect_dtpt(tvb, pinfo, tree);
+ offset = dissect_dtpt(tvb, pinfo, tree, NULL);
if (offset == 0) {
/* No, maybe it was a DTPT data packet. */
@@ -693,7 +693,7 @@ dissect_dtpt_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
static int
-dissect_dtpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_dtpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
proto_tree *dtpt_tree = NULL;
proto_item *dtpt_item = NULL;