Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
SPAN:add l2 mirror
[vpp.git]
/
src
/
vnet
/
span
/
span_api.c
diff --git
a/src/vnet/span/span_api.c
b/src/vnet/span/span_api.c
index
b456566
..
69fa8e9
100644
(file)
--- a/
src/vnet/span/span_api.c
+++ b/
src/vnet/span/span_api.c
@@
-56,7
+56,8
@@
static void
vlib_main_t *vm = vlib_get_main ();
rv = span_add_delete_entry (vm, ntohl (mp->sw_if_index_from),
vlib_main_t *vm = vlib_get_main ();
rv = span_add_delete_entry (vm, ntohl (mp->sw_if_index_from),
- ntohl (mp->sw_if_index_to), mp->state);
+ ntohl (mp->sw_if_index_to), mp->state,
+ mp->is_l2 ? SPAN_FEAT_L2 : SPAN_FEAT_DEVICE);
REPLY_MACRO (VL_API_SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY);
}
REPLY_MACRO (VL_API_SW_INTERFACE_SPAN_ENABLE_DISABLE_REPLY);
}
@@
-76,11
+77,14
@@
vl_api_sw_interface_span_dump_t_handler (vl_api_sw_interface_span_dump_t * mp)
/* *INDENT-OFF* */
vec_foreach (si, sm->interfaces)
/* *INDENT-OFF* */
vec_foreach (si, sm->interfaces)
- if (si->num_rx_mirror_ports || si->num_tx_mirror_ports)
+ {
+ 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)
{
clib_bitmap_t *b;
u32 i;
{
clib_bitmap_t *b;
u32 i;
- b = clib_bitmap_dup_or (
si->rx_mirror_ports, si->tx_
mirror_ports);
+ b = clib_bitmap_dup_or (
drxm->mirror_ports, dtxm->
mirror_ports);
clib_bitmap_foreach (i, b, (
{
rmp = vl_msg_api_alloc (sizeof (*rmp));
clib_bitmap_foreach (i, b, (
{
rmp = vl_msg_api_alloc (sizeof (*rmp));
@@
-90,13
+94,14
@@
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->sw_if_index_from = htonl (si - sm->interfaces);
rmp->sw_if_index_to = htonl (i);
- rmp->state = (u8) (clib_bitmap_get (
si->rx_
mirror_ports, i) +
- clib_bitmap_get (
si->tx_
mirror_ports, i) * 2);
+ rmp->state = (u8) (clib_bitmap_get (
drxm->
mirror_ports, i) +
+ clib_bitmap_get (
dtxm->
mirror_ports, i) * 2);
vl_msg_api_send_shmem (q, (u8 *) & rmp);
}));
clib_bitmap_free (b);
}
vl_msg_api_send_shmem (q, (u8 *) & rmp);
}));
clib_bitmap_free (b);
}
+ }
/* *INDENT-ON* */
}
/* *INDENT-ON* */
}