X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4_punt_drop.c;h=e36980ce9ed78f2d6539d62d254d77e9c01a5480;hb=609e1210c;hp=72f36f33560d1f524357e8a3fb2b136c03315a31;hpb=d91c1dbdb31f80db7d967f2f57c43d0a81d65297;p=vpp.git

diff --git a/src/vnet/ip/ip4_punt_drop.c b/src/vnet/ip/ip4_punt_drop.c
index 72f36f33560..e36980ce9ed 100644
--- a/src/vnet/ip/ip4_punt_drop.c
+++ b/src/vnet/ip/ip4_punt_drop.c
@@ -28,7 +28,7 @@ VNET_FEATURE_ARC_INIT (ip4_punt) =
 VNET_FEATURE_ARC_INIT (ip4_drop) =
 {
   .arc_name  = "ip4-drop",
-  .start_nodes = VNET_FEATURES ("ip4-drop"),
+  .start_nodes = VNET_FEATURES ("ip4-drop", "ip4-not-enabled"),
 };
 /* *INDENT-ON* */
 
@@ -115,6 +115,7 @@ format_ip_punt_redirect_trace (u8 * s, va_list * args)
 ip_punt_redirect_t ip4_punt_redirect_cfg = {
   .any_rx_sw_if_index = {
     .tx_sw_if_index = ~0,
+	.adj_index = ADJ_INDEX_INVALID,
   },
 };
 /* *INDENT-ON* */
@@ -185,6 +186,17 @@ ip4_drop (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
 
 }
 
+static uword
+ip4_not_enabled (vlib_main_t * vm,
+		 vlib_node_runtime_t * node, vlib_frame_t * frame)
+{
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    ip4_forward_next_trace (vm, node, frame, VLIB_TX);
+
+  return ip_drop_or_punt (vm, node, frame,
+			  vnet_feat_arc_ip4_drop.feature_arc_index);
+}
+
 static uword
 ip4_punt (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
@@ -210,6 +222,20 @@ VLIB_REGISTER_NODE (ip4_drop_node, static) =
 
 VLIB_NODE_FUNCTION_MULTIARCH (ip4_drop_node, ip4_drop);
 
+VLIB_REGISTER_NODE (ip4_not_enabled_node, static) =
+{
+  .function = ip4_not_enabled,
+  .name = "ip4-not-enabled",
+  .vector_size = sizeof (u32),
+  .format_trace = format_ip4_forward_next_trace,
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_NODE_FUNCTION_MULTIARCH (ip4_not_enabled_node, ip4_not_enabled);
+
 VLIB_REGISTER_NODE (ip4_punt_node, static) =
 {
   .function = ip4_punt,
@@ -309,6 +335,7 @@ VLIB_CLI_COMMAND (ip4_punt_policer_command, static) =
  */
 ip_punt_redirect_rx_t uninit_rx_redirect = {
   .tx_sw_if_index = ~0,
+  .adj_index = ADJ_INDEX_INVALID,
 };
 
 void
@@ -351,6 +378,9 @@ ip_punt_redirect_del (ip_punt_redirect_t * cfg, u32 rx_sw_if_index)
       old = &cfg->redirect_by_rx_sw_if_index[rx_sw_if_index];
     }
 
+  if ((old == NULL) || (old->adj_index == ADJ_INDEX_INVALID))
+    return;
+
   adj_unlock (old->adj_index);
   *old = uninit_rx_redirect;
 }
@@ -384,10 +414,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 = ip46_address_initializer;
   clib_error_t *error = 0;
-  u32 rx_sw_if_index;
-  u32 tx_sw_if_index;
-  ip46_address_t nh;
+  u32 rx_sw_if_index = 0;
+  u32 tx_sw_if_index = 0;
   vnet_main_t *vnm;
   u8 is_add;
 
@@ -415,7 +445,7 @@ ip4_punt_redirect_cmd (vlib_main_t * vm,
 	;
       else if (unformat (line_input, "via %U",
 			 unformat_vnet_sw_interface, vnm, &tx_sw_if_index))
-	memset (&nh, 0, sizeof (nh));
+	clib_memset (&nh, 0, sizeof (nh));
       else
 	{
 	  error = unformat_parse_error (line_input);
@@ -424,9 +454,19 @@ 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 (rx_sw_if_index && tx_sw_if_index)
+	{
+	  ip4_punt_redirect_add (rx_sw_if_index, tx_sw_if_index, &nh);
+	}
+    }
   else
-    ip4_punt_redirect_del (rx_sw_if_index);
+    {
+      if (rx_sw_if_index)
+	{
+	  ip4_punt_redirect_del (rx_sw_if_index);
+	}
+    }
 
 done:
   unformat_free (line_input);
@@ -481,6 +521,42 @@ format_ip_punt_redirect (u8 * s, va_list * args)
   return (s);
 }
 
+ip_punt_redirect_detail_t *
+ip4_punt_redirect_entries (u32 sw_if_index)
+{
+  ip_punt_redirect_rx_t *pr;
+  ip_punt_redirect_detail_t *prs = 0;
+  u32 rx_sw_if_index;
+
+  vec_foreach_index (rx_sw_if_index,
+		     ip4_punt_redirect_cfg.redirect_by_rx_sw_if_index)
+  {
+    if (sw_if_index == ~0 || sw_if_index == rx_sw_if_index)
+      {
+	pr =
+	  &ip4_punt_redirect_cfg.redirect_by_rx_sw_if_index[rx_sw_if_index];
+	if (~0 != pr->tx_sw_if_index)
+	  {
+	    ip_punt_redirect_detail_t detail = {.rx_sw_if_index =
+		rx_sw_if_index,
+	      .punt_redirect = *pr
+	    };
+	    vec_add1 (prs, detail);
+	  }
+      }
+  }
+  if (~0 != ip4_punt_redirect_cfg.any_rx_sw_if_index.tx_sw_if_index)
+    {
+      pr = &ip4_punt_redirect_cfg.any_rx_sw_if_index;
+      ip_punt_redirect_detail_t detail = {.rx_sw_if_index = ~0,
+	.punt_redirect = *pr
+      };
+      vec_add1 (prs, detail);
+    }
+
+  return prs;
+}
+
 static clib_error_t *
 ip4_punt_redirect_show_cmd (vlib_main_t * vm,
 			    unformat_input_t * main_input,
@@ -501,7 +577,7 @@ VLIB_CLI_COMMAND (show_ip4_punt_redirect_command, static) =
 {
   .path = "show ip punt redirect",
   .function = ip4_punt_redirect_show_cmd,
-  .short_help = "show ip punt redirect [add|del] rx [<interface>|all] via [<nh>] <tx_interface>",
+  .short_help = "show ip punt redirect",
   .is_mp_safe = 1,
 };
 /* *INDENT-ON* */