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-dcerpc.c | |
parent | ed8ac81497c890bc82f161be727c0bb5285dcf12 (diff) | |
download | wireshark-af54b292e60fcdd8d03ec583e2b46c9c51f259a5.tar.gz |
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-dcerpc.c')
-rw-r--r-- | epan/dissectors/packet-dcerpc.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index f435edf831..bec5616ec0 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -1148,20 +1148,6 @@ static const reassembly_table_functions dcerpc_cl_reassembly_table_functions = { dcerpc_fragment_free_persistent_key }; -static void -dcerpc_reassemble_init(void) -{ - /* - * XXX - addresses_ports_reassembly_table_functions? - * Or can a single connection-oriented DCE RPC session persist - * over multiple transport layer connections? - */ - reassembly_table_init(&dcerpc_co_reassembly_table, - &addresses_reassembly_table_functions); - reassembly_table_init(&dcerpc_cl_reassembly_table, - &dcerpc_cl_reassembly_table_functions); -} - /* * Authentication subdissectors. Used to dissect authentication blobs in * DCERPC binds, requests and responses. @@ -6968,7 +6954,17 @@ proto_register_dcerpc(void) "Reassemble DCE/RPC fragments", "Whether the DCE/RPC dissector should reassemble fragmented DCE/RPC PDUs", &dcerpc_reassemble); - register_init_routine(dcerpc_reassemble_init); + + /* + * XXX - addresses_ports_reassembly_table_functions? + * Or can a single connection-oriented DCE RPC session persist + * over multiple transport layer connections? + */ + reassembly_table_register(&dcerpc_co_reassembly_table, + &addresses_reassembly_table_functions); + reassembly_table_register(&dcerpc_cl_reassembly_table, + &dcerpc_cl_reassembly_table_functions); + dcerpc_uuids = g_hash_table_new_full(dcerpc_uuid_hash, dcerpc_uuid_equal, g_free, g_free); dcerpc_tap = register_tap("dcerpc"); |