BGP: Update LLGR draft references to RFC 9494

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 5bed6df3c088cbd5d2593074aba5eef859509dab..ab48565f40b6cbc65ec2a7820756e4a27bdf5612 100644 (file)
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -2844,6 +2844,7 @@ avoid routing loops.
 <item> <rfc id="9072"> - Extended Optional Parameters Length for BGP OPEN Message
 <item> <rfc id="9117"> - Revised Validation Procedure for BGP Flow Specifications
 <item> <rfc id="9234"> - Route Leak Prevention and Detection Using Roles
+<item> <rfc id="9494"> - Long-Lived Graceful Restart for BGP
 <item> <rfc id="9687"> - Send Hold Timer
 </itemize>
 
@@ -3179,7 +3180,7 @@ using the following configuration parameters:
        routes are removed. Default: 3600 seconds.
 
        <tag><label id="bgp-require-long-lived-graceful-restart">require long lived graceful restart <m/switch/</tag>
-       If enabled, the BGP Long-lived Graceful Restart capability (draft)
+       If enabled, the BGP Long-lived Graceful Restart capability (<rfc id="9494">)
        must be announced by the BGP neighbor, otherwise the BGP session
        will not be established. Default: off.
 

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 0872ae23f026f47f7c292b45673e379ab0ef6ca3..e853624b803c3cf2fa9ebfede654b7eff365827d 100644 (file)
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -2035,7 +2035,7 @@ bgp_rte_better(rte *new, rte *old)
   if (n < o)
     return 0;
 
-  /* LLGR draft - depreference stale routes */
+  /* LLGR 9494 - depreference stale routes */
   n = rte_stale(new);
   o = rte_stale(old);
   if (n > o)
@@ -2172,7 +2172,7 @@ bgp_rte_mergable(rte *pri, rte *sec)
   if (rte_resolvable(pri) != rte_resolvable(sec))
     return 0;
 
-  /* LLGR draft - depreference stale routes */
+  /* LLGR 9494 - depreference stale routes */
   if (rte_stale(pri) != rte_stale(sec))
     return 0;
 

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 90c565aea8e2c465cfa7852991616c44910e11e8..f0660e6234d4b7d6cc59bdee8568cc8c6f3b7a4b 100644 (file)
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -104,8 +104,8 @@
  * RFC 9072 - Extended Optional Parameters Length for BGP OPEN Message
  * RFC 9117 - Revised Validation Procedure for BGP Flow Specifications
  * RFC 9234 - Route Leak Prevention and Detection Using Roles
+ * RFC 9494 - Long-Lived Graceful Restart for BGP
  * RFC 9687 - Send Hold Timer
- * draft-uttaro-idr-bgp-persistence-04
  * draft-walton-bgp-hostname-capability-02
  */
 

diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 19b44372167d42a0babc77a9c364b1b42fc9a761..32078668702c81c5248ede1665008bec9a2fbfd2 100644 (file)
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -146,7 +146,7 @@ struct bgp_config {
   int require_extended_messages;       /* Require remote support for extended messages [RFC 8654] */
   int require_hostname;                        /* Require remote support for hostname [draft] */
   int require_gr;                      /* Require remote support for graceful restart [RFC 4724] */
-  int require_llgr;                    /* Require remote support for long-lived graceful restart [draft] */
+  int require_llgr;                    /* Require remote support for long-lived graceful restart [RFC 9494] */
   struct bfd_options *bfd;             /* Use BFD for liveness detection */
 };
 
@@ -241,7 +241,7 @@ struct bgp_af_caps {
   u8 ready;                            /* Multiprotocol capability, RFC 4760 */
   u8 gr_able;                          /* Graceful restart support, RFC 4724 */
   u8 gr_af_flags;                      /* Graceful restart per-AF flags */
-  u8 llgr_able;                                /* Long-lived GR, RFC draft */
+  u8 llgr_able;                                /* Long-lived GR, RFC 9494 */
   u32 llgr_time;                       /* Long-lived GR stale time */
   u8 llgr_flags;                       /* Long-lived GR per-AF flags */
   u8 ext_next_hop;                     /* Extended IPv6 next hop,   RFC 8950 */
@@ -261,7 +261,7 @@ struct bgp_caps {
   u8 gr_flags;                         /* Graceful restart flags */
   u16 gr_time;                         /* Graceful restart time in seconds */
 
-  u8 llgr_aware;                       /* Long-lived GR capability, RFC draft */
+  u8 llgr_aware;                       /* Long-lived GR capability, RFC 9494 */
   u8 any_ext_next_hop;                 /* Bitwise OR of per-AF ext_next_hop */
   u8 any_add_path;                     /* Bitwise OR of per-AF add_path */
 

diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 81f0d3c4e0266bd0c0d6db0c221cc7e792392233..02bce7e7399c6e48e22269c2f7d57d837e09d758 100644 (file)
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -627,7 +627,7 @@ bgp_read_capabilities(struct bgp_conn *conn, byte *pos, int len)
       caps->enhanced_refresh = 1;
       break;
 
-    case 71: /* Long lived graceful restart capability, RFC draft */
+    case 71: /* Long lived graceful restart capability, RFC 9494 */
       if (cl % 7)
        goto err;