X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip.c;h=88eff4f4d59f877058b02b1b3208877ffe3bc385;hb=9534696b4;hp=0c4687d81a1dddd21165294dfc85702d93d62fbe;hpb=7999e83a41ebad8a3f02cfcb2809cdb3aae919ba;p=vpp.git

diff --git a/src/vnet/ip/ip.c b/src/vnet/ip/ip.c
index 0c4687d81a1..88eff4f4d59 100644
--- a/src/vnet/ip/ip.c
+++ b/src/vnet/ip/ip.c
@@ -31,7 +31,21 @@ ip_is_local_host (ip46_address_t * ip46_address, u8 is_ip4)
   if (is_ip4)
     return (ip46_address->ip4.as_u8[0] == 127);
   else
-    return (ip46_address->as_u64[0] == 0 && ip46_address->as_u64[1] == 1);
+    return (ip46_address->as_u64[0] == 0 &&
+	    clib_net_to_host_u64 (ip46_address->as_u64[1]) == 1);
+}
+
+u8
+ip4_is_local_host (ip4_address_t * ip4_address)
+{
+  return (ip4_address->as_u8[0] == 127);
+}
+
+u8
+ip6_is_local_host (ip6_address_t * ip6_address)
+{
+  return (ip6_address->as_u64[0] == 0 &&
+	  clib_net_to_host_u64 (ip6_address->as_u64[1]) == 1);
 }
 
 /**
@@ -56,8 +70,8 @@ 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));
-  fei = fib_table_lookup (0, &prefix);
+  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);
 
   return (flags & FIB_ENTRY_FLAG_LOCAL);
@@ -69,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
@@ -78,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
@@ -220,6 +235,7 @@ ip6_preflen_to_mask (u8 pref_len, ip6_address_t * mask)
     }
   else
     {
+      mask->as_u64[0] = 0xffffffffffffffffL;
       mask->as_u64[1] =
 	clib_host_to_net_u64 (0xffffffffffffffffL << (128 - pref_len));
     }
@@ -254,8 +270,8 @@ ip6_mask_to_preflen (ip6_address_t * mask)
   u8 first1, first0;
   if (mask->as_u64[0] == 0 && mask->as_u64[1] == 0)
     return 0;
-  first1 = log2_first_set (mask->as_u64[1]);
-  first0 = log2_first_set (mask->as_u64[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]));
 
   if (first1 != 0)
     return 128 - first1;
@@ -263,6 +279,56 @@ ip6_mask_to_preflen (ip6_address_t * mask)
     return 64 - first0;
 }
 
+u8 *
+format_ip_address_family (u8 * s, va_list * args)
+{
+  ip_address_family_t af = va_arg (*args, ip_address_family_t);
+
+  switch (af)
+    {
+    case AF_IP4:
+      return (format (s, "ip4"));
+    case AF_IP6:
+      return (format (s, "ip6"));
+    }
+
+  return (format (s, "unknown"));
+}
+
+u8 *
+format_ip_dscp (u8 * s, va_list * va)
+{
+  ip_dscp_t dscp = va_arg (*va, u32);	// int promotion of u8
+
+  switch (dscp)
+    {
+#define _(n,v)                                                  \
+    case IP_DSCP_##v:                                           \
+      return (format (s, "%s", #v));
+      foreach_ip_dscp
+#undef _
+    }
+
+  return (format (s, "unknown"));
+}
+
+u8 *
+format_ip_ecn (u8 * s, va_list * va)
+{
+  ip_ecn_t ecn = va_arg (*va, u32);	// int promotion of u8
+
+  switch (ecn)
+    {
+#define _(n,v)                                                  \
+    case IP_ECN_##v:                                           \
+      return (format (s, "%s", #v));
+      foreach_ip_ecn
+#undef _
+    }
+
+  return (format (s, "unknown"));
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *