classify: pcap / packet trace debug CLI bugs

"classify filter trace ... " and "classify filter pcap ..." are
mutually exclusive.

vnet_pcap_dispatch_trace_configure needs to check for
set->table_indices == NULL.

Type: fix
Ticket: VPP-1827

Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I43733364087ffb0a43de92e450955033431d559d
(cherry picked from commit 196fce2b62c0d215722dd233aa8bf70a43aa0a66)
This commit is contained in:
Dave Barach 2020-01-27 09:56:58 -05:00 committed by Dave Barach
parent 1d609270b6
commit b01058ce2c
3 changed files with 8 additions and 2 deletions

View File

@ -17,4 +17,6 @@ packet-generator new {
}
}
classify filter trace mask l3 ip4 src match l3 ip4 src 192.168.1.15
comment { Pick one, uncomment, and "pcap rx ..." or "trace add pg-input ..." }
comment { classify filter trace mask l3 ip4 src match l3 ip4 src 192.168.1.15 }
comment { classify filter pcap mask l3 ip4 src match l3 ip4 src 192.168.1.15 }

View File

@ -1744,6 +1744,10 @@ classify_filter_command_fn (vlib_main_t * vm,
if (sw_if_index == ~0 && pkt_trace == 0 && pcap == 0)
return clib_error_return (0, "Must specify trace, pcap or interface...");
if (pkt_trace && pcap)
return clib_error_return
(0, "Packet trace and pcap are mutually exclusive...");
if (pkt_trace && sw_if_index != ~0)
return clib_error_return (0, "Packet trace filter is per-system");

View File

@ -1954,7 +1954,7 @@ vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t * a)
/* Classify filter specified, but no classify filter configured */
if ((a->rx_enable + a->tx_enable + a->drop_enable) && a->filter &&
(set->table_indices[0] == ~0))
(set->table_indices == 0 || set->table_indices[0] == ~0))
return VNET_API_ERROR_NO_SUCH_LABEL;
if (a->rx_enable + a->tx_enable + a->drop_enable)