Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.

Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
Reviewed-on: https://code.wireshark.org/review/6060
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

7 files changed, 17 insertions, 25 deletions

diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index a2b8455e09..8777b7271a 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -1294,7 +1294,8 @@ insert_new_rows(GList *list)
           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));
+          SET_ADDRESS(&addr_str, AT_IPv6, 16, addr->addr.ip6_addr);
+          g_string_append(ip_str, ep_address_to_str(&addr_str));
           break;
         default:
           /* In case we add non-IP addresses */
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index b1d8ef5c15..ea6582fc9d 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -482,7 +482,8 @@ set_ip_addr_label(GSList *addr_list, GtkWidget *ip_lb, guint selected_ip_addr)
       break;
 
     case IF_AT_IPv6:
-      addr_str = ip6_to_str((struct e_in6_addr *)&addr->addr.ip6_addr);
+      SET_ADDRESS(&addr_address, AT_IPv6, 16, addr->addr.ip6_addr);
+      addr_str = ep_address_to_str(&addr_address);
       break;
 
     default:
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index e218f45183..35509810d0 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -273,14 +273,11 @@ update_analyse_dlg(struct sctp_analyse *u_data)
 
 			store = (address *)(list->data);
 			if (store->type != AT_NONE) {
-				if (store->type == AT_IPv4)
+				if ((store->type == AT_IPv4) || (store->type == AT_IPv6))
 				{
-					g_snprintf(field[0], 30, "%s", ep_address_to_str(store));
-				}
-				else if (store->type == AT_IPv6)
-				{
-					g_snprintf(field[0], 40, "%s", ip6_to_str((const struct e_in6_addr *)(store->data)));
+					g_snprintf(field[0], 40, "%s", ep_address_to_str(store));
 				}
+
 				list_store = GTK_LIST_STORE(
 					gtk_tree_view_get_model(GTK_TREE_VIEW(u_data->analyse_nb->page2->clist))); /* Get store */
 
@@ -355,14 +352,11 @@ update_analyse_dlg(struct sctp_analyse *u_data)
 
 			store = (address *)(list->data);
 			if (store->type != AT_NONE) {
-				if (store->type == AT_IPv4)
+				if ((store->type == AT_IPv4) || (store->type == AT_IPv6))
 				{
-					g_snprintf(field[0], 30, "%s", ep_address_to_str(store));
-				}
-				else if (store->type == AT_IPv6)
-				{
-					g_snprintf(field[0], 40, "%s", ip6_to_str((const struct e_in6_addr *)(store->data)));
+					g_snprintf(field[0], 40, "%s", ep_address_to_str(store));
 				}
+
 				list_store = GTK_LIST_STORE(
 					gtk_tree_view_get_model(GTK_TREE_VIEW(u_data->analyse_nb->page3->clist))); /* Get store */
 
diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c
index fb276b7440..57aa38f4c9 100644
--- a/ui/gtk/sctp_chunk_stat_dlg.c
+++ b/ui/gtk/sctp_chunk_stat_dlg.c
@@ -491,10 +491,8 @@ add_to_clist(sctp_addr_chunk* sac)
 
     list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW (clist))); /* Get store */
 
-    if (sac->addr->type == AT_IPv4) {
+    if ((sac->addr->type == AT_IPv4) || (sac->addr->type == AT_IPv6)) {
         g_snprintf(field[0], MAX_ADDRESS_LEN, "%s", ep_address_to_str(sac->addr));
-    } else if (sac->addr->type == AT_IPv6) {
-        g_snprintf(field[0], MAX_ADDRESS_LEN, "%s", ip6_to_str((const struct e_in6_addr *)(sac->addr->data)));
     } else {
         g_snprintf(field[0], MAX_ADDRESS_LEN, "%s", "NONE");
     }
diff --git a/ui/iface_lists.c b/ui/iface_lists.c
index e9ad2c28e5..8fed6eddbd 100644
--- a/ui/iface_lists.c
+++ b/ui/iface_lists.c
@@ -201,7 +201,8 @@ scan_local_interfaces(void (*update_cb)(void))
                         break;
                     case IF_AT_IPv6:
                         memcpy(temp_addr->addr.ip6_addr, addr->addr.ip6_addr, sizeof(addr->addr));
-                        g_string_append(ip_str,  ip6_guint8_to_str(addr->addr.ip6_addr));
+                        SET_ADDRESS(&addr_str, AT_IPv6, 16, addr->addr.ip6_addr);
+                        g_string_append(ip_str, ep_address_to_str(&addr_str));
                         break;
                     default:
                         /* In case we add non-IP addresses */
diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
index 382b3c9dca..a660e936ad 100644
--- a/ui/qt/manage_interfaces_dialog.cpp
+++ b/ui/qt/manage_interfaces_dialog.cpp
@@ -559,7 +559,8 @@ void ManageInterfacesDialog::addRemoteInterfaces(GList* rlist, remote_options *r
                 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));
+                SET_ADDRESS(&addr_str, AT_IPv6, 16, addr->addr.ip6_addr);
+                g_string_append(ip_str, ep_address_to_str(&addr_str));
                 break;
             default:
                 /* In case we add non-IP addresses */
diff --git a/ui/qt/sctp_assoc_analyse_dialog.cpp b/ui/qt/sctp_assoc_analyse_dialog.cpp
index 538980cdac..827af28b21 100644
--- a/ui/qt/sctp_assoc_analyse_dialog.cpp
+++ b/ui/qt/sctp_assoc_analyse_dialog.cpp
@@ -130,10 +130,8 @@ void SCTPAssocAnalyseDialog::fillTabs()
 
             store = (address *)(list->data);
             if (store->type != AT_NONE) {
-                if (store->type == AT_IPv4) {
+                if ((store->type == AT_IPv4) || (store->type == AT_IPv6)) {
                     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))));
                 }
             }
             list = g_list_next(list);
@@ -184,10 +182,8 @@ void SCTPAssocAnalyseDialog::fillTabs()
 
             store = (address *)(list->data);
             if (store->type != AT_NONE) {
-                if (store->type == AT_IPv4) {
+                if ((store->type == AT_IPv4) || (store->type == AT_IPv6)) {
                     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))));
                 }
             }
             list = g_list_next(list);