Some routine name changes.

"get_addr_name()" -> "ep_address_to_display()", to 1) indicate that it
returns a string with ephemeral scope and 2) indicate that it maps an
address to a "displayable" form - a name if possible, an address string
if not.

"se_get_addr_name()" -> "get_addr_name()", to indicate that its strings
have the same scope as "get_ether_name()", "get_hostname()", and
"get_hostname6()".

Change-Id: If2ab776395c7a4a163fef031d92b7757b5d23838
Reviewed-on: https://code.wireshark.org/review/1216
Reviewed-by: Guy Harris <guy@alum.mit.edu>

21 files changed, 70 insertions, 77 deletions

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index bdc7c9650f..5a4673b320 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -2988,7 +2988,7 @@ get_sctp_port(guint port)
 } /* get_sctp_port */
 
 const gchar *
-get_addr_name(const address *addr)
+ep_address_to_display(const address *addr)
 {
     const gchar *result;
 
@@ -3008,15 +3008,8 @@ get_addr_name(const address *addr)
     return ep_address_to_str(addr);
 }
 
-/*
- * XXX - we should rename get_addr_name() to ep_addr_name(), to indicate
- * that the scope of the string it returns may be as short-lived as
- * an ep_allocated string (although it may be longer-lived), and
- * rename this to get_addr_name(), as its strings have the same scope
- * as the get_XXX_name() routines it calls.
- */
 const gchar *
-se_get_addr_name(const address *addr)
+get_addr_name(const address *addr)
 {
     guint32 ip4_addr;
     struct e_in6_addr ip6_addr;
@@ -3049,7 +3042,7 @@ se_get_addr_name(const address *addr)
 void
 get_addr_name_buf(const address *addr, gchar *buf, gsize size)
 {
-    const gchar *result = get_addr_name(addr);
+    const gchar *result = ep_address_to_display(addr);
 
     g_strlcpy(buf, result, size);
 } /* get_addr_name_buf */
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index cd2979bc46..ecd94c61a2 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -132,7 +132,7 @@ extern gchar *get_dccp_port(guint port);
  */
 WS_DLL_PUBLIC gchar *get_sctp_port(guint port);
 
-/* get_addr_name takes as input an "address", as defined in address.h */
+/* ep_address_to_display takes as input an "address", as defined in address.h */
 /* it returns a string that contains: */
 /*  - if the address is of a type that can be translated into a name, and the user */
 /*    has activated name resolution, the translated name */
@@ -142,16 +142,16 @@ WS_DLL_PUBLIC gchar *get_sctp_port(guint port);
 /*    address 10.10.10.10 */
 
 WS_DLL_PUBLIC
-const gchar *get_addr_name(const address *addr);
-const gchar *se_get_addr_name(const address *addr);
+const gchar *ep_address_to_display(const address *addr);
 
-/* get_addr_name_buf solves an address in the same way as get_addr_name above */
+/* get_addr_name_buf solves an address in the same way as ep_address_to_display above */
 /* The difference is that get_addr_name_buf takes as input a buffer, into which it puts */
 /* the result which is always NUL ('\0') terminated. The buffer should be large enough to */
 /* contain size characters including the terminator */
 
 void get_addr_name_buf(const address *addr, gchar *buf, gsize size);
 
+const gchar *get_addr_name(const address *addr);
 
 /*
  * Asynchronous host name lookup initialization, processing, and cleanup
diff --git a/epan/column-utils.c b/epan/column-utils.c
index 0bf6883160..7ccc8846b7 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -1597,7 +1597,7 @@ col_set_addr(packet_info *pinfo, const int col, const address *addr, const gbool
     return;
   }
 
-  if (res && (name = se_get_addr_name(addr)) != NULL)
+  if (res && (name = get_addr_name(addr)) != NULL)
     pinfo->cinfo->col_data[col] = name;
   else {
     pinfo->cinfo->col_data[col] = pinfo->cinfo->col_buf[col];
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 235461c767..c797bf31e1 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -1820,7 +1820,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                  offset + (int)offsetof(struct ip6_hdr, ip6_src),
                                  16, (guint8 *)&ipv6.ip6_src);
         PROTO_ITEM_SET_HIDDEN(ti);
-        name = get_addr_name(&pinfo->src);
+        name = ep_address_to_display(&pinfo->src);
         if (ipv6_summary_in_tree) {
             proto_item_append_text(ipv6_item, ", Src: %s (%s)", name, ip6_to_str(&ipv6.ip6_src));
         }
@@ -1907,7 +1907,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                  offset + (int)offsetof(struct ip6_hdr, ip6_dst),
                                  16, (guint8 *)&ipv6.ip6_dst);
         PROTO_ITEM_SET_HIDDEN(ti);
-        name = get_addr_name(&pinfo->dst);
+        name = ep_address_to_display(&pinfo->dst);
         if (ipv6_summary_in_tree) {
             proto_item_append_text(ipv6_item, ", Dst: %s (%s)", name, ip6_to_str(&ipv6.ip6_dst));
         }
diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c
index f3a8a04599..b508010ea8 100644
--- a/epan/wslua/wslua_pinfo.c
+++ b/epan/wslua/wslua_pinfo.c
@@ -378,7 +378,7 @@ WSLUA_METHODS Address_methods[] = {
 WSLUA_METAMETHOD Address__tostring(lua_State* L) {
     Address addr = checkAddress(L,1);
 
-    lua_pushstring(L,get_addr_name(addr));
+    lua_pushstring(L,ep_address_to_display(addr));
 
     WSLUA_RETURN(1); /* The string representing the address. */
 }
diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c
index 28befa494c..3456bacc86 100644
--- a/ui/cli/tap-rtp.c
+++ b/ui/cli/tap-rtp.c
@@ -107,9 +107,9 @@ rtp_streams_stat_draw(void *arg _U_)
         }
 
         printf("%15s %5u %15s %5u 0x%08X %16s %5u %5d (%.1f%%) %15.2f %15.2f %15.2f %s\n",
-            get_addr_name(&(strinfo->src_addr)),
+            ep_address_to_display(&(strinfo->src_addr)),
 	    strinfo->src_port,
-	    get_addr_name(&(strinfo->dest_addr)),
+	    ep_address_to_display(&(strinfo->dest_addr)),
 	    strinfo->dest_port,
 	    strinfo->ssrc,
 	    payload_type,
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index a3b499e620..b29d47c435 100644
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -1970,7 +1970,7 @@ get_ct_table_address(conversations_table *ct, conv_t *conv, const char **entries
     if(!ct->resolve_names)
         entries[0] = ep_address_to_str(&conv->src_address);
     else {
-        entries[0] = (const char *)get_addr_name(&conv->src_address);
+        entries[0] = (const char *)ep_address_to_display(&conv->src_address);
     }
 
     pt = conv->port_type;
@@ -1993,7 +1993,7 @@ get_ct_table_address(conversations_table *ct, conv_t *conv, const char **entries
     if(!ct->resolve_names)
         entries[2]=ep_address_to_str(&conv->dst_address);
     else {
-        entries[2]=(const char *)get_addr_name(&conv->dst_address);
+        entries[2]=(const char *)ep_address_to_display(&conv->dst_address);
     }
 
     switch(pt) {
diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c
index 0a0184936a..609cd3c537 100644
--- a/ui/gtk/graph_analysis.c
+++ b/ui/gtk/graph_analysis.c
@@ -617,7 +617,7 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data)
 	for (i=0; i<user_data->graph_info->num_nodes; i++) {
 		/* print the node identifiers */
 		/* XXX we assign 5 pixels per character in the node identity */
-		g_strlcpy(label_string, get_addr_name(&(user_data->graph_info->nodes[i])), NODE_WIDTH/5);
+		g_strlcpy(label_string, ep_address_to_display(&(user_data->graph_info->nodes[i])), NODE_WIDTH/5);
 		pango_layout_set_text(layout, label_string, -1);
 		pango_layout_get_pixel_size(layout, &label_width, &label_height);
 #if GTK_CHECK_VERSION(2,22,0)
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index d5f0645d2c..0ea972f34a 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -625,7 +625,7 @@ get_hostlist_table_address(hostlist_table *hl, hostlist_talker_t *host, const ch
     if (!hl->resolve_names)
         entries[0] = ep_address_to_str(&host->myaddress);
     else
-        entries[0] = (char *)get_addr_name(&host->myaddress);
+        entries[0] = (char *)ep_address_to_display(&host->myaddress);
 
     pt = host->port_type;
     if(!hl->resolve_names) pt = PT_NONE;
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 0119715bc8..6f7fe77c73 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -830,13 +830,13 @@ dialog_graph_set_title(user_data_t* user_data)
 		return;
 	}
 	title = g_strdup_printf("IAX2 Graph Analysis Forward: %s:%u to %s:%u   Reverse: %s:%u to %s:%u",
-				get_addr_name(&(user_data->ip_src_fwd)),
+				ep_address_to_display(&(user_data->ip_src_fwd)),
 				user_data->port_src_fwd,
-				get_addr_name(&(user_data->ip_dst_fwd)),
+				ep_address_to_display(&(user_data->ip_dst_fwd)),
 				user_data->port_dst_fwd,
-				get_addr_name(&(user_data->ip_src_rev)),
+				ep_address_to_display(&(user_data->ip_src_rev)),
 				user_data->port_src_rev,
-				get_addr_name(&(user_data->ip_dst_rev)),
+				ep_address_to_display(&(user_data->ip_dst_rev)),
 				user_data->port_dst_rev);
 
 	gtk_window_set_title(GTK_WINDOW(user_data->dlg.dialog_graph.window), title);
@@ -872,9 +872,9 @@ dialog_graph_reset(user_data_t* user_data)
 				   sizeof (user_data->dlg.dialog_graph.graph[0].title),
 				   "%s: %s:%u to %s:%u",
 			graph_descr[i],
-			get_addr_name(&(user_data->ip_src_fwd)),
+			ep_address_to_display(&(user_data->ip_src_fwd)),
 			user_data->port_src_fwd,
-			get_addr_name(&(user_data->ip_dst_fwd)),
+			ep_address_to_display(&(user_data->ip_dst_fwd)),
 			user_data->port_dst_fwd);
 		/* it is reverse */
 		} else {
@@ -882,9 +882,9 @@ dialog_graph_reset(user_data_t* user_data)
 				   sizeof(user_data->dlg.dialog_graph.graph[0].title),
 				   "%s: %s:%u to %s:%u",
 			graph_descr[i],
-			get_addr_name(&(user_data->ip_src_rev)),
+			ep_address_to_display(&(user_data->ip_src_rev)),
 			user_data->port_src_rev,
-			get_addr_name(&(user_data->ip_dst_rev)),
+			ep_address_to_display(&(user_data->ip_dst_rev)),
 			user_data->port_dst_rev);
 		}
 	}
@@ -3333,16 +3333,16 @@ create_iax2_dialog(user_data_t* user_data)
 	gtk_widget_show(main_vb);
 
 	/* Notebooks... */
-	g_strlcpy(str_ip_src, get_addr_name(&(user_data->ip_src_fwd)), 16);
-	g_strlcpy(str_ip_dst, get_addr_name(&(user_data->ip_dst_fwd)), 16);
+	g_strlcpy(str_ip_src, ep_address_to_display(&(user_data->ip_src_fwd)), 16);
+	g_strlcpy(str_ip_dst, ep_address_to_display(&(user_data->ip_dst_fwd)), 16);
 
 	g_snprintf(label_forward, sizeof(label_forward),
 		"Analysing stream from  %s port %u  to  %s port %u  ",
 		str_ip_src, user_data->port_src_fwd, str_ip_dst, user_data->port_dst_fwd);
 
 
-	g_strlcpy(str_ip_src, get_addr_name(&(user_data->ip_src_rev)), 16);
-	g_strlcpy(str_ip_dst, get_addr_name(&(user_data->ip_dst_rev)), 16);
+	g_strlcpy(str_ip_src, ep_address_to_display(&(user_data->ip_src_rev)), 16);
+	g_strlcpy(str_ip_dst, ep_address_to_display(&(user_data->ip_dst_rev)), 16);
 
 	g_snprintf(label_reverse, sizeof(label_reverse),
 		"Analysing stream from  %s port %u  to  %s port %u  ",
diff --git a/ui/gtk/mcast_stream.c b/ui/gtk/mcast_stream.c
index a766ef4467..2edafcae89 100644
--- a/ui/gtk/mcast_stream.c
+++ b/ui/gtk/mcast_stream.c
@@ -193,8 +193,8 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 
 	/* not in the list? then create a new entry */
 	if (!strinfo) {
-		/*printf("nov sip %s sp %d dip %s dp %d\n", g_strdup(get_addr_name(&(pinfo->src))),
-			pinfo->srcport, g_strdup(get_addr_name(&(pinfo->dst))), pinfo->destport);*/
+		/*printf("nov sip %s sp %d dip %s dp %d\n", g_strdup(ep_address_to_display(&(pinfo->src))),
+			pinfo->srcport, g_strdup(ep_address_to_display(&(pinfo->dst))), pinfo->destport);*/
 		tmp_strinfo.npackets = 0;
 		tmp_strinfo.apackets = 0;
 		tmp_strinfo.first_frame_num = pinfo->fd->num;
diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c
index 3802ad5d17..dcd6928724 100644
--- a/ui/gtk/mcast_stream_dlg.c
+++ b/ui/gtk/mcast_stream_dlg.c
@@ -179,9 +179,9 @@ mcaststream_on_select_row(GtkTreeSelection *selection, gpointer data _U_)
 	{
 		gtk_tree_model_get(GTK_TREE_MODEL(list_store), &list_iter, MC_COL_DATA, &selected_stream_fwd, -1);
 		g_snprintf(label_text, sizeof(label_text), "Selected: %s:%u -> %s:%u",
-			get_addr_name(&(selected_stream_fwd->src_addr)),
+			ep_address_to_display(&(selected_stream_fwd->src_addr)),
 			selected_stream_fwd->src_port,
-			get_addr_name(&(selected_stream_fwd->dest_addr)),
+			ep_address_to_display(&(selected_stream_fwd->dest_addr)),
 			selected_stream_fwd->dest_port
 		);
 		gtk_label_set_text(GTK_LABEL(label_fwd), label_text);
@@ -373,9 +373,9 @@ add_to_list_store(mcast_stream_info_t* strinfo)
 	/* switch to "C" locale to avoid problems with localized decimal separators
 		in g_snprintf("%f") functions */
 	setlocale(LC_NUMERIC, "C");
-	data[0] = g_strdup(get_addr_name(&(strinfo->src_addr)));
+	data[0] = g_strdup(ep_address_to_display(&(strinfo->src_addr)));
 	data[1] = g_strdup_printf("%u", strinfo->src_port);
-	data[2] = g_strdup(get_addr_name(&(strinfo->dest_addr)));
+	data[2] = g_strdup(ep_address_to_display(&(strinfo->dest_addr)));
 	data[3] = g_strdup_printf("%u", strinfo->dest_port);
 	data[4] = g_strdup_printf("%u", strinfo->npackets);
 	data[5] = g_strdup_printf("%u /s", strinfo->apackets);
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index d9f3390aa2..0305b0a26a 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -873,13 +873,13 @@ dialog_graph_set_title(user_data_t* user_data)
 	}
 
 	title = g_strdup_printf("RTP Graph Analysis Forward: %s:%u to %s:%u   Reverse: %s:%u to %s:%u",
-			get_addr_name(&(user_data->src_fwd)),
+			ep_address_to_display(&(user_data->src_fwd)),
 			user_data->port_src_fwd,
-			get_addr_name(&(user_data->dst_fwd)),
+			ep_address_to_display(&(user_data->dst_fwd)),
 			user_data->port_dst_fwd,
-			get_addr_name(&(user_data->src_rev)),
+			ep_address_to_display(&(user_data->src_rev)),
 			user_data->port_src_rev,
-			get_addr_name(&(user_data->dst_rev)),
+			ep_address_to_display(&(user_data->dst_rev)),
 			user_data->port_dst_rev);
 
 	gtk_window_set_title(GTK_WINDOW(user_data->dlg.dialog_graph.window), title);
@@ -915,9 +915,9 @@ dialog_graph_reset(user_data_t* user_data)
 				   sizeof(user_data->dlg.dialog_graph.graph[0].title),
 				   "%s: %s:%u to %s:%u (SSRC=0x%X)",
 				   graph_descr[i],
-				   get_addr_name(&(user_data->src_fwd)),
+				   ep_address_to_display(&(user_data->src_fwd)),
 				   user_data->port_src_fwd,
-				   get_addr_name(&(user_data->dst_fwd)),
+				   ep_address_to_display(&(user_data->dst_fwd)),
 				   user_data->port_dst_fwd,
 				   user_data->ssrc_fwd);
 		/* it is reverse */
@@ -926,9 +926,9 @@ dialog_graph_reset(user_data_t* user_data)
 				   sizeof(user_data->dlg.dialog_graph.graph[0].title),
 				   "%s: %s:%u to %s:%u (SSRC=0x%X)",
 				   graph_descr[i],
-				   get_addr_name(&(user_data->src_rev)),
+				   ep_address_to_display(&(user_data->src_rev)),
 				   user_data->port_src_rev,
-				   get_addr_name(&(user_data->dst_rev)),
+				   ep_address_to_display(&(user_data->dst_rev)),
 				   user_data->port_dst_rev,
 				   user_data->ssrc_rev);
 		}
