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-redback.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-redback.c')
| -rw-r--r-- | epan/dissectors/packet-redback.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index 4f5b5aa5b7..7c363a4d3b 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -47,7 +47,6 @@ static dissector_handle_t clnp_handle; static dissector_handle_t arp_handle; static dissector_handle_t ppp_handle; static dissector_handle_t ppphdlc_handle; -static dissector_handle_t data_handle; static header_field_info *hfi_redback = NULL; @@ -146,7 +145,7 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data if(dissector_try_uint(osinl_excl_subdissector_table, nlpid, next_tvb, pinfo, tree)) break; next_tvb = tvb_new_subset_remaining(tvb, dataoff); - call_dissector(data_handle, next_tvb, pinfo, tree); + call_data_dissector(next_tvb, pinfo, tree); } break; case 0x06: { @@ -238,7 +237,6 @@ proto_reg_handoff_redback(void) ipv4_handle = find_dissector_add_dependency("ip", hfi_redback->id); ipv6_handle = find_dissector_add_dependency("ipv6", hfi_redback->id); - data_handle = find_dissector("data"); ethnofcs_handle = find_dissector_add_dependency("eth_withoutfcs", hfi_redback->id); clnp_handle = find_dissector_add_dependency("clnp", hfi_redback->id); arp_handle = find_dissector_add_dependency("arp", hfi_redback->id); |