mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-09 20:58:44 +00:00
Code Releases Activity

BGP: Autoconfigure BGP next hops from preferred addresses

Browse Source
This commit is contained in:
Ondrej Zajicek (work) 2017-12-08 02:26:17 +01:00
parent 830ba75e6d
commit ccee67ca3b
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
proto/bgp/bgp.c
View File

@ -1504,6 +1504,20 @@ bgp_channel_start(struct channel *C)
c->next_hop_addr = src; c->next_hop_addr = src;
} }
/* Use preferred addresses associated with interface / source address */
if (ipa_zero(c->next_hop_addr))
{
/* We know the iface for single-hop, we make lookup for multihop */
struct neighbor *nbr = p->neigh ?: neigh_find2(&p->p, &src, NULL, 0);
struct iface *iface = nbr ? nbr->iface : NULL;
if (bgp_channel_is_ipv4(c) && iface && iface->addr4)
c->next_hop_addr = iface->addr4->ip;
if (bgp_channel_is_ipv6(c) && iface && iface->addr6)
c->next_hop_addr = iface->addr6->ip;
}
/* Exit if no feasible next hop address is found */ /* Exit if no feasible next hop address is found */
if (ipa_zero(c->next_hop_addr)) if (ipa_zero(c->next_hop_addr))
{ {
@ -2079,6 +2093,11 @@ bgp_show_proto_info(struct proto *P)
{ {
channel_show_info(&c->c); channel_show_info(&c->c);
if (ipa_zero(c->link_addr))
cli_msg(-1006, " BGP Next hop: %I", c->next_hop_addr);
else
cli_msg(-1006, " BGP Next hop: %I %I", c->next_hop_addr, c->link_addr);
if (c->igp_table_ip4) if (c->igp_table_ip4)
cli_msg(-1006, " IGP IPv4 table: %s", c->igp_table_ip4->name); cli_msg(-1006, " IGP IPv4 table: %s", c->igp_table_ip4->name);