diff options
Diffstat (limited to 'src/vnet/ip/ip6_ll_table.c')
-rw-r--r-- | src/vnet/ip/ip6_ll_table.c | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/src/vnet/ip/ip6_ll_table.c b/src/vnet/ip/ip6_ll_table.c index e4010bc43c4..f9172f6c50c 100644 --- a/src/vnet/ip/ip6_ll_table.c +++ b/src/vnet/ip/ip6_ll_table.c @@ -52,9 +52,8 @@ ip6_ll_fib_create (u32 sw_if_index) vnet_main_t *vnm = vnet_get_main (); u8 *desc; - desc = format (NULL, "IP6-link-local:%U", - format_vnet_sw_interface_name, - vnm, vnet_get_sw_interface (vnm, sw_if_index)); + desc = format (NULL, "IP6-link-local:%U", format_vnet_sw_if_index_name, vnm, + sw_if_index); ip6_ll_table.ilt_fibs[sw_if_index] = ip6_fib_table_create_and_lock (FIB_SOURCE_IP6_ND, @@ -64,7 +63,6 @@ ip6_ll_fib_create (u32 sw_if_index) * leave the default route as a drop, but fix fe::/10 to be a glean * via the interface. */ - /* *INDENT-OFF* */ fib_prefix_t pfx = { .fp_proto = FIB_PROTOCOL_IP6, .fp_len = 10, @@ -90,7 +88,6 @@ ip6_ll_fib_create (u32 sw_if_index) 1, NULL, FIB_ROUTE_PATH_FLAG_NONE); - /* *INDENT-ON* */ } static void @@ -111,12 +108,17 @@ ip6_ll_table_entry_update (const ip6_ll_prefix_t * ilp, .frp_flags = flags, .frp_sw_if_index = ilp->ilp_sw_if_index, .frp_proto = DPO_PROTO_IP6, + .frp_fib_index = ~0, + .frp_weight = 1, }; - fib_prefix_t fp; + fib_prefix_t fp = { 0 }; - vec_validate (ip6_ll_table.ilt_fibs, ilp->ilp_sw_if_index); + if (flags & FIB_ROUTE_PATH_LOCAL) + rpath.frp_addr.ip6 = ilp->ilp_addr; - if (0 == ip6_ll_fib_get (ilp->ilp_sw_if_index)) + vec_validate_init_empty (ip6_ll_table.ilt_fibs, ilp->ilp_sw_if_index, ~0); + + if (~0 == ip6_ll_fib_get (ilp->ilp_sw_if_index)) { ip6_ll_fib_create (ilp->ilp_sw_if_index); } @@ -151,11 +153,12 @@ ip6_ll_table_entry_delete (const ip6_ll_prefix_t * ilp) * if there are no ND sourced prefixes left, then we can clean up this FIB */ fib_index = ip6_ll_fib_get (ilp->ilp_sw_if_index); - if (0 == fib_table_get_num_entries (fib_index, - FIB_PROTOCOL_IP6, FIB_SOURCE_IP6_ND)) + if (~0 != fib_index && + 0 == fib_table_get_num_entries (fib_index, FIB_PROTOCOL_IP6, + FIB_SOURCE_IP6_ND)) { fib_table_unlock (fib_index, FIB_PROTOCOL_IP6, FIB_SOURCE_IP6_ND); - ip6_ll_table.ilt_fibs[ilp->ilp_sw_if_index] = 0; + ip6_ll_table.ilt_fibs[ilp->ilp_sw_if_index] = ~0; } } @@ -273,8 +276,7 @@ ip6_ll_show_fib (vlib_main_t * vm, u8 *s = NULL; fib_index = ip6_ll_table.ilt_fibs[sw_if_index]; - - if (0 == fib_index) + if (~0 == fib_index) continue; fib_table = fib_table_get (fib_index, FIB_PROTOCOL_IP6); @@ -345,13 +347,21 @@ ip6_ll_show_fib (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (ip6_show_fib_command, static) = { .path = "show ip6-ll", .short_help = "show ip6-ll [summary] [interface] [<ip6-addr>[/<width>]] [detail]", .function = ip6_ll_show_fib, }; -/* *INDENT-ON* */ + +static clib_error_t * +ip6_ll_sw_interface_add_del (vnet_main_t *vnm, u32 sw_if_index, u32 is_add) +{ + vec_validate_init_empty (ip6_ll_table.ilt_fibs, sw_if_index, ~0); + + return (NULL); +} + +VNET_SW_INTERFACE_ADD_DEL_FUNCTION (ip6_ll_sw_interface_add_del); static clib_error_t * ip6_ll_module_init (vlib_main_t * vm) |