diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-07-11 10:41:17 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-07-11 10:41:17 +0200 |
| commit | d429bc5c841a8e9d4c81786973edfa56d20a407e (patch) | |
| tree | 3857e7791fa51588b5f0de16bf05b65754349067 /proto/bgp | |
| parent | 7e9cede1fd1878fb4c00e793bccd0ca6c18ad452 (diff) | |
| parent | beb5f78ada79ac90f31f2c4923302c74d9ab38bf (diff) | |
Merge commit 'beb5f78a' into backport
Diffstat (limited to 'proto/bgp')
| -rw-r--r-- | proto/bgp/attrs.c | 4 | ||||
| -rw-r--r-- | proto/bgp/bgp.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c index d8948f29..2f6cf640 100644 --- a/proto/bgp/attrs.c +++ b/proto/bgp/attrs.c @@ -1676,10 +1676,10 @@ bgp_free_prefix(struct bgp_channel *c, struct bgp_prefix *px) */ int -bgp_preexport(struct proto *P, rte *e) +bgp_preexport(struct channel *C, rte *e) { struct proto *SRC = e->src->proto; - struct bgp_proto *p = (struct bgp_proto *) P; + struct bgp_proto *p = (struct bgp_proto *) C->proto; struct bgp_proto *src = (SRC->proto == &proto_bgp) ? (struct bgp_proto *) SRC : NULL; /* Reject our routes */ diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h index 8a44514c..13102857 100644 --- a/proto/bgp/bgp.h +++ b/proto/bgp/bgp.h @@ -587,7 +587,7 @@ int bgp_rte_recalculate(rtable *table, net *net, rte *new, rte *old, rte *old_be struct rte *bgp_rte_modify_stale(struct rte *r, struct linpool *pool); u32 bgp_rte_igp_metric(struct rte *); void bgp_rt_notify(struct proto *P, struct channel *C, net *n, rte *new, rte *old); -int bgp_preexport(struct proto *, struct rte *); +int bgp_preexport(struct channel *, 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); |