Use address functions instead of ADDRESS macros in asn1 and epan

Replace CMP_ADDRESS, COPY_ADDRESS, et al with their lower-case
equivalents in the asn1 and epan directories.

Change-Id: I4043b0931d4353d60cffbd829e30269eb8d08cf4
Reviewed-on: https://code.wireshark.org/review/11200
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 82 insertions, 82 deletions

diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index e851a0d379..4289ada91a 100644
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -1056,8 +1056,8 @@ static int dissect_batadv_batman_v5(tvbuff_t *tvb, int offset, packet_info *pinf
 	batman_packeth->tq = tvb_get_guint8(tvb, offset+5);
 	batman_packeth->seqno = tvb_get_ntohs(tvb, offset+6);
 	TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+8, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->src, &batman_packeth->orig);
 	TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+14, 6);
 
 	batman_packeth->num_tt = tvb_get_guint8(tvb, offset+20);
@@ -1152,8 +1152,8 @@ static int dissect_batadv_batman_v7(tvbuff_t *tvb, int offset, packet_info *pinf
 	batman_packeth->tq = tvb_get_guint8(tvb, offset+3);
 	batman_packeth->seqno = tvb_get_ntohs(tvb, offset+4);
 	TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+6, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->src, &batman_packeth->orig);
 	TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+12, 6);
 	batman_packeth->ttl = tvb_get_guint8(tvb, offset+18);
 	batman_packeth->num_tt = tvb_get_guint8(tvb, offset+19);
@@ -1241,8 +1241,8 @@ static int dissect_batadv_batman_v9(tvbuff_t *tvb, int offset, packet_info *pinf
 	batman_packeth->tq = tvb_get_guint8(tvb, offset+3);
 	batman_packeth->seqno = tvb_get_ntohs(tvb, offset+4);
 	TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+6, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->src, &batman_packeth->orig);
 	TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+12, 6);
 	batman_packeth->ttl = tvb_get_guint8(tvb, offset+18);
 	batman_packeth->num_tt = tvb_get_guint8(tvb, offset+19);
@@ -1338,8 +1338,8 @@ static int dissect_batadv_batman_v10(tvbuff_t *tvb, int offset, packet_info *pin
 	batman_packeth->tq = tvb_get_guint8(tvb, offset+3);
 	batman_packeth->seqno = tvb_get_ntohl(tvb, offset+4);
 	TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+8, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->src, &batman_packeth->orig);
 	TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+14, 6);
 	batman_packeth->ttl = tvb_get_guint8(tvb, offset+20);
 	batman_packeth->num_tt = tvb_get_guint8(tvb, offset+21);
@@ -1434,8 +1434,8 @@ static int dissect_batadv_batman_v11(tvbuff_t *tvb, int offset, packet_info *pin
 	batman_packeth->tq = tvb_get_guint8(tvb, offset+3);
 	batman_packeth->seqno = tvb_get_ntohl(tvb, offset+4);
 	TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+8, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->src, &batman_packeth->orig);
 	TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+14, 6);
 	batman_packeth->ttl = tvb_get_guint8(tvb, offset+20);
 	batman_packeth->num_tt = tvb_get_guint8(tvb, offset+21);
@@ -1524,8 +1524,8 @@ static int dissect_batadv_batman_v14(tvbuff_t *tvb, int offset, packet_info *pin
 	batman_packeth->flags = tvb_get_guint8(tvb, offset+3);
 	batman_packeth->seqno = tvb_get_ntohl(tvb, offset+4);
 	TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+8, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig);
+	copy_address_shallow(&pinfo->src, &batman_packeth->orig);
 	TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+14, 6);
 	batman_packeth->gw_flags = tvb_get_guint8(tvb, offset+20);
 	batman_packeth->tq = tvb_get_guint8(tvb, offset+21);
