nat: adding docs for nat44-ed sub plugin

[vpp.git] / src / vat / ip_types.c

diff --git a/src/vat/ip_types.c b/src/vat/ip_types.c
index cd08c54..cdfcbc0 100644 (file)
--- a/src/vat/ip_types.c
+++ b/src/vat/ip_types.c
@@ -42,14 +42,15 @@ unformat_ip_address (unformat_input_t * input, va_list * args)
 {
   ip_address_t *a = va_arg (*args, ip_address_t *);
 
-  clib_memset (a, 0, sizeof (*a));
-  if (unformat (input, "%U", unformat_ip4_address, &ip_addr_v4 (a)))
-    ip_addr_version (a) = AF_IP4;
-  else if (unformat_user (input, unformat_ip6_address, &ip_addr_v6 (a)))
-    ip_addr_version (a) = AF_IP6;
-  else
-    return 0;
-  return 1;
+  if (unformat_user (input, unformat_ip46_address, &ip_addr_46 (a),
+                    IP46_TYPE_ANY))
+    {
+      ip_addr_version (a) =
+       ip46_address_is_ip4 (&ip_addr_46 (a)) ? AF_IP4 : AF_IP6;
+      return 1;
+    }
+
+  return 0;
 }
 
 u8 *
@@ -64,9 +65,12 @@ uword
 unformat_ip_prefix (unformat_input_t * input, va_list * args)
 {
   ip_prefix_t *a = va_arg (*args, ip_prefix_t *);
+  /* %d writes more than a u8 */
+  int plen;
   if (unformat (input, "%U/%d", unformat_ip_address, &ip_prefix_addr (a),
-               &ip_prefix_len (a)))
+               &plen))
     {
+      ip_prefix_len (a) = plen;
       if ((ip_prefix_version (a) == AF_IP4 && 32 < ip_prefix_len (a)) ||
          (ip_prefix_version (a) == AF_IP6 && 128 < ip_prefix_len (a)))
        {
@@ -341,23 +345,24 @@ ip_prefix_copy (void *dst, void *src)
 }
 
 int
-ip_prefix_cmp (ip_prefix_t * p1, ip_prefix_t * p2)
+ip_prefix_cmp (const ip_prefix_t *ipp1, const ip_prefix_t *ipp2)
 {
+  ip_prefix_t p1 = *ipp1, p2 = *ipp2;
   int cmp = 0;
 
-  ip_prefix_normalize (p1);
-  ip_prefix_normalize (p2);
+  ip_prefix_normalize (&p1);
+  ip_prefix_normalize (&p2);
 
-  cmp = ip_address_cmp (&ip_prefix_addr (p1), &ip_prefix_addr (p2));
+  cmp = ip_address_cmp (&ip_prefix_addr (&p1), &ip_prefix_addr (&p2));
   if (cmp == 0)
     {
-      if (ip_prefix_len (p1) < ip_prefix_len (p2))
+      if (ip_prefix_len (&p1) < ip_prefix_len (&p2))
        {
          cmp = 1;
        }
       else
        {
-         if (ip_prefix_len (p1) > ip_prefix_len (p2))
+         if (ip_prefix_len (&p1) > ip_prefix_len (&p2))
            cmp = 2;
        }
     }
@@ -511,16 +516,11 @@ ip6_prefix_max_address_host_order (ip6_address_t * ip, u8 plen,
 u32
 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 (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;
-  else
-    return 64 - first0;
+  if (mask->as_u64[1] != 0)
+    return 128 - log2_first_set (clib_net_to_host_u64 (mask->as_u64[1]));
+  if (mask->as_u64[0] != 0)
+    return 64 - log2_first_set (clib_net_to_host_u64 (mask->as_u64[0]));
+  return 0;
 }
 
 /*