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_recirc.c
diff --git
a/src/plugins/gbp/gbp_recirc.c
b/src/plugins/gbp/gbp_recirc.c
index
d907be0
..
2b45d48
100644
(file)
--- a/
src/plugins/gbp/gbp_recirc.c
+++ b/
src/plugins/gbp/gbp_recirc.c
@@
-53,13
+53,13
@@
format_gbp_recirc (u8 * s, va_list * args)
gbp_recirc_t *gr = va_arg (*args, gbp_recirc_t *);
vnet_main_t *vnm = vnet_get_main ();
gbp_recirc_t *gr = va_arg (*args, gbp_recirc_t *);
vnet_main_t *vnm = vnet_get_main ();
- return format (s, " %U,
epg
:%d, ext:%d",
+ return format (s, " %U,
sclass
:%d, ext:%d",
format_vnet_sw_if_index_name, vnm,
format_vnet_sw_if_index_name, vnm,
- gr->gr_sw_if_index, gr->gr_
epg
, gr->gr_is_ext);
+ gr->gr_sw_if_index, gr->gr_
sclass
, gr->gr_is_ext);
}
int
}
int
-gbp_recirc_add (u32 sw_if_index,
epg_id_t epg_id
, u8 is_ext)
+gbp_recirc_add (u32 sw_if_index,
sclass_t sclass
, u8 is_ext)
{
gbp_recirc_t *gr;
index_t gri;
{
gbp_recirc_t *gr;
index_t gri;
@@
-74,7
+74,7
@@
gbp_recirc_add (u32 sw_if_index, epg_id_t epg_id, u8 is_ext)
fib_protocol_t fproto;
index_t ggi;
fib_protocol_t fproto;
index_t ggi;
- ggi = gbp_endpoint_group_find (
epg_id
);
+ ggi = gbp_endpoint_group_find (
sclass
);
if (INDEX_INVALID == ggi)
return (VNET_API_ERROR_NO_SUCH_ENTRY);
if (INDEX_INVALID == ggi)
return (VNET_API_ERROR_NO_SUCH_ENTRY);
@@
-83,7
+83,7
@@
gbp_recirc_add (u32 sw_if_index, epg_id_t epg_id, u8 is_ext)
pool_get_zero (gbp_recirc_pool, gr);
gri = gr - gbp_recirc_pool;
pool_get_zero (gbp_recirc_pool, gr);
gri = gr - gbp_recirc_pool;
- gr->gr_
epg = epg_id
;
+ gr->gr_
sclass = sclass
;
gr->gr_is_ext = is_ext;
gr->gr_sw_if_index = sw_if_index;
gr->gr_is_ext = is_ext;
gr->gr_sw_if_index = sw_if_index;
@@
-108,7
+108,7
@@
gbp_recirc_add (u32 sw_if_index, epg_id_t epg_id, u8 is_ext)
/*
* bind to the bridge-domain of the EPG
*/
/*
* bind to the bridge-domain of the EPG
*/
- gr->gr_itf = gbp_itf_
add_and_lock (gr->gr_sw_if_index, gg->gg_bd_index
);
+ gr->gr_itf = gbp_itf_
l2_add_and_lock (gr->gr_sw_if_index, gg->gg_gbd
);
/*
* set the interface into L2 emulation mode
/*
* set the interface into L2 emulation mode
@@
-135,7
+135,7
@@
gbp_recirc_add (u32 sw_if_index, epg_id_t epg_id, u8 is_ext)
gbp_endpoint_update_and_lock (GBP_ENDPOINT_SRC_CP,
gr->gr_sw_if_index,
NULL, &mac, INDEX_INVALID,
gbp_endpoint_update_and_lock (GBP_ENDPOINT_SRC_CP,
gr->gr_sw_if_index,
NULL, &mac, INDEX_INVALID,
- INDEX_INVALID, gr->gr_
epg
,
+ INDEX_INVALID, gr->gr_
sclass
,
GBP_ENDPOINT_FLAG_NONE,
NULL, NULL, &gr->gr_ep);
vnet_feature_enable_disable ("ip4-unicast",
GBP_ENDPOINT_FLAG_NONE,
NULL, NULL, &gr->gr_ep);
vnet_feature_enable_disable ("ip4-unicast",
@@
-171,12
+171,14
@@
gbp_recirc_add (u32 sw_if_index, epg_id_t epg_id, u8 is_ext)
return (0);
}
return (0);
}
-void
+int
gbp_recirc_delete (u32 sw_if_index)
{
gbp_recirc_t *gr;
index_t gri;
gbp_recirc_delete (u32 sw_if_index)
{
gbp_recirc_t *gr;
index_t gri;
+ if (vec_len (gbp_recirc_db) <= sw_if_index)
+ return VNET_API_ERROR_INVALID_SW_IF_INDEX;
gri = gbp_recirc_db[sw_if_index];
if (INDEX_INVALID != gri)
gri = gbp_recirc_db[sw_if_index];
if (INDEX_INVALID != gri)
@@
-209,12
+211,14
@@
gbp_recirc_delete (u32 sw_if_index)
ip6_sw_interface_enable_disable (gr->gr_sw_if_index, 0);
l2e_disable (gr->gr_sw_if_index);
ip6_sw_interface_enable_disable (gr->gr_sw_if_index, 0);
l2e_disable (gr->gr_sw_if_index);
- gbp_itf_unlock (gr->gr_itf);
+ gbp_itf_unlock (
&
gr->gr_itf);
gbp_endpoint_group_unlock (gr->gr_epgi);
gbp_recirc_db[sw_if_index] = INDEX_INVALID;
pool_put (gbp_recirc_pool, gr);
gbp_endpoint_group_unlock (gr->gr_epgi);
gbp_recirc_db[sw_if_index] = INDEX_INVALID;
pool_put (gbp_recirc_pool, gr);
+ return (0);
}
}
+ return VNET_API_ERROR_NO_SUCH_ENTRY;
}
void
}
void