diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-04-05 21:15:23 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-04-06 01:31:28 +0000 |
| commit | fdeed480bf89a1f43f7b3d4be67fa0e4333f7120 (patch) | |
| tree | 03e0f5f102625697d49e9f8f80d3fdf55703a7e4 /epan/dissectors/packet-ssl-utils.c | |
| parent | 941bd013b3f481e9fd42c175ea6a5194b8046ca4 (diff) | |
Convert ep_address_to_str -> address_to_str(wmem_packet_scope, ...) for all dissectors
Change-Id: I7489e2fb3a1f2630ca17b0a5fe1aa873992f1061
Reviewed-on: https://code.wireshark.org/review/975
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 25e252efec..796e0845b0 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -3679,7 +3679,7 @@ ssl_find_private_key(SslDecryptSession *ssl_session, GHashTable *key_hash, GTree dummy.port = port = pinfo->destport; } ssl_debug_printf("ssl_find_private_key server %s:%u\n", - ep_address_to_str(&dummy.addr),dummy.port); + address_to_str(wmem_packet_scope(), &dummy.addr),dummy.port); /* try to retrieve private key for this service. Do it now 'cause pinfo * is not always available @@ -4212,7 +4212,7 @@ ssl_parse_key_list(const ssldecrypt_assoc_t * uats, GHashTable *key_hash, GTree* } ssl_debug_printf("ssl_init %s addr '%s' (%s) port '%d' filename '%s' password(only for p12 file) '%s'\n", - (addr_type[at] == AT_IPv4) ? "IPv4" : "IPv6", uats->ipaddr, ep_address_to_str(&service->addr), + (addr_type[at] == AT_IPv4) ? "IPv4" : "IPv6", uats->ipaddr, address_to_str(wmem_packet_scope(), &service->addr), service->port, uats->keyfile, uats->password); ssl_debug_printf("ssl_init private key file %s successfully loaded.\n", uats->keyfile); |