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-trmac.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-trmac.c')
| -rw-r--r-- | epan/dissectors/packet-trmac.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index 4206f4fd72..ab4cba8ffa 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -474,8 +474,8 @@ sv_text(tvbuff_t *tvb, int svoff, packet_info *pinfo, proto_tree *tree) return sv_length; } -static void -dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *mac_tree = NULL; proto_item *ti; @@ -515,6 +515,7 @@ dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } } + return tvb_captured_length(tvb); } void @@ -691,7 +692,7 @@ proto_register_trmac(void) expert_trmac = expert_register_protocol(proto_trmac); expert_register_field_array(expert_trmac, ei, array_length(ei)); - register_dissector("trmac", dissect_trmac, proto_trmac); + new_register_dissector("trmac", dissect_trmac, proto_trmac); } /* |