Use address functions instead of ADDRESS macros in ui.

Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the ui directory.

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

19 files changed, 92 insertions, 92 deletions

diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c
index 72d9bd4b76..023cf696cf 100644
--- a/ui/gtk/capture_dlg.c
+++ b/ui/gtk/capture_dlg.c
@@ -1300,12 +1300,12 @@ insert_new_rows(GList *list)
 
       switch (addr->ifat_type) {
         case IF_AT_IPv4:
-          SET_ADDRESS(&addr_str, AT_IPv4, 4, &addr->addr.ip4_addr);
+          set_address(&addr_str, AT_IPv4, 4, &addr->addr.ip4_addr);
           temp_addr_str = (char*)address_to_str(NULL, &addr_str);
           g_string_append(ip_str, temp_addr_str);
           break;
         case IF_AT_IPv6:
-          SET_ADDRESS(&addr_str, AT_IPv6, 16, addr->addr.ip6_addr);
+          set_address(&addr_str, AT_IPv6, 16, addr->addr.ip6_addr);
           temp_addr_str = (char*)address_to_str(NULL, &addr_str);
           g_string_append(ip_str, temp_addr_str);
           break;
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index ce4c6c5f03..19f01838e5 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -480,12 +480,12 @@ set_ip_addr_label(GSList *addr_list, GtkWidget *ip_lb, guint selected_ip_addr)
     switch (addr->ifat_type) {
 
     case IF_AT_IPv4:
-      SET_ADDRESS(&addr_address, AT_IPv4, 4, &addr->addr.ip4_addr);
+      set_address(&addr_address, AT_IPv4, 4, &addr->addr.ip4_addr);
       addr_str = (char*)address_to_str(NULL, &addr_address);
       break;
 
     case IF_AT_IPv6:
-      SET_ADDRESS(&addr_address, AT_IPv6, 16, addr->addr.ip6_addr);
+      set_address(&addr_address, AT_IPv6, 16, addr->addr.ip6_addr);
       addr_str = (char*)address_to_str(NULL, &addr_address);
       break;
 
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index 7f3df82d7e..6b13fd2d55 100644
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -157,8 +157,8 @@ comparestat_reset(void *arg)
 {
 	compstat_t *cs=(compstat_t *)arg;
 
-	SET_ADDRESS(&cs->eth_src, AT_ETHER, 0, NULL);
-	SET_ADDRESS(&cs->eth_dst, AT_ETHER, 0, NULL);
+	set_address(&cs->eth_src, AT_ETHER, 0, NULL);
+	set_address(&cs->eth_dst, AT_ETHER, 0, NULL);
 
 	gtk_tree_store_clear(cs->simple_list);
 	comparestat_set_title(cs);
@@ -327,7 +327,7 @@ call_foreach_new_order(gpointer key _U_, gpointer value, gpointer arg)
 	fInfoTemp=(frame_info *)g_hash_table_lookup(cs->nr_set, GINT_TO_POINTER((gint)fInfo->id));
 	if(fInfoTemp==NULL){
 		if(TTL_method==FALSE){
-			if((ADDRESSES_EQUAL(&cs->eth_dst, &fInfo->dl_dst)) || (ADDRESSES_EQUAL(&cs->eth_src, &fInfo->dl_dst))){
+			if((addresses_equal(&cs->eth_dst, &fInfo->dl_dst)) || (addresses_equal(&cs->eth_src, &fInfo->dl_dst))){
 				g_hash_table_insert(cs->nr_set, GINT_TO_POINTER((gint)fInfo->id), fInfo);
 				fInfo->zebra_time=cs->zebra_time;
 				cs->zebra_time.nsecs=cs->zebra_time.nsecs + MERGED_FILES;
@@ -352,7 +352,7 @@ call_foreach_new_order(gpointer key _U_, gpointer value, gpointer arg)
 		}
 	} else {
 		if(TTL_method==FALSE){
-			if(((ADDRESSES_EQUAL(&cs->eth_dst, &fInfo->dl_dst)) || (ADDRESSES_EQUAL(&cs->eth_src, &fInfo->dl_dst)))&&(!fmod(fInfoTemp->zebra_time.nsecs,MERGED_FILES))){
+			if(((addresses_equal(&cs->eth_dst, &fInfo->dl_dst)) || (addresses_equal(&cs->eth_src, &fInfo->dl_dst)))&&(!fmod(fInfoTemp->zebra_time.nsecs,MERGED_FILES))){
 				fInfo->zebra_time.nsecs=fInfoTemp->zebra_time.nsecs;
 			} else {
 				fInfo->zebra_time.nsecs=fInfoTemp->zebra_time.nsecs+1;
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index 0c3950a38e..f34085cb0b 100644
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -168,9 +168,9 @@ ct_sort_func(GtkTreeModel *model,
 
     switch(data_column){
     case CONV_COLUMN_SRC_ADDR: /* Source address */
-        return(CMP_ADDRESS(&conv1->src_address, &conv2->src_address));
+        return(cmp_address(&conv1->src_address, &conv2->src_address));
     case CONV_COLUMN_DST_ADDR: /* Destination address */
-        return(CMP_ADDRESS(&conv1->dst_address, &conv2->dst_address));
+        return(cmp_address(&conv1->dst_address, &conv2->dst_address));
     case CONV_COLUMN_SRC_PORT: /* Source port */
         CMP_NUM(conv1->src_port, conv2->src_port);
     case CONV_COLUMN_DST_PORT: /* Destination port */
diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c
index 93c6bf884e..5d4ce3cb8a 100644
--- a/ui/gtk/firewall_dlg.c
+++ b/ui/gtk/firewall_dlg.c
@@ -194,10 +194,10 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
     guint i;
 
     rule_info = g_new0(rule_info_t, 1);
-    COPY_ADDRESS(&(rule_info->dl_src), &(pinfo->dl_src));
-    COPY_ADDRESS(&(rule_info->dl_dst), &(pinfo->dl_dst));
-    COPY_ADDRESS(&(rule_info->net_src), &(pinfo->net_src));
-    COPY_ADDRESS(&(rule_info->net_dst), &(pinfo->net_dst));
+    copy_address(&(rule_info->dl_src), &(pinfo->dl_src));
+    copy_address(&(rule_info->dl_dst), &(pinfo->dl_dst));
+    copy_address(&(rule_info->net_src), &(pinfo->net_src));
+    copy_address(&(rule_info->net_dst), &(pinfo->net_dst));
     rule_info->ptype = pinfo->ptype;
     rule_info->srcport = pinfo->srcport;
     rule_info->destport = pinfo->destport;
diff --git a/ui/gtk/follow_ssl.c b/ui/gtk/follow_ssl.c
index a8d41d6da2..22569f1692 100644
--- a/ui/gtk/follow_ssl.c
+++ b/ui/gtk/follow_ssl.c
@@ -78,9 +78,9 @@ ssl_queue_packet_data(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_
     /* Compute the packet's sender. */
     if (follow_info->client_port == 0) {
         follow_info->client_port = pinfo->srcport;
-        COPY_ADDRESS(&follow_info->client_ip, &pinfo->src);
+        copy_address(&follow_info->client_ip, &pinfo->src);
     }
-    if (ADDRESSES_EQUAL(&follow_info->client_ip, &pinfo->src) &&
+    if (addresses_equal(&follow_info->client_ip, &pinfo->src) &&
             follow_info->client_port == pinfo->srcport) {
         from = FROM_CLIENT;
     } else {
diff --git a/ui/gtk/follow_udp.c b/ui/gtk/follow_udp.c
index 85a2778cc3..ae6f362e49 100644
--- a/ui/gtk/follow_udp.c
+++ b/ui/gtk/follow_udp.c
@@ -57,10 +57,10 @@ udp_queue_packet_data(void *tapdata, packet_info *pinfo,
 
     if (follow_info->client_port == 0) {
         follow_info->client_port = pinfo->srcport;
-        COPY_ADDRESS(&follow_info->client_ip, &pinfo->src);
+        copy_address(&follow_info->client_ip, &pinfo->src);
     }
 
-    if (ADDRESSES_EQUAL(&follow_info->client_ip, &pinfo->src) && follow_info->client_port == pinfo->srcport)
+    if (addresses_equal(&follow_info->client_ip, &pinfo->src) && follow_info->client_port == pinfo->srcport)
         follow_record->is_server = FALSE;
     else
         follow_record->is_server = TRUE;
diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c
index 34f43a11ef..5669510395 100644
--- a/ui/gtk/hostlist_table.c
+++ b/ui/gtk/hostlist_table.c
@@ -169,7 +169,7 @@ hostlist_sort_column(GtkTreeModel *model,
 
     switch(data_column){
     case ENDP_COLUMN_ADDR: /* Address */
-        return(CMP_ADDRESS(&host1->myaddress, &host2->myaddress));
+        return(cmp_address(&host1->myaddress, &host2->myaddress));
     case ENDP_COLUMN_PORT: /* (Port) */
         CMP_INT(host1->port, host2->port);
 #ifdef HAVE_GEOIP
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 1627b831a7..5f4178d98a 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -458,9 +458,9 @@ iax2_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t *edt _U_, co
 		return FALSE;
 
 	/* is it the forward direction?  */
-	else if ((CMP_ADDRESS(&(user_data->ip_src_fwd), &(pinfo->net_src)) == 0)
+	else if ((cmp_address(&(user_data->ip_src_fwd), &(pinfo->net_src)) == 0)
 		 && (user_data->port_src_fwd == pinfo->srcport)
-		 && (CMP_ADDRESS(&(user_data->ip_dst_fwd), &(pinfo->net_dst)) == 0)
+		 && (cmp_address(&(user_data->ip_dst_fwd), &(pinfo->net_dst)) == 0)
 		 && (user_data->port_dst_fwd == pinfo->destport))  {
 		iax2_packet_analyse(&(user_data->forward.statinfo), pinfo, iax2info);
 		iax2_packet_add_graph(&(user_data->dlg.dialog_graph.graph[GRAPH_FWD_JITTER]),
@@ -477,9 +477,9 @@ iax2_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t *edt _U_, co
 					 &(user_data->forward.statinfo), pinfo, iax2info);
 	}
 	/* is it the reversed direction? */
-	else if (CMP_ADDRESS(&(user_data->ip_src_rev), &(pinfo->net_src)) == 0
+	else if (cmp_address(&(user_data->ip_src_rev), &(pinfo->net_src)) == 0
 		 && user_data->port_src_rev == pinfo->srcport
-		 && CMP_ADDRESS(&(user_data->ip_dst_rev), &(pinfo->net_dst)) == 0
+		 && cmp_address(&(user_data->ip_dst_rev), &(pinfo->net_dst)) == 0
 		 && user_data->port_dst_rev == pinfo->destport)  {
 		iax2_packet_analyse(&(user_data->reversed.statinfo), pinfo, iax2info);
 		iax2_packet_add_graph(&(user_data->dlg.dialog_graph.graph[GRAPH_REV_JITTER]),
@@ -3515,13 +3515,13 @@ iax2_analysis(
 	/* init */
 	user_data = (user_data_t *)g_malloc(sizeof(user_data_t));
 
-	COPY_ADDRESS(&(user_data->ip_src_fwd), ip_src_fwd);
+	copy_address(&(user_data->ip_src_fwd), ip_src_fwd);
 	user_data->port_src_fwd = port_src_fwd;
-	COPY_ADDRESS(&(user_data->ip_dst_fwd), ip_dst_fwd);
+	copy_address(&(user_data->ip_dst_fwd), ip_dst_fwd);
 	user_data->port_dst_fwd = port_dst_fwd;
-	COPY_ADDRESS(&(user_data->ip_src_rev), ip_src_rev);
+	copy_address(&(user_data->ip_src_rev), ip_src_rev);
 	user_data->port_src_rev = port_src_rev;
-	COPY_ADDRESS(&(user_data->ip_dst_rev), ip_dst_rev);
+	copy_address(&(user_data->ip_dst_rev), ip_dst_rev);
 	user_data->port_dst_rev = port_dst_rev;
 
 
@@ -3658,14 +3658,14 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
 #endif
 
 	/* ok, it is a IAX2 frame, so let's get the ip and port values */
-	COPY_ADDRESS(&(ip_src_fwd), &(edt.pi.src));
-	COPY_ADDRESS(&(ip_dst_fwd), &(edt.pi.dst));
+	copy_address(&(ip_src_fwd), &(edt.pi.src));
+	copy_address(&(ip_dst_fwd), &(edt.pi.dst));
 	port_src_fwd = edt.pi.srcport;
 	port_dst_fwd = edt.pi.destport;
 
 	/* assume the inverse ip/port combination for the reverse direction */
-	COPY_ADDRESS(&(ip_src_rev), &(edt.pi.dst));
-	COPY_ADDRESS(&(ip_dst_rev), &(edt.pi.src));
+	copy_address(&(ip_src_rev), &(edt.pi.dst));
+	copy_address(&(ip_dst_rev), &(edt.pi.src));
 	port_src_rev = edt.pi.destport;
 	port_dst_rev = edt.pi.srcport;
 
@@ -3677,17 +3677,17 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
 	while (strinfo_list)
 	{
 		strinfo = (rtp_stream_info_t*)(strinfo_list->data);
-		if (ADDRESSES_EQUAL(&(strinfo->src_addr),&(ip_src_fwd))
+		if (addresses_equal(&(strinfo->src_addr),&(ip_src_fwd))
 			&& strinfo->src_port == port_src_fwd
-			&& ADDRESSES_EQUAL(&(strinfo->dest_addr),&(ip_dst_fwd))
+			&& addresses_equal(&(strinfo->dest_addr),&(ip_dst_fwd))
 			&& strinfo->dest_port == port_dst_fwd)
 		{
 			filtered_list = g_list_prepend(filtered_list, strinfo);
 		}
 
-		if (ADDRESSES_EQUAL(&(strinfo->src_addr),&(ip_src_rev))
+		if (addresses_equal(&(strinfo->src_addr),&(ip_src_rev))
 			&& strinfo->src_port == port_src_rev
-			&& ADDRESSES_EQUAL(&(strinfo->dest_addr),&(ip_dst_rev))
+			&& addresses_equal(&(strinfo->dest_addr),&(ip_dst_rev))
 			&& strinfo->dest_port == port_dst_rev)
 		{
 			++nfound;
diff --git a/ui/gtk/lbm_uimflow_dlg.c b/ui/gtk/lbm_uimflow_dlg.c
index 2ffc62f9a2..d1766bbc6b 100644
--- a/ui/gtk/lbm_uimflow_dlg.c
+++ b/ui/gtk/lbm_uimflow_dlg.c
@@ -131,7 +131,7 @@ static int lbmc_uim_flow_graph_add_to_graph(packet_info * pinfo, const lbm_uim_s
         {
             int compare;
 
-            compare = CMP_ADDRESS(&(stream_info->endpoint_a.stream_info.dest.addr), &(stream_info->endpoint_b.stream_info.dest.addr));
+            compare = cmp_address(&(stream_info->endpoint_a.stream_info.dest.addr), &(stream_info->endpoint_b.stream_info.dest.addr));
             if (compare < 0)
             {
                 swap_endpoints = FALSE;
@@ -164,8 +164,8 @@ static int lbmc_uim_flow_graph_add_to_graph(packet_info * pinfo, const lbm_uim_s
         epa = stream_info->endpoint_b;
     }
     item = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t));
-    COPY_ADDRESS(&(item->src_addr), &(pinfo->src));
-    COPY_ADDRESS(&(item->dst_addr), &(pinfo->dst));
+    copy_address(&(item->src_addr), &(pinfo->src));
+    copy_address(&(item->dst_addr), &(pinfo->dst));
     item->fd = pinfo->fd;
     item->port_src = pinfo->srcport;
     item->port_dst = pinfo->destport;
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index ca5a5be6ed..2c896b5111 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -509,7 +509,7 @@ finfo_ipv4_output(GtkSpinButton *spinbutton, gpointer user_data _U_)
 	adj = gtk_spin_button_get_adjustment(spinbutton);
 	value = (guint32) gtk_adjustment_get_value(adj);
 	value = GUINT32_TO_BE(value);
-	SET_ADDRESS(&addr, AT_IPv4, 4, &value);
+	set_address(&addr, AT_IPv4, 4, &value);
 	addr_str = (char*)address_to_str(NULL, &addr);
 	gtk_entry_set_text(GTK_ENTRY(spinbutton), addr_str);
 	wmem_free(NULL, addr_str);
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index c8fa4a7356..695e405768 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -499,9 +499,9 @@ rtp_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
 		return FALSE;
 	/* is it the forward direction?  */
 	else if (user_data->ssrc_fwd == rtpinfo->info_sync_src
-		 && (CMP_ADDRESS(&(user_data->src_fwd), &(pinfo->src)) == 0)
+		 && (cmp_address(&(user_data->src_fwd), &(pinfo->src)) == 0)
 		 && (user_data->port_src_fwd == pinfo->srcport)
-		 && (CMP_ADDRESS(&(user_data->dst_fwd), &(pinfo->dst)) == 0)
+		 && (cmp_address(&(user_data->dst_fwd), &(pinfo->dst)) == 0)
 		 && (user_data->port_dst_fwd == pinfo->destport))  {
 		rtp_packet_analyse(&(user_data->forward.statinfo), pinfo, rtpinfo);
 		rtp_packet_add_graph(&(user_data->dlg.dialog_graph.graph[GRAPH_FWD_JITTER]),
@@ -521,9 +521,9 @@ rtp_packet(void *user_data_arg, packet_info *pinfo, epan_dissect_t *edt _U_, con
 	}
 	/* is it the reversed direction? */
 	else if (user_data->ssrc_rev == rtpinfo->info_sync_src
-		 && (CMP_ADDRESS(&(user_data->src_rev), &(pinfo->src)) == 0)
+		 && (cmp_address(&(user_data->src_rev), &(pinfo->src)) == 0)
 		 && (user_data->port_src_rev == pinfo->srcport)
-		 && (CMP_ADDRESS(&(user_data->dst_rev), &(pinfo->dst)) == 0)
+		 && (cmp_address(&(user_data->dst_rev), &(pinfo->dst)) == 0)
 		 && (user_data->port_dst_rev == pinfo->destport))  {
 		rtp_packet_analyse(&(user_data->reversed.statinfo), pinfo, rtpinfo);
 		rtp_packet_add_graph(&(user_data->dlg.dialog_graph.graph[GRAPH_REV_JITTER]),
@@ -3833,14 +3833,14 @@ rtp_analysis(address *src_fwd,
 	/* init */
 	user_data = (user_data_t *)g_malloc(sizeof(user_data_t));
 
-	COPY_ADDRESS(&(user_data->src_fwd), src_fwd);
+	copy_address(&(user_data->src_fwd), src_fwd);
 	user_data->port_src_fwd = port_src_fwd;
-	COPY_ADDRESS(&(user_data->dst_fwd), dst_fwd);
+	copy_address(&(user_data->dst_fwd), dst_fwd);
 	user_data->port_dst_fwd = port_dst_fwd;
 	user_data->ssrc_fwd = ssrc_fwd;
-	COPY_ADDRESS(&(user_data->src_rev), src_rev);
+	copy_address(&(user_data->src_rev), src_rev);
 	user_data->port_src_rev = port_src_rev;
-	COPY_ADDRESS(&(user_data->dst_rev), dst_rev);
+	copy_address(&(user_data->dst_rev), dst_rev);
 	user_data->port_dst_rev = port_dst_rev;
 	user_data->ssrc_rev = ssrc_rev;
 
@@ -3972,14 +3972,14 @@ rtp_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
 	}
 
 	/* ok, it is a RTP frame, so let's get the ip and port values */
-	COPY_ADDRESS(&(src_fwd), &(edt.pi.src));
-	COPY_ADDRESS(&(dst_fwd), &(edt.pi.dst));
+	copy_address(&(src_fwd), &(edt.pi.src));
+	copy_address(&(dst_fwd), &(edt.pi.dst));
 	port_src_fwd = edt.pi.srcport;
 	port_dst_fwd = edt.pi.destport;
 
 	/* assume the inverse ip/port combination for the reverse direction */
-	COPY_ADDRESS(&(src_rev), &(edt.pi.dst));
-	COPY_ADDRESS(&(dst_rev), &(edt.pi.src));
+	copy_address(&(src_rev), &(edt.pi.dst));
+	copy_address(&(dst_rev), &(edt.pi.src));
 	port_src_rev = edt.pi.destport;
 	port_dst_rev = edt.pi.srcport;
 
@@ -4005,17 +4005,17 @@ rtp_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
 	while (strinfo_list)
 	{
 		strinfo = (rtp_stream_info_t*)(strinfo_list->data);
-		if (ADDRESSES_EQUAL(&(strinfo->src_addr), &(src_fwd))
+		if (addresses_equal(&(strinfo->src_addr), &(src_fwd))
 		    && (strinfo->src_port == port_src_fwd)
-		    && (ADDRESSES_EQUAL(&(strinfo->dest_addr), &(dst_fwd)))
+		    && (addresses_equal(&(strinfo->dest_addr), &(dst_fwd)))
 		    && (strinfo->dest_port == port_dst_fwd))
 		{
 			filtered_list = g_list_prepend(filtered_list, strinfo);
 		}
 
-		if (ADDRESSES_EQUAL(&(strinfo->src_addr), &(src_rev))
+		if (addresses_equal(&(strinfo->src_addr), &(src_rev))
 		    && (strinfo->src_port == port_src_rev)
-		    && (ADDRESSES_EQUAL(&(strinfo->dest_addr), &(dst_rev)))
+		    && (addresses_equal(&(strinfo->dest_addr), &(dst_rev)))
 		    && (strinfo->dest_port == port_dst_rev))
 		{
 			++nfound;
diff --git a/ui/gtk/rtp_player.c b/ui/gtk/rtp_player.c
index 6880d479d7..fd69a27ae9 100644
--- a/ui/gtk/rtp_player.c
+++ b/ui/gtk/rtp_player.c
@@ -339,9 +339,9 @@ add_rtp_packet(const struct _rtp_info *rtp_info, packet_info *pinfo)
 	/* if it is not in the hash table, create a new stream */
 	if (stream_info==NULL) {
 		stream_info = g_new0(rtp_stream_info_t, 1);
-		COPY_ADDRESS(&(stream_info->src_addr), &(pinfo->src));
+		copy_address(&(stream_info->src_addr), &(pinfo->src));
 		stream_info->src_port = pinfo->srcport;
-		COPY_ADDRESS(&(stream_info->dest_addr), &(pinfo->dst));
+		copy_address(&(stream_info->dest_addr), &(pinfo->dst));
 		stream_info->dest_port = pinfo->destport;
 		stream_info->ssrc = rtp_info->info_sync_src;
 		stream_info->start_fd = pinfo->fd;
diff --git a/ui/gtk/rtp_stream_dlg.c b/ui/gtk/rtp_stream_dlg.c
index d3dce19fb5..a53aaaef6e 100644
--- a/ui/gtk/rtp_stream_dlg.c
+++ b/ui/gtk/rtp_stream_dlg.c
@@ -516,23 +516,23 @@ rtpstream_on_analyse(GtkButton *button _U_, gpointer user_data _U_)
         return;
     }
 
-    SET_ADDRESS(&src_fwd,AT_NONE,0,NULL);
-    SET_ADDRESS(&dst_fwd,AT_NONE,0,NULL);
-    SET_ADDRESS(&src_rev,AT_NONE,0,NULL);
-    SET_ADDRESS(&dst_rev,AT_NONE,0,NULL);
+    set_address(&src_fwd,AT_NONE,0,NULL);
+    set_address(&dst_fwd,AT_NONE,0,NULL);
+    set_address(&src_rev,AT_NONE,0,NULL);
+    set_address(&dst_rev,AT_NONE,0,NULL);
 
     if (selected_stream_fwd) {
-        COPY_ADDRESS(&(src_fwd), &(selected_stream_fwd->src_addr));
+        copy_address(&(src_fwd), &(selected_stream_fwd->src_addr));
         port_src_fwd = selected_stream_fwd->src_port;
-        COPY_ADDRESS(&(dst_fwd), &(selected_stream_fwd->dest_addr));
+        copy_address(&(dst_fwd), &(selected_stream_fwd->dest_addr));
         port_dst_fwd = selected_stream_fwd->dest_port;
         ssrc_fwd = selected_stream_fwd->ssrc;
     }
 
     if (selected_stream_rev) {
-        COPY_ADDRESS(&(src_rev), &(selected_stream_rev->src_addr));
+        copy_address(&(src_rev), &(selected_stream_rev->src_addr));
         port_src_rev = selected_stream_rev->src_port;
-        COPY_ADDRESS(&(dst_rev), &(selected_stream_rev->dest_addr));
+        copy_address(&(dst_rev), &(selected_stream_rev->dest_addr));
         port_dst_rev = selected_stream_rev->dest_port;
         ssrc_rev = selected_stream_rev->ssrc;
     }
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index e8fb244621..8900b34b36 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -466,7 +466,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data)
 
 		srclist = g_list_first(selected_stream->addr1);
 		infosrc = (struct sockaddr_in *)(srclist->data);
-		SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
+		set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 		addr_str = (char*)address_to_str(NULL, &addr);
 		gstring = g_string_new(g_strdup_printf(
 					       "((sctp.srcport==%u && sctp.dstport==%u && (ip.src==%s",
@@ -479,7 +479,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data)
 		while (srclist)
 		{
 			infosrc = (struct sockaddr_in *)(srclist->data);
-			SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
+			set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 			addr_str = (char*)address_to_str(NULL, &addr);
 			str = g_strdup_printf("|| ip.src==%s", addr_str);
 			g_string_append(gstring, str);
@@ -489,7 +489,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data)
 
 		dstlist = g_list_first(selected_stream->addr2);
 		infodst = (struct sockaddr_in *)(dstlist->data);
-		SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
+		set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 		addr_str = (char*)address_to_str(NULL, &addr);
 		str = g_strdup_printf(") && (ip.dst==%s", addr_str);
 		g_string_append(gstring, str);
@@ -499,7 +499,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data)
 		while (dstlist)
 		{
 			infodst = (struct sockaddr_in *)(dstlist->data);
-			SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
+			set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 			addr_str = (char*)address_to_str(NULL, &addr);
 			str = g_strdup_printf("|| ip.dst==%s", addr_str);
 			g_string_append(gstring, str);
@@ -509,7 +509,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data)
 
 		srclist = g_list_first(selected_stream->addr1);
 		infosrc = (struct sockaddr_in *)(srclist->data);
-		SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
+		set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 		addr_str = (char*)address_to_str(NULL, &addr);
 		str = g_strdup_printf(")) || (sctp.dstport==%u && sctp.srcport==%u && (ip.dst==%s",
 				      selected_stream->port1,
@@ -522,7 +522,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data)
 		while (srclist)
 		{
 			infosrc = (struct sockaddr_in *)(srclist->data);
-			SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
+			set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 			addr_str = (char*)address_to_str(NULL, &addr);
 			str = g_strdup_printf("|| ip.dst==%s", addr_str);
 			g_string_append(gstring, str);
@@ -532,7 +532,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data)
 
 		dstlist = g_list_first(selected_stream->addr2);
 		infodst = (struct sockaddr_in *)(dstlist->data);
-		SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
+		set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 		addr_str = (char*)address_to_str(NULL, &addr);
 		str = g_strdup_printf(") && (ip.src==%s", addr_str);
 		g_string_append(gstring, str);
@@ -541,7 +541,7 @@ sctp_set_filter(GtkButton *button _U_, struct sctp_analyse *u_data)
 		while (dstlist)
 		{
 			infodst = (struct sockaddr_in *)(dstlist->data);
-			SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
+			set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 			addr_str = (char*)address_to_str(NULL, &addr);
 			str = g_strdup_printf("|| ip.src==%s", addr_str);
 			g_string_append(gstring, str);
diff --git a/ui/gtk/sctp_chunk_stat.c b/ui/gtk/sctp_chunk_stat.c
index 8b85c90ed1..edb5de543d 100644
--- a/ui/gtk/sctp_chunk_stat.c
+++ b/ui/gtk/sctp_chunk_stat.c
@@ -111,8 +111,8 @@ static sctp_ep_t* alloc_sctp_ep(struct _sctp_info *si)
 	if (!(ep = (sctp_ep_t *)g_malloc(sizeof(sctp_ep_t))))
 		return NULL;
 
-	COPY_ADDRESS(&ep->src,&si->ip_src);
-	COPY_ADDRESS(&ep->dst,&si->ip_dst);
+	copy_address(&ep->src,&si->ip_src);
+	copy_address(&ep->dst,&si->ip_dst);
 	ep->sport = si->sport;
 	ep->dport = si->dport;
 	ep->next = NULL;
@@ -139,8 +139,8 @@ sctpstat_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, cons
 		te = hs->ep_list;
 	} else {
 		for(tmp=hs->ep_list ; tmp ; tmp=tmp->next) {
-			if((!CMP_ADDRESS(&tmp->src,&si->ip_src)) &&
-			   (!CMP_ADDRESS(&tmp->dst,&si->ip_dst)) &&
+			if((!cmp_address(&tmp->src,&si->ip_src)) &&
+			   (!cmp_address(&tmp->dst,&si->ip_dst)) &&
 			   (tmp->sport == si->sport) &&
 			   (tmp->dport == si->dport)) {
 				te = tmp;
diff --git a/ui/gtk/sctp_stat_dlg.c b/ui/gtk/sctp_stat_dlg.c
index f88abf5061..59d57ae0ee 100644
--- a/ui/gtk/sctp_stat_dlg.c
+++ b/ui/gtk/sctp_stat_dlg.c
@@ -462,7 +462,7 @@ sctp_stat_on_filter(GtkButton *button _U_, gpointer user_data _U_)
 
 		srclist = g_list_first(selected_stream->addr1);
 		infosrc = (struct sockaddr_in *)(srclist->data);
-		SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
+		set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 		addr_str = (char*)address_to_str(NULL, &addr);
 		gstring = g_string_new(g_strdup_printf("((sctp.srcport==%u && sctp.dstport==%u && (ip.src==%s",
 			selected_stream->port1, selected_stream->port2, addr_str));
@@ -472,7 +472,7 @@ sctp_stat_on_filter(GtkButton *button _U_, gpointer user_data _U_)
 		while (srclist)
 		{
 			infosrc = (struct sockaddr_in *)(srclist->data);
-			SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
+			set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 			addr_str = (char*)address_to_str(NULL, &addr);
 			str = g_strdup_printf("|| ip.src==%s", addr_str);
 			g_string_append(gstring, str);
@@ -481,7 +481,7 @@ sctp_stat_on_filter(GtkButton *button _U_, gpointer user_data _U_)
 		}
 		dstlist = g_list_first(selected_stream->addr2);
 		infodst = (struct sockaddr_in *)(dstlist->data);
-		SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
+		set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 		addr_str = (char*)address_to_str(NULL, &addr);
 		str = g_strdup_printf(") && (ip.dst==%s", addr_str);
 		g_string_append(gstring, str);
@@ -490,7 +490,7 @@ sctp_stat_on_filter(GtkButton *button _U_, gpointer user_data _U_)
 		while (dstlist)
 		{
 			infodst = (struct sockaddr_in *)(dstlist->data);
-			SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
+			set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 			addr_str = (char*)address_to_str(NULL, &addr);
 			str = g_strdup_printf("|| ip.dst==%s", addr_str);
 			g_string_append(gstring, str);
@@ -499,7 +499,7 @@ sctp_stat_on_filter(GtkButton *button _U_, gpointer user_data _U_)
 		}
 		srclist = g_list_first(selected_stream->addr1);
 		infosrc = (struct sockaddr_in *)(srclist->data);
-		SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
+		set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 		addr_str = (char*)address_to_str(NULL, &addr);
 		str = g_strdup_printf(")) || (sctp.dstport==%u && sctp.srcport==%u && (ip.dst==%s",
 			selected_stream->port1, selected_stream->port2, addr_str);
@@ -510,7 +510,7 @@ sctp_stat_on_filter(GtkButton *button _U_, gpointer user_data _U_)
 		while (srclist)
 		{
 			infosrc = (struct sockaddr_in *)(srclist->data);
-			SET_ADDRESS(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
+			set_address(&addr, AT_IPv4, 4, &(infosrc->sin_addr.s_addr));
 			addr_str = (char*)address_to_str(NULL, &addr);
 			str = g_strdup_printf("|| ip.dst==%s", addr_str);
 			g_string_append(gstring, str);
@@ -520,7 +520,7 @@ sctp_stat_on_filter(GtkButton *button _U_, gpointer user_data _U_)
 
 		dstlist = g_list_first(selected_stream->addr2);
 		infodst = (struct sockaddr_in *)(dstlist->data);
-		SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
+		set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 		addr_str = (char*)address_to_str(NULL, &addr);
 		str = g_strdup_printf(") && (ip.src==%s", addr_str);
 		g_string_append(gstring, str);
@@ -529,7 +529,7 @@ sctp_stat_on_filter(GtkButton *button _U_, gpointer user_data _U_)
 		while (dstlist)
 		{
 			infodst = (struct sockaddr_in *)(dstlist->data);
-			SET_ADDRESS(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
+			set_address(&addr, AT_IPv4, 4, &(infodst->sin_addr.s_addr));
 			addr_str = (char*)address_to_str(NULL, &addr);
 			str = g_strdup_printf("|| ip.src==%s", addr_str);
 			g_string_append(gstring, str);
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c
index b4b55fe4ec..c49540415c 100644
--- a/ui/gtk/tcp_graph.c
+++ b/ui/gtk/tcp_graph.c
@@ -642,9 +642,9 @@ void tcp_graph_known_stream_launch(address *src_address, guint16 src_port,
     graph_initialize_values(g);
 
     /* Can set stream info for graph now */
-    COPY_ADDRESS(&g->tg.src_address, src_address);
+    copy_address(&g->tg.src_address, src_address);
     g->tg.src_port = src_port;
-    COPY_ADDRESS(&g->tg.dst_address, dst_address);
+    copy_address(&g->tg.dst_address, dst_address);
     g->tg.dst_port = dst_port;
     g->tg.stream = stream;
 
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
index 743406304c..a1693db63e 100644
--- a/ui/gtk/wlan_stat_dlg.c
+++ b/ui/gtk/wlan_stat_dlg.c
@@ -240,7 +240,7 @@ alloc_wlan_ep (const struct _wlan_hdr *si, const packet_info *pinfo _U_)
 
     ep = (wlan_ep_t *)g_malloc (sizeof(wlan_ep_t));
 
-    COPY_ADDRESS (&ep->bssid, &si->bssid);
+    copy_address (&ep->bssid, &si->bssid);
     ep->stats.channel      = si->stats.channel;
     memcpy (ep->stats.ssid, si->stats.ssid, MAX_SSID_LEN);
     ep->stats.ssid_len     = si->stats.ssid_len;
@@ -267,7 +267,7 @@ alloc_wlan_details_ep (const address *addr)
     if (!(d_ep = (wlan_details_ep_t *)g_malloc (sizeof(wlan_details_ep_t))))
         return NULL;
 
-    COPY_ADDRESS (&d_ep->addr, addr);
+    copy_address (&d_ep->addr, addr);
     d_ep->probe_req         = 0;
     d_ep->probe_rsp         = 0;
     d_ep->auth              = 0;
@@ -292,7 +292,7 @@ get_details_ep (wlan_ep_t *te, const address *addr)
         d_te = te->details;
     } else {
         for (tmp = te->details; tmp; tmp = tmp->next) {
-            if (!CMP_ADDRESS (&tmp->addr, addr)) {
+            if (!cmp_address (&tmp->addr, addr)) {
                 d_te = tmp;
                 break;
             }
@@ -369,7 +369,7 @@ is_broadcast(const address *addr)
 
     /* doesn't work if MAC resolution is disable */
     return cmp_addr;
-    return ADDRESSES_EQUAL(&broadcast, addr);
+    return addresses_equal(&broadcast, addr);
 }
 #endif
 
@@ -408,7 +408,7 @@ wlanstat_packet (void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, const v
                       || ((si->stats.ssid_len != 0) && (ssid_equal(&tmp->stats, &si->stats)))
                       )))
                 ||
-                ((si->type != MGT_PROBE_REQ) && !CMP_ADDRESS(&tmp->bssid, &si->bssid))) {
+                ((si->type != MGT_PROBE_REQ) && !cmp_address(&tmp->bssid, &si->bssid))) {
                 te = tmp;
                 break;
             }