aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-netbios.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-netbios.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-netbios.c')
-rw-r--r--epan/dissectors/packet-netbios.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index 42c3935b8f..9815879365 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -1240,19 +1240,6 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
return tvb_captured_length(tvb);
}
-static void
-netbios_init(void)
-{
- reassembly_table_init(&netbios_reassembly_table,
- &addresses_reassembly_table_functions);
-}
-
-static void
-netbios_cleanup(void)
-{
- reassembly_table_destroy(&netbios_reassembly_table);
-}
-
void
proto_register_netbios(void)
{
@@ -1475,8 +1462,8 @@ proto_register_netbios(void)
"Whether the NetBIOS dissector should defragment messages spanning multiple frames",
&netbios_defragment);
- register_init_routine(netbios_init);
- register_cleanup_routine(netbios_cleanup);
+ reassembly_table_register(&netbios_reassembly_table,
+ &addresses_reassembly_table_functions);
}
void