Rename address_to_str() to ep_address_to_str() because:

1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().

svn path=/trunk/; revision=29747

8 files changed, 70 insertions, 70 deletions

diff --git a/gtk/compare_stat.c b/gtk/compare_stat.c
index b47cbd51cd..5ef9340e16 100644
--- a/gtk/compare_stat.c
+++ b/gtk/compare_stat.c
@@ -354,7 +354,7 @@ call_foreach_new_order(gpointer value, gpointer arg)
 				fInfo->zebra_time=cs->zebra_time;
 				cs->zebra_time.nsecs=cs->zebra_time.nsecs++;
 			}
-			
+
 		}
 	} else {
 		if(TTL_method==FALSE){
@@ -369,9 +369,9 @@ call_foreach_new_order(gpointer value, gpointer arg)
 			} else {
 				fInfo->zebra_time.nsecs=fInfoTemp->zebra_time.nsecs+1;
 			}
-		}	
+		}
 	}
-	
+
 	/* count packets of file */
 	if(fmod(fInfo->zebra_time.nsecs, MERGED_FILES)){
 		cs->first_file_amount++;
@@ -485,12 +485,12 @@ call_foreach_print_ip_tree(gpointer value, gpointer user_data)
 	if(show_it){
 		if((fInfo->fg->count<MERGED_FILES)){
 			gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, NULL);
-			gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, IP_ID, fInfo->id, PROBLEM, "Packet lost", COUNT, fInfo->fg->count, DELTA, 0.0, -1); 
+			gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, IP_ID, fInfo->id, PROBLEM, "Packet lost", COUNT, fInfo->fg->count, DELTA, 0.0, -1);
 		}
-			
+
 		if(fInfo->fg->count > MERGED_FILES){
 			gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, NULL);
-			gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, IP_ID, fInfo->id, PROBLEM, "More than two packets", COUNT, fInfo->fg->count, DELTA, 0.0, -1); 
+			gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, IP_ID, fInfo->id, PROBLEM, "More than two packets", COUNT, fInfo->fg->count, DELTA, 0.0, -1);
 			if(fInfo->fg->cksum == WRONG_CHKSUM) {
 				gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, &cs->iter);
 				gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, IP_ID, fInfo->id, PROBLEM, "Checksum error over IP header", COUNT, fInfo->fg->count, DELTA, 0.0, -1);
@@ -506,14 +506,14 @@ call_foreach_print_ip_tree(gpointer value, gpointer user_data)
 				}
 				if((nstime_cmp(&fInfo->fg->predecessor_time, &fInfo->zebra_time)>0||nstime_cmp(&fInfo->fg->partner->fg->predecessor_time, &fInfo->fg->partner->zebra_time)>0) && (fInfo->zebra_time.nsecs!=MERGED_FILES) && ON_method){
 					gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, &cs->iter);
-					gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, IP_ID, fInfo->id, PROBLEM, "Not correct order", COUNT, fInfo->fg->count, DELTA, delta, -1); 
+					gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, IP_ID, fInfo->id, PROBLEM, "Not correct order", COUNT, fInfo->fg->count, DELTA, delta, -1);
 				}
 			} else if(((delta < (average-cs->stats.variance)) || (delta > (average+cs->stats.variance))) && (delta > 0.0) && (cs->stats.variance!=0)) {
 				gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, NULL);
 				gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, IP_ID, fInfo->id, PROBLEM, "Not arrived in time", COUNT, fInfo->fg->count, DELTA, delta, -1);
 				if((nstime_cmp(&fInfo->fg->predecessor_time, &fInfo->zebra_time)>0||nstime_cmp(&fInfo->fg->partner->fg->predecessor_time, &fInfo->fg->partner->zebra_time)>0) && fInfo->zebra_time.nsecs != MERGED_FILES && ON_method){
 					gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, &cs->iter);
