MTU: Setting of MTU on software interface (instead of hardware interface)

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

diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index 5509e3f..fe17c82 100644 (file)
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -934,60 +934,32 @@ set_unnumbered (vlib_main_t * vm,
                unformat_input_t * input, vlib_cli_command_t * cmd)
 {
   vnet_main_t *vnm = vnet_get_main ();
-  u32 unnumbered_sw_if_index;
-  u32 inherit_from_sw_if_index;
-  vnet_sw_interface_t *si;
-  int is_set = 0;
-  int is_del = 0;
-  u32 was_unnum;
+  u32 unnumbered_sw_if_index = ~0;
+  u32 inherit_from_sw_if_index = ~0;
+  int enable = 1;
 
   if (unformat (input, "%U use %U",
                unformat_vnet_sw_interface, vnm, &unnumbered_sw_if_index,
                unformat_vnet_sw_interface, vnm, &inherit_from_sw_if_index))
-    is_set = 1;
+    enable = 1;
   else if (unformat (input, "del %U",
                     unformat_vnet_sw_interface, vnm,
                     &unnumbered_sw_if_index))
-    is_del = 1;
+    enable = 0;
   else
     return clib_error_return (0, "parse error '%U'",
                              format_unformat_error, input);
 
-  si = vnet_get_sw_interface (vnm, unnumbered_sw_if_index);
-  was_unnum = (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED);
+  if (~0 == unnumbered_sw_if_index)
+    return clib_error_return (0, "Specify the unnumbered interface");
+  if (enable && ~0 == inherit_from_sw_if_index)
+    return clib_error_return (0, "When enabling unnumberered specify the"
+                             " IP enabled interface that it uses");
 
-  if (is_del)
-    {
-      si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
-      si->unnumbered_sw_if_index = (u32) ~ 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_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];
-    }
-
-  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);
-    }
+  vnet_sw_interface_update_unnumbered (unnumbered_sw_if_index,
+                                      inherit_from_sw_if_index, enable);
 
-  return 0;
+  return (NULL);
 }
 
 /* *INDENT-OFF* */
@@ -1131,37 +1103,29 @@ static clib_error_t *
 mtu_cmd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
 {
   vnet_main_t *vnm = vnet_get_main ();
-  u32 hw_if_index, mtu;
-  u32 flags = ETHERNET_INTERFACE_FLAG_MTU;
-  ethernet_main_t *em = &ethernet_main;
+  u32 sw_if_index, mtu;
 
-  if (unformat (input, "%d %U", &mtu,
-               unformat_vnet_hw_interface, vnm, &hw_if_index))
+  if (unformat (input, "%d %U", &mtu, unformat_vnet_sw_interface, vnm,
+               &sw_if_index))
     {
-      vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
-      ethernet_interface_t *eif = ethernet_get_interface (em, hw_if_index);
-
-      if (!eif)
-       return clib_error_return (0, "not supported");
-
-      if (mtu < hi->min_supported_packet_bytes)
-       return clib_error_return (0, "Invalid mtu (%d): "
-                                 "must be >= min pkt bytes (%d)", mtu,
-                                 hi->min_supported_packet_bytes);
-
-      if (mtu > hi->max_supported_packet_bytes)
-       return clib_error_return (0, "Invalid mtu (%d): must be <= (%d)", mtu,
-                                 hi->max_supported_packet_bytes);
-
-      if (hi->max_packet_bytes != mtu)
-       {
-         hi->max_packet_bytes = mtu;
-         ethernet_set_flags (vnm, hw_if_index, flags);
-       }
+      ;
     }
   else
-    return clib_error_return (0, "unknown input `%U'",
-                             format_unformat_error, input);
+    {
+      return clib_error_return (0, "unknown input `%U'",
+                               format_unformat_error, input);
+    }
+
+  int rv = vnet_sw_interface_set_mtu (vnm, sw_if_index, mtu);
+  if (rv < 0)
+    {
+      vnet_hw_interface_t *hi = vnet_get_sw_hw_interface (vnm, sw_if_index);
+      ASSERT (hi);
+      return clib_error_return (0, "Invalid mtu (%d): "
+                               "must be  between min pkt bytes (%d) and max pkt bytes (%d)",
+                               mtu, hi->min_packet_bytes,
+                               hi->max_packet_bytes);
+    }
   return 0;
 }
 
@@ -1439,7 +1403,7 @@ set_interface_rx_mode (vlib_main_t * vm, unformat_input_t * input,
  * @cliexend
 ?*/
 /* *INDENT-OFF* */
-VLIB_CLI_COMMAND (cmd_set_if_rx_mode,static) = {
+VLIB_CLI_COMMAND (cmd_set_if_rx_mode, static) = {
     .path = "set interface rx-mode",
     .short_help = "set interface rx-mode <interface> [queue <n>] [polling | interrupt | adaptive]",
     .function = set_interface_rx_mode,