@@ -1802,8 +1802,8 @@ static void dissect_batadv_bcast_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tre
 
 	bcast_packeth->version = tvb_get_guint8(tvb, 1);
 	TVB_SET_ADDRESS(&bcast_packeth->orig, AT_ETHER, tvb, 2, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &bcast_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &bcast_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &bcast_packeth->orig);
+	copy_address_shallow(&pinfo->src, &bcast_packeth->orig);
 	bcast_packeth->seqno = tvb_get_ntohs(tvb, 8);
 
 	/* Set info column */
@@ -1859,8 +1859,8 @@ static void dissect_batadv_bcast_v10(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
 	bcast_packeth->version = tvb_get_guint8(tvb, 1);
 	TVB_SET_ADDRESS(&bcast_packeth->orig, AT_ETHER, tvb, 2, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &bcast_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &bcast_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &bcast_packeth->orig);
+	copy_address_shallow(&pinfo->src, &bcast_packeth->orig);
 	bcast_packeth->ttl = tvb_get_guint8(tvb, 8);
 	bcast_packeth->seqno = tvb_get_ntohl(tvb, 9);
 
@@ -1925,8 +1925,8 @@ static void dissect_batadv_bcast_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 	bcast_packeth->reserved = tvb_get_guint8(tvb, 3);
 	bcast_packeth->seqno = tvb_get_ntohl(tvb, 4);
 	TVB_SET_ADDRESS(&bcast_packeth->orig, AT_ETHER, tvb, 8, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &bcast_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &bcast_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &bcast_packeth->orig);
+	copy_address_shallow(&pinfo->src, &bcast_packeth->orig);
 
 	/* Set info column */
 	col_add_fstr(pinfo->cinfo, COL_INFO, "Seq=%u", bcast_packeth->seqno);
@@ -2027,10 +2027,10 @@ static void dissect_batadv_icmp_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 	TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, 3, 6);
 	TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, 9, 6);
 
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &icmp_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &icmp_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &icmp_packeth->dst);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &icmp_packeth->dst);
+	copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig);
+	copy_address_shallow(&pinfo->src, &icmp_packeth->orig);
+	copy_address_shallow(&pinfo->dl_dst, &icmp_packeth->dst);
+	copy_address_shallow(&pinfo->dst, &icmp_packeth->dst);
 
 	icmp_packeth->ttl = tvb_get_guint8(tvb, 15);
 	icmp_packeth->uid = tvb_get_guint8(tvb, 16);
@@ -2155,10 +2155,10 @@ static void dissect_batadv_icmp_v7(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 	TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, 4, 6);
 	TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, 10, 6);
 
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &icmp_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &icmp_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &icmp_packeth->dst);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &icmp_packeth->dst);
+	copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig);
+	copy_address_shallow(&pinfo->src, &icmp_packeth->orig);
+	copy_address_shallow(&pinfo->dl_dst, &icmp_packeth->dst);
+	copy_address_shallow(&pinfo->dst, &icmp_packeth->dst);
 
 	icmp_packeth->seqno = tvb_get_ntohs(tvb, 16);
 	icmp_packeth->uid = tvb_get_guint8(tvb, 17);
@@ -2237,10 +2237,10 @@ static void dissect_batadv_icmp_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tre
 	TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, 4, 6);
 	TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, 10, 6);
 
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &icmp_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &icmp_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &icmp_packeth->dst);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &icmp_packeth->dst);
+	copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig);
+	copy_address_shallow(&pinfo->src, &icmp_packeth->orig);
+	copy_address_shallow(&pinfo->dl_dst, &icmp_packeth->dst);
+	copy_address_shallow(&pinfo->dst, &icmp_packeth->dst);
 
 	icmp_packeth->seqno = tvb_get_ntohs(tvb, 16);
 	icmp_packeth->uid = tvb_get_guint8(tvb, 17);
