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-zbee-aps.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-zbee-aps.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-aps.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index 96522deb4b..4bb96e4fd2 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -63,8 +63,6 @@ static guint dissect_zbee_t2 (tvbuff_t *tvb, proto_tree *tree, /* Helper routine. */ static guint zbee_apf_transaction_len (tvbuff_t *tvb, guint offset, guint8 type); -static void proto_init_zbee_aps(void); -static void proto_cleanup_zbee_aps(void); void proto_register_zbee_aps(void); /******************** @@ -2153,9 +2151,9 @@ void proto_register_zbee_aps(void) zbee_aps_dissector_table = register_dissector_table("zbee.profile", "ZigBee Profile ID", proto_zbee_aps, FT_UINT16, BASE_HEX); zbee_aps_handle = register_dissector(ZBEE_PROTOABBREV_APS, dissect_zbee_aps, proto_zbee_aps); - /* Register the init routine. */ - register_init_routine(proto_init_zbee_aps); - register_cleanup_routine(proto_cleanup_zbee_aps); + /* Register reassembly table. */ + reassembly_table_register(&zbee_aps_reassembly_table, + &addresses_reassembly_table_functions); /* Register the ZigBee Application Framework protocol with Wireshark. */ proto_zbee_apf = proto_register_protocol("ZigBee Application Framework", "ZigBee APF", "zbee_apf"); @@ -2166,21 +2164,6 @@ void proto_register_zbee_aps(void) zbee_apf_handle = register_dissector("zbee_apf", dissect_zbee_apf, proto_zbee_apf); } /* proto_register_zbee_aps */ -/** - *Initializes the APS dissectors prior to beginning protocol - * -*/ -static void proto_init_zbee_aps(void) -{ - reassembly_table_init(&zbee_aps_reassembly_table, - &addresses_reassembly_table_functions); -} /* proto_init_zbee_aps */ - -static void proto_cleanup_zbee_aps(void) -{ - reassembly_table_destroy(&zbee_aps_reassembly_table); -} - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |