diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-19 12:06:34 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-19 19:07:06 +0000 |
| commit | c8f7e16b57ed02dd5b4ccba7ec16ac37ae37beb6 (patch) | |
| tree | b9f7a5e0451550684ebbf089fefe1b685bbe68e4 /ui/gtk/iax2_analysis.c | |
| parent | c03f13bda8be7db381eb52a090af5871706dfb20 (diff) | |
| download | wireshark-c8f7e16b57ed02dd5b4ccba7ec16ac37ae37beb6.tar.gz | |
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>
Diffstat (limited to 'ui/gtk/iax2_analysis.c')
| -rw-r--r-- | ui/gtk/iax2_analysis.c | 24 |
1 files changed, 12 insertions, 12 deletions
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 ", |