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-mbim.c | |
parent | ed8ac81497c890bc82f161be727c0bb5285dcf12 (diff) |
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-mbim.c')
-rw-r--r-- | epan/dissectors/packet-mbim.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index e7bae38a5c..a2c1de67bf 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -6134,19 +6134,6 @@ dissect_mbim_decode_as(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void return 0; } -static void -mbim_reassembly_init(void) -{ - reassembly_table_init(&mbim_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void -mbim_reassembly_cleanup(void) -{ - reassembly_table_destroy(&mbim_reassembly_table); -} - static guint mbim_uuid_hash(gconstpointer key) { @@ -9565,8 +9552,8 @@ proto_register_mbim(void) expert_mbim = expert_register_protocol(proto_mbim); expert_register_field_array(expert_mbim, ei, array_length(ei)); - register_init_routine(mbim_reassembly_init); - register_cleanup_routine(mbim_reassembly_cleanup); + reassembly_table_register(&mbim_reassembly_table, + &addresses_reassembly_table_functions); mbim_control_handle = register_dissector("mbim.control", dissect_mbim_control, proto_mbim); register_dissector("mbim.descriptor", dissect_mbim_descriptor, proto_mbim); |