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-wai.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-wai.c')
| -rw-r--r-- | epan/dissectors/packet-wai.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/epan/dissectors/packet-wai.c b/epan/dissectors/packet-wai.c index f54ade66e9..98854bd384 100644 --- a/epan/dissectors/packet-wai.c +++ b/epan/dissectors/packet-wai.c @@ -966,17 +966,6 @@ Figure 18 from [ref:1] return tvb_captured_length(tvb); } -static void wai_reassemble_init (void) -{ - reassembly_table_init(&wai_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void wai_reassemble_cleanup (void) -{ - reassembly_table_destroy(&wai_reassembly_table); -} - void proto_register_wai(void) { @@ -1367,10 +1356,10 @@ proto_register_wai(void) }; proto_wai = proto_register_protocol("WAI Protocol", "WAI", "wai"); - register_init_routine(&wai_reassemble_init); - register_cleanup_routine(&wai_reassemble_cleanup); proto_register_field_array(proto_wai, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + reassembly_table_register(&wai_reassembly_table, + &addresses_reassembly_table_functions); wai_handle = register_dissector("wai", dissect_wai, proto_wai); } |