ipsec: make chacha20-poly1305 available via API

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

diff --git a/src/vnet/fib/fib_entry_cover.c b/src/vnet/fib/fib_entry_cover.c
index ad12b94..47bc5c3 100644 (file)
--- a/src/vnet/fib/fib_entry_cover.c
+++ b/src/vnet/fib/fib_entry_cover.c
@@ -16,6 +16,7 @@
 #include <vnet/fib/fib_entry_cover.h>
 #include <vnet/fib/fib_entry_src.h>
 #include <vnet/fib/fib_node_list.h>
+#include <vnet/fib/fib_entry_delegate.h>
 
 u32
 fib_entry_cover_track (fib_entry_t* cover,
@@ -27,7 +28,7 @@ fib_entry_cover_track (fib_entry_t* cover,
 
     ASSERT(fib_entry_get_index(cover) != covered);
 
-    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
+    fed = fib_entry_delegate_find(cover, FIB_ENTRY_DELEGATE_COVERED);
 
     if (NULL == fed)
     {
@@ -48,7 +49,7 @@ fib_entry_cover_untrack (fib_entry_t* cover,
 
     FIB_ENTRY_DBG(cover, "cover-untrack @ %d", tracked_index);
 
-    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
+    fed = fib_entry_delegate_find(cover, FIB_ENTRY_DELEGATE_COVERED);
 
     if (NULL == fed)
         return;
@@ -63,7 +64,7 @@ fib_entry_cover_untrack (fib_entry_t* cover,
 }
 
 /**
- * Internal struct to hold user supplied paraneters for the cover walk
+ * Internal struct to hold user supplied parameters for the cover walk
  */
 typedef struct fib_enty_cover_walk_ctx_t_ {
     fib_entry_t *cover;
@@ -71,7 +72,7 @@ typedef struct fib_enty_cover_walk_ctx_t_ {
     void *ctx;
 } fib_enty_cover_walk_ctx_t;
 
-static int
+static walk_rc_t
 fib_entry_cover_walk_node_ptr (fib_node_ptr_t *depend,
                               void *args)
 {
@@ -79,8 +80,7 @@ fib_entry_cover_walk_node_ptr (fib_node_ptr_t *depend,
 
     ctx->walk(ctx->cover, depend->fnp_index, ctx->ctx);
 
-    /* continue */
-    return (1);
+    return (WALK_CONTINUE);
 }
 
 void
@@ -90,7 +90,7 @@ fib_entry_cover_walk (fib_entry_t *cover,
 {
     fib_entry_delegate_t *fed;
 
-    fed = fib_entry_delegate_get(cover, FIB_ENTRY_DELEGATE_COVERED);
+    fed = fib_entry_delegate_find(cover, FIB_ENTRY_DELEGATE_COVERED);
 
     if (NULL == fed)
         return;
@@ -106,7 +106,7 @@ fib_entry_cover_walk (fib_entry_t *cover,
                        &ctx);
 }
 
-static int
+static walk_rc_t
 fib_entry_cover_change_one (fib_entry_t *cover,
                            fib_node_index_t covered,
                            void *args)
@@ -143,8 +143,7 @@ fib_entry_cover_change_one (fib_entry_t *cover,
            fib_entry_cover_changed(covered);
        }
     }
-    /* continue */
-    return (1);
+    return (WALK_CONTINUE);
 }
 
 void
@@ -160,15 +159,14 @@ fib_entry_cover_change_notify (fib_node_index_t cover_index,
                         uword_to_pointer(covered, void*));
 }
 
-static int
+static walk_rc_t
 fib_entry_cover_update_one (fib_entry_t *cover,
                            fib_node_index_t covered,
                            void *args)
 {
     fib_entry_cover_updated(covered);
 
-    /* continue */
-    return (1);
+    return (WALK_CONTINUE);
 }
 
 void