@@ -2362,16 +2362,16 @@ static void dissect_batadv_icmp_v15(tvbuff_t *tvb, packet_info *pinfo,
 	offset += 1;
 
 	TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, offset, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &icmp_packeth->dst);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &icmp_packeth->dst);
+	copy_address_shallow(&pinfo->dl_dst, &icmp_packeth->dst);
+	copy_address_shallow(&pinfo->dst, &icmp_packeth->dst);
 
 	proto_tree_add_item(batadv_icmp_tree, hf_batadv_icmp_dst, tvb, offset,
 			    6, ENC_NA);
 	offset += 6;
 
 	TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, offset, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &icmp_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &icmp_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig);
+	copy_address_shallow(&pinfo->src, &icmp_packeth->orig);
 	proto_tree_add_item(batadv_icmp_tree, hf_batadv_icmp_orig, tvb, offset,
 			    6, ENC_NA);
 	offset += 6;
@@ -2451,8 +2451,8 @@ static void dissect_batadv_unicast_v6(tvbuff_t *tvb, packet_info *pinfo, proto_t
 
 	unicast_packeth->version = tvb_get_guint8(tvb, 1);
 	TVB_SET_ADDRESS(&unicast_packeth->dest, AT_ETHER, tvb, 2, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_packeth->dest);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_packeth->dest);
+	copy_address_shallow(&pinfo->dl_dst, &unicast_packeth->dest);
+	copy_address_shallow(&pinfo->dst, &unicast_packeth->dest);
 
 	unicast_packeth->ttl = tvb_get_guint8(tvb, 8);
 
@@ -2513,8 +2513,8 @@ static void dissect_batadv_unicast_v14(tvbuff_t *tvb, packet_info *pinfo, proto_
 	unicast_packeth->ttl = tvb_get_guint8(tvb, 2);
 	unicast_packeth->ttvn = tvb_get_guint8(tvb, 3);
 	TVB_SET_ADDRESS(&unicast_packeth->dest, AT_ETHER, tvb, 4, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_packeth->dest);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_packeth->dest);
+	copy_address_shallow(&pinfo->dl_dst, &unicast_packeth->dest);
+	copy_address_shallow(&pinfo->dst, &unicast_packeth->dest);
 
 	/* Set info column */
 	col_clear(pinfo->cinfo, COL_INFO);
@@ -2600,12 +2600,12 @@ static void dissect_batadv_unicast_4addr_v14(tvbuff_t *tvb, packet_info *pinfo,
 	unicast_4addr_packeth->ttl = tvb_get_guint8(tvb, 2);
 	unicast_4addr_packeth->ttvn = tvb_get_guint8(tvb, 3);
 	TVB_SET_ADDRESS(&unicast_4addr_packeth->dest, AT_ETHER, tvb, 4, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_4addr_packeth->dest);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_4addr_packeth->dest);
+	copy_address_shallow(&pinfo->dl_dst, &unicast_4addr_packeth->dest);
+	copy_address_shallow(&pinfo->dst, &unicast_4addr_packeth->dest);
 
 	TVB_SET_ADDRESS(&unicast_4addr_packeth->src, AT_ETHER, tvb, 10, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_4addr_packeth->src);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_4addr_packeth->src);
+	copy_address_shallow(&pinfo->dl_src, &unicast_4addr_packeth->src);
+	copy_address_shallow(&pinfo->src, &unicast_4addr_packeth->src);
 	unicast_4addr_packeth->subtype = tvb_get_guint8(tvb, 16);
 	unicast_4addr_packeth->reserved = tvb_get_guint8(tvb, 17);
 
@@ -2708,13 +2708,13 @@ static void dissect_batadv_unicast_frag_v12(tvbuff_t *tvb, packet_info *pinfo, p
 
 	unicast_frag_packeth->version = tvb_get_guint8(tvb, 1);
 	TVB_SET_ADDRESS(&unicast_frag_packeth->dest, AT_ETHER, tvb, 2, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_frag_packeth->dest);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_frag_packeth->dest);
