From 799d6fd057b0c20a7692a1181d811a8ff3a88d04 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 15 Nov 2015 16:51:45 -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: I96aa9cf53533cbb07105aa400d42922baf3016b3 Reviewed-on: https://code.wireshark.org/review/11860 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-kink.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-kink.c') diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 8b6f8a89b9..a2e0527520 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -198,8 +198,8 @@ static void dissect_decrypt_kink_encrypt(packet_info *pinfo, tvbuff_t *tvb, prot #endif /* This function is dissecting the kink header. */ -static void -dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ +static int +dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_){ proto_item *ti = NULL; proto_tree *kink_tree = NULL; guint8 type; @@ -278,6 +278,7 @@ dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ control_payload(pinfo, tvb, offset, next_payload, kink_tree); + return tvb_captured_length(tvb); } /* This part call the dissect payload function by next_payload value. @@ -992,7 +993,7 @@ void proto_reg_handoff_kink(void) { dissector_handle_t kink_handle = NULL; - kink_handle = create_dissector_handle(dissect_kink, proto_kink); + kink_handle = new_create_dissector_handle(dissect_kink, proto_kink); dissector_add_uint("udp.port", KINK_PORT, kink_handle); -- cgit v1.2.3