X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip.c;h=8959b4c09cc7ecf474018446972b954c29c815e9;hb=3ec09e9243dceb78e7548725281b0da8eddf72b1;hp=144bbcc405d8480aae95389210a4674fd55a416e;hpb=a46b4c9b5ed1d14719d1d33b4586ab83b1e8b976;p=vpp.git

diff --git a/src/vnet/ip/ip.c b/src/vnet/ip/ip.c
index 144bbcc405d..8959b4c09cc 100644
--- a/src/vnet/ip/ip.c
+++ b/src/vnet/ip/ip.c
@@ -70,7 +70,7 @@ ip_is_local (u32 fib_index, ip46_address_t * ip46_address, u8 is_ip4)
       prefix.fp_proto = FIB_PROTOCOL_IP6;
     }
 
-  clib_memcpy (&prefix.fp_addr, ip46_address, sizeof (ip46_address_t));
+  clib_memcpy_fast (&prefix.fp_addr, ip46_address, sizeof (ip46_address_t));
   fei = fib_table_lookup (fib_index, &prefix);
   flags = fib_entry_get_flags (fei);
 
@@ -83,7 +83,7 @@ ip_copy (ip46_address_t * dst, ip46_address_t * src, u8 is_ip4)
   if (is_ip4)
     dst->ip4.as_u32 = src->ip4.as_u32;
   else
-    clib_memcpy (&dst->ip6, &src->ip6, sizeof (ip6_address_t));
+    clib_memcpy_fast (&dst->ip6, &src->ip6, sizeof (ip6_address_t));
 }
 
 void
@@ -92,7 +92,8 @@ ip_set (ip46_address_t * dst, void *src, u8 is_ip4)
   if (is_ip4)
     dst->ip4.as_u32 = ((ip4_address_t *) src)->as_u32;
   else
-    clib_memcpy (&dst->ip6, (ip6_address_t *) src, sizeof (ip6_address_t));
+    clib_memcpy_fast (&dst->ip6, (ip6_address_t *) src,
+		      sizeof (ip6_address_t));
 }
 
 u8
@@ -162,119 +163,74 @@ ip_interface_get_first_ip (u32 sw_if_index, u8 is_ip4)
   return 0;
 }
 
-void
-ip4_address_normalize (ip4_address_t * ip4, u8 preflen)
+u8 *
+format_ip_address_family (u8 * s, va_list * args)
 {
-  ASSERT (preflen <= 32);
-  if (preflen == 0)
-    ip4->data_u32 = 0;
-  else
-    ip4->data_u32 &= clib_net_to_host_u32 (0xffffffff << (32 - preflen));
-}
+  ip_address_family_t af = va_arg (*args, int);	// int promo ip_address_family_t);
 
-void
-ip6_address_normalize (ip6_address_t * ip6, u8 preflen)
-{
-  ASSERT (preflen <= 128);
-  if (preflen == 0)
+  switch (af)
     {
-      ip6->as_u64[0] = 0;
-      ip6->as_u64[1] = 0;
+    case AF_IP4:
+      return (format (s, "ip4"));
+    case AF_IP6:
+      return (format (s, "ip6"));
     }
-  else if (preflen <= 64)
-    {
-      ip6->as_u64[0] &=
-	clib_host_to_net_u64 (0xffffffffffffffffL << (64 - preflen));
-      ip6->as_u64[1] = 0;
-    }
-  else
-    ip6->as_u64[1] &=
-      clib_host_to_net_u64 (0xffffffffffffffffL << (128 - preflen));
-}
 
-void
-ip4_preflen_to_mask (u8 pref_len, ip4_address_t * ip)
-{
-  if (pref_len == 0)
-    ip->as_u32 = 0;
-  else
-    ip->as_u32 = clib_host_to_net_u32 (~((1 << (32 - pref_len)) - 1));
-}
-
-u32
-ip4_mask_to_preflen (ip4_address_t * mask)
-{
-  if (mask->as_u32 == 0)
-    return 0;
-  return (32 - log2_first_set (clib_net_to_host_u32 (mask->as_u32)));
+  return (format (s, "unknown"));
 }
 
