ip: Move the IP6 fib into ip6_[m]fib.c

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

diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c
index 3bc46fe..3f593c6 100644 (file)
--- a/src/vnet/ip/ip_api.c
+++ b/src/vnet/ip/ip_api.c
@@ -37,8 +37,6 @@
 #include <vnet/mfib/mfib_entry.h>
 #include <vnet/mfib/mfib_api.h>
 #include <vnet/ip/ip_source_and_port_range_check.h>
-#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/ip6_fib.h>
 #include <vnet/fib/fib_path_list.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
 #include <vnet/ip/ip6_link.h>
@@ -46,6 +44,7 @@
 #include <vnet/ip/reass/ip4_full_reass.h>
 #include <vnet/ip/reass/ip6_sv_reass.h>
 #include <vnet/ip/reass/ip6_full_reass.h>
+#include <vnet/ip/ip_table.h>
 
 #include <vnet/vnet_msg_enum.h>
 
@@ -82,6 +81,7 @@ _(IP_TABLE_REPLACE_BEGIN, ip_table_replace_begin)                       \
 _(IP_TABLE_REPLACE_END, ip_table_replace_end)                           \
 _(IP_TABLE_FLUSH, ip_table_flush)                                       \
 _(IP_ROUTE_ADD_DEL, ip_route_add_del)                                   \
+_(IP_ROUTE_LOOKUP, ip_route_lookup)                                     \
 _(IP_TABLE_ADD_DEL, ip_table_add_del)                                   \
 _(IP_PUNT_POLICE, ip_punt_police)                                       \
 _(IP_PUNT_REDIRECT, ip_punt_redirect)                                   \
@@ -328,7 +328,7 @@ send_ip_mroute_details (vpe_api_main_t * am,
   vl_api_ip_mroute_details_t *mp;
   const mfib_prefix_t *pfx;
   vl_api_mfib_path_t *fp;
-  int path_count;
+  u8 path_count;
 
   rpaths = NULL;
   pfx = mfib_entry_get_prefix (mfib_entry_index);
@@ -346,7 +346,7 @@ send_ip_mroute_details (vpe_api_main_t * am,
   mp->route.table_id =
     htonl (mfib_table_get_table_id
           (mfib_entry_get_fib_index (mfib_entry_index), pfx->fp_proto));
-  mp->route.n_paths = htonl (path_count);
+  mp->route.n_paths = path_count;
   fp = mp->route.paths;
   vec_foreach (rpath, rpaths)
   {
@@ -451,10 +451,37 @@ vl_api_ip_punt_redirect_t_handler (vl_api_ip_punt_redirect_t * mp,
   REPLY_MACRO (VL_API_IP_PUNT_REDIRECT_REPLY);
 }
 
+static clib_error_t *
+call_elf_section_ip_table_callbacks (vnet_main_t * vnm, u32 table_id,
+                                    u32 flags,
+                                    _vnet_ip_table_function_list_elt_t **
+                                    elts)
+{
+  _vnet_ip_table_function_list_elt_t *elt;
+  vnet_ip_table_function_priority_t prio;
+  clib_error_t *error = 0;
+
+  for (prio = VNET_IP_TABLE_FUNC_PRIORITY_LOW;
+       prio <= VNET_IP_TABLE_FUNC_PRIORITY_HIGH; prio++)
+    {
+      elt = elts[prio];
+
+      while (elt)
+       {
+         error = elt->fp (vnm, table_id, flags);
+         if (error)
+           return error;
+         elt = elt->next_ip_table_function;
+       }
+    }
+  return error;
+}
+
 void
 ip_table_delete (fib_protocol_t fproto, u32 table_id, u8 is_api)
 {
   u32 fib_index, mfib_index;
+  vnet_main_t *vnm = vnet_get_main ();
 
   /*
    * ignore action on the default table - this is always present
@@ -473,6 +500,10 @@ ip_table_delete (fib_protocol_t fproto, u32 table_id, u8 is_api)
       fib_index = fib_table_find (fproto, table_id);
       mfib_index = mfib_table_find (fproto, table_id);
 
+      if ((~0 != fib_index) || (~0 != mfib_index))
+       call_elf_section_ip_table_callbacks (vnm, table_id, 0 /* is_add */ ,
+                                            vnm->ip_table_add_del_functions);
+
       if (~0 != fib_index)
        {
          fib_table_unlock (fib_index, fproto,
@@ -573,11 +604,68 @@ vl_api_ip_route_add_del_t_handler (vl_api_ip_route_add_del_t * mp)
   /* *INDENT-ON* */
 }
 
+void
+vl_api_ip_route_lookup_t_handler (vl_api_ip_route_lookup_t * mp)
+{
+  vl_api_ip_route_lookup_reply_t *rmp = NULL;
+  fib_route_path_t *rpaths = NULL, *rpath;
+  const fib_prefix_t *pfx = NULL;
+  fib_prefix_t lookup;
+  vl_api_fib_path_t *fp;
+  fib_node_index_t fib_entry_index;
+  u32 fib_index;
+  int npaths = 0;
+  int rv;
+
+  ip_prefix_decode (&mp->prefix, &lookup);
+  rv = fib_api_table_id_decode (lookup.fp_proto, ntohl (mp->table_id),
+                               &fib_index);
+  if (PREDICT_TRUE (!rv))
+    {
+      if (mp->exact)
+       fib_entry_index = fib_table_lookup_exact_match (fib_index, &lookup);
+      else
+       fib_entry_index = fib_table_lookup (fib_index, &lookup);
+      if (fib_entry_index == FIB_NODE_INDEX_INVALID)
+       rv = VNET_API_ERROR_NO_SUCH_ENTRY;
+      else
+       {
+         pfx = fib_entry_get_prefix (fib_entry_index);
+         rpaths = fib_entry_encode (fib_entry_index);
+         npaths = vec_len (rpaths);
+       }
+    }
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO3_ZERO(VL_API_IP_ROUTE_LOOKUP_REPLY,
+                    npaths * sizeof (*fp),
+  ({
+    if (!rv)
+      {
+        ip_prefix_encode (pfx, &rmp->route.prefix);
+        rmp->route.table_id = mp->table_id;
+        rmp->route.n_paths = npaths;
+        rmp->route.stats_index = fib_table_entry_get_stats_index (fib_index, pfx);
+        rmp->route.stats_index = htonl (rmp->route.stats_index);
+
+        fp = rmp->route.paths;
+        vec_foreach (rpath, rpaths)
+          {
+            fib_api_path_encode (rpath, fp);
+            fp++;
+          }
+      }
+  }));
+  /* *INDENT-ON* */
+  vec_free (rpaths);
+}
+
 void
 ip_table_create (fib_protocol_t fproto,
                 u32 table_id, u8 is_api, const u8 * name)
 {
   u32 fib_index, mfib_index;
+  vnet_main_t *vnm = vnet_get_main ();
 
   /*
    * ignore action on the default table - this is always present
@@ -610,6 +698,10 @@ ip_table_create (fib_protocol_t fproto,
                                                      MFIB_SOURCE_API :
                                                      MFIB_SOURCE_CLI), name);
        }
+
+      if ((~0 == fib_index) || (~0 == mfib_index))
+       call_elf_section_ip_table_callbacks (vnm, table_id, 1 /* is_add */ ,
+                                            vnm->ip_table_add_del_functions);
     }
 }
 
@@ -1544,13 +1636,14 @@ static void
 vl_api_ip_punt_redirect_dump_t_handler (vl_api_ip_punt_redirect_dump_t * mp)
 {
   vl_api_registration_t *reg;
-  fib_protocol_t fproto;
+  fib_protocol_t fproto = FIB_PROTOCOL_IP4;
 
   reg = vl_api_client_index_to_registration (mp->client_index);
   if (!reg)
     return;
 
-  fproto = mp->is_ipv6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4;
+  if (mp->is_ipv6 == 1)
+    fproto = FIB_PROTOCOL_IP6;
 
   ip_punt_redirect_walk_ctx_t ctx = {
     .reg = reg,