X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_types.h;h=b5a58e7b67420c5b765792590c64b28f51c57c9c;hb=e2fe09742;hp=805f8e1b9640ca97d341c22acf73c2ebd2cd8c92;hpb=d0df49f26eabf2f534b567f3370e50c4e804aeea;p=vpp.git diff --git a/src/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h index 805f8e1b964..b5a58e7b674 100644 --- a/src/vnet/fib/fib_types.h +++ b/src/vnet/fib/fib_types.h @@ -17,8 +17,7 @@ #define __FIB_TYPES_H__ #include -#include -#include +#include #include #include #include @@ -187,13 +186,18 @@ extern fib_forward_chain_type_t fib_forw_chain_type_from_link_type(vnet_link_t l */ extern fib_forward_chain_type_t fib_forw_chain_type_from_dpo_proto(dpo_proto_t proto); +/** + * @brief Convert from a fib-protocol to a chain type. + */ +extern fib_forward_chain_type_t fib_forw_chain_type_from_fib_proto(fib_protocol_t proto); + /** * @brief Convert from a chain type to the DPO proto it will install */ extern dpo_proto_t fib_forw_chain_type_to_dpo_proto(fib_forward_chain_type_t fct); /** - * Aggregrate type for a prefix + * Aggregate type for a prefix */ typedef struct fib_prefix_t_ { /** @@ -242,6 +246,12 @@ STATIC_ASSERT(STRUCT_OFFSET_OF(fib_prefix_t, fp_addr) == 4, extern int fib_prefix_cmp(const fib_prefix_t *p1, const fib_prefix_t *p2); +/** + * \brief Copy a prefix + */ +extern void fib_prefix_copy(fib_prefix_t *dst, + const fib_prefix_t *src); + /** * \brief Compare two prefixes for covering relationship * @@ -254,7 +264,14 @@ extern int fib_prefix_is_cover(const fib_prefix_t *p1, * \brief Return true is the prefix is a host prefix */ extern int fib_prefix_is_host(const fib_prefix_t *p); +extern u8 fib_prefix_get_host_length (fib_protocol_t proto); +/** + * normalise a prefix (i.e. mask the host bits according to the + * prefix length) + */ +extern void fib_prefix_normalize(const fib_prefix_t *p, + fib_prefix_t *out); /** * \brief Host prefix from ip @@ -374,8 +391,26 @@ typedef enum fib_route_path_flags_t_ * A path that resolves via a DVR DPO */ FIB_ROUTE_PATH_DVR = (1 << 14), + + FIB_ROUTE_PATH_ICMP_UNREACH = (1 << 15), + FIB_ROUTE_PATH_ICMP_PROHIBIT = (1 << 16), + FIB_ROUTE_PATH_CLASSIFY = (1 << 17), + + /** + * Pop a Psuedo Wire Control Word + */ + FIB_ROUTE_PATH_POP_PW_CW = (1 << 18), + /** + * A path that resolves via a glean adjacency + */ + FIB_ROUTE_PATH_GLEAN = (1 << 19), } fib_route_path_flags_t; +/** + * Format route path flags + */ +extern u8 * format_fib_route_path_flags(u8 *s, va_list *ap); + /** * An RPF-ID is numerical value that is used RPF validate. An entry * has-a RPF-ID, when a packet egress from (e.g. an LSP) it gains an @@ -491,18 +526,29 @@ typedef struct fib_route_path_t_ { */ mpls_eos_bit_t frp_eos; }; - }; - union { /** - * The interface. - * Will be invalid for recursive paths. + * A path via a BIER imposition object. + * Present in an mfib path list */ - u32 frp_sw_if_index; + index_t frp_bier_imp; + /** - * The RPF-ID + * Glean prefix on a glean path */ - fib_rpf_id_t frp_rpf_id; + fib_prefix_t frp_connected; }; + + /** + * 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 @@ -518,6 +564,14 @@ typedef struct fib_route_path_t_ { * The outgoing MPLS label Stack. NULL implies no label. */ fib_mpls_label_t *frp_label_stack; + /** + * Exclusive DPO + */ + dpo_id_t dpo; + /** + * MFIB interface flags + */ + u32 frp_mitf_flags; }; /** * A path that resolves via a BIER Table. @@ -526,20 +580,24 @@ typedef struct fib_route_path_t_ { bier_table_id_t frp_bier_tbl; /** - * A path via a BIER imposition object. - * Present in an mfib path list + * UDP encap ID */ - index_t frp_bier_imp; + u32 frp_udp_encap_id; /** - * UDP encap ID + * Classify table ID */ - u32 frp_udp_encap_id; + u32 frp_classify_table_id; /** * Resolving via a BIER Fmask */ index_t frp_bier_fmask; + + /** + * The DPO for use with exclusive paths + */ + dpo_id_t frp_dpo; }; /** * [un]equal cost path weight @@ -563,18 +621,14 @@ typedef struct fib_route_path_t_ { extern uword unformat_fib_route_path(unformat_input_t * input, va_list * args); /** - * A help string to list the FIB path options + * Format route path flags */ -#define FIB_ROUTE_PATH_HELP "[next-hop-address] [next-hop-interface] [next-hop-table ] [weight ] [preference ] [udp-encap-id ] [ip4-lookup-in-table ] [ip6-lookup-in-table ] [mpls-lookup-in-table ] [resolve-via-host] [resolve-via-connected] [rx-ip4 ] [out-labels ]" +extern u8 * format_fib_route_path(u8 *s, va_list *ap); /** - * @brief - * A representation of a fib path for fib_path_encode to convey the information to the caller + * A help string to list the FIB path options */ -typedef struct fib_route_path_encode_t_ { - fib_route_path_t rpath; - dpo_id_t dpo; -} fib_route_path_encode_t; +#define FIB_ROUTE_PATH_HELP "[next-hop-address] [next-hop-interface] [next-hop-table ] [weight ] [preference ] [udp-encap-id ] [ip4-lookup-in-table ] [ip6-lookup-in-table ] [mpls-lookup-in-table ] [resolve-via-host] [resolve-via-connected] [rx-ip4 ] [out-labels ]" /** * return code to control pat-hlist walk