diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-05 11:12:08 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-06 07:38:18 +0000 |
| commit | 55de46f317b5e3aba957f4aa44e242aea0d29dfc (patch) | |
| tree | 3e5c8a3d17ef272b098fc7db62b6f56ab0b96f78 /ui/qt/manage_interfaces_dialog.cpp | |
| parent | 124272ec097852c0c0efa587cb1cb1bf8047ff73 (diff) | |
Replace ep_address_to_str with address_to_str.
Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b
Reviewed-on: https://code.wireshark.org/review/6323
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/manage_interfaces_dialog.cpp')
| -rw-r--r-- | ui/qt/manage_interfaces_dialog.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp index a660e936ad..f28affc72f 100644 --- a/ui/qt/manage_interfaces_dialog.cpp +++ b/ui/qt/manage_interfaces_dialog.cpp @@ -549,6 +549,7 @@ void ManageInterfacesDialog::addRemoteInterfaces(GList* rlist, remote_options *r caps = capture_get_if_capabilities(if_string, monitor_mode, NULL, main_window_update); for (; (curr_addr = g_slist_nth(if_info->addrs, ips)) != NULL; ips++) { address addr_str; + char* temp_addr_str = NULL; if (ips != 0) { g_string_append(ip_str, "\n"); } @@ -556,16 +557,19 @@ void ManageInterfacesDialog::addRemoteInterfaces(GList* rlist, remote_options *r switch (addr->ifat_type) { case IF_AT_IPv4: SET_ADDRESS(&addr_str, AT_IPv4, 4, &addr->addr.ip4_addr); - g_string_append(ip_str, ep_address_to_str(&addr_str)); + temp_addr_str = (char*)address_to_str(NULL, &addr_str); + g_string_append(ip_str, temp_addr_str); break; case IF_AT_IPv6: SET_ADDRESS(&addr_str, AT_IPv6, 16, addr->addr.ip6_addr); - g_string_append(ip_str, ep_address_to_str(&addr_str)); + temp_addr_str = (char*)address_to_str(NULL, &addr_str); + g_string_append(ip_str, temp_addr_str); break; default: /* In case we add non-IP addresses */ break; } + wmem_free(NULL, temp_addr_str); } /* for curr_addr */ linktype_count = 0; device.links = NULL; |