X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_types.h;h=0a4b169960982774e110f061ad9be310fa67b76c;hb=refs%2Fchanges%2F50%2F8950%2F14;hp=4cb73e8a7a6a6cc71f334cdf797f17951f9853a7;hpb=0f26c5a0138ac86d7ebd197c31a09d8d624c35fe;p=vpp.git diff --git a/src/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h index 4cb73e8a7a6..0a4b1699609 100644 --- a/src/vnet/fib/fib_types.h +++ b/src/vnet/fib/fib_types.h @@ -20,6 +20,7 @@ #include #include #include +#include /** * A typedef of a node index. @@ -32,9 +33,9 @@ typedef u32 fib_node_index_t; * Protocol Type. packed so it consumes a u8 only */ typedef enum fib_protocol_t_ { - FIB_PROTOCOL_IP4 = 0, - FIB_PROTOCOL_IP6, - FIB_PROTOCOL_MPLS, + FIB_PROTOCOL_IP4 = DPO_PROTO_IP4, + FIB_PROTOCOL_IP6 = DPO_PROTO_IP6, + FIB_PROTOCOL_MPLS = DPO_PROTO_MPLS, } __attribute__ ((packed)) fib_protocol_t; #define FIB_PROTOCOLS { \ @@ -49,6 +50,12 @@ typedef enum fib_protocol_t_ { */ #define FIB_PROTOCOL_MAX (FIB_PROTOCOL_MPLS + 1) +/** + * Definition outside of enum so it does not need to be included in non-defaulted + * switch statements + */ +#define FIB_PROTOCOL_IP_MAX (FIB_PROTOCOL_IP6 + 1) + /** * Not part of the enum so it does not have to be handled in switch statements */ @@ -88,6 +95,10 @@ typedef enum fib_forward_chain_type_t_ { * MPLS packets */ FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS, + /** + * Contribute an object that is to be used to forward BIER packets. + */ + FIB_FORW_CHAIN_TYPE_BIER, /** * Contribute an object that is to be used to forward end-of-stack * MPLS packets. This is a convenient ID for clients. A real EOS chain @@ -117,6 +128,7 @@ typedef enum fib_forward_chain_type_t_ { #define FIB_FORW_CHAINS { \ [FIB_FORW_CHAIN_TYPE_ETHERNET] = "ethernet", \ + [FIB_FORW_CHAIN_TYPE_BIER] = "bier", \ [FIB_FORW_CHAIN_TYPE_UNICAST_IP4] = "unicast-ip4", \ [FIB_FORW_CHAIN_TYPE_UNICAST_IP6] = "unicast-ip6", \ [FIB_FORW_CHAIN_TYPE_MCAST_IP4] = "multicast-ip4", \ @@ -230,6 +242,11 @@ extern u8 * format_fib_forw_chain_type(u8 * s, va_list * args); extern dpo_proto_t fib_proto_to_dpo(fib_protocol_t fib_proto); extern fib_protocol_t dpo_proto_to_fib(dpo_proto_t dpo_proto); +/** + * Convert from BIER next-hop proto to FIB proto + */ +extern fib_protocol_t bier_hdr_proto_to_fib(bier_hdr_proto_id_t bproto); + /** * Enurmeration of special path/entry types */ @@ -261,8 +278,8 @@ typedef enum fib_special_type_t_ { for (_item = FIB_TYPE_SPEICAL_FIRST; \ _item <= FIB_SPEICAL_TYPE_LAST; _item++) -extern u8 * format_fib_protocol(u8 * s, va_list ap); -extern u8 * format_vnet_link(u8 *s, va_list ap); +extern u8 * format_fib_protocol(u8 * s, va_list *ap); +extern u8 * format_vnet_link(u8 *s, va_list *ap); /** * Path flags from the control plane @@ -303,6 +320,26 @@ typedef enum fib_route_path_flags_t_ * A local path with a RPF-ID => multicast traffic */ FIB_ROUTE_PATH_RPF_ID = (1 << 7), + /** + * A deag path using the packet's source not destination address. + */ + FIB_ROUTE_PATH_SOURCE_LOOKUP = (1 << 8), + /** + * A path via a UDP encap object. + */ + FIB_ROUTE_PATH_UDP_ENCAP = (1 << 9), + /** + * A path that resolves via a BIER F-Mask + */ + FIB_ROUTE_PATH_BIER_FMASK = (1 << 10), + /** + * A path that resolves via a BIER [ECMP] Table + */ + FIB_ROUTE_PATH_BIER_TABLE = (1 << 11), + /** + * A path that resolves via a BIER impostion object + */ + FIB_ROUTE_PATH_BIER_IMP = (1 << 12), } fib_route_path_flags_t; /** @@ -338,57 +375,89 @@ typedef struct fib_route_path_t_ { * The protocol of the address below. We need this since the all * zeros address is ambiguous. */ - fib_protocol_t frp_proto; + dpo_proto_t frp_proto; union { - /** - * The next-hop address. - * Will be NULL for attached paths. - * Will be all zeros for attached-next-hop paths on a p2p interface - * Will be all zeros for a deag path. - */ - ip46_address_t frp_addr; - struct { + union { + /** + * The next-hop address. + * Will be NULL for attached paths. + * Will be all zeros for attached-next-hop paths on a p2p interface + * Will be all zeros for a deag path. + */ + ip46_address_t frp_addr; + + struct { + /** + * The MPLS local Label to reursively resolve through. + * This is valid when the path type is MPLS. + */ + mpls_label_t frp_local_label; + /** + * EOS bit for the resolving label + */ + mpls_eos_bit_t frp_eos; + }; + }; + union { + /** + * The interface. + * Will be invalid for recursive paths. + */ + u32 frp_sw_if_index; + /** + * The RPF-ID + */ + fib_rpf_id_t frp_rpf_id; + }; + union { + /** + * The FIB index to lookup the nexthop + * Only valid for recursive paths. + */ + u32 frp_fib_index; + /** + * The BIER table to resolve the fmask in + */ + u32 frp_bier_fib_index; + }; /** - * The MPLS local Label to reursively resolve through. - * This is valid when the path type is MPLS. - */ - mpls_label_t frp_local_label; - /** - * EOS bit for the resolving label + * The outgoing MPLS label Stack. NULL implies no label. */ - mpls_eos_bit_t frp_eos; + mpls_label_t *frp_label_stack; }; - }; - union { /** - * The interface. - * Will be invalid for recursive paths. + * A path that resolves via a BIER Table. + * This would be for a MPLS label at a BIER midpoint or tail */ - u32 frp_sw_if_index; + bier_table_id_t frp_bier_tbl; + /** - * The RPF-ID + * A path via a BIER imposition object. + * Present in an mfib path list */ - fib_rpf_id_t frp_rpf_id; + index_t frp_bier_imp; + + /** + * UDP encap ID + */ + u32 frp_udp_encap_id; }; /** - * The FIB index to lookup the nexthop - * Only valid for recursive paths. + * [un]equal cost path weight */ - u32 frp_fib_index; + u8 frp_weight; /** - * [un]equal cost path weight + * A path preference. 0 is the best. + * Only paths of the best preference, that are 'up', are considered + * for forwarding. */ - u32 frp_weight; + u8 frp_preference; /** * flags on the path */ fib_route_path_flags_t frp_flags; - /** - * The outgoing MPLS label Stack. NULL implies no label. - */ - mpls_label_t *frp_label_stack; } fib_route_path_t; /** @@ -400,4 +469,21 @@ typedef struct fib_route_path_encode_t_ { dpo_id_t dpo; } fib_route_path_encode_t; +/** + * return code to control pat-hlist walk + */ +typedef enum fib_path_list_walk_rc_t_ +{ + FIB_PATH_LIST_WALK_STOP, + FIB_PATH_LIST_WALK_CONTINUE, +} fib_path_list_walk_rc_t; + +/** + * A list of path-extensions + */ +typedef struct fib_path_ext_list_t_ +{ + struct fib_path_ext_t_ *fpel_exts; +} fib_path_ext_list_t; + #endif