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 /plugins/m2m | |
| 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 'plugins/m2m')
| -rw-r--r-- | plugins/m2m/packet-m2m.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index 022b4f537a..2c7b5c0fc1 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -155,20 +155,6 @@ static gint hf_m2m_phy_attributes = -1; static expert_field ei_m2m_unexpected_length = EI_INIT; -/* Register M2M defrag table init routine. */ -static void -m2m_defragment_init(void) -{ - reassembly_table_init(&pdu_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void -m2m_defragment_cleanup(void) -{ - reassembly_table_destroy(&pdu_reassembly_table); -} - /* WiMax MAC to MAC protocol dissector */ static int dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) @@ -799,9 +785,9 @@ void proto_register_m2m(void) expert_m2m = expert_register_protocol(proto_m2m); expert_register_field_array(expert_m2m, ei, array_length(ei)); - /* Register the PDU fragment table init routine */ - register_init_routine(m2m_defragment_init); - register_cleanup_routine(m2m_defragment_cleanup); + /* Register reassembly table */ + reassembly_table_register(&pdu_reassembly_table, + &addresses_reassembly_table_functions); } /* Register Wimax Mac to Mac Protocol handler */ |