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-retix-bpdu.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-retix-bpdu.c')
| -rw-r--r-- | epan/dissectors/packet-retix-bpdu.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index 549eedb1d0..f70dc9473d 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.c @@ -53,30 +53,27 @@ static int hf_retix_bpdu_forward_delay = -1; * There are several fields I've not dissected as I'm not exactly sure what they are * What ever happened to Retix anyway? */ -static void -dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *retix_bpdu_tree; proto_tree *ti; col_set_str(pinfo->cinfo, COL_PROTOCOL, "R-STP"); - col_add_fstr(pinfo->cinfo, COL_INFO, "Bridge MAC %s", tvb_ether_to_str(tvb, 10)); - - retix_bpdu_tree = NULL; - if (tree) { - ti = proto_tree_add_item(tree, proto_retix_bpdu, tvb, 0, -1, ENC_NA); - retix_bpdu_tree = proto_item_add_subtree(ti, ett_retix_bpdu); - } + ti = proto_tree_add_item(tree, proto_retix_bpdu, tvb, 0, -1, ENC_NA); + retix_bpdu_tree = proto_item_add_subtree(ti, ett_retix_bpdu); proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_root_mac, tvb, 0, 6, ENC_NA); proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_bridge_mac, tvb, 10, 6, ENC_NA); + col_add_fstr(pinfo->cinfo, COL_INFO, "Bridge MAC %s", tvb_ether_to_str(tvb, 10)); proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_max_age, tvb, 20, 2, ENC_BIG_ENDIAN); proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_hello_time, tvb, 22, 2, ENC_BIG_ENDIAN); proto_tree_add_item(retix_bpdu_tree, hf_retix_bpdu_forward_delay, tvb, 24, 2, ENC_BIG_ENDIAN); + return tvb_captured_length(tvb); } @@ -112,7 +109,7 @@ proto_register_retix_bpdu(void) proto_retix_bpdu = proto_register_protocol("Retix Spanning Tree Protocol", "R-STP", "r-stp"); proto_register_field_array(proto_retix_bpdu, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("rbpdu", dissect_retix_bpdu, proto_retix_bpdu); + new_register_dissector("rbpdu", dissect_retix_bpdu, proto_retix_bpdu); } /* |