fib: Fix some more realloc errors

[vpp.git] / src / vnet / fib / fib_entry_src_interface.c

diff --git a/src/vnet/fib/fib_entry_src_interface.c b/src/vnet/fib/fib_entry_src_interface.c
index bb87818..e172577 100644 (file)
--- a/src/vnet/fib/fib_entry_src_interface.c
+++ b/src/vnet/fib/fib_entry_src_interface.c
@@ -27,15 +27,15 @@
 static void
 fib_entry_src_interface_init (fib_entry_src_t *src)
 {
-    src->interface.fesi_cover = FIB_NODE_INDEX_INVALID;
-    src->interface.fesi_sibling = FIB_NODE_INDEX_INVALID;
+    src->u.interface.fesi_cover = FIB_NODE_INDEX_INVALID;
+    src->u.interface.fesi_sibling = FIB_NODE_INDEX_INVALID;
 }
 
 static void
 fib_entry_src_interface_add (fib_entry_src_t *src,
                              const fib_entry_t *entry,
                              fib_entry_flag_t flags,
-                             fib_protocol_t proto,
+                             dpo_proto_t proto,
                              const dpo_id_t *dpo)
 {
     src->fes_pl = fib_path_list_create_special(
@@ -56,27 +56,35 @@ fib_entry_src_interface_path_swap (fib_entry_src_t *src,
                                   fib_path_list_flags_t pl_flags,
                                   const fib_route_path_t *paths)
 {
+    fib_node_index_t fib_entry_index;
     ip_adjacency_t *adj;
 
+    fib_entry_index = fib_entry_get_index(entry);
     src->fes_pl = fib_path_list_create(pl_flags, paths);
 
     /*
-     * this is a hack to get the entry's prefix into the glean adjacnecy
-     * so that it is available for fast retreival in the switch path.
+     * this is a hack to get the entry's prefix into the glean adjacency
+     * so that it is available for fast retrieval in the switch path.
      */
     if (!(FIB_ENTRY_FLAG_LOCAL & src->fes_entry_flags))
     {
-        adj = adj_get(fib_path_list_get_adj(
-                         src->fes_pl,
-                         fib_entry_get_default_chain_type(entry)));
+        adj_index_t ai;
 
-       if (IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index)
+        ai = fib_path_list_get_adj(src->fes_pl,
+                                   fib_entry_get_default_chain_type(
+                                       fib_entry_get(fib_entry_index)));
+        if (INDEX_INVALID != ai)
         {
-            /*
-             * the connected prefix will link to a glean on a non-p2p
-             * interface.
-             */
-            adj->sub_type.glean.receive_addr = entry->fe_prefix.fp_addr;
+            adj = adj_get(ai);
+
+            if (IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index)
+            {
+                /*
+                 * the connected prefix will link to a glean on a non-p2p
+                 * u.interface.
+                 */
+                adj->sub_type.glean.receive_addr = entry->fe_prefix.fp_addr;
+            }
         }
     }
 }
@@ -98,15 +106,15 @@ fib_entry_src_interface_activate (fib_entry_src_t *src,
         * during an attached export of the cover, this local prefix is
         * also exported
         */
-       src->interface.fesi_cover =
+       src->u.interface.fesi_cover =
            fib_table_get_less_specific(fib_entry->fe_fib_index,
                                        &fib_entry->fe_prefix);
 
-       ASSERT(FIB_NODE_INDEX_INVALID != src->interface.fesi_cover);
+       ASSERT(FIB_NODE_INDEX_INVALID != src->u.interface.fesi_cover);
 
-       cover = fib_entry_get(src->interface.fesi_cover);
+       cover = fib_entry_get(src->u.interface.fesi_cover);
 
-       src->interface.fesi_sibling =
+       src->u.interface.fesi_sibling =
            fib_entry_cover_track(cover, fib_entry_get_index(fib_entry));
     }
 
@@ -125,15 +133,15 @@ fib_entry_src_interface_deactivate (fib_entry_src_t *src,
     fib_entry_t *cover;
 
     /*
-     * remove the depednecy on the covering entry
+     * remove the dependency on the covering entry
      */
-    if (FIB_NODE_INDEX_INVALID != src->interface.fesi_cover)
+    if (FIB_NODE_INDEX_INVALID != src->u.interface.fesi_cover)
     {
-       cover = fib_entry_get(src->interface.fesi_cover);
+       cover = fib_entry_get(src->u.interface.fesi_cover);
 
-       fib_entry_cover_untrack(cover, src->interface.fesi_sibling);
+       fib_entry_cover_untrack(cover, src->u.interface.fesi_sibling);
 
-       src->interface.fesi_cover = FIB_NODE_INDEX_INVALID;
+       src->u.interface.fesi_cover = FIB_NODE_INDEX_INVALID;
     }
 }
 
@@ -146,7 +154,7 @@ fib_entry_src_interface_cover_change (fib_entry_src_t *src,
        .bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
     };
 
-    if (FIB_NODE_INDEX_INVALID == src->interface.fesi_cover)
+    if (FIB_NODE_INDEX_INVALID == src->u.interface.fesi_cover)
     {
        /*
         * not tracking the cover. surprised we got poked?
@@ -159,8 +167,9 @@ fib_entry_src_interface_cover_change (fib_entry_src_t *src,
      * entry inserted benaeth it. That does not necessarily mean that this
      * entry is covered by the new prefix. check that
      */
-    if (src->rr.fesr_cover != fib_table_get_less_specific(fib_entry->fe_fib_index,
-                                                         &fib_entry->fe_prefix))
+    if (src->u.interface.fesi_cover !=
+        fib_table_get_less_specific(fib_entry->fe_fib_index,
+                                    &fib_entry->fe_prefix))
     {
        fib_entry_src_interface_deactivate(src, fib_entry);
        fib_entry_src_interface_activate(src, fib_entry);
@@ -177,9 +186,9 @@ fib_entry_src_interface_installed (fib_entry_src_t *src,
      */
     fib_entry_t *cover;
 
-    if (FIB_NODE_INDEX_INVALID != src->interface.fesi_cover)
+    if (FIB_NODE_INDEX_INVALID != src->u.interface.fesi_cover)
     {
-       cover = fib_entry_get(src->interface.fesi_cover);
+       cover = fib_entry_get(src->u.interface.fesi_cover);
 
        fib_attached_export_covered_added(cover,
                                          fib_entry_get_index(fib_entry));
@@ -190,7 +199,7 @@ static u8*
 fib_entry_src_interface_format (fib_entry_src_t *src,
                                u8* s)
 {
-    return (format(s, "cover:%d", src->interface.fesi_cover));
+    return (format(s, " cover:%d", src->u.interface.fesi_cover));
 }
 
 const static fib_entry_src_vft_t interface_src_vft = {
@@ -212,5 +221,6 @@ const static fib_entry_src_vft_t interface_src_vft = {
 void
 fib_entry_src_interface_register (void)
 {
-    fib_entry_src_register(FIB_SOURCE_INTERFACE, &interface_src_vft);    
+    fib_entry_src_behaviour_register(FIB_SOURCE_BH_INTERFACE,
+                                     &interface_src_vft);
 }