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-v5ua.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-v5ua.c')
| -rw-r--r-- | epan/dissectors/packet-v5ua.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index 053cb16cf1..2bf110abd4 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -1380,10 +1380,9 @@ dissect_v5ua_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ } -static void -dissect_v5ua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_v5ua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - gint offset, remaining_length, length, tag, one_bit; @@ -1395,14 +1394,10 @@ dissect_v5ua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "V5UA"); /* end */ col_clear(pinfo->cinfo, COL_INFO); - if (tree) { - /* create display subtree for the protocol */ - ti = proto_tree_add_item(tree, proto_v5ua, tvb, 0, -1, ENC_NA); - v5ua_tree = proto_item_add_subtree(ti, ett_v5ua); - } - else { - v5ua_tree=NULL; - }; + + /* create display subtree for the protocol */ + ti = proto_tree_add_item(tree, proto_v5ua, tvb, 0, -1, ENC_NA); + v5ua_tree = proto_item_add_subtree(ti, ett_v5ua); /* detect version of IUA */ iua_version = RFC; @@ -1467,6 +1462,7 @@ dissect_v5ua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* dissect the message */ dissect_v5ua_message(tvb, pinfo, tree, v5ua_tree); + return tvb_captured_length(tvb); } @@ -1682,7 +1678,7 @@ proto_reg_handoff_v5ua(void) { dissector_handle_t v5ua_handle; - v5ua_handle = create_dissector_handle(dissect_v5ua, proto_v5ua); + v5ua_handle = new_create_dissector_handle(dissect_v5ua, proto_v5ua); q931_handle = find_dissector("q931"); v52_handle = find_dissector("v52"); |