+	copy_address_shallow(&pinfo->dl_dst, &unicast_frag_packeth->dest);
+	copy_address_shallow(&pinfo->dst, &unicast_frag_packeth->dest);
 	unicast_frag_packeth->ttl = tvb_get_guint8(tvb, 8);
 	unicast_frag_packeth->flags = tvb_get_guint8(tvb, 9);
 	TVB_SET_ADDRESS(&unicast_frag_packeth->orig, AT_ETHER, tvb, 10, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_frag_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_frag_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &unicast_frag_packeth->orig);
+	copy_address_shallow(&pinfo->src, &unicast_frag_packeth->orig);
 	unicast_frag_packeth->seqno = tvb_get_ntohs(tvb, 16);
 
 	save_fragmented = pinfo->fragmented;
@@ -2802,13 +2802,13 @@ static void dissect_batadv_unicast_frag_v14(tvbuff_t *tvb, packet_info *pinfo, p
 	unicast_frag_packeth->ttl = tvb_get_guint8(tvb, 2);
 	unicast_frag_packeth->ttvn = tvb_get_guint8(tvb, 3);
 	TVB_SET_ADDRESS(&unicast_frag_packeth->dest, AT_ETHER, tvb, 4, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_frag_packeth->dest);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_frag_packeth->dest);
+	copy_address_shallow(&pinfo->dl_dst, &unicast_frag_packeth->dest);
+	copy_address_shallow(&pinfo->dst, &unicast_frag_packeth->dest);
 	unicast_frag_packeth->flags = tvb_get_guint8(tvb, 10);
 	unicast_frag_packeth->align = tvb_get_guint8(tvb, 11);
 	TVB_SET_ADDRESS(&unicast_frag_packeth->orig, AT_ETHER, tvb, 12, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_frag_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_frag_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &unicast_frag_packeth->orig);
+	copy_address_shallow(&pinfo->src, &unicast_frag_packeth->orig);
 	unicast_frag_packeth->seqno = tvb_get_ntohs(tvb, 18);
 
 	save_fragmented = pinfo->fragmented;
@@ -2946,15 +2946,15 @@ static void dissect_batadv_unicast_frag_v15(tvbuff_t *tvb, packet_info *pinfo,
 	offset += 1;
 
 	TVB_SET_ADDRESS(&unicast_frag_packeth->dest, AT_ETHER, tvb, offset, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_frag_packeth->dest);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_frag_packeth->dest);
+	copy_address_shallow(&pinfo->dl_dst, &unicast_frag_packeth->dest);
+	copy_address_shallow(&pinfo->dst, &unicast_frag_packeth->dest);
 	proto_tree_add_item(batadv_unicast_frag_tree, hf_batadv_unicast_frag_dst,
 			    tvb, offset, 6, ENC_NA);
 	offset += 6;
 
 	TVB_SET_ADDRESS(&unicast_frag_packeth->orig, AT_ETHER, tvb, offset, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_frag_packeth->orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_frag_packeth->orig);
+	copy_address_shallow(&pinfo->dl_src, &unicast_frag_packeth->orig);
+	copy_address_shallow(&pinfo->src, &unicast_frag_packeth->orig);
 	proto_tree_add_item(batadv_unicast_frag_tree, hf_batadv_unicast_frag_orig,
 			    tvb, offset, 6, ENC_NA);
 	offset += 6;
@@ -3054,12 +3054,12 @@ static void dissect_batadv_vis_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 	vis_packeth->ttl = tvb_get_guint8(tvb, 5);
 
 	TVB_SET_ADDRESS(&vis_packeth->vis_orig, AT_ETHER, tvb, 6, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &vis_packeth->vis_orig);
+	copy_address_shallow(&pinfo->src, &vis_packeth->vis_orig);
 	TVB_SET_ADDRESS(&vis_packeth->target_orig, AT_ETHER, tvb, 12, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &vis_packeth->target_orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &vis_packeth->target_orig);
