osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity

Pass smb2_info_t structure to heuristic subdissectors.

Browse source 
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>
This commit is contained in:
Michael Mann 2016-02-02 19:04:01 -05:00
parent 59b5609624
commit 9c846024fd
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
epan/dissectors/packet-smb2.c
View file

@ -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 */