Except for special protocols (nowadays only the kernel syncer), don't

export host and link scope routes.

diff --git a/nest/proto.c b/nest/proto.c
index ab7de0f6fbfac33759045fadae26b78df8aec788..a58c3f71d60422bad966cb64cc985592d6f5dc88 100644 (file)
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -91,6 +91,7 @@ proto_new(struct proto_config *c, unsigned size)
   p->table = c->table->table;
   p->in_filter = c->in_filter;
   p->out_filter = c->out_filter;
+  p->min_scope = SCOPE_SITE;
   c->proto = p;
   return p;
 }

diff --git a/nest/protocol.h b/nest/protocol.h
index 3e53c86cea42f11ce5df509f82e3f020d8afc37d..39d1cf5d01cac5d09c6f9eb38abebd765cc9f644 100644 (file)
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -98,6 +98,7 @@ struct proto {
   char *name;                          /* Name of this instance (== cf->name) */
   unsigned debug;                      /* Debugging flags */
   unsigned preference;                 /* Default route preference */
+  int min_scope;                       /* Minimal route scope accepted */
   unsigned disabled;                   /* Manually disabled */
   unsigned proto_state;                        /* Protocol state machine (see below) */
   unsigned core_state;                 /* Core state machine (see below) */

diff --git a/nest/rt-table.c b/nest/rt-table.c
index edbf154d5fcc541f02c31f3dbda28558e5b4b213..dc13ea768e0261aaed09fb7f7a1526bf311394ff 100644 (file)
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -102,7 +102,7 @@ rte_better(rte *new, rte *old)
 }
 
 static inline void
-do_rte_announce(struct announce_hook *a, net *net, rte *new, rte *old, ea_list *tmpa)
+do_rte_announce(struct announce_hook *a, net *net, rte *new, rte *old, ea_list *tmpa, int class)
 {
   struct proto *p = a->proto;
   rte *new0 = new;
@@ -110,8 +110,9 @@ do_rte_announce(struct announce_hook *a, net *net, rte *new, rte *old, ea_list *
 
   if (new)
     {
-      int ok = p->import_control ? p->import_control(p, &new, &tmpa, rte_update_pool) : 0;
-      if (ok < 0 ||
+      int ok;
+      if ((class & IADDR_SCOPE_MASK) < p->min_scope ||
+         (ok = p->import_control ? p->import_control(p, &new, &tmpa, rte_update_pool) : 0) < 0 ||
          (!ok && (p->out_filter == FILTER_REJECT ||
                   p->out_filter && f_run(p->out_filter, &new, &tmpa, rte_update_pool) > F_MODIFY)
          )
@@ -142,11 +143,12 @@ static void
 rte_announce(rtable *tab, net *net, rte *new, rte *old, ea_list *tmpa)
 {
   struct announce_hook *a;
+  int class = ipa_classify(net->n.prefix);
 
   WALK_LIST(a, tab->hooks)
     {
       ASSERT(a->proto->core_state == FS_HAPPY || a->proto->core_state == FS_FEEDING);
-      do_rte_announce(a, net, new, old, tmpa);
+      do_rte_announce(a, net, new, old, tmpa, class);
     }
 }
 
@@ -169,7 +171,7 @@ rt_feed_baby(struct proto *p)
            {
              struct proto *q = e->attrs->proto;
              ea_list *tmpa = q->make_tmp_attrs ? q->make_tmp_attrs(e, rte_update_pool) : NULL;
-             do_rte_announce(h, n, e, NULL, tmpa);
+             do_rte_announce(h, n, e, NULL, tmpa, ipa_classify(n->n.prefix));
              lp_flush(rte_update_pool);
            }
        }
@@ -195,15 +197,12 @@ rte_validate(rte *e)
              n->n.prefix, n->n.pxlen, e->attrs->from, e->attrs->proto->name);
          return 0;
        }
-      if ((c & IADDR_SCOPE_MASK) == SCOPE_HOST)
+      if ((c & IADDR_SCOPE_MASK) < e->attrs->proto->min_scope)
        {
-         int s = e->attrs->source;
-         if (s != RTS_STATIC && s != RTS_DEVICE && s != RTS_STATIC_DEVICE)
-           {
-             log(L_WARN "Ignoring host scope route %I/%d received from %I via %s",
-                 n->n.prefix, n->n.pxlen, e->attrs->from, e->attrs->proto->name);
-             return 0;
-           }
+         log(L_WARN "Ignoring %s scope route %I/%d received from %I via %s",
+             ip_scope_text(c & IADDR_SCOPE_MASK),
+             n->n.prefix, n->n.pxlen, e->attrs->from, e->attrs->proto->name);
+         return 0;
        }
     }
   return 1;

diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 090c50b94dbd442ec2c61552f300dbd9669f43ba..aa9a9c43618ca37ebf9e61e95ea42dc3a7790faf 100644 (file)
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -753,6 +753,7 @@ krt_init(struct proto_config *c)
   struct krt_proto *p = proto_new(c, sizeof(struct krt_proto));
 
   p->p.rt_notify = krt_notify;
+  p->p.min_scope = SCOPE_HOST;
   return &p->p;
 }