X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_api.c;h=f3712d3fd29949c75ce268c25da3056bab19a3c4;hb=f9342023c19887da656133e2688a90d70383b0c5;hp=4d4daac8536929078878f959d3a5a7b66924df0e;hpb=8edad036f1f8b920a6643a026f50a5d3aff8cbf1;p=vpp.git

diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c
index 4d4daac8536..f3712d3fd29 100644
--- a/src/vnet/ip/ip_api.c
+++ b/src/vnet/ip/ip_api.c
@@ -70,6 +70,8 @@ _(IP_DUMP, ip_dump)                                                     \
 _(IP_NEIGHBOR_ADD_DEL, ip_neighbor_add_del)                             \
 _(IP_ADD_DEL_ROUTE, ip_add_del_route)                                   \
 _(IP_TABLE_ADD_DEL, ip_table_add_del)                                   \
+_(IP_PUNT_POLICE, ip_punt_police)                                       \
+_(IP_PUNT_REDIRECT, ip_punt_redirect)                                   \
 _(SET_IP_FLOW_HASH,set_ip_flow_hash)                                    \
 _(SW_INTERFACE_IP6ND_RA_CONFIG, sw_interface_ip6nd_ra_config)           \
 _(SW_INTERFACE_IP6ND_RA_PREFIX, sw_interface_ip6nd_ra_prefix)           \
@@ -647,6 +649,64 @@ vl_api_ip6_mfib_dump_t_handler (vl_api_ip6_mfib_dump_t * mp)
   vec_free (api_rpaths);
 }
 
+static void
+vl_api_ip_punt_police_t_handler (vl_api_ip_punt_police_t * mp,
+				 vlib_main_t * vm)
+{
+  vl_api_ip_punt_police_reply_t *rmp;
+  int rv = 0;
+
+  if (mp->is_ip6)
+    ip6_punt_policer_add_del (mp->is_add, ntohl (mp->policer_index));
+  else
+    ip4_punt_policer_add_del (mp->is_add, ntohl (mp->policer_index));
+
+  REPLY_MACRO (VL_API_IP_PUNT_POLICE_REPLY);
+}
+
+static void
+vl_api_ip_punt_redirect_t_handler (vl_api_ip_punt_redirect_t * mp,
+				   vlib_main_t * vm)
+{
+  vl_api_ip_punt_redirect_reply_t *rmp;
+  int rv = 0;
+
+  if (mp->is_add)
+    {
+      ip46_address_t nh;
+
+      memset (&nh, 0, sizeof (nh));
+
+      if (mp->is_ip6)
+	{
+	  memcpy (&nh.ip6, mp->nh, sizeof (nh.ip6));
+
+	  ip6_punt_redirect_add (ntohl (mp->rx_sw_if_index),
+				 ntohl (mp->tx_sw_if_index), &nh);
+	}
+      else
+	{
+	  memcpy (&nh.ip4, mp->nh, sizeof (nh.ip4));
+
+	  ip4_punt_redirect_add (ntohl (mp->rx_sw_if_index),
+				 ntohl (mp->tx_sw_if_index), &nh);
+	}
+    }
+  else
+    {
+      if (mp->is_ip6)
+	{
+	  ip6_punt_redirect_del (ntohl (mp->rx_sw_if_index));
+	}
+      else
+	{
+	  ip4_punt_redirect_del (ntohl (mp->rx_sw_if_index));
+	}
+    }
+
+  REPLY_MACRO (VL_API_IP_PUNT_REDIRECT_REPLY);
+}
+
 static void
 vl_api_ip_neighbor_add_del_t_handler (vl_api_ip_neighbor_add_del_t * mp,
 				      vlib_main_t * vm)
@@ -926,23 +986,11 @@ add_del_route_check (fib_protocol_t table_proto,
 {
   vnet_main_t *vnm = vnet_get_main ();
 
-  /* Temporaray whilst I do the CSIT dance */
-  u8 create_missing_tables = 1;
-
   *fib_index = fib_table_find (table_proto, ntohl (table_id));
   if (~0 == *fib_index)
     {
-      if (create_missing_tables)
-	{
-	  *fib_index = fib_table_find_or_create_and_lock (table_proto,
-							  ntohl (table_id),
-							  FIB_SOURCE_API);
-	}
-      else
-	{
-	  /* No such VRF, and we weren't asked to create one */
-	  return VNET_API_ERROR_NO_SUCH_FIB;
-	}
+      /* No such VRF */
+      return VNET_API_ERROR_NO_SUCH_FIB;
     }
 
   if (!is_rpf_id && ~0 != ntohl (next_hop_sw_if_index))
@@ -971,26 +1019,7 @@ add_del_route_check (fib_protocol_t table_proto,
 
       if (~0 == *next_hop_fib_index)
 	{
-	  if (create_missing_tables)
-	    {
-	      if (is_rpf_id)
-		*next_hop_fib_index =
-		  mfib_table_find_or_create_and_lock (fib_nh_proto,
-						      ntohl
-						      (next_hop_table_id),
-						      MFIB_SOURCE_API);
-	      else
-		*next_hop_fib_index =
-		  fib_table_find_or_create_and_lock (fib_nh_proto,
-						     ntohl
-						     (next_hop_table_id),
-						     FIB_SOURCE_API);
-	    }
-	  else
-	    {
-	      /* No such VRF, and we weren't asked to create one */
-	      return VNET_API_ERROR_NO_SUCH_FIB;
-	    }
+	  return VNET_API_ERROR_NO_SUCH_FIB;
 	}
     }