X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_entry_src_rr.c;h=d0256b9f24bf3387e199f6324ea64024ce1e481b;hb=ce21599c8af34a3f9da813a3c953a38a16316b4d;hp=d66ef7b110832e00b63eeba81e8e1da8252e60f2;hpb=08b1648194e0076220c52aebe27ee1eb5615fd6a;p=vpp.git diff --git a/src/vnet/fib/fib_entry_src_rr.c b/src/vnet/fib/fib_entry_src_rr.c old mode 100644 new mode 100755 index d66ef7b1108..d0256b9f24b --- a/src/vnet/fib/fib_entry_src_rr.c +++ b/src/vnet/fib/fib_entry_src_rr.c @@ -20,6 +20,7 @@ #include #include "fib_entry_src.h" +#include "fib_entry_src_rr.h" #include "fib_entry_cover.h" #include "fib_entry.h" #include "fib_table.h" @@ -29,13 +30,13 @@ * * Resolve via a connected cover. */ -static void +void fib_entry_src_rr_resolve_via_connected (fib_entry_src_t *src, const fib_entry_t *fib_entry, const fib_entry_t *cover) { const fib_route_path_t path = { - .frp_proto = fib_entry->fe_prefix.fp_proto, + .frp_proto = fib_proto_to_dpo(fib_entry->fe_prefix.fp_proto), .frp_addr = fib_entry->fe_prefix.fp_addr, .frp_sw_if_index = fib_entry_get_resolving_interface( fib_entry_get_index(cover)), @@ -53,7 +54,8 @@ fib_entry_src_rr_resolve_via_connected (fib_entry_src_t *src, * shortly to over-rule this RR source. */ src->fes_pl = fib_path_list_create(FIB_PATH_LIST_FLAG_NONE, paths); - src->fes_entry_flags = fib_entry_get_flags(fib_entry_get_index(cover)); + src->fes_entry_flags |= (fib_entry_get_flags(fib_entry_get_index(cover)) & + FIB_ENTRY_FLAGS_RR_INHERITED); vec_free(paths); } @@ -65,8 +67,8 @@ fib_entry_src_rr_resolve_via_connected (fib_entry_src_t *src, static void fib_entry_src_rr_init (fib_entry_src_t *src) { - src->rr.fesr_cover = FIB_NODE_INDEX_INVALID; - src->rr.fesr_sibling = FIB_NODE_INDEX_INVALID; + src->u.rr.fesr_cover = FIB_NODE_INDEX_INVALID; + src->u.rr.fesr_sibling = FIB_NODE_INDEX_INVALID; } @@ -77,31 +79,30 @@ fib_entry_src_rr_init (fib_entry_src_t *src) * and there would be 2 locks on the path-list; one since its used * by the cover, and 1 from here. The first lock will go when the * cover is removed, the second, and last, when the covered walk - * occurs during the cover's removel - this is not a place where + * occurs during the cover's removal - this is not a place where * we can handle last lock gone. * In short, don't let the loop form. The usual rules of 'we must * let it form so we know when it breaks' don't apply here, since * the loop will break when the cover changes, and this function * will be called again when that happens. */ -static void +void fib_entry_src_rr_use_covers_pl (fib_entry_src_t *src, const fib_entry_t *fib_entry, const fib_entry_t *cover) { fib_node_index_t *entries = NULL; - fib_protocol_t proto; + dpo_proto_t proto; - proto = fib_entry->fe_prefix.fp_proto; + proto = fib_proto_to_dpo(fib_entry->fe_prefix.fp_proto); vec_add1(entries, fib_entry_get_index(fib_entry)); if (fib_path_list_recursive_loop_detect(cover->fe_parent, &entries)) { - src->fes_pl = fib_path_list_create_special( - proto, - FIB_PATH_LIST_FLAG_DROP, - drop_dpo_get(fib_proto_to_dpo(proto))); + src->fes_pl = fib_path_list_create_special(proto, + FIB_PATH_LIST_FLAG_DROP, + drop_dpo_get(proto)); } else { @@ -126,21 +127,21 @@ fib_entry_src_rr_activate (fib_entry_src_t *src, */ if (FIB_PROTOCOL_MPLS == fib_entry->fe_prefix.fp_proto) { - src->fes_pl = fib_path_list_create_special(FIB_PROTOCOL_MPLS, + src->fes_pl = fib_path_list_create_special(DPO_PROTO_MPLS, FIB_PATH_LIST_FLAG_DROP, NULL); fib_path_list_lock(src->fes_pl); return (!0); } - src->rr.fesr_cover = fib_table_get_less_specific(fib_entry->fe_fib_index, + src->u.rr.fesr_cover = fib_table_get_less_specific(fib_entry->fe_fib_index, &fib_entry->fe_prefix); - ASSERT(FIB_NODE_INDEX_INVALID != src->rr.fesr_cover); + ASSERT(FIB_NODE_INDEX_INVALID != src->u.rr.fesr_cover); - cover = fib_entry_get(src->rr.fesr_cover); + cover = fib_entry_get(src->u.rr.fesr_cover); - src->rr.fesr_sibling = + src->u.rr.fesr_sibling = fib_entry_cover_track(cover, fib_entry_get_index(fib_entry)); /* @@ -174,13 +175,22 @@ fib_entry_src_rr_deactivate (fib_entry_src_t *src, fib_entry_t *cover; /* - * remove the depednecy on the covering entry + * remove the dependency on the covering entry */ - if (FIB_NODE_INDEX_INVALID != src->rr.fesr_cover) + if (FIB_NODE_INDEX_INVALID != src->u.rr.fesr_cover) { - cover = fib_entry_get(src->rr.fesr_cover); - fib_entry_cover_untrack(cover, src->rr.fesr_sibling); - src->rr.fesr_cover = FIB_NODE_INDEX_INVALID; + fib_node_index_t *entries = NULL; + + cover = fib_entry_get(src->u.rr.fesr_cover); + fib_entry_cover_untrack(cover, src->u.rr.fesr_sibling); + src->u.rr.fesr_cover = FIB_NODE_INDEX_INVALID; + + if (FIB_NODE_INDEX_INVALID != cover->fe_parent) + { + fib_path_list_recursive_loop_detect(cover->fe_parent, &entries); + + vec_free(entries); + } } fib_path_list_unlock(src->fes_pl); @@ -188,7 +198,7 @@ fib_entry_src_rr_deactivate (fib_entry_src_t *src, src->fes_entry_flags = FIB_ENTRY_FLAG_NONE; } -static fib_entry_src_cover_res_t +fib_entry_src_cover_res_t fib_entry_src_rr_cover_change (fib_entry_src_t *src, const fib_entry_t *fib_entry) { @@ -197,7 +207,7 @@ fib_entry_src_rr_cover_change (fib_entry_src_t *src, .bw_reason = FIB_NODE_BW_REASON_FLAG_NONE, }; - if (FIB_NODE_INDEX_INVALID == src->rr.fesr_cover) + if (FIB_NODE_INDEX_INVALID == src->u.rr.fesr_cover) { /* * the source may be added, but it is not active @@ -211,7 +221,7 @@ fib_entry_src_rr_cover_change (fib_entry_src_t *src, * entry inserted benaeth it. That does not necessarily mean that this * entry is covered by the new prefix. check that */ - if (src->rr.fesr_cover != fib_table_get_less_specific(fib_entry->fe_fib_index, + if (src->u.rr.fesr_cover != fib_table_get_less_specific(fib_entry->fe_fib_index, &fib_entry->fe_prefix)) { fib_entry_src_rr_deactivate(src, fib_entry); @@ -231,7 +241,7 @@ fib_entry_src_rr_cover_change (fib_entry_src_t *src, * This entry's cover has updated its forwarding info. This entry * will need to re-inheret. */ -static fib_entry_src_cover_res_t +fib_entry_src_cover_res_t fib_entry_src_rr_cover_update (fib_entry_src_t *src, const fib_entry_t *fib_entry) { @@ -242,7 +252,7 @@ fib_entry_src_rr_cover_update (fib_entry_src_t *src, fib_node_index_t old_path_list; fib_entry_t *cover; - if (FIB_NODE_INDEX_INVALID == src->rr.fesr_cover) + if (FIB_NODE_INDEX_INVALID == src->u.rr.fesr_cover) { /* * the source may be added, but it is not active @@ -251,7 +261,7 @@ fib_entry_src_rr_cover_update (fib_entry_src_t *src, return (res); } - cover = fib_entry_get(src->rr.fesr_cover); + cover = fib_entry_get(src->u.rr.fesr_cover); old_path_list = src->fes_pl; /* @@ -281,7 +291,7 @@ static u8* fib_entry_src_rr_format (fib_entry_src_t *src, u8* s) { - return (format(s, "cover:%d", src->rr.fesr_cover)); + return (format(s, " cover:%d", src->u.rr.fesr_cover)); } const static fib_entry_src_vft_t rr_src_vft = { @@ -296,6 +306,5 @@ const static fib_entry_src_vft_t rr_src_vft = { void fib_entry_src_rr_register (void) { - fib_entry_src_register(FIB_SOURCE_RR, &rr_src_vft); - fib_entry_src_register(FIB_SOURCE_URPF_EXEMPT, &rr_src_vft); + fib_entry_src_behaviour_register(FIB_SOURCE_BH_RR, &rr_src_vft); }