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-uhd.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-uhd.c')
-rw-r--r-- | epan/dissectors/packet-uhd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-uhd.c b/epan/dissectors/packet-uhd.c index 07627ce81e..92ae6c60c4 100644 --- a/epan/dissectors/packet-uhd.c +++ b/epan/dissectors/packet-uhd.c @@ -155,8 +155,8 @@ static const value_string uhd_reg_actions[] = { void proto_reg_handoff_uhd(void); /* dissect a UHD header and hand payload off to respective dissector */ -static void -dissect_uhd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_uhd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { int ind; proto_item *ti; @@ -172,7 +172,7 @@ dissect_uhd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(id, uhd_ids, "Unknown UHD message type '%c'")); if (tree == NULL) - return; + return tvb_captured_length(tvb); ti = proto_tree_add_protocol_format(tree, proto_uhd, tvb, 0, 34, "UHD id = %c ", id); uhd_tree = proto_item_add_subtree(ti, ett_uhd); @@ -221,6 +221,7 @@ dissect_uhd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(uhd_tree, hf_uhd_echo_len, tvb, 12, 4, ENC_BIG_ENDIAN); break; } + return tvb_captured_length(tvb); } void @@ -289,7 +290,7 @@ proto_reg_handoff_uhd(void) static gint dissector_port; if (!uhd_prefs_initialized) { - uhd_handle = create_dissector_handle(dissect_uhd, proto_uhd); + uhd_handle = new_create_dissector_handle(dissect_uhd, proto_uhd); uhd_prefs_initialized = TRUE; } else { dissector_delete_uint("udp.port", dissector_port, uhd_handle); |