Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.

Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 19 insertions, 10 deletions

diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index 1b89963915..e218f45183 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -275,7 +275,7 @@ update_analyse_dlg(struct sctp_analyse *u_data)
 			if (store->type != AT_NONE) {
 				if (store->type == AT_IPv4)
 				{
-					g_snprintf(field[0], 30, "%s", ip_to_str((const guint8 *)(store->data)));
+					g_snprintf(field[0], 30, "%s", ep_address_to_str(store));
 				}
 				else if (store->type == AT_IPv6)
 				{
@@ -357,7 +357,7 @@ update_analyse_dlg(struct sctp_analyse *u_data)
 			if (store->type != AT_NONE) {
 				if (store->type == AT_IPv4)
 				{
-					g_snprintf(field[0], 30, "%s", ip_to_str((const guint8 *)(store->data)));
+					g_snprintf(field[0], 30, "%s", ep_address_to_str(store));
 				}
 				else if (store->type == AT_IPv6)
 				{
@@ -462,69 +462,78 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data)
 		GString *gstring;
 		struct sockaddr_in *infosrc;
 		struct sockaddr_in *infodst;
+		address addr;
 
 		srclist = g_list_first(selected_stream->addr1);
 		infosrc = (struct sockaddr_in *)(srclist->data);
+		SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 		gstring = g_string_new(g_strdup_printf(
 					       "((sctp.srcport==%u && sctp.dstport==%u && (ip.src==%s",
 					       selected_stream->port1,
 					       selected_stream->port2,
-					       ip_to_str((const guint8 *)&(infosrc->sin_addr.s_addr))));
+					       ep_address_to_str(&addr)));
 		srclist = g_list_next(srclist);
 
 		while (srclist)
 		{
 			infosrc = (struct sockaddr_in *)(srclist->data);
+			SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 			str = g_strdup_printf("|| ip.src==%s",
-					      ip_to_str((const guint8 *)&(infosrc->sin_addr.s_addr)));
+					      ep_address_to_str(&addr));
 			g_string_append(gstring, str);
 			srclist = g_list_next(srclist);
 		}
 
 		dstlist = g_list_first(selected_stream->addr2);
 		infodst = (struct sockaddr_in *)(dstlist->data);
+		SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 		str = g_strdup_printf(") && (ip.dst==%s",
-				      ip_to_str((const guint8 *)&(infodst->sin_addr.s_addr)));
+				      ep_address_to_str(&addr));
 		g_string_append(gstring, str);
 		dstlist = g_list_next(dstlist);
 		while (dstlist)
 		{
 			infodst = (struct sockaddr_in *)(dstlist->data);
+			SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 			str = g_strdup_printf("|| ip.dst==%s",
-					      ip_to_str((const guint8 *)&(infodst->sin_addr.s_addr)));
+					      ep_address_to_str(&addr));
 			g_string_append(gstring, str);
 			dstlist = g_list_next(dstlist);
 		}
 
 		srclist = g_list_first(selected_stream->addr1);
 		infosrc = (struct sockaddr_in *)(srclist->data);
+		SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 		str = g_strdup_printf(")) || (sctp.dstport==%u && sctp.srcport==%u && (ip.dst==%s",
 				      selected_stream->port1,
 				      selected_stream->port2,
-				      ip_to_str((const guint8 *)&(infosrc->sin_addr.s_addr)));
+				      ep_address_to_str(&addr));
 		g_string_append(gstring, str);
 		srclist = g_list_next(srclist);
 
 		while (srclist)
 		{
 			infosrc = (struct sockaddr_in *)(srclist->data);
+			SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 			str = g_strdup_printf("|| ip.dst==%s",
-					      ip_to_str((const guint8 *)&(infosrc->sin_addr.s_addr)));
+					      ep_address_to_str(&addr));
 			g_string_append(gstring, str);
 			srclist = g_list_next(srclist);
 		}
 
 		dstlist = g_list_first(selected_stream->addr2);
 		infodst = (struct sockaddr_in *)(dstlist->data);
+		SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 		str = g_strdup_printf(") && (ip.src==%s",
-				      ip_to_str((const guint8 *)&(infodst->sin_addr.s_addr)));
+				      ep_address_to_str(&addr));
 		g_string_append(gstring, str);
 		dstlist = g_list_next(dstlist);
 		while (dstlist)
 		{
 			infodst = (struct sockaddr_in *)(dstlist->data);
+			SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 			str = g_strdup_printf("|| ip.src==%s",
-					      ip_to_str((const guint8 *)&(infodst->sin_addr.s_addr)));
+					      ep_address_to_str(&addr));
 			g_string_append(gstring, str);
 			dstlist = g_list_next(dstlist);
 		}