X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4_packet.h;h=fa86229a073f3456b690e79aa2635f7280e599f5;hb=d69f4396bfe6b41ca04b7fc1496475f0a635b0da;hp=b2c1fcd49c171b398a46a184716b10c0ce046769;hpb=68b0fb0c620c7451ef1a6380c43c39de6614db51;p=vpp.git

diff --git a/src/vnet/ip/ip4_packet.h b/src/vnet/ip/ip4_packet.h
index b2c1fcd49c1..fa86229a073 100644
--- a/src/vnet/ip/ip4_packet.h
+++ b/src/vnet/ip/ip4_packet.h
@@ -52,6 +52,7 @@ typedef union
   u32 data_u32;
   /* Aliases. */
   u8 as_u8[4];
+  u16 as_u16[2];
   u32 as_u32;
 } ip4_address_t;
 
@@ -63,8 +64,8 @@ typedef struct
 } ip4_address_fib_t;
 
 always_inline void
-ip4_addr_fib_init (ip4_address_fib_t * addr_fib, ip4_address_t * address,
-		   u32 fib_index)
+ip4_addr_fib_init (ip4_address_fib_t * addr_fib,
+		   const ip4_address_t * address, u32 fib_index)
 {
   clib_memcpy (&addr_fib->ip4_addr, address, sizeof (addr_fib->ip4_addr));
   addr_fib->fib_index = fib_index;
@@ -76,9 +77,14 @@ typedef struct
   ip4_address_t src, dst;
 } ip4_address_pair_t;
 
+typedef struct
+{
+  ip4_address_t addr, mask;
+} ip4_address_and_mask_t;
+
 /* If address is a valid netmask, return length of mask. */
 always_inline uword
-ip4_address_netmask_length (ip4_address_t * a)
+ip4_address_netmask_length (const ip4_address_t * a)
 {
   uword result = 0;
   uword i;
@@ -187,28 +193,30 @@ typedef union
 #define IP4_VERSION_AND_HEADER_LENGTH_NO_OPTIONS \
   ((4 << 4) | (sizeof (ip4_header_t) / sizeof (u32)))
 
+#define IP4_ROUTER_ALERT_OPTION 20
+
 always_inline int
-ip4_get_fragment_offset (ip4_header_t * i)
+ip4_get_fragment_offset (const ip4_header_t * i)
 {
   return clib_net_to_host_u16 (i->flags_and_fragment_offset) & 0x1fff;
 }
 
 always_inline int
-ip4_get_fragment_more (ip4_header_t * i)
+ip4_get_fragment_more (const ip4_header_t * i)
 {
   return clib_net_to_host_u16 (i->flags_and_fragment_offset) &
     IP4_HEADER_FLAG_MORE_FRAGMENTS;
 }
 
 always_inline int
-ip4_is_fragment (ip4_header_t * i)
+ip4_is_fragment (const ip4_header_t * i)
 {
   return (i->flags_and_fragment_offset &
 	  clib_net_to_host_u16 (0x1fff | IP4_HEADER_FLAG_MORE_FRAGMENTS));
 }
 
 always_inline int
-ip4_is_first_fragment (ip4_header_t * i)
+ip4_is_first_fragment (const ip4_header_t * i)
 {
   return (i->flags_and_fragment_offset &
 	  clib_net_to_host_u16 (0x1fff | IP4_HEADER_FLAG_MORE_FRAGMENTS)) ==
@@ -217,13 +225,13 @@ ip4_is_first_fragment (ip4_header_t * i)
 
 /* Fragment offset in bytes. */
 always_inline int
-ip4_get_fragment_offset_bytes (ip4_header_t * i)
+ip4_get_fragment_offset_bytes (const ip4_header_t * i)
 {
   return 8 * ip4_get_fragment_offset (i);
 }
 
 always_inline int
-ip4_header_bytes (ip4_header_t * i)
+ip4_header_bytes (const ip4_header_t * i)
 {
   return sizeof (u32) * (i->ip_version_and_header_length & 0xf);
 }
@@ -306,7 +314,7 @@ do {									\
 } while (0)
 
 always_inline uword
-ip4_address_is_multicast (ip4_address_t * a)
+ip4_address_is_multicast (const ip4_address_t * a)
 {
   return (a->data[0] & 0xf0) == 0xe0;
 }
@@ -320,9 +328,10 @@ ip4_multicast_address_set_for_group (ip4_address_t * a,
 }
 
 always_inline void
-ip4_multicast_ethernet_address (u8 * ethernet_address, ip4_address_t * a)
+ip4_multicast_ethernet_address (u8 * ethernet_address,
+				const ip4_address_t * a)
 {
-  u8 *d = a->as_u8;
+  const u8 *d = a->as_u8;
 
   ethernet_address[0] = 0x01;
   ethernet_address[1] = 0x00;