fib: fix calls to unformat_fib_path

Type: fix
Ticket: 1728

Change-Id: I679c2b8c5b0f751c9476db3669ab3f6c26dcdd28
Signed-off-by: Neale Ranns <nranns@cisco.com>

diff --git a/src/plugins/abf/abf_policy.c b/src/plugins/abf/abf_policy.c
index 458bf1b..8defa75 100644 (file)
--- a/src/plugins/abf/abf_policy.c
+++ b/src/plugins/abf/abf_policy.c
@@ -245,9 +245,9 @@ abf_policy_cmd (vlib_main_t * vm,
                unformat_input_t * main_input, vlib_cli_command_t * cmd)
 {
   unformat_input_t _line_input, *line_input = &_line_input;
-  u32 acl_index, policy_id;
   fib_route_path_t *rpaths = NULL, rpath;
-  u32 is_del;
+  u32 acl_index, policy_id, is_del;
+  dpo_proto_t payload_proto;
   int rv = 0;
 
   is_del = 0;
@@ -269,7 +269,7 @@ abf_policy_cmd (vlib_main_t * vm,
       else if (unformat (line_input, "add"))
        is_del = 0;
       else if (unformat (line_input, "via %U",
-                        unformat_fib_route_path, &rpath))
+                        unformat_fib_route_path, &rpath, &payload_proto))
        vec_add1 (rpaths, rpath);
       else
        return (clib_error_return (0, "unknown input '%U'",

diff --git a/src/plugins/l3xc/l3xc.c b/src/plugins/l3xc/l3xc.c
index 77c062f..9839278 100644 (file)
--- a/src/plugins/l3xc/l3xc.c
+++ b/src/plugins/l3xc/l3xc.c
@@ -199,6 +199,7 @@ l3xc_cmd (vlib_main_t * vm,
   unformat_input_t _line_input, *line_input = &_line_input;
   fib_route_path_t *rpaths = NULL, rpath;
   u32 sw_if_index, is_del, is_ip6;
+  dpo_proto_t payload_proto;
   vnet_main_t *vnm;
   int rv = 0;
 
@@ -224,7 +225,7 @@ l3xc_cmd (vlib_main_t * vm,
       else if (unformat (line_input, "add"))
        is_del = 0;
       else if (unformat (line_input, "via %U",
-                        unformat_fib_route_path, &rpath))
+                        unformat_fib_route_path, &rpath, &payload_proto))
        vec_add1 (rpaths, rpath);
       else
        return (clib_error_return (0, "unknown input '%U'",

diff --git a/src/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c
index 386aece..44fa463 100644 (file)
--- 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 4771e8d..fc5a68f 100644 (file)
--- 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 330ef55..8d91c09 100644 (file)
--- 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
        {