X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fesp_encrypt.c;h=fc1fe392f161dd24601fbb275acaca5a57db211d;hb=1e3aa5e213c23588981ee17d1413a0441a40527a;hp=ebcf0ed8e085016d0c2dda2f6c9b943d6df6dc35;hpb=25edf14369b27ab3dfcda14b69dc53148c9ccf7e;p=vpp.git

diff --git a/src/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c
index ebcf0ed8e08..fc1fe392f16 100644
--- a/src/vnet/ipsec/esp_encrypt.c
+++ b/src/vnet/ipsec/esp_encrypt.c
@@ -330,7 +330,8 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	      hdr_len += len;
 	      ip6 = (ip6_header_t *) (payload - hdr_len);
 	      clib_memcpy_fast (ip6, &sa0->ip6_hdr, len);
-	      *next_hdr_ptr = IP_PROTOCOL_IPV6;
+	      *next_hdr_ptr = (is_ip6 ?
+			       IP_PROTOCOL_IPV6 : IP_PROTOCOL_IP_IN_IP);
 	      len = payload_len + hdr_len - len;
 	      ip6->payload_length = clib_net_to_host_u16 (len);
 	    }
@@ -341,7 +342,8 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	      hdr_len += len;
 	      ip4 = (ip4_header_t *) (payload - hdr_len);
 	      clib_memcpy_fast (ip4, &sa0->ip4_hdr, len);
-	      *next_hdr_ptr = IP_PROTOCOL_IP_IN_IP;
+	      *next_hdr_ptr = (is_ip6 ?
+			       IP_PROTOCOL_IPV6 : IP_PROTOCOL_IP_IN_IP);
 	      len = payload_len + hdr_len;
 	      esp_update_ip4_hdr (ip4, len, /* is_transport */ 0, 0);
 	    }
@@ -449,7 +451,7 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	  op->len = payload_len - icv_sz + iv_sz + sizeof (esp_header_t);
 	  op->flags = 0;
 	  op->user_data = b - bufs;
-	  if (ipsec_sa_is_set_USE_EXTENDED_SEQ_NUM (sa0))
+	  if (ipsec_sa_is_set_USE_ESN (sa0))
 	    {
 	      u32 seq_hi = clib_net_to_host_u32 (sa0->seq_hi);
 	      clib_memcpy_fast (op->dst, &seq_hi, sizeof (seq_hi));