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-lon.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-lon.c')
| -rw-r--r-- | epan/dissectors/packet-lon.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-lon.c b/epan/dissectors/packet-lon.c index 69f00af0a5..013b2ad7c1 100644 --- a/epan/dissectors/packet-lon.c +++ b/epan/dissectors/packet-lon.c @@ -186,8 +186,6 @@ static expert_field ei_lon_tpdu_spdu_type_unknown = EI_INIT; static expert_field ei_lon_tpdu_authpdu_type_unknown = EI_INIT; static expert_field ei_lon_tpdu_apdu_dest_type = EI_INIT; -static dissector_handle_t data_handle; - static gint dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint offset); @@ -498,7 +496,7 @@ dissect_apdu(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, next_tvb = tvb_new_subset_remaining(tvb, offset); - return offset - old_offset + call_dissector(data_handle, next_tvb, pinfo, tree); + return offset - old_offset + call_data_dissector(next_tvb, pinfo, tree); } void @@ -762,7 +760,6 @@ proto_reg_handoff_lon(void) dissector_handle_t lon_handle; lon_handle = create_dissector_handle(dissect_lon, proto_lon); - data_handle = find_dissector("data"); dissector_add_uint("cnip.protocol", 0, lon_handle); } |