Merge commit 'd5a32563' into haugesund

6 files changed, 10 insertions, 13 deletions

diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 174fc9e2..0444e7a4 100644
--- 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 6c1ae176..c35f9384 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1668,9 +1668,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 f2c11869..9d25da21 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -585,7 +585,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 ebebf0ff..48e078ed 100644
--- 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 f991d09a..cc4b5a07 100644
--- a/proto/pipe/pipe.c
+++ b/proto/pipe/pipe.c
@@ -101,9 +101,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 66e8eb4b..540ff2a7 100644
--- 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)