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-obex.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-obex.c')
-rw-r--r-- | epan/dissectors/packet-obex.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/epan/dissectors/packet-obex.c b/epan/dissectors/packet-obex.c index 4b85d7b280..84ad857794 100644 --- a/epan/dissectors/packet-obex.c +++ b/epan/dissectors/packet-obex.c @@ -1115,19 +1115,6 @@ static gpointer obex_profile_value(packet_info *pinfo _U_) return NULL; } -static void -defragment_init(void) -{ - reassembly_table_init(&obex_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void -defragment_cleanup(void) -{ - reassembly_table_destroy(&obex_reassembly_table); -} - static int is_ascii_str(const guint8 *str, int length) { @@ -3833,8 +3820,8 @@ proto_register_obex(void) expert_obex = expert_register_protocol(proto_obex); expert_register_field_array(expert_obex, ei, array_length(ei)); - register_init_routine(&defragment_init); - register_cleanup_routine(&defragment_cleanup); + reassembly_table_register(&obex_reassembly_table, + &addresses_reassembly_table_functions); register_decode_as(&obex_profile_da); |