4 files changed, 55 insertions, 42 deletions

diff --git a/sysdep/linux/netlink/krt-iface.h b/sysdep/linux/netlink/krt-iface.h
index 770c6e2e..8cfe1073 100644
--- a/sysdep/linux/netlink/krt-iface.h
+++ b/sysdep/linux/netlink/krt-iface.h
@@ -13,17 +13,21 @@
  *  We don't have split iface/scan/set parts. See krt-scan.h.
  */
 
-struct krt_if_params {
+struct kif_params {
 };
 
-struct krt_if_status {
+struct kif_status {
 };
 
-static inline void krt_if_construct(struct kif_config *c UNUSED) { };
-static inline void krt_if_shutdown(struct kif_proto *p UNUSED) { };
-static inline void krt_if_io_init(void) { };
 
-static inline int kif_params_same(struct krt_if_params *old UNUSED, struct krt_if_params *new UNUSED) { return 1; }
-static inline void kif_copy_params(struct krt_if_params *dest UNUSED, struct krt_if_params *src UNUSED) { }
+static inline void kif_sys_init(struct kif_proto *p UNUSED) { }
+static inline int kif_sys_reconfigure(struct kif_proto *p UNUSED, struct kif_config *n UNUSED, struct kif_config *o UNUSED) { return 1; }
+
+static inline void kif_sys_preconfig(struct config *c UNUSED) { }
+static inline void kif_sys_postconfig(struct kif_config *c UNUSED) { }
+static inline void kif_sys_init_config(struct kif_config *c UNUSED) { }
+static inline void kif_sys_copy_config(struct kif_config *d UNUSED, struct kif_config *s UNUSED) { }
+
+static inline void kif_sys_io_init(void) { }
 
 #endif
diff --git a/sysdep/linux/netlink/krt-scan.h b/sysdep/linux/netlink/krt-scan.h
index 9b5e075b..302b6093 100644
--- a/sysdep/linux/netlink/krt-scan.h
+++ b/sysdep/linux/netlink/krt-scan.h
@@ -17,20 +17,14 @@
 
 #define NL_NUM_TABLES 256
 
-struct krt_scan_params {
+struct krt_params {
   int table_id;				/* Kernel table ID we sync with */
 };
 
-struct krt_scan_status {
-  list temp_ifs;			/* Temporary interfaces */
+struct krt_status {
 };
 
-static inline int krt_scan_params_same(struct krt_scan_params *o, struct krt_scan_params *n)
-{
-  return o->table_id == n->table_id;
-}
 
-static inline void krt_scan_copy_params(struct krt_scan_params *d UNUSED, struct krt_scan_params *s UNUSED) { }
-/* table_id copied in krt_copy_config() */
+static inline void krt_sys_init(struct krt_proto *p UNUSED) { }
 
 #endif
diff --git a/sysdep/linux/netlink/netlink.Y b/sysdep/linux/netlink/netlink.Y
index b00b0eee..51689ff9 100644
--- a/sysdep/linux/netlink/netlink.Y
+++ b/sysdep/linux/netlink/netlink.Y
@@ -20,7 +20,7 @@ nl_item:
    KERNEL TABLE expr {
 	if ($3 <= 0 || $3 >= NL_NUM_TABLES)
 	  cf_error("Kernel routing table number out of range");
-	THIS_KRT->scan.table_id = $3;
+	THIS_KRT->sys.table_id = $3;
    }
  ;
 
diff --git a/sysdep/linux/netlink/netlink.c b/sysdep/linux/netlink/netlink.c
index 182088a1..e3faf043 100644
--- a/sysdep/linux/netlink/netlink.c
+++ b/sysdep/linux/netlink/netlink.c
@@ -548,7 +548,7 @@ nl_parse_addr(struct nlmsghdr *h)
 }
 
 void
-krt_if_scan(struct kif_proto *p UNUSED)
+kif_do_scan(struct kif_proto *p UNUSED)
 {
   struct nlmsghdr *h;
 
@@ -634,7 +634,7 @@ nl_send_route(struct krt_proto *p, rte *e, struct ea_list *eattrs, int new)
   r.r.rtm_family = BIRD_AF;
   r.r.rtm_dst_len = net->n.pxlen;
   r.r.rtm_tos = 0;
-  r.r.rtm_table = KRT_CF->scan.table_id;
+  r.r.rtm_table = KRT_CF->sys.table_id;
   r.r.rtm_protocol = RTPROT_BIRD;
   r.r.rtm_scope = RT_SCOPE_UNIVERSE;
   nl_add_attr_ipa(&r.h, sizeof(r), RTA_DST, net->n.prefix);
@@ -687,7 +687,7 @@ nl_send_route(struct krt_proto *p, rte *e, struct ea_list *eattrs, int new)
 }
 
 void
-krt_set_notify(struct krt_proto *p, net *n, rte *new, rte *old, struct ea_list *eattrs)
+krt_do_notify(struct krt_proto *p, net *n, rte *new, rte *old, struct ea_list *eattrs)
 {
   int err = 0;
 
@@ -940,7 +940,7 @@ nl_parse_route(struct nlmsghdr *h, int scan)
 }
 
 void
-krt_scan_fire(struct krt_proto *p UNUSED)	/* CONFIG_ALL_TABLES_AT_ONCE => p is NULL */
+krt_do_scan(struct krt_proto *p UNUSED)	/* CONFIG_ALL_TABLES_AT_ONCE => p is NULL */
 {
   struct nlmsghdr *h;
 
@@ -1084,15 +1084,38 @@ nl_open_async(void)
 static u8 nl_cf_table[(NL_NUM_TABLES+7) / 8];
 
 void
-krt_scan_preconfig(struct config *c UNUSED)
+krt_sys_start(struct krt_proto *p, int first)
+{
+  nl_table_map[KRT_CF->sys.table_id] = p;
+  if (first)
+    {
+      nl_open();
+      nl_open_async();
+    }
+}
+
+void
+krt_sys_shutdown(struct krt_proto *p UNUSED, int last UNUSED)
+{
+}
+
+int
+krt_sys_reconfigure(struct krt_proto *p UNUSED, struct krt_config *n, struct krt_config *o)
+{
+  return n->sys.table_id == o->sys.table_id;
+}
+
+
+void
+krt_sys_preconfig(struct config *c UNUSED)
 {
   bzero(&nl_cf_table, sizeof(nl_cf_table));
 }
 
 void
-krt_scan_postconfig(struct krt_config *x)
+krt_sys_postconfig(struct krt_config *x)
 {
-  int id = x->scan.table_id;
+  int id = x->sys.table_id;
 
   if (nl_cf_table[id/8] & (1 << (id%8)))
     cf_error("Multiple kernel syncers defined for table #%d", id);
@@ -1100,35 +1123,27 @@ krt_scan_postconfig(struct krt_config *x)
 }
 
 void
-krt_scan_construct(struct krt_config *x)
+krt_sys_init_config(struct krt_config *cf)
 {
-#ifndef IPV6
-  x->scan.table_id = RT_TABLE_MAIN;
-#else
-  x->scan.table_id = 254;
-#endif
+  cf->sys.table_id = RT_TABLE_MAIN;
 }
 
 void
-krt_scan_start(struct krt_proto *p, int first)
+krt_sys_copy_config(struct krt_config *d, struct krt_config *s)
 {
-  init_list(&p->scan.temp_ifs);
-  nl_table_map[KRT_CF->scan.table_id] = p;
-  if (first)
-    {
-      nl_open();
-      nl_open_async();
-    }
+  d->sys.table_id = s->sys.table_id;
 }
 
+
+
 void
-krt_scan_shutdown(struct krt_proto *p UNUSED, int last UNUSED)
+kif_sys_start(struct kif_proto *p UNUSED)
 {
+  nl_open();
+  nl_open_async();
 }
 
 void
-krt_if_start(struct kif_proto *p UNUSED)
+kif_sys_shutdown(struct kif_proto *p UNUSED)
 {
-  nl_open();
-  nl_open_async();
 }