bonding: support custom interface IDs

[vpp.git] / src / vnet / vxlan-gbp / encap.c

diff --git a/src/vnet/vxlan-gbp/encap.c b/src/vnet/vxlan-gbp/encap.c
index 07142c8..f1b839c 100644 (file)
--- a/src/vnet/vxlan-gbp/encap.c
+++ b/src/vnet/vxlan-gbp/encap.c
@@ -50,6 +50,7 @@ typedef struct
   u32 tunnel_index;
   u32 vni;
   u16 sclass;
+  u8 flags;
 } vxlan_gbp_encap_trace_t;
 
 u8 *
@@ -59,8 +60,10 @@ format_vxlan_gbp_encap_trace (u8 * s, va_list * args)
   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;
 }
 
@@ -186,10 +189,12 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
          /* vnet_rewrite_two_header writes only in (uword) 8 bytes chunks
           * and discards the first 4 bytes of the (36 bytes ip4 underlay)  rewrite
           * use memcpy as a workaround */
-         clib_memcpy (underlay0, t0->rewrite_header.data + rw_hdr_offset,
-                      underlay_hdr_len);
-         clib_memcpy (underlay1, t1->rewrite_header.data + rw_hdr_offset,
-                      underlay_hdr_len);
+         clib_memcpy_fast (underlay0,
+                           t0->rewrite_header.data + rw_hdr_offset,
+                           underlay_hdr_len);
+         clib_memcpy_fast (underlay1,
+                           t1->rewrite_header.data + rw_hdr_offset,
+                           underlay_hdr_len);
 
          ip4_header_t *ip4_0, *ip4_1;
          qos_bits_t ip4_0_tos = 0, ip4_1_tos = 0;
@@ -320,6 +325,7 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
              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))
@@ -329,6 +335,7 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
              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,
@@ -368,8 +375,9 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
          /* vnet_rewrite_one_header writes only in (uword) 8 bytes chunks
           * and discards the first 4 bytes of the (36 bytes ip4 underlay)  rewrite
           * use memcpy as a workaround */
-         clib_memcpy (underlay0, t0->rewrite_header.data + rw_hdr_offset,
-                      underlay_hdr_len);
+         clib_memcpy_fast (underlay0,
+                           t0->rewrite_header.data + rw_hdr_offset,
+                           underlay_hdr_len);
 
          u32 len0 = vlib_buffer_length_in_chain (vm, b0);
          u16 payload_l0 = clib_host_to_net_u16 (len0 - l3_len);
@@ -462,6 +470,7 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
              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,