-					gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, IP_ID, fInfo->id, PROBLEM, "Not correct order", COUNT, fInfo->fg->count, DELTA, delta, -1); 
+					gtk_tree_store_set(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->child, IP_ID, fInfo->id, PROBLEM, "Not correct order", COUNT, fInfo->fg->count, DELTA, delta, -1);
 				}
 			} else if((nstime_cmp(&fInfo->fg->predecessor_time, &fInfo->zebra_time)>0||nstime_cmp(&fInfo->fg->partner->fg->predecessor_time, &fInfo->fg->partner->zebra_time)>0) && fInfo->zebra_time.nsecs != MERGED_FILES && ON_method){
 				gtk_tree_store_append(GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cs->treeview))), &cs->iter, NULL);
@@ -601,12 +601,12 @@ comparestat_draw(void *arg)
 	timestamp_set_precision(TS_PREC_AUTO_NSEC);
 	/* reset ordering */
 	nstime_set_unset(&cs->current_time);
-	
+
 	/* set color filter, in Routing environment */
 	if(TTL_method&&cs->ip_ttl_list->len!=0){
 		g_string_printf(filter_str, "%s %i %s %i", "ip.ttl ==", g_array_index(cs->ip_ttl_list, guint8, 0), "|| ip.ttl ==", g_array_index(cs->ip_ttl_list, guint8, 1));
 	} else if(cs->eth_dst.len!=0&&cs->eth_src.len!=0){
-		g_string_printf(filter_str, "%s %s %s %s", "eth.dst==", address_to_str(&cs->eth_dst), "|| eth.dst==", address_to_str(&cs->eth_src));
+		g_string_printf(filter_str, "%s %s %s %s", "eth.dst==", ep_address_to_str(&cs->eth_dst), "|| eth.dst==", ep_address_to_str(&cs->eth_src));
 	}
 	color_filters_set_tmp(COLOR_N, filter_str->str, FALSE);
 #ifdef NEW_PACKET_LIST
@@ -755,7 +755,7 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_)
 	timestamp_set_precision(TS_PREC_AUTO_NSEC);
 
 	/* transient_for top_level */
-	cs->win=dlg_window_new("compare-stat");  
+	cs->win=dlg_window_new("compare-stat");
 	gtk_window_set_destroy_with_parent (GTK_WINDOW(cs->win), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(cs->win), 550, 400);
 	comparestat_set_title(cs);
@@ -763,7 +763,7 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_)
 	vbox=gtk_vbox_new(FALSE, 3);
 	gtk_container_add(GTK_CONTAINER(cs->win), vbox);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
-	
+
 	title_string = g_strdup_printf("Compare two capture files: %s", cf_get_display_name(&cfile));
 	stat_label=gtk_label_new(title_string);
 	g_free(title_string);
@@ -797,7 +797,7 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_)
 	/* call this method when row is chosen*/
 	gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(cs->treeview)),GTK_SELECTION_SINGLE);
 	g_signal_connect(gtk_tree_view_get_selection(GTK_TREE_VIEW(cs->treeview)), "changed", G_CALLBACK(new_tree_view_selection_changed), cs);
-	
+
 	/* list with scrollbar's */
 	cs->scrolled_win=gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(cs->scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -871,7 +871,7 @@ comparestat_start_button_clicked(GtkWidget *item _U_, gpointer data _U_)
 	} else {
 		report_failure("cannot open more than one compare of the same type at once");
 	}
-	
+
 	g_string_free(str, TRUE);
 }
 
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 32e1c9f657..265f6237c9 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -507,13 +507,13 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A <-> B */
         str = g_strdup_printf("%s==%s%s%s%s%s && %s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_PORT):"",
                               sport?"==":"",
                               sport?sport:"",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_PORT):"",
                               dport?"==":"",
@@ -524,13 +524,13 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A --> B */
         str = g_strdup_printf("%s==%s%s%s%s%s && %s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_PORT):"",
                               sport?"==":"",
                               sport?sport:"",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_PORT):"",
                               dport?"==":"",
