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-spdy.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-spdy.c')
-rw-r--r-- | epan/dissectors/packet-spdy.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index ac7e47a2c7..44ad165661 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -238,7 +238,6 @@ static expert_field ei_spdy_invalid_go_away = EI_INIT; static expert_field ei_spdy_invalid_frame_type = EI_INIT; static expert_field ei_spdy_reassembly_info = EI_INIT; -static dissector_handle_t data_handle; static dissector_handle_t media_handle; static dissector_handle_t spdy_handle; static dissector_table_t media_type_subdissector_table; @@ -873,7 +872,7 @@ static int dissect_spdy_data_payload(tvbuff_t *tvb, if (spdy_decompress_body) { proto_item_append_text(e_ti, " [Error: Decompression failed]"); } - call_dissector(data_handle, data_tvb, pinfo, e_tree); + call_data_dissector(data_tvb, pinfo, e_tree); goto body_dissected; } @@ -929,7 +928,7 @@ static int dissect_spdy_data_payload(tvbuff_t *tvb, call_dissector_with_data(media_handle, next_tvb, pinfo, spdy_tree, media_str); } else { /* Call the default data dissector */ - call_dissector(data_handle, next_tvb, pinfo, spdy_tree); + call_data_dissector(next_tvb, pinfo, spdy_tree); } body_dissected: @@ -1946,7 +1945,6 @@ void proto_reg_handoff_spdy(void) { /* Use "0" to avoid overwriting HTTPS port and still offer support over SSL */ ssl_dissector_add(0, spdy_handle); - data_handle = find_dissector("data"); media_handle = find_dissector_add_dependency("media", proto_spdy); port_subdissector_table = find_dissector_table("http.port"); media_type_subdissector_table = find_dissector_table("media_type"); |