aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Smith <mgsmith@netgate.com>2020-07-02 17:24:17 -0500
committerNeale Ranns <nranns@cisco.com>2020-07-06 08:35:59 +0000
commitee167e524c6244b400045907c322862bb4f42c6c (patch)
tree7af61a07e64ef66ad69a697d89fee00c6fcfedc2
parentfbb846cfa1f95d57159f9ad6cc429f6d9d0b8696 (diff)
fib: fix debug preprocessor directives
Type: fix Some debugging declarations were wrapped in an 'ifdef CLIB_DEBUG'. This seems to always evaluate true because clib.h defines CLIB_DEBUG to 0 if its not defined. The result is that if a route table is added and a route is added to it and then the table is deleted, VPP exits because the debug function fib_table_assert_empty() gets called whether VPP was started using a debug build or a release build. Change the ifdef to 'if CLIB_DEBUG > 0'. Change-Id: I357dc2c299e81b95244f2f7efaadb8e0de27627a Signed-off-by: Matthew Smith <mgsmith@netgate.com>
-rw-r--r--src/vnet/fib/fib_entry.c2
-rw-r--r--src/vnet/fib/fib_table.h2
-rw-r--r--src/vnet/fib/ip4_fib.c2
-rw-r--r--src/vnet/fib/ip6_fib.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/vnet/fib/fib_entry.c b/src/vnet/fib/fib_entry.c
index 3bef28e..a8dec1a 100644
--- a/src/vnet/fib/fib_entry.c
+++ b/src/vnet/fib/fib_entry.c
@@ -1713,7 +1713,7 @@ fib_entry_pool_size (void)
return (pool_elts(fib_entry_pool));
}
-#ifdef CLIB_DEBUG
+#if CLIB_DEBUG > 0
void
fib_table_assert_empty (const fib_table_t *fib_table)
{
diff --git a/src/vnet/fib/fib_table.h b/src/vnet/fib/fib_table.h
index 7f18188..2011707 100644
--- a/src/vnet/fib/fib_table.h
+++ b/src/vnet/fib/fib_table.h
@@ -960,7 +960,7 @@ extern u8 *format_fib_table_memory(u8 *s, va_list *args);
/**
* Debug function
*/
-#ifdef CLIB_DEBUG
+#if CLIB_DEBUG > 0
extern void fib_table_assert_empty(const fib_table_t *fib_table);
#endif
diff --git a/src/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c
index 29d121c..5b12aa6 100644
--- a/src/vnet/fib/ip4_fib.c
+++ b/src/vnet/fib/ip4_fib.c
@@ -182,7 +182,7 @@ ip4_fib_table_destroy (u32 fib_index)
/*
* validate no more routes.
*/
-#ifdef CLIB_DEBUG
+#if CLIB_DEBUG > 0
if (0 != fib_table->ft_total_route_counts)
fib_table_assert_empty(fib_table);
#endif
diff --git a/src/vnet/fib/ip6_fib.c b/src/vnet/fib/ip6_fib.c
index 784f52c..5664173 100644
--- a/src/vnet/fib/ip6_fib.c
+++ b/src/vnet/fib/ip6_fib.c
@@ -154,7 +154,7 @@ ip6_fib_table_destroy (u32 fib_index)
/*
* validate no more routes.
*/
-#ifdef CLIB_DEBUG
+#if CLIB_DEBUG > 0
if (0 != fib_table->ft_total_route_counts)
fib_table_assert_empty(fib_table);
#endif