dpdk: add rte_delay_us_callback

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

diff --git a/vnet/vnet/interface_cli.c b/vnet/vnet/interface_cli.c
index 05e650e..7dbee86 100644 (file)
--- a/vnet/vnet/interface_cli.c
+++ b/vnet/vnet/interface_cli.c
@@ -225,12 +225,13 @@ show_sw_interfaces (vlib_main_t * vm,
   vnet_main_t *vnm = vnet_get_main ();
   vnet_interface_main_t *im = &vnm->interface_main;
   vnet_sw_interface_t *si, *sorted_sis = 0;
+  u32 sw_if_index = ~(u32) 0;
   u8 show_addresses = 0;
+  u8 show_features = 0;
+  u8 show_tag = 0;
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
-      u32 sw_if_index;
-
       /* See if user wants to show specific interface */
       if (unformat
          (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
@@ -240,6 +241,10 @@ show_sw_interfaces (vlib_main_t * vm,
        }
       else if (unformat (input, "address") || unformat (input, "addr"))
        show_addresses = 1;
+      else if (unformat (input, "features") || unformat (input, "feat"))
+       show_features = 1;
+      else if (unformat (input, "tag"))
+       show_tag = 1;
       else
        {
          error = clib_error_return (0, "unknown input `%U'",
@@ -248,6 +253,27 @@ show_sw_interfaces (vlib_main_t * vm,
        }
     }
 
+  if (show_features || show_tag)
+    {
+      if (sw_if_index == ~(u32) 0)
+       return clib_error_return (0, "Interface not specified...");
+    }
+
+  if (show_features)
+    {
+      vnet_interface_features_show (vm, sw_if_index);
+      return 0;
+    }
+  if (show_tag)
+    {
+      u8 *tag;
+      tag = vnet_get_sw_interface_tag (vnm, sw_if_index);
+      vlib_cli_output (vm, "%U: %s",
+                      format_vnet_sw_if_index_name, vnm, sw_if_index,
+                      tag ? (char *) tag : "(none)");
+      return 0;
+    }
+
   if (!show_addresses)
     vlib_cli_output (vm, "%U\n", format_vnet_sw_interface, vnm, 0);
 
@@ -390,7 +416,7 @@ done:
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (show_sw_interfaces_command, static) = {
   .path = "show interfaces",
-  .short_help = "show interfaces [address|addr] [<if-name1> <if-name2> ...]",
+  .short_help = "show interfaces [address|addr|features|feat] [<if-name1> <if-name2> ...]",
   .function = show_sw_interfaces,
 };
 /* *INDENT-ON* */
@@ -686,6 +712,7 @@ create_sub_interfaces (vlib_main_t * vm,
       *kp = sup_and_sub_key;
 
       template.type = VNET_SW_INTERFACE_TYPE_SUB;
+      template.flood_class = VNET_FLOOD_CLASS_NORMAL;
       template.sup_sw_if_index = hi->sw_if_index;
       template.sub.id = id;
       if (id_min < id_max)
@@ -1079,6 +1106,56 @@ VLIB_CLI_COMMAND (set_interface_mac_address_cmd, static) = {
 };
 /* *INDENT-ON* */
 
+static clib_error_t *
+set_tag (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+  u8 *tag = 0;
+
+  if (!unformat (input, "%U %s", unformat_vnet_sw_interface,
+                vnm, &sw_if_index, &tag))
+    return clib_error_return (0, "unknown input `%U'",
+                             format_unformat_error, input);
+
+  vnet_set_sw_interface_tag (vnm, tag, sw_if_index);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (set_tag_command, static) = {
+  .path = "set interface tag",
+  .short_help = "set interface tag <intfc> <tag>",
+  .function = set_tag,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+clear_tag (vlib_main_t * vm, unformat_input_t * input,
+          vlib_cli_command_t * cmd)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  u32 sw_if_index = ~0;
+
+  if (!unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
+    return clib_error_return (0, "unknown input `%U'",
+                             format_unformat_error, input);
+
+  vnet_clear_sw_interface_tag (vnm, sw_if_index);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (clear_tag_command, static) = {
+  .path = "clear interface tag",
+  .short_help = "clear interface tag <intfc>",
+  .function = clear_tag,
+};
+/* *INDENT-ON* */
+
+
 /*
  * fd.io coding-style-patch-verification: ON
  *