diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-14 09:23:33 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-14 21:54:27 +0000 |
| commit | 28ea58251c04562cc0670e57bf073dc6966e73e6 (patch) | |
| tree | abe57292f17b280056a73ee7cfdc94abdcaaaaf3 /epan/dissectors/packet-pw-common.c | |
| parent | 13101020e12eb21e8464a3c4eb4fc2fe51409235 (diff) | |
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.
This concludes a "first pass" over the dissector directory.
Change-Id: If5ce5484214be50fe541cba478da1de62e354297
Reviewed-on: https://code.wireshark.org/review/11830
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-pw-common.c')
| -rw-r--r-- | epan/dissectors/packet-pw-common.c | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c index 4e87f105a0..96dc6ec78e 100644 --- a/epan/dissectors/packet-pw-common.c +++ b/epan/dissectors/packet-pw-common.c @@ -90,25 +90,21 @@ static int hf_padding_len = -1; static dissector_handle_t dh_data; static -void dissect_pw_padding(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) +int dissect_pw_padding(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_) { - /* do not touch columns */ - if (tree) - { - gint size; - proto_item* item; - size = tvb_reported_length_remaining(tvb, 0); - item = proto_tree_add_item(tree, proto_pw_padding, tvb, 0, -1, ENC_NA); - pwc_item_append_text_n_items(item,size,"byte"); - { - proto_tree* tree_p; - tree_p = proto_item_add_subtree(item, ett); - call_dissector(dh_data, tvb, pinfo, tree_p); - item = proto_tree_add_int(tree_p, hf_padding_len, tvb, 0, 0, size); - PROTO_ITEM_SET_HIDDEN(item); /*allow filtering*/ - } - } - return; + gint size; + proto_item* item; + proto_tree* tree_p; + size = tvb_reported_length_remaining(tvb, 0); + item = proto_tree_add_item(tree, proto_pw_padding, tvb, 0, -1, ENC_NA); + pwc_item_append_text_n_items(item,size,"byte"); + tree_p = proto_item_add_subtree(item, ett); + + call_dissector(dh_data, tvb, pinfo, tree_p); + item = proto_tree_add_int(tree_p, hf_padding_len, tvb, 0, 0, size); + PROTO_ITEM_SET_HIDDEN(item); /*allow filtering*/ + + return tvb_captured_length(tvb); } void proto_register_pw_padding(void) @@ -124,15 +120,13 @@ void proto_register_pw_padding(void) proto_pw_padding = proto_register_protocol("Pseudowire Padding","PW Padding","pw.padding"); proto_register_field_array(proto_pw_padding, hfpadding, array_length(hfpadding)); proto_register_subtree_array(ett_array, array_length(ett_array)); - register_dissector("pw_padding", dissect_pw_padding, proto_pw_padding); - return; + new_register_dissector("pw_padding", dissect_pw_padding, proto_pw_padding); } void proto_reg_handoff_pw_padding(void) { dh_data = find_dissector("data"); - return; } /* |