From 28ea58251c04562cc0670e57bf073dc6966e73e6 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 14 Nov 2015 09:23:33 -0500 Subject: 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 Reviewed-by: Michael Mann --- epan/dissectors/packet-rfc2190.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-rfc2190.c') diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c index 9eb7e7940c..ed61655bc1 100644 --- a/epan/dissectors/packet-rfc2190.c +++ b/epan/dissectors/packet-rfc2190.c @@ -75,8 +75,8 @@ static gint ett_rfc2190 = -1; static dissector_handle_t h263_handle; -static void -dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) +static int +dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ ) { proto_item *ti = NULL; proto_tree *rfc2190_tree = NULL; @@ -238,6 +238,7 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* The rest of the packet is the H.263 stream */ next_tvb = tvb_new_subset_remaining( tvb, offset); call_dissector(h263_handle,next_tvb,pinfo,tree); + return tvb_captured_length(tvb); } void @@ -521,7 +522,7 @@ proto_register_rfc2190(void) "RFC2190", "rfc2190"); proto_register_field_array(proto_rfc2190, hf, array_length(hf)); - register_dissector("rfc2190", dissect_rfc2190, proto_rfc2190); + new_register_dissector("rfc2190", dissect_rfc2190, proto_rfc2190); } /* -- cgit v1.2.3