aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-btl2cap.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-btl2cap.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-btl2cap.c')
-rw-r--r--epan/dissectors/packet-btl2cap.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 30134cef3a..256194fac3 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -2775,19 +2775,6 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
return offset;
}
-static void
-init_btl2cap(void)
-{
- reassembly_table_init(&btl2cap_le_sdu_reassembly_table,
- &addresses_reassembly_table_functions);
-}
-
-static void
-cleanup_btl2cap(void)
-{
- reassembly_table_destroy(&btl2cap_le_sdu_reassembly_table);
-}
-
/* Register the protocol with Wireshark */
void
proto_register_btl2cap(void)
@@ -3368,9 +3355,8 @@ proto_register_btl2cap(void)
register_decode_as(&btl2cap_cid_da);
register_decode_as(&btl2cap_psm_da);
- register_init_routine(&init_btl2cap);
- register_cleanup_routine(&cleanup_btl2cap);
-
+ reassembly_table_register(&btl2cap_le_sdu_reassembly_table,
+ &addresses_reassembly_table_functions);
}