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-tr.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-tr.c')
| -rw-r--r-- | epan/dissectors/packet-tr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 11f3fe586f..85c9b5a049 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -375,8 +375,8 @@ capture_tr(const guchar *pd, int offset, int len, packet_counts *ld) { } -static void -dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_tree *tr_tree; proto_item *ti, *hidden_item; @@ -637,6 +637,7 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } tap_queue_packet(tr_tap, pinfo, trh); + return tvb_captured_length(tvb); } /* this routine is taken from the Linux net/802/tr.c code, which shows @@ -798,7 +799,7 @@ proto_register_tr(void) "Whether Linux mangling of the link-layer header should be checked for and worked around", &fix_linux_botches); - register_dissector("tr", dissect_tr, proto_tr); + new_register_dissector("tr", dissect_tr, proto_tr); tr_tap=register_tap("tr"); register_conversation_table(proto_tr, TRUE, tr_conversation_packet, tr_hostlist_packet); |