aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-raknet.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-01-28 19:53:36 -0500
committerMichael Mann <mmann78@netscape.net>2017-01-29 13:29:04 +0000
commitaf54b292e60fcdd8d03ec583e2b46c9c51f259a5 (patch)
tree67a4b61fd3e71ada67f2c27092a6849424759263 /epan/dissectors/packet-raknet.c
parented8ac81497c890bc82f161be727c0bb5285dcf12 (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-raknet.c')
-rw-r--r--epan/dissectors/packet-raknet.c22
1 files changed, 3 insertions, 19 deletions
diff --git a/epan/dissectors/packet-raknet.c b/epan/dissectors/packet-raknet.c
index 401bd2acc6..520a7b95d9 100644
--- a/epan/dissectors/packet-raknet.c
+++ b/epan/dissectors/packet-raknet.c
@@ -216,22 +216,6 @@ void proto_register_raknet(void);
void proto_reg_handoff_raknet(void);
static proto_tree *init_raknet_offline_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint *offset);
-/*
- * Initialization.
- */
-static void
-raknet_reassemble_init(void)
-{
- reassembly_table_init(&raknet_reassembly_table,
- &addresses_ports_reassembly_table_functions);
-}
-
-static void
-raknet_reassemble_cleanup(void)
-{
- reassembly_table_destroy(&raknet_reassembly_table);
-}
-
/*
* Called by dissectors for protocols that run atop RakNet/UDP.
@@ -1975,10 +1959,10 @@ proto_register_raknet(void)
proto_register_subtree_array(ett, array_length(ett));
/*
- * Register init/cleanup routines.
+ * Register reassembly table.
*/
- register_init_routine(raknet_reassemble_init);
- register_cleanup_routine(raknet_reassemble_cleanup);
+ reassembly_table_register(&raknet_reassembly_table,
+ &addresses_ports_reassembly_table_functions);
/*
* For internal use only