KRF_* flags moved to krt.h as they are internal to kernel syncer,

fib->pad0,pad1 renamed to x0,x1 and in case of struct net x0 is reserved
for kernel syncing as well.

diff --git a/nest/route.h b/nest/route.h
index ad06275145fa5214f224ca0293331c34f66d13fa..cfad72fe968fdf875bacd97f412e138ceefc8816 100644 (file)
--- a/nest/route.h
+++ b/nest/route.h
@@ -30,7 +30,7 @@ struct fib_node {
   ip_addr prefix;                      /* In host order */
   byte pxlen;
   byte flags;                          /* User-defined */
-  byte pad0, pad1;                     /* ??? use ??? */
+  byte x0, x1;                         /* User-defined */
   struct fib_node *next;               /* Next in hash chain */
 };
 
@@ -76,13 +76,10 @@ typedef struct rtable {
 } rtable;
 
 typedef struct network {
-  struct fib_node n;                   /* FIB flags hold kernel sync info (KRF_...) */
+  struct fib_node n;                   /* FIB flags,x0 reserved for kernel syncer */
   struct rte *routes;                  /* Available routes for this network */
 } net;
 
-#define KRF_SEEN 1                     /* Seen in kernel table during last scan */
-#define KRF_UPDATE 2                   /* Need to update this entry */
-
 typedef struct rte {
   struct rte *next;
   net *net;                            /* Network this RTE belongs to */

diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index 2da29e5d96159714f152189eaf2d96ef0d2c1e89..24122e941756336ebeb51dd4b37bdc695b52531d 100644 (file)
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -12,6 +12,11 @@
 #include "lib/krt-scan.h"
 #include "lib/krt-set.h"
 
+/* Flags stored in net->n.flags */
+
+#define KRF_SEEN 1                     /* Seen in kernel table during last scan */
+#define KRF_UPDATE 2                   /* Need to update this entry */
+
 /* sync-rt.c */
 
 extern struct protocol proto_unix_kernel;