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-tpkt.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-tpkt.c')
| -rw-r--r-- | epan/dissectors/packet-tpkt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index cbb5e920d3..eb9d261391 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -556,10 +556,11 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * Dissect RFC 1006 TPKT, which wraps a TPKT header around an OSI TP * PDU. */ -static void -dissect_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_tpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { dissect_tpkt_encap(tvb, pinfo, tree, tpkt_desegment, osi_tp_handle); + return tvb_captured_length(tvb); } /* @@ -638,7 +639,7 @@ proto_register_tpkt(void) proto_tpkt_ptr = find_protocol_by_id(proto_tpkt); proto_register_field_array(proto_tpkt, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("tpkt", dissect_tpkt, proto_tpkt); + new_register_dissector("tpkt", dissect_tpkt, proto_tpkt); tpkt_module = prefs_register_protocol(proto_tpkt, NULL); prefs_register_bool_preference(tpkt_module, "desegment", |