Add callbacks for extended trace functionality, one as content is added with vlib_add...

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

diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index 12310eb..624f8ef 100644 (file)
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -470,6 +470,7 @@ VLIB_CLI_COMMAND (show_sw_interfaces_command, static) = {
   .path = "show interface",
   .short_help = "show interface [address|addr|features|feat] [<interface> [<interface> [..]]] [verbose]",
   .function = show_sw_interfaces,
+  .is_mp_safe = 1,
 };
 /* *INDENT-ON* */
 
@@ -1736,7 +1737,8 @@ pcap_trace_command_internal (vlib_main_t * vm,
            }
          else
            {
-             vlib_cli_output (vm, "pcap tx capture already on...");
+             vlib_cli_output (vm, "pcap %s capture already on...",
+                              (rx_tx == VLIB_RX) ? "rx" : "tx");
              errorFlag = 1;
              break;
            }
@@ -1764,7 +1766,8 @@ pcap_trace_command_internal (vlib_main_t * vm,
            }
          else
            {
-             vlib_cli_output (vm, "pcap tx capture already off...");
+             vlib_cli_output (vm, "pcap %s capture already off...",
+                              (rx_tx == VLIB_RX) ? "rx" : "tx");
              errorFlag = 1;
              break;
            }
@@ -1836,7 +1839,7 @@ pcap_trace_command_internal (vlib_main_t * vm,
                               pcap_main.n_packets_to_capture :
                               PCAP_DEF_PKT_TO_CAPTURE,
                               format_vnet_sw_if_index_name, vnm,
-                              vm->pcap_sw_if_index,
+                              vm->pcap[rx_tx].pcap_sw_if_index,
                               vm->pcap[rx_tx].
                               pcap_main.file_name ? (u8 *) vm->pcap[rx_tx].
                               pcap_main.file_name : (u8 *) "/tmp/vpe.pcap");