@@ -3548,8 +3548,8 @@ create_rtp_dialog(user_data_t* user_data)
 	gtk_widget_show(main_vb);
 
 	/* Notebooks... */
-	g_strlcpy(str_src, get_addr_name(&(user_data->src_fwd)), sizeof(str_src));
-	g_strlcpy(str_dst, get_addr_name(&(user_data->dst_fwd)), sizeof(str_dst));
+	g_strlcpy(str_src, ep_address_to_display(&(user_data->src_fwd)), sizeof(str_src));
+	g_strlcpy(str_dst, ep_address_to_display(&(user_data->dst_fwd)), sizeof(str_dst));
 
 	g_snprintf(label_forward, sizeof(label_forward),
 		"Analysing stream from  %s port %u  to  %s port %u   SSRC = 0x%X",
@@ -3561,8 +3561,8 @@ create_rtp_dialog(user_data_t* user_data)
 		str_src, user_data->port_src_fwd, str_dst, user_data->port_dst_fwd, user_data->ssrc_fwd);
 
 
-	g_strlcpy(str_src, get_addr_name(&(user_data->src_rev)), sizeof(str_src));
-	g_strlcpy(str_dst, get_addr_name(&(user_data->dst_rev)), sizeof(str_dst));
+	g_strlcpy(str_src, ep_address_to_display(&(user_data->src_rev)), sizeof(str_src));
+	g_strlcpy(str_dst, ep_address_to_display(&(user_data->dst_rev)), sizeof(str_dst));
 
 	g_snprintf(label_reverse, sizeof(label_reverse),
 		"Analysing stream from  %s port %u  to  %s port %u   SSRC = 0x%X \n"
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c
index 060307f046..335880b60a 100644
--- a/ui/gtk/rtp_player.c
+++ b/ui/gtk/rtp_player.c
@@ -369,8 +369,8 @@ add_rtp_packet(const struct _rtp_info *rtp_info, packet_info *pinfo)
 	 * uses: src_ip:src_port dst_ip:dst_port ssrc
 	 */
 	key_str = g_string_new("");
-	g_string_printf(key_str, "%s:%d %s:%d %d", get_addr_name(&(pinfo->src)),
-		pinfo->srcport, get_addr_name(&(pinfo->dst)),
+	g_string_printf(key_str, "%s:%d %s:%d %d", ep_address_to_display(&(pinfo->src)),
+		pinfo->srcport, ep_address_to_display(&(pinfo->dst)),
 		pinfo->destport, rtp_info->info_sync_src );
 
 	/* lookup for this RTP packet in the stream hash table */
@@ -601,8 +601,8 @@ decode_rtp_stream(rtp_stream_info_t *rsi, gpointer ptr)
 	 * uses: src_ip:src_port dst_ip:dst_port call_num
 	 */
 	key_str = g_string_new("");
-	g_string_printf(key_str, "%s:%d %s:%d %d %u", get_addr_name(&(rsi->src_addr)),
-		rsi->src_port, get_addr_name(&(rsi->dest_addr)),
+	g_string_printf(key_str, "%s:%d %s:%d %d %u", ep_address_to_display(&(rsi->src_addr)),
+		rsi->src_port, ep_address_to_display(&(rsi->dest_addr)),
 		rsi->dest_port, rsi->call_num, info->current_channel);
 
 	/* create the rtp_channels_hash table if it doesn't exist */
@@ -1789,15 +1789,15 @@ add_channel_to_window(gchar *key _U_ , rtp_channel_info_t *rci, guint *counter _
 	label = g_string_new("");
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb_use_rtp_timestamp))) {
 		g_string_printf(label, "From %s:%d to %s:%d   Duration:%.2f   Out of Seq: %d(%.1f%%)   Wrong Timestamp: %d(%.1f%%)",
-		get_addr_name(&(rci->first_stream->src_addr)), rci->first_stream->src_port,
-		get_addr_name(&(rci->first_stream->dest_addr)), rci->first_stream->dest_port,
+		ep_address_to_display(&(rci->first_stream->src_addr)), rci->first_stream->src_port,
+		ep_address_to_display(&(rci->first_stream->dest_addr)), rci->first_stream->dest_port,
 		(double)rci->samples->len/sample_rate,
 		rci->out_of_seq, (double)rci->out_of_seq * 100 / (double)rci->num_packets,
 		rci->wrong_timestamp, (double)rci->wrong_timestamp * 100 / (double)rci->num_packets);
 	} else {
 		g_string_printf(label, "From %s:%d to %s:%d   Duration:%.2f   Drop by Jitter Buff:%d(%.1f%%)   Out of Seq: %d(%.1f%%)   Wrong Timestamp: %d(%.1f%%)",
-		get_addr_name(&(rci->first_stream->src_addr)), rci->first_stream->src_port,
-		get_addr_name(&(rci->first_stream->dest_addr)), rci->first_stream->dest_port,
+		ep_address_to_display(&(rci->first_stream->src_addr)), rci->first_stream->src_port,
+		ep_address_to_display(&(rci->first_stream->dest_addr)), rci->first_stream->dest_port,
 		(double)rci->samples->len/sample_rate,
 		rci->drop_by_jitter_buff, (double)rci->drop_by_jitter_buff * 100 / (double)rci->num_packets,
 		rci->out_of_seq, (double)rci->out_of_seq * 100 / (double)rci->num_packets,
diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c
index 08053b12ba..17ae0703a5 100644
--- a/ui/gtk/rtp_stream_dlg.c
+++ b/ui/gtk/rtp_stream_dlg.c
@@ -635,9 +635,9 @@ rtpstream_view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
 
 	if (selected_stream_fwd) {
 		g_snprintf(label_text, sizeof(label_text), "Forward: %s:%u -> %s:%u, SSRC=0x%X",
-			get_addr_name(&(selected_stream_fwd->src_addr)),
+			ep_address_to_display(&(selected_stream_fwd->src_addr)),
 			selected_stream_fwd->src_port,
-			get_addr_name(&(selected_stream_fwd->dest_addr)),
+			ep_address_to_display(&(selected_stream_fwd->dest_addr)),
 			selected_stream_fwd->dest_port,
 			selected_stream_fwd->ssrc
 		);
@@ -651,9 +651,9 @@ rtpstream_view_selection_func(GtkTreeSelection *selection, GtkTreeModel *model,
 
 	if (selected_stream_rev) {
 		g_snprintf(label_text, sizeof(label_text), "Reverse: %s:%u -> %s:%u, SSRC=0x%X",
-			get_addr_name(&(selected_stream_rev->src_addr)),
+			ep_address_to_display(&(selected_stream_rev->src_addr)),
 			selected_stream_rev->src_port,
-			get_addr_name(&(selected_stream_rev->dest_addr)),
+			ep_address_to_display(&(selected_stream_rev->dest_addr)),
 			selected_stream_rev->dest_port,
 			selected_stream_rev->ssrc
 		);
@@ -686,9 +686,9 @@ add_to_list_store(rtp_stream_info_t* strinfo)
 		in g_snprintf("%f") functions */
 	setlocale(LC_NUMERIC, "C");
 
-	data[0] = g_strdup(get_addr_name(&(strinfo->src_addr)));
+	data[0] = g_strdup(ep_address_to_display(&(strinfo->src_addr)));
 	data[1] = NULL;
-	data[2] = g_strdup(get_addr_name(&(strinfo->dest_addr)));
+	data[2] = g_strdup(ep_address_to_display(&(strinfo->dest_addr)));
 	data[3] = NULL;
 	data[4] = g_strdup_printf("0x%X", strinfo->ssrc);
 	if (strinfo->info_payload_type_str != NULL) {
diff --git a/ui/gtk/voip_calls_dlg.c b/ui/gtk/voip_calls_dlg.c
index 27b650215e..14ddbbc1a7 100644
--- a/ui/gtk/voip_calls_dlg.c
+++ b/ui/gtk/voip_calls_dlg.c
@@ -437,7 +437,7 @@ add_to_list_store(voip_calls_info_t* strinfo)
 	h323_calls_info_t *h323info;
 	gboolean flag = FALSE;
 
-	g_snprintf(field[CALL_COL_INITIAL_SPEAKER], 30, "%s", get_addr_name(&(strinfo->initial_speaker)));
+	g_snprintf(field[CALL_COL_INITIAL_SPEAKER], 30, "%s", ep_address_to_display(&(strinfo->initial_speaker)));
 	g_snprintf(field[CALL_COL_FROM],            50, "%s", strinfo->from_identity);
 	g_snprintf(field[CALL_COL_TO],              50, "%s", strinfo->to_identity);
 	g_snprintf(field[CALL_COL_PROTOCOL],        15, "%s",
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
index 54f6ce28a1..7f0d4f0438 100644
--- a/ui/gtk/wlan_stat_dlg.c
+++ b/ui/gtk/wlan_stat_dlg.c
@@ -361,7 +361,7 @@ is_broadcast(const address *addr)
 {
 #if 0
     /* doesn't work if MAC resolution is disable */
-    return strcmp(get_addr_name(addr), "Broadcast") == 0;
+    return strcmp(ep_address_to_display(addr), "Broadcast") == 0;
 #endif
     return ADDRESSES_EQUAL(&broadcast, addr);
 }
@@ -502,7 +502,7 @@ wlanstat_draw_details(wlanstat_t *hs, wlan_ep_t *wlan_ep, gboolean clear)
         }
 
         if (hs->resolve_names) {
-            g_strlcpy (addr, get_addr_name(&tmp->addr), sizeof(addr));
+            g_strlcpy (addr, ep_address_to_display(&tmp->addr), sizeof(addr));
         } else {
             g_strlcpy (addr, ep_address_to_str(&tmp->addr), sizeof(addr));
         }
@@ -569,7 +569,7 @@ wlanstat_draw(void *phs)
         f = (float)(((float)tmp->number_of_packets * 100.0) / hs->number_of_packets);
 
         if (hs->resolve_names) {
-            g_strlcpy (bssid, get_addr_name(&tmp->bssid), sizeof(bssid));
+            g_strlcpy (bssid, ep_address_to_display(&tmp->bssid), sizeof(bssid));
         } else {
             g_strlcpy (bssid, ep_address_to_str(&tmp->bssid), sizeof(bssid));
         }
diff --git a/ui/qt/sequence_diagram.cpp b/ui/qt/sequence_diagram.cpp
index d27106e840..3caef3572b 100644
--- a/ui/qt/sequence_diagram.cpp
+++ b/ui/qt/sequence_diagram.cpp
@@ -124,7 +124,7 @@ void SequenceDiagram::setData(seq_analysis_info_t *sainfo)
 
     for (unsigned int i = 0; i < sainfo_->num_nodes; i++) {
         val_ticks.append(i);
-        val_labels.append(get_addr_name(&(sainfo_->nodes[i])));
+        val_labels.append(ep_address_to_display(&(sainfo_->nodes[i])));
         if (i % 2 == 0) {
             val_labels.last().append("\n");
         }
diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp
index fdceba4a36..743fbb376b 100644
--- a/ui/qt/sequence_dialog.cpp
+++ b/ui/qt/sequence_dialog.cpp
@@ -358,7 +358,7 @@ void SequenceDialog::fillDiagram()
     QFontMetrics vfm = QFontMetrics(sp->xAxis2->labelFont());
     node_label_w_ = 0;
     for (guint i = 0; i < seq_analysis_.num_nodes; i++) {
-        int label_w = vfm.width(get_addr_name(&(seq_analysis_.nodes[i])));
+        int label_w = vfm.width(ep_address_to_display(&(seq_analysis_.nodes[i])));
         if (node_label_w_ < label_w) {
             node_label_w_ = label_w;
         }
diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c
index b8ae922c91..b998a4fc95 100644
--- a/ui/tap-rtp-common.c
+++ b/ui/tap-rtp-common.c
@@ -131,7 +131,7 @@ void rtp_write_header(rtp_stream_info_t *strinfo, FILE *file)
 	guint16 padding;       /* 2 padding bytes */
 
 	fprintf(file, "#!rtpplay%s %s/%u\n", RTPFILE_VERSION,
-		get_addr_name(&(strinfo->dest_addr)),
+		ep_address_to_display(&(strinfo->dest_addr)),
 		strinfo->dest_port);
 
 	start_sec = g_htonl(strinfo->start_sec);
diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c
index 681fb1d4ea..459637ef5c 100644
--- a/ui/tap-sequence-analysis.c
+++ b/ui/tap-sequence-analysis.c
@@ -469,7 +469,7 @@ sequence_analysis_dump_to_file(const char *pathname, seq_analysis_info_t *sainfo
     for (i=0; i<display_nodes; i+=2) {
         /* print the node identifiers */
         g_string_printf(label_string, "| %s",
-            get_addr_name(&(sainfo->nodes[i+first_node])));
+            ep_address_to_display(&(sainfo->nodes[i+first_node])));
         enlarge_string(label_string, NODE_CHARS_WIDTH*2, ' ');
         fprintf(of, "%s", label_string->str);
         g_string_printf(label_string, "| ");
@@ -486,7 +486,7 @@ sequence_analysis_dump_to_file(const char *pathname, seq_analysis_info_t *sainfo
     for (i=1; i<display_nodes; i+=2) {
         /* print the node identifiers */
         g_string_printf(label_string, "| %s",
-            get_addr_name(&(sainfo->nodes[i+first_node])));
+            ep_address_to_display(&(sainfo->nodes[i+first_node])));
         if (label_string->len < NODE_CHARS_WIDTH)
         {
             enlarge_string(label_string, NODE_CHARS_WIDTH, ' ');