diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-09-10 21:40:21 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-09-10 21:40:21 +0000 |
| commit | 5a8783f5b12e017967ce178bac3d1826630dea1a (patch) | |
| tree | 72bd010e8f647ea2c4fbd0b8ace91952758f595e /epan/dissectors/packet-cip.c | |
| parent | f764eabb6725bf82f4f45ae12faa1f54860cf090 (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-cip.c')
| -rw-r--r-- | epan/dissectors/packet-cip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index f26870287d..7121d11392 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -3394,7 +3394,7 @@ dissect_cip_generic_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int } /* End of dissect_cip_generic_data() */ static int -dissect_cip_class_generic(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_cip_class_generic(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_item *ti; proto_tree *class_tree; @@ -4708,7 +4708,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ } /* End of dissect_cip_cm_data() */ static int -dissect_cip_class_cm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_cip_class_cm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_item *ti; proto_tree *class_tree; @@ -4915,7 +4915,7 @@ dissect_cip_mb_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_ } /* End of dissect_cip_mb_data() */ static int -dissect_cip_class_mb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_cip_class_mb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_item *ti; proto_tree *class_tree; @@ -5268,7 +5268,7 @@ dissect_cip_cco_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item } /* End of dissect_cip_cco_data() */ static int -dissect_cip_class_cco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_cip_class_cco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_item *ti; proto_tree *class_tree; @@ -5283,7 +5283,7 @@ dissect_cip_class_cco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } static gboolean -dissect_class_cco_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_class_cco_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { unsigned char service, service_code, ioilen, segment; cip_req_info_t* preq_info; @@ -5559,7 +5559,7 @@ dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info static int -dissect_cip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_cip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { enip_request_info_t *enip_info; cip_req_info_t *preq_info; |