Preexport: No route modification, no linpool needed

diff --git a/nest/protocol.h b/nest/protocol.h
index 8e94fcd57dded8acbcb928a23898ef8dbe9a7168..1c19af2d08770dd0fdf0afea0d2ebe9e98ae9b9c 100644 (file)
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -197,10 +197,11 @@ struct proto {
    *      ifa_notify   Notify protocol about interface address changes.
    *      rt_notify    Notify protocol about routing table updates.
    *      neigh_notify Notify protocol about neighbor cache events.
-   *      preexport  Called as the first step of the route exporting process.
-   *                   It can construct a new rte, add private attributes and
-   *                   decide whether the route shall be exported: 1=yes, -1=no,
-   *                   0=process it through the export filter set by the user.
+   *      preexport    Called as the first step of the route exporting process.
+   *                   It can decide whether the route shall be exported:
+   *                     -1 = reject,
+   *                      0 = continue to export filter
+   *                      1 = accept immediately
    *      reload_routes   Request channel to reload all its routes to the core
    *                   (using rte_update()). Returns: 0=reload cannot be done,
    *                   1= reload is scheduled and will happen (asynchronously).
@@ -212,7 +213,7 @@ struct proto {
   void (*ifa_notify)(struct proto *, unsigned flags, struct ifa *a);
   void (*rt_notify)(struct channel *, struct rte_export *);
   void (*neigh_notify)(struct neighbor *neigh);
-  int (*preexport)(struct proto *, struct rte **rt, struct linpool *pool);
+  int (*preexport)(struct proto *, struct rte *rt);
   void (*reload_routes)(struct channel *);
   void (*feed_begin)(struct channel *, int initial);
   void (*feed_end)(struct channel *);

diff --git a/nest/rt-show.c b/nest/rt-show.c
index 6a45b5182f61aa82e0e4b1f938510f5ec14110d8..44a62f60b7f0cf0237d48075d1e7250f907f384d 100644 (file)
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -154,7 +154,7 @@ rt_show_net(struct cli *c, net *n, struct rt_show_data *d)
       else if (d->export_mode)
        {
          struct proto *ep = ec->proto;
-         int ic = ep->preexport ? ep->preexport(ep, &e, c->show_pool) : 0;
+         int ic = ep->preexport ? ep->preexport(ep, e) : 0;
 
          if (ec->ra_mode == RA_OPTIMAL || ec->ra_mode == RA_MERGED)
            pass = 1;

diff --git a/nest/rt-table.c b/nest/rt-table.c
index 711e368ac46cc37ccd407a70befde342c93f1f2b..2c7f8b5b74c49f44abfab2ea25a2049e0d82c539 100644 (file)
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -449,7 +449,7 @@ export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int si
   if (silent && bmap_test(&c->export_reject_map, rt0->id))
     return NULL;
 
-  v = p->preexport ? p->preexport(p, &rt, pool) : 0;
+  v = p->preexport ? p->preexport(p, rt) : 0;
   if (v < 0)
     {
       if (silent)

diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 1a072c9c9f02cb03697f4858dd496633beeb22b7..add835131b44a5f9dc7ae82c6f960fbcc9dc8127 100644 (file)
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -2105,10 +2105,10 @@ babel_kick_timer(struct babel_proto *p)
 
 
 static int
-babel_preexport(struct proto *P, struct rte **new, struct linpool *pool UNUSED)
+babel_preexport(struct proto *P, struct rte *new)
 {
   /* Reject our own unreachable routes */
-  if (((*new)->attrs->dest == RTD_UNREACHABLE) && ((*new)->src->proto == P))
+  if ((new->attrs->dest == RTD_UNREACHABLE) && (new->src->proto == P))
     return -1;
 
   return 0;

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index e11f01e548e29ae4467b7686d5349ee8d8ed6166..6bcc7339d486d43770e6a72206920339e0e570fc 100644 (file)
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1630,9 +1630,8 @@ bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px)
  */
 
 int
-bgp_preexport(struct proto *P, rte **new, struct linpool *pool UNUSED)
+bgp_preexport(struct proto *P, rte *e)
 {
-  rte *e = *new;
   struct proto *SRC = e->src->proto;
   struct bgp_proto *p = (struct bgp_proto *) P;
   struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL;

diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index ef01296d17224f9e7fc71657056093d8080117f0..e164cd60a554c90d07e3cceb7c46e0f06d1b83ac 100644 (file)
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -584,7 +584,7 @@ int bgp_rte_mergable(rte *pri, rte *sec);
 int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_best);
 struct rte *bgp_rte_modify_stale(struct rte *r, struct linpool *pool);
 void bgp_rt_notify(struct channel *C, struct rte_export *e);
-int bgp_preexport(struct proto *, struct rte **, struct linpool *);
+int bgp_preexport(struct proto *, struct rte *);
 int bgp_get_attr(const struct eattr *e, byte *buf, int buflen);
 void bgp_get_route_info(struct rte *, byte *buf);
 int bgp_total_aigp_metric_(rte *e, u64 *metric, const struct adata **ad);

diff --git a/proto/ospf/ospf.c b/proto/ospf/ospf.c
index 0f4e4c0d870848dfbd8e653662458307a37e7825..7785ec6569f159257fb699341294a343a4bd4dc1 100644 (file)
--- a/proto/ospf/ospf.c
+++ b/proto/ospf/ospf.c
@@ -107,7 +107,7 @@
 #include <stdlib.h>
 #include "ospf.h"
 
-static int ospf_preexport(struct proto *P, rte **new, struct linpool *pool);
+static int ospf_preexport(struct proto *P, rte *new);
 static void ospf_reload_routes(struct channel *C);
 static int ospf_rte_better(struct rte *new, struct rte *old);
 static void ospf_disp(timer *timer);
@@ -471,11 +471,10 @@ ospf_disp(timer * timer)
  * import to the filters.
  */
 static int
-ospf_preexport(struct proto *P, rte **new, struct linpool *pool UNUSED)
+ospf_preexport(struct proto *P, rte *e)
 {
   struct ospf_proto *p = (struct ospf_proto *) P;
   struct ospf_area *oa = ospf_main_area(p);
-  rte *e = *new;
 
   /* Reject our own routes */
   if (e->src->proto == P)

diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 4942cbc925ef8c0d00a8ee7cf2c1881cbf03205d..19bb5f6d82305caa4e0127586a428a64d25b6474 100644 (file)
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -89,9 +89,9 @@ pipe_rt_notify(struct channel *src_ch, struct rte_export *export)
 }
 
 static int
-pipe_preexport(struct proto *P, rte **ee, struct linpool *p UNUSED)
+pipe_preexport(struct proto *P, rte *e)
 {
-  struct proto *pp = (*ee)->sender->proto;
+  struct proto *pp = e->sender->proto;
 
   if (pp == P)
     return -1; /* Avoid local loops automatically */

diff --git a/proto/radv/radv.c b/proto/radv/radv.c
index c924ef84f1f98a0d9f60c7ec665bcf7c8b99284a..524ff5af4c5b7be68acb6176e6abc7da2ea7d198 100644 (file)
--- a/proto/radv/radv.c
+++ b/proto/radv/radv.c
@@ -391,12 +391,12 @@ radv_net_match_trigger(struct radv_config *cf, net_addr *n)
 }
 
 int
-radv_preexport(struct proto *P, rte **new, struct linpool *pool UNUSED)
+radv_preexport(struct proto *P, rte *new)
 {
   // struct radv_proto *p = (struct radv_proto *) P;
   struct radv_config *cf = (struct radv_config *) (P->cf);
 
-  if (radv_net_match_trigger(cf, (*new)->net->n.addr))
+  if (radv_net_match_trigger(cf, new->net->n.addr))
     return RIC_PROCESS;
 
   if (cf->propagate_routes)

diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 6a0b8eae7e75fed89fa766d4307414d39583d4a5..aaf891944455cd0fad9481009633812692d98e91 100644 (file)
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -873,11 +873,9 @@ krt_scan_timer_kick(struct krt_proto *p)
  */
 
 static int
-krt_preexport(struct proto *P, rte **new, struct linpool *pool UNUSED)
+krt_preexport(struct proto *P, rte *e)
 {
   // struct krt_proto *p = (struct krt_proto *) P;
-  rte *e = *new;
-
   if (e->src->proto == P)
     return -1;