diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-13 20:18:34 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-14 18:00:00 +0000 |
| commit | 8faf5c80b3302247c32e1f5c492cb31a082ee0ad (patch) | |
| tree | e9bac5673fc9a480fe1fa06fcc6d5d7d45b37389 /epan/dissectors/packet-hpteam.c | |
| parent | 76dec3ba681da2c315efba4433d3b1f995defd91 (diff) | |
register_dissector -> new_register_dissector
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I25fe6a0aac93980333217d007702799d16946563
Reviewed-on: https://code.wireshark.org/review/11816
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-hpteam.c')
| -rw-r--r-- | epan/dissectors/packet-hpteam.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c index 7537b50724..0294779693 100644 --- a/epan/dissectors/packet-hpteam.c +++ b/epan/dissectors/packet-hpteam.c @@ -83,8 +83,8 @@ static gint ett_hpteam = -1; * packets received by the machine. */ -static void -dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "HP NIC Team"); @@ -98,6 +98,7 @@ dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hpteam_tree = proto_item_add_subtree(hpteam_item, ett_hpteam); proto_tree_add_item(hpteam_tree, hf_hpteam, tvb, 0, -1, ENC_NA); } + return tvb_captured_length(tvb); } void proto_register_hpteam(void) @@ -127,7 +128,7 @@ void proto_register_hpteam(void) llc_add_oui(OUI_HP_2, "llc.hpteam_pid", "LLC Hewlett Packard OUI PID", &hf_pid); proto_register_field_array(proto_hpteam, hf_data, array_length(hf_data)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("hpteam", dissect_hpteam, proto_hpteam); + new_register_dissector("hpteam", dissect_hpteam, proto_hpteam); } void proto_reg_handoff_hpteam(void) |