@@ -541,13 +541,13 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A <-- B */
         str = g_strdup_printf("%s==%s%s%s%s%s && %s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_PORT):"",
                               sport?"==":"",
                               sport?sport:"",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_PORT):"",
                               dport?"==":"",
@@ -558,7 +558,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A <-> ANY */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_PORT):"",
                               sport?"==":"",
@@ -569,7 +569,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A --> ANY */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_PORT):"",
                               sport?"==":"",
@@ -580,7 +580,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* A <-- ANY */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
-                              address_to_str(&ct->conversations[selection].src_address),
+                              ep_address_to_str(&ct->conversations[selection].src_address),
                               sport?" && ":"",
                               sport?ct_get_filter_name(&ct->conversations[selection].src_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_PORT):"",
                               sport?"==":"",
@@ -591,7 +591,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* ANY <-> B */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_ANY_PORT):"",
                               dport?"==":"",
@@ -602,7 +602,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* ANY <-- B */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_SRC_PORT):"",
                               dport?"==":"",
@@ -613,7 +613,7 @@ ct_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callbac
         /* ANY --> B */
         str = g_strdup_printf("%s==%s%s%s%s%s",
                               ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_ADDRESS),
-                              address_to_str(&ct->conversations[selection].dst_address),
+                              ep_address_to_str(&ct->conversations[selection].dst_address),
                               dport?" && ":"",
                               dport?ct_get_filter_name(&ct->conversations[selection].dst_address, ct->conversations[selection].sat, ct->conversations[selection].port_type,  FN_DST_PORT):"",
                               dport?"==":"",
@@ -1012,7 +1012,7 @@ draw_ct_table_address(conversations_table *ct, int conversation_idx)
     rownum=gtk_clist_find_row_from_data(ct->table, (gpointer)(long)conversation_idx);
 
     if(!ct->resolve_names)
-        entry=address_to_str(&ct->conversations[conversation_idx].src_address);
+        entry=ep_address_to_str(&ct->conversations[conversation_idx].src_address);
     else {
         entry=get_addr_name(&ct->conversations[conversation_idx].src_address);
     }
@@ -1037,7 +1037,7 @@ draw_ct_table_address(conversations_table *ct, int conversation_idx)
     gtk_clist_set_text(ct->table, rownum, 1, entry);
 
     if(!ct->resolve_names)
-        entry=address_to_str(&ct->conversations[conversation_idx].dst_address);
+        entry=ep_address_to_str(&ct->conversations[conversation_idx].dst_address);
     else {
         entry=get_addr_name(&ct->conversations[conversation_idx].dst_address);
     }
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 5345424448..b1b1587f4f 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -335,7 +335,7 @@ hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint c
     str = g_strdup_printf("%s==%s%s%s%s%s",
                           hostlist_get_filter_name(&hl->hosts[selection].address,
                                                    hl->hosts[selection].sat, hl->hosts[selection].port_type,  FN_ANY_ADDRESS),
-                          address_to_str(&hl->hosts[selection].address),
+                          ep_address_to_str(&hl->hosts[selection].address),
                           sport?" && ":"",
                           sport?hostlist_get_filter_name(&hl->hosts[selection].address, hl->hosts[selection].sat, hl->hosts[selection].port_type,  FN_ANY_PORT):"",
                           sport?"==":"",
@@ -446,7 +446,7 @@ draw_hostlist_table_address(hostlist_table *hl, int hostlist_idx)
     rownum=gtk_clist_find_row_from_data(hl->table, (gpointer)(long)hostlist_idx);
 
     if (!hl->resolve_names)
-        entry=address_to_str(&hl->hosts[hostlist_idx].address);
+        entry=ep_address_to_str(&hl->hosts[hostlist_idx].address);
     else
         entry=get_addr_name(&hl->hosts[hostlist_idx].address);
 
@@ -633,7 +633,7 @@ open_as_map_cb(GtkWindow *copy_bt, gpointer data _U_)
             col_bytes = i;
         }
     }
