Typos. A bunch of typos I've been collecting.

[vpp.git] / src / vnet / ip / ip6_packet.h

diff --git a/src/vnet/ip/ip6_packet.h b/src/vnet/ip/ip6_packet.h
index 6207400..abbea5c 100644 (file)
--- a/src/vnet/ip/ip6_packet.h
+++ b/src/vnet/ip/ip6_packet.h
@@ -93,6 +93,8 @@ typedef CLIB_PACKED (union {
 #define ip46_address_is_zero(ip46)     (((ip46)->as_u64[0] == 0) && ((ip46)->as_u64[1] == 0))
 #define ip46_address_is_equal(a1, a2)  (((a1)->as_u64[0] == (a2)->as_u64[0]) \
                                          && ((a1)->as_u64[1] == (a2)->as_u64[1]))
+#define ip46_address_initializer {{{ 0 }}}
+
 static_always_inline void
 ip46_address_copy (ip46_address_t * dst, const ip46_address_t * src)
 {
@@ -100,7 +102,12 @@ ip46_address_copy (ip46_address_t * dst, const ip46_address_t * src)
   dst->as_u64[1] = src->as_u64[1];
 }
 
-#define ip46_address_initializer {{{ 0 }}}
+static_always_inline void
+ip46_address_set_ip6 (ip46_address_t * dst, const ip6_address_t * src)
+{
+  dst->as_u64[0] = src->as_u64[0];
+  dst->as_u64[1] = src->as_u64[1];
+}
 
 always_inline ip46_address_t
 to_ip46 (u32 is_ipv6, u8 * buf)
@@ -174,6 +181,13 @@ ip46_address_is_multicast (const ip46_address_t * a)
     ip6_address_is_multicast (&a->ip6);
 }
 
+always_inline void
+ip6_address_copy (ip6_address_t * dst, const ip6_address_t * src)
+{
+  dst->as_u64[0] = src->as_u64[0];
+  dst->as_u64[1] = src->as_u64[1];
+}
+
 always_inline void
 ip6_set_reserved_multicast_address (ip6_address_t * a,
                                    ip6_multicast_address_scope_t scope,
@@ -273,7 +287,7 @@ ip6_address_mask_from_width (ip6_address_t * a, u32 width)
 {
   int i, byte, bit, bitnum;
   ASSERT (width <= 128);
-  memset (a, 0, sizeof (a[0]));
+  clib_memset (a, 0, sizeof (a[0]));
   for (i = 0; i < width; i++)
     {
       bitnum = (7 - (i & 7));
@@ -340,6 +354,18 @@ ip6_is_solicited_node_multicast_address (const ip6_address_t * a)
          && a->as_u8[12] == 0xff);
 }
 
+always_inline u32
+ip6_address_hash_to_u32 (const ip6_address_t * a)
+{
+  return (a->as_u32[0] ^ a->as_u32[1] ^ a->as_u32[2] ^ a->as_u32[3]);
+}
+
+always_inline u64
+ip6_address_hash_to_u64 (const ip6_address_t * a)
+{
+  return (a->as_u64[0] ^ a->as_u64[1]);
+}
+
 typedef struct
 {
   /* 4 bit version, 8 bit traffic class and 20 bit flow label. */
@@ -487,16 +513,36 @@ typedef CLIB_PACKED (struct {
   u8 n_data_u64s;
 }) ip6_ext_header_t;
 
+#define foreach_ext_hdr_type \
+  _(IP6_HOP_BY_HOP_OPTIONS) \
+  _(IPV6_ROUTE) \
+  _(IPV6_FRAGMENTATION) \
+  _(IPSEC_ESP) \
+  _(IPSEC_AH) \
+  _(IP6_DESTINATION_OPTIONS) \
+  _(MOBILITY) \
+  _(HIP) \
+  _(SHIM6)
+
 always_inline u8 ip6_ext_hdr(u8 nexthdr)
 {
+#ifdef CLIB_HAVE_VEC128
+  static const u8x16 ext_hdr_types = {
+#define _(x) IP_PROTOCOL_##x,
+ foreach_ext_hdr_type
+#undef _
+  };
+
+  return !u8x16_is_all_zero (ext_hdr_types == u8x16_splat (nexthdr));
+#else
   /*
    * find out if nexthdr is an extension header or a protocol
    */
-  return   (nexthdr == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS) ||
-    (nexthdr == IP_PROTOCOL_IPV6_FRAGMENTATION)  ||
-    (nexthdr == IP_PROTOCOL_IPSEC_AH)      ||
-    (nexthdr == IP_PROTOCOL_IPV6_ROUTE)      ||
-    (nexthdr == IP_PROTOCOL_IP6_DESTINATION_OPTIONS);
+  return   0
+#define _(x) || (nexthdr == IP_PROTOCOL_##x)
+ foreach_ext_hdr_type;
+#undef _
+#endif
 }
 
 #define ip6_ext_header_len(p)  ((((ip6_ext_header_t *)(p))->n_data_u64s+1) << 3)