diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-03-19 20:33:14 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-03-20 17:38:03 +0000 |
| commit | 1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf (patch) | |
| tree | 4147c4f2bee3b93c250a49fa8ec337072c80e713 /epan/dissectors/packet-smb-pipe.c | |
| parent | 2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff) | |
Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it.
There were also some that were finding it, but not using it.
For others this was the only reason for their handoff function, so it could be eliminated.
Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b
Reviewed-on: https://code.wireshark.org/review/14530
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-smb-pipe.c')
| -rw-r--r-- | epan/dissectors/packet-smb-pipe.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index d63ed79149..00ddd244f6 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -44,7 +44,6 @@ XXX Fixme : shouldn't show [malformed frame] for long packets void proto_register_pipe_lanman(void); void proto_register_smb_pipe(void); -void proto_reg_handoff_smb_pipe(void); static int proto_smb_pipe = -1; static int hf_smb_pipe_function = -1; @@ -202,8 +201,6 @@ static gint ett_lanman_server = -1; static expert_field ei_smb_pipe_bogus_netwkstauserlogon = EI_INIT; static expert_field ei_smb_pipe_bad_type = EI_INIT; -static dissector_handle_t data_handle; - /* * See * @@ -3434,7 +3431,7 @@ clean_up_and_exit: pinfo->desegment_len = 0; if (!result) - call_dissector(data_handle, d_tvb, pinfo, parent_tree); + call_data_dissector(d_tvb, pinfo, parent_tree); pinfo->fragmented = save_fragmented; return TRUE; @@ -3926,13 +3923,6 @@ proto_register_smb_pipe(void) register_cleanup_routine(smb_dcerpc_reassembly_cleanup); } -void -proto_reg_handoff_smb_pipe(void) -{ - data_handle = find_dissector("data"); -} - - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |