Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ip: Replace Sematics for Interface IP addresses
[vpp.git]
/
src
/
plugins
/
gbp
/
gbp_endpoint_group.c
diff --git
a/src/plugins/gbp/gbp_endpoint_group.c
b/src/plugins/gbp/gbp_endpoint_group.c
index
bacbb0c
..
92bad37
100644
(file)
--- a/
src/plugins/gbp/gbp_endpoint_group.c
+++ b/
src/plugins/gbp/gbp_endpoint_group.c
@@
-19,6
+19,7
@@
#include <plugins/gbp/gbp_endpoint.h>
#include <plugins/gbp/gbp_bridge_domain.h>
#include <plugins/gbp/gbp_route_domain.h>
#include <plugins/gbp/gbp_endpoint.h>
#include <plugins/gbp/gbp_bridge_domain.h>
#include <plugins/gbp/gbp_route_domain.h>
+#include <plugins/gbp/gbp_itf.h>
#include <vnet/dpo/dvr_dpo.h>
#include <vnet/fib/fib_table.h>
#include <vnet/dpo/dvr_dpo.h>
#include <vnet/fib/fib_table.h>
@@
-51,11
+52,14
@@
gbp_endpoint_group_get (index_t i)
}
void
}
void
-gbp_endpoint_group_lock (index_t i)
+gbp_endpoint_group_lock (index_t
gg
i)
{
gbp_endpoint_group_t *gg;
{
gbp_endpoint_group_t *gg;
- gg = gbp_endpoint_group_get (i);
+ if (INDEX_INVALID == ggi)
+ return;
+
+ gg = gbp_endpoint_group_get (ggi);
gg->gg_locks++;
}
gg->gg_locks++;
}
@@
-87,7
+91,6
@@
gbp_endpoint_group_add_and_lock (vnid_t vnid,
if (INDEX_INVALID == ggi)
{
if (INDEX_INVALID == ggi)
{
- gbp_bridge_domain_t *gb;
fib_protocol_t fproto;
index_t gbi, grdi;
fib_protocol_t fproto;
index_t gbi, grdi;
@@
-104,16
+107,14
@@
gbp_endpoint_group_add_and_lock (vnid_t vnid,
return (VNET_API_ERROR_NO_SUCH_FIB);
}
return (VNET_API_ERROR_NO_SUCH_FIB);
}
- gb = gbp_bridge_domain_get (gbi);
-
pool_get_zero (gbp_endpoint_group_pool, gg);
gg->gg_vnid = vnid;
gg->gg_rd = grdi;
gg->gg_gbd = gbi;
pool_get_zero (gbp_endpoint_group_pool, gg);
gg->gg_vnid = vnid;
gg->gg_rd = grdi;
gg->gg_gbd = gbi;
- gg->gg_bd_index = gb->gb_bd_index;
gg->gg_uplink_sw_if_index = uplink_sw_if_index;
gg->gg_uplink_sw_if_index = uplink_sw_if_index;
+ gbp_itf_hdl_reset (&gg->gg_uplink_itf);
gg->gg_locks = 1;
gg->gg_sclass = sclass;
gg->gg_retention = *retention;
gg->gg_locks = 1;
gg->gg_sclass = sclass;
gg->gg_retention = *retention;
@@
-138,10
+139,11
@@
gbp_endpoint_group_add_and_lock (vnid_t vnid,
* Add the uplink to the BD
* packets direct from the uplink have had policy applied
*/
* Add the uplink to the BD
* packets direct from the uplink have had policy applied
*/
- gbp_bridge_domain_itf_add (gg->gg_uplink_sw_if_index,
- gg->gg_bd_index, L2_BD_PORT_TYPE_NORMAL);
- l2input_intf_bitmap_enable (gg->gg_uplink_sw_if_index,
- L2INPUT_FEAT_GBP_NULL_CLASSIFY, 1);
+ gg->gg_uplink_itf =
+ gbp_itf_l2_add_and_lock (gg->gg_uplink_sw_if_index, gbi);
+
+ gbp_itf_l2_set_input_feature (gg->gg_uplink_itf,
+ L2INPUT_FEAT_GBP_NULL_CLASSIFY);
}
hash_set (gbp_endpoint_group_db.gg_hash_sclass,
}
hash_set (gbp_endpoint_group_db.gg_hash_sclass,
@@
-176,13
+178,8
@@
gbp_endpoint_group_unlock (index_t ggi)
gg = pool_elt_at_index (gbp_endpoint_group_pool, ggi);
gg = pool_elt_at_index (gbp_endpoint_group_pool, ggi);
- if (~0 != gg->gg_uplink_sw_if_index)
- {
- gbp_bridge_domain_itf_del (gg->gg_uplink_sw_if_index,
- gg->gg_bd_index, L2_BD_PORT_TYPE_NORMAL);
- l2input_intf_bitmap_enable (gg->gg_uplink_sw_if_index,
- L2INPUT_FEAT_GBP_NULL_CLASSIFY, 0);
- }
+ gbp_itf_unlock (&gg->gg_uplink_itf);
+
FOR_EACH_FIB_IP_PROTOCOL (fproto)
{
dpo_reset (&gg->gg_dpo[fproto]);
FOR_EACH_FIB_IP_PROTOCOL (fproto)
{
dpo_reset (&gg->gg_dpo[fproto]);
@@
-332,16
+329,15
@@
u8 *
format_gbp_endpoint_group (u8 * s, va_list * args)
{
gbp_endpoint_group_t *gg = va_arg (*args, gbp_endpoint_group_t*);
format_gbp_endpoint_group (u8 * s, va_list * args)
{
gbp_endpoint_group_t *gg = va_arg (*args, gbp_endpoint_group_t*);
- vnet_main_t *vnm = vnet_get_main ();
if (NULL != gg)
if (NULL != gg)
- s = format (s, "[%d] %d, sclass:%d bd:
[%d,%d] rd:[%d]
uplink:%U retention:%U locks:%d",
+ s = format (s, "[%d] %d, sclass:%d bd:
%d rd:%d
uplink:%U retention:%U locks:%d",
gg - gbp_endpoint_group_pool,
gg->gg_vnid,
gg->gg_sclass,
gg - gbp_endpoint_group_pool,
gg->gg_vnid,
gg->gg_sclass,
- g
bp_endpoint_group_get_bd_id(gg), gg->gg_bd_index
,
+ g
g->gg_gbd
,
gg->gg_rd,
gg->gg_rd,
- format_
vnet_sw_if_index_name, vnm, gg->gg_uplink_sw_if_index
,
+ format_
gbp_itf_hdl, gg->gg_uplink_itf
,
format_gbp_endpoint_retention, &gg->gg_retention,
gg->gg_locks);
else
format_gbp_endpoint_retention, &gg->gg_retention,
gg->gg_locks);
else