From 8de88c03056a3cca1f5eb9dacc53bbb391a407fe Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 28 Nov 2017 04:36:37 -0800 Subject: Fix CLI path parsing for via interface only before: DBGvpp# ip route add 1.1.1.1/32 via mpls-tunnel0 ip route add 1.1.1.1/32 via mpls-tunnel0 ip route: parse error `via mpls-tunnel0' DBGvpp# ip route add 1.1.1.1/32 via via mpls-tunnel0 ip route add 1.1.1.1/32 via via mpls-tunnel0 after: DBGvpp# ip route add 1.1.1.1/32 via via mpls-tunnel1 ip route add 1.1.1.1/32 via via mpls-tunnel1 Change-Id: I2185a82fcf0799d59de9cb16e09b7f297faffab9 Signed-off-by: Neale Ranns --- src/vnet/fib/fib_types.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/vnet') diff --git a/src/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c index 5c70d6c1729..48f2bd1dc9a 100644 --- a/src/vnet/fib/fib_types.c +++ b/src/vnet/fib/fib_types.c @@ -417,12 +417,6 @@ unformat_fib_route_path (unformat_input_t * input, va_list * args) rpath->frp_proto = *payload_proto; rpath->frp_sw_if_index = ~0; } - else if (unformat (input, "via %U", - unformat_vnet_sw_interface, vnm, - &rpath->frp_sw_if_index)) - { - rpath->frp_proto = *payload_proto; - } else if (unformat (input, "resolve-via-host")) { rpath->frp_flags |= FIB_ROUTE_PATH_RESOLVE_VIA_HOST; @@ -483,6 +477,12 @@ unformat_fib_route_path (unformat_input_t * input, va_list * args) vec_add1(rpath->frp_label_stack, out_label); } } + else if (unformat (input, "%U", + unformat_vnet_sw_interface, vnm, + &rpath->frp_sw_if_index)) + { + rpath->frp_proto = *payload_proto; + } else { return (0); -- cgit 1.2.3-korg