+	copy_address_shallow(&pinfo->dl_dst, &vis_packeth->target_orig);
+	copy_address_shallow(&pinfo->dst, &vis_packeth->target_orig);
 	TVB_SET_ADDRESS(&vis_packeth->sender_orig, AT_ETHER, tvb, 18, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &vis_packeth->sender_orig);
+	copy_address_shallow(&pinfo->dl_src, &vis_packeth->sender_orig);
 
 
 	/* Set info column */
@@ -3173,12 +3173,12 @@ static void dissect_batadv_vis_v10(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 	vis_packeth->ttl = tvb_get_guint8(tvb, 8);
 
 	TVB_SET_ADDRESS(&vis_packeth->vis_orig, AT_ETHER, tvb, 9, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &vis_packeth->vis_orig);
+	copy_address_shallow(&pinfo->src, &vis_packeth->vis_orig);
 	TVB_SET_ADDRESS(&vis_packeth->target_orig, AT_ETHER, tvb, 15, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &vis_packeth->target_orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &vis_packeth->target_orig);
+	copy_address_shallow(&pinfo->dl_dst, &vis_packeth->target_orig);
+	copy_address_shallow(&pinfo->dst, &vis_packeth->target_orig);
     TVB_SET_ADDRESS(&vis_packeth->sender_orig, AT_ETHER, tvb, 21, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &vis_packeth->sender_orig);
+	copy_address_shallow(&pinfo->dl_src, &vis_packeth->sender_orig);
 
 
 	/* Set info column */
@@ -3269,12 +3269,12 @@ static void dissect_batadv_vis_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 	vis_packeth->reserved = tvb_get_guint8(tvb, 9);
 
 	TVB_SET_ADDRESS(&vis_packeth->vis_orig, AT_ETHER, tvb, 10, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &vis_packeth->vis_orig);
+	copy_address_shallow(&pinfo->src, &vis_packeth->vis_orig);
 	TVB_SET_ADDRESS(&vis_packeth->target_orig, AT_ETHER, tvb, 16, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &vis_packeth->target_orig);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &vis_packeth->target_orig);
+	copy_address_shallow(&pinfo->dl_dst, &vis_packeth->target_orig);
+	copy_address_shallow(&pinfo->dst, &vis_packeth->target_orig);
 	TVB_SET_ADDRESS(&vis_packeth->sender_orig, AT_ETHER, tvb, 22, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &vis_packeth->sender_orig);
+	copy_address_shallow(&pinfo->dl_src, &vis_packeth->sender_orig);
 
 	/* Set info column */
 	col_add_fstr(pinfo->cinfo, COL_INFO, "[%s] Seq=%u",
@@ -3413,12 +3413,12 @@ static void dissect_batadv_tt_query_v14(tvbuff_t *tvb, packet_info *pinfo _U_, p
 	tt_query_packeth->flags = tvb_get_guint8(tvb, 3);
 
 	TVB_SET_ADDRESS(&tt_query_packeth->dst, AT_ETHER, tvb, 4, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &tt_query_packeth->dst);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &tt_query_packeth->dst);
+	copy_address_shallow(&pinfo->dl_dst, &tt_query_packeth->dst);
+	copy_address_shallow(&pinfo->dst, &tt_query_packeth->dst);
 
 	TVB_SET_ADDRESS(&tt_query_packeth->src, AT_ETHER, tvb, 10, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &tt_query_packeth->src);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &tt_query_packeth->src);
+	copy_address_shallow(&pinfo->dl_src, &tt_query_packeth->src);
+	copy_address_shallow(&pinfo->src, &tt_query_packeth->src);
 
 	tt_query_packeth->ttvn = tvb_get_guint8(tvb, 16);
 	tt_query_packeth->tt_data = tvb_get_ntohs(tvb, 17);
