From 70ed8aeff30c0eece0e19f0ad26c4cc8957278ae Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Wed, 15 Nov 2017 12:54:46 -0800 Subject: unformat function for FIB paths Change-Id: I32de25890ac0a643314f650591d2479879d9a2a6 Signed-off-by: Neale Ranns --- src/vnet/mpls/mpls.c | 161 ++------------------------------------------ src/vnet/mpls/mpls_tunnel.c | 58 ++-------------- 2 files changed, 14 insertions(+), 205 deletions(-) (limited to 'src/vnet/mpls') diff --git a/src/vnet/mpls/mpls.c b/src/vnet/mpls/mpls.c index ed24f75fbde..173771477de 100644 --- a/src/vnet/mpls/mpls.c +++ b/src/vnet/mpls/mpls.c @@ -212,16 +212,13 @@ vnet_mpls_local_label (vlib_main_t * vm, vlib_cli_command_t * cmd) { unformat_input_t _line_input, * line_input = &_line_input; + u32 table_id, is_del, is_ip, payload_proto; fib_route_path_t *rpaths = NULL, rpath; - u32 table_id, is_del, is_ip; mpls_label_t local_label; - mpls_label_t out_label; clib_error_t * error; mpls_eos_bit_t eos; - vnet_main_t * vnm; fib_prefix_t pfx; - vnm = vnet_get_main(); error = NULL; is_ip = 0; table_id = 0; @@ -229,6 +226,7 @@ vnet_mpls_local_label (vlib_main_t * vm, is_del = 0; local_label = MPLS_LABEL_INVALID; memset(&pfx, 0, sizeof(pfx)); + payload_proto = DPO_PROTO_MPLS; /* Get a line of input. */ if (! unformat_user (input, unformat_line_input, line_input)) @@ -236,8 +234,6 @@ vnet_mpls_local_label (vlib_main_t * vm, while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - memset(&rpath, 0, sizeof(rpath)); - if (unformat (line_input, "table %d", &table_id)) ; else if (unformat (line_input, "del")) @@ -264,158 +260,15 @@ vnet_mpls_local_label (vlib_main_t * vm, pfx.fp_proto = FIB_PROTOCOL_IP6; is_ip = 1; } - else if (unformat (line_input, "via %U %U weight %u", - unformat_ip4_address, - &rpath.frp_addr.ip4, - unformat_vnet_sw_interface, vnm, - &rpath.frp_sw_if_index, - &rpath.frp_weight)) - { - rpath.frp_proto = DPO_PROTO_IP4; - vec_add1(rpaths, rpath); - } - - else if (unformat (line_input, "via %U %U weight %u", - unformat_ip6_address, - &rpath.frp_addr.ip6, - unformat_vnet_sw_interface, vnm, - &rpath.frp_sw_if_index, - &rpath.frp_weight)) - { - rpath.frp_proto = DPO_PROTO_IP6; - vec_add1(rpaths, rpath); - } - - else if (unformat (line_input, "via %U %U", - unformat_ip4_address, - &rpath.frp_addr.ip4, - unformat_vnet_sw_interface, vnm, - &rpath.frp_sw_if_index)) - { - rpath.frp_weight = 1; - rpath.frp_proto = DPO_PROTO_IP4; - vec_add1(rpaths, rpath); - } - else if (unformat (line_input, "rx-ip4 %U", - unformat_vnet_sw_interface, vnm, - &rpath.frp_sw_if_index)) - { - rpath.frp_weight = 1; - rpath.frp_proto = DPO_PROTO_IP4; - rpath.frp_flags = FIB_ROUTE_PATH_INTF_RX; - vec_add1(rpaths, rpath); - } - else if (unformat (line_input, "via %U %U", - unformat_ip6_address, - &rpath.frp_addr.ip6, - unformat_vnet_sw_interface, vnm, - &rpath.frp_sw_if_index)) - { - rpath.frp_weight = 1; - rpath.frp_proto = DPO_PROTO_IP6; - vec_add1(rpaths, rpath); - } - else if (unformat (line_input, "via %U next-hop-table %d", - unformat_ip4_address, - &rpath.frp_addr.ip4, - &rpath.frp_fib_index)) - { - rpath.frp_weight = 1; - rpath.frp_sw_if_index = ~0; - rpath.frp_proto = DPO_PROTO_IP4; - vec_add1(rpaths, rpath); - } - else if (unformat (line_input, "via %U next-hop-table %d", - unformat_ip6_address, - &rpath.frp_addr.ip6, - &rpath.frp_fib_index)) - { - rpath.frp_weight = 1; - rpath.frp_sw_if_index = ~0; - rpath.frp_proto = DPO_PROTO_IP6; - vec_add1(rpaths, rpath); - } - else if (unformat (line_input, "via %U", - unformat_ip4_address, - &rpath.frp_addr.ip4)) - { - /* - * the recursive next-hops are by default in the same table - * as the prefix - */ - rpath.frp_fib_index = table_id; - rpath.frp_weight = 1; - rpath.frp_sw_if_index = ~0; - rpath.frp_proto = DPO_PROTO_IP4; - vec_add1(rpaths, rpath); - } else if (unformat (line_input, "via %U", - unformat_ip6_address, - &rpath.frp_addr.ip6)) + unformat_fib_route_path, + &rpath, &payload_proto)) { - rpath.frp_fib_index = table_id; - rpath.frp_weight = 1; - rpath.frp_sw_if_index = ~0; - rpath.frp_proto = DPO_PROTO_IP6; + pfx.fp_payload_proto = payload_proto; vec_add1(rpaths, rpath); } else if (unformat (line_input, "%d", &local_label)) ; - else if (unformat (line_input, - "ip4-lookup-in-table %d", - &rpath.frp_fib_index)) - { - rpath.frp_proto = DPO_PROTO_IP4; - rpath.frp_sw_if_index = FIB_NODE_INDEX_INVALID; - pfx.fp_payload_proto = DPO_PROTO_IP4; - vec_add1(rpaths, rpath); - } - else if (unformat (line_input, - "ip6-lookup-in-table %d", - &rpath.frp_fib_index)) - { - rpath.frp_proto = DPO_PROTO_IP6; - rpath.frp_sw_if_index = FIB_NODE_INDEX_INVALID; - vec_add1(rpaths, rpath); - pfx.fp_payload_proto = DPO_PROTO_IP6; - } - else if (unformat (line_input, - "mpls-lookup-in-table %d", - &rpath.frp_fib_index)) - { - rpath.frp_proto = DPO_PROTO_MPLS; - rpath.frp_sw_if_index = FIB_NODE_INDEX_INVALID; - pfx.fp_payload_proto = DPO_PROTO_MPLS; - vec_add1(rpaths, rpath); - } - else if (unformat (line_input, - "l2-input-on %U", - unformat_vnet_sw_interface, vnm, - &rpath.frp_sw_if_index)) - { - rpath.frp_proto = DPO_PROTO_ETHERNET; - pfx.fp_payload_proto = DPO_PROTO_ETHERNET; - rpath.frp_flags = FIB_ROUTE_PATH_INTF_RX; - vec_add1(rpaths, rpath); - } - 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 { error = clib_error_return (0, "unkown input: %U", @@ -531,9 +384,9 @@ done: } VLIB_CLI_COMMAND (mpls_local_label_command, static) = { - .path = "mpls local-label", + .path = "mpls local-label [eos|non-eos] via [next-hop-address] [next-hop-interface] [next-hop-table ] [weight ] [preference ] [udp-encap-id ] [ip4-lookup-in-table ] [ip6-lookup-in-table ] [mpls-lookup-in-table ] [resolve-via-host] [resolve-via-connected] [rx-ip4 ] [out-labels ]", .function = vnet_mpls_local_label, - .short_help = "Create/Delete MPL local labels", + .short_help = "Create/Delete MPLS local labels", }; clib_error_t * diff --git a/src/vnet/mpls/mpls_tunnel.c b/src/vnet/mpls/mpls_tunnel.c index 2d5521f447a..a9f32d4e48f 100644 --- a/src/vnet/mpls/mpls_tunnel.c +++ b/src/vnet/mpls/mpls_tunnel.c @@ -778,11 +778,11 @@ vnet_create_mpls_tunnel_command_fn (vlib_main_t * vm, vnet_main_t * vnm = vnet_get_main(); u8 is_del = 0, l2_only = 0, is_multicast =0; fib_route_path_t rpath, *rpaths = NULL; - mpls_label_t out_label = MPLS_LABEL_INVALID; - u32 sw_if_index = ~0; + u32 sw_if_index = ~0, payload_proto; clib_error_t *error = NULL; memset(&rpath, 0, sizeof(rpath)); + payload_proto = DPO_PROTO_MPLS; /* Get a line of input. */ if (! unformat_user (input, unformat_line_input, line_input)) @@ -800,56 +800,14 @@ 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-labels")) - { - while (unformat (line_input, "%U", - unformat_mpls_unicast_label, - &out_label)) - { - vec_add1 (rpath.frp_label_stack, out_label); - } - } - else if (unformat (line_input, "via %U %U", - unformat_ip4_address, - &rpath.frp_addr.ip4, - unformat_vnet_sw_interface, vnm, - &rpath.frp_sw_if_index)) - { - rpath.frp_weight = 1; - rpath.frp_proto = DPO_PROTO_IP4; - } - - else if (unformat (line_input, "via %U %U", - unformat_ip6_address, - &rpath.frp_addr.ip6, - unformat_vnet_sw_interface, vnm, - &rpath.frp_sw_if_index)) - { - rpath.frp_weight = 1; - rpath.frp_proto = DPO_PROTO_IP6; - } - else if (unformat (line_input, "via %U", - unformat_ip6_address, - &rpath.frp_addr.ip6)) - { - rpath.frp_fib_index = 0; - rpath.frp_weight = 1; - rpath.frp_sw_if_index = ~0; - rpath.frp_proto = DPO_PROTO_IP6; - } - else if (unformat (line_input, "via %U", - unformat_ip4_address, - &rpath.frp_addr.ip4)) - { - rpath.frp_fib_index = 0; - rpath.frp_weight = 1; - rpath.frp_sw_if_index = ~0; - rpath.frp_proto = DPO_PROTO_IP4; - } else if (unformat (line_input, "l2-only")) l2_only = 1; else if (unformat (line_input, "multicast")) is_multicast = 1; + else if (unformat (line_input, "via %U", + unformat_fib_route_path, + &rpath, &payload_proto)) + vec_add1(rpaths, rpath); else { error = clib_error_return (0, "unknown input '%U'", @@ -858,8 +816,6 @@ vnet_create_mpls_tunnel_command_fn (vlib_main_t * vm, } } - vec_add1(rpaths, rpath); - if (is_del) { if (!vnet_mpls_tunnel_path_remove(sw_if_index, rpaths)) @@ -901,7 +857,7 @@ done: VLIB_CLI_COMMAND (create_mpls_tunnel_command, static) = { .path = "mpls tunnel", .short_help = - "mpls tunnel via [addr] [interface] [out-labels]", + "mpls tunnel [multicast] [l2-only] via [next-hop-address] [next-hop-interface] [next-hop-table ] [weight ] [preference ] [udp-encap-id ] [ip4-lookup-in-table ] [ip6-lookup-in-table ] [mpls-lookup-in-table ] [resolve-via-host] [resolve-via-connected] [rx-ip4 ] [out-labels ]", .function = vnet_create_mpls_tunnel_command_fn, }; -- cgit 1.2.3-korg