diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-17 20:16:06 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-18 07:33:08 +0000 |
| commit | 4adeb424f5cdb74ca1f98cd4b87bd72e4d811f03 (patch) | |
| tree | 6c73d6e0795cc5181ad53242581e4c7f2282081f /epan/dissectors/packet-telkonet.c | |
| parent | 13297438d98e3388d650fc55c2a77d5b52367e1f (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I9c7d1c092bbae896ec0c2832617891346927f2e1
Reviewed-on: https://code.wireshark.org/review/11932
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-telkonet.c')
| -rw-r--r-- | epan/dissectors/packet-telkonet.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index c96fc5f234..ddaa3f648f 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -54,8 +54,8 @@ static const value_string telkonet_type_vals[] = { { 0x00, NULL } }; -static void -dissect_telkonet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_telkonet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *ti, *telkonet_tree; int offset = 0; @@ -77,6 +77,8 @@ dissect_telkonet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (type == TELKONET_TYPE_TUNNEL) call_dissector(eth_withoutfcs_handle, tvb_new_subset_remaining(tvb, offset), pinfo, tree); + + return tvb_captured_length(tvb); } void @@ -103,7 +105,7 @@ proto_reg_handoff_telkonet(void) eth_withoutfcs_handle = find_dissector("eth_withoutfcs"); - telkonet_handle = create_dissector_handle(dissect_telkonet, proto_telkonet); + telkonet_handle = new_create_dissector_handle(dissect_telkonet, proto_telkonet); dissector_add_uint("ethertype", ETHERTYPE_TELKONET, telkonet_handle); } |