-   
+
     /* check for the minimum required data */
     if(col_lat == -1 || col_lon == -1) {
         simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Latitude/Longitude data not available (GeoIP installed?)");
@@ -726,7 +726,7 @@ open_as_map_cb(GtkWindow *copy_bt, gpointer data _U_)
     /* copy ipmap.html to temp dir */
     src_file_path = get_datafile_path("ipmap.html");
     dst_file_path = g_strdup_printf("%s%cipmap.html", map_path, G_DIR_SEPARATOR);
-    
+
     if (!copy_file_binary_mode(src_file_path, dst_file_path)) {
         g_free(src_file_path);
         g_free(dst_file_path);
@@ -910,7 +910,7 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
     } else {
         bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
     }
-#else    
+#else
     bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
 #endif
 
@@ -934,7 +934,7 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
         g_signal_connect(map_bt, "clicked", G_CALLBACK(open_as_map_cb), NULL);
     }
 #endif /* HAVE_GEOIP */
-    
+
     help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
     g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_ENDPOINTS_DIALOG);
 
@@ -1196,7 +1196,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     /* Button row. */
 #ifdef HAVE_GEOIP
     bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, WIRESHARK_STOCK_MAP, GTK_STOCK_HELP, NULL);
-#else    
+#else
     bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
 #endif
     gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
@@ -1219,7 +1219,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     g_signal_connect(nb, "switch-page", G_CALLBACK(ct_nb_map_switch_page_cb), map_bt);
     gtk_widget_set_sensitive(map_bt, FALSE);
 #endif /* HAVE_GEOIP */
-    
+
     g_signal_connect(nb, "switch-page", G_CALLBACK(ct_nb_switch_page_cb), copy_bt);
 
     help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c
index d41dd0883d..408ad36e90 100644
--- a/gtk/mcast_stream_dlg.c
+++ b/gtk/mcast_stream_dlg.c
@@ -69,7 +69,7 @@ extern guint16 burstint;
 extern guint32 trigger;
 extern guint32 bufferalarm;
 extern gint32 emptyspeed;
-extern gint32 cumulemptyspeed; 
+extern gint32 cumulemptyspeed;
 
 static const gchar FWD_LABEL_TEXT[] = "Select a stream with left mouse button";
 static const gchar PAR_LABEL_TEXT[] = "\nBurst int: ms   Burst alarm: pps    Buffer alarm: KB    Stream empty speed: Mbps    Total empty speed: Mbps\n";
@@ -132,13 +132,13 @@ static void add_to_clist(mcast_stream_info_t* strinfo)
 	/* Update the top label with the number of detected streams */
 	g_snprintf(label_text, sizeof(label_text),
 	        "Detected %d Multicast streams,   Average Bw: %.1f Mbps   Max Bw: %.1f Mbps   Max burst: %d / %dms   Max buffer: %.1f KB",
-	        ++streams_nb, 
-		mcaststream_get_info()->allstreams->average_bw, mcaststream_get_info()->allstreams->element.maxbw, 
-		mcaststream_get_info()->allstreams->element.topburstsize, burstint, 
+	        ++streams_nb,
+		mcaststream_get_info()->allstreams->average_bw, mcaststream_get_info()->allstreams->element.maxbw,
+		mcaststream_get_info()->allstreams->element.topburstsize, burstint,
 		(float)(mcaststream_get_info()->allstreams->element.topbuffusage)/1000);
 	 gtk_label_set_text(GTK_LABEL(top_label), label_text);
 
-         g_snprintf(label_text, sizeof(label_text), "\nBurst int: %u ms   Burst alarm: %u pps   Buffer alarm: %u Bytes   Stream empty speed: %u Kbps   Total empty speed: %u Kbps\n", 
+         g_snprintf(label_text, sizeof(label_text), "\nBurst int: %u ms   Burst alarm: %u pps   Buffer alarm: %u Bytes   Stream empty speed: %u Kbps   Total empty speed: %u Kbps\n",
 		burstint, trigger, bufferalarm, emptyspeed, cumulemptyspeed);
 	gtk_label_set_text(GTK_LABEL(label_par), label_text);
 }
