X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4_packet.h;h=513a7449b54b06c2475ed0d65ff0f2c7fd58ddf0;hb=a91cb4590;hp=fee0c8cbcd774cf44abcea84ff3053adf01a3a3d;hpb=9a0f2a5e7f678de58807fd49d47deec367656715;p=vpp.git

diff --git a/src/vnet/ip/ip4_packet.h b/src/vnet/ip/ip4_packet.h
index fee0c8cbcd7..513a7449b54 100644
--- a/src/vnet/ip/ip4_packet.h
+++ b/src/vnet/ip/ip4_packet.h
@@ -43,6 +43,7 @@
 #include <vnet/ip/ip_packet.h>	/* for ip_csum_t */
 #include <vnet/tcp/tcp_packet.h>	/* for tcp_header_t */
 #include <vppinfra/byte_order.h>	/* for clib_net_to_host_u16 */
+#include <vppinfra/warnings.h>	/* for WARN_OFF/WARN_ON macro */
 
 /* IP4 address which can be accessed either as 4 bytes
    or as a 32-bit number. */
@@ -197,8 +198,15 @@ ip4_next_header (ip4_header_t * i)
   return (void *) i + ip4_header_bytes (i);
 }
 
-always_inline u16
-ip4_header_checksum (ip4_header_t * i)
+/* Turn off array bounds check due to ip4_header_t
+   option field operations. */
+
+/* *INDENT-OFF* */
+WARN_OFF(array-bounds)
+/* *INDENT-ON* */
+
+static_always_inline u16
+ip4_header_checksum_inline (ip4_header_t * i, int with_checksum)
 {
   int option_len = (i->ip_version_and_header_length & 0xf) - 5;
   uword sum = 0;
@@ -207,7 +215,7 @@ ip4_header_checksum (ip4_header_t * i)
 
   sum += iphdr[0];
   sum += iphdr[1];
-  sum += *(u16 *) (iphdr + 2);
+  sum += with_checksum ? iphdr[2] : *(u16 *) (iphdr + 2);
   /* skip checksum */
   sum += iphdr[3];
   sum += iphdr[4];
@@ -248,7 +256,8 @@ ip4_header_checksum (ip4_header_t * i)
   sum += iphdr[2];
   sum += iphdr[3];
   sum += iphdr[4];
-  /* skip checksum */
+  if (with_checksum)
+    sum += iphdr[5];
   sum += iphdr[6];
   sum += iphdr[7];
   sum += iphdr[8];
@@ -297,6 +306,16 @@ ip4_header_checksum (ip4_header_t * i)
   return ~((u16) sum);
 }
 
+/* *INDENT-OFF* */
+WARN_ON(array-bounds)
+/* *INDENT-ON* */
+
+always_inline u16
+ip4_header_checksum (ip4_header_t * i)
+{
+  return ip4_header_checksum_inline (i, /* with_checksum */ 0);
+}
+
 always_inline void
 ip4_header_set_dscp (ip4_header_t * ip4, ip_dscp_t dscp)
 {
@@ -340,6 +359,18 @@ ip4_header_get_ecn (const ip4_header_t * ip4)
   return (ip4->tos & IP_PACKET_TC_FIELD_ECN_MASK);
 }
 
+always_inline u8
+ip4_header_get_ttl (const ip4_header_t *ip4)
+{
+  return (ip4->ttl);
+}
+
+always_inline void
+ip4_header_set_ttl (ip4_header_t *ip4, u8 ttl)
+{
+  ip4->ttl = ttl;
+}
+
 always_inline void
 ip4_header_set_df (ip4_header_t * ip4)
 {
@@ -364,7 +395,7 @@ ip4_header_get_df (const ip4_header_t * ip4)
 static inline uword
 ip4_header_checksum_is_valid (ip4_header_t * i)
 {
-  return i->checksum == ip4_header_checksum (i);
+  return ip4_header_checksum_inline (i, /* with_checksum */ 1) == 0;
 }
 
 #define ip4_partial_header_checksum_x1(ip0,sum0)			\