diff options
| -rw-r--r-- | src/vat/api_format.c | 13 | ||||
| -rw-r--r-- | src/vnet/span/span.api | 3 | ||||
| -rw-r--r-- | src/vnet/span/span_api.c | 13 | ||||
| -rw-r--r-- | src/vpp/api/custom_dump.c | 3 |
4 files changed, 25 insertions, 7 deletions
diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 932e162d7bc..5a0c4580c21 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -18207,11 +18207,22 @@ static void static int api_sw_interface_span_dump (vat_main_t * vam) { + unformat_input_t *input = vam->input; vl_api_sw_interface_span_dump_t *mp; vl_api_control_ping_t *mp_ping; + u8 is_l2 = 0; int ret; + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "l2")) + is_l2 = 1; + else + break; + } + M (SW_INTERFACE_SPAN_DUMP, mp); + mp->is_l2 = is_l2; S (mp); /* Use a control ping for synchronization */ @@ -20049,7 +20060,7 @@ _(ipfix_classify_stream_dump, "") \ _(ipfix_classify_table_add_del, "table <table-index> ip4|ip6 [tcp|udp]") \ _(ipfix_classify_table_dump, "") \ _(sw_interface_span_enable_disable, "[l2] [src <intfc> | src_sw_if_index <id>] [disable | [[dst <intfc> | dst_sw_if_index <id>] [both|rx|tx]]]") \ -_(sw_interface_span_dump, "") \ +_(sw_interface_span_dump, "[l2]") \ _(get_next_index, "node-name <node-name> next-node-name <node-name>") \ _(pg_create_interface, "if_id <nn>") \ _(pg_capture, "if_id <nnn> pcap <file_name> count <nnn> [disable]") \ diff --git a/src/vnet/span/span.api b/src/vnet/span/span.api index 2a762ac2582..03cd60ecf24 100644 --- a/src/vnet/span/span.api +++ b/src/vnet/span/span.api @@ -20,6 +20,7 @@ @param sw_if_index_from - interface to be mirorred @param sw_if_index_to - interface where the traffic is mirrored @param state - 0 = disabled, 1 = rx enabled, 2 = tx enabled, 3 tx & rx enabled + @param is_l2 - 0 = mirror at hw device level, 1 = mirror at L2 */ autoreply define sw_interface_span_enable_disable { u32 client_index; @@ -33,10 +34,12 @@ autoreply define sw_interface_span_enable_disable { /** \brief SPAN dump request @param client_index - opaque cookie to identify the sender @param context - sender context, to match reply w/ request + @param is_l2 - 0 = hw device level, 1 = L2 */ define sw_interface_span_dump { u32 client_index; u32 context; + u8 is_l2; }; /** \brief Reply to SPAN dump request diff --git a/src/vnet/span/span_api.c b/src/vnet/span/span_api.c index 69fa8e974fa..64a71a2ed69 100644 --- a/src/vnet/span/span_api.c +++ b/src/vnet/span/span_api.c @@ -75,16 +75,17 @@ vl_api_sw_interface_span_dump_t_handler (vl_api_sw_interface_span_dump_t * mp) if (!q) return; + span_feat_t sf = mp->is_l2 ? SPAN_FEAT_L2 : SPAN_FEAT_DEVICE; /* *INDENT-OFF* */ vec_foreach (si, sm->interfaces) { - span_mirror_t * drxm = &si->mirror_rxtx[SPAN_FEAT_DEVICE][VLIB_RX]; - span_mirror_t * dtxm = &si->mirror_rxtx[SPAN_FEAT_DEVICE][VLIB_TX]; - if (drxm->num_mirror_ports || dtxm->num_mirror_ports) + span_mirror_t * rxm = &si->mirror_rxtx[sf][VLIB_RX]; + span_mirror_t * txm = &si->mirror_rxtx[sf][VLIB_TX]; + if (rxm->num_mirror_ports || txm->num_mirror_ports) { clib_bitmap_t *b; u32 i; - b = clib_bitmap_dup_or (drxm->mirror_ports, dtxm->mirror_ports); + b = clib_bitmap_dup_or (rxm->mirror_ports, txm->mirror_ports); clib_bitmap_foreach (i, b, ( { rmp = vl_msg_api_alloc (sizeof (*rmp)); @@ -94,8 +95,8 @@ vl_api_sw_interface_span_dump_t_handler (vl_api_sw_interface_span_dump_t * mp) rmp->sw_if_index_from = htonl (si - sm->interfaces); rmp->sw_if_index_to = htonl (i); - rmp->state = (u8) (clib_bitmap_get (drxm->mirror_ports, i) + - clib_bitmap_get (dtxm->mirror_ports, i) * 2); + rmp->state = (u8) (clib_bitmap_get (rxm->mirror_ports, i) + + clib_bitmap_get (txm->mirror_ports, i) * 2); vl_msg_api_send_shmem (q, (u8 *) & rmp); })); diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c index 55a362a386b..520361f617d 100644 --- a/src/vpp/api/custom_dump.c +++ b/src/vpp/api/custom_dump.c @@ -2258,6 +2258,9 @@ vl_api_sw_interface_span_dump_t_print (vl_api_sw_interface_span_dump_t * mp, s = format (0, "SCRIPT: sw_interface_span_dump "); + if (mp->is_l2) + s = format (s, "l2 "); + FINISH; } |