Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fib: Decouple source from priority and behaviour
[vpp.git]
/
src
/
vnet
/
fib
/
ip6_fib.c
diff --git
a/src/vnet/fib/ip6_fib.c
b/src/vnet/fib/ip6_fib.c
index
991fbc1
..
6d0eca4
100644
(file)
--- a/
src/vnet/fib/ip6_fib.c
+++ b/
src/vnet/fib/ip6_fib.c
@@
-151,11
+151,11
@@
ip6_fib_table_destroy (u32 fib_index)
fib_table_t *fib_table = fib_table_get(fib_index, FIB_PROTOCOL_IP6);
fib_source_t source;
fib_table_t *fib_table = fib_table_get(fib_index, FIB_PROTOCOL_IP6);
fib_source_t source;
-
/*
+ /*
* validate no more routes.
*/
ASSERT(0 == fib_table->ft_total_route_counts);
* validate no more routes.
*/
ASSERT(0 == fib_table->ft_total_route_counts);
-
FOR_EACH_FIB_SOURCE(source
)
+
vec_foreach_index(source, fib_table->ft_src_route_counts
)
{
ASSERT(0 == fib_table->ft_src_route_counts[source]);
}
{
ASSERT(0 == fib_table->ft_src_route_counts[source]);
}
@@
-164,6
+164,7
@@
ip6_fib_table_destroy (u32 fib_index)
{
hash_unset (ip6_main.fib_index_by_table_id, fib_table->ft_table_id);
}
{
hash_unset (ip6_main.fib_index_by_table_id, fib_table->ft_table_id);
}
+ vec_free(fib_table->ft_src_route_counts);
pool_put_index(ip6_main.v6_fibs, fib_table->ft_index);
pool_put(ip6_main.fibs, fib_table);
}
pool_put_index(ip6_main.v6_fibs, fib_table->ft_index);
pool_put(ip6_main.fibs, fib_table);
}
@@
-688,7
+689,7
@@
ip6_show_fib (vlib_main_t * vm,
fib_table->ft_epoch,
format_fib_table_flags, fib_table->ft_flags);
fib_table->ft_epoch,
format_fib_table_flags, fib_table->ft_flags);
-
FOR_EACH_FIB_SOURCE(source
)
+
vec_foreach_index(source, fib_table->ft_locks
)
{
if (0 != fib_table->ft_locks[source])
{
{
if (0 != fib_table->ft_locks[source])
{