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, 2 insertions, 24 deletions

diff --git a/sysdep/unix/krt-set.c b/sysdep/unix/krt-set.c
index e77015b3..dae01f46 100644
--- a/sysdep/unix/krt-set.c
+++ b/sysdep/unix/krt-set.c
@@ -84,7 +84,7 @@ krt_ioctl(int ioc, rte *e, char *name)
     log(L_ERR "%s(%I/%d): %m", name, net->n.prefix, net->n.pxlen);
 }
 
-void
+static void
 krt_remove_route(rte *old)
 {
   net *net = old->net;
@@ -98,7 +98,7 @@ krt_remove_route(rte *old)
   krt_ioctl(SIOCDELRT, old, "SIOCDELRT");
 }
 
-void
+static void
 krt_add_route(rte *new)
 {
   net *net = new->net;
@@ -126,7 +126,6 @@ krt_set_start(struct krt_proto *x)
 {
   if (if_scan_sock < 0)
     bug("krt set: missing socket");
-  x->p.rt_notify = krt_set_notify;
 }
 
 void
@@ -137,25 +136,4 @@ krt_set_preconfig(struct krt_config *c)
 void
 krt_set_shutdown(struct krt_proto *x)
 {
-  struct rtable *t = &master_table;
-
-  if (((struct krt_config *) x->p.cf)->setopt.persist)
-    return;
-  DBG("Flushing kernel routes...\n");
-  while (t && t->tos)
-    t = t->sibling;
-  if (!t)
-    return;
-  FIB_WALK(&t->fib, f)
-    {
-      net *n = (net *) f;
-      rte *e = n->routes;
-      if (e)
-	{
-	  rta *a = e->attrs;
-	  if (a->source != RTS_DEVICE && a->source != RTS_INHERIT)
-	    krt_remove_route(e);
-	}
-    }
-  FIB_WALK_END;
 }