ipsec: esp-decrypt rework

[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 2fe3fa8..85d6f77 100644 (file)
--- a/src/vnet/vxlan-gbp/encap.c
+++ b/src/vnet/vxlan-gbp/encap.c
@@ -63,8 +63,9 @@ format_vxlan_gbp_encap_trace (u8 * s, va_list * args)
 
   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);
+           "VXLAN_GBP encap to vxlan_gbp_tunnel%d vni %d sclass %d flags %U",
+           t->tunnel_index, t->vni, t->sclass,
+           format_vxlan_gbp_header_gpflags, t->flags);
   return s;
 }
 #endif /* CLIB_MARCH_VARIANT */
@@ -97,7 +98,6 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
 
   u8 const underlay_hdr_len = is_ip4 ?
     sizeof (ip4_vxlan_gbp_header_t) : sizeof (ip6_vxlan_gbp_header_t);
-  u8 const rw_hdr_offset = sizeof t0->rewrite_data - underlay_hdr_len;
   u16 const l3_len = is_ip4 ? sizeof (ip4_header_t) : sizeof (ip6_header_t);
   u32 const csum_flags = is_ip4 ?
     VNET_BUFFER_F_OFFLOAD_IP_CKSUM | VNET_BUFFER_F_IS_IP4 |
@@ -176,6 +176,9 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
 
          ASSERT (t0->rewrite_header.data_bytes == underlay_hdr_len);
          ASSERT (t1->rewrite_header.data_bytes == underlay_hdr_len);
+         vnet_rewrite_two_headers (*t0, *t1, vlib_buffer_get_current (b0),
+                                   vlib_buffer_get_current (b1),
+                                   underlay_hdr_len);
 
          vlib_buffer_advance (b0, -underlay_hdr_len);
          vlib_buffer_advance (b1, -underlay_hdr_len);
@@ -188,16 +191,6 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
          void *underlay0 = vlib_buffer_get_current (b0);
          void *underlay1 = vlib_buffer_get_current (b1);
 
-         /* 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_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;
          ip6_header_t *ip6_0, *ip6_1;
@@ -370,17 +363,12 @@ vxlan_gbp_encap_inline (vlib_main_t * vm,
          vnet_buffer (b0)->ip.adj_index[VLIB_TX] = dpoi_idx0;
 
          ASSERT (t0->rewrite_header.data_bytes == underlay_hdr_len);
+         vnet_rewrite_one_header (*t0, vlib_buffer_get_current (b0),
+                                  underlay_hdr_len);
 
          vlib_buffer_advance (b0, -underlay_hdr_len);
          void *underlay0 = vlib_buffer_get_current (b0);
 
-         /* 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_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);