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-direct.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-direct.c')
| -rw-r--r-- | epan/dissectors/packet-smb-direct.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-smb-direct.c b/epan/dissectors/packet-smb-direct.c index 2c8f88476c..6ca65b7688 100644 --- a/epan/dissectors/packet-smb-direct.c +++ b/epan/dissectors/packet-smb-direct.c @@ -102,7 +102,6 @@ enum SMB_DIRECT_HDR_TYPE { #define SMB_DIRECT_RESPONSE_REQUESTED 0x0001 static heur_dissector_list_t smb_direct_heur_subdissector_list; -static dissector_handle_t data_handle; static gboolean smb_direct_reassemble = TRUE; static reassembly_table smb_direct_reassembly_table; @@ -198,7 +197,7 @@ dissect_payload: pinfo->fragmented = FALSE; if (!dissector_try_heuristic(smb_direct_heur_subdissector_list, payload_tvb, pinfo, tree, &hdtbl_entry, NULL)) { - call_dissector(data_handle, payload_tvb, pinfo, tree); + call_data_dissector(payload_tvb, pinfo, tree); } done: pinfo->fragmented = save_fragmented; @@ -700,7 +699,6 @@ void proto_register_smb_direct(void) void proto_reg_handoff_smb_direct(void) { - data_handle = find_dissector("data"); heur_dissector_add("iwarp_ddp_rdmap", dissect_smb_direct_iwarp_heur, "SMB Direct over iWARP", "smb_direct_iwarp", |