aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-atalk.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-01-28 19:53:36 -0500
committerMichael Mann <mmann78@netscape.net>2017-01-29 13:29:04 +0000
commitaf54b292e60fcdd8d03ec583e2b46c9c51f259a5 (patch)
tree67a4b61fd3e71ada67f2c27092a6849424759263 /epan/dissectors/packet-atalk.c
parented8ac81497c890bc82f161be727c0bb5285dcf12 (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-atalk.c')
-rw-r--r--epan/dissectors/packet-atalk.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index 45361e4399..ac07e237f3 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -1586,15 +1586,12 @@ dissect_llap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
static void
atp_init(void)
{
- reassembly_table_init(&atp_reassembly_table,
- &addresses_reassembly_table_functions);
atp_request_hash = g_hash_table_new(asp_hash, asp_equal);
}
static void
atp_cleanup(void)
{
- reassembly_table_destroy(&atp_reassembly_table);
g_hash_table_destroy(atp_request_hash);
}
@@ -2091,6 +2088,9 @@ proto_reg_handoff_atalk(void)
llap_cap_handle = create_capture_dissector_handle(capture_llap, proto_llap);
capture_dissector_add_uint("wtap_encap", WTAP_ENCAP_LOCALTALK, llap_cap_handle);
+ reassembly_table_register(&atp_reassembly_table,
+ &addresses_reassembly_table_functions);
+
register_init_routine( atp_init);
register_cleanup_routine( atp_cleanup);
register_init_routine( &asp_reinit);