diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-09-27 03:06:32 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-30 23:24:28 +0000 |
| commit | 252ac26fc2813785991ce1b9947dc39f2f6d6f10 (patch) | |
| tree | b26552ced816c9025999e2dd3066f31df928163d | |
| parent | 6503689958399a57a2dea7c81b4fef6ac648693e (diff) | |
packet-dcerpc: pass dcerpc_info to dcerpc_dissect_fnct_blk_t
Change-Id: I92711ee39850f6710eaebf5c678496e7cd9b5f59
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/11364
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-dcerpc.c | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-dcerpc.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 7cd901699e..cb66a7d5af 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -1996,7 +1996,8 @@ dissect_ndr_ucvarray_core(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* real run, dissect the elements */ if (fnct_block) { - offset = (*fnct_block)(tvb, offset, di->array_actual_count, pinfo, tree, drep); + offset = (*fnct_block)(tvb, offset, di->array_actual_count, + pinfo, tree, di, drep); } else { for (i=0 ;i<di->array_actual_count; i++) { old_offset = offset; diff --git a/epan/dissectors/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h index 0cb723f6c6..d3064bbc3e 100644 --- a/epan/dissectors/packet-dcerpc.h +++ b/epan/dissectors/packet-dcerpc.h @@ -302,7 +302,7 @@ int dissect_ndr_uint3264 (tvbuff_t *tvb, gint offset, packet_info *pinfo, int hfindex, guint3264 *pdata); typedef int (dcerpc_dissect_fnct_t)(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep); -typedef int (dcerpc_dissect_fnct_blk_t)(tvbuff_t *tvb, int offset, int length, packet_info *pinfo, proto_tree *tree, guint8 *drep); +typedef int (dcerpc_dissect_fnct_blk_t)(tvbuff_t *tvb, int offset, int length, packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep); typedef void (dcerpc_callback_fnct_t)(packet_info *pinfo, proto_tree *tree, proto_item *item, dcerpc_info *di, tvbuff_t *tvb, int start_offset, int end_offset, void *callback_args); |