diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-09 23:01:28 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-13 17:44:24 +0000 |
| commit | 01f7356f85d33567a25e722e6488addd72ff64d4 (patch) | |
| tree | 2d8623b57706cc924f76293f0f5b6ce8d83124ab /epan/dissectors/packet-cipmotion.c | |
| parent | b776707af540d7431e815818e21ea1efac326d9f (diff) | |
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 <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-cipmotion.c')
| -rw-r--r-- | epan/dissectors/packet-cipmotion.c | 10 |
1 files changed, 6 insertions, 4 deletions
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 ); } |