diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-03-09 10:50:38 +0100 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-03-09 10:50:38 +0100 |
| commit | ff47cd80dd04bc11692248a40cbf52ee8d351064 (patch) | |
| tree | ef64550e00c6610e55a2d0f9f1ebf71e93572f78 /proto/bgp | |
| parent | 9e60a1fbc3ef9ab93b414dcf451bbe741e2e8827 (diff) | |
| parent | d5a32563df1653952937117133f09143929ff0c2 (diff) | |
Merge commit 'd5a32563' into haugesund
Diffstat (limited to 'proto/bgp')
| -rw-r--r-- | proto/bgp/attrs.c | 3 | ||||
| -rw-r--r-- | proto/bgp/bgp.h | 2 |
2 files changed, 2 insertions, 3 deletions
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); |