From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Wed, 27 Apr 2022 18:50:58 +0000 (+0300)
Subject: bgpd: Rename graceful restart constants for R/F flags
X-Git-Tag: base_8.3~103^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d83facbbf54478845ca57c92ed2ff8a6fcc678cc;p=mirror%2Ffrr.git

bgpd: Rename graceful restart constants for R/F flags

Just to better understand what they mean.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
---

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 6bdefd0e9b..d2c1ff12b5 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -517,7 +517,7 @@ static int bgp_capability_restart(struct peer *peer,
 
 	SET_FLAG(peer->cap, PEER_CAP_RESTART_RCV);
 	restart_flag_time = stream_getw(s);
-	if (CHECK_FLAG(restart_flag_time, RESTART_R_BIT))
+	if (CHECK_FLAG(restart_flag_time, GRACEFUL_RESTART_R_BIT))
 		SET_FLAG(peer->cap, PEER_CAP_RESTART_BIT_RCV);
 	else
 		UNSET_FLAG(peer->cap, PEER_CAP_RESTART_BIT_RCV);
@@ -567,7 +567,7 @@ static int bgp_capability_restart(struct peer *peer,
 
 			SET_FLAG(peer->af_cap[afi][safi],
 				 PEER_CAP_RESTART_AF_RCV);
-			if (CHECK_FLAG(flag, RESTART_F_BIT))
+			if (CHECK_FLAG(flag, GRACEFUL_RESTART_F_BIT))
 				SET_FLAG(peer->af_cap[afi][safi],
 					 PEER_CAP_RESTART_AF_PRESERVE_RCV);
 		}
@@ -1416,7 +1416,7 @@ static void bgp_peer_send_gr_capability(struct stream *s, struct peer *peer,
 	stream_putc(s, 0);
 	restart_time = peer->bgp->restart_time;
 	if (peer->bgp->t_startup) {
-		SET_FLAG(restart_time, RESTART_R_BIT);
+		SET_FLAG(restart_time, GRACEFUL_RESTART_R_BIT);
 		SET_FLAG(peer->cap, PEER_CAP_RESTART_BIT_ADV);
 
 		if (BGP_DEBUG(graceful_restart, GRACEFUL_RESTART))
@@ -1452,7 +1452,7 @@ static void bgp_peer_send_gr_capability(struct stream *s, struct peer *peer,
 			stream_putc(s, pkt_safi);
 			if (CHECK_FLAG(peer->bgp->flags,
 				       BGP_FLAG_GR_PRESERVE_FWD))
-				stream_putc(s, RESTART_F_BIT);
+				stream_putc(s, GRACEFUL_RESTART_F_BIT);
 			else
 				stream_putc(s, 0);
 		}
diff --git a/bgpd/bgp_open.h b/bgpd/bgp_open.h
index c04816c006..d359a872dc 100644
--- a/bgpd/bgp_open.h
+++ b/bgpd/bgp_open.h
@@ -87,8 +87,8 @@ struct graceful_restart_af {
 #define CAPABILITY_ACTION_UNSET         1
 
 /* Graceful Restart */
-#define RESTART_R_BIT              0x8000
-#define RESTART_F_BIT              0x80
+#define GRACEFUL_RESTART_R_BIT 0x8000
+#define GRACEFUL_RESTART_F_BIT 0x80
 
 /* Long-lived Graceful Restart */
 #define LLGR_F_BIT 0x80