@@ -3559,11 +3559,11 @@ static void dissect_batadv_roam_adv_v14(tvbuff_t *tvb, packet_info *pinfo, proto
 	roam_adv_packeth->version = tvb_get_guint8(tvb, 1);
 	roam_adv_packeth->ttl = tvb_get_guint8(tvb, 2);
 	TVB_SET_ADDRESS(&roam_adv_packeth->dst, AT_ETHER, tvb, 4, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &roam_adv_packeth->dst);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &roam_adv_packeth->dst);
+	copy_address_shallow(&pinfo->dl_dst, &roam_adv_packeth->dst);
+	copy_address_shallow(&pinfo->dst, &roam_adv_packeth->dst);
 	TVB_SET_ADDRESS(&roam_adv_packeth->src, AT_ETHER, tvb, 10, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &roam_adv_packeth->src);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &roam_adv_packeth->src);
+	copy_address_shallow(&pinfo->dl_src, &roam_adv_packeth->src);
+	copy_address_shallow(&pinfo->src, &roam_adv_packeth->src);
 	TVB_SET_ADDRESS(&roam_adv_packeth->client, AT_ETHER, tvb, 16, 6);
 
 	/* Set info column */
@@ -3685,15 +3685,15 @@ static void dissect_batadv_coded_v15(tvbuff_t *tvb, packet_info *pinfo,
 	offset += 1;
 
 	TVB_SET_ADDRESS(&coded_packeth->first_source, AT_ETHER, tvb, offset, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &coded_packeth->first_source);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &coded_packeth->first_source);
+	copy_address_shallow(&pinfo->dl_src, &coded_packeth->first_source);
+	copy_address_shallow(&pinfo->src, &coded_packeth->first_source);
 	proto_tree_add_item(batadv_coded_tree, hf_batadv_coded_first_source,
 			    tvb, offset, 6, ENC_NA);
 	offset += 6;
 
 	TVB_SET_ADDRESS(&coded_packeth->first_orig_dest, AT_ETHER, tvb, offset, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &coded_packeth->first_orig_dest);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &coded_packeth->first_orig_dest);
+	copy_address_shallow(&pinfo->dl_dst, &coded_packeth->first_orig_dest);
+	copy_address_shallow(&pinfo->dst, &coded_packeth->first_orig_dest);
 	proto_tree_add_item(batadv_coded_tree, hf_batadv_coded_first_orig_dest,
 			    tvb, offset, 6, ENC_NA);
 	offset += 6;
@@ -3826,15 +3826,15 @@ static void dissect_batadv_unicast_tvlv_v15(tvbuff_t *tvb, packet_info *pinfo,
 	offset += 1;
 
 	TVB_SET_ADDRESS(&unicast_tvlv_packeth->dest, AT_ETHER, tvb, offset, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_tvlv_packeth->dest);
-	COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_tvlv_packeth->dest);
+	copy_address_shallow(&pinfo->dl_dst, &unicast_tvlv_packeth->dest);
+	copy_address_shallow(&pinfo->dst, &unicast_tvlv_packeth->dest);
 	proto_tree_add_item(batadv_unicast_tvlv_tree, hf_batadv_unicast_tvlv_dst,
 			    tvb, offset, 6, ENC_NA);
 	offset += 6;
 
 	TVB_SET_ADDRESS(&unicast_tvlv_packeth->src, AT_ETHER, tvb, offset, 6);
-	COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_tvlv_packeth->src);
-	COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_tvlv_packeth->src);
+	copy_address_shallow(&pinfo->dl_src, &unicast_tvlv_packeth->src);
+	copy_address_shallow(&pinfo->src, &unicast_tvlv_packeth->src);
 	proto_tree_add_item(batadv_unicast_tvlv_tree, hf_batadv_unicast_tvlv_src,
 			    tvb, offset, 6, ENC_NA);
 	offset += 6;