Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fib: fib api updates
[vpp.git]
/
src
/
vnet
/
fib
/
fib_types.h
diff --git
a/src/vnet/fib/fib_types.h
b/src/vnet/fib/fib_types.h
index
472ce88
..
77b133f
100644
(file)
--- a/
src/vnet/fib/fib_types.h
+++ b/
src/vnet/fib/fib_types.h
@@
-379,6
+379,10
@@
typedef enum fib_route_path_flags_t_
* A path that resolves via a DVR DPO
*/
FIB_ROUTE_PATH_DVR = (1 << 14),
* 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),
} fib_route_path_flags_t;
/**
} fib_route_path_flags_t;
/**
@@
-496,18
+500,24
@@
typedef struct fib_route_path_t_ {
*/
mpls_eos_bit_t frp_eos;
};
*/
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;
- /**
- * The RPF-ID
- */
- fib_rpf_id_t frp_rpf_id;
+ index_t frp_bier_imp;
};
};
+
+ /**
+ * 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
union {
/**
* The FIB index to lookup the nexthop
@@
-523,7
+533,6
@@
typedef struct fib_route_path_t_ {
* The outgoing MPLS label Stack. NULL implies no label.
*/
fib_mpls_label_t *frp_label_stack;
* The outgoing MPLS label Stack. NULL implies no label.
*/
fib_mpls_label_t *frp_label_stack;
-
/**
* Exclusive DPO
*/
/**
* Exclusive DPO
*/
@@
-540,20
+549,24
@@
typedef struct fib_route_path_t_ {
bier_table_id_t frp_bier_tbl;
/**
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;
/**
* 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
};
/**
* [un]equal cost path weight
@@
-581,15
+594,6
@@
extern uword unformat_fib_route_path(unformat_input_t * input, va_list * args);
*/
#define FIB_ROUTE_PATH_HELP "[next-hop-address] [next-hop-interface] [next-hop-table <value>] [weight <value>] [preference <value>] [udp-encap-id <value>] [ip4-lookup-in-table <value>] [ip6-lookup-in-table <value>] [mpls-lookup-in-table <value>] [resolve-via-host] [resolve-via-connected] [rx-ip4 <interface>] [out-labels <value value value>]"
*/
#define FIB_ROUTE_PATH_HELP "[next-hop-address] [next-hop-interface] [next-hop-table <value>] [weight <value>] [preference <value>] [udp-encap-id <value>] [ip4-lookup-in-table <value>] [ip6-lookup-in-table <value>] [mpls-lookup-in-table <value>] [resolve-via-host] [resolve-via-connected] [rx-ip4 <interface>] [out-labels <value value value>]"
-/**
- * @brief
- * A representation of a fib path for fib_path_encode to convey the information to the caller
- */
-typedef struct fib_route_path_encode_t_ {
- fib_route_path_t rpath;
- dpo_id_t dpo;
-} fib_route_path_encode_t;
-
/**
* return code to control pat-hlist walk
*/
/**
* return code to control pat-hlist walk
*/