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-dnp.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-dnp.c')
| -rw-r--r-- | epan/dissectors/packet-dnp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index 5b7410a0c6..48df1f3f40 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -3522,14 +3522,11 @@ static void dnp3_init(void) { dl_conversation_table = g_hash_table_new(dl_conversation_hash, dl_conversation_equal); - reassembly_table_init(&al_reassembly_table, - &addresses_reassembly_table_functions); } static void dnp3_cleanup(void) { - reassembly_table_destroy(&al_reassembly_table); g_hash_table_destroy(dl_conversation_table); } @@ -4557,6 +4554,9 @@ proto_register_dnp3(void) /* Register protocol init routine */ register_init_routine(&dnp3_init); register_cleanup_routine(&dnp3_cleanup); + reassembly_table_register(&al_reassembly_table, + &addresses_reassembly_table_functions); + /* Register the protocol name and description */ proto_dnp3 = proto_register_protocol("Distributed Network Protocol 3.0", |