summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-ieee80211.c
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2015-06-28 13:06:31 +0200
committerPeter Wu <peter@lekensteyn.nl>2015-07-03 23:54:43 +0200
commit37faf3ca5cf873f8bb8761de539e438da13ef0ff (patch)
treec1cb83de0abe15565dfacc67a1e53694d6ce9959 /epan/dissectors/packet-ieee80211.c
parentef0006ddf357b29c1c0d5dab3948172aabd0209f (diff)
downloadwireshark-37faf3ca5cf873f8bb8761de539e438da13ef0ff.tar.gz
Call reassembly_table_destroy for some dissectors
This patch adds reassembly_table_destroy calls as cleanup function for dissectors which have a simple init routine that just calls reassembly_table_init (comments are ignored). The changes were automatically generated using https://git.lekensteyn.nl/peter/wireshark-notes/diff/one-off/cleanup-rewrite.py?id=4cc0aec05dc67a51926a045e1955b7a956757b5e (with the if and assignment parsers disabled). The only difference from the autogenerated output is that the XXX comments from the init routines in smb-pipe and tds dissectors are kept. Change-Id: I64aedf7189877247282b30b0e0f83757be6199e7
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
-rw-r--r--epan/dissectors/packet-ieee80211.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 52ffcb6acc..cc8dc24498 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -18387,6 +18387,12 @@ wlan_defragment_init(void)
&addresses_reassembly_table_functions);
}
+static void
+wlan_defragment_cleanup(void)
+{
+ reassembly_table_destroy(&wlan_reassembly_table);
+}
+
/* ------------- */
static guint
retransmit_hash(gconstpointer k)
@@ -27020,6 +27026,7 @@ proto_register_ieee80211 (void)
register_dissector("wlan_bsfc", dissect_ieee80211_bsfc, proto_wlan);
register_init_routine(wlan_defragment_init);
+ register_cleanup_routine(wlan_defragment_cleanup);
register_init_routine(wlan_retransmit_init);
register_init_routine(ieee80211_gas_reassembly_init);