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: fib api updates
[vpp.git]
/
src
/
vnet
/
fib
/
fib_table.c
diff --git
a/src/vnet/fib/fib_table.c
b/src/vnet/fib/fib_table.c
index
c37ac1d
..
3778fa9
100644
(file)
--- a/
src/vnet/fib/fib_table.c
+++ b/
src/vnet/fib/fib_table.c
@@
-481,7
+481,7
@@
fib_table_entry_special_remove (u32 fib_index,
*/
static void
fib_table_route_path_fixup (const fib_prefix_t *prefix,
*/
static void
fib_table_route_path_fixup (const fib_prefix_t *prefix,
- fib_entry_flag_t eflags,
+ fib_entry_flag_t
*
eflags,
fib_route_path_t *path)
{
/*
fib_route_path_t *path)
{
/*
@@
-496,7
+496,8
@@
fib_table_route_path_fixup (const fib_prefix_t *prefix,
/* Prefix recurses via itse;f */
path->frp_flags |= FIB_ROUTE_PATH_DROP;
}
/* Prefix recurses via itse;f */
path->frp_flags |= FIB_ROUTE_PATH_DROP;
}
- if (fib_prefix_is_host(prefix) &&
+ if (!(path->frp_flags & FIB_ROUTE_PATH_LOCAL) &&
+ fib_prefix_is_host(prefix) &&
ip46_address_is_zero(&path->frp_addr) &&
path->frp_sw_if_index != ~0 &&
path->frp_proto != DPO_PROTO_ETHERNET)
ip46_address_is_zero(&path->frp_addr) &&
path->frp_sw_if_index != ~0 &&
path->frp_proto != DPO_PROTO_ETHERNET)
@@
-504,18
+505,27
@@
fib_table_route_path_fixup (const fib_prefix_t *prefix,
path->frp_addr = prefix->fp_addr;
path->frp_flags |= FIB_ROUTE_PATH_ATTACHED;
}
path->frp_addr = prefix->fp_addr;
path->frp_flags |= FIB_ROUTE_PATH_ATTACHED;
}
- if (eflags & FIB_ENTRY_FLAG_DROP)
+ if (
*
eflags & FIB_ENTRY_FLAG_DROP)
{
path->frp_flags |= FIB_ROUTE_PATH_DROP;
}
{
path->frp_flags |= FIB_ROUTE_PATH_DROP;
}
- if (eflags & FIB_ENTRY_FLAG_LOCAL)
+ if (
*
eflags & FIB_ENTRY_FLAG_LOCAL)
{
path->frp_flags |= FIB_ROUTE_PATH_LOCAL;
}
{
path->frp_flags |= FIB_ROUTE_PATH_LOCAL;
}
- if (eflags & FIB_ENTRY_FLAG_EXCLUSIVE)
+ if (
*
eflags & FIB_ENTRY_FLAG_EXCLUSIVE)
{
path->frp_flags |= FIB_ROUTE_PATH_EXCLUSIVE;
}
{
path->frp_flags |= FIB_ROUTE_PATH_EXCLUSIVE;
}
+ if (path->frp_flags & FIB_ROUTE_PATH_LOCAL)
+ {
+ *eflags |= FIB_ENTRY_FLAG_LOCAL;
+
+ if (path->frp_sw_if_index != ~0)
+ {
+ *eflags |= FIB_ENTRY_FLAG_CONNECTED;
+ }
+ }
}
fib_node_index_t
}
fib_node_index_t
@@
-538,6
+548,7
@@
fib_table_entry_path_add (u32 fib_index,
.frp_fib_index = next_hop_fib_index,
.frp_weight = next_hop_weight,
.frp_flags = path_flags,
.frp_fib_index = next_hop_fib_index,
.frp_weight = next_hop_weight,
.frp_flags = path_flags,
+ .frp_rpf_id = INDEX_INVALID,
.frp_label_stack = next_hop_labels,
};
fib_node_index_t fib_entry_index;
.frp_label_stack = next_hop_labels,
};
fib_node_index_t fib_entry_index;
@@
-557,7
+568,7
@@
fib_table_entry_path_add2 (u32 fib_index,
const fib_prefix_t *prefix,
fib_source_t source,
fib_entry_flag_t flags,
const fib_prefix_t *prefix,
fib_source_t source,
fib_entry_flag_t flags,
- fib_route_path_t *rpath)
+ fib_route_path_t *rpath
s
)
{
fib_node_index_t fib_entry_index;
fib_table_t *fib_table;
{
fib_node_index_t fib_entry_index;
fib_table_t *fib_table;
@@
-566,16
+577,16
@@
fib_table_entry_path_add2 (u32 fib_index,
fib_table = fib_table_get(fib_index, prefix->fp_proto);
fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
fib_table = fib_table_get(fib_index, prefix->fp_proto);
fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
- for (ii = 0; ii < vec_len(rpath); ii++)
+ for (ii = 0; ii < vec_len(rpath
s
); ii++)
{
{
- fib_table_route_path_fixup(prefix,
flags, &rpath
[ii]);
+ fib_table_route_path_fixup(prefix,
&flags, &rpaths
[ii]);
}
if (FIB_NODE_INDEX_INVALID == fib_entry_index)
{
fib_entry_index = fib_entry_create(fib_index, prefix,
source, flags,
}
if (FIB_NODE_INDEX_INVALID == fib_entry_index)
{
fib_entry_index = fib_entry_create(fib_index, prefix,
source, flags,
- rpath);
+ rpath
s
);
fib_table_entry_insert(fib_table, prefix, fib_entry_index);
fib_table->ft_src_route_counts[source]++;
fib_table_entry_insert(fib_table, prefix, fib_entry_index);
fib_table->ft_src_route_counts[source]++;
@@
-585,7
+596,7
@@
fib_table_entry_path_add2 (u32 fib_index,
int was_sourced;
was_sourced = fib_entry_is_sourced(fib_entry_index, source);
int was_sourced;
was_sourced = fib_entry_is_sourced(fib_entry_index, source);
- fib_entry_path_add(fib_entry_index, source, flags, rpath);;
+ fib_entry_path_add(fib_entry_index, source, flags, rpath
s
);;
if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
{
if (was_sourced != fib_entry_is_sourced(fib_entry_index, source))
{
@@
-600,7
+611,7
@@
void
fib_table_entry_path_remove2 (u32 fib_index,
const fib_prefix_t *prefix,
fib_source_t source,
fib_table_entry_path_remove2 (u32 fib_index,
const fib_prefix_t *prefix,
fib_source_t source,
- fib_route_path_t *rpath)
+ fib_route_path_t *rpath
s
)
{
/*
* 1 is it present
{
/*
* 1 is it present
@@
-609,8
+620,8
@@
fib_table_entry_path_remove2 (u32 fib_index,
* no => cover walk
*/
fib_node_index_t fib_entry_index;
* no => cover walk
*/
fib_node_index_t fib_entry_index;
+ fib_route_path_t *rpath;
fib_table_t *fib_table;
fib_table_t *fib_table;
- u32 ii;
fib_table = fib_table_get(fib_index, prefix->fp_proto);
fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
fib_table = fib_table_get(fib_index, prefix->fp_proto);
fib_entry_index = fib_table_lookup_exact_match_i(fib_table, prefix);
@@
-640,16
+651,16
@@
fib_table_entry_path_remove2 (u32 fib_index,
*/
fib_entry_lock(fib_entry_index);
*/
fib_entry_lock(fib_entry_index);
-
for (ii = 0; ii < vec_len(rpath); ii++
)
+
vec_foreach(rpath, rpaths
)
{
{
- fib_
table_route_path_fixup(
- prefix,
-
fib_entry_get_flags_for_source(fib_entry_index,
- source),
-
&rpath[ii]
);
+ fib_
entry_flag_t eflags;
+
+
eflags =
fib_entry_get_flags_for_source(fib_entry_index,
+ source);
+
fib_table_route_path_fixup(prefix, &eflags, rpath
);
}
}
- src_flag = fib_entry_path_remove(fib_entry_index, source, rpath);
+ src_flag = fib_entry_path_remove(fib_entry_index, source, rpath
s
);
if (!(FIB_ENTRY_SRC_FLAG_ADDED & src_flag))
{
if (!(FIB_ENTRY_SRC_FLAG_ADDED & src_flag))
{
@@
-735,7
+746,7
@@
fib_table_entry_update (u32 fib_index,
for (ii = 0; ii < vec_len(paths); ii++)
{
for (ii = 0; ii < vec_len(paths); ii++)
{
- fib_table_route_path_fixup(prefix, flags, &paths[ii]);
+ fib_table_route_path_fixup(prefix,
&
flags, &paths[ii]);
}
/*
* sort the paths provided by the control plane. this means
}
/*
* sort the paths provided by the control plane. this means
@@
-877,12
+888,20
@@
void
fib_table_entry_delete_index (fib_node_index_t fib_entry_index,
fib_source_t source)
{
fib_table_entry_delete_index (fib_node_index_t fib_entry_index,
fib_source_t source)
{
-
fib_prefix_t
prefix;
+
const fib_prefix_t *
prefix;
-
fib_entry_get_prefix(fib_entry_index, &prefi
x);
+
prefix = fib_entry_get_prefix(fib_entry_inde
x);
fib_table_entry_delete_i(fib_entry_get_fib_index(fib_entry_index),
fib_table_entry_delete_i(fib_entry_get_fib_index(fib_entry_index),
- fib_entry_index, &prefix, source);
+ fib_entry_index, prefix, source);
+}
+
+u32
+fib_table_entry_get_stats_index (u32 fib_index,
+ const fib_prefix_t *prefix)
+{
+ return (fib_entry_get_stats_index(
+ fib_table_lookup_exact_match(fib_index, prefix)));
}
fib_node_index_t
}
fib_node_index_t
@@
-1140,7
+1159,6
@@
fib_table_create_and_lock (fib_protocol_t proto,
fib_node_index_t fi;
va_list ap;
fib_node_index_t fi;
va_list ap;
- va_start(ap, fmt);
switch (proto)
{
switch (proto)
{
@@
-1159,6
+1177,8
@@
fib_table_create_and_lock (fib_protocol_t proto,
fib_table = fib_table_get(fi, proto);
fib_table = fib_table_get(fi, proto);
+ va_start(ap, fmt);
+
fib_table->ft_desc = va_format(fib_table->ft_desc, fmt, &ap);
va_end(ap);
fib_table->ft_desc = va_format(fib_table->ft_desc, fmt, &ap);
va_end(ap);
@@
-1235,15
+1255,6
@@
fib_table_unlock (u32 fib_index,
fib_table->ft_locks[source]--;
fib_table->ft_locks[FIB_TABLE_TOTAL_LOCKS]--;
fib_table->ft_locks[source]--;
fib_table->ft_locks[FIB_TABLE_TOTAL_LOCKS]--;
- if (0 == fib_table->ft_locks[source])
- {
- /*
- * The source no longer needs the table. flush any routes
- * from it just in case
- */
- fib_table_flush(fib_index, proto, source);
- }
-
if (0 == fib_table->ft_locks[FIB_TABLE_TOTAL_LOCKS])
{
/*
if (0 == fib_table->ft_locks[FIB_TABLE_TOTAL_LOCKS])
{
/*
@@
-1261,6
+1272,9
@@
fib_table_lock (u32 fib_index,
fib_table_t *fib_table;
fib_table = fib_table_get(fib_index, proto);
fib_table_t *fib_table;
fib_table = fib_table_get(fib_index, proto);
+
+ ASSERT(fib_table->ft_locks[source] < (0xffff - 1));
+
fib_table->ft_locks[source]++;
fib_table->ft_locks[FIB_TABLE_TOTAL_LOCKS]++;
}
fib_table->ft_locks[source]++;
fib_table->ft_locks[FIB_TABLE_TOTAL_LOCKS]++;
}