X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_path.c;h=f48b64484cbff8e34dbf12ed2b65e3d6893a03bd;hb=b2c31b685fd2cf28436ca32bc93e23eb24c74878;hp=1eb195d3a52a18c3514401e4aacd19de5493a297;hpb=3fd99047439fe56dcd070e6dcaea7bc14715749c;p=vpp.git diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c index 1eb195d3a52..f48b64484cb 100644 --- a/src/vnet/fib/fib_path.c +++ b/src/vnet/fib/fib_path.c @@ -106,17 +106,8 @@ typedef enum fib_path_type_t_ { * via a DVR. */ FIB_PATH_TYPE_DVR, - /** - * Marker. Add new types before this one, then update it. - */ - FIB_PATH_TYPE_LAST = FIB_PATH_TYPE_BIER_FMASK, } __attribute__ ((packed)) fib_path_type_t; -/** - * The maximum number of path_types - */ -#define FIB_PATH_TYPE_MAX (FIB_PATH_TYPE_LAST + 1) - #define FIB_PATH_TYPES { \ [FIB_PATH_TYPE_ATTACHED_NEXT_HOP] = "attached-nexthop", \ [FIB_PATH_TYPE_ATTACHED] = "attached", \ @@ -133,11 +124,6 @@ typedef enum fib_path_type_t_ { [FIB_PATH_TYPE_DVR] = "dvr", \ } -#define FOR_EACH_FIB_PATH_TYPE(_item) \ - for (_item = FIB_PATH_TYPE_FIRST; \ - _item <= FIB_PATH_TYPE_LAST; \ - _item++) - /** * Enurmeration of path operational (i.e. derived) attributes */ @@ -154,10 +140,6 @@ typedef enum fib_path_oper_attribute_t_ { * The path is resolved */ FIB_PATH_OPER_ATTRIBUTE_RESOLVED, - /** - * The path is attached, despite what the next-hop may say. - */ - FIB_PATH_OPER_ATTRIBUTE_ATTACHED, /** * The path has become a permanent drop. */ @@ -192,7 +174,6 @@ typedef enum fib_path_oper_flags_t_ { FIB_PATH_OPER_FLAG_RECURSIVE_LOOP = (1 << FIB_PATH_OPER_ATTRIBUTE_RECURSIVE_LOOP), FIB_PATH_OPER_FLAG_DROP = (1 << FIB_PATH_OPER_ATTRIBUTE_DROP), FIB_PATH_OPER_FLAG_RESOLVED = (1 << FIB_PATH_OPER_ATTRIBUTE_RESOLVED), - FIB_PATH_OPER_FLAG_ATTACHED = (1 << FIB_PATH_OPER_ATTRIBUTE_ATTACHED), } __attribute__ ((packed)) fib_path_oper_flags_t; /** @@ -259,6 +240,10 @@ typedef struct fib_path_t_ { u32 fp_interface; } attached_next_hop; struct { + /** + * The Connected local address + */ + fib_prefix_t fp_connected; /** * The interface */ @@ -282,16 +267,10 @@ typedef struct fib_path_t_ { mpls_eos_bit_t fp_eos; }; } fp_nh; - union { - /** - * The FIB table index in which to find the next-hop. - */ - fib_node_index_t fp_tbl_id; - /** - * The BIER FIB the fmask is in - */ - index_t fp_bier_fib; - }; + /** + * The FIB table index in which to find the next-hop. + */ + fib_node_index_t fp_tbl_id; } recursive; struct { /** @@ -369,7 +348,7 @@ typedef struct fib_path_t_ { STRUCT_MARK(path_hash_end); /** - * Memebers in this last section represent information that is + * Members in this last section represent information that is * dervied during resolution. It should not be copied to new paths * nor compared. */ @@ -645,14 +624,16 @@ fib_path_last_lock_gone (fib_node_t *node) ASSERT(0); } -static void +static fib_path_t* fib_path_attached_next_hop_get_adj (fib_path_t *path, vnet_link_t link, dpo_id_t *dpo) { + fib_node_index_t fib_path_index; fib_protocol_t nh_proto; adj_index_t ai; + fib_path_index = fib_path_get_index(path); nh_proto = dpo_proto_to_fib(path->fp_nh_proto); if (vnet_sw_interface_is_p2p(vnet_get_main(), @@ -676,6 +657,8 @@ fib_path_attached_next_hop_get_adj (fib_path_t *path, dpo_set(dpo, DPO_ADJACENCY, vnet_link_to_dpo_proto(link), ai); adj_unlock(ai); + + return (fib_path_get(fib_path_index)); } static void @@ -685,9 +668,9 @@ fib_path_attached_next_hop_set (fib_path_t *path) * resolve directly via the adjacency discribed by the * interface and next-hop */ - fib_path_attached_next_hop_get_adj(path, - dpo_proto_to_link(path->fp_nh_proto), - &path->fp_dpo); + path = fib_path_attached_next_hop_get_adj(path, + dpo_proto_to_link(path->fp_nh_proto), + &path->fp_dpo); ASSERT(dpo_is_adj(&path->fp_dpo)); @@ -742,7 +725,7 @@ fib_path_attached_get_adj (fib_path_t *path, ai = adj_glean_add_or_lock(nh_proto, link, path->attached.fp_interface, - NULL); + &path->attached.fp_connected); dpo_set(dpo, DPO_ADJACENCY_GLEAN, vnet_link_to_dpo_proto(link), ai); adj_unlock(ai); } @@ -1111,7 +1094,7 @@ FIXME comment vnet_get_main(), path->attached_next_hop.fp_interface); - fib_path_attached_next_hop_get_adj( + path = fib_path_attached_next_hop_get_adj( path, dpo_proto_to_link(path->fp_nh_proto), &path->fp_dpo); @@ -1272,6 +1255,8 @@ fib_path_route_flags_to_cfg_flags (const fib_route_path_t *rpath) cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_UNREACH; if (rpath->frp_flags & FIB_ROUTE_PATH_ICMP_PROHIBIT) cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_PROHIBIT; + if (rpath->frp_flags & FIB_ROUTE_PATH_GLEAN) + cfg_flags |= FIB_PATH_CFG_FLAG_GLEAN; return (cfg_flags); } @@ -1375,6 +1360,12 @@ fib_path_create (fib_node_index_t pl_index, path->fp_type = FIB_PATH_TYPE_SPECIAL; path->classify.fp_classify_table_id = rpath->frp_classify_table_id; } + else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_GLEAN) + { + path->fp_type = FIB_PATH_TYPE_ATTACHED; + path->attached.fp_interface = rpath->frp_sw_if_index; + path->attached.fp_connected = rpath->frp_connected; + } else if (~0 != rpath->frp_sw_if_index) { if (ip46_address_is_zero(&rpath->frp_addr)) @@ -1488,7 +1479,7 @@ fib_path_copy (fib_node_index_t path_index, orig_path = fib_path_get(path_index); ASSERT(NULL != orig_path); - memcpy(path, orig_path, sizeof(*path)); + clib_memcpy(path, orig_path, sizeof(*path)); FIB_PATH_DBG(path, "create-copy:%d", path_index); @@ -1590,8 +1581,8 @@ fib_path_cmp_i (const fib_path_t *path1, path2->attached.fp_interface); break; case FIB_PATH_TYPE_RECURSIVE: - res = ip46_address_cmp(&path1->recursive.fp_nh, - &path2->recursive.fp_nh); + res = ip46_address_cmp(&path1->recursive.fp_nh.fp_ip, + &path2->recursive.fp_nh.fp_ip); if (0 == res) { @@ -1870,7 +1861,8 @@ fib_path_recursive_loop_detect (fib_node_index_t path_index, } case FIB_PATH_TYPE_ATTACHED_NEXT_HOP: case FIB_PATH_TYPE_ATTACHED: - if (adj_recursive_loop_detect(path->fp_dpo.dpoi_index, + if (dpo_is_adj(&path->fp_dpo) && + adj_recursive_loop_detect(path->fp_dpo.dpoi_index, entry_indicies)) { FIB_PATH_DBG(path, "recursive loop formed"); @@ -2114,7 +2106,7 @@ fib_path_resolve (fib_node_index_t path_index) break; } case FIB_PATH_TYPE_DVR: - dvr_dpo_add_or_lock(path->attached.fp_interface, + dvr_dpo_add_or_lock(path->dvr.fp_interface, path->fp_nh_proto, &path->fp_dpo); break; @@ -2446,10 +2438,10 @@ fib_path_contribute_forwarding (fib_node_index_t path_index, case FIB_FORW_CHAIN_TYPE_NSH: case FIB_FORW_CHAIN_TYPE_MCAST_IP4: case FIB_FORW_CHAIN_TYPE_MCAST_IP6: - fib_path_attached_next_hop_get_adj( - path, - fib_forw_chain_type_to_link_type(fct), - dpo); + path = fib_path_attached_next_hop_get_adj( + path, + fib_forw_chain_type_to_link_type(fct), + dpo); break; case FIB_FORW_CHAIN_TYPE_BIER: break; @@ -2818,7 +2810,7 @@ show_fib_path_command (vlib_main_t * vm, FIB_PATH_FORMAT_FLAGS_NONE); s = format(s, "\n children:"); s = fib_node_children_format(path->fp_node.fn_children, s); - vlib_cli_output (vm, "%s", s); + vlib_cli_output (vm, "%v", s); vec_free(s); } else @@ -2829,11 +2821,11 @@ show_fib_path_command (vlib_main_t * vm, else { vlib_cli_output (vm, "FIB Paths"); - pool_foreach_index (pi, fib_path_pool, - ({ + pool_foreach_index (pi, fib_path_pool) + { vlib_cli_output (vm, "%U", format_fib_path, pi, 0, FIB_PATH_FORMAT_FLAGS_NONE); - })); + } } return (NULL);