diff options
| author |   Dave Barach <dave@barachs.net> | 2020-01-27 09:56:58 -0500 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2020-02-12 13:45:47 +0000 |
| commit | b01058ce2c79705b96aeba52e41ba986640020f0 (patch) | |
| tree | 639d8dfde04a390d76ee99d42bb0780b3178cd4c | |
| parent | 1d609270b61b551b9e81db0f573e861dedc1d3cf (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
(cherry picked from commit 196fce2b62c0d215722dd233aa8bf70a43aa0a66)
| -rw-r--r-- | extras/pcapcli/setup.tracefilter | 4 | ||||
| -rwxr-xr-x | src/vnet/classify/vnet_classify.c | 4 | ||||
| -rw-r--r-- | src/vnet/interface_cli.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/extras/pcapcli/setup.tracefilter b/extras/pcapcli/setup.tracefilter index e6c86298c84..db07a0e4224 100644 --- a/extras/pcapcli/setup.tracefilter +++ b/extras/pcapcli/setup.tracefilter @@ -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 } diff --git a/src/vnet/classify/vnet_classify.c b/src/vnet/classify/vnet_classify.c index b02a5dc6e5e..5843c36f139 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) |