diff options
| author |   Neale Ranns <nranns@cisco.com> | 2019-07-29 12:59:45 +0000 |
|---|---|---|
| committer | Neale Ranns <nranns@cisco.com> | 2019-07-31 10:08:05 +0000 |
| commit | 5ca2a8ae19c93d24070df066d027da791294b827 (patch) | |
| tree | 19b8e6f95923e3e4a4a8c1369b6b68e097464c43 /src/vnet | |
| parent | 6b43ce57cb5620c936b38ff9c5443b3f0f447170 (diff) | |
fib: fix calls to unformat_fib_path
Type: fix
Ticket: 1728
Change-Id: I679c2b8c5b0f751c9476db3669ab3f6c26dcdd28
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/fib/fib_types.c | 2 | ||||
| -rw-r--r-- | src/vnet/ip/ip4_punt_drop.c | 3 | ||||
| -rw-r--r-- | src/vnet/ip/ip6_punt_drop.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c index 386aece8753..44fa463dc50 100644 --- a/src/vnet/fib/fib_types.c +++ b/src/vnet/fib/fib_types.c @@ -434,7 +434,7 @@ uword unformat_fib_route_path (unformat_input_t * input, va_list * args) { fib_route_path_t *rpath = va_arg (*args, fib_route_path_t *); - u32 *payload_proto = va_arg (*args, u32*); + dpo_proto_t *payload_proto = va_arg (*args, void*); u32 weight, preference, udp_encap_id, fi; mpls_label_t out_label; vnet_main_t *vnm; diff --git a/src/vnet/ip/ip4_punt_drop.c b/src/vnet/ip/ip4_punt_drop.c index 4771e8d5b34..fc5a68fc66a 100644 --- a/src/vnet/ip/ip4_punt_drop.c +++ b/src/vnet/ip/ip4_punt_drop.c @@ -338,6 +338,7 @@ ip4_punt_redirect_cmd (vlib_main_t * vm, { unformat_input_t _line_input, *line_input = &_line_input; fib_route_path_t *rpaths = NULL, rpath; + dpo_proto_t payload_proto; clib_error_t *error = 0; u32 rx_sw_if_index = ~0; vnet_main_t *vnm; @@ -361,7 +362,7 @@ ip4_punt_redirect_cmd (vlib_main_t * vm, unformat_vnet_sw_interface, vnm, &rx_sw_if_index)) ; else if (unformat (line_input, "via %U", - unformat_fib_route_path, &rpath)) + unformat_fib_route_path, &rpath, &payload_proto)) vec_add1 (rpaths, rpath); else { diff --git a/src/vnet/ip/ip6_punt_drop.c b/src/vnet/ip/ip6_punt_drop.c index 330ef55483f..8d91c093a4b 100644 --- a/src/vnet/ip/ip6_punt_drop.c +++ b/src/vnet/ip/ip6_punt_drop.c @@ -327,6 +327,7 @@ ip6_punt_redirect_cmd (vlib_main_t * vm, { unformat_input_t _line_input, *line_input = &_line_input; fib_route_path_t *rpaths = NULL, rpath; + dpo_proto_t payload_proto; clib_error_t *error = 0; u32 rx_sw_if_index = ~0; vnet_main_t *vnm; @@ -350,7 +351,7 @@ ip6_punt_redirect_cmd (vlib_main_t * vm, unformat_vnet_sw_interface, vnm, &rx_sw_if_index)) ; else if (unformat (line_input, "via %U", - unformat_fib_route_path, &rpath)) + unformat_fib_route_path, &rpath, &payload_proto)) vec_add1 (rpaths, rpath); else { |