@@ -192,17 +192,17 @@ mcaststream_on_filter                    (GtkButton       *button _U_,
 	{
 		if (selected_stream_fwd->src_addr.type==AT_IPv6){
                     g_strlcpy(ip_version,"v6",sizeof(ip_version));
-		}		
+		}
 		else{
 			ip_version[0] = '\0';
 		}
 		filter_string_fwd = g_strdup_printf(
 			"(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u)",
 			ip_version,
-			address_to_str(&(selected_stream_fwd->src_addr)),
+			ep_address_to_str(&(selected_stream_fwd->src_addr)),
 			selected_stream_fwd->src_port,
 			ip_version,
-			address_to_str(&(selected_stream_fwd->dest_addr)),
+			ep_address_to_str(&(selected_stream_fwd->dest_addr)),
 			selected_stream_fwd->dest_port);
         filter_string = filter_string_fwd;
 	}
@@ -378,7 +378,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w)
 	if ( (p == fnumber_text || *p != '\0') || (fnumber <=0) || (fnumber > 10000000) ){
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The total empty speed should be between 1 and 10000000");
 		return; }
-	cumulemptyspeed = fnumber; 
+	cumulemptyspeed = fnumber;
 
 	window_destroy(GTK_WIDGET(parent_w));
 
@@ -407,12 +407,12 @@ mcast_on_params                      (GtkButton       *button _U_,
                 return;
         }
 
-	mcast_params_dlg = dlg_window_new("Wireshark: Set parameters for Multicast Stream Analysis");  
+	mcast_params_dlg = dlg_window_new("Wireshark: Set parameters for Multicast Stream Analysis");
 	gtk_window_set_destroy_with_parent (GTK_WINDOW(mcast_params_dlg), TRUE);
         gtk_window_set_default_size(GTK_WINDOW(mcast_params_dlg), 210, 210);
 
         gtk_widget_show(mcast_params_dlg);
-	
+
         /* Container for each row of widgets */
         main_vb = gtk_vbox_new(FALSE, 3);
         gtk_container_set_border_width(GTK_CONTAINER(main_vb), 2);
