From af54b292e60fcdd8d03ec583e2b46c9c51f259a5 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 28 Jan 2017 19:53:36 -0500 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-sndcp.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'epan/dissectors/packet-sndcp.c') diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index be6aa64130..9fc5997bec 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.c @@ -104,18 +104,6 @@ static dissector_handle_t sndcp_handle; */ static reassembly_table npdu_reassembly_table; -static void -sndcp_defragment_init(void) -{ - reassembly_table_init(&npdu_reassembly_table, &addresses_reassembly_table_functions); -} - -static void -sndcp_defragment_cleanup(void) -{ - reassembly_table_destroy(&npdu_reassembly_table); -} - /* value strings */ static const value_string nsapi_t[] = { @@ -562,8 +550,7 @@ proto_register_sndcp(void) proto_register_field_array(proto_sndcp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); sndcp_handle = register_dissector("sndcp", dissect_sndcp, proto_sndcp); - register_init_routine(sndcp_defragment_init); - register_cleanup_routine(sndcp_defragment_cleanup); + reassembly_table_register(&npdu_reassembly_table, &addresses_reassembly_table_functions); } /* If this dissector uses sub-dissector registration add a registration routine. -- cgit v1.2.3