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 b976eae..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>
 
@@ -329,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);
@@ -347,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)
   {
@@ -452,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
@@ -474,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,
@@ -635,6 +665,7 @@ 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
@@ -667,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);
     }
 }