From: Donatas Abraitis <donatas.abraitis@gmail.com>
Date: Thu, 23 Dec 2021 12:23:48 +0000 (+0200)
Subject: bgpd: Change default long-lived graceful restart stale timer to 0 seconds
X-Git-Tag: base_8.2~93^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7f8a9a24a9dc06f9f6483ecd1f5a4c9e34cfb4f1;p=matthieu%2Ffrr.git

bgpd: Change default long-lived graceful restart stale timer to 0 seconds

That means the feature is off by default.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 8a63030181..2581714f31 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -3163,7 +3163,8 @@ DEFUN (no_bgp_graceful_restart_rib_stale_time,
 }
 
 DEFUN(bgp_llgr_stalepath_time, bgp_llgr_stalepath_time_cmd,
-      "bgp long-lived-graceful-restart stale-time (0-4294967295)", BGP_STR
+      "bgp long-lived-graceful-restart stale-time (1-4294967295)",
+      BGP_STR
       "Enable Long-lived Graceful Restart\n"
       "Specifies maximum time to wait before purging long-lived stale routes\n"
       "Stale time value (seconds)\n")
@@ -3179,7 +3180,7 @@ DEFUN(bgp_llgr_stalepath_time, bgp_llgr_stalepath_time_cmd,
 }
 
 DEFUN(no_bgp_llgr_stalepath_time, no_bgp_llgr_stalepath_time_cmd,
-      "no bgp long-lived-graceful-restart stale-time [(0-4294967295)]",
+      "no bgp long-lived-graceful-restart stale-time [(1-4294967295)]",
       NO_STR BGP_STR
       "Enable Long-lived Graceful Restart\n"
       "Specifies maximum time to wait before purging long-lived stale routes\n"
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 2fcebe69d5..c9dd1a8ea1 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -1885,7 +1885,7 @@ struct bgp_nlri {
 #define BGP_DEFAULT_UPDATE_ADVERTISEMENT_TIME  1
 
 /* BGP Long-lived Graceful Restart */
-#define BGP_DEFAULT_LLGR_STALE_TIME 360
+#define BGP_DEFAULT_LLGR_STALE_TIME 0
 
 /* BGP uptime string length.  */
 #define BGP_UPTIME_LEN 25
diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst
index 4115146e55..dfd865bf33 100644
--- a/doc/user/bgp.rst
+++ b/doc/user/bgp.rst
@@ -995,11 +995,13 @@ Long-lived Graceful Restart
 Currently, only restarter mode is supported. This capability is advertised only
 if graceful restart capability is negotiated.
 
-.. clicmd:: bgp long-lived-graceful-restart stale-time (0-4294967295)
+.. clicmd:: bgp long-lived-graceful-restart stale-time (1-4294967295)
 
    Specifies the maximum time to wait before purging long-lived stale routes for
    helper routers.
 
+   Default is 0, which means the feature is off by default. Only graceful
+   restart takes into account.
 
 .. _bgp-shutdown: