BGP: Update RFC reference

RFC 5549 was obsoleted by RFC 8950.

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 6a8183309885c5e605cc9a2551d3b64837e69f4e..29e12b7a6fe78683de45a75a0dd9af4b3db37d39 100644 (file)
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -2425,7 +2425,6 @@ avoid routing loops.
 <item> <rfc id="5065"> - AS confederations for BGP
 <item> <rfc id="5082"> - Generalized TTL Security Mechanism
 <item> <rfc id="5492"> - Capabilities Advertisement with BGP
-<item> <rfc id="5549"> - Advertising IPv4 NLRI with an IPv6 Next Hop
 <item> <rfc id="5575"> - Dissemination of Flow Specification Rules
 <item> <rfc id="5668"> - 4-Octet AS Specific BGP Extended Community
 <item> <rfc id="6286"> - AS-Wide Unique BGP Identifier
@@ -2440,6 +2439,7 @@ avoid routing loops.
 <item> <rfc id="8203"> - BGP Administrative Shutdown Communication
 <item> <rfc id="8212"> - Default EBGP Route Propagation Behavior without Policies
 <item> <rfc id="8654"> - Extended Message Support for BGP
+<item> <rfc id="8950"> - Advertising IPv4 NLRI with an IPv6 Next Hop
 <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
@@ -3100,7 +3100,7 @@ be used in explicit configuration.
        associated network prefixes. This option provides an extension to use
        IPv4 next hops with IPv6 prefixes and vice versa. For IPv4 / VPNv4
        channels, the behavior is controlled by the Extended Next Hop Encoding
-       capability, as described in <rfc id="5549">. For IPv6 / VPNv6 channels,
+       capability, as described in <rfc id="8950">. For IPv6 / VPNv6 channels,
        just IPv4-mapped IPv6 addresses are used, as described in
        <rfc id="4798"> and <rfc id="4659">. Default: off.
 

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index c806765a7117b5bd595a1beeb82655cecac7675c..1ae563974dade50fbf09ed9fab7dd000c4a3706f 100644 (file)
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -86,7 +86,6 @@
  * RFC 5065 - AS confederations for BGP
  * RFC 5082 - Generalized TTL Security Mechanism
  * RFC 5492 - Capabilities Advertisement with BGP
- * RFC 5549 - Advertising IPv4 NLRI with an IPv6 Next Hop
  * RFC 5575 - Dissemination of Flow Specification Rules
  * RFC 5668 - 4-Octet AS Specific BGP Extended Community
  * RFC 6286 - AS-Wide Unique BGP Identifier
@@ -101,6 +100,7 @@
  * RFC 8203 - BGP Administrative Shutdown Communication
  * RFC 8212 - Default EBGP Route Propagation Behavior without Policies
  * RFC 8654 - Extended Message Support for BGP
+ * RFC 8950 - Advertising IPv4 NLRI with an IPv6 Next Hop
  * 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

diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 7c96e85133d35d6ae21ab9d1589a26b32f53644e..0fb375d5da5d0b1a282f802383ff518cc17f6428 100644 (file)
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -232,7 +232,7 @@ struct bgp_af_caps {
   u8 llgr_able;                                /* Long-lived GR, RFC draft */
   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 5549 */
+  u8 ext_next_hop;                     /* Extended IPv6 next hop,   RFC 8950 */
   u8 add_path;                         /* Multiple paths support,   RFC 7911 */
 };
 

diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 6e6e41caabd46b80731a99bbd2cfa08d96ddd9f6..66f243bdccd81adda94c25a5158b96814c4baf20 100644 (file)
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -507,7 +507,7 @@ bgp_read_capabilities(struct bgp_conn *conn, byte *pos, int len)
       caps->route_refresh = 1;
       break;
 
-    case  5: /* Extended next hop encoding capability, RFC 5549 */
+    case  5: /* Extended next hop encoding capability, RFC 8950 */
       if (cl % 6)
        goto err;
 
@@ -1257,7 +1257,7 @@ bgp_encode_next_hop_ip(struct bgp_write_state *s, eattr *a, byte *buf, uint size
 
   /*
    * Both IPv4 and IPv6 next hops can be used (with ext_next_hop enabled). This
-   * is specified in RFC 5549 for IPv4 and in RFC 4798 for IPv6. The difference
+   * is specified in RFC 8950 for IPv4 and in RFC 4798 for IPv6. The difference
    * is that IPv4 address is directly encoded with IPv4 NLRI, but as IPv4-mapped
    * IPv6 address with IPv6 NLRI.
    */
@@ -1332,7 +1332,7 @@ bgp_encode_next_hop_vpn(struct bgp_write_state *s, eattr *a, byte *buf, uint siz
 
   /*
    * Both IPv4 and IPv6 next hops can be used (with ext_next_hop enabled). This
-   * is specified in RFC 5549 for VPNv4 and in RFC 4659 for VPNv6. The difference
+   * is specified in RFC 8950 for VPNv4 and in RFC 4659 for VPNv6. The difference
    * is that IPv4 address is directly encoded with VPNv4 NLRI, but as IPv4-mapped
    * IPv6 address with VPNv6 NLRI.
    */