[bgp] Fix nexthop reachability check on confederations

* bgp_route.c: (bgp_update_main) Nexthop reachability should be checked for
  confederations too in case a prefix is received from more than one
  confederation peers.

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index bc21f3c67be2d666b9e85516161a2e8eef05d742..208803968078b0b07ec4dff00f9b190db47b5f8e 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2247,6 +2247,7 @@ bgp_update_main (struct peer *peer, struct prefix *p, struct attr *attr,
       if ((afi == AFI_IP || afi == AFI_IP6)
          && safi == SAFI_UNICAST 
          && (peer_sort (peer) == BGP_PEER_IBGP
+              || peer_sort (peer) == BGP_PEER_CONFED
              || (peer_sort (peer) == BGP_PEER_EBGP && peer->ttl != 1)
              || CHECK_FLAG (peer->flags, PEER_FLAG_DISABLE_CONNECTED_CHECK)))
        {
@@ -2293,6 +2294,7 @@ bgp_update_main (struct peer *peer, struct prefix *p, struct attr *attr,
   if ((afi == AFI_IP || afi == AFI_IP6)
       && safi == SAFI_UNICAST
       && (peer_sort (peer) == BGP_PEER_IBGP
+          || peer_sort (peer) == BGP_PEER_CONFED
          || (peer_sort (peer) == BGP_PEER_EBGP && peer->ttl != 1)
          || CHECK_FLAG (peer->flags, PEER_FLAG_DISABLE_CONNECTED_CHECK)))
     {