diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-12-20 03:01:49 -0800 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-12-20 15:00:30 +0000 |
| commit | 775f73c6baaf9bc2283e7ab9752c81984823be99 (patch) | |
| tree | 7c2496d34a590fae15f917f9e51867fa14aafec5 /src/vnet/fib/fib_path.c | |
| parent | a3aaa61e2f2fd81f9653cb678b38519e96e6c6cd (diff) | |
FIB: encode the label stack in the FIB path during table dump
Change-Id: I28e8a99b980ad343a4209e673201791b91ceab4e
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/fib/fib_path.c')
| -rw-r--r-- | src/vnet/fib/fib_path.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c index f528c67677f..d4a701d417c 100644 --- a/src/vnet/fib/fib_path.c +++ b/src/vnet/fib/fib_path.c @@ -37,6 +37,7 @@ #include <vnet/fib/fib_internal.h> #include <vnet/fib/fib_urpf_list.h> #include <vnet/fib/mpls_fib.h> +#include <vnet/fib/fib_path_ext.h> #include <vnet/udp/udp_encap.h> #include <vnet/bier/bier_fmask.h> #include <vnet/bier/bier_table.h> @@ -605,10 +606,14 @@ format_fib_path (u8 * s, va_list * args) vnm, path->dvr.fp_interface)); break; + case FIB_PATH_TYPE_DEAG: + s = format (s, " %sfib-index:%d", + (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RPF_ID ? "m" : ""), + path->deag.fp_tbl_id); + break; 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_EXCLUSIVE: if (dpo_id_is_valid(&path->fp_dpo)) { @@ -2609,7 +2614,8 @@ fib_path_is_looped (fib_node_index_t path_index) fib_path_list_walk_rc_t fib_path_encode (fib_node_index_t path_list_index, - fib_node_index_t path_index, + fib_node_index_t path_index, + const fib_path_ext_t *path_ext, void *ctx) { fib_route_path_encode_t **api_rpaths = ctx; @@ -2628,7 +2634,7 @@ fib_path_encode (fib_node_index_t path_list_index, api_rpath->dpo = path->fp_dpo; switch (path->fp_type) - { + { case FIB_PATH_TYPE_RECEIVE: api_rpath->rpath.frp_addr = path->receive.fp_addr; api_rpath->rpath.frp_sw_if_index = path->receive.fp_interface; @@ -2647,6 +2653,10 @@ fib_path_encode (fib_node_index_t path_list_index, break; case FIB_PATH_TYPE_DEAG: api_rpath->rpath.frp_fib_index = path->deag.fp_tbl_id; + if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_RPF_ID) + { + api_rpath->rpath.frp_flags |= FIB_ROUTE_PATH_RPF_ID; + } break; case FIB_PATH_TYPE_RECURSIVE: api_rpath->rpath.frp_addr = path->recursive.fp_nh.fp_ip; @@ -2660,9 +2670,18 @@ fib_path_encode (fib_node_index_t path_list_index, api_rpath->rpath.frp_udp_encap_id = path->udp_encap.fp_udp_encap_id; api_rpath->rpath.frp_flags |= FIB_ROUTE_PATH_UDP_ENCAP; break; + case FIB_PATH_TYPE_INTF_RX: + api_rpath->rpath.frp_sw_if_index = path->receive.fp_interface; + api_rpath->rpath.frp_flags |= FIB_ROUTE_PATH_INTF_RX; + break; default: break; - } + } + + if (path_ext && path_ext->fpe_type == FIB_PATH_EXT_MPLS) + { + api_rpath->rpath.frp_label_stack = path_ext->fpe_path.frp_label_stack; + } return (FIB_PATH_LIST_WALK_CONTINUE); } |