summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2020-01-27 09:56:58 -0500
committerDamjan Marion <dmarion@me.com>2020-01-27 20:43:29 +0000
commit196fce2b62c0d215722dd233aa8bf70a43aa0a66 (patch)
tree58e74da7f9e7c387c8b085d01034bc74cbfa52b5 /src
parent03328ec8bb86b93fa70bb6b2a9b37c40e686a1f7 (diff)
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
Diffstat (limited to 'src')
-rwxr-xr-xsrc/vnet/classify/vnet_classify.c4
-rw-r--r--src/vnet/interface_cli.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c
index b461463d02e..bb9e52a0db3 100755
--- a/src/vnet/classify/vnet_classify.c
+++ b/src/vnet/classify/vnet_classify.c
@@ -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");
diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index 8fb315b4846..2e5714c3c0f 100644
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -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)