Rewrote the kernel syncer. The old layering was horrible.

The new kernel syncer is cleanly split between generic UNIX module
and OS dependent submodules:

  -  krt.c (the generic part)
  -  krt-iface (low-level functions for interface handling)
  -  krt-scan (low-level functions for routing table scanning)
  -  krt-set (low-level functions for setting of kernel routes)

krt-set and krt-iface are common for all BSD-like Unices, krt-scan is heavily
system dependent (most Unices require /dev/kmem parsing, Linux uses /proc),
Netlink substitues all three modules.

We expect each UNIX port supports kernel routing table scanning, kernel
interface table scanning, kernel route manipulation and possibly also
asynchronous event notifications (new route, interface state change;
not implemented yet) and build the KRT protocol on the top of these
primitive operations.

1 files changed, 28 insertions, 15 deletions

diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index cebf3354..1c59799f 100644
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -1,7 +1,7 @@
 /*
- *	BIRD -- Unix Kernel Route Syncer
+ *	BIRD -- UNIX Kernel Route Syncer
  *
- *	(c) 1998 Martin Mares <mj@ucw.cz>
+ *	(c) 1998--1999 Martin Mares <mj@ucw.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -9,6 +9,9 @@
 #ifndef _BIRD_KRT_H_
 #define _BIRD_KRT_H_
 
+struct krt_config;
+struct krt_proto;
+
 #include "lib/krt-scan.h"
 #include "lib/krt-set.h"
 #include "lib/krt-iface.h"
@@ -21,32 +24,42 @@
 #define KRF_DELETE 3			/* Should be deleted */
 #define KRF_LEARN 4			/* We should learn this route */
 
-/* sync-rt.c */
+/* krt.c */
 
 extern struct protocol proto_unix_kernel;
 
 struct krt_config {
   struct proto_config c;
-  struct krt_set_params setopt;
-  struct krt_scan_params scanopt;
-  struct krt_if_params ifopt;
+  struct krt_set_params set;
+  struct krt_scan_params scan;
+  struct krt_if_params iface;
+  int persist;			/* Keep routes when we exit */
+  int scan_time;		/* How often we re-scan interfaces */
+  int route_scan_time;		/* How often we re-scan routes */
+  int learn;			/* Learn routes from other sources */
 };
 
 struct krt_proto {
   struct proto p;
-  struct krt_set_status setstat;
-  struct krt_scan_status scanstat;
-  struct krt_if_status ifstat;
+  struct krt_set_status set;
+  struct krt_scan_status scan;
+  struct krt_if_status iface;
+  int accum_time;	        /* Accumulated route scanning time */
 };
 
 extern struct proto_config *cf_krt;
 
+#define KRT_CF ((struct krt_config *)p->p.cf)
+
+void krt_got_route(struct krt_proto *p, struct rte *e);
+
 /* krt-scan.c */
 
 void krt_scan_preconfig(struct krt_config *);
 void krt_scan_start(struct krt_proto *);
 void krt_scan_shutdown(struct krt_proto *);
-void krt_scan_ifaces_done(struct krt_proto *);
+
+void krt_scan_fire(struct krt_proto *);
 
 /* krt-set.c */
 
@@ -54,15 +67,15 @@ void krt_set_preconfig(struct krt_config *);
 void krt_set_start(struct krt_proto *);
 void krt_set_shutdown(struct krt_proto *);
 
-/* sync-if.c */
-
-extern int if_scan_sock;
-extern int if_scan_period;
+int krt_capable(rte *e);
+void krt_set_notify(struct proto *x, net *net, rte *new, rte *old);
 
-void scan_if_init(void);
+/* krt-iface.c */
 
 void krt_if_preconfig(struct krt_config *);
 void krt_if_start(struct krt_proto *);
 void krt_if_shutdown(struct krt_proto *);
 
+void krt_if_scan(struct krt_proto *);
+
 #endif