commit f7f2a9feaa2cad8313afba53b53c32f1928f664c
author Gabriel Ganne <gabriel.ganne@enea.com> Mon Mar 06 15:19:40 2017 +0100
committer John Lo <loj@cisco.com> Tue Mar 07 21:34:44 2017 +0000
tree b300924abe7e74595861102e279028046b263325
parent 45e4f365086267ef2551b1dedf4e309bdd00a34a

fix gcc 5.4 warning: argument to 'sizeof' in 'memcpy' call is the same expression as the destination

warning translates as an invalid write :
sizeof(u8* b_dmac) == 8 != sizeof(eth_hdr->dst_address) == 6

~/vpp/build-data/../src/vnet/l2/l2_vtr.c: In function 'l2pbb_get':
~/vpp/build-data/../src/vnet/l2/l2_vtr.c:734:63: error: argument to 'sizeof' in 'memcpy' call is the same expression as the destination;
        did you mean to provide an explicit length?  [-Werror=sizeof-pointer-memaccess]
~/vpp/build-data/../src/vnet/l2/l2_vtr.c:736:63: error: argument to 'sizeof' in 'memcpy' call is the same expression as the destination;
        did you mean to provide an explicit length?  [-Werror=sizeof-pointer-memaccess]

update l2pbb_get to take an ethernet header instead of two u8* pointers
for source and dest mac addresses.

Change-Id: Ifcf1319a9e22614d57682f940e10f0420dc6fb8c
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>

src/vnet/l2/l2_vtr.c

diff --git a/src/vnet/l2/l2_vtr.c b/src/vnet/l2/l2_vtr.c
index e03a488..3c5365f 100644
--- a/src/vnet/l2/l2_vtr.c
+++ b/src/vnet/l2/l2_vtr.c
@@ -687,7 +687,7 @@
  */
 u32
 l2pbb_get (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 sw_if_index,
-	   u32 * vtr_op, u16 * outer_tag, u8 * b_dmac, u8 * b_smac,
+	   u32 * vtr_op, u16 * outer_tag, ethernet_header_t * eth_hdr,
 	   u16 * b_vlanid, u32 * i_sid)
 {
   u32 error = 1;
@@ -702,8 +702,6 @@
 
   *vtr_op = L2_VTR_DISABLED;
   *outer_tag = 0;
-  *b_dmac = 0;
-  *b_smac = 0;
   *b_vlanid = 0;
   *i_sid = 0;
 
@@ -731,16 +729,16 @@
       else if (in_config->push_bytes)
 	*vtr_op = L2_VTR_PUSH_2;
 
-      clib_memcpy (b_dmac, in_config->macs_tags.b_dst_address,
-		   sizeof (b_dmac));
-      clib_memcpy (b_smac, in_config->macs_tags.b_src_address,
-		   sizeof (b_smac));
+      clib_memcpy (&eth_hdr->dst_address, in_config->macs_tags.b_dst_address,
+		   sizeof (eth_hdr->dst_address));
+      clib_memcpy (&eth_hdr->src_address, in_config->macs_tags.b_src_address,
+		   sizeof (eth_hdr->src_address));
 
       *b_vlanid =
 	clib_host_to_net_u16 (in_config->macs_tags.priority_dei_id) & 0xFFF;
       *i_sid =
-	clib_host_to_net_u32 (in_config->
-			      macs_tags.priority_dei_uca_res_sid) & 0xFFFFF;
+	clib_host_to_net_u32 (in_config->macs_tags.
+			      priority_dei_uca_res_sid) & 0xFFFFF;
       error = 0;
     }
 done: