bgpd: Treat the peer as not active due to BFD down only if established (backport...

If we have `neighbor X bfd` and BFD status is DOWN and/or ADMIN_DOWN, and BGP
session is not yet established, we never allow the session to establish.

Let's fix this regression that was in 10.2.

Fixes: 1fb48f5 ("bgpd: Do not start BGP session if BFD profile is in shutdown state")
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 0601400afdf50305982debb29ebd367811d10ef5..f6b8abd9cc452213f0a6663525b9a554ad0cf5cd 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -4648,7 +4648,7 @@ bool peer_active(struct peer *peer)
                return false;
 
        if (peer->bfd_config) {
-               if (bfd_session_is_down(peer->bfd_config->session))
+               if (peer_established(peer->connection) && bfd_session_is_down(peer->bfd_config->session))
                        return false;
        }