diff options
author | Peter Wu <peter@lekensteyn.nl> | 2015-06-28 07:31:18 -0700 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-07-03 23:38:26 +0000 |
commit | 3ad976896a983178fc42a0794f137983f528cde7 (patch) | |
tree | 14da052397719898848caadd0c77facbb416a0a6 /epan/dissectors/packet-dtls.c | |
parent | ba9aa3015f29f07bf81cdfebdfab54fdc379b94d (diff) |
ssl,dtls: split init/cleanup routines
Minor functional change: instead of an empty hash table, now the
ssl_session_hash and ssl_crandom_hash structures point will be set to
NULL when files are closed.
API change: drop the ssl_keylog_file parameter from ssl_common_init,
add a new ssl_common_cleanup parameter instead.
Change-Id: I65efe71f8347fe9685359f8ed70cfb9673712421
Reviewed-on: https://code.wireshark.org/review/9226
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dtls.c')
-rw-r--r-- | epan/dissectors/packet-dtls.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index cd9da7db20..d5182df09e 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -184,7 +184,7 @@ dtls_init(void) module_t *dtls_module = prefs_find_module("dtls"); pref_t *keys_list_pref; - ssl_common_init(&dtls_master_key_map, &dtls_keylog_file, + ssl_common_init(&dtls_master_key_map, &dtls_decrypted_data, &dtls_compressed_data); reassembly_table_init (&dtls_reassembly_table, &addresses_ports_reassembly_table_functions); @@ -197,6 +197,14 @@ dtls_init(void) } } +static void +dtls_cleanup(void) +{ + reassembly_table_destroy(&dtls_reassembly_table); + ssl_common_cleanup(&dtls_master_key_map, &dtls_keylog_file, + &dtls_decrypted_data, &dtls_compressed_data); +} + /* parse dtls related preferences (private keys and ports association strings) */ static void dtls_parse_uat(void) @@ -1934,6 +1942,7 @@ proto_register_dtls(void) dtls_associations = g_tree_new(ssl_association_cmp); register_init_routine(dtls_init); + register_cleanup_routine(dtls_cleanup); ssl_lib_init(); dtls_tap = register_tap("dtls"); ssl_debug_printf("proto_register_dtls: registered tap %s:%d\n", |