summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2017-08-08 13:07:16 -0700
committerFlorin Coras <florin.coras@gmail.com>2017-08-09 02:04:32 +0000
commitf73d0e2ea6bf4e0dc9c69ec4f1d0c7b9b41d2fa3 (patch)
tree9837612f6ee19e88e73a6e87163e55f44f1aead7
parenta3a3a9dedd6af147a310fa5830a52f771e1448bb (diff)
Allow multiple MPLS output labels to be passed on the CLI
Change-Id: Ib5af105e32b6b0df86923e189ab6bf6ee59de5b9 Signed-off-by: Neale Ranns <nranns@cisco.com>
-rwxr-xr-xsrc/vnet/ip/lookup.c13
-rw-r--r--src/vnet/mpls/mpls.c33
-rw-r--r--src/vnet/mpls/mpls_tunnel.c23
3 files changed, 53 insertions, 16 deletions
diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c
index 41e46070267..4506ae14019 100755
--- a/src/vnet/ip/lookup.c
+++ b/src/vnet/ip/lookup.c
@@ -408,15 +408,22 @@ vnet_ip_route_cmd (vlib_main_t * vm,
rpaths[vec_len (rpaths) - 1].frp_flags |=
FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED;
}
- else if (unformat (line_input, "out-label %U",
- unformat_mpls_unicast_label, &out_label))
+ else if (unformat (line_input, "out-labels"))
{
if (vec_len (rpaths) == 0)
{
error = clib_error_return (0, "Paths then labels");
goto done;
}
- vec_add1 (rpaths[vec_len (rpaths) - 1].frp_label_stack, out_label);
+ else
+ {
+ while (unformat (line_input, "%U",
+ unformat_mpls_unicast_label, &out_label))
+ {
+ vec_add1 (rpaths[vec_len (rpaths) - 1].frp_label_stack,
+ out_label);
+ }
+ }
}
else if (unformat (line_input, "via-label %U",
unformat_mpls_unicast_label, &rpath.frp_local_label))
diff --git a/src/vnet/mpls/mpls.c b/src/vnet/mpls/mpls.c
index 266ba42c94f..5021ac23bc0 100644
--- a/src/vnet/mpls/mpls.c
+++ b/src/vnet/mpls/mpls.c
@@ -66,8 +66,18 @@ uword unformat_mpls_unicast_label (unformat_input_t * input, va_list * args)
*label = MPLS_IETF_ROUTER_ALERT_LABEL;
else if (unformat (input, MPLS_IETF_IMPLICIT_NULL_STRING))
*label = MPLS_IETF_IMPLICIT_NULL_LABEL;
+ else if (unformat (input, MPLS_IETF_IPV4_EXPLICIT_NULL_BRIEF_STRING))
+ *label = MPLS_IETF_IPV4_EXPLICIT_NULL_LABEL;
+ else if (unformat (input, MPLS_IETF_IPV6_EXPLICIT_NULL_BRIEF_STRING))
+ *label = MPLS_IETF_IPV6_EXPLICIT_NULL_LABEL;
+ else if (unformat (input, MPLS_IETF_ROUTER_ALERT_BRIEF_STRING))
+ *label = MPLS_IETF_ROUTER_ALERT_LABEL;
+ else if (unformat (input, MPLS_IETF_IMPLICIT_NULL_BRIEF_STRING))
+ *label = MPLS_IETF_IMPLICIT_NULL_LABEL;
else if (unformat (input, "%d", label))
;
+ else
+ return (0);
return (1);
}
@@ -388,16 +398,23 @@ vnet_mpls_local_label (vlib_main_t * vm,
rpath.frp_flags = FIB_ROUTE_PATH_INTF_RX;
vec_add1(rpaths, rpath);
}
- else if (unformat (line_input, "out-label %U",
- unformat_mpls_unicast_label,
- &out_label))
+ else if (unformat (line_input, "out-labels"))
{
- if (vec_len(rpaths) == 0)
- {
- error = clib_error_return(0 , "Paths then labels");
+ if (vec_len (rpaths) == 0)
+ {
+ error = clib_error_return (0, "Paths then labels");
goto done;
- }
- vec_add1(rpaths[vec_len(rpaths)-1].frp_label_stack, out_label);
+ }
+ else
+ {
+ while (unformat (line_input, "%U",
+ unformat_mpls_unicast_label,
+ &out_label))
+ {
+ vec_add1 (rpaths[vec_len (rpaths) - 1].frp_label_stack,
+ out_label);
+ }
+ }
}
else
{
diff --git a/src/vnet/mpls/mpls_tunnel.c b/src/vnet/mpls/mpls_tunnel.c
index 6452a60bfe2..5211c926055 100644
--- a/src/vnet/mpls/mpls_tunnel.c
+++ b/src/vnet/mpls/mpls_tunnel.c
@@ -800,11 +800,24 @@ vnet_create_mpls_tunnel_command_fn (vlib_main_t * vm,
is_del = 0;
else if (unformat (line_input, "add"))
is_del = 0;
- else if (unformat (line_input, "out-label %U",
- unformat_mpls_unicast_label, &out_label))
- {
- vec_add1(rpath.frp_label_stack, out_label);
- }
+ else if (unformat (line_input, "out-labels"))
+ {
+ if (vec_len (rpaths) == 0)
+ {
+ error = clib_error_return (0, "Paths then labels");
+ goto done;
+ }
+ else
+ {
+ while (unformat (line_input, "%U",
+ unformat_mpls_unicast_label,
+ &out_label))
+ {
+ vec_add1 (rpaths[vec_len (rpaths) - 1].frp_label_stack,
+ out_label);
+ }
+ }
+ }
else if (unformat (line_input, "via %U %U",
unformat_ip4_address,
&rpath.frp_addr.ip4,