Fixed a very nasty bug in FIB iterators.

diff --git a/TODO b/TODO
index 6950365d0371cccef92e8d1cde5c53cb9791a1f8..ec886fabedc9277d693074ed205661f16c8988e6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,8 +4,6 @@ Core
 - client: paging?
 - client: data losses on large dumps?
 
-- table: ocassional core dumps in rt_prune()
-
 Documentation
 ~~~~~~~~~~~~~
 - write doctool

diff --git a/nest/route.h b/nest/route.h
index 183e80b5e4b297479b31ee267bf2e3561d82778b..640cd490d9e803e2f37e8100b2f50633d870ade0 100644 (file)
--- a/nest/route.h
+++ b/nest/route.h
@@ -42,9 +42,9 @@ struct fib_node {
 
 struct fib_iterator {                  /* See lib/slists.h for an explanation */
   struct fib_iterator *prev, *next;    /* Must be synced with struct fib_node! */
-  struct fib_node *node;               /* Or NULL if freshly merged */
   byte efef;                           /* 0xff to distinguish between iterator and node */
   byte pad[3];
+  struct fib_node *node;               /* Or NULL if freshly merged */
   unsigned int hash;
 };