Mcast rewrite no memcpy

[vpp.git] / src / vnet / interface_cli.c

diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index bd715e4..5640966 100644 (file)
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -416,8 +416,8 @@ done:
 
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (show_sw_interfaces_command, static) = {
-  .path = "show interfaces",
-  .short_help = "show interfaces [address|addr|features|feat] [<if-name1> <if-name2> ...]",
+  .path = "show interface",
+  .short_help = "show interface [address|addr|features|feat] [<if-name1> <if-name2> ...]",
   .function = show_sw_interfaces,
 };
 /* *INDENT-ON* */
@@ -844,6 +844,7 @@ set_unnumbered (vlib_main_t * vm,
   vnet_sw_interface_t *si;
   int is_set = 0;
   int is_del = 0;
+  u32 was_unnum;
 
   if (unformat (input, "%U use %U",
                unformat_vnet_sw_interface, vnm, &unnumbered_sw_if_index,
@@ -858,19 +859,41 @@ set_unnumbered (vlib_main_t * vm,
                              format_unformat_error, input);
 
   si = vnet_get_sw_interface (vnm, unnumbered_sw_if_index);
+  was_unnum = (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED);
+
   if (is_del)
     {
       si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
       si->unnumbered_sw_if_index = (u32) ~ 0;
-      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
-      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 0);
+
+      ip4_main.lookup_main.if_address_pool_index_by_sw_if_index
+       [unnumbered_sw_if_index] = ~0;
+      ip6_main.lookup_main.if_address_pool_index_by_sw_if_index
+       [unnumbered_sw_if_index] = ~0;
     }
   else if (is_set)
     {
       si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED;
       si->unnumbered_sw_if_index = inherit_from_sw_if_index;
-      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
-      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, 1);
+
+      ip4_main.lookup_main.if_address_pool_index_by_sw_if_index
+       [unnumbered_sw_if_index] =
+       ip4_main.lookup_main.if_address_pool_index_by_sw_if_index
+       [inherit_from_sw_if_index];
+      ip6_main.lookup_main.if_address_pool_index_by_sw_if_index
+       [unnumbered_sw_if_index] =
+       ip6_main.lookup_main.if_address_pool_index_by_sw_if_index
+       [inherit_from_sw_if_index];
+    }
+  else
+    {
+      return (0);
+    }
+
+  if (was_unnum != (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED))
+    {
+      ip4_sw_interface_enable_disable (unnumbered_sw_if_index, !is_del);
+      ip6_sw_interface_enable_disable (unnumbered_sw_if_index, !is_del);
     }
 
   return 0;