X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fesp_encrypt.c;h=4793fddcd5aada7afe7940fd08b4492aa9b1c95b;hb=b0d2eda75a268f6afc2b08080a3e00b0a3295702;hp=e06babd92ef2f9e1c526dd53f1435c48347b4d30;hpb=5484daa001ccbbbf8773b273f428dbcddc4750cc;p=vpp.git

diff --git a/src/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c
index e06babd92ef..4793fddcd5a 100644
--- a/src/vnet/ipsec/esp_encrypt.c
+++ b/src/vnet/ipsec/esp_encrypt.c
@@ -463,6 +463,7 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	  u8 *l2_hdr, l2_len, *ip_hdr, ip_len;
 	  ip6_ext_header_t *ext_hdr;
 	  udp_header_t *udp = 0;
+	  u16 udp_len = 0;
 	  u8 *old_ip_hdr = vlib_buffer_get_current (b[0]);
 
 	  ip_len = is_ip6 ?
@@ -537,7 +538,7 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 	      if (udp)
 		{
 		  esp_update_ip4_hdr (ip4, len, /* is_transport */ 1, 1);
-		  esp_fill_udp_hdr (sa0, udp, len - ip_len);
+		  udp_len = len - ip_len;
 		}
 	      else
 		esp_update_ip4_hdr (ip4, len, /* is_transport */ 1, 0);
@@ -545,6 +546,11 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 	  clib_memcpy_le64 (ip_hdr, old_ip_hdr, ip_len);
 
+	  if (udp)
+	    {
+	      esp_fill_udp_hdr (sa0, udp, udp_len);
+	    }
+
 	  if (!is_tun)
 	    next[0] = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT;
 	}