Proxy ND (RFC4389 - or a sub-set thereof). This allows the 'emulation' of bridging...

[vpp.git] / src / vnet / ip / lookup.c

diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c
index 6c5611d..8607fa5 100644 (file)
--- a/src/vnet/ip/lookup.c
+++ b/src/vnet/ip/lookup.c
@@ -49,6 +49,7 @@
 #include <vnet/dpo/punt_dpo.h>
 #include <vnet/dpo/receive_dpo.h>
 #include <vnet/dpo/ip_null_dpo.h>
+#include <vnet/ip/ip6_neighbor.h>
 
 /**
  * @file
@@ -568,8 +569,6 @@ vnet_ip_route_cmd (vlib_main_t * vm,
        }
     }
 
-  unformat_free (line_input);
-
   if (vec_len (prefixs) == 0)
     {
       error =
@@ -704,6 +703,7 @@ done:
   vec_free (dpos);
   vec_free (prefixs);
   vec_free (rpaths);
+  unformat_free (line_input);
   return error;
 }
 
@@ -784,7 +784,10 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
   u32 fib_index;
   mfib_itf_flags_t iflags = 0;
   mfib_entry_flags_t eflags = 0;
+  u32 gcount, scount, ss, gg, incr;
+  f64 timet[2];
 
+  gcount = scount = 1;
   vnm = vnet_get_main ();
   is_del = 0;
   table_id = 0;
@@ -804,6 +807,10 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
        is_del = 1;
       else if (unformat (line_input, "add"))
        is_del = 0;
+      else if (unformat (line_input, "scount %d", &scount))
+       ;
+      else if (unformat (line_input, "gcount %d", &gcount))
+       ;
       else if (unformat (line_input, "%U %U",
                         unformat_ip4_address,
                         &pfx.fp_src_addr.ip4,
@@ -865,8 +872,6 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
        }
     }
 
-  unformat_free (line_input);
-
   if (~0 == table_id)
     {
       /*
@@ -885,25 +890,86 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
        }
     }
 
-  if (is_del && 0 == rpath.frp_weight)
+  timet[0] = vlib_time_now (vm);
+
+  if (FIB_PROTOCOL_IP4 == pfx.fp_proto)
     {
-      mfib_table_entry_delete (fib_index, &pfx, MFIB_SOURCE_CLI);
+      incr = 1 << (32 - (pfx.fp_len % 32));
     }
-  else if (eflags)
+  else
     {
-      mfib_table_entry_update (fib_index, &pfx, MFIB_SOURCE_CLI, eflags);
+      incr = 1 << (128 - (pfx.fp_len % 128));
     }
-  else
+
+  for (ss = 0; ss < scount; ss++)
     {
-      if (is_del)
-       mfib_table_entry_path_remove (fib_index,
-                                     &pfx, MFIB_SOURCE_CLI, &rpath);
+      for (gg = 0; gg < gcount; gg++)
+       {
+         if (is_del && 0 == rpath.frp_weight)
+           {
+             /* no path provided => route delete */
+             mfib_table_entry_delete (fib_index, &pfx, MFIB_SOURCE_CLI);
+           }
+         else if (eflags)
+           {
+             mfib_table_entry_update (fib_index, &pfx, MFIB_SOURCE_CLI,
+                                      eflags);
+           }
+         else
+           {
+             if (is_del)
+               mfib_table_entry_path_remove (fib_index,
+                                             &pfx, MFIB_SOURCE_CLI, &rpath);
+             else
+               mfib_table_entry_path_update (fib_index,
+                                             &pfx, MFIB_SOURCE_CLI, &rpath,
+                                             iflags);
+           }
+
+         if (FIB_PROTOCOL_IP4 == pfx.fp_proto)
+           {
+             pfx.fp_grp_addr.ip4.as_u32 =
+               clib_host_to_net_u32 (incr +
+                                     clib_net_to_host_u32 (pfx.
+                                                           fp_grp_addr.ip4.
+                                                           as_u32));
+           }
+         else
+           {
+             int bucket = (incr < 64 ? 0 : 1);
+             pfx.fp_grp_addr.ip6.as_u64[bucket] =
+               clib_host_to_net_u64 (incr +
+                                     clib_net_to_host_u64 (pfx.
+                                                           fp_grp_addr.ip6.as_u64
+                                                           [bucket]));
+
+           }
+       }
+      if (FIB_PROTOCOL_IP4 == pfx.fp_proto)
+       {
+         pfx.fp_src_addr.ip4.as_u32 =
+           clib_host_to_net_u32 (1 +
+                                 clib_net_to_host_u32 (pfx.fp_src_addr.
+                                                       ip4.as_u32));
+       }
       else
-       mfib_table_entry_path_update (fib_index,
-                                     &pfx, MFIB_SOURCE_CLI, &rpath, iflags);
+       {
+         pfx.fp_src_addr.ip6.as_u64[1] =
+           clib_host_to_net_u64 (1 +
+                                 clib_net_to_host_u64 (pfx.fp_src_addr.
+                                                       ip6.as_u64[1]));
+       }
     }
 
+  timet[1] = vlib_time_now (vm);
+
+  if (scount > 1 || gcount > 1)
+    vlib_cli_output (vm, "%.6e routes/sec",
+                    (scount * gcount) / (timet[1] - timet[0]));
+
 done:
+  unformat_free (line_input);
+
   return error;
 }
 
@@ -1083,24 +1149,37 @@ probe_neighbor_address (vlib_main_t * vm,
          is_ip4 = 0;
        }
       else
-       return clib_error_return (0, "unknown input '%U'",
-                                 format_unformat_error, line_input);
+       {
+         error = clib_error_return (0, "unknown input '%U'",
+                                    format_unformat_error, line_input);
+         goto done;
+       }
     }
 
-  unformat_free (line_input);
-
   if (sw_if_index == ~0)
-    return clib_error_return (0, "Interface required, not set.");
+    {
+      error = clib_error_return (0, "Interface required, not set.");
+      goto done;
+    }
   if (address_set == 0)
-    return clib_error_return (0, "ip address required, not set.");
+    {
+      error = clib_error_return (0, "ip address required, not set.");
+      goto done;
+    }
   if (address_set > 1)
-    return clib_error_return (0, "Multiple ip addresses not supported.");
+    {
+      error = clib_error_return (0, "Multiple ip addresses not supported.");
+      goto done;
+    }
 
   if (is_ip4)
     error = ip4_probe_neighbor_wait (vm, &a4, sw_if_index, retry_count);
   else
     error = ip6_probe_neighbor_wait (vm, &a6, sw_if_index, retry_count);
 
+done:
+  unformat_free (line_input);
+
   return error;
 }