diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 16:51:45 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 22:00:30 +0000 |
| commit | 799d6fd057b0c20a7692a1181d811a8ff3a88d04 (patch) | |
| tree | 31d6d1248aee7c3192ae6d854b43eeb2c0b996a0 /epan/dissectors/packet-hsr.c | |
| parent | 92bb13a4d22a48c43aa5fa6910c68829edebfdd0 (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3
Reviewed-on: https://code.wireshark.org/review/11860
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-hsr.c')
| -rw-r--r-- | epan/dissectors/packet-hsr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-hsr.c b/epan/dissectors/packet-hsr.c index 660e97d924..8a063c1897 100644 --- a/epan/dissectors/packet-hsr.c +++ b/epan/dissectors/packet-hsr.c @@ -72,8 +72,8 @@ static gint ett_hsr_frame = -1; static dissector_handle_t data_handle; /* Code to actually dissect the packets */ -static void -dissect_hsr_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_hsr_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; proto_tree *hsr_tree; @@ -126,6 +126,7 @@ dissect_hsr_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!dissector_try_uint(ethertype_subdissector_table, etype, next_tvb, pinfo, tree)) call_dissector(data_handle, next_tvb, pinfo, hsr_tree); + return tvb_captured_length(tvb); } @@ -188,7 +189,7 @@ void proto_register_hsr(void) void proto_reg_handoff_hsr(void) { dissector_handle_t hsr_frame_handle; - hsr_frame_handle = create_dissector_handle(dissect_hsr_frame, proto_hsr); + hsr_frame_handle = new_create_dissector_handle(dissect_hsr_frame, proto_hsr); dissector_add_uint("ethertype", ETHERTYPE_HSR, hsr_frame_handle); ethertype_subdissector_table = find_dissector_table("ethertype"); |