X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fesp_encrypt.c;h=e06babd92ef2f9e1c526dd53f1435c48347b4d30;hb=5cd31ec9405d2bb2fbc8152a08c4cfb64f2a8e73;hp=2c4da5dafa83804fb9ba112bb2fba5c00ad485d7;hpb=efcad1a9d22c4a664f3004cafe09d9c3a68e1620;p=vpp.git

diff --git a/src/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c
index 2c4da5dafa8..e06babd92ef 100644
--- a/src/vnet/ipsec/esp_encrypt.c
+++ b/src/vnet/ipsec/esp_encrypt.c
@@ -23,6 +23,7 @@
 #include <vnet/crypto/crypto.h>
 
 #include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/ipsec_tun.h>
 #include <vnet/ipsec/esp.h>
 
 #define foreach_esp_encrypt_next                   \
@@ -319,13 +320,11 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       if (is_tun)
 	{
 	  /* we are on a ipsec tunnel's feature arc */
-	  u32 next0;
 	  config_index = b[0]->current_config_index;
-	  sa_index0 = *(u32 *) vnet_feature_next_with_data (&next0, b[0],
-							    sizeof
-							    (sa_index0));
-	  vnet_buffer (b[0])->ipsec.sad_index = sa_index0;
-	  next[0] = next0;
+	  vnet_feature_next_u16 (&next[0], b[0]);
+	  vnet_buffer (b[0])->ipsec.sad_index =
+	    sa_index0 = ipsec_tun_protect_get_sa_out
+	    (vnet_buffer (b[0])->ip.adj_index[VLIB_TX]);
 	}
       else
 	sa_index0 = vnet_buffer (b[0])->ipsec.sad_index;