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>

1 files changed, 2 insertions, 15 deletions

diff --git a/epan/dissectors/packet-openvpn.c b/epan/dissectors/packet-openvpn.c
index df7af4982e..3fb2ca98a0 100644
--- a/epan/dissectors/packet-openvpn.c
+++ b/epan/dissectors/packet-openvpn.c
@@ -145,19 +145,6 @@ static const fragment_items openvpn_frag_items = {
   "Message fragments"
 };
 
-static void
-openvpn_reassemble_init(void)
-{
-  reassembly_table_init(&msg_reassembly_table,
-                        &addresses_reassembly_table_functions);
-}
-
-static void
-openvpn_reassemble_cleanup(void)
-{
-  reassembly_table_destroy(&msg_reassembly_table);
-}
-
 /* we check the leading 4 byte of a suspected hmac for 0x00 bytes,
    if more than 1 byte out of the 4 provided contains 0x00, the
    hmac is considered not valid, which suggests that no tls auth is used.
@@ -611,8 +598,8 @@ proto_register_openvpn(void)
   openvpn_udp_handle = register_dissector("openvpn.udp", dissect_openvpn_udp, proto_openvpn);
   openvpn_tcp_handle = register_dissector("openvpn.tcp", dissect_openvpn_tcp, proto_openvpn);
 
-  register_init_routine(&openvpn_reassemble_init);
-  register_cleanup_routine(&openvpn_reassemble_cleanup);
+  reassembly_table_register(&msg_reassembly_table,
+                        &addresses_reassembly_table_functions);
 
   openvpn_module = prefs_register_protocol(proto_openvpn, NULL);