API: Add support for type aliases

[vpp.git] / src / vnet / mfib / mfib_entry.c

diff --git a/src/vnet/mfib/mfib_entry.c b/src/vnet/mfib/mfib_entry.c
index a88f375..90b223e 100644 (file)
--- a/src/vnet/mfib/mfib_entry.c
+++ b/src/vnet/mfib/mfib_entry.c
@@ -21,32 +21,23 @@
 #include <vnet/dpo/drop_dpo.h>
 #include <vnet/dpo/replicate_dpo.h>
 
+/**
+ * the logger
+ */
+vlib_log_class_t mfib_entry_logger;
+
 /**
  * Debug macro
  */
-#ifdef MFIB_DEBUG
-#DEFIne MFIB_ENTRY_DBG(_e, _fmt, _args...)             \
+#define MFIB_ENTRY_DBG(_e, _fmt, _args...)             \
 {                                                       \
-    u8*__tmp = NULL;                                   \
-    __tmp = format(__tmp, "e:[%d:%U",                   \
+    vlib_log_debug(mfib_entry_logger,                   \
+                   "e:[%d:%U]: " _fmt,                  \
                    mfib_entry_get_index(_e),           \
-                   format_ip46_address,                        \
-                   &_e->mfe_prefix.fp_grp_addr,                \
-                   IP46_TYPE_ANY);                     \
-    __tmp = format(__tmp, "/%d,",                      \
-                   _e->mfe_prefix.fp_len);             \
-    __tmp = format(__tmp, "%U]",                        \
-                   mfib_entry_get_index(_e),           \
-                   format_ip46_address,                        \
-                   &_e->mfe_prefix.fp_src_addr,                \
-                   IP46_TYPE_ANY);                     \
-    __tmp = format(__tmp, _fmt, ##_args);              \
-    clib_warning("%s", __tmp);                         \
-    vec_free(__tmp);                                   \
+                   format_mfib_prefix,                 \
+                   &_e->mfe_prefix,                     \
+                   ##_args);                            \
 }
-#else
-#define MFIB_ENTRY_DBG(_e, _fmt, _args...)
-#endif
 
 /**
  * MFIB extensions to each path
@@ -412,7 +403,7 @@ mfib_entry_alloc (u32 fib_index,
 
     /*
      * Some of the members require non-default initialisation
-     * so we also init those that don't and thus save on the call to memset.
+     * so we also init those that don't and thus save on the call to clib_memset.
      */
     mfib_entry->mfe_flags = 0;
     mfib_entry->mfe_fib_index = fib_index;
@@ -1106,6 +1097,16 @@ mfib_entry_last_lock_gone (fib_node_t *node)
     pool_put(mfib_entry_pool, mfib_entry);
 }
 
+u32
+mfib_entry_get_stats_index (fib_node_index_t fib_entry_index)
+{
+    mfib_entry_t *mfib_entry;
+
+    mfib_entry = mfib_entry_get(fib_entry_index);
+
+    return (mfib_entry->mfe_rep.dpoi_index);
+}
+
 /*
  * mfib_entry_back_walk_notify
  *
@@ -1197,6 +1198,7 @@ mfib_entry_module_init (void)
 {
     fib_node_register_type (FIB_NODE_TYPE_MFIB_ENTRY, &mfib_entry_vft);
     dpo_register(DPO_MFIB_ENTRY, &mfib_entry_dpo_vft, mfib_entry_nodes);
+    mfib_entry_logger = vlib_log_register_class("mfib", "entry");
 }
 
 void