proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:13:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #556 from dslicenc/bgp-fixes

Browse Source 
Bgp fixes
This commit is contained in:
Renato Westphal 2017-05-17 21:37:01 -03:00 committed by GitHub
commit be371e2318
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpd/bgp_fsm.c
View File

@ -1026,7 +1026,7 @@ bgp_stop (struct peer *peer)
zlog_info ("%%ADJCHANGE: neighbor %s(%s) in vrf %s Down %s", zlog_info ("%%ADJCHANGE: neighbor %s(%s) in vrf %s Down %s",
peer->host, peer->host,
(peer->hostname) ? peer->hostname : "Unknown", (peer->hostname) ? peer->hostname : "Unknown",
(vrf->vrf_id != VRF_DEFAULT) ? vrf->name : "Default", vrf ? ((vrf->vrf_id != VRF_DEFAULT) ? vrf->name : "Default") : "",
peer_down_str [(int) peer->last_reset]); peer_down_str [(int) peer->last_reset]);
} }

3
bgpd/bgp_zebra.c
View File

@ -1469,7 +1469,8 @@ bgp_zebra_announce (struct prefix *p, struct bgp_info *info, struct bgp *bgp,
if (!ifindex) if (!ifindex)
{ {
if (info->peer->conf_if || info->peer->ifname) if (info->peer->conf_if || info->peer->ifname)
ifindex = if_nametoindex (info->peer->conf_if ? info->peer->conf_if : info->peer->ifname); ifindex = ifname2ifindex_vrf (info->peer->conf_if ? info->peer->conf_if :
info->peer->ifname, bgp->vrf_id);
else if (info->peer->nexthop.ifp) else if (info->peer->nexthop.ifp)
ifindex = info->peer->nexthop.ifp->ifindex; ifindex = info->peer->nexthop.ifp->ifindex;
} }