Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Preexport: No route modification, no linpool needed

Browse source
This commit is contained in:
Maria Matejka 2020-04-12 21:54:20 +02:00 committed by Maria Matejka
parent cee0cd148c
commit d5a32563df
10 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nest/protocol.h
View file

@ -201,9 +201,10 @@ struct proto {
* 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.
* 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 *);

2
nest/rt-show.c
View file

@ -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;

4
nest/rt-table.c
View file

@ -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);

5
proto/babel/babel.c
View file

@ -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;

3
proto/bgp/attrs.c
View file

@ -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;

2
proto/bgp/bgp.h
View file

@ -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);

5
proto/ospf/ospf.c
View file

@ -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)

4
proto/pipe/pipe.c
View file

@ -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 */

4
proto/radv/radv.c
View file

@ -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)

4
sysdep/unix/krt.c
View file

@ -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;