From 4adeb424f5cdb74ca1f98cd4b87bd72e4d811f03 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Tue, 17 Nov 2015 20:16:06 -0500 Subject: create_dissector_handle -> new_create_dissector_handle Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I9c7d1c092bbae896ec0c2832617891346927f2e1 Reviewed-on: https://code.wireshark.org/review/11932 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-pw-satop.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-pw-satop.c') diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 9c88cc1ef2..726367df5d 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -383,10 +383,10 @@ void dissect_pw_satop(tvbuff_t * tvb_original static -void dissect_pw_satop_mpls( tvbuff_t * tvb_original, packet_info * pinfo, proto_tree * tree) +int dissect_pw_satop_mpls( tvbuff_t * tvb_original, packet_info * pinfo, proto_tree * tree, void* data _U_) { dissect_pw_satop(tvb_original,pinfo,tree,PWC_DEMUX_MPLS); - return; + return tvb_captured_length(tvb_original); } @@ -472,7 +472,7 @@ void proto_reg_handoff_pw_satop(void) pw_padding_handle = find_dissector("pw_padding"); /* For Decode As */ - pw_satop_mpls_handle = create_dissector_handle( dissect_pw_satop_mpls, proto ); + pw_satop_mpls_handle = new_create_dissector_handle( dissect_pw_satop_mpls, proto ); dissector_add_for_decode_as("mpls.label", pw_satop_mpls_handle); dissector_add_for_decode_as("udp.port", find_dissector("pw_satop_udp")); -- cgit v1.2.3