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-mstp.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-mstp.c')
-rw-r--r-- | epan/dissectors/packet-mstp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index 897358d6fe..c0c65cd8f1 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -341,8 +341,8 @@ dissect_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } -static void -dissect_mstp_wtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_mstp_wtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; proto_tree *subtree; @@ -376,6 +376,7 @@ dissect_mstp_wtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(subtree, hf_mstp_preamble_FF, tvb, offset+1, 1, ENC_LITTLE_ENDIAN); dissect_mstp(tvb, pinfo, tree, subtree, offset+2); + return tvb_captured_length(tvb); } void @@ -459,7 +460,7 @@ proto_register_mstp(void) expert_mstp = expert_register_protocol(proto_mstp); expert_register_field_array(expert_mstp, ei, array_length(ei)); - register_dissector("mstp", dissect_mstp_wtap, proto_mstp); + new_register_dissector("mstp", dissect_mstp_wtap, proto_mstp); subdissector_table = register_dissector_table("mstp.vendor_frame_type", "MSTP Vendor specific Frametypes", FT_UINT24, BASE_DEC, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE); |