diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:15:04 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-05-18 12:23:13 +0200 |
| commit | 92eedda1fb1b9c9fb2c31153677a033bee4573d3 (patch) | |
| tree | d99e2aa0ac3346dc20c766026e717cf69b0abbbb /bgpd/bgp_zebra.c | |
| parent | Merge branch 'frr/pull/548' ("Pim dev 3.0 defect fixes") (diff) | |
| parent | Pre-revert nonmergeable changes (diff) | |
| download | frr-92eedda1fb1b9c9fb2c31153677a033bee4573d3.tar.xz frr-92eedda1fb1b9c9fb2c31153677a033bee4573d3.zip | |
Merge branch stable/2.0 into stable/3.0
Conflicts:
bgpd/bgp_fsm.c
ospf6d/ospf6_lsa.c
ospfd/ospf_vty.c
zebra/redistribute.c
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'bgpd/bgp_zebra.c')
| -rw-r--r-- | bgpd/bgp_zebra.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c index 72bd081a7..4e00367af 100644 --- a/bgpd/bgp_zebra.c +++ b/bgpd/bgp_zebra.c @@ -1470,7 +1470,8 @@ bgp_zebra_announce (struct prefix *p, struct bgp_info *info, struct bgp *bgp, if (!ifindex) { 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) ifindex = info->peer->nexthop.ifp->ifindex; } |