diff options
author | Michael Mann <mmann78@netscape.net> | 2017-01-28 19:53:36 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-01-29 13:29:04 +0000 |
commit | af54b292e60fcdd8d03ec583e2b46c9c51f259a5 (patch) | |
tree | 67a4b61fd3e71ada67f2c27092a6849424759263 /epan/dissectors/packet-selfm.c | |
parent | ed8ac81497c890bc82f161be727c0bb5285dcf12 (diff) | |
download | wireshark-af54b292e60fcdd8d03ec583e2b46c9c51f259a5.tar.gz |
Register reassembly tables
Register all reassembly tables with a central unit, allowing the
central unit to have the callback that initializes and destroys
the reassembly tables, rather than have dissectors do it individually.
Change-Id: Ic92619c06fb5ba6f1c3012f613cae14982e101d4
Reviewed-on: https://code.wireshark.org/review/19834
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-selfm.c')
-rw-r--r-- | epan/dissectors/packet-selfm.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 03f98785d3..632ffae08c 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -2698,22 +2698,6 @@ dissect_selfm_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } /******************************************************************************************************/ -/* SEL Fast Message Dissector initialization */ -/******************************************************************************************************/ -static void -selfm_init(void) -{ - reassembly_table_init(&selfm_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void -selfm_cleanup(void) -{ - reassembly_table_destroy(&selfm_reassembly_table); -} - -/******************************************************************************************************/ /* Register the protocol with Wireshark */ /******************************************************************************************************/ void proto_reg_handoff_selfm(void); @@ -3071,9 +3055,8 @@ proto_register_selfm(void) module_t *selfm_module; expert_module_t* expert_selfm; - /* Register protocol init routine */ - register_init_routine(&selfm_init); - register_cleanup_routine(&selfm_cleanup); + reassembly_table_register(&selfm_reassembly_table, + &addresses_reassembly_table_functions); /* Register the protocol name and description */ proto_selfm = proto_register_protocol("SEL Protocol", "SEL Protocol", "selfm"); |