From: Florin Coras <fcoras@cisco.com>
Date: Tue, 23 Jun 2020 21:11:01 +0000 (-0700)
Subject: udp: jump over ip4 options
X-Git-Tag: v21.01-rc0~253
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=9c8142a43c503276f97666cb8d34b39e382f82d6;p=vpp.git

udp: jump over ip4 options

Type: improvement

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I4f57a776302e11815fcea433ba8cf6724799ff65
---

diff --git a/src/vnet/udp/udp_local.c b/src/vnet/udp/udp_local.c
index 1451cc3a0ad..8efcda1da14 100644
--- a/src/vnet/udp/udp_local.c
+++ b/src/vnet/udp/udp_local.c
@@ -113,8 +113,8 @@ udp46_local_inline (vlib_main_t * vm,
 	  /* ip4/6_local hands us the ip header, not the udp header */
 	  if (is_ip4)
 	    {
-	      advance0 = sizeof (ip4_header_t);
-	      advance1 = sizeof (ip4_header_t);
+	      advance0 = ip4_header_bytes (vlib_buffer_get_current (b0));
+	      advance1 = ip4_header_bytes (vlib_buffer_get_current (b1));
 	    }
 	  else
 	    {
@@ -291,7 +291,7 @@ udp46_local_inline (vlib_main_t * vm,
 
 	  /* ip4/6_local hands us the ip header, not the udp header */
 	  if (is_ip4)
-	    advance0 = sizeof (ip4_header_t);
+	    advance0 = ip4_header_bytes (vlib_buffer_get_current (b0));
 	  else
 	    advance0 = sizeof (ip6_header_t);