commit 45db885a6a050aa809ae333bf6c14349db644822
author Neale Ranns <nranns@cisco.com> Wed Jan 09 00:04:04 2019 -0800
committer Neale Ranns <nranns@cisco.com> Thu Jan 10 13:29:33 2019 +0000
tree e58cbf714460230cc842185992d4a2720ccca83b
parent e33cab390705f7fd24cf9443a18a96a4e309707d

ARP/ND: copy opaque2 persistent fields to new packet

Change-Id: Ic65f686aaccaf8450732d88d7471b587faccaa9d
Signed-off-by: Neale Ranns <nranns@cisco.com>

src/vnet/vxlan-gbp/encap.c

diff --git a/src/vnet/vxlan-gbp/encap.c b/src/vnet/vxlan-gbp/encap.c
index d260ccc..f1b839c 100644
--- a/src/vnet/vxlan-gbp/encap.c
+++ b/src/vnet/vxlan-gbp/encap.c
@@ -50,6 +50,7 @@
   u32 tunnel_index;
   u32 vni;
   u16 sclass;
+  u8 flags;
 } vxlan_gbp_encap_trace_t;
 
 u8 *
@@ -59,8 +60,10 @@
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
   vxlan_gbp_encap_trace_t *t = va_arg (*args, vxlan_gbp_encap_trace_t *);
 
-  s = format (s, "VXLAN_GBP encap to vxlan_gbp_tunnel%d vni %d sclass %d",
-	      t->tunnel_index, t->vni, t->sclass);
+  s =
+    format (s,
+	    "VXLAN_GBP encap to vxlan_gbp_tunnel%d vni %d sclass %d flags %d",
+	    t->tunnel_index, t->vni, t->sclass, t->flags);
   return s;
 }
 
@@ -322,6 +325,7 @@
 	      tr->tunnel_index = t0 - vxm->tunnels;
 	      tr->vni = t0->vni;
 	      tr->sclass = vnet_buffer2 (b0)->gbp.src_epg;
+	      tr->flags = vnet_buffer2 (b0)->gbp.flags;
 	    }
 
 	  if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
@@ -331,6 +335,7 @@
 	      tr->tunnel_index = t1 - vxm->tunnels;
 	      tr->vni = t1->vni;
 	      tr->sclass = vnet_buffer2 (b1)->gbp.src_epg;
+	      tr->flags = vnet_buffer2 (b1)->gbp.flags;
 	    }
 
 	  vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
@@ -465,6 +470,7 @@
 	      tr->tunnel_index = t0 - vxm->tunnels;
 	      tr->vni = t0->vni;
 	      tr->sclass = vnet_buffer2 (b0)->gbp.src_epg;
+	      tr->flags = vnet_buffer2 (b0)->gbp.flags;
 	    }
 	  vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
 					   to_next, n_left_to_next,