summaryrefslogtreecommitdiff
path: root/plugins/docsis
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 /plugins/docsis
parented8ac81497c890bc82f161be727c0bb5285dcf12 (diff)
downloadwireshark-af54b292e60fcdd8d03ec583e2b46c9c51f259a5.tar.gz
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 'plugins/docsis')
-rw-r--r--plugins/docsis/packet-docsis.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index 01f44c384b..bc17b6eeb5 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -264,18 +264,6 @@ static guint16 frag_sid;
*/
static reassembly_table docsis_reassembly_table;
-static void
-docsis_defragment_init(void)
-{
- reassembly_table_init(&docsis_reassembly_table,
- &addresses_reassembly_table_functions);
-}
-
-static void
-docsis_defragment_cleanup(void)
-{
- reassembly_table_destroy(&docsis_reassembly_table);
-}
static const fragment_items docsis_frag_items = {
&ett_docsis_fragment,
@@ -1158,8 +1146,8 @@ proto_register_docsis (void)
#endif
docsis_handle = register_dissector ("docsis", dissect_docsis, proto_docsis);
- register_init_routine(docsis_defragment_init);
- register_cleanup_routine(docsis_defragment_cleanup);
+ reassembly_table_register(&docsis_reassembly_table,
+ &addresses_reassembly_table_functions);
}
void