diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-02-09 12:28:14 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-02-10 13:26:14 +0000 |
| commit | b54c43801112711dcba341f3eb4701678a0e1916 (patch) | |
| tree | 49c8f27b4ad96bd35189451addd1ab6941a408a3 /epan/epan.c | |
| parent | 8bbf0341e13b28f76a2e0d9c31bc0912aba36327 (diff) | |
| download | wireshark-b54c43801112711dcba341f3eb4701678a0e1916.tar.gz | |
Convert conversation hash tables to use wmem.
Simplifies cleanup because wmem can handle the memory cleanup.
Change-Id: Idc6a9bfe5f23c83b59a5278a64b9fb706862342d
Reviewed-on: https://code.wireshark.org/review/20042
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/epan.c')
| -rw-r--r-- | epan/epan.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/epan/epan.c b/epan/epan.c index e0ebd5b215..ffb4bddecf 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -172,6 +172,7 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da prefs_init(); expert_init(); packet_init(); + conversation_init(); capture_dissector_init(); reassembly_tables_init(); proto_init(register_all_protocols_func, register_all_handoffs_func, @@ -308,13 +309,7 @@ epan_free(epan_t *session) void epan_conversation_init(void) { - conversation_init(); -} - -void -epan_conversation_cleanup(void) -{ - conversation_cleanup(); + conversation_epan_reset(); } void |