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-cell_broadcast.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-cell_broadcast.c')
| -rw-r--r-- | epan/dissectors/packet-cell_broadcast.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/epan/dissectors/packet-cell_broadcast.c b/epan/dissectors/packet-cell_broadcast.c index 608af7463a..23162d7832 100644 --- a/epan/dissectors/packet-cell_broadcast.c +++ b/epan/dissectors/packet-cell_broadcast.c @@ -160,18 +160,6 @@ static const fragment_items gsm_page_items = { "pages" }; - -static void gsm_cbs_message_reassembly_init(void) -{ - reassembly_table_init(&gsm_cbs_reassembly_table, - &addresses_reassembly_table_functions); -} - -static void gsm_cbs_message_reassembly_cleanup(void) -{ - reassembly_table_destroy(&gsm_cbs_reassembly_table); -} - guint dissect_cbs_serial_number(tvbuff_t *tvb, proto_tree *tree, guint offset) { guint16 serial_number = tvb_get_ntohs(tvb, offset) ; @@ -571,8 +559,9 @@ proto_register_cbs(void) proto_cell_broadcast = proto_register_protocol("GSM Cell Broadcast Service", "GSM Cell Broadcast Service", "gsm_cbs"); proto_register_field_array(proto_cell_broadcast, hf_cbs, array_length(hf_cbs)); - register_init_routine(gsm_cbs_message_reassembly_init); - register_cleanup_routine(gsm_cbs_message_reassembly_cleanup); + + reassembly_table_register(&gsm_cbs_reassembly_table, + &addresses_reassembly_table_functions); /* subdissector code */ register_dissector("gsm_cbs", dissect_gsm_cell_broadcast, proto_cell_broadcast); |