ip: punt redirect add nh in api

[vpp.git] / src / vnet / ip / ip4_punt_drop.c

diff --git a/src/vnet/ip/ip4_punt_drop.c b/src/vnet/ip/ip4_punt_drop.c
index 65b2401..89803af 100644 (file)
--- a/src/vnet/ip/ip4_punt_drop.c
+++ b/src/vnet/ip/ip4_punt_drop.c
@@ -51,6 +51,29 @@ ip_punt_policer_t ip4_punt_policer_cfg = {
 };
 #endif /* CLIB_MARCH_VARIANT */
 
+static char *ip4_punt_policer_handoff_error_strings[] = { "congestion drop" };
+
+VLIB_NODE_FN (ip4_punt_policer_handoff_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return policer_handoff (vm, node, frame, ip4_punt_policer_cfg.fq_index,
+                         ip4_punt_policer_cfg.policer_index);
+}
+
+VLIB_REGISTER_NODE (ip4_punt_policer_handoff_node) = {
+  .name = "ip4-punt-policer-handoff",
+  .vector_size = sizeof (u32),
+  .format_trace = format_policer_handoff_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(ip4_punt_policer_handoff_error_strings),
+  .error_strings = ip4_punt_policer_handoff_error_strings,
+
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
 static char *ip4_punt_policer_error_strings[] = {
 #define _(sym,string) string,
   foreach_ip_punt_policer_error
@@ -77,6 +100,7 @@ VLIB_REGISTER_NODE (ip4_punt_policer_node) = {
 
   .next_nodes = {
     [IP_PUNT_POLICER_NEXT_DROP] = "ip4-drop",
+    [IP_PUNT_POLICER_NEXT_HANDOFF] = "ip4-punt-policer-handoff",
   },
 };
 
@@ -289,28 +313,8 @@ VLIB_CLI_COMMAND (ip4_punt_policer_command, static) =
 #ifndef CLIB_MARCH_VARIANT
 
 void
-ip4_punt_redirect_add (u32 rx_sw_if_index,
-                      u32 tx_sw_if_index, ip46_address_t * nh)
-{
-  /* *INDENT-OFF* */
-  fib_route_path_t *rpaths = NULL, rpath = {
-    .frp_proto = DPO_PROTO_IP4,
-    .frp_addr = *nh,
-    .frp_sw_if_index = tx_sw_if_index,
-    .frp_weight = 1,
-    .frp_fib_index = ~0,
-  };
-  /* *INDENT-ON* */
-
-  vec_add1 (rpaths, rpath);
-
-  ip4_punt_redirect_add_paths (rx_sw_if_index, rpaths);
-
-  vec_free (rpaths);
-}
-
-void
-ip4_punt_redirect_add_paths (u32 rx_sw_if_index, fib_route_path_t * rpaths)
+ip4_punt_redirect_add_paths (u32 rx_sw_if_index,
+                            const fib_route_path_t *rpaths)
 {
   ip_punt_redirect_add (FIB_PROTOCOL_IP4,
                        rx_sw_if_index,
@@ -334,10 +338,10 @@ ip4_punt_redirect_cmd (vlib_main_t * vm,
                       vlib_cli_command_t * cmd)
 {
   unformat_input_t _line_input, *line_input = &_line_input;
-  ip46_address_t nh = { 0 };
+  fib_route_path_t *rpaths = NULL, rpath;
+  dpo_proto_t payload_proto = DPO_PROTO_IP4;
   clib_error_t *error = 0;
   u32 rx_sw_if_index = ~0;
-  u32 tx_sw_if_index = ~0;
   vnet_main_t *vnm;
   u8 is_add;
 
@@ -354,17 +358,13 @@ ip4_punt_redirect_cmd (vlib_main_t * vm,
       else if (unformat (line_input, "add"))
        is_add = 1;
       else if (unformat (line_input, "rx all"))
-       rx_sw_if_index = ~0;
+       rx_sw_if_index = 0;
       else if (unformat (line_input, "rx %U",
                         unformat_vnet_sw_interface, vnm, &rx_sw_if_index))
        ;
-      else if (unformat (line_input, "via %U %U",
-                        unformat_ip4_address, unformat_vnet_sw_interface,
-                        &nh.ip4, vnm, &tx_sw_if_index))
-       ;
-      else if (unformat (line_input, "via %U",
-                        unformat_vnet_sw_interface, vnm, &tx_sw_if_index))
-       ;
+      else if (unformat (line_input, "via %U", unformat_fib_route_path, &rpath,
+                        &payload_proto))
+       vec_add1 (rpaths, rpath);
       else
        {
          error = unformat_parse_error (line_input);
@@ -380,7 +380,8 @@ ip4_punt_redirect_cmd (vlib_main_t * vm,
 
   if (is_add)
     {
-      ip4_punt_redirect_add (rx_sw_if_index, tx_sw_if_index, &nh);
+      if (vec_len (rpaths))
+       ip4_punt_redirect_add_paths (rx_sw_if_index, rpaths);
     }
   else
     {
@@ -388,6 +389,7 @@ ip4_punt_redirect_cmd (vlib_main_t * vm,
     }
 
 done:
+  vec_free (rpaths);
   unformat_free (line_input);
   return (error);
 }