Preexport: No route modification, no linpool needed

diff --git a/nest/protocol.h b/nest/protocol.h
index abcc505d4ce320ec4287a73561c23ab7ec25f8e5..6ee97b7cd2d4fb7935fa91cbb33241d850bc2dfa 100644 (file)
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -200,10 +200,11 @@ struct proto {
    *      neigh_notify Notify protocol about neighbor cache events.
    *      make_tmp_attrs  Add attributes to rta from from private attrs stored in rte. The route and rta MUST NOT be cached.
    *      store_tmp_attrs Store private attrs back to rte and undef added attributes. The route and rta MUST NOT be cached.
-   *      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).
@@ -217,7 +218,7 @@ struct proto {
   void (*neigh_notify)(struct neighbor *neigh);
   void (*make_tmp_attrs)(struct rte *rt, struct linpool *pool);
   void (*store_tmp_attrs)(struct rte *rt, struct linpool *pool);
-  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 a2ebe6a40eaf96bbcd931b15c381aca66405d5db..cccd91ab28ddf6beb2a52a172bd3f88319d4c36e 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 b1e3ab7030da437e6dd15c62fa37a438dad8a71c..eb306227f5f066233fd347e00ebea8fbb19cd726 100644 (file)
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -605,7 +605,7 @@ export_filter_(struct channel *c, rte *rt0, rte **rt_free, linpool *pool, int si
   rt = rt0;
   *rt_free = NULL;
 
-  v = p->preexport ? p->preexport(p, &rt, pool) : 0;
+  v = p->preexport ? p->preexport(p, rt) : 0;
   if (v < 0)
     {
       if (silent)
@@ -1605,7 +1605,7 @@ rt_examine(rtable *t, net_addr *a, struct proto *p, const struct filter *filter)
   rte_update_lock();
 
   /* Rest is stripped down export_filter() */
-  int v = p->preexport ? p->preexport(p, &rt, rte_update_pool) : 0;
+  int v = p->preexport ? p->preexport(p, rt) : 0;
   if (v == RIC_PROCESS)
   {
     rte_make_tmp_attrs(&rt, rte_update_pool, NULL);

diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 1e87212c0e3757aae06789b2de42353f4fb4a218..68cc62f1e1705a004937a576525d9beb612e8bb5 100644 (file)
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -2231,10 +2231,9 @@ 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)
 {
-  struct rta *a = (*new)->attrs;
-
+  struct rta *a = new->attrs;
   /* Reject our own unreachable routes */
   if ((a->dest == RTD_UNREACHABLE) && (a->src->proto == P))
     return -1;

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 24ba00ba735cfbc20434f8e8cb3e7a90b5815447..95d1c337c569bbc63bf79735d3dad418617a808e 100644 (file)
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1661,9 +1661,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->attrs->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 cca4b4482dc04627e097f82dfbd9200ad3e9ff7b..20944fe67610e2c402f51dc30fe09e9db8aa8cad 100644 (file)
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -583,7 +583,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 proto *P, struct channel *C, net *n, rte *new, rte *old);
-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 ebebf0ff26364e569c6fc85aaa657df624c53473..48e078ed5858100918da0b6a09b427becd61a8fb 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_make_tmp_attrs(struct rte *rt, struct linpool *pool);
 static void ospf_store_tmp_attrs(struct rte *rt, struct linpool *pool);
 static void ospf_reload_routes(struct channel *C);
@@ -484,11 +484,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->attrs->src->proto == P)

diff --git a/proto/pipe/pipe.c b/proto/pipe/pipe.c
index 3532f114f836b22b2c628402df7dbcaab7f07234..a50d44a3473cb21d2baf90ce535e28911e691384 100644 (file)
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -98,9 +98,9 @@ pipe_rt_notify(struct proto *P, struct channel *src_ch, net *n, rte *new, rte *o
 }
 
 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 66e8eb4bbde24af361dc909ea9f5627baebfe140..540ff2a7a418e305c27bb55f88cc0086fbb7a9e5 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 *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))
+  if (radv_net_match_trigger(cf, new->net))
     return RIC_PROCESS;
 
   if (cf->propagate_routes)

diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index 7c2614b101047c96bb7645a928e749e62942d2fd..da61fc9c8ed99976f23fcd9c986ebd34b9be1082 100644 (file)
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -903,11 +903,9 @@ krt_store_tmp_attrs(struct rte *rt, struct linpool *pool)
 }
 
 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->attrs->src->proto == P)
     return -1;