From 01f7356f85d33567a25e722e6488addd72ff64d4 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Mon, 9 Nov 2015 23:01:28 -0500 Subject: register_dissector -> new_register_dissector Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I3d5e576b796556ef070bb36d8b55da0b175dcba8 Reviewed-on: https://code.wireshark.org/review/11805 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-cipmotion.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-cipmotion.c') diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c index 476b11c76f..311a44be60 100644 --- a/epan/dissectors/packet-cipmotion.c +++ b/epan/dissectors/packet-cipmotion.c @@ -1776,8 +1776,8 @@ dissect_var_devce_conn_header(tvbuff_t* tvb, proto_tree* tree, guint32* inst_cou * * Returns: void */ -static void -dissect_cipmotion(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) +static int +dissect_cipmotion(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void* data _U_) { guint32 con_format; /* guint32 seq_number; */ @@ -1878,6 +1878,8 @@ dissect_cipmotion(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) } /* End of instance for( ) loop */ } } + + return tvb_captured_length(tvb); } /* @@ -2919,7 +2921,7 @@ proto_register_cipmotion(void) /* Register the subtrees for the protocol dissection */ proto_register_subtree_array(cip_subtree, array_length(cip_subtree)); - register_dissector( "cipmotion", dissect_cipmotion, proto_cipmotion); + new_register_dissector( "cipmotion", dissect_cipmotion, proto_cipmotion); } void proto_reg_handoff_cipmotion(void) @@ -2927,7 +2929,7 @@ void proto_reg_handoff_cipmotion(void) dissector_handle_t cipmotion_handle; /* Create and register dissector for I/O data handling */ - cipmotion_handle = create_dissector_handle( dissect_cipmotion, proto_cipmotion ); + cipmotion_handle = new_create_dissector_handle( dissect_cipmotion, proto_cipmotion ); dissector_add_for_decode_as("enip.io", cipmotion_handle ); } -- cgit v1.2.3