@@ -465,7 +465,7 @@ mcast_on_params                      (GtkButton       *button _U_,
 	GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
 	gtk_box_set_spacing (GTK_BOX (hbuttonbox), 0);
-        
+
 	g_signal_connect(mcast_params_dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
         g_signal_connect(mcast_params_dlg, "destroy", G_CALLBACK(mcast_params_destroy_cb), NULL);
 	g_signal_connect(ok_bt, "clicked", G_CALLBACK(mcast_params_ok_cb), mcast_params_dlg);
diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index bb1df06ff7..6135740ec0 100644
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -197,7 +197,7 @@ static gboolean save_stream_ok_cb(GtkWidget *ok_bt _U_, gpointer fs)
 	/*  Dialog box needs to be always destroyed. Return TRUE      */
 	/*  so that caller will destroy the dialog box.               */
 	/*  See comment under rtpstream_on_save.                      */
-	rtpstream_save(selected_stream_fwd, g_dest);    
+	rtpstream_save(selected_stream_fwd, g_dest);
 	g_free(g_dest);
 	return TRUE;
 #endif
@@ -415,17 +415,17 @@ rtpstream_on_filter                    (GtkButton       *button _U_,
 	{
 		if (selected_stream_fwd->src_addr.type==AT_IPv6){
 			g_strlcpy(ip_version,"v6",sizeof(ip_version));
-		}		
+		}
 		else{
 			ip_version[0] = '\0';
 		}
 		filter_string_fwd = g_strdup_printf(
 			"(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)",
 			ip_version,
-			address_to_str(&(selected_stream_fwd->src_addr)),
+			ep_address_to_str(&(selected_stream_fwd->src_addr)),
 			selected_stream_fwd->src_port,
 			ip_version,
-			address_to_str(&(selected_stream_fwd->dest_addr)),
+			ep_address_to_str(&(selected_stream_fwd->dest_addr)),
 			selected_stream_fwd->dest_port,
 			selected_stream_fwd->ssrc);
         filter_string = filter_string_fwd;
@@ -435,17 +435,17 @@ rtpstream_on_filter                    (GtkButton       *button _U_,
 	{
 		if (selected_stream_rev->src_addr.type==AT_IPv6){
 			g_strlcpy(ip_version,"v6",sizeof(ip_version));
-		}		
+		}
 		else{
 			ip_version[0] = '\0';
 		}
 		filter_string_rev = g_strdup_printf(
 			"(ip%s.src==%s && udp.srcport==%u && ip%s.dst==%s && udp.dstport==%u && rtp.ssrc==0x%X)",
 			ip_version,
-			address_to_str(&(selected_stream_rev->src_addr)),
+			ep_address_to_str(&(selected_stream_rev->src_addr)),
 			selected_stream_rev->src_port,
 			ip_version,
-			address_to_str(&(selected_stream_rev->dest_addr)),
+			ep_address_to_str(&(selected_stream_rev->dest_addr)),
 			selected_stream_rev->dest_port,
 			selected_stream_rev->ssrc);
 
@@ -492,7 +492,7 @@ rtpstream_on_copy_as_csv(GtkWindow *win _U_, gpointer data _U_)
 			gtk_clist_get_text(GTK_CLIST(clist),i,j,&table_entry);
 			g_string_append(CSV_str,table_entry);
 			g_string_append(CSV_str,",");
-		} 
+		}
 		g_string_append(CSV_str,"\n");
 	}
 
@@ -506,7 +506,7 @@ rtpstream_on_copy_as_csv(GtkWindow *win _U_, gpointer data _U_)
 static void
 rtpstream_on_analyse                   (GtkButton       *button _U_,
                                         gpointer         user_data _U_)
-{ 
+{
 	address ip_src_fwd;
 	guint16 port_src_fwd = 0;
 	address ip_dst_fwd;
@@ -522,12 +522,12 @@ rtpstream_on_analyse                   (GtkButton       *button _U_,
 	{
 		return;
 	}
-	
+
 	SET_ADDRESS(&ip_src_fwd,AT_NONE,0,NULL);
 	SET_ADDRESS(&ip_dst_fwd,AT_NONE,0,NULL);
 	SET_ADDRESS(&ip_src_rev,AT_NONE,0,NULL);
 	SET_ADDRESS(&ip_dst_rev,AT_NONE,0,NULL);
-	
+
 	if (selected_stream_fwd) {
 		COPY_ADDRESS(&(ip_src_fwd), &(selected_stream_fwd->src_addr));
 		port_src_fwd = selected_stream_fwd->src_port;
@@ -820,7 +820,7 @@ static void rtpstream_dlg_create (void)
     /*bt_copy = gtk_button_new_with_label ("Copy content to clipboard as CSV");*/
     bt_copy = gtk_button_new_from_stock(GTK_STOCK_COPY);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_copy);
-    gtk_tooltips_set_tip(tooltips, bt_copy, 
+    gtk_tooltips_set_tip(tooltips, bt_copy,
         "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.", NULL);
 
     bt_analyze = gtk_button_new_with_label ("Analyze");
diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c
index d7efb07b73..1830f25705 100644
--- a/gtk/sctp_chunk_stat.c
+++ b/gtk/sctp_chunk_stat.c
@@ -223,9 +223,9 @@ sctpstat_draw(void *phs)
 
 	for(tmp = list ; tmp ; tmp=tmp->next) {
 
-		g_snprintf(str[0],  sizeof(char[256]),"%s", address_to_str(&tmp->src));
+		g_snprintf(str[0],  sizeof(char[256]),"%s", ep_address_to_str(&tmp->src));
 		g_snprintf(str[1],  sizeof(char[256]),"%u", tmp->sport);
-		g_snprintf(str[2],  sizeof(char[256]),"%s", address_to_str(&tmp->dst));
+		g_snprintf(str[2],  sizeof(char[256]),"%s", ep_address_to_str(&tmp->dst));
 		g_snprintf(str[3],  sizeof(char[256]),"%u", tmp->dport);
 		g_snprintf(str[4],  sizeof(char[256]),"%u", tmp->chunk_count[SCTP_DATA_CHUNK_ID]);
 		g_snprintf(str[5],  sizeof(char[256]),"%u", tmp->chunk_count[SCTP_SACK_CHUNK_ID]);
diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index ddd7fcc63d..47c66abe47 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -648,9 +648,9 @@ static void create_drawing_area (struct graph *g)
 	g_snprintf (window_title, WINDOW_TITLE_LENGTH, "TCP Graph %d: %s %s:%d -> %s:%d",
 			refnum,
 			cf_get_display_name(&cfile),
-			address_to_str(&(thdr->ip_src)),
+			ep_address_to_str(&(thdr->ip_src)),
 			thdr->th_sport,
-			address_to_str(&(thdr->ip_dst)),
+			ep_address_to_str(&(thdr->ip_dst)),
 			thdr->th_dport
 	);
 	g->toplevel = dlg_window_new ("Tcp Graph");
diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c
index f83ff37d01..f5e70cc3b6 100644
--- a/gtk/wlan_stat_dlg.c
+++ b/gtk/wlan_stat_dlg.c
@@ -493,7 +493,7 @@ wlanstat_details(wlanstat_t *hs, wlan_ep_t *wlan_ep, gboolean clear)
 		if (hs->resolve_names) {
 			g_strlcpy (address, get_addr_name(&tmp->address), sizeof(address));
 		} else {
-			g_strlcpy (address, address_to_str(&tmp->address), sizeof(address));
+			g_strlcpy (address, ep_address_to_str(&tmp->address), sizeof(address));
 		}
 		if (basestation) {
 			g_strlcpy (comment, "Base station", sizeof(comment));
@@ -562,7 +562,7 @@ wlanstat_draw(void *phs)
 		if (hs->resolve_names) {
 			g_strlcpy (bssid, get_addr_name(&tmp->bssid), sizeof(bssid));
 		} else {
-			g_strlcpy (bssid, address_to_str(&tmp->bssid), sizeof(bssid));
+			g_strlcpy (bssid, ep_address_to_str(&tmp->bssid), sizeof(bssid));
 		}
 		if (tmp->stats.channel) {
 			g_snprintf (channel, sizeof(channel), "%u", tmp->stats.channel);
@@ -757,18 +757,18 @@ wlan_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callb
 
 	switch (value) {
 	case VALUE_BSSID_ONLY:
-		str = g_strdup_printf("wlan.bssid==%s", address_to_str(&ep->bssid));
+		str = g_strdup_printf("wlan.bssid==%s", ep_address_to_str(&ep->bssid));
 		break;
 	case VALUE_SSID_ONLY:
 		str = g_strdup_printf("wlan_mgt.ssid==\"%s\"", format_text(ep->stats.ssid, ep->stats.ssid_len));
 		break;
 	case VALUE_BSSID_AND_SSID:
 		str = g_strdup_printf("wlan.bssid==%s && wlan_mgt.ssid==\"%s\"",
-				      address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
+				      ep_address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
 		break;
 	case VALUE_BSSID_OR_SSID:
 		str = g_strdup_printf("wlan.bssid==%s || wlan_mgt.ssid==\"%s\"",
-				      address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
+				      ep_address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
 		break;
 	}
 
@@ -791,7 +791,7 @@ wlan_details_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, gui
 	gtk_tree_selection_get_selected (sel, &model, &iter);
 	gtk_tree_model_get (model, &iter, DETAILS_COLUMN, &ep, -1);
 
-	str = g_strdup_printf("wlan.addr==%s", address_to_str(&ep->address));
+	str = g_strdup_printf("wlan.addr==%s", ep_address_to_str(&ep->address));
 
 	apply_selected_filter (callback_action, str);