From 2bbbb4879c3e0885fd971bd75ca88a183feb92f0 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 22 Nov 2015 22:59:08 -0500 Subject: register_dissector -> new_register_dissector Change-Id: Ic368dd8e83cf39e0c934da0ae2744778e2d54ce6 Reviewed-on: https://code.wireshark.org/review/12050 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-h263.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-h263.c') diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c index fbdd0d136a..1c2e16f06f 100644 --- a/epan/dissectors/packet-h263.c +++ b/epan/dissectors/packet-h263.c @@ -627,7 +627,7 @@ dissect_h263_picture_layer( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, A word of 17 bits. Its value is 0000 0000 0000 0000 1. ( 1xxx xxxx ) */ -static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) +static int dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dissector_data _U_ ) { guint offset = 0; proto_item *h263_payload_item = NULL; @@ -645,7 +645,7 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if(length<4){ if( tree ) proto_tree_add_item( h263_payload_tree, hf_h263_data, tvb, offset, -1, ENC_NA ); - return; + return tvb_captured_length(tvb); } /* Check for PSC, PSC is a word of 22 bits. Its value is 0000 0000 0000 0000' 1000 00xx xxxx xxxx. */ data = tvb_get_ntohl(tvb, offset); @@ -690,6 +690,8 @@ static void dissect_h263_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } if( tree ) proto_tree_add_item( h263_payload_tree, hf_h263_data, tvb, offset, -1, ENC_NA ); + + return tvb_captured_length(tvb); } void @@ -1021,7 +1023,7 @@ proto_register_h263_data(void) proto_h263_data = proto_register_protocol("ITU-T Recommendation H.263", "H.263", "h263"); proto_register_field_array(proto_h263_data, hf, array_length(hf)); - register_dissector("h263data", dissect_h263_data, proto_h263_data); + new_register_dissector("h263data", dissect_h263_data, proto_h263_data); } /* -- cgit v1.2.3