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-giop.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-giop.c')
| -rw-r--r-- | epan/dissectors/packet-giop.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 1154499170..b2b1c00cc3 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -1602,13 +1602,9 @@ static void giop_init(void) { giop_complete_request_list = NULL; read_IOR_strings_from_file(giop_ior_file, 600); - - reassembly_table_init(&giop_reassembly_table, - &addresses_reassembly_table_functions); } static void giop_cleanup(void) { - reassembly_table_destroy(&giop_reassembly_table); g_hash_table_destroy(giop_objkey_hash); g_hash_table_destroy(giop_complete_reply_hash); g_list_free(giop_complete_request_list); @@ -5537,6 +5533,9 @@ proto_register_giop (void) register_init_routine( &giop_init); /* any init stuff */ register_cleanup_routine( &giop_cleanup); + reassembly_table_register(&giop_reassembly_table, + &addresses_reassembly_table_functions); + /* Register for tapping */ giop_tap = register_tap(GIOP_TAP_NAME); /* GIOP statistics tap */ |