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-ndmp.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-ndmp.c')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 9fab54f7ec..684e18e74c 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3416,19 +3416,6 @@ dissect_ndmp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat return tvb_captured_length(tvb); } -static void -ndmp_init(void) -{ - reassembly_table_init(&ndmp_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void -ndmp_cleanup(void) -{ - reassembly_table_destroy(&ndmp_reassembly_table); -} - void proto_register_ndmp(void) @@ -4259,8 +4246,8 @@ proto_register_ndmp(void) "Reassemble fragmented NDMP messages spanning multiple packets", "Whether the dissector should defragment NDMP messages spanning multiple packets.", &ndmp_defragment); - register_init_routine(ndmp_init); - register_cleanup_routine(ndmp_cleanup); + reassembly_table_register(&ndmp_reassembly_table, + &addresses_reassembly_table_functions); } void |