summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-03-11 05:34:50 -0700
committerOle Trøan <otroan@employees.org>2019-03-12 16:02:07 +0000
commitf726f539185609cb4f3aee7f34906e8b538cd33e (patch)
tree4232b62eea207b2bb576d959316bedf80cd72030 /src/vnet
parentfa0ac2c5668cb8f387a8e16dcf8d2d7154a09fe2 (diff)
FIB: path parsing, table-id not fib-index (VPP-1586)
Change-Id: Ib27952935393163eaabf005c69b1cbc2feca2b98 Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/fib/fib_api.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/vnet/fib/fib_api.c b/src/vnet/fib/fib_api.c
index 98f92c3e73f..ada0012ecd0 100644
--- a/src/vnet/fib/fib_api.c
+++ b/src/vnet/fib/fib_api.c
@@ -56,10 +56,20 @@ fib_path_api_parse (const vl_api_fib_path_t *in,
out->frp_proto = in->afi;
// .frp_addr = (NULL == next_hop ? zero_addr : *next_hop),
out->frp_sw_if_index = ntohl(in->sw_if_index);
- out->frp_fib_index = ntohl(in->table_id);
out->frp_weight = in->weight;
out->frp_preference = in->preference;
+ if (DPO_PROTO_IP4 == out->frp_proto ||
+ DPO_PROTO_IP6 == out->frp_proto ||
+ DPO_PROTO_MPLS == out->frp_proto)
+ {
+ out->frp_fib_index = fib_table_find (dpo_proto_to_fib(out->frp_proto),
+ ntohl (in->table_id));
+
+ if (~0 == out->frp_fib_index)
+ return (VNET_API_ERROR_NO_SUCH_FIB);
+ }
+
/*
* the special INVALID label meams we are not recursing via a
* label. Exp-null value is never a valid via-label so that