diff options
Diffstat (limited to 'src/vnet/fib/fib_table.c')
| -rw-r--r-- | src/vnet/fib/fib_table.c | 89 |
1 files changed, 73 insertions, 16 deletions
diff --git a/src/vnet/fib/fib_table.c b/src/vnet/fib/fib_table.c index 7cc989d6324..b2a32d0da56 100644 --- a/src/vnet/fib/fib_table.c +++ b/src/vnet/fib/fib_table.c @@ -25,6 +25,13 @@ const static char * fib_table_flags_strings[] = FIB_TABLE_ATTRIBUTES; +/* + * Default names for IP4, IP6, and MPLS FIB table index 0. + * Nominally like "ipv6-VRF:0", but this will override that name if set + * in a config section of the startup.conf file. + */ +char *fib_table_default_names[FIB_PROTOCOL_MAX]; + fib_table_t * fib_table_get (fib_node_index_t index, fib_protocol_t proto) @@ -534,7 +541,11 @@ fib_table_route_path_fixup (const fib_prefix_t *prefix, else if (fib_route_path_is_attached(path)) { path->frp_flags |= FIB_ROUTE_PATH_GLEAN; - fib_prefix_normalize(prefix, &path->frp_connected); + /* + * attached prefixes are not suitable as the source of ARP requests + * so don't save the prefix in the glean adj + */ + clib_memset(&path->frp_connected, 0, sizeof(path->frp_connected)); } if (*eflags & FIB_ENTRY_FLAG_DROP) { @@ -1149,21 +1160,29 @@ fib_table_find_or_create_and_lock_i (fib_protocol_t proto, fib_table = fib_table_get(fi, proto); - if (NULL == fib_table->ft_desc) + if (fib_table->ft_desc) + return fi; + + if (name && name[0]) { - if (name && name[0]) - { - fib_table->ft_desc = format(NULL, "%s", name); - } - else - { - fib_table->ft_desc = format(NULL, "%U-VRF:%d", - format_fib_protocol, proto, - table_id); - } + fib_table->ft_desc = format(NULL, "%s", name); + return fi; } - return (fi); + if (table_id == 0) + { + char *default_name = fib_table_default_names[proto]; + if (default_name && default_name[0]) + { + fib_table->ft_desc = format(NULL, "%s", default_name); + return fi; + } + } + + fib_table->ft_desc = format(NULL, "%U-VRF:%d", + format_fib_protocol, proto, + table_id); + return fi; } u32 @@ -1322,6 +1341,7 @@ fib_table_lock_dec (fib_table_t *fib_table, { vec_validate(fib_table->ft_locks, source); + ASSERT(fib_table->ft_locks[source] > 0); fib_table->ft_locks[source]--; fib_table->ft_total_locks--; } @@ -1337,6 +1357,36 @@ fib_table_lock_inc (fib_table_t *fib_table, fib_table->ft_total_locks++; } + +static void +fib_table_lock_clear (fib_table_t *fib_table, + fib_source_t source) +{ + vec_validate(fib_table->ft_locks, source); + + ASSERT(fib_table->ft_locks[source] <= 1); + if (fib_table->ft_locks[source]) + { + fib_table->ft_locks[source]--; + fib_table->ft_total_locks--; + } +} + +static void +fib_table_lock_set (fib_table_t *fib_table, + fib_source_t source) +{ + vec_validate(fib_table->ft_locks, source); + + ASSERT(fib_table->ft_locks[source] <= 1); + ASSERT(fib_table->ft_total_locks < (0xffffffff - 1)); + if (!fib_table->ft_locks[source]) + { + fib_table->ft_locks[source]++; + fib_table->ft_total_locks++; + } +} + void fib_table_unlock (u32 fib_index, fib_protocol_t proto, @@ -1345,12 +1395,16 @@ fib_table_unlock (u32 fib_index, fib_table_t *fib_table; fib_table = fib_table_get(fib_index, proto); - fib_table_lock_dec(fib_table, source); + + if (source == FIB_SOURCE_API || source == FIB_SOURCE_CLI) + fib_table_lock_clear(fib_table, source); + else + fib_table_lock_dec(fib_table, source); if (0 == fib_table->ft_total_locks) { /* - * no more locak from any source - kill it + * no more lock from any source - kill it */ fib_table_destroy(fib_table); } @@ -1365,7 +1419,10 @@ fib_table_lock (u32 fib_index, fib_table = fib_table_get(fib_index, proto); - fib_table_lock_inc(fib_table, source); + if (source == FIB_SOURCE_API || source == FIB_SOURCE_CLI) + fib_table_lock_set(fib_table, source); + else + fib_table_lock_inc(fib_table, source); } u32 |