VPP-414: Fixed IPSec transport mode in esp_encrypt.c

[vpp.git] / vnet / vnet / ipsec / esp_encrypt.c

diff --git a/vnet/vnet/ipsec/esp_encrypt.c b/vnet/vnet/ipsec/esp_encrypt.c
index 0516d43..ba7579d 100644 (file)
--- a/vnet/vnet/ipsec/esp_encrypt.c
+++ b/vnet/vnet/ipsec/esp_encrypt.c
@@ -202,6 +202,8 @@ esp_encrypt_node_fn (vlib_main_t * vm,
                                           ESP_ENCRYPT_ERROR_SEQ_CYCLED, 1);
              //TODO: rekey SA
              o_bi0 = i_bi0;
+             to_next[0] = o_bi0;
+             to_next += 1;
              goto trace;
            }
 
@@ -297,13 +299,15 @@ esp_encrypt_node_fn (vlib_main_t * vm,
            }
          else
            {
-             vlib_buffer_advance (i_b0, ip_hdr_size);
              next_hdr_type = ip_proto;
              if (vnet_buffer (i_b0)->sw_if_index[VLIB_TX] != ~0)
                {
                  transport_mode = 1;
                  ethernet_header_t *ieh0, *oeh0;
-                 ieh0 = (ethernet_header_t *) i_b0->data;
+                 ieh0 =
+                   (ethernet_header_t *) ((u8 *)
+                                          vlib_buffer_get_current (i_b0) -
+                                          sizeof (ethernet_header_t));
                  oeh0 = (ethernet_header_t *) o_b0->data;
                  clib_memcpy (oeh0, ieh0, sizeof (ethernet_header_t));
                  next0 = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT;
@@ -313,6 +317,7 @@ esp_encrypt_node_fn (vlib_main_t * vm,
                  vnet_buffer (o_b0)->output_features.bitmap =
                    vnet_buffer (i_b0)->output_features.bitmap;
                }
+             vlib_buffer_advance (i_b0, ip_hdr_size);
            }
 
          ASSERT (sa0->crypto_alg < IPSEC_CRYPTO_N_ALG);