summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-10-07 08:23:38 +0000
committerNeale Ranns <nranns@cisco.com>2019-10-14 07:51:42 +0000
commitd557b187f75b4c754b2bbd0f79ae52aabaab1448 (patch)
treebdd4dc97e28772eb0078e1e42a401dd83bb96bab
parent47a2a705d0f33c0da0be1e4c0cb59b2286c3306f (diff)
ip: MFIB CLI fix for parsing path flags
Type: fix Change-Id: I7ed9726d8c5ca26715a84b004a18fd7f93142486 Signed-off-by: Neale Ranns <nranns@cisco.com> (cherry picked from commit 46023762d1da674ff73954f0d1523d450bfcf03c)
-rw-r--r--src/vnet/fib/fib_types.c4
-rw-r--r--src/vnet/ip/lookup.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c
index 44fa463dc50..7b07fa976a4 100644
--- a/src/vnet/fib/fib_types.c
+++ b/src/vnet/fib/fib_types.c
@@ -18,6 +18,7 @@
#include <vnet/fib/fib_types.h>
#include <vnet/fib/fib_internal.h>
#include <vnet/fib/fib_table.h>
+#include <vnet/mfib/mfib_types.h>
#include <vnet/mpls/mpls.h>
/*
@@ -609,6 +610,9 @@ unformat_fib_route_path (unformat_input_t * input, va_list * args)
rpath->frp_weight = 1;
rpath->frp_flags |= FIB_ROUTE_PATH_LOCAL;
}
+ else if (unformat (input, "%U",
+ unformat_mfib_itf_flags, &rpath->frp_mitf_flags))
+ ;
else if (unformat (input, "out-labels"))
{
while (unformat (input, "%U",
diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c
index 43a90a1b558..e354db77216 100644
--- a/src/vnet/ip/lookup.c
+++ b/src/vnet/ip/lookup.c
@@ -905,9 +905,6 @@ vnet_ip_mroute_cmd (vlib_main_t * vm,
vec_add1 (rpaths, rpath);
}
else if (unformat (line_input, "%U",
- unformat_mfib_itf_flags, &rpath.frp_mitf_flags))
- ;
- else if (unformat (line_input, "%U",
unformat_mfib_entry_flags, &eflags))
;
else