diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-08-29 02:09:47 -0700 |
|---|---|---|
| committer | Neale Ranns <nranns@cisco.com> | 2018-08-29 12:06:41 +0000 |
| commit | 270e1900856852163361a99db6b5c669e454b93b (patch) | |
| tree | 1e890eb1dabe0ee7a27a6ee59f8ec97c31199b3a /src/vnet/fib | |
| parent | 6da5d8d237c52d999fe077dd278eaa9bc020f01b (diff) | |
Consolidate table->index conversion in fib-path CLI processing
Change-Id: I221cebddc45efbfdec428b7df2af96e2aedff2dd
Signed-off-by: Neale Ranns <nranns@cisco.com>
(cherry picked from commit 77eb9073b178e8d4375bf0ef274246586f018ddc)
Diffstat (limited to 'src/vnet/fib')
| -rw-r--r-- | src/vnet/fib/fib_types.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c index 1046e45b2f7..d54b5c4a19a 100644 --- a/src/vnet/fib/fib_types.c +++ b/src/vnet/fib/fib_types.c @@ -17,6 +17,7 @@ #include <vnet/fib/fib_types.h> #include <vnet/fib/fib_internal.h> +#include <vnet/fib/fib_table.h> #include <vnet/mpls/mpls.h> /* @@ -384,7 +385,7 @@ unformat_fib_route_path (unformat_input_t * input, va_list * args) { fib_route_path_t *rpath = va_arg (*args, fib_route_path_t *); u32 *payload_proto = va_arg (*args, u32*); - u32 weight, preference, udp_encap_id; + u32 weight, preference, udp_encap_id, fi; mpls_label_t out_label; vnet_main_t *vnm; @@ -426,6 +427,14 @@ unformat_fib_route_path (unformat_input_t * input, va_list * args) { rpath->frp_sw_if_index = ~0; rpath->frp_proto = DPO_PROTO_IP4; + + /* + * the user enter table-ids, convert to index + */ + fi = fib_table_find (FIB_PROTOCOL_IP4, rpath->frp_fib_index); + if (~0 == fi) + return 0; + rpath->frp_fib_index = fi; } else if (unformat (input, "%U next-hop-table %d", unformat_ip6_address, @@ -434,6 +443,10 @@ unformat_fib_route_path (unformat_input_t * input, va_list * args) { rpath->frp_sw_if_index = ~0; rpath->frp_proto = DPO_PROTO_IP6; + fi = fib_table_find (FIB_PROTOCOL_IP6, rpath->frp_fib_index); + if (~0 == fi) + return 0; + rpath->frp_fib_index = fi; } else if (unformat (input, "%U", unformat_ip4_address, |