diff options
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/manage_interfaces_dialog.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/sctp_assoc_analyse_dialog.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/voip_calls_dialog.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp index f87ab3d441..382b3c9dca 100644 --- a/ui/qt/manage_interfaces_dialog.cpp +++ b/ui/qt/manage_interfaces_dialog.cpp @@ -548,13 +548,15 @@ void ManageInterfacesDialog::addRemoteInterfaces(GList* rlist, remote_options *r monitor_mode = prefs_capture_device_monitor_mode(if_string); 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; if (ips != 0) { g_string_append(ip_str, "\n"); } addr = (if_addr_t *)curr_addr->data; switch (addr->ifat_type) { case IF_AT_IPv4: - g_string_append(ip_str, ip_to_str((guint8 *)&addr->addr.ip4_addr)); + SET_ADDRESS(&addr_str, AT_IPv4, 4, &addr->addr.ip4_addr); + g_string_append(ip_str, ep_address_to_str(&addr_str)); break; case IF_AT_IPv6: g_string_append(ip_str, ip6_to_str((struct e_in6_addr *)&addr->addr.ip6_addr)); diff --git a/ui/qt/sctp_assoc_analyse_dialog.cpp b/ui/qt/sctp_assoc_analyse_dialog.cpp index 49b4f19e51..538980cdac 100644 --- a/ui/qt/sctp_assoc_analyse_dialog.cpp +++ b/ui/qt/sctp_assoc_analyse_dialog.cpp @@ -131,7 +131,7 @@ void SCTPAssocAnalyseDialog::fillTabs() store = (address *)(list->data); if (store->type != AT_NONE) { if (store->type == AT_IPv4) { - ui->listWidgetEP1->addItem(QString("%1").arg(ip_to_str((const guint8 *)(store->data)))); + ui->listWidgetEP1->addItem(QString("%1").arg(ep_address_to_str(store))); } else if (store->type == AT_IPv6) { ui->listWidgetEP1->addItem(QString("%1").arg(ip6_to_str((const struct e_in6_addr *)(store->data)))); } @@ -185,7 +185,7 @@ void SCTPAssocAnalyseDialog::fillTabs() store = (address *)(list->data); if (store->type != AT_NONE) { if (store->type == AT_IPv4) { - ui->listWidgetEP2->addItem(QString("%1").arg(ip_to_str((const guint8 *)(store->data)))); + ui->listWidgetEP2->addItem(QString("%1").arg(ep_address_to_str(store))); } else if (store->type == AT_IPv6) { ui->listWidgetEP2->addItem(QString("%1").arg(ip6_to_str((const struct e_in6_addr *)(store->data)))); } diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp index aee0e08121..c8b9f7a359 100644 --- a/ui/qt/voip_calls_dialog.cpp +++ b/ui/qt/voip_calls_dialog.cpp @@ -405,7 +405,7 @@ void VoipCallsDialog::prepareFilter() h245_add = (h245_address_t *)listb->data; g_string_append_printf(filter_string_fwd, " || (ip.addr == %s && tcp.port == %d && h245)", - ip_to_str((guint8 *)(h245_add->h245_address.data)), h245_add->h245_port); + ep_address_to_str(&h245_add->h245_address), h245_add->h245_port); listb = g_list_next(listb); } g_string_append_printf(filter_string_fwd, ")"); |