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-batadv.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-batadv.c')
| -rw-r--r-- | epan/dissectors/packet-batadv.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index a591a8430b..8c89759d5b 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -4190,17 +4190,6 @@ static int dissect_batadv_tvlv_v15_tt_change(tvbuff_t *tvb, return offset; } -static void batadv_init_routine(void) -{ - reassembly_table_init(&msg_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void batadv_cleanup_routine(void) -{ - reassembly_table_destroy(&msg_reassembly_table); -} - void proto_register_batadv(void) { module_t *batadv_module; @@ -5036,8 +5025,8 @@ void proto_register_batadv(void) expert_batadv = expert_register_protocol(proto_batadv_plugin); expert_register_field_array(expert_batadv, ei, array_length(ei)); - register_init_routine(&batadv_init_routine); - register_cleanup_routine(&batadv_cleanup_routine); + reassembly_table_register(&msg_reassembly_table, + &addresses_reassembly_table_functions); } void proto_reg_handoff_batadv(void) |