diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-02-02 19:04:01 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-02-03 01:13:50 +0000 |
| commit | 9c846024fda4e4d2e8948ee2974c24a8d5355410 (patch) | |
| tree | dc115404f04cadf02aec25c614c40fb896737b8c /epan/dissectors/packet-smb2.c | |
| parent | 59b5609624db8214b8e8f4b749ad3af03e9573fa (diff) | |
Pass smb2_info_t structure to heuristic subdissectors.
Bug: 11933
Change-Id: I7ac03166c4c69a2366da26c44a89aee60116ac7f
Reviewed-on: https://code.wireshark.org/review/13674
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-smb2.c')
| -rw-r--r-- | epan/dissectors/packet-smb2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 0262328b8a..91481ecc67 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -4658,7 +4658,7 @@ dissect_file_data_smb2_pipe(tvbuff_t *raw_tvb, packet_info *pinfo, proto_tree *t if (!pinfo->can_desegment) { result = dissector_try_heuristic(smb2_pipe_subdissector_list, tvb, pinfo, top_tree, - &hdtbl_entry, NULL); + &hdtbl_entry, data); goto clean_up_and_exit; } @@ -4693,7 +4693,7 @@ dissect_file_data_smb2_pipe(tvbuff_t *raw_tvb, packet_info *pinfo, proto_tree *t */ result = dissector_try_heuristic(smb2_pipe_subdissector_list, tvb, pinfo, top_tree, - &hdtbl_entry, NULL); + &hdtbl_entry, data); /* no this didn't look like something we know */ if (!result) { @@ -4746,7 +4746,7 @@ dissect_file_data_smb2_pipe(tvbuff_t *raw_tvb, packet_info *pinfo, proto_tree *t /* dissect the full PDU */ result = dissector_try_heuristic(smb2_pipe_subdissector_list, tvb, pinfo, top_tree, - &hdtbl_entry, NULL); + &hdtbl_entry, data); } goto clean_up_and_exit; } @@ -4768,14 +4768,14 @@ dissect_file_data_smb2_pipe(tvbuff_t *raw_tvb, packet_info *pinfo, proto_tree *t */ result = dissector_try_heuristic(smb2_pipe_subdissector_list, tvb, pinfo, top_tree, - &hdtbl_entry, NULL); + &hdtbl_entry, data); goto clean_up_and_exit; } if (!(fd_head->flags&FD_DEFRAGMENTED)) { /* we don't have a fully reassembled frame */ result = dissector_try_heuristic(smb2_pipe_subdissector_list, tvb, pinfo, top_tree, - &hdtbl_entry, NULL); + &hdtbl_entry, data); goto clean_up_and_exit; } @@ -4803,7 +4803,7 @@ dissect_file_data_smb2_pipe(tvbuff_t *raw_tvb, packet_info *pinfo, proto_tree *t /* dissect the full PDU */ result = dissector_try_heuristic(smb2_pipe_subdissector_list, tvb, pinfo, top_tree, - &hdtbl_entry, NULL); + &hdtbl_entry, data); clean_up_and_exit: /* clear out the variables */ |