bpf_trace_filter: allow use whithout classifier
Change-Id: I7ac5693ca547fe7249e7b6297bade70a6052b169 Type: improvement Signed-off-by: Mohammed Hawari <mohammed@hawari.fr>
This commit is contained in:
committed by
Damjan Marion
parent
a474bc8a3b
commit
bc67e9fd20
@@ -64,9 +64,9 @@ bpf_is_packed_traced (vlib_buffer_t *b, u32 classify_table_index, int func)
|
||||
struct pcap_pkthdr phdr = { 0 };
|
||||
int res;
|
||||
int res1;
|
||||
res1 = vnet_is_packet_traced (b, classify_table_index, 0);
|
||||
|
||||
if (res1 != 1)
|
||||
if (classify_table_index != ~0 &&
|
||||
(res1 = vnet_is_packet_traced (b, classify_table_index, 0)) != 1)
|
||||
return res1;
|
||||
|
||||
if (!bfm->prog_set)
|
||||
|
||||
@@ -463,13 +463,6 @@ cli_add_trace_buffer (vlib_main_t * vm,
|
||||
goto done;
|
||||
}
|
||||
|
||||
u32 filter_table = classify_get_trace_chain ();
|
||||
if (filter && filter_table == ~0)
|
||||
{
|
||||
error = clib_error_create ("No packet trace filter configured...");
|
||||
goto done;
|
||||
}
|
||||
|
||||
trace_update_capture_options (add, node_index, filter, verbose);
|
||||
|
||||
done:
|
||||
|
||||
@@ -45,6 +45,9 @@ vnet_is_packet_traced_inline (vlib_buffer_t * b,
|
||||
if (func != 0)
|
||||
return -1;
|
||||
|
||||
if (classify_table_index == ~0)
|
||||
return -1;
|
||||
|
||||
/* This will happen... */
|
||||
if (pool_is_free_index (vcm->tables, classify_table_index))
|
||||
return -1;
|
||||
|
||||
Reference in New Issue
Block a user