-void
-ip4_prefix_max_address_host_order (ip4_address_t * ip, u8 plen,
-				   ip4_address_t * res)
+uword
+unformat_ip_address_family (unformat_input_t * input, va_list * args)
 {
-  u32 not_mask;
-  not_mask = (1 << (32 - plen)) - 1;
-  res->as_u32 = clib_net_to_host_u32 (ip->as_u32) + not_mask;
-}
+  ip_address_family_t *af = va_arg (*args, ip_address_family_t *);
 
-void
-ip6_preflen_to_mask (u8 pref_len, ip6_address_t * mask)
-{
-  if (pref_len == 0)
+  if (unformat (input, "ip4") || unformat (input, "ipv4") ||
+      unformat (input, "IP4") || unformat (input, "IPv4"))
     {
-      mask->as_u64[0] = 0;
-      mask->as_u64[1] = 0;
+      *af = AF_IP4;
+      return (1);
     }
-  else if (pref_len <= 64)
-    {
-      mask->as_u64[0] =
-	clib_host_to_net_u64 (0xffffffffffffffffL << (64 - pref_len));
-      mask->as_u64[1] = 0;
-    }
-  else
+  else if (unformat (input, "ip6") || unformat (input, "ipv6") ||
+	   unformat (input, "IP6") || unformat (input, "IPv6"))
     {
-      mask->as_u64[1] =
-	clib_host_to_net_u64 (0xffffffffffffffffL << (128 - pref_len));
+      *af = AF_IP6;
+      return (1);
     }
+  return (0);
 }
 
-void
-ip6_prefix_max_address_host_order (ip6_address_t * ip, u8 plen,
-				   ip6_address_t * res)
+u8 *
+format_ip_dscp (u8 * s, va_list * va)
 {
-  u64 not_mask;
-  if (plen == 0)
-    {
-      res->as_u64[0] = 0xffffffffffffffffL;
-      res->as_u64[1] = 0xffffffffffffffffL;
-    }
-  else if (plen <= 64)
-    {
-      not_mask = ((u64) 1 << (64 - plen)) - 1;
-      res->as_u64[0] = clib_net_to_host_u64 (ip->as_u64[0]) + not_mask;
-      res->as_u64[1] = 0xffffffffffffffffL;
-    }
-  else
+  ip_dscp_t dscp = va_arg (*va, u32);	// int promotion of u8
+
+  switch (dscp)
     {
-      not_mask = ((u64) 1 << (128 - plen)) - 1;
-      res->as_u64[1] = clib_net_to_host_u64 (ip->as_u64[1]) + not_mask;
+#define _(n,v)                                                  \
+    case IP_DSCP_##v:                                           \
+      return (format (s, "%s", #v));
+      foreach_ip_dscp
+#undef _
     }
+
+  return (format (s, "unknown"));
 }
 
-u32
-ip6_mask_to_preflen (ip6_address_t * mask)
+u8 *
+format_ip_ecn (u8 * s, va_list * va)
 {
-  u8 first1, first0;
-  if (mask->as_u64[0] == 0 && mask->as_u64[1] == 0)
-    return 0;
-  first1 = log2_first_set (clib_net_to_host_u64 (mask->as_u64[1]));
-  first0 = log2_first_set (clib_net_to_host_u64 (mask->as_u64[0]));
+  ip_ecn_t ecn = va_arg (*va, u32);	// int promotion of u8
 
-  if (first1 != 0)
-    return 128 - first1;
-  else
-    return 64 - first0;
+  switch (ecn)
+    {
+#define _(n,v)                                                  \
+    case IP_ECN_##v:                                           \
+      return (format (s, "%s", #v));
+      foreach_ip_ecn
+#undef _
+    }
+
+  return (format (s, "unknown"));
 }
 
 /*