#include <vnet/dpo/receive_dpo.h>
#include <vnet/dpo/load_balance_map.h>
#include <vnet/dpo/lookup_dpo.h>
-#include <vnet/dpo/interface_dpo.h>
+#include <vnet/dpo/interface_rx_dpo.h>
#include <vnet/dpo/mpls_disposition.h>
+#include <vnet/dpo/dvr_dpo.h>
+#include <vnet/dpo/drop_dpo.h>
#include <vnet/adj/adj.h>
#include <vnet/adj/adj_mcast.h>
#include <vnet/fib/fib_internal.h>
#include <vnet/fib/fib_urpf_list.h>
#include <vnet/fib/mpls_fib.h>
+#include <vnet/udp/udp_encap.h>
+#include <vnet/bier/bier_fmask.h>
+#include <vnet/bier/bier_table.h>
+#include <vnet/bier/bier_imp.h>
+#include <vnet/bier/bier_disp_table.h>
/**
* Enurmeration of path types
* interface receive.
*/
FIB_PATH_TYPE_INTF_RX,
+ /**
+ * interface receive.
+ */
+ FIB_PATH_TYPE_UDP_ENCAP,
/**
* receive. it's for-us.
*/
FIB_PATH_TYPE_RECEIVE,
+ /**
+ * bier-imp. it's via a BIER imposition.
+ */
+ FIB_PATH_TYPE_BIER_IMP,
+ /**
+ * bier-fmask. it's via a BIER ECMP-table.
+ */
+ FIB_PATH_TYPE_BIER_TABLE,
+ /**
+ * bier-fmask. it's via a BIER f-mask.
+ */
+ FIB_PATH_TYPE_BIER_FMASK,
+ /**
+ * via a DVR.
+ */
+ FIB_PATH_TYPE_DVR,
/**
* Marker. Add new types before this one, then update it.
*/
- FIB_PATH_TYPE_LAST = FIB_PATH_TYPE_RECEIVE,
+ FIB_PATH_TYPE_LAST = FIB_PATH_TYPE_BIER_FMASK,
} __attribute__ ((packed)) fib_path_type_t;
/**
[FIB_PATH_TYPE_EXCLUSIVE] = "exclusive", \
[FIB_PATH_TYPE_DEAG] = "deag", \
[FIB_PATH_TYPE_INTF_RX] = "intf-rx", \
+ [FIB_PATH_TYPE_UDP_ENCAP] = "udp-encap", \
[FIB_PATH_TYPE_RECEIVE] = "receive", \
+ [FIB_PATH_TYPE_BIER_IMP] = "bier-imp", \
+ [FIB_PATH_TYPE_BIER_TABLE] = "bier-table", \
+ [FIB_PATH_TYPE_BIER_FMASK] = "bier-fmask", \
+ [FIB_PATH_TYPE_DVR] = "dvr", \
}
-#define FOR_EACH_FIB_PATH_TYPE(_item) \
- for (_item = FIB_PATH_TYPE_FIRST; _item <= FIB_PATH_TYPE_LAST; _item++)
+#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
* next-hop's address. We can't derive this from the address itself
* since the address can be all zeros
*/
- fib_protocol_t fp_nh_proto;
+ dpo_proto_t fp_nh_proto;
+
+ /**
+ * UCMP [unnormalised] weigth
+ */
+ u8 fp_weight;
/**
- * UCMP [unnormalised] weigt
+ * A path preference. 0 is the best.
+ * Only paths of the best preference, that are 'up', are considered
+ * for forwarding.
*/
- u32 fp_weight;
+ u8 fp_preference;
/**
* per-type union of the data required to resolve the path
mpls_eos_bit_t fp_eos;
};
} fp_nh;
- /**
- * The FIB table index in which to find the next-hop.
- * This needs to be fixed. We should lookup the adjacencies in
- * a separate table of adjacencies, rather than from the FIB.
- * Two reasons I can think of:
- * - consider:
- * int ip addr Gig0 10.0.0.1/24
- * ip route 10.0.0.2/32 via Gig1 192.168.1.2
- * ip route 1.1.1.1/32 via Gig0 10.0.0.2
- * this is perfectly valid.
- * Packets addressed to 10.0.0.2 should be sent via Gig1.
- * Packets address to 1.1.1.1 should be sent via Gig0.
- * when we perform the adj resolution from the FIB for the path
- * "via Gig0 10.0.0.2" the lookup will result in the route via Gig1
- * and so we will pick up the adj via Gig1 - which was not what the
- * operator wanted.
- * - we can only return link-type IPv4 and so not the link-type MPLS.
- * more on this in a later commit.
- *
- * The table ID should only belong to a recursive path and indicate
- * which FIB should be used to resolve the next-hop.
- */
- fib_node_index_t fp_tbl_id;
+ 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;
+ };
} recursive;
+ struct {
+ /**
+ * BIER FMask ID
+ */
+ index_t fp_bier_fmask;
+ } bier_fmask;
+ struct {
+ /**
+ * The BIER table's ID
+ */
+ bier_table_id_t fp_bier_tbl;
+ } bier_table;
+ struct {
+ /**
+ * The BIER imposition object
+ * this is part of the path's key, since the index_t
+ * of an imposition object is the object's key.
+ */
+ index_t fp_bier_imp;
+ } bier_imp;
struct {
/**
* The FIB index in which to perfom the next lookup
*/
u32 fp_interface;
} intf_rx;
+ struct {
+ /**
+ * The UDP Encap object this path resolves through
+ */
+ u32 fp_udp_encap_id;
+ } udp_encap;
+ struct {
+ /**
+ * The interface
+ */
+ u32 fp_interface;
+ } dvr;
};
STRUCT_MARK(path_hash_end);
*/
fib_path_oper_flags_t fp_oper_flags;
- /**
- * the resolving via fib. not part of the union, since it it not part
- * of the path's hash.
- */
- fib_node_index_t fp_via_fib;
+ union {
+ /**
+ * the resolving via fib. not part of the union, since it it not part
+ * of the path's hash.
+ */
+ fib_node_index_t fp_via_fib;
+ /**
+ * the resolving bier-table
+ */
+ index_t fp_via_bier_tbl;
+ /**
+ * the resolving bier-fmask
+ */
+ index_t fp_via_bier_fmask;
+ };
/**
* The Data-path objects through which this path resolves for IP.
{ \
u8 *_tmp = NULL; \
_tmp = fib_path_format(fib_path_get_index(_p), _tmp); \
- clib_warning("path:[%d:%s]:" _fmt, \
- fib_path_get_index(_p), _tmp, \
+ clib_warning("path:[%d:%U]:" _fmt, \
+ fib_path_get_index(_p), format_fib_path, _p, 0,\
##_args); \
vec_free(_tmp); \
}
static fib_path_t*
fib_path_from_fib_node (fib_node_t *node)
{
-#if CLIB_DEBUG > 0
ASSERT(FIB_NODE_TYPE_PATH == node->fn_type);
-#endif
return ((fib_path_t*)node);
}
u8 *
format_fib_path (u8 * s, va_list * args)
{
- fib_path_t *path = va_arg (*args, fib_path_t *);
+ fib_node_index_t path_index = va_arg (*args, fib_node_index_t);
+ u32 indent = va_arg (*args, u32);
vnet_main_t * vnm = vnet_get_main();
fib_path_oper_attribute_t oattr;
fib_path_cfg_attribute_t cattr;
+ fib_path_t *path;
- s = format (s, " index:%d ", fib_path_get_index(path));
+ path = fib_path_get(path_index);
+
+ s = format (s, "%Upath:[%d] ", format_white_space, indent,
+ fib_path_get_index(path));
s = format (s, "pl-index:%d ", path->fp_pl_index);
- s = format (s, "%U ", format_fib_protocol, path->fp_nh_proto);
+ s = format (s, "%U ", format_dpo_proto, path->fp_nh_proto);
s = format (s, "weight=%d ", path->fp_weight);
+ s = format (s, "pref=%d ", path->fp_preference);
s = format (s, "%s: ", fib_path_type_names[path->fp_type]);
if (FIB_PATH_OPER_FLAG_NONE != path->fp_oper_flags) {
s = format(s, " oper-flags:");
}
}
}
- s = format(s, "\n ");
+ s = format(s, "\n%U", format_white_space, indent+2);
switch (path->fp_type)
{
}
if (!dpo_id_is_valid(&path->fp_dpo))
{
- s = format(s, "\n unresolved");
+ s = format(s, "\n%Uunresolved", format_white_space, indent+2);
}
else
{
- s = format(s, "\n %U",
- format_dpo_id,
+ s = format(s, "\n%U%U",
+ format_white_space, indent,
+ format_dpo_id,
&path->fp_dpo, 13);
}
break;
case FIB_PATH_TYPE_ATTACHED:
if (path->fp_oper_flags & FIB_PATH_OPER_FLAG_DROP)
{
- s = format (s, " if_index:%d", path->attached_next_hop.fp_interface);
+ s = format (s, "if_index:%d", path->attached_next_hop.fp_interface);
}
else
{
}
break;
case FIB_PATH_TYPE_RECURSIVE:
- if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
+ if (DPO_PROTO_MPLS == path->fp_nh_proto)
{
s = format (s, "via %U %U",
format_mpls_unicast_label,
path->fp_dpo.dpoi_index);
break;
+ case FIB_PATH_TYPE_UDP_ENCAP:
+ s = format (s, "UDP-encap ID:%d", path->udp_encap.fp_udp_encap_id);
+ break;
+ case FIB_PATH_TYPE_BIER_TABLE:
+ s = format (s, "via bier-table:[%U}",
+ format_bier_table_id,
+ &path->bier_table.fp_bier_tbl);
+ s = format (s, " via-dpo:[%U:%d]",
+ format_dpo_type, path->fp_dpo.dpoi_type,
+ path->fp_dpo.dpoi_index);
+ break;
+ case FIB_PATH_TYPE_BIER_FMASK:
+ s = format (s, "via-fmask:%d", path->bier_fmask.fp_bier_fmask);
+ s = format (s, " via-dpo:[%U:%d]",
+ format_dpo_type, path->fp_dpo.dpoi_type,
+ path->fp_dpo.dpoi_index);
+ break;
+ case FIB_PATH_TYPE_BIER_IMP:
+ s = format (s, "via %U", format_bier_imp,
+ path->bier_imp.fp_bier_imp, 0, BIER_SHOW_BRIEF);
+ break;
+ case FIB_PATH_TYPE_DVR:
+ s = format (s, " %U",
+ format_vnet_sw_interface_name,
+ vnm,
+ vnet_get_sw_interface(
+ vnm,
+ path->dvr.fp_interface));
+ break;
case FIB_PATH_TYPE_RECEIVE:
case FIB_PATH_TYPE_INTF_RX:
case FIB_PATH_TYPE_SPECIAL:
if (dpo_id_is_valid(&path->fp_dpo))
{
s = format(s, "%U", format_dpo_id,
- &path->fp_dpo, 2);
+ &path->fp_dpo, indent+2);
}
break;
}
return (format (s, "%U", format_fib_path, path));
}
-u8 *
-fib_path_adj_format (fib_node_index_t pi,
- u32 indent,
- u8 *s)
-{
- fib_path_t *path;
-
- path = fib_path_get(pi);
- ASSERT(NULL != path);
-
- if (!dpo_id_is_valid(&path->fp_dpo))
- {
- s = format(s, " unresolved");
- }
- else
- {
- s = format(s, "%U", format_dpo_id,
- &path->fp_dpo, 2);
- }
-
- return (s);
-}
-
/*
* fib_path_last_lock_gone
*
* the subnet address (the attached route) links to the
* auto-adj (see below), we want that adj here too.
*/
- return (adj_nbr_add_or_lock(path->fp_nh_proto,
+ return (adj_nbr_add_or_lock(dpo_proto_to_fib(path->fp_nh_proto),
link,
&zero_addr,
path->attached_next_hop.fp_interface));
}
else
{
- return (adj_nbr_add_or_lock(path->fp_nh_proto,
+ return (adj_nbr_add_or_lock(dpo_proto_to_fib(path->fp_nh_proto),
link,
&path->attached_next_hop.fp_nh,
path->attached_next_hop.fp_interface));
*/
dpo_set(&path->fp_dpo,
DPO_ADJACENCY,
- fib_proto_to_dpo(path->fp_nh_proto),
+ path->fp_nh_proto,
fib_path_attached_next_hop_get_adj(
path,
- fib_proto_to_link(path->fp_nh_proto)));
+ dpo_proto_to_link(path->fp_nh_proto)));
/*
* become a child of the adjacency so we receive updates
}
}
+static const adj_index_t
+fib_path_attached_get_adj (fib_path_t *path,
+ vnet_link_t link)
+{
+ if (vnet_sw_interface_is_p2p(vnet_get_main(),
+ path->attached.fp_interface))
+ {
+ /*
+ * point-2-point interfaces do not require a glean, since
+ * there is nothing to ARP. Install a rewrite/nbr adj instead
+ */
+ return (adj_nbr_add_or_lock(dpo_proto_to_fib(path->fp_nh_proto),
+ link,
+ &zero_addr,
+ path->attached.fp_interface));
+ }
+ else
+ {
+ return (adj_glean_add_or_lock(dpo_proto_to_fib(path->fp_nh_proto),
+ path->attached.fp_interface,
+ NULL));
+ }
+}
+
/*
* create of update the paths recursive adj
*/
if (path->fp_oper_flags & FIB_PATH_OPER_FLAG_RECURSIVE_LOOP)
{
path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
- dpo_copy(&via_dpo, drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+ dpo_copy(&via_dpo, drop_dpo_get(path->fp_nh_proto));
}
else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RESOLVE_HOST)
{
if (fib_entry_get_best_source(path->fp_via_fib) >= FIB_SOURCE_RR)
{
path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
- dpo_copy(&via_dpo, drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+ dpo_copy(&via_dpo, drop_dpo_get(path->fp_nh_proto));
/*
* PIC edge trigger. let the load-balance maps know
if (!(FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags(path->fp_via_fib)))
{
path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
- dpo_copy(&via_dpo, drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+ dpo_copy(&via_dpo, drop_dpo_get(path->fp_nh_proto));
/*
* PIC edge trigger. let the load-balance maps know
if (!fib_entry_is_resolved(path->fp_via_fib))
{
path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
- dpo_copy(&via_dpo, drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+ dpo_copy(&via_dpo, drop_dpo_get(path->fp_nh_proto));
/*
* PIC edge trigger. let the load-balance maps know
load_balance_map_path_state_change(fib_path_get_index(path));
}
+ /*
+ * If this path is contributing a drop, then it's not resolved
+ */
+ if (dpo_is_drop(&via_dpo) || load_balance_is_drop(&via_dpo))
+ {
+ path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+ }
+
/*
* update the path's contributed DPO
*/
dpo_copy(dpo, &via_dpo);
- FIB_PATH_DBG(path, "recursive update: %U",
- fib_get_lookup_main(path->fp_nh_proto),
- &path->fp_dpo, 2);
+ FIB_PATH_DBG(path, "recursive update:");
dpo_reset(&via_dpo);
}
+/*
+ * re-evaulate the forwarding state for a via fmask path
+ */
+static void
+fib_path_bier_fmask_update (fib_path_t *path,
+ dpo_id_t *dpo)
+{
+ bier_fmask_contribute_forwarding(path->bier_fmask.fp_bier_fmask, dpo);
+
+ /*
+ * if we are stakcing on the drop, then the path is not resolved
+ */
+ if (dpo_is_drop(dpo))
+ {
+ path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+ }
+ else
+ {
+ path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
+ }
+}
+
/*
* fib_path_is_permanent_drop
*
path->fp_via_fib = FIB_NODE_INDEX_INVALID;
}
break;
+ case FIB_PATH_TYPE_BIER_FMASK:
+ bier_fmask_child_remove(path->fp_via_bier_fmask,
+ path->fp_sibling);
+ break;
+ case FIB_PATH_TYPE_BIER_IMP:
+ bier_imp_unlock(path->fp_dpo.dpoi_index);
+ break;
+ case FIB_PATH_TYPE_BIER_TABLE:
+ bier_table_ecmp_unlock(path->fp_via_bier_tbl);
+ break;
case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
- case FIB_PATH_TYPE_ATTACHED:
adj_child_remove(path->fp_dpo.dpoi_index,
path->fp_sibling);
adj_unlock(path->fp_dpo.dpoi_index);
break;
+ case FIB_PATH_TYPE_ATTACHED:
+ adj_child_remove(path->fp_dpo.dpoi_index,
+ path->fp_sibling);
+ adj_unlock(path->fp_dpo.dpoi_index);
+ break;
+ case FIB_PATH_TYPE_UDP_ENCAP:
+ udp_encap_unlock_w_index(path->fp_dpo.dpoi_index);
+ break;
case FIB_PATH_TYPE_EXCLUSIVE:
dpo_reset(&path->exclusive.fp_ex_dpo);
break;
case FIB_PATH_TYPE_RECEIVE:
case FIB_PATH_TYPE_INTF_RX:
case FIB_PATH_TYPE_DEAG:
+ case FIB_PATH_TYPE_DVR:
/*
* these hold only the path's DPO, which is reset below.
*/
static fib_forward_chain_type_t
fib_path_to_chain_type (const fib_path_t *path)
{
- switch (path->fp_nh_proto)
+ if (DPO_PROTO_MPLS == path->fp_nh_proto)
{
- case FIB_PROTOCOL_IP4:
- return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
- case FIB_PROTOCOL_IP6:
- return (FIB_FORW_CHAIN_TYPE_UNICAST_IP6);
- case FIB_PROTOCOL_MPLS:
if (FIB_PATH_TYPE_RECURSIVE == path->fp_type &&
MPLS_EOS == path->recursive.fp_nh.fp_eos)
{
}
else
{
- return (FIB_FORW_CHAIN_TYPE_MPLS_EOS);
+ return (FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS);
}
}
- return (FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
+ else
+ {
+ return (fib_forw_chain_type_from_dpo_proto(path->fp_nh_proto));
+ }
}
/*
return (FIB_NODE_BACK_WALK_CONTINUE);
}
break;
+ case FIB_PATH_TYPE_BIER_FMASK:
+ if (FIB_NODE_BW_REASON_FLAG_EVALUATE & ctx->fnbw_reason)
+ {
+ /*
+ * update to use the BIER fmask's new forwading
+ */
+ fib_path_bier_fmask_update(path, &path->fp_dpo);
+ }
+ if ((FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE & ctx->fnbw_reason) ||
+ (FIB_NODE_BW_REASON_FLAG_ADJ_DOWN & ctx->fnbw_reason))
+ {
+ /*
+ * ADJ updates (complete<->incomplete) do not need to propagate to
+ * recursive entries.
+ * The only reason its needed as far back as here, is that the adj
+ * and the incomplete adj are a different DPO type, so the LBs need
+ * to re-stack.
+ * If this walk was quashed in the fib_entry, then any non-fib_path
+ * children (like tunnels that collapse out the LB when they stack)
+ * would not see the update.
+ */
+ return (FIB_NODE_BACK_WALK_CONTINUE);
+ }
+ break;
case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
/*
FIXME comment
ai = fib_path_attached_next_hop_get_adj(
path,
- fib_proto_to_link(path->fp_nh_proto));
+ dpo_proto_to_link(path->fp_nh_proto));
path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
if (if_is_up && adj_is_up(ai))
path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
}
- dpo_set(&path->fp_dpo, DPO_ADJACENCY,
- fib_proto_to_dpo(path->fp_nh_proto),
- ai);
+ dpo_set(&path->fp_dpo, DPO_ADJACENCY, path->fp_nh_proto, ai);
adj_unlock(ai);
if (!if_is_up)
}
break;
case FIB_PATH_TYPE_ATTACHED:
+ case FIB_PATH_TYPE_DVR:
/*
* FIXME; this could schedule a lower priority walk, since attached
* routes are not usually in ECMP configurations so the backwalk to
path->fp_oper_flags |= FIB_PATH_OPER_FLAG_DROP;
}
break;
+ case FIB_PATH_TYPE_UDP_ENCAP:
+ {
+ dpo_id_t via_dpo = DPO_INVALID;
+
+ /*
+ * hope for the best - clear if restrictions apply.
+ */
+ path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RESOLVED;
+
+ udp_encap_contribute_forwarding(path->udp_encap.fp_udp_encap_id,
+ path->fp_nh_proto,
+ &via_dpo);
+ /*
+ * If this path is contributing a drop, then it's not resolved
+ */
+ if (dpo_is_drop(&via_dpo) || load_balance_is_drop(&via_dpo))
+ {
+ path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+ }
+
+ /*
+ * update the path's contributed DPO
+ */
+ dpo_copy(&path->fp_dpo, &via_dpo);
+ dpo_reset(&via_dpo);
+ break;
+ }
case FIB_PATH_TYPE_INTF_RX:
ASSERT(0);
case FIB_PATH_TYPE_DEAG:
case FIB_PATH_TYPE_SPECIAL:
case FIB_PATH_TYPE_RECEIVE:
case FIB_PATH_TYPE_EXCLUSIVE:
+ case FIB_PATH_TYPE_BIER_TABLE:
+ case FIB_PATH_TYPE_BIER_IMP:
/*
* these path types have no parents. so to be
* walked from one is unexpected.
cfg_flags |= FIB_PATH_CFG_FLAG_EXCLUSIVE;
if (rpath->frp_flags & FIB_ROUTE_PATH_DROP)
cfg_flags |= FIB_PATH_CFG_FLAG_DROP;
+ if (rpath->frp_flags & FIB_ROUTE_PATH_SOURCE_LOOKUP)
+ cfg_flags |= FIB_PATH_CFG_FLAG_DEAG_SRC;
return (cfg_flags);
}
*/
path->fp_weight = 1;
}
+ path->fp_preference = rpath->frp_preference;
path->fp_cfg_flags = fib_path_route_flags_to_cfg_flags(rpath);
/*
path->receive.fp_interface = rpath->frp_sw_if_index;
path->receive.fp_addr = rpath->frp_addr;
}
+ else if (rpath->frp_flags & FIB_ROUTE_PATH_UDP_ENCAP)
+ {
+ path->fp_type = FIB_PATH_TYPE_UDP_ENCAP;
+ path->udp_encap.fp_udp_encap_id = rpath->frp_udp_encap_id;
+ }
else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_INTF_RX)
{
path->fp_type = FIB_PATH_TYPE_INTF_RX;
path->deag.fp_tbl_id = rpath->frp_fib_index;
path->deag.fp_rpf_id = rpath->frp_rpf_id;
}
+ else if (rpath->frp_flags & FIB_ROUTE_PATH_BIER_FMASK)
+ {
+ path->fp_type = FIB_PATH_TYPE_BIER_FMASK;
+ path->bier_fmask.fp_bier_fmask = rpath->frp_bier_fmask;
+ }
+ else if (rpath->frp_flags & FIB_ROUTE_PATH_BIER_IMP)
+ {
+ path->fp_type = FIB_PATH_TYPE_BIER_IMP;
+ path->bier_imp.fp_bier_imp = rpath->frp_bier_imp;
+ }
+ else if (rpath->frp_flags & FIB_ROUTE_PATH_BIER_TABLE)
+ {
+ path->fp_type = FIB_PATH_TYPE_BIER_TABLE;
+ path->bier_table.fp_bier_tbl = rpath->frp_bier_tbl;
+ }
+ else if (rpath->frp_flags & FIB_ROUTE_PATH_DEAG)
+ {
+ path->fp_type = FIB_PATH_TYPE_DEAG;
+ path->deag.fp_tbl_id = rpath->frp_fib_index;
+ }
+ else if (rpath->frp_flags & FIB_ROUTE_PATH_DVR)
+ {
+ path->fp_type = FIB_PATH_TYPE_DVR;
+ path->dvr.fp_interface = rpath->frp_sw_if_index;
+ }
else if (~0 != rpath->frp_sw_if_index)
{
if (ip46_address_is_zero(&rpath->frp_addr))
else
{
path->fp_type = FIB_PATH_TYPE_RECURSIVE;
- if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
+ if (DPO_PROTO_MPLS == path->fp_nh_proto)
{
path->recursive.fp_nh.fp_local_label = rpath->frp_local_label;
path->recursive.fp_nh.fp_eos = rpath->frp_eos;
{
path->recursive.fp_nh.fp_ip = rpath->frp_addr;
}
- path->recursive.fp_tbl_id = rpath->frp_fib_index;
+ path->recursive.fp_tbl_id = rpath->frp_fib_index;
}
}
*/
fib_node_index_t
fib_path_create_special (fib_node_index_t pl_index,
- fib_protocol_t nh_proto,
+ dpo_proto_t nh_proto,
fib_path_cfg_flags_t flags,
const dpo_id_t *dpo)
{
path->fp_pl_index = pl_index;
path->fp_weight = 1;
+ path->fp_preference = 0;
path->fp_nh_proto = nh_proto;
path->fp_via_fib = FIB_NODE_INDEX_INVALID;
path->fp_cfg_flags = flags;
/*
* paths of different types and protocol are not equal.
- * different weights only are the same path.
+ * different weights and/or preference only are the same path.
*/
if (path1->fp_type != path2->fp_type)
{
res = (path1->recursive.fp_tbl_id - path2->recursive.fp_tbl_id);
}
break;
+ case FIB_PATH_TYPE_BIER_FMASK:
+ res = (path1->bier_fmask.fp_bier_fmask -
+ path2->bier_fmask.fp_bier_fmask);
+ break;
+ case FIB_PATH_TYPE_BIER_IMP:
+ res = (path1->bier_imp.fp_bier_imp -
+ path2->bier_imp.fp_bier_imp);
+ break;
+ case FIB_PATH_TYPE_BIER_TABLE:
+ res = bier_table_id_cmp(&path1->bier_table.fp_bier_tbl,
+ &path2->bier_table.fp_bier_tbl);
+ break;
case FIB_PATH_TYPE_DEAG:
res = (path1->deag.fp_tbl_id - path2->deag.fp_tbl_id);
if (0 == res)
case FIB_PATH_TYPE_INTF_RX:
res = (path1->intf_rx.fp_interface - path2->intf_rx.fp_interface);
break;
+ case FIB_PATH_TYPE_UDP_ENCAP:
+ res = (path1->udp_encap.fp_udp_encap_id - path2->udp_encap.fp_udp_encap_id);
+ break;
+ case FIB_PATH_TYPE_DVR:
+ res = (path1->dvr.fp_interface - path2->dvr.fp_interface);
+ break;
case FIB_PATH_TYPE_SPECIAL:
case FIB_PATH_TYPE_RECEIVE:
case FIB_PATH_TYPE_EXCLUSIVE:
path1 = fib_path_get(*pi1);
path2 = fib_path_get(*pi2);
+ /*
+ * when sorting paths we want the highest preference paths
+ * first, so that the choices set built is in prefernce order
+ */
+ if (path1->fp_preference != path2->fp_preference)
+ {
+ return (path1->fp_preference - path2->fp_preference);
+ }
+
return (fib_path_cmp_i(path1, path2));
}
res = (path->attached.fp_interface - rpath->frp_sw_if_index);
break;
case FIB_PATH_TYPE_RECURSIVE:
- if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
+ if (DPO_PROTO_MPLS == path->fp_nh_proto)
{
res = path->recursive.fp_nh.fp_local_label - rpath->frp_local_label;
res = (path->recursive.fp_tbl_id - rpath->frp_fib_index);
}
break;
+ case FIB_PATH_TYPE_BIER_FMASK:
+ res = (path->bier_fmask.fp_bier_fmask - rpath->frp_bier_fmask);
+ break;
+ case FIB_PATH_TYPE_BIER_IMP:
+ res = (path->bier_imp.fp_bier_imp - rpath->frp_bier_imp);
+ break;
+ case FIB_PATH_TYPE_BIER_TABLE:
+ res = bier_table_id_cmp(&path->bier_table.fp_bier_tbl,
+ &rpath->frp_bier_tbl);
+ break;
case FIB_PATH_TYPE_INTF_RX:
res = (path->intf_rx.fp_interface - rpath->frp_sw_if_index);
break;
+ case FIB_PATH_TYPE_UDP_ENCAP:
+ res = (path->udp_encap.fp_udp_encap_id - rpath->frp_udp_encap_id);
+ break;
case FIB_PATH_TYPE_DEAG:
res = (path->deag.fp_tbl_id - rpath->frp_fib_index);
if (0 == res)
res = (path->deag.fp_rpf_id - rpath->frp_rpf_id);
}
break;
+ case FIB_PATH_TYPE_DVR:
+ res = (path->dvr.fp_interface - rpath->frp_sw_if_index);
+ break;
case FIB_PATH_TYPE_SPECIAL:
case FIB_PATH_TYPE_RECEIVE:
case FIB_PATH_TYPE_EXCLUSIVE:
FIB_PATH_DBG(path, "recursive loop formed");
path->fp_oper_flags |= FIB_PATH_OPER_FLAG_RECURSIVE_LOOP;
- dpo_copy(&path->fp_dpo,
- drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+ dpo_copy(&path->fp_dpo, drop_dpo_get(path->fp_nh_proto));
}
else
{
case FIB_PATH_TYPE_ATTACHED:
case FIB_PATH_TYPE_SPECIAL:
case FIB_PATH_TYPE_DEAG:
+ case FIB_PATH_TYPE_DVR:
case FIB_PATH_TYPE_RECEIVE:
case FIB_PATH_TYPE_INTF_RX:
+ case FIB_PATH_TYPE_UDP_ENCAP:
case FIB_PATH_TYPE_EXCLUSIVE:
+ case FIB_PATH_TYPE_BIER_FMASK:
+ case FIB_PATH_TYPE_BIER_TABLE:
+ case FIB_PATH_TYPE_BIER_IMP:
/*
* these path types cannot be part of a loop, since they are the leaves
* of the graph.
*/
if (fib_path_is_permanent_drop(path))
{
- dpo_copy(&path->fp_dpo,
- drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+ dpo_copy(&path->fp_dpo, drop_dpo_get(path->fp_nh_proto));
path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
return (fib_path_is_resolved(path_index));
}
fib_path_attached_next_hop_set(path);
break;
case FIB_PATH_TYPE_ATTACHED:
- /*
- * path->attached.fp_interface
- */
- if (!vnet_sw_interface_is_admin_up(vnet_get_main(),
- path->attached.fp_interface))
- {
- path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
- }
- if (vnet_sw_interface_is_p2p(vnet_get_main(),
- path->attached.fp_interface))
- {
- /*
- * point-2-point interfaces do not require a glean, since
- * there is nothing to ARP. Install a rewrite/nbr adj instead
- */
- dpo_set(&path->fp_dpo,
- DPO_ADJACENCY,
- fib_proto_to_dpo(path->fp_nh_proto),
- adj_nbr_add_or_lock(
- path->fp_nh_proto,
- fib_proto_to_link(path->fp_nh_proto),
- &zero_addr,
- path->attached.fp_interface));
- }
- else
- {
- dpo_set(&path->fp_dpo,
- DPO_ADJACENCY_GLEAN,
- fib_proto_to_dpo(path->fp_nh_proto),
- adj_glean_add_or_lock(path->fp_nh_proto,
- path->attached.fp_interface,
- NULL));
- }
- /*
- * become a child of the adjacency so we receive updates
- * when the interface state changes
- */
- path->fp_sibling = adj_child_add(path->fp_dpo.dpoi_index,
- FIB_NODE_TYPE_PATH,
- fib_path_get_index(path));
+ /*
+ * path->attached.fp_interface
+ */
+ if (!vnet_sw_interface_is_admin_up(vnet_get_main(),
+ path->attached.fp_interface))
+ {
+ path->fp_oper_flags &= ~FIB_PATH_OPER_FLAG_RESOLVED;
+ }
+ dpo_set(&path->fp_dpo,
+ DPO_ADJACENCY,
+ path->fp_nh_proto,
+ fib_path_attached_get_adj(path,
+ dpo_proto_to_link(path->fp_nh_proto)));
+ /*
+ * become a child of the adjacency so we receive updates
+ * when the interface state changes
+ */
+ path->fp_sibling = adj_child_add(path->fp_dpo.dpoi_index,
+ FIB_NODE_TYPE_PATH,
+ fib_path_get_index(path));
break;
case FIB_PATH_TYPE_RECURSIVE:
{
ASSERT(FIB_NODE_INDEX_INVALID == path->fp_via_fib);
- if (FIB_PROTOCOL_MPLS == path->fp_nh_proto)
+ if (DPO_PROTO_MPLS == path->fp_nh_proto)
{
fib_prefix_from_mpls_label(path->recursive.fp_nh.fp_local_label,
path->recursive.fp_nh.fp_eos,
fei = fib_table_entry_special_add(path->recursive.fp_tbl_id,
&pfx,
FIB_SOURCE_RR,
- FIB_ENTRY_FLAG_NONE,
- ADJ_INDEX_INVALID);
+ FIB_ENTRY_FLAG_NONE);
path = fib_path_get(path_index);
path->fp_via_fib = fei;
break;
}
+ case FIB_PATH_TYPE_BIER_FMASK:
+ {
+ /*
+ * become a dependent child of the entry so the path is
+ * informed when the forwarding for the entry changes.
+ */
+ path->fp_sibling = bier_fmask_child_add(path->bier_fmask.fp_bier_fmask,
+ FIB_NODE_TYPE_PATH,
+ fib_path_get_index(path));
+
+ path->fp_via_bier_fmask = path->bier_fmask.fp_bier_fmask;
+ fib_path_bier_fmask_update(path, &path->fp_dpo);
+
+ break;
+ }
+ case FIB_PATH_TYPE_BIER_IMP:
+ bier_imp_lock(path->bier_imp.fp_bier_imp);
+ bier_imp_contribute_forwarding(path->bier_imp.fp_bier_imp,
+ DPO_PROTO_IP4,
+ &path->fp_dpo);
+ break;
+ case FIB_PATH_TYPE_BIER_TABLE:
+ {
+ /*
+ * Find/create the BIER table to link to
+ */
+ ASSERT(FIB_NODE_INDEX_INVALID == path->fp_via_bier_tbl);
+
+ path->fp_via_bier_tbl =
+ bier_table_ecmp_create_and_lock(&path->bier_table.fp_bier_tbl);
+
+ bier_table_contribute_forwarding(path->fp_via_bier_tbl,
+ &path->fp_dpo);
+ break;
+ }
case FIB_PATH_TYPE_SPECIAL:
/*
* Resolve via the drop
*/
- dpo_copy(&path->fp_dpo,
- drop_dpo_get(fib_proto_to_dpo(path->fp_nh_proto)));
+ dpo_copy(&path->fp_dpo, drop_dpo_get(path->fp_nh_proto));
break;
case FIB_PATH_TYPE_DEAG:
{
- /*
- * Resolve via a lookup DPO.
- * FIXME. control plane should add routes with a table ID
- */
- lookup_cast_t cast;
-
- cast = (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RPF_ID ?
- LOOKUP_MULTICAST :
- LOOKUP_UNICAST);
-
- lookup_dpo_add_or_lock_w_fib_index(path->deag.fp_tbl_id,
- fib_proto_to_dpo(path->fp_nh_proto),
- cast,
- LOOKUP_INPUT_DST_ADDR,
- LOOKUP_TABLE_FROM_CONFIG,
- &path->fp_dpo);
- break;
+ if (DPO_PROTO_BIER == path->fp_nh_proto)
+ {
+ bier_disp_table_contribute_forwarding(path->deag.fp_tbl_id,
+ &path->fp_dpo);
+ }
+ else
+ {
+ /*
+ * Resolve via a lookup DPO.
+ * FIXME. control plane should add routes with a table ID
+ */
+ lookup_input_t input;
+ lookup_cast_t cast;
+
+ cast = (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RPF_ID ?
+ LOOKUP_MULTICAST :
+ LOOKUP_UNICAST);
+ input = (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_DEAG_SRC ?
+ LOOKUP_INPUT_SRC_ADDR :
+ LOOKUP_INPUT_DST_ADDR);
+
+ lookup_dpo_add_or_lock_w_fib_index(path->deag.fp_tbl_id,
+ path->fp_nh_proto,
+ cast,
+ input,
+ LOOKUP_TABLE_FROM_CONFIG,
+ &path->fp_dpo);
+ }
+ break;
}
+ case FIB_PATH_TYPE_DVR:
+ dvr_dpo_add_or_lock(path->attached.fp_interface,
+ path->fp_nh_proto,
+ &path->fp_dpo);
+ break;
case FIB_PATH_TYPE_RECEIVE:
/*
* Resolve via a receive DPO.
*/
- receive_dpo_add_or_lock(fib_proto_to_dpo(path->fp_nh_proto),
+ receive_dpo_add_or_lock(path->fp_nh_proto,
path->receive.fp_interface,
&path->receive.fp_addr,
&path->fp_dpo);
break;
+ case FIB_PATH_TYPE_UDP_ENCAP:
+ udp_encap_lock(path->udp_encap.fp_udp_encap_id);
+ udp_encap_contribute_forwarding(path->udp_encap.fp_udp_encap_id,
+ path->fp_nh_proto,
+ &path->fp_dpo);
+ break;
case FIB_PATH_TYPE_INTF_RX: {
/*
* Resolve via a receive DPO.
*/
- interface_dpo_add_or_lock(fib_proto_to_dpo(path->fp_nh_proto),
- path->intf_rx.fp_interface,
- &path->fp_dpo);
+ interface_rx_dpo_add_or_lock(path->fp_nh_proto,
+ path->intf_rx.fp_interface,
+ &path->fp_dpo);
break;
}
case FIB_PATH_TYPE_EXCLUSIVE:
case FIB_PATH_TYPE_RECEIVE:
return (path->receive.fp_interface);
case FIB_PATH_TYPE_RECURSIVE:
- return (fib_entry_get_resolving_interface(path->fp_via_fib));
+ if (fib_path_is_resolved(path_index))
+ {
+ return (fib_entry_get_resolving_interface(path->fp_via_fib));
+ }
+ break;
+ case FIB_PATH_TYPE_DVR:
+ return (path->dvr.fp_interface);
case FIB_PATH_TYPE_INTF_RX:
+ case FIB_PATH_TYPE_UDP_ENCAP:
case FIB_PATH_TYPE_SPECIAL:
case FIB_PATH_TYPE_DEAG:
case FIB_PATH_TYPE_EXCLUSIVE:
+ case FIB_PATH_TYPE_BIER_FMASK:
+ case FIB_PATH_TYPE_BIER_TABLE:
+ case FIB_PATH_TYPE_BIER_IMP:
break;
}
return (~0);
}
+index_t
+fib_path_get_resolving_index (fib_node_index_t path_index)
+{
+ fib_path_t *path;
+
+ path = fib_path_get(path_index);
+
+ switch (path->fp_type)
+ {
+ case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+ case FIB_PATH_TYPE_ATTACHED:
+ case FIB_PATH_TYPE_RECEIVE:
+ case FIB_PATH_TYPE_INTF_RX:
+ case FIB_PATH_TYPE_SPECIAL:
+ case FIB_PATH_TYPE_DEAG:
+ case FIB_PATH_TYPE_DVR:
+ case FIB_PATH_TYPE_EXCLUSIVE:
+ break;
+ case FIB_PATH_TYPE_UDP_ENCAP:
+ return (path->udp_encap.fp_udp_encap_id);
+ case FIB_PATH_TYPE_RECURSIVE:
+ return (path->fp_via_fib);
+ case FIB_PATH_TYPE_BIER_FMASK:
+ return (path->bier_fmask.fp_bier_fmask);
+ case FIB_PATH_TYPE_BIER_TABLE:
+ return (path->fp_via_bier_tbl);
+ case FIB_PATH_TYPE_BIER_IMP:
+ return (path->bier_imp.fp_bier_imp);
+ }
+ return (~0);
+}
+
adj_index_t
fib_path_get_adj (fib_node_index_t path_index)
{
return (ADJ_INDEX_INVALID);
}
-int
+u16
fib_path_get_weight (fib_node_index_t path_index)
{
fib_path_t *path;
return (path->fp_weight);
}
+u16
+fib_path_get_preference (fib_node_index_t path_index)
+{
+ fib_path_t *path;
+
+ path = fib_path_get(path_index);
+
+ ASSERT(path);
+
+ return (path->fp_preference);
+}
+
+u32
+fib_path_get_rpf_id (fib_node_index_t path_index)
+{
+ fib_path_t *path;
+
+ path = fib_path_get(path_index);
+
+ ASSERT(path);
+
+ if (FIB_PATH_CFG_FLAG_RPF_ID & path->fp_cfg_flags)
+ {
+ return (path->deag.fp_rpf_id);
+ }
+
+ return (~0);
+}
+
/**
* @brief Contribute the path's adjacency to the list passed.
* By calling this function over all paths, recursively, a child
break;
case FIB_PATH_TYPE_RECURSIVE:
- if (FIB_NODE_INDEX_INVALID != path->fp_via_fib)
+ if (FIB_NODE_INDEX_INVALID != path->fp_via_fib &&
+ !fib_path_is_looped(path_index))
{
/*
* there's unresolved due to constraints, and there's unresolved
- * due to ain't go no via. can't do nowt w'out via.
+ * due to ain't got no via. can't do nowt w'out via.
*/
fib_entry_contribute_urpf(path->fp_via_fib, urpf);
}
case FIB_PATH_TYPE_EXCLUSIVE:
case FIB_PATH_TYPE_SPECIAL:
- /*
+ {
+ /*
* these path types may link to an adj, if that's what
* the clinet gave
*/
- if (dpo_is_adj(&path->fp_dpo))
- {
- ip_adjacency_t *adj;
+ u32 rpf_sw_if_index;
- adj = adj_get(path->fp_dpo.dpoi_index);
+ rpf_sw_if_index = dpo_get_urpf(&path->fp_dpo);
- fib_urpf_list_append(urpf, adj->rewrite_header.sw_if_index);
+ if (~0 != rpf_sw_if_index)
+ {
+ fib_urpf_list_append(urpf, rpf_sw_if_index);
}
break;
-
+ }
+ case FIB_PATH_TYPE_DVR:
+ fib_urpf_list_append(urpf, path->dvr.fp_interface);
+ break;
case FIB_PATH_TYPE_DEAG:
case FIB_PATH_TYPE_RECEIVE:
case FIB_PATH_TYPE_INTF_RX:
+ case FIB_PATH_TYPE_UDP_ENCAP:
+ case FIB_PATH_TYPE_BIER_FMASK:
+ case FIB_PATH_TYPE_BIER_TABLE:
+ case FIB_PATH_TYPE_BIER_IMP:
/*
* these path types don't link to an adj
*/
switch (path->fp_type)
{
+ case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
+ {
+ dpo_id_t tmp = DPO_INVALID;
+
+ dpo_copy(&tmp, dpo);
+ dpo_set(dpo,
+ DPO_MPLS_DISPOSITION,
+ payload_proto,
+ mpls_disp_dpo_create(payload_proto, ~0, &tmp));
+ dpo_reset(&tmp);
+ break;
+ }
case FIB_PATH_TYPE_DEAG:
{
dpo_id_t tmp = DPO_INVALID;
&tmp));
dpo_reset(&tmp);
break;
- }
+ }
case FIB_PATH_TYPE_RECEIVE:
case FIB_PATH_TYPE_ATTACHED:
- case FIB_PATH_TYPE_ATTACHED_NEXT_HOP:
case FIB_PATH_TYPE_RECURSIVE:
case FIB_PATH_TYPE_INTF_RX:
+ case FIB_PATH_TYPE_UDP_ENCAP:
case FIB_PATH_TYPE_EXCLUSIVE:
case FIB_PATH_TYPE_SPECIAL:
+ case FIB_PATH_TYPE_BIER_FMASK:
+ case FIB_PATH_TYPE_BIER_TABLE:
+ case FIB_PATH_TYPE_BIER_IMP:
+ case FIB_PATH_TYPE_DVR:
break;
}
}
}
case FIB_FORW_CHAIN_TYPE_MCAST_IP4:
case FIB_FORW_CHAIN_TYPE_MCAST_IP6:
- break;
- }
+ case FIB_FORW_CHAIN_TYPE_BIER:
+ break;
+ }
break;
case FIB_PATH_TYPE_RECURSIVE:
switch (fct)
case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
case FIB_FORW_CHAIN_TYPE_MCAST_IP4:
case FIB_FORW_CHAIN_TYPE_MCAST_IP6:
+ case FIB_FORW_CHAIN_TYPE_BIER:
fib_path_recursive_adj_update(path, fct, dpo);
break;
case FIB_FORW_CHAIN_TYPE_ETHERNET:
break;
}
break;
+ case FIB_PATH_TYPE_BIER_TABLE:
+ switch (fct)
+ {
+ case FIB_FORW_CHAIN_TYPE_BIER:
+ bier_table_contribute_forwarding(path->fp_via_bier_tbl, dpo);
+ break;
+ case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+ case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
+ case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
+ case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
+ case FIB_FORW_CHAIN_TYPE_MCAST_IP4:
+ case FIB_FORW_CHAIN_TYPE_MCAST_IP6:
+ case FIB_FORW_CHAIN_TYPE_ETHERNET:
+ case FIB_FORW_CHAIN_TYPE_NSH:
+ ASSERT(0);
+ break;
+ }
+ break;
+ case FIB_PATH_TYPE_BIER_FMASK:
+ switch (fct)
+ {
+ case FIB_FORW_CHAIN_TYPE_BIER:
+ fib_path_bier_fmask_update(path, dpo);
+ break;
+ case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
+ case FIB_FORW_CHAIN_TYPE_UNICAST_IP4:
+ case FIB_FORW_CHAIN_TYPE_UNICAST_IP6:
+ case FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS:
+ case FIB_FORW_CHAIN_TYPE_MCAST_IP4:
+ case FIB_FORW_CHAIN_TYPE_MCAST_IP6:
+ case FIB_FORW_CHAIN_TYPE_ETHERNET:
+ case FIB_FORW_CHAIN_TYPE_NSH:
+ ASSERT(0);
+ break;
+ }
+ break;
+ case FIB_PATH_TYPE_BIER_IMP:
+ bier_imp_contribute_forwarding(path->bier_imp.fp_bier_imp,
+ fib_forw_chain_type_to_dpo_proto(fct),
+ dpo);
+ break;
case FIB_PATH_TYPE_DEAG:
switch (fct)
{
break;
case FIB_FORW_CHAIN_TYPE_MCAST_IP4:
case FIB_FORW_CHAIN_TYPE_MCAST_IP6:
+ case FIB_FORW_CHAIN_TYPE_BIER:
+ break;
case FIB_FORW_CHAIN_TYPE_ETHERNET:
case FIB_FORW_CHAIN_TYPE_NSH:
ASSERT(0);
case FIB_FORW_CHAIN_TYPE_MPLS_EOS:
case FIB_FORW_CHAIN_TYPE_ETHERNET:
case FIB_FORW_CHAIN_TYPE_NSH:
- break;
+ case FIB_FORW_CHAIN_TYPE_BIER:
+ {
+ adj_index_t ai;
+
+ /*
+ * get a appropriate link type adj.
+ */
+ ai = fib_path_attached_get_adj(
+ path,
+ fib_forw_chain_type_to_link_type(fct));
+ dpo_set(dpo, DPO_ADJACENCY,
+ fib_forw_chain_type_to_dpo_proto(fct), ai);
+ adj_unlock(ai);
+ break;
+ }
case FIB_FORW_CHAIN_TYPE_MCAST_IP4:
case FIB_FORW_CHAIN_TYPE_MCAST_IP6:
{
/*
* Create the adj needed for sending IP multicast traffic
*/
- ai = adj_mcast_add_or_lock(path->fp_nh_proto,
+ ai = adj_mcast_add_or_lock(dpo_proto_to_fib(path->fp_nh_proto),
fib_forw_chain_type_to_link_type(fct),
path->attached.fp_interface);
dpo_set(dpo, DPO_ADJACENCY,
/*
* Create the adj needed for sending IP multicast traffic
*/
- interface_dpo_add_or_lock(fib_forw_chain_type_to_dpo_proto(fct),
- path->attached.fp_interface,
- dpo);
+ interface_rx_dpo_add_or_lock(fib_forw_chain_type_to_dpo_proto(fct),
+ path->attached.fp_interface,
+ dpo);
+ break;
+ case FIB_PATH_TYPE_UDP_ENCAP:
+ udp_encap_contribute_forwarding(path->udp_encap.fp_udp_encap_id,
+ path->fp_nh_proto,
+ dpo);
break;
case FIB_PATH_TYPE_RECEIVE:
case FIB_PATH_TYPE_SPECIAL:
+ case FIB_PATH_TYPE_DVR:
dpo_copy(dpo, &path->fp_dpo);
break;
}
}
int
-fib_path_is_recursive (fib_node_index_t path_index)
+fib_path_is_recursive_constrained (fib_node_index_t path_index)
{
fib_path_t *path;
path = fib_path_get(path_index);
- return (FIB_PATH_TYPE_RECURSIVE == path->fp_type);
+ return ((FIB_PATH_TYPE_RECURSIVE == path->fp_type) &&
+ ((path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RESOLVE_ATTACHED) ||
+ (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RESOLVE_HOST)));
}
int
return (path->fp_oper_flags & FIB_PATH_OPER_FLAG_RECURSIVE_LOOP);
}
-int
+fib_path_list_walk_rc_t
fib_path_encode (fib_node_index_t path_list_index,
fib_node_index_t path_index,
void *ctx)
path = fib_path_get(path_index);
if (!path)
- return (0);
+ return (FIB_PATH_LIST_WALK_CONTINUE);
vec_add2(*api_rpaths, api_rpath, 1);
api_rpath->rpath.frp_weight = path->fp_weight;
+ api_rpath->rpath.frp_preference = path->fp_preference;
api_rpath->rpath.frp_proto = path->fp_nh_proto;
api_rpath->rpath.frp_sw_if_index = ~0;
- api_rpath->dpo = path->exclusive.fp_ex_dpo;
+ api_rpath->dpo = path->fp_dpo;
+
switch (path->fp_type)
{
case FIB_PATH_TYPE_RECEIVE:
api_rpath->rpath.frp_sw_if_index = path->attached_next_hop.fp_interface;
api_rpath->rpath.frp_addr = path->attached_next_hop.fp_nh;
break;
+ case FIB_PATH_TYPE_BIER_FMASK:
+ api_rpath->rpath.frp_bier_fmask = path->bier_fmask.fp_bier_fmask;
+ break;
case FIB_PATH_TYPE_SPECIAL:
break;
case FIB_PATH_TYPE_DEAG:
+ api_rpath->rpath.frp_fib_index = path->deag.fp_tbl_id;
break;
case FIB_PATH_TYPE_RECURSIVE:
api_rpath->rpath.frp_addr = path->recursive.fp_nh.fp_ip;
default:
break;
}
- return (1);
+
+ return (FIB_PATH_LIST_WALK_CONTINUE);
}
-fib_protocol_t
+dpo_proto_t
fib_path_get_proto (fib_node_index_t path_index)
{
fib_path_t *path;
if (!pool_is_free_index(fib_path_pool, pi))
{
path = fib_path_get(pi);
- u8 *s = fib_path_format(pi, NULL);
+ u8 *s = format(NULL, "%U", format_fib_path, pi, 1);
s = format(s, "children:");
s = fib_node_children_format(path->fp_node.fn_children, s);
vlib_cli_output (vm, "%s", s);
else
{
vlib_cli_output (vm, "FIB Paths");
- pool_foreach(path, fib_path_pool,
+ pool_foreach_index (pi, fib_path_pool,
({
- vlib_cli_output (vm, "%U", format_fib_path, path);
+ vlib_cli_output (vm, "%U", format_fib_path, pi, 0);
}));
}
Code Review / vpp.git / blobdiff