aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-cigi.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-cigi.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-cigi.c')
-rw-r--r--epan/dissectors/packet-cigi.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index 3dc1a6acb5..5701dadf16 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -41,8 +41,6 @@
/* Forward declaration */
void proto_reg_handoff_cigi(void);
static gboolean packet_is_cigi(tvbuff_t*);
-static gboolean dissect_cigi_heur(tvbuff_t*, packet_info*, proto_tree*);
-static int dissect_cigi(tvbuff_t*, packet_info*, proto_tree*);
static void dissect_cigi_pdu(tvbuff_t*, packet_info*, proto_tree*);
static void cigi_add_tree(tvbuff_t*, proto_tree*);
static gint cigi_add_data(tvbuff_t*, proto_tree*, gint);
@@ -2586,7 +2584,7 @@ packet_is_cigi(tvbuff_t *tvb)
* The heuristic dissector
*/
static gboolean
-dissect_cigi_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_cigi_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
/* Does this look like CIGI? */
if ( !packet_is_cigi(tvb) ) {
@@ -2600,7 +2598,7 @@ dissect_cigi_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
* The non-heuristic dissector.
*/
static int
-dissect_cigi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+dissect_cigi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
/* Make sure this looks like CIGI */
if ( !packet_is_cigi(tvb) ) {