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

BGP: Better handling of non-matching AFI in nexthops

Browse source
This commit is contained in:
Ondrej Zajicek (work) 2018-12-15 14:01:57 +01:00
parent 3a2a3c7325
commit cb311b441a
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
proto/bgp/attrs.c
View file

@ -1386,8 +1386,6 @@ bgp_preexport(struct proto *P, rte **new, struct linpool *pool UNUSED)
if (src == NULL) if (src == NULL)
return 0; return 0;
// XXXX: Check next hop AF
/* IBGP route reflection, RFC 4456 */ /* IBGP route reflection, RFC 4456 */
if (p->is_internal && src->is_internal && (p->local_as == src->local_as)) if (p->is_internal && src->is_internal && (p->local_as == src->local_as))
{ {

10
proto/bgp/packets.c
View file

@ -855,6 +855,7 @@ static inline int
bgp_use_next_hop(struct bgp_export_state *s, eattr *a) bgp_use_next_hop(struct bgp_export_state *s, eattr *a)
{ {
struct bgp_proto *p = s->proto; struct bgp_proto *p = s->proto;
struct bgp_channel *c = s->channel;
ip_addr *nh = (void *) a->u.ptr->data; ip_addr *nh = (void *) a->u.ptr->data;
if (s->channel->cf->next_hop_self) if (s->channel->cf->next_hop_self)
@ -867,6 +868,10 @@ bgp_use_next_hop(struct bgp_export_state *s, eattr *a)
if (a->type & EAF_FRESH) if (a->type & EAF_FRESH)
return 1; return 1;
/* Check for non-matching AF */
if ((ipa_is_ip4(*nh) != bgp_channel_is_ipv4(c)) && !c->ext_next_hop)
return 0;
/* Keep it when exported to internal peers */ /* Keep it when exported to internal peers */
if (p->is_interior && ipa_nonzero(*nh)) if (p->is_interior && ipa_nonzero(*nh))
return 1; return 1;
@ -880,6 +885,7 @@ static inline int
bgp_use_gateway(struct bgp_export_state *s) bgp_use_gateway(struct bgp_export_state *s)
{ {
struct bgp_proto *p = s->proto; struct bgp_proto *p = s->proto;
struct bgp_channel *c = s->channel;
rta *ra = s->route->attrs; rta *ra = s->route->attrs;
if (s->channel->cf->next_hop_self) if (s->channel->cf->next_hop_self)
@ -889,6 +895,10 @@ bgp_use_gateway(struct bgp_export_state *s)
if ((ra->dest != RTD_UNICAST) || ra->nh.next || ipa_zero(ra->nh.gw) || ipa_is_link_local(ra->nh.gw)) if ((ra->dest != RTD_UNICAST) || ra->nh.next || ipa_zero(ra->nh.gw) || ipa_is_link_local(ra->nh.gw))
return 0; return 0;
/* Check for non-matching AF */
if ((ipa_is_ip4(ra->nh.gw) != bgp_channel_is_ipv4(c)) && !c->ext_next_hop)
return 0;
/* Use it when exported to internal peers */ /* Use it when exported to internal peers */
if (p->is_interior) if (p->is_interior)
return 1; return 1;