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-capwap.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-capwap.c')
| -rw-r--r-- | epan/dissectors/packet-capwap.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c index 48fdf5ab62..b78c973c17 100644 --- a/epan/dissectors/packet-capwap.c +++ b/epan/dissectors/packet-capwap.c @@ -1253,17 +1253,6 @@ static const value_string ieee80211_mac_profile_vals[] = { { 0, NULL } }; -static void capwap_reassemble_init(void) -{ - reassembly_table_init(&capwap_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void capwap_reassemble_cleanup(void) -{ - reassembly_table_destroy(&capwap_reassembly_table); -} - static void dissect_capwap_data_message_bindings_ieee80211(tvbuff_t *tvb, proto_tree *data_message_binding_tree, guint offset, packet_info *pinfo) { @@ -5766,8 +5755,8 @@ proto_register_capwap_control(void) expert_capwap = expert_register_protocol(proto_capwap_control); expert_register_field_array(expert_capwap, ei, array_length(ei)); - register_init_routine(&capwap_reassemble_init); - register_cleanup_routine(&capwap_reassemble_cleanup); + reassembly_table_register(&capwap_reassembly_table, + &addresses_reassembly_table_functions); capwap_module = prefs_register_protocol(proto_capwap_control, NULL); /* Need to create a placeholder for "port" preferences so there is a callback */ |