summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-cmp.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-cmp.c
parentf764eabb6725bf82f4f45ae12faa1f54860cf090 (diff)
downloadwireshark-5a8783f5b12e017967ce178bac3d1826630dea1a.tar.gz
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-cmp.c')
-rw-r--r--epan/dissectors/packet-cmp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 6ba99e0692..e382bbab67 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -1486,7 +1486,7 @@ static const value_string cmp_pdu_types[] = {
};
-static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
+static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
{
tvbuff_t *next_tvb;
guint32 pdu_len;
@@ -1583,7 +1583,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa
static void dissect_cmp_tcp_pdu_no_return(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
{
- dissect_cmp_tcp_pdu(tvb, pinfo, parent_tree);
+ dissect_cmp_tcp_pdu(tvb, pinfo, parent_tree, NULL);
}
static guint get_cmp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
@@ -1600,8 +1600,8 @@ static guint get_cmp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
/* CMP over TCP: RFC2510 section 5.2 and "Transport Protocols for CMP" draft */
- static int
-dissect_cmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
+static int
+dissect_cmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
{
guint32 pdu_len;
guint8 pdu_type;
@@ -1657,8 +1657,8 @@ dissect_cmp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
}
- static int
-dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
+static int
+dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
{
proto_item *item=NULL;
proto_tree *tree=NULL;