From: bisdhdh <biswajit.sadhu@gmail.com>
Date: Thu, 24 Oct 2019 06:37:08 +0000 (+0530)
Subject: bgpd: Fix for Helper node doesn't set R-bit in OPEN message after the reload.
X-Git-Tag: base_7.4~388^2~12
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6102cb7fe4c86787ea80c62b99a7d891ebb21d29;p=mirror%2Ffrr.git

bgpd: Fix for Helper node doesn't set R-bit in OPEN message after the reload.

BGP Helper node doesn't set R-bit in OPEN message after the
restart or reload of the BGP router.

Signed-off-by: Biswajit Sadhu <sadhub@vmware.com>
---

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 89437a5149..82a17671e9 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -1332,9 +1332,7 @@ static void bgp_peer_send_gr_capability(struct stream *s, struct peer *peer,
 		rcapp = stream_get_endp(s);
 		stream_putc(s, 0);
 		restart_time = peer->bgp->restart_time;
-		if ((peer->bgp->t_startup) &&
-			(CHECK_FLAG(peer->flags,
-				PEER_FLAG_GRACEFUL_RESTART))) {
+		if (peer->bgp->t_startup) {
 			SET_FLAG(restart_time, RESTART_R_BIT);
 			SET_FLAG(peer->cap, PEER_CAP_RESTART_BIT_ADV);
 		}