From: Maria Matejka Date: Sun, 12 Apr 2020 19:54:20 +0000 (+0200) Subject: Preexport: No route modification, no linpool needed X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9d468c5909289eae8736b6c093e7f1598f84b85;p=thirdparty%2Fbird.git Preexport: No route modification, no linpool needed --- diff --git a/nest/protocol.h b/nest/protocol.h index 9dc7a085e..216cd9544 100644 --- 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 b0bfa1c8b..4a96ad3ca 100644 --- a/nest/rt-show.c +++ b/nest/rt-show.c @@ -153,7 +153,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 b8f16a692..21acad770 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -456,7 +456,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 824d066d2..8b0859b40 100644 --- a/proto/babel/babel.c +++ b/proto/babel/babel.c @@ -2100,10 +2100,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 f254c940e..11a64c1bb 100644 --- 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->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 49cbc3efb..70faf1de0 100644 --- a/proto/bgp/bgp.h +++ b/proto/bgp/bgp.h @@ -587,7 +587,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 396f9ece2..f8d011566 100644 --- a/proto/ospf/ospf.c +++ b/proto/ospf/ospf.c @@ -107,7 +107,7 @@ #include #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 7cf1524ad..0e541eb0e 100644 --- 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 c924ef84f..524ff5af4 100644 --- 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 00655213d..f39f6f10b 100644 --- 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;