diff options
| author |   Eyal Bari <ebari@cisco.com> | 2017-07-31 13:12:30 +0300 |
|---|---|---|
| committer |   John Lo <loj@cisco.com> | 2017-08-01 02:32:53 +0000 |
| commit | 5b311202b82a827c712d2cb7604c56049266adc9 (patch) | |
| tree | 9b1d62b6ee75dbf730667c80339b565e94e36495 /src/vnet/span | |
| parent | b88566498a83209f8646e4a6b1d247e69dae2aeb (diff) | |
SPAN/API:enable L2 dump
Change-Id: Icea1dff33aae35a85ae1a7ed1900a0abb3fe4b6b
Signed-off-by: Eyal Bari <ebari@cisco.com>
Diffstat (limited to 'src/vnet/span')
| -rw-r--r-- | src/vnet/span/span.api | 3 | ||||
| -rw-r--r-- | src/vnet/span/span_api.c | 13 |
2 files changed, 10 insertions, 6 deletions
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); })); |