diff options
| author |   Neale Ranns <neale@graphiant.com> | 2021-08-06 12:24:14 +0000 |
|---|---|---|
| committer |   Ole Tr�an <otroan@employees.org> | 2021-08-11 08:48:42 +0000 |
| commit | 6bb2db0ea860812d9c366935312e7849deca9c93 (patch) | |
| tree | f70bdd3e4ce59419aa6583f3ee879dbaa029f56d /src/vnet/fib/ip4_fib.c | |
| parent | a8c720e301f3576506b2b284fe925b055398b638 (diff) | |
ip: Rename the ip4 mtrie function to be 16_8_8 specific
Type: improvement
the existing mtrie functions use the existing 16_8_8 mtrie. Rename them
to make that explicit. Then we can add the 8_8_8_8 types and functions
alongside.
Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: If5ce7a282d5d3742dc65bcd0523220235d9c510d
Diffstat (limited to 'src/vnet/fib/ip4_fib.c')
| -rw-r--r-- | src/vnet/fib/ip4_fib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c index a3010149a4d..e8ab653e53a 100644 --- a/src/vnet/fib/ip4_fib.c +++ b/src/vnet/fib/ip4_fib.c @@ -129,7 +129,7 @@ ip4_create_fib_with_table_id (u32 table_id, fib_table_lock(fib_table->ft_index, FIB_PROTOCOL_IP4, src); - ip4_mtrie_init(&v4_fib->mtrie); + ip4_mtrie_16_init(&v4_fib->mtrie); /* * add the special entries into the new FIB @@ -195,7 +195,7 @@ ip4_fib_table_destroy (u32 fib_index) } vec_free(fib_table->ft_src_route_counts); - ip4_mtrie_free(&v4_fib->mtrie); + ip4_mtrie_16_free(&v4_fib->mtrie); pool_put(ip4_main.v4_fibs, v4_fib); pool_put(ip4_main.fibs, fib_table); @@ -377,7 +377,7 @@ ip4_fib_table_fwding_dpo_update (ip4_fib_t *fib, u32 len, const dpo_id_t *dpo) { - ip4_fib_mtrie_route_add(&fib->mtrie, addr, len, dpo->dpoi_index); + ip4_mtrie_16_route_add(&fib->mtrie, addr, len, dpo->dpoi_index); } void @@ -398,7 +398,7 @@ ip4_fib_table_fwding_dpo_remove (ip4_fib_t *fib, cover_prefix = fib_entry_get_prefix(cover_index); cover_dpo = fib_entry_contribute_ip_forwarding(cover_index); - ip4_fib_mtrie_route_del(&fib->mtrie, + ip4_mtrie_16_route_del(&fib->mtrie, addr, len, dpo->dpoi_index, cover_prefix->fp_len, cover_dpo->dpoi_index); @@ -632,7 +632,7 @@ ip4_show_fib (vlib_main_t * vm, uword mtrie_size, hash_size; - mtrie_size = ip4_fib_mtrie_memory_usage(&fib->mtrie); + mtrie_size = ip4_mtrie_16_memory_usage(&fib->mtrie); hash_size = 0; for (i = 0; i < ARRAY_LEN (fib->fib_entry_by_dst_address); i++) @@ -679,7 +679,7 @@ ip4_show_fib (vlib_main_t * vm, /* Show summary? */ if (mtrie) { - vlib_cli_output (vm, "%U", format_ip4_fib_mtrie, &fib->mtrie, verbose); + vlib_cli_output (vm, "%U", format_ip4_mtrie_16, &fib->mtrie, verbose); continue; } if (! verbose) |