Channels - explicit links between protocols and tables

The patch adds support for channels, structures connecting protocols and
tables and handling most interactions between them. The documentation is
missing yet.

3 files changed, 41 insertions, 17 deletions

diff --git a/proto/radv/config.Y b/proto/radv/config.Y
index 5e655de4..7ba23205 100644
--- a/proto/radv/config.Y
+++ b/proto/radv/config.Y
@@ -41,6 +41,7 @@ CF_ADDTO(proto, radv_proto)
 radv_proto_start: proto_start RADV
 {
   this_proto = proto_config_new(&proto_radv, $1);
+
   init_list(&RADV_CFG->patt_list);
   init_list(&RADV_CFG->pref_list);
   init_list(&RADV_CFG->rdnss_list);
@@ -49,14 +50,12 @@ radv_proto_start: proto_start RADV
 
 radv_proto_item:
    proto_item
+ | proto_channel
  | INTERFACE radv_iface
  | PREFIX radv_prefix { add_tail(&RADV_CFG->pref_list, NODE this_radv_prefix); }
  | RDNSS { init_list(&radv_dns_list); } radv_rdnss { add_tail_list(&RADV_CFG->rdnss_list, &radv_dns_list); }
  | DNSSL { init_list(&radv_dns_list); } radv_dnssl { add_tail_list(&RADV_CFG->dnssl_list, &radv_dns_list); }
- | TRIGGER net_any {
-     RADV_CFG->trigger = $2;
-     RADV_CFG->trigger_valid = 1;
-   }
+ | TRIGGER net_ip6 { RADV_CFG->trigger = $2; }
  ;
 
 radv_proto_opts:
diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index 97713b95..f9c0940f 100644
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -256,9 +256,16 @@ radv_ifa_notify(struct proto *p, unsigned flags, struct ifa *a)
     radv_iface_notify(ifa, RA_EV_CHANGE);
 }
 
-static inline int radv_net_match_trigger(struct radv_config *cf, net *n)
+static inline int
+radv_trigger_valid(struct radv_config *cf)
 {
-  return cf->trigger_valid && net_equal(n->n.addr, cf->trigger);
+  return cf->trigger.type != 0;
+}
+
+static inline int
+radv_net_match_trigger(struct radv_config *cf, net *n)
+{
+  return radv_trigger_valid(cf) && net_equal(n->n.addr, &cf->trigger);
 }
 
 int
@@ -301,22 +308,35 @@ radv_check_active(struct proto_radv *ra)
 {
   struct radv_config *cf = (struct radv_config *) (ra->p.cf);
 
-  if (! cf->trigger_valid)
+  if (!radv_trigger_valid(cf))
     return 1;
 
-  return rt_examine(ra->p.table, cf->trigger, &ra->p, ra->p.cf->out_filter);
+  struct channel *c =ra->p.main_channel;
+  return rt_examine(c->table, &cf->trigger, &ra->p, c->out_filter);
+}
+
+static void
+radv_postconfig(struct proto_config *CF)
+{
+  // struct radv_config *cf = (void *) CF;
+
+  /* Define default channel */
+  if (EMPTY_LIST(CF->channels))
+    channel_config_new(NULL, NET_IP6, CF);
 }
 
 static struct proto *
-radv_init(struct proto_config *c)
+radv_init(struct proto_config *CF)
 {
-  struct proto *p = proto_new(c, sizeof(struct proto_radv));
+  struct proto *p = proto_new(CF);
+
+  p->main_channel = proto_add_channel(p, proto_cf_main_channel(CF));
 
-  p->accept_ra_types = RA_OPTIMAL;
   p->import_control = radv_import_control;
   p->rt_notify = radv_rt_notify;
   p->if_notify = radv_if_notify;
   p->ifa_notify = radv_ifa_notify;
+
   return p;
 }
 
@@ -327,7 +347,7 @@ radv_start(struct proto *p)
   struct radv_config *cf = (struct radv_config *) (p->cf);
 
   init_list(&(ra->iface_list));
-  ra->active = !cf->trigger_valid;
+  ra->active = !radv_trigger_valid(cf);
 
   return PS_UP;
 }
@@ -352,11 +372,11 @@ radv_shutdown(struct proto *p)
 }
 
 static int
-radv_reconfigure(struct proto *p, struct proto_config *c)
+radv_reconfigure(struct proto *p, struct proto_config *CF)
 {
   struct proto_radv *ra = (struct proto_radv *) p;
   // struct radv_config *old = (struct radv_config *) (p->cf);
-  struct radv_config *new = (struct radv_config *) c;
+  struct radv_config *new = (struct radv_config *) CF;
 
   /*
    * The question is why there is a reconfigure function for RAdv if
@@ -366,7 +386,10 @@ radv_reconfigure(struct proto *p, struct proto_config *c)
    * causing nodes to temporary remove their default routes.
    */
 
-  p->cf = c; /* radv_check_active() requires proper p->cf */
+  if (!proto_configure_channel(p, &p->main_channel, proto_cf_main_channel(CF)))
+    return 0;
+
+  p->cf = CF; /* radv_check_active() requires proper p->cf */
   ra->active = radv_check_active(ra);
 
   struct iface *iface;
@@ -423,7 +446,10 @@ radv_get_status(struct proto *p, byte *buf)
 struct protocol proto_radv = {
   .name =		"RAdv",
   .template =		"radv%d",
+  .channel_mask =	NB_IP6,
+  .proto_size =		sizeof(struct proto_radv),
   .config_size =	sizeof(struct radv_config),
+  .postconfig =		radv_postconfig,
   .init =		radv_init,
   .start =		radv_start,
   .shutdown =		radv_shutdown,
diff --git a/proto/radv/radv.h b/proto/radv/radv.h
index 755009d4..f8aa421d 100644
--- a/proto/radv/radv.h
+++ b/proto/radv/radv.h
@@ -50,8 +50,7 @@ struct radv_config
   list rdnss_list;		/* Global list of RDNSS configs (struct radv_rdnss_config) */
   list dnssl_list;		/* Global list of DNSSL configs (struct radv_dnssl_config) */
 
-  net_addr *trigger;		/* Prefix of a trigger route, if defined */
-  u8 trigger_valid;		/* Whether a trigger route is defined */
+  net_addr trigger;		/* Prefix of a trigger route, if defined */
 };
 
 struct radv_iface_config