diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:26:25 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:26:25 +0200 |
| commit | 41508ceac3cdd74ca705d3bfc6a79464bf38e0b5 (patch) | |
| tree | 4a0506a93849b3b7e61faeeaba1af289e13d646a /proto/bgp | |
| parent | 65254128e105903b6b470c6b4bb4729f56cf81bc (diff) | |
| parent | 1c30b689ddd032ef8000fb7836348a48ba3184ff (diff) | |
Merge commit '1c30b689ddd032ef8000fb7836348a48ba3184ff' into haugesund
Diffstat (limited to 'proto/bgp')
| -rw-r--r-- | proto/bgp/attrs.c | 2 | ||||
| -rw-r--r-- | proto/bgp/config.Y | 2 | ||||
| -rw-r--r-- | proto/bgp/packets.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c index 6a91e6e7..11b1c728 100644 --- a/proto/bgp/attrs.c +++ b/proto/bgp/attrs.c @@ -404,7 +404,7 @@ bgp_total_aigp_metric_(const rte *e, u64 *metric, const struct adata **ad) static inline int bgp_init_aigp_metric(rte *e, u64 *metric, const struct adata **ad) { - if (e->attrs->source == RTS_BGP) + if (rt_get_source_attr(e) == RTS_BGP) return 0; *metric = rt_get_igp_metric(e); diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y index b4d8b83f..24f3ec8f 100644 --- a/proto/bgp/config.Y +++ b/proto/bgp/config.Y @@ -43,7 +43,7 @@ CF_KEYWORDS(CEASE, PREFIX, LIMIT, HIT, ADMINISTRATIVE, SHUTDOWN, RESET, PEER, CF_GRAMMAR -toksym: BGP_MED | BGP_LOCAL_PREF ; +toksym: BGP_MED | BGP_LOCAL_PREF | SOURCE ; proto: bgp_proto '}' ; diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c index c01dfeea..44a2f80a 100644 --- a/proto/bgp/packets.c +++ b/proto/bgp/packets.c @@ -2475,11 +2475,11 @@ bgp_decode_nlri(struct bgp_parse_state *s, u32 afi, byte *nlri, uint len, ea_lis { a = allocz(RTA_MAX_SIZE); - a->source = RTS_BGP; a->eattrs = ea; ea_set_attr_data(&a->eattrs, &ea_gen_from, 0, &s->proto->remote_ip, sizeof(ip_addr)); ea_set_attr_u32(&a->eattrs, &ea_gen_preference, 0, c->c.preference); + ea_set_attr_u32(&a->eattrs, &ea_gen_source, 0, RTS_BGP); c->desc->decode_next_hop(s, nh, nh_len, a); bgp_finish_attrs(s, a); |