More rip fixes (config data moved to struct rip_proto_config), still

not tested.

1 files changed, 9 insertions, 8 deletions

diff --git a/proto/rip/rip.h b/proto/rip/rip.h
index 4839016..e79c95d 100644
--- a/proto/rip/rip.h
+++ b/proto/rip/rip.h
@@ -82,6 +82,15 @@ struct rip_patt {
   int mode;
 };
 
+struct rip_proto_config {
+  list iface_list;	/* Patterns configured */
+
+  int infinity;		/* User configurable data */
+  int port;
+  int period;
+  int garbage_time;
+};
+
 struct rip_proto {
   struct proto inherited;
   timer *timer;
@@ -89,17 +98,9 @@ struct rip_proto {
   struct fib rtable;
   list garbage;
   list interfaces;	/* Interfaces we really know about */
-  list iface_list;	/* Patterns configured */
   int magic;
-
-  int infinity;		/* User configurable data */
-  int port;
-  int period;
-  int garbage_time;
 };
 
-#define P ((struct rip_proto *) p)
-#define E ((struct rip_entry *) e)
 
 #define RIP_MAGIC 81861253
 #define CHK_MAGIC do { if (P->magic != RIP_MAGIC) bug( "Not enough magic\n" ); } while (0)